[embjopr-commits] EMBJOPR SVN: r822 - in trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit: as5/connfactories and 1 other directory.

[embjopr-commits at lists.jboss.org]

Author: ozizka at redhat.com
Date: 2009-10-27 22:10:23 -0400 (Tue, 27 Oct 2009)
New Revision: 822

Modified:
   trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/EmbjoprTestCase.java
   trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/connfactories/ConnFactoryCreationTest.java
Log:
 * EmbJoprTestCase::isDeployed() updated - now first tries to match ProfileService deployments by regex.

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-28 01:11:24 UTC (rev 821)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/EmbjoprTestCase.java	2009-10-28 02:10:23 UTC (rev 822)
@@ -1086,12 +1086,26 @@
      * @param deployment - the deployment we are interested in
 		 * @param secured   If true, JAAS secured ManagementView is used.
      */
-    protected boolean isDeployed(String deployment, boolean secured) throws Exception {
+    protected boolean isDeployed(String deployment, boolean secured) throws Exception
+		{
 				deployment = deployment.replace("/", System.getProperty("file.separator"));
         
         ManagementView currentProfileView = getCurrentProfileView(secured);
+
+				/*/// Debug
+				Set<String> deploymentNames = currentProfileView.getDeploymentNames();
+				log.debug("*** Deployment names: ***");
+				for( String name: deploymentNames )
+					log.debug("  "+name); /**/
+
+				Set<String> matchingNames = currentProfileView.getMatchingDeploymentName(deployment);
+				log.debug( String.format("Regex '%s' matched %d deployment names.", deployment, matchingNames.size()) );
+				if( matchingNames.size() > 0 )
+					return true;
+
         ManagedDeployment managedDeployment = null;
         try {
+						log.info("Calling ManagementView#getDeployment('"+deployment+"')");
             managedDeployment = currentProfileView.getDeployment(deployment);
         } catch (NoSuchDeploymentException e) {
             return false;

Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/connfactories/ConnFactoryCreationTest.java
===================================================================
--- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/connfactories/ConnFactoryCreationTest.java	2009-10-28 01:11:24 UTC (rev 821)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/connfactories/ConnFactoryCreationTest.java	2009-10-28 02:10:23 UTC (rev 822)
@@ -92,11 +92,13 @@
         String expectedMessage = ADD_MESSAGE;
         checkClientAndServerMessages(expectedMessage, expectedMessage, false);
 
-        // Make sure the ManagedComponent was created and that the properties are
-        // set correctly
-        assertTrue("Connection Factory is not deployed (isDeployed() returned false).",
-                   isDeployed(jndiName + "-ds.xml"));
+        // Make sure the ManagedComponent was created and that the properties are set correctly
+        //assertTrue("Connection Factory is not deployed (isDeployed() returned false).",  isDeployed(jndiName + "-ds.xml"));
 
+				//String deploymentName = String.format("vfsfile:/home/ondra/work/JOPRembedded/embjopr-svn-trunk/jsfunit/target/jboss5x/deploy/%s-ds.xml", jndiName.replace('/', '_') );
+				String deploymentName = jndiName.replace('/', '_');
+        assertTrue("Connection Factory is not deployed (isDeployed('"+deploymentName+"') returned false).",  isDeployed(deploymentName));
+
         checkComponentProperties(propertiesMapAsMetaValues, jndiName, componentType);
 
         // Clean up