Sharing tests, fixtures, and proto generation

We removed a LOT of somewhat golden files and only consume them if some tests now.
Proto generation to be used in other tests are now in wire-test-proto-generation, and wire-tests contains proto fixtures and testing modules.

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

@@ -19,7 +19,6 @@ package com.squareup.wire
 
 import assertk.all
 import assertk.assertThat
-import assertk.assertions.contains
 import assertk.assertions.containsExactly
 import assertk.assertions.containsOnly
 import assertk.assertions.isEmpty
@@ -29,7 +28,6 @@ import assertk.assertions.isNotNull
 import assertk.assertions.isNull
 import assertk.assertions.isTrue
 import assertk.assertions.prop
-import assertk.assertions.size
 import com.squareup.wire.kotlin.EnumMode
 import com.squareup.wire.kotlin.RpcCallStyle
 import com.squareup.wire.kotlin.RpcRole
@@ -103,7 +101,7 @@ class WireCompilerTest {
     }
   }
 
-  @Test // TODO(Benoit) Delete? Nobody wanna maintain such a test
+  @Test
   fun allFlags() {
     fileSystem.appendingSink("foo.proto".toPath())
     fileSystem.appendingSink("bar.proto".toPath())

wire-compiler/src/test/java/com/squareup/wire/WireCompilerTest.kt

@@ -46,7 +46,6 @@ sourceSets {
   val test by getting {
     java.srcDir("build/generated/source/proto/test/grpc")
     java.srcDir("build/generated/source/proto/test/java")
-    java.srcDir("src/test/proto-grpc")
   }
 }
 
@@ -68,6 +67,7 @@ dependencies {
   testImplementation(libs.grpc.stub)
   testImplementation(libs.kotlin.test.junit)
   testImplementation(libs.protobuf.java)
+  testImplementation(projects.wireTestProtoGeneration.grpc)
 }
 
 val test by tasks.getting(Test::class) {
@@ -76,12 +76,3 @@ val test by tasks.getting(Test::class) {
     exceptionFormat = TestExceptionFormat.FULL
   }
 }
-
-configure<SpotlessExtension> {
-  kotlin {
-    targetExclude(
-      // Generated files.
-      "src/test/proto-grpc/**/*.kt",
-    )
-  }
-}