Skip to content

Commit 09a67b6

Browse files
thomasvlthomasvl
committed
Flatten some of the test protos
Not sure why I did the directory originally, we fork these so they won't break us if upstream changes them, but for some reason didn't flatten them.
1 parent 97c8dbd commit 09a67b6

File tree

9 files changed

+40
-44
lines changed

9 files changed

+40
-44
lines changed

‎Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -354,8 +354,8 @@ SWIFT_PLUGINLIB_DESCRIPTOR_TEST_PROTOS= \
354354
Protos/SwiftProtobufPluginLibraryTests/pluginlib_descriptor_test.proto \
355355
Protos/SwiftProtobufPluginLibraryTests/pluginlib_descriptor_test2.proto \
356356
Protos/SwiftProtobufPluginLibraryTests/pluginlib_descriptor_delimited.proto \
357-
Protos/SwiftProtobufPluginLibraryTests/google/protobuf/unittest_delimited.proto \
358-
Protos/SwiftProtobufPluginLibraryTests/google/protobuf/unittest_delimited_import.proto \
357+
Protos/SwiftProtobufPluginLibraryTests/unittest_delimited.proto \
358+
Protos/SwiftProtobufPluginLibraryTests/unittest_delimited_import.proto \
359359
Protos/SwiftProtobufPluginLibrary/google/protobuf/compiler/plugin.proto \
360360
Protos/SwiftProtobufPluginLibrary/swift_protobuf_module_mappings.proto
361361

Protos/SwiftProtobufPluginLibraryTests/google/protobuf/unittest_delimited.proto renamed to Protos/SwiftProtobufPluginLibraryTests/unittest_delimited.proto

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ edition = "2023";
22

33
package editions_unittest;
44

5-
import "google/protobuf/unittest_delimited_import.proto";
5+
import "unittest_delimited_import.proto";
66

77
option java_multiple_files = true;
88

Protos/SwiftProtobufPluginLibraryTests/google/protobuf/unittest_delimited_import.proto renamed to Protos/SwiftProtobufPluginLibraryTests/unittest_delimited_import.proto

File renamed without changes.

Reference/SwiftProtobufPluginLibraryTests/google/protobuf/unittest_delimited.pb.swift renamed to Reference/SwiftProtobufPluginLibraryTests/unittest_delimited.pb.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// swiftlint:disable all
44
//
55
// Generated by the Swift generator plugin for the protocol buffer compiler.
6-
// Source: google/protobuf/unittest_delimited.proto
6+
// Source: unittest_delimited.proto
77
//
88
// For information on using the generated types, please see the documentation:
99
// https://github.com/apple/swift-protobuf/

Reference/SwiftProtobufPluginLibraryTests/google/protobuf/unittest_delimited_import.pb.swift renamed to Reference/SwiftProtobufPluginLibraryTests/unittest_delimited_import.pb.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// swiftlint:disable all
44
//
55
// Generated by the Swift generator plugin for the protocol buffer compiler.
6-
// Source: google/protobuf/unittest_delimited_import.proto
6+
// Source: unittest_delimited_import.proto
77
//
88
// For information on using the generated types, please see the documentation:
99
// https://github.com/apple/swift-protobuf/

‎Tests/SwiftProtobufPluginLibraryTests/DescriptorTestData.swift‎

