summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorUcan, Emre \(ADITG/SW1\) <eucan@de.adit-jv.com>2016-03-04 12:50:20 +0000
committerBryce Harrington <bryce@osg.samsung.com>2016-03-04 10:33:34 -0800
commitb2ff255792a4208b7f864421f5635bc2e281f544 (patch)
tree06eed3f6cdb029fb58e2a23caae486db5a6c354c /tests
parentc3aee1f67f09594b4ecb746a9b038ba10aeb0967 (diff)
ivi-shell: remove ivi_layout_surface_get_position 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.c7
-rw-r--r--tests/ivi_layout-test-plugin.c27
2 files changed, 6 insertions, 28 deletions
diff --git a/tests/ivi_layout-internal-test.c b/tests/ivi_layout-internal-test.c
index 3e31870f..cb34fc1f 100644
--- a/tests/ivi_layout-internal-test.c
+++ b/tests/ivi_layout-internal-test.c
@@ -113,17 +113,10 @@ static void
test_surface_bad_position(struct test_context *ctx)
{
const struct ivi_layout_interface *lyt = ctx->layout_interface;
- struct ivi_layout_surface *ivisurf = NULL;
- int32_t dest_x;
- int32_t dest_y;
iassert(lyt->surface_set_position(NULL, 20, 30) == IVI_FAILED);
lyt->commit_changes();
-
- iassert(lyt->surface_get_position(NULL, &dest_x, &dest_y) == IVI_FAILED);
- iassert(lyt->surface_get_position(ivisurf, NULL, &dest_y) == IVI_FAILED);
- iassert(lyt->surface_get_position(ivisurf, &dest_x, NULL) == IVI_FAILED);
}
static void
diff --git a/tests/ivi_layout-test-plugin.c b/tests/ivi_layout-test-plugin.c
index db6155b0..ed316353 100644
--- a/tests/ivi_layout-test-plugin.c
+++ b/tests/ivi_layout-test-plugin.c
@@ -463,32 +463,23 @@ RUNNER_TEST(surface_position)
const struct ivi_layout_interface *lyt = ctx->layout_interface;
struct ivi_layout_surface *ivisurf;
const struct ivi_layout_surface_properties *prop;
- int32_t dest_x;
- int32_t dest_y;
ivisurf = lyt->get_surface_from_id(IVI_TEST_SURFACE_ID(0));
runner_assert(ivisurf != NULL);
- runner_assert(lyt->surface_get_position(
- ivisurf, &dest_x, &dest_y) == IVI_SUCCEEDED);
- runner_assert(dest_x == 0);
- runner_assert(dest_y == 0);
+ prop = lyt->get_properties_of_surface(ivisurf);
+ runner_assert_or_return(prop);
+ runner_assert(prop->dest_x == 0);
+ runner_assert(prop->dest_y == 0);
runner_assert(lyt->surface_set_position(
ivisurf, 20, 30) == IVI_SUCCEEDED);
- runner_assert(lyt->surface_get_position(
- ivisurf, &dest_x, &dest_y) == IVI_SUCCEEDED);
- runner_assert(dest_x == 0);
- runner_assert(dest_y == 0);
+ runner_assert(prop->dest_x == 0);
+ runner_assert(prop->dest_y == 0);
lyt->commit_changes();
- runner_assert(lyt->surface_get_position(
- ivisurf, &dest_x, &dest_y) == IVI_SUCCEEDED);
- runner_assert(dest_x == 20);
- runner_assert(dest_y == 30);
-
prop = lyt->get_properties_of_surface(ivisurf);
runner_assert_or_return(prop);
runner_assert(prop->dest_x == 20);
@@ -502,8 +493,6 @@ RUNNER_TEST(surface_destination_rectangle)
const struct ivi_layout_surface_properties *prop;
int32_t dest_width;
int32_t dest_height;
- int32_t dest_x;
- int32_t dest_y;
ivisurf = lyt->get_surface_from_id(IVI_TEST_SURFACE_ID(0));
runner_assert(ivisurf != NULL);
@@ -532,10 +521,6 @@ RUNNER_TEST(surface_destination_rectangle)
runner_assert(dest_width == 200);
runner_assert(dest_height == 300);
- runner_assert(lyt->surface_get_position(ivisurf, &dest_x, &dest_y) == IVI_SUCCEEDED);
- runner_assert(dest_x == 20);
- runner_assert(dest_y == 30);
-
prop = lyt->get_properties_of_surface(ivisurf);
runner_assert_or_return(prop);
runner_assert(prop->dest_width == 200);