Merge pull request #40 from dekkers/fix-unit-test

Fix unit test with gnustep 1.24
pull/41/head
Francis Lachapelle 2014-05-29 10:32:30 -04:00
commit 9ce3b8ff8f
2 changed files with 7 additions and 2 deletions

View File

@ -42,5 +42,5 @@ ADDITIONAL_LDFLAGS += -Wl,--no-as-needed
include $(GNUSTEP_MAKEFILES)/test-tool.make include $(GNUSTEP_MAKEFILES)/test-tool.make
-include GNUmakefile.postamble -include GNUmakefile.postamble
check :: check :: $(TEST_TOOL)
./obj/sogo-tests ./obj/sogo-tests

View File

@ -37,6 +37,7 @@
CardElement *element; CardElement *element;
CardVersitRenderer *renderer; CardVersitRenderer *renderer;
NSString *result; NSString *result;
NSString *error;
renderer = [CardVersitRenderer new]; renderer = [CardVersitRenderer new];
[renderer autorelease]; [renderer autorelease];
@ -78,7 +79,11 @@
[element setSingleValue: @"1,2,3" forKey: @"named2"]; [element setSingleValue: @"1,2,3" forKey: @"named2"];
[element setSingleValue: @"text1;text2" forKey: @"named3"]; [element setSingleValue: @"text1;text2" forKey: @"named3"];
result = [renderer render: element]; result = [renderer render: element];
testEquals(result, @"ELEM:NAMED1=1,2,3;NAMED2=1\\,2\\,3;NAMED3=text1\\;text2\r\n"); error = [NSString stringWithFormat: @"string '%@' elements not the same as in 'ELEM:NAMED1=1,2,3;NAMED2=1\\,2\\,3;NAMED3=text1\\;text2'",
result];
testWithMessage([result isEqual: @"ELEM:NAMED1=1,2,3;NAMED2=1\\,2\\,3;NAMED3=text1\\;text2\r\n"]
|| [result isEqual: @"ELEM:NAMED3=text1\\;text2;NAMED1=1,2,3;NAMED2=1\\,2\\,3\r\n"],
error);
/* 6. values with 1 ordered value with a whitespace starting subvalues */ /* 6. values with 1 ordered value with a whitespace starting subvalues */
element = [CardElement elementWithTag: @"elem"]; element = [CardElement elementWithTag: @"elem"];