modules/enterprise/server/jar/pom.xml
| 1 +
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java
| 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
New commits:
commit 7d7c1a02ef9164940d3e6eb695293f520d9d923c
Merge: 7b27318... b3ac18a...
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Thu Oct 28 10:31:28 2010 +0200
Merge branch 'master' of
ssh://git.fedorahosted.org/git/rhq/rhq
commit 7b2731889909ed988916ad0c4daed4333cfc7610
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Thu Oct 28 10:29:47 2010 +0200
Allow to specify included groups as opposed to only excluding. The abstract ejb3 test
is needed for integration and perf group.
diff --git a/modules/enterprise/server/jar/pom.xml
b/modules/enterprise/server/jar/pom.xml
index 2abdae5..d444d67 100644
--- a/modules/enterprise/server/jar/pom.xml
+++ b/modules/enterprise/server/jar/pom.xml
@@ -499,6 +499,7 @@ Build-OS-Version=${os.version}
<exclude>com/**/*.java</exclude>
</excludes>
<excludedGroups>${rhq.testng.excludedGroups}</excludedGroups>
+ <groups>${rhq.testng.includedGroups}</groups>
<systemPropertyVariables>
<embeddedDeployment>true</embeddedDeployment>
<deploymentDirectory>target/classes</deploymentDirectory>
diff --git
a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java
b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java
index 2609861..1bd4600 100644
---
a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java
+++
b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java
@@ -63,7 +63,7 @@ import org.rhq.enterprise.server.util.LookupUtil;
* @author Greg Hinkle
*/
public abstract class AbstractEJB3Test extends AssertJUnit {
- @BeforeSuite(groups = "integration.ejb3")
+ @BeforeSuite(groups = {"integration.ejb3","PERF"})
public static void startupEmbeddedJboss() throws Exception {
// Setting content location to the tmp dir
System.setProperty(ContentSourceManagerBean.FILESYSTEM_PROPERTY,
System.getProperty("java.io.tmpdir"));
@@ -150,7 +150,7 @@ public abstract class AbstractEJB3Test extends AssertJUnit {
public static Connection getConnection() throws SQLException {
return LookupUtil.getDataSource().getConnection();
}
-
+
@AfterMethod
public static void endTest() {
//System.out.println("Connections used: " +
(stats.getQueryExecutionCount() - start));