Overview
Comment: | A few test framework improvements and migration of OFString tests. |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA3-256: |
138cb8f09a0bfd0c46c7a5ec65225839 |
User & Date: | js on 2009-09-14 18:37:28 |
Other Links: | manifest | tags |
Context
2009-09-15
| ||
14:17 | +[stringWithCString:length:] requires a \0 at the end of the string. check-in: 16db39752c user: js tags: trunk | |
2009-09-14
| ||
18:37 | A few test framework improvements and migration of OFString tests. check-in: 138cb8f09a user: js tags: trunk | |
2009-09-13
| ||
18:26 | Add new testing framework - all existing tests are going to be migrated. check-in: d1ddc84e0e user: js tags: trunk | |
Changes
Modified tests/Makefile from [8d2a3f4c3c] to [2533f0275e].
1 2 | include ../extra.mk | < | < | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 | include ../extra.mk SUBDIRS = OFAutoreleasePool \ OFDataArray \ OFArray \ OFDictionary \ OFHashes \ ${OFPLUGIN} \ OFTCPSocket \ OFThread \ OFList \ OFXMLElement \ OFXMLParser \ ${OBJC_SYNC} include ../buildsys.mk |
Deleted tests/OFString/Makefile version [e7868194ec].
|
| < < < < < < < < < < < < < < < < < < < < < < < < < |
Deleted tests/OFString/OFString.m version [9cf2bd2fe4].
|
| < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < |
Modified tests_new/Makefile from [743b0898b3] to [e84adfd51f].
1 2 | PROG_NOINST = tests${PROG_SUFFIX} SRCS = main.m \ | | > | 1 2 3 4 5 6 7 8 9 10 11 | PROG_NOINST = tests${PROG_SUFFIX} SRCS = main.m \ object.m \ string.m include ../buildsys.mk include ../extra.mk CPPFLAGS += -I../src -I.. -DSTDOUT LIBS := -L../src -lobjfw ${LIBS} |
︙ | ︙ |
Modified tests_new/main.h from [1a59e2e7e2] to [e49868a57b].
︙ | ︙ | |||
14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 | extern void testing(OFString*, OFString*); extern void success(OFString*, OFString*); extern void failed(OFString*, OFString*); #define TEST(test, cond) \ { \ testing(module, test); \ if (cond) \ success(module, test); \ else \ failed(module, test); \ } #define EXPECT_EXCEPTION(test, exception, code) \ { \ BOOL caught = NO; \ \ @try { \ code; \ } @catch (exception *e) { \ caught = YES; \ [e dealloc]; \ } \ \ | > > > | > > > | 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 | extern void testing(OFString*, OFString*); extern void success(OFString*, OFString*); extern void failed(OFString*, OFString*); #define TEST(test, cond) \ { \ testing(module, test); \ \ if (cond) \ success(module, test); \ else \ failed(module, test); \ } #define EXPECT_EXCEPTION(test, exception, code) \ { \ BOOL caught = NO; \ \ testing(module, test); \ \ @try { \ code; \ } @catch (exception *e) { \ caught = YES; \ [e dealloc]; \ } \ \ if (caught) \ success(module, test); \ else \ failed(module, test); \ } |
Modified tests_new/main.m from [abc8b39d7c] to [f0c02f400c].
︙ | ︙ | |||
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 | #endif #include <stdlib.h> #import <OFString.h> #import <OFAutoreleasePool.h> extern void object_tests(); static void output(OFString *str, int color) { #ifdef STDOUT switch (color) { case 0: fputs("\r\033[K\033[1;33m", stdout); break; case 1: fputs("\r\033[K\033[1;32m", stdout); break; case 2: fputs("\r\033[K\033[1;31m", stdout); break; } fputs([str cString], stdout); | > > > < > | 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 | #endif #include <stdlib.h> #import <OFString.h> #import <OFAutoreleasePool.h> extern void object_tests(); extern void string_tests(); static int fails = 0; static void output(OFString *str, int color) { #ifdef STDOUT switch (color) { case 0: fputs("\r\033[K\033[1;33m", stdout); break; case 1: fputs("\r\033[K\033[1;32m", stdout); break; case 2: fputs("\r\033[K\033[1;31m", stdout); break; } fputs([str cString], stdout); fputs("\033[m", stdout); fflush(stdout); #else #error No output method! #endif } void testing(OFString *module, OFString *test) |
︙ | ︙ | |||
71 72 73 74 75 76 77 78 | failed(OFString *module, OFString *test) { OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init]; OFString *str = [OFString stringWithFormat: @"[%s] %s: failed\n", [module cString], [test cString]]; output(str, 2); [pool release]; | > < > | | 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 | failed(OFString *module, OFString *test) { OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init]; OFString *str = [OFString stringWithFormat: @"[%s] %s: failed\n", [module cString], [test cString]]; output(str, 2); fails++; [pool release]; } int main() { object_tests(); string_tests(); return fails; } |
Added tests_new/string.m version [01f5951778].
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 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 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 | /* * Copyright (c) 2008 - 2009 * Jonathan Schleifer <js@webkeks.org> * * All rights reserved. * * This file is part of libobjfw. It may be distributed under the terms of the * Q Public License 1.0, which can be found in the file LICENSE included in * the packaging of this file. */ #include "config.h" #import "OFString.h" #import "OFArray.h" #import "OFAutoreleasePool.h" #import "OFExceptions.h" #import "main.h" static OFString *module = @"OFString"; static OFString* whitespace[] = { @" \r \t\n\t \tasd \t \t\t\r\n", @" \t\t \t\t \t \t" }; @interface EntityHandler: OFObject <OFXMLUnescapingDelegate> @end @implementation EntityHandler - (OFString*)foundUnknownEntityNamed: (OFString*)entity { if ([entity isEqual: @"foo"]) return @"bar"; return nil; } @end void string_tests() { OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init]; OFString *s[3]; OFArray *a; int i; EntityHandler *h; s[0] = [OFMutableString stringWithString: @"test"]; s[1] = [OFMutableString string]; s[2] = [[s[0] copy] autorelease]; TEST(@"-[isEqual:]", [s[0] isEqual: s[2]] && ![s[0] isEqual: [[[OFObject alloc] init] autorelease]]) TEST(@"-[compare:]", [s[0] compare: s[2]] == 0 && [s[0] compare: @""] != 0) TEST(@"-[hash] is the same if -[isEqual:] is YES", [s[0] hash] == [s[2] hash]) TEST(@"-[appendString:] and -[appendCString:]", [s[1] appendCString: "12"] && [s[1] appendString: @"3"] && [[s[0] appendString: s[1]] isEqual: @"test123"]) TEST(@"-[cStringLength]", [s[0] cStringLength] == 7) TEST(@"-[hash]", [s[0] hash] == 0xC44F49A4) TEST(@"-[reverse]", [[s[0] reverse] isEqual: @"321tset"]) TEST(@"-[upper]", [[s[0] upper] isEqual: @"321TSET"]) TEST(@"-[lower]", [[s[0] lower] isEqual: @"321tset"]) TEST(@"+[stringWithCString:length:]", (s[0] = [OFMutableString stringWithCString: "foobar" length: 3]) && [s[0] isEqual: @"foo"]) TEST(@"-[appendCStringWithLength:]", [[s[0] appendCString: "foobarqux" + 3 withLength: 3] isEqual: @"foobar"]) EXPECT_EXCEPTION(@"Detection of invalid UTF-8 encoding #1", OFInvalidEncodingException, [OFString stringWithCString: "\xE0\x80"]) EXPECT_EXCEPTION(@"Detection of invalid UTF-8 encoding #2", OFInvalidEncodingException, [OFString stringWithCString: "\xF0\x80\x80\xC0"]) TEST(@"-[reverse] on UTF-8 strings", (s[0] = [[OFMutableString stringWithCString: "äöü€𝄞"] reverse]) && [s[0] isEqual: @"𝄞€üöä"]) TEST(@"Conversion of ISO 8859-1 to UTF-8", [[OFString stringWithCString: "\xE4\xF6\xFC" encoding: OF_STRING_ENCODING_ISO_8859_1] isEqual: @"äöü"]) TEST(@"Conversion of ISO 8859-15 to UTF-8", [[OFString stringWithCString: "\xA4\xA6\xA8\xB4\xB8\xBC\xBD\xBE" encoding: OF_STRING_ENCODING_ISO_8859_15] isEqual: @"€ŠšŽžŒœŸ"]) TEST(@"Conversion of Windows 1252 to UTF-8", [[OFString stringWithCString: "\x80\x82\x83\x84\x85\x86\x87\x88" "\x89\x8A\x8B\x8C\x8E\x91\x92\x93" "\x94\x95\x96\x97\x98\x99\x9A\x9B" "\x9C\x9E\x9F" encoding: OF_STRING_ENCODING_WINDOWS_1252] isEqual: @"€‚ƒ„…†‡ˆ‰Š‹ŒŽ‘’“”•–—˜™š›œžŸ"]) TEST(@"+[stringWithFormat:]", [(s[0] = [OFMutableString stringWithFormat: @"%s: %d", "test", 123]) isEqual: @"test: 123"]) TEST(@"-[appendWithFormat:]", [([s[0] appendWithFormat: @"%02X", 15]) isEqual: @"test: 1230F"]) TEST(@"-[indexOfFirstOccurrenceOfString:]", [@"foo" indexOfFirstOccurrenceOfString: @"oo"] == 1 && [@"foo" indexOfFirstOccurrenceOfString: @"o"] == 1 && [@"foo" indexOfFirstOccurrenceOfString: @"f"] == 0 && [@"foo" indexOfFirstOccurrenceOfString: @"x"] == SIZE_MAX) TEST(@"-[indexOfLastOccurrenceOfString:]", [@"foo" indexOfLastOccurrenceOfString: @"oo"] == 1 && [@"foo" indexOfLastOccurrenceOfString: @"o"] == 2 && [@"foo" indexOfLastOccurrenceOfString: @"f"] == 0 && [@"foo" indexOfLastOccurrenceOfString: @"x"] == SIZE_MAX) TEST(@"-[substringFromIndexToIndex:]", [[@"foo" substringFromIndex: 1 toIndex: 2] isEqual: @"o"] && [[@"foo" substringFromIndex: 3 toIndex: 3] isEqual: @""]) EXPECT_EXCEPTION(@"Detect out of range in " @"-[substringFromIndex:toIndex:] #1", OFOutOfRangeException, [@"foo" substringFromIndex: 2 toIndex: 4]) EXPECT_EXCEPTION(@"Detect out of range in " @"-[substringFromIndex:toIndex:] #2", OFOutOfRangeException, [@"foo" substringFromIndex: 4 toIndex: 4]) EXPECT_EXCEPTION(@"Detect start > end in " @"-[substringFromIndex:toIndex:]", OFInvalidArgumentException, [@"foo" substringFromIndex: 2 toIndex: 0]) TEST(@"-[stringByAppendingString:]", [[@"foo" stringByAppendingString: @"bar"] isEqual: @"foobar"]) TEST(@"-[hasPrefix:]", [@"foobar" hasPrefix: @"foo"] && ![@"foobar" hasPrefix: @"foobar0"]) TEST(@"-[hasSuffix:]", [@"foobar" hasSuffix: @"bar"] && ![@"foobar" hasSuffix: @"foobar0"]) i = 0; TEST(@"-[splitWithDelimiter:]", (a = [@"fooXXbarXXXXbazXXXX" splitWithDelimiter: @"XX"]) && [[a objectAtIndex: i++] isEqual: @"foo"] && [[a objectAtIndex: i++] isEqual: @"bar"] && [[a objectAtIndex: i++] isEqual: @""] && [[a objectAtIndex: i++] isEqual: @"baz"] && [[a objectAtIndex: i++] isEqual: @""] && [[a objectAtIndex: i++] isEqual: @""]) TEST(@"-[md5Hash]", [[@"asdfoobar" md5Hash] isEqual: @"184dce2ec49b5422c7cfd8728864db4c"]) TEST(@"-[sha1Hash]", [[@"asdfoobar" sha1Hash] isEqual: @"f5f81ac0a8b5cbfdc4585ec1ad32e7b3a12b9b49"]) TEST(@"-[stringByURLEncoding]", [[@"foo\"ba'_~$" stringByURLEncoding] isEqual: @"foo%22ba%27_~%24"]) TEST(@"-[stringByURLDecoding]", [[@"foo%20bar%22+%24" stringByURLDecoding] isEqual: @"foo bar\" $"]) EXPECT_EXCEPTION(@"Detect invalid encoding in -[stringByURLDecoding] " @"#1", OFInvalidEncodingException, [@"foo%bar" stringByURLDecoding]) EXPECT_EXCEPTION(@"Detect invalid encoding in -[stringByURLDecoding] " @"#2", OFInvalidEncodingException, [@"foo%FFbar" stringByURLDecoding]) TEST(@"-[removeCharactersFromIndex:toIndex:]", (s[0] = [OFMutableString stringWithString: @"fooobar"]) && [s[0] removeCharactersFromIndex: 1 toIndex: 4] && [s[0] isEqual: @"fbar"] && [s[0] removeCharactersFromIndex: 0 toIndex: 4] && [s[0] isEqual: @""]) TEST(@"-[replaceOccurrencesOfString:withString:]", [[[OFMutableString stringWithString: @"asd fo asd fofo asd"] replaceOccurrencesOfString: @"fo" withString: @"foo"] isEqual: @"asd foo asd foofoo asd"] && [[[OFMutableString stringWithString: @"XX"] replaceOccurrencesOfString: @"X" withString: @"XX"] isEqual: @"XXXX"]) TEST(@"-[removeLeadingWhitespaces]", (s[0] = [OFMutableString stringWithString: whitespace[0]]) && [[s[0] removeLeadingWhitespaces] isEqual: @"asd \t \t\t\r\n"] && (s[0] = [OFMutableString stringWithString: whitespace[1]]) && [[s[0] removeLeadingWhitespaces] isEqual: @""]) TEST(@"-[removeTrailingWhitespaces]", (s[0] = [OFMutableString stringWithString: whitespace[0]]) && [[s[0] removeTrailingWhitespaces] isEqual: @" \r \t\n\t \tasd"] && (s[0] = [OFMutableString stringWithString: whitespace[1]]) && [[s[0] removeTrailingWhitespaces] isEqual: @""]) TEST(@"-[removeLeadingAndTrailingWhitespaces]", (s[0] = [OFMutableString stringWithString: whitespace[0]]) && [[s[0] removeLeadingAndTrailingWhitespaces] isEqual: @"asd"] && (s[0] = [OFMutableString stringWithString: whitespace[1]]) && [[s[0] removeLeadingAndTrailingWhitespaces] isEqual: @""]) TEST(@"-[stringByXMLEscaping]", (s[0] = [@"<hello> &world'\"!&" stringByXMLEscaping]) && [s[0] isEqual: @"<hello> &world'"!&"]) TEST(@"-[stringByXMLUnescaping]", [[s[0] stringByXMLUnescaping] isEqual: @"<hello> &world'\"!&"] && [[@"y" stringByXMLUnescaping] isEqual: @"y"] && [[@"ä" stringByXMLUnescaping] isEqual: @"ä"] && [[@"€" stringByXMLUnescaping] isEqual: @"€"] && [[@"𝄞" stringByXMLUnescaping] isEqual: @"𝄞"]) EXPECT_EXCEPTION(@"Detect invalid entities in -[stringByXMLUnescaping] " @"#1", OFInvalidEncodingException, [@"&foo;" stringByXMLUnescaping]) EXPECT_EXCEPTION(@"Detect invalid entities in -[stringByXMLUnescaping] " @"#2", OFInvalidEncodingException, [@"x&" stringByXMLUnescaping]) EXPECT_EXCEPTION(@"Detect invalid entities in -[stringByXMLUnescaping] " @"#3", OFInvalidEncodingException, [@"&#;" stringByXMLUnescaping]) EXPECT_EXCEPTION(@"Detect invalid entities in -[stringByXMLUnescaping] " @"#4", OFInvalidEncodingException, [@"&#x;" stringByXMLUnescaping]) EXPECT_EXCEPTION(@"Detect invalid entities in -[stringByXMLUnescaping] " @"#5", OFInvalidEncodingException, [@"&#g;" stringByXMLUnescaping]) EXPECT_EXCEPTION(@"Detect invalid entities in -[stringByXMLUnescaping] " @"#6", OFInvalidEncodingException, [@"&#xg;" stringByXMLUnescaping]) TEST(@"-[stringByXMLUnescapingWithHandler:]", (h = [[[EntityHandler alloc] init] autorelease]) && (s[0] = [@"x&foo;y" stringByXMLUnescapingWithHandler: h]) && [s[0] isEqual: @"xbary"]) [pool release]; } |