Changeset 377 for trunk/ICeCoffEE/ICeCoffEE

Timestamp:

02/11/08 02:38:11 (16 years ago)

Author:

Nicholas Riley

Message:

TestParser.m: Make testing more than a noop (oops).

File:

• trunk/ICeCoffEE/ICeCoffEE/TestParser.m (modified) (4 diffs)

trunk/ICeCoffEE/ICeCoffEE/TestParser.m

@@ -18 +18 @@
 void ICCF_CheckRange(NSRange range) {}
 
-void ps(NSString *format, ...) {
+static void ps(NSString *format, ...) {
     va_list args;
     va_start(args, format);
@@ -27 +27 @@
 }
 
-void pr(NSString *s, NSRange r) {
+static void pr(NSString *s, NSRange r) {
     ps([[NSString alloc] initWithFormat: @"%@%@>%@<",
         s, [@"" stringByPaddingToLength: r.location withString: @" " startingAtIndex: 0],
         [@"" stringByPaddingToLength: r.length withString: @"-" startingAtIndex: 0]]);
+}
+
+static BOOL check_parse(NSString *uri, NSString *text,
+                        NSRange delimitedURIRange, NSRange initialSelectionRange) {
+    // XXX figure XFAIL-type error checking
+    
+    NSRange enclosingRange;
+    NSString *parsedURI = nil;
+    NSException *parseException = nil;
+    @try {
+        enclosingRange = ICCF_URLEnclosingRange(text, initialSelectionRange);
+        parsedURI = [text substringWithRange: enclosingRange];
+    } @catch (NSException *e) {
+        parseException = e;
+    }
+    
+    if ([uri isEqualToString: parsedURI]) {
+        return YES;
+    }
+    
+    ps(@"Text       %@", text);
+    pr(@"Available ", delimitedURIRange);
+    pr(@"Starting  ", initialSelectionRange);
+    
+    if (parseException != nil) {
+        ps(@"Exception  %@", parseException);
+    } else {
+        pr(@"Parsed    ", enclosingRange);
+        ps(@"Parsed     %@", parsedURI);
+        ps(@"Desired    %@", uri);
+    }
+    return NO;
 }
 
@@ -65 +97 @@
             delimitedURIRange.location = 0;
             delimitedURIRange.length = [uri length];
-        }
+        } // XXX add ^ ^ to indicate initialSelectionRange?
         
         for (unsigned startOffset = 0 ; startOffset < delimitedURIRange.length ; ++startOffset) {
@@ -73 +105 @@
             };
             
-            // XXX figure XFAIL-type error checking
-            
-            NSRange enclosingRange;
-            NSString *parsedURI = nil;
-            NSException *parseException = nil;
-            @try {
-                enclosingRange = ICCF_URLEnclosingRange(text, delimitedURIRange);
-                parsedURI = [text substringWithRange: enclosingRange];
-            } @catch (NSException *e) {
-                parseException = e;
+            if (check_parse(uri, text, delimitedURIRange, initialSelectionRange)) {
+                pass++;
+            } else {
+                fail++;
+                goto summary;
             }
-            
-            if ([uri isEqualToString: parsedURI]) {
-                ++pass;
-                continue;
-            }
-            
-            ps(@"Text       %@", text);
-            pr(@"Available ", delimitedURIRange);
-            pr(@"Starting  ", initialSelectionRange);
-            
-            if (parseException != nil) {
-                ps(@"Exception  %@", parseException);
-            } else {
-                pr(@"Parsed    ", enclosingRange);
-                ps(@"Parsed     %@", parsedURI);
-                ps(@"Desired    %@", uri);
-            }
-            ++fail;
-            goto summary;
         }
     }