[PATCH v2 1/3] t0111: Prepare for other filter prefixes

[PATCH v2 1/3] t0111: Prepare for other filter prefixes

[cgit]

* Validate the email filter by manipulating stdin. Additional checks for
  all the arguments can be added in a later patch.

* Add the exec prefix to all informational messages.

* Rename the filter repository to filter-exec. The Git repository itself
  is not renamed since it can be shared amongst all filter types.

Signed-off-by: Lukas Fleischer <cgit at cryptocrack.de>
---
 tests/filters/capitalize-argv1.sh |  3 ---
 tests/setup.sh                    |  4 ++--
 tests/t0111-filter.sh             | 26 +++++++++++++-------------
 3 files changed, 15 insertions(+), 18 deletions(-)
 delete mode 100755 tests/filters/capitalize-argv1.sh

diff --git a/tests/filters/capitalize-argv1.sh b/tests/filters/capitalize-argv1.sh
deleted file mode 100755
index 2ea0098..0000000
--- a/tests/filters/capitalize-argv1.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-echo "$1" | tr '[:lower:]' '[:upper:]'
diff --git a/tests/setup.sh b/tests/setup.sh
index 861f48a..a0a9be2 100755
--- a/tests/setup.sh
+++ b/tests/setup.sh
@@ -125,12 +125,12 @@ repo.url=with space
 repo.path=$PWD/repos/with space/.git
 repo.desc=spaced repo
 
-repo.url=filter
+repo.url=filter-exec
 repo.path=$PWD/repos/filter/.git
 repo.desc=filtered repo
 repo.about-filter=exec:$FILTER_DIRECTORY/capitalize-stdin.sh
 repo.commit-filter=exec:$FILTER_DIRECTORY/capitalize-stdin.sh
-repo.email-filter=exec:$FILTER_DIRECTORY/capitalize-argv1.sh
+repo.email-filter=exec:$FILTER_DIRECTORY/capitalize-stdin.sh
 repo.source-filter=exec:$FILTER_DIRECTORY/capitalize-stdin.sh
 repo.readme=master:a+b
 EOF
diff --git a/tests/t0111-filter.sh b/tests/t0111-filter.sh
index 2f99880..c235652 100755
--- a/tests/t0111-filter.sh
+++ b/tests/t0111-filter.sh
@@ -3,36 +3,36 @@
 test_description='Check filtered content'
 . ./setup.sh
 
-test_expect_success 'generate filter/tree/a%2bb' '
-	cgit_url "filter/tree/a%2bb" >tmp
+test_expect_success 'generate filter-exec/tree/a%2bb' '
+	cgit_url "filter-exec/tree/a%2bb" >tmp
 '
 
-test_expect_success 'check whether the source filter works' '
+test_expect_success 'check whether the exec source filter works' '
 	grep "<code>HELLO$" tmp
 '
 
-test_expect_success 'generate filter/about/' '
-	cgit_url "filter/about/" >tmp
+test_expect_success 'generate filter-exec/about/' '
+	cgit_url "filter-exec/about/" >tmp
 '
 
-test_expect_success 'check whether the about filter works' '
+test_expect_success 'check whether the exec about filter works' '
 	grep "<div id='"'"'summary'"'"'>HELLO$" tmp
 '
 
-test_expect_success 'generate filter/commit/' '
-	cgit_url "filter/commit/" >tmp
+test_expect_success 'generate filter-exec/commit/' '
+	cgit_url "filter-exec/commit/" >tmp
 '
 
-test_expect_success 'check whether the commit filter works' '
+test_expect_success 'check whether the exec commit filter works' '
 	grep "<div class='"'"'commit-subject'"'"'>ADD A+B" tmp
 '
 
-test_expect_success 'check whether the email filter works for authors' '
-	grep "<AUTHOR at EXAMPLE.COM>" tmp
+test_expect_success 'check whether the exec email filter works for authors' '
+	grep "A U THOR &LT;AUTHOR at EXAMPLE.COM&GT;" tmp
 '
 
