http-all-headers: remove check.sh, use new __len test

Remove check.sh script and use __len to test the length
of the arrays.

diff --git a/tests/http-all-headers/check.sh b/tests/http-all-headers/check.sh
deleted file mode 100755 (executable)
index 2d7b37b..0000000
--- a/tests/http-all-headers/check.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#! /bin/sh
-
-. ${TOPDIR}/util/functions.sh
-
-# 9 request headers (2 rows per header + start and end of list).
-n=$(jq '.http.request_headers | length' eve.json)
-assert_eq 9 "$n"
-
-# Simplified test: check 1 request header
-# Arbitrary decision to check "Host": "www.ethereal.com"
-n=$(jq ".http.request_headers[] | select(.name | contains(\"Host\")) | select(.value | contains(\"www.ethereal.com\"))" eve.json)
-test -n "$n"
-
-# 9 request headers (2 rows per header).
-n=$(jq '.http.response_headers | length ' eve.json)
-assert_eq 9 "$n"
-
-# Simplified test: check 1 response header
-# Arbitrary decision to check "Content-Length": "18070"
-n=$(jq ".http.response_headers[] | select(.name | contains(\"Content-Length\")) | select(.value | contains(\"18070\"))" eve.json)
-test -n "$n"

diff --git a/tests/http-all-headers/test.yaml b/tests/http-all-headers/test.yaml
index 10c069eb3d6108965259f57aa850a70fa04a7eb2..305b8e9081f0b6ef5f15dd205dc8d3c14ddf7e0d 100644 (file)
--- a/tests/http-all-headers/test.yaml
+++ b/tests/http-all-headers/test.yaml
@@ -1,10 +1,34 @@
 requires:
-    min-version: 5.0.0
-    features:
-        - HAVE_LIBJANSSON
+  min-version: 5.0.0
 
 checks:
-    - filter:
-            count: 1
-            match:
-                event_type: http
+  - filter:
+      count: 1
+      match:
+        event_type: http
+
+  - filter:
+      count: 1
+      match:
+        event_type: http
+        http.request_headers[0].name: Host
+        http.request_headers[0].value: www.ethereal.com
+
+  - filter:
+      count: 1
+      match:
+        event_type: http
+        http.response_headers[5].name: Content-Length
+        http.response_headers[5].value: "18070"
+
+  - filter:
+      count: 1
+      match:
+        event_type: http
+        http.response_headers.__len: 9
+
+  - filter:
+      count: 1
+      match:
+        event_type: http
+        http.request_headers.__len: 9