GitHub/ResearchKit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix unit tests.

Browse Source
This commit is contained in:
Yuan Zhu
2015-12-16 10:30:09 -08:00
parent cb4514328e
commit 5bdd973315
3 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ResearchKit/Onboarding/ORKRegistrationStep.m
+5 -7
View File
@@ -179,9 +179,7 @@ static NSArray <ORKFormItem*> *ORKRegistrationFormItems(ORKRegistrationStepOptio
return formItems;
}
@implementation ORKRegistrationStep {
NSArray <ORKFormItem *> * _registrationFormItems;
}
@implementation ORKRegistrationStep
- (instancetype)initWithIdentifier:(NSString *)identifier
title:(NSString *)title
@@ -233,11 +231,11 @@ static NSArray <ORKFormItem*> *ORKRegistrationFormItems(ORKRegistrationStepOptio
}
- (NSArray <ORKFormItem *> *)formItems {
if (!_registrationFormItems) {
_registrationFormItems = ORKRegistrationFormItems(_options);
if (![super formItems]) {
self.formItems = ORKRegistrationFormItems(_options);
}
ORKFormItem *dobFormItem = ORKFindInArrayByFormItemId(_registrationFormItems, ORKRegistrationFormItemIdentifierDOB);
ORKFormItem *dobFormItem = ORKFindInArrayByFormItemId([super formItems], ORKRegistrationFormItemIdentifierDOB);
ORKDateAnswerFormat *originalAnswerFormat = (ORKDateAnswerFormat *)dobFormItem.answerFormat;
ORKDateAnswerFormat *modifiedAnswerFormat = [ORKAnswerFormat dateAnswerFormatWithDefaultDate:originalAnswerFormat.defaultDate
minimumDate:originalAnswerFormat.minimumDate
@@ -250,7 +248,7 @@ static NSArray <ORKFormItem*> *ORKRegistrationFormItems(ORKRegistrationStepOptio
optional:NO];
dobFormItem.placeholder = ORKLocalizedString(@"DOB_FORM_ITEM_PLACEHOLDER", nil);
return _registrationFormItems;
return [super formItems];
}
- (NSString *)passcodeValidationRegex {
Testing/ORKTest/ORKTest/ORKESerialization.m
+1 -1
View File
@@ -670,7 +670,7 @@ ret =
})),
ENTRY(ORKVerificationStep,
^id(NSDictionary *dict, ORKESerializationPropertyGetter getter) {
return [[ORKVerificationStep alloc] initWithIdentifier:GETPROP(dict, identifier) title:GETPROP(dict, title) text:GETPROP(dict, text) verificationViewControllerClass:NSClassFromString(GETPROP(dict, verificationViewControllerString))];
return [[ORKVerificationStep alloc] initWithIdentifier:GETPROP(dict, identifier) text:GETPROP(dict, text) verificationViewControllerClass:NSClassFromString(GETPROP(dict, verificationViewControllerString))];
},
(@{
PROPERTY(verificationViewControllerString, NSString, NSObject, NO, nil, nil)
Testing/ORKTest/ORKTestTests/ORKJSONSerializationTests.m
+3 -2
View File
@@ -494,7 +494,7 @@ ORK_MAKE_TEST_INIT(ORKLocation, (^{
// Serialize again, the output ought to be equal
NSDictionary *dictionary2 = [ORKESerializer JSONObjectForObject:instance2 error:NULL];
BOOL isMatch = [mockDictionary isEqualToDictionary:dictionary2];
if (! isMatch)
if (!isMatch)
{
XCTAssertTrue(isMatch, @"Should be equal for class: %@", NSStringFromClass(aClass));
}
@@ -699,7 +699,8 @@ ORK_MAKE_TEST_INIT(ORKLocation, (^{
- (void)testEquality {
NSArray *classesExcluded = @[]; // classes not intended to be serialized standalone
NSMutableArray *stringsForClassesExcluded = [NSMutableArray array];
// Each time ORKRegistrationStep returns a new date in its answer fromat, cannot be tested.
NSMutableArray *stringsForClassesExcluded = [NSMutableArray arrayWithObjects:NSStringFromClass([ORKRegistrationStep class]), nil];
for (Class c in classesExcluded) {
[stringsForClassesExcluded addObject:NSStringFromClass(c)];
}