[jspwiki] 25/26: Fix remaining tests

[ju...@apache.org]

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 564888f0bfdab5e57dfb07de149a06a8b3e01488
Author: Juan Pablo Santos Rodríguez <ju...@gmail.com>
AuthorDate: Thu Dec 2 22:53:00 2021 +0100

    Fix remaining tests
---
 .../src/test/java/org/apache/wiki/pages/DefaultPageManagerTest.java | 4 ++--
 jspwiki-main/src/test/resources/ini/jspwiki.properties              | 2 +-
 .../java/org/apache/wiki/render/markdown/MarkdownRendererTest.java  | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

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 415d876..e6763f1 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
@@ -16,7 +16,6 @@
     specific language governing permissions and limitations
     under the License.
  */
-
 package org.apache.wiki.pages;
 
 import org.apache.wiki.TestEngine;
@@ -27,6 +26,7 @@ import org.apache.wiki.api.providers.AttachmentProvider;
 import org.apache.wiki.api.providers.WikiProvider;
 import org.apache.wiki.api.spi.Wiki;
 import org.apache.wiki.attachment.AttachmentManager;
+import org.apache.wiki.cache.CachingManager;
 import org.apache.wiki.providers.CachingProvider;
 import org.apache.wiki.providers.FileSystemProvider;
 import org.apache.wiki.providers.VerySimpleProvider;
@@ -86,7 +86,7 @@ public class DefaultPageManagerTest {
 
     @Test
     public void testPageCacheNotInUse() throws Exception {
-        engine.getWikiProperties().setProperty( "jspwiki.cache.enable", "false" );
+        engine.getManager( CachingManager.class ).shutdown();
         final PageManager m = new DefaultPageManager( engine, engine.getWikiProperties() );
 
         Assertions.assertFalse( m.getProvider() instanceof CachingProvider );
diff --git a/jspwiki-main/src/test/resources/ini/jspwiki.properties b/jspwiki-main/src/test/resources/ini/jspwiki.properties
index cdc4fb5..e133cb2 100644
--- a/jspwiki-main/src/test/resources/ini/jspwiki.properties
+++ b/jspwiki-main/src/test/resources/ini/jspwiki.properties
@@ -18,7 +18,7 @@
 jspwiki.applicationName = JSPWiki
 jspwiki.pageProvider = FileSystemProvider
 jspwiki.cache.enable = true
-jspwiki.attachmentProvider = BasicAttachmentProvider
+jspwiki.attachment.provider = BasicAttachmentProvider
 jspwiki.diffProvider = TraditionalDiffProvider
 jspwiki.encoding = UTF-8
 jspwiki.translatorReader.allowHTML = false
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 0d7e3a1..7fb1061 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
@@ -270,12 +270,12 @@ public class MarkdownRendererTest {
     }
 
     @BeforeEach
-    public void setUp() throws Exception {
+    public void setUp() {
         props.setProperty( "jspwiki.translatorReader.matchEnglishPlurals", "true" );
         props.setProperty( "jspwiki.fileSystemProvider.pageDir", "./target/md-pageDir" );
         props.setProperty( "jspwiki.renderingManager.markupParser", MarkdownParser.class.getName() );
         props.setProperty( "jspwiki.renderingManager.renderer", MarkdownRenderer.class.getName() );
-        testEngine = new TestEngine( props );
+        testEngine = TestEngine.build( props );
     }
 
     @AfterEach
@@ -286,7 +286,7 @@ public class MarkdownRendererTest {
         }
 
         created.clear();
-        // CacheManager.getInstance().removeAllCaches();
+        testEngine.shutdown();
     }
 
     String translate( final String src ) throws Exception {