@@ -13,95 +13,88 @@
  * file.
  */
 
 #include "config.h"
 
-#import "TestsAppDelegate.h"
+#import "ObjFW.h"
+#import "ObjFWTest.h"
 
 #import "OFCharacterSet.h"
 #import "OFBitSetCharacterSet.h"
 #import "OFRangeCharacterSet.h"
 
-static OFString *module;
+@interface OFCharacterSetTests: OTTestCase
+@end
 
-@interface SimpleCharacterSet: OFCharacterSet
+@interface CustomCharacterSet: OFCharacterSet
 @end
 
-@implementation SimpleCharacterSet
+@implementation CustomCharacterSet
 - (bool)characterIsMember: (OFUnichar)character
 {
 	return (character % 2 == 0);
 }
 @end
 
-@implementation TestsAppDelegate (OFCharacterSetTests)
-- (void)characterSetTests
-{
-	void *pool = objc_autoreleasePoolPush();
-	OFCharacterSet *characterSet, *invertedCharacterSet;
-	bool ok;
-
-	module = @"OFCharacterSet";
-
-	characterSet = [[[SimpleCharacterSet alloc] init] autorelease];
-
-	ok = true;
-	for (OFUnichar c = 0; c < 65536; c++) {
-		if (c % 2 == 0) {
-			if (![characterSet characterIsMember: c])
-				ok = false;
-		} else if ([characterSet characterIsMember: c])
-			ok = false;
-	}
-	TEST(@"-[characterIsMember:]", ok);
-
-	module = @"OFBitSetCharacterSet";
-
-	TEST(@"+[characterSetWithCharactersInString:]",
-	    (characterSet = [OFCharacterSet characterSetWithCharactersInString:
-	    @"0123456789"]) &&
-	    [characterSet isKindOfClass: [OFBitSetCharacterSet class]])
-
-	ok = true;
-	for (OFUnichar c = 0; c < 65536; c++) {
-		if (c >= '0' && c <= '9') {
-			if (![characterSet characterIsMember: c])
-				ok = false;
-		} else if ([characterSet characterIsMember: c])
-			ok = false;
-	}
-	TEST(@"-[characterIsMember:]", ok);
-
-	module = @"OFRangeCharacterSet";
-
-	TEST(@"+[characterSetWithRange:]",
-	    (characterSet = [OFCharacterSet
-	    characterSetWithRange: OFMakeRange('0', 10)]) &&
-	    [characterSet isKindOfClass: [OFRangeCharacterSet class]])
-
-	ok = true;
-	for (OFUnichar c = 0; c < 65536; c++) {
-		if (c >= '0' && c <= '9') {
-			if (![characterSet characterIsMember: c])
-				ok = false;
-		} else if ([characterSet characterIsMember: c])
-			ok = false;
-	}
-	TEST(@"-[characterIsMember:]", ok);
-
-	ok = true;
-	invertedCharacterSet = characterSet.invertedSet;
-	for (OFUnichar c = 0; c < 65536; c++) {
-		if (c >= '0' && c <= '9') {
-			if ([invertedCharacterSet characterIsMember: c])
-				ok = false;
-		} else if (![invertedCharacterSet characterIsMember: c])
-			ok = false;
-	}
-	TEST(@"-[invertedSet]", ok);
-
-	TEST(@"Inverting -[invertedSet] returns original set",
-	    invertedCharacterSet.invertedSet == characterSet)
-
-	objc_autoreleasePoolPop(pool);
+@implementation OFCharacterSetTests
+- (void)testCustomCharacterSet
+{
+	OFCharacterSet *characterSet =
+	    [[[CustomCharacterSet alloc] init] autorelease];
+
+	for (OFUnichar c = 0; c < 65536; c++)
+		if (c % 2 == 0)
+			OTAssertTrue([characterSet characterIsMember: c]);
+		else
+			OTAssertFalse([characterSet characterIsMember: c]);
+}
+
+- (void)testBitSetCharacterSet
+{
+	OFCharacterSet *characterSet =
+	    [OFCharacterSet characterSetWithCharactersInString: @"0123456789"];
+
+	OTAssertTrue(
+	    [characterSet isKindOfClass: [OFBitSetCharacterSet class]]);
+
+	for (OFUnichar c = 0; c < 65536; c++)
+		if (c >= '0' && c <= '9')
+			OTAssertTrue([characterSet characterIsMember: c]);
+		else if ([characterSet characterIsMember: c])
+			OTAssertFalse([characterSet characterIsMember: c]);
+}
+
+- (void)testRangeCharacterSet
+{
+	OFCharacterSet *characterSet =
+	    [OFCharacterSet characterSetWithRange: OFMakeRange('0', 10)];
+
+	OTAssertTrue(
+	    [characterSet isKindOfClass: [OFRangeCharacterSet class]]);
+
+	for (OFUnichar c = 0; c < 65536; c++)
+		if (c >= '0' && c <= '9')
+			OTAssertTrue([characterSet characterIsMember: c]);
+		else
+			OTAssertFalse([characterSet characterIsMember: c]);
+}
+
+- (void)testInvertedCharacterSet
+{
+	OFCharacterSet *characterSet = [[OFCharacterSet
+	    characterSetWithRange: OFMakeRange('0', 10)] invertedSet];
+
+	for (OFUnichar c = 0; c < 65536; c++)
+		if (c >= '0' && c <= '9')
+			OTAssertFalse([characterSet characterIsMember: c]);
+		else
+			OTAssertTrue([characterSet characterIsMember: c]);
+}
+
+- (void)testInvertingInvertedSetReturnsOriginal
+{
+	OFCharacterSet *characterSet =
+	    [OFCharacterSet characterSetWithRange: OFMakeRange('0', 10)];
+
+	OTAssertEqual(characterSet, characterSet.invertedSet.invertedSet);
 }
 @end