modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/MultiplePluginExtensionMetadataTest.java
| 6 +-----
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/PluginExtensionMetadataTest.java
| 6 +-----
2 files changed, 2 insertions(+), 10 deletions(-)
New commits:
commit 6e140cbad75a35cbf7e162b69f043f479e87f09e
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Thu Mar 1 11:56:53 2012 -0500
[BZ 747925] there is only one test in this class, don't override beforeMethod,
just get the SLSB managers in the test method itself
diff --git
a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/MultiplePluginExtensionMetadataTest.java
b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/MultiplePluginExtensionMetadataTest.java
index bed5645..b395120 100644
---
a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/MultiplePluginExtensionMetadataTest.java
+++
b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/MultiplePluginExtensionMetadataTest.java
@@ -2,7 +2,6 @@ package org.rhq.enterprise.server.resource.metadata;
import java.util.List;
-import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
import org.rhq.core.domain.criteria.ResourceTypeCriteria;
@@ -45,13 +44,10 @@ public class MultiplePluginExtensionMetadataTest extends
MetadataBeanTest {
private SubjectManagerLocal subjectMgr;
private ResourceTypeManagerLocal resourceTypeMgr;
- @BeforeMethod
- public void beforeMethod() {
+ public void testRegisterPlugins() throws Exception {
subjectMgr = LookupUtil.getSubjectManager();
resourceTypeMgr = LookupUtil.getResourceTypeManager();
- }
- public void testRegisterPlugins() throws Exception {
registerParentPluginV1(); // create an initial type (called the parent)
registerChild1PluginV1(); // using plugin extension mechanism, create child #1
type that extends that parent type
registerChild2PluginV1(); // using plugin extension mechanism, create child #2
type that extends that parent type
diff --git
a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/PluginExtensionMetadataTest.java
b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/PluginExtensionMetadataTest.java
index c4973ee..9a9c1b0 100644
---
a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/PluginExtensionMetadataTest.java
+++
b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/PluginExtensionMetadataTest.java
@@ -4,7 +4,6 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
import org.rhq.core.domain.bundle.ResourceTypeBundleConfiguration;
@@ -114,13 +113,10 @@ public class PluginExtensionMetadataTest extends MetadataBeanTest {
private SubjectManagerLocal subjectMgr;
private ResourceTypeManagerLocal resourceTypeMgr;
- @BeforeMethod
- public void beforeMethod() {
+ public void testRegisterPlugins() throws Exception {
subjectMgr = LookupUtil.getSubjectManager();
resourceTypeMgr = LookupUtil.getResourceTypeManager();
- }
- public void testRegisterPlugins() throws Exception {
registerParentPluginV1(); // create an initial type (called the parent)
registerChildPluginV1(); // using plugin extension mechanism, create a child type
that extends that parent type
registerParentPluginV2(); // update the parent type
Show replies by date