-test_expect_success 'check whether the email filter works for committers' '
-	grep "<COMMITTER at EXAMPLE.COM>" tmp
+test_expect_success 'check whether the exec email filter works for committers' '
+	grep "C O MITTER &LT;COMMITTER at EXAMPLE.COM&GT;" tmp
 '
 
 test_done
-- 
1.8.5.2

[PATCH v2 2/3] t0111: Add basic tests for Lua filters

[cgit]

Signed-off-by: Lukas Fleischer <cgit at cryptocrack.de>
---
 tests/filters/capitalize-buffer.lua | 14 ++++++++
 tests/setup.sh                      |  9 +++++
 tests/t0111-filter.sh               | 65 +++++++++++++++++++------------------
 3 files changed, 57 insertions(+), 31 deletions(-)
 create mode 100644 tests/filters/capitalize-buffer.lua

diff --git a/tests/filters/capitalize-buffer.lua b/tests/filters/capitalize-buffer.lua
new file mode 100644
index 0000000..7ca4ec6
--- /dev/null
+++ b/tests/filters/capitalize-buffer.lua
@@ -0,0 +1,14 @@
+function filter_open(...)
+	buffer = ""
+end
+
+function filter_close()
+	html(buffer)
+	return 0
+end
+
+function filter_write(str)
+	buffer = buffer .. string.upper(str)
+end
+
+
diff --git a/tests/setup.sh b/tests/setup.sh
index a0a9be2..12c97f5 100755
--- a/tests/setup.sh
+++ b/tests/setup.sh
@@ -133,6 +133,15 @@ repo.commit-filter=exec:$FILTER_DIRECTORY/capitalize-stdin.sh
 repo.email-filter=exec:$FILTER_DIRECTORY/capitalize-stdin.sh
 repo.source-filter=exec:$FILTER_DIRECTORY/capitalize-stdin.sh
 repo.readme=master:a+b
+
+repo.url=filter-lua
+repo.path=$PWD/repos/filter/.git
+repo.desc=filtered repo
+repo.about-filter=lua:$FILTER_DIRECTORY/capitalize-buffer.lua
+repo.commit-filter=lua:$FILTER_DIRECTORY/capitalize-buffer.lua
+repo.email-filter=lua:$FILTER_DIRECTORY/capitalize-buffer.lua
+repo.source-filter=lua:$FILTER_DIRECTORY/capitalize-buffer.lua
+repo.readme=master:a+b
 EOF
 }
 
diff --git a/tests/t0111-filter.sh b/tests/t0111-filter.sh
index c235652..dab6aa8 100755
--- a/tests/t0111-filter.sh
+++ b/tests/t0111-filter.sh
@@ -3,36 +3,39 @@
 test_description='Check filtered content'
 . ./setup.sh
 
