Skip to content

Commit 3eaf4a9

Browse files
philprimephilprime
committed
Merge branch 'philprime/fix-masking_split_4' into philprime/fix-masking_split_5
2 parents 12b3e20 + 28264ad commit 3eaf4a9

File tree

2 files changed

+22
-21
lines changed

2 files changed

+22
-21
lines changed

‎Sentry.xcodeproj/project.pbxproj‎

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -769,6 +769,7 @@
769769
D43B26DA2D70A612007747FD /* SentrySpanDataKey.m in Sources */ = {isa = PBXBuildFile; fileRef = D43B26D92D70A60E007747FD /* SentrySpanDataKey.m */; };
770770
D43C1BE82E8FB85400CD5D67 /* SnapshotTesting in Frameworks */ = {isa = PBXBuildFile; productRef = D43C1BE72E8FB85400CD5D67 /* SnapshotTesting */; };
771771
D4411DD52E02B74900EA4987 /* ArrayAccessesTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D4411DD42E02B74100EA4987 /* ArrayAccessesTests.swift */; };
772+
D44311312EB22812006CABE4 /* SentryUIRedactBuilderTests+ReactNative.swift in Sources */ = {isa = PBXBuildFile; fileRef = D4AF7D212E93FFCA004F0F59 /* SentryUIRedactBuilderTests+ReactNative.swift */; };
772773
D44B16722DE464AD006DBDB3 /* TestDispatchFactoryTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D44B16712DE464A9006DBDB3 /* TestDispatchFactoryTests.swift */; };
773774
D451ED5D2D92ECD200C9BEA8 /* SentryOnDemandReplayError.swift in Sources */ = {isa = PBXBuildFile; fileRef = D451ED5C2D92ECD200C9BEA8 /* SentryOnDemandReplayError.swift */; };
774775
D451ED5F2D92ECDE00C9BEA8 /* SentryReplayFrame.swift in Sources */ = {isa = PBXBuildFile; fileRef = D451ED5E2D92ECDE00C9BEA8 /* SentryReplayFrame.swift */; };
@@ -817,7 +818,7 @@
817818
D4AF7D222E93FFCA004F0F59 /* SentryUIRedactBuilderTests+ReactNative.swift in Sources */ = {isa = PBXBuildFile; fileRef = D4AF7D212E93FFCA004F0F59 /* SentryUIRedactBuilderTests+ReactNative.swift */; };
818819
D4AF7D262E9401EB004F0F59 /* SentryUIRedactBuilderTests+UIKit.swift in Sources */ = {isa = PBXBuildFile; fileRef = D4AF7D252E9401EB004F0F59 /* SentryUIRedactBuilderTests+UIKit.swift */; };
819820
D4AF7D282E9402AC004F0F59 /* SentryUIRedactBuilderTests+SpecialViews.swift in Sources */ = {isa = PBXBuildFile; fileRef = D4AF7D272E9402AC004F0F59 /* SentryUIRedactBuilderTests+SpecialViews.swift */; };
820-
D4AF7D2A2E940493004F0F59 /* SentryUIRedactBuilderTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D4AF7D292E940492004F0F59 /* SentryUIRedactBuilderTests.swift */; };
821+
D4AF7D2A2E940493004F0F59 /* SentryUIRedactBuilderTests+Common.swift in Sources */ = {isa = PBXBuildFile; fileRef = D4AF7D292E940492004F0F59 /* SentryUIRedactBuilderTests+Common.swift */; };
821822
D4AF7D2C2E9404ED004F0F59 /* SentryUIRedactBuilderTests+EdgeCases.swift in Sources */ = {isa = PBXBuildFile; fileRef = D4AF7D2B2E9404ED004F0F59 /* SentryUIRedactBuilderTests+EdgeCases.swift */; };
822823
D4B0DC7F2DA9257A00DE61B6 /* SentryRenderVideoResult.swift in Sources */ = {isa = PBXBuildFile; fileRef = D4B0DC7E2DA9257200DE61B6 /* SentryRenderVideoResult.swift */; };
823824
D4B339F92EA7823000359F3A /* SentryTestUtilsDynamic.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D84DAD4D2B17428D003CF120 /* SentryTestUtilsDynamic.framework */; };
@@ -971,7 +972,7 @@
971972
D8DBE0CA2C0E093000FAB1FD /* SentryTouchTrackerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8DBE0C92C0E093000FAB1FD /* SentryTouchTrackerTests.swift */; };
972973
D8DBE0D22C0EFFC300FAB1FD /* SentryReplayOptionsTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8DBE0D12C0EFFC300FAB1FD /* SentryReplayOptionsTests.swift */; };
973974
D8F67AF12BE0D33F00C9197B /* UIImageHelperTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8F67AEF2BE0D31A00C9197B /* UIImageHelperTests.swift */; };
974-
D8F67AF42BE10F9600C9197B /* SentryUIRedactBuilderTests+Common.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8F67AF22BE10F7600C9197B /* SentryUIRedactBuilderTests+Common.swift */; };
975+
D8F67AF42BE10F9600C9197B /* SentryUIRedactBuilderTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8F67AF22BE10F7600C9197B /* SentryUIRedactBuilderTests.swift */; };
975976
D8F67B1B2BE9728600C9197B /* SentrySRDefaultBreadcrumbConverter.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8F67B1A2BE9728600C9197B /* SentrySRDefaultBreadcrumbConverter.swift */; };
976977
D8F67B222BEAB6CC00C9197B /* SentryRRWebEvent.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8F67B212BEAB6CC00C9197B /* SentryRRWebEvent.swift */; };
977978
D8F6A2472885512100320515 /* SentryPredicateDescriptor.m in Sources */ = {isa = PBXBuildFile; fileRef = D8F6A2452885512100320515 /* SentryPredicateDescriptor.m */; };
@@ -2187,7 +2188,7 @@
21872188
D4AF7D212E93FFCA004F0F59 /* SentryUIRedactBuilderTests+ReactNative.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "SentryUIRedactBuilderTests+ReactNative.swift"; sourceTree = "<group>"; };
21882189
D4AF7D252E9401EB004F0F59 /* SentryUIRedactBuilderTests+UIKit.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "SentryUIRedactBuilderTests+UIKit.swift"; sourceTree = "<group>"; };
21892190
D4AF7D272E9402AC004F0F59 /* SentryUIRedactBuilderTests+SpecialViews.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "SentryUIRedactBuilderTests+SpecialViews.swift"; sourceTree = "<group>"; };
2190-
D4AF7D292E940492004F0F59 /* SentryUIRedactBuilderTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentryUIRedactBuilderTests.swift; sourceTree = "<group>"; };
2191+
D4AF7D292E940492004F0F59 /* SentryUIRedactBuilderTests+Common.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "SentryUIRedactBuilderTests+Common.swift"; sourceTree = "<group>"; };
21912192
D4AF7D2B2E9404ED004F0F59 /* SentryUIRedactBuilderTests+EdgeCases.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "SentryUIRedactBuilderTests+EdgeCases.swift"; sourceTree = "<group>"; };
21922193
D4B0DC7E2DA9257200DE61B6 /* SentryRenderVideoResult.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentryRenderVideoResult.swift; sourceTree = "<group>"; };
21932194
D4BCA0C22DA93C25009E49AB /* SentrySessionReplayIntegration+Test.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "SentrySessionReplayIntegration+Test.h"; sourceTree = "<group>"; };
@@ -2355,7 +2356,7 @@
23552356
D8F01DE42A126B62008F4996 /* HybridPod.podspec */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; path = HybridPod.podspec; sourceTree = "<group>"; };
23562357
D8F01DE52A126BF5008F4996 /* HybridTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HybridTest.swift; sourceTree = "<group>"; };
23572358
D8F67AEF2BE0D31A00C9197B /* UIImageHelperTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UIImageHelperTests.swift; sourceTree = "<group>"; };
2358-
D8F67AF22BE10F7600C9197B /* SentryUIRedactBuilderTests+Common.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "SentryUIRedactBuilderTests+Common.swift"; sourceTree = "<group>"; };
2359+
D8F67AF22BE10F7600C9197B /* SentryUIRedactBuilderTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentryUIRedactBuilderTests.swift; sourceTree = "<group>"; };
23592360
D8F67B1A2BE9728600C9197B /* SentrySRDefaultBreadcrumbConverter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentrySRDefaultBreadcrumbConverter.swift; sourceTree = "<group>"; };
23602361
D8F67B212BEAB6CC00C9197B /* SentryRRWebEvent.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentryRRWebEvent.swift; sourceTree = "<group>"; };
23612362
D8F6A2452885512100320515 /* SentryPredicateDescriptor.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SentryPredicateDescriptor.m; sourceTree = "<group>"; };
@@ -4247,8 +4248,8 @@
42474248
children = (
42484249
D4AF802E2E965188004F0F59 /* __Snapshots__ */,
42494250
D82915622C85EF0C00A6CDD4 /* SentryViewPhotographerTests.swift */,
4250-
D4AF7D292E940492004F0F59 /* SentryUIRedactBuilderTests.swift */,
4251-
D8F67AF22BE10F7600C9197B /* SentryUIRedactBuilderTests+Common.swift */,
4251+
D8F67AF22BE10F7600C9197B /* SentryUIRedactBuilderTests.swift */,
4252+
D4AF7D292E940492004F0F59 /* SentryUIRedactBuilderTests+Common.swift */,
42524253
D4AF7D2B2E9404ED004F0F59 /* SentryUIRedactBuilderTests+EdgeCases.swift */,
42534254
D4AF7D272E9402AC004F0F59 /* SentryUIRedactBuilderTests+SpecialViews.swift */,
42544255
D4AF7D252E9401EB004F0F59 /* SentryUIRedactBuilderTests+UIKit.swift */,
@@ -4360,13 +4361,6 @@
43604361
path = Screenshot;
43614362
sourceTree = "<group>";
43624363
};
4363-
D4AF802E2E965188004F0F59 /* __Snapshots__ */ = {
4364-
isa = PBXGroup;
4365-
children = (
4366-
);
4367-
path = __Snapshots__;
4368-
sourceTree = "<group>";
4369-
};
43704364
D4A0C22A2E9E3CE100791353 /* InfoPlist */ = {
43714365
isa = PBXGroup;
43724366
children = (
@@ -4379,6 +4373,13 @@
43794373
path = InfoPlist;
43804374
sourceTree = "<group>";
43814375
};
4376+
D4AF802E2E965188004F0F59 /* __Snapshots__ */ = {
4377+
isa = PBXGroup;
4378+
children = (
4379+
);
4380+
path = __Snapshots__;
4381+
sourceTree = "<group>";
4382+
};
43824383
D4CBA2522DE06D1600581618 /* SentryTestUtilsTests */ = {
43834384
isa = PBXGroup;
43844385
children = (
@@ -6142,8 +6143,8 @@
61426143
FAC62B652E15A4100003909D /* SentrySDKThreadTests.swift in Sources */,
61436144
D82915632C85EF0C00A6CDD4 /* SentryViewPhotographerTests.swift in Sources */,
61446145
D8DBE0CA2C0E093000FAB1FD /* SentryTouchTrackerTests.swift in Sources */,
6145-
D8F67AF42BE10F9600C9197B /* SentryUIRedactBuilderTests+Common.swift in Sources */,
61466146
D4AF7D2C2E9404ED004F0F59 /* SentryUIRedactBuilderTests+EdgeCases.swift in Sources */,
6147+
D8F67AF42BE10F9600C9197B /* SentryUIRedactBuilderTests.swift in Sources */,
61476148
92ECD7482E05B57C0063EC10 /* SentryLogAttributeTests.swift in Sources */,
61486149
63B819141EC352A7002FDF4C /* SentryInterfacesTests.m in Sources */,
61496150
92B6BDA92E05B8F600D538B3 /* SentryLogLevelTests.swift in Sources */,
@@ -6199,6 +6200,7 @@
61996200
7BC6EBF4255C044A0059822A /* SentryEventTests.swift in Sources */,
62006201
63FE721920DA66EC00CDBAE8 /* SentryCrashReportStore_Tests.m in Sources */,
62016202
7B6D98EB24C6E84F005502FA /* SentryCrashInstallationReporterTests.swift in Sources */,
6203+
D44311312EB22812006CABE4 /* SentryUIRedactBuilderTests+ReactNative.swift in Sources */,
62026204
7BA61EA625F21E660008CAA2 /* SentrySDKLogTests.swift in Sources */,
62036205
62CFD9A92C99741100834E1B /* SentryInvalidJSONStringTests.swift in Sources */,
62046206
7BB42EF124F3B7B700D7B39A /* SentrySession+Equality.m in Sources */,
@@ -6230,7 +6232,7 @@
62306232
62F4DDA12C04CB9700588890 /* SentryBaggageSerializationTests.swift in Sources */,
62316233
7BE912AF272166DD00E49E62 /* SentryNoOpSpanTests.swift in Sources */,
62326234
D4F2B5352D0C69D500649E42 /* SentryCrashCTests.swift in Sources */,
6233-
D4AF7D2A2E940493004F0F59 /* SentryUIRedactBuilderTests.swift in Sources */,
6235+
D4AF7D2A2E940493004F0F59 /* SentryUIRedactBuilderTests+Common.swift in Sources */,
62346236
7B56D73524616E5600B842DA /* SentryConcurrentRateLimitsDictionaryTests.swift in Sources */,
62356237
7B7D8730248648AD00D2ECFF /* SentryStacktraceBuilderTests.swift in Sources */,
62366238
FA21A2EF2E60E9CB00E7EADB /* EnvelopeComparison.swift in Sources */,
@@ -6429,7 +6431,6 @@
64296431
7B68D93625FF5F1A0082D139 /* SentryAppState+Equality.m in Sources */,
64306432
7B5CAF7E27F5AD3500ED0DB6 /* TestNSURLRequestBuilder.m in Sources */,
64316433
D467125E2DCCFF2500D4074A /* SentryReplayOptionsObjcTests.m in Sources */,
6432-
D4AF7D222E93FFCA004F0F59 /* SentryUIRedactBuilderTests+ReactNative.swift in Sources */,
64336434
7BF69E072987D1FE002EBCA4 /* SentryCrashDoctorTests.swift in Sources */,
64346435
7B4F22DC294089530067EA17 /* FormatHexAddress.swift in Sources */,
64356436
8EAC7FF8265C8910005B44E5 /* SentryTracerTests.swift in Sources */,

‎Tests/SentryTests/ViewCapture/SentryUIRedactBuilderTests+EdgeCases.swift‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -676,7 +676,7 @@ class SentryUIRedactBuilderTests_EdgeCases: SentryUIRedactBuilderTests { // swif
676676
rootView.addSubview(label)
677677

678678
// Start a shorter animation with linear timing to create a predictable presentation layer
679-
UIView.animate(withDuration: 1.0, delay: 0, options: .curveLinear) {
679+
UIView.animate(withDuration: 10.0, delay: 0, options: .curveLinear) {
680680
label.frame = CGRect(x: 60, y: 60, width: 40, height: 40)
681681
}
682682

@@ -702,10 +702,10 @@ class SentryUIRedactBuilderTests_EdgeCases: SentryUIRedactBuilderTests { // swif
702702

703703
// Verify the position is in the middle third of the animation range (between 30 and 50)
704704
// This ensures the presentation layer is being used and represents an intermediate state
705-
XCTAssertGreaterThan(region.transform.tx, 30.0, "Position should have progressed beyond 30% of animation")
706-
XCTAssertLessThan(region.transform.tx, 50.0, "Position should not have progressed beyond 70% of animation")
707-
XCTAssertGreaterThan(region.transform.ty, 30.0, "Position should have progressed beyond 30% of animation")
708-
XCTAssertLessThan(region.transform.ty, 50.0, "Position should not have progressed beyond 70% of animation")
705+
XCTAssertGreaterThan(region.transform.tx, 20.0)
706+
XCTAssertLessThanOrEqual(region.transform.tx, 60.0)
707+
XCTAssertGreaterThan(region.transform.ty, 20.0)
708+
XCTAssertLessThanOrEqual(region.transform.ty, 60.0)
709709

710710
// Assert that no other regions
711711
XCTAssertEqual(result.count, 1)

0 commit comments

Comments
 (0)