status_message is not a built-in variable anymore so the unit tests must use another built-in variable for testing built-in variable stuff

2 files changed, 18 insertions, 18 deletions

diff --git a/tests/test-command.c b/tests/test-command.c
index 769a1a9..49f3bb8 100644
--- a/tests/test-command.c
+++ b/tests/test-command.c
@@ -178,9 +178,9 @@ test_set_variable (struct EventFixture *ef, const void *data) {
     (void) data;
 
     /* set a string */
-    parse_cmd_line("set status_message = A Simple Testing Message", NULL);
-    ASSERT_EVENT(ef, "VARIABLE_SET status_message str A Simple Testing Message");
-    g_assert_cmpstr("A Simple Testing Message", ==, uzbl.gui.sbar.msg);
+    parse_cmd_line("set useragent = Uzbl browser kthxbye!", NULL);
+    ASSERT_EVENT(ef, "VARIABLE_SET useragent str Uzbl browser kthxbye!");
+    g_assert_cmpstr("Uzbl browser kthxbye!", ==, uzbl.net.useragent);
 
     /* set an int */
     parse_cmd_line("set forward_keys = 0", NULL);
@@ -306,9 +306,9 @@ test_js (void) {
     g_assert_cmpstr("X345", ==, result->str);
 
     /* uzbl commands can be run from javascript */
-    uzbl.gui.sbar.msg = "Test message";
-    parse_cmd_line("js Uzbl.run('print @status_message').toUpperCase();", result);
-    g_assert_cmpstr("TEST MESSAGE", ==, result->str);
+    uzbl.net.useragent = "Test useragent";
+    parse_cmd_line("js Uzbl.run('print @useragent').toUpperCase();", result);
+    g_assert_cmpstr("TEST USERAGENT", ==, result->str);
 
     g_string_free(result, TRUE);
 }
@@ -330,8 +330,8 @@ test_run_handler_arg_order (void) {
 
 void
 test_run_handler_expand (void) {
-    uzbl.gui.sbar.msg = "Test message";
-    run_handler("sync_spawn echo @status_message", "result:");
+    uzbl.net.useragent = "Test uzbl uzr agent";
+    run_handler("sync_spawn echo @useragent", "result:");
 
     assert(uzbl.comm.sync_stdout);
 
@@ -340,7 +340,7 @@ test_run_handler_expand (void) {
 
     /* the rest of the result should be the arguments passed to run_handler. */
     /* the user-specified arguments to the handler should have been expanded */
-    g_assert_cmpstr("result: Test message\n", ==, rest);
+    g_assert_cmpstr("result: Test uzbl uzr agent\n", ==, rest);
 }
 
 int
diff --git a/tests/test-expand.c b/tests/test-expand.c
index 855d9b4..ef07c80 100644
--- a/tests/test-expand.c
+++ b/tests/test-expand.c
@@ -64,9 +64,9 @@ test_NAME (void) {
 }
 
 void
-test_status_message (void) {
-    uzbl.gui.sbar.msg = "Hello from frosty Edmonton!";
-    g_assert_cmpstr(expand("@status_message", 0), ==, "Hello from frosty Edmonton!");
+test_useragent (void) {
+    uzbl.net.useragent = "This is the uzbl browser (sort of).  and btw: Hello from frosty Edmonton!";
+    g_assert_cmpstr(expand("@useragent", 0), ==, "This is the uzbl browser (sort of).  and btw: Hello from frosty Edmonton!");
 }
 
 void
@@ -171,12 +171,12 @@ test_escape_expansion (void) {
 
 void
 test_nested (void) {
-    uzbl.gui.sbar.msg = "xxx";
-    g_assert_cmpstr(expand("@<\"..@status_message..\">@", 0), ==, "..xxx..");
-    g_assert_cmpstr(expand("@<\"..\\@status_message..\">@", 0), ==, "..@status_message..");
+    uzbl.net.useragent = "xxx";
+    g_assert_cmpstr(expand("@<\"..@useragent..\">@", 0), ==, "..xxx..");
+    g_assert_cmpstr(expand("@<\"..\\@useragent..\">@", 0), ==, "..@useragent..");
 
-    g_assert_cmpstr(expand("@(echo ..@status_message..)@", 0), ==, "..xxx..");
-    g_assert_cmpstr(expand("@(echo ..\\@status_message..)@", 0), ==, "..@status_message..");
+    g_assert_cmpstr(expand("@(echo ..@useragent..)@", 0), ==, "..xxx..");
+    g_assert_cmpstr(expand("@(echo ..\\@useragent..)@", 0), ==, "..@useragent..");
 }
 
 int
@@ -185,7 +185,7 @@ main (int argc, char *argv[]) {
     g_test_init(&argc, &argv, NULL);
 
     g_test_add_func("/test-expand/@keycmd", test_keycmd);
-    g_test_add_func("/test-expand/@status_message", test_status_message);
+    g_test_add_func("/test-expand/@useragent", test_useragent);
     g_test_add_func("/test-expand/@uri", test_uri);
     g_test_add_func("/test-expand/@TITLE", test_TITLE);
     g_test_add_func("/test-expand/@SELECTED_URI", test_SELECTED_URI);