-test_expect_success 'generate filter-exec/tree/a%2bb' '
-	cgit_url "filter-exec/tree/a%2bb" >tmp
-'
-
-test_expect_success 'check whether the exec source filter works' '
-	grep "<code>HELLO$" tmp
-'
-
-test_expect_success 'generate filter-exec/about/' '
-	cgit_url "filter-exec/about/" >tmp
-'
-
-test_expect_success 'check whether the exec about filter works' '
-	grep "<div id='"'"'summary'"'"'>HELLO$" tmp
-'
-
-test_expect_success 'generate filter-exec/commit/' '
-	cgit_url "filter-exec/commit/" >tmp
-'
-
-test_expect_success 'check whether the exec commit filter works' '
-	grep "<div class='"'"'commit-subject'"'"'>ADD A+B" tmp
-'
-
-test_expect_success 'check whether the exec email filter works for authors' '
-	grep "A U THOR &LT;AUTHOR at EXAMPLE.COM&GT;" tmp
-'
-
-test_expect_success 'check whether the exec email filter works for committers' '
-	grep "C O MITTER &LT;COMMITTER at EXAMPLE.COM&GT;" tmp
-'
+for prefix in exec lua
+do
+	test_expect_success "generate filter-$prefix/tree/a%2bb" "
+		cgit_url 'filter-$prefix/tree/a%2bb' >tmp
+	"
+
+	test_expect_success "check whether the $prefix source filter works" '
+		grep "<code>HELLO$" tmp
+	'
+
+	test_expect_success "generate filter-$prefix/about/" "
+		cgit_url 'filter-$prefix/about/' >tmp
+	"
+
+	test_expect_success "check whether the $prefix about filter works" '
+		grep "<div id='"'"'summary'"'"'>HELLO$" tmp
+	'
+
+	test_expect_success "generate filter-$prefix/commit/" "
+		cgit_url 'filter-$prefix/commit/' >tmp
+	"
+
+	test_expect_success "check whether the $prefix commit filter works" '
+		grep "<div class='"'"'commit-subject'"'"'>ADD A+B" tmp
+	'
+
+	test_expect_success "check whether the $prefix email filter works for authors" '
+		grep "A U THOR &LT;AUTHOR at EXAMPLE.COM&GT;" tmp
+	'
+
+	test_expect_success "check whether the $prefix email filter works for committers" '
+		grep "C O MITTER &LT;COMMITTER at EXAMPLE.COM&GT;" tmp
+	'
+done
 
 test_done
-- 
1.8.5.2

[PATCH 3/3] t0111: Check all arguments

[cgit]

In the filter checks, check whether all arguments are passed properly
instead of validating the buffer/stdin only.

Signed-off-by: Lukas Fleischer <cgit at cryptocrack.de>
---
 tests/filters/capitalize-buffer.lua | 3 +++
 tests/filters/capitalize-stdin.sh   | 1 +
 tests/t0111-filter.sh               | 4 ++--
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/tests/filters/capitalize-buffer.lua b/tests/filters/capitalize-buffer.lua
index 7ca4ec6..1f15c93 100644
--- a/tests/filters/capitalize-buffer.lua
+++ b/tests/filters/capitalize-buffer.lua
@@ -1,5 +1,8 @@
 function filter_open(...)
 	buffer = ""
+	for i = 1, select("#", ...) do
+		buffer = buffer .. select(i, ...) .. " "
+	end
 end
 
 function filter_close()
diff --git a/tests/filters/capitalize-stdin.sh b/tests/filters/capitalize-stdin.sh
index c9f4719..da6f7a1 100755
--- a/tests/filters/capitalize-stdin.sh
+++ b/tests/filters/capitalize-stdin.sh
@@ -1,3 +1,4 @@
 #!/bin/sh
 
+[ "$#" -gt 0 ] && printf "%s " "$*"
 tr '[:lower:]' '[:upper:]'
diff --git a/tests/t0111-filter.sh b/tests/t0111-filter.sh
index dab6aa8..c89020a 100755
--- a/tests/t0111-filter.sh
+++ b/tests/t0111-filter.sh
@@ -10,7 +10,7 @@ do
 	"
 
 	test_expect_success "check whether the $prefix source filter works" '
-		grep "<code>HELLO$" tmp
+		grep "<code>a+b HELLO$" tmp
 	'
 
 	test_expect_success "generate filter-$prefix/about/" "
@@ -18,7 +18,7 @@ do
 	"
 
 	test_expect_success "check whether the $prefix about filter works" '
-		grep "<div id='"'"'summary'"'"'>HELLO$" tmp
+		grep "<div id='"'"'summary'"'"'>a+b HELLO$" tmp
 	'
 
 	test_expect_success "generate filter-$prefix/commit/" "
-- 
1.8.5.2

[PATCH 3/3] t0111: Check all arguments

[Jason]

Squashed and merged this series.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.zx2c4.com/pipermail/cgit/attachments/20140115/75b3cd13/attachment.html>