summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorUcan, Emre \(ADITG/SW1\) <eucan@de.adit-jv.com>2016-03-04 12:50:43 +0000
committerBryce Harrington <bryce@osg.samsung.com>2016-03-04 10:33:34 -0800
commit161da40b068cdf7d9daca0762f0180789bfe3ec5 (patch)
treea33294c2079cf0dc83fe544b24f8ddc8c66eb9d3 /tests
parent5bb068d16d08b99ff171d02a5e67377e6cb3d4e8 (diff)
downloadweston-161da40b068cdf7d9daca0762f0180789bfe3ec5.tar.gz
ivi-shell: remove ivi_layout_surface_set_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.c11
-rw-r--r--tests/ivi_layout-test-plugin.c16
-rw-r--r--tests/ivi_layout-test.c1
3 files changed, 3 insertions, 25 deletions
diff --git a/tests/ivi_layout-internal-test.c b/tests/ivi_layout-internal-test.c
index 7ec29482..2c924e53 100644
--- a/tests/ivi_layout-internal-test.c
+++ b/tests/ivi_layout-internal-test.c
@@ -101,16 +101,6 @@ test_surface_bad_dimension(struct test_context *ctx)
}
static void
-test_surface_bad_position(struct test_context *ctx)
-{
- const struct ivi_layout_interface *lyt = ctx->layout_interface;
-
- iassert(lyt->surface_set_position(NULL, 20, 30) == IVI_FAILED);
-
- lyt->commit_changes();
-}
-
-static void
test_surface_bad_source_rectangle(struct test_context *ctx)
{
const struct ivi_layout_interface *lyt = ctx->layout_interface;
@@ -1041,7 +1031,6 @@ run_internal_tests(void *data)
test_surface_bad_destination_rectangle(ctx);
test_surface_bad_orientation(ctx);
test_surface_bad_dimension(ctx);
- test_surface_bad_position(ctx);
test_surface_bad_source_rectangle(ctx);
test_surface_bad_properties(ctx);
diff --git a/tests/ivi_layout-test-plugin.c b/tests/ivi_layout-test-plugin.c
index 8097563c..00b1e87d 100644
--- a/tests/ivi_layout-test-plugin.c
+++ b/tests/ivi_layout-test-plugin.c
@@ -458,8 +458,9 @@ RUNNER_TEST(surface_position)
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_set_destination_rectangle(
+ ivisurf, 20, 30,
+ prop->dest_width, prop->dest_height) == IVI_SUCCEEDED);
runner_assert(prop->dest_x == 0);
runner_assert(prop->dest_y == 0);
@@ -631,17 +632,6 @@ RUNNER_TEST(commit_changes_after_dimension_set_surface_destroy)
ivisurf, 200, 300) == IVI_SUCCEEDED);
}
-RUNNER_TEST(commit_changes_after_position_set_surface_destroy)
-{
- const struct ivi_layout_interface *lyt = ctx->layout_interface;
- struct ivi_layout_surface *ivisurf;
-
- ivisurf = lyt->get_surface_from_id(IVI_TEST_SURFACE_ID(0));
- runner_assert(ivisurf != NULL);
- runner_assert(lyt->surface_set_position(
- ivisurf, 20, 30) == IVI_SUCCEEDED);
-}
-
RUNNER_TEST(commit_changes_after_source_rectangle_set_surface_destroy)
{
const struct ivi_layout_interface *lyt = ctx->layout_interface;
diff --git a/tests/ivi_layout-test.c b/tests/ivi_layout-test.c
index 6c739dae..196ef8fb 100644
--- a/tests/ivi_layout-test.c
+++ b/tests/ivi_layout-test.c
@@ -205,7 +205,6 @@ const char * const surface_property_commit_changes_test_names[] = {
"commit_changes_after_opacity_set_surface_destroy",
"commit_changes_after_orientation_set_surface_destroy",
"commit_changes_after_dimension_set_surface_destroy",
- "commit_changes_after_position_set_surface_destroy",
"commit_changes_after_source_rectangle_set_surface_destroy",
"commit_changes_after_destination_rectangle_set_surface_destroy",
};