From 363f0b7aeda117d2b74f01d43f6fc959277126d7 Mon Sep 17 00:00:00 2001 From: "Junseok, Kim" Date: Tue, 3 Aug 2021 14:14:15 +0900 Subject: [PATCH] 0013_iconic_state: change color method to setColor from startBGColor using startBGColor to change window's color can cause timing issue of verifyTC. so, use setColor after uniconify request to make buffer commit of window. Change-Id: Ibcd46268fef645cad7e5465f5fdfd1b7154ef4fd --- .../iconify_by_client_uniconify2.png | Bin 5713 -> 5711 bytes .../iconify_by_client_uniconify3.png | Bin 5713 -> 5711 bytes src/testcase/0013_iconic_state.cpp | 42 +++------------------ 3 files changed, 5 insertions(+), 37 deletions(-) diff --git a/data/img/mobile/etTestIconicState/iconify_by_client_uniconify2.png b/data/img/mobile/etTestIconicState/iconify_by_client_uniconify2.png index 487628910782cb2873fecb445e67fa226e552c35..5b4cb9b5885da6e8491434cf2ef1267894ee1036 100644 GIT binary patch delta 84 zcmV-a0IUDeEYB>EHZ256L_t(|obA@34FDkk1VMN~|MjA%;YmnV%;*y*caA*(0Nz^v q=HHta008&1K?3>{vrqxu0TnqO$O{0C(6^lc0000mdKI;Vst05t3#MF0Q* diff --git a/data/img/mobile/etTestIconicState/iconify_by_client_uniconify3.png b/data/img/mobile/etTestIconicState/iconify_by_client_uniconify3.png index 487628910782cb2873fecb445e67fa226e552c35..5b4cb9b5885da6e8491434cf2ef1267894ee1036 100644 GIT binary patch delta 84 zcmV-a0IUDeEYB>EHZ256L_t(|obA@34FDkk1VMN~|MjA%;YmnV%;*y*caA*(0Nz^v q=HHta008&1K?3>{vrqxu0TnqO$O{0C(6^lc0000mdKI;Vst05t3#MF0Q* diff --git a/src/testcase/0013_iconic_state.cpp b/src/testcase/0013_iconic_state.cpp index bd32531..b160a41 100644 --- a/src/testcase/0013_iconic_state.cpp +++ b/src/testcase/0013_iconic_state.cpp @@ -62,17 +62,11 @@ TEST_F(etTestIconicState, iconify_by_client_basic) // init TC window, show=true, geom=false initTC(EINA_TRUE, EINA_FALSE); - // set tw_blue bg color change - tw_blue->startBGColor(0.1); - // Iconify Blue res = etRunner::get().setWinIconic(tw_blue, EINA_TRUE); ASSERT_TRUE(res); ASSERT_ICONIFIED(tw_blue); - // unset tw_blue bg color change - tw_blue->stopBGColor(); - // Expected stack res: // [Top] Blue (iconified) -> Green -> Red [Bottom] list = etRunner::get().getWinInfoList(); @@ -244,9 +238,6 @@ TEST_F(etTestIconicState, iconify_by_client_uniconify) // init TC window, show=true, geom=false initTC(EINA_TRUE, EINA_FALSE); - // set tw_blue bg color change - tw_blue->startBGColor(0.1); - // Iconify Blue res = etRunner::get().setWinIconic(tw_blue, EINA_TRUE); ASSERT_TRUE(res); @@ -255,11 +246,9 @@ TEST_F(etTestIconicState, iconify_by_client_uniconify) // Uniconify Blue res = etRunner::get().setWinIconic(tw_blue, EINA_FALSE); ASSERT_TRUE(res); + tw_blue->setColor(0, 0, 250); // for buffer commit ASSERT_UNICONIFIED(tw_blue); - // unset tw_blue bg color change - tw_blue->stopBGColor(); - // Expected stack res: // [Top] Blue -> Green -> Red [Bottom] list = etRunner::get().getWinInfoList(); @@ -312,9 +301,6 @@ TEST_F(etTestIconicState, iconify_by_client_uniconify2) // init TC window, show=true, geom=false initTC(EINA_TRUE, EINA_FALSE); - // set tw_green bg color change - tw_green->startBGColor(0.1); - // Iconify Green res = etRunner::get().setWinIconic(tw_green, EINA_TRUE); ASSERT_TRUE(res); @@ -322,11 +308,9 @@ TEST_F(etTestIconicState, iconify_by_client_uniconify2) // Uniconify Green res = etRunner::get().setWinIconic(tw_green, EINA_FALSE); ASSERT_TRUE(res); + tw_green->setColor(0, 250, 0); // for buffer commit ASSERT_UNICONIFIED(tw_green); - // unset tw_green bg color change - tw_green->stopBGColor(); - // Expected stack res: // [Top] Green -> Blue -> Red [Bottom] list = etRunner::get().getWinInfoList(); @@ -379,17 +363,12 @@ TEST_F(etTestIconicState, iconify_by_client_uniconify3) // init TC window, show=true, geom=false initTC(EINA_TRUE, EINA_FALSE); - // set tw_green bg color change - tw_green->startBGColor(0.1); - // Uniconify Green res = etRunner::get().setWinIconic(tw_green, EINA_FALSE); ASSERT_TRUE(res); + tw_green->setColor(0, 250, 0); // for buffer commit ASSERT_UNICONIFIED(tw_green); - // unset tw_green bg color change - tw_green->stopBGColor(); - // Expected stack res: // [Top] Green -> Blue -> Red [Bottom] list = etRunner::get().getWinInfoList(); @@ -501,9 +480,6 @@ TEST_F(etTestIconicState, iconify_by_server_uniconify) // init TC window, show=false, geom=false initTC(EINA_FALSE, EINA_FALSE); - // set tw_red bg color change - tw_red->startBGColor(0.1); - // show tw_red res = showTCWin(tw_red); ASSERT_TRUE(res); @@ -521,11 +497,9 @@ TEST_F(etTestIconicState, iconify_by_server_uniconify) elm_win_alpha_set(tw_green->elm_win, EINA_TRUE); // event check tw_red is uniconified + tw_red->setColor(250, 0, 0); // for buffer commit ASSERT_UNICONIFIED(tw_red); - // stop tw_red bg color change - tw_red->stopBGColor(); - // Expected stack res: // [Top] Green (alpha) -> Red [Bottom] list = etRunner::get().getWinInfoList(); @@ -570,20 +544,14 @@ TEST_F(etTestIconicState, iconify_by_server_uniconify2) // init TC window, show=true, geom=false initTC(EINA_TRUE, EINA_FALSE); - // set tw_green bg color change - tw_green->startBGColor(0.1); - // change all window to 32bit colored window elm_win_alpha_set(tw_blue->elm_win, EINA_TRUE); elm_win_alpha_set(tw_green->elm_win, EINA_TRUE); elm_win_alpha_set(tw_red->elm_win, EINA_TRUE); - // event check tw_red is iconified_by_server + // event check tw_red is uniconified_by_server ASSERT_UNICONIFIED(tw_red); - // stop tw_green bg color change - tw_green->stopBGColor(); - // Expected stack res: // [Top] Blue -> Green -> Red [Bottom] list = etRunner::get().getWinInfoList(); -- 2.7.4