Add more tests

Author: mrabiciu

Protos/SwiftProtobufTests/test_messages_proto3.proto

@@ -60,44 +60,65 @@ message TestAllTypesProto3 {
   }
 
   // Singular
-  int32 optional_int32 = 1;
-  int64 optional_int64 = 2;
-  uint32 optional_uint32 = 3;
-  uint64 optional_uint64 = 4;
-  sint32 optional_sint32 = 5;
-  sint64 optional_sint64 = 6;
-  fixed32 optional_fixed32 = 7;
-  fixed64 optional_fixed64 = 8;
-  sfixed32 optional_sfixed32 = 9;
-  sfixed64 optional_sfixed64 = 10;
-  float optional_float = 11;
-  double optional_double = 12;
-  bool optional_bool = 13;
-  string optional_string = 14;
-  bytes optional_bytes = 15;
-
-  NestedMessage optional_nested_message = 18;
-
-  NestedEnum optional_nested_enum = 21;
+  optional int32 optional_int32 = 1;
+  optional int64 optional_int64 = 2;
+  optional uint32 optional_uint32 = 3;
+  optional uint64 optional_uint64 = 4;
+  optional sint32 optional_sint32 = 5;
+  optional sint64 optional_sint64 = 6;
+  optional fixed32 optional_fixed32 = 7;
+  optional fixed64 optional_fixed64 = 8;
+  optional sfixed32 optional_sfixed32 = 9;
+  optional sfixed64 optional_sfixed64 = 10;
+  optional float optional_float = 11;
+  optional double optional_double = 12;
+  optional bool optional_bool = 13;
+  optional string optional_string = 14;
+  optional bytes optional_bytes = 15;
+    
+  optional NestedMessage optional_nested_message = 16;
+    
+  optional NestedEnum optional_nested_enum = 17;
+    
+  int32 singular_int32 = 18;
+  int64 singular_int64 = 19;
+  uint32 singular_uint32 = 20;
+  uint64 singular_uint64 = 21;
+  sint32 singular_sint32 = 22;
+  sint64 singular_sint64 = 23;
+  fixed32 singular_fixed32 = 24;
+  fixed64 singular_fixed64 = 25;
+  sfixed32 singular_sfixed32 = 26;
+  sfixed64 singular_sfixed64 = 27;
+  float singular_float = 28;
+  double singular_double = 29;
+  bool singular_bool = 30;
+  string singular_string = 31;
+  bytes singular_bytes = 32;
+    
+  NestedMessage singular_nested_message = 33;
+      
+  NestedEnum singular_nested_enum = 34;
+
 
   // Repeated
-  repeated int32 repeated_int32 = 31;
-  repeated int64 repeated_int64 = 32;
-  repeated uint32 repeated_uint32 = 33;
-  repeated uint64 repeated_uint64 = 34;
-  repeated sint32 repeated_sint32 = 35;
-  repeated sint64 repeated_sint64 = 36;
-  repeated fixed32 repeated_fixed32 = 37;
-  repeated fixed64 repeated_fixed64 = 38;
-  repeated sfixed32 repeated_sfixed32 = 39;
-  repeated sfixed64 repeated_sfixed64 = 40;
-  repeated float repeated_float = 41;
-  repeated double repeated_double = 42;
-  repeated bool repeated_bool = 43;
-  repeated string repeated_string = 44;
-  repeated bytes repeated_bytes = 45;
-
-  repeated NestedMessage repeated_nested_message = 48;
+  repeated int32 repeated_int32 = 35;
+  repeated int64 repeated_int64 = 36;
+  repeated uint32 repeated_uint32 = 37;
+  repeated uint64 repeated_uint64 = 38;
+  repeated sint32 repeated_sint32 = 39;
+  repeated sint64 repeated_sint64 = 40;
+  repeated fixed32 repeated_fixed32 = 41;
+  repeated fixed64 repeated_fixed64 = 42;
+  repeated sfixed32 repeated_sfixed32 = 43;
+  repeated sfixed64 repeated_sfixed64 = 44;
+  repeated float repeated_float = 45;
+  repeated double repeated_double = 46;
+  repeated bool repeated_bool = 47;
+  repeated string repeated_string = 48;
+  repeated bytes repeated_bytes = 49;
+
+  repeated NestedMessage repeated_nested_message = 50;
 
   repeated NestedEnum repeated_nested_enum = 51;
 
