util-misc: Convert unittests to new FAIL/PASS API

Task #6345

diff --git a/src/util-misc.c b/src/util-misc.c
index 38c4f9dd8d062a97360dfd577809fcc66c5c0335..4380e694a8a02e3a74ebeffd15db8507fc2d47b7 100644 (file)
--- a/src/util-misc.c
+++ b/src/util-misc.c
@@ -252,227 +252,129 @@ static int UtilMiscParseSizeStringTest01(void)
 
     str = "10";
     result = 0;
-    if (ParseSizeString(str, &result) > 0) {
-        goto error;
-    }
-    if (result != 10) {
-        goto error;
-    }
+    FAIL_IF(ParseSizeString(str, &result) > 0);
+    FAIL_IF(result != 10);
 
     str = "10kb";
     result = 0;
-    if (ParseSizeString(str, &result) > 0) {
-        goto error;
-    }
-    if (result != 10 * 1024) {
-        goto error;
-    }
+    FAIL_IF(ParseSizeString(str, &result) > 0);
+    FAIL_IF(result != 10 * 1024);
 
     str = "10Kb";
     result = 0;
-    if (ParseSizeString(str, &result) > 0) {
-        goto error;
-    }
-    if (result != 10 * 1024) {
-        goto error;
-    }
+    FAIL_IF(ParseSizeString(str, &result) > 0);
+    FAIL_IF(result != 10 * 1024);
 
     str = "10KB";
     result = 0;
-    if (ParseSizeString(str, &result) > 0) {
-        goto error;
-    }
-    if (result != 10 * 1024) {
-        goto error;
-    }
+    FAIL_IF(ParseSizeString(str, &result) > 0);
+    FAIL_IF(result != 10 * 1024);
 
     str = "10mb";
     result = 0;
-    if (ParseSizeString(str, &result) > 0) {
-        goto error;
-    }
-    if (result != 10 * 1024 * 1024) {
-        goto error;
-    }
+    FAIL_IF(ParseSizeString(str, &result) > 0);
+    FAIL_IF(result != 10 * 1024 * 1024);
 
     str = "10gb";
     result = 0;
-    if (ParseSizeString(str, &result) > 0) {
-        goto error;
-    }
-    if (result != 10737418240UL) {
-        goto error;
-    }
-
+    FAIL_IF(ParseSizeString(str, &result) > 0);
+    FAIL_IF(result != 10737418240UL);
 
     /* space start */
 
     str = " 10";
     result = 0;
-    if (ParseSizeString(str, &result) > 0) {
-        goto error;
-    }
-    if (result != 10) {
-        goto error;
-    }
+    FAIL_IF(ParseSizeString(str, &result) > 0);
+    FAIL_IF(result != 10);
 
     str = " 10kb";
     result = 0;
-    if (ParseSizeString(str, &result) > 0) {
-        goto error;
-    }
-    if (result != 10 * 1024) {
-        goto error;
-    }
+    FAIL_IF(ParseSizeString(str, &result) > 0);
+    FAIL_IF(result != 10 * 1024);
 
     str = " 10Kb";
     result = 0;
-    if (ParseSizeString(str, &result) > 0) {
-        goto error;
-    }
-    if (result != 10 * 1024) {
-        goto error;
-    }
+    FAIL_IF(ParseSizeString(str, &result) > 0);
+    FAIL_IF(result != 10 * 1024);
 
     str = " 10KB";
     result = 0;
-    if (ParseSizeString(str, &result) > 0) {
-        goto error;
-    }
-    if (result != 10 * 1024) {
-        goto error;
-    }
+    FAIL_IF(ParseSizeString(str, &result) > 0);
+    FAIL_IF(result != 10 * 1024);
 
     str = " 10mb";
     result = 0;
-    if (ParseSizeString(str, &result) > 0) {
-        goto error;
-    }
-    if (result != 10 * 1024 * 1024) {
-        goto error;
-    }
+    FAIL_IF(ParseSizeString(str, &result) > 0);
+    FAIL_IF(result != 10 * 1024 * 1024);
 
     str = " 10gb";
     result = 0;
