summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Sixt <j6t@kdbg.org>2014-03-21 22:07:17 +0100
committerJunio C Hamano <gitster@pobox.com>2014-03-21 15:02:36 -0700
commitdd4dc5c574c0849fef6855d9efdfae5dc9369f2d (patch)
tree47df3242d87a72e59e06975fbbd81bbe5a472933
parent2d08413ba1ce0a1940e97a5a8af5faf40ab8d178 (diff)
downloadgit-dd4dc5c574c0849fef6855d9efdfae5dc9369f2d.tar.gz
t4018: convert java pattern test to the new infrastructure
Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-xt/t4018-diff-funcname.sh4
-rw-r--r--t/t4018/java-class-member-function8
2 files changed, 8 insertions, 4 deletions
diff --git a/t/t4018-diff-funcname.sh b/t/t4018-diff-funcname.sh
index c94a5f49d2..008325f2a8 100755
--- a/t/t4018-diff-funcname.sh
+++ b/t/t4018-diff-funcname.sh
@@ -79,10 +79,6 @@ test_expect_success 'set up .gitattributes declaring drivers to test' '
EOF
'
-test_expect_success 'preset java pattern' '
- test_expect_funcname "public static void main("
-'
-
test_expect_success 'custom pattern' '
test_config diff.java.funcname "!static
!String
diff --git a/t/t4018/java-class-member-function b/t/t4018/java-class-member-function
new file mode 100644
index 0000000000..298bc7a71b
--- /dev/null
+++ b/t/t4018/java-class-member-function
@@ -0,0 +1,8 @@
+public class Beer
+{
+ int special;
+ public static void main(String RIGHT[])
+ {
+ System.out.print("ChangeMe");
+ }
+}