diff options
| author | William Hua <william.hua@canonical.com> | 2013-07-04 00:12:14 -0400 |
|---|---|---|
| committer | William Hua <william.hua@canonical.com> | 2013-07-04 00:12:14 -0400 |
| commit | 6061e1de2a680b14b1a6e1eb2642d0a643910a73 (patch) | |
| tree | 5eafcd0ca3371523cc5d2482d333b822c130b98f /tests | |
| parent | 7507be3ce89d7bb02fb41847a015f7c0400bb926 (diff) | |
| download | ayatana-indicator-keyboard-6061e1de2a680b14b1a6e1eb2642d0a643910a73.tar.gz ayatana-indicator-keyboard-6061e1de2a680b14b1a6e1eb2642d0a643910a73.tar.bz2 ayatana-indicator-keyboard-6061e1de2a680b14b1a6e1eb2642d0a643910a73.zip | |
Disable experimental non-null for tests.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Makefile.am | 3 | ||||
| -rw-r--r-- | tests/main.vala | 12 |
2 files changed, 7 insertions, 8 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index b4e80c02..9161365e 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -4,8 +4,7 @@ check_PROGRAMS = indicator-keyboard-test AM_CFLAGS = -w AM_LDFLAGS = -lm -AM_VALAFLAGS = --enable-experimental-non-null \ - --metadatadir $(top_srcdir)/deps \ +AM_VALAFLAGS = --metadatadir $(top_srcdir)/deps \ --vapidir $(top_srcdir)/deps indicator_keyboard_test_SOURCES = main.vala \ diff --git a/tests/main.vala b/tests/main.vala index 1a23b46f..4e121fcd 100644 --- a/tests/main.vala +++ b/tests/main.vala @@ -146,7 +146,7 @@ static void test_activate_input_source (void *data) { action_group.disconnect (signal_name); var state = action_group.get_action_state ("current"); - var current = ((!) state).get_uint32 (); + var current = state.get_uint32 (); assert (current == 2); try { @@ -410,7 +410,7 @@ static void test_update_visible (void *data) { action_group.disconnect (signal_name); var state = action_group.get_action_state ("indicator"); - assert (((!) state).lookup ("visible", "b", out visible)); + assert (state.lookup ("visible", "b", out visible)); assert (visible); loop = new MainLoop (null, false); @@ -433,7 +433,7 @@ static void test_update_visible (void *data) { action_group.disconnect (signal_name); state = action_group.get_action_state ("indicator"); - assert (((!) state).lookup ("visible", "b", out visible)); + assert (state.lookup ("visible", "b", out visible)); assert (!visible); loop = new MainLoop (null, false); @@ -456,7 +456,7 @@ static void test_update_visible (void *data) { action_group.disconnect (signal_name); state = action_group.get_action_state ("indicator"); - assert (((!) state).lookup ("visible", "b", out visible)); + assert (state.lookup ("visible", "b", out visible)); assert (visible); } @@ -505,7 +505,7 @@ static void test_update_input_source (void *data) { action_group.disconnect (signal_name); var state = action_group.get_action_state ("current"); - var current = ((!) state).get_uint32 (); + var current = state.get_uint32 (); assert (current == 1); try { @@ -538,7 +538,7 @@ static void test_update_input_source (void *data) { action_group.disconnect (signal_name); state = action_group.get_action_state ("current"); - current = ((!) state).get_uint32 (); + current = state.get_uint32 (); assert (current == 0); try { |