-    if (ParseSizeString(str, &result) > 0) {
-        goto error;
-    }
-    if (result != 10737418240) {
-        goto error;
-    }
+    FAIL_IF(ParseSizeString(str, &result) > 0);
+    FAIL_IF(result != 10737418240);
 
     /* space end */
 
     str = "10 ";
     result = 0;
-    if (ParseSizeString(str, &result) > 0) {
-        goto error;
-    }
-    if (result != 10) {
-        goto error;
-    }
+    FAIL_IF(ParseSizeString(str, &result) > 0);
+    FAIL_IF(result != 10);
 
     str = "10kb ";
     result = 0;
-    if (ParseSizeString(str, &result) > 0) {
-        goto error;
-    }
-    if (result != 10 * 1024) {
-        goto error;
-    }
+    FAIL_IF(ParseSizeString(str, &result) > 0);
+    FAIL_IF(result != 10 * 1024);
 
     str = "10Kb ";
     result = 0;
-    if (ParseSizeString(str, &result) > 0) {
-        goto error;
-    }
-    if (result != 10 * 1024) {
-        goto error;
-    }
+    FAIL_IF(ParseSizeString(str, &result) > 0);
+    FAIL_IF(result != 10 * 1024);
 
     str = "10KB ";
     result = 0;
-    if (ParseSizeString(str, &result) > 0) {
-        goto error;
-    }
-    if (result != 10 * 1024) {
-        goto error;
-    }
+    FAIL_IF(ParseSizeString(str, &result) > 0);
+    FAIL_IF(result != 10 * 1024);
 
     str = "10mb ";
     result = 0;
-    if (ParseSizeString(str, &result) > 0) {
-        goto error;
-    }
-    if (result != 10 * 1024 * 1024) {
-        goto error;
-    }
+    FAIL_IF(ParseSizeString(str, &result) > 0);
+    FAIL_IF(result != 10 * 1024 * 1024);
 
     str = "10gb ";
     result = 0;
-    if (ParseSizeString(str, &result) > 0) {
-        goto error;
-    }
-    if (result != 10737418240) {
-        goto error;
-    }
+    FAIL_IF(ParseSizeString(str, &result) > 0);
+    FAIL_IF(result != 10737418240);
 
     /* space start - space end */
 
     str = " 10 ";
     result = 0;
-    if (ParseSizeString(str, &result) > 0) {
-        goto error;
-    }
-    if (result != 10) {
-        goto error;
-    }
+    FAIL_IF(ParseSizeString(str, &result) > 0);
+    FAIL_IF(result != 10);
 
     str = " 10kb ";
     result = 0;
-    if (ParseSizeString(str, &result) > 0) {
-        goto error;
-    }
-    if (result != 10 * 1024) {
-        goto error;
-    }
+    FAIL_IF(ParseSizeString(str, &result) > 0);
+    FAIL_IF(result != 10 * 1024);
 
     str = " 10Kb ";
     result = 0;
-    if (ParseSizeString(str, &result) > 0) {
-        goto error;
-    }
-    if (result != 10 * 1024) {
-        goto error;
-    }
+    FAIL_IF(ParseSizeString(str, &result) > 0);
+    FAIL_IF(result != 10 * 1024);
 
     str = " 10KB ";
     result = 0;
-    if (ParseSizeString(str, &result) > 0) {
-        goto error;
-    }
-    if (result != 10 * 1024) {
-        goto error;
-    }
+    FAIL_IF(ParseSizeString(str, &result) > 0);
+    FAIL_IF(result != 10 * 1024);
 
     str = " 10mb ";
     result = 0;
-    if (ParseSizeString(str, &result) > 0) {
-        goto error;
-    }
-    if (result != 10 * 1024 * 1024) {
-        goto error;
-    }
+    FAIL_IF(ParseSizeString(str, &result) > 0);
+    FAIL_IF(result != 10 * 1024 * 1024);
 
     str = " 10gb ";
     result = 0;
-    if (ParseSizeString(str, &result) > 0) {
-        goto error;
-    }
-    if (result != 10737418240) {
-        goto error;
-    }
-
+    FAIL_IF(ParseSizeString(str, &result) > 0);
+    FAIL_IF(result != 10737418240);
 
     /* space between number and scale */
 
@@ -480,452 +382,257 @@ static int UtilMiscParseSizeStringTest01(void)
 
     str = "10";
     result = 0;
