[embjopr-commits] EMBJOPR SVN: r923 - in branches/EmbJopr-1.4.0-SN-EAP5/jsfunit/src: main/resources and 2 other directories.

[embjopr-commits at lists.jboss.org]

Author: ozizka at redhat.com
Date: 2010-04-09 11:10:22 -0400 (Fri, 09 Apr 2010)
New Revision: 923

Modified:
   branches/EmbJopr-1.4.0-SN-EAP5/jsfunit/src/
   branches/EmbJopr-1.4.0-SN-EAP5/jsfunit/src/main/resources/labels-jopr-2.4.0-SNAPSHOT.properties
   branches/EmbJopr-1.4.0-SN-EAP5/jsfunit/src/test/java/org/jboss/jopr/jsfunit/EmbjoprTestCase.java
   branches/EmbJopr-1.4.0-SN-EAP5/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jbcache/JBossCacheTestBase.java
   branches/EmbJopr-1.4.0-SN-EAP5/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jbcache/JBossCacheTransactionTableTest.java
Log:
* Fixed JBoss Cache tests.


Property changes on: branches/EmbJopr-1.4.0-SN-EAP5/jsfunit/src
___________________________________________________________________
Name: svn:ignore
   + EmbJopr-TS-HTMLUnit27.patch


Modified: branches/EmbJopr-1.4.0-SN-EAP5/jsfunit/src/main/resources/labels-jopr-2.4.0-SNAPSHOT.properties
===================================================================
--- branches/EmbJopr-1.4.0-SN-EAP5/jsfunit/src/main/resources/labels-jopr-2.4.0-SNAPSHOT.properties	2010-04-08 21:21:35 UTC (rev 922)
+++ branches/EmbJopr-1.4.0-SN-EAP5/jsfunit/src/main/resources/labels-jopr-2.4.0-SNAPSHOT.properties	2010-04-09 15:10:22 UTC (rev 923)
@@ -11,3 +11,10 @@
 NAV_WAR = Web Application (WAR)s
 NAV_EMB_WAR = Embedded Web Application (WAR)s
 NAV_EMB_RAR = Embedded Resource Adapter (RAR)s
+
+
+# After EAP 5.0 CR3, not sure when exactly this changed in Jopr.
+JBCACHE_HA_PARTITION = ha-partition
+JBCACHE_MVCC_ENTITY = mvcc-entity
+JBCACHE_PESSIMISTIC_SHARED = pessimistic-shared
+JBCACHE_TIMESTAMPS = timestamps-cache

Modified: branches/EmbJopr-1.4.0-SN-EAP5/jsfunit/src/test/java/org/jboss/jopr/jsfunit/EmbjoprTestCase.java
===================================================================
--- branches/EmbJopr-1.4.0-SN-EAP5/jsfunit/src/test/java/org/jboss/jopr/jsfunit/EmbjoprTestCase.java	2010-04-08 21:21:35 UTC (rev 922)
+++ branches/EmbJopr-1.4.0-SN-EAP5/jsfunit/src/test/java/org/jboss/jopr/jsfunit/EmbjoprTestCase.java	2010-04-09 15:10:22 UTC (rev 923)
@@ -924,7 +924,7 @@
 			if( null == val )
 				return null;
 
-			boolean isNumeric = val.matches("([0-9][0-9\\., ]+[0-9])[a-zA-Z]{0,3}");
+			boolean isNumeric = val.matches("([0-9][0-9\\., ]+[0-9]+)[a-zA-Z]{0,3}");
 			if( !isNumeric )
 				return val;
 

Modified: branches/EmbJopr-1.4.0-SN-EAP5/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jbcache/JBossCacheTestBase.java
===================================================================
--- branches/EmbJopr-1.4.0-SN-EAP5/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jbcache/JBossCacheTestBase.java	2010-04-08 21:21:35 UTC (rev 922)
+++ branches/EmbJopr-1.4.0-SN-EAP5/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jbcache/JBossCacheTestBase.java	2010-04-09 15:10:22 UTC (rev 923)
@@ -5,8 +5,10 @@
 
 package org.jboss.jopr.jsfunit.as5.jbcache;
 
+import java.io.IOException;
 import org.jboss.jopr.jsfunit.ApplicationTestBaseAS5;
 import org.jboss.jopr.jsfunit.DeployableTypeInfo;
+import org.jboss.jopr.jsfunit.exceptions.EmbJoprTestException;
 
 /**
  *
@@ -18,16 +20,17 @@
 
 
 	// 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_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";
+	 */
 
 	// Post-CR3
-	//	protected static final String JBCACHE_HA_PARTITION = "ha-partition";
-	//	protected static final String JBCACHE_MVCC_ENTITY = "mvcc-entity";
-	//	protected static final String JBCACHE_PESSIMISTIC_SHARED = "pessimistic-shared";
-	//	protected static final String JBCACHE_TIMESTAMPS = "timestamps-cache";
+	protected static final String JBCACHE_HA_PARTITION = "ha-partition";
+	protected static final String JBCACHE_MVCC_ENTITY = "mvcc-entity";
+	protected static final String JBCACHE_PESSIMISTIC_SHARED = "pessimistic-shared";
+	protected static final String JBCACHE_TIMESTAMPS = "timestamps-cache";
 
 
 	// Subnodes
@@ -39,8 +42,15 @@
 	protected static final String SUBNODE_TRANSACTION_TABLE = "Transaction Table";
 	protected static final String SUBNODE_TX_INTERCEPTOR = "Tx Interceptor";
 
+	@Override
+	public void setUp() throws IOException, EmbJoprTestException {
+		super.setUp();
+		this.APP_TYPE = ejtt.deployableTypes.RAR;
+	}
 
 
+
+
 	/**
 	 * Some JBoss AS configurations don't have Cache included -
 	 * in that case, skip all JBoss Cache tests (don't fail).

Modified: branches/EmbJopr-1.4.0-SN-EAP5/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jbcache/JBossCacheTransactionTableTest.java
===================================================================
--- branches/EmbJopr-1.4.0-SN-EAP5/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jbcache/JBossCacheTransactionTableTest.java	2010-04-08 21:21:35 UTC (rev 922)
+++ branches/EmbJopr-1.4.0-SN-EAP5/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jbcache/JBossCacheTransactionTableTest.java	2010-04-09 15:10:22 UTC (rev 923)
@@ -79,9 +79,9 @@
 
 
 	/**
-	 *
+	 *  DISABLED - Control tab was disabled (checked in EAP 5.0.1).
 	 */
-	public void testJBossCacheTransactionTableControl() throws IOException, EmbJoprTestException {
+	public void DISABLEDtestJBossCacheTransactionTableControl() throws IOException, EmbJoprTestException {
 		if( isJBossConfigWithoutCache() ) return;
 
 		navigateToNode();