Author: metskem
Date: Sat Feb 14 17:51:01 2009
New Revision: 744550
URL: http://svn.apache.org/viewvc?rev=744550&view=rev
Log:
oops, the JUnit test still had an old name for denounce.properties
Modified:
incubator/jspwiki/trunk/tests/java/org/apache/wiki/plugin/DenouncePluginTest.java
Modified:
incubator/jspwiki/trunk/tests/java/org/apache/wiki/plugin/DenouncePluginTest.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/plugin/DenouncePluginTest.java?rev=744550&r1=744549&r2=744550&view=diff
==============================================================================
---
incubator/jspwiki/trunk/tests/java/org/apache/wiki/plugin/DenouncePluginTest.java
(original)
+++
incubator/jspwiki/trunk/tests/java/org/apache/wiki/plugin/DenouncePluginTest.java
Sat Feb 14 17:51:01 2009
@@ -56,7 +56,7 @@
ClassLoader loader = Denounce.class.getClassLoader();
- InputStream in =
loader.getResourceAsStream("org/apache/wiki/plugin/denounce.properties");
+ InputStream in =
loader.getResourceAsStream("DenouncePlugin.properties");
if (in == null) {
throw new IOException("No property file found! (Check the
installation, it should be there.)");
@@ -70,7 +70,7 @@
}
- private void setupHTTPRequest(String host, String header) {
+ private void setupHTTPRequest(String header) {
MockHttpServletRequest request = engine.newHttpRequest();
if (header != null)
request.addHeader("User-Agent", header);
@@ -89,41 +89,41 @@
}
public void testSLURPBot() throws Exception {
- setupHTTPRequest(null, "Slurp/2.1");
+ setupHTTPRequest("Slurp/2.1");
String res = manager.execute(context, pluginCmdLine);
assertEquals(getDenounceText(), res);
//
- setupHTTPRequest(null, "ETSlurp/");
+ setupHTTPRequest("ETSlurp/");
res = manager.execute(context, pluginCmdLine);
assertEquals(getDenounceText(), res);
- setupHTTPRequest(null, "Slurp");
+ setupHTTPRequest("Slurp");
res = manager.execute(context, pluginCmdLine);
assertFalse(getDenounceText().equalsIgnoreCase(res));
}
public void testGoogleBotWithWrongCase() throws Exception {
- setupHTTPRequest(null, "gOOglebot/2.1");
+ setupHTTPRequest("gOOglebot/2.1");
String res = manager.execute(context, pluginCmdLine);
assertFalse(getDenounceText().equalsIgnoreCase(res));
}
public void testGoogleBot() throws Exception {
- setupHTTPRequest(null, "Googlebot/2.1");
+ setupHTTPRequest("Googlebot/2.1");
String res = manager.execute(context, pluginCmdLine);
assertEquals(getDenounceText(), res);
//
- setupHTTPRequest(null, "ETSGooglebot/2.1");
+ setupHTTPRequest("ETSGooglebot/2.1");
res = manager.execute(context, pluginCmdLine);
assertEquals(getDenounceText(), res);
- setupHTTPRequest(null, "ETSGooglebot");
+ setupHTTPRequest("ETSGooglebot");
res = manager.execute(context, pluginCmdLine);
assertEquals(getDenounceText(), res);
}
public void testPlugin() throws Exception {
- setupHTTPRequest(null, null);
+ setupHTTPRequest(null);
String res = manager.execute(context, pluginCmdLine);