[rhq] 2 commits - modules/enterprise

Jay Shaughnessy jshaughn at fedoraproject.org
Mon Aug 20 15:47:10 UTC 2012


 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/group/test/LargeGroupCriteriaTest.java |   55 +++
 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/test/ResourceManagerBeanTest.java      |  139 ++++------
 2 files changed, 118 insertions(+), 76 deletions(-)

New commits:
commit 8732f82745b97897372ce0d00a9b3ac0773fedea
Author: Jay Shaughnessy <jshaughn at redhat.com>
Date:   Mon Aug 20 11:46:10 2012 -0400

    Add unit test for new ResourceManager.findResourcesByCriteriaBounded().

diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/group/test/LargeGroupCriteriaTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/group/test/LargeGroupCriteriaTest.java
index 93bb887..323cf5c 100644
--- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/group/test/LargeGroupCriteriaTest.java
+++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/group/test/LargeGroupCriteriaTest.java
@@ -21,17 +21,21 @@ package org.rhq.enterprise.server.resource.group.test;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Iterator;
+import java.util.List;
 
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.Test;
 
 import org.rhq.core.domain.authz.Permission;
+import org.rhq.core.domain.criteria.ResourceCriteria;
 import org.rhq.core.domain.criteria.ResourceGroupCriteria;
 import org.rhq.core.domain.resource.InventoryStatus;
 import org.rhq.core.domain.resource.Resource;
 import org.rhq.core.domain.resource.group.composite.ResourceGroupComposite;
+import org.rhq.core.domain.util.PageControl;
 import org.rhq.core.domain.util.PageList;
 import org.rhq.enterprise.server.authz.AuthorizationManagerLocal;
+import org.rhq.enterprise.server.resource.ResourceManagerLocal;
 import org.rhq.enterprise.server.resource.group.ResourceGroupManagerLocal;
 import org.rhq.enterprise.server.test.LargeGroupTestBase;
 import org.rhq.enterprise.server.test.TestServerCommunicationsService;
@@ -189,6 +193,57 @@ public class LargeGroupCriteriaTest extends LargeGroupTestBase {
         testGroupQueries(gacs);
     }
 
