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/resource/metadata/ResourceMetadataManagerBeanTest/dup_drift.xml | 19 ++++++++++ 2 files changed, 30 insertions(+), 1 deletion(-)
New commits: commit c307eb219e654b02b027c325f1a37c7d188e5008 Author: John Mazzitelli mazz@redhat.com Date: Tue Jul 5 17:36:54 2011 -0400
unit test to make sure we do not deploy plugins that have duplicate drift config names
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 27bcdc7..e2fdd96 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 @@ -50,10 +50,20 @@ import static java.util.Arrays.asList; public class ResourceMetadataManagerBeanTest extends MetadataBeanTest {
@Test(groups = {"plugin.metadata", "NewPlugin"}) + public void registerPluginWithDuplicateDriftConfigurations() { + try { + createPlugin("test-plugin.jar", "1.0", "dup_drift.xml"); + fail("should not have succeeded - the drift config had duplicate names"); + } catch (Exception e) { + // OK, the plugin should have failed to be deployed since it has duplicate drift configs + } + } + + @Test(groups = {"plugin.metadata", "NewPlugin"}) public void registerPlugin() throws Exception { createPlugin("test-plugin.jar", "1.0", "plugin_v1.xml"); } - + @Test(dependsOnMethods = {"registerPlugin"}, groups = {"plugin.metadata", "NewPlugin"}) public void persistNewTypes() { List<String> newTypes = asList("ServerA", "ServerB"); diff --git a/modules/enterprise/server/jar/src/test/resources/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/dup_drift.xml b/modules/enterprise/server/jar/src/test/resources/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/dup_drift.xml new file mode 100644 index 0000000..d2dd71f --- /dev/null +++ b/modules/enterprise/server/jar/src/test/resources/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/dup_drift.xml @@ -0,0 +1,19 @@ +<plugin name="TestPlugin" displayName="Test Plugin" package="org.rhq.plugins.test" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns="urn:xmlns:rhq-plugin" + xmlns:c="urn:xmlns:rhq-configuration"> + <server name="ServerWithDupDrift" description="has duplicate drift config names and thus is invalid"> + <drift-configuration name="drift-one"> + <basedir> + <value-context>fileSystem</value-context> + <value-name>/a</value-name> + </basedir> + </drift-configuration> + <drift-configuration name="drift-one"> + <basedir> + <value-context>fileSystem</value-context> + <value-name>/b</value-name> + </basedir> + </drift-configuration> + </server> +</plugin> \ No newline at end of file
rhq-commits@lists.fedorahosted.org