From 470d5bd78df92c3ce81a2b715f907415956e9283 Mon Sep 17 00:00:00 2001 From: Martin Cardozo Date: Fri, 6 Jun 2025 14:50:52 -0300 Subject: [PATCH 01/11] New MetadataType --- Split.xcodeproj/project.pbxproj | 6 ++++++ Split/Events/MetadataType.swift | 24 ++++++++++++++++++++++++ 2 files changed, 30 insertions(+) create mode 100644 Split/Events/MetadataType.swift diff --git a/Split.xcodeproj/project.pbxproj b/Split.xcodeproj/project.pbxproj index 3d7b9fe2f..2fe586463 100644 --- a/Split.xcodeproj/project.pbxproj +++ b/Split.xcodeproj/project.pbxproj @@ -354,6 +354,8 @@ 59FB7C3C2203795F00ECC96A /* LocalhostSplitsParser.swift in Sources */ = {isa = PBXBuildFile; fileRef = 59FB7C3B2203795F00ECC96A /* LocalhostSplitsParser.swift */; }; 59FB7C3E22037B9400ECC96A /* SpaceDelimitedLocalhostSplitsParser.swift in Sources */ = {isa = PBXBuildFile; fileRef = 59FB7C3D22037B9400ECC96A /* SpaceDelimitedLocalhostSplitsParser.swift */; }; 5B48D8172DEA2CED00351925 /* PrerequisitesMatcher.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BF52DF52DE0B60300FEDAFE /* PrerequisitesMatcher.swift */; }; + 5B48D8192DF360D000351925 /* MetadataType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B48D8182DF360CB00351925 /* MetadataType.swift */; }; + 5B48D81A2DF360D000351925 /* MetadataType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B48D8182DF360CB00351925 /* MetadataType.swift */; }; 5B91B8392DDE4A3B000510F0 /* SplitDTOTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B91B8382DDE4A30000510F0 /* SplitDTOTests.swift */; }; 5BF52DF72DE0B60700FEDAFE /* PrerequisitesMatcher.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BF52DF52DE0B60300FEDAFE /* PrerequisitesMatcher.swift */; }; 5BF52DF92DE4B8D400FEDAFE /* PrerequisitesMatcherTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BF52DF82DE4B8CA00FEDAFE /* PrerequisitesMatcherTest.swift */; }; @@ -1557,6 +1559,7 @@ 59FB7C34220329B900ECC96A /* SplitFactoryBuilderTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SplitFactoryBuilderTests.swift; sourceTree = ""; }; 59FB7C3B2203795F00ECC96A /* LocalhostSplitsParser.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocalhostSplitsParser.swift; sourceTree = ""; }; 59FB7C3D22037B9400ECC96A /* SpaceDelimitedLocalhostSplitsParser.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SpaceDelimitedLocalhostSplitsParser.swift; sourceTree = ""; }; + 5B48D8182DF360CB00351925 /* MetadataType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MetadataType.swift; sourceTree = ""; }; 5B91B8382DDE4A30000510F0 /* SplitDTOTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SplitDTOTests.swift; sourceTree = ""; }; 5BF52DF52DE0B60300FEDAFE /* PrerequisitesMatcher.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PrerequisitesMatcher.swift; sourceTree = ""; }; 5BF52DF82DE4B8CA00FEDAFE /* PrerequisitesMatcherTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PrerequisitesMatcherTest.swift; sourceTree = ""; }; @@ -2408,6 +2411,7 @@ 3B6DEEBE20EA6AE20067435E /* Events */ = { isa = PBXGroup; children = ( + 5B48D8182DF360CB00351925 /* MetadataType.swift */, 3B6DEEC420EA6AE20067435E /* SplitEvent.swift */, 3B6DEEC520EA6AE20067435E /* SplitEventsManager.swift */, 9530FD7927F24306005027AA /* EventsManagerCoordinator.swift */, @@ -4285,6 +4289,7 @@ 598EDE84224CE2C4005D4762 /* SplitResult.swift in Sources */, 3B6DEF4120EA6AE50067435E /* DependencyMatcherData.swift in Sources */, 595AD24B24E30C0C00A7B750 /* Base64Utils.swift in Sources */, + 5B48D8192DF360D000351925 /* MetadataType.swift in Sources */, 3B6DEF4520EA6AE50067435E /* Matcher.swift in Sources */, 59FB7C0D21F6099500ECC96A /* EventValidator.swift in Sources */, 95B341B026136B42002F57F6 /* KeyValueStorage.swift in Sources */, @@ -5027,6 +5032,7 @@ 95B02D5F28D0BDC20030EC8B /* LessThanOrEqualToMatcher.swift in Sources */, 95B02D6028D0BDC20030EC8B /* MatchesStringMatcher.swift in Sources */, 952FA1312A31DCE400264AB5 /* SplitComponentCatalog.swift in Sources */, + 5B48D81A2DF360D000351925 /* MetadataType.swift in Sources */, 95B02D6128D0BDC20030EC8B /* PartOfSetMatcher.swift in Sources */, 95B02D6228D0BDC20030EC8B /* StartWithMatcher.swift in Sources */, 95880CFB2AEFF177000498A0 /* FlagSetsValidator.swift in Sources */, diff --git a/Split/Events/MetadataType.swift b/Split/Events/MetadataType.swift new file mode 100644 index 000000000..644872d45 --- /dev/null +++ b/Split/Events/MetadataType.swift @@ -0,0 +1,24 @@ +// Created by Martin Cardozo on 06/06/2025 + +@objc enum MetadataType: Int { + case FLAG_UPDATED + case FLAG_KILLED + case SEGMENT_UPDATED + case LARGE_SEGMENT_UPDATED + case RULE_BASED_SEGMENT_UPDATED + + public func toString() -> String { + switch self { + case .FLAG_UPDATED: + return "FLAG_UPDATED" + case .FLAG_KILLED: + return "FLAG_KILLED" + case .SEGMENT_UPDATED: + return "SEGMENT_UPDATED" + case .LARGE_SEGMENT_UPDATED: + return "LARGE_SEGMENT_UPDATED" + case .RULE_BASED_SEGMENT_UPDATED: + return "RULE_BASED_SEGMENT_UPDATED" + } + } +} From bdd5b9a9aa25d641a5b40441bbc23d2c3bff3e8d Mon Sep 17 00:00:00 2001 From: Martin Cardozo Date: Fri, 6 Jun 2025 15:22:13 -0300 Subject: [PATCH 02/11] Simplified logic --- Split/Events/MetadataType.swift | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/Split/Events/MetadataType.swift b/Split/Events/MetadataType.swift index 644872d45..e03616c06 100644 --- a/Split/Events/MetadataType.swift +++ b/Split/Events/MetadataType.swift @@ -7,18 +7,7 @@ case LARGE_SEGMENT_UPDATED case RULE_BASED_SEGMENT_UPDATED - public func toString() -> String { - switch self { - case .FLAG_UPDATED: - return "FLAG_UPDATED" - case .FLAG_KILLED: - return "FLAG_KILLED" - case .SEGMENT_UPDATED: - return "SEGMENT_UPDATED" - case .LARGE_SEGMENT_UPDATED: - return "LARGE_SEGMENT_UPDATED" - case .RULE_BASED_SEGMENT_UPDATED: - return "RULE_BASED_SEGMENT_UPDATED" - } + var stringValue: String { + return String(describing: self) } } From 2892893ede479cb024d8b69def9b3ed5e9df3e7b Mon Sep 17 00:00:00 2001 From: Martin Cardozo Date: Fri, 6 Jun 2025 15:42:33 -0300 Subject: [PATCH 03/11] Tests added --- SemVer.xctestplan | 2 ++ Split.xcodeproj/project.pbxproj | 4 ++++ Split/Events/MetadataType.swift | 10 +++++----- SplitPushManagerUT.xctestplan | 2 ++ SplitStreamingUT.xctestplan | 2 ++ SplitTests/Streaming/MetadataTypeTest.swift | 14 ++++++++++++++ SplitiOSHalf_1.xctestplan | 2 ++ SplitiOSIntegration_1.xctestplan | 2 ++ SplitiOSStreaming.xctestplan | 1 + SplitiOSStreaming_1.xctestplan | 2 ++ SplitiOSStreaming_2.xctestplan | 2 ++ SplitiOSUnit.xctestplan | 1 + SplitiOSUnit_1.xctestplan | 2 ++ SplitiOSUnit_2.xctestplan | 1 + SplitiOSUnit_3.xctestplan | 2 ++ 15 files changed, 44 insertions(+), 5 deletions(-) create mode 100644 SplitTests/Streaming/MetadataTypeTest.swift diff --git a/SemVer.xctestplan b/SemVer.xctestplan index d58aa2bb4..caf239057 100644 --- a/SemVer.xctestplan +++ b/SemVer.xctestplan @@ -563,6 +563,8 @@ "LoggerTest\/testWarning()", "MatcherEvalTests", "MatcherEvalTests\/testEval()", + "MetadataTypeTest", + "MetadataTypeTest\/testMetadataType()", "MultiClientEvaluationTest", "MultiClientEvaluationTest\/testEvaluation()", "MultiClientEvaluationTest\/testEvaluationFromCache()", diff --git a/Split.xcodeproj/project.pbxproj b/Split.xcodeproj/project.pbxproj index 2fe586463..5966c268a 100644 --- a/Split.xcodeproj/project.pbxproj +++ b/Split.xcodeproj/project.pbxproj @@ -356,6 +356,7 @@ 5B48D8172DEA2CED00351925 /* PrerequisitesMatcher.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BF52DF52DE0B60300FEDAFE /* PrerequisitesMatcher.swift */; }; 5B48D8192DF360D000351925 /* MetadataType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B48D8182DF360CB00351925 /* MetadataType.swift */; }; 5B48D81A2DF360D000351925 /* MetadataType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B48D8182DF360CB00351925 /* MetadataType.swift */; }; + 5B48D81C2DF36C3F00351925 /* MetadataTypeTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B48D81B2DF36C3700351925 /* MetadataTypeTest.swift */; }; 5B91B8392DDE4A3B000510F0 /* SplitDTOTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B91B8382DDE4A30000510F0 /* SplitDTOTests.swift */; }; 5BF52DF72DE0B60700FEDAFE /* PrerequisitesMatcher.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BF52DF52DE0B60300FEDAFE /* PrerequisitesMatcher.swift */; }; 5BF52DF92DE4B8D400FEDAFE /* PrerequisitesMatcherTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BF52DF82DE4B8CA00FEDAFE /* PrerequisitesMatcherTest.swift */; }; @@ -1560,6 +1561,7 @@ 59FB7C3B2203795F00ECC96A /* LocalhostSplitsParser.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocalhostSplitsParser.swift; sourceTree = ""; }; 59FB7C3D22037B9400ECC96A /* SpaceDelimitedLocalhostSplitsParser.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SpaceDelimitedLocalhostSplitsParser.swift; sourceTree = ""; }; 5B48D8182DF360CB00351925 /* MetadataType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MetadataType.swift; sourceTree = ""; }; + 5B48D81B2DF36C3700351925 /* MetadataTypeTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MetadataTypeTest.swift; sourceTree = ""; }; 5B91B8382DDE4A30000510F0 /* SplitDTOTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SplitDTOTests.swift; sourceTree = ""; }; 5BF52DF52DE0B60300FEDAFE /* PrerequisitesMatcher.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PrerequisitesMatcher.swift; sourceTree = ""; }; 5BF52DF82DE4B8CA00FEDAFE /* PrerequisitesMatcherTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PrerequisitesMatcherTest.swift; sourceTree = ""; }; @@ -2089,6 +2091,7 @@ 31AA215C368D12E69FE80703 /* Streaming */ = { isa = PBXGroup; children = ( + 5B48D81B2DF36C3700351925 /* MetadataTypeTest.swift */, 31AA280A65C72BC92858422C /* SseClientTest.swift */, 595AD26024E5D48500A7B750 /* ReconnectBackoffCounterTest.swift */, 595AD20B24DDCB0E00A7B750 /* SseAuthenticatorTest.swift */, @@ -4602,6 +4605,7 @@ 95DE29532739A7AB00DB3EAD /* AttributesDaoTest.swift in Sources */, 95ABF50029379CCD006ED016 /* EventsSynchronizerStub.swift in Sources */, 955428E02568155B00331356 /* PersistentImpressionsStorageTest.swift in Sources */, + 5B48D81C2DF36C3F00351925 /* MetadataTypeTest.swift in Sources */, 5912D152219A022000BC698C /* CsvHelper.swift in Sources */, 9505682026825B53001D7B10 /* ImpressionsCounterTest.swift in Sources */, 958F98722B1124EC001F35B3 /* SplitBgSynchronizerTests.swift in Sources */, diff --git a/Split/Events/MetadataType.swift b/Split/Events/MetadataType.swift index e03616c06..2e8e48dde 100644 --- a/Split/Events/MetadataType.swift +++ b/Split/Events/MetadataType.swift @@ -1,11 +1,11 @@ // Created by Martin Cardozo on 06/06/2025 @objc enum MetadataType: Int { - case FLAG_UPDATED - case FLAG_KILLED - case SEGMENT_UPDATED - case LARGE_SEGMENT_UPDATED - case RULE_BASED_SEGMENT_UPDATED + case FLAGS_UPDATED + case FLAGS_KILLED + case SEGMENTS_UPDATED + case LARGE_SEGMENTS_UPDATED + case RULE_BASED_SEGMENTS_UPDATED var stringValue: String { return String(describing: self) diff --git a/SplitPushManagerUT.xctestplan b/SplitPushManagerUT.xctestplan index c1dc32ac4..aa13cb4a4 100644 --- a/SplitPushManagerUT.xctestplan +++ b/SplitPushManagerUT.xctestplan @@ -579,6 +579,8 @@ "MatcherEvalTests", "MatcherEvalTests\/testEval()", "MatcherTest", + "MetadataTypeTest", + "MetadataTypeTest\/testMetadataType()", "MultiClientEvaluationTest", "MultiClientEvaluationTest\/testEvaluation()", "MultiClientEvaluationTest\/testEvaluationFromCache()", diff --git a/SplitStreamingUT.xctestplan b/SplitStreamingUT.xctestplan index 2fe384591..a42e0c633 100644 --- a/SplitStreamingUT.xctestplan +++ b/SplitStreamingUT.xctestplan @@ -577,6 +577,8 @@ "LoggerTest\/testVerbose()", "MatcherEvalTests", "MatcherEvalTests\/testEval()", + "MetadataTypeTest", + "MetadataTypeTest\/testMetadataType()", "MultiClientEvaluationTest", "MultiClientEvaluationTest\/testEvaluation()", "MultiClientEvaluationTest\/testEvaluationFromCache()", diff --git a/SplitTests/Streaming/MetadataTypeTest.swift b/SplitTests/Streaming/MetadataTypeTest.swift new file mode 100644 index 000000000..2ef05294b --- /dev/null +++ b/SplitTests/Streaming/MetadataTypeTest.swift @@ -0,0 +1,14 @@ +// Created by Martin Cardozo on 06/06/2025 + +import XCTest +@testable import Split + +class MetadataTypeTest: XCTestCase { + func testMetadataType() { + XCTAssertEqual(MetadataType.FLAGS_UPDATED.stringValue, "FLAG_UPDATED") + XCTAssertEqual(MetadataType.FLAGS_KILLED.stringValue, "FLAG_KILLED") + XCTAssertEqual(MetadataType.SEGMENTS_UPDATED.stringValue, "SEGMENTS_UPDATED") + XCTAssertEqual(MetadataType.LARGE_SEGMENTS_UPDATED.stringValue, "LARGE_SEGMENTS_UPDATED") + XCTAssertEqual(MetadataType.RULE_BASED_SEGMENTS_UPDATED.stringValue, "RULE_BASED_SEGMENTS_UPDATED") + } +} diff --git a/SplitiOSHalf_1.xctestplan b/SplitiOSHalf_1.xctestplan index 13ae32257..13472fe92 100644 --- a/SplitiOSHalf_1.xctestplan +++ b/SplitiOSHalf_1.xctestplan @@ -619,6 +619,8 @@ "LoggerTest\/testWarning()", "MatcherEvalTests", "MatcherEvalTests\/testEval()", + "MetadataTypeTest", + "MetadataTypeTest\/testMetadataType()", "MultiClientEvaluationTest", "MultiClientEvaluationTest\/testEvaluation()", "MultiClientEvaluationTest\/testEvaluationFromCache()", diff --git a/SplitiOSIntegration_1.xctestplan b/SplitiOSIntegration_1.xctestplan index 59ed82b30..7c7bfa19e 100644 --- a/SplitiOSIntegration_1.xctestplan +++ b/SplitiOSIntegration_1.xctestplan @@ -590,6 +590,8 @@ "LoggerTest\/testVerbose()", "LoggerTest\/testWarning()", "MatcherEvalTests\/testEval()", + "MetadataTypeTest", + "MetadataTypeTest\/testMetadataType()", "MultiClientEvaluationTest", "MultiClientEvaluationTest\/testEvaluation()", "MultiClientEvaluationTest\/testEvaluationFromCache()", diff --git a/SplitiOSStreaming.xctestplan b/SplitiOSStreaming.xctestplan index 045f4e7cf..716d7ecef 100644 --- a/SplitiOSStreaming.xctestplan +++ b/SplitiOSStreaming.xctestplan @@ -582,6 +582,7 @@ "LoggerTest\/testWarning()", "MatcherEvalTests", "MatcherEvalTests\/testEval()", + "MetadataTypeTest", "MultiClientEvaluationTest", "MultiClientEvaluationTest\/testEvaluation()", "MultiClientEvaluationTest\/testEvaluationFromCache()", diff --git a/SplitiOSStreaming_1.xctestplan b/SplitiOSStreaming_1.xctestplan index e98a3a3ca..6df74f285 100644 --- a/SplitiOSStreaming_1.xctestplan +++ b/SplitiOSStreaming_1.xctestplan @@ -580,6 +580,8 @@ "LoggerTest\/testWarning()", "MatcherEvalTests", "MatcherEvalTests\/testEval()", + "MetadataTypeTest", + "MetadataTypeTest\/testMetadataType()", "MultiClientEvaluationTest", "MultiClientEvaluationTest\/testEvaluation()", "MultiClientEvaluationTest\/testEvaluationFromCache()", diff --git a/SplitiOSStreaming_2.xctestplan b/SplitiOSStreaming_2.xctestplan index c950db0f9..eedab56a6 100644 --- a/SplitiOSStreaming_2.xctestplan +++ b/SplitiOSStreaming_2.xctestplan @@ -584,6 +584,8 @@ "LoggerTest\/testWarning()", "MatcherEvalTests", "MatcherEvalTests\/testEval()", + "MetadataTypeTest", + "MetadataTypeTest\/testMetadataType()", "MultiClientEvaluationTest", "MultiClientEvaluationTest\/testEvaluation()", "MultiClientEvaluationTest\/testEvaluationFromCache()", diff --git a/SplitiOSUnit.xctestplan b/SplitiOSUnit.xctestplan index e7b84c777..ebdd05d47 100644 --- a/SplitiOSUnit.xctestplan +++ b/SplitiOSUnit.xctestplan @@ -588,6 +588,7 @@ "LoggerTest\/testVerbose()", "LoggerTest\/testWarning()", "MatcherEvalTests", + "MetadataTypeTest\/testMetadataType()", "MultiClientEvaluationTest", "MultiClientEvaluationTest\/testEvaluation()", "MultiClientEvaluationTest\/testEvaluationFromCache()", diff --git a/SplitiOSUnit_1.xctestplan b/SplitiOSUnit_1.xctestplan index 544b81db0..2b8cbb586 100644 --- a/SplitiOSUnit_1.xctestplan +++ b/SplitiOSUnit_1.xctestplan @@ -588,6 +588,8 @@ "LoggerTest\/testWarning()", "MatcherEvalTests", "MatcherEvalTests\/testEval()", + "MetadataTypeTest", + "MetadataTypeTest\/testMetadataType()", "MultiClientEvaluationTest", "MultiClientEvaluationTest\/testEvaluation()", "MultiClientEvaluationTest\/testEvaluationWithAttributes()", diff --git a/SplitiOSUnit_2.xctestplan b/SplitiOSUnit_2.xctestplan index 2a114cdf9..7d77ad2bc 100644 --- a/SplitiOSUnit_2.xctestplan +++ b/SplitiOSUnit_2.xctestplan @@ -596,6 +596,7 @@ "LoggerTest\/testWarning()", "MatcherEvalTests", "MatcherEvalTests\/testEval()", + "MetadataTypeTest", "MultiClientEvaluationTest\/testEvaluationFromCache()", "MultiClientEvaluationTest\/testEvaluationWithAttributes()", "MultiClientEvaluationTest\/testImpressions()", diff --git a/SplitiOSUnit_3.xctestplan b/SplitiOSUnit_3.xctestplan index 0ada2a57b..caed33173 100644 --- a/SplitiOSUnit_3.xctestplan +++ b/SplitiOSUnit_3.xctestplan @@ -587,6 +587,8 @@ "LoggerTest\/testWarning()", "MatcherEvalTests", "MatcherEvalTests\/testEval()", + "MetadataTypeTest", + "MetadataTypeTest\/testMetadataType()", "MultiClientEvaluationTest", "MultiClientEvaluationTest\/testEvaluation()", "MultiClientEvaluationTest\/testEvaluationFromCache()", From 58bc46b0a3d19071486c9ef4e758ea2d9af55f69 Mon Sep 17 00:00:00 2001 From: Martin Cardozo Date: Fri, 6 Jun 2025 15:54:32 -0300 Subject: [PATCH 04/11] Tests fixed --- Split/Events/MetadataType.swift | 10 ++++++++-- SplitTests/Streaming/MetadataTypeTest.swift | 10 +++++----- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/Split/Events/MetadataType.swift b/Split/Events/MetadataType.swift index 2e8e48dde..67859a389 100644 --- a/Split/Events/MetadataType.swift +++ b/Split/Events/MetadataType.swift @@ -7,7 +7,13 @@ case LARGE_SEGMENTS_UPDATED case RULE_BASED_SEGMENTS_UPDATED - var stringValue: String { - return String(describing: self) + public func toString() -> String { + switch self { + case .FLAGS_UPDATED: "FLAGS_UPDATED" + case .FLAGS_KILLED: "FLAGS_KILLED" + case .SEGMENTS_UPDATED: "SEGMENTS_UPDATED" + case .LARGE_SEGMENTS_UPDATED: "LARGE_SEGMENTS_UPDATED" + case .RULE_BASED_SEGMENTS_UPDATED: "RULE_BASED_SEGMENTS_UPDATED" + } } } diff --git a/SplitTests/Streaming/MetadataTypeTest.swift b/SplitTests/Streaming/MetadataTypeTest.swift index 2ef05294b..3f2ff81ac 100644 --- a/SplitTests/Streaming/MetadataTypeTest.swift +++ b/SplitTests/Streaming/MetadataTypeTest.swift @@ -5,10 +5,10 @@ import XCTest class MetadataTypeTest: XCTestCase { func testMetadataType() { - XCTAssertEqual(MetadataType.FLAGS_UPDATED.stringValue, "FLAG_UPDATED") - XCTAssertEqual(MetadataType.FLAGS_KILLED.stringValue, "FLAG_KILLED") - XCTAssertEqual(MetadataType.SEGMENTS_UPDATED.stringValue, "SEGMENTS_UPDATED") - XCTAssertEqual(MetadataType.LARGE_SEGMENTS_UPDATED.stringValue, "LARGE_SEGMENTS_UPDATED") - XCTAssertEqual(MetadataType.RULE_BASED_SEGMENTS_UPDATED.stringValue, "RULE_BASED_SEGMENTS_UPDATED") + XCTAssertEqual(MetadataType.FLAGS_UPDATED.toString(), "FLAGS_UPDATED") + XCTAssertEqual(MetadataType.FLAGS_KILLED.toString(), "FLAGS_KILLED") + XCTAssertEqual(MetadataType.SEGMENTS_UPDATED.toString(), "SEGMENTS_UPDATED") + XCTAssertEqual(MetadataType.LARGE_SEGMENTS_UPDATED.toString(), "LARGE_SEGMENTS_UPDATED") + XCTAssertEqual(MetadataType.RULE_BASED_SEGMENTS_UPDATED.toString(), "RULE_BASED_SEGMENTS_UPDATED") } } From 0271dc2ad98bbe3ea13373a9f4b85e5cc75a7656 Mon Sep 17 00:00:00 2001 From: Martin Cardozo Date: Mon, 9 Jun 2025 11:57:12 -0300 Subject: [PATCH 05/11] Unnecessary test removed --- Split.xcodeproj/project.pbxproj | 4 ---- SplitTests/Streaming/MetadataTypeTest.swift | 14 -------------- 2 files changed, 18 deletions(-) delete mode 100644 SplitTests/Streaming/MetadataTypeTest.swift diff --git a/Split.xcodeproj/project.pbxproj b/Split.xcodeproj/project.pbxproj index 5966c268a..2fe586463 100644 --- a/Split.xcodeproj/project.pbxproj +++ b/Split.xcodeproj/project.pbxproj @@ -356,7 +356,6 @@ 5B48D8172DEA2CED00351925 /* PrerequisitesMatcher.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BF52DF52DE0B60300FEDAFE /* PrerequisitesMatcher.swift */; }; 5B48D8192DF360D000351925 /* MetadataType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B48D8182DF360CB00351925 /* MetadataType.swift */; }; 5B48D81A2DF360D000351925 /* MetadataType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B48D8182DF360CB00351925 /* MetadataType.swift */; }; - 5B48D81C2DF36C3F00351925 /* MetadataTypeTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B48D81B2DF36C3700351925 /* MetadataTypeTest.swift */; }; 5B91B8392DDE4A3B000510F0 /* SplitDTOTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B91B8382DDE4A30000510F0 /* SplitDTOTests.swift */; }; 5BF52DF72DE0B60700FEDAFE /* PrerequisitesMatcher.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BF52DF52DE0B60300FEDAFE /* PrerequisitesMatcher.swift */; }; 5BF52DF92DE4B8D400FEDAFE /* PrerequisitesMatcherTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BF52DF82DE4B8CA00FEDAFE /* PrerequisitesMatcherTest.swift */; }; @@ -1561,7 +1560,6 @@ 59FB7C3B2203795F00ECC96A /* LocalhostSplitsParser.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocalhostSplitsParser.swift; sourceTree = ""; }; 59FB7C3D22037B9400ECC96A /* SpaceDelimitedLocalhostSplitsParser.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SpaceDelimitedLocalhostSplitsParser.swift; sourceTree = ""; }; 5B48D8182DF360CB00351925 /* MetadataType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MetadataType.swift; sourceTree = ""; }; - 5B48D81B2DF36C3700351925 /* MetadataTypeTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MetadataTypeTest.swift; sourceTree = ""; }; 5B91B8382DDE4A30000510F0 /* SplitDTOTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SplitDTOTests.swift; sourceTree = ""; }; 5BF52DF52DE0B60300FEDAFE /* PrerequisitesMatcher.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PrerequisitesMatcher.swift; sourceTree = ""; }; 5BF52DF82DE4B8CA00FEDAFE /* PrerequisitesMatcherTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PrerequisitesMatcherTest.swift; sourceTree = ""; }; @@ -2091,7 +2089,6 @@ 31AA215C368D12E69FE80703 /* Streaming */ = { isa = PBXGroup; children = ( - 5B48D81B2DF36C3700351925 /* MetadataTypeTest.swift */, 31AA280A65C72BC92858422C /* SseClientTest.swift */, 595AD26024E5D48500A7B750 /* ReconnectBackoffCounterTest.swift */, 595AD20B24DDCB0E00A7B750 /* SseAuthenticatorTest.swift */, @@ -4605,7 +4602,6 @@ 95DE29532739A7AB00DB3EAD /* AttributesDaoTest.swift in Sources */, 95ABF50029379CCD006ED016 /* EventsSynchronizerStub.swift in Sources */, 955428E02568155B00331356 /* PersistentImpressionsStorageTest.swift in Sources */, - 5B48D81C2DF36C3F00351925 /* MetadataTypeTest.swift in Sources */, 5912D152219A022000BC698C /* CsvHelper.swift in Sources */, 9505682026825B53001D7B10 /* ImpressionsCounterTest.swift in Sources */, 958F98722B1124EC001F35B3 /* SplitBgSynchronizerTests.swift in Sources */, diff --git a/SplitTests/Streaming/MetadataTypeTest.swift b/SplitTests/Streaming/MetadataTypeTest.swift deleted file mode 100644 index 3f2ff81ac..000000000 --- a/SplitTests/Streaming/MetadataTypeTest.swift +++ /dev/null @@ -1,14 +0,0 @@ -// Created by Martin Cardozo on 06/06/2025 - -import XCTest -@testable import Split - -class MetadataTypeTest: XCTestCase { - func testMetadataType() { - XCTAssertEqual(MetadataType.FLAGS_UPDATED.toString(), "FLAGS_UPDATED") - XCTAssertEqual(MetadataType.FLAGS_KILLED.toString(), "FLAGS_KILLED") - XCTAssertEqual(MetadataType.SEGMENTS_UPDATED.toString(), "SEGMENTS_UPDATED") - XCTAssertEqual(MetadataType.LARGE_SEGMENTS_UPDATED.toString(), "LARGE_SEGMENTS_UPDATED") - XCTAssertEqual(MetadataType.RULE_BASED_SEGMENTS_UPDATED.toString(), "RULE_BASED_SEGMENTS_UPDATED") - } -} From 013252d918909597084a12e3625e8b53c2d9d9a0 Mon Sep 17 00:00:00 2001 From: Martin Cardozo Date: Mon, 9 Jun 2025 12:19:57 -0300 Subject: [PATCH 06/11] Clean up tests --- SemVer.xctestplan | 2 -- SplitPushManagerUT.xctestplan | 2 -- SplitStreamingUT.xctestplan | 2 -- SplitiOSHalf_1.xctestplan | 2 -- SplitiOSIntegration_1.xctestplan | 2 -- SplitiOSStreaming.xctestplan | 1 - SplitiOSStreaming_1.xctestplan | 2 -- SplitiOSStreaming_2.xctestplan | 2 -- SplitiOSUnit.xctestplan | 2 -- SplitiOSUnit_1.xctestplan | 2 -- SplitiOSUnit_2.xctestplan | 1 - SplitiOSUnit_3.xctestplan | 2 -- 12 files changed, 22 deletions(-) diff --git a/SemVer.xctestplan b/SemVer.xctestplan index caf239057..d58aa2bb4 100644 --- a/SemVer.xctestplan +++ b/SemVer.xctestplan @@ -563,8 +563,6 @@ "LoggerTest\/testWarning()", "MatcherEvalTests", "MatcherEvalTests\/testEval()", - "MetadataTypeTest", - "MetadataTypeTest\/testMetadataType()", "MultiClientEvaluationTest", "MultiClientEvaluationTest\/testEvaluation()", "MultiClientEvaluationTest\/testEvaluationFromCache()", diff --git a/SplitPushManagerUT.xctestplan b/SplitPushManagerUT.xctestplan index aa13cb4a4..c1dc32ac4 100644 --- a/SplitPushManagerUT.xctestplan +++ b/SplitPushManagerUT.xctestplan @@ -579,8 +579,6 @@ "MatcherEvalTests", "MatcherEvalTests\/testEval()", "MatcherTest", - "MetadataTypeTest", - "MetadataTypeTest\/testMetadataType()", "MultiClientEvaluationTest", "MultiClientEvaluationTest\/testEvaluation()", "MultiClientEvaluationTest\/testEvaluationFromCache()", diff --git a/SplitStreamingUT.xctestplan b/SplitStreamingUT.xctestplan index a42e0c633..2fe384591 100644 --- a/SplitStreamingUT.xctestplan +++ b/SplitStreamingUT.xctestplan @@ -577,8 +577,6 @@ "LoggerTest\/testVerbose()", "MatcherEvalTests", "MatcherEvalTests\/testEval()", - "MetadataTypeTest", - "MetadataTypeTest\/testMetadataType()", "MultiClientEvaluationTest", "MultiClientEvaluationTest\/testEvaluation()", "MultiClientEvaluationTest\/testEvaluationFromCache()", diff --git a/SplitiOSHalf_1.xctestplan b/SplitiOSHalf_1.xctestplan index 13472fe92..13ae32257 100644 --- a/SplitiOSHalf_1.xctestplan +++ b/SplitiOSHalf_1.xctestplan @@ -619,8 +619,6 @@ "LoggerTest\/testWarning()", "MatcherEvalTests", "MatcherEvalTests\/testEval()", - "MetadataTypeTest", - "MetadataTypeTest\/testMetadataType()", "MultiClientEvaluationTest", "MultiClientEvaluationTest\/testEvaluation()", "MultiClientEvaluationTest\/testEvaluationFromCache()", diff --git a/SplitiOSIntegration_1.xctestplan b/SplitiOSIntegration_1.xctestplan index 7c7bfa19e..59ed82b30 100644 --- a/SplitiOSIntegration_1.xctestplan +++ b/SplitiOSIntegration_1.xctestplan @@ -590,8 +590,6 @@ "LoggerTest\/testVerbose()", "LoggerTest\/testWarning()", "MatcherEvalTests\/testEval()", - "MetadataTypeTest", - "MetadataTypeTest\/testMetadataType()", "MultiClientEvaluationTest", "MultiClientEvaluationTest\/testEvaluation()", "MultiClientEvaluationTest\/testEvaluationFromCache()", diff --git a/SplitiOSStreaming.xctestplan b/SplitiOSStreaming.xctestplan index 716d7ecef..045f4e7cf 100644 --- a/SplitiOSStreaming.xctestplan +++ b/SplitiOSStreaming.xctestplan @@ -582,7 +582,6 @@ "LoggerTest\/testWarning()", "MatcherEvalTests", "MatcherEvalTests\/testEval()", - "MetadataTypeTest", "MultiClientEvaluationTest", "MultiClientEvaluationTest\/testEvaluation()", "MultiClientEvaluationTest\/testEvaluationFromCache()", diff --git a/SplitiOSStreaming_1.xctestplan b/SplitiOSStreaming_1.xctestplan index 6df74f285..e98a3a3ca 100644 --- a/SplitiOSStreaming_1.xctestplan +++ b/SplitiOSStreaming_1.xctestplan @@ -580,8 +580,6 @@ "LoggerTest\/testWarning()", "MatcherEvalTests", "MatcherEvalTests\/testEval()", - "MetadataTypeTest", - "MetadataTypeTest\/testMetadataType()", "MultiClientEvaluationTest", "MultiClientEvaluationTest\/testEvaluation()", "MultiClientEvaluationTest\/testEvaluationFromCache()", diff --git a/SplitiOSStreaming_2.xctestplan b/SplitiOSStreaming_2.xctestplan index eedab56a6..c950db0f9 100644 --- a/SplitiOSStreaming_2.xctestplan +++ b/SplitiOSStreaming_2.xctestplan @@ -584,8 +584,6 @@ "LoggerTest\/testWarning()", "MatcherEvalTests", "MatcherEvalTests\/testEval()", - "MetadataTypeTest", - "MetadataTypeTest\/testMetadataType()", "MultiClientEvaluationTest", "MultiClientEvaluationTest\/testEvaluation()", "MultiClientEvaluationTest\/testEvaluationFromCache()", diff --git a/SplitiOSUnit.xctestplan b/SplitiOSUnit.xctestplan index ebdd05d47..adcf79144 100644 --- a/SplitiOSUnit.xctestplan +++ b/SplitiOSUnit.xctestplan @@ -587,8 +587,6 @@ "LoggerTest\/testNone()", "LoggerTest\/testVerbose()", "LoggerTest\/testWarning()", - "MatcherEvalTests", - "MetadataTypeTest\/testMetadataType()", "MultiClientEvaluationTest", "MultiClientEvaluationTest\/testEvaluation()", "MultiClientEvaluationTest\/testEvaluationFromCache()", diff --git a/SplitiOSUnit_1.xctestplan b/SplitiOSUnit_1.xctestplan index 2b8cbb586..544b81db0 100644 --- a/SplitiOSUnit_1.xctestplan +++ b/SplitiOSUnit_1.xctestplan @@ -588,8 +588,6 @@ "LoggerTest\/testWarning()", "MatcherEvalTests", "MatcherEvalTests\/testEval()", - "MetadataTypeTest", - "MetadataTypeTest\/testMetadataType()", "MultiClientEvaluationTest", "MultiClientEvaluationTest\/testEvaluation()", "MultiClientEvaluationTest\/testEvaluationWithAttributes()", diff --git a/SplitiOSUnit_2.xctestplan b/SplitiOSUnit_2.xctestplan index 7d77ad2bc..2a114cdf9 100644 --- a/SplitiOSUnit_2.xctestplan +++ b/SplitiOSUnit_2.xctestplan @@ -596,7 +596,6 @@ "LoggerTest\/testWarning()", "MatcherEvalTests", "MatcherEvalTests\/testEval()", - "MetadataTypeTest", "MultiClientEvaluationTest\/testEvaluationFromCache()", "MultiClientEvaluationTest\/testEvaluationWithAttributes()", "MultiClientEvaluationTest\/testImpressions()", diff --git a/SplitiOSUnit_3.xctestplan b/SplitiOSUnit_3.xctestplan index caed33173..0ada2a57b 100644 --- a/SplitiOSUnit_3.xctestplan +++ b/SplitiOSUnit_3.xctestplan @@ -587,8 +587,6 @@ "LoggerTest\/testWarning()", "MatcherEvalTests", "MatcherEvalTests\/testEval()", - "MetadataTypeTest", - "MetadataTypeTest\/testMetadataType()", "MultiClientEvaluationTest", "MultiClientEvaluationTest\/testEvaluation()", "MultiClientEvaluationTest\/testEvaluationFromCache()", From 18bb45ffa32410359ceaa1349cc39c7b1839817e Mon Sep 17 00:00:00 2001 From: Martin Cardozo Date: Mon, 9 Jun 2025 12:25:02 -0300 Subject: [PATCH 07/11] Clean up tests --- SplitiOSUnit.xctestplan | 1 + 1 file changed, 1 insertion(+) diff --git a/SplitiOSUnit.xctestplan b/SplitiOSUnit.xctestplan index adcf79144..f8533fd8d 100644 --- a/SplitiOSUnit.xctestplan +++ b/SplitiOSUnit.xctestplan @@ -587,6 +587,7 @@ "LoggerTest\/testNone()", "LoggerTest\/testVerbose()", "LoggerTest\/testWarning()", + "MatcherEvalTests", "MultiClientEvaluationTest", "MultiClientEvaluationTest\/testEvaluation()", "MultiClientEvaluationTest\/testEvaluationFromCache()", From b4fab6a43961ba5fb951243be07ef672b79660a6 Mon Sep 17 00:00:00 2001 From: Martin Cardozo Date: Mon, 9 Jun 2025 12:43:48 -0300 Subject: [PATCH 08/11] Event added --- Split.xcodeproj/project.pbxproj | 12 ++++++------ ...{MetadataType.swift => EventMetadataType.swift} | 14 +++++++++++++- SplitiOSUnit.xctestplan | 2 +- 3 files changed, 20 insertions(+), 8 deletions(-) rename Split/Events/{MetadataType.swift => EventMetadataType.swift} (67%) diff --git a/Split.xcodeproj/project.pbxproj b/Split.xcodeproj/project.pbxproj index 2fe586463..34e03afcf 100644 --- a/Split.xcodeproj/project.pbxproj +++ b/Split.xcodeproj/project.pbxproj @@ -354,8 +354,8 @@ 59FB7C3C2203795F00ECC96A /* LocalhostSplitsParser.swift in Sources */ = {isa = PBXBuildFile; fileRef = 59FB7C3B2203795F00ECC96A /* LocalhostSplitsParser.swift */; }; 59FB7C3E22037B9400ECC96A /* SpaceDelimitedLocalhostSplitsParser.swift in Sources */ = {isa = PBXBuildFile; fileRef = 59FB7C3D22037B9400ECC96A /* SpaceDelimitedLocalhostSplitsParser.swift */; }; 5B48D8172DEA2CED00351925 /* PrerequisitesMatcher.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BF52DF52DE0B60300FEDAFE /* PrerequisitesMatcher.swift */; }; - 5B48D8192DF360D000351925 /* MetadataType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B48D8182DF360CB00351925 /* MetadataType.swift */; }; - 5B48D81A2DF360D000351925 /* MetadataType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B48D8182DF360CB00351925 /* MetadataType.swift */; }; + 5B48D8192DF360D000351925 /* EventMetadataType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B48D8182DF360CB00351925 /* EventMetadataType.swift */; }; + 5B48D81A2DF360D000351925 /* EventMetadataType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B48D8182DF360CB00351925 /* EventMetadataType.swift */; }; 5B91B8392DDE4A3B000510F0 /* SplitDTOTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B91B8382DDE4A30000510F0 /* SplitDTOTests.swift */; }; 5BF52DF72DE0B60700FEDAFE /* PrerequisitesMatcher.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BF52DF52DE0B60300FEDAFE /* PrerequisitesMatcher.swift */; }; 5BF52DF92DE4B8D400FEDAFE /* PrerequisitesMatcherTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BF52DF82DE4B8CA00FEDAFE /* PrerequisitesMatcherTest.swift */; }; @@ -1559,7 +1559,7 @@ 59FB7C34220329B900ECC96A /* SplitFactoryBuilderTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SplitFactoryBuilderTests.swift; sourceTree = ""; }; 59FB7C3B2203795F00ECC96A /* LocalhostSplitsParser.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocalhostSplitsParser.swift; sourceTree = ""; }; 59FB7C3D22037B9400ECC96A /* SpaceDelimitedLocalhostSplitsParser.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SpaceDelimitedLocalhostSplitsParser.swift; sourceTree = ""; }; - 5B48D8182DF360CB00351925 /* MetadataType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MetadataType.swift; sourceTree = ""; }; + 5B48D8182DF360CB00351925 /* EventMetadataType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EventMetadataType.swift; sourceTree = ""; }; 5B91B8382DDE4A30000510F0 /* SplitDTOTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SplitDTOTests.swift; sourceTree = ""; }; 5BF52DF52DE0B60300FEDAFE /* PrerequisitesMatcher.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PrerequisitesMatcher.swift; sourceTree = ""; }; 5BF52DF82DE4B8CA00FEDAFE /* PrerequisitesMatcherTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PrerequisitesMatcherTest.swift; sourceTree = ""; }; @@ -2411,7 +2411,7 @@ 3B6DEEBE20EA6AE20067435E /* Events */ = { isa = PBXGroup; children = ( - 5B48D8182DF360CB00351925 /* MetadataType.swift */, + 5B48D8182DF360CB00351925 /* EventMetadataType.swift */, 3B6DEEC420EA6AE20067435E /* SplitEvent.swift */, 3B6DEEC520EA6AE20067435E /* SplitEventsManager.swift */, 9530FD7927F24306005027AA /* EventsManagerCoordinator.swift */, @@ -4289,7 +4289,7 @@ 598EDE84224CE2C4005D4762 /* SplitResult.swift in Sources */, 3B6DEF4120EA6AE50067435E /* DependencyMatcherData.swift in Sources */, 595AD24B24E30C0C00A7B750 /* Base64Utils.swift in Sources */, - 5B48D8192DF360D000351925 /* MetadataType.swift in Sources */, + 5B48D8192DF360D000351925 /* EventMetadataType.swift in Sources */, 3B6DEF4520EA6AE50067435E /* Matcher.swift in Sources */, 59FB7C0D21F6099500ECC96A /* EventValidator.swift in Sources */, 95B341B026136B42002F57F6 /* KeyValueStorage.swift in Sources */, @@ -5032,7 +5032,7 @@ 95B02D5F28D0BDC20030EC8B /* LessThanOrEqualToMatcher.swift in Sources */, 95B02D6028D0BDC20030EC8B /* MatchesStringMatcher.swift in Sources */, 952FA1312A31DCE400264AB5 /* SplitComponentCatalog.swift in Sources */, - 5B48D81A2DF360D000351925 /* MetadataType.swift in Sources */, + 5B48D81A2DF360D000351925 /* EventMetadataType.swift in Sources */, 95B02D6128D0BDC20030EC8B /* PartOfSetMatcher.swift in Sources */, 95B02D6228D0BDC20030EC8B /* StartWithMatcher.swift in Sources */, 95880CFB2AEFF177000498A0 /* FlagSetsValidator.swift in Sources */, diff --git a/Split/Events/MetadataType.swift b/Split/Events/EventMetadataType.swift similarity index 67% rename from Split/Events/MetadataType.swift rename to Split/Events/EventMetadataType.swift index 67859a389..da441c028 100644 --- a/Split/Events/MetadataType.swift +++ b/Split/Events/EventMetadataType.swift @@ -1,6 +1,18 @@ // Created by Martin Cardozo on 06/06/2025 -@objc enum MetadataType: Int { +import Foundation + +@objc public class EventMetadata: NSObject { + var type: EventMetadataType + var data: String = "" + + init(type: EventMetadataType, data: String) { + self.type = type + self.data = data + } +} + +@objc enum EventMetadataType: Int { case FLAGS_UPDATED case FLAGS_KILLED case SEGMENTS_UPDATED diff --git a/SplitiOSUnit.xctestplan b/SplitiOSUnit.xctestplan index f8533fd8d..e7b84c777 100644 --- a/SplitiOSUnit.xctestplan +++ b/SplitiOSUnit.xctestplan @@ -587,7 +587,7 @@ "LoggerTest\/testNone()", "LoggerTest\/testVerbose()", "LoggerTest\/testWarning()", - "MatcherEvalTests", + "MatcherEvalTests", "MultiClientEvaluationTest", "MultiClientEvaluationTest\/testEvaluation()", "MultiClientEvaluationTest\/testEvaluationFromCache()", From a707ab05b3a3b85b3c708a0a47b882213928fdea Mon Sep 17 00:00:00 2001 From: Martin Cardozo Date: Mon, 9 Jun 2025 22:59:25 -0300 Subject: [PATCH 09/11] SonarQube test --- Split/Events/EventMetadataType.swift | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Split/Events/EventMetadataType.swift b/Split/Events/EventMetadataType.swift index da441c028..5903e9ff7 100644 --- a/Split/Events/EventMetadataType.swift +++ b/Split/Events/EventMetadataType.swift @@ -2,6 +2,7 @@ import Foundation +// NOSONAR @objc public class EventMetadata: NSObject { var type: EventMetadataType var data: String = "" @@ -12,6 +13,7 @@ import Foundation } } +// NOSONAR @objc enum EventMetadataType: Int { case FLAGS_UPDATED case FLAGS_KILLED From f93680bbe74ae0c5578f4b76b60d84fb2357f418 Mon Sep 17 00:00:00 2001 From: Martin Cardozo Date: Tue, 10 Jun 2025 12:23:28 -0300 Subject: [PATCH 10/11] Trying NOSONAR --- Split/Events/EventMetadataType.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Split/Events/EventMetadataType.swift b/Split/Events/EventMetadataType.swift index 5903e9ff7..b1819d2c1 100644 --- a/Split/Events/EventMetadataType.swift +++ b/Split/Events/EventMetadataType.swift @@ -2,7 +2,7 @@ import Foundation -// NOSONAR +//NOSONAR @objc public class EventMetadata: NSObject { var type: EventMetadataType var data: String = "" @@ -13,7 +13,7 @@ import Foundation } } -// NOSONAR +//NOSONAR @objc enum EventMetadataType: Int { case FLAGS_UPDATED case FLAGS_KILLED From 4abd2f3f0aa2178a55af643898c7cd3b5c8be5eb Mon Sep 17 00:00:00 2001 From: Martin Cardozo Date: Tue, 10 Jun 2025 12:49:16 -0300 Subject: [PATCH 11/11] Restoring before NOSONAR --- Split/Events/EventMetadataType.swift | 2 -- 1 file changed, 2 deletions(-) diff --git a/Split/Events/EventMetadataType.swift b/Split/Events/EventMetadataType.swift index b1819d2c1..da441c028 100644 --- a/Split/Events/EventMetadataType.swift +++ b/Split/Events/EventMetadataType.swift @@ -2,7 +2,6 @@ import Foundation -//NOSONAR @objc public class EventMetadata: NSObject { var type: EventMetadataType var data: String = "" @@ -13,7 +12,6 @@ import Foundation } } -//NOSONAR @objc enum EventMetadataType: Int { case FLAGS_UPDATED case FLAGS_KILLED