tests: Rename test0* functions as internal_test*.

The internal_* prefix is reserved for internal functions
such as these tests.

4 files changed, 39 insertions, 36 deletions

diff --git a/gobject/Makefile.am b/gobject/Makefile.am
index 2d5c2a65..deaf5432 100644
--- a/gobject/Makefile.am
+++ b/gobject/Makefile.am
@@ -41,6 +41,9 @@ EXTRA_DIST = \
 CLEANFILES = \
 	guestfs-gobject*.c *.o *.lo
 
+# Remove old test0 API files.
+CLEANFILES += src/optargs-test0.c include/guestfs-gobject/optargs-test0.h
+
 libname = libguestfs-gobject-1.0.la
 
 lib_LTLIBRARIES = $(libname)
diff --git a/gobject/Makefile.inc b/gobject/Makefile.inc
index 056c5f52..e84236d4 100644
--- a/gobject/Makefile.inc
+++ b/gobject/Makefile.inc
@@ -38,7 +38,7 @@ guestfs_gobject_headers= \
   include/guestfs-gobject/struct-isoinfo.h \
   include/guestfs-gobject/struct-mdstat.h \
   include/guestfs-gobject/struct-btrfssubvolume.h \
-  include/guestfs-gobject/optargs-test0.h \
+  include/guestfs-gobject/optargs-internal_test.h \
   include/guestfs-gobject/optargs-add_drive_opts.h \
   include/guestfs-gobject/optargs-add_domain.h \
   include/guestfs-gobject/optargs-inspect_get_icon.h \
@@ -82,7 +82,7 @@ guestfs_gobject_sources= \
   src/struct-isoinfo.c \
   src/struct-mdstat.c \
   src/struct-btrfssubvolume.c \
-  src/optargs-test0.c \
+  src/optargs-internal_test.c \
   src/optargs-add_drive_opts.c \
   src/optargs-add_domain.c \
   src/optargs-inspect_get_icon.c \
diff --git a/gobject/bindtests-manual.js b/gobject/bindtests-manual.js
index 8f4ef152..d7bbe5fd 100644
--- a/gobject/bindtests-manual.js
+++ b/gobject/bindtests-manual.js
@@ -47,64 +47,64 @@ var g = new Guestfs.Session();
 var v;
 var eq;
 
-v = g.test0rint('1');
-v == 1 || eq_fail('test0rint', v);
-check_error('test0rinterr');
+v = g.internal_test_rint('1');
+v == 1 || eq_fail('internal_test_rint', v);
+check_error('internal_test_rinterr');
 
-v = g.test0rint64('1');
-v == 1 || eq_fail('test0rint64', v);
-check_error('test0rint64err');
+v = g.internal_test_rint64('1');
+v == 1 || eq_fail('internal_test_rint64', v);
+check_error('internal_test_rint64err');
 
-v = g.test0rbool('true');
-v == 1 || eq_fail('test0rbool', v);
-check_error('test0rboolerr');
+v = g.internal_test_rbool('true');
+v == 1 || eq_fail('internal_test_rbool', v);
+check_error('internal_test_rboolerr');
 
-v = g.test0rconststring('1');
-v == 'static string' || eq_fail('test0rconststring', v);
-check_error('test0rconststringerr');
+v = g.internal_test_rconststring('1');
+v == 'static string' || eq_fail('internal_test_rconststring', v);
+check_error('internal_test_rconststringerr');
 
-v = g.test0rconstoptstring('1');
-v == 'static string' || eq_fail('test0rconstoptstring', v);
-//check_error('test0rconstoptstringerr');
+v = g.internal_test_rconstoptstring('1');
+v == 'static string' || eq_fail('internal_test_rconstoptstring', v);
+//check_error('internal_test_rconstoptstringerr');
 
-v = g.test0rstring('string');
-v == 'string' || eq_fail('test0rstring', v);
-check_error('test0rstringerr');
+v = g.internal_test_rstring('string');
+v == 'string' || eq_fail('internal_test_rstring', v);
+check_error('internal_test_rstringerr');
 
-v = g.test0rstringlist('5');
+v = g.internal_test_rstringlist('5');
 eq = v.length == 5;
 for (var i = 0; eq && i < 5; i++) {
   if (v[i] != i) eq = false;
 }
-eq || eq_fail('test0rstringlist', v.join(' '));
-check_error('test0rstringlisterr');
+eq || eq_fail('internal_test_rstringlist', v.join(' '));
+check_error('internal_test_rstringlisterr');
 
-v = g.test0rstruct('1');
-v.pv_size == 0 || eq_fail('test0rstruct', v);
-check_error('test0rstructerr');
+v = g.internal_test_rstruct('1');
+v.pv_size == 0 || eq_fail('internal_test_rstruct', v);
+check_error('internal_test_rstructerr');
 
-v = g.test0rstructlist('5');
+v = g.internal_test_rstructlist('5');
 eq = v.length == 5;
 for (var i = 0; eq && i < 5; i++) {
   if (v[i].pv_size != i) eq = false;
 }
-eq || eq_fail('test0rstructlist', v);
-check_error('test0rstructlisterr');
+eq || eq_fail('internal_test_rstructlist', v);
+check_error('internal_test_rstructlisterr');
 
-v = g.test0rhashtable('5');
+v = g.internal_test_rhashtable('5');
 eq = true;
 for (var i = 0; eq && i < 5; i++) {
   if (v[i] != i) eq = false;
 }
-eq || eq_fail('test0rhashtable', v);
-check_error('test0rhashtableerr');
+eq || eq_fail('internal_test_rhashtable', v);
+check_error('internal_test_rhashtableerr');
 
-v = g.test0rbufferout("01234");
+v = g.internal_test_rbufferout("01234");
 eq = v.length == 5;
 for (var i = 0; i < v.length; i++) {
   if (v[i] != 48 + i) eq = false; // 48 = ascii '0'
 }
-eq || eq_fail('test0rbufferout', v);
-check_error('test0rbufferouterr');
+eq || eq_fail('internal_test_rbufferout', v);
+check_error('internal_test_rbufferouterr');
 
 fail ? 1 : 0;
diff --git a/gobject/tests-misc.js b/gobject/tests-misc.js
index 8faf8a80..058a6955 100644
--- a/gobject/tests-misc.js
+++ b/gobject/tests-misc.js
@@ -58,7 +58,7 @@ if (!progress_detected) {
 g.close();
 var threw = false;
 try {
-  var v = g.test0rconstoptstring('1');
+  var v = g.internal_test_rconstoptstring('1');
 } catch (error) {
   threw = true;
   if (!error.message.match(/closed/)) {