Start running shared tests

Author: oldergod

gen-tests.gradle.kts

@@ -649,61 +649,6 @@ val generateMoshiTests by tasks.creating {
   )
 }
 
-// Shared Json tests.
-
-val generateSharedJsonCompactJavaTests by tasks.creating(JavaExec::class) {
-  group = "Generate Shared JSON Tests"
-  description = "Generates compat Java classes for shared JSON tests"
-  classpath = wire
-  mainClass.set("com.squareup.wire.WireCompiler")
-  args = listOf(
-          "--proto_path=wire-tests/src/commonTest/shared/proto/proto2",
-          "--proto_path=wire-tests/src/commonTest/shared/proto/proto3",
-          "--java_out=wire-tests/src/jvmJsonJavaTest/proto-java",
-          "--compact",
-          "all32.proto",
-          "all64.proto",
-          "all_types_proto2.proto",
-          "all_types_proto3_test_proto3_optional.proto",
-          "all_structs.proto",
-          "all_wrappers.proto",
-          "camel_case.proto",
-          "map_types.proto",
-          "pizza.proto"
-  )
-}
-
-val generateSharedJsonKotlinTests by tasks.creating(JavaExec::class) {
-  group = "Generate Shared JSON Tests"
-  description = "Generates Kotlin classes for shared JSON tests"
-  classpath = wire
-  mainClass.set("com.squareup.wire.WireCompiler")
-  args = listOf(
-          "--proto_path=wire-tests/src/commonTest/shared/proto/proto2",
-          "--proto_path=wire-tests/src/commonTest/shared/proto/proto3",
-          "--kotlin_out=wire-tests/src/jvmJsonKotlinTest/proto-kotlin",
-          "--java_interop",
-          "all32.proto",
-          "all64.proto",
-          "all_types_proto2.proto",
-          "all_types_proto3_test_proto3_optional.proto",
-          "all_structs.proto",
-          "all_wrappers.proto",
-          "camel_case.proto",
-          "map_types.proto",
-          "pizza.proto"
-  )
-}
-
-val generateSharedJson by tasks.creating {
-  group = "Generate Tests"
-  description = "Generates Java and Kotlin classes for shared JSON tests"
-  dependsOn(
-    generateSharedJsonCompactJavaTests,
-    generateSharedJsonKotlinTests
-  )
-}
-
 val generateTests by tasks.creating {
   group = "Generate Tests"
   description = "Generates all test classes"
@@ -731,7 +676,6 @@ val generateTests by tasks.creating {
     generateProto3KotlinTests,
     generateProto3JavaTests,
     generateProtoReader32KotlinTests,
-    generateSharedJson,
     generateOpaqueTypeTests,
   )
 }

settings.gradle.kts

@@ -60,6 +60,9 @@ include(":wire-schema-tests")
 include(":wire-swift-generator")
 include(":wire-test-utils")
 include(":wire-tests")
