Browse Source

Drop the test data hop through `Data`

Thomas Van Lenten 2 năm trước cách đây
mục cha
commit
7a87669f3e

+ 0 - 2
Makefile

@@ -326,7 +326,6 @@ Tests/SwiftProtobufPluginLibraryTests/DescriptorTestData.swift: build ${PROTOC_G
 	@echo 'let fileDescriptorSetBytes: [UInt8] = [' >> $@
 	@xxd -i < PluginLibDescriptorTestData.bin >> $@
 	@echo ']' >> $@
-	@echo 'let fileDescriptorSetData = Data(fileDescriptorSetBytes)' >> $@
 
 SWIFT_PLUGIN_DESCRIPTOR_TEST_PROTOS= \
        Protos/protoc-gen-swiftTests/plugin_descriptor_test.proto
@@ -344,7 +343,6 @@ Tests/protoc-gen-swiftTests/DescriptorTestData.swift: build ${PROTOC_GEN_SWIFT}
 	@echo 'let fileDescriptorSetBytes: [UInt8] = [' >> $@
 	@xxd -i < PluginDescriptorTestData.bin >> $@
 	@echo ']' >> $@
-	@echo 'let fileDescriptorSetData = Data(fileDescriptorSetBytes)' >> $@
 
 #
 # Collect a list of words that appear in the SwiftProtobuf library

+ 0 - 1
Tests/SwiftProtobufPluginLibraryTests/DescriptorTestData.swift

@@ -1411,4 +1411,3 @@ let fileDescriptorSetBytes: [UInt8] = [
   0x6f, 0x46, 0x69, 0x6c, 0x65, 0x50, 0x61, 0x74, 0x68, 0x62, 0x06, 0x70,
   0x72, 0x6f, 0x74, 0x6f, 0x33
 ]
-let fileDescriptorSetData = Data(fileDescriptorSetBytes)

+ 5 - 5
Tests/SwiftProtobufPluginLibraryTests/Test_Descriptor.swift

@@ -15,7 +15,7 @@ import SwiftProtobufPluginLibrary
 final class Test_Descriptor: XCTestCase {
 
   func testParsing() throws {
-    let fileSet = try Google_Protobuf_FileDescriptorSet(serializedData: fileDescriptorSetData)
+    let fileSet = try Google_Protobuf_FileDescriptorSet(serializedBytes: fileDescriptorSetBytes)
 
     let descriptorSet = DescriptorSet(proto: fileSet)
     XCTAssertEqual(descriptorSet.files.count, 5)
@@ -77,7 +77,7 @@ final class Test_Descriptor: XCTestCase {
   }
 
   func testLookup() throws {
-    let fileSet = try Google_Protobuf_FileDescriptorSet(serializedData: fileDescriptorSetData)
+    let fileSet = try Google_Protobuf_FileDescriptorSet(serializedBytes: fileDescriptorSetBytes)
 
     let descriptorSet = DescriptorSet(proto: fileSet)
 
@@ -95,7 +95,7 @@ final class Test_Descriptor: XCTestCase {
   }
 
   func testParents() throws {
-    let fileSet = try Google_Protobuf_FileDescriptorSet(serializedData: fileDescriptorSetData)
+    let fileSet = try Google_Protobuf_FileDescriptorSet(serializedBytes: fileDescriptorSetBytes)
 
     let descriptorSet = DescriptorSet(proto: fileSet)
 
@@ -131,7 +131,7 @@ final class Test_Descriptor: XCTestCase {
   }
 
   func testFields() throws {
-    let fileSet = try Google_Protobuf_FileDescriptorSet(serializedData: fileDescriptorSetData)
+    let fileSet = try Google_Protobuf_FileDescriptorSet(serializedBytes: fileDescriptorSetBytes)
 
     let descriptorSet = DescriptorSet(proto: fileSet)
 
@@ -307,7 +307,7 @@ final class Test_Descriptor: XCTestCase {
     // Extensions are a little different in how they have extensionScope and
     // containingType, so they are split out to be a clear test of their behaviors.
 
-    let fileSet = try Google_Protobuf_FileDescriptorSet(serializedData: fileDescriptorSetData)
+    let fileSet = try Google_Protobuf_FileDescriptorSet(serializedBytes: fileDescriptorSetBytes)
 
     let descriptorSet = DescriptorSet(proto: fileSet)
 

+ 0 - 1
Tests/protoc-gen-swiftTests/DescriptorTestData.swift

@@ -51,4 +51,3 @@ let fileDescriptorSetBytes: [UInt8] = [
   0x65, 0x6c, 0x64, 0x32, 0x31, 0x2a, 0x04, 0x08, 0x03, 0x10, 0x06, 0x2a,
   0x04, 0x08, 0x07, 0x10, 0x0d, 0x2a, 0x04, 0x08, 0x10, 0x10, 0x15
 ]
-let fileDescriptorSetData = Data(fileDescriptorSetBytes)

+ 1 - 1
Tests/protoc-gen-swiftTests/Test_DescriptorExtensions.swift

@@ -18,7 +18,7 @@ fileprivate typealias FileDescriptorProto = Google_Protobuf_FileDescriptorProto
 final class Test_DescriptorExtensions: XCTestCase {
 
   func testExtensionRanges() throws {
-    let fileSet = try Google_Protobuf_FileDescriptorSet(serializedData: fileDescriptorSetData)
+    let fileSet = try Google_Protobuf_FileDescriptorSet(serializedBytes: fileDescriptorSetBytes)
 
     let descriptorSet = DescriptorSet(proto: fileSet)