code cleanup (#91)

* code cleanup

* add missing links to requirements

* bump to 0.9.0

Author: bitcoder

CHANGELOG.md

@@ -11,6 +11,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
+## [0.9.0] - 2025-05-06
+
+### Added
+
+- fixes #92 (code quality issues) by @bitcoder in #91
+
 ## [0.8.0] - 2024-08-14
 
 ### Added

README.md

@@ -36,7 +36,7 @@ Add the following dependency to your pom.xml, where the `<configuration>` is opt
         <plugin>
             <groupId>app.getxray</groupId>
             <artifactId>xray-maven-plugin</artifactId>
-            <version>0.8.0</version>
+            <version>0.9.0</version>
             <scope>test</scope>
             <configuration>
                 <clientId>215FFD69FE46447280000000000</clientId>

src/test/java/app/getxray/xray/CommonCloudTest.java

@@ -44,7 +44,6 @@ void authenticateXrayAPIKeyCredentialsTest() throws Exception{
         when(remoteCall.execute()).thenReturn(response);
         when(client.newCall(any())).thenReturn(remoteCall);
 
-        // OkHttpClient client2 = mockHttpClient("\""+expectedToken+"\"");
         String authToken = CommonCloud.authenticateXrayAPIKeyCredentials(log, true, client, clientId, clientSecret, cloudApiBaseUrl);
         assertEquals(expectedToken, authToken);
 

src/test/java/app/getxray/xray/CommonUtilsTest.java

@@ -20,7 +20,6 @@
 import org.mockito.Mockito;
 
 import app.getxray.xray.it.TestingUtils;
-import junit.framework.Assert;
 import okhttp3.MediaType;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
@@ -81,7 +80,7 @@ void testUnzipContentsToFolder() throws Exception {
         File tempDir = Files.createTempDirectory("dummy").toFile();
         byte[] zippedContent = TestingUtils.readRawResourceFile("import_features/XrayDatacenterIT/multiple_features/features.zip");
         InputStream zippedContentStream = new ByteArrayInputStream(zippedContent);
-        unzipContentsToFolder(zippedContentStream, tempDir.getAbsolutePath().toString());
+        unzipContentsToFolder(zippedContentStream, tempDir.getAbsolutePath());
         assertThat(tempDir.listFiles()).hasSize(2);
         assertThat(tempDir.listFiles()).extracting(File::getName).containsExactlyInAnyOrder("core", "other");
         assertThat((new File(tempDir, "core")).listFiles()).extracting(File::getName).containsExactlyInAnyOrder("positive_sum.feature");

src/test/java/app/getxray/xray/ImportResultsTest.java

@@ -4,7 +4,7 @@
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import org.junit.jupiter.api.Test;
 import app.getxray.xray.XrayResultsImporter.CloudBuilder;
-import app.getxray.xray.XrayResultsImporter.ServerDCBuilder;;
+import app.getxray.xray.XrayResultsImporter.ServerDCBuilder;
 
 class ImportResultsTest {
 

src/test/java/app/getxray/xray/it/TestingUtils.java

@@ -1,44 +1,11 @@
 package app.getxray.xray.it;
 
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Paths;
 
-import okhttp3.Call;
-import okhttp3.MediaType;
-import okhttp3.OkHttpClient;
-import okhttp3.Protocol;
-import okhttp3.Request;
-import okhttp3.Response;
-import okhttp3.ResponseBody;
-
 public class TestingUtils {
 
-    private static OkHttpClient mockHttpClient(final String serializedBody) throws IOException {
-        final OkHttpClient okHttpClient = mock(OkHttpClient.class);
-
-        final Call remoteCall = mock(Call.class);
-
-        final Response response = new Response.Builder()
-                .request(new Request.Builder().url("https://xray.cloud.getxray.app/api/v2/authenticate").build())
-                .protocol(Protocol.HTTP_1_1)
-                .code(200).message("").body(
-                    ResponseBody.create(
-                        serializedBody,
-                        MediaType.parse("application/json")
-                ))
-                .build();
-
-        when(remoteCall.execute()).thenReturn(response);
-        when(okHttpClient.newCall(any())).thenReturn(remoteCall);
-
-        return okHttpClient;
-    }
-
     public static String readFile(String path) throws IOException {
         String content = null;
         content = new String ( Files.readAllBytes( Paths.get(path) ) );

src/test/java/app/getxray/xray/it/export_features/XrayCloudIT.java

@@ -43,7 +43,7 @@ public class XrayCloudIT {
 
     static WireMockServer wm;
     @BeforeAll
-    public static void setup () {
+    static void setup () {
         wm = new WireMockServer(
             options()
             .port(PORT_NUMBER)
@@ -53,7 +53,7 @@ public static void setup () {
         setupStub();
     }
     @AfterAll
-    public static void teardown () {
+    static void teardown () {
         wm.stop();
     }
 

src/test/java/app/getxray/xray/it/import_features/XrayCloudIT.java

@@ -52,7 +52,7 @@ public class XrayCloudIT {
 
     static WireMockServer wm;
     @BeforeAll
-    public static void setup () {
+    static void setup () {
         wm = new WireMockServer(
             options()
             .port(PORT_NUMBER)
@@ -62,7 +62,7 @@ public static void setup () {
         setupStub();
     }
     @AfterAll
-    public static void teardown () {
+    static void teardown () {
         wm.stop();
     }
 

src/test/java/app/getxray/xray/it/import_features/XrayDatacenterIT.java

@@ -49,14 +49,14 @@ public class XrayDatacenterIT {
     static final int PORT_NUMBER = 18080;
 
     @BeforeAll
-    public static void setup () {
+    static void setup () {
         wm = new WireMockServer(options().port(PORT_NUMBER));
         wm.start();
         setupStub();
     }
 
     @AfterAll
-    public static void teardown () {
+    static void teardown () {
         wm.stop();
     }
 
@@ -252,7 +252,7 @@ void multiple_features_from_directory(MavenExecutionResult result) throws IOExce
         ServeEvent request = allServeEvents.get(0);
         byte[] zippedContent = request.getRequest().getPart("file").getBody().asBytes();
         InputStream zippedContentStream = new ByteArrayInputStream(zippedContent);
-        unzipContentsToFolder(zippedContentStream, tempDir.getAbsolutePath().toString());
+        unzipContentsToFolder(zippedContentStream, tempDir.getAbsolutePath());
         assertThat(tempDir.listFiles()).hasSize(2);
         assertThat(tempDir.listFiles()).extracting(File::getName).containsExactlyInAnyOrder("core", "other");
         assertThat((new File(tempDir, "core")).listFiles()).extracting(File::getName).containsExactlyInAnyOrder("positive_sum.feature");

src/test/java/app/getxray/xray/it/import_results/TimeoutHandlingIT.java

@@ -40,7 +40,7 @@ public class TimeoutHandlingIT {
     static final int PORT_NUMBER = 18080;
 
     @BeforeAll
-    public static void setup () {
+    static void setup () {
         wm = new WireMockServer(
             options()
             .port(PORT_NUMBER)
@@ -51,7 +51,7 @@ public static void setup () {
     }
 
     @AfterAll
-    public static void teardown () {
+    static void teardown () {
         wm.stop();
     }
 
@@ -180,7 +180,7 @@ void below_configured_timeout(MavenExecutionResult result) throws IOException {
     @SystemProperty(value = "xray.reportFile", content = "junit.xml")
     @SystemProperty(value = "xray.projectKey", content = "DELAY3")
     @SystemProperty(value = "xray.timeout", content = "2")
-    void exceed_configured_timeout(MavenExecutionResult result) throws IOException {
+    void exceed_configured_timeout(MavenExecutionResult result) {
         assertThat(result.getMavenLog().getStdout().toString()).contains("timeout");
         assertThat(result).isFailure();
     }
@@ -219,7 +219,7 @@ void below_default_timeout(MavenExecutionResult result) throws IOException {
     @SystemProperty(value = "xray.reportFormat", content = "junit")
     @SystemProperty(value = "xray.reportFile", content = "junit.xml")
     @SystemProperty(value = "xray.projectKey", content = "DELAY51")
-    void exceed_default_timeout(MavenExecutionResult result) throws IOException {
+    void exceed_default_timeout(MavenExecutionResult result) {
         assertThat(result.getMavenLog().getStdout().toString()).contains("timeout");
         assertThat(result).isFailure();
     }
@@ -258,7 +258,7 @@ void below_configured_timeout_cloud(MavenExecutionResult result) throws IOExcept
     @SystemProperty(value = "xray.projectKey", content = "DELAY3")
     @SystemProperty(value = "xray.timeout", content = "2")
     @SystemProperty(value = "xray.useInternalTestProxy", content = "true")
-    void exceed_configured_timeout_cloud(MavenExecutionResult result) throws IOException {
+    void exceed_configured_timeout_cloud(MavenExecutionResult result) {
         assertThat(result.getMavenLog().getStdout().toString()).contains("timeout");
         assertThat(result).isFailure();
     }
@@ -298,7 +298,7 @@ void below_default_timeout_cloud(MavenExecutionResult result) throws IOException
     @SystemProperty(value = "xray.reportFile", content = "junit.xml")
     @SystemProperty(value = "xray.projectKey", content = "DELAY51")
     @SystemProperty(value = "xray.useInternalTestProxy", content = "true")
-    void exceed_default_timeout_cloud(MavenExecutionResult result) throws IOException {
+    void exceed_default_timeout_cloud(MavenExecutionResult result) {
         assertThat(result.getMavenLog().getStdout().toString()).contains("timeout");
         assertThat(result).isFailure();
     }