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 2019/10/12 17:12:14 UTC
[jspwiki] 04/05: adapt test to latest TestEngine change
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 88af1a20aee6636b9fec8c1aa76819a8a8f3bd98
Author: juanpablo <ju...@apache.org>
AuthorDate: Sat Oct 12 19:11:22 2019 +0200
adapt test to latest TestEngine change
---
.../wiki/providers/VersioningFileProviderTest.java | 23 +++++++++++-----------
1 file changed, 11 insertions(+), 12 deletions(-)
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 1bca164..8d9da15 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
@@ -18,15 +18,7 @@
*/
package org.apache.wiki.providers;
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.StringReader;
-import java.io.Writer;
-import java.util.Collection;
-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;
@@ -38,7 +30,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.IOException;
+import java.io.StringReader;
+import java.io.Writer;
+import java.util.Collection;
+import java.util.List;
+import java.util.Properties;
// FIXME: Should this thingy go directly to the VersioningFileProvider,
// or should it rely on the WikiEngine API?
@@ -71,7 +70,7 @@ public class VersioningFileProviderTest
TestEngine.emptyWorkDir(null);
engine = new TestEngine(PROPS);
- files = PROPS.getProperty( AbstractFileProvider.PROP_PAGEDIR );
+ files = engine.getWikiProperties().getProperty( AbstractFileProvider.PROP_PAGEDIR );
}
@AfterEach
@@ -284,7 +283,7 @@ public class VersioningFileProviderTest
engine = new TestEngine(PROPS);
// the new TestEngine will have assigned a new page directory
- files = PROPS.getProperty( AbstractFileProvider.PROP_PAGEDIR );
+ files = engine.getWikiProperties().getProperty( AbstractFileProvider.PROP_PAGEDIR );
// we cannot switch PageProviders within a single test, so the
// initial FileSystemProvider wiki page must be faked.