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

[embjopr-commits at lists.jboss.org]

Author: ozizka at redhat.com
Date: 2009-10-19 12:01:46 -0400 (Mon, 19 Oct 2009)
New Revision: 792

Modified:
   trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/ApplicationTestBaseAS5.java
   trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/app/ejb/EjbTestBase.java
   trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/app/rar/RarTest.java
   trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/app/war/WarTest.java
Log:
 * Tests updated - Windows paths handling fixed.

Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/ApplicationTestBaseAS5.java
===================================================================
--- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/ApplicationTestBaseAS5.java	2009-10-16 17:55:24 UTC (rev 791)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/ApplicationTestBaseAS5.java	2009-10-19 16:01:46 UTC (rev 792)
@@ -164,7 +164,7 @@
 			//String query = "jboss.deployment:id=\"vfszip:" +
 			//				System.getProperty("jsfunit.deploy.dir") + "/" + earName + "/\",*";
 			String query = String.format("jboss.deployment:id=\"vfszip:%s/%s/\",*",
-							System.getProperty("jsfunit.deploy.dir"), earName );
+							System.getProperty("jsfunit.deploy.dir").replace('\\', '/'), earName );
 
 			return isMBeanStateDeployedByQuery(query);
 		}
@@ -180,7 +180,7 @@
 
 		try {
 			String query = "jboss.deployment:id=\"vfszip:" +
-					System.getProperty("jsfunit.deploy.dir") + "/" + rarName + "/\",*";
+					System.getProperty("jsfunit.deploy.dir").replace('\\', '/') + "/" + rarName + "/\",*";
 			//String query = String.format("jboss.deployment:id=\"vfszip:%s/%s/\",*",
 			//                               System.getProperty("jsfunit.deploy.dir"), rarName );
 
@@ -197,7 +197,7 @@
 	{
 		try {
 			 String query = "jboss.deployment:id=\"vfszip:" +
-                                                System.getProperty("jsfunit.deploy.dir") + "/" + earName +
+                                                System.getProperty("jsfunit.deploy.dir").replace('\\', '/') + "/" + earName +
                                                 "/" + rarName + "/\",*";
 
 			return isMBeanStateDeployedByQuery(query);

Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/app/ejb/EjbTestBase.java
===================================================================
--- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/app/ejb/EjbTestBase.java	2009-10-16 17:55:24 UTC (rev 791)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/app/ejb/EjbTestBase.java	2009-10-19 16:01:46 UTC (rev 792)
@@ -240,6 +240,7 @@
 
 			// Path
 			String path = ejtt.getDeployDir() + "/" + DEPLOYABLE_NAME;
+			path = path.replace("/", System.getProperty("file.separator"));
 			assertEquals(path, props.getProperty("Path").trim());
 
 			// Exploded
@@ -301,6 +302,7 @@
 
 			// Path
 			String path = ejtt.getDeployDir() + "/" + DEPLOYABLE_NAME;
+			path = path.replace( System.getProperty("file.separator"), "/");
 			assertEquals(path, props.getProperty("Path").trim());
 
 

Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/app/rar/RarTest.java
===================================================================
--- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/app/rar/RarTest.java	2009-10-16 17:55:24 UTC (rev 791)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/app/rar/RarTest.java	2009-10-19 16:01:46 UTC (rev 792)
@@ -254,7 +254,7 @@
 					ContentTableRow rarRow = ejtt.getDefaultContentTable().findFirstRowContainingLink(BASIC_RAR);
 					return null != rarRow;
 				}
-			}).dumpPageOnTimeout(this).throwOnTimeout().waitWithTimeout(2000, 5);
+			}).dumpPageOnTimeout(this).throwOnTimeout().waitWithTimeout(2000, 8);
 
 
 			ContentTableRow rarRow = ejtt.getDefaultContentTable().getFirstRowContainingLink(BASIC_RAR);
@@ -298,6 +298,7 @@
 
 
 			String path = ejtt.getDeployDir()+"/"+BASIC_RAR;
+			path = path.replace("/", System.getProperty("file.separator"));
 			assertEquals(path, props.getProperty("Path").trim());
 
 			assertEquals("no", props.getProperty("Exploded?").trim());

Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/app/war/WarTest.java
===================================================================
--- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/app/war/WarTest.java	2009-10-16 17:55:24 UTC (rev 791)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/app/war/WarTest.java	2009-10-19 16:01:46 UTC (rev 792)
@@ -489,6 +489,7 @@
 
 
 			String path = ejtt.getDeployDir()+"/"+DEPLOYABLE_NAME;
+			path = path.replace("/", System.getProperty("file.separator"));
 			assertEquals(path, props.getProperty("Path").trim());
 			assertEquals("no", props.getProperty("Exploded?").trim());
 			
@@ -843,6 +844,7 @@
 			log.debug("Traits: "+ props.toString());
 
 			String path = ejtt.getDeployDir()+"/"+DEPLOYABLE_NAME;
+			path = path.replace("/", System.getProperty("file.separator"));
 			assertEquals(path, props.getProperty("Path").trim());