Index: tests/org/apache/wiki/TestEngine.java =================================================================== --- tests/org/apache/wiki/TestEngine.java (revision 1416171) +++ tests/org/apache/wiki/TestEngine.java (working copy) @@ -227,7 +227,7 @@ * Removes a page, but not any auxiliary information. Works only * with FileSystemProvider. */ - public static void deleteTestPage( String name ) + public void deleteTestPage( String name ) { Properties properties = new Properties(); @@ -247,37 +247,6 @@ f.delete(); deleteAttachments( name ); - } - catch( Exception e ) - { - log.error("Couldn't delete "+name, e ); - } - } - - /** - * Removes a page, but not any auxiliary information. Works only - * with FileSystemProvider. - */ - public void nonStaticDeleteTestPage( String name ) - { - Properties properties = new Properties(); - - try - { - properties.load( findTestProperties() ); - String files = properties.getProperty( FileSystemProvider.PROP_PAGEDIR ); - - File f = new File( files, mangleName(name)+FileSystemProvider.FILE_EXT ); - - f.delete(); - - // Remove the property file, too - f = new File( files, mangleName(name)+".properties" ); - - if( f.exists() ) - f.delete(); - - deleteAttachments( name ); firePageEvent( WikiPageEvent.PAGE_DELETED, name ); } catch( Exception e ) Index: tests/org/apache/wiki/attachment/AttachmentManagerTest.java =================================================================== --- tests/org/apache/wiki/attachment/AttachmentManagerTest.java (revision 1416171) +++ tests/org/apache/wiki/attachment/AttachmentManagerTest.java (working copy) @@ -73,8 +73,8 @@ public void tearDown() { - TestEngine.deleteTestPage( NAME1 ); - TestEngine.deleteTestPage( NAMEU ); + m_engine.deleteTestPage( NAME1 ); + m_engine.deleteTestPage( NAMEU ); TestEngine.deleteAttachments(NAME1); TestEngine.deleteAttachments(NAMEU); Index: tests/org/apache/wiki/plugin/UndefinedPagesPluginTest.java =================================================================== --- tests/org/apache/wiki/plugin/UndefinedPagesPluginTest.java (revision 1416171) +++ tests/org/apache/wiki/plugin/UndefinedPagesPluginTest.java (working copy) @@ -32,7 +32,7 @@ public class UndefinedPagesPluginTest extends TestCase { Properties props = new Properties(); - TestEngine engine; + TestEngine testEngine; WikiContext context; PluginManager manager; @@ -46,36 +46,36 @@ { props.load( TestEngine.findTestProperties() ); - engine = new TestEngine(props); + testEngine = new TestEngine(props); - engine.saveText( "TestPage", "Reference to [Foobar]." ); - engine.saveText( "Foobar", "Reference to [Foobar 2], [Foobars]" ); + testEngine.saveText( "TestPage", "Reference to [Foobar]." ); + testEngine.saveText( "Foobar", "Reference to [Foobar 2], [Foobars]" ); - context = new WikiContext( engine, new WikiPage(engine, "TestPage") ); - manager = new PluginManager( engine, props ); + context = new WikiContext( testEngine, new WikiPage(testEngine, "TestPage") ); + manager = new PluginManager( testEngine, props ); } public void tearDown() { - TestEngine.deleteTestPage( "TestPage" ); - TestEngine.deleteTestPage( "Foobar" ); + testEngine.deleteTestPage( "TestPage" ); + testEngine.deleteTestPage( "Foobar" ); TestEngine.emptyWorkDir(); } private String wikitize( String s ) { - return engine.textToHTML( context, s ); + return testEngine.textToHTML( context, s ); } /** * Tests that only correct undefined links are found. * We also check against plural forms here, which should not - * be listed as non-existant. + * be listed as non-existent. */ public void testSimpleUndefined() throws Exception { - WikiContext context2 = new WikiContext( engine, new WikiPage(engine, "Foobar") ); + WikiContext context2 = new WikiContext( testEngine, new WikiPage(testEngine, "Foobar") ); String res = manager.execute( context2, "{INSERT org.apache.wiki.plugin.UndefinedPagesPlugin"); Index: tests/org/apache/wiki/plugin/InsertPageTest.java =================================================================== --- tests/org/apache/wiki/plugin/InsertPageTest.java (revision 1416171) +++ tests/org/apache/wiki/plugin/InsertPageTest.java (working copy) @@ -40,11 +40,11 @@ protected void tearDown() throws Exception { - TestEngine.deleteTestPage( "ThisPage" ); - TestEngine.deleteTestPage( "ThisPage2" ); - TestEngine.deleteTestPage( "Test_Page" ); - TestEngine.deleteTestPage( "TestPage" ); - TestEngine.deleteTestPage( "Test Page" ); + testEngine.deleteTestPage( "ThisPage" ); + testEngine.deleteTestPage( "ThisPage2" ); + testEngine.deleteTestPage( "Test_Page" ); + testEngine.deleteTestPage( "TestPage" ); + testEngine.deleteTestPage( "Test Page" ); } public void testRecursive() throws Exception Index: tests/org/apache/wiki/plugin/ReferringPagesPluginTest.java =================================================================== --- tests/org/apache/wiki/plugin/ReferringPagesPluginTest.java (revision 1416171) +++ tests/org/apache/wiki/plugin/ReferringPagesPluginTest.java (working copy) @@ -65,14 +65,14 @@ public void tearDown() { - TestEngine.deleteTestPage( "TestPage" ); - TestEngine.deleteTestPage( "Foobar" ); - TestEngine.deleteTestPage( "Foobar2" ); - TestEngine.deleteTestPage( "Foobar3" ); - TestEngine.deleteTestPage( "Foobar4" ); - TestEngine.deleteTestPage( "Foobar5" ); - TestEngine.deleteTestPage( "Foobar6" ); - TestEngine.deleteTestPage( "Foobar7" ); + engine.deleteTestPage( "TestPage" ); + engine.deleteTestPage( "Foobar" ); + engine.deleteTestPage( "Foobar2" ); + engine.deleteTestPage( "Foobar3" ); + engine.deleteTestPage( "Foobar4" ); + engine.deleteTestPage( "Foobar5" ); + engine.deleteTestPage( "Foobar6" ); + engine.deleteTestPage( "Foobar7" ); } private String mkLink( String page ) Index: tests/org/apache/wiki/plugin/PageViewPluginTest.java =================================================================== --- tests/org/apache/wiki/plugin/PageViewPluginTest.java (revision 1416171) +++ tests/org/apache/wiki/plugin/PageViewPluginTest.java (working copy) @@ -59,9 +59,9 @@ public void tearDown() { - testEngine.nonStaticDeleteTestPage( "TestPage01" ); - testEngine.nonStaticDeleteTestPage( "TestPage02" ); - testEngine.nonStaticDeleteTestPage( "PageViews" ); + testEngine.deleteTestPage( "TestPage01" ); + testEngine.deleteTestPage( "TestPage02" ); + testEngine.deleteTestPage( "PageViews" ); TestEngine.emptyWorkDir(); } @@ -121,7 +121,7 @@ // this page should not have been shown: assertFalse( result.contains( "Test Page Excluded" ) ); - testEngine.nonStaticDeleteTestPage( "TestPageExcluded" ); + testEngine.deleteTestPage( "TestPageExcluded" ); } public void testShowCountsSorted() throws Exception @@ -189,8 +189,8 @@ assertFalse( result.contains( "Test Page 04" ) ); - testEngine.nonStaticDeleteTestPage( "TestPage03" ); - testEngine.nonStaticDeleteTestPage( "TestPage04" ); + testEngine.deleteTestPage( "TestPage03" ); + testEngine.deleteTestPage( "TestPage04" ); } } Index: tests/org/apache/wiki/plugin/RecentChangesPluginTest.java =================================================================== --- tests/org/apache/wiki/plugin/RecentChangesPluginTest.java (revision 1416171) +++ tests/org/apache/wiki/plugin/RecentChangesPluginTest.java (working copy) @@ -35,7 +35,7 @@ { Properties props = new Properties(); -TestEngine engine; +TestEngine testEngine; WikiContext context; @@ -45,20 +45,20 @@ { props.load( TestEngine.findTestProperties() ); - engine = new TestEngine( props ); + testEngine = new TestEngine( props ); - engine.saveText( "TestPage01", "Some Text for testing 01" ); - engine.saveText( "TestPage02", "Some Text for testing 02" ); - engine.saveText( "TestPage03", "Some Text for testing 03" ); + testEngine.saveText( "TestPage01", "Some Text for testing 01" ); + testEngine.saveText( "TestPage02", "Some Text for testing 02" ); + testEngine.saveText( "TestPage03", "Some Text for testing 03" ); - manager = new PluginManager( engine, props ); + manager = new PluginManager( testEngine, props ); } public void tearDown() { - TestEngine.deleteTestPage( "TestPage01" ); - TestEngine.deleteTestPage( "TestPage02" ); - TestEngine.deleteTestPage( "TestPage03" ); + testEngine.deleteTestPage( "TestPage01" ); + testEngine.deleteTestPage( "TestPage02" ); + testEngine.deleteTestPage( "TestPage03" ); TestEngine.emptyWorkDir(); } @@ -70,7 +70,7 @@ */ public void testSimple() throws Exception { - context = new WikiContext( engine, new WikiPage(engine,"TestPage01") ); + context = new WikiContext( testEngine, new WikiPage(testEngine,"TestPage01") ); String res = manager.execute( context, "{INSERT org.apache.wiki.plugin.RecentChangesPlugin}" ); @@ -90,7 +90,7 @@ */ public void testParmInClude() throws Exception { - context = new WikiContext( engine, new WikiPage(engine,"TestPage02") ); + context = new WikiContext( testEngine, new WikiPage(testEngine,"TestPage02") ); String res = manager.execute( context, "{INSERT org.apache.wiki.plugin.RecentChangesPlugin include='TestPage02*'}" ); @@ -109,7 +109,7 @@ */ public void testParmExClude() throws Exception { - context = new WikiContext( engine, new WikiPage(engine,"TestPage03") ); + context = new WikiContext( testEngine, new WikiPage(testEngine,"TestPage03") ); String res = manager.execute( context, "{INSERT org.apache.wiki.plugin.RecentChangesPlugin exclude='TestPage03*'}" ); Index: tests/org/apache/wiki/xmlrpc/RPCHandlerTest.java =================================================================== --- tests/org/apache/wiki/xmlrpc/RPCHandlerTest.java (revision 1416171) +++ tests/org/apache/wiki/xmlrpc/RPCHandlerTest.java (working copy) @@ -54,7 +54,7 @@ public void tearDown() { - TestEngine.deleteTestPage( NAME1 ); + m_engine.deleteTestPage( NAME1 ); TestEngine.deleteAttachments( NAME1 ); TestEngine.emptyWorkDir(); } Index: tests/org/apache/wiki/search/SearchManagerTest.java =================================================================== --- tests/org/apache/wiki/search/SearchManagerTest.java (revision 1416171) +++ tests/org/apache/wiki/search/SearchManagerTest.java (working copy) @@ -57,7 +57,7 @@ { super.tearDown(); - TestEngine.deleteTestPage("TestPage"); + m_engine.deleteTestPage("TestPage"); } public void testDefaultProvider() Index: tests/org/apache/wiki/render/WysiwygEditingRendererTest.java =================================================================== --- tests/org/apache/wiki/render/WysiwygEditingRendererTest.java (revision 1416171) +++ tests/org/apache/wiki/render/WysiwygEditingRendererTest.java (working copy) @@ -34,29 +34,29 @@ public class WysiwygEditingRendererTest extends TestCase { - protected TestEngine m_testEngine; + protected TestEngine testEngine; protected void setUp() throws Exception { Properties props = new Properties(); props.load(TestEngine.findTestProperties()); - m_testEngine = new TestEngine(props); + testEngine = new TestEngine(props); super.setUp(); - m_testEngine.saveText( "WysiwygEditingRendererTest", "test page" ); - m_testEngine.saveText( "This Pagename Has Spaces", "This Pagename Has Spaces" ); + testEngine.saveText( "WysiwygEditingRendererTest", "test page" ); + testEngine.saveText( "This Pagename Has Spaces", "This Pagename Has Spaces" ); } public void tearDown() { - TestEngine.deleteTestPage( "WysiwygEditingRendererTest" ); - TestEngine.deleteTestPage( "This Pagename Has Spaces" ); + testEngine.deleteTestPage( "WysiwygEditingRendererTest" ); + testEngine.deleteTestPage( "This Pagename Has Spaces" ); } private String render(String s) throws IOException { - WikiPage dummyPage = new WikiPage(m_testEngine,"TestPage"); - WikiContext ctx = new WikiContext(m_testEngine,dummyPage); + WikiPage dummyPage = new WikiPage(testEngine,"TestPage"); + WikiContext ctx = new WikiContext(testEngine,dummyPage); StringReader in = new StringReader(s); Index: tests/org/apache/wiki/parser/JSPWikiMarkupParserTest.java =================================================================== --- tests/org/apache/wiki/parser/JSPWikiMarkupParserTest.java (revision 1416171) +++ tests/org/apache/wiki/parser/JSPWikiMarkupParserTest.java (working copy) @@ -82,7 +82,7 @@ { String name = i.next(); - TestEngine.deleteTestPage(name); + testEngine.deleteTestPage(name); TestEngine.deleteAttachments(name); } Index: tests/org/apache/wiki/content/PageRenamerTest.java =================================================================== --- tests/org/apache/wiki/content/PageRenamerTest.java (revision 1416171) +++ tests/org/apache/wiki/content/PageRenamerTest.java (working copy) @@ -50,22 +50,22 @@ { super.tearDown(); - TestEngine.deleteTestPage("TestPage"); - TestEngine.deleteTestPage("TestPage2"); - TestEngine.deleteTestPage("FooTest"); - TestEngine.deleteTestPage("Test"); - TestEngine.deleteTestPage("CdauthNew"); - TestEngine.deleteTestPage("Cdauth"); - TestEngine.deleteTestPage("TestPageReferring"); - TestEngine.deleteTestPage("TestPageReferredNew"); - TestEngine.deleteTestPage("Main"); - TestEngine.deleteTestPage("Main8887"); - TestEngine.deleteTestPage("TestPage1234"); - TestEngine.deleteTestPage("TestPageReferred"); - TestEngine.deleteTestPage("RenameTest"); - TestEngine.deleteTestPage("Link one"); - TestEngine.deleteTestPage("Link uno"); - TestEngine.deleteTestPage("Link two"); + m_engine.deleteTestPage("TestPage"); + m_engine.deleteTestPage("TestPage2"); + m_engine.deleteTestPage("FooTest"); + m_engine.deleteTestPage("Test"); + m_engine.deleteTestPage("CdauthNew"); + m_engine.deleteTestPage("Cdauth"); + m_engine.deleteTestPage("TestPageReferring"); + m_engine.deleteTestPage("TestPageReferredNew"); + m_engine.deleteTestPage("Main"); + m_engine.deleteTestPage("Main8887"); + m_engine.deleteTestPage("TestPage1234"); + m_engine.deleteTestPage("TestPageReferred"); + m_engine.deleteTestPage("RenameTest"); + m_engine.deleteTestPage("Link one"); + m_engine.deleteTestPage("Link uno"); + m_engine.deleteTestPage("Link two"); TestEngine.emptyWorkDir(); } Index: tests/org/apache/wiki/dav/AttachmentDavProviderTest.java =================================================================== --- tests/org/apache/wiki/dav/AttachmentDavProviderTest.java (revision 1416171) +++ tests/org/apache/wiki/dav/AttachmentDavProviderTest.java (working copy) @@ -49,7 +49,7 @@ protected void tearDown() throws Exception { TestEngine.deleteAttachments( "TestPage" ); - TestEngine.deleteTestPage("TestPage"); + engine.deleteTestPage("TestPage"); } public void testGetPageURL() Index: tests/org/apache/wiki/dav/RawPagesDavProviderTest.java =================================================================== --- tests/org/apache/wiki/dav/RawPagesDavProviderTest.java (revision 1416171) +++ tests/org/apache/wiki/dav/RawPagesDavProviderTest.java (working copy) @@ -47,7 +47,7 @@ protected void tearDown() throws Exception { - TestEngine.deleteTestPage("TestPage"); + engine.deleteTestPage("TestPage"); } public void testGetPageURL() Index: tests/org/apache/wiki/dav/HTMLPagesDavProviderTest.java =================================================================== --- tests/org/apache/wiki/dav/HTMLPagesDavProviderTest.java (revision 1416171) +++ tests/org/apache/wiki/dav/HTMLPagesDavProviderTest.java (working copy) @@ -48,7 +48,7 @@ protected void tearDown() throws Exception { - TestEngine.deleteTestPage("TestPage"); + engine.deleteTestPage("TestPage"); } public void testGetPageURL() Index: tests/org/apache/wiki/providers/BasicAttachmentProviderTest.java =================================================================== --- tests/org/apache/wiki/providers/BasicAttachmentProviderTest.java (revision 1416171) +++ tests/org/apache/wiki/providers/BasicAttachmentProviderTest.java (working copy) @@ -94,8 +94,8 @@ public void tearDown() { - TestEngine.deleteTestPage( NAME1 ); - TestEngine.deleteTestPage( NAME2 ); + m_engine.deleteTestPage( NAME1 ); + m_engine.deleteTestPage( NAME2 ); String tmpfiles = props.getProperty( BasicAttachmentProvider.PROP_STORAGEDIR ); Index: tests/org/apache/wiki/providers/CachingProviderTest.java =================================================================== --- tests/org/apache/wiki/providers/CachingProviderTest.java (revision 1416171) +++ tests/org/apache/wiki/providers/CachingProviderTest.java (working copy) @@ -33,6 +33,8 @@ public class CachingProviderTest extends TestCase { + protected TestEngine testEngine; + public CachingProviderTest( String s ) { super( s ); @@ -44,15 +46,15 @@ TestEngine.emptyWorkDir(); Properties props2 = new Properties(); - props2.load( TestEngine.findTestProperties() ); + testEngine = new TestEngine(props2); PropertyConfigurator.configure(props2); } public void tearDown() { TestEngine.emptyWorkDir(); - TestEngine.deleteTestPage("Testi"); + testEngine.deleteTestPage("Testi"); } /**