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.
apple · Aug 23, 2024 · 09a67b6 · 09a67b6
1 parent 97c8dbd
commit 09a67b6
Show file tree

Hide file tree

Showing 9 changed files with 40 additions and 44 deletions.
diff --git a/Makefile b/Makefile
@@ -354,8 +354,8 @@ SWIFT_PLUGINLIB_DESCRIPTOR_TEST_PROTOS= \
 	Protos/SwiftProtobufPluginLibraryTests/pluginlib_descriptor_test.proto \
 	Protos/SwiftProtobufPluginLibraryTests/pluginlib_descriptor_test2.proto \
 	Protos/SwiftProtobufPluginLibraryTests/pluginlib_descriptor_delimited.proto \
-	Protos/SwiftProtobufPluginLibraryTests/google/protobuf/unittest_delimited.proto \
-	Protos/SwiftProtobufPluginLibraryTests/google/protobuf/unittest_delimited_import.proto \
+	Protos/SwiftProtobufPluginLibraryTests/unittest_delimited.proto \
+	Protos/SwiftProtobufPluginLibraryTests/unittest_delimited_import.proto \
 	Protos/SwiftProtobufPluginLibrary/google/protobuf/compiler/plugin.proto \
 	Protos/SwiftProtobufPluginLibrary/swift_protobuf_module_mappings.proto
 

diff --git a/.../google/protobuf/unittest_delimited.proto → ...uginLibraryTests/unittest_delimited.proto b/.../google/protobuf/unittest_delimited.proto → ...uginLibraryTests/unittest_delimited.proto
@@ -2,7 +2,7 @@ edition = "2023";
 
 package editions_unittest;
 
-import "google/protobuf/unittest_delimited_import.proto";
+import "unittest_delimited_import.proto";
 
 option java_multiple_files = true;
 

diff --git a/.../protobuf/unittest_delimited_import.proto → ...raryTests/unittest_delimited_import.proto b/.../protobuf/unittest_delimited_import.proto → ...raryTests/unittest_delimited_import.proto
diff --git a/...ogle/protobuf/unittest_delimited.pb.swift → ...nLibraryTests/unittest_delimited.pb.swift b/...ogle/protobuf/unittest_delimited.pb.swift → ...nLibraryTests/unittest_delimited.pb.swift
@@ -3,7 +3,7 @@
 // swiftlint:disable all
 //
 // Generated by the Swift generator plugin for the protocol buffer compiler.
-// Source: google/protobuf/unittest_delimited.proto
+// Source: unittest_delimited.proto
 //
 // For information on using the generated types, please see the documentation:
 //   https://github.com/apple/swift-protobuf/

diff --git a/...otobuf/unittest_delimited_import.pb.swift → ...yTests/unittest_delimited_import.pb.swift b/...otobuf/unittest_delimited_import.pb.swift → ...yTests/unittest_delimited_import.pb.swift
@@ -3,7 +3,7 @@
 // swiftlint:disable all
 //
 // Generated by the Swift generator plugin for the protocol buffer compiler.
-// Source: google/protobuf/unittest_delimited_import.proto
+// Source: unittest_delimited_import.proto
 //
 // For information on using the generated types, please see the documentation:
 //   https://github.com/apple/swift-protobuf/

