[jboss-cvs] JBossAS SVN: r74827 - trunk/testsuite/src/main/org/jboss/test/profileservice/test.

[jboss-cvs-commits at lists.jboss.org]

Author: alesj
Date: 2008-06-19 07:51:03 -0400 (Thu, 19 Jun 2008)
New Revision: 74827

Modified:
   trunk/testsuite/src/main/org/jboss/test/profileservice/test/DeployUnitTestCase.java
Log:
Possible null types - deprecated notion in deployers.

Modified: trunk/testsuite/src/main/org/jboss/test/profileservice/test/DeployUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/profileservice/test/DeployUnitTestCase.java	2008-06-19 07:29:24 UTC (rev 74826)
+++ trunk/testsuite/src/main/org/jboss/test/profileservice/test/DeployUnitTestCase.java	2008-06-19 11:51:03 UTC (rev 74827)
@@ -22,7 +22,7 @@
 package org.jboss.test.profileservice.test;
 
 import java.net.URL;
-
+import java.util.Set;
 import javax.naming.InitialContext;
 
 import org.jboss.deployers.spi.management.ManagementView;
@@ -71,12 +71,12 @@
       String[] names = {name};
       URL contentURL = getDeployURL(name);
       assertNotNull(contentURL);
-      log.debug(contentURL);
+      getLog().debug(contentURL);
       // TODO - hack to get off JDK's url handling
       String urlString = contentURL.toExternalForm();
       int p = urlString.indexOf(":/");
       contentURL = new URL("vfszip" + urlString.substring(p));
-      log.debug(contentURL);
+      getLog().debug(contentURL);
 
       DeploymentStatus status;
       DeploymentProgress progress = deployMgr.distribute(name, DeploymentPhase.APPLICATION, contentURL);
@@ -104,8 +104,10 @@
             ManagementView mgtView = getManagementView();
             ManagedDeployment deployment = mgtView.getDeployment(name, DeploymentPhase.APPLICATION);
             assertNotNull(deployment);
-            log.info("Found " + type + " deployment: " + deployment);
-            assertTrue(deployment.getTypes().contains(type));
+            getLog().info("Found " + type + " deployment: " + deployment);
+            Set<String> types = deployment.getTypes();
+            if (types != null && types.isEmpty() == false)
+               assertTrue("Missing type: " + type + ", available: " + types, deployment.getTypes().contains(type));
             if (tester != null)
             {
                tester.testManagedDeployment();