svn commit: r1542301 - in /incubator/sirona/trunk/agent: performance/jpa/src/test/java/org/apache/sirona/jpa/QueryTest.java store/cube/src/test/java/org/apache/sirona/cube/CubeDataStoreTest.java

[rm...@apache.org]

Author: rmannibucau
Date: Fri Nov 15 15:50:51 2013
New Revision: 1542301

URL: http://svn.apache.org/r1542301
Log:
making few test less dependent of the jvm

Modified:
    incubator/sirona/trunk/agent/performance/jpa/src/test/java/org/apache/sirona/jpa/QueryTest.java
    incubator/sirona/trunk/agent/store/cube/src/test/java/org/apache/sirona/cube/CubeDataStoreTest.java

Modified: incubator/sirona/trunk/agent/performance/jpa/src/test/java/org/apache/sirona/jpa/QueryTest.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/agent/performance/jpa/src/test/java/org/apache/sirona/jpa/QueryTest.java?rev=1542301&r1=1542300&r2=1542301&view=diff
==============================================================================
--- incubator/sirona/trunk/agent/performance/jpa/src/test/java/org/apache/sirona/jpa/QueryTest.java (original)
+++ incubator/sirona/trunk/agent/performance/jpa/src/test/java/org/apache/sirona/jpa/QueryTest.java Fri Nov 15 15:50:51 2013
@@ -27,6 +27,7 @@ import javax.persistence.EntityManager;
 import javax.persistence.EntityManagerFactory;
 import javax.persistence.EntityTransaction;
 import javax.persistence.Persistence;
+import javax.persistence.TypedQuery;
 
 import static org.hamcrest.CoreMatchers.containsString;
 import static org.junit.Assert.assertEquals;
@@ -98,8 +99,9 @@ public class QueryTest {
                 final EntityManager em = emf.createEntityManager();
                 try {
                     reset();
-                    em.createNamedQuery("Person.findByName", Person.class).setParameter("name", "sirona").getSingleResult();
+                    final TypedQuery<Person> namedQuery = em.createNamedQuery("Person.findByName", Person.class);
                     assertCounter("createNamedQuery");
+                    namedQuery.setParameter("name", "sirona").getSingleResult();
                 } finally {
                     em.close();
                 }

Modified: incubator/sirona/trunk/agent/store/cube/src/test/java/org/apache/sirona/cube/CubeDataStoreTest.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/agent/store/cube/src/test/java/org/apache/sirona/cube/CubeDataStoreTest.java?rev=1542301&r1=1542300&r2=1542301&view=diff
==============================================================================
--- incubator/sirona/trunk/agent/store/cube/src/test/java/org/apache/sirona/cube/CubeDataStoreTest.java (original)
+++ incubator/sirona/trunk/agent/store/cube/src/test/java/org/apache/sirona/cube/CubeDataStoreTest.java Fri Nov 15 15:50:51 2013
@@ -65,23 +65,30 @@ public class CubeDataStoreTest {
             Thread.sleep(1500);
         }
 
+        final String host = InetAddress.getLocalHost().getHostName();
+
         final Collection<String> messages = server.getMessages();
-        final Collection<String> gauges = new ArrayList<String>(4);
+        final Collection<Double> gauges = new ArrayList<Double>(4);
         int counters = 0;
         String aCounterMessage = null;
         for (final String m : messages) {
             if (m.contains("\"type\": \"gauge\"")) {
-                gauges.add(m.replaceAll("\"time\": \"[^\"]*\"", "\"time\": \"-\"")); // remove date to be able to test it easily
+                assertThat(m, containsString("\"role\":\"mock\""));
+                assertThat(m, containsString("\"unit\":\"u\""));
+                assertThat(m, containsString("\"marker\":\"" + host + "\""));
+
+                final String valueStr = "value\":";
+                final int start = m.indexOf(valueStr) + valueStr.length();
+                gauges.add(Double.parseDouble(m.substring(start, Math.max(m.indexOf('"', start + 1), m.indexOf('}', start + 1)))));
             } else if (m.contains("\"type\": \"counter\"")) {
                 counters++;
                 aCounterMessage = m;
             }
         }
 
-        final String host = InetAddress.getLocalHost().getHostName();
-        assertTrue(gauges.contains("[{\"type\": \"gauge\",\"time\": \"-\",\"data\": {\"unit\":\"u\",\"marker\":\"" + host + "\",\"value\":0.0,\"role\":\"mock\"}}]"));
-        assertTrue(gauges.contains("[{\"type\": \"gauge\",\"time\": \"-\",\"data\": {\"unit\":\"u\",\"marker\":\"" + host + "\",\"value\":1.0,\"role\":\"mock\"}}]"));
-        assertTrue(gauges.contains("[{\"type\": \"gauge\",\"time\": \"-\",\"data\": {\"unit\":\"u\",\"marker\":\"" + host + "\",\"value\":2.0,\"role\":\"mock\"}}]"));
+        assertTrue(gauges.contains(0.));
+        assertTrue(gauges.contains(1.));
+        assertTrue(gauges.contains(2.));
 
         assertTrue(counters >= 3);
         assertNotNull(aCounterMessage);