Skip to content

Commit

Permalink
Google Java Format
Browse files Browse the repository at this point in the history
  • Loading branch information
github-actions committed Oct 17, 2023
1 parent c6882fa commit acdcf96
Show file tree
Hide file tree
Showing 3 changed files with 43 additions and 71 deletions.
15 changes: 7 additions & 8 deletions .../src/integration-test/java/com/vmware/taurus/datajobs/it/BaseDataJobDeploymentCrudIT.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
import static com.vmware.taurus.datajobs.it.common.WebHookServerMockExtension.TEST_TEAM_NAME;
import static com.vmware.taurus.datajobs.it.common.WebHookServerMockExtension.TEST_TEAM_WRONG_NAME;
import static org.awaitility.Awaitility.await;
import static org.hamcrest.Matchers.is;
import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.user;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
Expand Down Expand Up @@ -259,13 +258,13 @@ public void testDataJobDeploymentCrud() throws Exception {

// Verify deployment disabled
waitUntil(
() -> {
Optional<JobDeploymentStatus> cronJobOptional2 =
dataJobsKubernetesService.readCronJob(jobDeploymentName);
Assertions.assertTrue(cronJobOptional2.isPresent());
JobDeploymentStatus cronJob2 = cronJobOptional2.get();
return cronJob2.getEnabled();
});
() -> {
Optional<JobDeploymentStatus> cronJobOptional2 =
dataJobsKubernetesService.readCronJob(jobDeploymentName);
Assertions.assertTrue(cronJobOptional2.isPresent());
JobDeploymentStatus cronJob2 = cronJobOptional2.get();
return cronJob2.getEnabled();
});

beforeDeploymentDeletion();

Expand Down
29 changes: 1 addition & 28 deletions ...src/integration-test/java/com/vmware/taurus/datajobs/it/DataJobDeploymentCrudAsyncIT.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,37 +5,11 @@

package com.vmware.taurus.datajobs.it;

import com.fasterxml.jackson.databind.ObjectMapper;
import com.vmware.taurus.ControlplaneApplication;
import com.vmware.taurus.controlplane.model.data.DataJobDeploymentStatus;
import com.vmware.taurus.controlplane.model.data.DataJobMode;
import com.vmware.taurus.controlplane.model.data.DataJobVersion;
import com.vmware.taurus.datajobs.it.common.BaseIT;
import com.vmware.taurus.service.deploy.JobImageDeployer;
import com.vmware.taurus.service.model.JobDeploymentStatus;
import io.kubernetes.client.openapi.ApiException;
import org.apache.commons.io.IOUtils;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.platform.commons.util.StringUtils;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.http.HttpHeaders;
import org.springframework.http.MediaType;
import org.springframework.test.context.TestPropertySource;
import org.springframework.test.web.servlet.MvcResult;
import org.springframework.test.web.servlet.ResultActions;

import java.time.format.DateTimeFormatter;
import java.util.Optional;
import java.util.concurrent.Callable;
import java.util.concurrent.TimeUnit;

import static com.vmware.taurus.datajobs.it.common.WebHookServerMockExtension.TEST_TEAM_NAME;
import static com.vmware.taurus.datajobs.it.common.WebHookServerMockExtension.TEST_TEAM_WRONG_NAME;
import static org.awaitility.Awaitility.await;
import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.user;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;

Expand All @@ -52,6 +26,5 @@
classes = ControlplaneApplication.class)
public class DataJobDeploymentCrudAsyncIT extends BaseDataJobDeploymentCrudIT {
@Override
protected void beforeDeploymentDeletion() {
}
protected void beforeDeploymentDeletion() {}
}
70 changes: 35 additions & 35 deletions ...vice/src/integration-test/java/com/vmware/taurus/datajobs/it/DataJobDeploymentCrudIT.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,49 +32,49 @@ public class DataJobDeploymentCrudIT extends BaseDataJobDeploymentCrudIT {
protected void beforeDeploymentDeletion() throws Exception {
// Execute set vdk version for deployment
mockMvc
.perform(
patch(
String.format(
"/data-jobs/for-team/%s/jobs/%s/deployments/%s",
TEST_TEAM_NAME, testJobName, DEPLOYMENT_ID))
.with(user("user"))
.content(getDataJobDeploymentVdkVersionRequestBody("new_vdk_version_tag"))
.contentType(MediaType.APPLICATION_JSON))
.andExpect(status().isBadRequest());
.perform(
patch(
String.format(
"/data-jobs/for-team/%s/jobs/%s/deployments/%s",
TEST_TEAM_NAME, testJobName, DEPLOYMENT_ID))
.with(user("user"))
.content(getDataJobDeploymentVdkVersionRequestBody("new_vdk_version_tag"))
.contentType(MediaType.APPLICATION_JSON))
.andExpect(status().isBadRequest());

// Execute disable deployment again to check that the version is not overwritten
mockMvc
.perform(
patch(
String.format(
"/data-jobs/for-team/%s/jobs/%s/deployments/%s",
TEST_TEAM_NAME, testJobName, DEPLOYMENT_ID))
.with(user("user"))
.content(getDataJobDeploymentEnableRequestBody(false))
.contentType(MediaType.APPLICATION_JSON))
.andExpect(status().isAccepted());
.perform(
patch(
String.format(
"/data-jobs/for-team/%s/jobs/%s/deployments/%s",
TEST_TEAM_NAME, testJobName, DEPLOYMENT_ID))
.with(user("user"))
.content(getDataJobDeploymentEnableRequestBody(false))
.contentType(MediaType.APPLICATION_JSON))
.andExpect(status().isAccepted());

// Execute reset back vdk version for deployment
mockMvc
.perform(
patch(
String.format(
"/data-jobs/for-team/%s/jobs/%s/deployments/%s",
TEST_TEAM_NAME, testJobName, DEPLOYMENT_ID))
.with(user("user"))
.content(getDataJobDeploymentVdkVersionRequestBody(""))
.contentType(MediaType.APPLICATION_JSON))
.andExpect(status().isBadRequest());
.perform(
patch(
String.format(
"/data-jobs/for-team/%s/jobs/%s/deployments/%s",
TEST_TEAM_NAME, testJobName, DEPLOYMENT_ID))
.with(user("user"))
.content(getDataJobDeploymentVdkVersionRequestBody(""))
.contentType(MediaType.APPLICATION_JSON))
.andExpect(status().isBadRequest());

// verify vdk version is reset correctly
mockMvc
.perform(
get(String.format(
"/data-jobs/for-team/%s/jobs/%s/deployments/%s",
TEST_TEAM_NAME, testJobName, DEPLOYMENT_ID))
.with(user("user"))
.contentType(MediaType.APPLICATION_JSON))
.andExpect(status().isOk())
.andExpect(jsonPath("$.vdk_version", is("release")));
.perform(
get(String.format(
"/data-jobs/for-team/%s/jobs/%s/deployments/%s",
TEST_TEAM_NAME, testJobName, DEPLOYMENT_ID))
.with(user("user"))
.contentType(MediaType.APPLICATION_JSON))
.andExpect(status().isOk())
.andExpect(jsonPath("$.vdk_version", is("release")));
}
}

0 comments on commit acdcf96

Please sign in to comment.