Removed ZephyrTestCycleResponse and moved id and key fields to ZephyrTestCycle

Author: mei-kyoseva

bellatrix.plugins.jira.zephyr/src/main/java/plugins/jira/zephyr/ZephyrPlugin.java

@@ -18,7 +18,6 @@
 import plugins.jira.zephyr.annotations.ZephyrProjectId;
 import plugins.jira.zephyr.annotations.ZephyrTestCase;
 import plugins.jira.zephyr.data.ZephyrTestCycle;
-import plugins.jira.zephyr.data.ZephyrTestCycleResponse;
 import plugins.jira.zephyr.config.ZephyrSettings;
 import plugins.jira.zephyr.data.ZephyrTestCycleStatus;
 import plugins.jira.zephyr.data.ZephyrTestExecutionStatus;
@@ -33,14 +32,14 @@
 import solutions.bellatrix.core.plugins.TimeRecord;
 
 import java.lang.reflect.Method;
+import java.util.Map;
 
 public class ZephyrPlugin extends Plugin {
     public static final EventListener<ZephyrCyclePluginEventArgs> ZEPHYR_CYCLE_CREATED = new EventListener<>();
     public static final EventListener<ZephyrExecutionPluginEventArgs> ZEPHYR_TEST_CASE_EXECUTION_FAILED = new EventListener<>();
     public static final EventListener<ZephyrExecutionPluginEventArgs> ZEPHYR_TEST_CASE_EXECUTED = new EventListener<>();
     public static final EventListener<ZephyrCyclePluginEventArgs> ZEPHYR_CYCLE_STATUS_UPDATE_FAILED = new EventListener<>();
 
-    private ZephyrTestCycleResponse testCycleResponse;
     private ZephyrTestCycle testCycle;
 
     public ZephyrPlugin() {
@@ -62,7 +61,7 @@ private boolean isEnabled() {
     }
 
     private String getCycleId(Method memberInfo) {
-        if (!settings().isExistingCycle()) return testCycleResponse.getKey();
+        if (!settings().isExistingCycle()) return testCycle.getKey();
 
         if (memberInfo.isAnnotationPresent(ZephyrTestCase.class) && !memberInfo.getAnnotation(ZephyrTestCase.class).cycleId().isBlank()) {
             return memberInfo.getAnnotation(ZephyrTestCase.class).cycleId();
@@ -115,9 +114,9 @@ public void postBeforeClass(Class type) {
         testCycle = new ZephyrTestCycle(settings().getDefaultProjectKey(), testCycleName, ZephyrTestCycleStatus.IN_PROGRESS.getValue());
         testCycle.setPlannedStartDate(DateTimeUtilities.getUtcNow());
 
-        testCycleResponse = ZephyrApiService.createTestCycle(testCycle);
+        ZephyrApiService.createTestCycle(testCycle);
 
-        ZEPHYR_CYCLE_CREATED.broadcast(new ZephyrCyclePluginEventArgs(testCycleResponse));
+        ZEPHYR_CYCLE_CREATED.broadcast(new ZephyrCyclePluginEventArgs(testCycle));
     }
 
     @Override
@@ -133,6 +132,8 @@ public void postAfterTest(TestResult testResult, TimeRecord timeRecord, Method m
 
         var response = ZephyrApiService.executeTestCase(testCase);
 
+       var responseBody = response.body().prettyPrint();
+
         if (response.statusCode() >= 400) {
             ZEPHYR_TEST_CASE_EXECUTION_FAILED.broadcast(new ZephyrExecutionPluginEventArgs(testCase));
         }
@@ -146,7 +147,7 @@ public void preAfterClass(Class type) {
 
         testCycle.setPlannedEndDate(DateTimeUtilities.getUtcNow());
 
-        var response = ZephyrApiService.changeTestCycleStatus(testCycle, testCycleResponse);
+        var response = ZephyrApiService.changeTestCycleStatus(testCycle);
 
         if (response.statusCode() >= 400) {
             ZEPHYR_CYCLE_STATUS_UPDATE_FAILED.broadcast(new ZephyrCyclePluginEventArgs());

bellatrix.plugins.jira.zephyr/src/main/java/plugins/jira/zephyr/data/ZephyrTestCycle.java

@@ -23,6 +23,8 @@ public ZephyrTestCycle(String projectKey, String name, String statusName) {
         this.statusName = statusName;
     }
 
+    private String id;
+    private String key;
     private String projectKey;
     private String name;
     private String statusName;

bellatrix.plugins.jira.zephyr/src/main/java/plugins/jira/zephyr/data/ZephyrTestCycleResponse.java

@@ -13,12 +13,12 @@
 package plugins.jira.zephyr.events;
 
 import lombok.Getter;
-import plugins.jira.zephyr.data.ZephyrTestCycleResponse;
+import plugins.jira.zephyr.data.ZephyrTestCycle;
 
 public class ZephyrCyclePluginEventArgs {
-    @Getter private ZephyrTestCycleResponse testCycle;
+    @Getter private ZephyrTestCycle testCycle;
 
-    public ZephyrCyclePluginEventArgs(ZephyrTestCycleResponse testCycle) {
+    public ZephyrCyclePluginEventArgs(ZephyrTestCycle testCycle) {
         this.testCycle = testCycle;
     }
 

bellatrix.plugins.jira.zephyr/src/main/java/plugins/jira/zephyr/events/ZephyrCyclePluginEventArgs.java

@@ -16,18 +16,12 @@
 import io.restassured.path.json.JsonPath;
 import io.restassured.response.Response;
 import lombok.experimental.UtilityClass;
-import net.minidev.json.JSONObject;
 import org.apache.commons.text.StringEscapeUtils;
 import plugins.jira.zephyr.config.ZephyrSettings;
 import plugins.jira.zephyr.data.ZephyrTestCycle;
-import plugins.jira.zephyr.data.ZephyrTestCycleResponse;
 import plugins.jira.zephyr.data.ZephyrTestCycleStatus;
 import solutions.bellatrix.core.configuration.ConfigurationService;
-import solutions.bellatrix.core.utilities.DebugInformation;
 
-import java.net.URLEncoder;
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -40,19 +34,24 @@ private ZephyrSettings settings() {
         return ConfigurationService.get(ZephyrSettings.class);
     }
 
-    public ZephyrTestCycleResponse createTestCycle(ZephyrTestCycle testCycle) {
+    public Response createTestCycle(ZephyrTestCycle testCycle) {
         var body = Map.of(
                 "projectKey", testCycle.getProjectKey(),
                 "name", testCycle.getName(),
                 "statusName", testCycle.getStatusName()
         );
 
-        return given()
+        var extractableResponse = given()
                 .body(body, ObjectMapperType.GSON)
                 .when()
                 .post("/testcycles")
                 .then()
-                .extract().response().body().as(ZephyrTestCycleResponse.class, ObjectMapperType.GSON);
+                .extract();
+
+        testCycle.setId(extractableResponse.jsonPath().getString("id"));
+        testCycle.setKey(extractableResponse.jsonPath().getString("key"));
+
+        return extractableResponse.response();
     }
 
     public Response executeTestCase(plugins.jira.zephyr.data.ZephyrTestCase testCase) {
@@ -76,14 +75,14 @@ public Response executeTestCase(plugins.jira.zephyr.data.ZephyrTestCase testCase
                 .extract().response();
     }
 
-    public Response changeTestCycleStatus(ZephyrTestCycle cycleData, ZephyrTestCycleResponse cycleCreationResponse) {
+    public Response changeTestCycleStatus(ZephyrTestCycle cycleData) {
         var isDefaultValueAvailableInConfig = settings().getCycleFinalStatus() != null && !settings().getCycleFinalStatus().isBlank();
 
         var body = Map.of(
-                "id", cycleCreationResponse.getId(),
-                "key", cycleCreationResponse.getKey(),
+                "id", cycleData.getId(),
+                "key", cycleData.getKey(),
                 "name", cycleData.getName(),
-                "project", Map.of("id", ZephyrApiService.getProjectId(cycleCreationResponse.getKey())),
+                "project", Map.of("id", ZephyrApiService.getProjectId(cycleData.getKey())),
                 "status", Map.of("id", ZephyrApiService.getStatusId(isDefaultValueAvailableInConfig ?
                         settings().getCycleFinalStatus() : ZephyrTestCycleStatus.DONE.getValue(), cycleData.getProjectKey())),
                 "plannedEndDate", cycleData.getPlannedEndDate()
@@ -136,5 +135,4 @@ private static String formatError(Throwable error) {
 
         return errorInfo.replace("\n", "<br>");
     }
-
 }