-    if (ParseSizeString(str, &result) > 0) {
-        goto error;
-    }
-    if (result != 10) {
-        goto error;
-    }
+    FAIL_IF(ParseSizeString(str, &result) > 0);
+    FAIL_IF(result != 10);
 
     str = "10 kb";
     result = 0;
-    if (ParseSizeString(str, &result) > 0) {
-        goto error;
-    }
-    if (result != 10 * 1024) {
-        goto error;
-    }
+    FAIL_IF(ParseSizeString(str, &result) > 0);
+    FAIL_IF(result != 10 * 1024);
 
     str = "10 Kb";
     result = 0;
-    if (ParseSizeString(str, &result) > 0) {
-        goto error;
-    }
-    if (result != 10 * 1024) {
-        goto error;
-    }
+    FAIL_IF(ParseSizeString(str, &result) > 0);
+    FAIL_IF(result != 10 * 1024);
 
     str = "10 KB";
     result = 0;
-    if (ParseSizeString(str, &result) > 0) {
-        goto error;
-    }
-    if (result != 10 * 1024) {
-        goto error;
-    }
+    FAIL_IF(ParseSizeString(str, &result) > 0);
+    FAIL_IF(result != 10 * 1024);
 
     str = "10 mb";
     result = 0;
-    if (ParseSizeString(str, &result) > 0) {
-        goto error;
-    }
-    if (result != 10 * 1024 * 1024) {
-        goto error;
-    }
+    FAIL_IF(ParseSizeString(str, &result) > 0);
+    FAIL_IF(result != 10 * 1024 * 1024);
 
     str = "10 gb";
     result = 0;
-    if (ParseSizeString(str, &result) > 0) {
-        goto error;
-    }
-    if (result != 10737418240) {
-        goto error;
-    }
-
+    FAIL_IF(ParseSizeString(str, &result) > 0);
+    FAIL_IF(result != 10737418240);
 
     /* space start */
 
     str = " 10";
     result = 0;
-    if (ParseSizeString(str, &result) > 0) {
-        goto error;
-    }
-    if (result != 10) {
-        goto error;
-    }
+    FAIL_IF(ParseSizeString(str, &result) > 0);
+    FAIL_IF(result != 10);
 
     str = " 10 kb";
     result = 0;
-    if (ParseSizeString(str, &result) > 0) {
-        goto error;
-    }
-    if (result != 10 * 1024) {
-        goto error;
-    }
+    FAIL_IF(ParseSizeString(str, &result) > 0);
+    FAIL_IF(result != 10 * 1024);
 
     str = " 10 Kb";
     result = 0;
-    if (ParseSizeString(str, &result) > 0) {
-        goto error;
-    }
-    if (result != 10 * 1024) {
-        goto error;
-    }
+    FAIL_IF(ParseSizeString(str, &result) > 0);
+    FAIL_IF(result != 10 * 1024);
 
     str = " 10 KB";
     result = 0;
-    if (ParseSizeString(str, &result) > 0) {
-        goto error;
-    }
-    if (result != 10 * 1024) {
-        goto error;
-    }
+    FAIL_IF(ParseSizeString(str, &result) > 0);
+    FAIL_IF(result != 10 * 1024);
 
     str = " 10 mb";
     result = 0;
-    if (ParseSizeString(str, &result) > 0) {
-        goto error;
-    }
-    if (result != 10 * 1024 * 1024) {
-        goto error;
-    }
+    FAIL_IF(ParseSizeString(str, &result) > 0);
+    FAIL_IF(result != 10 * 1024 * 1024);
 
     str = " 10 gb";
     result = 0;
-    if (ParseSizeString(str, &result) > 0) {
-        goto error;
-    }
-    if (result != 10737418240) {
-        goto error;
-    }
+    FAIL_IF(ParseSizeString(str, &result) > 0);
+    FAIL_IF(result != 10737418240);
 
     /* space end */
 
     str = "10 ";
     result = 0;
-    if (ParseSizeString(str, &result) > 0) {
-        goto error;
-    }
-    if (result != 10) {
-        goto error;
-    }
+    FAIL_IF(ParseSizeString(str, &result) > 0);
+    FAIL_IF(result != 10);
 
     str = "10 kb ";
     result = 0;
