svn commit: r706376 - /incubator/shindig/trunk/features/opensocial-templates/template_test.js

[ev...@apache.org]

Author: evan
Date: Mon Oct 20 12:21:53 2008
New Revision: 706376

URL: http://svn.apache.org/viewvc?rev=706376&view=rev
Log:
SHINDIG-649 (latest patch) - Fix some whitespace issues on IE, use gadgets.util.registerOnLoadHandler when available

Modified:
    incubator/shindig/trunk/features/opensocial-templates/template_test.js

Modified: incubator/shindig/trunk/features/opensocial-templates/template_test.js
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/features/opensocial-templates/template_test.js?rev=706376&r1=706375&r2=706376&view=diff
==============================================================================
--- incubator/shindig/trunk/features/opensocial-templates/template_test.js (original)
+++ incubator/shindig/trunk/features/opensocial-templates/template_test.js Mon Oct 20 12:21:53 2008
@@ -281,21 +281,24 @@
  * Tests if attribute.
  */
 function testConditional_Number() {
-  var outputNode = compileAndRender_("_T_Conditional_Number");
-
-  assertEquals("TRUE", domutil.getVisibleText(outputNode));
+  var outputNode = os.compileTemplateString(
+      '<span if="42==42">TRUE</span><span if="!(42==42)">FALSE</span>'
+      ).render();   
+  assertEquals("TRUE", domutil.getVisibleTextTrim(outputNode));
 }
 
 function testConditional_String() {
-  var outputNode = compileAndRender_("_T_Conditional_String");
-
-  assertEquals("TRUE", domutil.getVisibleText(outputNode));
+  var outputNode = os.compileTemplateString(
+      "<span if=\"'101'=='101'\">TRUE</span><span if=\"'101'!='101'\">FALSE</span>"
+      ).render(); 
+  assertEquals("TRUE", domutil.getVisibleTextTrim(outputNode));
 }
 
 function testConditional_Mixed() {
-  var outputNode = compileAndRender_("_T_Conditional_Mixed");
-
-  assertEquals("TRUE", domutil.getVisibleText(outputNode));
+  var outputNode = os.compileTemplateString(
+      "<span if=\"'101' gt 42\">TRUE</span><span if=\"'101' lt 42\">FALSE</span>"
+      ).render();   
+  assertEquals("TRUE", domutil.getVisibleTextTrim(outputNode));
 }
 
 /**
@@ -371,10 +374,13 @@
 
   var data = {
     data: "Some default data"
-  };
-  var outputNode = compileAndRender_("_T_Tag_input", data);
-  // contentNode is wrapped by <div><span>
-  var contentNode = outputNode.firstChild.firstChild;
+  };  
+  var template = os.compileTemplateString("<custom:input value=\"data\"/>");
+  var output = template.render(data);
+  
+  // extract contentNode
+  var contentNode = output.getElementsByTagName("input")[0];
+  
   assertEquals(contentNode.value, data.data);
 }
 
@@ -735,3 +741,30 @@
   template.renderInto(output);
   assertEquals('bar', output.firstChild.title);
 };
+
+function testSpacesAmongTags() {
+  var tryTemplateContent = function(templateText) {
+    var output = os.compileTemplateString(templateText).render();
+    assertEquals('Hello world!', domutil.getVisibleTextTrim(output));
+  }
+
+  os.Loader.loadContent('<Templates xmlns:os="uri:unused">' +
+    '<Template tag="os:msg">${My.text}</Template></Templates>');
+
+  tryTemplateContent('<div><os:msg text="Hello"/>\n' +
+      ' <os:msg text="world!"/></div>');
+  tryTemplateContent('<div><os:msg text="Hello"/>  ' +
+      '<os:msg text="world!"/></div>');
+  tryTemplateContent('<div> <os:msg text="Hello"/>  ' +
+      '<os:msg text="world!"/>\n</div>');
+
+  os.Loader.loadContent('<Templates xmlns:os="uri:unused">' +
+    '<Template tag="os:msg"><os:Render/></Template></Templates>');
+
+  tryTemplateContent('<div><os:msg>Hello</os:msg>\n' +
+      ' <os:msg>world!</os:msg>\n</div>');
+  tryTemplateContent('<div><os:msg>Hello</os:msg>' +
+      '  <os:msg>world!</os:msg></div>');
+  tryTemplateContent('<div>\n  <os:msg>Hello</os:msg>' +
+      '  <os:msg>world!</os:msg>\n</div>');
+};