Author: juanpablo
Date: Sat Jan 14 19:52:27 2012
New Revision: 1231573

URL: http://svn.apache.org/viewvc?rev=1231573&view=rev
Log:
* corrected failing unit tests: 17 of them were locale dependant (test 
assertions assumed 
  english locale), so TestEngine enforces it when building mock requests

* RCSFileProvider tests are executed only if RCS is detected in path.

Modified:
    incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/ChangeLog
    
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/tests/com/ecyrd/jspwiki/TestEngine.java
    
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/tests/com/ecyrd/jspwiki/parser/CreoleToJSPWikiTranslatorTest.java
    
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/tests/com/ecyrd/jspwiki/parser/JSPWikiMarkupParserTest.java
    
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/tests/com/ecyrd/jspwiki/plugin/ReferringPagesPluginTest.java
    
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/tests/com/ecyrd/jspwiki/plugin/TableOfContentsTest.java
    
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/tests/com/ecyrd/jspwiki/providers/RCSFileProviderTest.java

Modified: incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/ChangeLog
URL: 
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/ChangeLog?rev=1231573&r1=1231572&r2=1231573&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/ChangeLog (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/ChangeLog Sat Jan 14 19:52:27 
2012
@@ -1,3 +1,10 @@
+2012-01-14  Juan Pablo Santos (juanpablo AT apache DOT org)
+
+        * no version bump
+        * corrected failing unit tests: 17 of them were locale dependant (test 
assertions assumed 
+          english locale), so TestEngine enforces it when building mock 
requests
+        * RCSFileProvider tests are executed only if RCS is detected in path.
+
 2011-09-20  Florian Holeczek <[email protected]>
 
         * no version bump

Modified: 
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/tests/com/ecyrd/jspwiki/TestEngine.java
URL: 
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/tests/com/ecyrd/jspwiki/TestEngine.java?rev=1231573&r1=1231572&r2=1231573&view=diff
==============================================================================
--- 
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/tests/com/ecyrd/jspwiki/TestEngine.java
 (original)
+++ 
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/tests/com/ecyrd/jspwiki/TestEngine.java
 Sat Jan 14 19:52:27 2012
@@ -1,7 +1,8 @@
 
 package com.ecyrd.jspwiki;
-import java.util.Properties;
 import java.io.*;
+import java.util.Locale;
+import java.util.Properties;
 
 import javax.servlet.ServletContext;
 import javax.servlet.http.HttpServletRequest;
@@ -17,7 +18,10 @@ import com.ecyrd.jspwiki.auth.Authentica
 import com.ecyrd.jspwiki.auth.SessionMonitor;
 import com.ecyrd.jspwiki.auth.Users;
 import com.ecyrd.jspwiki.auth.WikiSecurityException;
-import com.ecyrd.jspwiki.providers.*;
+import com.ecyrd.jspwiki.providers.AbstractFileProvider;
+import com.ecyrd.jspwiki.providers.BasicAttachmentProvider;
+import com.ecyrd.jspwiki.providers.FileSystemProvider;
+import com.ecyrd.jspwiki.providers.ProviderException;
 
 /**
  *  Simple test engine that always assumes pages are found.
@@ -116,6 +120,7 @@ public class TestEngine extends WikiEngi
     {
         MockHttpServletRequest request = new MockHttpServletRequest( 
"/JSPWiki", path );
         request.setSession( new MockHttpSession( this.getServletContext() ) );
+        request.addLocale( new Locale( "" ) );
         return request;
     }
     

Modified: 
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/tests/com/ecyrd/jspwiki/parser/CreoleToJSPWikiTranslatorTest.java
URL: 
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/tests/com/ecyrd/jspwiki/parser/CreoleToJSPWikiTranslatorTest.java?rev=1231573&r1=1231572&r2=1231573&view=diff
==============================================================================
--- 
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/tests/com/ecyrd/jspwiki/parser/CreoleToJSPWikiTranslatorTest.java
 (original)
+++ 
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/tests/com/ecyrd/jspwiki/parser/CreoleToJSPWikiTranslatorTest.java
 Sat Jan 14 19:52:27 2012
@@ -67,7 +67,7 @@ public class CreoleToJSPWikiTranslatorTe
     {
         String src = "This is **bold\nand still bold**.";
 
-        assertEquals("This is __bold" + System.getProperty("line.separator") + 
"and still bold__.", translate(src));
+        assertEquals("This is __bold\nand still bold__.", translate(src));
     }
 
     public void testBoldAcrossLineParagraphs() throws Exception

Modified: 
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/tests/com/ecyrd/jspwiki/parser/JSPWikiMarkupParserTest.java
URL: 
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/tests/com/ecyrd/jspwiki/parser/JSPWikiMarkupParserTest.java?rev=1231573&r1=1231572&r2=1231573&view=diff
==============================================================================
--- 
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/tests/com/ecyrd/jspwiki/parser/JSPWikiMarkupParserTest.java
 (original)
+++ 
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/tests/com/ecyrd/jspwiki/parser/JSPWikiMarkupParserTest.java
 Sat Jan 14 19:52:27 2012
@@ -101,7 +101,7 @@ public class JSPWikiMarkupParserTest ext
                NoRequiredPropertyException,
                ServletException
     {
-        WikiContext context = new WikiContext( e, p );
+        WikiContext context = new WikiContext( e, testEngine.newHttpRequest(), 
p );
         JSPWikiMarkupParser tr = new JSPWikiMarkupParser( context,
                                                           new BufferedReader( 
new StringReader(src)) );
 

Modified: 
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/tests/com/ecyrd/jspwiki/plugin/ReferringPagesPluginTest.java
URL: 
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/tests/com/ecyrd/jspwiki/plugin/ReferringPagesPluginTest.java?rev=1231573&r1=1231572&r2=1231573&view=diff
==============================================================================
--- 
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/tests/com/ecyrd/jspwiki/plugin/ReferringPagesPluginTest.java
 (original)
+++ 
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/tests/com/ecyrd/jspwiki/plugin/ReferringPagesPluginTest.java
 Sat Jan 14 19:52:27 2012
@@ -41,7 +41,7 @@ public class ReferringPagesPluginTest ex
         engine.saveText( "Foobar6", "Reference to [TestPage]." );
         engine.saveText( "Foobar7", "Reference to [TestPage]." );
 
-        context = new WikiContext( engine, new WikiPage(engine,"TestPage") );
+        context = new WikiContext( engine, engine.newHttpRequest(), new 
WikiPage(engine,"TestPage") );
         manager = new PluginManager( engine, props );
     }
 
@@ -182,7 +182,7 @@ public class ReferringPagesPluginTest ex
         
         String dateString = 
result.substring(result.indexOf("(")+1,result.indexOf(")"));
         // the date should be parseable:
-        SimpleDateFormat df = new SimpleDateFormat("HH:mm:ss dd-MMM-yyyy zzz");
+        SimpleDateFormat df = new SimpleDateFormat("HH:mm:ss dd-MMM-yyyy zzz", 
engine.newHttpRequest().getLocale());
         df.parse(dateString);
 
         // test if the proper exception is thrown:

Modified: 
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/tests/com/ecyrd/jspwiki/plugin/TableOfContentsTest.java
URL: 
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/tests/com/ecyrd/jspwiki/plugin/TableOfContentsTest.java?rev=1231573&r1=1231572&r2=1231573&view=diff
==============================================================================
--- 
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/tests/com/ecyrd/jspwiki/plugin/TableOfContentsTest.java
 (original)
+++ 
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/tests/com/ecyrd/jspwiki/plugin/TableOfContentsTest.java
 Sat Jan 14 19:52:27 2012
@@ -7,7 +7,10 @@ package com.ecyrd.jspwiki.plugin;
 import java.util.Properties;
 
 import com.ecyrd.jspwiki.TestEngine;
+import com.ecyrd.jspwiki.WikiContext;
 import com.ecyrd.jspwiki.WikiException;
+import com.ecyrd.jspwiki.WikiPage;
+import com.ecyrd.jspwiki.providers.WikiPageProvider;
 
 import junit.framework.Test;
 import junit.framework.TestCase;
@@ -44,6 +47,23 @@ public class TableOfContentsTest extends
         
         testEngine.deletePage( "Test" );
     }
+    
+    /**
+     * TableOfContents plugin produces some i18n text, so we enforce english 
locale in order to
+     * be able to compare properly to assertion texts.
+     * 
+     * @param pagename name of the page.
+     * @return (english) contents corresponding to the given page name. 
+     */
+    String getI18nHTML( String pagename ) 
+    {
+        WikiPage page = testEngine.getPage( pagename, 
WikiPageProvider.LATEST_VERSION );
+        WikiContext context = new WikiContext( testEngine,
+                                               testEngine.newHttpRequest(),
+                                               page );
+        context.setRequestContext( WikiContext.NONE );
+        return testEngine.getHTML( context, page );
+    }
 
     public void testHeadingVariables()
         throws Exception
@@ -52,7 +72,7 @@ public class TableOfContentsTest extends
         
         testEngine.saveText( "Test", src );
         
-        String res = testEngine.getHTML( "Test" );
+        String res = getI18nHTML( "Test" );
         
         // FIXME: The <p> should not be here.
         assertEquals( "<p><div class=\"toc\">\n<div class=\"collapsebox\">\n"+
@@ -71,7 +91,7 @@ public class TableOfContentsTest extends
         
         testEngine.saveText( "Test", src );
         
-        String res = testEngine.getHTML( "Test" );
+        String res = getI18nHTML( "Test" );
         
         // FIXME: The <p> should not be here.
         String expecting = "<p><div class=\"toc\">\n<div 
class=\"collapsebox\">\n"+
@@ -96,7 +116,7 @@ public class TableOfContentsTest extends
         
         testEngine.saveText( "Test", src );
         
-        String res = testEngine.getHTML( "Test" );
+        String res = getI18nHTML( "Test" );
         
         // FIXME: The <p> should not be here.
         String expecting = "<p><div class=\"toc\">\n<div 
class=\"collapsebox\">\n"+
@@ -131,7 +151,7 @@ public class TableOfContentsTest extends
         
         testEngine.saveText( "Test", src );
         
-        String res = testEngine.getHTML( "Test" );
+        String res = getI18nHTML( "Test" );
         
         // FIXME: The <p> should not be here.
         String expecting = "<p><div class=\"toc\">\n<div 
class=\"collapsebox\">\n"+
@@ -168,7 +188,7 @@ public class TableOfContentsTest extends
         
         testEngine.saveText( "Test", src );
         
-        String res = testEngine.getHTML( "Test" );
+        String res = getI18nHTML( "Test" );
         
         // FIXME: The <p> should not be here.
         String expecting = "<p><div class=\"toc\">\n<div 
class=\"collapsebox\">\n"+
@@ -198,7 +218,7 @@ public class TableOfContentsTest extends
         
         testEngine.saveText( "Test", src );
         
-        String res = testEngine.getHTML( "Test" );
+        String res = getI18nHTML( "Test" );
         
         assertTrue( res.indexOf("Table of Contents") != -1 );
     }
@@ -210,7 +230,7 @@ public class TableOfContentsTest extends
         
         testEngine.saveText( "Test", src );
         
-        String res = testEngine.getHTML( "Test" );
+        String res = getI18nHTML( "Test" );
         
         assertTrue( "<i>", res.indexOf("<i>") == -1 ); // Check that there is 
no HTML left
         assertTrue( "</i>", res.indexOf("</i>") == -1 ); // Check that there 
is no HTML left
@@ -223,7 +243,7 @@ public class TableOfContentsTest extends
         
         testEngine.saveText( "Test", src );
         
-        String res = testEngine.getHTML( "Test" );
+        String res = getI18nHTML( "Test" );
 
         assertTrue( "Final HTML 1", res.indexOf(  "id=\"section-Test-Test\"" ) 
!= -1 );
         assertTrue( "Final HTML 2", res.indexOf(  "id=\"section-Test-Test-2\"" 
) != -1 );

Modified: 
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/tests/com/ecyrd/jspwiki/providers/RCSFileProviderTest.java
URL: 
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/tests/com/ecyrd/jspwiki/providers/RCSFileProviderTest.java?rev=1231573&r1=1231572&r2=1231573&view=diff
==============================================================================
--- 
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/tests/com/ecyrd/jspwiki/providers/RCSFileProviderTest.java
 (original)
+++ 
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/tests/com/ecyrd/jspwiki/providers/RCSFileProviderTest.java
 Sat Jan 14 19:52:27 2012
@@ -4,6 +4,9 @@ package com.ecyrd.jspwiki.providers;
 import junit.framework.*;
 import java.io.*;
 import java.util.*;
+
+import org.apache.log4j.Logger;
+
 import com.ecyrd.jspwiki.*;
 
 /**
@@ -20,6 +23,8 @@ public class RCSFileProviderTest extends
     Properties props = new Properties();
 
     TestEngine engine;
+    
+    boolean isRcsInPath;
 
     public RCSFileProviderTest( String s )
     {
@@ -32,6 +37,37 @@ public class RCSFileProviderTest extends
         props.load( TestEngine.findTestProperties("/jspwiki_rcs.properties") );
 
         engine = new TestEngine(props);
+        
+        checkIfRCSIsInPath();
+    }
+    
+    /**
+     * if the RCS package isn't installed and in path, these tests will always 
fail, so we try to 
+     * run them selectively.
+     */
+    void checkIfRCSIsInPath() 
+    {
+        Process process = null;
+        final Logger log = Logger.getLogger(RCSFileProviderTest.class);
+        String cmd = "rlog --help";
+        try
+        {
+            process = Runtime.getRuntime().exec( cmd, null, new File( "." ) );
+            process.waitFor();
+            isRcsInPath = true;
+        }
+        catch( IOException ioe )
+        {
+            isRcsInPath = false;
+            log.info( "RCS must be installed and in path in order to execute 
the tests." );
+            log.info( "Hence, execution of RCSFileProviderTest will be 
disabled" );
+        }
+        catch( InterruptedException ie )
+        {
+            isRcsInPath = false;
+            log.info( "RCS must be installed and in path in order to execute 
the tests." );
+            log.info( "Hence, execution of RCSFileProviderTest will be 
disabled" );
+        }
     }
 
     /**
@@ -75,21 +111,24 @@ public class RCSFileProviderTest extends
     public void testMillionChanges()
         throws Exception
     {
-        String text = "";
-        String name = NAME1;
-        int    maxver = 100; // Save 100 versions.
-
-        for( int i = 0; i < maxver; i++ )
+        if( isRcsInPath ) 
         {
-            text = text + ".";
-            engine.saveText( name, text );
+            String text = "";
+            String name = NAME1;
+            int    maxver = 100; // Save 100 versions.
+
+            for( int i = 0; i < maxver; i++ )
+            {
+                text = text + ".";
+                engine.saveText( name, text );
+            }
+
+            WikiPage pageinfo = engine.getPage( NAME1 );
+
+            assertEquals( "wrong version", maxver, pageinfo.getVersion() );
+            // +2 comes from \r\n at the end of each file.
+            assertEquals( "wrong text", maxver+2, 
engine.getText(NAME1).length() );
         }
-
-        WikiPage pageinfo = engine.getPage( NAME1 );
-
-        assertEquals( "wrong version", maxver, pageinfo.getVersion() );
-        // +2 comes from \r\n at the end of each file.
-        assertEquals( "wrong text", maxver+2, engine.getText(NAME1).length() );
     }
 
     /**
@@ -99,138 +138,162 @@ public class RCSFileProviderTest extends
     public void testMigration()
         throws IOException
     {
-        String files = props.getProperty( FileSystemProvider.PROP_PAGEDIR );
-        
-        File f = new File( files, NAME1+FileSystemProvider.FILE_EXT );
+        if( isRcsInPath )
+        {
+            String files = props.getProperty( FileSystemProvider.PROP_PAGEDIR 
);
+            
+            File f = new File( files, NAME1+FileSystemProvider.FILE_EXT );
 
-        Writer out = new FileWriter( f );
-        FileUtil.copyContents( new StringReader("foobar"), out );
-        out.close();
+            Writer out = new FileWriter( f );
+            FileUtil.copyContents( new StringReader("foobar"), out );
+            out.close();
 
-        String res = engine.getText( NAME1 );
+            String res = engine.getText( NAME1 );
 
-        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( NAME1, 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 );
+        }
     }
 
     public void testGetByVersion()
         throws Exception
     {
-        String text = "diddo\r\n";
+        if( isRcsInPath ) 
+        {
+            String text = "diddo\r\n";
 
-        engine.saveText( NAME1, text );
+            engine.saveText( NAME1, text );
 
-        WikiPage page = engine.getPage( NAME1, 1 );
-       
-        assertEquals( "name", NAME1, page.getName() );
-        assertEquals( "version", 1, page.getVersion() );
+            WikiPage page = engine.getPage( NAME1, 1 );
+           
+            assertEquals( "name", NAME1, page.getName() );
+            assertEquals( "version", 1, page.getVersion() );
+        }
+        
     }
 
     public void testGetByLatestVersion()
         throws Exception
     {
-        String text = "diddo\r\n";
+        if( isRcsInPath ) 
+        {
+            String text = "diddo\r\n";
 
-        engine.saveText( NAME1, text );
+            engine.saveText( NAME1, text );
 
-        WikiPage page = engine.getPage( NAME1, WikiProvider.LATEST_VERSION );
-       
-        assertEquals( "name", NAME1, page.getName() );
-        assertEquals( "version", 1, page.getVersion() );
+            WikiPage page = engine.getPage( NAME1, WikiProvider.LATEST_VERSION 
);
+           
+            assertEquals( "name", NAME1, page.getName() );
+            assertEquals( "version", 1, page.getVersion() );
+        }
     }
 
     public void testDelete()
         throws Exception
     {
-        engine.saveText( NAME1, "v1" );
-        engine.saveText( NAME1, "v2" );
-        engine.saveText( NAME1, "v3" );
+        if( isRcsInPath )
+        {
+            engine.saveText( NAME1, "v1" );
+            engine.saveText( NAME1, "v2" );
+            engine.saveText( NAME1, "v3" );
 
-        PageManager mgr = engine.getPageManager();
-        WikiPageProvider provider = mgr.getProvider();
+            PageManager mgr = engine.getPageManager();
+            WikiPageProvider provider = mgr.getProvider();
 
-        provider.deletePage( NAME1 );
+            provider.deletePage( NAME1 );
 
-        String files = props.getProperty( FileSystemProvider.PROP_PAGEDIR );
+            String files = props.getProperty( FileSystemProvider.PROP_PAGEDIR 
);
 
-        File f = new File( files, NAME1+FileSystemProvider.FILE_EXT );
+            File f = new File( files, NAME1+FileSystemProvider.FILE_EXT );
 
-        assertFalse( "file exists", f.exists() );
+            assertFalse( "file exists", f.exists() );
 
-        f = new File( files+File.separator+"RCS", 
NAME1+FileSystemProvider.FILE_EXT+",v" );
+            f = new File( files+File.separator+"RCS", 
NAME1+FileSystemProvider.FILE_EXT+",v" );
 
-        assertFalse( "RCS file exists", f.exists() );
+            assertFalse( "RCS file exists", f.exists() );
+        }
     }
 
     public void testDeleteVersion()
         throws Exception
     {
-        engine.saveText( NAME1, "v1\r\n" );
-        engine.saveText( NAME1, "v2\r\n" );
-        engine.saveText( NAME1, "v3\r\n" );
-
-        PageManager mgr = engine.getPageManager();
-        WikiPageProvider provider = mgr.getProvider();
-
-        provider.deleteVersion( NAME1, 2 );
-
-        List l = provider.getVersionHistory( NAME1 );
-
-        assertEquals( "wrong # of versions", 2, l.size() );
-
-        assertEquals( "v1", "v1\r\n", provider.getPageText( NAME1, 1 ) );
-        assertEquals( "v3", "v3\r\n", provider.getPageText( NAME1, 3 ) );
-
-        try
-        {
-            provider.getPageText( NAME1, 2 );
-            fail( "v2" );
-        }
-        catch( NoSuchVersionException e )
+        if( isRcsInPath ) 
         {
-            // This is expected
+            engine.saveText( NAME1, "v1\r\n" );
+            engine.saveText( NAME1, "v2\r\n" );
+            engine.saveText( NAME1, "v3\r\n" );
+
+            PageManager mgr = engine.getPageManager();
+            WikiPageProvider provider = mgr.getProvider();
+
+            provider.deleteVersion( NAME1, 2 );
+
+            List l = provider.getVersionHistory( NAME1 );
+
+            assertEquals( "wrong # of versions", 2, l.size() );
+
+            assertEquals( "v1", "v1\r\n", provider.getPageText( NAME1, 1 ) );
+            assertEquals( "v3", "v3\r\n", provider.getPageText( NAME1, 3 ) );
+
+            try
+            {
+                provider.getPageText( NAME1, 2 );
+                fail( "v2" );
+            }
+            catch( NoSuchVersionException e )
+            {
+                // This is expected
+            }
         }
     }
 
     public void testChangeNote()
         throws Exception
     {
-        WikiPage p = new WikiPage( engine, NAME1 );
-        p.setAttribute(WikiPage.CHANGENOTE, "Test change" );
-        WikiContext context = new WikiContext(engine,p);
-        
-        engine.saveText( context, "test" );
-        
-        WikiPage p2 = engine.getPage( NAME1 );
-        
-        assertEquals( "Test change", p2.getAttribute(WikiPage.CHANGENOTE) );
+        if( isRcsInPath )
+        {
+            WikiPage p = new WikiPage( engine, NAME1 );
+            p.setAttribute(WikiPage.CHANGENOTE, "Test change" );
+            WikiContext context = new WikiContext(engine,p);
+            
+            engine.saveText( context, "test" );
+            
+            WikiPage p2 = engine.getPage( NAME1 );
+            
+            assertEquals( "Test change", p2.getAttribute(WikiPage.CHANGENOTE) 
);
+        }
     }
 
     public void testChangeNoteOldVersion()
         throws Exception
     {
-        WikiPage p = new WikiPage( engine, NAME1 );
-        WikiContext context = new WikiContext(engine,p);
-
-        context.getPage().setAttribute(WikiPage.CHANGENOTE, "Test change" );
-        engine.saveText( context, "test" );
-        
-        context.getPage().setAttribute(WikiPage.CHANGENOTE, "Change 2" );
-        engine.saveText( context, "test2" );
-
-        WikiPage p2 = engine.getPage( NAME1, 1 );
-        
-        assertEquals( "Test change", p2.getAttribute(WikiPage.CHANGENOTE) );
+        if( isRcsInPath )
+        {
+            WikiPage p = new WikiPage( engine, NAME1 );
+            WikiContext context = new WikiContext(engine,p);
 
-        WikiPage p3 = engine.getPage( NAME1, 2 );
-        
-        assertEquals( "Change 2", p3.getAttribute(WikiPage.CHANGENOTE) );
+            context.getPage().setAttribute(WikiPage.CHANGENOTE, "Test change" 
);
+            engine.saveText( context, "test" );
+            
+            context.getPage().setAttribute(WikiPage.CHANGENOTE, "Change 2" );
+            engine.saveText( context, "test2" );
+
+            WikiPage p2 = engine.getPage( NAME1, 1 );
+            
+            assertEquals( "Test change", p2.getAttribute(WikiPage.CHANGENOTE) 
);
+
+            WikiPage p3 = engine.getPage( NAME1, 2 );
+            
+            assertEquals( "Change 2", p3.getAttribute(WikiPage.CHANGENOTE) );
+        }
     }
+    
     public static Test suite()
     {
         return new TestSuite( RCSFileProviderTest.class );
     }
+    
 }


Reply via email to