From e17ae412245ba9afb33ff6a0f1f665b4d66d4da4 Mon Sep 17 00:00:00 2001
From: Jose Bollo <jose.bollo@iot.bzh>
Date: Thu, 12 Jul 2018 10:59:48 +0200
Subject: coverage and test: Add tests

coverage values:
  - lines:     70.5 %
  - functions: 76.3 %

Change-Id: Iaf802e84bbfa57502bbbac8c3b567b14c01608b6
Signed-off-by: Jose Bollo <jose.bollo@iot.bzh>
---
 coverage/scripts/00-trace.sh   |  7 +++--
 coverage/scripts/01-http.sh    | 28 ++++++++++++------
 coverage/scripts/02-hello.sh   | 44 ++++++++++++++++++++++++++++
 coverage/scripts/03-auto-ws.sh | 35 +++++++++++++++++++++++
 coverage/scripts/03-x-hello.sh | 35 -----------------------
 coverage/scripts/06-auto-so.sh | 35 +++++++++++++++++++++++
 coverage/scripts/run-test.sh   | 65 ++++++++++++++++++++++++++++++++++++++----
 7 files changed, 199 insertions(+), 50 deletions(-)
 create mode 100755 coverage/scripts/03-auto-ws.sh
 delete mode 100755 coverage/scripts/03-x-hello.sh
 create mode 100755 coverage/scripts/06-auto-so.sh

(limited to 'coverage/scripts')

diff --git a/coverage/scripts/00-trace.sh b/coverage/scripts/00-trace.sh
index 34a19bb0..27edc5b1 100755
--- a/coverage/scripts/00-trace.sh
+++ b/coverage/scripts/00-trace.sh
@@ -1,4 +1,7 @@
 #!/bin/sh
 
-$R/bin/afb-client -k $WSURL monitor trace '{"add":{"api":"*","request":"*","event":"*","session":"*","global":"*"}}' &
-
+$R/bin/afb-client -k $WSURL <<EOC &
+monitor trace {"add":{"tag":"fun","api":"*","request":"*","event":"*","session":"*","global":"*"}}
+monitor trace {"add":{"tag":"T","api":"*","request":"*","event":"*","session":"*","global":"*"}}
+monitor trace {"drop":{"tag":"fun"}}
+EOC
diff --git a/coverage/scripts/01-http.sh b/coverage/scripts/01-http.sh
index 191318c0..9ffd640f 100755
--- a/coverage/scripts/01-http.sh
+++ b/coverage/scripts/01-http.sh
@@ -1,17 +1,29 @@
 #!/bin/sh
 
 
-curl $URL/index.html
-curl $URL/marrus-orthocanna.jpg
-curl $URL/test.js
-curl $URL/icons/marrus-orthocanna.jpg
+curl -s -o /dev/null $URL/index.html
+curl -s -o /dev/null $URL/marrus-orthocanna.jpg
+curl -s -o /dev/null $URL/test.js
+curl -s -o /dev/null $URL/icons/marrus-orthocanna.jpg
 
-curl $URL/fake-file.html
+curl -s -o /dev/null $URL/fake-file.html
 
-curl "$URL/api/salut/ping?arg1=null&arg1=%22a+string%22"
-curl "$URL/api/hello/ping" \
+curl -s "$URL/api/salut/ping?arg1=null&arg1=%22a+string%22"
+curl -s "$URL/api/hello/ping" \
 	-F image=@$R/www/marrus-orthocanna.jpg \
 	-F name=test
-curl -X POST "$URL/api/hello/ping" \
+curl -s -X POST "$URL/api/hello/ping" \
 	--header 'content-type: application/json' \
 	--data-binary '[null,3,{"hello":false,"salut":4.5},true]'
