modules/core/domain/src/test/java/org/rhq/core/domain/bundle/test/BundleTest.java
| 10 ++--
modules/core/domain/src/test/java/org/rhq/core/domain/configuration/ResourceConfigurationUpdateIntegrationTest.java
| 2
modules/core/domain/src/test/java/org/rhq/core/domain/configuration/test/ConfigurationCompareTest.java
| 3 -
modules/core/domain/src/test/java/org/rhq/core/domain/configuration/test/ConfigurationTest.java
| 2
modules/core/domain/src/test/java/org/rhq/core/domain/content/test/ContentSourceSyncResultsTest.java
| 2
modules/core/domain/src/test/java/org/rhq/core/domain/content/test/ContentSourceTest.java
| 2
modules/core/domain/src/test/java/org/rhq/core/domain/content/test/PackageVersionContentSourceTest.java
| 2
modules/core/domain/src/test/java/org/rhq/core/domain/content/test/RepoGroupTest.java
| 2
modules/core/domain/src/test/java/org/rhq/core/domain/content/test/RepoTest.java
| 2
modules/core/domain/src/test/java/org/rhq/core/domain/resource/ResourceTypeTest.java
| 24 +++++++---
modules/core/domain/src/test/java/org/rhq/core/domain/resource/test/AgentTest.java
| 2
modules/core/domain/src/test/java/org/rhq/core/domain/resource/test/PluginTest.java
| 2
modules/core/domain/src/test/java/org/rhq/core/domain/resource/test/ResourceErrorTest.java
| 2
modules/core/domain/src/test/java/org/rhq/core/domain/resource/test/ServerPluginTest.java
| 2
modules/core/domain/src/test/java/org/rhq/core/domain/search/SavedSearchTest.java
| 2
modules/core/domain/src/test/java/org/rhq/core/domain/test/AbstractEJB3Test.java
| 9 ++-
modules/core/domain/src/test/java/org/rhq/core/domain/test/QueriesTest.java
| 2
modules/core/domain/src/test/resources/org/rhq/core/domain/resource/ResourceTypeTest.xml
| 8 +++
18 files changed, 51 insertions(+), 29 deletions(-)
New commits:
commit 6662223ab8bd315017808248a2a22047ac913cc8
Author: John Sanda <jsanda(a)redhat.com>
Date: Thu Oct 21 12:05:07 2010 -0400
Changing order of tests execution to work around an OOM error
When running all tests in core/domain locally with the new unitils-based
test, I started seeing OutOfMemoryErrors with a message about the GC
running too much. I did not however, see this on hudson. I came to the
general conclusion that the problem stemmed from loading entities both
in the embedded ejb container and both in unitils which is done in
stand-alone hibernate as far as I know. I have updated the test suite so
that the unitils tests run after all of the tests that depend on the
embedded container, allowing the embedded container to shutdown.
diff --git
a/modules/core/domain/src/test/java/org/rhq/core/domain/bundle/test/BundleTest.java
b/modules/core/domain/src/test/java/org/rhq/core/domain/bundle/test/BundleTest.java
index 8bdb830..e0aa981 100644
--- a/modules/core/domain/src/test/java/org/rhq/core/domain/bundle/test/BundleTest.java
+++ b/modules/core/domain/src/test/java/org/rhq/core/domain/bundle/test/BundleTest.java
@@ -47,7 +47,7 @@ public class BundleTest extends AbstractEJB3Test {
private static final boolean ENABLED = true;
- @Test(enabled = ENABLED)
+ @Test(enabled = ENABLED, groups = "integration.ejb3")
public void testBundleVersionRepo() throws Throwable {
getTransactionManager().begin();
EntityManager em = getEntityManager();
@@ -124,7 +124,7 @@ public class BundleTest extends AbstractEJB3Test {
}
}
- @Test(enabled = ENABLED)
+ @Test(enabled = ENABLED, groups = "integration.ejb3")
public void testBundleVersion() throws Throwable {
getTransactionManager().begin();
EntityManager em = getEntityManager();
@@ -204,7 +204,7 @@ public class BundleTest extends AbstractEJB3Test {
}
}
- @Test(enabled = ENABLED)
+ @Test(enabled = ENABLED, groups = "integration.ejb3")
public void testMultipleBundleVersions() throws Throwable {
getTransactionManager().begin();
EntityManager em = getEntityManager();
@@ -321,7 +321,7 @@ public class BundleTest extends AbstractEJB3Test {
}
}
- @Test(enabled = ENABLED)
+ @Test(enabled = ENABLED, groups = "integration.ejb3")
public void testBundle() throws Throwable {
getTransactionManager().begin();
EntityManager em = getEntityManager();
@@ -393,7 +393,7 @@ public class BundleTest extends AbstractEJB3Test {
}
}
- @Test(enabled = ENABLED)
+ @Test(enabled = ENABLED, groups = "integration.ejb3")
public void testBundleType() throws Throwable {
getTransactionManager().begin();
EntityManager em = getEntityManager();
diff --git
a/modules/core/domain/src/test/java/org/rhq/core/domain/configuration/ResourceConfigurationUpdateIntegrationTest.java
b/modules/core/domain/src/test/java/org/rhq/core/domain/configuration/ResourceConfigurationUpdateIntegrationTest.java
index c205f03..f71becf 100644
---
a/modules/core/domain/src/test/java/org/rhq/core/domain/configuration/ResourceConfigurationUpdateIntegrationTest.java
+++
b/modules/core/domain/src/test/java/org/rhq/core/domain/configuration/ResourceConfigurationUpdateIntegrationTest.java
@@ -33,7 +33,7 @@ import javax.persistence.EntityManager;
public class ResourceConfigurationUpdateIntegrationTest extends AbstractEJB3Test {
- @Test
+ @Test(groups = "integration.ejb3")
public void testUpdate() throws Exception {
try {
getTransactionManager().begin();
diff --git
a/modules/core/domain/src/test/java/org/rhq/core/domain/configuration/test/ConfigurationCompareTest.java
b/modules/core/domain/src/test/java/org/rhq/core/domain/configuration/test/ConfigurationCompareTest.java
index d71016b..7a8f7b9 100644
---
a/modules/core/domain/src/test/java/org/rhq/core/domain/configuration/test/ConfigurationCompareTest.java
+++
b/modules/core/domain/src/test/java/org/rhq/core/domain/configuration/test/ConfigurationCompareTest.java
@@ -38,7 +38,7 @@ import org.rhq.core.domain.test.AbstractEJB3Test;
*
* @author John Mazzitelli
*/
-@Test
+@Test(groups = "integration.ejb3")
public class ConfigurationCompareTest extends AbstractEJB3Test {
public void testNullCompare() {
Configuration c1 = new Configuration();
@@ -198,6 +198,7 @@ public class ConfigurationCompareTest extends AbstractEJB3Test {
}
}
+ @Test(groups = "integration.ejb3")
public void testSimpleCompare() {
Configuration c1 = new Configuration();
Configuration c2 = new Configuration();
diff --git
a/modules/core/domain/src/test/java/org/rhq/core/domain/configuration/test/ConfigurationTest.java
b/modules/core/domain/src/test/java/org/rhq/core/domain/configuration/test/ConfigurationTest.java
index c581ff8..604964a 100644
---
a/modules/core/domain/src/test/java/org/rhq/core/domain/configuration/test/ConfigurationTest.java
+++
b/modules/core/domain/src/test/java/org/rhq/core/domain/configuration/test/ConfigurationTest.java
@@ -118,7 +118,7 @@ public class ConfigurationTest extends AbstractEJB3Test {
}
}
- @Test
+ @Test(groups = "integration.ejb3")
public void testConfigurationSerialization() throws Exception {
Configuration c = new Configuration();
c.setId(1);
diff --git
a/modules/core/domain/src/test/java/org/rhq/core/domain/content/test/ContentSourceSyncResultsTest.java
b/modules/core/domain/src/test/java/org/rhq/core/domain/content/test/ContentSourceSyncResultsTest.java
index deb5fc3..60ed85f 100644
---
a/modules/core/domain/src/test/java/org/rhq/core/domain/content/test/ContentSourceSyncResultsTest.java
+++
b/modules/core/domain/src/test/java/org/rhq/core/domain/content/test/ContentSourceSyncResultsTest.java
@@ -42,7 +42,7 @@ import org.rhq.core.domain.resource.ResourceCategory;
import org.rhq.core.domain.resource.ResourceType;
import org.rhq.core.domain.test.AbstractEJB3Test;
-@Test
+@Test(groups = "integration.ejb3")
public class ContentSourceSyncResultsTest extends AbstractEJB3Test {
public void testInsert() throws Exception {
getTransactionManager().begin();
diff --git
a/modules/core/domain/src/test/java/org/rhq/core/domain/content/test/ContentSourceTest.java
b/modules/core/domain/src/test/java/org/rhq/core/domain/content/test/ContentSourceTest.java
index 3f89351..1ace3ee 100644
---
a/modules/core/domain/src/test/java/org/rhq/core/domain/content/test/ContentSourceTest.java
+++
b/modules/core/domain/src/test/java/org/rhq/core/domain/content/test/ContentSourceTest.java
@@ -41,7 +41,7 @@ import org.rhq.core.domain.resource.ResourceCategory;
import org.rhq.core.domain.resource.ResourceType;
import org.rhq.core.domain.test.AbstractEJB3Test;
-@Test
+@Test(groups = "integration.ejb3")
public class ContentSourceTest extends AbstractEJB3Test {
public void testInsert() throws Exception {
getTransactionManager().begin();
diff --git
a/modules/core/domain/src/test/java/org/rhq/core/domain/content/test/PackageVersionContentSourceTest.java
b/modules/core/domain/src/test/java/org/rhq/core/domain/content/test/PackageVersionContentSourceTest.java
index 0903628..b3829e5 100644
---
a/modules/core/domain/src/test/java/org/rhq/core/domain/content/test/PackageVersionContentSourceTest.java
+++
b/modules/core/domain/src/test/java/org/rhq/core/domain/content/test/PackageVersionContentSourceTest.java
@@ -57,7 +57,7 @@ import org.rhq.core.domain.test.AbstractEJB3Test;
*
* @author John Mazzitelli
*/
-@Test
+@Test(groups = "integration.ejb3")
public class PackageVersionContentSourceTest extends AbstractEJB3Test {
public void testInsert() throws Exception {
getTransactionManager().begin();
diff --git
a/modules/core/domain/src/test/java/org/rhq/core/domain/content/test/RepoGroupTest.java
b/modules/core/domain/src/test/java/org/rhq/core/domain/content/test/RepoGroupTest.java
index 58ad823..3f54d76 100644
---
a/modules/core/domain/src/test/java/org/rhq/core/domain/content/test/RepoGroupTest.java
+++
b/modules/core/domain/src/test/java/org/rhq/core/domain/content/test/RepoGroupTest.java
@@ -41,7 +41,7 @@ import org.rhq.core.domain.resource.ResourceCategory;
import org.rhq.core.domain.resource.ResourceType;
import org.rhq.core.domain.test.AbstractEJB3Test;
-@Test
+@Test(groups = "integration.ejb3")
public class RepoGroupTest extends AbstractEJB3Test {
public void testInsert() throws Exception {
getTransactionManager().begin();
diff --git
a/modules/core/domain/src/test/java/org/rhq/core/domain/content/test/RepoTest.java
b/modules/core/domain/src/test/java/org/rhq/core/domain/content/test/RepoTest.java
index 7b5a402..2c4dc89 100644
--- a/modules/core/domain/src/test/java/org/rhq/core/domain/content/test/RepoTest.java
+++ b/modules/core/domain/src/test/java/org/rhq/core/domain/content/test/RepoTest.java
@@ -29,7 +29,7 @@ import org.testng.annotations.Test;
import org.rhq.core.domain.content.Repo;
import org.rhq.core.domain.test.AbstractEJB3Test;
-@Test
+@Test(groups = "integration.ejb3")
public class RepoTest extends AbstractEJB3Test {
public void testInsert() throws Exception {
getTransactionManager().begin();
diff --git
a/modules/core/domain/src/test/java/org/rhq/core/domain/resource/ResourceTypeTest.java
b/modules/core/domain/src/test/java/org/rhq/core/domain/resource/ResourceTypeTest.java
index d165a06..8a1288e 100644
---
a/modules/core/domain/src/test/java/org/rhq/core/domain/resource/ResourceTypeTest.java
+++
b/modules/core/domain/src/test/java/org/rhq/core/domain/resource/ResourceTypeTest.java
@@ -5,22 +5,32 @@ import java.util.List;
import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
+import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
import org.unitils.UnitilsTestNG;
import org.unitils.dbunit.annotation.DataSet;
import org.unitils.orm.jpa.annotation.JpaEntityManagerFactory;
-import static org.rhq.core.domain.resource.ResourceType.*;
-import static org.testng.Assert.*;
+import static org.rhq.core.domain.resource.ResourceType.QUERY_FIND_ALL;
+import static org.rhq.core.domain.resource.ResourceType.QUERY_FIND_BY_NAME_AND_PLUGIN;
+import static org.rhq.core.domain.resource.ResourceType.QUERY_FIND_BY_PLUGIN;
+import static org.rhq.core.domain.resource.ResourceType.QUERY_FIND_CHILDREN;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertTrue;
+import static org.testng.Assert.fail;
@JpaEntityManagerFactory(persistenceUnit = "rhq-test", configFile =
"META-INF/test-persistence.xml")
@DataSet
public class ResourceTypeTest extends UnitilsTestNG {
+ @BeforeClass(groups = "unitils", dependsOnGroups =
"integration.ejb3")
+ public void init() {
+ }
+
@PersistenceContext
EntityManager entityMgr;
- @Test
+ @Test(groups = "unitils", dependsOnGroups = "integration.ejb3")
@SuppressWarnings("unchecked")
public void findByPlugin() {
List<ResourceType> results =
entityMgr.createNamedQuery(QUERY_FIND_BY_PLUGIN)
@@ -31,7 +41,7 @@ public class ResourceTypeTest extends UnitilsTestNG {
assertEquals(results.get(0).getId(), -1, "The wrong resource type was
returned");
}
- @Test
+ @Test(groups = "unitils", dependsOnGroups = "integration.ejb3")
@SuppressWarnings("unchecked")
public void findByNameAndPlugin() {
ResourceType type = (ResourceType)
entityMgr.createNamedQuery(QUERY_FIND_BY_NAME_AND_PLUGIN)
@@ -42,7 +52,7 @@ public class ResourceTypeTest extends UnitilsTestNG {
assertEquals(type.getId(), -1, "Failed to find resource type by name and by
plugin");
}
- @Test
+ @Test(groups = "unitils", dependsOnGroups = "integration.ejb3")
public void findByNameAndPluginShouldNotReturnDeletedType() {
List results = entityMgr.createNamedQuery(QUERY_FIND_BY_NAME_AND_PLUGIN)
.setParameter("name", "TestServer2")
@@ -52,7 +62,7 @@ public class ResourceTypeTest extends UnitilsTestNG {
assertEquals(results.size(), 0, "Deleted types should be ignored");
}
- @Test
+ @Test(groups = "unitils", dependsOnGroups = "integration.ejb3")
@SuppressWarnings("unchecked")
public void findAll() {
List<ResourceType> results =
entityMgr.createNamedQuery(QUERY_FIND_ALL).getResultList();
@@ -61,7 +71,7 @@ public class ResourceTypeTest extends UnitilsTestNG {
assertDeletedTypesIgnored(results);
}
- @Test
+ @Test(groups = "unitils", dependsOnGroups = "integration.ejb3")
@SuppressWarnings("unchecked")
public void findChildren() {
List<ResourceType> results =
entityMgr.createNamedQuery(QUERY_FIND_CHILDREN)
diff --git
a/modules/core/domain/src/test/java/org/rhq/core/domain/resource/test/AgentTest.java
b/modules/core/domain/src/test/java/org/rhq/core/domain/resource/test/AgentTest.java
index 68efa6d..d3e9e9a 100644
--- a/modules/core/domain/src/test/java/org/rhq/core/domain/resource/test/AgentTest.java
+++ b/modules/core/domain/src/test/java/org/rhq/core/domain/resource/test/AgentTest.java
@@ -33,7 +33,7 @@ import org.rhq.core.domain.resource.Agent;
import org.rhq.core.domain.resource.composite.AgentLastAvailabilityReportComposite;
import org.rhq.core.domain.test.AbstractEJB3Test;
-@Test
+@Test(groups = "integration.ejb3")
public class AgentTest extends AbstractEJB3Test {
private long now = System.currentTimeMillis();
diff --git
a/modules/core/domain/src/test/java/org/rhq/core/domain/resource/test/PluginTest.java
b/modules/core/domain/src/test/java/org/rhq/core/domain/resource/test/PluginTest.java
index c397780..8eb976d 100644
--- a/modules/core/domain/src/test/java/org/rhq/core/domain/resource/test/PluginTest.java
+++ b/modules/core/domain/src/test/java/org/rhq/core/domain/resource/test/PluginTest.java
@@ -46,7 +46,7 @@ import org.rhq.core.domain.test.AbstractEJB3Test;
import org.rhq.core.util.MessageDigestGenerator;
import org.rhq.core.util.stream.StreamUtil;
-@Test
+@Test(groups = "integration.ejb3")
public class PluginTest extends AbstractEJB3Test {
public void testUpdate() throws Throwable {
boolean done = false;
diff --git
a/modules/core/domain/src/test/java/org/rhq/core/domain/resource/test/ResourceErrorTest.java
b/modules/core/domain/src/test/java/org/rhq/core/domain/resource/test/ResourceErrorTest.java
index 8fdc2f7..0b08d53 100644
---
a/modules/core/domain/src/test/java/org/rhq/core/domain/resource/test/ResourceErrorTest.java
+++
b/modules/core/domain/src/test/java/org/rhq/core/domain/resource/test/ResourceErrorTest.java
@@ -39,7 +39,7 @@ import org.rhq.core.domain.resource.ResourceErrorType;
import org.rhq.core.domain.resource.ResourceType;
import org.rhq.core.domain.test.AbstractEJB3Test;
-@Test
+@Test(groups = "integration.ejb3")
public class ResourceErrorTest extends AbstractEJB3Test {
private Resource newResource;
diff --git
a/modules/core/domain/src/test/java/org/rhq/core/domain/resource/test/ServerPluginTest.java
b/modules/core/domain/src/test/java/org/rhq/core/domain/resource/test/ServerPluginTest.java
index 4ec9271..801db14 100644
---
a/modules/core/domain/src/test/java/org/rhq/core/domain/resource/test/ServerPluginTest.java
+++
b/modules/core/domain/src/test/java/org/rhq/core/domain/resource/test/ServerPluginTest.java
@@ -48,7 +48,7 @@ import org.rhq.core.domain.test.AbstractEJB3Test;
import org.rhq.core.util.MessageDigestGenerator;
import org.rhq.core.util.stream.StreamUtil;
-@Test
+@Test(groups = "integration.ejb3")
public class ServerPluginTest extends AbstractEJB3Test {
public void testUpdate() throws Throwable {
boolean done = false;
diff --git
a/modules/core/domain/src/test/java/org/rhq/core/domain/search/SavedSearchTest.java
b/modules/core/domain/src/test/java/org/rhq/core/domain/search/SavedSearchTest.java
index d7dfc03..e631b83 100644
--- a/modules/core/domain/src/test/java/org/rhq/core/domain/search/SavedSearchTest.java
+++ b/modules/core/domain/src/test/java/org/rhq/core/domain/search/SavedSearchTest.java
@@ -33,7 +33,7 @@ import java.util.List;
public class SavedSearchTest extends AbstractEJB3Test {
- @Test
+ @Test(groups = "integration.ejb3")
public void testInsert() throws Exception {
getTransactionManager().begin();
EntityManager entityMgr = getEntityManager();
diff --git
a/modules/core/domain/src/test/java/org/rhq/core/domain/test/AbstractEJB3Test.java
b/modules/core/domain/src/test/java/org/rhq/core/domain/test/AbstractEJB3Test.java
index ccf205f..57ec318 100644
--- a/modules/core/domain/src/test/java/org/rhq/core/domain/test/AbstractEJB3Test.java
+++ b/modules/core/domain/src/test/java/org/rhq/core/domain/test/AbstractEJB3Test.java
@@ -34,14 +34,17 @@ import javax.persistence.EntityManagerFactory;
import javax.transaction.TransactionManager;
import org.testng.AssertJUnit;
+import org.testng.annotations.AfterGroups;
import org.testng.annotations.AfterSuite;
+import org.testng.annotations.BeforeGroups;
import org.testng.annotations.BeforeSuite;
import org.jboss.ejb3.embedded.EJB3StandaloneBootstrap;
import org.jboss.ejb3.embedded.EJB3StandaloneDeployer;
public abstract class AbstractEJB3Test extends AssertJUnit {
- @BeforeSuite(groups = "integration.ejb3")
+// @BeforeSuite(groups = "integration.ejb3")
+ @BeforeGroups(groups = "integration.ejb3")
public static void startupEmbeddedJboss() {
System.out.println("Starting ejb3...");
String classesDir = System.getProperty("ejbjarDirectory",
"target/classes");
@@ -81,8 +84,8 @@ public abstract class AbstractEJB3Test extends AssertJUnit {
}
}
- //@Configuration(groups = "integration.ejb3", afterSuite = true)
- @AfterSuite
+// @AfterSuite
+ @AfterGroups(groups = "integration.ejb3")
public static void shutdownEmbeddedJboss() {
EJB3StandaloneBootstrap.shutdown();
}
diff --git a/modules/core/domain/src/test/java/org/rhq/core/domain/test/QueriesTest.java
b/modules/core/domain/src/test/java/org/rhq/core/domain/test/QueriesTest.java
index a60fa33..634d684 100644
--- a/modules/core/domain/src/test/java/org/rhq/core/domain/test/QueriesTest.java
+++ b/modules/core/domain/src/test/java/org/rhq/core/domain/test/QueriesTest.java
@@ -54,7 +54,7 @@ import org.rhq.core.util.exception.ThrowableUtil;
* Use this to explicitly test any of our named queries with any set of parameters.
Useful to make sure these run on
* both postgres and oracle, specifically those that try to do select distinct queries
while retrieve LOB columns.
*/
-@Test
+@Test(groups = "integration.ejb3")
public class QueriesTest extends AbstractEJB3Test {
private Map<String, Map<String, Object>> queries; // here just so we dont
have to pass it to the add()
diff --git
a/modules/core/domain/src/test/resources/org/rhq/core/domain/resource/ResourceTypeTest.xml
b/modules/core/domain/src/test/resources/org/rhq/core/domain/resource/ResourceTypeTest.xml
index 9383f3c..421bcab 100644
---
a/modules/core/domain/src/test/resources/org/rhq/core/domain/resource/ResourceTypeTest.xml
+++
b/modules/core/domain/src/test/resources/org/rhq/core/domain/resource/ResourceTypeTest.xml
@@ -1,4 +1,12 @@
<dataset>
+ <rhq_package_type/>
+ <rhq_measurement_def/>
+ <rhq_event_def/>
+ <rhq_operation_def/>
+ <rhq_process_scan/>
+ <rhq_config_def/>
+ <rhq_resource/>
+
<rhq_resource_type id="-1"
name="TestServer1"
category="SERVER"