Move crosstests to unit tests (#65)

Translating previous tests into vanilla JUnit and removing a lot of
duplication code for the javalite suite.

.github/workflows/ci.yml

@@ -53,6 +53,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
+      - uses: bufbuild/[email protected]
+        with:
+          github_token: ${{ github.token }}
+      - uses: arduino/setup-protoc@v1
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
       - uses: docker-practice/actions-setup-docker@master
       - uses: actions/setup-go@v4
       - uses: bufbuild/[email protected]
@@ -82,6 +88,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
+      - uses: bufbuild/[email protected]
+        with:
+          github_token: ${{ github.token }}
+      - uses: arduino/setup-protoc@v1
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
       - name: Run tests
         run: make test
   lint:

Makefile

@@ -17,7 +17,7 @@ $(BIN)/license-headers: Makefile
 
 .PHONY: build
 build: generate ## Build the entire project.
-	./gradlew build
+	./gradlew build -x test
 
 .PHONY: buildplugin
 buildplugin: ## Build the connect-kotlin protoc plugin.
@@ -50,17 +50,11 @@ crosstestserverstop: ## Stop the server for cross tests.
 	-docker container stop serverconnect servergrpc
 
 .PHONY: crosstestsrun
-crosstestsrun: crosstestsrunjava crosstestsrunjavalite ## Run the cross tests.
+crosstestsrun: crosstestsrunjava ## Run the cross tests.
 
 .PHONY: crosstestsrunjava
 crosstestsrunjava: ## Run the cross tests for protoc-gen-java integration.
-	./gradlew crosstests:google-java:jar
-	java -jar ./crosstests/google-java/build/libs/google-java-crosstests.jar
-
-.PHONY: crosstestsrunjavalite
-crosstestsrunjavalite: ## Run the cross tests for protoc-gen-javalite integration.
-	./gradlew crosstests:google-javalite:jar
-	java -jar ./crosstests/google-javalite/build/libs/google-javalite-crosstests.jar
+	./gradlew crosstest:google-java:test
 
 .PHONY: generate
 generate: buildplugin generatecrosstests generateexamples ## Generate proto files for the entire project.
@@ -113,5 +107,5 @@ releaselocal: ## Release artifacts to local maven repository.
 	./gradlew --info publishToMavenLocal
 
 .PHONY: test
-test: ## Run tests for the library.
+test: generate ## Run tests for the library.
 	./gradlew library:test

crosstests/google-java/build.gradle.kts

@@ -12,20 +12,6 @@ tasks {
             freeCompilerArgs += "-Xopt-in=kotlin.RequiresOptIn"
         }
     }
-    jar {
-        manifest {
-            attributes(mapOf("Main-Class" to "build.buf.connect.crosstest.Main"))
-        }
-        duplicatesStrategy = DuplicatesStrategy.INCLUDE
-        // This line of code recursively collects and copies all of a project's files
-        // and adds them to the JAR itself. One can extend this task, to skip certain
-        // files or particular types at will
-        val sourcesMain = sourceSets.main.get()
-        val contents = configurations.runtimeClasspath.get()
-            .map { if (it.isDirectory) it else zipTree(it) } +
-            sourcesMain.output
-        from(contents)
-    }
 }
 
 sourceSets {
@@ -35,14 +21,18 @@ sourceSets {
 }
 
 dependencies {
-    implementation(libs.okhttp.core)
+
     implementation(libs.kotlin.coroutines.core)
-    implementation(libs.assertj)
     implementation(libs.protobuf.kotlin)
     implementation(project(":crosstests:common"))
     implementation(project(":extensions:google-java"))
-
     implementation(project(":okhttp"))
+
+    testImplementation(libs.okhttp.core)
+    testImplementation(libs.junit)
+    testImplementation(libs.assertj)
+    testImplementation(libs.mockito)
+    testImplementation(libs.kotlin.coroutines.core)
 }
 
 configure<SpotlessExtension> {