mirror of
https://github.com/davatorium/rofi.git
synced 2024-11-18 13:54:36 -05:00
Add (initial) check for theme parser.
This commit is contained in:
parent
b8dff89b87
commit
abaae5f403
3 changed files with 119 additions and 1 deletions
24
Makefile.am
24
Makefile.am
|
@ -224,6 +224,7 @@ check_PROGRAMS=\
|
||||||
helper_config_cmdline_parser\
|
helper_config_cmdline_parser\
|
||||||
widget_test\
|
widget_test\
|
||||||
box_test\
|
box_test\
|
||||||
|
theme_parser_test\
|
||||||
scrollbar_test
|
scrollbar_test
|
||||||
|
|
||||||
|
|
||||||
|
@ -356,6 +357,24 @@ textbox_test_SOURCES=\
|
||||||
include/helper-theme.h\
|
include/helper-theme.h\
|
||||||
test/textbox-test.c
|
test/textbox-test.c
|
||||||
|
|
||||||
|
theme_parser_test_SOURCES=\
|
||||||
|
config/config.c\
|
||||||
|
include/rofi.h\
|
||||||
|
include/mode.h\
|
||||||
|
include/mode-private.h\
|
||||||
|
source/helper.c\
|
||||||
|
include/helper.h\
|
||||||
|
include/helper-theme.h\
|
||||||
|
include/theme.h\
|
||||||
|
include/xrmoptions.h\
|
||||||
|
source/xrmoptions.c\
|
||||||
|
source/x11-helper.c\
|
||||||
|
lexer/theme-lexer.c\
|
||||||
|
lexer/theme-parser.c\
|
||||||
|
lexer/theme-parser.h\
|
||||||
|
source/theme.c\
|
||||||
|
test/theme-parser-test.c
|
||||||
|
|
||||||
helper_test_SOURCES=\
|
helper_test_SOURCES=\
|
||||||
config/config.c\
|
config/config.c\
|
||||||
include/rofi.h\
|
include/rofi.h\
|
||||||
|
@ -369,6 +388,7 @@ helper_test_SOURCES=\
|
||||||
source/x11-helper.c\
|
source/x11-helper.c\
|
||||||
test/helper-test.c
|
test/helper-test.c
|
||||||
|
|
||||||
|
|
||||||
helper_test_CFLAGS=\
|
helper_test_CFLAGS=\
|
||||||
$(AM_CFLAGS)\
|
$(AM_CFLAGS)\
|
||||||
$(glib_CFLAGS)\
|
$(glib_CFLAGS)\
|
||||||
|
@ -387,6 +407,9 @@ helper_test_LDADD=\
|
||||||
$(libsn_LIBS)\
|
$(libsn_LIBS)\
|
||||||
$(cairo_LIBS)
|
$(cairo_LIBS)
|
||||||
|
|
||||||
|
theme_parser_test_CFLAGS=${helper_test_CFLAGS}
|
||||||
|
theme_parser_test_LDADD=${helper_test_LDADD}
|
||||||
|
|
||||||
helper_expand_SOURCES=\
|
helper_expand_SOURCES=\
|
||||||
config/config.c\
|
config/config.c\
|
||||||
include/rofi.h\
|
include/rofi.h\
|
||||||
|
@ -430,6 +453,7 @@ TESTS=\
|
||||||
textbox_test\
|
textbox_test\
|
||||||
widget_test\
|
widget_test\
|
||||||
box_test\
|
box_test\
|
||||||
|
theme_parser_test\
|
||||||
scrollbar_test
|
scrollbar_test
|
||||||
|
|
||||||
.PHONY: test-x
|
.PHONY: test-x
|
||||||
|
|
|
@ -279,8 +279,8 @@ void yyerror ( YYLTYPE *yylloc, const char *what, const char* s )
|
||||||
else {
|
else {
|
||||||
g_string_append_printf ( str, "\tLocation: line %d column %d to line %d column %d\n", yylloc->first_line, yylloc->first_column, yylloc->last_line, yylloc->last_column );
|
g_string_append_printf ( str, "\tLocation: line %d column %d to line %d column %d\n", yylloc->first_line, yylloc->first_column, yylloc->last_line, yylloc->last_column );
|
||||||
}
|
}
|
||||||
rofi_add_error_message ( str );
|
|
||||||
g_log ( "Parser", G_LOG_LEVEL_DEBUG, "Failed to parse theme:\n%s", str->str );
|
g_log ( "Parser", G_LOG_LEVEL_DEBUG, "Failed to parse theme:\n%s", str->str );
|
||||||
|
rofi_add_error_message ( str );
|
||||||
}
|
}
|
||||||
|
|
||||||
static gboolean rofi_theme_steal_property_int ( gpointer key, gpointer value, gpointer user_data )
|
static gboolean rofi_theme_steal_property_int ( gpointer key, gpointer value, gpointer user_data )
|
||||||
|
|
94
test/theme-parser-test.c
Normal file
94
test/theme-parser-test.c
Normal file
|
@ -0,0 +1,94 @@
|
||||||
|
#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"
|
||||||
|
#include "theme.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 ( ); \
|
||||||
|
} \
|
||||||
|
}
|
||||||
|
gboolean error = FALSE;
|
||||||
|
void rofi_add_error_message ( GString *msg )
|
||||||
|
{
|
||||||
|
|
||||||
|
error = TRUE;
|
||||||
|
g_string_free ( msg, TRUE );
|
||||||
|
}
|
||||||
|
|
||||||
|
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;
|
||||||
|
}
|
||||||
|
void rofi_view_get_current_monitor ( int *width, int *height )
|
||||||
|
{
|
||||||
|
if ( width ) {
|
||||||
|
*width = 1920;
|
||||||
|
}
|
||||||
|
if ( height ) {
|
||||||
|
*height = 1080;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
double textbox_get_estimated_char_height ( void )
|
||||||
|
{
|
||||||
|
return 16.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;
|
||||||
|
}
|
||||||
|
// EMPTY string.
|
||||||
|
rofi_theme_parse_string ( "");
|
||||||
|
TASSERT ( rofi_theme != NULL );
|
||||||
|
rofi_theme_free ( rofi_theme );
|
||||||
|
rofi_theme = NULL;
|
||||||
|
// EMPTY global.
|
||||||
|
rofi_theme_parse_string ( " *{} ");
|
||||||
|
TASSERT ( rofi_theme != NULL );
|
||||||
|
rofi_theme_free ( rofi_theme );
|
||||||
|
rofi_theme = NULL;
|
||||||
|
// EMPTY section.
|
||||||
|
rofi_theme_parse_string ( " #{} ");
|
||||||
|
TASSERT ( rofi_theme != NULL );
|
||||||
|
rofi_theme_free ( rofi_theme );
|
||||||
|
rofi_theme = NULL;
|
||||||
|
rofi_theme_parse_string ( " Blaat ");
|
||||||
|
TASSERT ( rofi_theme != NULL );
|
||||||
|
TASSERT ( error == TRUE );
|
||||||
|
rofi_theme_free ( rofi_theme );
|
||||||
|
rofi_theme = NULL;
|
||||||
|
error = FALSE;
|
||||||
|
}
|
Loading…
Reference in a new issue