Skip to content

FieldMask: broader Java/Kotlin generated-message coverage #3651

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
oldergod wants to merge 1 commit into
base: bquenaudon.2026-07-02.fieldmask_7
Choose a base branch
from
+19 −0
Draft

FieldMask: broader Java/Kotlin generated-message coverage #3651

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions wire-java-generator/src/test/java/com/squareup/wire/java/JavaGeneratorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -925,11 +925,19 @@ public void usesFieldMask() throws Exception {
+ "import \"google/protobuf/field_mask.proto\";\n"
+ "message Message {\n"
+ " optional google.protobuf.FieldMask mask = 1;\n"
+ " repeated google.protobuf.FieldMask masks = 2;\n"
+ " map<int32, google.protobuf.FieldMask> masks_by_id = 3;\n"
+ "}\n")
.build();
String code = new JavaWithProfilesGenerator(schema).generateJava("common.proto.Message");
assertThat(code).contains("import com.squareup.wire.FieldMask;");
assertThat(code).contains("public final FieldMask mask;");
assertThat(code).contains("public final List<FieldMask> masks;");
assertThat(code).contains("public final Map<Integer, FieldMask> masks_by_id;");
assertThat(code).contains("ProtoAdapter.FIELD_MASK");
assertThat(code).contains("ProtoAdapter.FIELD_MASK.asRepeated()");
assertThat(code)
.contains("ProtoAdapter.newMapAdapter(ProtoAdapter.INT32, ProtoAdapter.FIELD_MASK)");
}

@Test
Expand Down
11 changes: 11 additions & 0 deletions wire-kotlin-generator/src/test/java/com/squareup/wire/kotlin/KotlinGeneratorTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1514,13 +1514,24 @@ class KotlinGeneratorTest {
|import "google/protobuf/field_mask.proto";
|message Message {
| optional google.protobuf.FieldMask mask = 1;
| repeated google.protobuf.FieldMask masks = 2;
| map<int32, google.protobuf.FieldMask> masks_by_id = 3;
|}
""".trimMargin(),
)
}
val code = KotlinWithProfilesGenerator(schema).generateKotlin("common.proto.Message")
assertThat(code).contains("import com.squareup.wire.FieldMask")
assertThat(code).contains("public val mask: FieldMask? = null")
assertThat(code).contains("masks: List<FieldMask> = emptyList()")
assertThat(code).contains("masks_by_id: Map<Int, FieldMask> = emptyMap()")
assertThat(code).contains("public val masks: List<FieldMask> = immutableCopyOf(\"masks\", masks)")
assertThat(code).contains(
"public val masks_by_id: Map<Int, FieldMask> = immutableCopyOf(\"masks_by_id\", masks_by_id)",
)
assertThat(code).contains("ProtoAdapter.FIELD_MASK")
assertThat(code).contains("ProtoAdapter.FIELD_MASK.asRepeated()")
assertThat(code).contains("ProtoAdapter.newMapAdapter(ProtoAdapter.INT32, ProtoAdapter.FIELD_MASK)")
}

@Test fun wildCommentsAreEscaped() {
Expand Down
Loading