Consolidate testclusters tests into a single project

Author: alpar-t

buildSrc/src/test/java/org/elasticsearch/gradle/testclusters/TestClustersPluginIT.java

@@ -39,34 +39,34 @@ public void testListClusters() {
     }
 
     public void testUseClusterByOne() {
-        BuildResult result = getTestClustersRunner("user1").build();
+        BuildResult result = getTestClustersRunner(":user1").build();
         assertTaskSuccessful(result, ":user1");
         assertStartedAndStoppedOnce(result);
     }
 
     public void testUseClusterByOneWithDryRun() {
-        BuildResult result = getTestClustersRunner("--dry-run", "user1").build();
+        BuildResult result = getTestClustersRunner("--dry-run", ":user1").build();
         assertNull(result.task(":user1"));
         assertNotStarted(result);
     }
 
     public void testUseClusterByTwo() {
-        BuildResult result = getTestClustersRunner("user1", "user2").build();
+        BuildResult result = getTestClustersRunner(":user1", ":user2").build();
         assertTaskSuccessful(result, ":user1", ":user2");
         assertStartedAndStoppedOnce(result);
     }
 
     public void testUseClusterByUpToDateTask() {
         // Run it once, ignoring the result and again to make sure it's considered up to date.
         // Gradle randomly considers tasks without inputs and outputs as as up-to-date or success on the first run
-        getTestClustersRunner("upToDate1", "upToDate2").build();
-        BuildResult result = getTestClustersRunner("upToDate1", "upToDate2").build();
+        getTestClustersRunner(":upToDate1", ":upToDate2").build();
+        BuildResult result = getTestClustersRunner(":upToDate1", ":upToDate2").build();
         assertTaskUpToDate(result, ":upToDate1", ":upToDate2");
         assertNotStarted(result);
     }
 
     public void testUseClusterBySkippedTask() {
-        BuildResult result = getTestClustersRunner("skipped1", "skipped2").build();
+        BuildResult result = getTestClustersRunner(":skipped1", ":skipped2").build();
         assertTaskSkipped(result, ":skipped1", ":skipped2");
         assertNotStarted(result);
     }
@@ -84,17 +84,44 @@ public void testUseClusterBySkippedAndWorkingTask() {
     }
 
     public void testMultiProject() {
-        BuildResult result = GradleRunner.create()
-            .withProjectDir(getProjectDir("testclusters_multiproject"))
-            .withArguments("user1", "user2", "-s", "-i", "--parallel", "-Dlocal.repo.path=" + getLocalTestRepoPath())
-            .withPluginClasspath()
-            .build();
-        assertTaskSuccessful(result, ":user1", ":user2");
+        BuildResult result = getTestClustersRunner(
+            "user1", "user2", "-s", "-i", "--parallel", "-Dlocal.repo.path=" + getLocalTestRepoPath()
+        ).build();
+
+        assertTaskSuccessful(
+            result,
+            ":user1", ":user2", ":alpha:user1", ":alpha:user2", ":bravo:user1", ":bravo:user2"
+        );
+        assertStartedAndStoppedOnce(result);
+        assertOutputOnlyOnce(
+            result.getOutput(),
+            "Starting `node{:alpha:myTestCluster}`",
+            "Stopping `node{::myTestCluster}`"
+        );
+        assertOutputOnlyOnce(
+            result.getOutput(),
+            "Starting `node{::myTestCluster}`",
+            "Stopping `node{:bravo:myTestCluster}`"
+        );
+    }
+
+    public void testIncremental() {
+        BuildResult result = getTestClustersRunner("clean", ":user1").build();
+        assertTaskSuccessful(result, ":user1");
+        assertStartedAndStoppedOnce(result);
+
+        result = getTestClustersRunner(":user1").build();
+        assertTaskSuccessful(result, ":user1");
+        assertStartedAndStoppedOnce(result);
+
+        result = getTestClustersRunner("clean", ":user1").build();
+        assertTaskSuccessful(result, ":user1");
+        assertStartedAndStoppedOnce(result);
         assertStartedAndStoppedOnce(result);
     }
 
     public void testUseClusterByFailingOne() {
-        BuildResult result = getTestClustersRunner("itAlwaysFails").buildAndFail();
+        BuildResult result = getTestClustersRunner(":itAlwaysFails").buildAndFail();
         assertTaskFailed(result, ":itAlwaysFails");
         assertStartedAndStoppedOnce(result);
         assertOutputContains(
@@ -105,7 +132,7 @@ public void testUseClusterByFailingOne() {
     }
 
     public void testUseClusterByFailingDependency() {
-        BuildResult result = getTestClustersRunner("dependsOnFailed").buildAndFail();
+        BuildResult result = getTestClustersRunner(":dependsOnFailed").buildAndFail();
         assertTaskFailed(result, ":itAlwaysFails");
         assertNull(result.task(":dependsOnFailed"));
         assertStartedAndStoppedOnce(result);
@@ -117,7 +144,7 @@ public void testUseClusterByFailingDependency() {
     }
 
     public void testConfigurationLocked() {
-        BuildResult result = getTestClustersRunner("illegalConfigAlter").buildAndFail();
+        BuildResult result = getTestClustersRunner(":illegalConfigAlter").buildAndFail();
         assertTaskFailed(result, ":illegalConfigAlter");
         assertOutputContains(
             result.getOutput(),

buildSrc/src/testKit/testclusters/build.gradle

@@ -1,31 +1,45 @@
 plugins {
     id 'elasticsearch.testclusters'
+    id 'base'
 }
 
-testClusters {
-    myTestCluster {
-        distribution = 'ZIP'
-        version = System.getProperty("test.version_under_test")
+allprojects { all ->
+    repositories {
+        maven {
+            url System.getProperty("local.repo.path")
+        }
+        String luceneSnapshotRevision = System.getProperty("test.lucene-snapshot-revision")
+        if (luceneSnapshotRevision != null) {
+            maven {
+                url "http://s3.amazonaws.com/download.elasticsearch.org/lucenesnapshots/" + luceneSnapshotRevision
+            }
+        }
+        jcenter()
     }
-}
 
-repositories {
-    maven {
-        url System.getProperty("local.repo.path")
-    }
-}
+    if (project == rootProject || project.name == "alpha" || project.name == "bravo") {
+        apply plugin: 'elasticsearch.testclusters'
 
-task user1 {
-    useCluster testClusters.myTestCluster
-    doLast {
-        println "$path: Cluster running @ ${testClusters.myTestCluster.httpSocketURI}"
-    }
-}
+        all.testClusters {
+            myTestCluster {
+                distribution = 'ZIP'
+                version = System.getProperty("test.version_under_test")
+                javaHome = file(System.getProperty('java.home'))
+            }
+        }
 
-task user2 {
-    useCluster testClusters.myTestCluster
-    doLast {
-        println "$path: Cluster running @ ${testClusters.myTestCluster.httpSocketURI}"
+        task user1 {
+            useCluster testClusters.myTestCluster
+            doFirst {
+                println "$path: Cluster running @ ${testClusters.myTestCluster.httpSocketURI}"
+            }
+        }
+        task user2 {
+            useCluster testClusters.myTestCluster
+            doFirst {
+                println "$path: Cluster running @ ${testClusters.myTestCluster.httpSocketURI}"
+            }
+        }
     }
 }
 

buildSrc/src/testKit/testclusters/settings.gradle

@@ -0,0 +1,4 @@
+include 'dummyPlugin'
+include ':alpha'
+include ':bravo'
+include ':charlie'