From 04c272b89e91a9c03fc39462e16ace8299e1b590 Mon Sep 17 00:00:00 2001 From: Changgyu Choi Date: Wed, 12 Jan 2022 16:15:41 +0900 Subject: [PATCH] Reduce unittest timeout interval This patch is for saving the time to run unittest. Change-Id: I6cc6b49d35d6d4bc232fb3dc363a8813c5f3731f Signed-off-by: Changgyu Choi --- unittests/app_core_base_test.cc | 40 ++++++++++++++-------------- unittests/app_core_efl_base_test.cc | 28 +++++++++---------- unittests/app_core_multi_window_base_test.cc | 16 +++++------ 3 files changed, 42 insertions(+), 42 deletions(-) diff --git a/unittests/app_core_base_test.cc b/unittests/app_core_base_test.cc index 7d63a8d..57ca17f 100644 --- a/unittests/app_core_base_test.cc +++ b/unittests/app_core_base_test.cc @@ -142,7 +142,7 @@ TEST_F(AppCoreBaseTest, AppCoreBase_Run) { EXPECT_CALL(core, OnCreate()) .WillOnce(Invoke([&core]() -> int { core.AppCoreBase::OnCreate(); - g_timeout_add(1000, [](gpointer data) -> gboolean { + g_timeout_add(400, [](gpointer data) -> gboolean { auto* obj = static_cast*>(data); obj->Exit(); return G_SOURCE_REMOVE; @@ -162,7 +162,7 @@ TEST_F(AppCoreBaseTest, AppCoreBase_Init_Fini) { EXPECT_CALL(core, OnCreate()) .WillOnce(Invoke([&core]() -> int { core.AppCoreBase::OnCreate(); - g_timeout_add(1000, [](gpointer data) -> gboolean { + g_timeout_add(400, [](gpointer data) -> gboolean { auto* obj = static_cast*>(data); obj->Exit(); return G_SOURCE_REMOVE; @@ -183,7 +183,7 @@ TEST_F(AppCoreBaseTest, AppCoreBase_Run_Again) { ON_CALL(core, OnCreate()) .WillByDefault(Invoke([&core]() -> int { core.AppCoreBase::OnCreate(); - g_timeout_add(1000, [](gpointer data) -> gboolean { + g_timeout_add(400, [](gpointer data) -> gboolean { auto* obj = static_cast*>(data); obj->Exit(); return G_SOURCE_REMOVE; @@ -207,7 +207,7 @@ TEST_F(AppCoreBaseTest, AppCoreBase_OnControl) { EXPECT_CALL(core, OnCreate()) .WillOnce(Invoke([&core]() -> int { core.AppCoreBase::OnCreate(); - g_timeout_add(1000, [](gpointer data) -> gboolean { + g_timeout_add(400, [](gpointer data) -> gboolean { auto* obj = static_cast*>(data); obj->Exit(); return G_SOURCE_REMOVE; @@ -229,7 +229,7 @@ TEST_F(AppCoreBaseTest, AppCoreBase_AddEvent) { EXPECT_CALL(core, OnCreate()) .WillOnce(Invoke([&core]() -> int { core.AppCoreBase::OnCreate(); - g_timeout_add(1000, [](gpointer data) -> gboolean { + g_timeout_add(400, [](gpointer data) -> gboolean { auto* obj = static_cast*>(data); obj->RaiseEvent(9216, IAppCore::IEvent::Type::LOW_MEMORY); obj->RaiseEvent("test", IAppCore::IEvent::Type::LOW_MEMORY); @@ -258,7 +258,7 @@ TEST_F(AppCoreBaseTest, AppCoreBase_AllowBG) { EXPECT_CALL(core, OnCreate()) .WillOnce(Invoke([&core]() -> int { core.AppCoreBase::OnCreate(); - g_timeout_add(1000, [](gpointer data) -> gboolean { + g_timeout_add(400, [](gpointer data) -> gboolean { auto* obj = static_cast*>(data); obj->Exit(); return G_SOURCE_REMOVE; @@ -297,7 +297,7 @@ TEST_F(AppCoreBaseTest, AppCoreBase_FlushMemory) { .WillOnce(Invoke([&core]() -> int { core.AppCoreBase::OnCreate(); - g_timeout_add(1000, [](gpointer data) -> gboolean { + g_timeout_add(400, [](gpointer data) -> gboolean { auto* obj = static_cast*>(data); obj->FlushMemory(); obj->Exit(); @@ -336,7 +336,7 @@ TEST_F(AppCoreBaseTest, AppCoreBase_GetRotationState) { .WillOnce(Invoke([&core, &rst]() -> int { core.AppCoreBase::OnCreate(); rst = AppCoreBase::GetRotationState(); - g_timeout_add(1000, [](gpointer data) -> gboolean { + g_timeout_add(400, [](gpointer data) -> gboolean { auto* obj = static_cast*>(data); obj->Exit(); return G_SOURCE_REMOVE; @@ -375,7 +375,7 @@ TEST_F(AppCoreBaseTest, AppCoreBase_LockCb) { core.AppCoreBase::OnCreate(); GetMock().ChangeBool(VCONFKEY_SETAPPL_AUTO_ROTATE_SCREEN_BOOL, true); rst = AppCoreBase::GetRotationState(); - g_timeout_add(1000, [](gpointer data) -> gboolean { + g_timeout_add(400, [](gpointer data) -> gboolean { auto* obj = static_cast*>(data); obj->Exit(); return G_SOURCE_REMOVE; @@ -402,7 +402,7 @@ TEST_F(AppCoreBaseTest, AppCoreBase_ChargerStatusChangedCb) { core.AppCoreBase::OnCreate(); GetMock().ChangeInt(VCONFKEY_SYSMAN_CHARGER_STATUS, 0); GetMock().ChangeInt(VCONFKEY_SYSMAN_CHARGER_STATUS, 1); - g_timeout_add(1000, [](gpointer data) -> gboolean { + g_timeout_add(400, [](gpointer data) -> gboolean { auto* obj = static_cast*>(data); obj->Exit(); return G_SOURCE_REMOVE; @@ -427,7 +427,7 @@ TEST_F(AppCoreBaseTest, AppCoreBase_AddEvent_LanguageChanged) { EXPECT_CALL(core, OnCreate()) .WillOnce(Invoke([&core]() -> int { core.AppCoreBase::OnCreate(); - g_timeout_add(1000, [](gpointer data) -> gboolean { + g_timeout_add(400, [](gpointer data) -> gboolean { auto* obj = static_cast*>(data); obj->Exit(); return G_SOURCE_REMOVE; @@ -465,7 +465,7 @@ TEST_F(AppCoreBaseTest, AppCoreBase_AddEvent_RegionChanged) { EXPECT_CALL(core, OnCreate()) .WillOnce(Invoke([&core]() -> int { core.AppCoreBase::OnCreate(); - g_timeout_add(1000, [](gpointer data) -> gboolean { + g_timeout_add(400, [](gpointer data) -> gboolean { auto* obj = static_cast*>(data); obj->Exit(); return G_SOURCE_REMOVE; @@ -503,7 +503,7 @@ TEST_F(AppCoreBaseTest, AppCoreBase_AddEvent_LowBattery) { EXPECT_CALL(core, OnCreate()) .WillOnce(Invoke([&core]() -> int { core.AppCoreBase::OnCreate(); - g_timeout_add(1000, [](gpointer data) -> gboolean { + g_timeout_add(400, [](gpointer data) -> gboolean { auto* obj = static_cast*>(data); obj->Exit(); return G_SOURCE_REMOVE; @@ -535,7 +535,7 @@ TEST_F(AppCoreBaseTest, AppCoreBase_AddEvent_LowMemory) { EXPECT_CALL(core, OnCreate()) .WillOnce(Invoke([&core]() -> int { core.AppCoreBase::OnCreate(); - g_timeout_add(1000, [](gpointer data) -> gboolean { + g_timeout_add(400, [](gpointer data) -> gboolean { auto* obj = static_cast*>(data); obj->Exit(); return G_SOURCE_REMOVE; @@ -607,7 +607,7 @@ TEST_F(AppCoreBaseTest, AppCoreBase_OnReceive_AUL_RESUME) { EXPECT_CALL(core, OnCreate()) .WillOnce(Invoke([&core]() -> int { core.AppCoreBase::OnCreate(); - g_timeout_add(1000, [](gpointer data) -> gboolean { + g_timeout_add(400, [](gpointer data) -> gboolean { auto* obj = static_cast*>(data); obj->Exit(); return G_SOURCE_REMOVE; @@ -638,7 +638,7 @@ TEST_F(AppCoreBaseTest, AppCoreBase_OnReceive_AUL_UPDATE_REQUESTED) { EXPECT_CALL(core, OnCreate()) .WillOnce(Invoke([&core]() -> int { core.AppCoreBase::OnCreate(); - g_timeout_add(1000, [](gpointer data) -> gboolean { + g_timeout_add(400, [](gpointer data) -> gboolean { auto* obj = static_cast*>(data); obj->Exit(); return G_SOURCE_REMOVE; @@ -666,7 +666,7 @@ TEST_F(AppCoreBaseTest, AppCoreBase_OnReceive_INVALID_EVENT) { EXPECT_CALL(core, OnCreate()) .WillOnce(Invoke([&core]() -> int { core.AppCoreBase::OnCreate(); - g_timeout_add(1000, [](gpointer data) -> gboolean { + g_timeout_add(400, [](gpointer data) -> gboolean { auto* obj = static_cast*>(data); obj->Exit(); return G_SOURCE_REMOVE; @@ -694,7 +694,7 @@ TEST_F(AppCoreBaseTest, AppCoreBase_OnReceive_AUL_TERMINATE_INST) { EXPECT_CALL(core, OnCreate()) .WillOnce(Invoke([&core]() -> int { core.AppCoreBase::OnCreate(); - g_timeout_add(1000, [](gpointer data) -> gboolean { + g_timeout_add(400, [](gpointer data) -> gboolean { auto* obj = static_cast*>(data); obj->Exit(); return G_SOURCE_REMOVE; @@ -722,7 +722,7 @@ TEST_F(AppCoreBaseTest, AppCoreBase_OnReceive_AUL_SUSPEND) { EXPECT_CALL(core, OnCreate()) .WillOnce(Invoke([&core]() -> int { core.AppCoreBase::OnCreate(); - g_timeout_add(1000, [](gpointer data) -> gboolean { + g_timeout_add(400, [](gpointer data) -> gboolean { auto* obj = static_cast*>(data); obj->Exit(); return G_SOURCE_REMOVE; @@ -753,7 +753,7 @@ TEST_F(AppCoreBaseTest, AppCoreBase_OnReceive_AUL_WAKE) { .WillOnce(Invoke([&core]() -> int { core.AppCoreBase::OnCreate(); core.ToggleSuspendedState(); - g_timeout_add(1000, [](gpointer data) -> gboolean { + g_timeout_add(400, [](gpointer data) -> gboolean { auto* obj = static_cast*>(data); obj->Exit(); return G_SOURCE_REMOVE; diff --git a/unittests/app_core_efl_base_test.cc b/unittests/app_core_efl_base_test.cc index bb74996..ec8d075 100644 --- a/unittests/app_core_efl_base_test.cc +++ b/unittests/app_core_efl_base_test.cc @@ -124,7 +124,7 @@ TEST_F(AppCoreEflBaseTest, AppCoreEflBase_Run) { EXPECT_CALL(core, OnCreate()) .WillOnce(Invoke([&core]() -> int { core.AppCoreEflBase::OnCreate(); - g_timeout_add(1000, [](gpointer data) -> gboolean { + g_timeout_add(400, [](gpointer data) -> gboolean { auto* obj = static_cast*>(data); obj->Exit(); return G_SOURCE_REMOVE; @@ -155,7 +155,7 @@ TEST_F(AppCoreEflBaseTest, AppCoreEflBase_AddEvent_OnTrimMemory) { EXPECT_CALL(core, OnCreate()) .WillOnce(Invoke([&core]() -> int { core.AppCoreEflBase::OnCreate(); - g_timeout_add(6000, [](gpointer data) -> gboolean { + g_timeout_add(3000, [](gpointer data) -> gboolean { auto* obj = static_cast*>(data); obj->Exit(); return G_SOURCE_REMOVE; @@ -186,7 +186,7 @@ TEST_F(AppCoreEflBaseTest, AppCoreEflBase_AddEvent_SetSystemResourceReclaiming) EXPECT_CALL(core, OnCreate()) .WillOnce(Invoke([&core]() -> int { core.AppCoreEflBase::OnCreate(); - g_timeout_add(6000, [](gpointer data) -> gboolean { + g_timeout_add(3000, [](gpointer data) -> gboolean { auto* obj = static_cast*>(data); obj->Exit(); return G_SOURCE_REMOVE; @@ -217,7 +217,7 @@ TEST_F(AppCoreEflBaseTest, AppCoreEflBase_OnResume) { EXPECT_CALL(core, OnCreate()) .WillOnce(Invoke([&core]() -> int { core.AppCoreEflBase::OnCreate(); - g_timeout_add(1000, [](gpointer data) -> gboolean { + g_timeout_add(400, [](gpointer data) -> gboolean { auto* obj = static_cast*>(data); obj->Exit(); return G_SOURCE_REMOVE; @@ -275,7 +275,7 @@ TEST_F(AppCoreEflBaseTest, AppCoreEflBase_RaiseWin) { EXPECT_CALL(core, OnCreate()) .WillOnce(Invoke([&core]() -> int { core.AppCoreEflBase::OnCreate(); - g_timeout_add(3000, [](gpointer data) -> gboolean { + g_timeout_add(1500, [](gpointer data) -> gboolean { auto* obj = static_cast*>(data); obj->Exit(); return G_SOURCE_REMOVE; @@ -340,7 +340,7 @@ TEST_F(AppCoreEflBaseTest, AppCoreEflBase_PauseWin) { EXPECT_CALL(core, OnCreate()) .WillOnce(Invoke([&core]() -> int { core.AppCoreEflBase::OnCreate(); - g_timeout_add(3000, [](gpointer data) -> gboolean { + g_timeout_add(1500, [](gpointer data) -> gboolean { auto* obj = static_cast*>(data); obj->Exit(); return G_SOURCE_REMOVE; @@ -401,7 +401,7 @@ TEST_F(AppCoreEflBaseTest, AppCoreEflBase_AUL_RESUME) { EXPECT_CALL(core, OnCreate()) .WillOnce(Invoke([&core]() -> int { core.AppCoreEflBase::OnCreate(); - g_timeout_add(3000, [](gpointer data) -> gboolean { + g_timeout_add(1500, [](gpointer data) -> gboolean { auto* obj = static_cast*>(data); obj->Exit(); return G_SOURCE_REMOVE; @@ -526,7 +526,7 @@ TEST_F(AppCoreEflBaseTest, AppCoreEflBase_VcElm) { EXPECT_CALL(core, OnCreate()) .WillOnce(Invoke([&core]() -> int { core.AppCoreEflBase::OnCreate(); - g_timeout_add(1000, [](gpointer data) -> gboolean { + g_timeout_add(400, [](gpointer data) -> gboolean { auto* obj = static_cast*>(data); obj->Exit(); return G_SOURCE_REMOVE; @@ -569,7 +569,7 @@ TEST_F(AppCoreEflBaseTest, AppCoreEflBase_VcElm2) { EXPECT_CALL(core, OnCreate()) .WillOnce(Invoke([&core]() -> int { core.AppCoreEflBase::OnCreate(); - g_timeout_add(1000, [](gpointer data) -> gboolean { + g_timeout_add(400, [](gpointer data) -> gboolean { auto* obj = static_cast*>(data); GetMock().ChangeBool(VCONFKEY_VC_VOICE_TOUCH_AUTOMODE, false); GetMock().ChangeBool(VCONFKEY_VC_VOICE_TOUCH_AUTOMODE, true); @@ -615,7 +615,7 @@ TEST_F(AppCoreEflBaseTest, AppCoreEflBase_Aux) { EXPECT_CALL(core, OnCreate()) .WillOnce(Invoke([&core]() -> int { core.AppCoreEflBase::OnCreate(); - g_timeout_add(1000, [](gpointer data) -> gboolean { + g_timeout_add(400, [](gpointer data) -> gboolean { auto* obj = static_cast*>(data); obj->Exit(); return G_SOURCE_REMOVE; @@ -660,7 +660,7 @@ TEST_F(AppCoreEflBaseTest, AppCoreEflBase_IsLegacyLifecycle) { EXPECT_CALL(core, OnCreate()) .WillOnce(Invoke([&core]() -> int { core.AppCoreEflBase::OnCreate(); - g_timeout_add(1000, [](gpointer data) -> gboolean { + g_timeout_add(400, [](gpointer data) -> gboolean { auto* obj = static_cast*>(data); obj->Exit(); return G_SOURCE_REMOVE; @@ -689,7 +689,7 @@ TEST_F(AppCoreEflBaseTest, AppCoreEflBase_ApplyBgState) { EXPECT_CALL(core, OnCreate()) .WillOnce(Invoke([&core]() -> int { core.AppCoreEflBase::OnCreate(); - g_timeout_add(1000, [](gpointer data) -> gboolean { + g_timeout_add(400, [](gpointer data) -> gboolean { auto* obj = static_cast*>(data); obj->Exit(); return G_SOURCE_REMOVE; @@ -759,7 +759,7 @@ TEST_F(AppCoreEflBaseTest, AppCoreEflBase_Plugin) { EXPECT_CALL(core, OnCreate()) .WillOnce(Invoke([&core]() -> int { core.AppCoreEflBase::OnCreate(); - g_timeout_add(1000, [](gpointer data) -> gboolean { + g_timeout_add(400, [](gpointer data) -> gboolean { auto* obj = static_cast*>(data); obj->Exit(); return G_SOURCE_REMOVE; @@ -789,7 +789,7 @@ TEST_F(AppCoreEflBaseTest, AppCoreEflBase_Plugin2) { EXPECT_CALL(core, OnCreate()) .WillOnce(Invoke([&core]() -> int { core.AppCoreEflBase::OnCreate(); - g_timeout_add(1000, [](gpointer data) -> gboolean { + g_timeout_add(400, [](gpointer data) -> gboolean { auto* obj = static_cast*>(data); obj->Exit(); return G_SOURCE_REMOVE; diff --git a/unittests/app_core_multi_window_base_test.cc b/unittests/app_core_multi_window_base_test.cc index b00f1a0..a6cd385 100644 --- a/unittests/app_core_multi_window_base_test.cc +++ b/unittests/app_core_multi_window_base_test.cc @@ -102,7 +102,7 @@ TEST_F(AppCoreMultiWindowBaseTest, AppCoreMultiWindowBase_Run) { EXPECT_CALL(core, OnCreate()) .WillOnce(Invoke([&core]() -> int { core.AppCoreMultiWindowBase::OnCreate(); - g_timeout_add(1000, [](gpointer data) -> gboolean { + g_timeout_add(400, [](gpointer data) -> gboolean { auto* obj = static_cast*>(data); obj->Exit(); return G_SOURCE_REMOVE; @@ -127,7 +127,7 @@ TEST_F(AppCoreMultiWindowBaseTest, AppCoreMultiWindowBase_AddContextFactory) { auto f = std::make_shared(context_id, &core); core.AddContextFactory(f, context_id); ret_factory = core.GetContextFactory(context_id); - g_timeout_add(1000, [](gpointer data) -> gboolean { + g_timeout_add(400, [](gpointer data) -> gboolean { auto* obj = static_cast*>(data); obj->Exit(); return G_SOURCE_REMOVE; @@ -154,7 +154,7 @@ TEST_F(AppCoreMultiWindowBaseTest, AppCoreMultiWindowBase_RunContext) { .WillOnce(Invoke([&]() -> int { core.AppCoreMultiWindowBase::OnCreate(); core.AddContextFactory(f, context_id); - g_timeout_add(1000, [](gpointer data) -> gboolean { + g_timeout_add(400, [](gpointer data) -> gboolean { auto* obj = static_cast*>(data); obj->Exit(); return G_SOURCE_REMOVE; @@ -196,7 +196,7 @@ TEST_F(AppCoreMultiWindowBaseTest, AppCoreMultiWindowBase_ExitContext) { .WillOnce(Invoke([&]() -> int { core.AppCoreMultiWindowBase::OnCreate(); core.AddContextFactory(f, context_id); - g_timeout_add(1000, [](gpointer data) -> gboolean { + g_timeout_add(400, [](gpointer data) -> gboolean { auto* obj = static_cast*>(data); obj->Exit(); return G_SOURCE_REMOVE; @@ -236,7 +236,7 @@ TEST_F(AppCoreMultiWindowBaseTest, AppCoreMultiWindowBase_Resume) { .WillOnce(Invoke([&]() -> int { core.AppCoreMultiWindowBase::OnCreate(); core.AddContextFactory(f, context_id); - g_timeout_add(1000, [](gpointer data) -> gboolean { + g_timeout_add(400, [](gpointer data) -> gboolean { auto* obj = static_cast*>(data); obj->Exit(); return G_SOURCE_REMOVE; @@ -278,7 +278,7 @@ TEST_F(AppCoreMultiWindowBaseTest, AppCoreMultiWindowBase_OnVisibility) { .WillOnce(Invoke([&]() -> int { core.AppCoreMultiWindowBase::OnCreate(); core.AddContextFactory(f, context_id); - g_timeout_add(1000, [](gpointer data) -> gboolean { + g_timeout_add(400, [](gpointer data) -> gboolean { auto* obj = static_cast*>(data); obj->Exit(); return G_SOURCE_REMOVE; @@ -356,7 +356,7 @@ TEST_F(AppCoreMultiWindowBaseTest, AppCoreMultiWindowBase_OnAuxMessage) { .WillOnce(Invoke([&]() -> int { core.AppCoreMultiWindowBase::OnCreate(); core.AddContextFactory(f, context_id); - g_timeout_add(1000, [](gpointer data) -> gboolean { + g_timeout_add(400, [](gpointer data) -> gboolean { auto* obj = static_cast*>(data); obj->Exit(); return G_SOURCE_REMOVE; @@ -410,7 +410,7 @@ TEST_F(AppCoreMultiWindowBaseTest, AppCoreMultiWindowBase_FindById) { .WillOnce(Invoke([&]() -> int { core.AppCoreMultiWindowBase::OnCreate(); core.AddContextFactory(f, context_id); - g_timeout_add(1000, [](gpointer data) -> gboolean { + g_timeout_add(400, [](gpointer data) -> gboolean { auto* obj = static_cast*>(data); obj->Exit(); return G_SOURCE_REMOVE; -- 2.7.4