diff options
author | Emre Ucan <eucan@de.adit-jv.com> | 2015-09-30 09:13:18 +0200 |
---|---|---|
committer | Nobuhiko Tanibata <nobuhiko_tanibata@xddp.denso.co.jp> | 2015-09-30 16:20:23 +0900 |
commit | 8dfe242db76aaeaf5e5d7d70ca66ab5a3ba82e33 (patch) | |
tree | 3e1defd169ee63df3e24228e38e83700388dc52b /ivi-input-api/test | |
parent | 0770a892fa4a00870f24d37285a1a6cb02371a43 (diff) | |
download | wayland-ivi-extension-8dfe242db76aaeaf5e5d7d70ca66ab5a3ba82e33.tar.gz |
tests: fix compiler warnings
Signed-off-by: Emre Ucan <eucan@de.adit-jv.com>
Diffstat (limited to 'ivi-input-api/test')
-rw-r--r-- | ivi-input-api/test/TestBase.cpp | 2 | ||||
-rw-r--r-- | ivi-input-api/test/ilm_input_null_pointer_test.cpp | 8 | ||||
-rw-r--r-- | ivi-input-api/test/ilm_input_test.cpp | 12 |
3 files changed, 11 insertions, 11 deletions
diff --git a/ivi-input-api/test/TestBase.cpp b/ivi-input-api/test/TestBase.cpp index b871b1e..5ae5392 100644 --- a/ivi-input-api/test/TestBase.cpp +++ b/ivi-input-api/test/TestBase.cpp @@ -35,7 +35,7 @@ TestBase::TestBase() } wlSurfaces.reserve(10); - for (int i = 0; i < wlSurfaces.capacity(); ++i) + for (int i = 0; i < (int)wlSurfaces.capacity(); ++i) { wlSurfaces.push_back(wl_compositor_create_surface(wlCompositor)); } diff --git a/ivi-input-api/test/ilm_input_null_pointer_test.cpp b/ivi-input-api/test/ilm_input_null_pointer_test.cpp index e3aa84d..7043614 100644 --- a/ivi-input-api/test/ilm_input_null_pointer_test.cpp +++ b/ivi-input-api/test/ilm_input_null_pointer_test.cpp @@ -105,7 +105,7 @@ TEST_F(IlmNullPointerTest, ilm_get_input_focus_null_pointer) { TEST_F(IlmNullPointerTest, ilm_set_input_event_acceptance_null_pointer) { t_ilm_surface surface1 = 1010; - t_ilm_string set_seats[] = {"default"}; + char const *set_seats = "default"; t_ilm_uint set_seats_count = 1; ASSERT_EQ(ILM_SUCCESS, ilm_surfaceCreate((t_ilm_nativehandle)wlSurfaces[0], 0, 0, ILM_PIXELFORMAT_RGBA_8888, @@ -113,7 +113,7 @@ TEST_F(IlmNullPointerTest, ilm_set_input_event_acceptance_null_pointer) { EXPECT_EQ(ILM_FAILED, ilm_setInputAcceptanceOn(surface1, set_seats_count, NULL)); - EXPECT_EQ(ILM_FAILED, ilm_setInputAcceptanceOn(0, set_seats_count, set_seats)); + EXPECT_EQ(ILM_FAILED, ilm_setInputAcceptanceOn(0, set_seats_count, (t_ilm_string*)&set_seats)); } TEST_F(IlmNullPointerTest, ilm_get_input_event_acceptance_null_pointer) { @@ -149,9 +149,9 @@ TEST_F(IlmNullPointerTest, ilm_get_input_devices_null_pointer) { } TEST_F(IlmNullPointerTest, ilm_get_input_device_capabilities_null_pointer) { - t_ilm_string seats[] = {"default"}; + char const *seats = "default"; ilmInputDevice bitmask; EXPECT_EQ(ILM_FAILED, ilm_getInputDeviceCapabilities(NULL, &bitmask)); - EXPECT_EQ(ILM_FAILED, ilm_getInputDeviceCapabilities(seats[0], NULL)); + EXPECT_EQ(ILM_FAILED, ilm_getInputDeviceCapabilities((t_ilm_string)seats, NULL)); } diff --git a/ivi-input-api/test/ilm_input_test.cpp b/ivi-input-api/test/ilm_input_test.cpp index ed4b8a3..fdefa7e 100644 --- a/ivi-input-api/test/ilm_input_test.cpp +++ b/ivi-input-api/test/ilm_input_test.cpp @@ -151,7 +151,7 @@ TEST_F(IlmCommandTest, ilm_input_event_acceptance) { t_ilm_surface surface1 = 1010; t_ilm_uint num_seats = 0; t_ilm_string *seats = NULL; - t_ilm_string set_seats[] = {"default"}; + char const *set_seats = "default"; t_ilm_uint set_seats_count = 1; ASSERT_EQ(ILM_SUCCESS, ilm_surfaceCreate((t_ilm_nativehandle)wlSurfaces[0], 0, 0, ILM_PIXELFORMAT_RGBA_8888, @@ -162,7 +162,7 @@ TEST_F(IlmCommandTest, ilm_input_event_acceptance) { &seats)); EXPECT_EQ(1, num_seats); /* googletest doesn't like comparing to null pointers */ - ASSERT_EQ(false, seats == NULL); + ASSERT_FALSE(seats == NULL); EXPECT_STREQ("default", seats[0]); free(seats[0]); free(seats); @@ -176,12 +176,12 @@ TEST_F(IlmCommandTest, ilm_input_event_acceptance) { /* Can add a seat to acceptance */ ASSERT_EQ(ILM_SUCCESS, ilm_setInputAcceptanceOn(surface1, set_seats_count, - set_seats)); + (t_ilm_string*)&set_seats)); ASSERT_EQ(ILM_SUCCESS, ilm_getInputAcceptanceOn(surface1, &num_seats, &seats)); EXPECT_EQ(set_seats_count, num_seats); bool found = false; - if (!strcmp(seats[0], set_seats[0])) + if (!strcmp(*seats, (t_ilm_string)set_seats)) found = true; EXPECT_EQ(true, found) << set_seats[0] << " not found in returned seats"; @@ -189,7 +189,7 @@ TEST_F(IlmCommandTest, ilm_input_event_acceptance) { free(seats); /* Seats can be set, unset, then reset */ - ASSERT_EQ(ILM_SUCCESS, ilm_setInputAcceptanceOn(surface1, 1, &set_seats[0])); + ASSERT_EQ(ILM_SUCCESS, ilm_setInputAcceptanceOn(surface1, 1, (t_ilm_string*)&set_seats)); ASSERT_EQ(ILM_SUCCESS, ilm_setInputAcceptanceOn(surface1, 0, NULL)); - ASSERT_EQ(ILM_SUCCESS, ilm_setInputAcceptanceOn(surface1, 1, &set_seats[0])); + ASSERT_EQ(ILM_SUCCESS, ilm_setInputAcceptanceOn(surface1, 1, (t_ilm_string*)&set_seats)); } |