Merge pull request #159 from lucasponce/automate-clustering-tests

Preliminar cleanup tasks
hawkular · Feb 3, 2016 · 03a31a0 · 03a31a0
2 parents 17effd6 + b94306d
commit 03a31a0
Show file tree

Hide file tree

Showing 23 changed files with 372 additions and 723 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -10,6 +10,7 @@ notifications:
 install:
 - mvn -version -B
 script:
+- mvn -s .travis.maven.settings.xml verify -Denv=perf
 - mvn -s .travis.maven.settings.xml verify -Pitest
 env:
   global:

diff --git a/hawkular-alerts-engine/pom.xml b/hawkular-alerts-engine/pom.xml
@@ -112,6 +112,13 @@
       <scope>provided</scope>
     </dependency>
 
+    <dependency>
+      <groupId>org.infinispan</groupId>
+      <artifactId>infinispan-core</artifactId>
+      <scope>provided</scope>
+      <version>${version.org.infinispan.wildfly}</version>
+    </dependency>
+
     <!-- Tests -->
     <dependency>
       <groupId>junit</groupId>
@@ -132,6 +139,13 @@
       <scope>test</scope>
     </dependency>
 
+    <dependency>
+      <groupId>org.hawkular.commons</groupId>
+      <artifactId>hawkular-commons-embedded-cassandra-service</artifactId>
+      <version>${version.org.hawkular.commons}</version>
+      <scope>test</scope>
+    </dependency>
+
     <dependency>
       <groupId>org.yaml</groupId>
       <artifactId>snakeyaml</artifactId>
@@ -188,24 +202,6 @@
 
   <profiles>
 
-    <!-- Profiles to compile with specific clustering libraries -->
-    <profile>
-      <id>clustering-wildfly</id>
-      <activation>
-        <property>
-          <name>!env</name>
-        </property>
-      </activation>
-      <dependencies>
-        <dependency>
-          <groupId>org.infinispan</groupId>
-          <artifactId>infinispan-core</artifactId>
-          <scope>provided</scope>
-          <version>${version.org.infinispan.wildfly}</version>
-        </dependency>
-      </dependencies>
-    </profile>
-
     <!-- Profiles to control test scenarios -->
     <profile>
       <id>default-tests</id>
@@ -244,14 +240,6 @@
           <value>perf</value>
         </property>
       </activation>
-      <dependencies>
-        <dependency>
-          <groupId>org.infinispan</groupId>
-          <artifactId>infinispan-core</artifactId>
-          <scope>provided</scope>
-          <version>${version.org.infinispan.wildfly}</version>
-        </dependency>
-      </dependencies>
       <build>
         <plugins>
           <plugin>

diff --git a/hawkular-alerts-engine/src/test/java/org/hawkular/alerts/engine/CassPersistenceTest.java b/hawkular-alerts-engine/src/test/java/org/hawkular/alerts/engine/CassPersistenceTest.java
@@ -16,11 +16,14 @@
  */
 package org.hawkular.alerts.engine;
 
+import static org.hawkular.commons.cassandra.EmbeddedConstants.EMBEDDED_CASSANDRA_OPTION;
+import static org.hawkular.commons.cassandra.EmbeddedConstants.HAWKULAR_BACKEND_PROPERTY;
+
 import org.hawkular.alerts.api.services.ActionsCriteria;
 import org.hawkular.alerts.api.services.AlertsCriteria;
 import org.hawkular.alerts.api.services.EventsCriteria;
-import org.hawkular.alerts.engine.cassandra.EmbeddedCassandra;
 import org.hawkular.alerts.engine.impl.CassCluster;
