[#60feature/#60-restlib] lib used

Signed-off-by: huluvu424242 <huluvu424242@gmail.com>
Huluvu424242 · Jan 29, 2023 · 0401f1a · 0401f1a
1 parent abe6067
commit 0401f1a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/src/main/java/com/github/funthomas424242/jenkinsmonitor/jenkins/JenkinsAPI.java b/src/main/java/com/github/funthomas424242/jenkinsmonitor/jenkins/JenkinsAPI.java
@@ -25,5 +25,6 @@
 public class JenkinsAPI {
 
     private JenkinsAPI(){}
-    public static final String STATUS_PATH = "/lastBuild/api/json"; // NOSONAR java:S1075
+    public static final String STATUS_PATH = "/lastBuild/buildNumber"; // NOSONAR java:S1075
+//    public static final String STATUS_PATH = "/lastBuild/api/json"; // NOSONAR java:S1075
 }
diff --git a/src/test/java/com/github/funthomas424242/jenkinsmonitor/jenkins/JobAbfrageTest.java b/src/test/java/com/github/funthomas424242/jenkinsmonitor/jenkins/JobAbfrageTest.java
@@ -25,9 +25,10 @@
 import com.cdancy.jenkins.rest.domain.job.BuildInfo;
 import com.github.funthomas424242.jenkinsmonitor.gui.JobStatusBeschreibungen;
 import com.github.tomakehurst.wiremock.WireMockServer;
+
 import java.net.MalformedURLException;
 import java.net.URL;
-import org.json.JSONObject;
+
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
@@ -60,6 +61,7 @@ protected static void setUp() throws MalformedURLException {
         JOB_URL_MULTIBRANCH_JOB1_GRAY_BUILDING = new URL(JenkinsAPIMock.JOB_URL_MULTIBRANCH_JOB1_GRAY_BUILDING);
         JOB_URL_MULTIBRANCH_JOB1_GRAY_UNKNOW = new URL(JenkinsAPIMock.JOB_URL_MULTIBRANCH_JOB1_GRAY_UNKNOW);
 
+        // TODO
 //        STATUS_URL_MULTIBRANCH_JOB1_RED = new URL(JenkinsAPIMock.STATUS_URL_MULTIBRANCH_JOB1_RED);
 //        STATUS_URL_MULTIBRANCH_JOB1_GREEN = new URL(JenkinsAPIMock.STATUS_URL_MULTIBRANCH_JOB1_GREEN);
 //        STATUS_URL_MULTIBRANCH_JOB1_YELLOW = new URL(JenkinsAPIMock.STATUS_URL_MULTIBRANCH_JOB1_YELLOW);
@@ -142,24 +144,24 @@ void getStatusGray() {
     @Test
     @DisplayName("Die Statusabfrage eines roten Build Jobs gibt ein valides JSON zurück")
     void getValidJsonRed() {
-        final JSONObject json = assertDoesNotThrow(() -> {
+        final BuildInfo json = assertDoesNotThrow(() -> {
             final JobAbfragedaten jobAbfragedaten = new JobAbfragedaten(JOB_URL_MULTIBRANCH_JOB1_RED);
             final JobAbfrage requester = new JobAbfrage(jobAbfragedaten, "#");
             return requester.sendGetRequest();
         });
         assertNotNull(json);
-        assertEquals("mypocketmod » master #2", json.get("fullDisplayName"));
-        assertEquals("FAILURE", json.get("result"));
+        assertEquals("mypocketmod » master #2", json.fullDisplayName()); //get("fullDisplayName"));
+        assertEquals("FAILURE", json.result()); //get("result"));
     }
 
     @Test
     @DisplayName("Die Statusabfrage eines grünen Build Jobs gibt ein valides JSON zurück")
     void getValidJsonGreen() {
         final JobAbfragedaten jobAbfragedaten = new JobAbfragedaten(JOB_URL_MULTIBRANCH_JOB1_GREEN, null);
         final JobAbfrage requester = new JobAbfrage(jobAbfragedaten, "#1");
-        final BuildInfo json = assertDoesNotThrow(() -> requester.sendGetRequest());
+        final BuildInfo json = assertDoesNotThrow(requester::sendGetRequest);
         assertNotNull(json);
-        assertEquals("mypocketmod \u00bb master #2", json.fullDisplayName()); //get("fullDisplayName"));
+        assertEquals("mypocketmod » master #2", json.fullDisplayName()); //get("fullDisplayName"));
         assertEquals("SUCCESS", json.result()); //get("result"));
     }