aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--tests/Makefile.am2
-rw-r--r--tests/test-gtk-label-server.c4
-rw-r--r--tests/test-gtk-label.h75
3 files changed, 2 insertions, 79 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 3e818a2..e566594 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -88,7 +88,6 @@ test-gtk-label: test-gtk-label-client test-gtk-label-server
$(DBUS_RUNNER) --task ./test-gtk-label-client --task-name Client --task ./test-gtk-label-server --task-name Server --ignore-return
test_gtk_label_server_SOURCES = \
- test-gtk-label.h \
test-gtk-label-server.c
test_gtk_label_server_CFLAGS = \
@@ -104,7 +103,6 @@ test_gtk_label_server_LDADD = \
$(DBUSMENUTESTS_LIBS)
test_gtk_label_client_SOURCES = \
- test-gtk-label.h \
test-gtk-label-client.c
test_gtk_label_client_CFLAGS = \
diff --git a/tests/test-gtk-label-server.c b/tests/test-gtk-label-server.c
index 349d7d1..a494ab0 100644
--- a/tests/test-gtk-label-server.c
+++ b/tests/test-gtk-label-server.c
@@ -95,8 +95,8 @@ main (int argc, char ** argv)
JsonParser * parser = json_parser_new();
GError * error = NULL;
- if (!json_parser_load_from_file(parser, argv[1], &error)) {
- g_debug("Failed parsing file %s because: %s", argv[1], error->message);
+ if (!json_parser_load_from_file(parser, "test-gtk-label.json", &error)) {
+ g_debug("Failed parsing file %s because: %s", "test-gtk-label.json", error->message);
return 1;
}
JsonNode * root_node = json_parser_get_root(parser);
diff --git a/tests/test-gtk-label.h b/tests/test-gtk-label.h
deleted file mode 100644
index e63ac44..0000000
--- a/tests/test-gtk-label.h
+++ /dev/null
@@ -1,75 +0,0 @@
-
-#include <glib.h>
-
-typedef struct _proplayout_t proplayout_t;
-struct _proplayout_t {
- guint id;
- gchar ** properties;
- proplayout_t * submenu;
-};
-
-gchar * props1[] = {"label", "value1", NULL};
-gchar * props2[] = {"label", "value1", NULL};
-gchar * props3[] = {"label",
- "And a property name that is really long should have a value that is really long, because well, that's an important part of the yin and yang of software testing.",
- NULL};
-gchar * props4[] = {"icon-name", "network-status", "label", "Look at network", "right-column", "10:32", NULL};
-
-
-proplayout_t submenu_4_1[] = {
- {id: 10, properties: props2, submenu: NULL},
- {id: 11, properties: props2, submenu: NULL},
- {id: 12, properties: props2, submenu: NULL},
- {id: 13, properties: props2, submenu: NULL},
- {id: 14, properties: props2, submenu: NULL},
- {id: 15, properties: props2, submenu: NULL},
- {id: 16, properties: props2, submenu: NULL},
- {id: 17, properties: props2, submenu: NULL},
- {id: 18, properties: props2, submenu: NULL},
- {id: 19, properties: props2, submenu: NULL},
- {id: 0, properties: NULL, submenu: NULL}
-};
-
-proplayout_t submenu_4_2[] = {
- {id: 20, properties: props2, submenu: NULL},
- {id: 21, properties: props2, submenu: NULL},
- {id: 22, properties: props2, submenu: NULL},
- {id: 23, properties: props2, submenu: NULL},
- {id: 24, properties: props2, submenu: NULL},
- {id: 25, properties: props2, submenu: NULL},
- {id: 26, properties: props2, submenu: NULL},
- {id: 27, properties: props2, submenu: NULL},
- {id: 28, properties: props2, submenu: NULL},
- {id: 29, properties: props2, submenu: NULL},
- {id: 0, properties: NULL, submenu: NULL}
-};
-
-proplayout_t submenu_4_3[] = {
- {id: 30, properties: props2, submenu: NULL},
- {id: 31, properties: props2, submenu: NULL},
- {id: 32, properties: props2, submenu: NULL},
- {id: 33, properties: props2, submenu: NULL},
- {id: 34, properties: props2, submenu: NULL},
- {id: 35, properties: props2, submenu: NULL},
- {id: 36, properties: props2, submenu: NULL},
- {id: 37, properties: props2, submenu: NULL},
- {id: 38, properties: props2, submenu: NULL},
- {id: 39, properties: props2, submenu: NULL},
- {id: 0, properties: NULL, submenu: NULL}
-};
-
-proplayout_t submenu_4_0[] = {
- {id: 1, properties: props2, submenu: submenu_4_1},
- {id: 2, properties: props2, submenu: submenu_4_2},
- {id: 3, properties: props2, submenu: submenu_4_3},
- {id: 0, properties: NULL, submenu: NULL}
-};
-
-proplayout_t layouts[] = {
- {id: 1, properties: props1, submenu: submenu_4_3},
- {id: 10, properties: props2, submenu: submenu_4_2},
- {id: 20, properties: props3, submenu: submenu_4_1},
- {id: 100, properties: props2, submenu: submenu_4_0},
- {id: 0, properties: NULL, submenu: NULL}
-};
-