fix: fixed an issue loading the JSON test reports during aggregate re…

…port generation.
serenity-bdd · Feb 19, 2015 · 93b836f · 93b836f
1 parent 5894af6
commit 93b836f
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/core/src/main/java/net/thucydides/core/model/TestOutcome.java b/core/src/main/java/net/thucydides/core/model/TestOutcome.java
@@ -76,7 +76,7 @@ public class TestOutcome {
     /**
      * The class containing the test method, if the test is implemented in a Java class.
      */
-    private  Class<?> testCase;
+    private  transient Class<?> testCase;
 
     private String testCaseName;
 
@@ -1732,7 +1732,7 @@ public boolean equals(Object o) {
         if (manual != that.manual) return false;
         if (name != null ? !name.equals(that.name) : that.name != null) return false;
         if (qualifier != null ? !qualifier.equals(that.qualifier) : that.qualifier != null) return false;
-        if (testCase != null ? !testCase.equals(that.testCase) : that.testCase != null) return false;
+        if (testCaseName != null ? !testCaseName.equals(that.testCaseName) : that.testCaseName != null) return false;
         if (title != null ? !title.equals(that.title) : that.title != null) return false;
         if (userStory != null ? !userStory.equals(that.userStory) : that.userStory != null) return false;
 

diff --git a/...est/groovy/net/thucydides/core/reports/json/gson/WhenSerializingJSONObjectWithGSON.groovy b/...est/groovy/net/thucydides/core/reports/json/gson/WhenSerializingJSONObjectWithGSON.groovy
@@ -41,4 +41,15 @@ class WhenSerializingJSONObjectWithGSON extends Specification {
         then:
             loadedTestOutcome == testOutcome
     }
+
+    def "should load serialized test outcomes from JSON"() {
+        given:
+            GsonJSONConverter converter = new GsonJSONConverter(environmentVariables)
+        and:
+            def jsonFile = this.class.getResource("/json-reports/sample-report-1.json").getPath()
+        when:
+            def loadedTestOutcome = converter.fromJson(new FileInputStream(new File(jsonFile)))
+        then:
+            loadedTestOutcome != null
+    }
 }