EMBJOPR SVN: r724 - trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5.
by embjopr-commits＠lists.jboss.org
Author: ozizka(a)redhat.com
Date: 2009-08-31 08:28:54 -0400 (Mon, 31 Aug 2009)
New Revision: 724
Modified:
trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/JBossASNodeTest.java
Log:
* JBossASNodeTest updated
Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/JBossASNodeTest.java
===================================================================
--- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/JBossASNodeTest.java 2009-08-31 12:09:42 UTC (rev 723)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/JBossASNodeTest.java 2009-08-31 12:28:54 UTC (rev 724)
@@ -146,8 +146,8 @@
// Allocate some memory to decrease free mem.
- log.info("Allocating 500 MB of ram.");
- byte tmp[] = new byte[500 * 1024 * 1024]; // Few MB.
+ log.info("Allocating 200 MB of ram.");
+ byte tmp[] = new byte[200 * 1024 * 1024]; // Few MB.
tmp[0] = 1;
tmp[tmp.length-1] = 1;
14 years, 7 months
EMBJOPR SVN: r723 - trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5.
by embjopr-commits＠lists.jboss.org
Author: ozizka(a)redhat.com
Date: 2009-08-31 08:09:42 -0400 (Mon, 31 Aug 2009)
New Revision: 723
Modified:
trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/ResourceTestBase.java
Log:
* ResourceTestBase fixed - comment
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-08-31 12:08:41 UTC (rev 722)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/ResourceTestBase.java 2009-08-31 12:09:42 UTC (rev 723)
@@ -625,6 +625,7 @@
assertEquals("Incorrect value for '" + rowName + "' - ", expectedValue, rowValue);
}/**/
+ // The list of properties to check is not taken from the table, but given by the test.
Properties properties = ejtt.tabMenu.getTabContentBox().getTable(table).getProperties();
for( String key : expectedValues.keySet() ){
assertEquals("Incorrect value for '" + key + "' - ", expectedValues.get(key), properties.getProperty(key));
14 years, 7 months
EMBJOPR SVN: r722 - trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5.
by embjopr-commits＠lists.jboss.org
Author: ozizka(a)redhat.com
Date: 2009-08-31 08:08:41 -0400 (Mon, 31 Aug 2009)
New Revision: 722
Modified:
trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/ResourceTestBase.java
Log:
* ResourceTestBase fixed - the list of properties to check is not taken from the table, but given by the test.
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-08-31 11:38:55 UTC (rev 721)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/ResourceTestBase.java 2009-08-31 12:08:41 UTC (rev 722)
@@ -36,6 +36,7 @@
import java.util.Iterator;
import java.util.List;
import java.util.LinkedHashMap;
+import java.util.Properties;
import org.jboss.jopr.jsfunit.util.EmbJoprTestToolkit.NavTreeNode;
import org.jboss.jopr.jsfunit.exceptions.*;
@@ -607,21 +608,28 @@
// Get the resulting table: it will have two columns, Name and Value
HtmlDivision historyPanel = (HtmlDivision)client.getElement(OPERATION_RESULTS);
HtmlTable table = (HtmlTable)historyPanel.getFirstByXPath(".//table[@class='openmap-properties-table']");
-
+
+ /*
List<HtmlTableRow> rows = table.getRows();
Iterator i = rows.iterator();
HtmlTableRow headerRow = (HtmlTableRow)i.next(); // Skip over the row that contains column names
while(i.hasNext()) {
-
+
// Get the actual value
HtmlTableRow row = (HtmlTableRow)i.next();
String rowName = ((HtmlTableCell)row.getCell(NAME_COLUMN)).asText();
String rowValue = ((HtmlTableCell)row.getCell(VALUE_COLUMN)).asText();
-
+
String expectedValue = expectedValues.get(rowName);
assertEquals("Incorrect value for '" + rowName + "' - ", expectedValue, rowValue);
- }
+ }/**/
+
+ Properties properties = ejtt.tabMenu.getTabContentBox().getTable(table).getProperties();
+ for( String key : expectedValues.keySet() ){
+ assertEquals("Incorrect value for '" + key + "' - ", expectedValues.get(key), properties.getProperty(key));
+ }
+
}
/**
14 years, 7 months
EMBJOPR SVN: r721 - trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/connfactories.
by embjopr-commits＠lists.jboss.org
Author: ozizka(a)redhat.com
Date: 2009-08-31 07:38:55 -0400 (Mon, 31 Aug 2009)
New Revision: 721
Modified:
trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/connfactories/ConnFactoryOperationsTest.java
Log:
* ConnFactoryOpsTest fixed.
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-08-31 11:15:06 UTC (rev 720)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/connfactories/ConnFactoryOperationsTest.java 2009-08-31 11:38:55 UTC (rev 721)
@@ -320,7 +320,7 @@
try {
// Set up the expected results
- StringBuffer expectedBuffer = new StringBuffer();
+ StringBuffer expectedBuffer = new StringBuffer("(?m)");
expectedBuffer.append("Sub Pool Statistics: \n");
expectedBuffer.append("Sub Pool Count: 1\n");
expectedBuffer.append(POOL_SEPARATOR);
@@ -341,7 +341,7 @@
performResourceOperationAndCheckValueBox(CF_NAV_LABEL, cfType.getLabel(),
jndiName, LIST_FORMATTED_SUB_POOL_STATISTICS,
- Boolean.TRUE, expectedBuffer, errorMessage);
+ Boolean.TRUE, expectedBuffer, errorMessage, true);
} finally {
// Clean up
14 years, 7 months
EMBJOPR SVN: r720 - trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jbcache.
by embjopr-commits＠lists.jboss.org
Author: ozizka(a)redhat.com
Date: 2009-08-31 07:15:06 -0400 (Mon, 31 Aug 2009)
New Revision: 720
Modified:
trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jbcache/JBossCacheTestBase.java
Log:
* JBoss Cache tests updated - caches names has changed.
Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jbcache/JBossCacheTestBase.java
===================================================================
--- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jbcache/JBossCacheTestBase.java 2009-08-31 08:40:14 UTC (rev 719)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jbcache/JBossCacheTestBase.java 2009-08-31 11:15:06 UTC (rev 720)
@@ -18,10 +18,14 @@
// Cache which is active by default.
- protected static final String JBCACHE_HA_PARTITION = "jboss.cache:config=ha-partition,service=Cache";
- protected static final String JBCACHE_MVCC_ENTITY = "jboss.cache:config=mvcc-entity,service=Cache";
- protected static final String JBCACHE_PESSIMISTIC_SHARED = "jboss.cache:config=pessimistic-shared,service=Cache";
- protected static final String JBCACHE_TIMESTAMPS = "jboss.cache:config=timestamps-cache,service=Cache";
+ //protected static final String JBCACHE_HA_PARTITION = "jboss.cache:config=ha-partition,service=Cache";
+ protected static final String JBCACHE_HA_PARTITION = "ha-partition";
+ //protected static final String JBCACHE_MVCC_ENTITY = "jboss.cache:config=mvcc-entity,service=Cache";
+ protected static final String JBCACHE_MVCC_ENTITY = "mvcc-entity";
+ //protected static final String JBCACHE_PESSIMISTIC_SHARED = "jboss.cache:config=pessimistic-shared,service=Cache";
+ protected static final String JBCACHE_PESSIMISTIC_SHARED = "pessimistic-shared";
+ //protected static final String JBCACHE_TIMESTAMPS = "jboss.cache:config=timestamps-cache,service=Cache";
+ protected static final String JBCACHE_TIMESTAMPS = "timestamps-cache";
// Subnodes
14 years, 7 months
EMBJOPR SVN: r719 - trunk/jsfunit/testdata.
by embjopr-commits＠lists.jboss.org
Author: ozizka(a)redhat.com
Date: 2009-08-31 04:40:14 -0400 (Mon, 31 Aug 2009)
New Revision: 719
Modified:
trunk/jsfunit/testdata/hudson_shell_script.sh
Log:
* hudson shell script: Fixed - Empty Cargo's configuration dir between parts.
Modified: trunk/jsfunit/testdata/hudson_shell_script.sh
===================================================================
--- trunk/jsfunit/testdata/hudson_shell_script.sh 2009-08-28 05:46:20 UTC (rev 718)
+++ trunk/jsfunit/testdata/hudson_shell_script.sh 2009-08-31 08:40:14 UTC (rev 719)
@@ -62,6 +62,7 @@
svn revert pom.xml
echo "Performing 'patch -p0 < testdata/pom_patches/pom-$part.patch'..."
patch -p0 < testdata/pom_patches/pom-$part.patch
+ rm -rf target/jboss5x # Empty Cargo's configuration dir
mvn -Pjboss5x -Pfoo$ADD_PROFILES install -Dcargo.jboss.configuration=$JBOSS_CONFIG -Dhtmlunit.browser=$BROWSER --fail-never --update-snapshots -DJBOSS_HOME=$JBOSS_HOME -Dcargo.jboss.bind.address=$MYTESTIP_1
#mv target/surefire-reports/TEST-TestSuite.xml TEST-TestSuite-$part.xml
mv target target-$part
14 years, 7 months
EMBJOPR SVN: r718 - trunk/jsfunit/testdata.
by embjopr-commits＠lists.jboss.org
Author: ozizka(a)redhat.com
Date: 2009-08-28 01:46:20 -0400 (Fri, 28 Aug 2009)
New Revision: 718
Modified:
trunk/jsfunit/testdata/hudson_shell_script.sh
Log:
* hudson shell script: Fixed - missing $ in front of NO_GC_LIMIT
Modified: trunk/jsfunit/testdata/hudson_shell_script.sh
===================================================================
--- trunk/jsfunit/testdata/hudson_shell_script.sh 2009-08-28 05:19:35 UTC (rev 717)
+++ trunk/jsfunit/testdata/hudson_shell_script.sh 2009-08-28 05:46:20 UTC (rev 718)
@@ -50,7 +50,7 @@
#mvn -Pjboss5x install -Dcargo.jboss.configuration=$JBOSS_CONFIG -Dhtmlunit.browser=$BROWSER --fail-never --update-snapshots -DJBOSS_HOME=$JBOSS_HOME -Dcargo.jboss.bind.address=$MYTESTIP_1
- if [ -n "NO_GC_LIMIT" ] ; then ADD_PROFILES=",no_GC_limit"; fi
+ if [ -n "$NO_GC_LIMIT" ] ; then ADD_PROFILES=",no_GC_limit"; fi
if [ -n "$DONT_SPLIT" ] ; then
echo "Running whole testsuite... (DONT_SPLIT)"
14 years, 8 months
EMBJOPR SVN: r717 - trunk/jsfunit/testdata.
by embjopr-commits＠lists.jboss.org
Author: ozizka(a)redhat.com
Date: 2009-08-28 01:19:35 -0400 (Fri, 28 Aug 2009)
New Revision: 717
Modified:
trunk/jsfunit/testdata/hudson_shell_script.sh
Log:
* hudson shell script: -Pfoo$ADD_PROFILES
Modified: trunk/jsfunit/testdata/hudson_shell_script.sh
===================================================================
--- trunk/jsfunit/testdata/hudson_shell_script.sh 2009-08-28 05:11:05 UTC (rev 716)
+++ trunk/jsfunit/testdata/hudson_shell_script.sh 2009-08-28 05:19:35 UTC (rev 717)
@@ -50,11 +50,11 @@
#mvn -Pjboss5x install -Dcargo.jboss.configuration=$JBOSS_CONFIG -Dhtmlunit.browser=$BROWSER --fail-never --update-snapshots -DJBOSS_HOME=$JBOSS_HOME -Dcargo.jboss.bind.address=$MYTESTIP_1
- if [ -n "NO_GC_LIMIT" ] ; then ADD_PROFILES="no_GC_limit"; fi
+ if [ -n "NO_GC_LIMIT" ] ; then ADD_PROFILES=",no_GC_limit"; fi
if [ -n "$DONT_SPLIT" ] ; then
echo "Running whole testsuite... (DONT_SPLIT)"
- mvn -Pjboss5x install -Dcargo.jboss.configuration=$JBOSS_CONFIG -Dhtmlunit.browser=$BROWSER --fail-never --update-snapshots -DJBOSS_HOME=$JBOSS_HOME -Dcargo.jboss.bind.address=$MYTESTIP_1
+ mvn -Pjboss5x -Pfoo$ADD_PROFILES install -Dcargo.jboss.configuration=$JBOSS_CONFIG -Dhtmlunit.browser=$BROWSER --fail-never --update-snapshots -DJBOSS_HOME=$JBOSS_HOME -Dcargo.jboss.bind.address=$MYTESTIP_1
else
## Split testsuite to parts, because of OOME
for part in Apps ConnFactories Datasources Jms theRest; do
@@ -62,7 +62,7 @@
svn revert pom.xml
echo "Performing 'patch -p0 < testdata/pom_patches/pom-$part.patch'..."
patch -p0 < testdata/pom_patches/pom-$part.patch
- mvn -Pjboss5x -P$ADD_PROFILES install -Dcargo.jboss.configuration=$JBOSS_CONFIG -Dhtmlunit.browser=$BROWSER --fail-never --update-snapshots -DJBOSS_HOME=$JBOSS_HOME -Dcargo.jboss.bind.address=$MYTESTIP_1
+ mvn -Pjboss5x -Pfoo$ADD_PROFILES install -Dcargo.jboss.configuration=$JBOSS_CONFIG -Dhtmlunit.browser=$BROWSER --fail-never --update-snapshots -DJBOSS_HOME=$JBOSS_HOME -Dcargo.jboss.bind.address=$MYTESTIP_1
#mv target/surefire-reports/TEST-TestSuite.xml TEST-TestSuite-$part.xml
mv target target-$part
done
14 years, 8 months
EMBJOPR SVN: r716 - in trunk/jsfunit: testdata and 1 other directory.
by embjopr-commits＠lists.jboss.org
Author: ozizka(a)redhat.com
Date: 2009-08-28 01:11:05 -0400 (Fri, 28 Aug 2009)
New Revision: 716
Modified:
trunk/jsfunit/pom.xml
trunk/jsfunit/testdata/hudson_shell_script.sh
Log:
* hudson shell script: Added "NO_GC_LIMIT" variable to trigger the no_GC_limit profile
* POM: Added the no_GC_limit profile which adds "-XX:-UseGCOverheadLimit" to JVM args.
Modified: trunk/jsfunit/pom.xml
===================================================================
--- trunk/jsfunit/pom.xml 2009-08-28 03:40:47 UTC (rev 715)
+++ trunk/jsfunit/pom.xml 2009-08-28 05:11:05 UTC (rev 716)
@@ -7,6 +7,8 @@
<jvm.args.debug></jvm.args.debug> <!-- Used by the -Pdebug profile. -->
<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>
<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. -->
@@ -421,8 +423,8 @@
<!-- 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} -Xmx1536m -Dxb.builder.useUnorderedSequence=true -XX:-UseGCOverheadLimit -XX:PermSize=256m -XX:MaxPermSize=512m</cargo.jvmargs>
- <!-- -XX:+UseConcMarkSweepGC -XX:+CMSPermGenSweepingEnabled -XX:+CMSClassUnloadingEnabled -->
+ <cargo.jvmargs>${jvm.args.debug} ${jvm.args.profiler} ${jvm.args.exposejmx} ${jvm.args.memory} ${jvm.args.common} -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>
<!-- Set explicitely because of Cargo's bad port settings for JBoss. -->
@@ -647,8 +649,16 @@
</properties>
</profile>
+ <!-- Expose JMX - used to enable the Hibernate statistics. -->
+ <profile>
+ <id>no_GC_limit</id>
+ <properties>
+ <jvm.args.memory>-XX:-UseGCOverheadLimit</jvm.args.memory>
+ </properties>
+ </profile>
+
<!-- Profiler profile - enables JBoss Profiler. THIS IS FOR JDK 5 ONLY! -->
<profile>
<id>profile</id>
Modified: trunk/jsfunit/testdata/hudson_shell_script.sh
===================================================================
--- trunk/jsfunit/testdata/hudson_shell_script.sh 2009-08-28 03:40:47 UTC (rev 715)
+++ trunk/jsfunit/testdata/hudson_shell_script.sh 2009-08-28 05:11:05 UTC (rev 716)
@@ -50,16 +50,23 @@
#mvn -Pjboss5x install -Dcargo.jboss.configuration=$JBOSS_CONFIG -Dhtmlunit.browser=$BROWSER --fail-never --update-snapshots -DJBOSS_HOME=$JBOSS_HOME -Dcargo.jboss.bind.address=$MYTESTIP_1
- ## Split testsuite to parts, because of OOME
- for part in Apps ConnFactories Datasources Jms theRest; do
- echo "Running tests for part '$part'..."
- svn revert pom.xml
- echo "Performing 'patch -p0 < testdata/pom_patches/pom-$part.patch'..."
- patch -p0 < testdata/pom_patches/pom-$part.patch
+ if [ -n "NO_GC_LIMIT" ] ; then ADD_PROFILES="no_GC_limit"; fi
+
+ if [ -n "$DONT_SPLIT" ] ; then
+ echo "Running whole testsuite... (DONT_SPLIT)"
mvn -Pjboss5x install -Dcargo.jboss.configuration=$JBOSS_CONFIG -Dhtmlunit.browser=$BROWSER --fail-never --update-snapshots -DJBOSS_HOME=$JBOSS_HOME -Dcargo.jboss.bind.address=$MYTESTIP_1
- #mv target/surefire-reports/TEST-TestSuite.xml TEST-TestSuite-$part.xml
- mv target target-$part
- done
+ else
+ ## Split testsuite to parts, because of OOME
+ for part in Apps ConnFactories Datasources Jms theRest; do
+ echo "Running tests for part '$part'..."
+ svn revert pom.xml
+ echo "Performing 'patch -p0 < testdata/pom_patches/pom-$part.patch'..."
+ patch -p0 < testdata/pom_patches/pom-$part.patch
+ mvn -Pjboss5x -P$ADD_PROFILES install -Dcargo.jboss.configuration=$JBOSS_CONFIG -Dhtmlunit.browser=$BROWSER --fail-never --update-snapshots -DJBOSS_HOME=$JBOSS_HOME -Dcargo.jboss.bind.address=$MYTESTIP_1
+ #mv target/surefire-reports/TEST-TestSuite.xml TEST-TestSuite-$part.xml
+ mv target target-$part
+ done
+ fi
sleep 5
14 years, 8 months
EMBJOPR SVN: r715 - trunk/core/src/main/webapp/WEB-INF/facelets.
by embjopr-commits＠lists.jboss.org
Author: ozizka(a)redhat.com
Date: 2009-08-27 23:40:47 -0400 (Thu, 27 Aug 2009)
New Revision: 715
Modified:
trunk/core/src/main/webapp/WEB-INF/facelets/resourceDataScroller.xhtml
Log:
Fixed pagination <span>s.
Modified: trunk/core/src/main/webapp/WEB-INF/facelets/resourceDataScroller.xhtml
===================================================================
--- trunk/core/src/main/webapp/WEB-INF/facelets/resourceDataScroller.xhtml 2009-08-28 03:22:42 UTC (rev 714)
+++ trunk/core/src/main/webapp/WEB-INF/facelets/resourceDataScroller.xhtml 2009-08-28 03:40:47 UTC (rev 715)
@@ -111,12 +111,14 @@
</rich:datascroller>
<h:panelGroup layout="block" style=" margin-top: -4px; float: right; font-size:11px;">
<h:outputText id="paginationTotalItems"
- style="margin-right: 1em;">#{messages['scroller.total']}#{paginationDataModel.size}</h:outputText>
+ style="margin-right: 1em;"
+ value="#{messages['scroller.total']}#{paginationDataModel.size}"/>
<!-- Allow the user to configure the number of items per page
displayed in a data table. -->
<h:outputText style="margin-right: .2em;"
- rendered="#{paginationDataModel.size > tableManager.minimumPageSize}">#{messages['scroller.itemsPerPage']}</h:outputText>
+ rendered="#{paginationDataModel.size > tableManager.minimumPageSize}"
+ value="#{messages['scroller.itemsPerPage']}"/>
<h:selectOneListbox
style="margin-right: 1em; width: 3.5em; height: 1.8em; position: relative; top: -0.05em; left: 0.1em;"
id="currentPageSize" size="1"
14 years, 8 months