modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/measurement/test/MeasurementDataManagerTest.java | 54 +--------- modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java | 2 2 files changed, 7 insertions(+), 49 deletions(-)
New commits: commit 0aa2ef7be4b47d0d2a48e23ecdcd652d63a7dcca Author: Heiko W. Rupp hwr@redhat.com Date: Wed Dec 15 12:07:41 2010 +0100
Disable the limitation to certain groups for the moment
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 c75e462..4d99505 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","PERF"}) + @BeforeSuite//(groups = {"integration.ejb3","PERF"}) // TODO investigate again public static void startupEmbeddedJboss() throws Exception { // Setting content location to the tmp dir System.setProperty(ContentSourceManagerBean.FILESYSTEM_PROPERTY, System.getProperty("java.io.tmpdir"));
commit 34e34f0feef9215c0f5cc531e9e3d806b559f3a5 Author: Heiko W. Rupp hwr@redhat.com Date: Wed Dec 15 12:02:47 2010 +0100
Do the old try-rollback trick so that we leave no dangling stuff around.
diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/measurement/test/MeasurementDataManagerTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/measurement/test/MeasurementDataManagerTest.java index 53e21c9..6a09934 100644 --- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/measurement/test/MeasurementDataManagerTest.java +++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/measurement/test/MeasurementDataManagerTest.java @@ -22,6 +22,7 @@ import java.util.Date; import java.util.Random;
import javax.persistence.EntityManager; +import javax.transaction.Status;
import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -75,8 +76,6 @@ public class MeasurementDataManagerTest extends AbstractEJB3Test { @BeforeMethod public void beforeMethod() { try { - prepareScheduler(); - this.resourceManager = LookupUtil.getResourceManager(); this.measurementDataManager = LookupUtil.getMeasurementDataManager(); this.callTimeDataManager = LookupUtil.getCallTimeDataManager(); @@ -89,41 +88,6 @@ public class MeasurementDataManagerTest extends AbstractEJB3Test { } }
- @AfterMethod - public void afterMethod() throws Exception { - try { - EntityManager em = getEntityManager(); - getTransactionManager().begin(); - - MeasurementSchedule schedule1 = resource1.getSchedules().iterator().next(); - MeasurementSchedule schedule2 = resource2.getSchedules().iterator().next(); - schedule1 = em.find(MeasurementSchedule.class,schedule1.getId()); - schedule2 = em.find(MeasurementSchedule.class,schedule2.getId()); - em.remove(schedule1); - em.remove(schedule2); - resource1 = em.find(Resource.class,resource1.getId()); - resource2 = em.find(Resource.class,resource2.getId()); - em.remove(resource1); - em.remove(resource2); - theDefinition = em.find(MeasurementDefinition.class,theDefinition.getId()); - em.remove(theDefinition); - theResourceType = em.find(ResourceType.class,theResourceType.getId()); - em.remove(theResourceType); - theAgent = em.find(Agent.class,theAgent.getId()); - em.remove(theAgent); - - getTransactionManager().commit(); - - } catch (Exception e) { - e.printStackTrace(); - throw e; - } - - finally { - unprepareScheduler(); - } - } -
@Test public void bz658491() throws Exception { @@ -131,7 +95,6 @@ public class MeasurementDataManagerTest extends AbstractEJB3Test {
try { setupResources(em); - commitAndClose(em);
MeasurementSchedule schedule1 = resource1.getSchedules().iterator().next(); MeasurementSchedule schedule2 = resource2.getSchedules().iterator().next(); @@ -166,10 +129,11 @@ public class MeasurementDataManagerTest extends AbstractEJB3Test { } catch (Exception e) { e.printStackTrace(); throw e; - } - - finally { - unprepareScheduler(); + } finally { + if (em != null) { + getTransactionManager().rollback(); + em.close(); + } } }
@@ -222,10 +186,4 @@ public class MeasurementDataManagerTest extends AbstractEJB3Test { return em; }
- private void commitAndClose(EntityManager em) throws Exception { - getTransactionManager().commit(); - em.close(); - } - - }
rhq-commits@lists.fedorahosted.org