@@ -154,12 +175,12 @@ message TestAllTypesProto3 {
   repeated google.protobuf.StringValue repeated_string_wrapper = 218;
   repeated google.protobuf.BytesValue repeated_bytes_wrapper = 219;
 
-  google.protobuf.Duration optional_duration = 301;
-  google.protobuf.Timestamp optional_timestamp = 302;
-  google.protobuf.FieldMask optional_field_mask = 303;
-  google.protobuf.Struct optional_struct = 304;
-  google.protobuf.Any optional_any = 305;
-  google.protobuf.Value optional_value = 306;
+  optional google.protobuf.Duration optional_duration = 301;
+  optional google.protobuf.Timestamp optional_timestamp = 302;
+  optional google.protobuf.FieldMask optional_field_mask = 303;
+  optional google.protobuf.Struct optional_struct = 304;
+  optional google.protobuf.Any optional_any = 305;
+  optional google.protobuf.Value optional_value = 306;
   google.protobuf.NullValue optional_null_value = 307;
 
   repeated google.protobuf.Duration repeated_duration = 311;

Tests/SwiftProtobufTests/TestHelpers.swift

@@ -134,17 +134,21 @@ extension PBTestHelpers where MessageTestType: SwiftProtobuf.Message & Equatable
 
     }
 
-    func assertJSONEncode(_ expected: String, extensions: any ExtensionMap = SimpleExtensionMap(), encodingOptions: JSONEncodingOptions = .init(), file: XCTestFileArgType = #file, line: UInt = #line, configure: (inout MessageTestType) -> Void) {
+    func assertJSONEncode(_ expected: String, extensions: any ExtensionMap = SimpleExtensionMap(), encodingOptions: JSONEncodingOptions = .init(), allowUnconfigured: Bool = false, assertEncodeDecodeEqual: Bool = true, file: XCTestFileArgType = #file, line: UInt = #line, configure: (inout MessageTestType) -> Void) {
         let empty = MessageTestType()
         var configured = empty
         configure(&configured)
-        XCTAssert(configured != empty, "Object should not be equal to empty object", file: file, line: line)
+        if !allowUnconfigured {
+            XCTAssert(configured != empty, "Object should not be equal to empty object", file: file, line: line)
+        }
         do {
             let encoded = try configured.jsonString(options: encodingOptions)
             XCTAssert(expected == encoded, "Did not encode correctly: got \(encoded) but expected \(expected)", file: file, line: line)
             do {
                 let decoded = try MessageTestType(jsonString: encoded, extensions: extensions)
-                XCTAssert(decoded == configured, "Encode/decode cycle should generate equal object: \(decoded) != \(configured)", file: file, line: line)
+                if assertEncodeDecodeEqual {
+                    XCTAssert(decoded == configured, "Encode/decode cycle should generate equal object: \(decoded) != \(configured)", file: file, line: line)
+                }
             } catch {
                 XCTFail("Encode/decode cycle should not throw error decoding: \(encoded), but it threw \(error)", file: file, line: line)
             }
@@ -160,7 +164,9 @@ extension PBTestHelpers where MessageTestType: SwiftProtobuf.Message & Equatable
             XCTAssert(expected == encodedString, "Did not encode correctly: got \(encodedString)", file: file, line: line)
             do {
                 let decoded = try MessageTestType(jsonUTF8Bytes: encodedData, extensions: extensions)
-                XCTAssert(decoded == configured, "Encode/decode cycle should generate equal object: \(decoded) != \(configured)", file: file, line: line)
+                if assertEncodeDecodeEqual {
+                    XCTAssert(decoded == configured, "Encode/decode cycle should generate equal object: \(decoded) != \(configured)", file: file, line: line)
+                }
             } catch {
                 XCTFail("Encode/decode cycle should not throw error decoding: \(encodedString), but it threw \(error)", file: file, line: line)
             }