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:24 UTC
[3/3] jspwiki git commit: JSPWIKI 1035 fix plugin tests.
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"));
}