-rwxr-xr-x | tests/setup.sh | 13 | ||||
-rwxr-xr-x | tests/t0101-index.sh | 2 | ||||
-rwxr-xr-x | tests/t0104-tree.sh | 12 |
3 files changed, 26 insertions, 1 deletions
diff --git a/tests/setup.sh b/tests/setup.sh index e37306e..1457dd5 100755 --- a/tests/setup.sh +++ b/tests/setup.sh | |||
@@ -18,62 +18,74 @@ | |||
18 | 18 | ||
19 | mkrepo() { | 19 | mkrepo() { |
20 | name=$1 | 20 | name=$1 |
21 | count=$2 | 21 | count=$2 |
22 | dir=$PWD | 22 | dir=$PWD |
23 | test -d $name && return | 23 | test -d $name && return |
24 | printf "Creating testrepo %s\n" $name | 24 | printf "Creating testrepo %s\n" $name |
25 | mkdir -p $name | 25 | mkdir -p $name |
26 | cd $name | 26 | cd $name |
27 | git init | 27 | git init |
28 | for ((n=1; n<=count; n++)) | 28 | for ((n=1; n<=count; n++)) |
29 | do | 29 | do |
30 | echo $n >file-$n | 30 | echo $n >file-$n |
31 | git add file-$n | 31 | git add file-$n |
32 | git commit -m "commit $n" | 32 | git commit -m "commit $n" |
33 | done | 33 | done |
34 | if test "$3" = "testplus" | ||
35 | then | ||
36 | echo "hello" >a+b | ||
37 | git add a+b | ||
38 | git commit -m "add a+b" | ||
39 | git branch "1+2" | ||
40 | fi | ||
34 | cd $dir | 41 | cd $dir |
35 | } | 42 | } |
36 | 43 | ||
37 | setup_repos() | 44 | setup_repos() |
38 | { | 45 | { |
39 | rm -rf trash/cache | 46 | rm -rf trash/cache |
40 | mkdir -p trash/cache | 47 | mkdir -p trash/cache |
41 | mkrepo trash/repos/foo 5 >/dev/null | 48 | mkrepo trash/repos/foo 5 >/dev/null |
42 | mkrepo trash/repos/bar 50 >/dev/null | 49 | mkrepo trash/repos/bar 50 >/dev/null |
50 | mkrepo trash/repos/foo+bar 10 testplus >/dev/null | ||
43 | cat >trash/cgitrc <<EOF | 51 | cat >trash/cgitrc <<EOF |
44 | virtual-root=/ | 52 | virtual-root=/ |
45 | cache-root=$PWD/trash/cache | 53 | cache-root=$PWD/trash/cache |
46 | 54 | ||
47 | cache-size=1021 | 55 | cache-size=1021 |
48 | snapshots=tar.gz tar.bz zip | 56 | snapshots=tar.gz tar.bz zip |
49 | enable-log-filecount=1 | 57 | enable-log-filecount=1 |
50 | enable-log-linecount=1 | 58 | enable-log-linecount=1 |
51 | summary-log=5 | 59 | summary-log=5 |
52 | summary-branches=5 | 60 | summary-branches=5 |
53 | summary-tags=5 | 61 | summary-tags=5 |
54 | 62 | ||
55 | repo.url=foo | 63 | repo.url=foo |
56 | repo.path=$PWD/trash/repos/foo/.git | 64 | repo.path=$PWD/trash/repos/foo/.git |
57 | # Do not specify a description for this repo, as it then will be assigned | 65 | # Do not specify a description for this repo, as it then will be assigned |
58 | # the constant value "[no description]" (which actually used to cause a | 66 | # the constant value "[no description]" (which actually used to cause a |
59 | # segfault). | 67 | # segfault). |
60 | 68 | ||
61 | repo.url=bar | 69 | repo.url=bar |
62 | repo.path=$PWD/trash/repos/bar/.git | 70 | repo.path=$PWD/trash/repos/bar/.git |
63 | repo.desc=the bar repo | 71 | repo.desc=the bar repo |
72 | |||
73 | repo.url=foo+bar | ||
74 | repo.path=$PWD/trash/repos/foo+bar/.git | ||
75 | repo.desc=the foo+bar repo | ||
64 | EOF | 76 | EOF |
65 | } | 77 | } |
66 | 78 | ||
67 | prepare_tests() | 79 | prepare_tests() |
68 | { | 80 | { |
69 | setup_repos | 81 | setup_repos |
70 | rm -f test-output.log 2>/dev/null | 82 | rm -f test-output.log 2>/dev/null |
71 | test_count=0 | 83 | test_count=0 |
72 | test_failed=0 | 84 | test_failed=0 |
73 | echo "[$0]" "$@" >test-output.log | 85 | echo "[$0]" "$@" >test-output.log |
74 | echo "$@" "($0)" | 86 | echo "$@" "($0)" |
75 | } | 87 | } |
76 | 88 | ||
77 | tests_done() | 89 | tests_done() |
78 | { | 90 | { |
79 | printf "\n" | 91 | printf "\n" |
@@ -100,17 +112,16 @@ run_test() | |||
100 | printf " %2d) %-60s [ok]\n" $test_count "$desc" | 112 | printf " %2d) %-60s [ok]\n" $test_count "$desc" |
101 | else | 113 | else |
102 | ((test_failed++)) | 114 | ((test_failed++)) |
103 | printf " %2d) %-60s [failed]\n" $test_count "$desc" | 115 | printf " %2d) %-60s [failed]\n" $test_count "$desc" |
104 | fi | 116 | fi |
105 | } | 117 | } |
106 | 118 | ||
107 | cgit_query() | 119 | cgit_query() |
108 | { | 120 | { |
109 | CGIT_CONFIG="$PWD/trash/cgitrc" QUERY_STRING="$1" "$PWD/../cgit" | 121 | CGIT_CONFIG="$PWD/trash/cgitrc" QUERY_STRING="$1" "$PWD/../cgit" |
110 | } | 122 | } |
111 | 123 | ||
112 | cgit_url() | 124 | cgit_url() |
113 | { | 125 | { |
114 | CGIT_CONFIG="$PWD/trash/cgitrc" QUERY_STRING="url=$1" "$PWD/../cgit" | 126 | CGIT_CONFIG="$PWD/trash/cgitrc" QUERY_STRING="url=$1" "$PWD/../cgit" |
115 | } | 127 | } |
116 | |||
diff --git a/tests/t0101-index.sh b/tests/t0101-index.sh index 445af6a..07e39f9 100755 --- a/tests/t0101-index.sh +++ b/tests/t0101-index.sh | |||
@@ -1,15 +1,17 @@ | |||
1 | #!/bin/sh | 1 | #!/bin/sh |
2 | 2 | ||
3 | . ./setup.sh | 3 | . ./setup.sh |
4 | 4 | ||
5 | prepare_tests "Check content on index page" | 5 | prepare_tests "Check content on index page" |
6 | 6 | ||
7 | run_test 'generate index page' 'cgit_url "" >trash/tmp' | 7 | run_test 'generate index page' 'cgit_url "" >trash/tmp' |
8 | run_test 'find foo repo' 'grep -e "foo" trash/tmp' | 8 | run_test 'find foo repo' 'grep -e "foo" trash/tmp' |
9 | run_test 'find foo description' 'grep -e "\[no description\]" trash/tmp' | 9 | run_test 'find foo description' 'grep -e "\[no description\]" trash/tmp' |
10 | run_test 'find bar repo' 'grep -e "bar" trash/tmp' | 10 | run_test 'find bar repo' 'grep -e "bar" trash/tmp' |
11 | run_test 'find bar description' 'grep -e "the bar repo" trash/tmp' | 11 | run_test 'find bar description' 'grep -e "the bar repo" trash/tmp' |
12 | run_test 'find foo+bar repo' 'grep -e ">foo+bar<" trash/tmp' | ||
13 | run_test 'verify foo+bar link' 'grep -e "/foo+bar/" trash/tmp' | ||
12 | run_test 'no tree-link' '! grep -e "foo/tree" trash/tmp' | 14 | run_test 'no tree-link' '! grep -e "foo/tree" trash/tmp' |
13 | run_test 'no log-link' '! grep -e "foo/log" trash/tmp' | 15 | run_test 'no log-link' '! grep -e "foo/log" trash/tmp' |
14 | 16 | ||
15 | tests_done | 17 | tests_done |
diff --git a/tests/t0104-tree.sh b/tests/t0104-tree.sh index 2516c72..0d62cc8 100755 --- a/tests/t0104-tree.sh +++ b/tests/t0104-tree.sh | |||
@@ -5,17 +5,29 @@ | |||
5 | prepare_tests "Check content on tree page" | 5 | prepare_tests "Check content on tree page" |
6 | 6 | ||
7 | run_test 'generate bar/tree' 'cgit_url "bar/tree" >trash/tmp' | 7 | run_test 'generate bar/tree' 'cgit_url "bar/tree" >trash/tmp' |
8 | run_test 'find file-1' 'grep -e "file-1" trash/tmp' | 8 | run_test 'find file-1' 'grep -e "file-1" trash/tmp' |
9 | run_test 'find file-50' 'grep -e "file-50" trash/tmp' | 9 | run_test 'find file-50' 'grep -e "file-50" trash/tmp' |
10 | 10 | ||
11 | run_test 'generate bar/tree/file-50' 'cgit_url "bar/tree/file-50" >trash/tmp' | 11 | run_test 'generate bar/tree/file-50' 'cgit_url "bar/tree/file-50" >trash/tmp' |
12 | 12 | ||
13 | run_test 'find line 1' ' | 13 | run_test 'find line 1' ' |
14 | grep -e "<a id=.n1. name=.n1. href=.#n1.>1</a>" trash/tmp | 14 | grep -e "<a id=.n1. name=.n1. href=.#n1.>1</a>" trash/tmp |
15 | ' | 15 | ' |
16 | 16 | ||
17 | run_test 'no line 2' ' | 17 | run_test 'no line 2' ' |
18 | grep -e "<a id=.n2. name=.n2. href=.#n2.>2</a>" trash/tmp | 18 | grep -e "<a id=.n2. name=.n2. href=.#n2.>2</a>" trash/tmp |
19 | ' | 19 | ' |
20 | 20 | ||
21 | run_test 'generate foo+bar/tree' 'cgit_url "foo%2bbar/tree" >trash/tmp' | ||
22 | |||
23 | run_test 'verify a+b link' ' | ||
24 | grep -e "/foo+bar/tree/a+b" trash/tmp | ||
25 | ' | ||
26 | |||
27 | run_test 'generate foo+bar/tree?h=1+2' 'cgit_url "foo%2bbar/tree&h=1%2b2" >trash/tmp' | ||
28 | |||
29 | run_test 'verify a+b?h=1+2 link' ' | ||
30 | grep -e "/foo+bar/tree/a+b?h=1%2b2" trash/tmp | ||
31 | ' | ||
32 | |||
21 | tests_done | 33 | tests_done |