NSSet additions, better NSDebugLog, added defs

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@2854 72102866-910b-0410-8b05-ffd578937521

Testing/nsset.m

@@ -2,8 +2,23 @@
 #include <Foundation/NSArray.h>
 #include <Foundation/NSString.h>
 
+void original_test ();
+void intersects_set_test();
+void is_subset_of_set_test ();
+
 int
 main ()
+{
+  original_test ();
+  intersects_set_test ();
+  is_subset_of_set_test ();
+
+  printf("Test passed\n");
+  exit (0);
+}
+
+void
+original_test ()
 {
   id a, s1, s2;
   id enumerator;
@@ -22,7 +37,79 @@ main ()
 
   s2 = [s1 mutableCopy];
   assert ([s1 isEqual:s2]);
-
-  printf("Test passed\n");
-  exit (0);
+}
+
+void
+intersects_set_test()
+{
+  id a1 = [NSArray arrayWithObjects: @"abstract factory", @"builder",
+                  @"factory method", @"prototype", @"singleton", nil];
+  id s1 = [NSSet setWithArray: a1];
+
+  id a2 = [NSArray arrayWithObjects: @"adapter", @"bridge", @"composite",
+                  @"decorator", @"facade", @"flyweight", @"Proxy", nil];
+  id s2 = [NSSet setWithArray: a2];
+
+  id s3 = [NSSet setWithObjects: @"abstract factory", @"adapter", nil];
+  id s4 = [NSSet setWithObject: @"chain of responsibility"];
+
+  id s5 = [NSSet set];
+  assert (![s1 intersectsSet: s2]);
+  assert (![s2 intersectsSet: s1]);
+
+  assert ([s1 intersectsSet: s3]);
+  assert ([s2 intersectsSet: s3]);
+  assert ([s3 intersectsSet: s1]);
+  assert ([s3 intersectsSet: s2]);
+
+  assert (![s1 intersectsSet: s4]);
+  assert (![s2 intersectsSet: s4]);
+  assert (![s4 intersectsSet: s1]);
+  assert (![s4 intersectsSet: s2]);
+
+  assert (![s1 intersectsSet: s5]);
+  assert (![s2 intersectsSet: s5]);
+  assert (![s3 intersectsSet: s5]);
+  assert (![s4 intersectsSet: s5]);
+  assert (![s5 intersectsSet: s5]);
+
+  assert (![s5 intersectsSet: s1]);
+  assert (![s5 intersectsSet: s2]);
+  assert (![s5 intersectsSet: s3]);
+  assert (![s5 intersectsSet: s4]);
+  assert (![s5 intersectsSet: s5]);
+}
+
+void
+is_subset_of_set_test ()
+{
+  id a1 = [NSArray arrayWithObjects: @"abstract factory", @"builder",
+                  @"factory method", @"prototype", @"singleton", nil];
+  id s1 = [NSSet setWithArray: a1];
+
+  id a2 = [NSArray arrayWithObjects: @"adapter", @"bridge", @"composite",
+                  @"decorator", @"facade", @"flyweight", @"proxy", nil];
+  id s2 = [NSSet setWithArray: a2];
+
+  id s3 = [NSSet setWithObjects: @"abstract factory", nil];
+  id s4 = [NSSet setWithObjects: @"adapter", @"proxy", nil];
+  id s5 = [NSSet setWithObject: @"chain of responsibility"];
+
+  id s6 = [NSSet set];
+
+  assert ([s3 isSubsetOfSet: s1]);
+  assert ([s4 isSubsetOfSet: s2]);
+  assert ([s6 isSubsetOfSet: s1]);
+  assert ([s6 isSubsetOfSet: s2]);
+  assert ([s6 isSubsetOfSet: s3]);
+  assert ([s6 isSubsetOfSet: s4]);
+  assert ([s6 isSubsetOfSet: s5]);
+  assert ([s6 isSubsetOfSet: s6]);
+
+  assert (![s1 isSubsetOfSet: s6]);
+  assert (![s1 isSubsetOfSet: s5]);
+  assert (![s1 isSubsetOfSet: s4]);
+  assert (![s1 isSubsetOfSet: s3]);
+  assert (![s1 isSubsetOfSet: s2]);
+
 }