[rhq] Branch 'bugfixes' - modules/core modules/enterprise

modules/core/domain/src/main/java/org/rhq/core/domain/configuration/definition/PropertyDefinitionMap.java | 2 - modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdateConfigurationSubsystemTest.java | 14 +++++++--- 2 files changed, 11 insertions(+), 5 deletions(-) New commits: commit a028f6f9ddda4710f480ed34349d0e7daeec6683 Author: Ian P. Springer <ips(a)jetengine.(none)&gt; Date: Wed Mar 31 11:18:10 2010 -0400 add temporary workaround in testListProperty() for constraint min/max not being initialized, along with a TODO to look into the issue (@onLoad method not being called on Constraint entities) diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/configuration/definition/PropertyDefinitionMap.java b/modules/core/domain/src/main/java/org/rhq/core/domain/configuration/definition/PropertyDefinitionMap.java index d3f42c7..088be59 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/configuration/definition/PropertyDefinitionMap.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/configuration/definition/PropertyDefinitionMap.java @@ -43,7 +43,7 @@ import org.jetbrains.annotations.NotNull; /** * The definition of properties in a map. The map may be null allowing for the requirement of the map's existence but no - * contraints on its contents. (i.e. an arbitrary map) + * constraints on its contents. (i.e. an arbitrary map) * * @author Greg Hinkle */ diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdateConfigurationSubsystemTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdateConfigurationSubsystemTest.java index c09c0e7..5f693de 100644 --- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdateConfigurationSubsystemTest.java +++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdateConfigurationSubsystemTest.java @@ -596,17 +596,23 @@ public class UpdateConfigurationSubsystemTest extends UpdateSubsytemTestBase { for (Constraint constraint : constraints) { if (constraint instanceof IntegerRangeConstraint) { IntegerRangeConstraint irc = (IntegerRangeConstraint) constraint; + assert irc != null : "Integer-constraint was null, but should not be"; // See JBNADM-1596/97 + assert irc.getDetails().equals("-2#10"); + // TODO (ips, 3/31/10): The below is a workaround for IntegerRangeConstraint.onLoad() not being called by Hibernate. + irc.setDetails(irc.getDetails()); assert irc.getMaximum() == 10; assert irc.getMinimum() == -2; - assert irc.getDetails().equals("-2#10"); } else if (constraint instanceof FloatRangeConstraint) { FloatRangeConstraint frc = (FloatRangeConstraint) constraint; assert frc != null : "Float-constraint was null, but should not be"; // See JBNADM-1596/97 + assert frc.getDetails().equals("10.0#5.0"); + // TODO (ips, 3/31/10): The below is a workaround for FloatRangeConstraint.onLoad() not being called by Hibernate. + frc.setDetails(frc.getDetails()); assert frc.getMinimum() == 10; // TODO change when JBNADM-1597 is being worked on assert frc.getMaximum() == 5; - assert frc.getDetails().equals("10.0#5.0"); + } else { assert true == false : "Unknown constraint type encountered"; } @@ -687,7 +693,7 @@ public class UpdateConfigurationSubsystemTest extends UpdateSubsytemTestBase { } } - assert found == 5 : "Did not find the 5 desird maps in v1"; + assert found == 5 : "Did not find the 5 desired maps in v1"; } System.out.println("Done with v1"); @@ -846,7 +852,7 @@ public class UpdateConfigurationSubsystemTest extends UpdateSubsytemTestBase { assert def instanceof PropertyDefinitionList : "Expected a list-property, but it was " + def.getClass().getCanonicalName(); } else if (def.getName().equals("five")) { - assert def instanceof PropertyDefinitionSimple : "Expected a simle-property, but it was " + assert def instanceof PropertyDefinitionSimple : "Expected a simple-property, but it was " + def.getClass().getCanonicalName(); } else if (def.getName().equals("six")) { assert def instanceof PropertyDefinitionSimple : "Expected a simple-property, but it was "