Fix Performance Unit Tests requiring Swizzling

firebase · Oct 3, 2024 · 25a120b · 25a120b
1 parent c216e1f
commit 25a120b
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 21 deletions.
diff --git a/FirebasePerformance/Sources/Instrumentation/FPRSelectorInstrumentor.m b/FirebasePerformance/Sources/Instrumentation/FPRSelectorInstrumentor.m
@@ -17,7 +17,7 @@
 #import "FirebasePerformance/Sources/Common/FPRDiagnostics.h"
 
 #import <GoogleUtilities/GULSwizzler.h>
-#ifdef UNSWIZZLE_AVAILABLE
+#ifdef FPR_UNSWIZZLE_AVAILABLE
 #import <GoogleUtilities/GULSwizzler+Unswizzle.h>
 #endif
 
@@ -76,7 +76,7 @@ - (void)swizzle {
 
 - (void)unswizzle {
   _swizzled = NO;
-#ifdef UNSWIZZLE_AVAILABLE
+#ifdef FPR_UNSWIZZLE_AVAILABLE
   [GULSwizzler unswizzleClass:_class selector:_selector isClassSelector:_isClassSelector];
 #else
   NSAssert(NO, @"Unswizzling is disabled.");

diff --git a/FirebasePerformance/Tests/Unit/FPRClassInstrumentorTest.m b/FirebasePerformance/Tests/Unit/FPRClassInstrumentorTest.m
@@ -57,8 +57,6 @@ - (void)testCannotInstrumentSameSelectorTwice {
 
 #pragma mark - Unswizzle based tests
 
-#if !SWIFT_PACKAGE
-
 /** Tests swizzling an instance selector. */
 - (void)testSwizzleInstanceSelector {
   FPRClassInstrumentor *classInstrumentor =
@@ -158,6 +156,4 @@ - (void)testVoidReturnClassSelector {
   [classInstrumentor unswizzle];
 }
 
-#endif  // SWIFT_PACKAGE
-
 @end
diff --git a/FirebasePerformance/Tests/Unit/FPRInstrumentTest.m b/FirebasePerformance/Tests/Unit/FPRInstrumentTest.m
@@ -65,8 +65,6 @@ - (void)testRegisterAlreadyRegisteredClassInstrumentor {
 
 #pragma mark - Unswizzle based tests
 
-#if !SWIFT_PACKAGE
-
 - (void)testDeregisterInstrumentors {
   FPRInstrument *instrument = [[FPRInstrument alloc] init];
   FPRClassInstrumentor *classInstrumentor =
@@ -86,6 +84,4 @@ - (void)testDeregisterInstrumentors {
   [classInstrumentor unswizzle];
 }
 
-#endif  // SWIFT_PACKAGE
-
 @end
diff --git a/FirebasePerformance/Tests/Unit/Instruments/FPRNSURLConnectionInstrumentTest.m b/FirebasePerformance/Tests/Unit/Instruments/FPRNSURLConnectionInstrumentTest.m
@@ -14,8 +14,6 @@
 
 #pragma mark - Unswizzle based tests
 
-#if !SWIFT_PACKAGE
-
 #import "FirebasePerformance/Tests/Unit/Instruments/FPRNSURLConnectionInstrumentTestDelegates.h"
 
 #import <XCTest/XCTest.h>
@@ -519,5 +517,3 @@ - (void)testDownloadDelegateCompletionAPIGetsCalledEvenIfDataDelegateIsImplement
 }
 
 @end
-
-#endif  // SWIFT_PACKAGE
diff --git a/FirebasePerformance/Tests/Unit/Instruments/FPRNSURLSessionInstrumentTest.m b/FirebasePerformance/Tests/Unit/Instruments/FPRNSURLSessionInstrumentTest.m
@@ -14,8 +14,6 @@
 
 #pragma mark - Unswizzle based tests
 
-#ifndef SWIFT_PACKAGE
-
 #import "FirebasePerformance/Tests/Unit/Instruments/FPRNSURLSessionInstrumentTestDelegates.h"
 
 #import <XCTest/XCTest.h>
@@ -836,5 +834,3 @@ - (void)testMutableRequestURLs {
 }
 
 @end
-
-#endif  // SWIFT_PACKAGE
diff --git a/FirebasePerformance/Tests/Unit/Instruments/FPRUIViewControllerInstrumentTest.m b/FirebasePerformance/Tests/Unit/Instruments/FPRUIViewControllerInstrumentTest.m
@@ -14,8 +14,6 @@
 
 #pragma mark - Unswizzle based tests
 
-#if !SWIFT_PACKAGE
-
 #import "FirebasePerformance/Sources/Instrumentation/UIKit/FPRUIViewControllerInstrument.h"
 
 #import <XCTest/XCTest.h>
@@ -173,4 +171,3 @@ - (void)testViewDidAppearInvokesPreviousViewDidDisappear {
 
 @end
 
-#endif  // SWIFT_PACKAGE
diff --git a/Package.swift b/Package.swift
@@ -884,6 +884,7 @@ let package = Package(
         .product(name: "GoogleDataTransport", package: "GoogleDataTransport"),
         .product(name: "GULEnvironment", package: "GoogleUtilities"),
         .product(name: "GULMethodSwizzler", package: "GoogleUtilities"),
+        .product(name: "GULSwizzlerTestHelpers", package: "GoogleUtilities"),
         .product(name: "GULUserDefaults", package: "GoogleUtilities"),
         .product(name: "nanopb", package: "nanopb"),
       ],
@@ -895,6 +896,7 @@ let package = Package(
         .define("PB_NO_PACKED_STRUCTS", to: "1"),
         .define("PB_ENABLE_MALLOC", to: "1"),
         .define("FIRPerformance_LIB_VERSION", to: firebaseVersion),
+        .define("FPR_UNSWIZZLE_AVAILABLE", to: "1"),
       ],
       linkerSettings: [
         .linkedFramework("MobileCoreServices", .when(platforms: [.iOS, .tvOS])),
@@ -907,6 +909,8 @@ let package = Package(
         "FirebasePerformanceTarget",
         "SharedTestUtilities",
         "GCDWebServer",
+        .product(name: "GULMethodSwizzler", package: "GoogleUtilities"),
+        .product(name: "GULSwizzlerTestHelpers", package: "GoogleUtilities"),
         .product(name: "OCMock", package: "ocmock"),
       ],
       path: "FirebasePerformance/Tests/Unit",