svn commit: r447340 - in /tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry: junit/mock/app/Styled.html services/impl/DefaultResponseBuilderTest.java util/TestPageRenderSupport.java

[an...@apache.org]

Author: andyhot
Date: Mon Sep 18 02:31:38 2006
New Revision: 447340

URL: http://svn.apache.org/viewvc?view=rev&rev=447340
Log:
TAPESTRY-1093: Fix whitespace and newline issues in tests

Modified:
    tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/mock/app/Styled.html
    tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/services/impl/DefaultResponseBuilderTest.java
    tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/util/TestPageRenderSupport.java

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/mock/app/Styled.html
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/mock/app/Styled.html?view=diff&rev=447340&r1=447339&r2=447340
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/mock/app/Styled.html (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/mock/app/Styled.html Mon Sep 18 02:31:38 2006
@@ -5,7 +5,7 @@
 <link jwcid="@Relation" href="dummy.css"/>
 Empty page...
 <style jwcid="@Style" media="all">
-a {background:yellow;}    
+a {background:yellow;}
 </style>    
 </span>
 </span>

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/services/impl/DefaultResponseBuilderTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/services/impl/DefaultResponseBuilderTest.java?view=diff&rev=447340&r1=447339&r2=447340
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/services/impl/DefaultResponseBuilderTest.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/services/impl/DefaultResponseBuilderTest.java Mon Sep 18 02:31:38 2006
@@ -42,7 +42,7 @@
 
     private static CharArrayWriter _writer;
     
-    private static String LINE_SEPERATOR = (String)java.security.AccessController.doPrivileged(
+    private static String LINE_SEPARATOR = (String)java.security.AccessController.doPrivileged(
             new sun.security.action.GetPropertyAction("line.separator"));
     
     private PrintWriter newPrintWriter()
@@ -144,7 +144,7 @@
         
         builder.writeImageInitializations(mw, imageInit, preload, cycle);
         
-        assertOutput("\n"
+        assertOutput(LINE_SEPARATOR
                 + "dojo.event.connect(window, 'onload', function(e) {\n\n\n"
                 + preload + " = [];\n"
                 + "if (document.images)\n"
@@ -183,12 +183,12 @@
         builder.writeExternalScript(mw, script1, cycle);
         
         assertOutput("<script type=\"text/javascript\" src=\""
-                + script1 + "\"></script>" + LINE_SEPERATOR);
+                + script1 + "\"></script>" + LINE_SEPARATOR);
         
         builder.writeExternalScript(mw, script2, cycle);
         
         assertOutput("<script type=\"text/javascript\" src=\""
-                + script2 + "\"></script>" + LINE_SEPERATOR);
+                + script2 + "\"></script>" + LINE_SEPARATOR);
         
         verify();
     }

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/util/TestPageRenderSupport.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/util/TestPageRenderSupport.java?view=diff&rev=447340&r1=447339&r2=447340
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/util/TestPageRenderSupport.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/util/TestPageRenderSupport.java Mon Sep 18 02:31:38 2006
@@ -42,6 +42,10 @@
 @Test
 public class TestPageRenderSupport extends BaseComponentTestCase
 {
+    private static final String SYSTEM_NEWLINE= (String)java.security.AccessController.doPrivileged(
+            new sun.security.action.GetPropertyAction("line.separator"));
+    private static final String TEST_NEWLINE= "\n";
+
     private AssetFactory newAssetFactory()
     {
         return newMock(AssetFactory.class);
@@ -92,6 +96,8 @@
     private void assertOutput(String expected)
     {
         String actual = _writer.toString();
+        // Replace any system line feeds with \n
+        actual = actual.replaceAll(SYSTEM_NEWLINE, TEST_NEWLINE);
 
         assertEquals(expected, actual);
 
@@ -255,7 +261,7 @@
 
     public void testAddExternalScript() throws Exception
     {
-        String newline = System.getProperty("line.separator");
+        String newline = TEST_NEWLINE;
 
         IRequestCycle cycle = newCycle();