.classpath
| 27 ++++------
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/discovery/DiscoveryBossBeanTest.java
| 25 +++++----
2 files changed, 26 insertions(+), 26 deletions(-)
New commits:
commit c703b8bfa8ec5f08a4de261858f827885b9c1280
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Tue Jun 5 13:32:41 2012 -0400
Fix test failure. What goes up must go down and what gets prepared must get
unprepared.
diff --git
a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/discovery/DiscoveryBossBeanTest.java
b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/discovery/DiscoveryBossBeanTest.java
index 1625480..d4d9cbf 100644
---
a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/discovery/DiscoveryBossBeanTest.java
+++
b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/discovery/DiscoveryBossBeanTest.java
@@ -18,6 +18,10 @@
*/
package org.rhq.enterprise.server.discovery;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Mockito.when;
+
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.ObjectInputStream;
@@ -72,10 +76,6 @@ import org.rhq.enterprise.server.test.TestServerCommunicationsService;
import org.rhq.enterprise.server.util.LookupUtil;
import org.rhq.enterprise.server.util.ResourceTreeHelper;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Mockito.when;
-
/**
* A unit test for {@link DiscoveryBossBean}.
*/
@@ -125,7 +125,8 @@ public class DiscoveryBossBeanTest extends AbstractEJB3Test {
agentServiceContainer = prepareForTestAgents();
agentServiceContainer.discoveryService =
Mockito.mock(DiscoveryAgentService.class);
-
when(agentServiceContainer.discoveryService.manuallyAddResource(any(ResourceType.class),
anyInt(),
+ when(
+
agentServiceContainer.discoveryService.manuallyAddResource(any(ResourceType.class),
anyInt(),
any(Configuration.class), anyInt())).thenAnswer(new
Answer<MergeResourceResponse>() {
public MergeResourceResponse answer(InvocationOnMock invocation) throws
Throwable {
Resource resource = new Resource(1000000);
@@ -135,7 +136,7 @@ public class DiscoveryBossBeanTest extends AbstractEJB3Test {
long randomLong = UUID.randomUUID().getLeastSignificantBits();
resource.setResourceKey(String.valueOf("key-" + randomLong));
resource.setName("name-" + randomLong);
- int parentResourceId = (Integer)invocation.getArguments()[1];
+ int parentResourceId = (Integer) invocation.getArguments()[1];
Resource parentResource =
resourceManager.getResource(subjectManager.getOverlord(), parentResourceId);
resource.setParentResource(parentResource);
Integer ownerSubjectId = (Integer) invocation.getArguments()[3];
@@ -146,9 +147,13 @@ public class DiscoveryBossBeanTest extends AbstractEJB3Test {
@AfterMethod(alwaysRun = true)
public void afterMethod() throws Exception {
- MBeanServerFactory.releaseMBeanServer(dummyJBossMBeanServer);
+ try {
+ MBeanServerFactory.releaseMBeanServer(dummyJBossMBeanServer);
- cleanDB();
+ cleanDB();
+ } finally {
+ unprepareForTestAgents();
+ }
}
@Test(groups = "integration.ejb3")
@@ -226,11 +231,11 @@ public class DiscoveryBossBeanTest extends AbstractEJB3Test {
ResourceSyncInfo serverSyncInfo =
syncInfo.getChildSyncInfos().iterator().next();
Resource resource1 =
discoveryBoss.manuallyAddResource(subjectManager.getOverlord(), serviceType2.getId(),
- serverSyncInfo.getId(), new Configuration());
+ serverSyncInfo.getId(), new Configuration());
try {
Resource resource2 =
discoveryBoss.manuallyAddResource(subjectManager.getOverlord(), serviceType2.getId(),
- serverSyncInfo.getId(), new Configuration());
+ serverSyncInfo.getId(), new Configuration());
fail("Manually adding a singleton that already existed succeeded: "
+ resource2);
} catch (EJBException e) {
assertEquals(String.valueOf(e.getCause()), RuntimeException.class,
e.getCause().getClass());
commit f4cf080aa240f38d88532f1966e4459328c35ca3
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Tue Jun 5 13:32:05 2012 -0400
A bunch of updates to the Eclipse .classpath file after a recent clean repo build.
diff --git a/.classpath b/.classpath
index 6f0af83..fd400dc 100644
--- a/.classpath
+++ b/.classpath
@@ -181,7 +181,7 @@
<classpathentry exported="true" kind="var"
path="M2_REPO/org/jboss/man/jboss-managed/2.1.1.GA/jboss-managed-2.1.1.GA.jar"/>
<classpathentry exported="true" kind="var"
path="M2_REPO/org/jboss/man/jboss-metatype/2.1.1.GA/jboss-metatype-2.1.1.GA.jar"/>
<classpathentry exported="true" kind="var"
path="M2_REPO/org/apache/commons/commons-io/1.3.2/commons-io-1.3.2.jar"
sourcepath="/M2_REPO/commons-io/commons-io/1.3.1/commons-io-1.3.1-sources.jar"/>
- <classpathentry exported="true" kind="var"
path="M2_REPO/com/sun/xml/bind/jaxb-impl/2.1.12/jaxb-impl-2.1.12.jar"/>
+ <classpathentry exported="true" kind="var"
path="M2_REPO/com/sun/xml/bind/jaxb-impl/2.1.9/jaxb-impl-2.1.9.jar"/>
<classpathentry exported="true" kind="var"
path="M2_REPO/i18nlog/i18nlog/1.0.10/i18nlog-1.0.10.jar"/>
<classpathentry exported="true" kind="var"
path="M2_REPO/gnu-getopt/getopt/1.0.13/getopt-1.0.13.jar"/>
<classpathentry exported="true" kind="var"
path="M2_REPO/commons-httpclient/commons-httpclient/3.0.1/commons-httpclient-3.0.1.jar"/>
@@ -194,7 +194,7 @@
<classpathentry exported="true" kind="var"
path="M2_REPO/struts/struts/1.2.9/struts-1.2.9.jar"/>
<classpathentry exported="true" kind="var"
path="M2_REPO/javax/servlet/jsp-api/2.0/jsp-api-2.0.jar"/>
<classpathentry exported="true" kind="var"
path="M2_REPO/commons-validator/commons-validator/1.1.4/commons-validator-1.1.4.jar"/>
- <classpathentry exported="true" kind="var"
path="M2_REPO/org/testng/testng/6.1.1/testng-6.1.1.jar"/>
+ <classpathentry exported="true" kind="var"
path="M2_REPO/org/testng/testng/6.5.2/testng-6.5.2.jar"/>
<classpathentry exported="true" kind="var"
path="M2_REPO/org/snmp4j/snmp4j/1.8.2/snmp4j-1.8.2.jar"/>
<classpathentry exported="true" kind="var"
path="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14.jar"/>
<classpathentry exported="true" kind="var"
path="M2_REPO/tomcat/tomcat-jk/4.1.31/tomcat-jk-4.1.31.jar"/>
@@ -225,14 +225,14 @@
<classpathentry exported="true" kind="var"
path="M2_REPO/javax/faces/jsf-impl/1.2_14/jsf-impl-1.2_14.jar"
sourcepath="/M2_REPO/javax/faces/jsf-impl/1.2_14/jsf-impl-1.2_14-sources.jar"/>
<classpathentry exported="true" kind="var"
path="M2_REPO/javax/el/el-api/1.0/el-api-1.0.jar"/>
<classpathentry exported="true" kind="var"
path="M2_REPO/com/sun/facelets/jsf-facelets/1.1.15.B1/jsf-facelets-1.1.15.B1.jar"
sourcepath="/M2_REPO/com/sun/facelets/jsf-facelets/1.1.15.B1/jsf-facelets-1.1.15.B1-sources.jar"/>
- <classpathentry exported="true" kind="var"
path="M2_REPO/mc4j/org-mc4j-ems/1.2.16/org-mc4j-ems-1.2.16.jar"
sourcepath="/M2_REPO/mc4j/org-mc4j-ems/1.2.16/org-mc4j-ems-1.2.16-sources.jar"/>
+ <classpathentry exported="true" kind="var"
path="M2_REPO/mc4j/org-mc4j-ems/1.3/org-mc4j-ems-1.3.jar"
sourcepath="/M2_REPO/mc4j/org-mc4j-ems/1.3/org-mc4j-ems-1.3-sources.jar"/>
<classpathentry exported="true" kind="var"
path="M2_REPO/org/opensymphony/quartz/quartz/1.6.5/quartz-1.6.5.jar"
sourcepath="/M2_REPO/org/opensymphony/quartz/quartz/1.6.5/quartz-1.6.5-sources.jar"/>
- <classpathentry exported="true" kind="var"
path="M2_REPO/javax/mail/mail/1.4.2/mail-1.4.2.jar"/>
+ <classpathentry exported="true" kind="var"
path="M2_REPO/javax/mail/mail/1.4/mail-1.4.jar"/>
<classpathentry exported="true" kind="var"
path="M2_REPO/commons-fileupload/commons-fileupload/1.2/commons-fileupload-1.2.jar"/>
<classpathentry exported="true" kind="var"
path="M2_REPO/org/richfaces/framework/richfaces-api/3.3.3.Final/richfaces-api-3.3.3.Final.jar"
sourcepath="/M2_REPO/org/richfaces/framework/richfaces-api/3.1.3.GA/richfaces-api-3.1.3.GA-sources.jar"/>
<classpathentry exported="true" kind="var"
path="M2_REPO/org/richfaces/framework/richfaces-impl/3.3.3.Final/richfaces-impl-3.3.3.Final.jar"
sourcepath="/M2_REPO/org/richfaces/framework/richfaces-impl/3.3.0.GA/richfaces-impl-3.3.0.GA-sources.jar"/>
<classpathentry exported="true" kind="var"
path="M2_REPO/org/richfaces/ui/richfaces-ui/3.3.3.Final/richfaces-ui-3.3.3.Final.jar"
sourcepath="/M2_REPO/org/richfaces/ui/richfaces-ui/3.3.0.GA/richfaces-ui-3.3.0.GA-sources.jar"/>
- <classpathentry exported="true" kind="var"
path="M2_REPO/postgresql/postgresql/9.0-801.jdbc4/postgresql-9.0-801.jdbc4.jar"/>
+ <classpathentry exported="true" kind="var"
path="M2_REPO/postgresql/postgresql/9.1-901.jdbc4/postgresql-9.1-901.jdbc4.jar"/>
<classpathentry exported="true" kind="var"
path="M2_REPO/jboss/jboss-cache/1.4.1.SP9/jboss-cache-1.4.1.SP9.jar"/>
<classpathentry exported="true" kind="var"
path="M2_REPO/org/hyperic/sigar/1.6.5.132/sigar-1.6.5.132.jar"
sourcepath="/M2_REPO/org/hyperic/sigar/1.6.3.82/sigar-1.6.3.82-sources.jar"/>
<classpathentry exported="true" kind="var"
path="M2_REPO/org/jboss/transaction/jboss-jta/4.2.3.SP5/jboss-jta-4.2.3.SP5.jar"/>
@@ -253,11 +253,6 @@
<classpathentry exported="true" kind="var"
path="M2_REPO/jline/jline/0.9.94/jline-0.9.94.jar"/>
<classpathentry exported="true" kind="var"
path="M2_REPO/javassist/javassist/3.9.0.GA/javassist-3.9.0.GA.jar"/>
<classpathentry exported="true" kind="var"
path="M2_REPO/net/sf/opencsv/opencsv/1.8/opencsv-1.8.jar"/>
- <classpathentry exported="true" kind="var"
path="M2_REPO/bouncycastle/bcpg-jdk15/140/bcpg-jdk15-140.jar"/>
- <classpathentry exported="true" kind="var"
path="M2_REPO/bouncycastle/bcprov-jdk15/140/bcprov-jdk15-140.jar"/>
- <classpathentry exported="true" kind="var"
path="M2_REPO/org/apache/xmlrpc/xmlrpc-client/3.1.2/xmlrpc-client-3.1.2.jar"
sourcepath="/M2_REPO/org/apache/xmlrpc/xmlrpc-client/3.1.2/xmlrpc-client-3.1.2-sources.jar"/>
- <classpathentry exported="true" kind="var"
path="M2_REPO/org/apache/xmlrpc/xmlrpc-common/3.1.2/xmlrpc-common-3.1.2.jar"/>
- <classpathentry exported="true" kind="var"
path="M2_REPO/org/apache/ws/commons/util/ws-commons-util/1.0.2/ws-commons-util-1.0.2.jar"/>
<classpathentry exported="true" kind="var"
path="M2_REPO/commons-digester/commons-digester/1.8.1/commons-digester-1.8.1.jar"/>
<classpathentry exported="true" kind="var"
path="M2_REPO/commons-codec/commons-codec/1.4/commons-codec-1.4.jar"/>
<classpathentry exported="true" kind="var"
path="M2_REPO/pircbot/pircbot/1.4.2/pircbot-1.4.2.jar"/>
@@ -268,12 +263,10 @@
<classpathentry exported="true" kind="var"
path="M2_REPO/org/antlr/antlr-runtime/3.2/antlr-runtime-3.2.jar"/>
<classpathentry exported="true" kind="var"
path="M2_REPO/jboss/web/jbossweb/2.0.1.GA/jbossweb-2.0.1.GA.jar"/>
<classpathentry exported="true" kind="var"
path="M2_REPO/org/libvirt/libvirt/0.4.1/libvirt-0.4.1.jar"/>
- <classpathentry exported="true" kind="var"
path="M2_REPO/org/jboss/byteman/byteman/1.2.1/byteman-1.2.1.jar"/>
<classpathentry exported="true" kind="var"
path="M2_REPO/org/fedorahosted/cobbler/cobbler4j/0.1/cobbler4j-0.1.jar"/>
<classpathentry exported="true" kind="var"
path="M2_REPO/com/google/gwt/gwt-user/2.4.0/gwt-user-2.4.0.jar"/>
<classpathentry exported="true" kind="var"
path="M2_REPO/com/google/gwt/gwt-dev/2.4.0/gwt-dev-2.4.0.jar"/>
<classpathentry exported="true" kind="var"
path="M2_REPO/com/smartgwt/smartgwt/3.0/smartgwt-3.0.jar"/>
- <classpathentry exported="true" kind="var"
path="M2_REPO/com/google/code/gwt-log/gwt-log/3.1.0/gwt-log-3.1.0.jar"/>
<classpathentry exported="true" kind="var"
path="M2_REPO/ca/nanometrics/gflot/1.0.0/gflot-1.0.0.jar"/>
<classpathentry exported="true" kind="var"
path="M2_REPO/com/jcraft/jsch/0.1.29/jsch-0.1.29.jar"/>
<classpathentry exported="true" kind="var"
path="M2_REPO/commons-jxpath/commons-jxpath/1.3/commons-jxpath-1.3.jar"/>
@@ -284,16 +277,16 @@
<classpathentry exported="true" kind="var"
path="M2_REPO/org/unitils/unitils-dbunit/3.1/unitils-dbunit-3.1.jar"/>
<classpathentry exported="true" kind="var"
path="M2_REPO/org/unitils/unitils-orm/3.1/unitils-orm-3.1.jar"/>
<classpathentry exported="true" kind="var"
path="M2_REPO/org/unitils/unitils-testng/3.1/unitils-testng-3.1.jar"/>
- <classpathentry exported="true" kind="var"
path="M2_REPO/org/codehaus/jackson/jackson-core-asl/1.7.4/jackson-core-asl-1.7.4.jar"/>
- <classpathentry exported="true" kind="var"
path="M2_REPO/org/codehaus/jackson/jackson-mapper-asl/1.7.4/jackson-mapper-asl-1.7.4.jar"/>
+ <classpathentry exported="true" kind="var"
path="M2_REPO/org/codehaus/jackson/jackson-core-asl/1.8.5/jackson-core-asl-1.8.5.jar"/>
+ <classpathentry exported="true" kind="var"
path="M2_REPO/org/codehaus/jackson/jackson-mapper-asl/1.8.5/jackson-mapper-asl-1.8.5.jar"/>
<classpathentry exported="true" kind="var"
path="M2_REPO/org/mongodb/mongo-java-driver/2.6.5/mongo-java-driver-2.6.5.jar"/>
<classpathentry exported="true" kind="var"
path="M2_REPO/com/googlecode/java-diff-utils/diffutils/1.2.1/diffutils-1.2.1.jar"/>
- <classpathentry exported="true" kind="var"
path="M2_REPO/com/google/code/morphia/morphia/1.00-SNAPSHOT/morphia-1.00-SNAPSHOT.jar"/>
+ <classpathentry exported="true" kind="var"
path="M2_REPO/com/google/code/morphia/morphia/0.99/morphia-0.99.jar"/>
<classpathentry exported="true" kind="var"
path="M2_REPO/org/jboss/resteasy/resteasy-links/2.3.3.Final/resteasy-links-2.3.3.Final.jar"/>
<classpathentry exported="true" kind="var"
path="M2_REPO/org/jboss/resteasy/resteasy-jaxrs/2.3.3.Final/resteasy-jaxrs-2.3.3.Final.jar"/>
<classpathentry exported="true" kind="var"
path="M2_REPO/org/jboss/resteasy/resteasy-jackson-provider/2.3.3.Final/resteasy-jackson-provider-2.3.3.Final.jar"/>
<classpathentry exported="true" kind="var"
path="M2_REPO/org/jboss/resteasy/jaxrs-api/2.3.3.Final/jaxrs-api-2.3.3.Final.jar"/>
- <classpathentry exported="true" kind="var"
path="M2_REPO/org/jboss/sasl/jboss-sasl/1.0.0.Beta9/jboss-sasl-1.0.0.Beta9.jar"/>
+ <classpathentry exported="true" kind="var"
path="M2_REPO/org/jboss/sasl/jboss-sasl/1.0.0.Final/jboss-sasl-1.0.0.Final.jar"/>
<classpathentry exported="true" kind="var"
path="JDK_HOME/lib/tools.jar"/>
<classpathentry exported="true" kind="var"
path="M2_REPO/org/mockito/mockito-all/1.9.0/mockito-all-1.9.0.jar"/>
<classpathentry exported="true" kind="var"
path="M2_REPO/org/powermock/powermock-api-mockito/1.4.11/powermock-api-mockito-1.4.11.jar"/>
@@ -315,5 +308,7 @@
<classpathentry exported="true" kind="var"
path="M2_REPO/org/jboss/arquillian/container/arquillian-container-spi/1.0.0.Final/arquillian-container-spi-1.0.0.Final.jar"/>
<classpathentry exported="true" kind="var"
path="M2_REPO/org/jboss/arquillian/container/arquillian-container-test-api/1.0.0.Final/arquillian-container-test-api-1.0.0.Final.jar"/>
<classpathentry exported="true" kind="var"
path="M2_REPO/org/jboss/arquillian/testng/arquillian-testng-core/1.0.0.Final/arquillian-testng-core-1.0.0.Final.jar"/>
+ <classpathentry exported="true" kind="var"
path="M2_REPO/com/wordnik/swagger-annotations_2.9.1/1.1-SNAPSHOT/swagger-annotations_2.9.1-1.1-20120531.064118-1.jar"/>
+ <classpathentry exported="true" kind="var"
path="M2_REPO/org/jboss/byteman/byteman/1.2.1/byteman-1.2.1.jar"/>
<classpathentry kind="output" path="eclipse-classes"/>
</classpath>
Show replies by date