test: add test cases

marjune163 · marjune163 · commit c41d9931c49d · 2020-03-02T11:11:39.000+08:00
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 .*/
 /output
 /test/bin/
+/test/**/*.tmp
diff --git a/test/case/001.basic.bash b/test/case/001.basic.bash
@@ -3,8 +3,9 @@
 source "$root"/lib.bash
 
 "$ghfs" -l 3003 -r "$fs"/vhost1 &
+sleep 0.05 # wait server ready
 
-file1=$(http_get_body 127.0.0.1:3003/file1.txt)
+file1=$(curl_get_body http://127.0.0.1:3003/file1.txt)
 assert "$file1" 'vhost1/file1.txt'
 
 kill %1
diff --git a/test/case/002.vhost.bash b/test/case/002.vhost.bash
@@ -3,11 +3,12 @@
 source "$root"/lib.bash
 
 "$ghfs" -l 3003 -r "$fs"/vhost1 --hostname=127.0.0.1 ,,  -l 3003 -r "$fs"/vhost2 --hostname=127.0.0.2 &
+sleep 0.05 # wait server ready
 
-vh1file1=$(http_get_body 127.0.0.1:3003/file1.txt)
+vh1file1=$(curl_get_body http://127.0.0.1:3003/file1.txt)
 assert "$vh1file1" 'vhost1/file1.txt'
 
-vh2file1=$(http_get_body 127.0.0.2:3003/file1.txt)
+vh2file1=$(curl_get_body http://127.0.0.2:3003/file1.txt)
 assert "$vh2file1" 'vhost2/file1.txt'
 
 kill %1
diff --git a/test/case/003.vhost.tls.bash b/test/case/003.vhost.tls.bash
@@ -3,11 +3,12 @@
 source "$root"/lib.bash
 
 "$ghfs" -l 3003 -r "$fs"/vhost1 --hostname=127.0.0.1 -c "$cert"/example.crt -k "$cert"/example.key ,,  -l 3003 -r "$fs"/vhost2 --hostname=127.0.0.2 -c "$cert"/localhost.crt -k "$cert"/localhost.key &
+sleep 0.05 # wait server ready
 
-vh1file1=$(https_get_body 127.0.0.1:3003/file1.txt)
+vh1file1=$(curl_get_body https://127.0.0.1:3003/file1.txt)
 assert "$vh1file1" 'vhost1/file1.txt'
 
-vh2file1=$(https_get_body 127.0.0.2:3003/file1.txt)
+vh2file1=$(curl_get_body https://127.0.0.2:3003/file1.txt)
 assert "$vh2file1" 'vhost2/file1.txt'
 
 kill %1
diff --git a/test/case/004.alias.bash b/test/case/004.alias.bash
@@ -2,18 +2,25 @@
 
 source "$root"/lib.bash
 
-"$ghfs" -l 3003 -r "$fs"/vhost1 -a :world:"$fs"/vhost1/go :/not/exist/name:"$fs"/vhost1/yes &
+"$ghfs" -l 3003 -r "$fs"/vhost1 -a :world:"$fs"/vhost1/go :/not/exist/name:"$fs"/vhost1/yes -E '' &
+sleep 0.05 # wait server ready
 
-file1=$(http_get_body 127.0.0.1:3003/file1.txt)
+file1=$(curl_get_body http://127.0.0.1:3003/file1.txt)
 assert "$file1" 'vhost1/file1.txt'
 
-hello=$(http_get_body 127.0.0.1:3003/hello/index.txt)
+hello=$(curl_get_body http://127.0.0.1:3003/hello/index.txt)
 assert "$hello" 'vhost1/hello/index.txt'
 
-go=$(http_get_body 127.0.0.1:3003/world/index.txt)
+go=$(curl_get_body http://127.0.0.1:3003/world/index.txt)
 assert "$go" 'vhost1/go/index.txt'
 
-yes=$(http_get_body 127.0.0.1:3003/not/exist/name/index.txt)
+status=$(curl_get_status http://127.0.0.1:3003/not)
+assert "$status" '404'
+
+status=$(curl_get_status http://127.0.0.1:3003/not/exist)
+assert "$status" '404'
+
+yes=$(curl_get_body http://127.0.0.1:3003/not/exist/name/index.txt)
 assert "$yes" 'vhost1/yes/index.txt'
 
 kill %1
diff --git a/test/case/005.alias.empty.root.bash b/test/case/005.alias.empty.root.bash
@@ -3,23 +3,24 @@
 source "$root"/lib.bash
 
 "$ghfs" -l 3003 -R -a :world:"$fs"/vhost1/go :/not/exist/name:"$fs"/vhost1/yes &
+sleep 0.05 # wait server ready
 
-file1status=$(http_get_status  127.0.0.1:3003/file1.txt | head -n 1 | cut -d ' ' -f 2)
+file1status=$(curl_get_status http://127.0.0.1:3003/file1.txt | head -n 1 | cut -d ' ' -f 2)
 assert "$file1status" '404'
 
-file1headstatus=$(http_head_status  127.0.0.1:3003/file1.txt | head -n 1 | cut -d ' ' -f 2)
+file1headstatus=$(curl_head_status http://127.0.0.1:3003/file1.txt | head -n 1 | cut -d ' ' -f 2)
 assert "$file1headstatus" '404'
 
-hellostatus=$(http_get_status 127.0.0.1:3003/hello/index.txt | head -n 1 | cut -d ' ' -f 2)
+hellostatus=$(curl_get_status http://127.0.0.1:3003/hello/index.txt | head -n 1 | cut -d ' ' -f 2)
 assert "$hellostatus" '404'
 
-helloheadstatus=$(http_head_status 127.0.0.1:3003/hello/index.txt | head -n 1 | cut -d ' ' -f 2)
+helloheadstatus=$(curl_head_status http://127.0.0.1:3003/hello/index.txt | head -n 1 | cut -d ' ' -f 2)
 assert "$helloheadstatus" '404'
 
-go=$(http_get_body 127.0.0.1:3003/world/index.txt)
+go=$(curl_get_body http://127.0.0.1:3003/world/index.txt)
 assert "$go" 'vhost1/go/index.txt'
 
-yes=$(http_get_body 127.0.0.1:3003/not/exist/name/index.txt)
+yes=$(curl_get_body http://127.0.0.1:3003/not/exist/name/index.txt)
 assert "$yes" 'vhost1/yes/index.txt'
 
 kill %1
diff --git a/test/case/006.auth.bash b/test/case/006.auth.bash
@@ -3,17 +3,18 @@
 source "$root"/lib.bash
 
 "$ghfs" -l 3003 -r "$fs"/vhost1 --auth /hello --user alice:AliceSecret &
+sleep 0.05 # wait server ready
 
-yesstatus=$(http_get_status 127.0.0.1:3003/yes/)
+yesstatus=$(curl_get_status http://127.0.0.1:3003/yes/)
 assert "$yesstatus" '200'
 
-hellostatus=$(http_get_status 127.0.0.1:3003/hello/)
+hellostatus=$(curl_get_status http://127.0.0.1:3003/hello/)
 assert "$hellostatus" '401'
 
-userhellostatus=$(http_get_status alice:AliceSecret@127.0.0.1:3003/hello/)
+userhellostatus=$(curl_get_status http://alice:AliceSecret@127.0.0.1:3003/hello/)
 assert "$userhellostatus" '200'
 
-userhelloheadstatus=$(http_head_status alice:AliceSecret@127.0.0.1:3003/hello/)
+userhelloheadstatus=$(curl_head_status http://alice:AliceSecret@127.0.0.1:3003/hello/)
 assert "$userhelloheadstatus" '200'
 
 kill %1
diff --git a/test/case/007.dir.index.bash b/test/case/007.dir.index.bash
@@ -3,8 +3,9 @@
 source "$root"/lib.bash
 
 "$ghfs" -l 3003 -r "$fs"/vhost1 -I index.txt &
+sleep 0.05 # wait server ready
 
-yes=$(http_get_body 127.0.0.1:3003/yes)
+yes=$(curl_get_body http://127.0.0.1:3003/yes)
 assert "$yes" 'vhost1/yes/index.txt'
 
 kill %1
diff --git a/test/case/008.alias.dir.index.bash b/test/case/008.alias.dir.index.bash
@@ -3,8 +3,9 @@
 source "$root"/lib.bash
 
 "$ghfs" -l 3003 -r "$fs"/vhost1 -I index.txt -a :/hello/index.txt:"$fs"/vhost1/world/index.txt &
+sleep 0.05 # wait server ready
 
-world=$(http_get_body 127.0.0.1:3003/hello)
+world=$(curl_get_body http://127.0.0.1:3003/hello)
 assert "$world" 'vhost1/world/index.txt'
 
 kill %1
diff --git a/test/case/009.upload.bash b/test/case/009.upload.bash
@@ -0,0 +1,24 @@
+#!/bin/bash
+
+cleanup() {
+	rm -f "$fs"/uploaded/[12]/*.tmp
+}
+
+source "$root"/lib.bash
+
+"$ghfs" -l 3003 -r "$fs"/uploaded --upload /1 --upload-dir "$fs"/uploaded/2 &
+sleep 0.05 # wait server ready
+cleanup
+
+content1='uploaded/1/uploaded.tmp'
+curl_upload_content http://127.0.0.1:3003/1 files "$content1" uploaded.tmp
+uploaded1=$(cat "$fs"/uploaded/1/uploaded.tmp)
+assert "$uploaded1" "$content1"
+
+content2='uploaded/2/uploaded.tmp'
+curl_upload_content http://127.0.0.1:3003/2 files "$content2" uploaded.tmp
+uploaded2=$(cat "$fs"/uploaded/2/uploaded.tmp)
+assert "$uploaded2" "$content2"
+
+cleanup
+kill %1
diff --git a/test/case/010.archive.bash b/test/case/010.archive.bash
@@ -0,0 +1,24 @@
+#!/bin/bash
+
+cleanup() {
+	rm -f "$fs"/downloaded/*.tmp
+}
+
+source "$root"/lib.bash
+
+"$ghfs" -l 3003 -r "$fs"/vhost2 --archive /a --archive-dir "$fs"/vhost2/b &
+sleep 0.05 # wait server ready
+cleanup
+
+archive="$fs"/downloaded/a.tar.tmp
+curl_get_body 'http://127.0.0.1:3003/a?tar' > "$archive"
+(tar -tf "$archive" | grep -q a1.txt) || fail "a1.txt not in $(basename $archive)"
+(tar -tf "$archive" | grep -q a2.txt) || fail "a2.txt not in $(basename $archive)"
+
+archive="$fs"/downloaded/b.tar.tmp
+curl_get_body 'http://127.0.0.1:3003/b/?tar' > "$archive"
+(tar -tf "$archive" | grep -q b1.txt) || fail "b1.txt not in $(basename $archive)"
+(tar -tf "$archive" | grep -q b2.txt) || fail "b2.txt not in $(basename $archive)"
+
+cleanup
+kill %1
diff --git a/test/fs/downloaded/index.txt b/test/fs/downloaded/index.txt
@@ -0,0 +1 @@
+downloaded/index.txt
diff --git a/test/fs/uploaded/1/index.txt b/test/fs/uploaded/1/index.txt
@@ -0,0 +1 @@
+uploaded/1/index.txt
diff --git a/test/fs/uploaded/2/index.txt b/test/fs/uploaded/2/index.txt
@@ -0,0 +1 @@
+uploaded/2/index.txt
diff --git a/test/fs/vhost2/a/a1.txt b/test/fs/vhost2/a/a1.txt
@@ -0,0 +1 @@
+vhost2/a/a1.txt
diff --git a/test/fs/vhost2/a/a2.txt b/test/fs/vhost2/a/a2.txt
@@ -0,0 +1 @@
+vhost2/a/a2.txt
diff --git a/test/fs/vhost2/b/b1.txt b/test/fs/vhost2/b/b1.txt
@@ -0,0 +1 @@
+vhost2/b/b1.txt
diff --git a/test/fs/vhost2/b/b2.txt b/test/fs/vhost2/b/b2.txt
@@ -0,0 +1 @@
+vhost2/b/b2.txt
diff --git a/test/lib.bash b/test/lib.bash
@@ -4,36 +4,36 @@ assert() {
 	expect="$2"
 	actual="$1"
 	if [ "$expect" != "$actual" ]; then
-		echo -e "$(basename $0): expect \"\e[0;32m$expect\e[0m\", got \"\e[1;31m$actual\e[0m\""
-	fi;
+		echo -e "$(basename $0): expect \"\e[0;32m$expect\e[0m\", got \"\e[1;31m$actual\e[0m\"" >&2
+	fi
 }
 
-http_head_status() {
-	url=http://"$1"
-	curl -s -I "$url" | head -n 1 | cut -d ' ' -f 2
+fail() {
+	msg="$1"
+	echo -e "$(basename $0): \e[1;31m$msg\e[0m" >&2
 }
 
-http_get_status() {
-	url=http://"$1"
-	curl -s -i "$url" | head -n 1 | cut -d ' ' -f 2
-}
-
-http_get_body() {
-	url=http://"$1"
-	curl -s "$url"
-}
-
-https_head_status() {
-	url=https://"$1"
+curl_head_status() {
+	url="$1"
 	curl -s -k -I "$url" | head -n 1 | cut -d ' ' -f 2
 }
 
-https_get_status() {
-	url=https://"$1"
+curl_get_status() {
+	url="$1"
+	opts="$2"
 	curl -s -k -i "$url" | head -n 1 | cut -d ' ' -f 2
 }
 
-https_get_body() {
-	url=https://"$1"
+curl_get_body() {
+	url="$1"
+	opts="$2"
 	curl -s -k "$url"
 }
+
+curl_upload_content() {
+	url="$1"
+	name="$2"
+	value="$3"
+	filename="$4"
+	curl -s -k -F "$name=$value;filename=$filename" "$url"
+}
diff --git a/test/main.bash b/test/main.bash
@@ -10,9 +10,13 @@ export ghfs=$(realpath bin)/ghfs
 
 go build -o "$ghfs" "$src/main.go"
 
+pattern="$1"
+if [ -z "$pattern" ]; then
+	pattern='*'
+fi
 
-for file in case/*.bash; do
+for file in case/$pattern.bash; do
 	bash "$file"
-done;
+done
 
 killall "$ghfs" 2> /dev/null

-Original file line number
+Diff line change
@@ @@ -1,3 +1,4 @@ @@
 .*/
 /output
 /test/bin/
 +/test/**/*.tmp