modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/bundle/BundleManagerBeanTest.java
| 17 --
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/bundle/TestBundleServerPluginService.java
| 61 ----------
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/bundle/TestBundleServerPluginServiceMBean.java
| 24 +++
3 files changed, 36 insertions(+), 66 deletions(-)
New commits:
commit 3c61acc239ef4eb7e4bdd086cb5f533ca845e1c8
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Tue Mar 2 15:57:09 2010 -0500
fix bundle test so the mock PC is started properly
diff --git
a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/bundle/BundleManagerBeanTest.java
b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/bundle/BundleManagerBeanTest.java
index e8ac546..a7cf52d 100644
---
a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/bundle/BundleManagerBeanTest.java
+++
b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/bundle/BundleManagerBeanTest.java
@@ -65,18 +65,14 @@ public class BundleManagerBeanTest extends AbstractEJB3Test {
public void beforeMethod() {
super.startTest();
- if (null == ps) {
- ps = new TestBundleServerPluginService();
- pc = ps.createMasterPluginContainer();
- } else {
- pc.initialize(ps.masterConfig);
- }
-
+ this.ps = new TestBundleServerPluginService();
+ prepareCustomServerPluginService(this.ps);
bundleManagerBean = LookupUtil.getBundleManager();
+ this.ps.startMasterPluginContainer();
}
@AfterMethod(alwaysRun = true)
- public void afterMethod() {
+ public void afterMethod() throws Exception {
EntityManager em = null;
@@ -133,9 +129,8 @@ public class BundleManagerBeanTest extends AbstractEJB3Test {
}
}
- if (null != pc) {
- pc.shutdown();
- }
+ unprepareServerPluginService();
+ this.ps = null;
super.endTest();
}
diff --git
a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/bundle/TestBundleServerPluginService.java
b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/bundle/TestBundleServerPluginService.java
index dcbc951..64bd5af 100644
---
a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/bundle/TestBundleServerPluginService.java
+++
b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/bundle/TestBundleServerPluginService.java
@@ -39,18 +39,15 @@ import org.rhq.enterprise.server.plugin.pc.ServerPluginEnvironment;
import org.rhq.enterprise.server.plugin.pc.ServerPluginManager;
import org.rhq.enterprise.server.plugin.pc.ServerPluginService;
import org.rhq.enterprise.server.plugin.pc.ServerPluginType;
-import org.rhq.enterprise.server.plugin.pc.generic.GenericServerPluginContainer;
-import org.rhq.enterprise.server.plugin.pc.generic.TestGenericServerPluginServiceMBean;
+import org.rhq.enterprise.server.plugin.pc.bundle.BundleServerPluginContainer;
+import org.rhq.enterprise.server.plugin.pc.bundle.BundleServerPluginManager;
import org.rhq.enterprise.server.xmlschema.ServerPluginDescriptorMetadataParser;
import
org.rhq.enterprise.server.xmlschema.generated.serverplugin.ServerPluginDescriptorType;
/**
- * Used as a mock service for the generic server plugin container.
+ * Used as a mock service for the bundle server plugin container.
*/
-public class TestBundleServerPluginService extends ServerPluginService implements
TestGenericServerPluginServiceMBean {
- public enum State {
- INITIALIZED, STARTED, STOPPED, UNINITIALIZED
- }
+public class TestBundleServerPluginService extends ServerPluginService implements
TestBundleServerPluginServiceMBean {
// public so tests can directly set these
public TestMasterServerPluginContainer master;
@@ -105,9 +102,7 @@ public class TestBundleServerPluginService extends ServerPluginService
implement
}
}
- public class TestBundleServerPluginContainer extends GenericServerPluginContainer {
- public State state = State.UNINITIALIZED;
-
+ public class TestBundleServerPluginContainer extends BundleServerPluginContainer {
public TestBundleServerPluginContainer(MasterServerPluginContainer master) {
super(master);
}
@@ -117,56 +112,12 @@ public class TestBundleServerPluginService extends
ServerPluginService implement
TestBundlePluginManager pm = new TestBundlePluginManager(this);
return pm;
}
-
- @Override
- public synchronized void initialize() throws Exception {
- if (state == State.UNINITIALIZED) {
- state = State.INITIALIZED;
- } else {
- System.out.println("!!! PC LIFECYCLE WAS BAD - THIS IS A BUG
!!!");
- throw new IllegalStateException("not uninitialized: " +
state);
- }
- super.initialize();
- }
-
- @Override
- public synchronized void start() {
- if (state == State.INITIALIZED) {
- state = State.STARTED;
- } else {
- System.out.println("!!! PC LIFECYCLE WAS BAD - THIS IS A BUG
!!!");
- throw new IllegalStateException("not initialized: " + state);
- }
- super.start();
- }
-
- @Override
- public synchronized void stop() {
- if (state == State.STARTED) {
- state = State.STOPPED;
- } else {
- System.out.println("!!! PC LIFECYCLE WAS BAD - THIS IS A BUG
!!!");
- throw new IllegalStateException("not started: " + state);
- }
- super.stop();
- }
-
- @Override
- public synchronized void shutdown() {
- if (state == State.STOPPED) {
- state = State.UNINITIALIZED;
- } else {
- System.out.println("!!! PC LIFECYCLE WAS BAD - THIS IS A BUG
!!!");
- throw new IllegalStateException("not stopped: " + state);
- }
- super.shutdown();
- }
}
/**
* The test plugin manager.
*/
- class TestBundlePluginManager extends ServerPluginManager {
+ class TestBundlePluginManager extends BundleServerPluginManager {
public final Map<String, ServerPluginComponent> components;
public TestBundlePluginManager(TestBundleServerPluginContainer pc) {
diff --git
a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/bundle/TestBundleServerPluginServiceMBean.java
b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/bundle/TestBundleServerPluginServiceMBean.java
new file mode 100644
index 0000000..80b2d7f
--- /dev/null
+++
b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/bundle/TestBundleServerPluginServiceMBean.java
@@ -0,0 +1,24 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2008 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+package org.rhq.enterprise.server.bundle;
+
+import org.rhq.enterprise.server.plugin.pc.ServerPluginServiceManagement;
+
+public interface TestBundleServerPluginServiceMBean extends ServerPluginServiceManagement
{
+}
\ No newline at end of file
Show replies by date