svn commit: r1540534 - /jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/providers/RCSFileProviderTest.java

[gm...@apache.org]

Author: gmazza
Date: Sun Nov 10 20:08:25 2013
New Revision: 1540534

URL: http://svn.apache.org/r1540534
Log:
Fixed test failure due to unexpected ordering of tests in RCSFileProvider.

Modified:
    jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/providers/RCSFileProviderTest.java

Modified: jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/providers/RCSFileProviderTest.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/providers/RCSFileProviderTest.java?rev=1540534&r1=1540533&r2=1540534&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/providers/RCSFileProviderTest.java (original)
+++ jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/providers/RCSFileProviderTest.java Sun Nov 10 20:08:25 2013
@@ -41,6 +41,7 @@ import org.apache.wiki.util.FileUtil;
 public class RCSFileProviderTest extends TestCase
 {
     public static final String NAME1 = "Test1";
+    public static final String NAME2 = "Test2";
 
     Properties props = TestEngine.getTestProperties("/jspwiki-rcs-custom.properties");
 
@@ -155,26 +156,23 @@ public class RCSFileProviderTest extends
      *  Checks if migration from FileSystemProvider to VersioningFileProvider
      *  works by creating a dummy file without corresponding content in OLD/
      */
-    public void testMigration()
-        throws IOException
-    {
-        if( isRcsInPath )
-        {
+    public void testMigration() throws IOException {
+        if (isRcsInPath) {
             String files = props.getProperty( FileSystemProvider.PROP_PAGEDIR );
             
-            File f = new File( files, NAME1+FileSystemProvider.FILE_EXT );
+            File f = new File(files, NAME2 + FileSystemProvider.FILE_EXT );
 
-            Writer out = new FileWriter( f );
-            FileUtil.copyContents( new StringReader("foobar"), out );
+            Writer out = new FileWriter(f);
+            FileUtil.copyContents(new StringReader("foobar"), out);
             out.close();
 
-            String res = engine.getText( NAME1 );
+            String res = engine.getText(NAME2);
 
-            assertEquals( "latest did not work", "foobar", res );
+            assertEquals("latest did not work", "foobar", res);
 
-            res = engine.getText( NAME1, 1 ); // Should be the first version.
+            res = engine.getText(NAME2, 1); // Should be the first version.
 
-            assertEquals( "fetch by direct version did not work", "foobar", res );
+            assertEquals("fetch by direct version did not work", "foobar", res);
         }
     }