updating to gradle 4.4

Author: dcendents

build.gradle

@@ -16,7 +16,7 @@ repositories {
 }
 
 ext {
-	gradleVersions = '4.3'
+	gradleVersions = '4.4'
 	androidGradleBuildVersion = '3.0.0-beta3'
 	androidCompileSdkVersion = 'android-26'
 	androidBuildToolsVersion = '26.0.1'
@@ -53,6 +53,7 @@ ext {
 
 versions.maven = "3.0.4"
 versions.groovy = "2.4.12"
+versions.ant = "1.9.9"
 
 dependencies {
 	jacocoRuntime "org.jacoco:org.jacoco.agent:${jacoco.toolVersion}:runtime"
@@ -65,7 +66,7 @@ dependencies {
 		dependency "org.apache.maven:maven-settings-builder:${versions.maven}@jar"
 
 		//plexus:
-		dependency "org.codehaus.plexus:plexus-utils:2.0.6@jar"
+		dependency "org.codehaus.plexus:plexus-utils:2.1@jar"
 		dependency "org.codehaus.plexus:plexus-interpolation:1.14@jar"
 		dependency "org.codehaus.plexus:plexus-component-annotations:1.5.5@jar"
 		dependency "org.codehaus.plexus:plexus-container-default:1.5.5@jar"
@@ -125,8 +126,8 @@ dependencies {
 	testCompile dependencies.module('org.apache.ivy:ivy:2.2.0'){
 		dependency "com.jcraft:jsch:0.1.54"
 	}
-	testCompile dependencies.module('org.apache.ant:ant:1.9.6') {
-		dependency 'org.apache.ant:ant-launcher:1.9.6@jar'
+	testCompile dependencies.module("org.apache.ant:ant:${versions.ant}") {
+		dependency "org.apache.ant:ant-launcher:${versions.ant}@jar"
 	}
 }
 
@@ -230,7 +231,7 @@ jacocoTestReport.dependsOn test
 check.dependsOn jacocoTestReport
 
 task wrapper(type: Wrapper) {
-    gradleVersion = '4.3'
+    gradleVersion = '4.4'
     distributionUrl = "https://services.gradle.org/distributions/gradle-${gradleVersion}-all.zip"
 }
 

gradle/wrapper/gradle-wrapper.jar

@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip

gradle/wrapper/gradle-wrapper.properties

@@ -94,6 +94,9 @@ class TestUtil {
     private static void hackInTaskProperties(Class type, Task task, Map args) {
         args.each { k, v ->
             def field = type.getDeclaredFields().find { it.name == k }
+            if (!field) {
+                field = type.getSuperclass().getDeclaredFields().find { it.name == k }
+            }
             if (field) {
                 field.setAccessible(true)
                 field.set(task, v)
@@ -179,6 +182,7 @@ class TestUtil {
     static String createUniqueId() {
         return new UID().toString();
     }
+
 }
 
 

src/test/core/src/testFixtures/groovy/org/gradle/util/TestUtil.groovy

@@ -22,7 +22,7 @@ class FixedAvailablePortAllocator extends AbstractAvailablePortAllocator {
     static final String WORKER_ID_SYS_PROPERTY = "org.gradle.test.worker"
     static final String AGENT_NUM_SYS_PROPERTY = "org.gradle.ci.agentNum"
     static final String TOTAL_AGENTS_SYS_PROPERTY = "org.gradle.ci.agentCount"
-    static final int DEFAULT_RANGE_SIZE = 50
+    static final int DEFAULT_RANGE_SIZE = 100
     private static FixedAvailablePortAllocator instance
     final int workerId
     final int agentNum

src/test/core/src/testFixtures/groovy/org/gradle/util/ports/FixedAvailablePortAllocator.groovy

@@ -21,7 +21,7 @@ import org.hamcrest.Matcher
 
 class DefaultTestExecutionResult implements TestExecutionResult {
 
-    def results = []
+    List<TestExecutionResult> results = []
 
     public DefaultTestExecutionResult(TestFile projectDir, String buildDirName = 'build', String binary='', String testedBinary = '', String testTaskName = 'test') {
         String binaryPath = binary?"/$binary":''
@@ -43,13 +43,25 @@ class DefaultTestExecutionResult implements TestExecutionResult {
     }
 
     TestClassExecutionResult testClass(String testClass) {
-        new DefaultTestClassExecutionResult(results.collect {it.testClass(testClass)});
+        new DefaultTestClassExecutionResult(results.collect {it.testClass(testClass)})
     }
 
     TestClassExecutionResult testClassStartsWith(String testClass) {
         new DefaultTestClassExecutionResult(results.collect { it.testClassStartsWith(testClass) })
     }
 
+    void assertNoTestClassesExecuted() {
+        assert totalNumberOfTestClassesExecuted == 0
+    }
+
+    @Override
+    int getTotalNumberOfTestClassesExecuted() {
+        assert !results.isEmpty()
+        def firstResult = results[0].totalNumberOfTestClassesExecuted
+        assert results.every { firstResult == it.totalNumberOfTestClassesExecuted }
+        return firstResult
+    }
+
     private class DefaultTestClassExecutionResult implements TestClassExecutionResult {
         def testClassResults
 

src/test/internal-testing/src/main/groovy/org/gradle/integtests/fixtures/DefaultTestExecutionResult.groovy

@@ -36,11 +36,16 @@ class HtmlTestExecutionResult implements TestExecutionResult {
     }
 
     private void indexContainsTestClass(String... expectedTestClasses) {
+        List<String> executedTestClasses = getExecutedTestClasses()
+        assert executedTestClasses.containsAll(expectedTestClasses)
+    }
+
+    private List<String> getExecutedTestClasses() {
         def indexFile = new File(htmlReportDirectory, "index.html")
         assert indexFile.exists()
         Document html = Jsoup.parse(indexFile, null)
         def executedTestClasses = html.select("div:has(h2:contains(Classes)).tab a").collect { it.text() }
-        assert executedTestClasses.containsAll(expectedTestClasses)
+        executedTestClasses
     }
 
     private void assertHtmlReportForTestClassExists(String... classNames) {
@@ -57,6 +62,11 @@ class HtmlTestExecutionResult implements TestExecutionResult {
         return new HtmlTestClassExecutionResult(new File(htmlReportDirectory, "classes").listFiles().find { it.name.startsWith(FileUtils.toSafeFileName(testClass)) })
     }
 
+    @Override
+    int getTotalNumberOfTestClassesExecuted() {
+        return getExecutedTestClasses().size()
+    }
+
     private static class HtmlTestClassExecutionResult implements TestClassExecutionResult {
         private File htmlFile
         private List<String> testsExecuted = []

src/test/internal-testing/src/main/groovy/org/gradle/integtests/fixtures/HtmlTestExecutionResult.groovy

@@ -45,10 +45,9 @@ class JUnitXmlTestExecutionResult implements TestExecutionResult {
         this
     }
 
-    def fromFileToTestClass(String s) {
-        s.replaceAll(/#([\d\w][\d\w])/){
-            (char)Integer.parseInt(it[1], 16)
-        }
+    String fromFileToTestClass(File junitXmlFile) {
+        def xml = new XmlSlurper().parse(junitXmlFile)
+        xml.@'name'.text()
     }
 
     TestClassExecutionResult testClass(String testClass) {
@@ -60,6 +59,11 @@ class JUnitXmlTestExecutionResult implements TestExecutionResult {
         return new JUnitTestClassExecutionResult(matching[1], matching[0], outputAssociation)
     }
 
+    @Override
+    int getTotalNumberOfTestClassesExecuted() {
+        return findClasses().size()
+    }
+
     private def findTestClass(String testClass) {
         def classes = findClasses()
         assertThat(classes.keySet(), hasItem(testClass))
@@ -84,7 +88,7 @@ class JUnitXmlTestExecutionResult implements TestExecutionResult {
         testResultsDir.eachFile { File file ->
             def matcher = (file.name=~/TEST-(.+)\.xml/)
             if (matcher.matches()) {
-                classes[fromFileToTestClass(matcher.group(1))] = file
+                classes[fromFileToTestClass(file)] = file
             }
         }
         return classes

src/test/internal-testing/src/main/groovy/org/gradle/integtests/fixtures/JUnitXmlTestExecutionResult.groovy

@@ -31,4 +31,6 @@ public interface TestExecutionResult {
      * Returns the result for the first test class whose name starts with the given string.
      */
     TestClassExecutionResult testClassStartsWith(String testClass);
+
+    int getTotalNumberOfTestClassesExecuted();
 }

src/test/internal-testing/src/main/groovy/org/gradle/integtests/fixtures/TestExecutionResult.java

@@ -87,7 +87,7 @@ public static Identifier getPunctuation() {
 
     public static Identifier getNonAscii() {
         if (OperatingSystem.current().isMacOsX()) {
-            // The hfs+ file system stores file names in decomposed form. Don't use precomposed characters on OS X, as way too few things normalise text correctly
+            // The hfs+ file system stores file names in decomposed form. Don't use precomposed characters on macOS, as way too few things normalise text correctly
             return new Identifier(NON_PRECOMPOSED_NON_ASCII, "non-ascii");
         }
         return new Identifier(NON_ASCII_CHARS, "non-ascii");