simple expansion test passes.

diff --git a/Makefile b/Makefile
index 4e9d282..b914599 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,13 @@
-CFLAGS:=-std=c99 $(shell pkg-config --cflags gtk+-2.0 webkit-1.0 libsoup-2.4 gthread-2.0) -ggdb -Wall -W -DARCH="\"$(shell uname -m)\"" -lgthread-2.0 -DG_ERRORCHECK_MUTEXES -DCOMMIT="\"$(shell git log | head -n1 | sed "s/.* //")\"" $(CPPFLAGS)
+CFLAGS:=-std=c99 $(shell pkg-config --cflags gtk+-2.0 webkit-1.0 libsoup-2.4 gthread-2.0) -ggdb -Wall -W -DARCH="\"$(shell uname -m)\"" -lgthread-2.0 -DG_ERRORCHECK_MUTEXES -DCOMMIT="\"$(shell git log | head -n1 | sed "s/.* //")\"" $(CPPFLAGS) -fPIC
 LDFLAGS:=$(shell pkg-config --libs gtk+-2.0 webkit-1.0 libsoup-2.4 gthread-2.0) -pthread $(LDFLAGS)
 all: uzbl uzblctrl
 
 PREFIX?=$(DESTDIR)/usr
 
-test: uzbl
-       ./uzbl --uri http://www.uzbl.org --verbose
+# When compiling unit tests, compile uzbl as a library first
+test: uzbl.o
+       $(CC) -DUZBL_LIBRARY -shared -Wl uzbl.o -o ./tests/libuzbl.so
+       cd ./tests/; $(MAKE)
 
 test-dev: uzbl
        XDG_DATA_HOME=./examples/data               XDG_CONFIG_HOME=./examples/config               ./uzbl --uri http://www.uzbl.org --verbose
@@ -13,10 +15,12 @@ test-dev: uzbl
 test-share: uzbl
        XDG_DATA_HOME=/usr/share/uzbl/examples/data XDG_CONFIG_HOME=/usr/share/uzbl/examples/config ./uzbl --uri http://www.uzbl.org --verbose
 
-       
+
 clean:
        rm -f uzbl
        rm -f uzblctrl
+       rm -f uzbl.o
+       cd ./tests/; $(MAKE) clean
 
 install:
        install -d $(PREFIX)/bin

diff --git a/tests/Makefile b/tests/Makefile
new file mode 100644 (file)
index 0000000..2bfcf98
--- /dev/null
+++ b/tests/Makefile
@@ -0,0 +1,14 @@
+CFLAGS:=-std=c99 -I$(shell pwd)/../ -L$(shell pwd) -luzbl $(shell pkg-config --cflags gtk+-2.0 webkit-1.0 libsoup-2.4 gthread-2.0) -ggdb -Wall -W -DARCH="\"$(shell uname -m)\"" -lgthread-2.0 -DG_ERRORCHECK_MUTEXES -DCOMMIT="\"$(shell git log | head -n1 | sed "s/.* //")\"" $(CPPFLAGS)
+LDFLAGS:=$(shell pkg-config --libs gtk+-2.0 webkit-1.0 libsoup-2.4 gthread-2.0) -pthread $(LDFLAGS)
+
+GTESTER:=gtester
+GTESTER_REPORT:=gtester-report
+
+TEST_PROGS:=test-expand
+
+all: $(TEST_PROGS)
+       LD_LIBRARY_PATH="$(LD_LIBRARY_PATH):." $(GTESTER) --verbose $(TEST_PROGS)
+
+clean:
+       rm -f $(TEST_PROGS)
+       rm -f libuzbl.so

diff --git a/tests/test-expand.c b/tests/test-expand.c
new file mode 100644 (file)
index 0000000..d77c42e
--- /dev/null
+++ b/tests/test-expand.c
@@ -0,0 +1,50 @@
+/* -*- c-basic-offset: 4; -*- */
+#define _POSIX_SOURCE
+
+#include <gtk/gtk.h>
+#include <gdk/gdkx.h>
+#include <gdk/gdkkeysyms.h>
+#include <sys/socket.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <sys/un.h>
+#include <sys/utsname.h>
+#include <sys/time.h>
+#include <webkit/webkit.h>
+#include <libsoup/soup.h>
+#include <JavaScriptCore/JavaScript.h>
+
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <signal.h>
+
+#include <uzbl.h>
+#include <config.h>
+
+extern Uzbl uzbl;
+
+extern gchar* expand_template(const char*, gboolean);
+
+static void
+test_URI (void) {
+    setup_scanner();
+    uzbl.state.uri = g_strdup("http://www.uzbl.org/");
+    g_assert_cmpstr(expand_template("URI", FALSE), ==, uzbl.state.uri);
+    g_free(uzbl.state.uri);
+}
+
+int
+main (int argc, char *argv[]) {
+    g_type_init();
+    g_test_init(&argc, &argv, NULL);
+
+    g_test_add_func("/test-expand/URI", test_URI);
+
+    return g_test_run();
+}
+
+/* vi: set et ts=4: */

diff --git a/uzbl.c b/uzbl.c
index ed9c4be..3a25cef 100644 (file)
--- a/uzbl.c
+++ b/uzbl.c
@@ -57,7 +57,7 @@
 #include "uzbl.h"
 #include "config.h"
 
-static Uzbl uzbl;
+Uzbl uzbl;
 
 
 
@@ -1137,7 +1137,7 @@ build_progressbar_ascii(int percent) {
    return g_string_free(bar, FALSE);
 }
 
-static void
+void
 setup_scanner() {
      const GScannerConfig scan_config = {
              (
@@ -1192,7 +1192,7 @@ setup_scanner() {
      }
 }
 
-static gchar *
+gchar *
 expand_template(const char *template, gboolean escape_markup) {
      if(!template) return NULL;
 
@@ -2685,6 +2685,7 @@ dump_config() {
     g_hash_table_foreach(uzbl.bindings, dump_key_hash, NULL);
 }
 
+#ifndef UZBL_LIBRARY
 /** -- MAIN -- **/
 int
 main (int argc, char* argv[]) {
@@ -2801,5 +2802,6 @@ main (int argc, char* argv[]) {
 
     return EXIT_SUCCESS;
 }
+#endif
 
 /* vi: set et ts=4: */

diff --git a/uzbl.h b/uzbl.h
index d19ceb3..23409ab 100644 (file)
--- a/uzbl.h
+++ b/uzbl.h
@@ -224,7 +224,7 @@ XDG_Var XDG[] =
 };
 
 /* Functions */
-static void
+void
 setup_scanner();
 
 char *