svn commit: r1554254 - /jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/stress/MassiveRepositoryTest.java

[juanpablo]

Author: juanpablo
Date: Mon Dec 30 15:19:59 2013
New Revision: 1554254

URL: http://svn.apache.org/r1554254
Log:
JSPWIKI-809: associated unit tests

Modified:
    
jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/stress/MassiveRepositoryTest.java

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=1554254&r1=1554253&r2=1554254&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
 Mon Dec 30 15:19:59 2013
@@ -23,22 +23,21 @@ import java.util.Properties;
 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;
+import org.apache.wiki.api.exceptions.WikiException;
 import org.apache.wiki.providers.FileSystemProvider;
 import org.apache.wiki.util.TextUtil;
 
-public class MassiveRepositoryTest extends TestCase
-{
+public class MassiveRepositoryTest extends TestCase {
+       
     Properties props = 
TestEngine.getTestProperties("/jspwiki-vers-custom.properties");
 
     TestEngine engine;
 
-    protected void setUp() throws Exception
-    {
+    protected void setUp() throws Exception {
         super.setUp();
 
         String files = props.getProperty( FileSystemProvider.PROP_PAGEDIR );
@@ -48,13 +47,12 @@ public class MassiveRepositoryTest exten
 
         TestEngine.deleteAll(f);
 
-        CacheManager.getInstance().removalAll();
+        CacheManager.getInstance().clearAll();
 
         engine = new TestEngine(props);
     }
 
-    protected void tearDown() throws Exception
-    {
+    protected void tearDown() throws Exception {
         super.tearDown();
         
         String files = props.getProperty( FileSystemProvider.PROP_PAGEDIR );
@@ -65,21 +63,32 @@ public class MassiveRepositoryTest exten
         TestEngine.deleteAll(f);
     }
 
-    private String getName( int i )
-    {
+    private String getName( int i ) {
         String baseName = "Page";
         return baseName + i;
     }
     
-    public void testMassiveRepository1()
-    throws Exception
-    {
-        String baseText = "!This is a page %d\r\n\r\nX\r\n\r\nLinks to [%1], 
[%2], [%3], [%4], [%5], [%6], [%7], [%8], [%9], [%0]";
-        int    numPages = 1000;
-        int    numRevisions = 1000;
-        int    numRenders = 10000;
+    public void testMassiveRepositoryGettingAllPagesFromCache() throws 
Exception {
+        int    numPages = 900;
+        int    numRevisions = 900;
+        int    numRenders = 9000;
+        int    tickmarks  = 90;
+        
+        stressTest( numPages, numRevisions, numRenders, tickmarks );
+    }
+    
+    public void testMassiveRepositoryBypassingCacheByHavingTooMuchPages() 
throws Exception {
+       int    numPages = 1001;
+        int    numRevisions = 1001;
+        int    numRenders = 10001;
         int    tickmarks  = 100;
         
+        stressTest( numPages, numRevisions, numRenders, tickmarks );
+    }
+
+       void stressTest( int numPages, int numRevisions, int numRenders, int 
tickmarks ) throws WikiException {
+               String baseText = "!This is a page %d\r\n\r\nX\r\n\r\nLinks to 
[%1], [%2], [%3], [%4], [%5], [%6], [%7], [%8], [%9], [%0]";
+        
         Random random = new Random();
         Benchmark sw = new Benchmark();
         sw.start();
@@ -156,6 +165,6 @@ public class MassiveRepositoryTest exten
         
         sw.stop();
         System.out.println("\nTook "+sw.toString()+", which is 
"+sw.toString(numRenders)+" renders/second");
-        
-    }
+       }
+
 }