From aba7cad7dfbb12fe4e21f9388cf4e50b47117cfb Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 30 Nov 2010 14:06:27 +0000 Subject: java: Combine tests to reduce number of launches. --- java/Makefile.am | 3 +-- java/t/GuestFS010Basic.java | 54 +++++++++++++++++++++++++++++++++++++++++ java/t/GuestFS010Launch.java | 41 ------------------------------- java/t/GuestFS050LVCreate.java | 55 ------------------------------------------ 4 files changed, 55 insertions(+), 98 deletions(-) create mode 100644 java/t/GuestFS010Basic.java delete mode 100644 java/t/GuestFS010Launch.java delete mode 100644 java/t/GuestFS050LVCreate.java (limited to 'java') 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/GuestFS010Basic.java b/java/t/GuestFS010Basic.java new file mode 100644 index 00000000..f4778dc0 --- /dev/null +++ b/java/t/GuestFS010Basic.java @@ -0,0 +1,54 @@ +/* libguestfs Java bindings + * 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 + * 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 GuestFS010Basic +{ + public static void main (String[] argv) + { + try { + 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 (); + + g.pvcreate ("/dev/sda"); + g.vgcreate ("VG", new String[] {"/dev/sda"}); + g.lvcreate ("LV1", "VG", 200); + g.lvcreate ("LV2", "VG", 200); + + String[] lvs = g.lvs (); + assert lvs[0].equals ("/dev/VG/LV1"); + assert lvs[1].equals ("/dev/VG/LV2"); + + g.close (); + + File f2 = new File ("test.img"); + f2.delete (); + } + catch (Exception exn) { + System.err.println (exn); + System.exit (1); + } + } +} 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); - } - } -} diff --git a/java/t/GuestFS050LVCreate.java b/java/t/GuestFS050LVCreate.java deleted file mode 100644 index 940239a6..00000000 --- a/java/t/GuestFS050LVCreate.java +++ /dev/null @@ -1,55 +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 GuestFS050LVCreate { - 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.pvcreate ("/dev/sda"); - g.vgcreate ("VG", new String[] {"/dev/sda"}); - g.lvcreate ("LV1", "VG", 200); - g.lvcreate ("LV2", "VG", 200); - - String[] lvs = g.lvs (); - assert lvs[0].equals ("/dev/VG/LV1"); - assert lvs[1].equals ("/dev/VG/LV2"); - - g.sync (); - g.close (); - - File f2 = new File ("test.img"); - f2.delete (); - } - catch (Exception exn) { - System.err.println (exn); - System.exit (1); - } - } -} -- cgit