modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/json/Operation.java | 2 ++ modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/ConfigurationLoadingTest.java | 2 +- modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/OperationJsonTest.java | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-)
New commits: commit 14b81e5036bbbc47bb09fac2dc86b7166b1846fd Author: Heiko W. Rupp hwr@redhat.com Date: Sun Dec 25 11:42:47 2011 +0100
Initialize additionalProperties; give more debug output when assert fails.
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/json/Operation.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/json/Operation.java index 0517ee1..23df1a5 100644 --- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/json/Operation.java +++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/json/Operation.java @@ -47,10 +47,12 @@ public class Operation { this.operation = operation; this.address = new Address(addressKey,addressValue); this._address = address.path; + additionalProperties = new HashMap<String, Object>(); }
public Operation(String operation, Address address) { this.operation = operation; + additionalProperties = new HashMap<String, Object>(); if (address!=null && address.path!=null) { this.address = address; this._address = address.path; diff --git a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/ConfigurationLoadingTest.java b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/ConfigurationLoadingTest.java index ef58967..11f823d 100644 --- a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/ConfigurationLoadingTest.java +++ b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/ConfigurationLoadingTest.java @@ -430,7 +430,7 @@ public class ConfigurationLoadingTest extends AbstractConfigurationHandlingTest ConfigurationLoadDelegate delegate = new ConfigurationLoadDelegate(definition,connection,null); Configuration config = delegate.loadResourceConfiguration(); assert config!=null; - assert config.getProperties().size()==5 : "Got " + config.getProperties().size() + " props instead of 5"; + assert config.getProperties().size()==5 : "Got " + config.getProperties().size() + " props instead of 5: " + config.getProperties().toString(); PropertySimple simple = config.getSimple("check-interval"); assert simple !=null; Integer integerValue = simple.getIntegerValue(); diff --git a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/OperationJsonTest.java b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/OperationJsonTest.java index 354ab8d..67f2243 100644 --- a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/OperationJsonTest.java +++ b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/OperationJsonTest.java @@ -59,7 +59,7 @@ public class OperationJsonTest { assert op!=null; assert op.getOperation()!=null : "op.operation was null!"; assert op.getOperation().equals(operation.getOperation()) : "Operation is " + op.getOperation(); - assert op.getName().equals("socket-binding") : "attribute name is " + op.getName(); + assert op.getName().equals("socket-binding") : "attribute name is " + op.getName() + " and not 'socket-binding'"; assert op.getValue().equals("jndi") : "attribute value is " + op.getValue(); assert op.getAddress().size()==2 : "Address did not contain 2 parts, but " + op.getAddress().size();
rhq-commits@lists.fedorahosted.org