modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerBeanTest.java | 21 ++++------ 1 file changed, 10 insertions(+), 11 deletions(-)
New commits: commit e14b96b48e4a7faedf4dfcad1d3ebc7ad3ec0bd5 Author: Jay Shaughnessy jshaughn@redhat.com Date: Tue Dec 4 11:53:14 2012 -0500
Adding in the missing server plugin service prepare/unprepare.
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerBeanTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerBeanTest.java index a3ae638..190c3d5 100644 --- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerBeanTest.java +++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerBeanTest.java @@ -57,6 +57,7 @@ import org.rhq.core.domain.resource.Resource; import org.rhq.core.domain.resource.ResourceType; import org.rhq.core.util.jdbc.JDBCUtil; import org.rhq.enterprise.server.auth.SubjectManagerLocal; +import org.rhq.enterprise.server.drift.DriftServerPluginService; import org.rhq.enterprise.server.measurement.util.MeasurementDataManagerUtility; import org.rhq.enterprise.server.test.AbstractEJB3Test; import org.rhq.enterprise.server.test.TransactionCallback; @@ -66,16 +67,6 @@ import org.rhq.enterprise.server.test.TransactionCallback; */ public class MeasurementDataManagerBeanTest extends AbstractEJB3Test {
- // Tests in this class are failing currently do to a system initialization problem. - // MeasurementDataManagerUtility looks up config settings from SystemManagerBean. - // SystemManagerBean is however failing in its getDriftServerPluginManager method on - // the call to LookupUtil.getServerPluginService(). An InstanceNotFoundException is - // thrown, - // - // javax.management.InstanceNotFoundException: rhq:service=ServerPluginService - // - // Looks like the server plugin service is not getting deployed. - //private final Log log = LogFactory.getLog(MeasurementDataManagerBeanTest.class);
private static final boolean ENABLED = true; @@ -120,13 +111,21 @@ public class MeasurementDataManagerBeanTest extends AbstractEJB3Test { protected void beforeMethod() throws Exception { overlord = subjectManager.getOverlord();
+ // MeasurementDataManagerUtility looks up config settings from SystemManagerBean. + // SystemManagerBean.getDriftServerPluginManager method requires drift server plugin. + DriftServerPluginService driftServerPluginService = new DriftServerPluginService(); + prepareCustomServerPluginService(driftServerPluginService); + driftServerPluginService.masterConfig.getPluginDirectory().mkdirs(); + createInventory(); insertDummyReport(); }
@Override - protected void afterMethod() { + protected void afterMethod() throws Exception { purgeDB(); + + unprepareServerPluginService(); }
@Test(enabled = ENABLED)
rhq-commits@lists.fedorahosted.org