detect-icmp-id: convert unittests to FAIL/PASS APIs

Task: #4042

diff --git a/src/detect-icmp-id.c b/src/detect-icmp-id.c
index 156c2bd6e62ea0b8507da8ac9a0da836885f3cbd..73cde21ad1ef0db2e322420ff214a325df64084b 100644 (file)
--- a/src/detect-icmp-id.c
+++ b/src/detect-icmp-id.c
@@ -331,13 +331,11 @@ static bool PrefilterIcmpIdIsPrefilterable(const Signature *s)
  */
 static int DetectIcmpIdParseTest01 (void)
 {
-    DetectIcmpIdData *iid = NULL;
-    iid = DetectIcmpIdParse(NULL, "300");
-    if (iid != NULL && iid->id == htons(300)) {
-        DetectIcmpIdFree(NULL, iid);
-        return 1;
-    }
-    return 0;
+    DetectIcmpIdData *iid = DetectIcmpIdParse(NULL, "300");
+    FAIL_IF_NULL(iid);
+    FAIL_IF_NOT(iid->id == htons(300));
+    DetectIcmpIdFree(NULL, iid);
+    PASS;
 }
 
 /**
@@ -346,13 +344,11 @@ static int DetectIcmpIdParseTest01 (void)
  */
 static int DetectIcmpIdParseTest02 (void)
 {
-    DetectIcmpIdData *iid = NULL;
-    iid = DetectIcmpIdParse(NULL, "  300  ");
-    if (iid != NULL && iid->id == htons(300)) {
-        DetectIcmpIdFree(NULL, iid);
-        return 1;
-    }
-    return 0;
+    DetectIcmpIdData *iid = DetectIcmpIdParse(NULL, "  300  ");
+    FAIL_IF_NULL(iid);
+    FAIL_IF_NOT(iid->id == htons(300));
+    DetectIcmpIdFree(NULL, iid);
+    PASS;
 }
 
 /**
@@ -361,13 +357,11 @@ static int DetectIcmpIdParseTest02 (void)
  */
 static int DetectIcmpIdParseTest03 (void)
 {
-    DetectIcmpIdData *iid = NULL;
-    iid = DetectIcmpIdParse(NULL, "\"300\"");
-    if (iid != NULL && iid->id == htons(300)) {
-        DetectIcmpIdFree(NULL, iid);
-        return 1;
-    }
-    return 0;
+    DetectIcmpIdData *iid = DetectIcmpIdParse(NULL, "\"300\"");
+    FAIL_IF_NULL(iid);
+    FAIL_IF_NOT(iid->id == htons(300));
+    DetectIcmpIdFree(NULL, iid);
+    PASS;
 }
 
 /**
@@ -376,13 +370,11 @@ static int DetectIcmpIdParseTest03 (void)
  */
 static int DetectIcmpIdParseTest04 (void)
 {
-    DetectIcmpIdData *iid = NULL;
-    iid = DetectIcmpIdParse(NULL, "   \"   300 \"");
-    if (iid != NULL && iid->id == htons(300)) {
-        DetectIcmpIdFree(NULL, iid);
-        return 1;
-    }
-    return 0;
+    DetectIcmpIdData *iid = DetectIcmpIdParse(NULL, "   \"   300 \"");
+    FAIL_IF_NULL(iid);
+    FAIL_IF_NOT(iid->id == htons(300));
+    DetectIcmpIdFree(NULL, iid);
+    PASS;
 }
 
 /**
@@ -391,13 +383,9 @@ static int DetectIcmpIdParseTest04 (void)
  */
 static int DetectIcmpIdParseTest05 (void)
 {
-    DetectIcmpIdData *iid = NULL;
-    iid = DetectIcmpIdParse(NULL, "\"300");
-    if (iid == NULL) {
-        DetectIcmpIdFree(NULL, iid);
-        return 1;
-    }
-    return 0;
+    DetectIcmpIdData *iid = DetectIcmpIdParse(NULL, "\"300");
+    FAIL_IF_NOT_NULL(iid);
+    PASS;
 }
 
 /**