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

Fix unit test with gnustep 1.24

Tests/Unit/GNUmakefile

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

Tests/Unit/TestVersit.m

@@ -37,6 +37,7 @@
   CardElement *element;
   CardVersitRenderer *renderer;
   NSString *result;
+  NSString *error;
 
   renderer = [CardVersitRenderer new];
   [renderer autorelease];
@@ -78,7 +79,11 @@
   [element setSingleValue: @"1,2,3" forKey: @"named2"];
   [element setSingleValue: @"text1;text2" forKey: @"named3"];
   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 */
   element = [CardElement elementWithTag: @"elem"];