svn commit: r700357 - in /incubator/shindig/trunk: features/opensocial-templates/container.js java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndTest.java java/server/src/test/resources/endtoend/opensocial-templates/ost_test.xml

[evan]

Author: evan
Date: Mon Sep 29 23:32:31 2008
New Revision: 700357

URL: http://svn.apache.org/viewvc?rev=700357&view=rev
Log:
SHINDIG-621 - fix for JS unit tests.

Note - had to prepend "/opensocial-templates" to test URIs to get this to work:
 <script type="text/javascript" src="testadapter.js"></script>
 became
 <script type="text/javascript" 
src="/opensocial-templates/testadapter.js"></script>

Modified:
    incubator/shindig/trunk/features/opensocial-templates/container.js
    
incubator/shindig/trunk/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndTest.java
    
incubator/shindig/trunk/java/server/src/test/resources/endtoend/opensocial-templates/ost_test.xml

Modified: incubator/shindig/trunk/features/opensocial-templates/container.js
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/features/opensocial-templates/container.js?rev=700357&r1=700356&r2=700357&view=diff
==============================================================================
--- incubator/shindig/trunk/features/opensocial-templates/container.js 
(original)
+++ incubator/shindig/trunk/features/opensocial-templates/container.js Mon Sep 
29 23:32:31 2008
@@ -72,7 +72,7 @@
   } if (window.addEventListener) {
     window.addEventListener("load", os.Container.onDomLoad_, false);
   } else {          
-    if (!window.body) {
+    if (!document.body) {
       setTimeout(arguments.callee, 0);
       return;
     }
@@ -82,7 +82,6 @@
       os.Container.onDomLoad_();
     }              
   }
-  os.Container.domLoadCallbacks_ = [];
 };
 
 /**
@@ -110,6 +109,7 @@
     setTimeout(callback, 0);    
   } else {
     if (os.Container.domLoadCallbacks_ == null) {
+      os.Container.domLoadCallbacks_ = [];
       os.Container.registerDomLoadListener_();
     }
     os.Container.domLoadCallbacks_.push(callback);

Modified: 
incubator/shindig/trunk/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndTest.java
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndTest.java?rev=700357&r1=700356&r2=700357&view=diff
==============================================================================
--- 
incubator/shindig/trunk/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndTest.java
 (original)
+++ 
incubator/shindig/trunk/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndTest.java
 Mon Sep 29 23:32:31 2008
@@ -100,8 +100,7 @@
 
   @Test
   public void testTemplates() throws Exception {
-    // TODO: Re-enable when the test is passing
-    //executeAllPageTests("opensocial-templates/ost_test");
+    executeAllPageTests("opensocial-templates/ost_test");
   }
 
   @BeforeClass

Modified: 
incubator/shindig/trunk/java/server/src/test/resources/endtoend/opensocial-templates/ost_test.xml
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/server/src/test/resources/endtoend/opensocial-templates/ost_test.xml?rev=700357&r1=700356&r2=700357&view=diff
==============================================================================
--- 
incubator/shindig/trunk/java/server/src/test/resources/endtoend/opensocial-templates/ost_test.xml
 (original)
+++ 
incubator/shindig/trunk/java/server/src/test/resources/endtoend/opensocial-templates/ost_test.xml
 Mon Sep 29 23:32:31 2008
@@ -24,14 +24,14 @@
   </ModulePrefs>
   <Content type="html">
     <![CDATA[
-    <script type="text/javascript" src="testadapter.js"></script>
+    <script type="text/javascript" 
src="/opensocial-templates/testadapter.js"></script>
     <!-- the JsUnit tests -->
-    <script type="text/javascript" src="compiler_test.js"></script>
-    <script type="text/javascript" src="data_test.js"></script>
-    <script type="text/javascript" src="container_test.js"></script>
-    <script type="text/javascript" src="loader_test.js"></script>
-    <script type="text/javascript" src="os_test.js"></script>
-    <script type="text/javascript" src="util_test.js"></script>
+    <script type="text/javascript" 
src="/opensocial-templates/compiler_test.js"></script>
+    <script type="text/javascript" 
src="/opensocial-templates/data_test.js"></script>
+    <script type="text/javascript" 
src="/opensocial-templates/container_test.js"></script>
+    <script type="text/javascript" 
src="/opensocial-templates/loader_test.js"></script>
+    <script type="text/javascript" 
src="/opensocial-templates/os_test.js"></script>
+    <script type="text/javascript" 
src="/opensocial-templates/util_test.js"></script>
 
     <div style="display: none">
       <div id="domSource">