updated

Author: pashidlos

src/main/java/io/visual_regression_tracker/sdk_java/VisualRegressionTracker.java

@@ -10,7 +10,6 @@
 import okhttp3.Request;
 import okhttp3.RequestBody;
 import okhttp3.Response;
-import okhttp3.ResponseBody;
 
 import java.io.IOException;
 import java.util.Optional;
@@ -56,9 +55,11 @@ void startBuild() throws IOException {
                 String responseBody = Optional.ofNullable(response.body())
                         .orElseThrow(() -> new TestRunException("Cannot get response body"))
                         .string();
-                BuildResponse buildDTO = new Gson().fromJson(responseBody, BuildResponse.class);
-                this.buildId = buildDTO.getId();
-                this.projectId = buildDTO.getProjectId();
+                BuildResponse buildDTO = gson.fromJson(responseBody, BuildResponse.class);
+                this.buildId = Optional.ofNullable(buildDTO.getId())
+                        .orElseThrow(() -> new TestRunException("Build id is null"));
+                this.projectId = Optional.ofNullable(buildDTO.getProjectId())
+                        .orElseThrow(() -> new TestRunException("Project id is null"));
             }
         }
     }
@@ -85,8 +86,11 @@ TestRunResponse submitTestRun(String name, String imageBase64, TestRunOptions te
                 .post(body)
                 .build();
 
-        try (ResponseBody responseBody = client.newCall(request).execute().body()) {
-            return gson.fromJson(responseBody.string(), TestRunResponse.class);
+        try (Response response = client.newCall(request).execute()) {
+            String responseBody = Optional.ofNullable(response.body())
+                    .orElseThrow(() -> new TestRunException("Cannot get response body"))
+                    .string();
+            return gson.fromJson(responseBody, TestRunResponse.class);
         }
     }
 
@@ -95,11 +99,14 @@ public void track(String name, String imageBase64, TestRunOptions testRunOptions
 
         TestRunResponse testResultDTO = this.submitTestRun(name, imageBase64, testRunOptions);
 
-        if (testResultDTO.getStatus().equals(TestRunStatus.NEW)) {
+        TestRunStatus status = Optional.ofNullable(testResultDTO.getStatus())
+                .orElseThrow(() -> new TestRunException("Status is null"));
+
+        if (status.equals(TestRunStatus.NEW)) {
             throw new TestRunException("No baseline: ".concat(testResultDTO.getUrl()));
         }
 
-        if (testResultDTO.getStatus().equals(TestRunStatus.UNRESOLVED)) {
+        if (status.equals(TestRunStatus.UNRESOLVED)) {
             throw new TestRunException("Difference found: ".concat(testResultDTO.getUrl()));
         }
     }

src/test/java/io/visual_regression_tracker/sdk_java/VisualRegressionTrackerTest.java

@@ -24,7 +24,7 @@ public class VisualRegressionTrackerTest {
     MockWebServer server;
     VisualRegressionTracker vrt;
     VisualRegressionTrackerConfig config = new VisualRegressionTrackerConfig(
-            "http://localhost",
+            "http://localhost:4200",
             "733c148e-ef70-4e6d-9ae5-ab22263697cc",
             "XHGDZDFD3GMJDNM87JKEMP0JS1G5",
             "develop"
@@ -160,7 +160,7 @@ public Object[][] shouldTrackThrowExceptionCases() {
     }
 
     @Test(dataProvider = "shouldTrackThrowExceptionCases")
-    public void shouldTrackThrowException(TestRunResponse testRunResponse, String expectedExceptionMessage) throws IOException {
+    void shouldTrackThrowException(TestRunResponse testRunResponse, String expectedExceptionMessage) throws IOException {
         VisualRegressionTracker vrtMocked = Mockito.mock(VisualRegressionTracker.class);
         Mockito.when(vrtMocked.submitTestRun(Mockito.anyString(), Mockito.anyString(), Mockito.any())).thenReturn(testRunResponse);
 
@@ -187,7 +187,7 @@ public Object[][] shouldTrackPassCases() {
     }
 
     @Test(dataProvider = "shouldTrackPassCases")
-    public void shouldTrackPass(TestRunResponse testRunResponse) throws IOException {
+    void shouldTrackPass(TestRunResponse testRunResponse) throws IOException {
         VisualRegressionTracker vrtMocked = Mockito.mock(VisualRegressionTracker.class);
         Mockito.when(vrtMocked.submitTestRun(Mockito.anyString(), Mockito.anyString(), Mockito.any())).thenReturn(testRunResponse);
 
@@ -196,7 +196,7 @@ public void shouldTrackPass(TestRunResponse testRunResponse) throws IOException
     }
 
     @Test()
-    public void shouldTrackOverload() throws IOException {
+    void shouldTrackOverload() throws IOException {
         VisualRegressionTracker vrtMocked = Mockito.mock(VisualRegressionTracker.class);
 
         Mockito.doCallRealMethod().when(vrtMocked).track(Mockito.anyString(), Mockito.anyString());