-    if (ParseSizeString(str, &result) > 0) {
-        goto error;
-    }
-    if (result != 10 * 1024) {
-        goto error;
-    }
+    FAIL_IF(ParseSizeString(str, &result) > 0);
+    FAIL_IF(result != 10 * 1024);
 
     str = "10 Kb ";
     result = 0;
-    if (ParseSizeString(str, &result) > 0) {
-        goto error;
-    }
-    if (result != 10 * 1024) {
-        goto error;
-    }
+    FAIL_IF(ParseSizeString(str, &result) > 0);
+    FAIL_IF(result != 10 * 1024);
 
     str = "10 KB ";
     result = 0;
-    if (ParseSizeString(str, &result) > 0) {
-        goto error;
-    }
-    if (result != 10 * 1024) {
-        goto error;
-    }
+    FAIL_IF(ParseSizeString(str, &result) > 0);
+    FAIL_IF(result != 10 * 1024);
 
     str = "10 mb ";
     result = 0;
-    if (ParseSizeString(str, &result) > 0) {
-        goto error;
-    }
-    if (result != 10 * 1024 * 1024) {
-        goto error;
-    }
+    FAIL_IF(ParseSizeString(str, &result) > 0);
+    FAIL_IF(result != 10 * 1024 * 1024);
 
     str = "10 gb ";
     result = 0;
-    if (ParseSizeString(str, &result) > 0) {
-        goto error;
-    }
-    if (result != 10737418240) {
-        goto error;
-    }
+    FAIL_IF(ParseSizeString(str, &result) > 0);
+    FAIL_IF(result != 10737418240);
 
     /* space start - space end */
 
     str = " 10 ";
     result = 0;
-    if (ParseSizeString(str, &result) > 0) {
-        goto error;
-    }
-    if (result != 10) {
-        goto error;
-    }
+    FAIL_IF(ParseSizeString(str, &result) > 0);
+    FAIL_IF(result != 10);
 
     str = " 10 kb ";
     result = 0;
-    if (ParseSizeString(str, &result) > 0) {
-        goto error;
-    }
-    if (result != 10 * 1024) {
-        goto error;
-    }
+    FAIL_IF(ParseSizeString(str, &result) > 0);
+    FAIL_IF(result != 10 * 1024);
 
     str = " 10 Kb ";
     result = 0;
-    if (ParseSizeString(str, &result) > 0) {
-        goto error;
-    }
-    if (result != 10 * 1024) {
-        goto error;
-    }
+    FAIL_IF(ParseSizeString(str, &result) > 0);
+    FAIL_IF(result != 10 * 1024);
 
     str = " 10 KB ";
     result = 0;
-    if (ParseSizeString(str, &result) > 0) {
-        goto error;
-    }
-    if (result != 10 * 1024) {
-        goto error;
-    }
+    FAIL_IF(ParseSizeString(str, &result) > 0);
+    FAIL_IF(result != 10 * 1024);
 
     str = " 10 mb ";
     result = 0;
-    if (ParseSizeString(str, &result) > 0) {
-        goto error;
-    }
-    if (result != 10 * 1024 * 1024) {
-        goto error;
-    }
+    FAIL_IF(ParseSizeString(str, &result) > 0);
+    FAIL_IF(result != 10 * 1024 * 1024);
 
     str = " 10 gb ";
     result = 0;
-    if (ParseSizeString(str, &result) > 0) {
-        goto error;
-    }
-    if (result != 10737418240) {
-        goto error;
-    }
+    FAIL_IF(ParseSizeString(str, &result) > 0);
+    FAIL_IF(result != 10737418240);
 
     /* no space */
 
     str = "10.5";
     result = 0;
-    if (ParseSizeString(str, &result) > 0) {
-        goto error;
-    }
-    if (result != 10.5) {
-        goto error;
-    }
+    FAIL_IF(ParseSizeString(str, &result) > 0);
+    FAIL_IF(result != 10.5);
 
     str = "10.5kb";
     result = 0;
