Merge pull request #2562 from square/bquenaudon.2023-08-16.extensiontest

Add test for extensions in proto path
square · Aug 16, 2023 · 34ad696 · 34ad696
2 parents 8641b6a + 125c587
commit 34ad696
Showing 1 changed file with 68 additions and 0 deletions.
diff --git a/wire-schema/src/jvmTest/kotlin/com/squareup/wire/schema/SchemaTest.kt b/wire-schema/src/jvmTest/kotlin/com/squareup/wire/schema/SchemaTest.kt
@@ -2535,6 +2535,74 @@ class SchemaTest {
     assertThat(schema.protoFile("squareup/domain/message.proto")).isNotNull()
   }
 
+  @Test
+  fun extensionInProtoPathDontLoad() {
+    val schema = buildSchema {
+      add(
+        "a/original.proto".toPath(),
+        """
+        |syntax = "proto2";
+        |package a;
+        |message A {
+        |  optional string one = 1;
+        |}
+        """.trimMargin(),
+      )
+      addProtoPath(
+        "b/extension.proto".toPath(),
+        """
+        |syntax = "proto2";
+        |package b;
+        |import "a/original.proto";
+        |extend a.A {
+        |  optional string two = 2;
+        |}
+        """.trimMargin(),
+      )
+    }
+    val fields = (schema.getType("a.A") as MessageType).fields
+    assertThat(fields).hasSize(1)
+    with(fields[0]) {
+      assertThat(namespaces).isEqualTo(listOf("a", "A"))
+      assertThat(name).isEqualTo("one")
+      assertThat(isExtension).isEqualTo(false)
+    }
+  }
+
+  @Test
+  fun extensionInSourceLoadsEvenIfParentMessageIsInProtoPath() {
+    val schema = buildSchema {
+      addProtoPath(
+        "a/original.proto".toPath(),
+        """
+        |syntax = "proto2";
+        |package a;
+        |message A {
+        |  optional string one = 1;
+        |}
+        """.trimMargin(),
+      )
+      add(
+        "b/extension.proto".toPath(),
+        """
+        |syntax = "proto2";
+        |package b;
+        |import "a/original.proto";
+        |extend a.A {
+        |  optional string two = 2;
+        |}
+        """.trimMargin(),
+      )
+    }
+    val fields = (schema.getType("a.A") as MessageType).fields
+    assertThat(fields).hasSize(1)
+    with(fields[0]) {
+      assertThat(namespaces).isEqualTo(listOf("b"))
+      assertThat(name).isEqualTo("two")
+      assertThat(isExtension).isEqualTo(true)
+    }
+  }
+
   @Test
   fun optionsWithRelativePathUsedInExtensions() {
     val schema = buildSchema {