Fix more previously disabled tests.

spring-cloud · Aug 20, 2024 · 6570991 · 6570991
1 parent 89b8932
commit 6570991
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 11 deletions.
diff --git a/.../test/java/org/springframework/cloud/dataflow/core/StreamDefinitionServiceUtilsTests.java b/.../test/java/org/springframework/cloud/dataflow/core/StreamDefinitionServiceUtilsTests.java
@@ -60,7 +60,6 @@ void bindings3Apps() {
 		reverseDslTest("time | filter | log", 3);
 	}
 
-	@Disabled
 	@Test
 	void xd24161() {
 		reverseDslTest("http | transform --expression='payload.replace(\"abc\", \"\")' | log", 3);

diff --git a/.../springframework/cloud/dataflow/server/service/impl/DefaultTaskExecutionServiceTests.java b/.../springframework/cloud/dataflow/server/service/impl/DefaultTaskExecutionServiceTests.java
@@ -1113,7 +1113,7 @@ public void validateMissingTaskDefinitionTest() {
 			assertThatThrownBy(() -> {
 				initializeSuccessfulRegistry(appRegistry);
 				ValidationStatus validationStatus = taskValidationService.validateTask("simpleTask");
-				assertThat(validationStatus.getAppsStatuses().get("task:simpleTask")).isEqualTo("valid");
+				assertThat(validationStatus.getAppsStatuses()).containsEntry("task:simpleTask", "valid");
 			}).isInstanceOf(NoSuchTaskDefinitionException.class);
 		}
 

diff --git a/...-core/src/test/java/org/springframework/cloud/dataflow/shell/command/JobCommandTests.java b/...-core/src/test/java/org/springframework/cloud/dataflow/shell/command/JobCommandTests.java
@@ -26,6 +26,7 @@
 
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/spring-cloud-skipper/pom.xml b/spring-cloud-skipper/pom.xml
@@ -290,10 +290,6 @@
 					</execution>
 				</executions>
 			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-checkstyle-plugin</artifactId>
-			</plugin>
 		</plugins>
 	</build>
 	<reporting>

diff --git a/...test/java/org/springframework/cloud/skipper/server/controller/ReleaseControllerTests.java b/...test/java/org/springframework/cloud/skipper/server/controller/ReleaseControllerTests.java
@@ -160,7 +160,7 @@ public void checkDeleteReleaseWithPackage() throws Exception {
 		// Second attempt to delete 'release1' along with its package 'log'.
 		mockMvc.perform(delete("/api/release/" + releaseNameOne + "/package"))
 				.andDo(print()).andExpect(status().isOk()).andReturn();
-		assertThat(this.packageMetadataRepository.findByName("log")).hasSize(0);
+		assertThat(this.packageMetadataRepository.findByName("log")).isEmpty();
 
 	}
 
@@ -286,8 +286,8 @@ public void testMutableAttributesAppInstanceStatus() {
 		assertThat(appStatusCopy.getState()).isNotNull();
 		assertThat(appStatusCopy.getState()).isEqualTo(appStatusWithGeneralState.getState());
 
-		assertThat(appStatusWithGeneralState.getInstances()).hasSize(0);
-		assertThat(appStatusCopy.getInstances()).hasSize(0);
+		assertThat(appStatusWithGeneralState.getInstances()).isEmpty();
+		assertThat(appStatusCopy.getInstances()).isEmpty();
 
 		// Test AppStatus with instances
 		AppStatus appStatusWithInstances = AppStatus.of("id666").generalState(null)

diff --git a/...e/src/test/java/org/springframework/cloud/skipper/server/service/ReleaseServiceTests.java b/...e/src/test/java/org/springframework/cloud/skipper/server/service/ReleaseServiceTests.java
@@ -344,7 +344,7 @@ public void testDeletedReleaseWithPackage() throws InterruptedException {
 		// Delete
 		delete(releaseName, true);
 
-		assertThat(this.packageMetadataRepository.findByName(packageIdentifier.getPackageName())).hasSize(0);
+		assertThat(this.packageMetadataRepository.findByName(packageIdentifier.getPackageName())).isEmpty();
 	}
 
 	@Test
@@ -464,7 +464,7 @@ public void testInstallDeleteOfdMultipleReleasesFromSingePackage() throws Interr
 
 		// Successful deletion of release and its package.
 		assertReleaseStatus(RELEASE_ONE, StatusCode.DELETED);
-		assertThat(this.packageMetadataRepository.findByName(logPackageIdentifier.getPackageName())).hasSize(0);
+		assertThat(this.packageMetadataRepository.findByName(logPackageIdentifier.getPackageName())).isEmpty();
 	}
 
 	private Release install(String releaseName, PackageIdentifier packageIdentifier) throws InterruptedException {