-    if (ParseSizeString(str, &result) > 0) {
-        goto error;
-    }
-    if (result != 10.5 * 1024) {
-        goto error;
-    }
+    FAIL_IF(ParseSizeString(str, &result) > 0);
+    FAIL_IF(result != 10.5 * 1024);
 
     str = "10.5Kb";
     result = 0;
-    if (ParseSizeString(str, &result) > 0) {
-        goto error;
-    }
-    if (result != 10.5 * 1024) {
-        goto error;
-    }
+    FAIL_IF(ParseSizeString(str, &result) > 0);
+    FAIL_IF(result != 10.5 * 1024);
 
     str = "10.5KB";
     result = 0;
-    if (ParseSizeString(str, &result) > 0) {
-        goto error;
-    }
-    if (result != 10.5 * 1024) {
-        goto error;
-    }
+    FAIL_IF(ParseSizeString(str, &result) > 0);
+    FAIL_IF(result != 10.5 * 1024);
 
     str = "10.5mb";
     result = 0;
-    if (ParseSizeString(str, &result) > 0) {
-        goto error;
-    }
-    if (result != 10.5 * 1024 * 1024) {
-        goto error;
-    }
+    FAIL_IF(ParseSizeString(str, &result) > 0);
+    FAIL_IF(result != 10.5 * 1024 * 1024);
 
     str = "10.5gb";
     result = 0;
-    if (ParseSizeString(str, &result) > 0) {
-        goto error;
-    }
-    if (result != 10.5 * 1024 * 1024 * 1024) {
-        goto error;
-    }
-
+    FAIL_IF(ParseSizeString(str, &result) > 0);
+    FAIL_IF(result != 10.5 * 1024 * 1024 * 1024);
 
     /* space start */
 
     str = " 10.5";
     result = 0;
-    if (ParseSizeString(str, &result) > 0) {
-        goto error;
-    }
-    if (result != 10.5) {
-        goto error;
-    }
+    FAIL_IF(ParseSizeString(str, &result) > 0);
+    FAIL_IF(result != 10.5);
 
     str = " 10.5kb";
     result = 0;
-    if (ParseSizeString(str, &result) > 0) {
-        goto error;
-    }
-    if (result != 10.5 * 1024) {
-        goto error;
-    }
+    FAIL_IF(ParseSizeString(str, &result) > 0);
+    FAIL_IF(result != 10.5 * 1024);
 
     str = " 10.5Kb";
     result = 0;
-    if (ParseSizeString(str, &result) > 0) {
-        goto error;
-    }
-    if (result != 10.5 * 1024) {
-        goto error;
-    }
+    FAIL_IF(ParseSizeString(str, &result) > 0);
+    FAIL_IF(result != 10.5 * 1024);
 
     str = " 10.5KB";
     result = 0;
-    if (ParseSizeString(str, &result) > 0) {
-        goto error;
-    }
-    if (result != 10.5 * 1024) {
-        goto error;
-    }
+    FAIL_IF(ParseSizeString(str, &result) > 0);
+    FAIL_IF(result != 10.5 * 1024);
 
     str = " 10.5mb";
     result = 0;
-    if (ParseSizeString(str, &result) > 0) {
-        goto error;
-    }
-    if (result != 10.5 * 1024 * 1024) {
-        goto error;
-    }
+    FAIL_IF(ParseSizeString(str, &result) > 0);
+    FAIL_IF(result != 10.5 * 1024 * 1024);
 
     str = " 10.5gb";
     result = 0;
-    if (ParseSizeString(str, &result) > 0) {
-        goto error;
-    }
-    if (result != 10.5 * 1024 * 1024 * 1024) {
-        goto error;
-    }
+    FAIL_IF(ParseSizeString(str, &result) > 0);
+    FAIL_IF(result != 10.5 * 1024 * 1024 * 1024);
 
     /* space end */
 
     str = "10.5 ";
     result = 0;
-    if (ParseSizeString(str, &result) > 0) {
-        goto error;
-    }
-    if (result != 10.5) {
-        goto error;
-    }
+    FAIL_IF(ParseSizeString(str, &result) > 0);
+    FAIL_IF(result != 10.5);
 
     str = "10.5kb ";
     result = 0;
