This repository was archived by the owner on Jun 9, 2019. It is now read-only.
File tree 2 files changed +6
-10
lines changed
2 files changed +6
-10
lines changed Original file line number Diff line number Diff line change 27
27
28
28
@implementation RKType {
29
29
__strong NSString *_code;
30
- __strong NSMutableSet <RKResource *> *_resources;
30
+ __strong NSMutableArray <RKResource *> *_resources;
31
31
}
32
32
33
33
#pragma mark - Initialisers
@@ -36,7 +36,7 @@ + (nonnull instancetype)withCode:(nonnull NSString *)code
36
36
{
37
37
RKType *type = RKType.new ;
38
38
type->_code = code.copy ;
39
- type->_resources = NSMutableSet .new ;
39
+ type->_resources = NSMutableArray .new ;
40
40
return type;
41
41
}
42
42
@@ -55,7 +55,7 @@ - (NSString *)code
55
55
56
56
- (NSArray <RKResource *> *)allResources
57
57
{
58
- return _resources.allObjects ;
58
+ return _resources.copy ;
59
59
}
60
60
61
61
@@ -93,15 +93,11 @@ - (void)addResource:(nonnull RKResource *)resource replacingDuplicates:(BOOL)rep
93
93
return ;
94
94
}
95
95
96
- NSSet <RKResource *> *currentResources = [_resources objectsPassingTest: ^BOOL (RKResource *obj, BOOL *stop) {
97
- return [obj isEqual: resource];
98
- }];
99
-
100
- if (!replaceDuplicates && currentResources.count > 0 ) {
96
+ if (!replaceDuplicates && [_resources containsObject: resource]) {
101
97
return ;
102
98
}
103
99
104
- [_resources minusSet: currentResources ];
100
+ [_resources removeObject: resource ];
105
101
[resource switchTypeTo: self ];
106
102
[_resources addObject: resource];
107
103
}
Original file line number Diff line number Diff line change @@ -187,7 +187,7 @@ - (void)testResourceManager_resourcesWithValidType_returnsExpectedResult
187
187
188
188
NSArray <RKResource *> *result = [RKResourceManager.sharedManager resourcesWithType: [RKType withCode: @" UNIT" ]];
189
189
XCTAssertEqual (result.count , 2 );
190
- XCTAssertEqualObjects (result.firstObject .name , @" Test Resource 2 " );
190
+ XCTAssertEqualObjects (result.firstObject .name , @" Test Resource 1 " );
191
191
}
192
192
193
193
- (void )testResourceManager_resourcesWithInvalidType_returnsNilResult
You can’t perform that action at this time.
0 commit comments