fixing IT tests for Jobs

Author: salaboy

sdk-tests/src/test/java/io/dapr/it/testcontainers/jobs/DaprJobsIT.java

@@ -13,7 +13,7 @@
 
 package io.dapr.it.testcontainers.jobs;
 
-import io.dapr.client.DaprPreviewClient;
+import io.dapr.client.DaprClient;
 import io.dapr.client.domain.ConstantFailurePolicy;
 import io.dapr.client.domain.DeleteJobRequest;
 import io.dapr.client.domain.DropFailurePolicy;
@@ -28,7 +28,6 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
-import org.junit.runner.notification.Failure;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
@@ -85,7 +84,7 @@ static void daprProperties(DynamicPropertyRegistry registry) {
   }
 
   @Autowired
-  private DaprPreviewClient daprPreviewClient;
+  private DaprClient daprClient;
 
   @BeforeEach
   public void setUp(){
@@ -98,12 +97,12 @@ public void testJobScheduleCreationWithDueTime() {
             .withZone(ZoneOffset.UTC);
 
     Instant currentTime = Instant.now();
-    daprPreviewClient.scheduleJob(new ScheduleJobRequest("Job", currentTime).setOverwrite(true)).block();
+    daprClient.scheduleJob(new ScheduleJobRequest("Job", currentTime).setOverwrite(true)).block();
 
     GetJobResponse getJobResponse =
-        daprPreviewClient.getJob(new GetJobRequest("Job")).block();
+        daprClient.getJob(new GetJobRequest("Job")).block();
 
-    daprPreviewClient.deleteJob(new DeleteJobRequest("Job")).block();
+    daprClient.deleteJob(new DeleteJobRequest("Job")).block();
 
     assertEquals(iso8601Formatter.format(currentTime), getJobResponse.getDueTime().toString());
     assertEquals("Job", getJobResponse.getName());
@@ -115,13 +114,13 @@ public void testJobScheduleCreationWithSchedule() {
             .withZone(ZoneOffset.UTC);
 
     Instant currentTime = Instant.now();
-    daprPreviewClient.scheduleJob(new ScheduleJobRequest("Job", JobSchedule.hourly())
+    daprClient.scheduleJob(new ScheduleJobRequest("Job", JobSchedule.hourly())
         .setDueTime(currentTime).setOverwrite(true)).block();
 
     GetJobResponse getJobResponse =
-        daprPreviewClient.getJob(new GetJobRequest("Job")).block();
+        daprClient.getJob(new GetJobRequest("Job")).block();
 
-    daprPreviewClient.deleteJob(new DeleteJobRequest("Job")).block();
+    daprClient.deleteJob(new DeleteJobRequest("Job")).block();
 
     assertEquals(iso8601Formatter.format(currentTime), getJobResponse.getDueTime().toString());
     assertEquals(JobSchedule.hourly().getExpression(), getJobResponse.getSchedule().getExpression());
@@ -136,17 +135,17 @@ public void testJobScheduleCreationWithAllParameters() {
 
     String cronExpression = "2 * 3 * * FRI";
 
-    daprPreviewClient.scheduleJob(new ScheduleJobRequest("Job", currentTime)
+    daprClient.scheduleJob(new ScheduleJobRequest("Job", currentTime)
         .setTtl(currentTime.plus(2, ChronoUnit.HOURS))
         .setData("Job data".getBytes())
         .setRepeat(3)
         .setOverwrite(true)
         .setSchedule(JobSchedule.fromString(cronExpression))).block();
 
     GetJobResponse getJobResponse =
-        daprPreviewClient.getJob(new GetJobRequest("Job")).block();
+        daprClient.getJob(new GetJobRequest("Job")).block();
 
-    daprPreviewClient.deleteJob(new DeleteJobRequest("Job")).block();
+    daprClient.deleteJob(new DeleteJobRequest("Job")).block();
 
     assertEquals(iso8601Formatter.format(currentTime), getJobResponse.getDueTime().toString());
     assertEquals("2 * 3 * * FRI", getJobResponse.getSchedule().getExpression());
@@ -165,17 +164,17 @@ public void testJobScheduleCreationWithDropFailurePolicy() {
 
     String cronExpression = "2 * 3 * * FRI";
 
-    daprPreviewClient.scheduleJob(new ScheduleJobRequest("Job", currentTime)
+    daprClient.scheduleJob(new ScheduleJobRequest("Job", currentTime)
         .setTtl(currentTime.plus(2, ChronoUnit.HOURS))
         .setData("Job data".getBytes())
         .setRepeat(3)
             .setFailurePolicy(new DropFailurePolicy())
         .setSchedule(JobSchedule.fromString(cronExpression))).block();
 
     GetJobResponse getJobResponse =
-        daprPreviewClient.getJob(new GetJobRequest("Job")).block();
+        daprClient.getJob(new GetJobRequest("Job")).block();
 
-    daprPreviewClient.deleteJob(new DeleteJobRequest("Job")).block();
+    daprClient.deleteJob(new DeleteJobRequest("Job")).block();
 
     assertEquals(FailurePolicyType.DROP, getJobResponse.getFailurePolicy().getFailurePolicyType());
   }
@@ -188,7 +187,7 @@ public void testJobScheduleCreationWithConstantFailurePolicy() {
 
     String cronExpression = "2 * 3 * * FRI";
 
-    daprPreviewClient.scheduleJob(new ScheduleJobRequest("Job", currentTime)
+    daprClient.scheduleJob(new ScheduleJobRequest("Job", currentTime)
         .setTtl(currentTime.plus(2, ChronoUnit.HOURS))
         .setData("Job data".getBytes())
         .setRepeat(3)
@@ -197,9 +196,9 @@ public void testJobScheduleCreationWithConstantFailurePolicy() {
         .setSchedule(JobSchedule.fromString(cronExpression))).block();
 
     GetJobResponse getJobResponse =
-        daprPreviewClient.getJob(new GetJobRequest("Job")).block();
+        daprClient.getJob(new GetJobRequest("Job")).block();
 
-    daprPreviewClient.deleteJob(new DeleteJobRequest("Job")).block();
+    daprClient.deleteJob(new DeleteJobRequest("Job")).block();
 
     ConstantFailurePolicy jobFailurePolicyConstant = (ConstantFailurePolicy) getJobResponse.getFailurePolicy();
     assertEquals(FailurePolicyType.CONSTANT, getJobResponse.getFailurePolicy().getFailurePolicyType());
@@ -214,13 +213,13 @@ public void testDeleteJobRequest() {
 
     String cronExpression = "2 * 3 * * FRI";
 
-    daprPreviewClient.scheduleJob(new ScheduleJobRequest("Job", currentTime)
+    daprClient.scheduleJob(new ScheduleJobRequest("Job", currentTime)
         .setTtl(currentTime.plus(2, ChronoUnit.HOURS))
         .setData("Job data".getBytes())
         .setRepeat(3)
         .setOverwrite(true)
         .setSchedule(JobSchedule.fromString(cronExpression))).block();
 
-    daprPreviewClient.deleteJob(new DeleteJobRequest("Job")).block();
+    daprClient.deleteJob(new DeleteJobRequest("Job")).block();
   }
 }