tests: Move test coverage for app/ into a new executablesplit-tty

Signed-off-by: Simon McVittie <smcv@collabora.com>

4 files changed, 618 insertions, 569 deletions

diff --git a/tests/Makefile.am.inc b/tests/Makefile.am.inc
index 9018e275..728683e1 100644
--- a/tests/Makefile.am.inc
+++ b/tests/Makefile.am.inc
@@ -59,7 +59,7 @@ testlibrary_SOURCES = \
 	tests/testlibrary.c \
 	$(NULL)
 
-testcommon_CFLAGS = \
+testapp_CFLAGS = \
 	$(AM_CFLAGS) \
 	$(BASE_CFLAGS) \
 	$(OSTREE_CFLAGS) \
@@ -70,7 +70,7 @@ testcommon_CFLAGS = \
 	-I$(srcdir)/app \
 	-I$(builddir)/app \
 	$(NULL)
-testcommon_LDADD = \
+testapp_LDADD = \
 	$(AM_LDADD) \
 	$(BASE_LIBS) \
 	$(OSTREE_LIBS) \
@@ -81,6 +81,27 @@ testcommon_LDADD = \
 	libflatpak-common-base.la \
 	libglnx.la \
 	$(NULL)
+testapp_SOURCES = tests/testapp.c
+
+testcommon_CFLAGS = \
+	$(AM_CFLAGS) \
+	$(BASE_CFLAGS) \
+	$(OSTREE_CFLAGS) \
+	$(JSON_CFLAGS) \
+	$(APPSTREAM_CFLAGS) \
+	-DFLATPAK_COMPILATION \
+	-DLIBEXECDIR=\"$(libexecdir)\" \
+	$(NULL)
+testcommon_LDADD = \
+	$(AM_LDADD) \
+	$(BASE_LIBS) \
+	$(OSTREE_LIBS) \
+	$(JSON_LIBS) \
+	$(APPSTREAM_LIBS) \
+	libflatpak-common.la \
+	libflatpak-common-base.la \
+	libglnx.la \
+	$(NULL)
 testcommon_SOURCES = tests/testcommon.c
 
 test_context_CFLAGS = $(testcommon_CFLAGS)
@@ -280,6 +301,7 @@ test_programs = \
 	test-exports \
 	test-instance \
 	test-portal \
+	testapp \
 	testcommon \
 	testlibrary \
 	$(NULL)
