You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by me...@apache.org on 2016/12/17 12:08:22 UTC
[1/3] jspwiki git commit: JSPWIKI-1035 - first updates from Jurgen
Repository: jspwiki
Updated Branches:
refs/heads/JSPWIKI-1035 [created] d5b597e81
JSPWIKI-1035 - first updates from Jurgen
Project: http://git-wip-us.apache.org/repos/asf/jspwiki/repo
Commit: http://git-wip-us.apache.org/repos/asf/jspwiki/commit/7ab07298
Tree: http://git-wip-us.apache.org/repos/asf/jspwiki/tree/7ab07298
Diff: http://git-wip-us.apache.org/repos/asf/jspwiki/diff/7ab07298
Branch: refs/heads/JSPWIKI-1035
Commit: 7ab07298811f5a3984dcacb712778ca2261321d6
Parents: 1ebca68
Author: Harry Metske <ha...@gmail.com>
Authored: Fri Dec 16 20:04:32 2016 +0100
Committer: Harry Metske <ha...@gmail.com>
Committed: Fri Dec 16 20:04:32 2016 +0100
----------------------------------------------------------------------
.../src/main/java/org/apache/wiki/WikiEngine.java | 13 ++++---------
.../apache/wiki/url/DefaultURLConstructor.java | 18 +-----------------
.../src/main/resources/ini/jspwiki.properties | 13 -------------
3 files changed, 5 insertions(+), 39 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jspwiki/blob/7ab07298/jspwiki-war/src/main/java/org/apache/wiki/WikiEngine.java
----------------------------------------------------------------------
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/WikiEngine.java b/jspwiki-war/src/main/java/org/apache/wiki/WikiEngine.java
index 39b4417..afb34f5 100644
--- a/jspwiki-war/src/main/java/org/apache/wiki/WikiEngine.java
+++ b/jspwiki-war/src/main/java/org/apache/wiki/WikiEngine.java
@@ -198,9 +198,6 @@ public class WikiEngine
/** If true, uses UTF8 encoding for all data */
private boolean m_useUTF8 = true;
- /** Stores the base URL. */
- private String m_baseURL;
-
/** Store the file path to the basic URL. When we're not running as
a servlet, it defaults to the user's current directory. */
private String m_rootPath = System.getProperty("user.dir");
@@ -533,11 +530,6 @@ public class WikiEngine
m_saveUserInfo );
m_useUTF8 = "UTF-8".equals( TextUtil.getStringProperty( props, PROP_ENCODING, "ISO-8859-1" ) );
- m_baseURL = TextUtil.getStringProperty(props, PROP_BASEURL, "");
- if (!m_baseURL.endsWith("/"))
- {
- m_baseURL = m_baseURL + "/";
- }
m_beautifyTitle = TextUtil.getBooleanProperty( props,
PROP_BEAUTIFYTITLE,
@@ -795,9 +787,12 @@ public class WikiEngine
public String getBaseURL()
{
- return m_baseURL;
+ String contextPath = m_servletContext.getContextPath();
+
+ return contextPath;
}
+
/**
* Returns the moment when this engine was started.
*
http://git-wip-us.apache.org/repos/asf/jspwiki/blob/7ab07298/jspwiki-war/src/main/java/org/apache/wiki/url/DefaultURLConstructor.java
----------------------------------------------------------------------
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/url/DefaultURLConstructor.java b/jspwiki-war/src/main/java/org/apache/wiki/url/DefaultURLConstructor.java
index 458bfca..8d8779c 100644
--- a/jspwiki-war/src/main/java/org/apache/wiki/url/DefaultURLConstructor.java
+++ b/jspwiki-war/src/main/java/org/apache/wiki/url/DefaultURLConstructor.java
@@ -60,23 +60,7 @@ public class DefaultURLConstructor
{
m_engine = engine;
- String baseurl = engine.getBaseURL();
-
- if( baseurl != null && baseurl.length() > 0 )
- {
- try
- {
- URL url = new URL( baseurl );
-
- String path = url.getPath();
-
- m_pathPrefix = path;
- }
- catch( MalformedURLException e )
- {
- m_pathPrefix = "/JSPWiki/"; // Just a guess.
- }
- }
+ m_pathPrefix = engine.getBaseURL() + "/";
}
/**
http://git-wip-us.apache.org/repos/asf/jspwiki/blob/7ab07298/jspwiki-war/src/main/resources/ini/jspwiki.properties
----------------------------------------------------------------------
diff --git a/jspwiki-war/src/main/resources/ini/jspwiki.properties b/jspwiki-war/src/main/resources/ini/jspwiki.properties
index c00c7f7..589cc8b 100644
--- a/jspwiki-war/src/main/resources/ini/jspwiki.properties
+++ b/jspwiki-war/src/main/resources/ini/jspwiki.properties
@@ -36,19 +36,6 @@
jspwiki.applicationName = JSPWiki
#
-# Describe where your wiki lives (the real URL through which it is available
-# through the internet/intranet). This is a mandatory attribute.
-#
-# Be careful if you use a localhost address (http://localhost/ or http://127.0.0.1/),
-# as this will cause some unwanted side effects if your wiki is accessed from
-# any other computer than where the wiki is running.
-#
-# Example:
-# jspwiki.baseURL = http://jspwiki.apache.org/
-#
-jspwiki.baseURL=http://localhost:8080/JSPWiki/
-
-#
# Which page provider class to use. Possibilities are:
#
# FileSystemProvider - for simple pure file storage with no version information
[2/3] jspwiki git commit: JSPWIKI-1035 fix JSPWikiMarkupParserTest
Posted by me...@apache.org.
JSPWIKI-1035 fix JSPWikiMarkupParserTest
Project: http://git-wip-us.apache.org/repos/asf/jspwiki/repo
Commit: http://git-wip-us.apache.org/repos/asf/jspwiki/commit/77d2e457
Tree: http://git-wip-us.apache.org/repos/asf/jspwiki/tree/77d2e457
Diff: http://git-wip-us.apache.org/repos/asf/jspwiki/diff/77d2e457
Branch: refs/heads/JSPWIKI-1035
Commit: 77d2e4576201aea2b001364f16ced993b59fff06
Parents: 7ab0729
Author: Harry Metske <ha...@gmail.com>
Authored: Fri Dec 16 20:09:51 2016 +0100
Committer: Harry Metske <ha...@gmail.com>
Committed: Fri Dec 16 20:09:51 2016 +0100
----------------------------------------------------------------------
.../wiki/parser/JSPWikiMarkupParserTest.java | 118 +++++++++----------
1 file changed, 59 insertions(+), 59 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jspwiki/blob/77d2e457/jspwiki-war/src/test/java/org/apache/wiki/parser/JSPWikiMarkupParserTest.java
----------------------------------------------------------------------
diff --git a/jspwiki-war/src/test/java/org/apache/wiki/parser/JSPWikiMarkupParserTest.java b/jspwiki-war/src/test/java/org/apache/wiki/parser/JSPWikiMarkupParserTest.java
index b2506a0..e9aa00a 100644
--- a/jspwiki-war/src/test/java/org/apache/wiki/parser/JSPWikiMarkupParserTest.java
+++ b/jspwiki-war/src/test/java/org/apache/wiki/parser/JSPWikiMarkupParserTest.java
@@ -164,7 +164,7 @@ public class JSPWikiMarkupParserTest extends TestCase
String src = "This should be a [hyperlink]";
- assertEquals( "This should be a <a class=\"wikipage\" href=\"/Wiki.jsp?page=Hyperlink\">hyperlink</a>",
+ assertEquals( "This should be a <a class=\"wikipage\" href=\"/test/Wiki.jsp?page=Hyperlink\">hyperlink</a>",
translate(src) );
}
@@ -175,7 +175,7 @@ public class JSPWikiMarkupParserTest extends TestCase
String src = "This should be a [hyperlink too]";
- assertEquals( "This should be a <a class=\"wikipage\" href=\"/Wiki.jsp?page=HyperlinkToo\">hyperlink too</a>",
+ assertEquals( "This should be a <a class=\"wikipage\" href=\"/test/Wiki.jsp?page=HyperlinkToo\">hyperlink too</a>",
translate(src) );
}
@@ -186,7 +186,7 @@ public class JSPWikiMarkupParserTest extends TestCase
String src = "This should be a [HyperLink]";
- assertEquals( "This should be a <a class=\"wikipage\" href=\"/Wiki.jsp?page=HyperLink\">HyperLink</a>",
+ assertEquals( "This should be a <a class=\"wikipage\" href=\"/test/Wiki.jsp?page=HyperLink\">HyperLink</a>",
translate(src) );
}
@@ -197,7 +197,7 @@ public class JSPWikiMarkupParserTest extends TestCase
String src = "This should be a [here|HyperLink]";
- assertEquals( "This should be a <a class=\"wikipage\" href=\"/Wiki.jsp?page=HyperLink\">here</a>",
+ assertEquals( "This should be a <a class=\"wikipage\" href=\"/test/Wiki.jsp?page=HyperLink\">here</a>",
translate(src) );
}
@@ -208,7 +208,7 @@ public class JSPWikiMarkupParserTest extends TestCase
String src = "This should be a [here|HyperLink#heading]";
- assertEquals( "This should be a <a class=\"wikipage\" href=\"/Wiki.jsp?page=HyperLink#section-HyperLink-Heading\">here</a>",
+ assertEquals( "This should be a <a class=\"wikipage\" href=\"/test/Wiki.jsp?page=HyperLink#section-HyperLink-Heading\">here</a>",
translate(src) );
}
@@ -219,7 +219,7 @@ public class JSPWikiMarkupParserTest extends TestCase
String src = "This should be a [HyperLink#heading]";
- assertEquals( "This should be a <a class=\"wikipage\" href=\"/Wiki.jsp?page=HyperLink#section-HyperLink-Heading\">HyperLink#heading</a>",
+ assertEquals( "This should be a <a class=\"wikipage\" href=\"/test/Wiki.jsp?page=HyperLink#section-HyperLink-Heading\">HyperLink#heading</a>",
translate(src) );
}
@@ -230,7 +230,7 @@ public class JSPWikiMarkupParserTest extends TestCase
String src = "!Heading Too\r\nThis should be a [HyperLink#heading too]";
- assertEquals( "<h4 id=\"section-testpage-HeadingToo\">Heading Too<a class=\"hashlink\" href=\"#section-testpage-HeadingToo\">#</a></h4>\nThis should be a <a class=\"wikipage\" href=\"/Wiki.jsp?page=HyperLink#section-HyperLink-HeadingToo\">HyperLink#heading too</a>",
+ assertEquals( "<h4 id=\"section-testpage-HeadingToo\">Heading Too<a class=\"hashlink\" href=\"#section-testpage-HeadingToo\">#</a></h4>\nThis should be a <a class=\"wikipage\" href=\"/test/Wiki.jsp?page=HyperLink#section-HyperLink-HeadingToo\">HyperLink#heading too</a>",
translate(src) );
}
@@ -242,7 +242,7 @@ public class JSPWikiMarkupParserTest extends TestCase
String src = "This should be a [HyperLink#headingwithnonASCIIZolt�n]";
- assertEquals( "This should be a <a class=\"wikipage\" href=\"/Wiki.jsp?page=HyperLink#section-HyperLink-HeadingwithnonASCIIZolt_E1n\">HyperLink#headingwithnonASCIIZolt�n</a>",
+ assertEquals( "This should be a <a class=\"wikipage\" href=\"/test/Wiki.jsp?page=HyperLink#section-HyperLink-HeadingwithnonASCIIZolt_E1n\">HyperLink#headingwithnonASCIIZolt�n</a>",
translate(src) );
}
@@ -258,7 +258,7 @@ public class JSPWikiMarkupParserTest extends TestCase
String src = "[DiscussionAboutWiki] [WikiMarkupDevelopment].";
- assertEquals( "<a class=\"wikipage\" href=\"/Wiki.jsp?page=DiscussionAboutWiki\">DiscussionAboutWiki</a> <a class=\"wikipage\" href=\"/Wiki.jsp?page=WikiMarkupDevelopment\">WikiMarkupDevelopment</a>.",
+ assertEquals( "<a class=\"wikipage\" href=\"/test/Wiki.jsp?page=DiscussionAboutWiki\">DiscussionAboutWiki</a> <a class=\"wikipage\" href=\"/test/Wiki.jsp?page=WikiMarkupDevelopment\">WikiMarkupDevelopment</a>.",
translate(src) );
}
@@ -269,7 +269,7 @@ public class JSPWikiMarkupParserTest extends TestCase
String src = "This should be a HyperLink.";
- assertEquals( "This should be a <a class=\"wikipage\" href=\"/Wiki.jsp?page=HyperLink\">HyperLink</a>.",
+ assertEquals( "This should be a <a class=\"wikipage\" href=\"/test/Wiki.jsp?page=HyperLink\">HyperLink</a>.",
translate(src) );
}
@@ -278,7 +278,7 @@ public class JSPWikiMarkupParserTest extends TestCase
{
String src = "This should be a HyperLink.";
- assertEquals( "This should be a <a class=\"createpage\" href=\"/Edit.jsp?page=HyperLink\" title=\"Create "HyperLink"\">HyperLink</a>.",
+ assertEquals( "This should be a <a class=\"createpage\" href=\"/test/Edit.jsp?page=HyperLink\" title=\"Create "HyperLink"\">HyperLink</a>.",
translate(src) );
}
@@ -294,7 +294,7 @@ public class JSPWikiMarkupParserTest extends TestCase
String src = "This should be a [ HyperLink ].";
- assertEquals( "This should be a <a class=\"wikipage\" href=\"/Wiki.jsp?page=HyperLink\"> HyperLink </a>.",
+ assertEquals( "This should be a <a class=\"wikipage\" href=\"/test/Wiki.jsp?page=HyperLink\"> HyperLink </a>.",
translate(src) );
}
@@ -318,7 +318,7 @@ public class JSPWikiMarkupParserTest extends TestCase
String src = "This should be a HyperLink, and ThisToo.";
- assertEquals( "This should be a <a class=\"wikipage\" href=\"/Wiki.jsp?page=HyperLink\">HyperLink</a>, and <a class=\"wikipage\" href=\"/Wiki.jsp?page=ThisToo\">ThisToo</a>.",
+ assertEquals( "This should be a <a class=\"wikipage\" href=\"/test/Wiki.jsp?page=HyperLink\">HyperLink</a>, and <a class=\"wikipage\" href=\"/test/Wiki.jsp?page=ThisToo\">ThisToo</a>.",
translate(src) );
}
@@ -333,7 +333,7 @@ public class JSPWikiMarkupParserTest extends TestCase
String src = "This should be a [HyperLink], and ThisToo.";
- assertEquals( "This should be a <a class=\"wikipage\" href=\"/Wiki.jsp?page=HyperLink\">HyperLink</a>, and <a class=\"wikipage\" href=\"/Wiki.jsp?page=ThisToo\">ThisToo</a>.",
+ assertEquals( "This should be a <a class=\"wikipage\" href=\"/test/Wiki.jsp?page=HyperLink\">HyperLink</a>, and <a class=\"wikipage\" href=\"/test/Wiki.jsp?page=ThisToo\">ThisToo</a>.",
translate(src) );
}
@@ -347,7 +347,7 @@ public class JSPWikiMarkupParserTest extends TestCase
String src = "] This ] should be a HyperLink], and ThisToo.";
- assertEquals( "] This ] should be a <a class=\"wikipage\" href=\"/Wiki.jsp?page=HyperLink\">HyperLink</a>], and <a class=\"wikipage\" href=\"/Wiki.jsp?page=ThisToo\">ThisToo</a>.",
+ assertEquals( "] This ] should be a <a class=\"wikipage\" href=\"/test/Wiki.jsp?page=HyperLink\">HyperLink</a>], and <a class=\"wikipage\" href=\"/test/Wiki.jsp?page=ThisToo\">ThisToo</a>.",
translate(src) );
}
@@ -360,7 +360,7 @@ public class JSPWikiMarkupParserTest extends TestCase
String src = "HyperLink, and ThisToo";
- assertEquals( "<a class=\"wikipage\" href=\"/Wiki.jsp?page=HyperLink\">HyperLink</a>, and <a class=\"wikipage\" href=\"/Wiki.jsp?page=ThisToo\">ThisToo</a>",
+ assertEquals( "<a class=\"wikipage\" href=\"/test/Wiki.jsp?page=HyperLink\">HyperLink</a>, and <a class=\"wikipage\" href=\"/test/Wiki.jsp?page=ThisToo\">ThisToo</a>",
translate(src) );
}
@@ -429,10 +429,10 @@ public class JSPWikiMarkupParserTest extends TestCase
public void testHyperlinksCCURLs6()
throws Exception
{
- String src = "This should not be a link: http://''some.server''/wiki//Wiki.jsp\nIs it?";
+ String src = "This should not be a link: http://''some.server''/wiki//test/Wiki.jsp\nIs it?";
// System.out.println( "EX:"+translate(src) );
- assertEquals( "This should not be a link: http://<i>some.server</i>/wiki//Wiki.jsp\nIs it?",
+ assertEquals( "This should not be a link: http://<i>some.server</i>/wiki//test/Wiki.jsp\nIs it?",
translate(src) );
}
@@ -510,7 +510,7 @@ public class JSPWikiMarkupParserTest extends TestCase
String src = "*HyperLink";
- assertEquals( "<ul><li><a class=\"wikipage\" href=\"/Wiki.jsp?page=HyperLink\">HyperLink</a></li></ul>",
+ assertEquals( "<ul><li><a class=\"wikipage\" href=\"/test/Wiki.jsp?page=HyperLink\">HyperLink</a></li></ul>",
translate(src) );
}
@@ -521,7 +521,7 @@ public class JSPWikiMarkupParserTest extends TestCase
String src = "__BoldHyperLink__";
- assertEquals( "<b><a class=\"wikipage\" href=\"/Wiki.jsp?page=BoldHyperLink\">BoldHyperLink</a></b>",
+ assertEquals( "<b><a class=\"wikipage\" href=\"/test/Wiki.jsp?page=BoldHyperLink\">BoldHyperLink</a></b>",
translate(src) );
}
@@ -532,7 +532,7 @@ public class JSPWikiMarkupParserTest extends TestCase
String src = "Let's see, if a bold __HyperLink__ is correct?";
- assertEquals( "Let's see, if a bold <b><a class=\"wikipage\" href=\"/Wiki.jsp?page=HyperLink\">HyperLink</a></b> is correct?",
+ assertEquals( "Let's see, if a bold <b><a class=\"wikipage\" href=\"/test/Wiki.jsp?page=HyperLink\">HyperLink</a></b> is correct?",
translate(src) );
}
@@ -543,7 +543,7 @@ public class JSPWikiMarkupParserTest extends TestCase
String src = "''ItalicHyperLink''";
- assertEquals( "<i><a class=\"wikipage\" href=\"/Wiki.jsp?page=ItalicHyperLink\">ItalicHyperLink</a></i>",
+ assertEquals( "<i><a class=\"wikipage\" href=\"/test/Wiki.jsp?page=ItalicHyperLink\">ItalicHyperLink</a></i>",
translate(src) );
}
@@ -554,7 +554,7 @@ public class JSPWikiMarkupParserTest extends TestCase
String src = "Test. Punctuation. HyperLink.";
- assertEquals( "Test. Punctuation. <a class=\"wikipage\" href=\"/Wiki.jsp?page=HyperLink\">HyperLink</a>.",
+ assertEquals( "Test. Punctuation. <a class=\"wikipage\" href=\"/test/Wiki.jsp?page=HyperLink\">HyperLink</a>.",
translate(src) );
}
@@ -566,7 +566,7 @@ public class JSPWikiMarkupParserTest extends TestCase
String src = "Punctuations: HyperLink,ThisToo.";
- assertEquals( "Punctuations: <a class=\"wikipage\" href=\"/Wiki.jsp?page=HyperLink\">HyperLink</a>,<a class=\"wikipage\" href=\"/Wiki.jsp?page=ThisToo\">ThisToo</a>.",
+ assertEquals( "Punctuations: <a class=\"wikipage\" href=\"/test/Wiki.jsp?page=HyperLink\">HyperLink</a>,<a class=\"wikipage\" href=\"/test/Wiki.jsp?page=ThisToo\">ThisToo</a>.",
translate(src) );
}
@@ -577,7 +577,7 @@ public class JSPWikiMarkupParserTest extends TestCase
String src = "Onko t\u00e4m\u00e4 hyperlinkki: \u00c4itiSy\u00f6\u00d6ljy\u00e4?";
- assertEquals( "Onko t\u00e4m\u00e4 hyperlinkki: <a class=\"wikipage\" href=\"/Wiki.jsp?page=%C4itiSy%F6%D6ljy%E4\">\u00c4itiSy\u00f6\u00d6ljy\u00e4</a>?",
+ assertEquals( "Onko t\u00e4m\u00e4 hyperlinkki: <a class=\"wikipage\" href=\"/test/Wiki.jsp?page=%C4itiSy%F6%D6ljy%E4\">\u00c4itiSy\u00f6\u00d6ljy\u00e4</a>?",
translate(src) );
}
@@ -620,7 +620,7 @@ public class JSPWikiMarkupParserTest extends TestCase
newPage("HyperLink");
- assertEquals( "This should be a <a class=\"wikipage\" href=\"/Wiki.jsp?page=HyperLink\">HyperLinks</a>",
+ assertEquals( "This should be a <a class=\"wikipage\" href=\"/test/Wiki.jsp?page=HyperLink\">HyperLinks</a>",
translate(src) );
}
@@ -629,7 +629,7 @@ public class JSPWikiMarkupParserTest extends TestCase
{
String src = "This should be a [HyperLinks]";
- assertEquals( "This should be a <a class=\"createpage\" href=\"/Edit.jsp?page=HyperLinks\" title=\"Create "HyperLinks"\">HyperLinks</a>",
+ assertEquals( "This should be a <a class=\"createpage\" href=\"/test/Edit.jsp?page=HyperLinks\" title=\"Create "HyperLinks"\">HyperLinks</a>",
translate(src) );
}
@@ -640,7 +640,7 @@ public class JSPWikiMarkupParserTest extends TestCase
newPage("HyperLinks");
- assertEquals( "This should be a <a class=\"wikipage\" href=\"/Wiki.jsp?page=HyperLinks\">HyperLink</a>",
+ assertEquals( "This should be a <a class=\"wikipage\" href=\"/test/Wiki.jsp?page=HyperLinks\">HyperLink</a>",
translate(src) );
}
@@ -651,7 +651,7 @@ public class JSPWikiMarkupParserTest extends TestCase
newPage("HyperLink");
- assertEquals( "This should be a <a class=\"wikipage\" href=\"/Wiki.jsp?page=HyperLink\">Hyper links</a>",
+ assertEquals( "This should be a <a class=\"wikipage\" href=\"/test/Wiki.jsp?page=HyperLink\">Hyper links</a>",
translate(src) );
}
@@ -694,8 +694,8 @@ public class JSPWikiMarkupParserTest extends TestCase
String src = "This should be an [attachment link|Test/TestAtt.txt]";
- assertEquals( "This should be an <a class=\"attachment\" href=\"/attach/Test/TestAtt.txt\">attachment link</a>"+
- "<a href=\"/PageInfo.jsp?page=Test/TestAtt.txt\" class=\"infolink\"><img src=\"/images/attachment_small.png\" border=\"0\" alt=\"(info)\" /></a>",
+ assertEquals( "This should be an <a class=\"attachment\" href=\"/test/attach/Test/TestAtt.txt\">attachment link</a>"+
+ "<a href=\"/test/PageInfo.jsp?page=Test/TestAtt.txt\" class=\"infolink\"><img src=\"/test/images/attachment_small.png\" border=\"0\" alt=\"(info)\" /></a>",
translate(src));
}
@@ -717,8 +717,8 @@ public class JSPWikiMarkupParserTest extends TestCase
String src = "This should be an [attachment link|Test/TestAtt.txt]";
- assertEquals( "This should be an <a class=\"attachment\" href=\"/attach/Test/TestAtt.txt\">attachment link</a>"+
- "<a href=\"/PageInfo.jsp?page=Test/TestAtt.txt\" class=\"infolink\"><img src=\"/images/attachment_small.png\" border=\"0\" alt=\"(info)\" /></a>",
+ assertEquals( "This should be an <a class=\"attachment\" href=\"/test/attach/Test/TestAtt.txt\">attachment link</a>"+
+ "<a href=\"/test/PageInfo.jsp?page=Test/TestAtt.txt\" class=\"infolink\"><img src=\"/test/images/attachment_small.png\" border=\"0\" alt=\"(info)\" /></a>",
translate(testEngine2,src));
}
@@ -740,8 +740,8 @@ public class JSPWikiMarkupParserTest extends TestCase
String src = "[Test page/TestAtt.txt]";
- assertEquals( "<a class=\"attachment\" href=\"/attach/TestPage/TestAtt.txt\">Test page/TestAtt.txt</a>"+
- "<a href=\"/PageInfo.jsp?page=TestPage/TestAtt.txt\" class=\"infolink\"><img src=\"/images/attachment_small.png\" border=\"0\" alt=\"(info)\" /></a>",
+ assertEquals( "<a class=\"attachment\" href=\"/test/attach/TestPage/TestAtt.txt\">Test page/TestAtt.txt</a>"+
+ "<a href=\"/test/PageInfo.jsp?page=TestPage/TestAtt.txt\" class=\"infolink\"><img src=\"/test/images/attachment_small.png\" border=\"0\" alt=\"(info)\" /></a>",
translate(testEngine2,src));
}
@@ -760,8 +760,8 @@ public class JSPWikiMarkupParserTest extends TestCase
String src = "["+testEngine2.beautifyTitle("TestPage/TestAtt.txt")+"]";
- assertEquals( "<a class=\"attachment\" href=\"/attach/TestPage/TestAtt.txt\">Test Page/TestAtt.txt</a>"+
- "<a href=\"/PageInfo.jsp?page=TestPage/TestAtt.txt\" class=\"infolink\"><img src=\"/images/attachment_small.png\" border=\"0\" alt=\"(info)\" /></a>",
+ assertEquals( "<a class=\"attachment\" href=\"/test/attach/TestPage/TestAtt.txt\">Test Page/TestAtt.txt</a>"+
+ "<a href=\"/test/PageInfo.jsp?page=TestPage/TestAtt.txt\" class=\"infolink\"><img src=\"/test/images/attachment_small.png\" border=\"0\" alt=\"(info)\" /></a>",
translate(testEngine2,src));
}
@@ -828,7 +828,7 @@ public class JSPWikiMarkupParserTest extends TestCase
newPage("Test_page");
- assertEquals("Link <a class=\"wikipage\" href=\"/Wiki.jsp?page=Test_page\">test_page</a>",
+ assertEquals("Link <a class=\"wikipage\" href=\"/test/Wiki.jsp?page=Test_page\">test_page</a>",
translate(src) );
}
@@ -839,7 +839,7 @@ public class JSPWikiMarkupParserTest extends TestCase
newPage("Test.page");
- assertEquals("Link <a class=\"wikipage\" href=\"/Wiki.jsp?page=Test.page\">test.page</a>",
+ assertEquals("Link <a class=\"wikipage\" href=\"/test/Wiki.jsp?page=Test.page\">test.page</a>",
translate(src) );
}
@@ -850,7 +850,7 @@ public class JSPWikiMarkupParserTest extends TestCase
newPage(".testpage_");
- assertEquals("Link <a class=\"wikipage\" href=\"/Wiki.jsp?page=.testpage_\">.testpage_</a>",
+ assertEquals("Link <a class=\"wikipage\" href=\"/test/Wiki.jsp?page=.testpage_\">.testpage_</a>",
translate(src) );
}
@@ -916,7 +916,7 @@ public class JSPWikiMarkupParserTest extends TestCase
newPage("SandBox");
- assertEquals("Link <a class=\"wikipage\" href=\"/Wiki.jsp?page=SandBox\"><img class=\"inline\" src=\"http://foobar.jpg\" alt=\"SandBox\" /></a>",
+ assertEquals("Link <a class=\"wikipage\" href=\"/test/Wiki.jsp?page=SandBox\"><img class=\"inline\" src=\"http://foobar.jpg\" alt=\"SandBox\" /></a>",
translate(src) );
}
@@ -927,7 +927,7 @@ public class JSPWikiMarkupParserTest extends TestCase
newPage("\u00C5\u00E4Test"); // FIXME: Should be capital
- assertEquals("Link <a class=\"wikipage\" href=\"/Wiki.jsp?page=%C5%E4Test\">\u00c5\u00e4Test</a>",
+ assertEquals("Link <a class=\"wikipage\" href=\"/test/Wiki.jsp?page=%C5%E4Test\">\u00c5\u00e4Test</a>",
translate(src));
}
@@ -946,8 +946,8 @@ public class JSPWikiMarkupParserTest extends TestCase
newPage( "WikiEtiquette" );
- assertEquals( "<p><a class=\"wikipage\" href=\"/Wiki.jsp?page=WikiEtiquette\">WikiEtiquette</a>\n</p>"+
- "<p><a class=\"wikipage\" href=\"/Wiki.jsp?page=Search\">Search</a></p>", translate(src) );
+ assertEquals( "<p><a class=\"wikipage\" href=\"/test/Wiki.jsp?page=WikiEtiquette\">WikiEtiquette</a>\n</p>"+
+ "<p><a class=\"wikipage\" href=\"/test/Wiki.jsp?page=Search\">Search</a></p>", translate(src) );
}
public void testParagraph3()
@@ -969,10 +969,10 @@ public class JSPWikiMarkupParserTest extends TestCase
newPage("Search");
newPage("UnusedPages");
- assertEquals( "<p><a class=\"wikipage\" href=\"/Wiki.jsp?page=RecentChanges\">Recent Changes</a><br />\n"+
- "<a class=\"wikipage\" href=\"/Wiki.jsp?page=WikiEtiquette\">WikiEtiquette</a>\n</p>\n"+
- "<p><a class=\"wikipage\" href=\"/Wiki.jsp?page=Search\">Find pages</a><br />\n"+
- "<a class=\"wikipage\" href=\"/Wiki.jsp?page=UnusedPages\">Unused pages</a></p>",
+ assertEquals( "<p><a class=\"wikipage\" href=\"/test/Wiki.jsp?page=RecentChanges\">Recent Changes</a><br />\n"+
+ "<a class=\"wikipage\" href=\"/test/Wiki.jsp?page=WikiEtiquette\">WikiEtiquette</a>\n</p>\n"+
+ "<p><a class=\"wikipage\" href=\"/test/Wiki.jsp?page=Search\">Find pages</a><br />\n"+
+ "<a class=\"wikipage\" href=\"/test/Wiki.jsp?page=UnusedPages\">Unused pages</a></p>",
translate(src) );
}
@@ -1063,7 +1063,7 @@ public class JSPWikiMarkupParserTest extends TestCase
newPage("ALink");
- assertEquals( "1<tt>\n2345\n<a class=\"wikipage\" href=\"/Wiki.jsp?page=ALink\">a link</a>\n</tt>6", translate(src) );
+ assertEquals( "1<tt>\n2345\n<a class=\"wikipage\" href=\"/test/Wiki.jsp?page=ALink\">a link</a>\n</tt>6", translate(src) );
}
public void testPre()
@@ -1930,7 +1930,7 @@ public class JSPWikiMarkupParserTest extends TestCase
assertEquals( "<table class=\"wikitable\" border=\"1\">"+
"<tr class=\"odd\"><td>Cell 1</td><td> Cell 2</td></tr>\n"+
- "<tr><td><a class=\"wikipage\" href=\"/Wiki.jsp?page=ReallyALink\">Cell 3</a></td><td>Cell 4</td></tr>\n"+
+ "<tr><td><a class=\"wikipage\" href=\"/test/Wiki.jsp?page=ReallyALink\">Cell 3</a></td><td>Cell 4</td></tr>\n"+
"</table><p />",
translate(src) );
}
@@ -1944,7 +1944,7 @@ public class JSPWikiMarkupParserTest extends TestCase
assertEquals( "<table class=\"wikitable\" border=\"1\">"+
"<tr class=\"odd\"><td>Cell 1</td><td> Cell| 2</td></tr>\n"+
- "<tr><td><a class=\"wikipage\" href=\"/Wiki.jsp?page=ReallyALink\">Cell 3</a></td><td>Cell 4</td></tr>\n"+
+ "<tr><td><a class=\"wikipage\" href=\"/test/Wiki.jsp?page=ReallyALink\">Cell 3</a></td><td>Cell 4</td></tr>\n"+
"</table><p />",
translate(src) );
}
@@ -2090,7 +2090,7 @@ public class JSPWikiMarkupParserTest extends TestCase
{
String src="!!![Hello]";
- assertEquals( "<h2 id=\"section-testpage-Hello\"><a class=\"createpage\" href=\"/Edit.jsp?page=Hello\" title=\"Create "Hello"\">Hello</a><a class=\"hashlink\" href=\"#section-testpage-Hello\">#</a></h2>",
+ assertEquals( "<h2 id=\"section-testpage-Hello\"><a class=\"createpage\" href=\"/test/Edit.jsp?page=Hello\" title=\"Create "Hello"\">Hello</a><a class=\"hashlink\" href=\"#section-testpage-Hello\">#</a></h2>",
translate(src) );
}
@@ -2583,7 +2583,7 @@ public class JSPWikiMarkupParserTest extends TestCase
{
String src = "[-phobous]";
- assertEquals( "<a class=\"createpage\" href=\"/Edit.jsp?page=-phobous\" title=\"Create "-phobous"\">-phobous</a>", translate(src) );
+ assertEquals( "<a class=\"createpage\" href=\"/test/Edit.jsp?page=-phobous\" title=\"Create "-phobous"\">-phobous</a>", translate(src) );
}
public void testPunctuatedWikiNames2()
@@ -2591,7 +2591,7 @@ public class JSPWikiMarkupParserTest extends TestCase
{
String src = "[?phobous]";
- assertEquals( "<a class=\"createpage\" href=\"/Edit.jsp?page=Phobous\" title=\"Create "Phobous"\">?phobous</a>", translate(src) );
+ assertEquals( "<a class=\"createpage\" href=\"/test/Edit.jsp?page=Phobous\" title=\"Create "Phobous"\">?phobous</a>", translate(src) );
}
public void testPunctuatedWikiNames3()
@@ -2599,7 +2599,7 @@ public class JSPWikiMarkupParserTest extends TestCase
{
String src = "[Brightness (apical)]";
- assertEquals( "<a class=\"createpage\" href=\"/Edit.jsp?page=Brightness%20%28apical%29\" title=\"Create "Brightness (apical)"\">Brightness (apical)</a>", translate(src) );
+ assertEquals( "<a class=\"createpage\" href=\"/test/Edit.jsp?page=Brightness%20%28apical%29\" title=\"Create "Brightness (apical)"\">Brightness (apical)</a>", translate(src) );
}
public void testDeadlySpammer()
@@ -2628,7 +2628,7 @@ public class JSPWikiMarkupParserTest extends TestCase
newPage("Foo bar");
String src = "[Foo bar]";
- assertEquals( "<a class=\"wikipage\" href=\"/Wiki.jsp?page=Foo%20bar\">Foo bar</a>", translate(src) );
+ assertEquals( "<a class=\"wikipage\" href=\"/test/Wiki.jsp?page=Foo%20bar\">Foo bar</a>", translate(src) );
}
/** Too many spaces */
@@ -2637,7 +2637,7 @@ public class JSPWikiMarkupParserTest extends TestCase
newPage("Foo bar");
String src = "[Foo bar]";
- assertEquals( "<a class=\"wikipage\" href=\"/Wiki.jsp?page=Foo%20bar\">Foo bar</a>", translate(src) );
+ assertEquals( "<a class=\"wikipage\" href=\"/test/Wiki.jsp?page=Foo%20bar\">Foo bar</a>", translate(src) );
}
public void testIllegalXML() throws Exception
@@ -2665,7 +2665,7 @@ public class JSPWikiMarkupParserTest extends TestCase
String dst = translate(src);
- assertEquals( "<a class=\"wikipage\" href=\"/Wiki.jsp?page=Foo%26Bar\">Foo&Bar</a>", dst );
+ assertEquals( "<a class=\"wikipage\" href=\"/test/Wiki.jsp?page=Foo%26Bar\">Foo&Bar</a>", dst );
}
public void testAmpersand2() throws Exception
@@ -2675,7 +2675,7 @@ public class JSPWikiMarkupParserTest extends TestCase
String dst = translate(src);
- assertEquals( "<a class=\"wikipage\" href=\"/Wiki.jsp?page=Foo%20%26%20Bar\">Foo & Bar</a>", dst );
+ assertEquals( "<a class=\"wikipage\" href=\"/test/Wiki.jsp?page=Foo%20%26%20Bar\">Foo & Bar</a>", dst );
}
// This is a random find: the following page text caused an eternal loop in V2.0.x.
[3/3] jspwiki git commit: JSPWIKI 1035 fix plugin tests.
Posted by me...@apache.org.
JSPWIKI 1035 fix plugin tests.
Project: http://git-wip-us.apache.org/repos/asf/jspwiki/repo
Commit: http://git-wip-us.apache.org/repos/asf/jspwiki/commit/d5b597e8
Tree: http://git-wip-us.apache.org/repos/asf/jspwiki/tree/d5b597e8
Diff: http://git-wip-us.apache.org/repos/asf/jspwiki/diff/d5b597e8
Branch: refs/heads/JSPWIKI-1035
Commit: d5b597e810cc8dc533496580555c9ad381bb2500
Parents: 77d2e45
Author: Harry Metske <ha...@gmail.com>
Authored: Sat Dec 17 13:08:08 2016 +0100
Committer: Harry Metske <ha...@gmail.com>
Committed: Sat Dec 17 13:08:08 2016 +0100
----------------------------------------------------------------------
.../java/org/apache/wiki/plugin/GroupsTest.java | 8 ++++----
.../wiki/plugin/RecentChangesPluginTest.java | 18 +++++++++---------
.../wiki/plugin/ReferringPagesPluginTest.java | 2 +-
.../ReferringUndefinedPagesPluginTest.java | 20 ++++++++++----------
4 files changed, 24 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jspwiki/blob/d5b597e8/jspwiki-war/src/test/java/org/apache/wiki/plugin/GroupsTest.java
----------------------------------------------------------------------
diff --git a/jspwiki-war/src/test/java/org/apache/wiki/plugin/GroupsTest.java b/jspwiki-war/src/test/java/org/apache/wiki/plugin/GroupsTest.java
index c2dd13b..f5f6481 100644
--- a/jspwiki-war/src/test/java/org/apache/wiki/plugin/GroupsTest.java
+++ b/jspwiki-war/src/test/java/org/apache/wiki/plugin/GroupsTest.java
@@ -58,10 +58,10 @@ public class GroupsTest extends TestCase
String res = testEngine.getHTML( "Test" );
- assertEquals( "<a href=\"/Group.jsp?group=Admin\">Admin</a>, "
- + "<a href=\"/Group.jsp?group=Art\">Art</a>, "
- + "<a href=\"/Group.jsp?group=Literature\">Literature</a>, "
- + "<a href=\"/Group.jsp?group=TV\">TV</a>\n"
+ assertEquals( "<a href=\"/test/Group.jsp?group=Admin\">Admin</a>, "
+ + "<a href=\"/test/Group.jsp?group=Art\">Art</a>, "
+ + "<a href=\"/test/Group.jsp?group=Literature\">Literature</a>, "
+ + "<a href=\"/test/Group.jsp?group=TV\">TV</a>\n"
, res );
}
http://git-wip-us.apache.org/repos/asf/jspwiki/blob/d5b597e8/jspwiki-war/src/test/java/org/apache/wiki/plugin/RecentChangesPluginTest.java
----------------------------------------------------------------------
diff --git a/jspwiki-war/src/test/java/org/apache/wiki/plugin/RecentChangesPluginTest.java b/jspwiki-war/src/test/java/org/apache/wiki/plugin/RecentChangesPluginTest.java
index 32974b1..e5b24db 100644
--- a/jspwiki-war/src/test/java/org/apache/wiki/plugin/RecentChangesPluginTest.java
+++ b/jspwiki-war/src/test/java/org/apache/wiki/plugin/RecentChangesPluginTest.java
@@ -74,9 +74,9 @@ public class RecentChangesPluginTest extends TestCase {
// we don't want to compare the complete html returned, but check if
// certain Strings are present and other Strings are not present
assertTrue(res.contains("<table class=\"recentchanges\" cellpadding=\"4\">"));
- assertTrue(res.contains("<a href=\"/Wiki.jsp?page=TestPage01\">Test Page 01</a>"));
- assertTrue(res.contains("<a href=\"/Wiki.jsp?page=TestPage02\">Test Page 02</a>"));
- assertTrue(res.contains("<a href=\"/Wiki.jsp?page=TestPage03\">Test Page 03</a>"));
+ assertTrue(res.contains("<a href=\"/test/Wiki.jsp?page=TestPage01\">Test Page 01</a>"));
+ assertTrue(res.contains("<a href=\"/test/Wiki.jsp?page=TestPage02\">Test Page 02</a>"));
+ assertTrue(res.contains("<a href=\"/test/Wiki.jsp?page=TestPage03\">Test Page 03</a>"));
}
/**
@@ -91,9 +91,9 @@ public class RecentChangesPluginTest extends TestCase {
"{INSERT org.apache.wiki.plugin.RecentChangesPlugin include='TestPage02*'}" );
assertTrue(res.contains("<table class=\"recentchanges\" cellpadding=\"4\">"));
- assertFalse(res.contains("<a href=\"/Wiki.jsp?page=TestPage01\">Test Page 01</a>"));
- assertTrue(res.contains("<a href=\"/Wiki.jsp?page=TestPage02\">Test Page 02</a>"));
- assertFalse(res.contains("<a href=\"/Wiki.jsp?page=TestPage03\">Test Page 03</a>"));
+ assertFalse(res.contains("<a href=\"/test/Wiki.jsp?page=TestPage01\">Test Page 01</a>"));
+ assertTrue(res.contains("<a href=\"/test/Wiki.jsp?page=TestPage02\">Test Page 02</a>"));
+ assertFalse(res.contains("<a href=\"/test/Wiki.jsp?page=TestPage03\">Test Page 03</a>"));
}
/**
@@ -108,9 +108,9 @@ public class RecentChangesPluginTest extends TestCase {
"{INSERT org.apache.wiki.plugin.RecentChangesPlugin exclude='TestPage03*'}" );
assertTrue(res.contains("<table class=\"recentchanges\" cellpadding=\"4\">"));
- assertTrue(res.contains("<a href=\"/Wiki.jsp?page=TestPage01\">Test Page 01</a>"));
- assertTrue(res.contains("<a href=\"/Wiki.jsp?page=TestPage02\">Test Page 02</a>"));
- assertFalse(res.contains("<a href=\"/Wiki.jsp?page=TestPage03\">Test Page 03</a>"));
+ assertTrue(res.contains("<a href=\"/test/Wiki.jsp?page=TestPage01\">Test Page 01</a>"));
+ assertTrue(res.contains("<a href=\"/test/Wiki.jsp?page=TestPage02\">Test Page 02</a>"));
+ assertFalse(res.contains("<a href=\"/test/Wiki.jsp?page=TestPage03\">Test Page 03</a>"));
}
/**
http://git-wip-us.apache.org/repos/asf/jspwiki/blob/d5b597e8/jspwiki-war/src/test/java/org/apache/wiki/plugin/ReferringPagesPluginTest.java
----------------------------------------------------------------------
diff --git a/jspwiki-war/src/test/java/org/apache/wiki/plugin/ReferringPagesPluginTest.java b/jspwiki-war/src/test/java/org/apache/wiki/plugin/ReferringPagesPluginTest.java
index 8bba332..b0f40c1 100644
--- a/jspwiki-war/src/test/java/org/apache/wiki/plugin/ReferringPagesPluginTest.java
+++ b/jspwiki-war/src/test/java/org/apache/wiki/plugin/ReferringPagesPluginTest.java
@@ -82,7 +82,7 @@ public class ReferringPagesPluginTest extends TestCase
private String mkFullLink( String page, String link )
{
- return "<a class=\"wikipage\" href=\"/Wiki.jsp?page="+link+"\">"+page+"</a>";
+ return "<a class=\"wikipage\" href=\"/test/Wiki.jsp?page="+link+"\">"+page+"</a>";
}
public void testSingleReferral()
http://git-wip-us.apache.org/repos/asf/jspwiki/blob/d5b597e8/jspwiki-war/src/test/java/org/apache/wiki/plugin/ReferringUndefinedPagesPluginTest.java
----------------------------------------------------------------------
diff --git a/jspwiki-war/src/test/java/org/apache/wiki/plugin/ReferringUndefinedPagesPluginTest.java b/jspwiki-war/src/test/java/org/apache/wiki/plugin/ReferringUndefinedPagesPluginTest.java
index dbb6934..88bded8 100644
--- a/jspwiki-war/src/test/java/org/apache/wiki/plugin/ReferringUndefinedPagesPluginTest.java
+++ b/jspwiki-war/src/test/java/org/apache/wiki/plugin/ReferringUndefinedPagesPluginTest.java
@@ -66,7 +66,7 @@ public class ReferringUndefinedPagesPluginTest extends TestCase {
*/
public void testSimple() throws Exception {
String res = manager.execute(context, "{INSERT ReferringUndefinedPagesPlugin}");
- assertTrue(res.contains("href=\"/Wiki.jsp?page=TestPage01\""));
+ assertTrue(res.contains("href=\"/test/Wiki.jsp?page=TestPage01\""));
}
/**
@@ -76,9 +76,9 @@ public class ReferringUndefinedPagesPluginTest extends TestCase {
*/
public void testParmInClude() throws Exception {
String res = manager.execute(context, "{INSERT ReferringUndefinedPagesPlugin} include='TestPage02*'}");
- assertFalse(res.contains("href=\"/Wiki.jsp?page=TestPage01\""));
- assertTrue(res.contains("href=\"/Wiki.jsp?page=TestPage02\""));
- assertFalse(res.contains("href=\"/Wiki.jsp?page=TestPage03\""));
+ assertFalse(res.contains("href=\"/test/Wiki.jsp?page=TestPage01\""));
+ assertTrue(res.contains("href=\"/test/Wiki.jsp?page=TestPage02\""));
+ assertFalse(res.contains("href=\"/test/Wiki.jsp?page=TestPage03\""));
}
/**
@@ -89,9 +89,9 @@ public class ReferringUndefinedPagesPluginTest extends TestCase {
public void testParmExClude() throws Exception {
String res = manager.execute(context,"{INSERT ReferringUndefinedPagesPlugin} exclude='TestPage02*'}");
- assertTrue(res.contains("href=\"/Wiki.jsp?page=TestPage01\""));
- assertFalse(res.contains("href=\"/Wiki.jsp?page=TestPage02\""));
- assertTrue(res.contains("href=\"/Wiki.jsp?page=TestPage03\""));
+ assertTrue(res.contains("href=\"/test/Wiki.jsp?page=TestPage01\""));
+ assertFalse(res.contains("href=\"/test/Wiki.jsp?page=TestPage02\""));
+ assertTrue(res.contains("href=\"/test/Wiki.jsp?page=TestPage03\""));
}
/**
@@ -102,9 +102,9 @@ public class ReferringUndefinedPagesPluginTest extends TestCase {
public void testParmMax() throws Exception {
String res = manager.execute(context,"{INSERT ReferringUndefinedPagesPlugin} max='2'}");
- assertTrue(res.contains("href=\"/Wiki.jsp?page=TestPage01\""));
- assertTrue(res.contains("href=\"/Wiki.jsp?page=TestPage02\""));
- assertFalse(res.contains("href=\"/Wiki.jsp?page=TestPage03\""));
+ assertTrue(res.contains("href=\"/test/Wiki.jsp?page=TestPage01\""));
+ assertTrue(res.contains("href=\"/test/Wiki.jsp?page=TestPage02\""));
+ assertFalse(res.contains("href=\"/test/Wiki.jsp?page=TestPage03\""));
assertTrue(res.contains("...and 1 more"));
}