From 6cfc19edde6226ec7a3a58a8cacb713a3f861222 Mon Sep 17 00:00:00 2001 From: Thomas Van Lenten Date: Tue, 28 Jun 2016 09:00:06 -0400 Subject: Xcode project cleanup/setup. - Correct some cases sources were compiled into the static lib and the tests. - Enable Xcodes code coverage support on the unittests. We aren't complete on coverage, but having the data always there should make it easier to chip away at this going forward. - Drop method in tests that isn't used, wire up a validator in another test. --- objectivec/Tests/GPBUnknownFieldSetTest.m | 4 ---- objectivec/Tests/GPBWireFormatTests.m | 8 +++++++- 2 files changed, 7 insertions(+), 5 deletions(-) (limited to 'objectivec/Tests') diff --git a/objectivec/Tests/GPBUnknownFieldSetTest.m b/objectivec/Tests/GPBUnknownFieldSetTest.m index 01217ca6..b2b5b21e 100644 --- a/objectivec/Tests/GPBUnknownFieldSetTest.m +++ b/objectivec/Tests/GPBUnknownFieldSetTest.m @@ -60,10 +60,6 @@ unknownFields_ = emptyMessage_.unknownFields; } -- (GPBUnknownField *)getField:(int32_t)number { - return [unknownFields_ getField:number]; -} - // Constructs a protocol buffer which contains fields with all the same // numbers as allFieldsData except that each field is some other wire // type. diff --git a/objectivec/Tests/GPBWireFormatTests.m b/objectivec/Tests/GPBWireFormatTests.m index 2a406f11..dbeab215 100644 --- a/objectivec/Tests/GPBWireFormatTests.m +++ b/objectivec/Tests/GPBWireFormatTests.m @@ -46,6 +46,7 @@ TestAllTypes* message = [self allSetRepeatedCount:kGPBDefaultRepeatCount]; NSData* rawBytes = message.data; + [self assertFieldsInOrder:rawBytes]; XCTAssertEqual(message.serializedSize, (size_t)rawBytes.length); TestAllTypes* message2 = [TestAllTypes parseFromData:rawBytes error:NULL]; @@ -58,6 +59,7 @@ [self packedSetRepeatedCount:kGPBDefaultRepeatCount]; NSData* rawBytes = message.data; + [self assertFieldsInOrder:rawBytes]; XCTAssertEqual(message.serializedSize, (size_t)rawBytes.length); TestPackedTypes* message2 = @@ -74,6 +76,7 @@ TestAllExtensions* message = [self allExtensionsSetRepeatedCount:kGPBDefaultRepeatCount]; NSData* rawBytes = message.data; + [self assertFieldsInOrder:rawBytes]; XCTAssertEqual(message.serializedSize, (size_t)rawBytes.length); TestAllTypes* message2 = [TestAllTypes parseFromData:rawBytes error:NULL]; @@ -87,6 +90,7 @@ TestPackedExtensions* message = [self packedExtensionsSetRepeatedCount:kGPBDefaultRepeatCount]; NSData* rawBytes = message.data; + [self assertFieldsInOrder:rawBytes]; TestPackedTypes* message2 = [self packedSetRepeatedCount:kGPBDefaultRepeatCount]; @@ -102,6 +106,7 @@ TestAllTypes* message = [self allSetRepeatedCount:kGPBDefaultRepeatCount]; NSData* rawBytes = message.data; + [self assertFieldsInOrder:rawBytes]; GPBExtensionRegistry* registry = [self extensionRegistry]; @@ -113,7 +118,7 @@ } -- (void) testExtensionsSerializedSize { +- (void)testExtensionsSerializedSize { size_t allSet = [self allSetRepeatedCount:kGPBDefaultRepeatCount].serializedSize; size_t extensionSet = [self allExtensionsSetRepeatedCount:kGPBDefaultRepeatCount].serializedSize; XCTAssertEqual(allSet, extensionSet); @@ -124,6 +129,7 @@ TestPackedExtensions* message = [self packedExtensionsSetRepeatedCount:kGPBDefaultRepeatCount]; NSData* rawBytes = message.data; + [self assertFieldsInOrder:rawBytes]; GPBExtensionRegistry* registry = [self extensionRegistry]; -- cgit v1.2.3