modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
New commits: commit b59d1684eb12c4e1c5a78309b4ec40eeb461b7d5 Author: John Sanda jsanda@redhat.com Date: Wed Jul 17 20:17:14 2013 -0400
fix test ear deployment error that resulted from renaming server jar
The ear deployment was failing because classes were not getting added to the rhq-server.jar in the test ear.
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java index 4dfbd46..2fd8624 100644 --- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java +++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java @@ -341,7 +341,7 @@ public abstract class AbstractEJB3Test extends Arquillian { // merge rhq.ear into testEar but include only the EJB jars and the supporting libraries. Note that we // don't include the services sar because tests are responsible for prepare/unprepare of all required services, // we don't want the production services performing any unexpected work. - testEar = testEar.merge(rhqEar, Filters.include("/lib.*|/rhq.*ejb3\.jar.*")); + testEar = testEar.merge(rhqEar, Filters.include("/lib.*|/rhq.*ejb3\.jar.*|/rhq-server.jar.*")); // remove startup beans and shutdown listeners, we don't want this to be a full server deployment. The tests // start/stop what they need, typically with test services or mocks. testEar.delete(ArchivePaths @@ -413,7 +413,7 @@ public abstract class AbstractEJB3Test extends Arquillian { //System.out.println("** The Deployment EAR: " + testEar.toString(true) + "\n");
// Save the test EAR to a zip file for inspection (set file explicitly) - //exportZip(testEar, new File("c:/temp/test-ear.ear")); + exportZip(testEar, new File("/Users/jsanda/tmp/test-ear.ear"));
return testEar; }
rhq-commits@lists.fedorahosted.org