-    if (ParseSizeString(str, &result) > 0) {
-        goto error;
-    }
-    if (result != 10.5 * 1024) {
-        goto error;
-    }
+    FAIL_IF(ParseSizeString(str, &result) > 0);
+    FAIL_IF(result != 10.5 * 1024);
 
     str = "10.5Kb ";
     result = 0;
-    if (ParseSizeString(str, &result) > 0) {
-        goto error;
-    }
-    if (result != 10.5 * 1024) {
-        goto error;
-    }
+    FAIL_IF(ParseSizeString(str, &result) > 0);
+    FAIL_IF(result != 10.5 * 1024);
 
     str = "10.5KB ";
     result = 0;
-    if (ParseSizeString(str, &result) > 0) {
-        goto error;
-    }
-    if (result != 10.5 * 1024) {
-        goto error;
-    }
+    FAIL_IF(ParseSizeString(str, &result) > 0);
+    FAIL_IF(result != 10.5 * 1024);
 
     str = "10.5mb ";
     result = 0;
-    if (ParseSizeString(str, &result) > 0) {
-        goto error;
-    }
-    if (result != 10.5 * 1024 * 1024) {
-        goto error;
-    }
+    FAIL_IF(ParseSizeString(str, &result) > 0);
+    FAIL_IF(result != 10.5 * 1024 * 1024);
 
     str = "10.5gb ";
     result = 0;
-    if (ParseSizeString(str, &result) > 0) {
-        goto error;
-    }
-    if (result != 10.5 * 1024 * 1024 * 1024) {
-        goto error;
-    }
+    FAIL_IF(ParseSizeString(str, &result) > 0);
+    FAIL_IF(result != 10.5 * 1024 * 1024 * 1024);
 
     /* space start - space end */
 
     str = " 10.5 ";
     result = 0;
-    if (ParseSizeString(str, &result) > 0) {
-        goto error;
-    }
-    if (result != 10.5) {
-        goto error;
-    }
+    FAIL_IF(ParseSizeString(str, &result) > 0);
+    FAIL_IF(result != 10.5);
 
     str = " 10.5kb ";
     result = 0;
-    if (ParseSizeString(str, &result) > 0) {
-        goto error;
-    }
-    if (result != 10.5 * 1024) {
-        goto error;
-    }
+    FAIL_IF(ParseSizeString(str, &result) > 0);
+    FAIL_IF(result != 10.5 * 1024);
 
     str = " 10.5Kb ";
     result = 0;
-    if (ParseSizeString(str, &result) > 0) {
-        goto error;
-    }
-    if (result != 10.5 * 1024) {
-        goto error;
-    }
+    FAIL_IF(ParseSizeString(str, &result) > 0);
+    FAIL_IF(result != 10.5 * 1024);
 
     str = " 10.5KB ";
     result = 0;
-    if (ParseSizeString(str, &result) > 0) {
-        goto error;
-    }
-    if (result != 10.5 * 1024) {
-        goto error;
-    }
+    FAIL_IF(ParseSizeString(str, &result) > 0);
+    FAIL_IF(result != 10.5 * 1024);
 
     str = " 10.5mb ";
     result = 0;
-    if (ParseSizeString(str, &result) > 0) {
-        goto error;
-    }
-    if (result != 10.5 * 1024 * 1024) {
-        goto error;
-    }
+    FAIL_IF(ParseSizeString(str, &result) > 0);
+    FAIL_IF(result != 10.5 * 1024 * 1024);
 
     str = " 10.5gb ";
     result = 0;
-    if (ParseSizeString(str, &result) > 0) {
-        goto error;
-    }
-    if (result != 10.5 * 1024 * 1024 * 1024) {
-        goto error;
-    }
-
+    FAIL_IF(ParseSizeString(str, &result) > 0);
+    FAIL_IF(result != 10.5 * 1024 * 1024 * 1024);
 
     /* space between number and scale */
 
@@ -933,235 +640,134 @@ static int UtilMiscParseSizeStringTest01(void)
 
     str = "10.5";
     result = 0;
-    if (ParseSizeString(str, &result) > 0) {
-        goto error;
-    }
-    if (result != 10.5) {
-        goto error;
-    }
+    FAIL_IF(ParseSizeString(str, &result) > 0);
+    FAIL_IF(result != 10.5);
 
     str = "10.5 kb";
     result = 0;