+    // test findResourcesByCriteriaBounded here instead of ResourceGroupManagerBeanTest because we want
+    // to work with a decent # or resources.
+    @Test(enabled = TEST_ENABLED)
+    public void testResourceCriteriaBounded() throws Exception {
+        ArrayList<GroupAvailCounts> gacs = new ArrayList<LargeGroupCriteriaTest.GroupAvailCounts>();
+        gacs.add(new GroupAvailCounts(1100, 0, 0, 0)); // purposefully over 1,000, avails don't really matter
+
+        ResourceManagerLocal resourceManager = LookupUtil.getResourceManager();
+        AuthorizationManagerLocal authManager = LookupUtil.getAuthorizationManager();
+
+        env = new ArrayList<LargeGroupEnvironment>(gacs.size());
+
+        LargeGroupEnvironment lgeWithTypes = null;
+        for (GroupAvailCounts gac : gacs) {
+            env.add(createLargeGroupWithNormalUserRoleAccessWithInventoryStatus(lgeWithTypes, gac.total, gac.down,
+                gac.unknown, gac.disabled, gac.uncommitted, Permission.CONFIGURE_READ));
+            lgeWithTypes = env.get(0);
+        }
+
+        ResourceCriteria criteria = new ResourceCriteria();
+        List<Resource> result;
+
+        SessionTestHelper.simulateLogin(env.get(0).normalSubject);
+
+        criteria.addFilterParentResourceId(lgeWithTypes.platformResource.getId());
+        criteria.setPageControl(PageControl.getUnlimitedInstance());
+        result = resourceManager.findResourcesByCriteria(env.get(0).normalSubject, criteria);
+        assert null != result;
+        assert result.size() == 1100 : "Expected unbounded query to return all 1100 resources";
+
+        result = resourceManager.findResourcesByCriteriaBounded(env.get(0).normalSubject, criteria, 2000, 100);
+        assert null != result;
+        assert result.size() == 1100 : "Expected 2000/100 bounded query to return all 1100 resources";
+
+        result = resourceManager.findResourcesByCriteriaBounded(env.get(0).normalSubject, criteria, 1100, 100);
+        assert null != result;
+        assert result.size() == 1100 : "Expected 1100/100 bounded query to return all 1100 resources";
+
+        result = resourceManager.findResourcesByCriteriaBounded(env.get(0).normalSubject, criteria, 0, 0);
+        assert null != result;
+        assert result.size() == 200 : "Expected default (1000/200) bounded query to return 200 resources";
+
+        result = resourceManager.findResourcesByCriteriaBounded(env.get(0).normalSubject, criteria, 0, 500);
+        assert null != result;
+        assert result.size() == 500 : "Expected default (1000)/500) bounded query to return 500 resources";
+
+        result = resourceManager.findResourcesByCriteriaBounded(env.get(0).normalSubject, criteria, 100, 200);
+        assert null != result;
+        assert result.size() == 100 : "Expected 100/200 bounded query to return 100 resources";
+    }
+
     private PageList<ResourceGroupComposite> testGroupQueriesWithSearchBar(GroupAvailCounts gac, String searchExpression)
         throws Exception {
         ResourceGroupManagerLocal groupManager = LookupUtil.getResourceGroupManager();


commit 8cd529eb7b04e785ded5c7a3fb6e633e6bc90cc4
Author: Jay Shaughnessy <jshaughn at redhat.com>
Date:   Mon Aug 20 10:25:47 2012 -0400

    Reformat only!

diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/test/ResourceManagerBeanTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/test/ResourceManagerBeanTest.java
index f0fe5b7..deac357 100644
--- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/test/ResourceManagerBeanTest.java
+++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/test/ResourceManagerBeanTest.java
@@ -113,102 +113,89 @@ public class ResourceManagerBeanTest extends UpdatePluginMetadataTestBase {
         assert errors.size() == 0;
     }
 
-
     public void testResourceLineage() throws Exception {
-       // given a resource id for the leaf resource in a resource hierarchy
-       int leafResourceId = givenASampleResourceHierarchy();
+        // given a resource id for the leaf resource in a resource hierarchy
+        int leafResourceId = givenASampleResourceHierarchy();
 
-    	// when
-    	List<Resource> resourceLineage = resourceManager.getResourceLineage(leafResourceId);
+        // when
+        List<Resource> resourceLineage = resourceManager.getResourceLineage(leafResourceId);
 
         assertEquals(resourceLineage.size(), 4);
-        
-    	// then
-    	StringBuilder stringBuilder = new StringBuilder();
-    	for (Resource resource : resourceLineage) {
-			stringBuilder.append(resource.getName());
-			if (resourceLineage.indexOf(resource) != resourceLineage.size() - 1) {
-				stringBuilder.append("::");
-			}
-		}
-    	System.err.println(stringBuilder.toString());
+
+        // then
+        StringBuilder stringBuilder = new StringBuilder();
+        for (Resource resource : resourceLineage) {
+            stringBuilder.append(resource.getName());
+            if (resourceLineage.indexOf(resource) != resourceLineage.size() - 1) {
+                stringBuilder.append("::");
+            }
+        }
+        System.err.println(stringBuilder.toString());
 
         // cleanup the DB
-        for (int i = resourceLineage.size() - 1; i >=0; i--) {
+        for (int i = resourceLineage.size() - 1; i >= 0; i--) {
             deleteNewResourceAgentResourceType(resourceLineage.get(i));
         }
     }
 
-	private int givenASampleResourceHierarchy() throws NotSupportedException,
-			SystemException {
-		getTransactionManager().begin();
-    	EntityManager em = getEntityManager();
-    	int leafResourceId = 0;
-    	try {
-			ResourceType platformType = createResourceType(em, "platform"
-					+ System.currentTimeMillis(), "test", null,
-					ResourceCategory.PLATFORM);
-			ResourceType appserverType = createResourceType(em, "jboss AS 5"
-					+ System.currentTimeMillis(), "jbossas5", platformType,
-					ResourceCategory.SERVER);
-			ResourceType jvmType = createResourceType(em,
-					"JVM" + System.currentTimeMillis(), "jbossas5",
-					appserverType, ResourceCategory.SERVICE);
-			ResourceType memType = createResourceType(em, "Memory Subsystem"
-					+ System.currentTimeMillis(), "jbossas5", jvmType,
-					ResourceCategory.SERVICE);
-			Agent agent = new Agent("agent" + System.currentTimeMillis(), "host" + System.currentTimeMillis(), 1, "",
+    private int givenASampleResourceHierarchy() throws NotSupportedException, SystemException {
+        getTransactionManager().begin();
+        EntityManager em = getEntityManager();
+        int leafResourceId = 0;
+        try {
+            ResourceType platformType = createResourceType(em, "platform" + System.currentTimeMillis(), "test", null,
+                ResourceCategory.PLATFORM);
+            ResourceType appserverType = createResourceType(em, "jboss AS 5" + System.currentTimeMillis(), "jbossas5",
+                platformType, ResourceCategory.SERVER);
+            ResourceType jvmType = createResourceType(em, "JVM" + System.currentTimeMillis(), "jbossas5",
+                appserverType, ResourceCategory.SERVICE);
+            ResourceType memType = createResourceType(em, "Memory Subsystem" + System.currentTimeMillis(), "jbossas5",
+                jvmType, ResourceCategory.SERVICE);
+            Agent agent = new Agent("agent" + System.currentTimeMillis(), "host" + System.currentTimeMillis(), 1, "",
                 "token" + System.currentTimeMillis());
-			em.persist(agent);
-			em.flush();
-
-			Resource platform = createResource(em, platformType, agent,
-					"platformKey" + System.currentTimeMillis(),
-					"host.dev.corp", null);
-			Resource appserver = createResource(em, appserverType, agent,
-					"JEAP" + System.currentTimeMillis(), "JBOSS EAP 5.1.1",
-					platform);
-			Resource jvm = createResource(em, jvmType, agent, "jvm"
-					+ System.currentTimeMillis(), "JBoss AS JVM", appserver);
-			Resource memSubystem = createResource(em, memType, agent,
-					"mem" + System.currentTimeMillis(), "Memory Subsystem", jvm);
-			leafResourceId = memSubystem.getId();
-
-			getTransactionManager().commit();
-		} catch (Exception e) {
-			try {
+            em.persist(agent);
+            em.flush();
+
+            Resource platform = createResource(em, platformType, agent, "platformKey" + System.currentTimeMillis(),
+                "host.dev.corp", null);
+            Resource appserver = createResource(em, appserverType, agent, "JEAP" + System.currentTimeMillis(),
+                "JBOSS EAP 5.1.1", platform);
+            Resource jvm = createResource(em, jvmType, agent, "jvm" + System.currentTimeMillis(), "JBoss AS JVM",
+                appserver);
+            Resource memSubystem = createResource(em, memType, agent, "mem" + System.currentTimeMillis(),
+                "Memory Subsystem", jvm);
+            leafResourceId = memSubystem.getId();
+
+            getTransactionManager().commit();
+        } catch (Exception e) {
+            try {
                 System.out.println("CANNOT Prepare TEST: Cause: " + e);
                 getTransactionManager().rollback();
             } catch (Exception ignore) {
             }
-		} finally {
-			em.close();
-		}
-		return leafResourceId;
-	}
-
-	private Resource createResource(EntityManager em, ResourceType platformType,
-			Agent agent, String resourceKey, String resourceName,
-			Resource parent) {
-		Resource resource = new Resource(resourceKey, resourceName, platformType);
+        } finally {
+            em.close();
+        }
+        return leafResourceId;
+    }
+
+    private Resource createResource(EntityManager em, ResourceType platformType, Agent agent, String resourceKey,
+        String resourceName, Resource parent) {
+        Resource resource = new Resource(resourceKey, resourceName, platformType);
         resource.setUuid(UUID.randomUUID().toString());
         resource.setAgent(agent);
         resource.setParentResource(parent);
         em.persist(resource);
         return resource;
-	}
-
-
-	private ResourceType createResourceType(EntityManager em, String name,
-			String pluginName, ResourceType parentResourceType,
-			ResourceCategory resourceCategory) {
-		ResourceType platformType = new ResourceType(name, pluginName,
-    			resourceCategory, parentResourceType);
-    	ResourceType resourceType = platformType;
-    	em.persist(resourceType);
-		return resourceType;
-	}
+    }
 
+    private ResourceType createResourceType(EntityManager em, String name, String pluginName,
+        ResourceType parentResourceType, ResourceCategory resourceCategory) {
+        ResourceType platformType = new ResourceType(name, pluginName, resourceCategory, parentResourceType);
+        ResourceType resourceType = platformType;
+        em.persist(resourceType);
+        return resourceType;
+    }
 
     private Resource createNewResourceWithNewType() throws Exception {
         getTransactionManager().begin();
@@ -257,7 +244,7 @@ public class ResourceManagerBeanTest extends UpdatePluginMetadataTestBase {
                     resourceManager.uninventoryResourceAsyncWork(superuser, deletedResourceId);
                 }
                 em.flush();
-                
+
                 ResourceType type = em.find(ResourceType.class, resource.getResourceType().getId());
                 System.out.println("Removing " + type + "...");
                 em.remove(type);




More information about the rhq-commits mailing list