Fix duplicate test

Author: noahsmartin

SentryTestUtils/Sources/TestClient.swift

@@ -1,14 +1,14 @@
 import _SentryPrivate
 import Foundation
-@_spi(Private) import Sentry
+@_spi(Private) @testable import Sentry
 
 public class TestClient: SentryClientInternal {
     public override init?(options: NSObject) {
         super.init(
             options: options,
             transportAdapter: TestTransportAdapter(transports: [TestTransport()], options: options as! Options),
             fileManager: try! TestFileManager(
-                options: options.toOptions(),
+                options: options as? Options,
                 dateProvider: TestCurrentDateProvider(),
                 dispatchQueueWrapper: TestSentryDispatchQueueWrapper()
             ),

SentryTestUtils/Sources/TestFileManager.swift

@@ -7,6 +7,11 @@ import Foundation
     var readTimestampLastInForegroundInvocations: Int = 0
     var storeTimestampLastInForegroundInvocations: Int = 0
     var deleteTimestampLastInForegroundInvocations: Int = 0
+    
+    public init(options: Options?, dateProvider: any SentryCurrentDateProvider, dispatchQueueWrapper: SentryDispatchQueueWrapper) throws {
+        let helper = try SentryFileManagerHelper(options: options)
+        super.init(helper: helper, dateProvider: dateProvider, dispatchQueueWrapper: dispatchQueueWrapper)
+    }
 
     @_spi(Private) public var storeEnvelopeInvocations = Invocations<SentryEnvelope>()
     public var storeEnvelopePath: String?

Sources/Sentry/Profiling/SentryProfilingSwiftHelpers.m

@@ -167,12 +167,20 @@
 BOOL
 sentry_appHangsDisabled(void)
 {
-    return [[[[SentrySDKInternal currentHub] getClient] options] isAppHangTrackingDisabled];
+    SentryOptions *options = [[[SentrySDKInternal currentHub] getClient] options];
+    if (options == nil) {
+        return NO;
+    }
+    return [options isAppHangTrackingDisabled];
 }
 BOOL
 sentry_autoPerformanceTracingDisabled(void)
 {
-    return ![[[[SentrySDKInternal currentHub] getClient] options] enableAutoPerformanceTracing];
+    SentryOptions *options = [[[SentrySDKInternal currentHub] getClient] options];
+    if (options == nil) {
+        return YES;
+    }
+    return ![options enableAutoPerformanceTracing];
 }
 void
 sentry_startFramesTracker(void)

Sources/Sentry/SentryClient.m

@@ -58,9 +58,8 @@ @interface SentryClientInternal ()
 
 @implementation SentryClientInternal
 
-- (_Nullable instancetype)initWithOptions:(SentryOptionsObjC *)internalOptions
+- (_Nullable instancetype)initWithOptions:(SentryOptions *)options
 {
-    SentryOptions *options = [internalOptions toOptions];
     NSError *error;
     SentryFileManager *fileManager = [[SentryFileManager alloc]
              initWithOptions:options
@@ -82,9 +81,9 @@ - (_Nullable instancetype)initWithOptions:(SentryOptionsObjC *)internalOptions
         [[SentryTransportAdapter alloc] initWithTransports:transports options:options];
 
     SentryDefaultThreadInspector *threadInspector =
-        [[SentryDefaultThreadInspector alloc] initWithOptions:internalOptions];
+        [[SentryDefaultThreadInspector alloc] initWithOptions:options];
 
-    return [self initWithOptions:internalOptions
+    return [self initWithOptions:options
                 transportAdapter:transportAdapter
                      fileManager:fileManager
                  threadInspector:threadInspector
@@ -94,7 +93,7 @@ - (_Nullable instancetype)initWithOptions:(SentryOptionsObjC *)internalOptions
                         timezone:[NSCalendar autoupdatingCurrentCalendar].timeZone];
 }
 
-- (instancetype)initWithOptions:(SentryOptionsObjC *)options
+- (instancetype)initWithOptions:(SentryOptions *)options
                transportAdapter:(SentryTransportAdapter *)transportAdapter
                     fileManager:(SentryFileManager *)fileManager
                 threadInspector:(SentryDefaultThreadInspector *)threadInspector
@@ -105,7 +104,7 @@ - (instancetype)initWithOptions:(SentryOptionsObjC *)options
 {
     if (self = [super init]) {
         _isEnabled = YES;
-        self.optionsInternal = options;
+        self.options = options;
         self.transportAdapter = transportAdapter;
         self.fileManager = fileManager;
         self.threadInspector = threadInspector;
@@ -117,17 +116,21 @@ - (instancetype)initWithOptions:(SentryOptionsObjC *)options
 
         // The SDK stores the installationID in a file. The first call requires file IO. To avoid
         // executing this on the main thread, we cache the installationID async here.
-        [SentryInstallation
-            cacheIDAsyncWithCacheDirectoryPath:[options toOptions].cacheDirectoryPath];
+        [SentryInstallation cacheIDAsyncWithCacheDirectoryPath:options.cacheDirectoryPath];
 
         [fileManager deleteOldEnvelopeItems];
     }
     return self;
 }
 
-- (SentryOptions *)options
+- (void)setOptionsInternal:(SentryOptions *)optionsInternal
 {
-    return [self.optionsInternal toOptions];
+    self.options = optionsInternal;
+}
+
+- (NSObject *)getOptions
+{
+    return self.options;
 }
 
 - (SentryId *)captureMessage:(NSString *)message
@@ -384,7 +387,7 @@ - (nullable SentryTraceContext *)getTraceStateWithEvent:(SentryEvent *)event
 
     SentryTracer *tracer = [SentryTracer getTracer:span];
     if (tracer != nil) {
-        return [[SentryTraceContext alloc] initWithTracer:tracer scope:scope options:self.options];
+        return [[SentryTraceContext alloc] initWithTracer:tracer scope:scope options:_options];
     }
 
     if (event.error || event.exceptions.count > 0) {

Sources/Sentry/SentryCoreDataTrackingIntegration.m

@@ -21,8 +21,7 @@ - (BOOL)installWithOptions:(SentryOptions *)options
     }
 
     self.tracker = [[SentryCoreDataTracker alloc]
-        initWithThreadInspector:[[SentryDefaultThreadInspector alloc]
-                                    initWithOptions:[options toInternal]]
+        initWithThreadInspector:[[SentryDefaultThreadInspector alloc] initWithOptions:options]
              processInfoWrapper:[SentryDependencyContainer.sharedInstance processInfoWrapper]];
     [SentryCoreDataSwizzling.sharedInstance startWithTracker:self.tracker];
 

Sources/Sentry/SentryDependencyContainerSwiftHelper.m

@@ -4,6 +4,24 @@
 #import "SentrySDK+Private.h"
 #import "SentrySwift.h"
 
+@implementation SentryDefaultRedactOptions
+- (instancetype)initWithMaskAllText:(BOOL)maskAllText
+                      maskAllImages:(BOOL)maskAllImages
+                  maskedViewClasses:(NSArray<Class> *)maskedViewClasses
+                unmaskedViewClasses:(NSArray<Class> *)unmaskedViewClasses
+{
+    if (self = [super init]) {
+        _maskAllText = maskAllText;
+        _maskAllImages = maskAllImages;
+        _maskedViewClasses = maskedViewClasses;
+        _unmaskedViewClasses = unmaskedViewClasses;
+        return self;
+    }
+    return nil;
+}
+
+@end
+
 @implementation SentryDependencyContainerSwiftHelper
 
 #if SENTRY_HAS_UIKIT
@@ -13,8 +31,70 @@ @implementation SentryDependencyContainerSwiftHelper
     return [SentryDependencyContainer.sharedInstance.application getWindows];
 }
 
++ (BOOL)fastViewRenderingEnabled:(SentryOptions *)options
+{
+    return options.screenshot.enableFastViewRendering;
+}
+
++ (BOOL)viewRendererV2Enabled:(SentryOptions *)options
+{
+    return options.screenshot.enableViewRendererV2;
+}
+
++ (SentryDefaultRedactOptions *)redactOptions:(SentryOptions *)options
+{
+    return [[SentryDefaultRedactOptions alloc]
+        initWithMaskAllText:options.screenshot.maskAllText
+              maskAllImages:options.screenshot.maskAllImages
+          maskedViewClasses:options.screenshot.maskedViewClasses
+        unmaskedViewClasses:options.screenshot.unmaskedViewClasses];
+}
+
 #endif // SENTRY_HAS_UIKIT
 
++ (NSString *)release:(SentryOptions *)options
+{
+    return options.releaseName;
+}
+
++ (SentryLog *)beforeSendLog:(SentryLog *)log options:(SentryOptions *)options
+{
+    if (options.beforeSendLog) {
+        return options.beforeSendLog(log);
+    }
+    return log;
+}
+
++ (NSString *)environment:(SentryOptions *)options
+{
+    return options.environment;
+}
+
++ (NSString *)cacheDirectoryPath:(SentryOptions *)options
+{
+    return options.cacheDirectoryPath;
+}
+
++ (BOOL)enableLogs:(SentryOptions *)options
+{
+    return options.enableLogs;
+}
+
++ (NSArray<NSString *> *)enabledFeatures:(SentryOptions *)options
+{
+    return [SentryEnabledFeaturesBuilder getEnabledFeaturesWithOptions:options];
+}
+
++ (BOOL)sendDefaultPii:(SentryOptions *)options
+{
+    return options.sendDefaultPii;
+}
+
++ (NSArray<NSString *> *)inAppIncludes:(SentryOptions *)options
+{
+    return options.inAppIncludes;
+}
+
 + (SentryDispatchQueueWrapper *)dispatchQueueWrapper
 {
     return SentryDependencyContainer.sharedInstance.dispatchQueueWrapper;

Sources/Sentry/SentryFileManagerHelper.m

@@ -8,6 +8,7 @@
 #import "SentryEvent.h"
 #import "SentryInternalDefines.h"
 #import "SentryLogC.h"
+#import "SentrySDK+Private.h"
 #import "SentrySerialization.h"
 #import "SentrySwift.h"
 
@@ -101,11 +102,16 @@ @interface SentryFileManagerHelper ()
 
 @implementation SentryFileManagerHelper
 
-- (nullable instancetype)initWithOptions:(SentryOptionsObjC *_Nullable)optionsInternal
-                                   error:(NSError **)error
+- (nullable instancetype)initWithPlaceholder:(NSObject *)objc
+                                       error:(NSError *_Nullable *_Nullable)error
+{
+    SentryOptions *options = [SentrySDKInternal options];
+    return [self initWithOptions:options error:error];
+}
+
+- (nullable instancetype)initWithOptions:(SentryOptions *_Nullable)options error:(NSError **)error
 {
     if (self = [super init]) {
-        SentryOptions *options = [optionsInternal toOptions];
         [self createPathsWithOptions:options];
 
         // Remove old cached events for versions before 6.0.0

Sources/Sentry/SentrySDKInternal.m

@@ -220,11 +220,10 @@ + (void)setStartTimestamp:(NSDate *)value
     startTimestamp = value;
 }
 
-+ (void)startWithOptions:(SentryOptionsObjC *)internalOptions
++ (void)startWithOptions:(SentryOptions *)options
 {
     // We save the options before checking for Xcode preview because
     // we will use this options in the preview
-    SentryOptions *options = [internalOptions toOptions];
     startOption = options;
     if ([SentryDependencyContainer.sharedInstance.processInfoWrapper
                 .environment[SENTRY_XCODE_PREVIEW_ENVIRONMENT_KEY] isEqualToString:@"1"]) {
@@ -255,8 +254,7 @@ + (void)startWithOptions:(SentryOptionsObjC *)internalOptions
     startInvocations++;
     startTimestamp = [SentryDependencyContainer.sharedInstance.dateProvider date];
 
-    SentryClientInternal *newClient =
-        [[SentryClientInternal alloc] initWithOptions:internalOptions];
+    SentryClientInternal *newClient = [[SentryClientInternal alloc] initWithOptions:options];
     [newClient.fileManager moveAppStateToPreviousAppState];
     [newClient.fileManager moveBreadcrumbsToPreviousBreadcrumbs];
     [SentryDependencyContainer.sharedInstance

Sources/Sentry/include/SentryClient.h

@@ -21,9 +21,11 @@ SENTRY_NO_INIT
 
 @property (nonatomic, assign, readonly) BOOL isEnabled;
 
-@property (nonatomic, strong) SentryOptionsObjC *optionsInternal;
+@property (nonatomic, strong) SentryOptions *options;
 
-@property (nonatomic, strong, readonly) SentryOptions *options;
+- (void)setOptionsInternal:(SentryOptionsObjC *)optionsInternal;
+
+- (SentryOptionsObjC *)getOptions;
 
 /**
  * Initializes a @c SentryClient. Pass in a dictionary of options.

Sources/Sentry/include/SentryDependencyContainerSwiftHelper.h

@@ -1,4 +1,5 @@
 #import "SentryDefines.h"
+#import "SentryOptionsObjC.h"
 #import "SentryProfilingConditionals.h"
 #import <Foundation/Foundation.h>
 
@@ -11,6 +12,15 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
+@interface SentryDefaultRedactOptions : NSObject
+
+@property (nonatomic) BOOL maskAllText;
+@property (nonatomic) BOOL maskAllImages;
+@property (nonatomic) NSArray<Class> *maskedViewClasses;
+@property (nonatomic) NSArray<Class> *unmaskedViewClasses;
+
+@end
+
 // Some Swift code needs to access Sentry types that we don’t want to completely
 // expose to Swift. This class is exposed to Swift
 // and bridges some functionality from without importing large amounts of the
@@ -21,8 +31,22 @@ NS_ASSUME_NONNULL_BEGIN
 
 + (nullable NSArray<UIWindow *> *)windows;
 
+// Since SentryOptions is in ObjC, Swift code can't see the SentryViewScreenshotOptions property
++ (BOOL)fastViewRenderingEnabled:(SentryOptionsObjC *)options;
++ (BOOL)viewRendererV2Enabled:(SentryOptionsObjC *)options;
++ (SentryDefaultRedactOptions *)redactOptions:(SentryOptionsObjC *)options;
+
 #endif // SENTRY_HAS_UIKIT
 
++ (NSString *_Nullable)release:(SentryOptionsObjC *)options;
++ (NSString *)environment:(SentryOptionsObjC *)options;
++ (NSObject *_Nullable)beforeSendLog:(NSObject *)beforeSendLog options:(SentryOptionsObjC *)options;
++ (NSString *)cacheDirectoryPath:(SentryOptionsObjC *)options;
++ (BOOL)enableLogs:(SentryOptionsObjC *)options;
++ (NSArray<NSString *> *)enabledFeatures:(SentryOptionsObjC *)options;
++ (BOOL)sendDefaultPii:(SentryOptionsObjC *)options;
++ (NSArray<NSString *> *)inAppIncludes:(SentryOptionsObjC *)options;
+
 + (SentryDispatchQueueWrapper *)dispatchQueueWrapper;
 + (void)dispatchSyncOnMainQueue:(void (^)(void))block;
 + (nullable NSDate *)readTimestampLastInForeground;