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 2013/09/03 19:42:54 UTC
svn commit: r1519765 [2/2] - in /jspwiki/trunk: ./ jspwiki-war/
jspwiki-war/src/main/config/doc/ jspwiki-war/src/main/java/org/apache/wiki/
jspwiki-war/src/main/java/org/apache/wiki/attachment/
jspwiki-war/src/main/java/org/apache/wiki/providers/ jspwi...
Modified: jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/plugin/RecentChangesPluginTest.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/plugin/RecentChangesPluginTest.java?rev=1519765&r1=1519764&r2=1519765&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/plugin/RecentChangesPluginTest.java (original)
+++ jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/plugin/RecentChangesPluginTest.java Tue Sep 3 17:42:53 2013
@@ -25,6 +25,7 @@ import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
+import net.sf.ehcache.CacheManager;
import org.apache.wiki.TestEngine;
import org.apache.wiki.WikiContext;
import org.apache.wiki.WikiPage;
@@ -40,6 +41,7 @@ public class RecentChangesPluginTest ext
PluginManager manager;
public void setUp() throws Exception {
+ CacheManager.getInstance().removalAll();
testEngine = new TestEngine(props);
testEngine.saveText("TestPage01", "Some Text for testing 01");
@@ -63,23 +65,17 @@ public class RecentChangesPluginTest ext
* @throws Exception
*/
public void testSimple() throws Exception {
- context = new WikiContext(testEngine, new WikiPage(testEngine,
- "TestPage01"));
+ context = new WikiContext(testEngine, new WikiPage(testEngine, "TestPage01"));
- String res = manager.execute(context,
- "{INSERT org.apache.wiki.plugin.RecentChangesPlugin}");
+ String res = manager.execute(context, "{INSERT org.apache.wiki.plugin.RecentChangesPlugin}");
// 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 cellpadding='4' class='recentchanges'>"));
- 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("<table cellpadding='4' class='recentchanges'>"));
+ 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>"));
}
@@ -89,21 +85,16 @@ public class RecentChangesPluginTest ext
* @throws Exception
*/
public void testParmInClude() throws Exception {
- context = new WikiContext(testEngine, new WikiPage(testEngine,
- "TestPage02"));
+ context = new WikiContext(testEngine, new WikiPage(testEngine, "TestPage02"));
String res = manager
.execute(context,
"{INSERT org.apache.wiki.plugin.RecentChangesPlugin include='TestPage02*'}");
- assertTrue(res
- .contains("<table cellpadding='4' class='recentchanges'>"));
- 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>"));
+ assertTrue(res.contains("<table cellpadding='4' class='recentchanges'>"));
+ 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>"));
}
@@ -113,21 +104,16 @@ public class RecentChangesPluginTest ext
* @throws Exception
*/
public void testParmExClude() throws Exception {
- context = new WikiContext(testEngine, new WikiPage(testEngine,
- "TestPage03"));
+ context = new WikiContext(testEngine, new WikiPage(testEngine, "TestPage03"));
String res = manager
.execute(context,
"{INSERT org.apache.wiki.plugin.RecentChangesPlugin exclude='TestPage03*'}");
- assertTrue(res
- .contains("<table cellpadding='4' class='recentchanges'>"));
- 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("<table cellpadding='4' class='recentchanges'>"));
+ 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>"));
}
Modified: jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/providers/CachingProviderTest.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/providers/CachingProviderTest.java?rev=1519765&r1=1519764&r2=1519765&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/providers/CachingProviderTest.java (original)
+++ jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/providers/CachingProviderTest.java Tue Sep 3 17:42:53 2013
@@ -29,6 +29,7 @@ import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
+import net.sf.ehcache.CacheManager;
import org.apache.log4j.PropertyConfigurator;
import org.apache.wiki.TestEngine;
import org.apache.wiki.WikiPage;
@@ -47,6 +48,7 @@ public class CachingProviderTest extends
throws Exception
{
TestEngine.emptyWorkDir();
+ CacheManager.getInstance().removalAll();
Properties props2 = TestEngine.getTestProperties();
testEngine = new TestEngine(props2);
@@ -78,13 +80,11 @@ public class CachingProviderTest extends
assertEquals("init", 1, p.m_initCalls);
assertEquals("getAllPages", 1, p.m_getAllPagesCalls);
assertEquals("pageExists", 0, p.m_pageExistsCalls);
- assertEquals("getPage", 2, p.m_getPageCalls); // These two are for non-existant pages (with and without s)
assertEquals("getPageText", 4, p.m_getPageTextCalls);
engine.getPage( "Foo" );
assertEquals("pageExists2", 0, p.m_pageExistsCalls);
- assertEquals("getPage2", 2, p.m_getPageCalls);
}
public void testSneakyAdd()
Modified: jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/render/RenderingManagerTest.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/render/RenderingManagerTest.java?rev=1519765&r1=1519764&r2=1519765&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/render/RenderingManagerTest.java (original)
+++ jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/render/RenderingManagerTest.java Tue Sep 3 17:42:53 2013
@@ -66,7 +66,7 @@ public class RenderingManagerTest extend
System.out.println("DOM cache speed test:");
sw.start();
- for( int i = 0; i < 100; i++ )
+ for( int i = 0; i < 300; i++ )
{
WikiPage page = m_engine.getPage( "TestPage" );
String pagedata = m_engine.getPureText( page );
@@ -89,7 +89,7 @@ public class RenderingManagerTest extend
sw.reset();
sw.start();
- for( int i = 0; i < 100; i++ )
+ for( int i = 0; i < 300; i++ )
{
WikiPage page = m_engine.getPage( "TestPage" );
String pagedata = m_engine.getPureText( page );
Modified: jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/rss/RSSGeneratorTest.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/rss/RSSGeneratorTest.java?rev=1519765&r1=1519764&r2=1519765&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/rss/RSSGeneratorTest.java (original)
+++ jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/rss/RSSGeneratorTest.java Tue Sep 3 17:42:53 2013
@@ -27,6 +27,7 @@ import java.util.Date;
import java.util.List;
import java.util.Properties;
+import net.sf.ehcache.CacheManager;
import org.apache.wiki.TestEngine;
import org.apache.wiki.WikiContext;
import org.apache.wiki.WikiEngine;
@@ -56,6 +57,7 @@ public class RSSGeneratorTest extends Te
{
props.setProperty( WikiEngine.PROP_BASEURL, "http://localhost/" );
props.setProperty( RSSGenerator.PROP_GENERATE_RSS, "true" );
+ CacheManager.getInstance().removalAll();
m_testEngine = new TestEngine(props);
}
Modified: jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/search/SearchManagerTest.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/search/SearchManagerTest.java?rev=1519765&r1=1519764&r2=1519765&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/search/SearchManagerTest.java (original)
+++ jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/search/SearchManagerTest.java Tue Sep 3 17:42:53 2013
@@ -25,6 +25,7 @@ import java.util.Properties;
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
+import net.sf.ehcache.CacheManager;
import net.sourceforge.stripes.mock.MockHttpServletRequest;
import org.apache.wiki.SearchResult;
@@ -48,7 +49,8 @@ public class SearchManagerTest extends T
props.setProperty( "jspwiki.lucene.initialdelay", "1" );
props.setProperty( "jspwiki.workDir", workDir + System.currentTimeMillis() );
props.setProperty( "jspwiki.fileSystemProvider.pageDir", workRepo + System.currentTimeMillis() );
-
+
+ CacheManager.getInstance().removalAll();
m_engine = new TestEngine( props );
m_mgr = m_engine.getSearchManager();
}
Modified: jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/stress/MassiveRepositoryTest.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/stress/MassiveRepositoryTest.java?rev=1519765&r1=1519764&r2=1519765&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/stress/MassiveRepositoryTest.java (original)
+++ jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/stress/MassiveRepositoryTest.java Tue Sep 3 17:42:53 2013
@@ -24,6 +24,7 @@ import java.util.Random;
import junit.framework.TestCase;
+import net.sf.ehcache.CacheManager;
import org.apache.wiki.TestEngine;
import org.apache.wiki.WikiProvider;
import org.apache.wiki.providers.CachingProvider;
@@ -38,11 +39,8 @@ public class MassiveRepositoryTest exten
protected void setUp() throws Exception
{
- super.setUp();
+ super.setUp();
- props.setProperty( CachingProvider.PROP_CACHECAPACITY, "1000" );
-
-
String files = props.getProperty( FileSystemProvider.PROP_PAGEDIR );
// Remove file
@@ -50,6 +48,8 @@ public class MassiveRepositoryTest exten
TestEngine.deleteAll(f);
+ CacheManager.getInstance().removalAll();
+
engine = new TestEngine(props);
}
Modified: jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/stress/StressTestVersioningProvider.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/stress/StressTestVersioningProvider.java?rev=1519765&r1=1519764&r2=1519765&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/stress/StressTestVersioningProvider.java (original)
+++ jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/stress/StressTestVersioningProvider.java Tue Sep 3 17:42:53 2013
@@ -41,7 +41,6 @@ public class StressTestVersioningProvide
public void setUp()
throws Exception
{
- props.setProperty( CachingProvider.PROP_CACHECAPACITY, "10000" );
engine = new TestEngine(props);
}
Modified: jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/xmlrpc/RPCHandlerTest.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/xmlrpc/RPCHandlerTest.java?rev=1519765&r1=1519764&r2=1519765&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/xmlrpc/RPCHandlerTest.java (original)
+++ jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/xmlrpc/RPCHandlerTest.java Tue Sep 3 17:42:53 2013
@@ -19,6 +19,7 @@
package org.apache.wiki.xmlrpc;
+import net.sf.ehcache.CacheManager;
import org.apache.wiki.*;
import org.apache.wiki.attachment.Attachment;
import junit.framework.*;
@@ -42,6 +43,7 @@ public class RPCHandlerTest extends Test
public void setUp()
throws Exception
{
+ CacheManager.getInstance().removalAll();
m_engine = new TestEngine( m_props );
m_handler = new RPCHandler();
Modified: jspwiki/trunk/pom.xml
URL: http://svn.apache.org/viewvc/jspwiki/trunk/pom.xml?rev=1519765&r1=1519764&r2=1519765&view=diff
==============================================================================
--- jspwiki/trunk/pom.xml (original)
+++ jspwiki/trunk/pom.xml Tue Sep 3 17:42:53 2013
@@ -127,6 +127,12 @@
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.7.2</version>
+ </dependency>
+
+ <dependency>
<groupId>net.sourceforge</groupId>
<artifactId>akismet-java</artifactId>
<version>1.02</version>
@@ -139,9 +145,9 @@
</dependency>
<dependency>
- <groupId>opensymphony</groupId>
- <artifactId>oscache</artifactId>
- <version>2.3</version>
+ <groupId>net.sf.ehcache</groupId>
+ <artifactId>ehcache-core</artifactId>
+ <version>2.6.6</version>
</dependency>
<dependency>
@@ -461,6 +467,7 @@
- use UglifyJS for JS compression
- use Less as advanced CSS preprocessor
-->
+
<plugin>
<groupId>ro.isdc.wro4j</groupId>
<artifactId>wro4j-maven-plugin</artifactId>