You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by ju...@apache.org on 2020/03/16 21:58:31 UTC
[jspwiki] 41/47: JSPWIKI-303: introduce Page instead of WikiPage
(ACL handling still needs to be done) 2/2
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 633124c80f0ae93b790612965e873b87e9099032
Author: juanpablo <ju...@apache.org>
AuthorDate: Mon Mar 16 14:35:02 2020 +0100
JSPWIKI-303: introduce Page instead of WikiPage (ACL handling still needs to be done) 2/2
---
.../src/test/java/org/apache/wiki/TestEngine.java | 3 +-
.../test/java/org/apache/wiki/WikiEngineTest.java | 7 ++--
.../wiki/attachment/AttachmentManagerTest.java | 25 +++++------
.../apache/wiki/auth/AuthorizationManagerTest.java | 6 +--
.../java/org/apache/wiki/auth/UserManagerTest.java | 8 ++--
.../wiki/auth/acl/DefaultAclManagerTest.java | 6 +--
.../org/apache/wiki/content/PageRenamerTest.java | 28 ++++++-------
.../apache/wiki/pages/DefaultPageManagerTest.java | 19 +++++----
.../org/apache/wiki/plugin/PageViewPluginTest.java | 30 +++++++-------
.../providers/BasicAttachmentProviderTest.java | 26 ++++++------
.../apache/wiki/providers/CachingProviderTest.java | 4 +-
.../wiki/providers/VersioningFileProviderTest.java | 48 +++++++++++-----------
.../apache/wiki/render/RenderingManagerTest.java | 6 +--
.../java/org/apache/wiki/rss/RSSGeneratorTest.java | 6 +--
.../org/apache/wiki/search/SearchManagerTest.java | 1 +
.../wiki/stress/StressTestVersioningProvider.java | 8 ++--
.../org/apache/wiki/ui/CommandResolverTest.java | 3 +-
.../java/org/apache/wiki/ui/PageCommandTest.java | 4 +-
.../org/apache/wiki/xmlrpc/RPCHandlerTest.java | 7 ++--
.../wiki/render/markdown/MarkdownRendererTest.java | 2 +-
20 files changed, 128 insertions(+), 119 deletions(-)
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 48e674e..559c375 100644
--- a/jspwiki-main/src/test/java/org/apache/wiki/TestEngine.java
+++ b/jspwiki-main/src/test/java/org/apache/wiki/TestEngine.java
@@ -24,6 +24,7 @@ import net.sourceforge.stripes.mock.MockHttpSession;
import net.sourceforge.stripes.mock.MockServletContext;
import org.apache.commons.lang3.StringUtils;
import org.apache.log4j.Logger;
+import org.apache.wiki.api.core.Page;
import org.apache.wiki.api.core.Session;
import org.apache.wiki.api.exceptions.ProviderException;
import org.apache.wiki.api.exceptions.WikiException;
@@ -408,7 +409,7 @@ public class TestEngine extends WikiEngine
* @return (english) contents corresponding to the given page name.
*/
public String getI18nHTML( final String pagename ) {
- final WikiPage page = getPageManager().getPage( pagename, PageProvider.LATEST_VERSION );
+ final Page page = getPageManager().getPage( pagename, PageProvider.LATEST_VERSION );
final WikiContext context = new WikiContext( this, newHttpRequest(), page );
context.setRequestContext( WikiContext.NONE );
return getRenderingManager().getHTML( context, page );
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 e6f2042..f4d02eb 100644
--- a/jspwiki-main/src/test/java/org/apache/wiki/WikiEngineTest.java
+++ b/jspwiki-main/src/test/java/org/apache/wiki/WikiEngineTest.java
@@ -20,6 +20,7 @@
package org.apache.wiki;
import net.sf.ehcache.CacheManager;
+import org.apache.wiki.api.core.Page;
import org.apache.wiki.attachment.Attachment;
import org.apache.wiki.attachment.AttachmentManager;
import org.apache.wiki.modules.ModuleManager;
@@ -260,8 +261,8 @@ public class WikiEngineTest {
engine.saveText( NAME1, "[{SET foo=bar}]" );
engine.saveText( NAME1, "[{SET foo=notbar}]");
- final WikiPage v1 = engine.getManager( PageManager.class ).getPage( NAME1, 1 );
- final WikiPage v2 = engine.getManager( PageManager.class ).getPage( NAME1, 2 );
+ final Page v1 = engine.getManager( PageManager.class ).getPage( NAME1, 1 );
+ final Page v2 = engine.getManager( PageManager.class ).getPage( NAME1, 2 );
Assertions.assertEquals( "bar", v1.getAttribute("foo"), "V1" );
Assertions.assertEquals( "notbar", v2.getAttribute("foo"), "V2" );
@@ -319,7 +320,7 @@ public class WikiEngineTest {
m_engine.getManager( PageManager.class ).saveText( context, "test" + i );
}
- final WikiPage p3 = m_engine.getManager( PageManager.class ).getPage( NAME1, -1 );
+ final Page p3 = m_engine.getManager( PageManager.class ).getPage( NAME1, -1 );
Assertions.assertNull( p3.getAttribute( WikiPage.CHANGENOTE ) );
}
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 ed7a400..0e37e82 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
@@ -17,6 +17,7 @@ import net.sf.ehcache.CacheManager;
import org.apache.wiki.TestEngine;
import org.apache.wiki.WikiContext;
import org.apache.wiki.WikiPage;
+import org.apache.wiki.api.core.Attachment;
import org.apache.wiki.api.exceptions.ProviderException;
import org.apache.wiki.api.exceptions.WikiException;
import org.apache.wiki.pages.PageManager;
@@ -88,7 +89,7 @@ public class AttachmentManagerTest {
public void testSimpleStore()
throws Exception
{
- final Attachment att = new Attachment( m_engine, NAME1, "test1.txt" );
+ final Attachment att = new org.apache.wiki.attachment.Attachment( m_engine, NAME1, "test1.txt" );
att.setAuthor( "FirstPost" );
@@ -118,7 +119,7 @@ public class AttachmentManagerTest {
public void testSimpleStoreSpace()
throws Exception
{
- final Attachment att = new Attachment( m_engine, NAME1, "test file.txt" );
+ final Attachment att = new org.apache.wiki.attachment.Attachment( m_engine, NAME1, "test file.txt" );
att.setAuthor( "FirstPost" );
@@ -150,7 +151,7 @@ public class AttachmentManagerTest {
public void testSimpleStoreByVersion()
throws Exception
{
- final Attachment att = new Attachment( m_engine, NAME1, "test1.txt" );
+ final Attachment att = new org.apache.wiki.attachment.Attachment( m_engine, NAME1, "test1.txt" );
att.setAuthor( "FirstPost" );
@@ -181,7 +182,7 @@ public class AttachmentManagerTest {
public void testMultipleStore()
throws Exception
{
- final Attachment att = new Attachment( m_engine, NAME1, "test1.txt" );
+ final Attachment att = new org.apache.wiki.attachment.Attachment( m_engine, NAME1, "test1.txt" );
att.setAuthor( "FirstPost" );
@@ -223,7 +224,7 @@ public class AttachmentManagerTest {
public void testListAttachments()
throws Exception
{
- final Attachment att = new Attachment( m_engine, NAME1, "test1.txt" );
+ final Attachment att = new org.apache.wiki.attachment.Attachment( m_engine, NAME1, "test1.txt" );
att.setAuthor( "FirstPost" );
@@ -242,7 +243,7 @@ public class AttachmentManagerTest {
@Test
public void testSimpleStoreWithoutExt() throws Exception
{
- final Attachment att = new Attachment( m_engine, NAME1, "test1" );
+ final Attachment att = new org.apache.wiki.attachment.Attachment( m_engine, NAME1, "test1" );
att.setAuthor( "FirstPost" );
@@ -275,7 +276,7 @@ public class AttachmentManagerTest {
@Test
public void testExists() throws Exception
{
- final Attachment att = new Attachment( m_engine, NAME1, "test1" );
+ final Attachment att = new org.apache.wiki.attachment.Attachment( m_engine, NAME1, "test1" );
att.setAuthor( "FirstPost" );
@@ -287,7 +288,7 @@ public class AttachmentManagerTest {
@Test
public void testExists2() throws Exception
{
- final Attachment att = new Attachment( m_engine, NAME1, "test1.bin" );
+ final Attachment att = new org.apache.wiki.attachment.Attachment( m_engine, NAME1, "test1.bin" );
att.setAuthor( "FirstPost" );
@@ -299,7 +300,7 @@ public class AttachmentManagerTest {
@Test
public void testExistsSpace() throws Exception
{
- final Attachment att = new Attachment( m_engine, NAME1, "test file.bin" );
+ final Attachment att = new org.apache.wiki.attachment.Attachment( m_engine, NAME1, "test file.bin" );
att.setAuthor( "FirstPost" );
@@ -311,7 +312,7 @@ public class AttachmentManagerTest {
@Test
public void testExistsUTF1() throws Exception
{
- final Attachment att = new Attachment( m_engine, NAME1, "test\u00e4.bin" );
+ final Attachment att = new org.apache.wiki.attachment.Attachment( m_engine, NAME1, "test\u00e4.bin" );
att.setAuthor( "FirstPost" );
@@ -323,7 +324,7 @@ public class AttachmentManagerTest {
@Test
public void testExistsUTF2() throws Exception
{
- final Attachment att = new Attachment( m_engine, NAMEU, "test\u00e4.bin" );
+ final Attachment att = new org.apache.wiki.attachment.Attachment( m_engine, NAMEU, "test\u00e4.bin" );
att.setAuthor( "FirstPost" );
@@ -339,7 +340,7 @@ public class AttachmentManagerTest {
{
m_engine.saveText( "TestPage", "xx" );
- final Attachment att = new Attachment( m_engine, "TestPages", "foo.bin" );
+ final Attachment att = new org.apache.wiki.attachment.Attachment( m_engine, "TestPages", "foo.bin" );
att.setAuthor("MonicaBellucci");
m_manager.storeAttachment( att, makeAttachmentFile() );
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 1b673b8..f2b2b8a 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
@@ -20,8 +20,8 @@ package org.apache.wiki.auth;
import org.apache.commons.lang3.ArrayUtils;
import org.apache.wiki.TestEngine;
-import org.apache.wiki.WikiPage;
import org.apache.wiki.WikiSessionTest;
+import org.apache.wiki.api.core.Page;
import org.apache.wiki.api.core.Session;
import org.apache.wiki.api.exceptions.ProviderException;
import org.apache.wiki.api.exceptions.WikiException;
@@ -438,7 +438,7 @@ public class AuthorizationManagerTest
final String src = "[{ALLOW edit Alice}] ";
m_engine.saveText( "Test", src );
- final WikiPage p = m_engine.getManager( PageManager.class ).getPage( "Test" );
+ final Page p = m_engine.getManager( PageManager.class ).getPage( "Test" );
final Permission view = PermissionFactory.getPagePermission( p, "view" );
final Permission edit = PermissionFactory.getPagePermission( p, "edit" );
@@ -559,7 +559,7 @@ public class AuthorizationManagerTest
final String src = "[{ALLOW edit Authenticated}] ";
m_engine.saveText( "Test", src );
- final WikiPage p = m_engine.getManager( PageManager.class ).getPage( "Test" );
+ final Page p = m_engine.getManager( PageManager.class ).getPage( "Test" );
final Permission view = PermissionFactory.getPagePermission( p, "view" );
final Permission edit = PermissionFactory.getPagePermission( p, "edit" );
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 3473e81..1f3d189 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
@@ -144,7 +144,7 @@ public class UserManagerTest {
m_engine.saveText( pageName, "Test text. [{ALLOW view " + oldName + ", " + oldLogin + ", Alice}] More text." );
// 3a. Make sure the page got saved, and that ONLY our test user has permission to read it.
- WikiPage p = m_engine.getManager( PageManager.class ).getPage( pageName );
+ WikiPage p = ( WikiPage )m_engine.getManager( PageManager.class ).getPage( pageName );
Assertions.assertEquals( oldPageCount + 1, pageManager.getTotalPageCount() );
Assertions.assertNotNull( p.getAcl().getEntry( new WikiPrincipal( oldLogin ) ) );
Assertions.assertNotNull( p.getAcl().getEntry( new WikiPrincipal( oldName ) ) );
@@ -179,7 +179,7 @@ public class UserManagerTest {
// Test 3: our page should not contain the old wiki name OR login name
// in the ACL any more (the full name is always used)
- p = m_engine.getManager( PageManager.class ).getPage( pageName );
+ p = ( WikiPage )m_engine.getManager( PageManager.class ).getPage( pageName );
Assertions.assertNull( p.getAcl().getEntry( new WikiPrincipal( oldLogin ) ) );
Assertions.assertNull( p.getAcl().getEntry( new WikiPrincipal( oldName ) ) );
Assertions.assertNull( p.getAcl().getEntry( new WikiPrincipal( newLogin ) ) );
@@ -204,7 +204,7 @@ public class UserManagerTest {
// The test user should still be able to see the page (because the login name matches...)
pageName = "TestPage2" + now;
m_engine.saveText( pageName, "More test text. [{ALLOW view " + oldName + ", " + oldLogin + ", Alice}] More text." );
- p = m_engine.getManager( PageManager.class ).getPage( pageName );
+ p = ( WikiPage )m_engine.getManager( PageManager.class ).getPage( pageName );
Assertions.assertEquals( oldPageCount + 1, pageManager.getTotalPageCount() );
Assertions.assertNotNull( p.getAcl().getEntry( new WikiPrincipal( oldLogin ) ) );
Assertions.assertNotNull( p.getAcl().getEntry( new WikiPrincipal( oldName ) ) );
@@ -238,7 +238,7 @@ public class UserManagerTest {
// Test 7: our page should not contain the old wiki name OR login name
// in the ACL any more (the full name is always used)
- p = m_engine.getManager( PageManager.class ).getPage( pageName );
+ p = ( WikiPage )m_engine.getManager( PageManager.class ).getPage( pageName );
Assertions.assertNull( p.getAcl().getEntry( new WikiPrincipal( oldLogin ) ) );
Assertions.assertNotNull( p.getAcl().getEntry( new WikiPrincipal( oldName ) ) );
Assertions.assertNull( p.getAcl().getEntry( new WikiPrincipal( newLogin ) ) );
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 d287350..06b4d23 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,12 +55,12 @@ public class DefaultAclManagerTest
@Test
public void testGetPermissions()
{
- WikiPage page = m_engine.getManager( PageManager.class ).getPage( "TestDefaultPage" );
+ WikiPage page = ( WikiPage )m_engine.getManager( PageManager.class ).getPage( "TestDefaultPage" );
Acl acl = m_engine.getAclManager().getPermissions( page );
Assertions.assertNotNull( page.getAcl() );
Assertions.assertTrue(page.getAcl().isEmpty());
- page = m_engine.getManager( PageManager.class ).getPage( "TestAclPage" );
+ page = ( WikiPage )m_engine.getManager( PageManager.class ).getPage( "TestAclPage" );
acl = m_engine.getAclManager().getPermissions( page );
Assertions.assertNotNull( page.getAcl() );
Assertions.assertFalse(page.getAcl().isEmpty());
@@ -161,7 +161,7 @@ public class DefaultAclManagerTest
public void testPrintAcl()
{
// Verify that the printed Acl for the test page is OK
- final WikiPage page = m_engine.getManager( PageManager.class ).getPage( "TestAclPage" );
+ final WikiPage page = ( WikiPage )m_engine.getManager( PageManager.class ).getPage( "TestAclPage" );
Acl acl = m_engine.getAclManager().getPermissions( page );
final String aclString = DefaultAclManager.printAcl( acl );
Assertions.assertEquals( "[{ALLOW edit Charlie,Herman}]\n", aclString );
diff --git a/jspwiki-main/src/test/java/org/apache/wiki/content/PageRenamerTest.java b/jspwiki-main/src/test/java/org/apache/wiki/content/PageRenamerTest.java
index e909338..3653c5d 100644
--- a/jspwiki-main/src/test/java/org/apache/wiki/content/PageRenamerTest.java
+++ b/jspwiki-main/src/test/java/org/apache/wiki/content/PageRenamerTest.java
@@ -22,10 +22,10 @@ import net.sf.ehcache.CacheManager;
import org.apache.wiki.TestEngine;
import org.apache.wiki.WikiContext;
import org.apache.wiki.WikiEngine;
-import org.apache.wiki.WikiPage;
+import org.apache.wiki.api.core.Attachment;
+import org.apache.wiki.api.core.Page;
import org.apache.wiki.api.exceptions.WikiException;
import org.apache.wiki.api.providers.WikiProvider;
-import org.apache.wiki.attachment.Attachment;
import org.apache.wiki.pages.PageManager;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Assertions;
@@ -77,13 +77,13 @@ public class PageRenamerTest
m_engine.saveText("TestPage", "the big lazy dog thing" );
- final WikiPage p = m_engine.getManager( PageManager.class ).getPage("TestPage");
+ final Page p = m_engine.getManager( PageManager.class ).getPage("TestPage");
final WikiContext context = new WikiContext(m_engine, p);
m_engine.getPageRenamer().renamePage(context, "TestPage", "FooTest", false);
- final WikiPage newpage = m_engine.getManager( PageManager.class ).getPage("FooTest");
+ final Page newpage = m_engine.getManager( PageManager.class ).getPage("FooTest");
Assertions.assertNotNull( newpage, "no new page" );
Assertions.assertNull( m_engine.getManager( PageManager.class ).getPage("TestPage"), "old page not gone" );
@@ -103,7 +103,7 @@ public class PageRenamerTest
m_engine.saveText("TestPage", "foofoo" );
m_engine.saveText("TestPage2", "[TestPage]");
- final WikiPage p = m_engine.getManager( PageManager.class ).getPage("TestPage");
+ final Page p = m_engine.getManager( PageManager.class ).getPage("TestPage");
final WikiContext context = new WikiContext(m_engine, p);
@@ -129,7 +129,7 @@ public class PageRenamerTest
m_engine.saveText("TestPage", "foofoo" );
m_engine.saveText("TestPage2", "TestPage");
- final WikiPage p = m_engine.getManager( PageManager.class ).getPage("TestPage");
+ final Page p = m_engine.getManager( PageManager.class ).getPage("TestPage");
final WikiContext context = new WikiContext(m_engine, p);
@@ -154,7 +154,7 @@ public class PageRenamerTest
m_engine.saveText("TestPage", "foofoo" );
m_engine.saveText("TestPage2", "[TestPage#heading1]");
- final WikiPage p = m_engine.getManager( PageManager.class ).getPage("TestPage");
+ final Page p = m_engine.getManager( PageManager.class ).getPage("TestPage");
final WikiContext context = new WikiContext(m_engine, p);
@@ -179,7 +179,7 @@ public class PageRenamerTest
m_engine.saveText("TestPage", "foofoo" );
m_engine.saveText("TestPage2", "[TestPage] [TestPage] [linktext|TestPage] TestPage [linktext|TestPage] [TestPage#Anchor] [TestPage] TestPage [TestPage]");
- final WikiPage p = m_engine.getManager( PageManager.class ).getPage("TestPage");
+ final Page p = m_engine.getManager( PageManager.class ).getPage("TestPage");
final WikiContext context = new WikiContext(m_engine, p);
@@ -207,7 +207,7 @@ public class PageRenamerTest
m_engine.saveText("Test","foo");
m_engine.saveText("TestPage2", "[Test] [Test#anchor] test Test [test] [link|test] [link|test]");
- final WikiPage p = m_engine.getManager( PageManager.class ).getPage("TestPage");
+ final Page p = m_engine.getManager( PageManager.class ).getPage("TestPage");
final WikiContext context = new WikiContext(m_engine, p);
@@ -227,7 +227,7 @@ public class PageRenamerTest
m_engine.addAttachment("TestPage", "foo.txt", "testing".getBytes() );
m_engine.addAttachment("TestPage", "bar.jpg", "pr0n".getBytes() );
- final WikiPage p = m_engine.getManager( PageManager.class ).getPage("TestPage");
+ final Page p = m_engine.getManager( PageManager.class ).getPage("TestPage");
final WikiContext context = new WikiContext(m_engine, p);
@@ -265,7 +265,7 @@ public class PageRenamerTest
rename( "TestPage", "FooTest" );
- final WikiPage p = m_engine.getManager( PageManager.class ).getPage( "FooTest" );
+ final Page p = m_engine.getManager( PageManager.class ).getPage( "FooTest" );
Assertions.assertNotNull( p, "no page" );
@@ -280,7 +280,7 @@ public class PageRenamerTest
rename( "TestPage", "FooTest" );
- final WikiPage p = m_engine.getManager( PageManager.class ).getPage( "FooTest" );
+ final Page p = m_engine.getManager( PageManager.class ).getPage( "FooTest" );
Assertions.assertNotNull( p, "no page" );
@@ -294,7 +294,7 @@ public class PageRenamerTest
m_engine.saveText( "TestPage", "hubbub");
m_engine.saveText( "TestPage2", "[|TestPage]" );
- final WikiPage p;
+ final Page p;
rename( "TestPage", "FooTest" );
p = m_engine.getManager( PageManager.class ).getPage( "FooTest" );
@@ -306,7 +306,7 @@ public class PageRenamerTest
private void rename( final String src, final String dst ) throws WikiException
{
- final WikiPage p = m_engine.getManager( PageManager.class ).getPage(src);
+ final Page p = m_engine.getManager( PageManager.class ).getPage(src);
final WikiContext context = new WikiContext(m_engine, p);
diff --git a/jspwiki-main/src/test/java/org/apache/wiki/pages/DefaultPageManagerTest.java b/jspwiki-main/src/test/java/org/apache/wiki/pages/DefaultPageManagerTest.java
index 4185a0a..6b70bc4 100644
--- a/jspwiki-main/src/test/java/org/apache/wiki/pages/DefaultPageManagerTest.java
+++ b/jspwiki-main/src/test/java/org/apache/wiki/pages/DefaultPageManagerTest.java
@@ -23,8 +23,9 @@ import net.sf.ehcache.CacheManager;
import org.apache.wiki.TestEngine;
import org.apache.wiki.WikiEngine;
import org.apache.wiki.WikiPage;
+import org.apache.wiki.api.core.Attachment;
+import org.apache.wiki.api.core.Page;
import org.apache.wiki.api.providers.WikiProvider;
-import org.apache.wiki.attachment.Attachment;
import org.apache.wiki.providers.BasicAttachmentProvider;
import org.apache.wiki.providers.CachingProvider;
import org.apache.wiki.providers.FileSystemProvider;
@@ -97,7 +98,7 @@ public class DefaultPageManagerTest {
final File saved = new File( files, NAME1+FileSystemProvider.FILE_EXT );
Assertions.assertTrue( saved.exists(), "Didn't create it!" );
- final WikiPage page = engine.getManager( PageManager.class ).getPage( NAME1, WikiProvider.LATEST_VERSION );
+ final Page page = engine.getManager( PageManager.class ).getPage( NAME1, WikiProvider.LATEST_VERSION );
engine.getManager( PageManager.class ).deletePage( page.getName() );
Assertions.assertFalse( saved.exists(), "Page has not been removed!" );
}
@@ -105,7 +106,7 @@ public class DefaultPageManagerTest {
@Test
public void testDeletePageAndAttachments() throws Exception {
engine.saveText( NAME1, "Test" );
- final Attachment att = new Attachment( engine, NAME1, "TestAtt.txt" );
+ final Attachment att = new org.apache.wiki.attachment.Attachment( engine, NAME1, "TestAtt.txt" );
att.setAuthor( "FirstPost" );
engine.getAttachmentManager().storeAttachment( att, engine.makeAttachmentFile() );
@@ -118,7 +119,7 @@ public class DefaultPageManagerTest {
Assertions.assertTrue( saved.exists(), "Didn't create it!" );
Assertions.assertTrue( attfile.exists(), "Attachment dir does not exist" );
- final WikiPage page = engine.getManager( PageManager.class ).getPage( NAME1, WikiProvider.LATEST_VERSION );
+ final Page page = engine.getManager( PageManager.class ).getPage( NAME1, WikiProvider.LATEST_VERSION );
engine.getManager( PageManager.class ).deletePage( page.getName() );
@@ -129,7 +130,7 @@ public class DefaultPageManagerTest {
@Test
public void testDeletePageAndAttachments2() throws Exception {
engine.saveText( NAME1, "Test" );
- Attachment att = new Attachment( engine, NAME1, "TestAtt.txt" );
+ Attachment att = new org.apache.wiki.attachment.Attachment( engine, NAME1, "TestAtt.txt" );
att.setAuthor( "FirstPost" );
engine.getAttachmentManager().storeAttachment( att, engine.makeAttachmentFile() );
@@ -142,7 +143,7 @@ public class DefaultPageManagerTest {
Assertions.assertTrue( saved.exists(), "Didn't create it!" );
Assertions.assertTrue( attfile.exists(), "Attachment dir does not exist" );
- final WikiPage page = engine.getManager( PageManager.class ).getPage( NAME1, WikiProvider.LATEST_VERSION );
+ final Page page = engine.getManager( PageManager.class ).getPage( NAME1, WikiProvider.LATEST_VERSION );
Assertions.assertNotNull( page, "page" );
att = engine.getAttachmentManager().getAttachmentInfo(NAME1+"/TestAtt.txt");
@@ -164,7 +165,7 @@ public class DefaultPageManagerTest {
engine.saveText( NAME1, "Test2" );
engine.saveText( NAME1, "Test3" );
- final WikiPage page = engine.getManager( PageManager.class ).getPage( NAME1, 3 );
+ final Page page = engine.getManager( PageManager.class ).getPage( NAME1, 3 );
engine.getManager( PageManager.class ).deleteVersion( page );
Assertions.assertNull( engine.getManager( PageManager.class ).getPage( NAME1, 3 ), "got page" );
@@ -181,7 +182,7 @@ public class DefaultPageManagerTest {
engine.saveText( NAME1, "Test2" );
engine.saveText( NAME1, "Test3" );
- final WikiPage page = engine.getManager( PageManager.class ).getPage( NAME1, 1 );
+ final Page page = engine.getManager( PageManager.class ).getPage( NAME1, 1 );
engine.getManager( PageManager.class ).deleteVersion( page );
Assertions.assertNull( engine.getManager( PageManager.class ).getPage( NAME1, 1 ), "got page" );
@@ -196,7 +197,7 @@ public class DefaultPageManagerTest {
props.setProperty( "jspwiki.pageProvider", "org.apache.wiki.providers.VerySimpleProvider" );
props.setProperty( "jspwiki.usePageCache", "false" );
final WikiEngine engine = new TestEngine( props );
- final WikiPage p = engine.getManager( PageManager.class ).getPage( "test", -1 );
+ final Page p = engine.getManager( PageManager.class ).getPage( "test", -1 );
final VerySimpleProvider vsp = (VerySimpleProvider) engine.getManager( PageManager.class ).getProvider();
Assertions.assertEquals( "test", vsp.m_latestReq, "wrong page" );
diff --git a/jspwiki-main/src/test/java/org/apache/wiki/plugin/PageViewPluginTest.java b/jspwiki-main/src/test/java/org/apache/wiki/plugin/PageViewPluginTest.java
index 020bc93..7a3c6a4 100644
--- a/jspwiki-main/src/test/java/org/apache/wiki/plugin/PageViewPluginTest.java
+++ b/jspwiki-main/src/test/java/org/apache/wiki/plugin/PageViewPluginTest.java
@@ -21,7 +21,7 @@ package org.apache.wiki.plugin;
import net.sf.ehcache.CacheManager;
import org.apache.wiki.TestEngine;
import org.apache.wiki.WikiContext;
-import org.apache.wiki.WikiPage;
+import org.apache.wiki.api.core.Page;
import org.apache.wiki.pages.PageManager;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Assertions;
@@ -65,9 +65,9 @@ public class PageViewPluginTest
@Test
public void testShowCountsBasic() throws Exception
{
- final WikiPage page1 = testEngine.getManager( PageManager.class ).getPage( "TestPage01" );
+ final Page page1 = testEngine.getManager( PageManager.class ).getPage( "TestPage01" );
final WikiContext context1 = new WikiContext( testEngine, page1 );
- final WikiPage page2 = testEngine.getManager( PageManager.class ).getPage( "TestPage02" );
+ final Page page2 = testEngine.getManager( PageManager.class ).getPage( "TestPage02" );
final WikiContext context2 = new WikiContext( testEngine, page2 );
// generate counts:
@@ -79,7 +79,7 @@ public class PageViewPluginTest
final String pageViewPageContent = "[{PageViewPlugin show='list''\n\n* {1} ({2} views)\n}]";
testEngine.saveText( "PageViews", pageViewPageContent );
- final WikiPage pageviews = testEngine.getManager( PageManager.class ).getPage( "PageViews" );
+ final Page pageviews = testEngine.getManager( PageManager.class ).getPage( "PageViews" );
final WikiContext contextPV = new WikiContext( testEngine, pageviews );
final String result = testEngine.getRenderingManager().getHTML( contextPV, pageviews );
@@ -95,9 +95,9 @@ public class PageViewPluginTest
{
testEngine.saveText( "TestPageExcluded", "this is test page that should be excluded [{PageViewPlugin}]" );
- final WikiPage page1 = testEngine.getManager( PageManager.class ).getPage( "TestPage01" );
+ final Page page1 = testEngine.getManager( PageManager.class ).getPage( "TestPage01" );
final WikiContext context1 = new WikiContext( testEngine, page1 );
- final WikiPage page2 = testEngine.getManager( PageManager.class ).getPage( "TestPage02" );
+ final Page page2 = testEngine.getManager( PageManager.class ).getPage( "TestPage02" );
final WikiContext context2 = new WikiContext( testEngine, page2 );
// generate counts:
@@ -109,7 +109,7 @@ public class PageViewPluginTest
final String pageViewPageContent = "[{PageViewPlugin show='list' exclude='TestPageExcl*' '\n\n* {1} ({2} views)\n}]";
testEngine.saveText( "PageViews", pageViewPageContent );
- final WikiPage pageviews = testEngine.getManager( PageManager.class ).getPage( "PageViews" );
+ final Page pageviews = testEngine.getManager( PageManager.class ).getPage( "PageViews" );
final WikiContext contextPV = new WikiContext( testEngine, pageviews );
final String result = testEngine.getRenderingManager().getHTML( contextPV, pageviews );
@@ -126,9 +126,9 @@ public class PageViewPluginTest
@Test
public void testShowCountsSorted() throws Exception
{
- final WikiPage page1 = testEngine.getManager( PageManager.class ).getPage( "TestPage01" );
+ final Page page1 = testEngine.getManager( PageManager.class ).getPage( "TestPage01" );
final WikiContext context1 = new WikiContext( testEngine, page1 );
- final WikiPage page2 = testEngine.getManager( PageManager.class ).getPage( "TestPage02" );
+ final Page page2 = testEngine.getManager( PageManager.class ).getPage( "TestPage02" );
final WikiContext context2 = new WikiContext( testEngine, page2 );
// generate counts:
@@ -140,7 +140,7 @@ public class PageViewPluginTest
final String pageViewPageContent = "[{PageViewPlugin show='list' sort=count '\n\n* {1} ({2} views)\n}]";
testEngine.saveText( "PageViews", pageViewPageContent );
- final WikiPage pageviews = testEngine.getManager( PageManager.class ).getPage( "PageViews" );
+ final Page pageviews = testEngine.getManager( PageManager.class ).getPage( "PageViews" );
final WikiContext contextPV = new WikiContext( testEngine, pageviews );
final String result = testEngine.getRenderingManager().getHTML( contextPV, pageviews );
@@ -160,13 +160,13 @@ public class PageViewPluginTest
testEngine.saveText( "TestPage03", "this is test page 03 [{PageViewPlugin}]" );
testEngine.saveText( "TestPage04", "this is test page 04 [{PageViewPlugin}]" );
- final WikiPage page1 = testEngine.getManager( PageManager.class ).getPage( "TestPage01" );
+ final Page page1 = testEngine.getManager( PageManager.class ).getPage( "TestPage01" );
final WikiContext context1 = new WikiContext( testEngine, page1 );
- final WikiPage page2 = testEngine.getManager( PageManager.class ).getPage( "TestPage02" );
+ final Page page2 = testEngine.getManager( PageManager.class ).getPage( "TestPage02" );
final WikiContext context2 = new WikiContext( testEngine, page2 );
- final WikiPage page3 = testEngine.getManager( PageManager.class ).getPage( "TestPage03" );
+ final Page page3 = testEngine.getManager( PageManager.class ).getPage( "TestPage03" );
final WikiContext context3 = new WikiContext( testEngine, page3 );
- final WikiPage page4 = testEngine.getManager( PageManager.class ).getPage( "TestPage04" );
+ final Page page4 = testEngine.getManager( PageManager.class ).getPage( "TestPage04" );
final WikiContext context4 = new WikiContext( testEngine, page4 );
// generate counts:
@@ -180,7 +180,7 @@ public class PageViewPluginTest
final String pageViewPageContent = "[{PageViewPlugin show='list' entries=3'\n\n* {1} ({2} views)\n}]";
testEngine.saveText( "PageViews", pageViewPageContent );
- final WikiPage pageviews = testEngine.getManager( PageManager.class ).getPage( "PageViews" );
+ final Page pageviews = testEngine.getManager( PageManager.class ).getPage( "PageViews" );
final WikiContext contextPV = new WikiContext( testEngine, pageviews );
final String result = testEngine.getRenderingManager().getHTML( contextPV, pageviews );
diff --git a/jspwiki-main/src/test/java/org/apache/wiki/providers/BasicAttachmentProviderTest.java b/jspwiki-main/src/test/java/org/apache/wiki/providers/BasicAttachmentProviderTest.java
index 282f2a5..ff7809e 100644
--- a/jspwiki-main/src/test/java/org/apache/wiki/providers/BasicAttachmentProviderTest.java
+++ b/jspwiki-main/src/test/java/org/apache/wiki/providers/BasicAttachmentProviderTest.java
@@ -20,8 +20,8 @@
package org.apache.wiki.providers;
import org.apache.wiki.TestEngine;
+import org.apache.wiki.api.core.Attachment;
import org.apache.wiki.api.exceptions.ProviderException;
-import org.apache.wiki.attachment.Attachment;
import org.apache.wiki.util.FileUtil;
import org.awaitility.Awaitility;
import org.awaitility.core.ConditionFactory;
@@ -123,7 +123,7 @@ public class BasicAttachmentProviderTest {
@Test
public void testPutAttachmentUTF8() throws Exception {
final File in = makeAttachmentFile();
- final Attachment att = new Attachment( m_engine, NAME1, "\u3072\u3048\u308b\u00e5\u00e4\u00f6test.f\u00fc\u00fc" );
+ final Attachment att = new org.apache.wiki.attachment.Attachment( m_engine, NAME1, "\u3072\u3048\u308b\u00e5\u00e4\u00f6test.f\u00fc\u00fc" );
m_provider.putAttachmentData( att, new FileInputStream(in) );
final List< Attachment > res = m_provider.listAllChanged( new Date(0L) );
@@ -134,7 +134,7 @@ public class BasicAttachmentProviderTest {
@Test
public void testGetAttachmentDataRaisesProviderExceptionIfInexistentFileOnDisk() {
- final Attachment att = new Attachment( m_engine, NAME1, "test1.txt" );
+ final Attachment att = new org.apache.wiki.attachment.Attachment( m_engine, NAME1, "test1.txt" );
Assertions.assertThrows( ProviderException.class, () -> m_provider.getAttachmentData( att ) );
}
@@ -164,12 +164,12 @@ public class BasicAttachmentProviderTest {
@Test
public void testListAll() throws Exception {
final File in = makeAttachmentFile();
- final Attachment att = new Attachment( m_engine, NAME1, "test1.txt" );
+ final Attachment att = new org.apache.wiki.attachment.Attachment( m_engine, NAME1, "test1.txt" );
m_provider.putAttachmentData( att, new FileInputStream(in) );
awaitility().await( "testListAll" ).until( attachmentIsSaved( att ) );
- final Attachment att2 = new Attachment( m_engine, NAME2, "test2.txt" );
+ final Attachment att2 = new org.apache.wiki.attachment.Attachment( m_engine, NAME2, "test2.txt" );
m_provider.putAttachmentData( att2, new FileInputStream(in) );
final List< Attachment > res = m_provider.listAllChanged( new Date(0L) );
@@ -193,12 +193,12 @@ public class BasicAttachmentProviderTest {
final File sDir = new File(m_engine.getWikiProperties().getProperty( BasicAttachmentProvider.PROP_STORAGEDIR ) );
makeExtraFile( sDir, "foobar.blob" );
- final Attachment att = new Attachment( m_engine, NAME1, "test1.txt" );
+ final Attachment att = new org.apache.wiki.attachment.Attachment( m_engine, NAME1, "test1.txt" );
m_provider.putAttachmentData( att, new FileInputStream(in) );
awaitility().await( "testListAllExtrafile" ).until( attachmentIsSaved( att ) );
- final Attachment att2 = new Attachment( m_engine, NAME2, "test2.txt" );
+ final Attachment att2 = new org.apache.wiki.attachment.Attachment( m_engine, NAME2, "test2.txt" );
m_provider.putAttachmentData( att2, new FileInputStream(in) );
final List< Attachment > res = m_provider.listAllChanged( new Date(0L) );
@@ -221,13 +221,13 @@ public class BasicAttachmentProviderTest {
final File sDir = new File( m_engine.getWikiProperties().getProperty( BasicAttachmentProvider.PROP_STORAGEDIR ) );
final File attDir = new File( sDir, NAME1+"-att" );
- final Attachment att = new Attachment( m_engine, NAME1, "test1.txt" );
+ final Attachment att = new org.apache.wiki.attachment.Attachment( m_engine, NAME1, "test1.txt" );
m_provider.putAttachmentData( att, new FileInputStream(in) );
makeExtraFile( attDir, "ping.pong" );
awaitility().await( "testListAllExtrafileInAttachmentDir" ).until( attachmentIsSaved( att ) );
- final Attachment att2 = new Attachment( m_engine, NAME2, "test2.txt" );
+ final Attachment att2 = new org.apache.wiki.attachment.Attachment( m_engine, NAME2, "test2.txt" );
m_provider.putAttachmentData( att2, new FileInputStream(in) );
@@ -250,7 +250,7 @@ public class BasicAttachmentProviderTest {
final File in = makeAttachmentFile();
final File sDir = new File(m_engine.getWikiProperties().getProperty( BasicAttachmentProvider.PROP_STORAGEDIR ));
final File attDir = new File( sDir, NAME1+"-att" );
- final Attachment att = new Attachment( m_engine, NAME1, "test1.txt" );
+ final Attachment att = new org.apache.wiki.attachment.Attachment( m_engine, NAME1, "test1.txt" );
m_provider.putAttachmentData( att, new FileInputStream(in) );
// This is our extraneous directory.
@@ -259,7 +259,7 @@ public class BasicAttachmentProviderTest {
awaitility().await( "testListAllExtradirInAttachmentDir" ).until( attachmentIsSaved( att ) );
- final Attachment att2 = new Attachment( m_engine, NAME2, "test2.txt" );
+ final Attachment att2 = new org.apache.wiki.attachment.Attachment( m_engine, NAME2, "test2.txt" );
m_provider.putAttachmentData( att2, new FileInputStream(in) );
@@ -277,12 +277,12 @@ public class BasicAttachmentProviderTest {
@Test
public void testListAllNoExtension() throws Exception {
final File in = makeAttachmentFile();
- final Attachment att = new Attachment( m_engine, NAME1, "test1." );
+ final Attachment att = new org.apache.wiki.attachment.Attachment( m_engine, NAME1, "test1." );
m_provider.putAttachmentData( att, new FileInputStream(in) );
awaitility().await( "testListAllNoExtension" ).until( attachmentIsSaved( att ) );
- final Attachment att2 = new Attachment( m_engine, NAME2, "test2." );
+ final Attachment att2 = new org.apache.wiki.attachment.Attachment( m_engine, NAME2, "test2." );
m_provider.putAttachmentData( att2, new FileInputStream(in) );
final List< Attachment > res = m_provider.listAllChanged( new Date( 0L ) );
diff --git a/jspwiki-main/src/test/java/org/apache/wiki/providers/CachingProviderTest.java b/jspwiki-main/src/test/java/org/apache/wiki/providers/CachingProviderTest.java
index c2543c4..dfbdcd2 100644
--- a/jspwiki-main/src/test/java/org/apache/wiki/providers/CachingProviderTest.java
+++ b/jspwiki-main/src/test/java/org/apache/wiki/providers/CachingProviderTest.java
@@ -21,7 +21,7 @@ package org.apache.wiki.providers;
import net.sf.ehcache.CacheManager;
import org.apache.wiki.TestEngine;
-import org.apache.wiki.WikiPage;
+import org.apache.wiki.api.core.Page;
import org.apache.wiki.pages.PageManager;
import org.apache.wiki.util.FileUtil;
import org.awaitility.Awaitility;
@@ -93,7 +93,7 @@ public class CachingProviderTest
out.close();
Awaitility.await( "testSneakyAdd" ).until( () -> engine.getManager( PageManager.class ).getPage( "Testi" ) != null );
- final WikiPage p = engine.getManager( PageManager.class ).getPage( "Testi" );
+ final Page p = engine.getManager( PageManager.class ).getPage( "Testi" );
Assertions.assertNotNull( p, "page did not exist?" );
final String text = engine.getManager( PageManager.class ).getText( "Testi");
diff --git a/jspwiki-main/src/test/java/org/apache/wiki/providers/VersioningFileProviderTest.java b/jspwiki-main/src/test/java/org/apache/wiki/providers/VersioningFileProviderTest.java
index 301a968..44eb925 100644
--- a/jspwiki-main/src/test/java/org/apache/wiki/providers/VersioningFileProviderTest.java
+++ b/jspwiki-main/src/test/java/org/apache/wiki/providers/VersioningFileProviderTest.java
@@ -23,6 +23,8 @@ import net.sf.ehcache.CacheManager;
import org.apache.wiki.TestEngine;
import org.apache.wiki.WikiContext;
import org.apache.wiki.WikiPage;
+import org.apache.wiki.api.core.Page;
+import org.apache.wiki.api.providers.PageProvider;
import org.apache.wiki.auth.Users;
import org.apache.wiki.pages.PageManager;
import org.apache.wiki.util.FileUtil;
@@ -90,7 +92,7 @@ public class VersioningFileProviderTest
final String res = engine.getManager( PageManager.class ).getText( NAME1 );
Assertions.assertEquals( fakeWikiPage, res, "fetch latest should work" );
- final WikiPage page = engine.getManager( PageManager.class ).getPage( NAME1, 1 );
+ final Page page = engine.getManager( PageManager.class ).getPage( NAME1, 1 );
Assertions.assertEquals( 1, page.getVersion(), "original version expected" );
Assertions.assertEquals( OLD_AUTHOR, page.getAuthor(), "original author" );
}
@@ -114,7 +116,7 @@ public class VersioningFileProviderTest
res = engine.getManager( PageManager.class ).getText( NAME1, 1 ); // Should be the first version.
Assertions.assertEquals( "foobar", res, "fetch by direct version did not work" );
- final WikiPage page = engine.getManager( PageManager.class ).getPage( NAME1 );
+ final Page page = engine.getManager( PageManager.class ).getPage( NAME1 );
Assertions.assertEquals( 1, page.getVersion(), "original version expected" );
Assertions.assertNull( page.getAuthor(), "original author not expected" );
}
@@ -142,7 +144,7 @@ public class VersioningFileProviderTest
res = engine.getManager( PageManager.class ).getText( NAME1, 1 ); // Should be the first version.
Assertions.assertEquals( fakeWikiPage, res, "fetch by direct version did not work" );
- final WikiPage page = engine.getManager( PageManager.class ).getPage( NAME1, 1 );
+ final Page page = engine.getManager( PageManager.class ).getPage( NAME1, 1 );
Assertions.assertEquals( 1, page.getVersion(), "original version expected" );
Assertions.assertEquals( OLD_AUTHOR, page.getAuthor(), "original author" );
}
@@ -187,11 +189,11 @@ public class VersioningFileProviderTest
final String result4 = engine.getManager( PageManager.class ).getText( NAME1, 1 );
Assertions.assertEquals( fakeWikiPage, result4, "fetch original by version Assertions.failed" );
- final WikiPage pageNew = engine.getManager( PageManager.class ).getPage( NAME1, 2 );
+ final Page pageNew = engine.getManager( PageManager.class ).getPage( NAME1, 2 );
Assertions.assertEquals( 2, pageNew.getVersion(), "new version" );
Assertions.assertEquals( "Guest", pageNew.getAuthor(), "new author" );
- final WikiPage pageOld = engine.getManager( PageManager.class ).getPage( NAME1, 1 );
+ final Page pageOld = engine.getManager( PageManager.class ).getPage( NAME1, 1 );
Assertions.assertEquals( 1, pageOld.getVersion(), "old version" );
Assertions.assertEquals( OLD_AUTHOR, pageOld.getAuthor(), "old author" );
}
@@ -239,15 +241,15 @@ public class VersioningFileProviderTest
final String result4 = engine.getManager( PageManager.class ).getText( NAME1, 2 );
Assertions.assertEquals( text2, result4, "fetch original by version Assertions.failed" );
- final WikiPage pageNew = engine.getManager( PageManager.class ).getPage( NAME1 );
+ final Page pageNew = engine.getManager( PageManager.class ).getPage( NAME1 );
Assertions.assertEquals( 3, pageNew.getVersion(), "newest version" );
Assertions.assertEquals( pageNew.getAuthor(), "Guest", "newest author" );
- final WikiPage pageMiddle = engine.getManager( PageManager.class ).getPage( NAME1, 2 );
+ final Page pageMiddle = engine.getManager( PageManager.class ).getPage( NAME1, 2 );
Assertions.assertEquals( 2, pageMiddle.getVersion(), "middle version" );
Assertions.assertEquals( Users.JANNE, pageMiddle.getAuthor(), "middle author" );
- final WikiPage pageOld = engine.getManager( PageManager.class ).getPage( NAME1, 1 );
+ final Page pageOld = engine.getManager( PageManager.class ).getPage( NAME1, 1 );
Assertions.assertEquals( 1, pageOld.getVersion(), "old version" );
Assertions.assertEquals( OLD_AUTHOR, pageOld.getAuthor(), "old author" );
}
@@ -306,15 +308,15 @@ public class VersioningFileProviderTest
final String result4 = engine.getManager( PageManager.class ).getText( NAME1, 2 );
Assertions.assertEquals( text2, result4, "fetch original by version Assertions.failed" );
- final WikiPage pageNew = engine.getManager( PageManager.class ).getPage( NAME1 );
+ final Page pageNew = engine.getManager( PageManager.class ).getPage( NAME1 );
Assertions.assertEquals( 3, pageNew.getVersion(), "newest version" );
Assertions.assertEquals( "Guest", pageNew.getAuthor(), "newest author" );
- final WikiPage pageMiddle = engine.getManager( PageManager.class ).getPage( NAME1, 2 );
+ final Page pageMiddle = engine.getManager( PageManager.class ).getPage( NAME1, 2 );
Assertions.assertEquals( 2, pageMiddle.getVersion(), "middle version" );
Assertions.assertEquals( Users.JANNE, pageMiddle.getAuthor(), "middle author" );
- final WikiPage pageOld = engine.getManager( PageManager.class ).getPage( NAME1, 1 );
+ final Page pageOld = engine.getManager( PageManager.class ).getPage( NAME1, 1 );
Assertions.assertEquals( 1, pageOld.getVersion(), "old version" );
Assertions.assertEquals( OLD_AUTHOR, pageOld.getAuthor(), "old author" );
}
@@ -333,7 +335,7 @@ public class VersioningFileProviderTest
engine.saveText( name, text );
}
- final WikiPage pageinfo = engine.getManager( PageManager.class ).getPage( NAME1 );
+ final Page pageinfo = engine.getManager( PageManager.class ).getPage( NAME1 );
Assertions.assertEquals( maxver, pageinfo.getVersion(), "wrong version" );
@@ -362,7 +364,7 @@ public class VersioningFileProviderTest
engine.saveText( NAME1, text );
- final WikiPage page = engine.getManager( PageManager.class ).getPage( NAME1, 1 );
+ final Page page = engine.getManager( PageManager.class ).getPage( NAME1, 1 );
Assertions.assertEquals( NAME1, page.getName(), "name" );
Assertions.assertEquals( 1, page.getVersion(), "version" );
@@ -376,7 +378,7 @@ public class VersioningFileProviderTest
engine.saveText( NAME1, text );
- final WikiPage res = engine.getManager( PageManager.class ).getPage(NAME1);
+ final Page res = engine.getManager( PageManager.class ).getPage(NAME1);
Assertions.assertEquals( 1, res.getVersion() );
}
@@ -393,7 +395,7 @@ public class VersioningFileProviderTest
engine.saveText( NAME1, text2 );
engine.saveText( NAME1, text3 );
- final WikiPage res = engine.getManager( PageManager.class ).getPage(NAME1);
+ final Page res = engine.getManager( PageManager.class ).getPage(NAME1);
Assertions.assertEquals( 3, res.getVersion(), "wrong version" );
@@ -414,7 +416,7 @@ public class VersioningFileProviderTest
engine.saveText( NAME1, text2 );
engine.saveText( NAME1, text3 );
- final WikiPage res = engine.getManager( PageManager.class ).getPage(NAME1);
+ final Page res = engine.getManager( PageManager.class ).getPage(NAME1);
Assertions.assertEquals( 3, res.getVersion(), "wrong version" );
@@ -438,7 +440,7 @@ public class VersioningFileProviderTest
engine.saveText( NAME1, text2 );
engine.saveText( NAME1, text3 );
- final WikiPage res = engine.getManager( PageManager.class ).getPage(NAME1);
+ final Page res = engine.getManager( PageManager.class ).getPage(NAME1);
Assertions.assertEquals( 3, res.getVersion(), "wrong version" );
@@ -479,7 +481,7 @@ public class VersioningFileProviderTest
engine.saveText( NAME1, "v3" );
final PageManager mgr = engine.getManager( PageManager.class );
- final WikiPageProvider provider = mgr.getProvider();
+ final PageProvider provider = mgr.getProvider();
provider.deletePage( NAME1 );
@@ -496,7 +498,7 @@ public class VersioningFileProviderTest
engine.saveText( NAME1, "v3\r\n" );
final PageManager mgr = engine.getManager( PageManager.class );
- final WikiPageProvider provider = mgr.getProvider();
+ final PageProvider provider = mgr.getProvider();
List l = provider.getVersionHistory( NAME1 );
Assertions.assertEquals( 3, l.size(), "wrong # of versions" );
@@ -532,7 +534,7 @@ public class VersioningFileProviderTest
engine.getManager( PageManager.class ).saveText( context, "test" );
- final WikiPage p2 = engine.getManager( PageManager.class ).getPage( NAME1 );
+ final Page p2 = engine.getManager( PageManager.class ).getPage( NAME1 );
Assertions.assertEquals( "Test change", p2.getAttribute(WikiPage.CHANGENOTE) );
}
@@ -552,11 +554,11 @@ public class VersioningFileProviderTest
context.getPage().setAttribute(WikiPage.CHANGENOTE, "Change 2" );
engine.getManager( PageManager.class ).saveText( context, "test2" );
- final WikiPage p2 = engine.getManager( PageManager.class ).getPage( NAME1, 1 );
+ final Page p2 = engine.getManager( PageManager.class ).getPage( NAME1, 1 );
Assertions.assertEquals( "Test change", p2.getAttribute(WikiPage.CHANGENOTE) );
- final WikiPage p3 = engine.getManager( PageManager.class ).getPage( NAME1, 2 );
+ final Page p3 = engine.getManager( PageManager.class ).getPage( NAME1, 2 );
Assertions.assertEquals( "Change 2", p3.getAttribute(WikiPage.CHANGENOTE) );
}
@@ -582,7 +584,7 @@ public class VersioningFileProviderTest
engine.getManager( PageManager.class ).saveText( context, "test"+i );
}
- final WikiPage p3 = engine.getManager( PageManager.class ).getPage( NAME1, -1 );
+ final Page p3 = engine.getManager( PageManager.class ).getPage( NAME1, -1 );
Assertions.assertEquals( null, (String)p3.getAttribute(WikiPage.CHANGENOTE) );
}
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 9a453b6..c1ebf33 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
@@ -22,7 +22,7 @@ import net.sf.ehcache.CacheManager;
import org.apache.commons.lang3.time.StopWatch;
import org.apache.wiki.TestEngine;
import org.apache.wiki.WikiContext;
-import org.apache.wiki.WikiPage;
+import org.apache.wiki.api.core.Page;
import org.apache.wiki.pages.PageManager;
import org.apache.wiki.parser.MarkupParser;
import org.apache.wiki.parser.WikiDocument;
@@ -114,7 +114,7 @@ public class RenderingManagerTest {
for( int i = 0; i < 300; i++ )
{
- final WikiPage page = m_engine.getManager( PageManager.class ).getPage( "TestPage" );
+ final Page page = m_engine.getManager( PageManager.class ).getPage( "TestPage" );
final String pagedata = m_engine.getManager( PageManager.class ).getPureText( page );
final WikiContext context = new WikiContext( m_engine, page );
@@ -136,7 +136,7 @@ public class RenderingManagerTest {
sw.start();
for( int i = 0; i < 300; i++ ) {
- final WikiPage page = m_engine.getManager( PageManager.class ).getPage( "TestPage" );
+ final Page page = m_engine.getManager( PageManager.class ).getPage( "TestPage" );
final String pagedata = m_engine.getManager( PageManager.class ).getPureText( page );
final WikiContext context = new WikiContext( m_engine, page );
final String html = m_manager.getHTML( context, pagedata );
diff --git a/jspwiki-main/src/test/java/org/apache/wiki/rss/RSSGeneratorTest.java b/jspwiki-main/src/test/java/org/apache/wiki/rss/RSSGeneratorTest.java
index ecef0e8..ae6b754 100644
--- a/jspwiki-main/src/test/java/org/apache/wiki/rss/RSSGeneratorTest.java
+++ b/jspwiki-main/src/test/java/org/apache/wiki/rss/RSSGeneratorTest.java
@@ -25,7 +25,7 @@ package org.apache.wiki.rss;
import net.sf.ehcache.CacheManager;
import org.apache.wiki.TestEngine;
import org.apache.wiki.WikiContext;
-import org.apache.wiki.WikiPage;
+import org.apache.wiki.api.core.Page;
import org.apache.wiki.pages.PageManager;
import org.apache.wiki.plugin.WeblogEntryPlugin;
import org.apache.wiki.plugin.WeblogPlugin;
@@ -81,7 +81,7 @@ public class RSSGeneratorTest {
final WeblogPlugin blogplugin = new WeblogPlugin();
- final List< WikiPage > entries = blogplugin.findBlogEntries( m_testEngine,
+ final List< Page > entries = blogplugin.findBlogEntries( m_testEngine,
"TestBlog",
new Date(0),
new Date(Long.MAX_VALUE) );
@@ -112,7 +112,7 @@ public class RSSGeneratorTest {
final WeblogPlugin blogplugin = new WeblogPlugin();
- final List< WikiPage > entries = blogplugin.findBlogEntries( m_testEngine,
+ final List< Page > entries = blogplugin.findBlogEntries( m_testEngine,
"TestBlog",
new Date(0),
new Date(Long.MAX_VALUE) );
diff --git a/jspwiki-main/src/test/java/org/apache/wiki/search/SearchManagerTest.java b/jspwiki-main/src/test/java/org/apache/wiki/search/SearchManagerTest.java
index 1f77ed2..1f7374e 100644
--- a/jspwiki-main/src/test/java/org/apache/wiki/search/SearchManagerTest.java
+++ b/jspwiki-main/src/test/java/org/apache/wiki/search/SearchManagerTest.java
@@ -22,6 +22,7 @@ import net.sf.ehcache.CacheManager;
import net.sourceforge.stripes.mock.MockHttpServletRequest;
import org.apache.wiki.TestEngine;
import org.apache.wiki.WikiContext;
+import org.apache.wiki.api.search.SearchResult;
import org.apache.wiki.pages.PageManager;
import org.awaitility.Awaitility;
import org.junit.jupiter.api.AfterEach;
diff --git a/jspwiki-main/src/test/java/org/apache/wiki/stress/StressTestVersioningProvider.java b/jspwiki-main/src/test/java/org/apache/wiki/stress/StressTestVersioningProvider.java
index 4f31246..c8be388 100644
--- a/jspwiki-main/src/test/java/org/apache/wiki/stress/StressTestVersioningProvider.java
+++ b/jspwiki-main/src/test/java/org/apache/wiki/stress/StressTestVersioningProvider.java
@@ -19,7 +19,7 @@
package org.apache.wiki.stress;
import org.apache.wiki.TestEngine;
-import org.apache.wiki.WikiPage;
+import org.apache.wiki.api.core.Page;
import org.apache.wiki.pages.PageManager;
import org.apache.wiki.providers.FileSystemProvider;
import org.junit.jupiter.api.AfterEach;
@@ -68,7 +68,7 @@ public class StressTestVersioningProvider {
mark.stop();
System.out.println("Benchmark: "+mark.toString(2000)+" pages/second");
- final WikiPage pageinfo = engine.getManager( PageManager.class ).getPage( NAME1 );
+ final Page pageinfo = engine.getManager( PageManager.class ).getPage( NAME1 );
Assertions.assertEquals( maxver, pageinfo.getVersion(), "wrong version" );
@@ -98,7 +98,7 @@ public class StressTestVersioningProvider {
mark.reset();
mark.start();
- final Collection< WikiPage > pages = engine.getManager( PageManager.class ).getAllPages();
+ final Collection< Page > pages = engine.getManager( PageManager.class ).getAllPages();
mark.stop();
System.out.println("Got a list of all pages in "+mark);
@@ -106,7 +106,7 @@ public class StressTestVersioningProvider {
mark.reset();
mark.start();
- for( final WikiPage page : pages ) {
+ for( final Page page : pages ) {
final String foo = engine.getManager( PageManager.class ).getPureText( page );
Assertions.assertNotNull( foo );
}
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 112a214..acafb5e 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
@@ -28,6 +28,7 @@ import org.apache.wiki.WikiContext;
import org.apache.wiki.WikiEngine;
import org.apache.wiki.WikiPage;
import org.apache.wiki.api.core.Command;
+import org.apache.wiki.api.core.Page;
import org.apache.wiki.auth.GroupPrincipal;
import org.apache.wiki.pages.PageManager;
import org.junit.jupiter.api.AfterEach;
@@ -126,7 +127,7 @@ public class CommandResolverTest {
@Test
public void testFindWikiActionWithParams() {
- final WikiPage page = m_engine.getManager( PageManager.class ).getPage( "SinglePage" );
+ final Page page = m_engine.getManager( PageManager.class ).getPage( "SinglePage" );
// Passing an EDIT request with page param yields a wrapped action
MockHttpServletRequest request = m_engine.newHttpRequest( "/Edit.jsp?page=SinglePage" );
diff --git a/jspwiki-main/src/test/java/org/apache/wiki/ui/PageCommandTest.java b/jspwiki-main/src/test/java/org/apache/wiki/ui/PageCommandTest.java
index ed81d7a..6d17376 100644
--- a/jspwiki-main/src/test/java/org/apache/wiki/ui/PageCommandTest.java
+++ b/jspwiki-main/src/test/java/org/apache/wiki/ui/PageCommandTest.java
@@ -23,8 +23,8 @@
package org.apache.wiki.ui;
import org.apache.wiki.TestEngine;
-import org.apache.wiki.WikiPage;
import org.apache.wiki.api.core.Command;
+import org.apache.wiki.api.core.Page;
import org.apache.wiki.auth.permissions.PermissionFactory;
import org.apache.wiki.pages.PageManager;
import org.junit.jupiter.api.Assertions;
@@ -66,7 +66,7 @@ public class PageCommandTest {
public void testTargetedCommand() throws Exception {
final TestEngine testEngine = TestEngine.build();
testEngine.saveText( "TestPage", "This is a test." );
- final WikiPage testPage = testEngine.getManager( PageManager.class ).getPage( "TestPage" );
+ final Page testPage = testEngine.getManager( PageManager.class ).getPage( "TestPage" );
// Get view command
Command a = PageCommand.VIEW;
diff --git a/jspwiki-main/src/test/java/org/apache/wiki/xmlrpc/RPCHandlerTest.java b/jspwiki-main/src/test/java/org/apache/wiki/xmlrpc/RPCHandlerTest.java
index e8902d1..9491231 100644
--- a/jspwiki-main/src/test/java/org/apache/wiki/xmlrpc/RPCHandlerTest.java
+++ b/jspwiki-main/src/test/java/org/apache/wiki/xmlrpc/RPCHandlerTest.java
@@ -23,6 +23,7 @@ import net.sf.ehcache.CacheManager;
import org.apache.wiki.TestEngine;
import org.apache.wiki.WikiContext;
import org.apache.wiki.WikiPage;
+import org.apache.wiki.api.core.Page;
import org.apache.wiki.attachment.Attachment;
import org.apache.wiki.pages.PageManager;
import org.apache.xmlrpc.XmlRpcException;
@@ -87,7 +88,7 @@ public class RPCHandlerTest
final Vector previousChanges = m_handler.getRecentChanges( time );
m_engine.saveText( NAME1, "Foo" );
- final WikiPage directInfo = m_engine.getManager( PageManager.class ).getPage( NAME1 );
+ final Page directInfo = m_engine.getManager( PageManager.class ).getPage( NAME1 );
time = getCalendarTime( directInfo.getLastModified() );
final Vector recentChanges = m_handler.getRecentChanges( time );
@@ -105,7 +106,7 @@ public class RPCHandlerTest
final Attachment att = new Attachment( m_engine, NAME1, "TestAtt.txt" );
att.setAuthor( "FirstPost" );
m_engine.getAttachmentManager().storeAttachment( att, m_engine.makeAttachmentFile() );
- final WikiPage directInfo = m_engine.getManager( PageManager.class ).getPage( NAME1 );
+ final Page directInfo = m_engine.getManager( PageManager.class ).getPage( NAME1 );
time = getCalendarTime( directInfo.getLastModified() );
final Vector recentChanges = m_handler.getRecentChanges( time );
@@ -117,7 +118,7 @@ public class RPCHandlerTest
throws Exception
{
m_engine.saveText( NAME1, "Foobar.[{ALLOW view Anonymous}]" );
- final WikiPage directInfo = m_engine.getManager( PageManager.class ).getPage( NAME1 );
+ final Page directInfo = m_engine.getManager( PageManager.class ).getPage( NAME1 );
final Hashtable ht = m_handler.getPageInfo( NAME1 );
Assertions.assertEquals( (String)ht.get( "name" ), NAME1, "name" );
diff --git a/jspwiki-markdown/src/test/java/org/apache/wiki/render/markdown/MarkdownRendererTest.java b/jspwiki-markdown/src/test/java/org/apache/wiki/render/markdown/MarkdownRendererTest.java
index c922652..38d9f57 100644
--- a/jspwiki-markdown/src/test/java/org/apache/wiki/render/markdown/MarkdownRendererTest.java
+++ b/jspwiki-markdown/src/test/java/org/apache/wiki/render/markdown/MarkdownRendererTest.java
@@ -105,7 +105,7 @@ public class MarkdownRendererTest {
Assertions.assertEquals( "<p> This should be visible if the ACL allows you to see it</p>\n", translate( src ) );
// in any case, we also check that the created wikipage has the ACL added
Assertions.assertEquals( " user = PerryMason: ((\"org.apache.wiki.auth.permissions.PagePermission\",\"JSPWiki:testpage\",\"view\"))\n",
- testEngine.getManager( PageManager.class ).getPage( PAGE_NAME ).getAcl().toString() );
+ ( ( WikiPage )testEngine.getManager( PageManager.class ).getPage( PAGE_NAME ) ).getAcl().toString() );
}
@Test