[rhq] Branch 'perftest' - 2 commits - modules/enterprise

[Heiko W. Rupp]

modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/measurement/test/AvailabilityManagerTest.java |   81 +++++++++-
 1 file changed, 73 insertions(+), 8 deletions(-)

New commits:
commit 988b64b3c57d2e493c088cd6f9b6de492b4b4e18
Merge: fd6e467... 0fa40ba...
Author: Heiko W. Rupp 
Date:   Mon Sep 20 12:36:10 2010 +0200

Merge branch 'perftest' of ssh://git.fedorahosted.org/git/rhq/rhq into perftest

commit fd6e4675561cbe9a5b1718c40f9ee654edd716fe
Author: Heiko W. Rupp 
Date:   Mon Sep 20 12:11:27 2010 +0200

Enable back some tests.

diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/measurement/test/AvailabilityManagerTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/measurement/test/AvailabilityManagerTest.java
index 288cf69..00193d5 100644
--- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/measurement/test/AvailabilityManagerTest.java
+++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/measurement/test/AvailabilityManagerTest.java
@@ -68,6 +68,7 @@ public class AvailabilityManagerTest extends AbstractEJB3Test {
     private Agent theAgent;
     private Resource theResource;
     private ResourceType theResourceType;
+    private List<Resource> additionalResources;
     private Availability availability1;
     private Availability availability2;
     private Availability availability3;
@@ -81,6 +82,7 @@ public class AvailabilityManagerTest extends AbstractEJB3Test {
             this.resourceAvailabilityManager = LookupUtil.getResourceAvailabilityManager();
             this.resourceManager = LookupUtil.getResourceManager();
             this.overlord = LookupUtil.getSubjectManager().getOverlord();
+            additionalResources = new ArrayList<Resource>();
         } catch (Throwable t) {
             // Catch RuntimeExceptions and Errors and dump their stack trace, because Surefire will completely swallow them
             // and throw a cryptic NPE (see http://jira.codehaus.org/browse/SUREFIRE-157)!
@@ -100,6 +102,19 @@ public class AvailabilityManagerTest extends AbstractEJB3Test {
                 theResource = null;
             }

+            if (additionalResources!=null) {
+                getTransactionManager().begin();
+                EntityManager em = getEntityManager();
+
+                for (Resource res : additionalResources) {
+                    Resource res2 = em.find(Resource.class, res.getId());
+                    resourceManager.uninventoryResource(overlord, res2.getId());
+                    resourceManager.uninventoryResourceAsyncWork(overlord, res2.getId());
+
+                }
+                getTransactionManager().commit();
+            }
+
             if (theResourceType != null) {
                 getTransactionManager().begin();
                 EntityManager em = getEntityManager();
@@ -121,6 +136,55 @@ public class AvailabilityManagerTest extends AbstractEJB3Test {

@SuppressWarnings("unchecked")
     @Test(enabled = true)
+    public void testInsertPastAvailabilities() throws Exception {
+        Date now = new Date();
+        Date middle = new Date(now.getTime() - 30000); // 30s ago
+        Date then = new Date(now.getTime() - 60000); // 60s ago
+
+        EntityManager em = beginTx();
+
+        try {
+            setupResource(em);
+            commitAndClose(em);
+
+            Availability aThen = new Availability(theResource, then, AvailabilityType.UP);
+            aThen.setEndTime(middle);
+
+            Availability aMiddle = new Availability(theResource, middle, AvailabilityType.DOWN);
+            aMiddle.setEndTime(now);
+
+            Availability aNow = new Availability(theResource, now, AvailabilityType.UP);
+
+            /*
+             * Simulate a report (aMiddle) that came in late (e.g. because of sorting
+             * issues on the agent or because of a network blip anyway. Expectation is
+             * that it gets just inserted in the middle.
+             */
+            persistAvailability(aThen);
+            persistAvailability(aNow);
+            persistAvailability(aMiddle);
+
+            em = beginTx();
+            Query q = em.createNamedQuery(Availability.FIND_BY_RESOURCE);
+            q.setParameter("resourceId", theResource.getId());
+            List<Availability> avails = q.getResultList();
+
+            assert avails.size()==2 : "Did not get 2 availabilities but " + avails.size(); // TODO Wrong assumption ?
+
+        } catch (Exception e) {
+            e.printStackTrace();
+            throw e;
+        } finally {
+            if (em != null) {
+                getTransactionManager().rollback();
+                em.close();
+            }
+        }
+    }
+
+
+    @SuppressWarnings("unchecked")
+    @Test(enabled = true)
     public void testPurgeAvailabilities() throws Exception {
         Date now = new Date();
         Date middle = new Date(now.getTime() - 30000); // 30s ago
@@ -186,7 +250,7 @@ public class AvailabilityManagerTest extends AbstractEJB3Test {
         }
     }

-    @Test(enabled = ENABLE_TESTS)
+    @Test(enabled = true)
     public void testGetAvailabilities() throws Exception {
         EntityManager em = beginTx();

@@ -321,7 +385,7 @@ public class AvailabilityManagerTest extends AbstractEJB3Test {
         }
     }

-    @Test(enabled = ENABLE_TESTS)
+    @Test(enabled = true)
     public void testSetAllAgentResourceAvailabilities() throws Exception {
         EntityManager em = beginTx();

@@ -352,7 +416,7 @@ public class AvailabilityManagerTest extends AbstractEJB3Test {
         }
     }

-    @Test(enabled = ENABLE_TESTS)
+    @Test(enabled = true)
     public void testAgentBackfillNewResource() throws Exception {
         EntityManager em = beginTx();

@@ -572,7 +636,7 @@ public class AvailabilityManagerTest extends AbstractEJB3Test {
         }
     }

-    @Test(enabled = ENABLE_TESTS)
+    @Test(enabled = true)
     public void testAgentOldReport() throws Exception {
         EntityManager em = beginTx();

@@ -660,7 +724,7 @@ public class AvailabilityManagerTest extends AbstractEJB3Test {
         }
     }

-    @Test(enabled = ENABLE_TESTS)
+    @Test(enabled = true)
     public void testAgentOldReport2() throws Exception {
         EntityManager em = beginTx();

@@ -720,7 +784,7 @@ public class AvailabilityManagerTest extends AbstractEJB3Test {
         }
     }

-    @Test(enabled = ENABLE_TESTS)
+    @Test(enabled = true)
     public void testGetAvailabilities2() throws Exception {
         EntityManager em = beginTx();

@@ -808,7 +872,7 @@ public class AvailabilityManagerTest extends AbstractEJB3Test {
      *
      * @throws Exception in case of error
      */
-    @Test(enabled = ENABLE_TESTS)
+    @Test(enabled = true)
     public void testMergeReport() throws Exception {
         EntityManager em = beginTx();

@@ -880,7 +944,7 @@ public class AvailabilityManagerTest extends AbstractEJB3Test {
         }
     }

-    @Test(enabled = ENABLE_TESTS)
+    @Test(enabled = true)
     public void testMergeReportPerformance() throws Exception {
         EntityManager em = beginTx();
         List<Resource> allResources = new ArrayList<Resource>();
@@ -1085,6 +1149,7 @@ public class AvailabilityManagerTest extends AbstractEJB3Test {
         newResource.setAgent(theAgent);
         parentResource.addChildResource(newResource);
         em.persist(newResource);
+        additionalResources.add(newResource);

return newResource;
     }