PolytreeDE/rofi
1
0
Fork 0
mirror of https://github.com/davatorium/rofi.git synced 2024-11-03 04:23:42 -05:00
Code Releases Activity

Add some NULL tests to widget test

Browse source
This commit is contained in:
Dave Davenport 2016-10-13 17:54:52 +02:00
parent 1cd94c27c7
commit 306eeac3fe
2 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/widgets/widget.c
View file

@ -68,7 +68,7 @@ void widget_draw ( widget *widget, cairo_t *d )
} }
void widget_free ( widget *widget ) void widget_free ( widget *widget )
{ {
if ( widget ) { if ( widget && widget->free ) {
widget->free ( widget ); widget->free ( widget );
} }
} }

21
test/widget-test.c
View file

@ -110,7 +110,6 @@ int main ( G_GNUC_UNUSED int argc, G_GNUC_UNUSED char **argv )
TASSERT ( widget_intersect ( wid, 20+30, 20+40) == 0 ); TASSERT ( widget_intersect ( wid, 20+30, 20+40) == 0 );
TASSERT ( widget_intersect ( wid, 20+30, 20+50) == 0 ); TASSERT ( widget_intersect ( wid, 20+30, 20+50) == 0 );
TASSERT ( widget_intersect ( NULL, 0, 0) == 0 );
TASSERT ( widget_intersect ( wid, -100, -100) == 0); TASSERT ( widget_intersect ( wid, -100, -100) == 0);
TASSERT ( widget_intersect ( wid, INT_MIN, INT_MIN) == 0); TASSERT ( widget_intersect ( wid, INT_MIN, INT_MIN) == 0);
@ -119,13 +118,29 @@ int main ( G_GNUC_UNUSED int argc, G_GNUC_UNUSED char **argv )
// Other wrappers. // Other wrappers.
TASSERT ( widget_get_height ( wid ) == wid->h); TASSERT ( widget_get_height ( wid ) == wid->h);
TASSERT ( widget_get_width ( wid ) == wid->w); TASSERT ( widget_get_width ( wid ) == wid->w);
TASSERT ( widget_get_height ( NULL ) == 0);
TASSERT ( widget_get_width ( NULL ) == 0);
TASSERT ( widget_enabled ( wid ) == FALSE ); TASSERT ( widget_enabled ( wid ) == FALSE );
widget_enable ( wid ); widget_enable ( wid );
TASSERT ( widget_enabled ( wid ) == TRUE ); TASSERT ( widget_enabled ( wid ) == TRUE );
widget_disable ( wid ); widget_disable ( wid );
TASSERT ( widget_enabled ( wid ) == FALSE ); TASSERT ( widget_enabled ( wid ) == FALSE );
// Null pointer tests.
TASSERT ( widget_intersect ( NULL, 0, 0) == 0 );
widget_move ( NULL, 0, 0 );
TASSERT ( widget_get_height ( NULL ) == 0);
TASSERT ( widget_get_width ( NULL ) == 0);
widget_enabled ( NULL );
widget_disable ( NULL );
widget_enable ( NULL );
widget_draw ( NULL, NULL );
widget_free ( NULL );
widget_resize ( NULL, 0, 0);
widget_update ( NULL );
widget_queue_redraw ( NULL );
widget_need_redraw ( NULL );
widget_clicked ( NULL, NULL );
widget_set_clicked_handler ( NULL, NULL, NULL );
g_free(wid); g_free(wid);
} }