Overview
Comment: | OFSetTests: Test all implementations |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA3-256: |
7c8ac46f5304eeb39b998acfe945053f |
User & Date: | js on 2017-11-20 22:35:21 |
Other Links: | manifest | tags |
Context
2017-11-22
| ||
00:47 | OF_APPLICATION_DELEGATE(): Verify conformance check-in: eba39f1c9d user: js tags: trunk | |
2017-11-20
| ||
22:35 | OFSetTests: Test all implementations check-in: 7c8ac46f53 user: js tags: trunk | |
2017-11-19
| ||
22:33 | OFLocalization: Ignore missing language files check-in: b62015c5b8 user: js tags: trunk | |
Changes
Modified src/OFSet.h from [878ae2eb77] to [52573bc3f6].
︙ | ︙ | |||
134 135 136 137 138 139 140 | /*! * @brief Initializes an already allocated set with the specified objects. * * @param firstObject The first object for the set * @return An initialized set with the specified objects */ | | | 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 | /*! * @brief Initializes an already allocated set with the specified objects. * * @param firstObject The first object for the set * @return An initialized set with the specified objects */ - (instancetype)initWithObjects: (ObjectType)firstObject, ... OF_SENTINEL; /*! * @brief Initializes an already allocated set with the specified objects. * * @param objects An array of objects for the set * @param count The number of objects in the specified array * @return An initialized set with the specified objects |
︙ | ︙ |
Modified src/OFSet.m from [e30f25fb57] to [95347a9390].
︙ | ︙ | |||
173 174 175 176 177 178 179 | - (instancetype)initWithArray: (OFArray *)array { OF_INVALID_INIT_METHOD } - (instancetype)initWithObjects: (id const *)objects | | | 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 | - (instancetype)initWithArray: (OFArray *)array { OF_INVALID_INIT_METHOD } - (instancetype)initWithObjects: (id const *)objects count: (size_t)count { OF_INVALID_INIT_METHOD } - (instancetype)initWithObjects: (id)firstObject, ... { id ret; |
︙ | ︙ |
Modified tests/OFSetTests.m from [601d8ce9b6] to [29baeed6fc].
︙ | ︙ | |||
14 15 16 17 18 19 20 21 22 23 24 25 26 27 | * file. */ #include "config.h" #import "OFSet.h" #import "OFArray.h" #import "OFNumber.h" #import "OFAutoreleasePool.h" #import "OFEnumerationMutationException.h" #import "TestsAppDelegate.h" | > > | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | > | | | | > > | | | | | > | | | | | | | | | 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 | * file. */ #include "config.h" #import "OFSet.h" #import "OFArray.h" #import "OFMutableSet_hashtable.h" #import "OFNumber.h" #import "OFSet_hashtable.h" #import "OFAutoreleasePool.h" #import "OFEnumerationMutationException.h" #import "TestsAppDelegate.h" static OFString *module = nil; @interface SimpleSet: OFSet { OFMutableSet *_set; } @end @interface SimpleMutableSet: OFMutableSet { OFMutableSet *_set; } @end @implementation SimpleSet - (instancetype)init { self = [super init]; @try { _set = [[OFMutableSet alloc] init]; } @catch (id e) { [self release]; @throw e; } return self; } - (instancetype)initWithSet: (OFSet *)set { self = [super init]; @try { _set = [[OFMutableSet alloc] initWithSet: set]; } @catch (id e) { [self release]; @throw e; } return self; } - (instancetype)initWithArray: (OFArray *)array { self = [super init]; @try { _set = [[OFMutableSet alloc] initWithArray: array]; } @catch (id e) { [self release]; @throw e; } return self; } - (instancetype)initWithObject: (id)firstObject arguments: (va_list)arguments { self = [super init]; @try { _set = [[OFMutableSet alloc] initWithObject: firstObject arguments: arguments]; } @catch (id e) { [self release]; @throw e; } return self; } - (void)dealloc { [_set release]; [super dealloc]; } - (size_t)count { return [_set count]; } - (bool)containsObject: (id)object { return [_set containsObject: object]; } - (OFEnumerator *)objectEnumerator { return [_set objectEnumerator]; } - (int)countByEnumeratingWithState: (of_fast_enumeration_state_t *)state objects: (id *)objects count: (int)count { return [_set countByEnumeratingWithState: state objects: objects count: count]; } @end @implementation SimpleMutableSet + (void)initialize { if (self == [SimpleMutableSet class]) [self inheritMethodsFromClass: [SimpleSet class]]; } - (void)addObject: (id)object { [_set addObject: object]; } - (void)removeObject: (id)object { [_set removeObject: object]; } @end @implementation TestsAppDelegate (OFSetTests) - (void)setTestsWithClass: (Class)setClass mutableClass: (Class)mutableSetClass { OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init]; OFSet *set1, *set2; OFMutableSet *mutableSet; bool ok; size_t i; TEST(@"+[setWithArray:]", (set1 = [setClass setWithArray: [OFArray arrayWithObjects: @"foo", @"bar", @"baz", @"foo", @"x", nil]])) TEST(@"+[setWithObjects:]", (set2 = [setClass setWithObjects: @"foo", @"bar", @"baz", @"bar", @"x", nil])) TEST(@"-[isEqual:]", [set1 isEqual: set2]) TEST(@"-[hash]", [set1 hash] == [set2 hash]) TEST(@"-[description]", [[set1 description] isEqual: @"{(\n\tx,\n\tbar,\n\tfoo,\n\tbaz\n)}"] && [[set1 description] isEqual: [set2 description]]) TEST(@"-[copy]", [set1 isEqual: [[set1 copy] autorelease]]) TEST(@"-[mutableCopy]", [set1 isEqual: [[set1 mutableCopy] autorelease]]); mutableSet = [mutableSetClass setWithSet: set1]; TEST(@"-[addObject:]", R([mutableSet addObject: @"baz"]) && [mutableSet isEqual: set2] && R([mutableSet addObject: @"y"]) && [mutableSet isEqual: [setClass setWithObjects: @"foo", @"bar", @"baz", @"x", @"y", nil]]) TEST(@"-[removeObject:]", R([mutableSet removeObject: @"y"]) && [mutableSet isEqual: set1]) TEST(@"-[isSubsetOfSet:]", R([mutableSet removeObject: @"foo"]) && [mutableSet isSubsetOfSet: set1] && ![set1 isSubsetOfSet: mutableSet]); TEST(@"-[intersectsSet:]", [(set2 = [setClass setWithObjects: @"x", nil]) intersectsSet: set1] && [set1 intersectsSet: set2] && ![[setClass setWithObjects: @"1", nil] intersectsSet: set1]); TEST(@"-[minusSet:]", R([mutableSet minusSet: [setClass setWithObjects: @"x", nil]]) && [mutableSet isEqual: [setClass setWithObjects: @"baz", @"bar", nil]]) TEST(@"-[intersectSet:]", R([mutableSet intersectSet: [setClass setWithObjects: @"baz", nil]]) && [mutableSet isEqual: [setClass setWithObjects: @"baz", nil]]) TEST(@"-[unionSet:]", R([mutableSet unionSet: [setClass setWithObjects: @"x", @"bar", nil]]) && [mutableSet isEqual: [setClass setWithObjects: @"baz", @"bar", @"x", nil]]) TEST(@"-[removeAllObjects]", R([mutableSet removeAllObjects]) && [mutableSet isEqual: [setClass set]]) ok = true; i = 0; for (OFString *s in set1) { switch (i) { case 0: |
︙ | ︙ | |||
134 135 136 137 138 139 140 | } @catch (OFEnumerationMutationException *e) { ok = true; } TEST(@"Detection of mutation during Fast Enumeration", ok); TEST(@"-[valueForKey:]", | | | > > > > > > > > > > > | 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 | } @catch (OFEnumerationMutationException *e) { ok = true; } TEST(@"Detection of mutation during Fast Enumeration", ok); TEST(@"-[valueForKey:]", [(set1 = [[setClass setWithObjects: @"a", @"ab", @"abc", @"b", nil] valueForKey: @"length"]) isEqual: [setClass setWithObjects: [OFNumber numberWithSize: 1], [OFNumber numberWithSize: 2], [OFNumber numberWithSize: 3], nil]] && [[set1 valueForKey: @"@count"] isEqual: [OFNumber numberWithSize: 3]]) [pool drain]; } - (void)setTests { module = @"OFSet"; [self setTestsWithClass: [SimpleSet class] mutableClass: [SimpleMutableSet class]]; module = @"OFSet_hashtable"; [self setTestsWithClass: [OFSet_hashtable class] mutableClass: [OFMutableSet_hashtable class]]; } @end |