Add SwiftProtobufTestHelpers.

thomasvl · thomasvl · commit aa563d311be9 · 2022-09-09T09:50:33.000-04:00
This is a library that isn't exported but will hold helpers that multiple tests
can now make use of.
diff --git a/Package.swift b/Package.swift
@@ -37,13 +37,17 @@ let package = Package(
   targets: [
     .target(
         name: "SwiftProtobuf",
-            exclude: ["CMakeLists.txt"]
+        exclude: ["CMakeLists.txt"]
     ),
     .target(
         name: "SwiftProtobufPluginLibrary",
         dependencies: ["SwiftProtobuf"],
         exclude: ["CMakeLists.txt"]
     ),
+    .target(
+        name: "SwiftProtobufTestHelpers",
+        dependencies: ["SwiftProtobuf"]
+    ),
     .executableTarget(
         name: "protoc-gen-swift",
         dependencies: ["SwiftProtobufPluginLibrary", "SwiftProtobuf"],
@@ -67,7 +71,7 @@ let package = Package(
     ),
     .testTarget(
         name: "SwiftProtobufPluginLibraryTests",
-        dependencies: ["SwiftProtobufPluginLibrary"]
+        dependencies: ["SwiftProtobufPluginLibrary", "SwiftProtobufTestHelpers"]
     ),
     .testTarget(
         name: "protoc-gen-swiftTests",
diff --git a/Package@swift-5.0.swift b/Package@swift-5.0.swift
@@ -22,14 +22,16 @@ let package = Package(
     .target(name: "SwiftProtobuf"),
     .target(name: "SwiftProtobufPluginLibrary",
             dependencies: ["SwiftProtobuf"]),
+    .target(name: "SwiftProtobufTestHelpers",
+            dependencies: ["SwiftProtobuf"]),
     .target(name: "protoc-gen-swift",
             dependencies: ["SwiftProtobufPluginLibrary", "SwiftProtobuf"]),
     .target(name: "Conformance",
             dependencies: ["SwiftProtobuf"]),
     .testTarget(name: "SwiftProtobufTests",
                 dependencies: ["SwiftProtobuf"]),
     .testTarget(name: "SwiftProtobufPluginLibraryTests",
-                dependencies: ["SwiftProtobufPluginLibrary"]),
+                dependencies: ["SwiftProtobufPluginLibrary", "SwiftProtobufTestHelpers"]),
   ],
   swiftLanguageVersions: [.v5]
 )
diff --git a/Package@swift-5.1.swift b/Package@swift-5.1.swift
@@ -22,14 +22,16 @@ let package = Package(
     .target(name: "SwiftProtobuf"),
     .target(name: "SwiftProtobufPluginLibrary",
             dependencies: ["SwiftProtobuf"]),
+    .target(name: "SwiftProtobufTestHelpers",
+            dependencies: ["SwiftProtobuf"]),
     .target(name: "protoc-gen-swift",
             dependencies: ["SwiftProtobufPluginLibrary", "SwiftProtobuf"]),
     .target(name: "Conformance",
             dependencies: ["SwiftProtobuf"]),
     .testTarget(name: "SwiftProtobufTests",
                 dependencies: ["SwiftProtobuf"]),
     .testTarget(name: "SwiftProtobufPluginLibraryTests",
-                dependencies: ["SwiftProtobufPluginLibrary"]),
+                dependencies: ["SwiftProtobufPluginLibrary", "SwiftProtobufTestHelpers"]),
   ],
   swiftLanguageVersions: [.v5]
 )
