fix: SentryUIViewControllerSwizzlingTests (#3089)

Fixed SentryUIViewControllerSwizzlingTests because it broke with latest swift/xcode updates
getsentry · Jun 7, 2023 · 60dd0f5 · 60dd0f5
1 parent 31ac438
commit 60dd0f5
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 2 deletions.
diff --git a/Sources/Sentry/SentryNSProcessInfoWrapper.mm b/Sources/Sentry/SentryNSProcessInfoWrapper.mm
@@ -1,6 +1,26 @@
 #import "SentryNSProcessInfoWrapper.h"
 
-@implementation SentryNSProcessInfoWrapper
+@implementation SentryNSProcessInfoWrapper {
+#if TEST
+    NSString *_executablePath;
+}
+- (void)setProcessPath:(NSString *)path
+{
+    _executablePath = path;
+}
+#    define EXECUTABLE_PATH _executablePath;
+
+- (instancetype)init
+{
+    self = [super init];
+    _executablePath = NSBundle.mainBundle.bundlePath;
+    return self;
+}
+
+#else
+}
+#    define EXECUTABLE_PATH NSBundle.mainBundle.executablePath;
+#endif
 
 + (SentryNSProcessInfoWrapper *)shared
 {
@@ -17,7 +37,7 @@ - (NSString *)processDirectoryPath
 
 - (NSString *)processPath
 {
-    return NSBundle.mainBundle.executablePath;
+    return EXECUTABLE_PATH;
 }
 
 - (NSUInteger)processorCount

diff --git a/Sources/Sentry/include/SentryNSProcessInfoWrapper.h b/Sources/Sentry/include/SentryNSProcessInfoWrapper.h
@@ -8,6 +8,10 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nullable, nonatomic, readonly) NSString *processPath;
 @property (readonly) NSUInteger processorCount;
 
+#if TEST
+- (void)setProcessPath:(NSString *)path;
+#endif
+
 @end
 
 NS_ASSUME_NONNULL_END
diff --git a/...ests/Integrations/Performance/UIViewController/SentryUIViewControllerSwizzlingTests.swift b/...ests/Integrations/Performance/UIViewController/SentryUIViewControllerSwizzlingTests.swift
@@ -88,6 +88,9 @@ class SentryUIViewControllerSwizzlingTests: XCTestCase {
     }
 
     func testViewControllerWithLoadView_TransactionBoundToScope() {
+        let d = class_getImageName(type(of: self))!
+        fixture.processInfoWrapper.setProcessPath(String(cString: d))
+
         fixture.sut.start()
         let controller = ViewWithLoadViewController()
 
@@ -328,6 +331,7 @@ class TestSubClassFinder: SentrySubClassFinder {
     var invocations = Invocations<(imageName: String, block: (AnyClass) -> Void)>()
     override func actOnSubclassesOfViewController(inImage imageName: String, block: @escaping (AnyClass) -> Void) {
         invocations.record((imageName, block))
+        super.actOnSubclassesOfViewController(inImage: imageName, block: block)
     }
 }