+include(":wire-tests-2:jvm-java-kotlin")
+include(":wire-tests-2:jvm-json-java")
+include(":wire-tests-2:jvm-json-kotlin")
 if (startParameter.projectProperties.get("swift") != "false") {
   include(":wire-runtime-swift")
   include(":wire-tests-swift")

wire-tests-2/jvm-java-kotlin/build.gradle.kts

@@ -0,0 +1,23 @@
+plugins {
+  kotlin("jvm")
+  id("com.squareup.wire")
+}
+
+dependencies {
+  implementation(libs.assertk)
+  implementation(libs.jimfs)
+  implementation(libs.kotlin.test.junit)
+  implementation(libs.truth)
+  implementation(projects.wireGsonSupport)
+  implementation(projects.wireMoshiAdapter)
+  implementation(projects.wireTestUtils)
+}
+
+wire {
+  sourcePath {
+    srcDir("../../wire-tests/src/commonTest/proto/java")
+  }
+
+  java {
+  }
+}

wire-tests-2/jvm-java-kotlin/src/test/java/com/squareup/wire/MapTest.kt

@@ -0,0 +1,83 @@
+/*
+ * Copyright (C) 2016 Square, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.squareup.wire
+
+import assertk.assertThat
+import assertk.assertions.isEmpty
+import assertk.assertions.isEqualTo
+import assertk.assertions.isNotNull
+import com.squareup.wire.internal.createRuntimeMessageAdapter
+import com.squareup.wire.map.Mappy
+import com.squareup.wire.map.Thing
+import java.io.IOException
+import okio.ByteString
+import okio.ByteString.Companion.decodeHex
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.junit.runners.Parameterized
+import org.junit.runners.Parameterized.Parameter
+import org.junit.runners.Parameterized.Parameters
+
+@RunWith(Parameterized::class)
+class MapTest {
+  @Parameter(0)
+  lateinit var name: String
+
+  @Parameter(1)
+  lateinit var adapter: ProtoAdapter<Mappy>
+
+  @Test
+  fun serialize() {
+    assertThat(ByteString.of(*adapter.encode(THREE))).isEqualTo(BYTES)
+
+    assertThat(adapter.encode(EMPTY)).isEmpty()
+  }
+
+  @Test
+  @Throws(IOException::class)
+  fun deserialize() {
+    assertThat(adapter.decode(BYTES)).isEqualTo(THREE)
+
+    val empty = adapter.decode(ByteArray(0))
+    assertThat(empty.things).isNotNull()
+  }
+
+  companion object {
+    private val BYTES =
+      "0a0c0a036f6e6512050a034f6e650a0c0a0374776f12050a0354776f0a100a05746872656512070a055468726565"
+        .decodeHex()
+    private val EMPTY = Mappy.Builder()
+      .build()
+    private val THREE = Mappy.Builder()
+      .things(mapOf("one" to Thing("One"), "two" to Thing("Two"), "three" to Thing("Three")))
+      .build()
+
+    @Parameters(name = "{0}")
+    @JvmStatic
+    fun parameters() = listOf(
+      arrayOf("Generated", Mappy.ADAPTER),
+      arrayOf(
+        "Runtime",
+        createRuntimeMessageAdapter(
+          Mappy::class.java,
+          "square.github.io/wire/unknown",
+          Syntax.PROTO_2,
+          Mappy::class.java.classLoader,
+        ),
+      ),
+    )
+  }
+}

wire-tests-2/jvm-java-kotlin/src/test/java/com/squareup/wire/MoshiRedactedTest.kt

@@ -0,0 +1,73 @@
+/*
+ * Copyright (C) 2020 Square, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.squareup.wire
+
+import assertk.assertThat
+import assertk.assertions.isEqualTo
+import com.squareup.moshi.Moshi
+import com.squareup.wire.protos.redacted.NotRedacted
+import com.squareup.wire.protos.redacted.RedactedChild
+import com.squareup.wire.protos.redacted.RedactedFields
+import org.junit.Test
+
+class MoshiRedactedTest {
+  @Test fun nonRedacted() {
+    val redacted = RedactedFields.Builder().a("a").b("b").c("c").build()
+    val jsonAdapter = moshi.adapter(RedactedFields::class.java)
+    assertThat(jsonAdapter.toJson(redacted)).isEqualTo("""{"a":"a","b":"b","c":"c"}""")
+  }
+
+  @Test fun redacted() {
+    val redacted = RedactedFields.Builder().a("a").b("b").c("c").build()
+    val jsonAdapter = moshi.adapter(RedactedFields::class.java).redacting()
+    assertThat(jsonAdapter.toJson(redacted))
+      .isEqualTo("""{"b":"b","c":"c","__redacted_fields":["a"]}""")
+  }
+
+  @Test fun redactedButSkipped() {
+    val redacted = RedactedFields.Builder().b("b").c("c").build()
+    val jsonAdapter = moshi.adapter(RedactedFields::class.java).redacting()
+    assertThat(jsonAdapter.toJson(redacted)).isEqualTo("""{"b":"b","c":"c"}""")
+  }
+
+  @Test fun redactedChild() {
+    val redacted = RedactedChild.Builder()
+      .a("a")
+      .b(
+        RedactedFields.Builder()
+          .a("a")
+          .b("b")
+          .c("c")
+          .build(),
+      ).c(
+        NotRedacted.Builder()
+          .a("a")
+          .b("b")
+          .build(),
+      ).build()
+
+    val jsonAdapter = moshi.adapter(RedactedChild::class.java).redacting()
+    assertThat(jsonAdapter.toJson(redacted)).isEqualTo(
+      """{"a":"a","b":{"b":"b","c":"c","__redacted_fields":["a"]},"c":{"a":"a","b":"b"}}""",
+    )
+  }
+
+  companion object {
+    private val moshi = Moshi.Builder()
+      .add(WireJsonAdapterFactory())
+      .build()
+  }
+}

wire-tests-2/jvm-java-kotlin/src/test/java/com/squareup/wire/OneOfTest.java

@@ -0,0 +1,107 @@
+/*
+ * Copyright (C) 2015 Square, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.squareup.wire;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.junit.Assert.fail;
+
+import com.squareup.wire.protos.oneof.OneOfMessage;
+import java.io.IOException;
+import org.junit.Test;
+
+public class OneOfTest {
+
+  private static final byte[] INITIAL_BYTES = {};
+  // (Tag #1 << 3 | VARINT) = 8.
+  private static final byte[] FOO_BYTES = {8, 17};
+  // (Tag #3 << 3 | LENGTH_DELIMITED) = 26, string length = 6.
+  private static final byte[] BAR_BYTES = {26, 6, 'b', 'a', 'r', 'b', 'a', 'r'};
+
+  private final ProtoAdapter<OneOfMessage> adapter = OneOfMessage.ADAPTER;
+
+  @Test
+  public void testOneOf() throws Exception {
+    OneOfMessage.Builder builder = new OneOfMessage.Builder();
+    validate(builder, null, null, INITIAL_BYTES);
+
+    builder.foo(17);
+    validate(builder, 17, null, FOO_BYTES);
+
+    builder.bar("barbar");
+    validate(builder, null, "barbar", BAR_BYTES);
+
+    builder.bar(null);
+    validate(builder, null, null, INITIAL_BYTES);
+
+    builder.bar("barbar");
+    validate(builder, null, "barbar", BAR_BYTES);
+
+    builder.foo(17);
+    validate(builder, 17, null, FOO_BYTES);
+
+    builder.foo(null);
+    validate(builder, null, null, INITIAL_BYTES);
+  }
+
+  @Test
+  public void buildFailsWhenBothFieldsAreNonNull() throws Exception {
+    OneOfMessage.Builder builder = new OneOfMessage.Builder();
+    builder.foo = 1;
+    builder.bar = "two";
+    try {
+      builder.build();
+      fail();
+    } catch (IllegalArgumentException expected) {
+      assertThat(expected)
+          .hasMessageThat()
+          .contains("at most one of foo, bar, baz may be non-null");
+    }
+  }
+
+  @Test
+  public void constructorFailsWhenBothFieldsAreNonNull() throws Exception {
+    try {
+      new OneOfMessage(1, "two", null);
+      fail();
+    } catch (IllegalArgumentException expected) {
+      assertThat(expected)
+          .hasMessageThat()
+          .contains("at most one of foo, bar, baz may be non-null");
+    }
+  }
+
+  private void validate(
+      OneOfMessage.Builder builder, Integer expectedFoo, String expectedBar, byte[] expectedBytes)
+      throws IOException {
+    // Check builder fields
+    assertThat(builder.foo).isEqualTo(expectedFoo);
+    assertThat(builder.bar).isEqualTo(expectedBar);
+
+    // Check message fields.
+    OneOfMessage message = builder.build();
+    assertThat(message.foo).isEqualTo(expectedFoo);
+    assertThat(message.bar).isEqualTo(expectedBar);
+
+    // Check serialized bytes.
+    byte[] bytes = adapter.encode(message);
+    assertThat(expectedBytes).isEqualTo(bytes);
+
+    // Check result of deserialization.
+    OneOfMessage newMessage = adapter.decode(bytes);
+    assertThat(newMessage.foo).isEqualTo(expectedFoo);
+    assertThat(newMessage.bar).isEqualTo(expectedBar);
+  }
+}