!!! REVERT !!! Enable all tests, disable gradle scan

Author: rougsig

.github/workflows/testing.yml

@@ -3,7 +3,7 @@ name: GitHub Actions Linux Testing
 on:
   push:
     branches:
-    - master
+      - master
   pull_request:
 
 permissions:
@@ -21,14 +21,13 @@ jobs:
       - uses: gradle/gradle-build-action@v2
         with:
           arguments: clean assemble --stacktrace
-        
+
   test:
     needs: build
     strategy:
       matrix:
-        tests: [ProtobufKotlinDslPluginTest]
+        tests: [ProtobufJavaPluginTest, ProtobufKotlinDslCopySpecTest, ProtobufKotlinDslPluginTest, ProtobufAndroidPluginTest, ProtobufAndroidPluginKotlinTest, AndroidProjectDetectionTest]
     runs-on: ubuntu-latest
-    timeout-minutes: 30
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-java@v2

src/test/groovy/com/google/protobuf/gradle/ProtobufKotlinDslPluginTest.groovy

@@ -17,33 +17,33 @@ class ProtobufKotlinDslPluginTest extends Specification {
   private static final List<String> GRADLE_VERSIONS = [/*"5.6", "6.1.1", "6.5",*/ "7.4.2"]
   private static final List<String> ANDROID_PLUGIN_VERSION = [/*"3.5.0", "4.0.0", "4.1.0",*/ "7.2.1"]
 
-//  @Unroll
-//  void "testProjectKotlinDsl should be successfully executed (java-only project) [gradle #gradleVersion]"() {
-//    given: "project from testProjectKotlinDslBase"
-//    File projectDir = ProtobufPluginTestHelper.projectBuilder('testProjectKotlinDsl')
-//        .copyDirs('testProjectKotlinDslBase')
-//        .build()
-//
-//    when: "build is invoked"
-//    BuildResult result = GradleRunner.create()
-//      .withProjectDir(projectDir)
-//      .withArguments('build', '--stacktrace')
-//      .withPluginClasspath()
-//      .withGradleVersion(gradleVersion)
-//      .forwardStdOutput(new OutputStreamWriter(System.out))
-//      .forwardStdError(new OutputStreamWriter(System.err))
-//    // Enabling debug causes the test to fail.
-//    // https://github.com/gradle/gradle/issues/6862
-//    //.withDebug(true)
-//      .build()
-//
-//    then: "it succeed"
-//    result.task(":build").outcome == TaskOutcome.SUCCESS
-//    ProtobufPluginTestHelper.verifyProjectDir(projectDir)
-//
-//    where:
-//    gradleVersion << GRADLE_VERSIONS
-//  }
+  @Unroll
+  void "testProjectKotlinDsl should be successfully executed (java-only project) [gradle #gradleVersion]"() {
+    given: "project from testProjectKotlinDslBase"
+    File projectDir = ProtobufPluginTestHelper.projectBuilder('testProjectKotlinDsl')
+        .copyDirs('testProjectKotlinDslBase')
+        .build()
+
+    when: "build is invoked"
+    BuildResult result = GradleRunner.create()
+      .withProjectDir(projectDir)
+      .withArguments('build', '--stacktrace')
+      .withPluginClasspath()
+      .withGradleVersion(gradleVersion)
+      .forwardStdOutput(new OutputStreamWriter(System.out))
+      .forwardStdError(new OutputStreamWriter(System.err))
+    // Enabling debug causes the test to fail.
+    // https://github.com/gradle/gradle/issues/6862
+    //.withDebug(true)
+      .build()
+
+    then: "it succeed"
+    result.task(":build").outcome == TaskOutcome.SUCCESS
+    ProtobufPluginTestHelper.verifyProjectDir(projectDir)
+
+    where:
+    gradleVersion << GRADLE_VERSIONS
+  }
 
   @Unroll
   void "testProjectAndroidKotlinDsl should be successfully executed [android #agpVersion, gradle #gradleVersion]"() {
@@ -64,8 +64,7 @@ class ProtobufKotlinDslPluginTest extends Specification {
         mainProjectDir,
         gradleVersion,
         agpVersion,
-        "testProjectAndroidKotlinDsl:build",
-        "--scan"
+        "testProjectAndroidKotlinDsl:build"
     )
 
     then: "it succeed"

src/test/groovy/com/google/protobuf/gradle/ProtobufPluginTestHelper.groovy

@@ -128,19 +128,6 @@ final class ProtobufPluginTestHelper {
         File settingsFile = new File(projectDir, 'settings.gradle')
         settingsFile.createNewFile()
 
-        settingsFile << """
-          plugins {
-              id "com.gradle.enterprise" version "3.10.2"
-          }
-
-          gradleEnterprise {
-            buildScan {
-                  termsOfServiceUrl = "https://gradle.com/terms-of-service"
-                  termsOfServiceAgree = "yes"
-              }
-          }
-          """
-
         subProjects.each {
           File subProjectDir = new File(projectDir.path, it.name)
           FileUtils.copyDirectory(it, subProjectDir)