diff options
| author | Ucan, Emre \(ADITG/SW1\) <eucan@de.adit-jv.com> | 2016-03-04 12:50:28 +0000 |
|---|---|---|
| committer | Bryce Harrington <bryce@osg.samsung.com> | 2016-03-04 10:33:34 -0800 |
| commit | c507f67f9ea964159f74c4155f7aaa081600be7a (patch) | |
| tree | 29612b53cc56c5437906166d5510a3c269f5a5ea /tests | |
| parent | dfc2d76432fd0b84168903c77afa7f7f2cc68a1d (diff) | |
| download | weston-c507f67f9ea964159f74c4155f7aaa081600be7a.tar.gz | |
ivi-shell: remove ivi_layout_surface_get_dimension API
Signed-off-by: Emre Ucan <eucan@de.adit-jv.com>
Acked-by: wataru_natsume <wataru_natsume@xddp.denso.co.jp>
Reviewed-by: Bryce Harrington <bryce@osg.samsung.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/ivi_layout-internal-test.c | 7 | ||||
| -rw-r--r-- | tests/ivi_layout-test-plugin.c | 28 |
2 files changed, 6 insertions, 29 deletions
diff --git a/tests/ivi_layout-internal-test.c b/tests/ivi_layout-internal-test.c index 2c52ed40..78ac7de4 100644 --- a/tests/ivi_layout-internal-test.c +++ b/tests/ivi_layout-internal-test.c @@ -96,17 +96,10 @@ static void test_surface_bad_dimension(struct test_context *ctx) { const struct ivi_layout_interface *lyt = ctx->layout_interface; - struct ivi_layout_surface *ivisurf = NULL; - int32_t dest_width; - int32_t dest_height; iassert(lyt->surface_set_dimension(NULL, 200, 300) == IVI_FAILED); lyt->commit_changes(); - - iassert(lyt->surface_get_dimension(NULL, &dest_width, &dest_height) == IVI_FAILED); - iassert(lyt->surface_get_dimension(ivisurf, NULL, &dest_height) == IVI_FAILED); - iassert(lyt->surface_get_dimension(ivisurf, &dest_width, NULL) == IVI_FAILED); } static void diff --git a/tests/ivi_layout-test-plugin.c b/tests/ivi_layout-test-plugin.c index ed316353..44913d63 100644 --- a/tests/ivi_layout-test-plugin.c +++ b/tests/ivi_layout-test-plugin.c @@ -426,32 +426,23 @@ RUNNER_TEST(surface_dimension) const struct ivi_layout_interface *lyt = ctx->layout_interface; struct ivi_layout_surface *ivisurf; const struct ivi_layout_surface_properties *prop; - int32_t dest_width; - int32_t dest_height; ivisurf = lyt->get_surface_from_id(IVI_TEST_SURFACE_ID(0)); runner_assert(ivisurf != NULL); - runner_assert(lyt->surface_get_dimension( - ivisurf, &dest_width, &dest_height) == IVI_SUCCEEDED); - runner_assert(dest_width == 1); - runner_assert(dest_height == 1); + prop = lyt->get_properties_of_surface(ivisurf); + runner_assert_or_return(prop); + runner_assert(prop->dest_width == 1); + runner_assert(prop->dest_height == 1); runner_assert(IVI_SUCCEEDED == lyt->surface_set_dimension(ivisurf, 200, 300)); - runner_assert(lyt->surface_get_dimension( - ivisurf, &dest_width, &dest_height) == IVI_SUCCEEDED); - runner_assert(dest_width == 1); - runner_assert(dest_height == 1); + runner_assert(prop->dest_width == 1); + runner_assert(prop->dest_height == 1); lyt->commit_changes(); - runner_assert(lyt->surface_get_dimension( - ivisurf, &dest_width, &dest_height) == IVI_SUCCEEDED); - runner_assert(dest_width == 200); - runner_assert(dest_height == 300); - prop = lyt->get_properties_of_surface(ivisurf); runner_assert_or_return(prop); runner_assert(prop->dest_width == 200); @@ -491,8 +482,6 @@ RUNNER_TEST(surface_destination_rectangle) const struct ivi_layout_interface *lyt = ctx->layout_interface; struct ivi_layout_surface *ivisurf; const struct ivi_layout_surface_properties *prop; - int32_t dest_width; - int32_t dest_height; ivisurf = lyt->get_surface_from_id(IVI_TEST_SURFACE_ID(0)); runner_assert(ivisurf != NULL); @@ -516,11 +505,6 @@ RUNNER_TEST(surface_destination_rectangle) lyt->commit_changes(); - runner_assert(lyt->surface_get_dimension( - ivisurf, &dest_width, &dest_height) == IVI_SUCCEEDED); - runner_assert(dest_width == 200); - runner_assert(dest_height == 300); - prop = lyt->get_properties_of_surface(ivisurf); runner_assert_or_return(prop); runner_assert(prop->dest_width == 200); |