modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest.java | 18 ++++++++++ 1 file changed, 18 insertions(+)
New commits: commit d2b2b371c0d840958bf1c8e726950f801fb5b66c Author: Simeon Pinder spinder@fulliautomatix.conchfritter.com Date: Thu Jan 31 14:06:50 2013 -0500
[BZ 905632] This is a unit test only fix to defend against regressions here. Failure was undetected before.
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest.java index 7392758..a7f8289 100644 --- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest.java +++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest.java @@ -396,6 +396,24 @@ public class ResourceMetadataManagerBeanTest extends MetadataBeanTest { addResourcesToGroup(rgFlat, resourcesServiceE4);
createPlugin("remove-types-plugin", "2.0", "remove_types_v2.xml"); + + //Removal of this resource type exceeds default criteria page size. + ResourceTypeManagerLocal resourceTypeMgr = LookupUtil.getResourceTypeManager(); + SubjectManagerLocal subjectMgr = LookupUtil.getSubjectManager(); + ResourceTypeCriteria criteria = new ResourceTypeCriteria(); + criteria.addFilterName("ServiceE4"); + criteria.addFilterPluginName("RemoveTypesPlugin"); + List<ResourceType> resourceTypes = resourceTypeMgr.findResourceTypesByCriteria(subjectMgr.getOverlord(), + criteria); + if ((resourceTypes != null) && (resourceTypes.size() > 0)) { + //spinder 1-31-13: sleep for 30s to see if type removal has then completed + //it's possible this could fail on smaller boxes. Not sure how to test this otherwise as + //after fix to break resource deletion into chunks[BZ 905632] this should work. + Thread.sleep(1000 * 30); + resourceTypes = resourceTypeMgr.findResourceTypesByCriteria(subjectMgr.getOverlord(), criteria); + assertEquals("Resource type '" + resourceTypes.get(0).getName() + "' not fully removed", 0, + resourceTypes.size()); + } }
@Test(dependsOnMethods = { "upgradePluginWithTypesRemoved" }, groups = { "plugin.resource.metadata.test",
rhq-commits@lists.fedorahosted.org