Merge pull request #10 from trivago/test-coverage

Test coverage increase
trivago · Nov 27, 2017 · 62325ec · 62325ec
2 parents d43473d + a9a1ad1
commit 62325ec
Show file tree

Hide file tree

Showing 8 changed files with 111 additions and 7 deletions.
diff --git a/pom.xml b/pom.xml
@@ -260,6 +260,13 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>com.openpojo</groupId>
+            <artifactId>openpojo</artifactId>
+            <version>0.8.6</version>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.maven.plugin-testing</groupId>
             <artifactId>maven-plugin-testing-harness</artifactId>

diff --git a/src/main/java/com/trivago/rta/json/pojo/Element.java b/src/main/java/com/trivago/rta/json/pojo/Element.java
@@ -174,7 +174,7 @@ public long getTotalDuration() {
         return totalDurationMicroseconds;
     }
 
-    public String getTotalDurationString() {
+    public String returnTotalDurationString() {
         return RenderingUtils.convertMicrosecondsToTimeString(getTotalDuration());
     }
 

diff --git a/src/main/java/com/trivago/rta/json/pojo/Result.java b/src/main/java/com/trivago/rta/json/pojo/Result.java
@@ -19,8 +19,6 @@
 import com.google.gson.annotations.SerializedName;
 import com.trivago.rta.rendering.RenderingUtils;
 
-import java.time.Duration;
-
 public class Result {
 
     private long duration;
@@ -63,7 +61,7 @@ public long getDurationInMilliseconds() {
         return RenderingUtils.convertMicrosecondsToMilliseconds(duration);
     }
 
-    public String getDurationString() {
+    public String returnDurationString() {
         return RenderingUtils.convertMicrosecondsToTimeString(duration);
     }
 

diff --git a/src/main/resources/template/scenario-detail/detail.html b/src/main/resources/template/scenario-detail/detail.html
@@ -45,7 +45,7 @@ <h5 class="navbar-text float-lg-left">Scenario Details | ${reportDetails.date}</
     <div class="cluecumber-template">
         <div class="row">
             <div class="col-sm-6">
-                <div class="card">
+                <div class="card h-100">
                     <div class="card-header">Scenario Result Chart</div>
                     <div class="card-body">
                         <div id="canvas-holder" class="w-100 text-center">
@@ -55,7 +55,7 @@ <h5 class="navbar-text float-lg-left">Scenario Details | ${reportDetails.date}</
                 </div>
             </div>
             <div class="col-sm-6">
-                <div class="card">
+                <div class="card h-100">
                     <div class="card-header">Scenario Information</div>
                     <div class="card-body">
                         <ul class="list-group list-group-flush">

diff --git a/src/test/java/com/trivago/rta/json/pojo/ElementTest.java b/src/test/java/com/trivago/rta/json/pojo/ElementTest.java
@@ -73,6 +73,6 @@ public void totalDurationTest() {
         element.setSteps(steps);
 
         assertThat(element.getTotalDuration(), is(10114667785L));
-        assertThat(element.getTotalDurationString(), is("0m 10s 114ms"));
+        assertThat(element.returnTotalDurationString(), is("0m 10s 114ms"));
     }
 }
diff --git a/src/test/java/com/trivago/rta/json/pojo/PojoTest.java b/src/test/java/com/trivago/rta/json/pojo/PojoTest.java
@@ -0,0 +1,35 @@
+package com.trivago.rta.json.pojo;
+
+import com.openpojo.reflection.PojoClass;
+import com.openpojo.reflection.filters.FilterPackageInfo;
+import com.openpojo.reflection.impl.PojoClassFactory;
+import com.openpojo.validation.Validator;
+import com.openpojo.validation.ValidatorBuilder;
+import com.openpojo.validation.affirm.Affirm;
+import com.openpojo.validation.test.impl.GetterTester;
+import com.openpojo.validation.test.impl.SetterTester;
+import org.junit.Test;
+
+import java.util.List;
+
+public class PojoTest {
+    private static final int EXPECTED_CLASS_COUNT = 12;
+    private static final String POJO_PACKAGE = "com.trivago.rta.json.pojo";
+
+    @Test
+    public void ensureExpectedPojoCount() {
+        List<PojoClass> pojoClasses = PojoClassFactory.getPojoClasses(POJO_PACKAGE,
+                new FilterPackageInfo());
+        Affirm.affirmEquals("Classes added / removed?", EXPECTED_CLASS_COUNT, pojoClasses.size());
+    }
+
+    @Test
+    public void testPojoStructureAndBehavior() {
+        Validator validator = ValidatorBuilder.create()
+                .with(new SetterTester())
+                .with(new GetterTester())
+                .build();
+
+        validator.validate(POJO_PACKAGE, new FilterPackageInfo());
+    }
+}
diff --git a/src/test/java/com/trivago/rta/rendering/pages/pojos/CustomParameterTest.java b/src/test/java/com/trivago/rta/rendering/pages/pojos/CustomParameterTest.java
@@ -0,0 +1,29 @@
+package com.trivago.rta.rendering.pages.pojos;
+
+import org.junit.Test;
+
+import static org.hamcrest.core.Is.is;
+import static org.junit.Assert.assertThat;
+
+
+public class CustomParameterTest {
+
+    @Test
+    public void isValidUrlTest() {
+        CustomParameter customParameter = new CustomParameter("test", "http://www.someurl.de");
+        assertThat(customParameter.isUrl(), is(true));
+    }
+
+    @Test
+    public void isInvalidUrlTest() {
+        CustomParameter customParameter = new CustomParameter("test", "test");
+        assertThat(customParameter.isUrl(), is(false));
+    }
+
+    @Test
+    public void getKeyValueTest() {
+        CustomParameter customParameter = new CustomParameter("key", "value");
+        assertThat(customParameter.getKey(), is("key"));
+        assertThat(customParameter.getValue(), is("value"));
+    }
+}
diff --git a/src/test/java/com/trivago/rta/rendering/pages/pojos/PojoTest.java b/src/test/java/com/trivago/rta/rendering/pages/pojos/PojoTest.java
@@ -0,0 +1,35 @@
+package com.trivago.rta.rendering.pages.pojos;
+
+import com.openpojo.reflection.PojoClass;
+import com.openpojo.reflection.filters.FilterPackageInfo;
+import com.openpojo.reflection.impl.PojoClassFactory;
+import com.openpojo.validation.Validator;
+import com.openpojo.validation.ValidatorBuilder;
+import com.openpojo.validation.affirm.Affirm;
+import com.openpojo.validation.test.impl.GetterTester;
+import com.openpojo.validation.test.impl.SetterTester;
+import org.junit.Test;
+
+import java.util.List;
+
+public class PojoTest {
+    private static final int EXPECTED_CLASS_COUNT = 6;
+    private static final String POJO_PACKAGE = "com.trivago.rta.rendering.pages.pojos";
+
+    @Test
+    public void ensureExpectedPojoCount() {
+        List<PojoClass> pojoClasses = PojoClassFactory.getPojoClasses(POJO_PACKAGE,
+                new FilterPackageInfo());
+        Affirm.affirmEquals("Classes added / removed?", EXPECTED_CLASS_COUNT, pojoClasses.size());
+    }
+
+    @Test
+    public void testPojoStructureAndBehavior() {
+        Validator validator = ValidatorBuilder.create()
+                .with(new SetterTester())
+                .with(new GetterTester())
+                .build();
+
+        validator.validate(POJO_PACKAGE, new FilterPackageInfo());
+    }
+}