diff --git a/Tests/SwiftProtobufPluginLibraryTests/DescriptorTestData.swift b/Tests/SwiftProtobufPluginLibraryTests/DescriptorTestData.swift
@@ -7575,40 +7575,36 @@ let fileDescriptorSetBytes: [UInt8] = [
   0x05, 0x04, 0x00, 0x02, 0x04, 0x08, 0x12, 0x04, 0x1b, 0x38, 0x1d, 0x03,
   0x0a, 0x0e, 0x0a, 0x07, 0x04, 0x00, 0x02, 0x04, 0x08, 0x15, 0x05, 0x12,
   0x03, 0x1c, 0x04, 0x2f, 0x62, 0x08, 0x65, 0x64, 0x69, 0x74, 0x69, 0x6f,
-  0x6e, 0x73, 0x70, 0xe8, 0x07, 0x0a, 0xbc, 0x02, 0x0a, 0x2f, 0x67, 0x6f,
-  0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75,
-  0x66, 0x2f, 0x75, 0x6e, 0x69, 0x74, 0x74, 0x65, 0x73, 0x74, 0x5f, 0x64,
-  0x65, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x65, 0x64, 0x5f, 0x69, 0x6d, 0x70,
-  0x6f, 0x72, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x11, 0x65,
-  0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x5f, 0x75, 0x6e, 0x69, 0x74,
-  0x74, 0x65, 0x73, 0x74, 0x22, 0x2b, 0x0a, 0x0d, 0x4d, 0x65, 0x73, 0x73,
-  0x61, 0x67, 0x65, 0x49, 0x6d, 0x70, 0x6f, 0x72, 0x74, 0x12, 0x0c, 0x0a,
-  0x01, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x01, 0x61, 0x12,
-  0x0c, 0x0a, 0x01, 0x62, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x01,
-  0x62, 0x42, 0x02, 0x50, 0x01, 0x4a, 0xb7, 0x01, 0x0a, 0x06, 0x12, 0x04,
-  0x00, 0x00, 0x09, 0x01, 0x0a, 0x08, 0x0a, 0x01, 0x0c, 0x12, 0x03, 0x00,
-  0x00, 0x11, 0x0a, 0x08, 0x0a, 0x01, 0x02, 0x12, 0x03, 0x02, 0x00, 0x1a,
-  0x0a, 0x08, 0x0a, 0x01, 0x08, 0x12, 0x03, 0x04, 0x00, 0x22, 0x0a, 0x09,
-  0x0a, 0x02, 0x08, 0x0a, 0x12, 0x03, 0x04, 0x00, 0x22, 0x0a, 0x0a, 0x0a,
-  0x02, 0x04, 0x00, 0x12, 0x04, 0x06, 0x00, 0x09, 0x01, 0x0a, 0x0a, 0x0a,
-  0x03, 0x04, 0x00, 0x01, 0x12, 0x03, 0x06, 0x08, 0x15, 0x0a, 0x0b, 0x0a,
-  0x04, 0x04, 0x00, 0x02, 0x00, 0x12, 0x03, 0x07, 0x02, 0x0e, 0x0a, 0x0c,
-  0x0a, 0x05, 0x04, 0x00, 0x02, 0x00, 0x05, 0x12, 0x03, 0x07, 0x02, 0x07,
-  0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x00, 0x02, 0x00, 0x01, 0x12, 0x03, 0x07,
-  0x08, 0x09, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x00, 0x02, 0x00, 0x03, 0x12,
-  0x03, 0x07, 0x0c, 0x0d, 0x0a, 0x0b, 0x0a, 0x04, 0x04, 0x00, 0x02, 0x01,
-  0x12, 0x03, 0x08, 0x02, 0x0e, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x00, 0x02,
-  0x01, 0x05, 0x12, 0x03, 0x08, 0x02, 0x07, 0x0a, 0x0c, 0x0a, 0x05, 0x04,
-  0x00, 0x02, 0x01, 0x01, 0x12, 0x03, 0x08, 0x08, 0x09, 0x0a, 0x0c, 0x0a,
-  0x05, 0x04, 0x00, 0x02, 0x01, 0x03, 0x12, 0x03, 0x08, 0x0c, 0x0d, 0x62,
-  0x08, 0x65, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x70, 0xe8, 0x07,
-  0x0a, 0xf7, 0x1e, 0x0a, 0x28, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f,
-  0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x75, 0x6e, 0x69,
-  0x74, 0x74, 0x65, 0x73, 0x74, 0x5f, 0x64, 0x65, 0x6c, 0x69, 0x6d, 0x69,
-  0x74, 0x65, 0x64, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x11, 0x65,
-  0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x5f, 0x75, 0x6e, 0x69, 0x74,
-  0x74, 0x65, 0x73, 0x74, 0x1a, 0x2f, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65,
-  0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x75, 0x6e,
+  0x6e, 0x73, 0x70, 0xe8, 0x07, 0x0a, 0xac, 0x02, 0x0a, 0x1f, 0x75, 0x6e,
+  0x69, 0x74, 0x74, 0x65, 0x73, 0x74, 0x5f, 0x64, 0x65, 0x6c, 0x69, 0x6d,
+  0x69, 0x74, 0x65, 0x64, 0x5f, 0x69, 0x6d, 0x70, 0x6f, 0x72, 0x74, 0x2e,
+  0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x11, 0x65, 0x64, 0x69, 0x74, 0x69,
+  0x6f, 0x6e, 0x73, 0x5f, 0x75, 0x6e, 0x69, 0x74, 0x74, 0x65, 0x73, 0x74,
+  0x22, 0x2b, 0x0a, 0x0d, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x49,
+  0x6d, 0x70, 0x6f, 0x72, 0x74, 0x12, 0x0c, 0x0a, 0x01, 0x61, 0x18, 0x01,
+  0x20, 0x01, 0x28, 0x05, 0x52, 0x01, 0x61, 0x12, 0x0c, 0x0a, 0x01, 0x62,
+  0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x01, 0x62, 0x42, 0x02, 0x50,
+  0x01, 0x4a, 0xb7, 0x01, 0x0a, 0x06, 0x12, 0x04, 0x00, 0x00, 0x09, 0x01,
+  0x0a, 0x08, 0x0a, 0x01, 0x0c, 0x12, 0x03, 0x00, 0x00, 0x11, 0x0a, 0x08,
+  0x0a, 0x01, 0x02, 0x12, 0x03, 0x02, 0x00, 0x1a, 0x0a, 0x08, 0x0a, 0x01,
+  0x08, 0x12, 0x03, 0x04, 0x00, 0x22, 0x0a, 0x09, 0x0a, 0x02, 0x08, 0x0a,
+  0x12, 0x03, 0x04, 0x00, 0x22, 0x0a, 0x0a, 0x0a, 0x02, 0x04, 0x00, 0x12,
+  0x04, 0x06, 0x00, 0x09, 0x01, 0x0a, 0x0a, 0x0a, 0x03, 0x04, 0x00, 0x01,
+  0x12, 0x03, 0x06, 0x08, 0x15, 0x0a, 0x0b, 0x0a, 0x04, 0x04, 0x00, 0x02,
+  0x00, 0x12, 0x03, 0x07, 0x02, 0x0e, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x00,
+  0x02, 0x00, 0x05, 0x12, 0x03, 0x07, 0x02, 0x07, 0x0a, 0x0c, 0x0a, 0x05,
+  0x04, 0x00, 0x02, 0x00, 0x01, 0x12, 0x03, 0x07, 0x08, 0x09, 0x0a, 0x0c,
+  0x0a, 0x05, 0x04, 0x00, 0x02, 0x00, 0x03, 0x12, 0x03, 0x07, 0x0c, 0x0d,
+  0x0a, 0x0b, 0x0a, 0x04, 0x04, 0x00, 0x02, 0x01, 0x12, 0x03, 0x08, 0x02,
+  0x0e, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x00, 0x02, 0x01, 0x05, 0x12, 0x03,
+  0x08, 0x02, 0x07, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x00, 0x02, 0x01, 0x01,
+  0x12, 0x03, 0x08, 0x08, 0x09, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x00, 0x02,
+  0x01, 0x03, 0x12, 0x03, 0x08, 0x0c, 0x0d, 0x62, 0x08, 0x65, 0x64, 0x69,
+  0x74, 0x69, 0x6f, 0x6e, 0x73, 0x70, 0xe8, 0x07, 0x0a, 0xd7, 0x1e, 0x0a,
+  0x18, 0x75, 0x6e, 0x69, 0x74, 0x74, 0x65, 0x73, 0x74, 0x5f, 0x64, 0x65,
+  0x6c, 0x69, 0x6d, 0x69, 0x74, 0x65, 0x64, 0x2e, 0x70, 0x72, 0x6f, 0x74,
+  0x6f, 0x12, 0x11, 0x65, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x5f,
+  0x75, 0x6e, 0x69, 0x74, 0x74, 0x65, 0x73, 0x74, 0x1a, 0x1f, 0x75, 0x6e,
   0x69, 0x74, 0x74, 0x65, 0x73, 0x74, 0x5f, 0x64, 0x65, 0x6c, 0x69, 0x6d,
   0x69, 0x74, 0x65, 0x64, 0x5f, 0x69, 0x6d, 0x70, 0x6f, 0x72, 0x74, 0x2e,
   0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x2c, 0x0a, 0x0e, 0x4c, 0x65, 0x6e,
@@ -7727,7 +7723,7 @@ let fileDescriptorSetBytes: [UInt8] = [
   0x42, 0x02, 0x50, 0x01, 0x4a, 0xae, 0x13, 0x0a, 0x06, 0x12, 0x04, 0x00,
   0x00, 0x4c, 0x01, 0x0a, 0x08, 0x0a, 0x01, 0x0c, 0x12, 0x03, 0x00, 0x00,
   0x11, 0x0a, 0x08, 0x0a, 0x01, 0x02, 0x12, 0x03, 0x02, 0x00, 0x1a, 0x0a,
-  0x09, 0x0a, 0x02, 0x03, 0x00, 0x12, 0x03, 0x04, 0x00, 0x39, 0x0a, 0x08,
+  0x09, 0x0a, 0x02, 0x03, 0x00, 0x12, 0x03, 0x04, 0x00, 0x29, 0x0a, 0x08,
   0x0a, 0x01, 0x08, 0x12, 0x03, 0x06, 0x00, 0x22, 0x0a, 0x09, 0x0a, 0x02,
   0x08, 0x0a, 0x12, 0x03, 0x06, 0x00, 0x22, 0x0a, 0x6c, 0x0a, 0x02, 0x04,
   0x00, 0x12, 0x04, 0x0b, 0x00, 0x0e, 0x01, 0x32, 0x60, 0x20, 0x54, 0x65,

diff --git a/Tests/SwiftProtobufPluginLibraryTests/Test_Descriptor.swift b/Tests/SwiftProtobufPluginLibraryTests/Test_Descriptor.swift
@@ -37,8 +37,8 @@ final class Test_Descriptor: XCTestCase {
     XCTAssertEqual(descriptorSet.files[2].name, "pluginlib_descriptor_test.proto")
     XCTAssertEqual(descriptorSet.files[3].name, "pluginlib_descriptor_test2.proto")
     XCTAssertEqual(descriptorSet.files[4].name, "pluginlib_descriptor_delimited.proto")
-    XCTAssertEqual(descriptorSet.files[5].name, "google/protobuf/unittest_delimited_import.proto")
-    XCTAssertEqual(descriptorSet.files[6].name, "google/protobuf/unittest_delimited.proto")
+    XCTAssertEqual(descriptorSet.files[5].name, "unittest_delimited_import.proto")
+    XCTAssertEqual(descriptorSet.files[6].name, "unittest_delimited.proto")
     XCTAssertEqual(descriptorSet.files[7].name, "swift_protobuf_module_mappings.proto")
 
     let pluginFileDescriptor = descriptorSet.files[1]

diff --git a/Tests/SwiftProtobufPluginLibraryTests/unittest_delimited.pb.swift b/Tests/SwiftProtobufPluginLibraryTests/unittest_delimited.pb.swift
@@ -3,7 +3,7 @@
 // swiftlint:disable all
 //
 // Generated by the Swift generator plugin for the protocol buffer compiler.
-// Source: google/protobuf/unittest_delimited.proto
+// Source: unittest_delimited.proto
 //
 // For information on using the generated types, please see the documentation:
 //   https://github.com/apple/swift-protobuf/

diff --git a/Tests/SwiftProtobufPluginLibraryTests/unittest_delimited_import.pb.swift b/Tests/SwiftProtobufPluginLibraryTests/unittest_delimited_import.pb.swift
@@ -3,7 +3,7 @@
 // swiftlint:disable all
 //
 // Generated by the Swift generator plugin for the protocol buffer compiler.
-// Source: google/protobuf/unittest_delimited_import.proto
+// Source: unittest_delimited_import.proto
 //
 // For information on using the generated types, please see the documentation:
 //   https://github.com/apple/swift-protobuf/