Merge branch 'feature/test_no_arm64_config' into 'develop'

MVM UI/Unit Testing implementation

See merge request BPHV_MIPS/mvm_core!130
This commit is contained in:
Pfeil, Scott Robert 2021-02-03 12:11:40 -05:00
commit 054c3f9bd8
3 changed files with 16 additions and 9 deletions

View File

@ -946,6 +946,7 @@
DEBUG_INFORMATION_FORMAT = dwarf; DEBUG_INFORMATION_FORMAT = dwarf;
ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES; ENABLE_TESTABILITY = YES;
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
GCC_C_LANGUAGE_STANDARD = gnu11; GCC_C_LANGUAGE_STANDARD = gnu11;
GCC_DYNAMIC_NO_PIC = NO; GCC_DYNAMIC_NO_PIC = NO;
GCC_NO_COMMON_BLOCKS = YES; GCC_NO_COMMON_BLOCKS = YES;
@ -1007,6 +1008,7 @@
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
ENABLE_NS_ASSERTIONS = NO; ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_STRICT_OBJC_MSGSEND = YES;
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
GCC_C_LANGUAGE_STANDARD = gnu11; GCC_C_LANGUAGE_STANDARD = gnu11;
GCC_NO_COMMON_BLOCKS = YES; GCC_NO_COMMON_BLOCKS = YES;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES;

View File

@ -12,12 +12,18 @@ public protocol ActionModelProtocol: ModelProtocol {
var actionType: String { get } var actionType: String { get }
var extraParameters: JSONValueDictionary? { get set } var extraParameters: JSONValueDictionary? { get set }
var analyticsData: JSONValueDictionary? { get set } var analyticsData: JSONValueDictionary? { get set }
var accessibilityIdentifier: String? { get set }
} }
public extension ActionModelProtocol { public extension ActionModelProtocol {
var actionType: String { var actionType: String {
get { return Self.identifier } get { Self.identifier }
}
var accessibilityIdentifier: String? {
get { nil }
set { }
} }
static var categoryCodingKey: String { static var categoryCodingKey: String {

View File

@ -101,7 +101,6 @@
cannedResponse = [self getHardCodedResponseForPageType:request.pageType]; cannedResponse = [self getHardCodedResponseForPageType:request.pageType];
} }
return cannedResponse; return cannedResponse;
} }