test: Improve integration test framework

.travis.yml

@@ -15,7 +15,6 @@ before_install:
   - sdk install java 8u144-zulu
 
 script:
-  - ./etc/scripts/run_etcd_docker.sh
   - sdk use java 8u144-zulu
   - java -version
   - ./mvnw clean install

README.md

@@ -77,16 +77,10 @@ The current major version is zero (0.y.z). Anything may change at any time. The
 
 ## Running tests
 
-The project is to be tested against a three node `etcd` setup, launched by the [scripts/run_etcd_docker.sh](etc/scripts/run_etcd_docker.sh) shell script:
-
-```
-./etc/scripts/run_etcd_docker.sh
-```
-
+The project is to be tested against a three node `etcd` setup, which automatically launched via Testcontainers framework.
+For more info and prerequisites visit [official website](https://www.testcontainers.org/)
 It should work on either macOS or Linux.
 
-Note: Make sure you don't have a default `etcd` running on your system! The script uses the default port `2379` for the first node, which fails to launch if that port is already taken.
-
 ```sh
 $ mvn test
 ...

jetcd-core/pom.xml

@@ -98,6 +98,11 @@
           <classifier>${os.detected.classifier}</classifier>
           <scope>test</scope>
         </dependency>
+        <dependency>
+          <groupId>org.testcontainers</groupId>
+          <artifactId>testcontainers</artifactId>
+          <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>

jetcd-core/src/test/java/com/coreos/jetcd/internal/impl/AuthClientTest.java

@@ -15,9 +15,6 @@
  */
 package com.coreos.jetcd.internal.impl;
 
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
-
 import com.coreos.jetcd.Auth;
 import com.coreos.jetcd.Client;
 import com.coreos.jetcd.KV;
@@ -26,15 +23,24 @@
 import com.coreos.jetcd.auth.Permission;
 import com.coreos.jetcd.auth.Permission.Type;
 import com.coreos.jetcd.data.ByteSequence;
-import java.util.List;
-import java.util.concurrent.ExecutionException;
+import com.coreos.jetcd.internal.infrastructure.ClusterFactory;
+import com.coreos.jetcd.internal.infrastructure.EtcdCluster;
+import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
 
+import java.io.IOException;
+import java.util.List;
+import java.util.concurrent.ExecutionException;
+
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
+
 /**
  * test etcd auth
  */
 public class AuthClientTest {
+  private static final EtcdCluster CLUSTER = ClusterFactory.buildSingleNodeCluster("auth-etcd");
 
   private ByteSequence rootRolekeyRangeBegin = ByteSequence.fromString("root");
   private ByteSequence rootkeyRangeEnd = ByteSequence.fromString("root1");
@@ -65,14 +71,16 @@ public class AuthClientTest {
   private Auth authDisabledAuthClient;
   private KV authDisabledKVClient;
 
+  private List<String> endpoints;
 
   /**
    * Build etcd client to create role, permission
    */
   @BeforeTest
   public void setupEnv() {
+    endpoints = CLUSTER.getClientEndpoints();
     Client client = Client.builder()
-        .endpoints("http://localhost:12379")
+        .endpoints(endpoints)
         .build();
 
     this.authDisabledKVClient = client.getKVClient();
@@ -165,11 +173,11 @@ public void testEnableAuth() throws ExecutionException, InterruptedException {
   @Test(dependsOnMethods = "testEnableAuth", groups = "authEnable", priority = 1)
   public void setupAuthClient() {
     this.userClient = Client.builder()
-        .endpoints("http://localhost:12379")
+        .endpoints(endpoints)
         .user(user)
         .password(userNewPass).build();
     this.rootClient = Client.builder()
-        .endpoints("http://localhost:12379")
+        .endpoints(endpoints)
         .user(root)
         .password(rootPass).build();
   }
@@ -261,4 +269,9 @@ public void delRole() throws ExecutionException, InterruptedException {
     this.authDisabledAuthClient.roleDelete(rootRole).get();
     this.authDisabledAuthClient.roleDelete(userRole).get();
   }
+
+  @AfterTest
+  public void tearDown() throws IOException {
+    CLUSTER.close();
+  }
 }

jetcd-core/src/test/java/com/coreos/jetcd/internal/impl/ClusterClientTest.java

@@ -20,29 +20,48 @@
 import com.coreos.jetcd.cluster.Member;
 import com.coreos.jetcd.cluster.MemberAddResponse;
 import com.coreos.jetcd.cluster.MemberListResponse;
+import com.coreos.jetcd.internal.infrastructure.ClusterFactory;
+import com.coreos.jetcd.internal.infrastructure.EtcdCluster;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+import org.testng.asserts.Assertion;
+
+import java.io.IOException;
 import java.util.Arrays;
+import java.util.List;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
-import org.testng.annotations.Test;
-import org.testng.asserts.Assertion;
 
 /**
  * test etcd cluster client
  */
 public class ClusterClientTest {
+  private static final EtcdCluster CLUSTER = ClusterFactory.buildThreeNodeCluster("CLUSTER-etcd");
 
   private Assertion assertion = new Assertion();
   private Member addedMember;
 
+  private List<String> endpoints;
+  private List<String> peerUrls;
+
   /**
    * test list cluster function
    */
+
+  @BeforeTest
+  public void setUp() throws InterruptedException {
+    endpoints = CLUSTER.getClientEndpoints();
+    peerUrls = CLUSTER.getPeerEndpoints();
+    TimeUnit.SECONDS.sleep(5);
+  }
+
   @Test
   public void testListCluster()
       throws ExecutionException, InterruptedException {
-    Client client = Client.builder().endpoints(TestConstants.endpoints).build();
+    Client client = Client.builder().endpoints(endpoints).build();
     Cluster clusterClient = client.getClusterClient();
     MemberListResponse response = clusterClient.listMember().get();
     assertion
@@ -56,14 +75,13 @@ public void testListCluster()
   public void testAddMember()
       throws ExecutionException, InterruptedException, TimeoutException {
     Client client = Client.builder()
-        .endpoints(Arrays.copyOfRange(TestConstants.endpoints, 0, 2))
+        .endpoints(endpoints.subList(0, 2))
         .build();
 
     Cluster clusterClient = client.getClusterClient();
     MemberListResponse response = clusterClient.listMember().get();
     assertion.assertEquals(response.getMembers().size(), 3);
-    CompletableFuture<MemberAddResponse> responseListenableFuture = clusterClient
-        .addMember(Arrays.asList(Arrays.copyOfRange(TestConstants.peerUrls, 2, 3)));
+    CompletableFuture<MemberAddResponse> responseListenableFuture = clusterClient.addMember(peerUrls.subList(2, 3));
     MemberAddResponse addResponse = responseListenableFuture.get(5, TimeUnit.SECONDS);
     addedMember = addResponse.getMember();
     assertion.assertNotNull(addedMember, "added member: " + addedMember.getId());
@@ -78,12 +96,12 @@ public void testUpdateMember() {
     Throwable throwable = null;
     try {
       Client client = Client.builder()
-          .endpoints(Arrays.copyOfRange(TestConstants.endpoints, 1, 3))
+          .endpoints(endpoints.subList(1, 3))
           .build();
 
       Cluster clusterClient = client.getClusterClient();
       MemberListResponse response = clusterClient.listMember().get();
-      String[] newPeerUrl = new String[]{"http://localhost:12380"};
+      String[] newPeerUrl = peerUrls.subList(0, 1).toArray(new String[]{});
       clusterClient.updateMember(response.getMembers().get(0).getId(), Arrays.asList(newPeerUrl))
           .get();
     } catch (Exception e) {
@@ -100,7 +118,7 @@ public void testUpdateMember() {
   public void testDeleteMember()
       throws ExecutionException, InterruptedException {
     Client client = Client.builder()
-        .endpoints(Arrays.copyOfRange(TestConstants.endpoints, 0, 2))
+        .endpoints(endpoints.subList(0, 2))
         .build();
 
     Cluster clusterClient = client.getClusterClient();
@@ -109,4 +127,9 @@ public void testDeleteMember()
     assertion.assertEquals(newCount, 3,
         "delete added member(" + addedMember.getId() + "), and left " + newCount + " members");
   }
+
+  @AfterTest
+  public void tearDown() throws IOException {
+    CLUSTER.close();
+  }
 }

jetcd-core/src/test/java/com/coreos/jetcd/internal/impl/KVTest.java

@@ -19,6 +19,8 @@
 import com.coreos.jetcd.KV;
 import com.coreos.jetcd.Txn;
 import com.coreos.jetcd.data.ByteSequence;
+import com.coreos.jetcd.internal.infrastructure.ClusterFactory;
+import com.coreos.jetcd.internal.infrastructure.EtcdCluster;
 import com.coreos.jetcd.kv.DeleteResponse;
 import com.coreos.jetcd.kv.GetResponse;
 import com.coreos.jetcd.kv.PutResponse;
@@ -30,17 +32,21 @@
 import com.coreos.jetcd.options.GetOption.SortOrder;
 import com.coreos.jetcd.options.GetOption.SortTarget;
 import com.coreos.jetcd.options.PutOption;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ExecutionException;
+import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
 import org.testng.asserts.Assertion;
 
+import java.io.IOException;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
+
 
 /**
  * KV service test cases.
  */
 public class KVTest {
+  private static final EtcdCluster CLUSTER = ClusterFactory.buildThreeNodeCluster("kv-etcd");
 
   private KV kvClient;
   private Assertion test;
@@ -55,7 +61,7 @@ public class KVTest {
   @BeforeTest
   public void setUp() throws Exception {
     test = new Assertion();
-    Client client = Client.builder().endpoints(TestConstants.endpoints).build();
+    Client client = CLUSTER.getClient();
     kvClient = client.getKVClient();
   }
 
@@ -221,4 +227,9 @@ public void testNestedTxn() throws Exception {
     test.assertEquals(getResp2.getKvs().size(), 1);
     test.assertEquals(getResp2.getKvs().get(0).getValue().toStringUtf8(), oneTwoThree.toStringUtf8());
   }
+
+  @AfterTest
+  public void tearDown() throws IOException {
+    CLUSTER.close();
+  }
 }