whole tests batch

test/config.sh

@@ -6,10 +6,8 @@ dir_path=$(dirname $script_path)
 get_conf(){
     while IFS= read -r line ;
     do
-	echo "$line"
 	cf_key=`echo $line | awk 'BEGIN {FS = "="} {print $1}'`
 	cf_val=`echo $line | awk 'BEGIN {FS = "="} {print $2}'`
-	echo "$cf_key $cf_val"
 	eval $cf_key=$cf_val
     done < $1
 }

test/del_line.sh

@@ -3,29 +3,29 @@
 help() {
     echo "Syntaxe"
     echo "‾‾‾‾‾‾‾"
-    echo "sh $0 [ adresse ] [ table ] [ id ]\n"
+    echo "sh $0 [ adresse ] [ tablename ] [ id ]\n"
 }
 
-if [ -z "$1" ]
+if [ "$1" ]
 then
-    echo "Missing parameters : web adresses is needed\n"
-    help
-    exit
+    address=$1
 fi
-if [ -z "$2" ]
+if [ "$2" ]
 then
-    echo "Missing parameters : tablename is needed\n"
-    help
-    exit
+    tablename=$2
 fi
-if [ -z "$3" ]
+if [ "$3" ]
 then
-    echo "Missing parameters : an id is needed\n"
-    help
-    exit
+    id=$3
 fi
 
+. ./config.sh
+. ./dep/address.sh
+. ./dep/tablename.sh
+. ./dep/id.sh
+
+. ./tools/title.sh
 echo "Delete id $3 of table $2"
-echo "$1 $2 $3"
-curl --header "Content-Type: application/json" -X "DELETE" -b cookie.txt $1/api.php/records/$2/$3
+result=`curl --header "Content-Type: application/json" -X "DELETE" -b cookie.txt $address/api.php/records/$tablename/$id 2> /dev/null`
+sh tools/show_result.sh $result
 echo "\n"

test/get_line.sh

@@ -6,26 +6,26 @@ help() {
     echo "sh $0 [ adresse ] [ tablename ] [ id ]\n"
 }
 
-if [ -z "$1" ]
+if [ "$1" ]
 then
-    echo "Missing parameters : web adresses is needed\n"
-    help
-    exit
+    address=$1
 fi
-if [ -z "$2" ]
+if [ "$2" ]
 then
-    echo "Missing parameters : tablename is needed\n"
-    help
-    exit
+    tablename=$2
 fi
-if [ -z "$3" ]
+if [ "$3" ]
 then
-    echo "Missing parameters : an id is needed\n"
-    help
-    exit
+    id=$3
 fi
 
-echo "Get id $3 of table $2"
-echo "$1 $2 $3"
-curl --header "Content-Type: application/json" -b cookie.txt $1/api.php/records/$2/$3
+. ./config.sh
+. ./dep/address.sh
+. ./dep/tablename.sh
+. ./dep/id.sh
+
+. ./tools/title.sh
+echo "Get id $id of table $tablename"
+result=`curl --header "Content-Type: application/json" -b cookie.txt $address/api.php/records/$tablename/$id 2> /dev/null`
+sh tools/show_result.sh $result
 echo "\n"

test/get_table.sh

@@ -6,19 +6,21 @@ help() {
     echo "sh $0 [ adresse ] [ tablename ]\n"
 }
 
-if [ -z "$1" ]
+if [ "$1" ]
 then
-    echo "Missing parameters : web adresses is needed\n"
-    help
-    exit
+    address=$1
 fi
-if [ -z "$2" ]
+if [ "$2" ]
 then
-    echo "Missing parameters : tablename is needed\n"
-    help
-    exit
+    tablename=$2
 fi
-echo "List entries from table $2"
-echo "$1 $2 $3"
-curl --header "Content-Type: application/json" -b cookie.txt $1/api.php/records/$2
+
+. ./config.sh
+. ./dep/address.sh
+. ./dep/tablename.sh
+
+. ./tools/title.sh
+echo "List entries from table $tablename"
+result=`curl --header "Content-Type: application/json" -b cookie.txt $address/api.php/records/$tablename 2>/dev/null`
+sh tools/show_result.sh $result
 echo "\n"

test/login.sh

@@ -24,6 +24,8 @@ fi
 . ./dep/username.sh
 . ./dep/password.sh
 
