You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by me...@apache.org on 2012/12/02 18:49:21 UTC
svn commit: r1416207 - in /incubator/jspwiki/trunk: ./ src/org/apache/wiki/
tests/org/apache/wiki/ tests/org/apache/wiki/attachment/
tests/org/apache/wiki/content/ tests/org/apache/wiki/dav/
tests/org/apache/wiki/parser/ tests/org/apache/wiki/plugin/ t...
Author: metskem
Date: Sun Dec 2 17:49:19 2012
New Revision: 1416207
URL: http://svn.apache.org/viewvc?rev=1416207&view=rev
Log:
2012-12-02 Harry Metske <me...@apache.org>
* 2.9.1-svn-2
* fixed JSPWIKI-753 Consolidate TestEngine.deleteTestPage to single, non-static method (thanks to Glen Mazza)
Modified:
incubator/jspwiki/trunk/ChangeLog
incubator/jspwiki/trunk/src/org/apache/wiki/Release.java
incubator/jspwiki/trunk/tests/org/apache/wiki/TestEngine.java
incubator/jspwiki/trunk/tests/org/apache/wiki/attachment/AttachmentManagerTest.java
incubator/jspwiki/trunk/tests/org/apache/wiki/content/PageRenamerTest.java
incubator/jspwiki/trunk/tests/org/apache/wiki/dav/AttachmentDavProviderTest.java
incubator/jspwiki/trunk/tests/org/apache/wiki/dav/HTMLPagesDavProviderTest.java
incubator/jspwiki/trunk/tests/org/apache/wiki/dav/RawPagesDavProviderTest.java
incubator/jspwiki/trunk/tests/org/apache/wiki/parser/JSPWikiMarkupParserTest.java
incubator/jspwiki/trunk/tests/org/apache/wiki/plugin/InsertPageTest.java
incubator/jspwiki/trunk/tests/org/apache/wiki/plugin/PageViewPluginTest.java
incubator/jspwiki/trunk/tests/org/apache/wiki/plugin/RecentChangesPluginTest.java
incubator/jspwiki/trunk/tests/org/apache/wiki/plugin/ReferringPagesPluginTest.java
incubator/jspwiki/trunk/tests/org/apache/wiki/plugin/UndefinedPagesPluginTest.java
incubator/jspwiki/trunk/tests/org/apache/wiki/providers/BasicAttachmentProviderTest.java
incubator/jspwiki/trunk/tests/org/apache/wiki/providers/CachingProviderTest.java
incubator/jspwiki/trunk/tests/org/apache/wiki/render/WysiwygEditingRendererTest.java
incubator/jspwiki/trunk/tests/org/apache/wiki/search/SearchManagerTest.java
incubator/jspwiki/trunk/tests/org/apache/wiki/xmlrpc/RPCHandlerTest.java
Modified: incubator/jspwiki/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=1416207&r1=1416206&r2=1416207&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Sun Dec 2 17:49:19 2012
@@ -1,5 +1,11 @@
2012-12-02 Harry Metske <me...@apache.org>
+ * 2.9.1-svn-2
+
+ * fixed JSPWIKI-753 Consolidate TestEngine.deleteTestPage to single, non-static method (thanks to Glen Mazza)
+
+2012-12-02 Harry Metske <me...@apache.org>
+
* 2.9.1-svn-1
* fixed JSPWIKI-665 Page View Plugin and page renames and deletions (thanks to Glen Mazza)
Modified: incubator/jspwiki/trunk/src/org/apache/wiki/Release.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/Release.java?rev=1416207&r1=1416206&r2=1416207&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/Release.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/Release.java Sun Dec 2 17:49:19 2012
@@ -64,7 +64,7 @@ public final class Release
public static final int REVISION = 9;
/** The minor revision. */
- public static final int MINORREVISION = 1;
+ public static final int MINORREVISION = 2;
/** The build number/identifier. This is a String as opposed to an integer, just
* so that people can add other identifiers to it. The build number is incremented
Modified: incubator/jspwiki/trunk/tests/org/apache/wiki/TestEngine.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/org/apache/wiki/TestEngine.java?rev=1416207&r1=1416206&r2=1416207&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/org/apache/wiki/TestEngine.java (original)
+++ incubator/jspwiki/trunk/tests/org/apache/wiki/TestEngine.java Sun Dec 2 17:49:19 2012
@@ -227,38 +227,7 @@ public class TestEngine extends WikiEngi
* Removes a page, but not any auxiliary information. Works only
* with FileSystemProvider.
*/
- public static void deleteTestPage( 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 );
- }
- 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 )
+ public void deleteTestPage( String name )
{
Properties properties = new Properties();
Modified: incubator/jspwiki/trunk/tests/org/apache/wiki/attachment/AttachmentManagerTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/org/apache/wiki/attachment/AttachmentManagerTest.java?rev=1416207&r1=1416206&r2=1416207&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/org/apache/wiki/attachment/AttachmentManagerTest.java (original)
+++ incubator/jspwiki/trunk/tests/org/apache/wiki/attachment/AttachmentManagerTest.java Sun Dec 2 17:49:19 2012
@@ -73,8 +73,8 @@ public class AttachmentManagerTest exten
public void tearDown()
{
- TestEngine.deleteTestPage( NAME1 );
- TestEngine.deleteTestPage( NAMEU );
+ m_engine.deleteTestPage( NAME1 );
+ m_engine.deleteTestPage( NAMEU );
TestEngine.deleteAttachments(NAME1);
TestEngine.deleteAttachments(NAMEU);
Modified: incubator/jspwiki/trunk/tests/org/apache/wiki/content/PageRenamerTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/org/apache/wiki/content/PageRenamerTest.java?rev=1416207&r1=1416206&r2=1416207&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/org/apache/wiki/content/PageRenamerTest.java (original)
+++ incubator/jspwiki/trunk/tests/org/apache/wiki/content/PageRenamerTest.java Sun Dec 2 17:49:19 2012
@@ -50,22 +50,22 @@ public class PageRenamerTest extends Tes
{
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();
}
Modified: incubator/jspwiki/trunk/tests/org/apache/wiki/dav/AttachmentDavProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/org/apache/wiki/dav/AttachmentDavProviderTest.java?rev=1416207&r1=1416206&r2=1416207&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/org/apache/wiki/dav/AttachmentDavProviderTest.java (original)
+++ incubator/jspwiki/trunk/tests/org/apache/wiki/dav/AttachmentDavProviderTest.java Sun Dec 2 17:49:19 2012
@@ -49,7 +49,7 @@ public class AttachmentDavProviderTest e
protected void tearDown() throws Exception
{
TestEngine.deleteAttachments( "TestPage" );
- TestEngine.deleteTestPage("TestPage");
+ engine.deleteTestPage("TestPage");
}
public void testGetPageURL()
Modified: incubator/jspwiki/trunk/tests/org/apache/wiki/dav/HTMLPagesDavProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/org/apache/wiki/dav/HTMLPagesDavProviderTest.java?rev=1416207&r1=1416206&r2=1416207&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/org/apache/wiki/dav/HTMLPagesDavProviderTest.java (original)
+++ incubator/jspwiki/trunk/tests/org/apache/wiki/dav/HTMLPagesDavProviderTest.java Sun Dec 2 17:49:19 2012
@@ -48,7 +48,7 @@ public class HTMLPagesDavProviderTest ex
protected void tearDown() throws Exception
{
- TestEngine.deleteTestPage("TestPage");
+ engine.deleteTestPage("TestPage");
}
public void testGetPageURL()
Modified: incubator/jspwiki/trunk/tests/org/apache/wiki/dav/RawPagesDavProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/org/apache/wiki/dav/RawPagesDavProviderTest.java?rev=1416207&r1=1416206&r2=1416207&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/org/apache/wiki/dav/RawPagesDavProviderTest.java (original)
+++ incubator/jspwiki/trunk/tests/org/apache/wiki/dav/RawPagesDavProviderTest.java Sun Dec 2 17:49:19 2012
@@ -47,7 +47,7 @@ public class RawPagesDavProviderTest ext
protected void tearDown() throws Exception
{
- TestEngine.deleteTestPage("TestPage");
+ engine.deleteTestPage("TestPage");
}
public void testGetPageURL()
Modified: incubator/jspwiki/trunk/tests/org/apache/wiki/parser/JSPWikiMarkupParserTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/org/apache/wiki/parser/JSPWikiMarkupParserTest.java?rev=1416207&r1=1416206&r2=1416207&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/org/apache/wiki/parser/JSPWikiMarkupParserTest.java (original)
+++ incubator/jspwiki/trunk/tests/org/apache/wiki/parser/JSPWikiMarkupParserTest.java Sun Dec 2 17:49:19 2012
@@ -82,7 +82,7 @@ public class JSPWikiMarkupParserTest ext
{
String name = i.next();
- TestEngine.deleteTestPage(name);
+ testEngine.deleteTestPage(name);
TestEngine.deleteAttachments(name);
}
Modified: incubator/jspwiki/trunk/tests/org/apache/wiki/plugin/InsertPageTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/org/apache/wiki/plugin/InsertPageTest.java?rev=1416207&r1=1416206&r2=1416207&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/org/apache/wiki/plugin/InsertPageTest.java (original)
+++ incubator/jspwiki/trunk/tests/org/apache/wiki/plugin/InsertPageTest.java Sun Dec 2 17:49:19 2012
@@ -40,11 +40,11 @@ public class InsertPageTest extends Test
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
Modified: incubator/jspwiki/trunk/tests/org/apache/wiki/plugin/PageViewPluginTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/org/apache/wiki/plugin/PageViewPluginTest.java?rev=1416207&r1=1416206&r2=1416207&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/org/apache/wiki/plugin/PageViewPluginTest.java (original)
+++ incubator/jspwiki/trunk/tests/org/apache/wiki/plugin/PageViewPluginTest.java Sun Dec 2 17:49:19 2012
@@ -59,9 +59,9 @@ public class PageViewPluginTest extends
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 @@ public class PageViewPluginTest extends
// 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 @@ public class PageViewPluginTest extends
assertFalse( result.contains( "Test Page 04" ) );
- testEngine.nonStaticDeleteTestPage( "TestPage03" );
- testEngine.nonStaticDeleteTestPage( "TestPage04" );
+ testEngine.deleteTestPage( "TestPage03" );
+ testEngine.deleteTestPage( "TestPage04" );
}
}
Modified: incubator/jspwiki/trunk/tests/org/apache/wiki/plugin/RecentChangesPluginTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/org/apache/wiki/plugin/RecentChangesPluginTest.java?rev=1416207&r1=1416206&r2=1416207&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/org/apache/wiki/plugin/RecentChangesPluginTest.java (original)
+++ incubator/jspwiki/trunk/tests/org/apache/wiki/plugin/RecentChangesPluginTest.java Sun Dec 2 17:49:19 2012
@@ -35,7 +35,7 @@ public class RecentChangesPluginTest ext
{
Properties props = new Properties();
-TestEngine engine;
+TestEngine testEngine;
WikiContext context;
@@ -45,20 +45,20 @@ public void setUp() throws Exception
{
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 tearDown()
*/
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 testSimple() throws Exceptio
*/
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 testParmInClude() throws Exc
*/
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*'}" );
Modified: incubator/jspwiki/trunk/tests/org/apache/wiki/plugin/ReferringPagesPluginTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/org/apache/wiki/plugin/ReferringPagesPluginTest.java?rev=1416207&r1=1416206&r2=1416207&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/org/apache/wiki/plugin/ReferringPagesPluginTest.java (original)
+++ incubator/jspwiki/trunk/tests/org/apache/wiki/plugin/ReferringPagesPluginTest.java Sun Dec 2 17:49:19 2012
@@ -65,14 +65,14 @@ public class ReferringPagesPluginTest ex
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 )
Modified: incubator/jspwiki/trunk/tests/org/apache/wiki/plugin/UndefinedPagesPluginTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/org/apache/wiki/plugin/UndefinedPagesPluginTest.java?rev=1416207&r1=1416206&r2=1416207&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/org/apache/wiki/plugin/UndefinedPagesPluginTest.java (original)
+++ incubator/jspwiki/trunk/tests/org/apache/wiki/plugin/UndefinedPagesPluginTest.java Sun Dec 2 17:49:19 2012
@@ -32,7 +32,7 @@ import org.apache.wiki.WikiPage;
public class UndefinedPagesPluginTest extends TestCase
{
Properties props = new Properties();
- TestEngine engine;
+ TestEngine testEngine;
WikiContext context;
PluginManager manager;
@@ -46,36 +46,36 @@ public class UndefinedPagesPluginTest ex
{
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");
Modified: incubator/jspwiki/trunk/tests/org/apache/wiki/providers/BasicAttachmentProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/org/apache/wiki/providers/BasicAttachmentProviderTest.java?rev=1416207&r1=1416206&r2=1416207&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/org/apache/wiki/providers/BasicAttachmentProviderTest.java (original)
+++ incubator/jspwiki/trunk/tests/org/apache/wiki/providers/BasicAttachmentProviderTest.java Sun Dec 2 17:49:19 2012
@@ -94,8 +94,8 @@ public class BasicAttachmentProviderTest
public void tearDown()
{
- TestEngine.deleteTestPage( NAME1 );
- TestEngine.deleteTestPage( NAME2 );
+ m_engine.deleteTestPage( NAME1 );
+ m_engine.deleteTestPage( NAME2 );
String tmpfiles = props.getProperty( BasicAttachmentProvider.PROP_STORAGEDIR );
Modified: incubator/jspwiki/trunk/tests/org/apache/wiki/providers/CachingProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/org/apache/wiki/providers/CachingProviderTest.java?rev=1416207&r1=1416206&r2=1416207&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/org/apache/wiki/providers/CachingProviderTest.java (original)
+++ incubator/jspwiki/trunk/tests/org/apache/wiki/providers/CachingProviderTest.java Sun Dec 2 17:49:19 2012
@@ -33,6 +33,8 @@ import org.apache.wiki.*;
public class CachingProviderTest extends TestCase
{
+ protected TestEngine testEngine;
+
public CachingProviderTest( String s )
{
super( s );
@@ -44,15 +46,15 @@ public class CachingProviderTest extends
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");
}
/**
Modified: incubator/jspwiki/trunk/tests/org/apache/wiki/render/WysiwygEditingRendererTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/org/apache/wiki/render/WysiwygEditingRendererTest.java?rev=1416207&r1=1416206&r2=1416207&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/org/apache/wiki/render/WysiwygEditingRendererTest.java (original)
+++ incubator/jspwiki/trunk/tests/org/apache/wiki/render/WysiwygEditingRendererTest.java Sun Dec 2 17:49:19 2012
@@ -34,29 +34,29 @@ import org.apache.wiki.parser.WikiDocume
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);
Modified: incubator/jspwiki/trunk/tests/org/apache/wiki/search/SearchManagerTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/org/apache/wiki/search/SearchManagerTest.java?rev=1416207&r1=1416206&r2=1416207&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/org/apache/wiki/search/SearchManagerTest.java (original)
+++ incubator/jspwiki/trunk/tests/org/apache/wiki/search/SearchManagerTest.java Sun Dec 2 17:49:19 2012
@@ -57,7 +57,7 @@ public class SearchManagerTest extends T
{
super.tearDown();
- TestEngine.deleteTestPage("TestPage");
+ m_engine.deleteTestPage("TestPage");
}
public void testDefaultProvider()
Modified: incubator/jspwiki/trunk/tests/org/apache/wiki/xmlrpc/RPCHandlerTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/org/apache/wiki/xmlrpc/RPCHandlerTest.java?rev=1416207&r1=1416206&r2=1416207&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/org/apache/wiki/xmlrpc/RPCHandlerTest.java (original)
+++ incubator/jspwiki/trunk/tests/org/apache/wiki/xmlrpc/RPCHandlerTest.java Sun Dec 2 17:49:19 2012
@@ -54,7 +54,7 @@ public class RPCHandlerTest extends Test
public void tearDown()
{
- TestEngine.deleteTestPage( NAME1 );
+ m_engine.deleteTestPage( NAME1 );
TestEngine.deleteAttachments( NAME1 );
TestEngine.emptyWorkDir();
}