Fixing integTests and adding new test

Author: Megamiun

buildSrc/src/test/java/org/elasticsearch/gradle/precommit/DependencyLicensesTasksIT.java

@@ -24,33 +24,49 @@
 public class DependencyLicensesTasksIT extends GradleIntegrationTestCase {
 
     public void testNoDependenciesWithNoFolder() {
-        GradleRunner runner = getRunner("no_dependencies_and_no_folder");
+        String project = "no_dependencies_and_no_folder";
+        GradleRunner runner = getRunner(project);
 
-        assertTaskSuccessful(runner.build(), ":no_dependencies_and_no_folder:dependencyLicenses");
+        assertTaskSuccessful(runner.build(), ":" + project + ":dependencyLicenses");
     }
 
     public void testDependenciesOk() {
-        GradleRunner runner = getRunner("dependencies_ok");
+        String project = "dependencies_ok";
+        GradleRunner runner = getRunner(project);
 
-        assertTaskSuccessful(runner.build(), ":dependencies_ok:dependencyLicenses");
+        assertTaskSuccessful(runner.build(), ":" + project + ":dependencyLicenses");
     }
 
     public void testNoDependenciesWithFolder() {
-        GradleRunner runner = getRunner("no_dependencies_with_folder");
+        String project = "no_dependencies_with_folder";
+        GradleRunner runner = getRunner(project);
 
-        assertTaskFailed(runner.buildAndFail(), ":no_dependencies_and_no_folder:dependencyLicenses");
+        String expectedOutcome = "Licenses dir " + getProjectName(runner, project) + "licenses exists, but there are no dependencies";
+        assertOutputContains(runner.buildAndFail().getOutput(), expectedOutcome);
     }
 
-    public void testDependenciesMissing() {
-        GradleRunner runner = getRunner("dependencies_missing");
+    public void testShaMissing() {
+        String project = "sha_missing";
+        GradleRunner runner = getRunner(project);
 
-        assertTaskFailed(runner.buildAndFail(), ":dependencies_missing:dependencyLicenses");
+        String expectedOutcome = "Missing SHA for icu4j-62.1.jar. Run \"gradle updateSHAs\" to create them";
+        assertOutputContains(runner.buildAndFail().getOutput(), expectedOutcome);
+    }
+
+    public void testLicensesMissing() {
+        String project = "license_missing";
+        GradleRunner runner = getRunner(project);
+
+        String expectedOutcome = "Missing LICENSE for icu4j-62.1.jar, expected in icu4j-LICENSE.txt";
+        assertOutputContains(runner.buildAndFail().getOutput(), expectedOutcome);
     }
 
     public void testTooManyDependencies() {
-        GradleRunner runner = getRunner("no_dependencies_with_folder");
+        String project = "dependencies_too_much";
+        GradleRunner runner = getRunner(project);
 
-        assertTaskFailed(runner.buildAndFail(), ":dependencies_too_much:dependencyLicenses");
+        String expectedOutcome = "Unused license super-csv-LICENSE.txt";
+        assertOutputContains(runner.buildAndFail().getOutput(), expectedOutcome);
     }
 
     private GradleRunner getRunner(String subProject) {
@@ -61,4 +77,7 @@ private GradleRunner getRunner(String subProject) {
             .withPluginClasspath();
     }
 
+    private String getProjectName(GradleRunner runner, String subProject) {
+        return runner.getProjectDir().toString() + "/" + subProject + "/";
+    }
 }

buildSrc/src/testKit/licenses/build.gradle

@@ -1,19 +1,15 @@
+plugins {
+    id 'java'
+    id 'elasticsearch.build'
+}
+
+ext.licenseFile = file("$buildDir/dummy/license")
+ext.noticeFile = file("$buildDir/dummy/notice")
+
 subprojects {
     apply plugin: 'java'
     apply plugin: 'elasticsearch.build'
 
-    repositories {
-        jcenter()
-        repositories {
-            maven {
-                url System.getProperty("local.repo.path")
-            }
-        }
-    }
-
-    unitTest.enabled = false
-    dependenciesInfo.enabled = false
-    forbiddenApisMain.enabled = false
-    forbiddenApisTest.enabled = false
-    thirdPartyAudit.enabled = false
+    ext.licenseFile = file("$buildDir/dummy/license")
+    ext.noticeFile = file("$buildDir/dummy/notice")
 }

buildSrc/src/testKit/licenses/dependencies_missing/licenses/.gitignore

@@ -0,0 +1 @@
+7a4d00d5ec5febd252a6182e8b6e87a0a9821f81

buildSrc/src/testKit/licenses/dependencies_missing/build.gradle renamed to buildSrc/src/testKit/licenses/license_missing/build.gradle

@@ -1,5 +1,6 @@
 include 'no_dependencies_and_no_folder'
 include 'no_dependencies_with_folder'
 include 'dependencies_ok'
-include 'dependencies_missing'
-include 'dependencies_too_much'
+include 'dependencies_too_much'
+include 'sha_missing'
+include 'license_missing'

buildSrc/src/testKit/licenses/license_missing/licenses/icu4j-62.1.jar.sha1

@@ -0,0 +1,3 @@
+dependencies {
+    compile "com.ibm.icu:icu4j:62.1"
+}

buildSrc/src/testKit/licenses/settings.gradle

@@ -0,0 +1,33 @@
+ICU License - ICU 1.8.1 and later
+
+COPYRIGHT AND PERMISSION NOTICE
+
+Copyright (c) 1995-2012 International Business Machines Corporation and others
+
+All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, and/or sell copies of the
+Software, and to permit persons to whom the Software is furnished to do so,
+provided that the above copyright notice(s) and this permission notice appear
+in all copies of the Software and that both the above copyright notice(s) and
+this permission notice appear in supporting documentation.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE BE
+LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR
+ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER
+IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
+OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder shall not
+be used in advertising or otherwise to promote the sale, use or other
+dealings in this Software without prior written authorization of the
+copyright holder.
+
+All trademarks and registered trademarks mentioned herein are the property of
+their respective owners.