This is an automated email from the ASF dual-hosted git repository. juanpablo pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/jspwiki.git
commit 1ec1151a07212fba3d6193c9c57e2bfe530eb2c3 Author: juanpablo <[email protected]> AuthorDate: Fri Jan 3 20:41:27 2020 +0100 JSPWIKI-120: move deletePage(..) and deleteVersion(..) methods from WikiEngine to PageManager also removed deletePage from TestEngine - was there to try to debug some nasty NPEs on tests but didn't end up being useful (NPEs probably due to objects being garbage collected on some ci nodes) --- .../src/main/java/org/apache/wiki/WikiEngine.java | 46 --------------------- .../org/apache/wiki/pages/DefaultPageManager.java | 47 +++++++++++++++++++--- .../java/org/apache/wiki/pages/PageManager.java | 28 +++++++------ .../src/test/java/org/apache/wiki/TestEngine.java | 9 ----- .../test/java/org/apache/wiki/WikiEngineTest.java | 14 +++---- .../wiki/attachment/AttachmentManagerTest.java | 21 +++++----- .../apache/wiki/auth/AuthorizationManagerTest.java | 10 ++--- .../java/org/apache/wiki/auth/UserManagerTest.java | 4 +- .../wiki/auth/acl/DefaultAclManagerTest.java | 4 +- .../wiki/plugin/DefaultPluginManagerTest.java | 21 ++++------ .../java/org/apache/wiki/plugin/GroupsTest.java | 21 ++-------- .../java/org/apache/wiki/plugin/IfPluginTest.java | 23 +++-------- .../apache/wiki/plugin/TableOfContentsTest.java | 17 ++------ .../org/apache/wiki/plugin/WeblogPluginTest.java | 13 +----- .../wiki/references/ReferenceManagerTest.java | 2 +- .../apache/wiki/render/RenderingManagerTest.java | 19 ++------- .../org/apache/wiki/ui/CommandResolverTest.java | 4 +- .../apache/wiki/workflow/ApprovalWorkflowTest.java | 17 ++++---- 18 files changed, 119 insertions(+), 201 deletions(-) diff --git a/jspwiki-main/src/main/java/org/apache/wiki/WikiEngine.java b/jspwiki-main/src/main/java/org/apache/wiki/WikiEngine.java index e8a322c..19a2eaa 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/WikiEngine.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/WikiEngine.java @@ -1835,52 +1835,6 @@ public class WikiEngine { } /** - * Deletes a page or an attachment completely, including all versions. If the page - * does not exist, does nothing. - * - * @param pageName The name of the page. - * @throws ProviderException If something goes wrong. - */ - public void deletePage( final String pageName ) throws ProviderException { - final WikiPage p = getPage( pageName ); - if( p != null ) { - if( p instanceof Attachment ) { - m_attachmentManager.deleteAttachment( ( Attachment )p ); - } else { - final Collection< String > refTo = m_referenceManager.findRefersTo( pageName ); - // May return null, if the page does not exist or has not been indexed yet. - - if( m_attachmentManager.hasAttachments( p ) ) { - final List< Attachment > attachments = m_attachmentManager.listAttachments( p ); - for( final Attachment attachment : attachments ) { - if( refTo != null ) { - refTo.remove( attachment.getName() ); - } - - m_attachmentManager.deleteAttachment( attachment ); - } - } - m_pageManager.deletePage( p ); - firePageEvent( WikiPageEvent.PAGE_DELETED, pageName ); - } - } - } - - /** - * Deletes a specific version of a page or an attachment. - * - * @param page The page object. - * @throws ProviderException If something goes wrong. - */ - public void deleteVersion( final WikiPage page ) throws ProviderException { - if( page instanceof Attachment ) { - m_attachmentManager.deleteVersion( (Attachment) page ); - } else { - m_pageManager.deleteVersion( page ); - } - } - - /** * Returns the URL of the global RSS file. May be null, if the * RSS file generation is not operational. * @since 1.7.10 diff --git a/jspwiki-main/src/main/java/org/apache/wiki/pages/DefaultPageManager.java b/jspwiki-main/src/main/java/org/apache/wiki/pages/DefaultPageManager.java index c1d9c16..e4f97b9 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/pages/DefaultPageManager.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/pages/DefaultPageManager.java @@ -27,6 +27,7 @@ import org.apache.wiki.WikiProvider; import org.apache.wiki.api.exceptions.NoRequiredPropertyException; import org.apache.wiki.api.exceptions.ProviderException; import org.apache.wiki.api.exceptions.WikiException; +import org.apache.wiki.attachment.Attachment; import org.apache.wiki.auth.WikiPrincipal; import org.apache.wiki.auth.WikiSecurityException; import org.apache.wiki.auth.acl.Acl; @@ -363,18 +364,52 @@ public class DefaultPageManager extends ModuleManager implements PageManager { return m_provider.pageExists(pageName, version); } - /* (non-Javadoc) + /** + * {@inheritDoc} * @see org.apache.wiki.pages.PageManager#deleteVersion(org.apache.wiki.WikiPage) */ @Override - public void deleteVersion(WikiPage page) throws ProviderException { - m_provider.deleteVersion(page.getName(), page.getVersion()); + public void deleteVersion( final WikiPage page ) throws ProviderException { + if( page instanceof Attachment ) { + m_engine.getAttachmentManager().deleteVersion( (Attachment) page ); + } else { + m_provider.deleteVersion(page.getName(), page.getVersion()); + // FIXME: If this was the latest, reindex Lucene + // FIXME: Update RefMgr + } + } - // FIXME: If this was the latest, reindex Lucene - // FIXME: Update RefMgr + /** + * {@inheritDoc} + * @see org.apache.wiki.pages.PageManager#deletePage(java.lang.String) + */ + public void deletePage( final String pageName ) throws ProviderException { + final WikiPage p = m_engine.getPage( pageName ); + if( p != null ) { + if( p instanceof Attachment ) { + m_engine.getAttachmentManager().deleteAttachment( ( Attachment )p ); + } else { + final Collection< String > refTo = m_engine.getReferenceManager().findRefersTo( pageName ); + // May return null, if the page does not exist or has not been indexed yet. + + if( m_engine.getAttachmentManager().hasAttachments( p ) ) { + final List< Attachment > attachments = m_engine.getAttachmentManager().listAttachments( p ); + for( final Attachment attachment : attachments ) { + if( refTo != null ) { + refTo.remove( attachment.getName() ); + } + + m_engine.getAttachmentManager().deleteAttachment( attachment ); + } + } + deletePage( p ); + fireEvent( WikiPageEvent.PAGE_DELETED, pageName ); + } + } } - /* (non-Javadoc) + /** + * {@inheritDoc} * @see org.apache.wiki.pages.PageManager#deletePage(org.apache.wiki.WikiPage) */ @Override diff --git a/jspwiki-main/src/main/java/org/apache/wiki/pages/PageManager.java b/jspwiki-main/src/main/java/org/apache/wiki/pages/PageManager.java index 95cc3a9..7337c8d 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/pages/PageManager.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/pages/PageManager.java @@ -18,9 +18,6 @@ */ package org.apache.wiki.pages; -import java.util.Collection; -import java.util.List; - import org.apache.wiki.WikiEngine; import org.apache.wiki.WikiPage; import org.apache.wiki.api.exceptions.ProviderException; @@ -28,6 +25,9 @@ import org.apache.wiki.event.WikiEvent; import org.apache.wiki.event.WikiEventListener; import org.apache.wiki.providers.WikiPageProvider; +import java.util.Collection; +import java.util.List; + public interface PageManager extends WikiEventListener { @@ -47,7 +47,7 @@ public interface PageManager extends WikiEventListener { /** * Returns all pages in some random order. If you need just the page names, - * please see {@link org.apache.wiki.ReferenceManager#findCreated() ReferenceManager#findCreated()}, which is probably a lot + * please see {@link org.apache.wiki.references.ReferenceManager#findCreated() ReferenceManager#findCreated()}, which is probably a lot * faster. This method may cause repository access. * * @return A Collection of WikiPage objects. @@ -85,8 +85,7 @@ public interface PageManager extends WikiEventListener { void putPageText(WikiPage page, String content) throws ProviderException; /** - * Locks page for editing. Note, however, that the PageManager - * will in no way prevent you from actually editing this page; + * Locks page for editing. Note, however, that the PageManager will in no way prevent you from actually editing this page; * the lock is just for information. * * @param page WikiPage to lock @@ -103,8 +102,7 @@ public interface PageManager extends WikiEventListener { void unlockPage(PageLock lock); /** - * Returns the current lock owner of a page. If the page is not - * locked, will return null. + * Returns the current lock owner of a page. If the page is not locked, will return null. * * @param page The page to check the lock for * @return Current lock, or null, if there is no lock @@ -115,8 +113,7 @@ public interface PageManager extends WikiEventListener { * Returns a list of currently applicable locks. Note that by the time you get the list, * the locks may have already expired, so use this only for informational purposes. * - * @return List of PageLock objects, detailing the locks. If no locks exist, returns - * an empty list. + * @return List of PageLock objects, detailing the locks. If no locks exist, returns an empty list. * @since 2.0.22. */ List<PageLock> getActiveLocks(); @@ -127,8 +124,7 @@ public interface PageManager extends WikiEventListener { * @param pageName The name of the page * @param version A version number * @return A WikiPage object, or null, if the page does not exist - * @throws ProviderException If there is something wrong with the page - * name or the repository + * @throws ProviderException If there is something wrong with the page name or the repository */ WikiPage getPageInfo(String pageName, int version) throws ProviderException; @@ -187,6 +183,14 @@ public interface PageManager extends WikiEventListener { void deleteVersion(WikiPage page) throws ProviderException; /** + * Deletes a page or an attachment completely, including all versions. If the page does not exist, does nothing. + * + * @param pageName The name of the page. + * @throws ProviderException If something goes wrong. + */ + void deletePage( final String pageName ) throws ProviderException; + + /** * Deletes an entire page, all versions, all traces. * * @param page The WikiPage to delete diff --git a/jspwiki-main/src/test/java/org/apache/wiki/TestEngine.java b/jspwiki-main/src/test/java/org/apache/wiki/TestEngine.java index 9eef99e..6115fea 100644 --- a/jspwiki-main/src/test/java/org/apache/wiki/TestEngine.java +++ b/jspwiki-main/src/test/java/org/apache/wiki/TestEngine.java @@ -282,15 +282,6 @@ public class TestEngine extends WikiEngine return pagename; } - public void deletePage( final String pageName ) throws ProviderException { - try { - super.deletePage( pageName ); - } catch( final ProviderException | RuntimeException e ) { - log.error( e.getMessage(), e ); - throw e; - } - } - /** * Removes a page, but not any auxiliary information. Works only * with FileSystemProvider. diff --git a/jspwiki-main/src/test/java/org/apache/wiki/WikiEngineTest.java b/jspwiki-main/src/test/java/org/apache/wiki/WikiEngineTest.java index 6bbddce..4cf1930 100644 --- a/jspwiki-main/src/test/java/org/apache/wiki/WikiEngineTest.java +++ b/jspwiki-main/src/test/java/org/apache/wiki/WikiEngineTest.java @@ -568,7 +568,7 @@ public class WikiEngineTest WikiPage page = m_engine.getPage( NAME1, WikiProvider.LATEST_VERSION ); - m_engine.deletePage( page.getName() ); + m_engine.getPageManager().deletePage( page.getName() ); Assertions.assertFalse( saved.exists(), "Page has not been removed!" ); } @@ -596,7 +596,7 @@ public class WikiEngineTest WikiPage page = m_engine.getPage( NAME1, WikiProvider.LATEST_VERSION ); - m_engine.deletePage( page.getName() ); + m_engine.getPageManager().deletePage( page.getName() ); Assertions.assertFalse( saved.exists(), "Page has not been removed!" ); Assertions.assertFalse( attfile.exists(), "Attachment has not been removed" ); @@ -628,9 +628,9 @@ public class WikiEngineTest att = m_engine.getAttachmentManager().getAttachmentInfo(NAME1+"/TestAtt.txt"); - m_engine.deletePage(att.getName()); + m_engine.getPageManager().deletePage(att.getName()); - m_engine.deletePage( NAME1 ); + m_engine.getPageManager().deletePage( NAME1 ); Assertions.assertNull( m_engine.getPage(NAME1), "Page not removed" ); Assertions.assertNull( m_engine.getPage(NAME1+"/TestAtt.txt"), "Att not removed" ); @@ -653,7 +653,7 @@ public class WikiEngineTest WikiPage page = engine.getPage( NAME1, 3 ); - engine.deleteVersion( page ); + engine.getPageManager().deleteVersion( page ); Assertions.assertNull( engine.getPage( NAME1, 3 ), "got page" ); @@ -675,7 +675,7 @@ public class WikiEngineTest WikiPage page = engine.getPage( NAME1, 1 ); - engine.deleteVersion( page ); + engine.getPageManager().deleteVersion( page ); Assertions.assertNull( engine.getPage( NAME1, 1 ), "got page" ); @@ -714,7 +714,7 @@ public class WikiEngineTest // FIXME: The following must run as well Assertions.assertEquals( "notbar", v2.getAttribute("foo"), "V2" ); - engine.deletePage( NAME1 ); + engine.getPageManager().deletePage( NAME1 ); } @Test diff --git a/jspwiki-main/src/test/java/org/apache/wiki/attachment/AttachmentManagerTest.java b/jspwiki-main/src/test/java/org/apache/wiki/attachment/AttachmentManagerTest.java index 192cb35..8128b47 100644 --- a/jspwiki-main/src/test/java/org/apache/wiki/attachment/AttachmentManagerTest.java +++ b/jspwiki-main/src/test/java/org/apache/wiki/attachment/AttachmentManagerTest.java @@ -12,15 +12,7 @@ * limitations under the License. */ package org.apache.wiki.attachment; -import java.io.File; -import java.io.FileWriter; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.StringReader; -import java.io.StringWriter; -import java.util.List; -import java.util.Properties; - +import net.sf.ehcache.CacheManager; import org.apache.wiki.TestEngine; import org.apache.wiki.WikiContext; import org.apache.wiki.WikiPage; @@ -31,7 +23,14 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import net.sf.ehcache.CacheManager; +import java.io.File; +import java.io.FileWriter; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.StringReader; +import java.io.StringWriter; +import java.util.List; +import java.util.Properties; public class AttachmentManagerTest { @@ -361,7 +360,7 @@ public class AttachmentManagerTest } finally { - m_engine.deletePage("TestPage"); + m_engine.getPageManager().deletePage("TestPage"); } } diff --git a/jspwiki-main/src/test/java/org/apache/wiki/auth/AuthorizationManagerTest.java b/jspwiki-main/src/test/java/org/apache/wiki/auth/AuthorizationManagerTest.java index 87a721e..674c821 100644 --- a/jspwiki-main/src/test/java/org/apache/wiki/auth/AuthorizationManagerTest.java +++ b/jspwiki-main/src/test/java/org/apache/wiki/auth/AuthorizationManagerTest.java @@ -114,7 +114,7 @@ public class AuthorizationManagerTest // Delete the test page try { - m_engine.deletePage( "TestDefaultPage" ); + m_engine.getPageManager().deletePage( "TestDefaultPage" ); } catch( ProviderException e ) { @@ -294,7 +294,7 @@ public class AuthorizationManagerTest // Delete test page & attachment m_engine.getAttachmentManager().deleteAttachment( att ); - m_engine.deletePage( "Test" ); + m_engine.getPageManager().deletePage( "Test" ); } @Test @@ -326,7 +326,7 @@ public class AuthorizationManagerTest // Delete test page & attachment m_engine.getAttachmentManager().deleteAttachment( att ); - m_engine.deletePage( "Test" ); + m_engine.getPageManager().deletePage( "Test" ); } @Test @@ -468,7 +468,7 @@ public class AuthorizationManagerTest // Cleanup try { - m_engine.deletePage( "Test" ); + m_engine.getPageManager().deletePage( "Test" ); } catch( ProviderException e ) { @@ -590,7 +590,7 @@ public class AuthorizationManagerTest // Cleanup try { - m_engine.deletePage( "Test" ); + m_engine.getPageManager().deletePage( "Test" ); } catch( ProviderException e ) { diff --git a/jspwiki-main/src/test/java/org/apache/wiki/auth/UserManagerTest.java b/jspwiki-main/src/test/java/org/apache/wiki/auth/UserManagerTest.java index 8212bfe..e9d770d 100644 --- a/jspwiki-main/src/test/java/org/apache/wiki/auth/UserManagerTest.java +++ b/jspwiki-main/src/test/java/org/apache/wiki/auth/UserManagerTest.java @@ -194,7 +194,7 @@ public class UserManagerTest { Assertions.assertEquals( expectedText, actualText ); // Remove our test page - m_engine.deletePage( pageName ); + m_engine.getPageManager().deletePage( pageName ); // Setup Step 6: re-create the group with our old test user names in it group = groupManager.parseGroup( m_groupName, "Alice \n Bob \n Charlie \n " + oldLogin + "\n" + oldName, true ); @@ -259,7 +259,7 @@ public class UserManagerTest { groupManager.removeGroup( group.getName() ); Assertions.assertEquals( oldGroupCount, groupManager.getRoles().length ); - m_engine.deletePage( pageName ); + m_engine.getPageManager().deletePage( pageName ); Assertions.assertEquals( oldPageCount, pageManager.getTotalPageCount() ); } diff --git a/jspwiki-main/src/test/java/org/apache/wiki/auth/acl/DefaultAclManagerTest.java b/jspwiki-main/src/test/java/org/apache/wiki/auth/acl/DefaultAclManagerTest.java index e56a91e..3326cfc 100644 --- a/jspwiki-main/src/test/java/org/apache/wiki/auth/acl/DefaultAclManagerTest.java +++ b/jspwiki-main/src/test/java/org/apache/wiki/auth/acl/DefaultAclManagerTest.java @@ -55,8 +55,8 @@ public class DefaultAclManagerTest { try { - m_engine.deletePage( "TestDefaultPage" ); - m_engine.deletePage( "TestAclPage" ); + m_engine.getPageManager().deletePage( "TestDefaultPage" ); + m_engine.getPageManager().deletePage( "TestAclPage" ); } catch ( ProviderException e ) { diff --git a/jspwiki-main/src/test/java/org/apache/wiki/plugin/DefaultPluginManagerTest.java b/jspwiki-main/src/test/java/org/apache/wiki/plugin/DefaultPluginManagerTest.java index b84a812..9a0a14e 100644 --- a/jspwiki-main/src/test/java/org/apache/wiki/plugin/DefaultPluginManagerTest.java +++ b/jspwiki-main/src/test/java/org/apache/wiki/plugin/DefaultPluginManagerTest.java @@ -18,7 +18,6 @@ */ package org.apache.wiki.plugin; -import java.util.Properties; import org.apache.wiki.TestEngine; import org.apache.wiki.WikiContext; @@ -30,31 +29,25 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -public class DefaultPluginManagerTest -{ - public static final String NAME1 = "Test1"; +import java.util.Properties; + +public class DefaultPluginManagerTest { Properties props = TestEngine.getTestProperties(); - - WikiEngine engine; + WikiEngine engine = TestEngine.build(); + DefaultPluginManager manager = new DefaultPluginManager( engine, props ); WikiContext context; - DefaultPluginManager manager; - @BeforeEach - public void setUp() - throws Exception - { - engine = new TestEngine(props); + public void setUp() throws Exception { context = new WikiContext( engine, new WikiPage(engine, "Testpage") ); - manager = new DefaultPluginManager( engine, props ); } @AfterEach public void tearDown() throws ProviderException { - engine.deletePage("Testpage"); + engine.getPageManager().deletePage("Testpage"); } @Test diff --git a/jspwiki-main/src/test/java/org/apache/wiki/plugin/GroupsTest.java b/jspwiki-main/src/test/java/org/apache/wiki/plugin/GroupsTest.java index c682c26..529af2c 100644 --- a/jspwiki-main/src/test/java/org/apache/wiki/plugin/GroupsTest.java +++ b/jspwiki-main/src/test/java/org/apache/wiki/plugin/GroupsTest.java @@ -19,31 +19,18 @@ package org.apache.wiki.plugin; -import java.util.Properties; - import org.apache.wiki.TestEngine; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -public class GroupsTest -{ - Properties props = TestEngine.getTestProperties(); - TestEngine testEngine; - - @BeforeEach - public void setUp() - throws Exception - { - testEngine = new TestEngine(props); - } +public class GroupsTest { + TestEngine testEngine = TestEngine.build(); @AfterEach - public void tearDown() throws Exception - { - testEngine.deletePage( "Test" ); + public void tearDown() throws Exception { + testEngine.getPageManager().deletePage( "Test" ); } @Test diff --git a/jspwiki-main/src/test/java/org/apache/wiki/plugin/IfPluginTest.java b/jspwiki-main/src/test/java/org/apache/wiki/plugin/IfPluginTest.java index b8b30cb..4ac3c19 100644 --- a/jspwiki-main/src/test/java/org/apache/wiki/plugin/IfPluginTest.java +++ b/jspwiki-main/src/test/java/org/apache/wiki/plugin/IfPluginTest.java @@ -17,8 +17,7 @@ under the License. */ package org.apache.wiki.plugin; -import java.util.Properties; - +import net.sourceforge.stripes.mock.MockHttpServletRequest; import org.apache.wiki.TestEngine; import org.apache.wiki.WikiContext; import org.apache.wiki.WikiPage; @@ -28,27 +27,15 @@ import org.apache.wiki.auth.Users; import org.apache.wiki.providers.WikiPageProvider; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import net.sourceforge.stripes.mock.MockHttpServletRequest; - -public class IfPluginTest -{ +public class IfPluginTest { - TestEngine testEngine; - - @BeforeEach - public void setUp() throws Exception - { - Properties props = TestEngine.getTestProperties(); - testEngine = new TestEngine( props ); - } + TestEngine testEngine = TestEngine.build(); @AfterEach - public void tearDown() throws Exception - { - testEngine.deletePage( "Test" ); + public void tearDown() throws Exception { + testEngine.getPageManager().deletePage( "Test" ); } /** diff --git a/jspwiki-main/src/test/java/org/apache/wiki/plugin/TableOfContentsTest.java b/jspwiki-main/src/test/java/org/apache/wiki/plugin/TableOfContentsTest.java index c0b1ada..47a0784 100644 --- a/jspwiki-main/src/test/java/org/apache/wiki/plugin/TableOfContentsTest.java +++ b/jspwiki-main/src/test/java/org/apache/wiki/plugin/TableOfContentsTest.java @@ -26,30 +26,19 @@ import org.apache.wiki.TestEngine; import org.apache.wiki.api.exceptions.WikiException; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import java.util.Properties; - /** * * @since */ public class TableOfContentsTest { - TestEngine testEngine; - - @BeforeEach - public void setUp() throws Exception - { - Properties props = TestEngine.getTestProperties(); - testEngine = new TestEngine( props ); - } + TestEngine testEngine = TestEngine.build(); @AfterEach - public void tearDown() throws Exception - { - testEngine.deletePage( "Test" ); + public void tearDown() throws Exception { + testEngine.getPageManager().deletePage( "Test" ); } @Test diff --git a/jspwiki-main/src/test/java/org/apache/wiki/plugin/WeblogPluginTest.java b/jspwiki-main/src/test/java/org/apache/wiki/plugin/WeblogPluginTest.java index 0bf7d9f..3ae3b30 100644 --- a/jspwiki-main/src/test/java/org/apache/wiki/plugin/WeblogPluginTest.java +++ b/jspwiki-main/src/test/java/org/apache/wiki/plugin/WeblogPluginTest.java @@ -4,25 +4,16 @@ import org.apache.wiki.TestEngine; import org.apache.wiki.api.exceptions.WikiException; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import java.util.Properties; - public class WeblogPluginTest { - TestEngine testEngine; - - @BeforeEach - public void setUp() throws Exception { - final Properties props = TestEngine.getTestProperties(); - testEngine = new TestEngine( props ); - } + TestEngine testEngine = TestEngine.build(); @AfterEach public void tearDown() throws Exception { - testEngine.deletePage( "Test" ); + testEngine.getPageManager().deletePage( "Test" ); } @Test diff --git a/jspwiki-main/src/test/java/org/apache/wiki/references/ReferenceManagerTest.java b/jspwiki-main/src/test/java/org/apache/wiki/references/ReferenceManagerTest.java index ff58d40..76122de 100644 --- a/jspwiki-main/src/test/java/org/apache/wiki/references/ReferenceManagerTest.java +++ b/jspwiki-main/src/test/java/org/apache/wiki/references/ReferenceManagerTest.java @@ -82,7 +82,7 @@ public class ReferenceManagerTest { Assertions.assertNotNull( c, "referrers expected" ); Assertions.assertTrue( c.size() == 1 && c.contains("Foobar") ); - engine.deletePage( "Foobar" ); + engine.getPageManager().deletePage( "Foobar" ); c = mgr.findReferrers("Foobar2"); Assertions.assertNull( c ); diff --git a/jspwiki-main/src/test/java/org/apache/wiki/render/RenderingManagerTest.java b/jspwiki-main/src/test/java/org/apache/wiki/render/RenderingManagerTest.java index 6d41332..cf5aada 100644 --- a/jspwiki-main/src/test/java/org/apache/wiki/render/RenderingManagerTest.java +++ b/jspwiki-main/src/test/java/org/apache/wiki/render/RenderingManagerTest.java @@ -27,28 +27,17 @@ import org.apache.wiki.parser.MarkupParser; import org.apache.wiki.parser.WikiDocument; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import java.util.Properties; - public class RenderingManagerTest { - RenderingManager m_manager; - TestEngine m_engine; - - @BeforeEach - public void setUp() throws Exception { - CacheManager.getInstance().removeAllCaches(); - Properties props = TestEngine.getTestProperties(); - m_engine = new TestEngine( props ); - - m_manager = m_engine.getRenderingManager(); - } + TestEngine m_engine = TestEngine.build(); + RenderingManager m_manager = m_engine.getRenderingManager(); @AfterEach public void tearDown() throws Exception { - m_engine.deletePage( "TestPage" ); + m_engine.getPageManager().deletePage( "TestPage" ); + CacheManager.getInstance().removeAllCaches(); } /** diff --git a/jspwiki-main/src/test/java/org/apache/wiki/ui/CommandResolverTest.java b/jspwiki-main/src/test/java/org/apache/wiki/ui/CommandResolverTest.java index 7212058..a557d5c 100644 --- a/jspwiki-main/src/test/java/org/apache/wiki/ui/CommandResolverTest.java +++ b/jspwiki-main/src/test/java/org/apache/wiki/ui/CommandResolverTest.java @@ -52,8 +52,8 @@ public class CommandResolverTest { @AfterEach public void tearDown() throws Exception { - m_engine.deletePage( "SinglePage" ); - m_engine.deletePage( "PluralPage" ); + m_engine.getPageManager().deletePage( "SinglePage" ); + m_engine.getPageManager().deletePage( "PluralPage" ); } @Test diff --git a/jspwiki-main/src/test/java/org/apache/wiki/workflow/ApprovalWorkflowTest.java b/jspwiki-main/src/test/java/org/apache/wiki/workflow/ApprovalWorkflowTest.java index 135ff01..5e03505 100644 --- a/jspwiki-main/src/test/java/org/apache/wiki/workflow/ApprovalWorkflowTest.java +++ b/jspwiki-main/src/test/java/org/apache/wiki/workflow/ApprovalWorkflowTest.java @@ -18,11 +18,6 @@ */ package org.apache.wiki.workflow; -import java.security.Principal; -import java.util.Collection; -import java.util.List; -import java.util.Properties; - import org.apache.wiki.TestEngine; import org.apache.wiki.WikiContext; import org.apache.wiki.api.engine.FilterManager; @@ -35,14 +30,18 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -public class ApprovalWorkflowTest -{ +import java.security.Principal; +import java.util.Collection; +import java.util.List; +import java.util.Properties; + +public class ApprovalWorkflowTest { + WorkflowBuilder m_builder; TestEngine m_engine; WorkflowManager m_wm; DecisionQueue m_dq; - @BeforeEach public void setUp() throws Exception { @@ -209,7 +208,7 @@ public class ApprovalWorkflowTest Assertions.assertEquals(0, decisions.size()); // Delete the page we created - m_engine.deletePage( pageName ); + m_engine.getPageManager().deletePage( pageName ); } @Test
