r1105 - xwiki/trunk/src/test/java/com/xpn/xwiki/test

[Ludovic Dubost]

Author: ludovic
Date: 2006-07-31 11:36:31 +0200 (Mon, 31 Jul 2006)
New Revision: 1105

Modified:
   xwiki/trunk/src/test/java/com/xpn/xwiki/test/GroovyRenderTest.java
Log:
Fix groovy memory test to clean cache before measuring memory comsuption

Modified: xwiki/trunk/src/test/java/com/xpn/xwiki/test/GroovyRenderTest.java
===================================================================
--- xwiki/trunk/src/test/java/com/xpn/xwiki/test/GroovyRenderTest.java	2006-07-31 09:29:30 UTC (rev 1104)
+++ xwiki/trunk/src/test/java/com/xpn/xwiki/test/GroovyRenderTest.java	2006-07-31 09:36:31 UTC (rev 1105)
@@ -71,8 +71,12 @@
     }
 
     public void cleanMem() {
+        // Make sure we get rid of all the caches
+        xwiki.flushCache();
+
+        // Make sure we clean the java memory
         Runtime rt = Runtime.getRuntime();
-        for (int i=0;i<5;i++) {
+        for (int i=0;i<10;i++) {
             rt.gc();
             rt.runFinalization();
             rt.gc();
@@ -81,6 +85,7 @@
     public void testMemory() throws Exception {
         XWikiRenderingEngine wikiengine = xwiki.getRenderingEngine();
         getXWiki().setRightService(new GroovyTestRightService());
+        wikiengine.getRenderer("groovy").flushCache();
         ((XWikiGroovyRenderer)wikiengine.getRenderer("groovy")).initCache(context);
         int nbrenders = 500;
         int nbtotal = 20;
@@ -98,6 +103,7 @@
                 "" + (nbtotal*2), false, getXWikiContext());
         }
 
+        wikiengine.getRenderer("groovy").flushCache();
         ((XWikiGroovyRenderer)wikiengine.getRenderer("groovy")).initCache(context);
         cleanMem();
 
@@ -112,6 +118,7 @@
                     "" + (nbtotal*2), false, getXWikiContext());
         }
 
+        wikiengine.getRenderer("groovy").flushCache();
         ((XWikiGroovyRenderer)wikiengine.getRenderer("groovy")).initCache(context);
         cleanMem();
 
@@ -127,9 +134,10 @@
                     "" + (nbtotal*(i+1)), false, getXWikiContext());
             MetaClassRegistry mcr = MetaClassRegistry.getIntance(0);
             Map map = (Map) XWiki.getPrivateField(mcr, "metaClasses");
-            System.out.println("Map size: " + map.size());
+            // System.out.println("Map size: " + map.size());
         }
 
+        wikiengine.getRenderer("groovy").flushCache();
         ((XWikiGroovyRenderer)wikiengine.getRenderer("groovy")).initCache(context);
         cleanMem();