[embjopr-commits] EMBJOPR SVN: r744 - in trunk/jsfunit: src/test/java/org/jboss/jopr/jsfunit/as5 and 2 other directories.

[embjopr-commits at lists.jboss.org]

Author: ozizka at redhat.com
Date: 2009-09-03 08:52:10 -0400 (Thu, 03 Sep 2009)
New Revision: 744

Modified:
   trunk/jsfunit/pom.xml
   trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/ResourceTestBase.java
   trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/connfactories/ConnFactoryOperationsTest.java
   trunk/jsfunit/testdata/ear/not-malformed-application-xml.ear
Log:
 * ConnFactoryOpsTest updated.

Modified: trunk/jsfunit/pom.xml
===================================================================
--- trunk/jsfunit/pom.xml	2009-09-02 17:25:24 UTC (rev 743)
+++ trunk/jsfunit/pom.xml	2009-09-03 12:52:10 UTC (rev 744)
@@ -8,7 +8,8 @@
       <jvm.args.profiler></jvm.args.profiler> <!-- Used by the -Pprofile profile. -->
       <jvm.args.exposejmx></jvm.args.exposejmx> <!-- Expose JMX - used to enable the Hibernate statistics.  -->
       <jvm.args.memory></jvm.args.memory> <!-- Used to prevent OOMEs. See the no_GC_limit profile. -->
-      <jvm.args.common>-XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=${project.build.directory}/heapdump -Xmx1536m -XX:PermSize=256m -XX:MaxPermSize=512m</jvm.args.common>
+      <jvm.args.common>-XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=${project.build.directory}/heapdump-sun -Xmx1536m -XX:PermSize=256m -XX:MaxPermSize=512m</jvm.args.common>
+      <jvm.args.vendor-specific></jvm.args.vendor-specific>
 
       <cargo.jboss.configuration>default</cargo.jboss.configuration><!-- JBoss AS configuration. -->
       <cargo.jboss.bind.address>localhost</cargo.jboss.bind.address><!-- Address for JBoss AS to bind to. -->
@@ -424,7 +425,7 @@
                          <!-- Raise permgen size, allow classes unloading and permgen sweep -->
                          <!-- xb.builder.useUnorderedSequence=true is the same what run.sh does. -->
                          <!--   See http://www.nabble.com/changes-in-parsing-with-xb-td22478176.html -->
-                         <cargo.jvmargs>${jvm.args.debug} ${jvm.args.profiler} ${jvm.args.exposejmx} ${jvm.args.memory} ${jvm.args.common} -Dxb.builder.useUnorderedSequence=true</cargo.jvmargs>
+                         <cargo.jvmargs>${jvm.args.debug} ${jvm.args.profiler} ${jvm.args.exposejmx} ${jvm.args.memory} ${jvm.args.common} ${jvm.args.vendor-specific} -Dxb.builder.useUnorderedSequence=true</cargo.jvmargs>
                          <!-- -XX:+UseConcMarkSweepGC -XX:+CMSPermGenSweepingEnabled -XX:+CMSClassUnloadingEnabled    -XX:-UseGCOverheadLimit  -->
                          <!-- JBoss configuration - default, all, standard -->
                          <cargo.jboss.configuration>${cargo.jboss.configuration}</cargo.jboss.configuration>
@@ -650,7 +651,7 @@
         </properties>
       </profile>
 
-      <!-- Expose JMX - used to enable the Hibernate statistics.  -->
+      <!-- No Garbage collector limit.  -->
       <profile>
         <id>no_GC_limit</id>
         <properties>
@@ -658,8 +659,16 @@
         </properties>
       </profile>
 
+      <!-- IBM heapdump and big objects allocation logging.  -->
+      <profile>
+        <id>ibm-jdk</id>
+        <properties>
+          <jvm.args.vendor-specific>-Xdump:stack:events=allocation,filter=#4k -DIBM_HEAPDUMPDIR=${project.build.directory}/heapdumps-ibm -DIBM_HEAPDUMP=true</jvm.args.vendor-specific>
+        </properties>
+      </profile>
 
 
+
       <!-- Profiler profile - enables JBoss Profiler. THIS IS FOR JDK 5 ONLY! -->
       <profile>
         <id>profile</id>

Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/ResourceTestBase.java
===================================================================
--- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/ResourceTestBase.java	2009-09-02 17:25:24 UTC (rev 743)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/ResourceTestBase.java	2009-09-03 12:52:10 UTC (rev 744)
@@ -603,7 +603,7 @@
 				String condVerb = isRegEx ? "match" : "contain";
 
 				if( !isSuccess ){
-					fail(errorMessage + " - \nexpected the result to "+condVerb+":\n\n" + expectedBuffer.toString() + "\n\nbut was:\n\n" + actualResult );
+					fail(errorMessage + " - \nexpected the result to "+condVerb+":\n\n>>>" + expectedBuffer.toString() + "<<<\n\nbut was:\n\n>>>" + actualResult + "<<<" );
 				}
         
     }

Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/connfactories/ConnFactoryOperationsTest.java
===================================================================
--- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/connfactories/ConnFactoryOperationsTest.java	2009-09-02 17:25:24 UTC (rev 743)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/connfactories/ConnFactoryOperationsTest.java	2009-09-03 12:52:10 UTC (rev 744)
@@ -320,7 +320,7 @@
         try { 
             
             // Set up the expected results
-            StringBuffer expectedBuffer = new StringBuffer("(?m)");
+            StringBuffer expectedBuffer = new StringBuffer("(?m)(?s)");
             expectedBuffer.append("Sub Pool Statistics: \n");
             expectedBuffer.append("Sub Pool Count: 1\n");
             expectedBuffer.append(POOL_SEPARATOR);

Modified: trunk/jsfunit/testdata/ear/not-malformed-application-xml.ear
===================================================================
(Binary files differ)