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/08/08 22:30:53 UTC
[jspwiki] 04/07: move getI18nHTML( String pagename ) to TestEngine
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 cb4c8864b079849fec72d76789ca162d9e44285d
Author: juanpablo <ju...@apache.org>
AuthorDate: Fri Aug 9 00:25:04 2019 +0200
move getI18nHTML( String pagename ) to TestEngine
---
.../src/test/java/org/apache/wiki/TestEngine.java | 41 ++++++++++++++--------
.../apache/wiki/plugin/TableOfContentsTest.java | 38 ++++++--------------
2 files changed, 37 insertions(+), 42 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 f372177..e9e2b6c 100644
--- a/jspwiki-main/src/test/java/org/apache/wiki/TestEngine.java
+++ b/jspwiki-main/src/test/java/org/apache/wiki/TestEngine.java
@@ -19,17 +19,9 @@
package org.apache.wiki;
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.StringReader;
-import java.util.Locale;
-import java.util.Properties;
-
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-
+import net.sourceforge.stripes.mock.MockHttpServletRequest;
+import net.sourceforge.stripes.mock.MockHttpSession;
+import net.sourceforge.stripes.mock.MockServletContext;
import org.apache.commons.lang.StringUtils;
import org.apache.log4j.Logger;
import org.apache.wiki.api.exceptions.ProviderException;
@@ -43,13 +35,20 @@ import org.apache.wiki.event.WikiPageEvent;
import org.apache.wiki.providers.AbstractFileProvider;
import org.apache.wiki.providers.BasicAttachmentProvider;
import org.apache.wiki.providers.FileSystemProvider;
+import org.apache.wiki.providers.WikiPageProvider;
import org.apache.wiki.util.FileUtil;
import org.apache.wiki.util.PropertyReader;
import org.apache.wiki.util.TextUtil;
-import net.sourceforge.stripes.mock.MockHttpServletRequest;
-import net.sourceforge.stripes.mock.MockHttpSession;
-import net.sourceforge.stripes.mock.MockServletContext;
+import javax.servlet.ServletContext;
+import javax.servlet.http.HttpServletRequest;
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.StringReader;
+import java.util.Locale;
+import java.util.Properties;
/**
* Simple test engine that always assumes pages are found.
@@ -401,6 +400,20 @@ public class TestEngine extends WikiEngine
saveText( context, content );
}
+ /**
+ * Some pages may produce some i18n text, so we enforce english locale in order to
+ * be able to compare properly to assertion texts.
+ *
+ * @param pagename name of the page.
+ * @return (english) contents corresponding to the given page name.
+ */
+ public String getI18nHTML( String pagename ) {
+ WikiPage page = getPage( pagename, WikiPageProvider.LATEST_VERSION );
+ WikiContext context = new WikiContext( this, newHttpRequest(), page );
+ context.setRequestContext( WikiContext.NONE );
+ return getHTML( context, page );
+ }
+
public static void trace()
{
try
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 a9fd877..c0b1ada 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
@@ -22,18 +22,15 @@
*/
package org.apache.wiki.plugin;
-import java.util.Properties;
-
import org.apache.wiki.TestEngine;
-import org.apache.wiki.WikiContext;
-import org.apache.wiki.WikiPage;
import org.apache.wiki.api.exceptions.WikiException;
-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 java.util.Properties;
+
/**
*
* @since
@@ -55,21 +52,6 @@ public class TableOfContentsTest
testEngine.deletePage( "Test" );
}
- /**
- * TableOfContents plugin produces some i18n text, so we enforce english locale in order to
- * be able to compare properly to assertion texts.
- *
- * @param pagename name of the page.
- * @return (english) contents corresponding to the given page name.
- */
- String getI18nHTML( String pagename )
- {
- WikiPage page = testEngine.getPage( pagename, WikiPageProvider.LATEST_VERSION );
- WikiContext context = new WikiContext( testEngine, testEngine.newHttpRequest(), page );
- context.setRequestContext( WikiContext.NONE );
- return testEngine.getHTML( context, page );
- }
-
@Test
public void testHeadingVariables()
throws Exception
@@ -78,7 +60,7 @@ public class TableOfContentsTest
testEngine.saveText( "Test", src );
- String res = getI18nHTML( "Test" );
+ String res = testEngine.getI18nHTML( "Test" );
// FIXME: The <p> should not be here.
Assertions.assertEquals( "<p><div class=\"toc\">\n<div class=\"collapsebox\">\n"+
@@ -98,7 +80,7 @@ public class TableOfContentsTest
testEngine.saveText( "Test", src );
- String res = getI18nHTML( "Test" );
+ String res = testEngine.getI18nHTML( "Test" );
// FIXME: The <p> should not be here.
String expecting = "<p><div class=\"toc\">\n<div class=\"collapsebox\">\n"+
@@ -123,7 +105,7 @@ public class TableOfContentsTest
testEngine.saveText( "Test", src );
- String res = getI18nHTML( "Test" );
+ String res = testEngine.getI18nHTML( "Test" );
// FIXME: The <p> should not be here.
String expecting = "<p><div class=\"toc\">\n<div class=\"collapsebox\">\n"+
@@ -159,7 +141,7 @@ public class TableOfContentsTest
testEngine.saveText( "Test", src );
- String res = getI18nHTML( "Test" );
+ String res = testEngine.getI18nHTML( "Test" );
// FIXME: The <p> should not be here.
String expecting = "<p><div class=\"toc\">\n<div class=\"collapsebox\">\n"+
@@ -197,7 +179,7 @@ public class TableOfContentsTest
testEngine.saveText( "Test", src );
- String res = getI18nHTML( "Test" );
+ String res = testEngine.getI18nHTML( "Test" );
// FIXME: The <p> should not be here.
String expecting = "<p><div class=\"toc\">\n<div class=\"collapsebox\">\n"+
@@ -227,7 +209,7 @@ public class TableOfContentsTest
testEngine.saveText( "Test", src );
- String res = getI18nHTML( "Test" );
+ String res = testEngine.getI18nHTML( "Test" );
Assertions.assertTrue( res.indexOf("Table of Contents") != -1 );
}
@@ -240,7 +222,7 @@ public class TableOfContentsTest
testEngine.saveText( "Test", src );
- String res = getI18nHTML( "Test" );
+ String res = testEngine.getI18nHTML( "Test" );
Assertions.assertTrue( res.indexOf("<i>") == -1, "<i>" ); // Check that there is no HTML left
Assertions.assertTrue( res.indexOf("</i>") == -1, "</i>" ); // Check that there is no HTML left
@@ -253,7 +235,7 @@ public class TableOfContentsTest
testEngine.saveText( "Test", src );
- String res = getI18nHTML( "Test" );
+ String res = testEngine.getI18nHTML( "Test" );
Assertions.assertTrue( res.indexOf( "id=\"section-Test-Test\"" ) != -1, "Final HTML 1" );
Assertions.assertTrue( res.indexOf( "id=\"section-Test-Test-2\"" ) != -1, "Final HTML 2" );