Merge pull request #3472 from square/jwilson-bquenaudon.1118.actually_run_tests

Global test refactoring

Author: oldergod

gen-tests.gradle.kts

@@ -49,17 +49,30 @@ include(":wire-grpc-client")
 include(":wire-grpc-mockwebserver")
 include(":wire-grpc-tests")
 include(":wire-gson-support")
+include(":wire-gson-support-test")
 include(":wire-java-generator")
 include(":wire-kotlin-generator")
 include(":wire-moshi-adapter")
+include(":wire-moshi-adapter-test")
 include(":wire-protoc-compatibility-tests")
 include(":wire-reflector")
 include(":wire-runtime")
 include(":wire-schema")
 include(":wire-schema-tests")
 include(":wire-swift-generator")
+include(":wire-test-proto-generation:grpc")
+include(":wire-test-proto-generation:json-java")
+include(":wire-test-proto-generation:json-java-compact")
+include(":wire-test-proto-generation:json-kotlin")
+include(":wire-test-proto-generation:json-kotlin-interop")
 include(":wire-test-utils")
-include(":wire-tests")
+include(":wire-tests:jvm-annotations-interop")
+include(":wire-tests:jvm-java-kotlin")
+include(":wire-tests:jvm-json-java")
+include(":wire-tests:jvm-json-kotlin")
+include(":wire-tests:jvm-kotlin-interop")
+include(":wire-tests:jvm-kotlin-proto-reader-32")
+include(":wire-tests:multiplatform")
 if (startParameter.projectProperties.get("swift") != "false") {
   include(":wire-runtime-swift")
   include(":wire-tests-swift")

settings.gradle.kts

@@ -10,6 +10,7 @@ public final class com/squareup/wire/WireCompiler {
 	public static final field Companion Lcom/squareup/wire/WireCompiler$Companion;
 	public synthetic fun <init> (Lokio/FileSystem;Lcom/squareup/wire/WireLogger;Ljava/util/List;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/List;Ljava/util/List;Ljava/util/List;ZLjava/util/Map;ZZZZZZZZIZZZLcom/squareup/wire/kotlin/RpcCallStyle;Lcom/squareup/wire/kotlin/RpcRole;ZLjava/lang/String;ZZZZLcom/squareup/wire/kotlin/EnumMode;Ljava/util/List;Ljava/util/Map;Ljava/util/List;IILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public final fun compile ()V
+	public final fun createRun ()Lcom/squareup/wire/schema/WireRun;
 	public static final fun forArgs (Ljava/nio/file/FileSystem;Lcom/squareup/wire/WireLogger;[Ljava/lang/String;)Lcom/squareup/wire/WireCompiler;
 	public static final fun forArgs (Lokio/FileSystem;Lcom/squareup/wire/WireLogger;[Ljava/lang/String;)Lcom/squareup/wire/WireCompiler;
 	public static final fun forArgs (Lokio/FileSystem;[Ljava/lang/String;)Lcom/squareup/wire/WireCompiler;

wire-compiler/api/wire-compiler.api

@@ -158,6 +158,12 @@ class WireCompiler internal constructor(
 
   @Throws(IOException::class)
   fun compile() {
+    val wireRun = createRun()
+    wireRun.execute(fs, log)
+  }
+
+  @Throws(IOException::class)
+  fun createRun(): WireRun {
     val targets = mutableListOf<Target>()
     if (javaOut != null) {
       targets += JavaTarget(
@@ -221,7 +227,7 @@ class WireCompiler internal constructor(
       protoPath = listOf()
     }
 
-    val wireRun = WireRun(
+    return WireRun(
       sourcePath = sourcePath,
       protoPath = protoPath,
       treeShakingRoots = treeShakingRoots,
@@ -234,8 +240,6 @@ class WireCompiler internal constructor(
       rejectUnusedRootsOrPrunes = rejectUnusedRootsOrPrunes,
       opaqueTypes = opaqueTypes,
     )
-
-    wireRun.execute(fs, log)
   }
 
   /** Searches [sources] trying to resolve [proto]. Returns the location if it is found. */