+import org.hawkular.commons.cassandra.EmbeddedCassandra;
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
@@ -38,9 +41,8 @@
 public class CassPersistenceTest extends PersistenceTest {
 
     private static final String JBOSS_DATA_DIR = "jboss.server.data.dir";
-    private static final String EXTERNAL_CASSANDRA = "external_cassandra";
 
-    static boolean externalCassandra;
+    static EmbeddedCassandra embeddedCassandra;
     static String keyspace;
 
     @BeforeClass
@@ -49,15 +51,16 @@ public static void initSessionAndResetTestSchema() throws Exception {
         String testFolder = CassPersistenceTest.class.getResource("/").getPath();
         System.setProperty(JBOSS_DATA_DIR, testFolder);
 
-        externalCassandra = (null != System.getProperty(EXTERNAL_CASSANDRA));
-
-        if (!externalCassandra) {
-            System.out.print("Starting embedded Cassandra for unit testing...");
-            EmbeddedCassandra.start();
-        } else {
-            System.out.print("Using External Cassandra for unit testing...");
+        /*
+            If not property defined, we initialized the embedded Cassandra
+         */
+        if (System.getProperty(HAWKULAR_BACKEND_PROPERTY) == null) {
+            System.setProperty(HAWKULAR_BACKEND_PROPERTY, EMBEDDED_CASSANDRA_OPTION);
         }
 
+        embeddedCassandra = new EmbeddedCassandra();
+        embeddedCassandra.start();
+
         keyspace = "hawkular_alerts_test";
         System.setProperty("hawkular-alerts.cassandra-keyspace", keyspace);
 
@@ -75,10 +78,8 @@ public static void cleanTestSchema() throws Exception {
         try {
             Session session = CassCluster.getSession();
             session.execute("DROP KEYSPACE " + keyspace);
-            if (!externalCassandra) {
-                System.out.print("Stopping embedded Cassandra for unit testing...");
-                CassCluster.shutdown();
-                EmbeddedCassandra.stop();
+            if (embeddedCassandra != null) {
+                embeddedCassandra.stop();
             }
         } catch (Throwable t) {
             // never mind, don't prevent further cleanup

diff --git a/hawkular-alerts-engine/src/test/java/org/hawkular/alerts/engine/PaginationTest.java b/hawkular-alerts-engine/src/test/java/org/hawkular/alerts/engine/PaginationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates
+ * Copyright 2015-2016 Red Hat, Inc. and/or its affiliates
  * and other contributors as indicated by the @author tags.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,12 +17,16 @@
 package org.hawkular.alerts.engine;
 
 import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * @author Lucas Ponce
  */
 public class PaginationTest {
 
+    private static final Logger logger = LoggerFactory.getLogger(PaginationTest.class);
+
     @Test
     public void cassandraSmallTests() {
 
@@ -42,31 +46,31 @@ PRIMARY KEY (partition, cluster_01, cluster_02, cluster_03)
         /*
             Populate data
          */
-        System.out.println("insert into paging_table (partition, cluster_01, cluster_02, cluster_03, " +
+        logger.info("insert into paging_table (partition, cluster_01, cluster_02, cluster_03, " +
                 "non_primary_key) " +
                 "values ('A01', 'B01', 'C01', 'D01', '01'); ");
 
-        System.out.println("insert into paging_table (partition, cluster_01, cluster_02, cluster_03, " +
+        logger.info("insert into paging_table (partition, cluster_01, cluster_02, cluster_03, " +
                 "non_primary_key) " +
                 "values ('A01', 'B01', 'C01', 'D02', '02'); ");
 
-        System.out.println("insert into paging_table (partition, cluster_01, cluster_02, cluster_03, " +
+        logger.info("insert into paging_table (partition, cluster_01, cluster_02, cluster_03, " +
                 "non_primary_key) " +
                 "values ('A01', 'B01', 'C02', 'D03', '03'); ");
 
-        System.out.println("insert into paging_table (partition, cluster_01, cluster_02, cluster_03, " +
+        logger.info("insert into paging_table (partition, cluster_01, cluster_02, cluster_03, " +
                 "non_primary_key) " +
                 "values ('A01', 'B01', 'C02', 'D04', '04'); ");
 
-        System.out.println("insert into paging_table (partition, cluster_01, cluster_02, cluster_03, " +
+        logger.info("insert into paging_table (partition, cluster_01, cluster_02, cluster_03, " +
                 "non_primary_key) " +
                 "values ('A01', 'B02', 'C03', 'D05', '05'); ");
 
-        System.out.println("insert into paging_table (partition, cluster_01, cluster_02, cluster_03, " +
+        logger.info("insert into paging_table (partition, cluster_01, cluster_02, cluster_03, " +
                 "non_primary_key) " +
                 "values ('A01', 'B02', 'C03', 'D06', '06'); ");
 
-        System.out.println("insert into paging_table (partition, cluster_01, cluster_02, cluster_03, " +
+        logger.info("insert into paging_table (partition, cluster_01, cluster_02, cluster_03, " +
                 "non_primary_key) " +
                 "values ('A02', 'B03', 'C04', 'D07', '07'); ");