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

[embjopr-commits at lists.jboss.org]

Author: ozizka at redhat.com
Date: 2009-10-16 13:55:24 -0400 (Fri, 16 Oct 2009)
New Revision: 791

Modified:
   trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/ApplicationTestBaseAS5.java
   trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/DatasourceTestBase.java
   trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/EmbjoprTestCase.java
   trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/app/ear/EarTest.java
   trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/util/EmbJoprTestToolkit.java
Log:
 * Tests updated to reflect project changes.

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-15 18:44:51 UTC (rev 790)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/ApplicationTestBaseAS5.java	2009-10-16 17:55:24 UTC (rev 791)
@@ -157,6 +157,8 @@
 	/* EAR */
 	public boolean isEarDeployed(String earName) throws RuntimeException
 	{
+		earName = earName.replace('\\', '/');
+
     //jboss.deployment:id="vfszip:/home/brq/.../jboss-5.0.0.Beta/server/all/deploy/JBossCacheTest-by-fdrabek.ear/",type=Deployment
 		try {
 			//String query = "jboss.deployment:id=\"vfszip:" +
@@ -174,6 +176,8 @@
 	/* RAR */
 	public boolean isRarDeployed(String rarName) throws RuntimeException
 	{
+		rarName = rarName.replace('\\', '/');
+
 		try {
 			String query = "jboss.deployment:id=\"vfszip:" +
 					System.getProperty("jsfunit.deploy.dir") + "/" + rarName + "/\",*";

Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/DatasourceTestBase.java
===================================================================
--- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/DatasourceTestBase.java	2009-10-15 18:44:51 UTC (rev 790)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/DatasourceTestBase.java	2009-10-16 17:55:24 UTC (rev 791)
@@ -246,6 +246,7 @@
 
         Map<String, String> actualValuesMap = new HashMap<String, String>();
 
+				jndiName = jndiName.replace('/', '_'); // Slashes in JNDI names are replaced with _.
 
         try {
 

Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/EmbjoprTestCase.java
===================================================================
--- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/EmbjoprTestCase.java	2009-10-15 18:44:51 UTC (rev 790)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/EmbjoprTestCase.java	2009-10-16 17:55:24 UTC (rev 791)
@@ -1087,9 +1087,10 @@
 		 * @param secured   If true, JAAS secured ManagementView is used.
      */
     protected boolean isDeployed(String deployment, boolean secured) throws Exception {
+				deployment = deployment.replace("/", System.getProperty("file.separator"));
+        
         ManagementView currentProfileView = getCurrentProfileView(secured);
         ManagedDeployment managedDeployment = null;
-        
         try {
             managedDeployment = currentProfileView.getDeployment(deployment);
         } catch (NoSuchDeploymentException e) {

Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/app/ear/EarTest.java
===================================================================
--- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/app/ear/EarTest.java	2009-10-15 18:44:51 UTC (rev 790)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/app/ear/EarTest.java	2009-10-16 17:55:24 UTC (rev 791)
@@ -436,7 +436,8 @@
 
 
 			String path = ejtt.getDeployDir()+"/"+DEPLOYABLE_NAME;
-			assertEquals(path, props.getProperty("Path").trim());
+			path = path.replace("/", System.getProperty("file.separator"));
+			assertEquals( path, props.getProperty("Path").trim());
 
 			assertEquals("no", props.getProperty("Exploded?").trim());
 
@@ -687,7 +688,8 @@
 			log.debug("EAR Metrics tab - Traits: "+ props.toString());
 
 			String path = ejtt.getDeployDir()+"/"+DEPLOYABLE_NAME;
-			assertEquals(path, props.getProperty("Path"));
+			path = path.replace("/", System.getProperty("file.separator"));
+			assertEquals( path, props.getProperty("Path").trim());
 
 		}
 		finally {

Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/util/EmbJoprTestToolkit.java
===================================================================
--- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/util/EmbJoprTestToolkit.java	2009-10-15 18:44:51 UTC (rev 790)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/util/EmbJoprTestToolkit.java	2009-10-16 17:55:24 UTC (rev 791)
@@ -2574,9 +2574,9 @@
 		public void deleteFromDeployDir( String deployableName ) throws IOException, EmbJoprTestException
 		{
 
-			String deployDir = getDeployDir();
+			String deployDirStr = getDeployDir();
 
-			File dirToDelete = new File( deployDir, deployableName);
+			File dirToDelete = new File( deployDirStr, deployableName);
 
 			// Just not to delete something accidentally...
 			// For tests:
@@ -2586,8 +2586,11 @@
 				+dirToDelete.getCanonicalPath() );
 			/**/
 
+			File deployDir = new File( deployDirStr );
+			deployDirStr = deployDir.getCanonicalPath();
+
 			// Check if not outside deploy dir.
-			if( !dirToDelete.getCanonicalPath().startsWith( deployDir ) )
+			if( !dirToDelete.getCanonicalPath().startsWith( deployDirStr ) )
 				throw new IllegalArgumentException(
 								" The resulting path is outside deploy dir: "+dirToDelete.getCanonicalPath());