-echo "Login as $2 in cookie.txt"
-curl --header "Content-Type: application/json" --cookie-jar cookie.txt --request POST --data "{\"username\":\"$username\",\"password\":\"$password\"}" $address/api.php/login
+. ./tools/title.sh
+echo "Login as $username in cookie.txt"
+result=`curl --header "Content-Type: application/json" --cookie-jar cookie.txt --request POST --data "{\"username\":\"$username\",\"password\":\"$password\"}" $address/api.php/login 2>/dev/null`
+sh tools/show_result.sh $result
 echo "\n"

test/post_line.sh

@@ -6,26 +6,26 @@ help() {
     echo "sh $0 [ adresse ] [ tablename ] [ data ]\n"
 }
 
-if [ -z "$1" ]
+if [ "$1" ]
 then
-    echo "Missing parameters : web adresses is needed\n"
-    help
-    exit
+    address=$1
 fi
-if [ -z "$2" ]
+if [ "$2" ]
 then
-    echo "Missing parameters : tablename is needed\n"
-    help
-    exit
+    tablename=$2
 fi
-if [ -z "$3" ]
+if [ "$3" ]
 then
-    echo "Missing parameters : data are needed\n"
-    help
-    exit
+    data=$3
 fi
 
-echo "Post $3 to table $2"
-echo "$1 $2 $3"
-curl --header "Content-Type: application/json" -b cookie.txt --data "$3" $1/api.php/records/$2/
+. ./config.sh
+. ./dep/address.sh
+. ./dep/tablename.sh
+. ./dep/data.sh
+
+. ./tools/title.sh
+echo "Post $data to table $tablename"
+result=`curl --header "Content-Type: application/json" -b cookie.txt -X POST --data ’$data’ $address/api.php/records/$tablename/ 2>/dev/null`
+sh tools/show_result.sh $result
 echo "\n"

test/set_line.sh

@@ -6,32 +6,33 @@ help() {
     echo "sh $0 [ adresse ] [ table ] [ id ] [ data ]\n"
 }
 
-if [ -z "$1" ]
+if [ "$1" ]
 then
-    echo "Missing parameters : web adresses is needed\n"
-    help
-    exit
+    address=$1
+
 fi
-if [ -z "$2" ]
+if [ "$2" ]
 then
-    echo "Missing parameters : tablename is needed\n"
-    help
-    exit
+    tablename=$2
 fi
 
-if [ -z "$3" ]
+if [ "$3" ]
 then
-    echo "Missing parameters : an id is needed\n"
-    help
-    exit
+    id=$3
 fi
-if [ -z "$4" ]
+if [ "$4" ]
 then
-    echo "Missing parameters : data are needed\n"
-    help
-    exit
+    data=$4
 fi
 
-echo "Set data for $2 with id $3"
-curl --header "Content-Type: application/json" -b cookie.txt -X PUT --data "$4" $1/api.php/records/$2/$3
+. ./config.sh
+. ./dep/address.sh
+. ./dep/tablename.sh
+. ./dep/id.sh
+. ./dep/data.sh
+
+. ./tools/title.sh
+echo "Set data for tablename with id $id"
+result=`curl --header "Content-Type: application/json" -b cookie.txt -X PUT --data "$data" $address/api.php/records/$tablename/$id 2>/dev/null`
+sh tools/show_result.sh $result
 echo "\n"

test/test.conf

@@ -0,0 +1,6 @@
+username=nas
+password=starwars
+address=192.168.1.152:8080
+tablename=ticket
+id=1
+data=’{"name" : "ondoing test run", "description" : "this ticket has been added by a testscript"}’

test/tests.sh

@@ -0,0 +1,4 @@
+#!/bin/sh
+
+sh login.sh
+find . -iname "*_*.sh" -type f -exec sh {} \;

test/tools/show_result.sh

@@ -0,0 +1,12 @@
+#!/bin/sh
+
+code=`echo $1 | grep code`
+
+if [ $code ]
+then
+    echo "\e[1;31mTest : [fail]\e[0m"
+else
+    echo "\e[1;32mResult [success]\e[0m"
+fi
+
+

test/tools/title.sh

@@ -0,0 +1,3 @@
+#/bin/sh
+echo "\e[1;34m\nTest : $0\e[0m"
+echo "\e[1;34m‾‾‾‾‾‾‾\e[0m"