Modified: shindig/trunk/features/src/test/javascript/features/container/gadget_holder_test.js URL: http://svn.apache.org/viewvc/shindig/trunk/features/src/test/javascript/features/container/gadget_holder_test.js?rev=1234987&r1=1234986&r2=1234987&view=diff ============================================================================== --- shindig/trunk/features/src/test/javascript/features/container/gadget_holder_test.js (original) +++ shindig/trunk/features/src/test/javascript/features/container/gadget_holder_test.js Mon Jan 23 21:09:15 2012 @@ -47,12 +47,12 @@ GadgetHolderTest.prototype.testNew = fun }, id: '123' }; - var site = new osapi.container.GadgetSite({gadgetEl: element}); + var site = new osapi.container.GadgetSite(null, null, {gadgetEl: element}); var holder = new osapi.container.GadgetHolder(site, element); this.assertEquals(element, holder.getElement()); - this.assertNull(holder.getIframeId()); - this.assertNull(holder.getGadgetInfo()); - this.assertNull(holder.getUrl()); + this.assertUndefined(holder.getIframeId()); + this.assertUndefined(holder.getGadgetInfo()); + this.assertUndefined(holder.getUrl()); }; GadgetHolderTest.prototype.testRenderWithoutRenderParams = function() { @@ -65,7 +65,7 @@ GadgetHolderTest.prototype.testRenderWit var element = { id: '123' }; - var site = new osapi.container.GadgetSite({gadgetEl: element}); + var site = new osapi.container.GadgetSite(null, null, {gadgetEl: element}); var holder = new osapi.container.GadgetHolder(site, element, '__gadgetOnLoad'); holder.render(gadgetInfo, {}, {}); this.assertEquals('<iframe' + @@ -102,7 +102,7 @@ GadgetHolderTest.prototype.testRenderWit var element = { id: '123' }; - var site = new osapi.container.GadgetSite({gadgetEl: element, moduleId: 123}); + var site = new osapi.container.GadgetSite(null, null, {gadgetEl: element, moduleId: 123}); var holder = new osapi.container.GadgetHolder(site, element, '__gadgetOnLoad'); holder.render(gadgetInfo, {}, renderParams); this.assertEquals('<iframe' +
Modified: shindig/trunk/features/src/test/javascript/features/container/gadget_site_test.js URL: http://svn.apache.org/viewvc/shindig/trunk/features/src/test/javascript/features/container/gadget_site_test.js?rev=1234987&r1=1234986&r2=1234987&view=diff ============================================================================== --- shindig/trunk/features/src/test/javascript/features/container/gadget_site_test.js (original) +++ shindig/trunk/features/src/test/javascript/features/container/gadget_site_test.js Mon Jan 23 21:09:15 2012 @@ -60,10 +60,10 @@ GadgetSiteTest.prototype.tearDown = func GadgetSiteTest.prototype.testGetId = function() { var site; - site = new osapi.container.GadgetSite({}); - this.assertEquals(osapi.container.Container.prototype.nextUniqueSiteId_ - 1, site.getId()); - site = new osapi.container.GadgetSite({}); - this.assertEquals(osapi.container.Container.prototype.nextUniqueSiteId_ - 1, site.getId()); + site = new osapi.container.GadgetSite(null, null, {}); + this.assertEquals(osapi.container.Site.prototype.nextUniqueSiteId_ - 1, site.getId()); + site = new osapi.container.GadgetSite(null, null, {}); + this.assertEquals(osapi.container.Site.prototype.nextUniqueSiteId_ - 1, site.getId()); }; GadgetSiteTest.prototype.testNavigateToWithUncachedError = function() { @@ -130,8 +130,7 @@ GadgetSiteTest.prototype.newMetadataErro }; GadgetSiteTest.prototype.newGadgetSite = function(service, navigateCallback) { - return new osapi.container.GadgetSite({ - 'service' : service, + return new osapi.container.GadgetSite(null, service, { 'navigateCallback' : navigateCallback }); }; Modified: shindig/trunk/features/src/test/javascript/features/embeddedexperiences/embedded_experiences_container_test.js URL: http://svn.apache.org/viewvc/shindig/trunk/features/src/test/javascript/features/embeddedexperiences/embedded_experiences_container_test.js?rev=1234987&r1=1234986&r2=1234987&view=diff ============================================================================== --- shindig/trunk/features/src/test/javascript/features/embeddedexperiences/embedded_experiences_container_test.js (original) +++ shindig/trunk/features/src/test/javascript/features/embeddedexperiences/embedded_experiences_container_test.js Mon Jan 23 21:09:15 2012 @@ -93,7 +93,7 @@ EEContainerTest.prototype.setupGadgetSit self.site_navigateTo_renderParams = renderParams; func(gadgetInfo); }, - 'getActiveGadgetHolder' : function() { + 'getActiveSiteHolder' : function() { return gadgetHolder; } }; Modified: shindig/trunk/features/src/test/javascript/features/opensearch/opensearch_test.js URL: http://svn.apache.org/viewvc/shindig/trunk/features/src/test/javascript/features/opensearch/opensearch_test.js?rev=1234987&r1=1234986&r2=1234987&view=diff ============================================================================== --- shindig/trunk/features/src/test/javascript/features/opensearch/opensearch_test.js (original) +++ shindig/trunk/features/src/test/javascript/features/opensearch/opensearch_test.js Mon Jan 23 21:09:15 2012 @@ -190,7 +190,7 @@ OpenSearchTest.prototype.setupGadgetSite self.site_navigateTo_renderParams = renderParams; func(gadgetInfo); }, - 'getActiveGadgetHolder' : function() { + 'getActiveSiteHolder' : function() { return gadgetHolder; } }; Modified: shindig/trunk/features/src/test/javascript/lib/testutils.js URL: http://svn.apache.org/viewvc/shindig/trunk/features/src/test/javascript/lib/testutils.js?rev=1234987&r1=1234986&r2=1234987&view=diff ============================================================================== --- shindig/trunk/features/src/test/javascript/lib/testutils.js (original) +++ shindig/trunk/features/src/test/javascript/lib/testutils.js Mon Jan 23 21:09:15 2012 @@ -137,6 +137,10 @@ var getSourceMessage = function(operand) * @private */ function deepEquals(expected, actual) { + if (expected === actual) { + return true; + } + // Undefined/null can be treated as equal here, I believe if (expected == null) { return actual == null;