Lines changed: 31 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -7575,40 +7575,36 @@ let fileDescriptorSetBytes: [UInt8] = [
75757575
0x05, 0x04, 0x00, 0x02, 0x04, 0x08, 0x12, 0x04, 0x1b, 0x38, 0x1d, 0x03,
75767576
0x0a, 0x0e, 0x0a, 0x07, 0x04, 0x00, 0x02, 0x04, 0x08, 0x15, 0x05, 0x12,
75777577
0x03, 0x1c, 0x04, 0x2f, 0x62, 0x08, 0x65, 0x64, 0x69, 0x74, 0x69, 0x6f,
7578-
0x6e, 0x73, 0x70, 0xe8, 0x07, 0x0a, 0xbc, 0x02, 0x0a, 0x2f, 0x67, 0x6f,
7579-
0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75,
7580-
0x66, 0x2f, 0x75, 0x6e, 0x69, 0x74, 0x74, 0x65, 0x73, 0x74, 0x5f, 0x64,
7581-
0x65, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x65, 0x64, 0x5f, 0x69, 0x6d, 0x70,
7582-
0x6f, 0x72, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x11, 0x65,
7583-
0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x5f, 0x75, 0x6e, 0x69, 0x74,
7584-
0x74, 0x65, 0x73, 0x74, 0x22, 0x2b, 0x0a, 0x0d, 0x4d, 0x65, 0x73, 0x73,
7585-
0x61, 0x67, 0x65, 0x49, 0x6d, 0x70, 0x6f, 0x72, 0x74, 0x12, 0x0c, 0x0a,
7586-
0x01, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x01, 0x61, 0x12,
7587-
0x0c, 0x0a, 0x01, 0x62, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x01,
7588-
0x62, 0x42, 0x02, 0x50, 0x01, 0x4a, 0xb7, 0x01, 0x0a, 0x06, 0x12, 0x04,
7589-
0x00, 0x00, 0x09, 0x01, 0x0a, 0x08, 0x0a, 0x01, 0x0c, 0x12, 0x03, 0x00,
7590-
0x00, 0x11, 0x0a, 0x08, 0x0a, 0x01, 0x02, 0x12, 0x03, 0x02, 0x00, 0x1a,
7591-
0x0a, 0x08, 0x0a, 0x01, 0x08, 0x12, 0x03, 0x04, 0x00, 0x22, 0x0a, 0x09,
7592-
0x0a, 0x02, 0x08, 0x0a, 0x12, 0x03, 0x04, 0x00, 0x22, 0x0a, 0x0a, 0x0a,
7593-
0x02, 0x04, 0x00, 0x12, 0x04, 0x06, 0x00, 0x09, 0x01, 0x0a, 0x0a, 0x0a,
7594-
0x03, 0x04, 0x00, 0x01, 0x12, 0x03, 0x06, 0x08, 0x15, 0x0a, 0x0b, 0x0a,
7595-
0x04, 0x04, 0x00, 0x02, 0x00, 0x12, 0x03, 0x07, 0x02, 0x0e, 0x0a, 0x0c,
7596-
0x0a, 0x05, 0x04, 0x00, 0x02, 0x00, 0x05, 0x12, 0x03, 0x07, 0x02, 0x07,
7597-
0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x00, 0x02, 0x00, 0x01, 0x12, 0x03, 0x07,
7598-
0x08, 0x09, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x00, 0x02, 0x00, 0x03, 0x12,
7599-
0x03, 0x07, 0x0c, 0x0d, 0x0a, 0x0b, 0x0a, 0x04, 0x04, 0x00, 0x02, 0x01,
7600-
0x12, 0x03, 0x08, 0x02, 0x0e, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x00, 0x02,
7601-
0x01, 0x05, 0x12, 0x03, 0x08, 0x02, 0x07, 0x0a, 0x0c, 0x0a, 0x05, 0x04,
7602-
0x00, 0x02, 0x01, 0x01, 0x12, 0x03, 0x08, 0x08, 0x09, 0x0a, 0x0c, 0x0a,
7603-
0x05, 0x04, 0x00, 0x02, 0x01, 0x03, 0x12, 0x03, 0x08, 0x0c, 0x0d, 0x62,
7604-
0x08, 0x65, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x70, 0xe8, 0x07,
7605-
0x0a, 0xf7, 0x1e, 0x0a, 0x28, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f,
7606-
0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x75, 0x6e, 0x69,
7607-
0x74, 0x74, 0x65, 0x73, 0x74, 0x5f, 0x64, 0x65, 0x6c, 0x69, 0x6d, 0x69,
7608-
0x74, 0x65, 0x64, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x11, 0x65,
7609-
0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x5f, 0x75, 0x6e, 0x69, 0x74,
7610-
0x74, 0x65, 0x73, 0x74, 0x1a, 0x2f, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65,
7611-
0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x75, 0x6e,
7578+
0x6e, 0x73, 0x70, 0xe8, 0x07, 0x0a, 0xac, 0x02, 0x0a, 0x1f, 0x75, 0x6e,
7579+
0x69, 0x74, 0x74, 0x65, 0x73, 0x74, 0x5f, 0x64, 0x65, 0x6c, 0x69, 0x6d,
7580+
0x69, 0x74, 0x65, 0x64, 0x5f, 0x69, 0x6d, 0x70, 0x6f, 0x72, 0x74, 0x2e,
7581+
0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x11, 0x65, 0x64, 0x69, 0x74, 0x69,
7582+
0x6f, 0x6e, 0x73, 0x5f, 0x75, 0x6e, 0x69, 0x74, 0x74, 0x65, 0x73, 0x74,
7583+
0x22, 0x2b, 0x0a, 0x0d, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x49,
7584+
0x6d, 0x70, 0x6f, 0x72, 0x74, 0x12, 0x0c, 0x0a, 0x01, 0x61, 0x18, 0x01,
7585+
0x20, 0x01, 0x28, 0x05, 0x52, 0x01, 0x61, 0x12, 0x0c, 0x0a, 0x01, 0x62,
7586+
0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x01, 0x62, 0x42, 0x02, 0x50,
7587+
0x01, 0x4a, 0xb7, 0x01, 0x0a, 0x06, 0x12, 0x04, 0x00, 0x00, 0x09, 0x01,
7588+
0x0a, 0x08, 0x0a, 0x01, 0x0c, 0x12, 0x03, 0x00, 0x00, 0x11, 0x0a, 0x08,
7589+
0x0a, 0x01, 0x02, 0x12, 0x03, 0x02, 0x00, 0x1a, 0x0a, 0x08, 0x0a, 0x01,
7590+
0x08, 0x12, 0x03, 0x04, 0x00, 0x22, 0x0a, 0x09, 0x0a, 0x02, 0x08, 0x0a,
7591+
0x12, 0x03, 0x04, 0x00, 0x22, 0x0a, 0x0a, 0x0a, 0x02, 0x04, 0x00, 0x12,
7592+
0x04, 0x06, 0x00, 0x09, 0x01, 0x0a, 0x0a, 0x0a, 0x03, 0x04, 0x00, 0x01,
7593+
0x12, 0x03, 0x06, 0x08, 0x15, 0x0a, 0x0b, 0x0a, 0x04, 0x04, 0x00, 0x02,
7594+
0x00, 0x12, 0x03, 0x07, 0x02, 0x0e, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x00,
7595+
0x02, 0x00, 0x05, 0x12, 0x03, 0x07, 0x02, 0x07, 0x0a, 0x0c, 0x0a, 0x05,
7596+
0x04, 0x00, 0x02, 0x00, 0x01, 0x12, 0x03, 0x07, 0x08, 0x09, 0x0a, 0x0c,
7597+
0x0a, 0x05, 0x04, 0x00, 0x02, 0x00, 0x03, 0x12, 0x03, 0x07, 0x0c, 0x0d,
7598+
0x0a, 0x0b, 0x0a, 0x04, 0x04, 0x00, 0x02, 0x01, 0x12, 0x03, 0x08, 0x02,
7599+
0x0e, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x00, 0x02, 0x01, 0x05, 0x12, 0x03,
7600+
0x08, 0x02, 0x07, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x00, 0x02, 0x01, 0x01,
7601+
0x12, 0x03, 0x08, 0x08, 0x09, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x00, 0x02,
7602+
0x01, 0x03, 0x12, 0x03, 0x08, 0x0c, 0x0d, 0x62, 0x08, 0x65, 0x64, 0x69,
7603+
0x74, 0x69, 0x6f, 0x6e, 0x73, 0x70, 0xe8, 0x07, 0x0a, 0xd7, 0x1e, 0x0a,
7604+
0x18, 0x75, 0x6e, 0x69, 0x74, 0x74, 0x65, 0x73, 0x74, 0x5f, 0x64, 0x65,
7605+
0x6c, 0x69, 0x6d, 0x69, 0x74, 0x65, 0x64, 0x2e, 0x70, 0x72, 0x6f, 0x74,
7606+
0x6f, 0x12, 0x11, 0x65, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x5f,
7607+
0x75, 0x6e, 0x69, 0x74, 0x74, 0x65, 0x73, 0x74, 0x1a, 0x1f, 0x75, 0x6e,
76127608
0x69, 0x74, 0x74, 0x65, 0x73, 0x74, 0x5f, 0x64, 0x65, 0x6c, 0x69, 0x6d,
76137609
0x69, 0x74, 0x65, 0x64, 0x5f, 0x69, 0x6d, 0x70, 0x6f, 0x72, 0x74, 0x2e,
76147610
0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x2c, 0x0a, 0x0e, 0x4c, 0x65, 0x6e,
@@ -7727,7 +7723,7 @@ let fileDescriptorSetBytes: [UInt8] = [
77277723
0x42, 0x02, 0x50, 0x01, 0x4a, 0xae, 0x13, 0x0a, 0x06, 0x12, 0x04, 0x00,
77287724
0x00, 0x4c, 0x01, 0x0a, 0x08, 0x0a, 0x01, 0x0c, 0x12, 0x03, 0x00, 0x00,
77297725
0x11, 0x0a, 0x08, 0x0a, 0x01, 0x02, 0x12, 0x03, 0x02, 0x00, 0x1a, 0x0a,
7730-
0x09, 0x0a, 0x02, 0x03, 0x00, 0x12, 0x03, 0x04, 0x00, 0x39, 0x0a, 0x08,
7726+
0x09, 0x0a, 0x02, 0x03, 0x00, 0x12, 0x03, 0x04, 0x00, 0x29, 0x0a, 0x08,
77317727
0x0a, 0x01, 0x08, 0x12, 0x03, 0x06, 0x00, 0x22, 0x0a, 0x09, 0x0a, 0x02,
77327728
0x08, 0x0a, 0x12, 0x03, 0x06, 0x00, 0x22, 0x0a, 0x6c, 0x0a, 0x02, 0x04,
77337729
0x00, 0x12, 0x04, 0x0b, 0x00, 0x0e, 0x01, 0x32, 0x60, 0x20, 0x54, 0x65,

‎Tests/SwiftProtobufPluginLibraryTests/Test_Descriptor.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ final class Test_Descriptor: XCTestCase {
3737
XCTAssertEqual(descriptorSet.files[2].name, "pluginlib_descriptor_test.proto")
3838
XCTAssertEqual(descriptorSet.files[3].name, "pluginlib_descriptor_test2.proto")
3939
XCTAssertEqual(descriptorSet.files[4].name, "pluginlib_descriptor_delimited.proto")
40-
XCTAssertEqual(descriptorSet.files[5].name, "google/protobuf/unittest_delimited_import.proto")
41-
XCTAssertEqual(descriptorSet.files[6].name, "google/protobuf/unittest_delimited.proto")
40+
XCTAssertEqual(descriptorSet.files[5].name, "unittest_delimited_import.proto")
41+
XCTAssertEqual(descriptorSet.files[6].name, "unittest_delimited.proto")
4242
XCTAssertEqual(descriptorSet.files[7].name, "swift_protobuf_module_mappings.proto")
4343

4444
let pluginFileDescriptor = descriptorSet.files[1]

‎Tests/SwiftProtobufPluginLibraryTests/unittest_delimited.pb.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// swiftlint:disable all
44
//
55
// Generated by the Swift generator plugin for the protocol buffer compiler.
6-
// Source: google/protobuf/unittest_delimited.proto
6+
// Source: unittest_delimited.proto
77
//
88
// For information on using the generated types, please see the documentation:
99
// https://github.com/apple/swift-protobuf/

‎Tests/SwiftProtobufPluginLibraryTests/unittest_delimited_import.pb.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// swiftlint:disable all
44
//
55
// Generated by the Swift generator plugin for the protocol buffer compiler.
6-
// Source: google/protobuf/unittest_delimited_import.proto
6+
// Source: unittest_delimited_import.proto
77
//
88
// For information on using the generated types, please see the documentation:
99
// https://github.com/apple/swift-protobuf/

0 commit comments

Comments
 (0)