From 93ba4ce715d8e6222182c35f8414c2ad863063de Mon Sep 17 00:00:00 2001
From: Shivam Dave <sdave@ucsc.edu>
Date: Thu, 25 Jun 2015 10:10:13 -0700
Subject: [PATCH] [Windowing] Unit Test

Added Unit test adjustments for
the change in urlService (addition
of a separate function for getting
the url for a location, used by browse
controller. WTD 23.
---
 .../browse/test/BrowseControllerSpec.js       |  4 +-
 .../browse/test/services/UrlServiceSpec.js    | 41 +++++++++++--------
 .../browse/test/windowing/NewTabActionSpec.js |  2 +-
 3 files changed, 28 insertions(+), 19 deletions(-)

diff --git a/platform/commonUI/browse/test/BrowseControllerSpec.js b/platform/commonUI/browse/test/BrowseControllerSpec.js
index 3a14589131..ca9a926f0d 100644
--- a/platform/commonUI/browse/test/BrowseControllerSpec.js
+++ b/platform/commonUI/browse/test/BrowseControllerSpec.js
@@ -61,7 +61,7 @@ define(
                 );
                 mockUrlService = jasmine.createSpyObj(
                     "urlService",
-                    ["urlFor"]
+                    ["urlForLocation"]
                 );
                 mockObjectService = jasmine.createSpyObj(
                     "objectService",
@@ -225,7 +225,7 @@ define(
                 // location.path to be called with the urlService's 
                 // urlFor function with the next domainObject and mode
                 expect(mockLocation.path).toHaveBeenCalledWith(
-                    mockUrlService.urlFor(mockMode, mockNextObject)
+                    mockUrlService.urlForLocation(mockMode, mockNextObject)
                 );
 
                 // Exercise the Angular workaround
diff --git a/platform/commonUI/browse/test/services/UrlServiceSpec.js b/platform/commonUI/browse/test/services/UrlServiceSpec.js
index 757a09fab0..daff0c5448 100644
--- a/platform/commonUI/browse/test/services/UrlServiceSpec.js
+++ b/platform/commonUI/browse/test/services/UrlServiceSpec.js
@@ -31,7 +31,11 @@ define(
 
         describe("The url service", function () {
             var urlService,
-                mockLocation;
+                mockLocation,
+                mockDomainObject,
+                mockContext,
+                mockMode,
+                testViews;
 
             beforeEach(function () {
                 // Creates a mockLocation, used to 
@@ -41,24 +45,20 @@ define(
                     [ "path", "search" ]
                 );
                 
-                urlService = new UrlService(mockLocation);
-            });
-            
-            it("get url for a domainObject and mode", function () {
-                // The mockDomainObject is initialized as a 
+                 // The mockDomainObject is initialized as a 
                 // spy object to ultimately be passed into the
                 // urlService urlFor function
-                var mockDomainObject = jasmine.createSpyObj(
+                mockDomainObject = jasmine.createSpyObj(
                     "domainObject",
                     [ "getId", "getCapability", "getModel", "useCapability" ]
-                ),
-                    mockContext = jasmine.createSpyObj('context', ['getPath']),
-                    testViews = [
-                        { key: 'abc' },
-                        { key: 'def', someKey: 'some value' },
-                        { key: 'xyz' }
-                    ],
-                    mockMode = "browse";
+                );
+                mockContext = jasmine.createSpyObj('context', ['getPath']);
+                testViews = [
+                    { key: 'abc' },
+                    { key: 'def', someKey: 'some value' },
+                    { key: 'xyz' }
+                ];
+                mockMode = "browse";
                 
                 // The mockContext is set a path
                 // for the mockDomainObject
@@ -81,8 +81,17 @@ define(
                 // Uses the mockLocation to get the current
                 // "mock" website's view
                 mockLocation.search.andReturn({ view: 'def' });
-                urlService.urlFor(mockMode, mockDomainObject);
+                
+                urlService = new UrlService(mockLocation);
             });
+            
+            it("get url for a location using domainObject and mode", function () {
+                urlService.urlForLocation(mockMode, mockDomainObject);
+            });
+            
+            it("get url for a new tab using domainObject and mode", function () {
+                urlService.urlForNewTab(mockMode, mockDomainObject);
+            });            
         });
     }
 );
\ No newline at end of file
diff --git a/platform/commonUI/browse/test/windowing/NewTabActionSpec.js b/platform/commonUI/browse/test/windowing/NewTabActionSpec.js
index 8955727e19..1371f96eda 100644
--- a/platform/commonUI/browse/test/windowing/NewTabActionSpec.js
+++ b/platform/commonUI/browse/test/windowing/NewTabActionSpec.js
@@ -53,7 +53,7 @@ define(
                 
                 // Mocks the urlService used to make the new tab's url from a
                 // domainObject and mode
-                mockUrlService = jasmine.createSpyObj("urlService", ["urlFor"]);
+                mockUrlService = jasmine.createSpyObj("urlService", ["urlForNewTab"]);
                 
                 // Action done using the current context or mockContextCurrent
                 actionCurrent = new NewTabAction(mockUrlService, mockWindow,