modules/core/domain/src/test/resources/org/rhq/core/domain/resource/ResourceTypeTest.xml
| 1
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/MetadataBeanTest.java
| 22 +++++-----
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest.java
| 12 +++++
modules/enterprise/server/jar/src/test/resources/org/rhq/enterprise/server/discovery/DiscoveryBossBeanTest.xml
| 1
modules/enterprise/server/jar/src/test/resources/org/rhq/enterprise/server/inventory/InventoryManagerBeanTest.xml
| 1
modules/enterprise/server/jar/src/test/resources/org/rhq/enterprise/server/resource/metadata/MetadataTest.xml
| 1
modules/enterprise/server/jar/src/test/resources/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/plugin_v1.xml
| 15 ++++++
7 files changed, 41 insertions(+), 12 deletions(-)
New commits:
commit a961fe3de368abefa8ed7be38aaec31d79d1544a
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Thu Jun 30 17:55:47 2011 -0400
add drift config metadata test
fix the main assert test method - it wasn't doing anything and actually provided
false positives
after I fixed that, there was a test that was actually failing that I fixed
(persistChildTypes)
diff --git
a/modules/core/domain/src/test/resources/org/rhq/core/domain/resource/ResourceTypeTest.xml
b/modules/core/domain/src/test/resources/org/rhq/core/domain/resource/ResourceTypeTest.xml
index 724b561..f649d64 100644
---
a/modules/core/domain/src/test/resources/org/rhq/core/domain/resource/ResourceTypeTest.xml
+++
b/modules/core/domain/src/test/resources/org/rhq/core/domain/resource/ResourceTypeTest.xml
@@ -102,6 +102,7 @@
<rhq_drift_template id="-2"
resource_type_id="-8"
config_template_id="-2"/>
+ <rhq_drift_template_map/>
<rhq_resource/>
<rhq_resource_group/>
diff --git
a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/MetadataBeanTest.java
b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/MetadataBeanTest.java
index 7182555..c0c6e27 100644
---
a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/MetadataBeanTest.java
+++
b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/MetadataBeanTest.java
@@ -43,7 +43,7 @@ public class MetadataBeanTest extends AbstractEJB3Test {
private static List<String> plugins = new ArrayList<String>();
- @BeforeGroups(groups = {"plugin.metadata"}, dependsOnGroups =
{"integration.ejb3"})
+ @BeforeGroups(groups = { "plugin.metadata" }, dependsOnGroups = {
"integration.ejb3" })
public void startMBeanServer() throws Exception {
setupDB();
@@ -58,14 +58,13 @@ public class MetadataBeanTest extends AbstractEJB3Test {
* at what plugins are in the database, and then look for corresponding plugin files
on the file system. MetadataTest
* however removes the generated plugin files during each test run.
*/
- @AfterGroups(groups = {"plugin.metadata"})
+ @AfterGroups(groups = { "plugin.metadata" })
void removePluginsFromDB() throws Exception {
unprepareScheduler();
getTransactionManager().begin();
- getEntityManager().createQuery("delete from Plugin p where p.name in
(:plugins)")
- .setParameter("plugins", plugins)
- .executeUpdate();
+ getEntityManager().createQuery("delete from Plugin p where p.name in
(:plugins)").setParameter("plugins",
+ plugins).executeUpdate();
getTransactionManager().commit();
}
@@ -104,8 +103,8 @@ public class MetadataBeanTest extends AbstractEJB3Test {
}
private IDataSet getDataSet() throws DataSetException {
- FlatXmlProducer xmlProducer = new FlatXmlProducer(
- new InputSource(getClass().getResourceAsStream(getDataSetFile())));
+ FlatXmlProducer xmlProducer = new FlatXmlProducer(new
InputSource(getClass().getResourceAsStream(
+ getDataSetFile())));
xmlProducer.setColumnSensing(true);
return new FlatXmlDataSet(xmlProducer);
}
@@ -198,14 +197,15 @@ public class MetadataBeanTest extends AbstractEJB3Test {
String errors = "";
if (!missing.isEmpty()) {
- errors = "Failed to find the following " + propertyName + "(s)
for type " + resourceTypeName +
- ": " + missing;
+ errors = "Failed to find the following " + propertyName + "(s)
for type " + resourceTypeName + ": "
+ + missing;
}
if (unexpected.size() > 0) {
- errors += "\nFailed to find the following " + propertyName +
"(s) for type " + resourceTypeName +
- ": " + unexpected;
+ errors += "\nFound unexpected " + propertyName + "(s) for type
" + resourceTypeName + ": " + unexpected;
}
+
+ assert errors.isEmpty() : errors;
}
private boolean contains(ResourceType type, String propertyName, String expected)
throws Exception {
diff --git
a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest.java
b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest.java
index 789377c..7e85df7 100644
---
a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest.java
+++
b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest.java
@@ -102,12 +102,22 @@ public class ResourceMetadataManagerBeanTest extends
MetadataBeanTest {
}
@Test(dependsOnMethods = {"persistNewTypes"}, groups =
{"plugin.metadata", "NewPlugin"})
+ public void persistDriftConfigurationTemplates() throws Exception {
+ assertResourceTypeAssociationEquals(
+ "ServerA",
+ "TestPlugin",
+ "driftConfigurationTemplates",
+ asList("drift1")
+ );
+ }
+
+ @Test(dependsOnMethods = {"persistNewTypes"}, groups =
{"plugin.metadata", "NewPlugin"})
public void persistChildTypes() throws Exception {
assertResourceTypeAssociationEquals(
"ServerA",
"TestPlugin",
"childResourceTypes",
- asList("child1", "child2")
+ asList("Child1", "Child2")
);
}
diff --git
a/modules/enterprise/server/jar/src/test/resources/org/rhq/enterprise/server/discovery/DiscoveryBossBeanTest.xml
b/modules/enterprise/server/jar/src/test/resources/org/rhq/enterprise/server/discovery/DiscoveryBossBeanTest.xml
index ce93e9e..cfdc185 100644
---
a/modules/enterprise/server/jar/src/test/resources/org/rhq/enterprise/server/discovery/DiscoveryBossBeanTest.xml
+++
b/modules/enterprise/server/jar/src/test/resources/org/rhq/enterprise/server/discovery/DiscoveryBossBeanTest.xml
@@ -82,6 +82,7 @@
<rhq_content_source/>
<rhq_package/>
<rhq_bundle/>
+ <rhq_drift_template_map/>
<rhq_plugin id="1"
deployment="AGENT"
diff --git
a/modules/enterprise/server/jar/src/test/resources/org/rhq/enterprise/server/inventory/InventoryManagerBeanTest.xml
b/modules/enterprise/server/jar/src/test/resources/org/rhq/enterprise/server/inventory/InventoryManagerBeanTest.xml
index 50f27e4..055f2fd 100644
---
a/modules/enterprise/server/jar/src/test/resources/org/rhq/enterprise/server/inventory/InventoryManagerBeanTest.xml
+++
b/modules/enterprise/server/jar/src/test/resources/org/rhq/enterprise/server/inventory/InventoryManagerBeanTest.xml
@@ -106,5 +106,6 @@
<rhq_content_source/>
<rhq_package/>
<rhq_bundle/>
+ <rhq_drift_template_map/>
<rhq_plugin/>
</dataset>
\ No newline at end of file
diff --git
a/modules/enterprise/server/jar/src/test/resources/org/rhq/enterprise/server/resource/metadata/MetadataTest.xml
b/modules/enterprise/server/jar/src/test/resources/org/rhq/enterprise/server/resource/metadata/MetadataTest.xml
index 29351c4..d8c8d4e 100644
---
a/modules/enterprise/server/jar/src/test/resources/org/rhq/enterprise/server/resource/metadata/MetadataTest.xml
+++
b/modules/enterprise/server/jar/src/test/resources/org/rhq/enterprise/server/resource/metadata/MetadataTest.xml
@@ -318,6 +318,7 @@
<rhq_tagging_bundle_dest_map/>
<rhq_create_res_hist/>
<rhq_delete_res_hist/>
+ <rhq_drift_template_map/>
<jms_messages/>
<jms_transactions/>
<jms_users/>
diff --git
a/modules/enterprise/server/jar/src/test/resources/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/plugin_v1.xml
b/modules/enterprise/server/jar/src/test/resources/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/plugin_v1.xml
index 944bd20..cd4ff11 100644
---
a/modules/enterprise/server/jar/src/test/resources/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/plugin_v1.xml
+++
b/modules/enterprise/server/jar/src/test/resources/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/plugin_v1.xml
@@ -51,6 +51,21 @@
</configuration>
</content>
+ <drift-configuration name="drift1">
+ <basedir>
+ <value-context>pluginConfiguration</value-context>
+ <value-name>connectionPropertyX</value-name>
+ </basedir>
+ </drift-configuration>
+
+<!-- THIS CAUSES A DEADLOCK DURING PLUGIN REGISTRATION!
+ <bundle-target>
+ <destination-base-dir name="bundleTarget1">
+ <value-context>pluginConfiguration</value-context>
+ <value-name>connectionPropertyY</value-name>
+ </destination-base-dir>
+ </bundle-target>
+-->
<service name="Child1" description="Child 1
description"/>
<service name="Child2" description="Child 2
description"/>
</server>
Show replies by date