Author: metskem
Date: Wed Jul 29 17:28:52 2009
New Revision: 798987
URL: http://svn.apache.org/viewvc?rev=798987&view=rev
Log:
3.0.0-svn-138
* fixed two minor JUnit tests (DenouncePlugin and CommentedProperties)
* removed OSCache reference from SisterSites.jsp
Modified:
incubator/jspwiki/trunk/ChangeLog
incubator/jspwiki/trunk/src/WebContent/SisterSites.jsp
incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java
incubator/jspwiki/trunk/tests/etc/test.properties
incubator/jspwiki/trunk/tests/java/org/apache/wiki/plugin/DenouncePluginTest.java
Modified: incubator/jspwiki/trunk/ChangeLog
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=798987&r1=798986&r2=798987&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Wed Jul 29 17:28:52 2009
@@ -1,3 +1,12 @@
+2009-07-29 Harry Metske <[email protected]>
+
+ * 3.0.0-svn-138
+
+ * fixed two minor JUnit tests (DenouncePlugin and CommentedProperties)
+ the last one by removing the license from test.properties (should be
OK)
+
+ * removed OSCache reference from SisterSites.jsp
+
2009-07-23 Janne Jalkanen <[email protected]>
* 3.0.0-svn-137
Modified: incubator/jspwiki/trunk/src/WebContent/SisterSites.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/SisterSites.jsp?rev=798987&r1=798986&r2=798987&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/SisterSites.jsp (original)
+++ incubator/jspwiki/trunk/src/WebContent/SisterSites.jsp Wed Jul 29 17:28:52
2009
@@ -24,7 +24,6 @@
<%@ page import="java.text.*" %>
<%@ page import="org.apache.wiki.rss.*" %>
<%@ page import="org.apache.wiki.util.*" %>
-<%@ taglib uri="http://www.opensymphony.com/oscache"; prefix="oscache" %>
<%!
Logger log = LoggerFactory.getLogger("JSPWiki");
%>
Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java?rev=798987&r1=798986&r2=798987&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java Wed Jul 29
17:28:52 2009
@@ -77,7 +77,7 @@
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "137";
+ public static final String BUILD = "138";
/**
* This is the generic version string you should use
Modified: incubator/jspwiki/trunk/tests/etc/test.properties
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/etc/test.properties?rev=798987&r1=798986&r2=798987&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/etc/test.properties (original)
+++ incubator/jspwiki/trunk/tests/etc/test.properties Wed Jul 29 17:28:52 2009
@@ -1,25 +1,3 @@
-#
-# JSPWiki - a JSP-based WikiWiki clone.
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-############################################################################
-#
# This is a sample properties file with comments
testProp1=Foo
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=798987&r1=798986&r2=798987&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
Wed Jul 29 17:28:52 2009
@@ -77,7 +77,6 @@
MockHttpServletRequest request = m_engine.newHttpRequest();
if (header != null)
request.addHeader("User-Agent", header);
- //if(host != null)
request.getParameterMap().put("page", new String[]{"TestPage"});
m_context = m_engine.getWikiContextFactory().newViewContext( request,
null, null );
@@ -91,20 +90,25 @@
m_engine.shutdown();
}
- public void testSLURPBot() throws Exception
+ public void testSLURPBot1() throws Exception
{
- setupHTTPRequest("Slurp/2.1");
- String res = m_pluginmanager.execute(m_context, PLUGINCMDLINE);
- assertEquals(getDenounceText(), res);
- //
- setupHTTPRequest("ETSlurp/");
- res = m_pluginmanager.execute(m_context, PLUGINCMDLINE);
- assertEquals(getDenounceText(), res);
+ setupHTTPRequest( "Slurp/2.1" );
+ String res = m_pluginmanager.execute( m_context, PLUGINCMDLINE );
+ assertEquals( getDenounceText(), res );
+ }
- setupHTTPRequest("Slurp");
- res = m_pluginmanager.execute(m_context, PLUGINCMDLINE);
- assertFalse(getDenounceText().equalsIgnoreCase(res));
+ public void testSLURPBot2() throws Exception
+ {
+ setupHTTPRequest( "ETSlurp/" );
+ String res = m_pluginmanager.execute( m_context, PLUGINCMDLINE );
+ assertEquals( getDenounceText(), res );
+ }
+ public void testSLURPBot3() throws Exception
+ {
+ setupHTTPRequest( "Slurp" );
+ String res = m_pluginmanager.execute( m_context, PLUGINCMDLINE );
+ assertFalse( getDenounceText().equalsIgnoreCase( res ) );
}
public void testGoogleBotWithWrongCase() throws Exception
@@ -114,20 +118,26 @@
assertFalse(getDenounceText().equalsIgnoreCase(res));
}
- public void testGoogleBot() throws Exception
+ public void testGoogleBot1() throws Exception
{
- setupHTTPRequest("Googlebot/2.1");
- String res = m_pluginmanager.execute(m_context, PLUGINCMDLINE);
- assertEquals(getDenounceText(), res);
+ setupHTTPRequest( "Googlebot/2.1" );
+ String res = m_pluginmanager.execute( m_context, PLUGINCMDLINE );
+ assertEquals( getDenounceText(), res );
//
- setupHTTPRequest("ETSGooglebot/2.1");
- res = m_pluginmanager.execute(m_context, PLUGINCMDLINE);
- assertEquals(getDenounceText(), res);
-
- setupHTTPRequest("ETSGooglebot");
- res = m_pluginmanager.execute(m_context, PLUGINCMDLINE);
- assertEquals(getDenounceText(), res);
+ }
+
+ public void testGoogleBot2() throws Exception
+ {
+ setupHTTPRequest( "ETSGooglebot/2.1" );
+ String res = m_pluginmanager.execute( m_context, PLUGINCMDLINE );
+ assertEquals( getDenounceText(), res );
+ }
+ public void testGoogleBot3() throws Exception
+ {
+ setupHTTPRequest( "ETSGooglebot" );
+ String res = m_pluginmanager.execute( m_context, PLUGINCMDLINE );
+ assertEquals( getDenounceText(), res );
}
public void testPlugin() throws Exception
