From 050fb91d40ea0cdc84b3118d9f26f93cadfa21c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Sat, 30 Jan 2010 12:25:13 +0200
Subject: [PATCH] (testsuite) Add some java classpath tests.

---
 test/fixtures/java/a/b$c.class    |   0
 test/fixtures/java/a/b.class      |   0
 test/fixtures/java/a/c/README.txt |   2 ++
 test/fixtures/java/a/c/d.class    |   0
 test/fixtures/java/a/d.txt        |   0
 test/fixtures/java/bashcomp.jar   | Bin 0 -> 788 bytes
 test/lib/completions/java.exp     |  20 ++++++++++++++++++++
 7 files changed, 22 insertions(+)
 create mode 100644 test/fixtures/java/a/b$c.class
 create mode 100644 test/fixtures/java/a/b.class
 create mode 100644 test/fixtures/java/a/c/README.txt
 create mode 100644 test/fixtures/java/a/c/d.class
 create mode 100644 test/fixtures/java/a/d.txt
 create mode 100644 test/fixtures/java/bashcomp.jar

diff --git a/test/fixtures/java/a/b$c.class b/test/fixtures/java/a/b$c.class
new file mode 100644
index 00000000..e69de29b
diff --git a/test/fixtures/java/a/b.class b/test/fixtures/java/a/b.class
new file mode 100644
index 00000000..e69de29b
diff --git a/test/fixtures/java/a/c/README.txt b/test/fixtures/java/a/c/README.txt
new file mode 100644
index 00000000..e5e6d0b3
--- /dev/null
+++ b/test/fixtures/java/a/c/README.txt
@@ -0,0 +1,2 @@
+When CLASSPATH is set to the fixtures/java/a dir, we do *not* expect
+*.class in subdirs to be included in completions, see Debian bug #496828.
diff --git a/test/fixtures/java/a/c/d.class b/test/fixtures/java/a/c/d.class
new file mode 100644
index 00000000..e69de29b
diff --git a/test/fixtures/java/a/d.txt b/test/fixtures/java/a/d.txt
new file mode 100644
index 00000000..e69de29b
diff --git a/test/fixtures/java/bashcomp.jar b/test/fixtures/java/bashcomp.jar
new file mode 100644
index 0000000000000000000000000000000000000000..d9c27799857a542a3bc0aea3c32a59daba52d073
GIT binary patch
literal 788
zcmWIWW@Zs#-~dA9I6E5#B*4kQ!r<!~;;8HC=cfPf6axb@Lx49s2S^1IR9OH{%_2Y*
zaLvAsex7cw!6ACSZl8V6oc8h7)w{^+t*dqJ%=yhh23L$9JT21m^40P5y;!=6g>%MB
z$s^Jl87$MEY5qu46MrfmE;fD1GcoOoXR5C=KNWo}Vg$Q`ch~<QH=r#b3~~n-*iFo6
zp5OzDmgE=Yq?V=T=q2YQ78fJb3ZSXw1gcF+EY3*I&n?hLDC0y^CW@>qE3v33HHDDL
zQpj2|^YT)QRKRY5>0@LPVL*)pSO|k60TsYQ6%-`_-l$rU0|gWX2w)3j!nGnr2*?C3
z2Hb&%FySbWi5`>)z1RX1q4y(@i4?R5ZP)@Ap-qAjNgHZVBaA?|85GzE;EikqmY`>4
R1F2;L!fK$(W*}x@0072>h{FH?

literal 0
HcmV?d00001

diff --git a/test/lib/completions/java.exp b/test/lib/completions/java.exp
index f14d84ad..bc0b4815 100644
--- a/test/lib/completions/java.exp
+++ b/test/lib/completions/java.exp
@@ -1,4 +1,5 @@
 proc setup {} {
+    assert_bash_exec {CLASSPATH=$TESTDIR/fixtures/java/a:$TESTDIR/fixtures/java/bashcomp.jar}
     save_env
 }; # setup()
 
@@ -17,4 +18,23 @@ assert_complete_any "java -"
 sync_after_int
 
 
+assert_complete "b bashcomp.jarred toplevel" "java "
+
+
+sync_after_int
+
+
+assert_complete "bashcomp.jarred toplevel" \
+    "java -cp $TESTDIR/fixtures/java/bashcomp.jar "
+
+
+sync_after_int
+
+
+assert_no_complete "java -cp \"\" "
+
+
+sync_after_int
+
+
 teardown