diff --git a/Package@swift-5.2.swift b/Package@swift-5.2.swift
@@ -22,14 +22,16 @@ let package = Package(
     .target(name: "SwiftProtobuf"),
     .target(name: "SwiftProtobufPluginLibrary",
             dependencies: ["SwiftProtobuf"]),
+    .target(name: "SwiftProtobufTestHelpers",
+            dependencies: ["SwiftProtobuf"]),
     .target(name: "protoc-gen-swift",
             dependencies: ["SwiftProtobufPluginLibrary", "SwiftProtobuf"]),
     .target(name: "Conformance",
             dependencies: ["SwiftProtobuf"]),
     .testTarget(name: "SwiftProtobufTests",
                 dependencies: ["SwiftProtobuf"]),
     .testTarget(name: "SwiftProtobufPluginLibraryTests",
-                dependencies: ["SwiftProtobufPluginLibrary"]),
+                dependencies: ["SwiftProtobufPluginLibrary", "SwiftProtobufTestHelpers"]),
   ],
   swiftLanguageVersions: [.v5]
 )
diff --git a/Package@swift-5.3.swift b/Package@swift-5.3.swift
@@ -22,14 +22,16 @@ let package = Package(
     .target(name: "SwiftProtobuf"),
     .target(name: "SwiftProtobufPluginLibrary",
             dependencies: ["SwiftProtobuf"]),
+    .target(name: "SwiftProtobufTestHelpers",
+            dependencies: ["SwiftProtobuf"]),
     .target(name: "protoc-gen-swift",
             dependencies: ["SwiftProtobufPluginLibrary", "SwiftProtobuf"]),
     .target(name: "Conformance",
             dependencies: ["SwiftProtobuf"]),
     .testTarget(name: "SwiftProtobufTests",
                 dependencies: ["SwiftProtobuf"]),
     .testTarget(name: "SwiftProtobufPluginLibraryTests",
-                dependencies: ["SwiftProtobufPluginLibrary"]),
+                dependencies: ["SwiftProtobufPluginLibrary", "SwiftProtobufTestHelpers"]),
   ],
   swiftLanguageVersions: [.v5]
 )
diff --git a/Package@swift-5.4.swift b/Package@swift-5.4.swift
@@ -22,14 +22,16 @@ let package = Package(
     .target(name: "SwiftProtobuf"),
     .target(name: "SwiftProtobufPluginLibrary",
             dependencies: ["SwiftProtobuf"]),
+    .target(name: "SwiftProtobufTestHelpers",
+            dependencies: ["SwiftProtobuf"]),
     .target(name: "protoc-gen-swift",
             dependencies: ["SwiftProtobufPluginLibrary", "SwiftProtobuf"]),
     .target(name: "Conformance",
             dependencies: ["SwiftProtobuf"]),
     .testTarget(name: "SwiftProtobufTests",
                 dependencies: ["SwiftProtobuf"]),
     .testTarget(name: "SwiftProtobufPluginLibraryTests",
-                dependencies: ["SwiftProtobufPluginLibrary"]),
+                dependencies: ["SwiftProtobufPluginLibrary", "SwiftProtobufTestHelpers"]),
   ],
   swiftLanguageVersions: [.v5]
 )
diff --git a/Package@swift-5.5.swift b/Package@swift-5.5.swift
@@ -22,14 +22,16 @@ let package = Package(
     .target(name: "SwiftProtobuf"),
     .target(name: "SwiftProtobufPluginLibrary",
             dependencies: ["SwiftProtobuf"]),
+    .target(name: "SwiftProtobufTestHelpers",
+            dependencies: ["SwiftProtobuf"]),
     .target(name: "protoc-gen-swift",
             dependencies: ["SwiftProtobufPluginLibrary", "SwiftProtobuf"]),
     .target(name: "Conformance",
             dependencies: ["SwiftProtobuf"]),
     .testTarget(name: "SwiftProtobufTests",
                 dependencies: ["SwiftProtobuf"]),
     .testTarget(name: "SwiftProtobufPluginLibraryTests",
-                dependencies: ["SwiftProtobufPluginLibrary"]),
+                dependencies: ["SwiftProtobufPluginLibrary", "SwiftProtobufTestHelpers"]),
   ],
   swiftLanguageVersions: [.v5]
 )
