From 0d5ae63013a73cca7ce5c6966a4e92d342355090 Mon Sep 17 00:00:00 2001 From: Ilya Kulakov Date: Fri, 7 Jan 2011 02:03:11 +0600 Subject: [PATCH] The isSubsetOfSet looking for objects inside itself instead of provided set --- Foundation/CPSet/CPSet.j | 2 +- Tests/Foundation/CPSetTest.j | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Foundation/CPSet/CPSet.j b/Foundation/CPSet/CPSet.j index 1face07e8..db19b8d56 100644 --- a/Foundation/CPSet/CPSet.j +++ b/Foundation/CPSet/CPSet.j @@ -316,7 +316,7 @@ objectEnumerator = [self objectEnumerator]; while ((object = [objectEnumerator nextObject]) !== nil) - if (![self containsObject:object]) + if (![aSet containsObject:object]) return NO; return YES; diff --git a/Tests/Foundation/CPSetTest.j b/Tests/Foundation/CPSetTest.j index f609cb336..fda5a1349 100644 --- a/Tests/Foundation/CPSetTest.j +++ b/Tests/Foundation/CPSetTest.j @@ -196,6 +196,14 @@ [self assertFalse:[set containsObject:nil]]; } +- (void)testIsSubsetOfSet +{ + var set = [CPSet setWithArray:[1, 2, 3, 4, 5]]; + [self assertTrue:[[CPSet setWithArray:[1, 2, 3]] isSubsetOfSet:set]]; + [self assertFalse:[[CPSet setWithArray:[1, 2, 3, 100]] isSubsetOfSet:set]]; + [self assertTrue:[[CPSet new] isSubsetOfSet:set]]; +} + - (void)testDescription { var set = [CPSet new];