PolytreeDE/rofi
1
0
Fork 0
mirror of https://github.com/davatorium/rofi.git synced 2025-07-31 21:59:25 -04:00
Code Releases Activity

Fix small bug and extend test for theme parser

Browse source
This commit is contained in:
Dave Davenport 2017-04-04 23:02:08 +02:00
parent 663f53290f
commit c40bb4fc35
2 changed files with 83 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
source/theme.c
View file

@ -351,7 +351,7 @@ static void rofi_theme_resolve_link_property ( Property *p, int depth )
return; return;
} }
if ( g_hash_table_contains ( rofi_theme->properties, name ) ) { if ( rofi_theme->properties && g_hash_table_contains ( rofi_theme->properties, name ) ) {
Property *pr = g_hash_table_lookup ( rofi_theme->properties, name ); Property *pr = g_hash_table_lookup ( rofi_theme->properties, name );
if ( pr->type == P_LINK ) { if ( pr->type == P_LINK ) {
if ( pr->value.link.ref == NULL ) { if ( pr->value.link.ref == NULL ) {

80
test/theme-parser-test.c
View file

@ -9,6 +9,7 @@
#include "rofi.h" #include "rofi.h"
#include "settings.h" #include "settings.h"
#include "theme.h" #include "theme.h"
#include "widgets/widget-internal.h"
static int test = 0; static int test = 0;
struct xcb_stuff *xcb; struct xcb_stuff *xcb;
@ -91,4 +92,83 @@ int main ( int argc, char ** argv )
rofi_theme_free ( rofi_theme ); rofi_theme_free ( rofi_theme );
rofi_theme = NULL; rofi_theme = NULL;
error = FALSE; error = FALSE;
// C++ style comments with nesting.
rofi_theme_parse_string ( "// Random comments // /*test */");
TASSERT ( rofi_theme != NULL );
rofi_theme_free ( rofi_theme );
rofi_theme = NULL;
rofi_theme_parse_string ( "/* test /* aap */ */");
TASSERT ( rofi_theme != NULL );
rofi_theme_free ( rofi_theme );
rofi_theme = NULL;
// C++ comments multiple lines.
rofi_theme_parse_string ( "// Random comments\n// /*test */");
TASSERT ( rofi_theme != NULL );
rofi_theme_free ( rofi_theme );
rofi_theme = NULL;
rofi_theme_parse_string ( "/* test \n*\n*/* aap */ */");
TASSERT ( rofi_theme != NULL );
rofi_theme_free ( rofi_theme );
rofi_theme = NULL;
widget wid;
wid.name = "blaat";
/** Boolean property */
rofi_theme_parse_string ( "*{ test: true; test2:/* inline */false; }");
TASSERT ( rofi_theme_get_boolean ( &wid, "test", FALSE) == TRUE );
TASSERT ( rofi_theme_get_boolean ( &wid, "test2", TRUE) == FALSE );
TASSERT ( rofi_theme != NULL );
rofi_theme_free ( rofi_theme );
rofi_theme = NULL;
/** reference. */
error = 0;
rofi_theme_parse_string ( "* { test: true; test2:/* inline */false;} *{ a:@test; b:@test2;}");
TASSERT ( error == 0 );
TASSERT ( rofi_theme_get_boolean ( &wid, "test", FALSE) == TRUE );
TASSERT ( rofi_theme_get_boolean ( &wid, "b", TRUE) == FALSE );
TASSERT ( rofi_theme != NULL );
rofi_theme_free ( rofi_theme );
rofi_theme = NULL;
{
error = 0;
rofi_theme_parse_string ( "* { test: 10em;}");
TASSERT ( error == 0 );
Distance d = (Distance){ 1, PW_PX, SOLID};
Padding pi = (Padding){d,d,d,d};
Padding p = rofi_theme_get_padding ( &wid, "test", pi);
TASSERT ( p.left.distance == 10 );
TASSERT ( p.left.type == PW_EM );
TASSERT ( rofi_theme != NULL );
rofi_theme_free ( rofi_theme );
rofi_theme = NULL;
}
{
error = 0;
rofi_theme_parse_string ( "* { test: 10px;}");
TASSERT ( error == 0 );
Distance d = (Distance){ 1, PW_PX, SOLID};
Padding pi = (Padding){d,d,d,d};
Padding p = rofi_theme_get_padding ( &wid, "test", pi);
TASSERT ( p.left.distance == 10 );
TASSERT ( p.left.type == PW_PX );
TASSERT ( rofi_theme != NULL );
rofi_theme_free ( rofi_theme );
rofi_theme = NULL;
}
{
error = 0;
rofi_theme_parse_string ( "* { test: 10%;}");
TASSERT ( error == 0 );
Distance d = (Distance){ 1, PW_PX, SOLID};
Padding pi = (Padding){d,d,d,d};
Padding p = rofi_theme_get_padding ( &wid, "test", pi);
TASSERT ( p.left.distance == 10 );
TASSERT ( p.left.type == PW_PERCENT );
TASSERT ( rofi_theme != NULL );
rofi_theme_free ( rofi_theme );
rofi_theme = NULL;
}
} }