Skip to content

FieldMask: broader Swift generated-message coverage #3650

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_6
Choose a base branch
from
+16 −2
Draft

FieldMask: broader Swift generated-message coverage #3650

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
2 changes: 2 additions & 0 deletions wire-runtime-swift/src/test/proto/field_mask_message.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,6 @@ import "google/protobuf/field_mask.proto";

message MessageContainingFieldMask {
google.protobuf.FieldMask mask = 1;
repeated google.protobuf.FieldMask masks = 2;
map<int32, google.protobuf.FieldMask> masks_by_id = 3;
}
10 changes: 8 additions & 2 deletions wire-runtime-swift/src/test/swift/FieldMaskTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,13 +68,19 @@ final class FieldMaskTests: XCTestCase {
}

func testGeneratedMessageWithFieldMask() throws {
let fieldMask = FieldMask(paths: ["user.display_name", "photo"])
let otherFieldMask = FieldMask(paths: ["updated_at.seconds"])
let message = MessageContainingFieldMask {
$0.mask = FieldMask(paths: ["user.display_name", "photo"])
$0.mask = fieldMask
$0.masks = [fieldMask, otherFieldMask]
$0.masks_by_id = [1: fieldMask, 2: otherFieldMask]
}

let data = try ProtoEncoder().encode(message)
let decoded = try ProtoDecoder().decode(MessageContainingFieldMask.self, from: data)

XCTAssertEqual(decoded.mask, FieldMask(paths: ["user.display_name", "photo"]))
XCTAssertEqual(decoded.mask, fieldMask)
XCTAssertEqual(decoded.masks, [fieldMask, otherFieldMask])
XCTAssertEqual(decoded.masks_by_id, [1: fieldMask, 2: otherFieldMask])
}
}
6 changes: 6 additions & 0 deletions wire-swift-generator/src/test/java/com/squareup/wire/swift/SwiftGeneratorTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,8 @@ class SwiftGeneratorTest {
|
|message Message {
| google.protobuf.FieldMask mask = 1;
| repeated google.protobuf.FieldMask masks = 2;
| map<int32, google.protobuf.FieldMask> masks_by_id = 3;
|}
""".trimMargin(),
)
Expand All @@ -86,7 +88,11 @@ class SwiftGeneratorTest {

assertThat(code).contains("import Wire")
assertThat(code).contains("public var mask: FieldMask?")
assertThat(code).contains("public var masks: [FieldMask]")
assertThat(code).contains("public var masks_by_id: [Int32 : FieldMask]")
assertThat(code).contains("mask = try protoReader.decode(FieldMask.self)")
assertThat(code).contains("try protoReader.decode(into: &masks)")
assertThat(code).contains("try protoReader.decode(into: &masks_by_id, keyEncoding: .variable)")
assertThat(code).doesNotContain("@ProtoDefaulted")
}

Expand Down
Loading