summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorUcan, Emre \(ADITG/SW1\) <eucan@de.adit-jv.com>2016-03-04 12:50:50 +0000
committerBryce Harrington <bryce@osg.samsung.com>2016-03-04 10:33:34 -0800
commit45d394281628a5b1c9615920b975a2e7dd7210e0 (patch)
tree73361e27799e7f622372421b54669b9ec4ae698f /tests
parente62bfd8d5e440fcdc23f42077d7e3096d8335d82 (diff)
ivi-shell: remove ivi_layout_surface_set_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.c11
-rw-r--r--tests/ivi_layout-test-plugin.c14
-rw-r--r--tests/ivi_layout-test.c1
3 files changed, 2 insertions, 24 deletions
diff --git a/tests/ivi_layout-internal-test.c b/tests/ivi_layout-internal-test.c
index 8dd2e6ac..1e22c759 100644
--- a/tests/ivi_layout-internal-test.c
+++ b/tests/ivi_layout-internal-test.c
@@ -91,16 +91,6 @@ test_surface_bad_orientation(struct test_context *ctx)
}
static void
-test_surface_bad_dimension(struct test_context *ctx)
-{
- const struct ivi_layout_interface *lyt = ctx->layout_interface;
-
- iassert(lyt->surface_set_dimension(NULL, 200, 300) == 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;
@@ -1001,7 +991,6 @@ run_internal_tests(void *data)
test_surface_bad_visibility(ctx);
test_surface_bad_destination_rectangle(ctx);
test_surface_bad_orientation(ctx);
- test_surface_bad_dimension(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 00b1e87d..7c72c36c 100644
--- a/tests/ivi_layout-test-plugin.c
+++ b/tests/ivi_layout-test-plugin.c
@@ -431,7 +431,8 @@ RUNNER_TEST(surface_dimension)
runner_assert(prop->dest_height == 1);
runner_assert(IVI_SUCCEEDED ==
- lyt->surface_set_dimension(ivisurf, 200, 300));
+ lyt->surface_set_destination_rectangle(ivisurf, prop->dest_x,
+ prop->dest_y, 200, 300));
runner_assert(prop->dest_width == 1);
runner_assert(prop->dest_height == 1);
@@ -621,17 +622,6 @@ RUNNER_TEST(commit_changes_after_orientation_set_surface_destroy)
ivisurf, WL_OUTPUT_TRANSFORM_90) == IVI_SUCCEEDED);
}
-RUNNER_TEST(commit_changes_after_dimension_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_dimension(
- ivisurf, 200, 300) == 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 196ef8fb..e2ee5c44 100644
--- a/tests/ivi_layout-test.c
+++ b/tests/ivi_layout-test.c
@@ -204,7 +204,6 @@ const char * const surface_property_commit_changes_test_names[] = {
"commit_changes_after_visibility_set_surface_destroy",
"commit_changes_after_opacity_set_surface_destroy",
"commit_changes_after_orientation_set_surface_destroy",
- "commit_changes_after_dimension_set_surface_destroy",
"commit_changes_after_source_rectangle_set_surface_destroy",
"commit_changes_after_destination_rectangle_set_surface_destroy",
};