detect/within: test cleanups

diff --git a/src/detect-within.c b/src/detect-within.c
index 24db6250be5636ea31ece1bcc6fc0a4de4fa7086..273aed0deea96ca30b9864d41b73e93cc33952cc 100644 (file)
--- a/src/detect-within.c
+++ b/src/detect-within.c
@@ -162,7 +162,6 @@ static int DetectWithinSetup(DetectEngineCtx *de_ctx, Signature *s, const char *
  */
 static int DetectWithinTestPacket01 (void)
 {
-    int result = 0;
     uint8_t *buf = (uint8_t *)"GET /AllWorkAndNoPlayMakesWillADullBoy HTTP/1.0"
                     "User-Agent: Wget/1.11.4"
                     "Accept: */*"
@@ -170,49 +169,41 @@ static int DetectWithinTestPacket01 (void)
                     "Connection: Keep-Alive"
                     "Date: Mon, 04 Jan 2010 17:29:39 GMT";
     uint16_t buflen = strlen((char *)buf);
-    Packet *p;
-    p = UTHBuildPacket((uint8_t *)buf, buflen, IPPROTO_TCP);
 
-    if (p == NULL)
-        goto end;
+    Packet *p = UTHBuildPacket((uint8_t *)buf, buflen, IPPROTO_TCP);
+    FAIL_IF_NULL(p);
 
     char sig[] = "alert tcp any any -> any any (msg:\"pcre with within "
                  "modifier\"; pcre:\"/AllWorkAndNoPlayMakesWillADullBoy/\";"
                  " content:\"HTTP\"; within:5; sid:49; rev:1;)";
-
-    result = UTHPacketMatchSig(p, sig);
+    int result = UTHPacketMatchSig(p, sig);
+    FAIL_IF_NOT(result == 1);
 
     UTHFreePacket(p);
-end:
-    return result;
+    PASS;
 }
 
 
 static int DetectWithinTestPacket02 (void)
 {
-    int result = 0;
     uint8_t *buf = (uint8_t *)"Zero Five Ten Fourteen";
     uint16_t buflen = strlen((char *)buf);
-    Packet *p;
-    p = UTHBuildPacket((uint8_t *)buf, buflen, IPPROTO_TCP);
 
-    if (p == NULL)
-        goto end;
+    Packet *p = UTHBuildPacket((uint8_t *)buf, buflen, IPPROTO_TCP);
+    FAIL_IF_NULL(p);
 
     char sig[] = "alert tcp any any -> any any (msg:\"pcre with within "
                  "modifier\"; content:\"Five\"; content:\"Ten\"; within:3; distance:1; sid:1;)";
 
-    result = UTHPacketMatchSig(p, sig);
+    int result = UTHPacketMatchSig(p, sig);
+    FAIL_IF_NOT(result == 1);
 
     UTHFreePacket(p);
-end:
-    return result;
+    PASS;
 }
 
 static int DetectWithinTestVarSetup(void)
 {
-    DetectEngineCtx *de_ctx = NULL;
-    int result = 0;
     char sig[] = "alert tcp any any -> any any ( "
         "msg:\"test rule\"; "
         "content:\"abc\"; "
@@ -223,23 +214,14 @@ static int DetectWithinTestVarSetup(void)
         "http_client_body; "
         "sid:4; rev:1;)";
 
-    de_ctx = DetectEngineCtxInit();
-    if (de_ctx == NULL) {
-        goto end;
-    }
-    de_ctx->sig_list = SigInit(de_ctx, sig);
-    if (de_ctx->sig_list == NULL) {
-        goto end;
-    }
+    DetectEngineCtx *de_ctx = DetectEngineCtxInit();
+    FAIL_IF_NULL(de_ctx);
 
-    result = 1;
+    Signature *s = DetectEngineAppendSig(de_ctx, sig);
+    FAIL_IF_NULL(s);
 
-end:
-    SigGroupCleanup(de_ctx);
-    SigCleanSignatures(de_ctx);
     DetectEngineCtxFree(de_ctx);
-
-    return result;
+    PASS;
 }
 
 #endif /* UNITTESTS */