diff --git a/tests/meson.build b/tests/meson.build
index 4e6f639d..aeff5362 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -81,6 +81,11 @@ libtestlib_dep = declare_dependency(
 )
 
 c_tests = [
+  ['testapp', {
+    'extra_dependencies' : [
+      libflatpak_app_dep,
+    ],
+  }],
   ['testcommon', {}],
   ['testlibrary', {
     'dependencies' : [
@@ -121,7 +126,6 @@ foreach testcase : c_tests
       base_deps,
       appstream_dep,
       json_glib_dep,
-      libflatpak_app_dep,
       libflatpak_common_dep,
       libflatpak_common_base_dep,
       libglnx_dep,
diff --git a/tests/testapp.c b/tests/testapp.c
new file mode 100644
index 00000000..f05215bf
--- /dev/null
+++ b/tests/testapp.c
@@ -0,0 +1,589 @@
+#include "config.h"
+
+#include <string.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+
+#include <glib.h>
+#include "flatpak.h"
+#include "flatpak-utils-private.h"
+#include "flatpak-appdata-private.h"
+#include "flatpak-builtins-utils.h"
+#include "flatpak-run-private.h"
+#include "flatpak-table-printer.h"
+#include "flatpak-tty-utils-private.h"
+#include "parse-datetime.h"
+
+static void
+test_fancy_output (void)
+{
+  if (!isatty (STDOUT_FILENO))
+    g_assert_false (flatpak_fancy_output ()); // no tty
+  else
+    g_assert_true (flatpak_fancy_output ()); // a tty
+  flatpak_enable_fancy_output ();
+  g_assert_true (flatpak_fancy_output ());
+  flatpak_disable_fancy_output ();
+  g_assert_false (flatpak_fancy_output ());
+}
+
+static GString *g_print_buffer;
+
+static void
+my_print_func (const char *string)
+{
+  g_string_append (g_print_buffer, string);
+}
+
+static void
+test_format_choices (void)
+{
+  GPrintFunc print_func;
+  const char *choices[] = { "one", "two", "three", NULL };
+  const char *many_choices[] = {
+    "one", "two", "three", "four", "five", "six",
+    "seven", "eight", "nine", "ten", "eleven",
+    NULL
+  };
+
+  g_assert_null (g_print_buffer);
+  g_print_buffer = g_string_new ("");
+  print_func = g_set_print_handler (my_print_func);
+
+  flatpak_format_choices (choices, "A prompt for %d choices:", 3);
+
+  g_assert_cmpstr (g_print_buffer->str, ==,
+                   "A prompt for 3 choices:\n\n"
+                   "   1) one\n"
+                   "   2) two\n"
+                   "   3) three\n"
+                   "\n");
+
+  g_string_truncate (g_print_buffer, 0);
+
+  flatpak_format_choices (many_choices, "A prompt for %d choices:", 11);
+  g_assert_cmpstr (g_print_buffer->str, ==,
+                   "A prompt for 11 choices:\n\n"
+                   "   1) one\n"
+                   "   2) two\n"
+                   "   3) three\n"
+                   "   4) four\n"
+                   "   5) five\n"
+                   "   6) six\n"
+                   "   7) seven\n"
+                   "   8) eight\n"
+                   "   9) nine\n"
+                   "  10) ten\n"
+                   "  11) eleven\n"
+                   "\n");
+
+  g_string_truncate (g_print_buffer, 0);
+
+  g_set_print_handler (print_func);
+  g_set_print_handler (print_func);
+  g_string_free (g_print_buffer, TRUE);
+  g_print_buffer = NULL;
+}
+
+static void
+test_yes_no_prompt (void)
+{
+  GPrintFunc print_func;
+  gboolean ret;
+
+  g_assert_null (g_print_buffer);
+  g_print_buffer = g_string_new ("");
+  print_func = g_set_print_handler (my_print_func);
+
+  /* not a tty, so flatpak_yes_no_prompt will auto-answer 'n' */
+  ret = flatpak_yes_no_prompt (TRUE, "Prompt %d ?", 1);
+  g_assert_false (ret);
+  g_assert_cmpstr (g_print_buffer->str, ==, "Prompt 1 ? [Y/n]: n\n");
+  g_string_truncate (g_print_buffer, 0);
+
+  ret = flatpak_yes_no_prompt (FALSE, "Prompt %d ?", 2);
+  g_assert_false (ret);
+  g_assert_cmpstr (g_print_buffer->str, ==, "Prompt 2 ? [y/n]: n\n");
+
+  g_set_print_handler (print_func);
+  g_string_free (g_print_buffer, TRUE);
+  g_print_buffer = NULL;
+}
+
+static void
+test_number_prompt (void)
+{
+  GPrintFunc print_func;
+  gboolean ret;
+
+  g_assert_null (g_print_buffer);
+  g_print_buffer = g_string_new ("");
+  print_func = g_set_print_handler (my_print_func);
+
+  /* not a tty, so flatpak_number_prompt will auto-answer '0' */
+  ret = flatpak_number_prompt (TRUE, 0, 8, "Prompt %d ?", 1);
+  g_assert_false (ret);
+  g_assert_cmpstr (g_print_buffer->str, ==, "Prompt 1 ? [0-8]: 0\n");
+  g_string_truncate (g_print_buffer, 0);
+
+  ret = flatpak_number_prompt (FALSE, 1, 3, "Prompt %d ?", 2);
+  g_assert_false (ret);
+  g_assert_cmpstr (g_print_buffer->str, ==, "Prompt 2 ? [1-3]: 0\n");
+
+  g_set_print_handler (print_func);
+  g_string_free (g_print_buffer, TRUE);
+  g_print_buffer = NULL;
+}
+
+static void
+assert_numbers (int *num, ...)
+{
+  va_list args;
+  int n;
+  int i;
+
+  g_assert_nonnull (num);
+
+  va_start (args, num);
+  for (i = 0; num[i]; i++)
+    {
+      n = va_arg (args, int);
+      g_assert_true (n == num[i]);
+    }
+
+  n = va_arg (args, int);
+  g_assert_true (n == 0);
+  va_end (args);
+}
+
+static void
+test_parse_numbers (void)
+{
+  g_autofree int *numbers = NULL;
+
+  numbers = flatpak_parse_numbers ("", 0, 10);
+  assert_numbers (numbers, 0);
+  g_clear_pointer (&numbers, g_free);
+
+  numbers = flatpak_parse_numbers ("1", 0, 10);
+  assert_numbers (numbers, 1, 0);
+  g_clear_pointer (&numbers, g_free);
+
+  numbers = flatpak_parse_numbers ("1 3 2", 0, 10);
+  assert_numbers (numbers, 1, 3, 2, 0);
+  g_clear_pointer (&numbers, g_free);
+
+  numbers = flatpak_parse_numbers ("1-3", 0, 10);
+  assert_numbers (numbers, 1, 2, 3, 0);
+  g_clear_pointer (&numbers, g_free);
+
+  numbers = flatpak_parse_numbers ("1", 2, 4);
+  g_assert_null (numbers);
+
+  numbers = flatpak_parse_numbers ("2-6", 2, 4);
+  g_assert_null (numbers);
+
+  numbers = flatpak_parse_numbers ("1,2 2", 1, 4);
+  assert_numbers (numbers, 1, 2, 0);
+  g_clear_pointer (&numbers, g_free);
+
+  numbers = flatpak_parse_numbers ("1-3,2-4", 1, 4);
+  assert_numbers (numbers, 1, 2, 3, 4, 0);
+  g_clear_pointer (&numbers, g_free);
+
+  numbers = flatpak_parse_numbers ("-1", 1, 4);
+  g_assert_null (numbers);
+}
+
+static void
+test_looks_like_branch (void)
+{
+  g_assert_false (looks_like_branch ("abc/d"));
+  g_assert_false (looks_like_branch ("ab.c.d"));
+  g_assert_true (looks_like_branch ("master"));
+  g_assert_true (looks_like_branch ("stable"));
+  g_assert_true (looks_like_branch ("3.30"));
+}
+
+static void
+test_columns (void)
+{
+  Column columns[] = {
+    { "column1", "col1", "col1",       0, 0, 1, 1 },
+    { "install", "install", "install", 0, 0, 0, 1 },
+    { "helper", "helper", "helper",    0, 0, 1, 0 },
+    { "column2", "col2", "col2",       0, 0, 0, 0 },
+    { NULL, }
+  };
+  Column *cols;
+  g_autofree char *help = NULL;
+  g_autoptr(GError) error = NULL;
+  const char *args[3];
+
+  help = column_help (columns);
+  g_assert_cmpstr (help, ==,
+                   "Available columns:\n"
+                   "  column1     col1\n"
+                   "  install     install\n"
+                   "  helper      helper\n"
+                   "  column2     col2\n"
+                   "  all         Show all columns\n"
+                   "  help        Show available columns\n"
+                   "\n"
+                   "Append :s[tart], :m[iddle], :e[nd] or :f[ull] to change ellipsization\n");
+
+  cols = handle_column_args (columns, FALSE, NULL, &error);
+  g_assert_no_error (error);
+  g_assert_cmpstr (cols[0].name, ==, "column1");
+  g_assert_cmpstr (cols[1].name, ==, "install");
+  g_assert_null (cols[2].name);
+  g_free (cols);
+
+  cols = handle_column_args (columns, TRUE, NULL, &error);
+  g_assert_no_error (error);
+  g_assert_cmpstr (cols[0].name, ==, "column1");
+  g_assert_cmpstr (cols[1].name, ==, "install");
+  g_assert_cmpstr (cols[2].name, ==, "helper");
+  g_assert_null (cols[3].name);
+  g_free (cols);
+
+  args[0] = "all";
+  args[1] = NULL;
+  cols = handle_column_args (columns, FALSE, args, &error);
+  g_assert_no_error (error);
+  g_assert_cmpstr (cols[0].name, ==, "column1");
+  g_assert_cmpstr (cols[1].name, ==, "install");
+  g_assert_cmpstr (cols[2].name, ==, "helper");
+  g_assert_null (cols[3].name);
+  g_free (cols);
+
+  args[0] = "column1,column2";
+  args[1] = "helper";
+  args[2] = NULL;
+  cols = handle_column_args (columns, FALSE, args, &error);
+  g_assert_no_error (error);
+  g_assert_cmpstr (cols[0].name, ==, "column1");
+  g_assert_cmpstr (cols[1].name, ==, "column2");
+  g_assert_cmpstr (cols[2].name, ==, "helper");
+  g_assert_null (cols[3].name);
+  g_free (cols);
+
+  args[0] = "column";
+  args[1] = NULL;
+  cols = handle_column_args (columns, FALSE, args, &error);
+  g_assert_null (cols);
+  g_assert_error (error, G_IO_ERROR, G_IO_ERROR_FAILED);
+  g_clear_error (&error);
+
+  args[0] = "app";
+  args[1] = NULL;
+  cols = handle_column_args (columns, FALSE, args, &error);
+  g_assert_null (cols);
+  g_assert_error (error, G_IO_ERROR, G_IO_ERROR_FAILED);
+  g_clear_error (&error);
+}
+
+typedef struct
+{
+  const char          *in;
+  int                  len;
+  FlatpakEllipsizeMode mode;
+  const char          *out;
+} EllipsizeData;
+
+static EllipsizeData ellipsize[] = {
+  { "abcdefghijklmnopqrstuvwxyz", 10, FLATPAK_ELLIPSIZE_MODE_NONE,   "abcdefghijklmnopqrstuvwxyz" },
+  { "abcdefghijklmnopqrstuvwxyz", 10, FLATPAK_ELLIPSIZE_MODE_END,    "abcdefghi…" },
+  { "abcdefghijklmnopqrstuvwxyz", 10, FLATPAK_ELLIPSIZE_MODE_MIDDLE, "abcde…wxyz" },
+  { "abcdefghijklmnopqrstuvwxyz", 10, FLATPAK_ELLIPSIZE_MODE_START,  "…rstuvwxyz" },
+  { "ģ☢ab", 3, FLATPAK_ELLIPSIZE_MODE_START,  "…ab" },
+  { "ģ☢ab", 3, FLATPAK_ELLIPSIZE_MODE_MIDDLE, "ģ…b" },
+  { "ģ☢ab", 3, FLATPAK_ELLIPSIZE_MODE_END,    "ģ☢…" }
+};
+
+static void
+test_string_ellipsize (void)
+{
+  gsize idx;
+
+  for (idx = 0; idx < G_N_ELEMENTS (ellipsize); idx++)
+    {
+      EllipsizeData *data = &ellipsize[idx];
+      g_autofree char *ret = NULL;
+
+      ret = ellipsize_string_full (data->in, data->len, data->mode);
+      g_assert_cmpstr (ret, ==, data->out);
+    }
+}
+
+static void
+test_table (void)
+{
+  GPrintFunc print_func;
+  FlatpakTablePrinter *printer;
+
+  g_assert_null (g_print_buffer);
+  g_print_buffer = g_string_new ("");
+  print_func = g_set_print_handler (my_print_func);
+  flatpak_enable_fancy_output ();
+
+  printer = flatpak_table_printer_new ();
+
+  flatpak_table_printer_set_column_title (printer, 0, "Column1");
+  flatpak_table_printer_set_column_title (printer, 1, "Column2");
+
+  flatpak_table_printer_add_column (printer, "text1");
+  flatpak_table_printer_add_column (printer, "text2");
+  flatpak_table_printer_finish_row (printer);
+
+  flatpak_table_printer_add_column (printer, "text3");
+  flatpak_table_printer_add_column (printer, "text4");
+  flatpak_table_printer_finish_row (printer);
+
+  flatpak_table_printer_print (printer);
+  g_assert_cmpstr (g_print_buffer->str, ==,
+                   FLATPAK_ANSI_BOLD_ON
+                   "Column1 Column2" FLATPAK_ANSI_BOLD_OFF "\n"
+                   "text1   text2\n"
+                   "text3   text4\n");
+  g_string_truncate (g_print_buffer, 0);
+
+  flatpak_table_printer_set_cell (printer, 0, 0, "newtext1");
+  flatpak_table_printer_set_decimal_cell (printer, 0, 1, "0.123");
+  flatpak_table_printer_set_decimal_cell (printer, 1, 1, "123.0");
+  flatpak_table_printer_print (printer);
+  g_assert_cmpstr (g_print_buffer->str, ==,
+                   FLATPAK_ANSI_BOLD_ON
+                   "Column1  Column2" FLATPAK_ANSI_BOLD_OFF "\n"
+                   "newtext1   0.123\n"
+                   "text3    123.0\n");
+  g_string_truncate (g_print_buffer, 0);
+
+  flatpak_table_printer_free (printer);
+
+  flatpak_disable_fancy_output ();
+  g_set_print_handler (print_func);
+  g_string_free (g_print_buffer, TRUE);
+  g_print_buffer = NULL;
+}
+
+static void
+test_table_expand (void)
+{
+  GPrintFunc print_func;
+  FlatpakTablePrinter *printer;
+  int rows, cols;
+
+  g_assert_null (g_print_buffer);
+  g_print_buffer = g_string_new ("");
+  print_func = g_set_print_handler (my_print_func);
+  flatpak_enable_fancy_output ();
+
+  printer = flatpak_table_printer_new ();
+
+  flatpak_table_printer_set_column_title (printer, 0, "Column1");
+  flatpak_table_printer_set_column_title (printer, 1, "Column2");
+  flatpak_table_printer_set_column_title (printer, 2, "Column3");
+
+  flatpak_table_printer_add_column (printer, "text1");
+  flatpak_table_printer_add_column (printer, "text2");
+  flatpak_table_printer_add_column (printer, "text3");
+  flatpak_table_printer_finish_row (printer);
+  flatpak_table_printer_add_span (printer, "012345678901234567890234567890123456789");
+  flatpak_table_printer_finish_row (printer);
+
+  flatpak_table_printer_set_column_expand (printer, 0, TRUE);
+
+  flatpak_table_printer_print_full (printer, 0, 40, &rows, &cols);
+
+  g_assert_cmpint (rows, ==, 3);
+  g_assert_cmpint (cols, ==, 34);
+  g_assert_cmpstr (g_print_buffer->str, ==,
+                   FLATPAK_ANSI_BOLD_ON
+                   "Column1            Column2 Column3" FLATPAK_ANSI_BOLD_OFF "\n"
+                   "text1              text2   text3" "\n"
+                   "012345678901234567890234567890123456789");
+  g_string_truncate (g_print_buffer, 0);
+
+  flatpak_table_printer_set_column_expand (printer, 2, TRUE);
+
+  flatpak_table_printer_print_full (printer, 0, 40, &rows, &cols);
+
+  g_assert_cmpint (rows, ==, 3);
+  g_assert_cmpint (cols, ==, 34);
+  g_assert_cmpstr (g_print_buffer->str, ==,
+                   FLATPAK_ANSI_BOLD_ON
+                   "Column1       Column2 Column3" FLATPAK_ANSI_BOLD_OFF "\n"
+                   "text1         text2   text3" "\n"
+                   "012345678901234567890234567890123456789");
+  g_string_truncate (g_print_buffer, 0);
+
+  flatpak_table_printer_free (printer);
+
+  flatpak_disable_fancy_output ();
+  g_set_print_handler (print_func);
+  g_string_free (g_print_buffer, TRUE);
+  g_print_buffer = NULL;
+}
+
+static void
+test_table_shrink (void)
+{
+  GPrintFunc print_func;
+  FlatpakTablePrinter *printer;
+  int rows, cols;
+
+  g_assert_null (g_print_buffer);
+  g_print_buffer = g_string_new ("");
+  print_func = g_set_print_handler (my_print_func);
+  flatpak_enable_fancy_output ();
+
+  printer = flatpak_table_printer_new ();
+
+  flatpak_table_printer_set_column_title (printer, 0, "Column1");
+  flatpak_table_printer_set_column_title (printer, 1, "Column2");
+  flatpak_table_printer_set_column_title (printer, 2, "Column3");
+
+  flatpak_table_printer_add_column (printer, "a very long text");
+  flatpak_table_printer_add_column (printer, "text2");
+  flatpak_table_printer_add_column (printer, "long text too");
+  flatpak_table_printer_finish_row (printer);
+
+  flatpak_table_printer_add_column (printer, "short");
+  flatpak_table_printer_add_column (printer, "short");
+  flatpak_table_printer_add_column (printer, "short");
+  flatpak_table_printer_finish_row (printer);
+
+  flatpak_table_printer_add_span (printer, "0123456789012345678902345");
+  flatpak_table_printer_finish_row (printer);
+
+  flatpak_table_printer_set_column_ellipsize (printer, 0, FLATPAK_ELLIPSIZE_MODE_END);
+
+  flatpak_table_printer_print_full (printer, 0, 25, &rows, &cols);
+
+  g_assert_cmpint (rows, ==, 4);
+  g_assert_cmpint (cols, ==, 25);
+  g_assert_cmpstr (g_print_buffer->str, ==,
+                   FLATPAK_ANSI_BOLD_ON
+                   "Co… Column2 Column3" FLATPAK_ANSI_BOLD_OFF "\n"
+                   "a … text2   long text too" "\n"
+                   "sh… short   short" "\n"
+                   "0123456789012345678902345");
+  g_string_truncate (g_print_buffer, 0);
+
+  flatpak_table_printer_set_column_ellipsize (printer, 2, FLATPAK_ELLIPSIZE_MODE_MIDDLE);
+
+  flatpak_table_printer_print_full (printer, 0, 25, &rows, &cols);
+
+  g_assert_cmpint (rows, ==, 4);
+  g_assert_cmpint (cols, ==, 25);
+  g_assert_cmpstr (g_print_buffer->str, ==,
+                   FLATPAK_ANSI_BOLD_ON
+                   "Column1  Column2 Column3" FLATPAK_ANSI_BOLD_OFF "\n"
+                   "a very … text2   long…too" "\n"
+                   "short    short   short" "\n"
+                                                                                                                         "0123456789012345678902345");
+  g_string_truncate (g_print_buffer, 0);
+
+  flatpak_table_printer_free (printer);
+
+  flatpak_disable_fancy_output ();
+  g_set_print_handler (print_func);
+  g_string_free (g_print_buffer, TRUE);
+  g_print_buffer = NULL;
+}
+
+static void
+test_table_shrink_more (void)
+{
+  GPrintFunc print_func;
+  FlatpakTablePrinter *printer;
+  int rows, cols;
+
+  g_assert_null (g_print_buffer);
+  g_print_buffer = g_string_new ("");
+  print_func = g_set_print_handler (my_print_func);
+  flatpak_enable_fancy_output ();
+
+  printer = flatpak_table_printer_new ();
+
+  flatpak_table_printer_set_column_title (printer, 0, "Column1");
+  flatpak_table_printer_set_column_title (printer, 1, "Column2");
+  flatpak_table_printer_set_column_title (printer, 2, "Column3");
+
+  flatpak_table_printer_add_column (printer, "a very long text");
+  flatpak_table_printer_add_column (printer, "midsize text");
+  flatpak_table_printer_add_column (printer, "another very long text");
+  flatpak_table_printer_finish_row (printer);
+
+  flatpak_table_printer_set_column_ellipsize (printer, 1, FLATPAK_ELLIPSIZE_MODE_END);
+
+  flatpak_table_printer_print_full (printer, 0, 25, &rows, &cols);
+
+  g_assert_cmpint (rows, ==, 4);
+  g_assert_cmpint (cols, ==, 40);
+  g_assert_cmpstr (g_print_buffer->str, ==,
+                   FLATPAK_ANSI_BOLD_ON
+                   "Column1          … Column3" FLATPAK_ANSI_BOLD_OFF "\n"
+                   "a very long text … another very long text");
+
+  flatpak_table_printer_free (printer);
+
+  flatpak_disable_fancy_output ();
+  g_set_print_handler (print_func);
+  g_string_free (g_print_buffer, TRUE);
+  g_print_buffer = NULL;
+}
+
+static void
+test_parse_datetime (void)
+{
+  struct timespec ts;
+  struct timespec now;
+  gboolean ret;
+  g_autoptr(GDateTime) dt = NULL;
+  GTimeVal tv;
+
+  clock_gettime (CLOCK_REALTIME, &now);
+  ret = parse_datetime (&ts, "NOW", NULL);
+  g_assert_true (ret);
+
+  g_assert_true (ts.tv_sec == now.tv_sec); // close enough
+
+  ret = parse_datetime (&ts, "2018-10-29 00:19:07 +0000", NULL);
+  g_assert_true (ret);
+  dt = g_date_time_new_utc (2018, 10, 29, 0, 19, 7);
+  g_date_time_to_timeval (dt, &tv);
+
+  g_assert_true (tv.tv_sec == ts.tv_sec &&
+                 tv.tv_usec == ts.tv_nsec / 1000);
+
+  ret = parse_datetime (&ts, "nonsense", NULL);
+  g_assert_false (ret);
+}
+
+int
+main (int argc, char *argv[])
+{
+  int res;
+
+  g_test_init (&argc, &argv, NULL);
+
+  g_test_add_func ("/app/columns", test_columns);
+  g_test_add_func ("/app/fancy-output", test_fancy_output);
+  g_test_add_func ("/app/format-choices", test_format_choices);
+  g_test_add_func ("/app/looks-like-branch", test_looks_like_branch);
+  g_test_add_func ("/app/number-prompt", test_number_prompt);
+  g_test_add_func ("/app/parse-datetime", test_parse_datetime);
+  g_test_add_func ("/app/parse-numbers", test_parse_numbers);
+  g_test_add_func ("/app/string-ellipsize", test_string_ellipsize);
+  g_test_add_func ("/app/table", test_table);
+  g_test_add_func ("/app/table-expand", test_table_expand);
+  g_test_add_func ("/app/table-shrink", test_table_shrink);
+  g_test_add_func ("/app/table-shrink-more", test_table_shrink_more);
+  g_test_add_func ("/app/yes-no-prompt", test_yes_no_prompt);
+
+  res = g_test_run ();
+
+  return res;
+}
diff --git a/tests/testcommon.c b/tests/testcommon.c
index 0545d29f..11a00769 100644
--- a/tests/testcommon.c
+++ b/tests/testcommon.c
@@ -8,12 +8,8 @@
 #include "flatpak.h"
 #include "flatpak-utils-private.h"
 #include "flatpak-appdata-private.h"
-#include "flatpak-builtins-utils.h"
 #include "flatpak-run-private.h"
 #include "flatpak-run-x11-private.h"
-#include "flatpak-table-printer.h"
-#include "flatpak-tty-utils-private.h"
-#include "parse-datetime.h"
 
 static void
 test_has_path_prefix (void)
@@ -35,19 +31,6 @@ test_path_match_prefix (void)
 }
 
 static void
-test_fancy_output (void)
-{
-  if (!isatty (STDOUT_FILENO))
-    g_assert_false (flatpak_fancy_output ()); // no tty
-  else
-    g_assert_true (flatpak_fancy_output ()); // a tty
-  flatpak_enable_fancy_output ();
-  g_assert_true (flatpak_fancy_output ());
-  flatpak_disable_fancy_output ();
-  g_assert_false (flatpak_fancy_output ());
-}
-
-static void
 test_arches (void)
 {
   const char **arches = flatpak_get_arches ();
@@ -597,174 +580,6 @@ test_levenshtein (void)
     }
 }
 
-static GString *g_print_buffer;
-
-static void
-my_print_func (const char *string)
-{
-  g_string_append (g_print_buffer, string);
-}
-
-static void
-test_format_choices (void)
-{
-  GPrintFunc print_func;
-  const char *choices[] = { "one", "two", "three", NULL };
-  const char *many_choices[] = {
-    "one", "two", "three", "four", "five", "six",
-    "seven", "eight", "nine", "ten", "eleven",
-    NULL
-  };
-
-  g_assert_null (g_print_buffer);
-  g_print_buffer = g_string_new ("");
-  print_func = g_set_print_handler (my_print_func);
-
-  flatpak_format_choices (choices, "A prompt for %d choices:", 3);
-
-  g_assert_cmpstr (g_print_buffer->str, ==,
-                   "A prompt for 3 choices:\n\n"
-                   "   1) one\n"
-                   "   2) two\n"
-                   "   3) three\n"
-                   "\n");
-
-  g_string_truncate (g_print_buffer, 0);
-
-  flatpak_format_choices (many_choices, "A prompt for %d choices:", 11);
-  g_assert_cmpstr (g_print_buffer->str, ==,
-                   "A prompt for 11 choices:\n\n"
-                   "   1) one\n"
-                   "   2) two\n"
-                   "   3) three\n"
-                   "   4) four\n"
-                   "   5) five\n"
-                   "   6) six\n"
-                   "   7) seven\n"
-                   "   8) eight\n"
-                   "   9) nine\n"
-                   "  10) ten\n"
-                   "  11) eleven\n"
-                   "\n");
-
-  g_string_truncate (g_print_buffer, 0);
-
-  g_set_print_handler (print_func);
-  g_set_print_handler (print_func);
-  g_string_free (g_print_buffer, TRUE);
-  g_print_buffer = NULL;
-}
-
-static void
-test_yes_no_prompt (void)
-{
-  GPrintFunc print_func;
-  gboolean ret;
-
-  g_assert_null (g_print_buffer);
-  g_print_buffer = g_string_new ("");
-  print_func = g_set_print_handler (my_print_func);
-
-  /* not a tty, so flatpak_yes_no_prompt will auto-answer 'n' */
-  ret = flatpak_yes_no_prompt (TRUE, "Prompt %d ?", 1);
-  g_assert_false (ret);
-  g_assert_cmpstr (g_print_buffer->str, ==, "Prompt 1 ? [Y/n]: n\n");
-  g_string_truncate (g_print_buffer, 0);
-
-  ret = flatpak_yes_no_prompt (FALSE, "Prompt %d ?", 2);
-  g_assert_false (ret);
-  g_assert_cmpstr (g_print_buffer->str, ==, "Prompt 2 ? [y/n]: n\n");
-
-  g_set_print_handler (print_func);
-  g_string_free (g_print_buffer, TRUE);
-  g_print_buffer = NULL;
-}
-
-static void
-test_number_prompt (void)
-{
-  GPrintFunc print_func;
-  gboolean ret;
-
-  g_assert_null (g_print_buffer);
-  g_print_buffer = g_string_new ("");
-  print_func = g_set_print_handler (my_print_func);
-
-  /* not a tty, so flatpak_number_prompt will auto-answer '0' */
-  ret = flatpak_number_prompt (TRUE, 0, 8, "Prompt %d ?", 1);
-  g_assert_false (ret);
-  g_assert_cmpstr (g_print_buffer->str, ==, "Prompt 1 ? [0-8]: 0\n");
-  g_string_truncate (g_print_buffer, 0);
-
-  ret = flatpak_number_prompt (FALSE, 1, 3, "Prompt %d ?", 2);
-  g_assert_false (ret);
-  g_assert_cmpstr (g_print_buffer->str, ==, "Prompt 2 ? [1-3]: 0\n");
-
-  g_set_print_handler (print_func);
-  g_string_free (g_print_buffer, TRUE);
-  g_print_buffer = NULL;
-}
-
-static void
-assert_numbers (int *num, ...)
-{
-  va_list args;
-  int n;
-  int i;
-
-  g_assert_nonnull (num);
-
-  va_start (args, num);
-  for (i = 0; num[i]; i++)
-    {
-      n = va_arg (args, int);
-      g_assert_true (n == num[i]);
-    }
-
-  n = va_arg (args, int);
-  g_assert_true (n == 0);
-  va_end (args);
-}
-
-static void
-test_parse_numbers (void)
-{
-  g_autofree int *numbers = NULL;
-
-  numbers = flatpak_parse_numbers ("", 0, 10);
-  assert_numbers (numbers, 0);
-  g_clear_pointer (&numbers, g_free);
-
-  numbers = flatpak_parse_numbers ("1", 0, 10);
-  assert_numbers (numbers, 1, 0);
-  g_clear_pointer (&numbers, g_free);
-
-  numbers = flatpak_parse_numbers ("1 3 2", 0, 10);
-  assert_numbers (numbers, 1, 3, 2, 0);
-  g_clear_pointer (&numbers, g_free);
-
-  numbers = flatpak_parse_numbers ("1-3", 0, 10);
-  assert_numbers (numbers, 1, 2, 3, 0);
-  g_clear_pointer (&numbers, g_free);
-
-  numbers = flatpak_parse_numbers ("1", 2, 4);
-  g_assert_null (numbers);
-
-  numbers = flatpak_parse_numbers ("2-6", 2, 4);
-  g_assert_null (numbers);
-
-  numbers = flatpak_parse_numbers ("1,2 2", 1, 4);
-  assert_numbers (numbers, 1, 2, 0);
-  g_clear_pointer (&numbers, g_free);
-
-  numbers = flatpak_parse_numbers ("1-3,2-4", 1, 4);
-  assert_numbers (numbers, 1, 2, 3, 4, 0);
-  g_clear_pointer (&numbers, g_free);
-
-  numbers = flatpak_parse_numbers ("-1", 1, 4);
-  g_assert_null (numbers);
-}
-
 static void
 assert_strv_equal (char **strv1,
                    char **strv2)
@@ -998,373 +813,6 @@ test_name_matching (void)
   g_assert_true (res);
 }
 
-static void
-test_looks_like_branch (void)
-{
-  g_assert_false (looks_like_branch ("abc/d"));
-  g_assert_false (looks_like_branch ("ab.c.d"));
-  g_assert_true (looks_like_branch ("master"));
-  g_assert_true (looks_like_branch ("stable"));
-  g_assert_true (looks_like_branch ("3.30"));
-}
-
-static void
-test_columns (void)
-{
-  Column columns[] = {
-    { "column1", "col1", "col1",       0, 0, 1, 1 },
-    { "install", "install", "install", 0, 0, 0, 1 },
-    { "helper", "helper", "helper",    0, 0, 1, 0 },
-    { "column2", "col2", "col2",       0, 0, 0, 0 },
-    { NULL, }
-  };
-  Column *cols;
-  g_autofree char *help = NULL;
-  g_autoptr(GError) error = NULL;
-  const char *args[3];
-
-  help = column_help (columns);
-  g_assert_cmpstr (help, ==,
-                   "Available columns:\n"
-                   "  column1     col1\n"
-                   "  install     install\n"
-                   "  helper      helper\n"
-                   "  column2     col2\n"
-                   "  all         Show all columns\n"
-                   "  help        Show available columns\n"
-                   "\n"
-                   "Append :s[tart], :m[iddle], :e[nd] or :f[ull] to change ellipsization\n");
-
-  cols = handle_column_args (columns, FALSE, NULL, &error);
-  g_assert_no_error (error);
-  g_assert_cmpstr (cols[0].name, ==, "column1");
-  g_assert_cmpstr (cols[1].name, ==, "install");
-  g_assert_null (cols[2].name);
-  g_free (cols);
-
-  cols = handle_column_args (columns, TRUE, NULL, &error);
-  g_assert_no_error (error);
-  g_assert_cmpstr (cols[0].name, ==, "column1");
-  g_assert_cmpstr (cols[1].name, ==, "install");
-  g_assert_cmpstr (cols[2].name, ==, "helper");
-  g_assert_null (cols[3].name);
-  g_free (cols);
-
-  args[0] = "all";
-  args[1] = NULL;
-  cols = handle_column_args (columns, FALSE, args, &error);
-  g_assert_no_error (error);
-  g_assert_cmpstr (cols[0].name, ==, "column1");
-  g_assert_cmpstr (cols[1].name, ==, "install");
-  g_assert_cmpstr (cols[2].name, ==, "helper");
-  g_assert_null (cols[3].name);
-  g_free (cols);
-
-  args[0] = "column1,column2";
-  args[1] = "helper";
-  args[2] = NULL;
-  cols = handle_column_args (columns, FALSE, args, &error);
-  g_assert_no_error (error);
-  g_assert_cmpstr (cols[0].name, ==, "column1");
-  g_assert_cmpstr (cols[1].name, ==, "column2");
-  g_assert_cmpstr (cols[2].name, ==, "helper");
-  g_assert_null (cols[3].name);
-  g_free (cols);
-
-  args[0] = "column";
-  args[1] = NULL;
-  cols = handle_column_args (columns, FALSE, args, &error);
-  g_assert_null (cols);
-  g_assert_error (error, G_IO_ERROR, G_IO_ERROR_FAILED);
-  g_clear_error (&error);
-
-  args[0] = "app";
-  args[1] = NULL;
-  cols = handle_column_args (columns, FALSE, args, &error);
-  g_assert_null (cols);
-  g_assert_error (error, G_IO_ERROR, G_IO_ERROR_FAILED);
-  g_clear_error (&error);
-}
-
-typedef struct
-{
-  const char          *in;
-  int                  len;
-  FlatpakEllipsizeMode mode;
-  const char          *out;
-} EllipsizeData;
-
-static EllipsizeData ellipsize[] = {
-  { "abcdefghijklmnopqrstuvwxyz", 10, FLATPAK_ELLIPSIZE_MODE_NONE,   "abcdefghijklmnopqrstuvwxyz" },
-  { "abcdefghijklmnopqrstuvwxyz", 10, FLATPAK_ELLIPSIZE_MODE_END,    "abcdefghi…" },
-  { "abcdefghijklmnopqrstuvwxyz", 10, FLATPAK_ELLIPSIZE_MODE_MIDDLE, "abcde…wxyz" },
-  { "abcdefghijklmnopqrstuvwxyz", 10, FLATPAK_ELLIPSIZE_MODE_START,  "…rstuvwxyz" },
-  { "ģ☢ab", 3, FLATPAK_ELLIPSIZE_MODE_START,  "…ab" },
-  { "ģ☢ab", 3, FLATPAK_ELLIPSIZE_MODE_MIDDLE, "ģ…b" },
-  { "ģ☢ab", 3, FLATPAK_ELLIPSIZE_MODE_END,    "ģ☢…" }
-};
-
-static void
-test_string_ellipsize (void)
-{
-  gsize idx;
-
-  for (idx = 0; idx < G_N_ELEMENTS (ellipsize); idx++)
-    {
-      EllipsizeData *data = &ellipsize[idx];
-      g_autofree char *ret = NULL;
-
-      ret = ellipsize_string_full (data->in, data->len, data->mode);
-      g_assert_cmpstr (ret, ==, data->out);
-    }
-}
-
-static void
-test_table (void)
-{
-  GPrintFunc print_func;
-  FlatpakTablePrinter *printer;
-
-  g_assert_null (g_print_buffer);
-  g_print_buffer = g_string_new ("");
-  print_func = g_set_print_handler (my_print_func);
-  flatpak_enable_fancy_output ();
-
-  printer = flatpak_table_printer_new ();
-
-  flatpak_table_printer_set_column_title (printer, 0, "Column1");
-  flatpak_table_printer_set_column_title (printer, 1, "Column2");
-
-  flatpak_table_printer_add_column (printer, "text1");
-  flatpak_table_printer_add_column (printer, "text2");
-  flatpak_table_printer_finish_row (printer);
-
-  flatpak_table_printer_add_column (printer, "text3");
-  flatpak_table_printer_add_column (printer, "text4");
-  flatpak_table_printer_finish_row (printer);
-
-  flatpak_table_printer_print (printer);
-  g_assert_cmpstr (g_print_buffer->str, ==,
-                   FLATPAK_ANSI_BOLD_ON
-                   "Column1 Column2" FLATPAK_ANSI_BOLD_OFF "\n"
-                   "text1   text2\n"
-                   "text3   text4\n");
-  g_string_truncate (g_print_buffer, 0);
-
-  flatpak_table_printer_set_cell (printer, 0, 0, "newtext1");
-  flatpak_table_printer_set_decimal_cell (printer, 0, 1, "0.123");
-  flatpak_table_printer_set_decimal_cell (printer, 1, 1, "123.0");
-  flatpak_table_printer_print (printer);
-  g_assert_cmpstr (g_print_buffer->str, ==,
-                   FLATPAK_ANSI_BOLD_ON
-                   "Column1  Column2" FLATPAK_ANSI_BOLD_OFF "\n"
-                   "newtext1   0.123\n"
-                   "text3    123.0\n");
-  g_string_truncate (g_print_buffer, 0);
-
-  flatpak_table_printer_free (printer);
-
-  flatpak_disable_fancy_output ();
-  g_set_print_handler (print_func);
-  g_string_free (g_print_buffer, TRUE);
-  g_print_buffer = NULL;
-}
-
-static void
-test_table_expand (void)
-{
-  GPrintFunc print_func;
-  FlatpakTablePrinter *printer;
-  int rows, cols;
-
-  g_assert_null (g_print_buffer);
-  g_print_buffer = g_string_new ("");
-  print_func = g_set_print_handler (my_print_func);
-  flatpak_enable_fancy_output ();
-
-  printer = flatpak_table_printer_new ();
-
-  flatpak_table_printer_set_column_title (printer, 0, "Column1");
-  flatpak_table_printer_set_column_title (printer, 1, "Column2");
-  flatpak_table_printer_set_column_title (printer, 2, "Column3");
-
-  flatpak_table_printer_add_column (printer, "text1");
-  flatpak_table_printer_add_column (printer, "text2");
-  flatpak_table_printer_add_column (printer, "text3");
-  flatpak_table_printer_finish_row (printer);
-  flatpak_table_printer_add_span (printer, "012345678901234567890234567890123456789");
-  flatpak_table_printer_finish_row (printer);
-
-  flatpak_table_printer_set_column_expand (printer, 0, TRUE);
-
-  flatpak_table_printer_print_full (printer, 0, 40, &rows, &cols);
-
-  g_assert_cmpint (rows, ==, 3);
-  g_assert_cmpint (cols, ==, 34);
-  g_assert_cmpstr (g_print_buffer->str, ==,
-                   FLATPAK_ANSI_BOLD_ON
-                   "Column1            Column2 Column3" FLATPAK_ANSI_BOLD_OFF "\n"
-                   "text1              text2   text3" "\n"
-                   "012345678901234567890234567890123456789");
-  g_string_truncate (g_print_buffer, 0);
-
-  flatpak_table_printer_set_column_expand (printer, 2, TRUE);
-
-  flatpak_table_printer_print_full (printer, 0, 40, &rows, &cols);
-
-  g_assert_cmpint (rows, ==, 3);
-  g_assert_cmpint (cols, ==, 34);
-  g_assert_cmpstr (g_print_buffer->str, ==,
-                   FLATPAK_ANSI_BOLD_ON
-                   "Column1       Column2 Column3" FLATPAK_ANSI_BOLD_OFF "\n"
-                   "text1         text2   text3" "\n"
-                   "012345678901234567890234567890123456789");
-  g_string_truncate (g_print_buffer, 0);
-
-  flatpak_table_printer_free (printer);
-
-  flatpak_disable_fancy_output ();
-  g_set_print_handler (print_func);
-  g_string_free (g_print_buffer, TRUE);
-  g_print_buffer = NULL;
-}
-
-static void
-test_table_shrink (void)
-{
-  GPrintFunc print_func;
-  FlatpakTablePrinter *printer;
-  int rows, cols;
-
-  g_assert_null (g_print_buffer);
-  g_print_buffer = g_string_new ("");
-  print_func = g_set_print_handler (my_print_func);
-  flatpak_enable_fancy_output ();
-
-  printer = flatpak_table_printer_new ();
-
-  flatpak_table_printer_set_column_title (printer, 0, "Column1");
-  flatpak_table_printer_set_column_title (printer, 1, "Column2");
-  flatpak_table_printer_set_column_title (printer, 2, "Column3");
-
-  flatpak_table_printer_add_column (printer, "a very long text");
-  flatpak_table_printer_add_column (printer, "text2");
-  flatpak_table_printer_add_column (printer, "long text too");
-  flatpak_table_printer_finish_row (printer);
-
-  flatpak_table_printer_add_column (printer, "short");
-  flatpak_table_printer_add_column (printer, "short");
-  flatpak_table_printer_add_column (printer, "short");
-  flatpak_table_printer_finish_row (printer);
-
-  flatpak_table_printer_add_span (printer, "0123456789012345678902345");
-  flatpak_table_printer_finish_row (printer);
-
-  flatpak_table_printer_set_column_ellipsize (printer, 0, FLATPAK_ELLIPSIZE_MODE_END);
-
-  flatpak_table_printer_print_full (printer, 0, 25, &rows, &cols);
-
-  g_assert_cmpint (rows, ==, 4);
-  g_assert_cmpint (cols, ==, 25);
-  g_assert_cmpstr (g_print_buffer->str, ==,
-                   FLATPAK_ANSI_BOLD_ON
-                   "Co… Column2 Column3" FLATPAK_ANSI_BOLD_OFF "\n"
-                   "a … text2   long text too" "\n"
-                   "sh… short   short" "\n"
-                   "0123456789012345678902345");
-  g_string_truncate (g_print_buffer, 0);
-
-  flatpak_table_printer_set_column_ellipsize (printer, 2, FLATPAK_ELLIPSIZE_MODE_MIDDLE);
-
-  flatpak_table_printer_print_full (printer, 0, 25, &rows, &cols);
-
-  g_assert_cmpint (rows, ==, 4);
-  g_assert_cmpint (cols, ==, 25);
-  g_assert_cmpstr (g_print_buffer->str, ==,
-                   FLATPAK_ANSI_BOLD_ON
-                   "Column1  Column2 Column3" FLATPAK_ANSI_BOLD_OFF "\n"
-                   "a very … text2   long…too" "\n"
-                   "short    short   short" "\n"
-                                                                                                                         "0123456789012345678902345");
-  g_string_truncate (g_print_buffer, 0);
-
-  flatpak_table_printer_free (printer);
-
-  flatpak_disable_fancy_output ();
-  g_set_print_handler (print_func);
-  g_string_free (g_print_buffer, TRUE);
-  g_print_buffer = NULL;
-}
-
-static void
-test_table_shrink_more (void)
-{
-  GPrintFunc print_func;
-  FlatpakTablePrinter *printer;
-  int rows, cols;
-
-  g_assert_null (g_print_buffer);
-  g_print_buffer = g_string_new ("");
-  print_func = g_set_print_handler (my_print_func);
-  flatpak_enable_fancy_output ();
-
-  printer = flatpak_table_printer_new ();
-
-  flatpak_table_printer_set_column_title (printer, 0, "Column1");
-  flatpak_table_printer_set_column_title (printer, 1, "Column2");
-  flatpak_table_printer_set_column_title (printer, 2, "Column3");
-
-  flatpak_table_printer_add_column (printer, "a very long text");
-  flatpak_table_printer_add_column (printer, "midsize text");
-  flatpak_table_printer_add_column (printer, "another very long text");
-  flatpak_table_printer_finish_row (printer);
-
-  flatpak_table_printer_set_column_ellipsize (printer, 1, FLATPAK_ELLIPSIZE_MODE_END);
-
-  flatpak_table_printer_print_full (printer, 0, 25, &rows, &cols);
-
-  g_assert_cmpint (rows, ==, 4);
-  g_assert_cmpint (cols, ==, 40);
-  g_assert_cmpstr (g_print_buffer->str, ==,
-                   FLATPAK_ANSI_BOLD_ON
-                   "Column1          … Column3" FLATPAK_ANSI_BOLD_OFF "\n"
-                   "a very long text … another very long text");
-
-  flatpak_table_printer_free (printer);
-
-  flatpak_disable_fancy_output ();
-  g_set_print_handler (print_func);
-  g_string_free (g_print_buffer, TRUE);
-  g_print_buffer = NULL;
-}
-
-static void
-test_parse_datetime (void)
-{
-  struct timespec ts;
-  struct timespec now;
-  gboolean ret;
-  g_autoptr(GDateTime) dt = NULL;
-  GTimeVal tv;
-
-  clock_gettime (CLOCK_REALTIME, &now);
-  ret = parse_datetime (&ts, "NOW", NULL);
-  g_assert_true (ret);
-
-  g_assert_true (ts.tv_sec == now.tv_sec); // close enough
-
-  ret = parse_datetime (&ts, "2018-10-29 00:19:07 +0000", NULL);
-  g_assert_true (ret);
-  dt = g_date_time_new_utc (2018, 10, 29, 0, 19, 7);
-  g_date_time_to_timeval (dt, &tv);
-
-  g_assert_true (tv.tv_sec == ts.tv_sec &&
-                 tv.tv_usec == ts.tv_nsec / 1000);
-
-  ret = parse_datetime (&ts, "nonsense", NULL);
-  g_assert_false (ret);
-}
-
 /* Test various syntax errors */
 static void
 test_filter_parser (void)
@@ -1922,16 +1370,11 @@ main (int argc, char *argv[])
 
   g_test_add_func ("/common/has-path-prefix", test_has_path_prefix);
   g_test_add_func ("/common/path-match-prefix", test_path_match_prefix);
-  g_test_add_func ("/common/fancy-output", test_fancy_output);
   g_test_add_func ("/common/arches", test_arches);
   g_test_add_func ("/common/extension-matches", test_extension_matches);
   g_test_add_func ("/common/valid-name", test_valid_name);
   g_test_add_func ("/common/string-to-unsigned", test_string_to_unsigned);
   g_test_add_func ("/common/levenshtein", test_levenshtein);
-  g_test_add_func ("/common/format-choices", test_format_choices);
-  g_test_add_func ("/common/yes-no-prompt", test_yes_no_prompt);
-  g_test_add_func ("/common/number-prompt", test_number_prompt);
-  g_test_add_func ("/common/parse-numbers", test_parse_numbers);
   g_test_add_func ("/common/subpaths-merge", test_subpaths_merge);
   g_test_add_func ("/common/lang-from-locale", test_lang_from_locale);
   g_test_add_func ("/common/appdata", test_parse_appdata);
@@ -1949,15 +1392,6 @@ main (int argc, char *argv[])
   g_test_add_func ("/common/string-escape", test_string_escape);
   g_test_add_func ("/common/validate-path-characters", test_validate_path_characters);
 
-  g_test_add_func ("/app/looks-like-branch", test_looks_like_branch);
-  g_test_add_func ("/app/columns", test_columns);
-  g_test_add_func ("/app/string-ellipsize", test_string_ellipsize);
-  g_test_add_func ("/app/table", test_table);
-  g_test_add_func ("/app/table-expand", test_table_expand);
-  g_test_add_func ("/app/table-shrink", test_table_shrink);
-  g_test_add_func ("/app/table-shrink-more", test_table_shrink_more);
-  g_test_add_func ("/app/parse-datetime", test_parse_datetime);
-
   res = g_test_run ();
 
   return res;