Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

FFM-8162 - iOS SDK - Fix unit tests #23

Merged
merged 2 commits into from
Jun 8, 2023
Merged

FFM-8162 - iOS SDK - Fix unit tests #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
adbb9fa
FFM-8162 - iOS SDK - Fix unit tests
andybharness Jun 8, 2023
463f96f
fixing last remaining test
andybharness Jun 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Tests/ff-ios-client-sdkTests/Mocks/CFProjectMocks.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ struct CfProjectMocks {
dict["environmentIdentifier"] = "environmentIdentifier_value"
dict["environment"] = "environment_value"
dict["accountID"] = "accountID_value"
dict["clusterIdentifier"] = "clusterIdentifier_value"
return dict
}
}
12 changes: 6 additions & 6 deletions Tests/ff-ios-client-sdkTests/Mocks/CacheMocks.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,15 +55,15 @@ struct CacheMocks {
for _ in 0..<count {
if let type = type {
switch type {
case .string(let stringVal): mocks.append(.init(flag: TestFlagValue(.string).key, value: ValueType.string(stringVal)))
case .bool(let boolVal): mocks.append(.init(flag: TestFlagValue(.bool).key, value: ValueType.bool(boolVal)))
case .int(let intVal): mocks.append(.init(flag: TestFlagValue(.int).key, value: ValueType.int(intVal)))
case .object(let objectVal): mocks.append(.init(flag: TestFlagValue(.object).key, value: ValueType.object(objectVal)))
case .string(let stringVal): mocks.append(.init(flag: TestFlagValue(.string).key, identifier: "test", value: ValueType.string(stringVal)))
case .bool(let boolVal): mocks.append(.init(flag: TestFlagValue(.bool).key, identifier: "test", value: ValueType.bool(boolVal)))
case .int(let intVal): mocks.append(.init(flag: TestFlagValue(.int).key, identifier: "test", value: ValueType.int(intVal)))
case .object(let objectVal): mocks.append(.init(flag: TestFlagValue(.object).key, identifier: "test", value: ValueType.object(objectVal)))
}
} else {
let random = Int(arc4random_uniform(UInt32(TestFlagValue.RawValue.allCases.count)))
let randomValueType = TestFlagValue(TestFlagValue.RawValue(rawValue: random)!)
mocks.append(.init(flag: randomValueType.key, value: randomValueType.value))
mocks.append(.init(flag: randomValueType.key, identifier: "test", value: randomValueType.value))
}
}
return mocks
Expand All @@ -85,7 +85,7 @@ struct CacheMocks {
let random = Int(arc4random_uniform(UInt32(TestFlagValue.RawValue.allCases.count)))
let randomValueType = TestFlagValue(TestFlagValue.RawValue(rawValue: random)!)
if !mocks.contains(where: {$0.value == randomValueType.value}) {
mocks.append(.init(flag: randomValueType.key, value: randomValueType.value))
mocks.append(.init(flag: randomValueType.key, identifier: "test", value: randomValueType.value))
}
}
return mocks
Expand Down
13 changes: 7 additions & 6 deletions Tests/ff-ios-client-sdkTests/Mocks/DefaultAPIManagerMock.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,9 @@ import Foundation
@testable import ff_ios_client_sdk

class DefaultAPIManagerMock: DefaultAPIManagerProtocol {

var replacementEnabled = false
func getEvaluations(environmentUUID: String, target: String, apiResponseQueue: DispatchQueue, completion: @escaping (Swift.Result<[Evaluation], ff_ios_client_sdk.CFError>) -> ()) {
func getEvaluations(environmentUUID: String, target: String, cluster: String, apiResponseQueue: DispatchQueue, completion: @escaping (Swift.Result<[Evaluation], ff_ios_client_sdk.CFError>) -> ()) {
if target == "success" {
let evaluations = CacheMocks.createAllTypeFlagMocks()
completion(.success(evaluations))
Expand All @@ -19,7 +20,7 @@ class DefaultAPIManagerMock: DefaultAPIManagerProtocol {
}
}

func getEvaluationByIdentifier(environmentUUID: String, feature: String, target: String, apiResponseQueue: DispatchQueue, completion: @escaping (Swift.Result<Evaluation, ff_ios_client_sdk.CFError>) -> ()) {
func getEvaluationByIdentifier(environmentUUID: String, feature: String, target: String, cluster: String, apiResponseQueue: DispatchQueue, completion: @escaping (Swift.Result<Evaluation, ff_ios_client_sdk.CFError>) -> ()) {
var found = false
if target == "cloud_failure_cache_failure" {
completion(.failure(CFError.storageError))
Expand All @@ -29,10 +30,10 @@ class DefaultAPIManagerMock: DefaultAPIManagerProtocol {
var modifiedEval: Evaluation?
let value = evaluation.value
switch value {
case .string(let string): modifiedEval = Evaluation(flag: evaluation.flag, value: .string(string + "_changed"))
case .bool(let bool): modifiedEval = Evaluation(flag: evaluation.flag, value: .bool(!bool))
case .int(let int): modifiedEval = Evaluation(flag: evaluation.flag, value: .int(int + 5))
case .object(_): modifiedEval = Evaluation(flag: evaluation.flag, value: .object(["added":ValueType.bool(true)]))
case .string(let string): modifiedEval = Evaluation(flag: evaluation.flag, identifier: "test", value: .string(string + "_changed"))
case .bool(let bool): modifiedEval = Evaluation(flag: evaluation.flag, identifier: "test",value: .bool(!bool))
case .int(let int): modifiedEval = Evaluation(flag: evaluation.flag, identifier: "test",value: .int(int + 5))
case .object(_): modifiedEval = Evaluation(flag: evaluation.flag, identifier: "test", value: .object(["added":ValueType.bool(true)]))
}
completion(.success(modifiedEval!))
} else {
Expand Down
10 changes: 6 additions & 4 deletions Tests/ff-ios-client-sdkTests/Mocks/JWTMocks.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,10 @@ struct JWTMocks {
static let stringMock = """
eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyfQ.SflKxwRJSMeKKF2QT4fwpMeJf36POk6yJV_adQssw5c
"""
static let token =
"""
"eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJwcm9qZWN0IjoiZTRkZWIxMDYtODU1MC00OTBhLWIyZWMtNmZhZDQzNTdiZmMyIiwiZW52aXJvbm1lbnQiOiJjMzRmYjhiOS05NDc5LTRlMTMtYjRjYy1kNDNjOGY2YjFhNWQiLCJwcm9qZWN0SWRlbnRpZmllciI6ImZlYXR1cmVmbGFnIiwiZW52aXJvbm1lbnRJZGVudGlmaWVyIjoicHJvZHVjdGlvbiIsImFjY291bnRJRCI6InpFYWFrLUZMUzQyNUlFTzdPTHpNVWciLCJvcmdhbml6YXRpb24iOiI1MDc5ZTNkOS03NDg2LTQwNmYtYTJjYi0wODM2YWVlYzRhMTgifQ.uSN83JSNOV27g6Dfx5DUpStyvnYflLKjtGAw1sIgrSE"
"""

static let token =
"""
"eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJwcm9qZWN0IjoiZTRkZWIxMDYtODU1MC00OTBhLWIyZWMtNmZhZDQzNTdiZmMyIiwiZW52aXJvbm1lbnQiOiJjMzRmYjhiOS05NDc5LTRlMTMtYjRjYy1kNDNjOGY2YjFhNWQiLCJwcm9qZWN0SWRlbnRpZmllciI6ImZlYXR1cmVmbGFnIiwiZW52aXJvbm1lbnRJZGVudGlmaWVyIjoicHJvZHVjdGlvbiIsImFjY291bnRJRCI6InpFYWFrLUZMUzQyNUlFTzdPTHpNVWciLCJvcmdhbml6YXRpb24iOiI1MDc5ZTNkOS03NDg2LTQwNmYtYTJjYi0wODM2YWVlYzRhMTgiLCJjbHVzdGVySWRlbnRpZmllciI6IjEifQ.KX3PeY9cHbtb8txqb2XE3uHHQ3zW2i_vNgh1-ir4eVw"
"""

}
2 changes: 1 addition & 1 deletion Tests/ff-ios-client-sdkTests/TestCases/CFAPI/AuthenticationRequestTest.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class AuthenticationRequestTest: XCTestCase {
let config = CfConfiguration.builder().build()
let target = CfTarget.builder().build()

let repository = FeatureRepository(token: "someToken", storageSource: mockCache, config: config, target: target, defaultAPIManager: mockAPIManager)
let repository = FeatureRepository(token: "someToken", cluster: "1", storageSource: mockCache, config: config, target: target, defaultAPIManager: mockAPIManager)
cfClient.featureRepository = repository
}

Expand Down
27 changes: 16 additions & 11 deletions Tests/ff-ios-client-sdkTests/TestCases/CFAPI/FeatureRepositoryTest.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class FeatureRepositoryTest: XCTestCase {
var config = CfConfiguration.builder().build()
config.environmentId = "c34fb8b9-9479-4e13-b4cc-d43c8f6b1a5d"
let target = CfTarget.builder().build()
sut = FeatureRepository(token: nil, storageSource: mockCache, config: config, target: target)
sut = FeatureRepository(token: nil, cluster: "1", storageSource: mockCache, config: config, target: target)
sut!.defaultAPIManager = DefaultAPIManagerMock()
expectation = XCTestExpectation(description: #function)
}
Expand All @@ -35,7 +35,7 @@ class FeatureRepositoryTest: XCTestCase {
let target = CfTarget.builder().setIdentifier("testID").build()

// When
let defaultRepo = FeatureRepository(token: token, storageSource: mockCache, config: config, target: target)
let defaultRepo = FeatureRepository(token: token, cluster: "1", storageSource: mockCache, config: config, target: target)

// Then
XCTAssertEqual(defaultRepo.token, token)
Expand All @@ -52,22 +52,27 @@ class FeatureRepositoryTest: XCTestCase {
sut?.target.identifier = "success"

// When
let result = await(sut!.getEvaluations(onCompletion:))
// Then
XCTAssertNotNil(result)
XCTAssertEqual(result?.count, 4, "Expected count == 4")
sut!.getEvaluations(onCompletion:) { result in
// Then
XCTAssertNotNil(result)
XCTAssertEqual(try? result.get().count, 4, "Expected count == 4")
}
}

func testGetEvaluationFailure() {
// Given
sut?.target.identifier = "failure"

// When
let result = await(sut!.getEvaluations(onCompletion:))

// Then
XCTAssertNil(result)
sut!.getEvaluations(onCompletion:) { result in
// Then
switch result {
case .failure(let error):
XCTAssertTrue(error.errorData.title == "Storage Error")
case .success(_):
XCTFail("should not be success")
}
}
}

func testGetEvaluationByIdSuccessReplaceSuccess() {
Expand Down
4 changes: 2 additions & 2 deletions Tests/ff-ios-client-sdkTests/TestCases/CFAPI/RegisterForEventsTest.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class RegisterForEventsTest: XCTestCase {
let target = CfTarget.builder().build()

let defaultAPIManager = DefaultAPIManagerMock()
let repository = FeatureRepository(token: "someToken", storageSource: mockCache, config: config, target: target, defaultAPIManager: defaultAPIManager)
let repository = FeatureRepository(token: "someToken", cluster: "1", storageSource: mockCache, config: config, target: target, defaultAPIManager: defaultAPIManager)

cfClient.featureRepository = repository
cfClient.configuration = config
Expand Down Expand Up @@ -89,7 +89,7 @@ class RegisterForEventsTest: XCTestCase {
// Given
let exp = XCTestExpectation(description: #function)
var config = CfConfiguration.builder().setStreamEnabled(true).build()
let eval = Evaluation(flag: "testRegisterEventSuccessFlag", value: .bool(true))
let eval = Evaluation(flag: "testRegisterEventSuccessFlag", identifier: "test", value: .bool(true))
try? cfClient.featureRepository.storageSource.saveValue(eval, key: "SODOD")
config.environmentId = "successID"
cfClient.configuration = config
Expand Down
22 changes: 11 additions & 11 deletions Tests/ff-ios-client-sdkTests/TestCases/Models/EvaluationTest.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ class EvaluationTest: XCTestCase {
let value = ValueType.string("test-value")

// When
let evaluation = Evaluation(flag: flag, value: value)
let evaluation = Evaluation(flag: flag, identifier: "test", value: value)

// Then
XCTAssertEqual(evaluation.flag == flag, evaluation.value.stringValue == value.stringValue)
Expand All @@ -41,7 +41,7 @@ class EvaluationTest: XCTestCase {
let value = ValueType.string("30")

// When
let evaluation = Evaluation(flag: flag, value: value)
let evaluation = Evaluation(flag: flag, identifier: "test", value: value)

// Then
XCTAssertEqual(evaluation.flag == flag, evaluation.value.stringValue == value.stringValue)
Expand All @@ -56,7 +56,7 @@ class EvaluationTest: XCTestCase {
let value = ValueType.string("true")

// When
let evaluation = Evaluation(flag: flag, value: value)
let evaluation = Evaluation(flag: flag, identifier: "test", value: value)

// Then
XCTAssertEqual(evaluation.flag == flag, evaluation.value.stringValue == value.stringValue)
Expand All @@ -71,7 +71,7 @@ class EvaluationTest: XCTestCase {
let value = ValueType.string("false")

// When
let evaluation = Evaluation(flag: flag, value: value)
let evaluation = Evaluation(flag: flag, identifier: "test", value: value)

// Then
XCTAssertEqual(evaluation.flag == flag, evaluation.value.stringValue == value.stringValue)
Expand All @@ -86,7 +86,7 @@ class EvaluationTest: XCTestCase {
let value = ValueType.string("{key:value}")

// When
let evaluation = Evaluation(flag: flag, value: value)
let evaluation = Evaluation(flag: flag, identifier: "test", value: value)

// Then
XCTAssertEqual(evaluation.flag == flag, evaluation.value.stringValue == value.stringValue)
Expand All @@ -102,7 +102,7 @@ class EvaluationTest: XCTestCase {
let value = ValueType.int(1)

// When
let evaluation = Evaluation(flag: flag, value: value)
let evaluation = Evaluation(flag: flag, identifier: "test", value: value)

// Then
XCTAssertEqual(evaluation.flag == flag, evaluation.value.intValue == value.intValue)
Expand All @@ -117,7 +117,7 @@ class EvaluationTest: XCTestCase {
let value = ValueType.int(0)

// When
let evaluation = Evaluation(flag: flag, value: value)
let evaluation = Evaluation(flag: flag, identifier: "test", value: value)

// Then
XCTAssertEqual(evaluation.flag == flag, evaluation.value.intValue == value.intValue)
Expand All @@ -132,7 +132,7 @@ class EvaluationTest: XCTestCase {
let value = ValueType.bool(true)

// When
let evaluation = Evaluation(flag: flag, value: value)
let evaluation = Evaluation(flag: flag, identifier: "test", value: value)

// Then
XCTAssertEqual(evaluation.flag == flag, evaluation.value.boolValue == value.boolValue)
Expand All @@ -147,7 +147,7 @@ class EvaluationTest: XCTestCase {
let value = ValueType.bool(false)

// When
let evaluation = Evaluation(flag: flag, value: value)
let evaluation = Evaluation(flag: flag, identifier: "test", value: value)

// Then
XCTAssertEqual(evaluation.flag == flag, evaluation.value.boolValue == value.boolValue)
Expand All @@ -162,7 +162,7 @@ class EvaluationTest: XCTestCase {
let value = ValueType.int(5)

// When
let evaluation = Evaluation(flag: flag, value: value)
let evaluation = Evaluation(flag: flag, identifier: "test", value: value)

// Then
XCTAssertEqual(evaluation.flag == flag, evaluation.value.intValue == value.intValue)
Expand All @@ -177,7 +177,7 @@ class EvaluationTest: XCTestCase {
let value = ValueType.object(ValueType.Value(dictionaryLiteral: ("testKey", .string("testValue"))))

// Then
let evaluation = Evaluation(flag: flag, value: value)
let evaluation = Evaluation(flag: flag, identifier: "test", value: value)

// Then
XCTAssertEqual(evaluation.flag == flag, evaluation.value.objectValue == value.objectValue)
Expand Down