added tests

Signed-off-by: wind57 <[email protected]>

Author: wind57

spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-leader-election/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-kubernetes-integration-tests</artifactId>
-		<version>5.0.0-SNAPSHOT</version>
+		<version>5.0.1-SNAPSHOT</version>
 	</parent>
 
 	<properties>

spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-leader-election/src/test/java/org/springframework/cloud/kubernetes/fabric8/leader/election/AbstractLeaderElection.java

@@ -75,6 +75,7 @@ void afterEach() {
 			.withTimeout(10, TimeUnit.SECONDS)
 			.delete();
 	}
+
 	Lease getLease() {
 		return kubernetesClient.leases().inNamespace("default").withName("spring-k8s-leader-election-lock").get();
 	}

spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-leader-election/src/test/java/org/springframework/cloud/kubernetes/fabric8/leader/election/Assertions.java

@@ -48,24 +48,23 @@ static void assertAcquireAndRenew(CapturedOutput output, Supplier<Lease> leaseSu
 		assertThat(output.getOut()).contains("starting leader initiator : " + candidateIdentity);
 
 		// 3. we try to acquire the lease (comes from fabric8 code)
-		assertThat(output.getOut()).contains(
-			"Attempting to acquire leader lease 'LeaseLock: default - spring-k8s-leader-election-lock " +
-				"(" + candidateIdentity + ")'");
+		assertThat(output.getOut())
+			.contains("Attempting to acquire leader lease 'LeaseLock: default - spring-k8s-leader-election-lock " + "("
+					+ candidateIdentity + ")'");
 
 		// 4. lease has been acquired
-		assertThat(output.getOut())
-			.contains("Acquired lease 'LeaseLock: default - spring-k8s-leader-election-lock " +
-				"(" + candidateIdentity + ")'");
+		assertThat(output.getOut()).contains("Acquired lease 'LeaseLock: default - spring-k8s-leader-election-lock "
+				+ "(" + candidateIdentity + ")'");
 
 		// 5. we are the leader (comes from fabric8 code)
 		assertThat(output.getOut()).contains("Leader changed from null to " + candidateIdentity);
 
 		// 6. wait until a renewal happens (comes from fabric code)
 		// this one means that we have extended our leadership
 		awaitUntil(30, 500,
-			() -> output.getOut()
-				.contains("Attempting to renew leader lease 'LeaseLock: "
-					+ "default - spring-k8s-leader-election-lock (" + candidateIdentity + ")'"));
+				() -> output.getOut()
+					.contains("Attempting to renew leader lease 'LeaseLock: "
+							+ "default - spring-k8s-leader-election-lock (" + candidateIdentity + ")'"));
 
 		Lease lease = leaseSupplier.get();
 
@@ -84,5 +83,4 @@ static void assertAcquireAndRenew(CapturedOutput output, Supplier<Lease> leaseSu
 		});
 	}
 
-
 }

spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-leader-election/src/test/java/org/springframework/cloud/kubernetes/fabric8/leader/election/Fabric8LeaderElectionCompletedExceptionallyAndRestartedIT.java

@@ -23,9 +23,9 @@
 import org.springframework.boot.test.system.CapturedOutput;
 import org.springframework.test.context.TestPropertySource;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.springframework.cloud.kubernetes.fabric8.leader.election.Assertions.assertAcquireAndRenew;
 import static org.springframework.cloud.kubernetes.integration.tests.commons.Awaitilities.awaitUntil;
-import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * <pre>
@@ -35,7 +35,7 @@
  * @author wind57
  */
 @TestPropertySource(properties = { "spring.cloud.kubernetes.leader.election.wait-for-pod-ready=true",
-	"spring.cloud.kubernetes.leader.election.restart-on-failure=true", "readiness.passes=true" })
+		"spring.cloud.kubernetes.leader.election.restart-on-failure=true", "readiness.passes=true" })
 class Fabric8LeaderElectionCompletedExceptionallyAndRestartedIT extends AbstractLeaderElection {
 
 	private static final String NAME = "acquired-then-fails";
@@ -68,8 +68,7 @@ void test(CapturedOutput output) {
 	}
 
 	private void afterLeaderFailure(int afterLeaderFailure, CapturedOutput output) {
-		awaitUntil(60, 100, () -> output.getOut().substring(afterLeaderFailure).
-			contains(NAME + " is the new leader"));
+		awaitUntil(60, 100, () -> output.getOut().substring(afterLeaderFailure).contains(NAME + " is the new leader"));
 
 		// lease has been re-acquired
 		assertThat(output.getOut().substring(afterLeaderFailure))
@@ -78,9 +77,10 @@ private void afterLeaderFailure(int afterLeaderFailure, CapturedOutput output) {
 		// renewal happens (comes from fabric code)
 		// this one means that we have extended our leadership
 		awaitUntil(30, 500,
-			() -> output.getOut().substring(afterLeaderFailure)
-				.contains("Attempting to renew leader lease 'LeaseLock: "
-					+ "default - spring-k8s-leader-election-lock (" + NAME + ")'"));
+				() -> output.getOut()
+					.substring(afterLeaderFailure)
+					.contains("Attempting to renew leader lease 'LeaseLock: "
+							+ "default - spring-k8s-leader-election-lock (" + NAME + ")'"));
 	}
 
 }

spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-leader-election/src/test/java/org/springframework/cloud/kubernetes/fabric8/leader/election/Fabric8LeaderElectionIsLostAndRestartedIT.java

@@ -27,13 +27,13 @@
 import static org.springframework.cloud.kubernetes.integration.tests.commons.Awaitilities.awaitUntil;
 
 /**
- * We acquire leadership, then lose it, then acquire it back.
- * This tests the "leaderFuture finished normally, will re-start it for" branch
+ * We acquire leadership, then lose it, then acquire it back. This tests the "leaderFuture
+ * finished normally, will re-start it for" branch
  *
  * @author wind57
  */
-@TestPropertySource(properties = { "spring.cloud.kubernetes.leader.election.wait-for-pod-ready=true",
-		"readiness.passes=true" })
+@TestPropertySource(
+		properties = { "spring.cloud.kubernetes.leader.election.wait-for-pod-ready=true", "readiness.passes=true" })
 public class Fabric8LeaderElectionIsLostAndRestartedIT extends AbstractLeaderElection {
 
 	private static final String NAME = "drops-than-recovers";

spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-leader-election/src/test/java/org/springframework/cloud/kubernetes/fabric8/leader/election/Fabric8LeaderElectionReadinessCanceledIT.java

@@ -47,8 +47,9 @@ static void beforeAll() {
 	void test(CapturedOutput output) {
 
 		// we are trying readiness at least once
-		awaitUntil(60, 500, () -> output.getOut().contains("Pod : canceled-readiness-it in namespace : "
-			+ "default is not ready, will retry in one second"));
+		awaitUntil(60, 500, () -> output.getOut()
+			.contains(
+					"Pod : canceled-readiness-it in namespace : " + "default is not ready, will retry in one second"));
 
 		initiator.preDestroy();