+
+curl -s "$URL/api/hello/get?name=something&something=nothing"
+
+curl -s -F name=file -F file=@$R/www/marrus-orthocanna.jpg "$URL/api/hello/get"
+
+curl -s -X HEAD -o /dev/null $URL/index.html
+#curl -s -X CONNECT -o /dev/null $URL/index.html
+curl -s -X DELETE -o /dev/null $URL/index.html
+curl -s -X OPTIONS -o /dev/null $URL/index.html
+curl -s -X PATCH -o /dev/null $URL/index.html
+curl -s -X PUT -o /dev/null $URL/index.html
+curl -s -X TRACE -o /dev/null $URL/index.html
diff --git a/coverage/scripts/02-hello.sh b/coverage/scripts/02-hello.sh
index fe9040c2..9e3a9b08 100755
--- a/coverage/scripts/02-hello.sh
+++ b/coverage/scripts/02-hello.sh
@@ -48,5 +48,49 @@ hello setctx "some-text-2"
 hello getctx
 hello info
 hello verbose {"level":2,"message":"hello"}
+hello eventloop
+hello dbus false
+hello dbus true
+hello reply-count 0
+hello reply-count 2
+hello get null
+hello get {"name":"toto"}
+hello get {"name":"toto","toto":5}
+hello ref null
+hello rootdir null
+hello eventadd {"tag":"EVENT","name":"EVENT"}
+hello locale {"file":"loc.txt","lang":"ru,de,jp-JP,fr"}
+hello locale "loc.txt"
+hello locale "i don't exist"
+hello api {"action":"create","api":"_extra_"}
+hello api {"action":"addverb","api":"_extra_","verb":"ping"}
+hello api {"action":"seal","api":"_extra_"}
+hello api {"action":"addverb","api":"_extra_","verb":"ping"}
+hello api {"action":"destroy","api":"_extra_"}
+_extra_ ping2 {"a":true}
+_extra_ ping3 {"b":false}
+_extra_ ping {"c":[1,2,3]}
+hello api {"action":"create","api":"extra"}
+extra api {"action":"addverb","verb":"blablabla"}
+extra api {"action":"addverb","verb":"ping"}
+extra api {"action":"addverb","verb":"ping2"}
+extra api {"action":"addverb","verb":"ping3"}
+extra api {"action":"addverb","verb":"q*"}
+extra api {"action":"delverb","verb":"blablabla"}
+extra api {"action":"addhandler","pattern":"*","closure":"*"}
+extra api {"action":"addhandler","pattern":"hello/*","closure":"hello/*"}
+extra call {"api":"hello","verb":"eventsub","args":{"tag":"EVENT"}}
+hello eventpush {"tag":"EVENT","data":[1,2,"hello"]}
+hello api {"action":"delhandler","api":"extra","pattern":"hello/*"}
+hello eventpush {"tag":"EVENT","data":[1,2,"hello"]}
+extra ping2 {"a":true}
+extra ping3 {"b":false}
+extra ping {"c":[1,2,3]}
+extra query {"c":[1,2,3]}
+extra blablabla {"c":[1,2,3]}
+extra api {"action":"addverb","verb":"ping"}
+extra ping {"c":[1,2,3]}
+hello api {"action":"destroy","api":"extra"}
+extra ping {"c":[1,2,3]}
 EOC
 
