java: Fix optional arguments in calls.

This also adds tests.

3 files changed, 66 insertions, 2 deletions

diff --git a/java/Makefile.am b/java/Makefile.am
index 3ae11237..fe55ec25 100644
--- a/java/Makefile.am
+++ b/java/Makefile.am
@@ -40,7 +40,8 @@ java_sources = \
 java_tests = \
 	Bindtests.java \
 	t/GuestFS005Load.java \
-	t/GuestFS010Basic.java
+	t/GuestFS010Basic.java \
+	t/GuestFS080OptArgs.java
 
 EXTRA_DIST = \
 	$(java_sources) \
diff --git a/java/run-java-tests b/java/run-java-tests
index 64ce079b..a9fe957c 100755
--- a/java/run-java-tests
+++ b/java/run-java-tests
@@ -18,7 +18,7 @@
 
 set -e
 
-for f in t/*.class; do
+for f in $(ls -1 t/*.class | fgrep -v \$); do
   classname=$(basename $f .class)
   $JAVA -Djava.library.path=.libs -ea $classname
 done
\ No newline at end of file
diff --git a/java/t/GuestFS080OptArgs.java b/java/t/GuestFS080OptArgs.java
new file mode 100644
index 00000000..291a8c3e
--- /dev/null
+++ b/java/t/GuestFS080OptArgs.java
@@ -0,0 +1,63 @@
+/* libguestfs Java bindings
+ * Copyright (C) 2011 Red Hat Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+import java.io.*;
+import java.util.HashMap;
+import com.redhat.et.libguestfs.*;
+
+public class GuestFS080OptArgs
+{
+    public static void main (String[] argv)
+    {
+        try {
+            GuestFS g = new GuestFS ();
+
+            g.add_drive_opts ("/dev/null", null);
+
+            HashMap<String,Object> optargs;
+
+            optargs = new HashMap<String,Object>() {
+                {
+                    put ("readonly", Boolean.TRUE);
+                }
+            };
+            g.add_drive_opts ("/dev/null", optargs);
+
+            optargs = new HashMap<String,Object>() {
+                {
+                    put ("readonly", Boolean.TRUE);
+                    put ("format", "raw");
+                }
+            };
+            g.add_drive_opts ("/dev/null", optargs);
+
+            optargs = new HashMap<String,Object>() {
+                {
+                    put ("readonly", Boolean.TRUE);
+                    put ("format", "raw");
+                    put ("iface", "virtio");
+                }
+            };
+            g.add_drive_opts ("/dev/null", optargs);
+        }
+        catch (Exception exn) {
+            System.err.println (exn);
+            System.exit (1);
+        }
+    }
+}