-    if (ParseSizeString(str, &result) > 0) {
-        goto error;
-    }
-    if (result != 10.5 * 1024) {
-        goto error;
-    }
+    FAIL_IF(ParseSizeString(str, &result) > 0);
+    FAIL_IF(result != 10.5 * 1024);
 
     str = "10.5 Kb";
     result = 0;
-    if (ParseSizeString(str, &result) > 0) {
-        goto error;
-    }
-    if (result != 10.5 * 1024) {
-        goto error;
-    }
+    FAIL_IF(ParseSizeString(str, &result) > 0);
+    FAIL_IF(result != 10.5 * 1024);
 
     str = "10.5 KB";
     result = 0;
-    if (ParseSizeString(str, &result) > 0) {
-        goto error;
-    }
-    if (result != 10.5 * 1024) {
-        goto error;
-    }
+    FAIL_IF(ParseSizeString(str, &result) > 0);
+    FAIL_IF(result != 10.5 * 1024);
 
     str = "10.5 mb";
     result = 0;
-    if (ParseSizeString(str, &result) > 0) {
-        goto error;
-    }
-    if (result != 10.5 * 1024 * 1024) {
-        goto error;
-    }
+    FAIL_IF(ParseSizeString(str, &result) > 0);
+    FAIL_IF(result != 10.5 * 1024 * 1024);
 
     str = "10.5 gb";
     result = 0;
-    if (ParseSizeString(str, &result) > 0) {
-        goto error;
-    }
-    if (result != 10.5 * 1024 * 1024 * 1024) {
-        goto error;
-    }
-
+    FAIL_IF(ParseSizeString(str, &result) > 0);
+    FAIL_IF(result != 10.5 * 1024 * 1024 * 1024);
 
     /* space start */
 
     str = " 10.5";
     result = 0;
-    if (ParseSizeString(str, &result) > 0) {
-        goto error;
-    }
-    if (result != 10.5) {
-        goto error;
-    }
+    FAIL_IF(ParseSizeString(str, &result) > 0);
+    FAIL_IF(result != 10.5);
 
     str = " 10.5 kb";
     result = 0;
-    if (ParseSizeString(str, &result) > 0) {
-        goto error;
-    }
-    if (result != 10.5 * 1024) {
-        goto error;
-    }
+    FAIL_IF(ParseSizeString(str, &result) > 0);
+    FAIL_IF(result != 10.5 * 1024);
 
     str = " 10.5 Kb";
     result = 0;
-    if (ParseSizeString(str, &result) > 0) {
-        goto error;
-    }
-    if (result != 10.5 * 1024) {
-        goto error;
-    }
+    FAIL_IF(ParseSizeString(str, &result) > 0);
+    FAIL_IF(result != 10.5 * 1024);
 
     str = " 10.5 KB";
     result = 0;
-    if (ParseSizeString(str, &result) > 0) {
-        goto error;
-    }
-    if (result != 10.5 * 1024) {
-        goto error;
-    }
+    FAIL_IF(ParseSizeString(str, &result) > 0);
+    FAIL_IF(result != 10.5 * 1024);
 
     str = " 10.5 mb";
     result = 0;
-    if (ParseSizeString(str, &result) > 0) {
-        goto error;
-    }
-    if (result != 10.5 * 1024 * 1024) {
-        goto error;
-    }
+    FAIL_IF(ParseSizeString(str, &result) > 0);
+    FAIL_IF(result != 10.5 * 1024 * 1024);
 
     str = " 10.5 gb";
     result = 0;
-    if (ParseSizeString(str, &result) > 0) {
-        goto error;
-    }
-    if (result != 10.5 * 1024 * 1024 * 1024) {
-        goto error;
-    }
+    FAIL_IF(ParseSizeString(str, &result) > 0);
+    FAIL_IF(result != 10.5 * 1024 * 1024 * 1024);
 
     /* space end */
 
     str = "10.5 ";
     result = 0;
-    if (ParseSizeString(str, &result) > 0) {
-        goto error;
-    }
-    if (result != 10.5) {
-        goto error;
-    }
+    FAIL_IF(ParseSizeString(str, &result) > 0);
+    FAIL_IF(result != 10.5);
 
     str = "10.5 kb ";
     result = 0;