diff --git a/coverage/scripts/03-auto-ws.sh b/coverage/scripts/03-auto-ws.sh
new file mode 100755
index 00000000..9d3726e4
--- /dev/null
+++ b/coverage/scripts/03-auto-ws.sh
@@ -0,0 +1,35 @@
+#!/bin/sh
+
+$R/bin/afb-client -s -e $WSURL <<EOC
+x-hello ping true
+x-HELLO PING false
+x-hello pIngNull true
+x-hello PingBug true
+x-hello PiNgJsOn {"well":"formed","json":[1,2,3,4.5,true,false,null,"oups"]}
+x-hello subcall {"api":"x-hello","verb":"pingjson","args":[{"key1":"value1"}]}
+x-hello subcall {"api":"x-hello","verb":"subcall","args":{"api":"x-hello","verb":"pingjson","args":[{"key1":"value1"}]}}
+x-hello subcallsync {"api":"x-hello","verb":"pingjson","args":[{"key1":"value1"}]}
+x-hello subcallsync {"api":"x-hello","verb":"subcall","args":{"api":"x-hello","verb":"pingjson","args":[{"key1":"value1"}]}}
+x-hello subcall {"api":"x-hello","verb":"subcallsync","args":{"api":"x-hello","verb":"pingjson","args":[{"key1":"value1"}]}}
+x-hello subcallsync {"api":"x-hello","verb":"subcallsync","args":{"api":"x-hello","verb":"pingjson","args":[{"key1":"value1"}]}}
+x-hello eventadd {"tag":"ev1","name":"event-A"}
+x-hello eventadd {"tag":"ev2","name":"event-B"}
+x-hello eventpush {"tag":"ev1","data":[1,2,"x-hello"]}
+x-hello eventpush {"tag":"ev2","data":{"item":0}}
+x-hello eventsub {"tag":"ev2"}
+x-hello eventpush {"tag":"ev1","data":[1,2,"x-hello"]}
+x-hello eventpush {"tag":"ev2","data":{"item":0}}
+x-hello eventsub {"tag":"ev1"}
+x-hello subcall {"api":"x-hello","verb":"eventpush","args":{"tag":"ev1","data":[1,2,"x-hello"]}}
+x-hello subcall {"api":"x-hello","verb":"eventpush","args":{"tag":"ev2","data":{"item":0}}}
+x-hello subcallsync {"api":"x-hello","verb":"eventpush","args":{"tag":"ev1","data":[1,2,"x-hello"]}}
+x-hello subcallsync {"api":"x-hello","verb":"eventpush","args":{"tag":"ev2","data":{"item":0}}}
+x-hello eventunsub {"tag":"ev2"}
+x-hello eventpush {"tag":"ev1","data":[1,2,"x-hello"]}
+x-hello eventpush {"tag":"ev2","data":{"item":0}}
+x-hello eventdel {"tag":"ev1"}
+x-hello eventpush {"tag":"ev1","data":[1,2,"x-hello"]}
+x-hello eventpush {"tag":"ev2","data":{"item":0}}
+x-hello eventdel {"tag":"ev2"}
+EOC
+
diff --git a/coverage/scripts/03-x-hello.sh b/coverage/scripts/03-x-hello.sh
deleted file mode 100755
index 9d3726e4..00000000
--- a/coverage/scripts/03-x-hello.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/sh
-
-$R/bin/afb-client -s -e $WSURL <<EOC
-x-hello ping true
-x-HELLO PING false
-x-hello pIngNull true
-x-hello PingBug true
-x-hello PiNgJsOn {"well":"formed","json":[1,2,3,4.5,true,false,null,"oups"]}
-x-hello subcall {"api":"x-hello","verb":"pingjson","args":[{"key1":"value1"}]}
-x-hello subcall {"api":"x-hello","verb":"subcall","args":{"api":"x-hello","verb":"pingjson","args":[{"key1":"value1"}]}}
-x-hello subcallsync {"api":"x-hello","verb":"pingjson","args":[{"key1":"value1"}]}
-x-hello subcallsync {"api":"x-hello","verb":"subcall","args":{"api":"x-hello","verb":"pingjson","args":[{"key1":"value1"}]}}
-x-hello subcall {"api":"x-hello","verb":"subcallsync","args":{"api":"x-hello","verb":"pingjson","args":[{"key1":"value1"}]}}
-x-hello subcallsync {"api":"x-hello","verb":"subcallsync","args":{"api":"x-hello","verb":"pingjson","args":[{"key1":"value1"}]}}
-x-hello eventadd {"tag":"ev1","name":"event-A"}
-x-hello eventadd {"tag":"ev2","name":"event-B"}
-x-hello eventpush {"tag":"ev1","data":[1,2,"x-hello"]}
-x-hello eventpush {"tag":"ev2","data":{"item":0}}
-x-hello eventsub {"tag":"ev2"}
-x-hello eventpush {"tag":"ev1","data":[1,2,"x-hello"]}
-x-hello eventpush {"tag":"ev2","data":{"item":0}}
-x-hello eventsub {"tag":"ev1"}
-x-hello subcall {"api":"x-hello","verb":"eventpush","args":{"tag":"ev1","data":[1,2,"x-hello"]}}
-x-hello subcall {"api":"x-hello","verb":"eventpush","args":{"tag":"ev2","data":{"item":0}}}
-x-hello subcallsync {"api":"x-hello","verb":"eventpush","args":{"tag":"ev1","data":[1,2,"x-hello"]}}
-x-hello subcallsync {"api":"x-hello","verb":"eventpush","args":{"tag":"ev2","data":{"item":0}}}
-x-hello eventunsub {"tag":"ev2"}
-x-hello eventpush {"tag":"ev1","data":[1,2,"x-hello"]}
-x-hello eventpush {"tag":"ev2","data":{"item":0}}
-x-hello eventdel {"tag":"ev1"}
-x-hello eventpush {"tag":"ev1","data":[1,2,"x-hello"]}
-x-hello eventpush {"tag":"ev2","data":{"item":0}}
-x-hello eventdel {"tag":"ev2"}
-EOC
-
diff --git a/coverage/scripts/06-auto-so.sh b/coverage/scripts/06-auto-so.sh
new file mode 100755
index 00000000..36214ee0
--- /dev/null
+++ b/coverage/scripts/06-auto-so.sh
@@ -0,0 +1,35 @@
+#!/bin/sh
+
+$R/bin/afb-client -s -e $WSURL <<EOC
+salam ping true
+x-HELLO PING false
+salam pIngNull true
+salam PingBug true
+salam PiNgJsOn {"well":"formed","json":[1,2,3,4.5,true,false,null,"oups"]}
+salam subcall {"api":"salam","verb":"pingjson","args":[{"key1":"value1"}]}
+salam subcall {"api":"salam","verb":"subcall","args":{"api":"salam","verb":"pingjson","args":[{"key1":"value1"}]}}
+salam subcallsync {"api":"salam","verb":"pingjson","args":[{"key1":"value1"}]}
+salam subcallsync {"api":"salam","verb":"subcall","args":{"api":"salam","verb":"pingjson","args":[{"key1":"value1"}]}}
+salam subcall {"api":"salam","verb":"subcallsync","args":{"api":"salam","verb":"pingjson","args":[{"key1":"value1"}]}}
+salam subcallsync {"api":"salam","verb":"subcallsync","args":{"api":"salam","verb":"pingjson","args":[{"key1":"value1"}]}}
+salam eventadd {"tag":"ev1","name":"event-A"}
+salam eventadd {"tag":"ev2","name":"event-B"}
+salam eventpush {"tag":"ev1","data":[1,2,"salam"]}
+salam eventpush {"tag":"ev2","data":{"item":0}}
+salam eventsub {"tag":"ev2"}
+salam eventpush {"tag":"ev1","data":[1,2,"salam"]}
+salam eventpush {"tag":"ev2","data":{"item":0}}
+salam eventsub {"tag":"ev1"}
+salam subcall {"api":"salam","verb":"eventpush","args":{"tag":"ev1","data":[1,2,"salam"]}}
+salam subcall {"api":"salam","verb":"eventpush","args":{"tag":"ev2","data":{"item":0}}}
+salam subcallsync {"api":"salam","verb":"eventpush","args":{"tag":"ev1","data":[1,2,"salam"]}}
+salam subcallsync {"api":"salam","verb":"eventpush","args":{"tag":"ev2","data":{"item":0}}}
+salam eventunsub {"tag":"ev2"}
+salam eventpush {"tag":"ev1","data":[1,2,"salam"]}
+salam eventpush {"tag":"ev2","data":{"item":0}}
+salam eventdel {"tag":"ev1"}
+salam eventpush {"tag":"ev1","data":[1,2,"salam"]}
+salam eventpush {"tag":"ev2","data":{"item":0}}
+salam eventdel {"tag":"ev2"}
+EOC
+
diff --git a/coverage/scripts/run-test.sh b/coverage/scripts/run-test.sh
index 34c2d303..bac4da5e 100755
--- a/coverage/scripts/run-test.sh
+++ b/coverage/scripts/run-test.sh
@@ -3,18 +3,72 @@
 export R=$(realpath $(dirname $0)/..)
 export PATH="$R/bin:$R/scripts:$PATH"
 
