[jboss-cvs] JBossAS SVN: r95310 - branches/JBPAPP_5_0/testsuite/src/main/org/jboss/test/profileservice/test.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Oct 21 11:50:05 EDT 2009
Author: jason.greene at jboss.com
Date: 2009-10-21 11:50:04 -0400 (Wed, 21 Oct 2009)
New Revision: 95310
Modified:
branches/JBPAPP_5_0/testsuite/src/main/org/jboss/test/profileservice/test/ProfileServiceUnitTestCase.java
Log:
jmx-remoting.sar is no longer included
Modified: branches/JBPAPP_5_0/testsuite/src/main/org/jboss/test/profileservice/test/ProfileServiceUnitTestCase.java
===================================================================
--- branches/JBPAPP_5_0/testsuite/src/main/org/jboss/test/profileservice/test/ProfileServiceUnitTestCase.java 2009-10-21 15:45:49 UTC (rev 95309)
+++ branches/JBPAPP_5_0/testsuite/src/main/org/jboss/test/profileservice/test/ProfileServiceUnitTestCase.java 2009-10-21 15:50:04 UTC (rev 95310)
@@ -64,7 +64,7 @@
{
/** The profileservice server name. */
public static final String PROFILESERVICE_SERVER_NAME = "profileservice";
-
+
/**
* We need to define the order in which tests runs
* @return
@@ -77,7 +77,7 @@
suite.addTest(new ProfileServiceUnitTestCase("testProfileKeys"));
suite.addTest(new ProfileServiceUnitTestCase("testDeploymentNames"));
suite.addTest(new ProfileServiceUnitTestCase("testIgnoredDeploymentNames"));
-
+
suite.addTest(new ProfileServiceUnitTestCase("testTemplateNames"));
suite.addTest(new ProfileServiceUnitTestCase("testNoSuchProfileException"));
// JMS
@@ -102,9 +102,9 @@
/**
* Basic test of accessing the ProfileService and checking the
* available profile keys.
- *
+ *
* As we are running the -c profileservice, the default key should be profileservice.
- *
+ *
*/
public void testProfileKeys()
throws Exception
@@ -147,7 +147,7 @@
String sname = name.substring(index + serverName.length(), name.length());
simpleNames.add(sname);
}
-
+
log.info("Deployment simple names: " + simpleNames);
// Validate some well known deployments
String[] expectedNames = {
@@ -155,7 +155,7 @@
"conf/bootstrap/classloader.xml",
"conf/bootstrap/deployers.xml",
"conf/bootstrap/jmx.xml",
- "conf/bootstrap/profile.xml",
+ "conf/bootstrap/profile.xml",
"conf/jboss-service.xml",
"deployers/jbossweb.deployer/",
"deployers/ear-deployer-jboss-beans.xml",
@@ -175,7 +175,6 @@
"deploy/jms-ra.rar/",
"deploy/jmx-console.war/",
"deploy/jmx-invoker-service.xml",
- "deploy/jmx-remoting.sar/",
"deploy/jsr88-service.xml",
"deploy/mail-service.xml",
"deploy/ROOT.war/"
@@ -188,7 +187,7 @@
}
assertEquals("There are missing names: "+missingNames + ", available: " + simpleNames, 0, missingNames.size());
}
-
+
public void testManagedDeployments()
throws Exception
{
@@ -204,7 +203,7 @@
/**
* Test that ignored deployments are not deployed.
* e.g. ignore.war.bak in the deploy dir
- *
+ *
* @throws Exception
*/
public void testIgnoredDeploymentNames() throws Exception
@@ -226,7 +225,7 @@
log.info(aop);
}
- /**
+ /**
* Test the expected template names
* @throws Exception
*/
@@ -251,7 +250,7 @@
public void testNoSuchProfileException()
throws Exception
{
- DeploymentManager deployMgr = getDeploymentManager();
+ DeploymentManager deployMgr = getDeploymentManager();
ProfileKey badKey = new ProfileKey("no-such-profile");
try
{
@@ -354,28 +353,28 @@
/**
* test api usage only
* @throws Exception
- */
+ */
public void testRemoveComponent () throws Exception
{
String componentName = "defaultDS";
ManagementView mgtView = getManagementView();
-
+
ComponentType type = new ComponentType("DataSource", "LocalTx");
Set<ManagedComponent> comps = mgtView.getComponentsForType(type);
-
+
// maybe a mgtView.getComponentByNameAndType(type, componentName) would be helpful
// i'm assuming componentName and type will be unique in a given profile.
-
- if (comps != null)
+
+ if (comps != null)
{
for (ManagedComponent comp : comps)
{
if (componentName.equals(comp.getName()))
{
ManagedDeployment deployment = comp.getDeployment();
- deployment.removeComponent(componentName);
+ deployment.removeComponent(componentName);
break;
- }
+ }
}
}
}
@@ -455,7 +454,7 @@
* Test an update of the hsqldb-ds.xml min/max pool size. This queries
* the mbeans to validate runtime changes to the min/max pool size. This
* couples the test to the deployment implementation details.
- *
+ *
* @throws Exception
*/
public void testUpdateDefaultDS()
@@ -504,7 +503,7 @@
Map<String,ManagedProperty> props = dsInfo.getProperties();
validatePropertyMetaValues(props);
}
-
+
/**
* Validate that there is only 1 DefaultDS ManagedComponent
* @throws Exception
@@ -567,10 +566,10 @@
assertTrue("security-domain value is a GenericValue", securityDomainValue instanceof CompositeValue);
log.debug("security-domain value: "+securityDomainValue);
}
-
+
/**
* Validate the DefaultDS stats that are non-null
- *
+ *
* @throws Exception
*/
public void testDefaultDSStats()
@@ -599,7 +598,7 @@
nullStats.add(stat.getName());
}
assertTrue("There are no null stats: "+nullStats, nullStats.size() == 0);
-
+
// Validate the component run state
RunState state = hsqldb.getRunState();
assertEquals("DefaultDS is running", RunState.RUNNING, state);
@@ -608,7 +607,7 @@
/**
* Validate that the DefaultDS management ops work and that they have the
* expected MetaValue return type.
- *
+ *
* @throws Exception
*/
public void testDefaultDSOps()
@@ -686,17 +685,17 @@
// If the property does not exist on the template we don't set it
if(prop == null)
continue;
-
+
log.debug("template property before: "+prop.getName()+","+prop.getValue());
assertNotNull("property " + propName + " found in template " + templateName, prop);
prop.setValue(propValues.get(propName));
log.debug("template property after: "+prop.getName()+","+prop.getValue());
}
-
+
// Assert map composite
if(dsInfo.getProperties().get("config-property") != null)
assertTrue(dsInfo.getProperties().get("config-property").getMetaType() instanceof MapCompositeMetaType);
-
+
mgtView.applyTemplate(deploymentName, dsInfo);
// reload the view
More information about the jboss-cvs-commits
mailing list