Resolve TODO and rename test resource

Author: ncooke3

Fixtures/MixedTargets/BasicMixedTargets/Package.swift

@@ -32,13 +32,13 @@ let package = Package(
             dependencies: ["BasicMixedTarget"]
         ),
 
-        // MARK: - BasicMixedTargetWithNestedUmbrellaHeader
+        // MARK: - BasicMixedTargetWithManualBridgingHeader
         .target(
-            name: "BasicMixedTargetWithNestedUmbrellaHeader"
+            name: "BasicMixedTargetWithManualBridgingHeader"
         ),
         .testTarget(
-            name: "BasicMixedTargetWithNestedUmbrellaHeaderTests",
-            dependencies: ["BasicMixedTargetWithNestedUmbrellaHeader"]
+            name: "BasicMixedTargetWithManualBridgingHeaderTests",
+            dependencies: ["BasicMixedTargetWithManualBridgingHeader"]
         ),
 
         // MARK: - BasicMixedTargetWithUmbrellaHeader

Fixtures/MixedTargets/BasicMixedTargets/Sources/BasicMixedTargetWithNestedUmbrellaHeader/CabinClass.h renamed to Fixtures/MixedTargets/BasicMixedTargets/Sources/BasicMixedTargetWithManualBridgingHeader/CabinClass.h

@@ -1,15 +1,15 @@
 #import <Foundation/Foundation.h>
 
-// The below import syntax resolves to the `"BasicMixedTargetWithNestedUmbrellaHeader/OldPlane.h"`
+// The below import syntax resolves to the `"BasicMixedTargetWithManualBridgingHeader/OldPlane.h"`
 // path within the public headers directory. It is not related to a
 // framework style import.
-#import <BasicMixedTargetWithNestedUmbrellaHeader/OldPlane.h>
+#import <BasicMixedTargetWithManualBridgingHeader/OldPlane.h>
 // Alternatively, the above `OldPlane` can be imported via:
-#import "include/BasicMixedTargetWithNestedUmbrellaHeader/OldPlane.h"
-#import "BasicMixedTargetWithNestedUmbrellaHeader/OldPlane.h"
+#import "include/BasicMixedTargetWithManualBridgingHeader/OldPlane.h"
+#import "BasicMixedTargetWithManualBridgingHeader/OldPlane.h"
 
 // Import the Swift part of the module.
-#import "BasicMixedTargetWithNestedUmbrellaHeader-Swift.h"
+#import "BasicMixedTargetWithManualBridgingHeader-Swift.h"
 
 #import "CabinClass.h"
 

Fixtures/MixedTargets/BasicMixedTargets/Sources/BasicMixedTargetWithNestedUmbrellaHeader/Engine.swift renamed to Fixtures/MixedTargets/BasicMixedTargets/Sources/BasicMixedTargetWithManualBridgingHeader/Engine.swift

@@ -1,12 +1,12 @@
 #import <Foundation/Foundation.h>
 
-// The below import syntax resolves to the `"BasicMixedTargetWithNestedUmbrellaHeader/Pilot.h"`
+// The below import syntax resolves to the `"BasicMixedTargetWithManualBridgingHeader/Pilot.h"`
 // path within the public headers directory. It is not related to a
 // framework style import.
-#import <BasicMixedTargetWithNestedUmbrellaHeader/Pilot.h>
+#import <BasicMixedTargetWithManualBridgingHeader/Pilot.h>
 // Alternatively, the above `Pilot` can be imported via:
-#import "include/BasicMixedTargetWithNestedUmbrellaHeader/Pilot.h"
-#import "BasicMixedTargetWithNestedUmbrellaHeader/Pilot.h"
+#import "include/BasicMixedTargetWithManualBridgingHeader/Pilot.h"
+#import "BasicMixedTargetWithManualBridgingHeader/Pilot.h"
 
 @implementation Pilot
 @end

Fixtures/MixedTargets/BasicMixedTargets/Sources/BasicMixedTargetWithNestedUmbrellaHeader/NewPlane.swift renamed to Fixtures/MixedTargets/BasicMixedTargets/Sources/BasicMixedTargetWithManualBridgingHeader/NewPlane.swift

@@ -1,12 +1,12 @@
 #import <Foundation/Foundation.h>
 
-// The below import syntax resolves to the `"BasicMixedTargetWithNestedUmbrellaHeader/PlanePart.h"`
+// The below import syntax resolves to the `"BasicMixedTargetWithManualBridgingHeader/PlanePart.h"`
 // path within the public headers directory. It is not related to a
 // framework style import.
-#import <BasicMixedTargetWithNestedUmbrellaHeader/PlanePart.h>
+#import <BasicMixedTargetWithManualBridgingHeader/PlanePart.h>
 // Alternatively, the above `PlanePart` can be imported via:
-#import "include/BasicMixedTargetWithNestedUmbrellaHeader/PlanePart.h"
-#import "BasicMixedTargetWithNestedUmbrellaHeader/PlanePart.h"
+#import "include/BasicMixedTargetWithManualBridgingHeader/PlanePart.h"
+#import "BasicMixedTargetWithManualBridgingHeader/PlanePart.h"
 
 @implementation PlanePart
 @end