-$R/bin/afb-daemon-cov --help > /dev/null
+cd $R/bin
 
-$R/bin/afb-daemon-cov --version > /dev/null
+lcov -c -i -d $R/bin -o $R/lcov-out.info
 
-$R/bin/afb-daemon-cov --fake-option > /dev/null
+mk() {
+	echo
+	echo "*******************************************************************"
+	echo "** $*"
+	echo "*******************************************************************"
+	lcov -c -i -d $R/bin -o $R/fake.info
+	"$@"
+	lcov -c -d $R/bin -o $R/tmp.info
+	mv $R/lcov-out.info $R/previous.info
+	lcov -a $R/tmp.info -a $R/previous.info -o $R/lcov-out.info
+	rm $R/previous.info $R/fake.info  $R/tmp.info
+}
 
+mkdir /tmp/ldpaths
+export AFB_LDPATHS=/tmp/ldpaths
+export AFB_TRACEAPI=no
+
+##########################################################
+# test to check options
+##########################################################
+mk $R/bin/afb-daemon-cov --help
+
+mk $R/bin/afb-daemon-cov --version
+
+mk $R/bin/afb-daemon-cov --no-httpd --fake-option
+
+mk $R/bin/afb-daemon-cov --daemon --session-max
+
+mk $R/bin/afb-daemon-cov --ws-client fake --session-max toto
+
+mk $R/bin/afb-daemon-cov --foreground --port -55
+
+mk $R/bin/afb-daemon-cov --foreground --port 9999999
+
+mk $R/bin/afb-daemon-cov --no-ldpath --traceapi fake
+
+mk $R/bin/afb-daemon-cov --traceditf all --tracesvc all --log error,alarm
+
+LISTEN_FDNAMES=toto,demat LISTEN_FDS=5 mk $R/bin/afb-daemon-cov --no-ldpath --binding $R/bin/demat.so --ws-server sd:demat --call "demat/exit:0"
+
+mk $R/bin/afb-daemon-cov --weak-ldpaths $R/ldpath/weak --binding $R/bin/demat.so --ws-server sd:demat --call "demat/exit:0"
+
+##########################################################
+# test of the bench
+##########################################################
+mk $R/bin/test-apiset
+
+mk $R/bin/test-session
+
+mk $R/bin/test-wrap-json
+
+##########################################################
+# true life test
+##########################################################
+mk \
 valgrind \
 	--log-file=$R/valgrind.out \
 	--trace-children=no \
 	--track-fds=yes \
 	--leak-check=full \
