lots of stuff, see below.

add uzbl.info, move wk_*_version, COMMIT, and ARCH_UZBL into
var_name_to_const, get rid of unameinfo, split off initialize() from main()

1 files changed, 11 insertions, 39 deletions

diff --git a/tests/test-expand.c b/tests/test-expand.c
index d83bbe5..a3163ed 100644
--- a/tests/test-expand.c
+++ b/tests/test-expand.c
@@ -111,23 +111,6 @@ test_WEBKIT_VERSION (void) {
 }
 
 void
-test_UNAMEINFO (void) {
-    GString* expected = g_string_new("");
-
-    g_string_append(expected, uzbl.state.unameinfo.sysname);
-    g_string_append(expected, " ");
-    g_string_append(expected, uzbl.state.unameinfo.nodename);
-    g_string_append(expected, " ");
-    g_string_append(expected, uzbl.state.unameinfo.release);
-    g_string_append(expected, " ");
-    g_string_append(expected, uzbl.state.unameinfo.version);
-    g_string_append(expected, " ");
-    g_string_append(expected, uzbl.state.unameinfo.machine);
-
-    g_assert_cmpstr(expand("@SYSNAME @NODENAME @KERNREL @KERNVER @ARCH_SYSTEM", 0, FALSE), ==, g_string_free(expected, FALSE));
-}
-
-void
 test_ARCH_UZBL (void) {
     g_assert_cmpstr(expand("@ARCH_UZBL", 0, FALSE), ==, ARCH);
 }
@@ -161,22 +144,26 @@ test_cmd_useragent_full (void) {
     g_string_append(expected, itos(WEBKIT_MICRO_VERSION));
     g_string_append(expected, ") (");
 
-    g_string_append(expected, uzbl.state.unameinfo.sysname);
+    struct utsname unameinfo;
+    if(uname(&unameinfo) == -1)
+      g_printerr("Can't retrieve unameinfo. This test might fail.\n");
+
+    g_string_append(expected, unameinfo.sysname);
     g_string_append(expected, " ");
-    g_string_append(expected, uzbl.state.unameinfo.nodename);
+    g_string_append(expected, unameinfo.nodename);
     g_string_append(expected, " ");
-    g_string_append(expected, uzbl.state.unameinfo.release);
+    g_string_append(expected, unameinfo.release);
     g_string_append(expected, " ");
-    g_string_append(expected, uzbl.state.unameinfo.version);
+    g_string_append(expected, unameinfo.version);
     g_string_append(expected, " ");
-    g_string_append(expected, uzbl.state.unameinfo.machine);
+    g_string_append(expected, unameinfo.machine);
     g_string_append(expected, " [");
     g_string_append(expected, ARCH);
     g_string_append(expected, "]) (Commit ");
     g_string_append(expected, COMMIT);
     g_string_append(expected, ")");
 
-    set_var_value("useragent", "Uzbl (Webkit @WEBKIT_MAJOR.@WEBKIT_MINOR.@WEBKIT_MICRO) (@SYSNAME @NODENAME @KERNREL @KERNVER @ARCH_SYSTEM [@ARCH_UZBL]) (Commit @COMMIT)");
+    set_var_value("useragent", "Uzbl (Webkit @WEBKIT_MAJOR.@WEBKIT_MINOR.@WEBKIT_MICRO) (@(uname -s)@ @(uname -n)@ @(uname -r)@ @(uname -v)@ @(uname -m)@ [@ARCH_UZBL]) (Commit @COMMIT)");
     g_assert_cmpstr(uzbl.net.useragent, ==, g_string_free(expected, FALSE));
 }
 
@@ -213,10 +200,7 @@ main (int argc, char *argv[]) {
     g_test_add_func("/test-expand/MODE", test_MODE);
     g_test_add_func("/test-expand/MSG", test_MSG);
     g_test_add_func("/test-expand/WEBKIT_VERSION", test_WEBKIT_VERSION);
-    g_test_add_func("/test-expand/UNAMEINFO", test_UNAMEINFO);
     g_test_add_func("/test-expand/ARCH_UZBL", test_ARCH_UZBL);
-    /* this only exists on _GNU_SOURCE i guess */
-    /* g_test_add_func("/test-expand/DOMAINNAME", test_DOMAINNAME); */
     g_test_add_func("/test-expand/COMMIT", test_COMMIT);
 
     g_test_add_func("/test-expand/cmd_useragent_simple", test_cmd_useragent_simple);
@@ -224,19 +208,7 @@ main (int argc, char *argv[]) {
 
     g_test_add_func("/test-expand/escape_markup", test_escape_markup);
 
-    gtk_init(&argc, &argv);
-    if (!g_thread_supported ())
-        g_thread_init (NULL);
-
-    uzbl.net.soup_session = webkit_get_default_session();
-
-    if(uname(&uzbl.state.unameinfo) == -1)
-      g_printerr("Can't retrieve unameinfo. This test might fail.\n");
-
-    setup_scanner();
-    make_var_to_name_hash();
-
-    uzbl.gui.scrolled_win = create_browser();
+    initialize(argc, argv);
 
     return g_test_run();
 }