Fixtures/MixedTargets/BasicMixedTargets/Sources/BasicMixedTargetWithNestedUmbrellaHeader/OldPlane.m renamed to Fixtures/MixedTargets/BasicMixedTargets/Sources/BasicMixedTargetWithManualBridgingHeader/OldPlane.m

@@ -1,4 +1,4 @@
-// Note: Importing `#import <BasicMixedTargetWithNestedUmbrellaHeader/X.h>` is not supported
+// Note: Importing `#import <BasicMixedTargetWithManualBridgingHeader/X.h>` is not supported
 // within this directory.
 #import "PlanePart.h"
 #import "Pilot.h"

Fixtures/MixedTargets/BasicMixedTargets/Sources/BasicMixedTargetWithNestedUmbrellaHeader/Pilot.m renamed to Fixtures/MixedTargets/BasicMixedTargets/Sources/BasicMixedTargetWithManualBridgingHeader/Pilot.m

@@ -1,7 +1,7 @@
 import XCTest
-import BasicMixedTargetWithNestedUmbrellaHeader
+import BasicMixedTargetWithManualBridgingHeader
 
-final class BasicMixedTargetWithNestedUmbrellaHeaderTests: XCTestCase {
+final class BasicMixedTargetWithManualBridgingHeaderTests: XCTestCase {
 
     func testPublicSwiftAPI() throws {
         // Check that Swift API surface is exposed...
@@ -16,10 +16,10 @@ final class BasicMixedTargetWithNestedUmbrellaHeaderTests: XCTestCase {
     }
 
     func testModulePrefixingWorks() throws {
-        let _ = BasicMixedTargetWithNestedUmbrellaHeader.NewPlane()
-        let _ = BasicMixedTargetWithNestedUmbrellaHeader.Engine()
-        let _ = BasicMixedTargetWithNestedUmbrellaHeader.OldPlane()
-        let _ = BasicMixedTargetWithNestedUmbrellaHeader.Pilot()
+        let _ = BasicMixedTargetWithManualBridgingHeader.NewPlane()
+        let _ = BasicMixedTargetWithManualBridgingHeader.Engine()
+        let _ = BasicMixedTargetWithManualBridgingHeader.OldPlane()
+        let _ = BasicMixedTargetWithManualBridgingHeader.Pilot()
     }
 
 }

Fixtures/MixedTargets/BasicMixedTargets/Sources/BasicMixedTargetWithNestedUmbrellaHeader/PlanePart.m renamed to Fixtures/MixedTargets/BasicMixedTargets/Sources/BasicMixedTargetWithManualBridgingHeader/PlanePart.m

@@ -1,12 +1,12 @@
 #import <XCTest/XCTest.h>
 
-@import BasicMixedTargetWithNestedUmbrellaHeader;
+@import BasicMixedTargetWithManualBridgingHeader;
 
-@interface ObjcBasicMixedTargetWithNestedUmbrellaHeaderTests : XCTestCase
+@interface ObjcBasicMixedTargetWithManualBridgingHeaderTests : XCTestCase
 
 @end
 
-@implementation ObjcBasicMixedTargetWithNestedUmbrellaHeaderTests
+@implementation ObjcBasicMixedTargetWithManualBridgingHeaderTests
 
 - (void)testPublicSwiftAPI {
     // Check that Objective-C compatible Swift API surface is exposed...

Fixtures/MixedTargets/BasicMixedTargets/Sources/BasicMixedTargetWithNestedUmbrellaHeader/include/BasicMixedTargetWithNestedUmbrellaHeader/BasicMixedTargetWithNestedUmbrellaHeader.h renamed to Fixtures/MixedTargets/BasicMixedTargets/Sources/BasicMixedTargetWithManualBridgingHeader/include/BasicMixedTargetWithManualBridgingHeader/BasicMixedTargetWithManualBridgingHeader.h

@@ -47,18 +47,15 @@ final class MixedTargetTests: XCTestCase {
         }
     }
 
-    // TODO(ncooke3): Remove below comment if `-import-objc-header` works.
-    // See `Fixtures/MixedTargets/BasicMixedTargets/Package.swift` for
-    // explanation of `BasicMixedTargetWithNestedUmbrellaHeader` target.
-    func testMixedTargetWithNestedUmbrellaHeader() throws {
+    func testMixedTargetWithManualBridgingHeader() throws {
         try fixture(name: "MixedTargets/BasicMixedTargets") { fixturePath in
             XCTAssertBuilds(
                 fixturePath,
-                extraArgs: ["--target", "BasicMixedTargetWithNestedUmbrellaHeader"]
+                extraArgs: ["--target", "BasicMixedTargetWithManualBridgingHeader"]
             )
             XCTAssertSwiftTest(
                 fixturePath,
-                extraArgs: ["--filter", "BasicMixedTargetWithNestedUmbrellaHeaderTests"]
+                extraArgs: ["--filter", "BasicMixedTargetWithManualBridgingHeaderTests"]
             )
         }
     }