Improved tests

vsadokhin · Oct 1, 2018 · d58246d · d58246d
1 parent bbf7b7e
commit d58246d
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 11 deletions.
diff --git a/data/src/test/java/me/vsadokhin/iot/data/MetricRepositoryGetStatisticsTest.java b/data/src/test/java/me/vsadokhin/iot/data/MetricRepositoryGetStatisticsTest.java
@@ -25,54 +25,55 @@
 public class MetricRepositoryGetStatisticsTest {
 
     private static final MetricRepository METRIC_REPOSITORY = new MetricRepository();
+
     private GetStatisticsRequest getStatisticsRequest;
 
     @BeforeClass
-    public static  void beforeClass() {
+    public static void beforeClass() {
         Session session = CassandraSessionUtility.getSession();
         for (MetricTable metricTable : MetricTable.values()) {
             session.execute(QueryBuilder.truncate(metricTable.getTable()));
         }
 
         List<Metric> metrics = new ArrayList<>();
         metrics.add(new MetricBuilder("sensor1","type1")
-                .setWhen(1).setValue(Float.MAX_VALUE)
+                .setWhen(1L).setValue(Float.MAX_VALUE)
                 .build());
 
         metrics.add(new MetricBuilder("sensor2","type1")
-                .setWhen(1).setValue(Float.MIN_VALUE)
+                .setWhen(1L).setValue(Float.MIN_VALUE)
                 .build());
 
         metrics.add(new MetricBuilder("sensor1","type1")
-                .setWhen(2).setValue(1F)
+                .setWhen(2L).setValue(1F)
                 .build());
 
         metrics.add(new MetricBuilder("sensor2","type1")
-                .setWhen(2).setValue(0.1F)
+                .setWhen(2L).setValue(0.1F)
                 .build());
 
         metrics.add(new MetricBuilder("sensor3","type2")
-                .setWhen(2).setValue(Float.MIN_VALUE)
+                .setWhen(2L).setValue(Float.MIN_VALUE)
                 .build());
 
         metrics.add(new MetricBuilder("sensor4","type2")
-                .setWhen(2).setValue(Float.MAX_VALUE)
+                .setWhen(2L).setValue(Float.MAX_VALUE)
                 .build());
 
         metrics.add(new MetricBuilder("sensor1","type1")
-                .setWhen(3).setValue(0.2F)
+                .setWhen(3L).setValue(0.2F)
                 .build());
 
         metrics.add(new MetricBuilder("sensor2","type1")
-                .setWhen(3).setValue(0.3F)
+                .setWhen(3L).setValue(0.3F)
                 .build());
 
         metrics.add(new MetricBuilder("sensor1","type1")
-                .setWhen(4).setValue(Float.MIN_VALUE)
+                .setWhen(4L).setValue(Float.MIN_VALUE)
                 .build());
 
         metrics.add(new MetricBuilder("sensor2","type1")
-                .setWhen(4).setValue(Float.MAX_VALUE)
+                .setWhen(4L).setValue(Float.MAX_VALUE)
                 .build());
 
         for (Metric metric : metrics) {

diff --git a/data/src/test/java/me/vsadokhin/iot/data/utility/CassandraConfigTest.java b/data/src/test/java/me/vsadokhin/iot/data/utility/CassandraConfigTest.java
@@ -7,6 +7,7 @@
 
 import com.datastax.driver.core.AuthProvider;
 import com.datastax.driver.core.PlainTextAuthProvider;
+import org.junit.AfterClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.powermock.core.classloader.annotations.PrepareForTest;
@@ -16,6 +17,13 @@
 @PrepareForTest(CassandraConfig.class)
 public class CassandraConfigTest {
 
+    @AfterClass
+    public static void afterClass() {
+        System.clearProperty("cassandra.contact.points");
+        System.clearProperty("cassandra.username");
+        System.clearProperty("cassandra.password");
+    }
+
     @Test
     public void getKeyspaceName() {
         // verify
@@ -59,6 +67,8 @@ public void getPort() {
     @Test
     public void getAuthProvider() throws Exception {
         // setup
+        System.clearProperty("cassandra.username");
+        System.clearProperty("cassandra.password");
         PlainTextAuthProvider mockPlainTextAuthProvider = mock(PlainTextAuthProvider.class);
         whenNew(PlainTextAuthProvider.class).withArguments("cassandra", "cassandra").thenReturn(mockPlainTextAuthProvider);