modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/authz/test/AuthorizationManagerBeanTest.java | 1 - modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/event/test/EventManagerTest.java | 10 +++++----- 2 files changed, 5 insertions(+), 6 deletions(-)
New commits: commit dab1eabe1bd3f4bc1ba640c3a2cde5db3d7a6025 Merge: 11d549c... 1b03621... Author: Heiko W. Rupp hwr@redhat.com Date: Tue Dec 14 16:03:26 2010 +0100
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
commit 11d549c4d83ca63b94670d0a1ff4670e82ce8667 Author: Heiko W. Rupp hwr@redhat.com Date: Tue Dec 14 16:03:01 2010 +0100
BeforeSuite may be too early.
diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/authz/test/AuthorizationManagerBeanTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/authz/test/AuthorizationManagerBeanTest.java index 181dccc..ccd8eec 100644 --- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/authz/test/AuthorizationManagerBeanTest.java +++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/authz/test/AuthorizationManagerBeanTest.java @@ -27,7 +27,6 @@ import java.util.Set; import javax.persistence.EntityManager;
import org.testng.annotations.BeforeMethod; -import org.testng.annotations.BeforeSuite; import org.testng.annotations.Test;
import org.rhq.core.domain.auth.Subject; diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/event/test/EventManagerTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/event/test/EventManagerTest.java index dc708f5..ad390d4 100644 --- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/event/test/EventManagerTest.java +++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/event/test/EventManagerTest.java @@ -28,7 +28,7 @@ import java.util.Set; import javax.persistence.EntityManager; import javax.persistence.Query;
-import org.testng.annotations.BeforeSuite; +import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test;
import org.rhq.core.domain.auth.Subject; @@ -47,7 +47,7 @@ import org.rhq.enterprise.server.test.AbstractEJB3Test; import org.rhq.enterprise.server.util.LookupUtil;
/** - * Tests around the event subsystem + * Tests around the event subsystem * @author Heiko W. Rupp */ public class EventManagerTest extends AbstractEJB3Test { @@ -55,7 +55,7 @@ public class EventManagerTest extends AbstractEJB3Test { EventManagerLocal eventManager; EntityManager em;
- @BeforeSuite + @BeforeMethod public void init() { try { eventManager = LookupUtil.getEventManager(); @@ -90,7 +90,7 @@ public class EventManagerTest extends AbstractEJB3Test { em.persist(ev); em.flush();
- /* + /* * do NOT use addEventData method until this test is refactored to support the fact that * insertions made via direct SQL won't be visible to the entity manager in this xaction */ @@ -142,7 +142,7 @@ public class EventManagerTest extends AbstractEJB3Test { //em.persist(ev); //em.flush();
- /* + /* * do NOT use addEventData method until this test is refactored to support the fact that * insertions made via direct SQL won't be visible to the entity manager in this xaction */
rhq-commits@lists.fedorahosted.org