-    if (ParseSizeString(str, &result) > 0) {
-        goto error;
-    }
-    if (result != 10.5 * 1024) {
-        goto error;
-    }
+    FAIL_IF(ParseSizeString(str, &result) > 0);
+    FAIL_IF(result != 10.5 * 1024);
 
     str = "10.5 Kb ";
     result = 0;
-    if (ParseSizeString(str, &result) > 0) {
-        goto error;
-    }
-    if (result != 10.5 * 1024) {
-        goto error;
-    }
+    FAIL_IF(ParseSizeString(str, &result) > 0);
+    FAIL_IF(result != 10.5 * 1024);
 
     str = "10.5 KB ";
     result = 0;
-    if (ParseSizeString(str, &result) > 0) {
-        goto error;
-    }
-    if (result != 10.5 * 1024) {
-        goto error;
-    }
+    FAIL_IF(ParseSizeString(str, &result) > 0);
+    FAIL_IF(result != 10.5 * 1024);
 
     str = "10.5 mb ";
     result = 0;
-    if (ParseSizeString(str, &result) > 0) {
-        goto error;
-    }
-    if (result != 10.5 * 1024 * 1024) {
-        goto error;
-    }
+    FAIL_IF(ParseSizeString(str, &result) > 0);
+    FAIL_IF(result != 10.5 * 1024 * 1024);
 
     str = "10.5 gb ";
     result = 0;
-    if (ParseSizeString(str, &result) > 0) {
-        goto error;
-    }
-    if (result != 10.5 * 1024 * 1024 * 1024) {
-        goto error;
-    }
+    FAIL_IF(ParseSizeString(str, &result) > 0);
+    FAIL_IF(result != 10.5 * 1024 * 1024 * 1024);
 
     /* space start - space end */
 
     str = " 10.5 ";
     result = 0;
-    if (ParseSizeString(str, &result) > 0) {
-        goto error;
-    }
-    if (result != 10.5) {
-        goto error;
-    }
+    FAIL_IF(ParseSizeString(str, &result) > 0);
+    FAIL_IF(result != 10.5);
 
     str = " 10.5 kb ";
     result = 0;
-    if (ParseSizeString(str, &result) > 0) {
-        goto error;
-    }
-    if (result != 10.5 * 1024) {
-        goto error;
-    }
+    FAIL_IF(ParseSizeString(str, &result) > 0);
+    FAIL_IF(result != 10.5 * 1024);
 
     str = " 10.5 Kb ";
     result = 0;
-    if (ParseSizeString(str, &result) > 0) {
-        goto error;
-    }
-    if (result != 10.5 * 1024) {
-        goto error;
-    }
+    FAIL_IF(ParseSizeString(str, &result) > 0);
+    FAIL_IF(result != 10.5 * 1024);
 
     str = " 10.5 KB ";
     result = 0;
-    if (ParseSizeString(str, &result) > 0) {
-        goto error;
-    }
-    if (result != 10.5 * 1024) {
-        goto error;
-    }
+    FAIL_IF(ParseSizeString(str, &result) > 0);
+    FAIL_IF(result != 10.5 * 1024);
 
     str = " 10.5 mb ";
     result = 0;
-    if (ParseSizeString(str, &result) > 0) {
-        goto error;
-    }
-    if (result != 10.5 * 1024 * 1024) {
-        goto error;
-    }
+    FAIL_IF(ParseSizeString(str, &result) > 0);
+    FAIL_IF(result != 10.5 * 1024 * 1024);
 
     str = " 10.5 gb ";
     result = 0;
-    if (ParseSizeString(str, &result) > 0) {
-        goto error;
-    }
-    if (result != 10.5 * 1024 * 1024 * 1024) {
-        goto error;
-    }
+    FAIL_IF(ParseSizeString(str, &result) > 0);
+    FAIL_IF(result != 10.5 * 1024 * 1024 * 1024);
 
     /* Should fail on unknown units. */
-    if (ParseSizeString("32eb", &result) > 0) {
-        goto error;
-    }
+    FAIL_IF(ParseSizeString("32eb", &result) > 0);
 
-    return 1;
- error:
-    return 0;
+    PASS;
 }
 
 void UtilMiscRegisterTests(void)