modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/configuration/metadata/ConfigurationMetadataManagerBeanTest.java
| 16 ++++++++++
modules/enterprise/server/jar/src/test/resources/org/rhq/enterprise/server/configuration/metadata/configuration_metadata_manager_bean_test_v1.xml
| 6 +++
modules/enterprise/server/jar/src/test/resources/org/rhq/enterprise/server/configuration/metadata/configuration_metadata_manager_bean_test_v2.xml
| 11 ++++++
3 files changed, 33 insertions(+)
New commits:
commit 978b466848e1bd299f191f370ca8c10e57f0f557
Author: John Sanda <jsanda(a)redhat.com>
Date: Mon Oct 4 20:07:50 2010 -0400
Adding test to verify options are added to an upgraded property
diff --git
a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/configuration/metadata/ConfigurationMetadataManagerBeanTest.java
b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/configuration/metadata/ConfigurationMetadataManagerBeanTest.java
index 2324a43..1f72c06 100644
---
a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/configuration/metadata/ConfigurationMetadataManagerBeanTest.java
+++
b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/configuration/metadata/ConfigurationMetadataManagerBeanTest.java
@@ -35,6 +35,7 @@ import org.rhq.core.clientapi.descriptor.plugin.PluginDescriptor;
import org.rhq.core.clientapi.descriptor.plugin.ServerDescriptor;
import org.rhq.core.domain.configuration.definition.ConfigurationDefinition;
import org.rhq.core.domain.configuration.definition.PropertyDefinition;
+import org.rhq.core.domain.configuration.definition.PropertyDefinitionEnumeration;
import org.rhq.core.domain.configuration.definition.PropertyDefinitionList;
import org.rhq.core.domain.configuration.definition.PropertyDefinitionMap;
import org.rhq.core.domain.configuration.definition.PropertyDefinitionSimple;
@@ -109,6 +110,21 @@ public class ConfigurationMetadataManagerBeanTest extends
AbstractEJB3Test {
}
@Test
+ public void updatePropertyWithAddedOptions() {
+ initConfigDefs("servers[name='ServerWithAddedOptions']",
"UpdatedPropertyWithAddedOptions");
+
+ String propertyName = "mySimple";
+ PropertyDefinitionSimple expectedProperty =
updatedConfigDef.getPropertyDefinitionSimple(propertyName);
+ List<PropertyDefinitionEnumeration> expected =
expectedProperty.getEnumeratedValues();
+
+ PropertyDefinitionSimple actualProperty =
originalConfigDef.getPropertyDefinitionSimple(propertyName);
+ List<PropertyDefinitionEnumeration> actual =
actualProperty.getEnumeratedValues();
+
+ // TODO Need to verify order here as well
+ AssertUtils.assertCollectionEqualsNoOrder(expected, actual, "Options should
have been added to property");
+ }
+
+ @Test
public void addNewGroup() {
initConfigDefs("servers[name='GroupTests']",
"GroupTests");
diff --git
a/modules/enterprise/server/jar/src/test/resources/org/rhq/enterprise/server/configuration/metadata/configuration_metadata_manager_bean_test_v1.xml
b/modules/enterprise/server/jar/src/test/resources/org/rhq/enterprise/server/configuration/metadata/configuration_metadata_manager_bean_test_v1.xml
index 23f3a1b..5a1fe11 100644
---
a/modules/enterprise/server/jar/src/test/resources/org/rhq/enterprise/server/configuration/metadata/configuration_metadata_manager_bean_test_v1.xml
+++
b/modules/enterprise/server/jar/src/test/resources/org/rhq/enterprise/server/configuration/metadata/configuration_metadata_manager_bean_test_v1.xml
@@ -19,6 +19,12 @@
</plugin-configuration>
</server>
+ <server name="ServerWithAddedOptions">
+ <plugin-configuration>
+ <c:simple-property name="mySimple"/>
+ </plugin-configuration>
+ </server>
+
<server name="GroupTests">
<plugin-configuration>
<c:group name="existingGroup">
diff --git
a/modules/enterprise/server/jar/src/test/resources/org/rhq/enterprise/server/configuration/metadata/configuration_metadata_manager_bean_test_v2.xml
b/modules/enterprise/server/jar/src/test/resources/org/rhq/enterprise/server/configuration/metadata/configuration_metadata_manager_bean_test_v2.xml
index 4c61512..564c68c 100644
---
a/modules/enterprise/server/jar/src/test/resources/org/rhq/enterprise/server/configuration/metadata/configuration_metadata_manager_bean_test_v2.xml
+++
b/modules/enterprise/server/jar/src/test/resources/org/rhq/enterprise/server/configuration/metadata/configuration_metadata_manager_bean_test_v2.xml
@@ -26,6 +26,17 @@
</plugin-configuration>
</server>
+ <server name="ServerWithAddedOptions">
+ <plugin-configuration>
+ <c:simple-property name="mySimple">
+ <c:property-options>
+ <c:option name="x" value="1"/>
+ <c:option name="y" value="2"/>
+ </c:property-options>
+ </c:simple-property>
+ </plugin-configuration>
+ </server>
+
<server name="GroupTests">
<plugin-configuration>
<c:group name="existingGroup">
Show replies by date