diff --git a/Sources/SwiftProtobufTestHelpers/Descriptor+TestHelpers.swift b/Sources/SwiftProtobufTestHelpers/Descriptor+TestHelpers.swift
@@ -9,9 +9,8 @@
 // -----------------------------------------------------------------------------
 
 import SwiftProtobuf
-import SwiftProtobufPluginLibrary
 
-extension Google_Protobuf_FileDescriptorProto {
+public extension Google_Protobuf_FileDescriptorProto {
   init(name: String, dependencies: [String] = [], publicDependencies: [Int32] = []) {
     for idx in publicDependencies { precondition(Int(idx) <= dependencies.count) }
     self.init()
@@ -25,7 +24,7 @@ extension Google_Protobuf_FileDescriptorProto {
   }
 }
 
-extension Google_Protobuf_FileDescriptorSet {
+public extension Google_Protobuf_FileDescriptorSet {
   init(files: [Google_Protobuf_FileDescriptorProto]) {
     self.init()
     file = files
@@ -36,7 +35,7 @@ extension Google_Protobuf_FileDescriptorSet {
   }
 }
 
-extension Google_Protobuf_EnumValueDescriptorProto {
+public extension Google_Protobuf_EnumValueDescriptorProto {
   init(name: String, number: Int32) {
     self.init()
     self.name = name
diff --git a/Tests/SwiftProtobufPluginLibraryTests/Test_ProtoFileToModuleMappings.swift b/Tests/SwiftProtobufPluginLibraryTests/Test_ProtoFileToModuleMappings.swift
@@ -10,6 +10,7 @@
 
 import XCTest
 import SwiftProtobuf
+import SwiftProtobufTestHelpers
 @testable import SwiftProtobufPluginLibrary
 
 // Support equality to simplify testing of getting the correct errors.
diff --git a/Tests/SwiftProtobufPluginLibraryTests/Test_SwiftProtobufNamer.swift b/Tests/SwiftProtobufPluginLibraryTests/Test_SwiftProtobufNamer.swift
@@ -11,6 +11,7 @@
 import XCTest
 import SwiftProtobuf
 import SwiftProtobufPluginLibrary
+import SwiftProtobufTestHelpers
 
 class Test_SwiftProtobufNamer: XCTestCase {
 

Original file line number	Diff line number	Diff line change
`@@ -9,9 +9,8 @@`
`9`	`9`	`// -----------------------------------------------------------------------------`
`10`	`10`
`11`	`11`	`import SwiftProtobuf`
`12`		`-import SwiftProtobufPluginLibrary`
`13`	`12`
`14`		`-extension Google_Protobuf_FileDescriptorProto {`
	`13`	`+public extension Google_Protobuf_FileDescriptorProto {`
`15`	`14`	`init(name: String, dependencies: [String] = [], publicDependencies: [Int32] = []) {`
`16`	`15`	`for idx in publicDependencies { precondition(Int(idx) <= dependencies.count) }`
`17`	`16`	`self.init()`
`@@ -25,7 +24,7 @@ extension Google_Protobuf_FileDescriptorProto {`
`25`	`24`	`}`
`26`	`25`	`}`
`27`	`26`
`28`		`-extension Google_Protobuf_FileDescriptorSet {`
	`27`	`+public extension Google_Protobuf_FileDescriptorSet {`
`29`	`28`	`init(files: [Google_Protobuf_FileDescriptorProto]) {`
`30`	`29`	`self.init()`
`31`	`30`	`file = files`
`@@ -36,7 +35,7 @@ extension Google_Protobuf_FileDescriptorSet {`
`36`	`35`	`}`
`37`	`36`	`}`
`38`	`37`
`39`		`-extension Google_Protobuf_EnumValueDescriptorProto {`
	`38`	`+public extension Google_Protobuf_EnumValueDescriptorProto {`
`40`	`39`	`init(name: String, number: Int32) {`
`41`	`40`	`self.init()`
`42`	`41`	`self.name = name`