-	 --show-leak-kinds=all \
+	--show-leak-kinds=all \
+	--num-callers=50 \
 $R/bin/afb-daemon-cov \
 	--verbose \
 	--verbose \
@@ -29,6 +83,7 @@ $R/bin/afb-daemon-cov \
 	--log error,warning,notice,info,debug,critical,alert-error,warning,notice,info,debug,critical,alert+error,warning,notice,info,debug,critical,alert \
 	--foreground \
 	--name binder-cov \
+	--port 8888 \
 	--roothttp $R/www \
 	--rootbase /opx \
 	--rootapi /api \
@@ -41,7 +96,6 @@ $R/bin/afb-daemon-cov \
 	--rootdir . \
 	--ldpaths $R/ldpath/strong \
 	--binding $R/bin/demat.so \
-	--weak-ldpaths $R/ldpath/weak \
 	--auto-api $R/apis/auto \
 	--token HELLO \
 	--random-token \
@@ -50,6 +104,7 @@ $R/bin/afb-daemon-cov \
 	--traceapi all \
 	--traceses all \
 	--traceevt all \
+	--monitoring \
 	--call demat/ping:true \
 	--ws-server unix:$R/apis/ws/hello \
 	--ws-server unix:$R/apis/ws/salut \
-- 
cgit 1.2.3-korg