diff options
author | Dave Davenport <qball@gmpclient.org> | 2016-03-21 17:16:45 +0100 |
---|---|---|
committer | Dave Davenport <qball@gmpclient.org> | 2016-03-21 17:16:45 +0100 |
commit | 8914fbf2df7c78194ce9d45d12c695d0c8314eb0 (patch) | |
tree | b15eea60910d5bc205ca3f572f7acc76c37aa600 | |
parent | 1e3294fa682a632cf72ff4c2f96c9c3216fc8e3e (diff) |
Split test in 2.
-rw-r--r-- | Makefile.am | 21 | ||||
-rw-r--r-- | test/helper-expand.c | 77 | ||||
-rw-r--r-- | test/helper-test.c | 24 |
3 files changed, 96 insertions, 26 deletions
diff --git a/Makefile.am b/Makefile.am index 5c25e4b1..1136a6a9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -139,7 +139,7 @@ update-manpage: $(top_srcdir)/doc/rofi-manpage.markdown ## # Rofi test program ## -check_PROGRAMS=rofi_test textbox_test helper_test +check_PROGRAMS=rofi_test textbox_test helper_test helper_expand rofi_test_CFLAGS=\ $(AM_CFLAGS)\ @@ -235,9 +235,26 @@ helper_test_LDADD=\ $(libsn_LIBS)\ $(cairo_LIBS) +helper_expand_SOURCES=\ + config/config.c\ + include/rofi.h\ + include/mode.h\ + include/mode-private.h\ + source/helper.c\ + include/helper.h\ + include/xrmoptions.h\ + source/xrmoptions.c\ + source/x11-helper.c\ + test/helper-expand.c + +helper_expand_CFLAGS=${helper_test_CFLAGS} + +helper_expand_LDADD=${helper_test_LDADD} + TESTS=\ rofi_test\ - helper_test + helper_test\ + helper_expand .PHONY: test-x test-x: $(bin_PROGRAMS) textbox_test diff --git a/test/helper-expand.c b/test/helper-expand.c new file mode 100644 index 00000000..39dd6373 --- /dev/null +++ b/test/helper-expand.c @@ -0,0 +1,77 @@ +#include <assert.h> +#include <locale.h> +#include <glib.h> +#include <stdio.h> +#include <helper.h> +#include <string.h> +#include <xcb/xcb_ewmh.h> +#include "xcb-internal.h" +#include "rofi.h" +#include "settings.h" + +static int test = 0; +struct xcb_stuff *xcb; + +#define TASSERT( a ) { \ + assert ( a ); \ + printf ( "Test %i passed (%s)\n", ++test, # a ); \ +} +#define TASSERTE( a, b ) { \ + if ( ( a ) == ( b ) ) { \ + printf ( "Test %i passed (%s == %s) (%u == %u)\n", ++test, # a, # b, a, b ); \ + }else { \ + printf ( "Test %i failed (%s == %s) (%u != %u)\n", ++test, # a, # b, a, b ); \ + abort ( ); \ + } \ +} + +int rofi_view_error_dialog ( const char *msg, G_GNUC_UNUSED int markup ) +{ + fputs ( msg, stderr ); + return TRUE; +} + +int show_error_message ( const char *msg, int markup ) +{ + rofi_view_error_dialog ( msg, markup ); + return 0; +} +xcb_screen_t *xcb_screen; +xcb_ewmh_connection_t xcb_ewmh; +int xcb_screen_nbr; +#include <x11-helper.h> + +int main ( int argc, char ** argv ) +{ + cmd_set_arguments ( argc, argv ); + + if ( setlocale ( LC_ALL, "" ) == NULL ) { + fprintf ( stderr, "Failed to set locale.\n" ); + return EXIT_FAILURE; + } + + /** + * Test some path functions. Not easy as not sure what is right output on travis. + */ + // Test if root is preserved. + char *str = rofi_expand_path ( "/" ); + TASSERT ( strcmp ( str, "/" ) == 0 ); + g_free ( str ); + // Test is relative path is preserved. + str = rofi_expand_path ( "../AUTHORS" ); + TASSERT ( strcmp ( str, "../AUTHORS" ) == 0 ); + g_free ( str ); + // Test another one. + str = rofi_expand_path ( "/bin/false" ); + TASSERT ( strcmp ( str, "/bin/false" ) == 0 ); + g_free ( str ); + // See if user paths get expanded in full path. + str = rofi_expand_path ( "~/" ); + const char *hd = g_get_home_dir (); + TASSERT ( strcmp ( str, hd ) == 0 ); + g_free ( str ); + str = rofi_expand_path ( "~root/" ); + TASSERT ( str[0] == '/' ); + g_free ( str ); + +} diff --git a/test/helper-test.c b/test/helper-test.c index 2339147b..00de4d19 100644 --- a/test/helper-test.c +++ b/test/helper-test.c @@ -66,30 +66,6 @@ int main ( int argc, char ** argv ) g_strfreev ( list ); /** - * Test some path functions. Not easy as not sure what is right output on travis. - */ - // Test if root is preserved. - char *str = rofi_expand_path ( "/" ); - TASSERT ( strcmp ( str, "/" ) == 0 ); - g_free ( str ); - // Test is relative path is preserved. - str = rofi_expand_path ( "../AUTHORS" ); - TASSERT ( strcmp ( str, "../AUTHORS" ) == 0 ); - g_free ( str ); - // Test another one. - str = rofi_expand_path ( "/bin/false" ); - TASSERT ( strcmp ( str, "/bin/false" ) == 0 ); - g_free ( str ); - // See if user paths get expanded in full path. - str = rofi_expand_path ( "~/" ); - const char *hd = g_get_home_dir (); - TASSERT ( strcmp ( str, hd ) == 0 ); - g_free ( str ); - str = rofi_expand_path ( "~root/" ); - TASSERT ( str[0] == '/' ); - g_free ( str ); - - /** * Collating. */ char *res = token_collate_key ( "€ Sign", FALSE ); |