From 8464b219554b0251fc0ef87309f5a63ca70ed6af Mon Sep 17 00:00:00 2001
From: Daniel Eriksson <daniel.w.eriksson@ericsson.com>
Date: Thu, 22 Feb 2024 12:37:31 +0100
Subject: [PATCH] Add get current job #592 improve TCs

---
 .../core/scheduling/TestScheduleManager.java  | 19 ++++++++++++++++++-
 .../TestScheduleRepairManagementRESTImpl.java | 18 +-----------------
 2 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/core/src/test/java/com/ericsson/bss/cassandra/ecchronos/core/scheduling/TestScheduleManager.java b/core/src/test/java/com/ericsson/bss/cassandra/ecchronos/core/scheduling/TestScheduleManager.java
index c02a16264..56b7b0ad5 100644
--- a/core/src/test/java/com/ericsson/bss/cassandra/ecchronos/core/scheduling/TestScheduleManager.java
+++ b/core/src/test/java/com/ericsson/bss/cassandra/ecchronos/core/scheduling/TestScheduleManager.java
@@ -257,10 +257,27 @@ public void testGetCurrentJobStatus() throws InterruptedException
                 latch);
         myScheduler.schedule(testJob);
         new Thread(() -> myScheduler.run()).start();
-        Thread.sleep(100);
+        Thread.sleep(50);
         assertThat(myScheduler.getCurrentJobStatus()).isEqualTo("Job ID: " + jobId.toString() + ", Status: Running");
         latch.countDown();
+    }
 
+    @Test
+    public void testGetCurrentJobStatusNoRunning() throws InterruptedException
+    {
+        CountDownLatch latch = new CountDownLatch(1);
+        UUID jobId = UUID.randomUUID();
+        ScheduledJob testJob = new TestScheduledJob(
+                new ScheduledJob.ConfigurationBuilder()
+                        .withPriority(ScheduledJob.Priority.LOW)
+                        .withRunInterval(1, TimeUnit.SECONDS)
+                        .build(),
+                jobId,
+                latch);
+        myScheduler.schedule(testJob);
+        new Thread(() -> myScheduler.run()).start();
+        assertThat(myScheduler.getCurrentJobStatus()).isNotEqualTo("Job ID: " + jobId.toString() + ", Status: Running");
+        latch.countDown();
     }
     private void waitForJobStarted(TestJob job) throws InterruptedException
     {
diff --git a/rest/src/test/java/com/ericsson/bss/cassandra/ecchronos/rest/TestScheduleRepairManagementRESTImpl.java b/rest/src/test/java/com/ericsson/bss/cassandra/ecchronos/rest/TestScheduleRepairManagementRESTImpl.java
index 1dd436915..85570869c 100644
--- a/rest/src/test/java/com/ericsson/bss/cassandra/ecchronos/rest/TestScheduleRepairManagementRESTImpl.java
+++ b/rest/src/test/java/com/ericsson/bss/cassandra/ecchronos/rest/TestScheduleRepairManagementRESTImpl.java
@@ -49,6 +49,7 @@
 import static org.mockito.Mockito.when;
 import static org.springframework.http.HttpStatus.NOT_FOUND;
 
+
 @RunWith(MockitoJUnitRunner.Silent.class)
 public class TestScheduleRepairManagementRESTImpl
 {
@@ -64,23 +65,6 @@ public void setupMocks()
         ScheduleREST = new ScheduleRepairManagementRESTImpl(myRepairScheduler);
     }
 
-    @Test
-    public void testGetCurrentJobOneExist()
-    {
-        UUID jobId = UUID.randomUUID();
-        String t = "Job ID: " + jobId + ", Status: Running";
-        when(myRepairScheduler.getCurrentJobStatus()).thenReturn(t);
-        assertThat(myRepairScheduler.getCurrentJobStatus()).isEqualTo(t);
-    }
-
-    @Test
-    public void testGetCurrentJobNoneExist()
-    {
-        String t =  "No job is currently running";
-        when(myRepairScheduler.getCurrentJobStatus()).thenReturn(t);
-        assertThat(myRepairScheduler.getCurrentJobStatus()).isEqualTo(t);
-    }
-
     @Test
     public void testGetNoSchedules()
     {