modules/plugins/jboss-as-7/pom.xml
| 2 +-
modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/ConfigurationLoadingTest.java
| 4 +++-
modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/OperationJsonTest.java
| 1 +
3 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 14fc3e1c71e67517449dcbe6543327cee9ffddcb
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Sat Dec 31 15:21:30 2011 +0100
Rollback jackson to 1.7.4, as 1.9.3 has a bug (JACKSON-744)
diff --git a/modules/plugins/jboss-as-7/pom.xml b/modules/plugins/jboss-as-7/pom.xml
index f39c296..8220355 100644
--- a/modules/plugins/jboss-as-7/pom.xml
+++ b/modules/plugins/jboss-as-7/pom.xml
@@ -16,7 +16,7 @@
<properties>
<json.version>${project.json.version}</json.version>
- <jackson.version>1.9.3</jackson.version>
+ <jackson.version>1.7.4</jackson.version>
<jboss.sasl.version>1.0.0.Beta9</jboss.sasl.version>
</properties>
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 11f823d..e895dd4 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
@@ -21,6 +21,7 @@ package org.rhq.modules.plugins.jbossas7;
import java.io.BufferedReader;
import java.io.InputStream;
import java.io.InputStreamReader;
+import java.util.Collection;
import java.util.List;
import java.util.Map;
@@ -430,7 +431,8 @@ 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: " +
config.getProperties().toString();
+ Collection<Property> properties = config.getProperties();
+ assert properties.size()==6 : "Got " + properties.size() + " props
instead of 6: " + properties.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 67f2243..2dcd49f 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,6 +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()!=null : "op.getName is null";
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();
Show replies by date