[jboss-cvs] JBossAS SVN: r106992 - in projects/cl-benchmark/trunk/src/test/java/org/jboss/test/cl/benchmark: test and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: kabir.khan at jboss.com
Date: 2010-07-21 12:58:05 -0400 (Wed, 21 Jul 2010)
New Revision: 106992

Modified:
   projects/cl-benchmark/trunk/src/test/java/org/jboss/test/cl/benchmark/AbstractClassLoaderBenchmark.java
   projects/cl-benchmark/trunk/src/test/java/org/jboss/test/cl/benchmark/test/ThreeDeepImportModuleLoaderBenchmarkTestCase.java
Log:
Better status message and fix module test

Modified: projects/cl-benchmark/trunk/src/test/java/org/jboss/test/cl/benchmark/AbstractClassLoaderBenchmark.java
===================================================================
--- projects/cl-benchmark/trunk/src/test/java/org/jboss/test/cl/benchmark/AbstractClassLoaderBenchmark.java	2010-07-21 16:55:29 UTC (rev 106991)
+++ projects/cl-benchmark/trunk/src/test/java/org/jboss/test/cl/benchmark/AbstractClassLoaderBenchmark.java	2010-07-21 16:58:05 UTC (rev 106992)
@@ -99,7 +99,7 @@
          info.initialize(result, getBenchmarkTestDelegate().install(info.getFactory()));
       }
       long time = System.currentTimeMillis() - start;
-      System.out.println("Creating " + classLoaderInfos.size() + " class loaders took." + time + "ms");
+      System.out.println("-> Creating " + classLoaderInfos.size() + " class loaders took." + time + "ms");
       
       List<ClassLoaderInfo> infosToLoad = getLoadersForLoading(classLoaderInfos);
       
@@ -112,14 +112,9 @@
       }
 
       time = System.currentTimeMillis() - start;
-      System.out.println("Loading classes  took." + time + "ms");
+      System.out.println("-> Loading classes  took." + time + "ms");
+      System.out.println("(Success: " + result.getSuccess() + " ; failed: " + result.getFailed() + " ; wrong (filter): " + result.getBadFilter() + ")");
       System.out.println("\n");
-      System.out.println("================================");
-      System.out.println("Stats:");
-      System.out.println("================================");
-      System.out.println("Successful classes:    " + result.getSuccess());
-      System.out.println("Failed classes:        " + result.getFailed());
-      System.out.println("Wrong loader (filter): " + result.getBadFilter());
       
       if (result.getFailed() > result.getSuccess())
          fail("A lot of failures!");

Modified: projects/cl-benchmark/trunk/src/test/java/org/jboss/test/cl/benchmark/test/ThreeDeepImportModuleLoaderBenchmarkTestCase.java
===================================================================
--- projects/cl-benchmark/trunk/src/test/java/org/jboss/test/cl/benchmark/test/ThreeDeepImportModuleLoaderBenchmarkTestCase.java	2010-07-21 16:55:29 UTC (rev 106991)
+++ projects/cl-benchmark/trunk/src/test/java/org/jboss/test/cl/benchmark/test/ThreeDeepImportModuleLoaderBenchmarkTestCase.java	2010-07-21 16:58:05 UTC (rev 106992)
@@ -73,6 +73,8 @@
    {
       VFSClassLoaderFactory factory = new VFSClassLoaderFactory(info.getName());
       ClassLoadingMetaDataFactory metaData = ClassLoadingMetaDataFactory.getInstance();
+      for (String pkg : info.getPackageNames())
+         factory.getCapabilities().addCapability(metaData.createPackage(pkg));
       factory.getCapabilities().addCapability(metaData.createModule(info.getName()));
       factory.getRoots().add(info.getUrl().toString());
       
@@ -85,6 +87,9 @@
       VFSClassLoaderFactory factory = new VFSClassLoaderFactory(info.getName());
       ClassLoadingMetaDataFactory metaData = ClassLoadingMetaDataFactory.getInstance();
       factory.getCapabilities().addCapability(metaData.createModule(info.getName()));
+      for (String pkg : info.getPackageNames())
+         factory.getCapabilities().addCapability(metaData.createPackage(pkg));
+
       factory.getRequirements().addRequirement(metaData.createReExportModule(grandParent.getName()));
       factory.getRoots().add(info.getUrl().toString());
       
@@ -95,6 +100,8 @@
    {
       VFSClassLoaderFactory factory = new VFSClassLoaderFactory(info.getName());
       ClassLoadingMetaDataFactory metaData = ClassLoadingMetaDataFactory.getInstance();
+      for (String pkg : info.getPackageNames())
+         factory.getCapabilities().addCapability(metaData.createPackage(pkg));
       factory.getRequirements().addRequirement(metaData.createReExportModule(parent.getName()));
       factory.getRoots().add(info.getUrl().toString());