java: Combine tests to reduce number of launches.

3 files changed, 5 insertions, 48 deletions

diff --git a/java/Makefile.am b/java/Makefile.am
index abd11ee0..3a64b0eb 100644
--- a/java/Makefile.am
+++ b/java/Makefile.am
@@ -40,8 +40,7 @@ java_sources = \
 java_tests = \
 	Bindtests.java \
 	t/GuestFS005Load.java \
-	t/GuestFS010Launch.java \
-	t/GuestFS050LVCreate.java
+	t/GuestFS010Basic.java
 
 EXTRA_DIST = \
 	$(java_sources) \
diff --git a/java/t/GuestFS050LVCreate.java b/java/t/GuestFS010Basic.java
index 940239a6..f4778dc0 100644
--- a/java/t/GuestFS050LVCreate.java
+++ b/java/t/GuestFS010Basic.java
@@ -1,5 +1,5 @@
 /* libguestfs Java bindings
- * Copyright (C) 2009 Red Hat Inc.
+ * Copyright (C) 2009-2010 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
@@ -19,16 +19,16 @@
 import java.io.*;
 import com.redhat.et.libguestfs.*;
 
-public class GuestFS050LVCreate {
+public class GuestFS010Basic
+{
     public static void main (String[] argv)
     {
         try {
-            GuestFS g = new GuestFS ();
-
             RandomAccessFile f = new RandomAccessFile ("test.img", "rw");
             f.setLength (500 * 1024 * 1024);
             f.close ();
 
+            GuestFS g = new GuestFS ();
             g.add_drive ("test.img");
             g.launch ();
 
@@ -41,7 +41,6 @@ public class GuestFS050LVCreate {
             assert lvs[0].equals ("/dev/VG/LV1");
             assert lvs[1].equals ("/dev/VG/LV2");
 
-            g.sync ();
             g.close ();
 
             File f2 = new File ("test.img");
diff --git a/java/t/GuestFS010Launch.java b/java/t/GuestFS010Launch.java
deleted file mode 100644
index ad0665b9..00000000
--- a/java/t/GuestFS010Launch.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/* libguestfs Java bindings
- * Copyright (C) 2009 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 com.redhat.et.libguestfs.*;
-
-public class GuestFS010Launch {
-    public static void main (String[] argv)
-    {
-        try {
-            GuestFS g = new GuestFS ();
-            RandomAccessFile f = new RandomAccessFile ("test.img", "rw");
-            f.setLength (500 * 1024 * 1024);
-            f.close ();
-            g.add_drive ("test.img");
-            g.launch ();
-            g.close ();
-            File f2 = new File ("test.img");
-            f2.delete ();
-        }
-        catch (Exception exn) {
-            System.err.println (exn);
-            System.exit (1);
-        }
-    }
-}