From d60c62632d34573a1a5639cbe9682690e6346f3c Mon Sep 17 00:00:00 2001 From: "daiyoung777.kim" Date: Sat, 1 Dec 2012 16:21:36 +0900 Subject: [PATCH] - verified codes on linux for compliance check --- package/changelog | 5 ++++ package/pkginfo.manifest | 4 +-- vts/script/main.lua | 10 +++++--- vts/script/tc_compliance_da.lua | 3 +++ vts/script/tc_compliance_native_ide.lua | 1 + vts/script/tc_compliance_web_ide.lua | 1 + vts/script/tc_emulator_manager.lua | 44 +++++++++++++++++++++++++++++++++ vts/src/main.cpp | 6 +++-- vts/src/tcbase.cpp | 2 +- vts/src/tcbase.h | 3 +++ 10 files changed, 70 insertions(+), 9 deletions(-) diff --git a/package/changelog b/package/changelog index 0600f5c..d4e5623 100644 --- a/package/changelog +++ b/package/changelog @@ -1,3 +1,8 @@ +*0.0.3 +- added compliance check for emulator image +== daiyoung, kim 2012-12-01 + + *0.0.2 - enhance test script and code == daiyoung, kim 2012-11-15 diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest index 339596f..96fb3ff 100644 --- a/package/pkginfo.manifest +++ b/package/pkginfo.manifest @@ -1,9 +1,9 @@ Source: emulator-test -Version: 0.0.2 +Version: 0.0.3 Maintainer: Yeong-Kyoon Lee Package: emulator-test OS: ubuntu-32 Build-host-os: ubuntu-32 -Description: Emulator Tester +Description: Emulator Test diff --git a/vts/script/main.lua b/vts/script/main.lua index 5bb872e..3478157 100644 --- a/vts/script/main.lua +++ b/vts/script/main.lua @@ -36,25 +36,27 @@ dofile(script_path .. "tc_event_injector.lua") dofile(script_path .. "tc_skinserver.lua") dofile(script_path .. "tc_compliance_web_ide.lua") dofile(script_path .. "tc_compliance_native_ide.lua") +dofile(script_path .. "tc_compliance_da.lua") - ---tclib.kill_emulator(); +tclib.kill_emulator(); -- call test case in each lua file's function -test_emulator_manager(env); +--test_emulator_manager(env); +prepare_compliance_check(env); --test_network_check(); --test_audio_video(); --test_camera(); --test_event_injector(); test_compliance_web_ide(env); test_compliance_native_ide(env); +test_compliance_da(env); + tclib.kill_emulator(); --test_skinserver(); -- ---model:Stop(); -- print("All test was completed"); -- -- diff --git a/vts/script/tc_compliance_da.lua b/vts/script/tc_compliance_da.lua index 222f911..61e2687 100644 --- a/vts/script/tc_compliance_da.lua +++ b/vts/script/tc_compliance_da.lua @@ -124,6 +124,9 @@ function test_compliance_da(env) add_library_test(da_suite); add_platform_test(da_suite); add_debug_file_test(da_suite); + + AddTestSuite(da_suite); + da_suite:runTest(); print (" ===================== da compliance test end!!! ===================== "); diff --git a/vts/script/tc_compliance_native_ide.lua b/vts/script/tc_compliance_native_ide.lua index 35f2243..aeb8fdd 100644 --- a/vts/script/tc_compliance_native_ide.lua +++ b/vts/script/tc_compliance_native_ide.lua @@ -182,6 +182,7 @@ function test_compliance_native_ide(env) add_on_demand_test(native_ide_suite) add_misc_test(native_ide_suite) + AddTestSuite(native_ide_suite); -- start native_ide_suite:runTest(); diff --git a/vts/script/tc_compliance_web_ide.lua b/vts/script/tc_compliance_web_ide.lua index e8c1346..4d58208 100644 --- a/vts/script/tc_compliance_web_ide.lua +++ b/vts/script/tc_compliance_web_ide.lua @@ -258,6 +258,7 @@ function test_compliance_web_ide(env) add_query_test(web_ide_suite) add_uninstall_test(web_ide_suite) + AddTestSuite(web_ide_suite); -- start web_ide_suite:runTest(); diff --git a/vts/script/tc_emulator_manager.lua b/vts/script/tc_emulator_manager.lua index 95e229c..ef19d86 100644 --- a/vts/script/tc_emulator_manager.lua +++ b/vts/script/tc_emulator_manager.lua @@ -63,3 +63,47 @@ function test_emulator_manager(env) end +function launch_for_image(em_suite) + --local img_path = "../res/img/xxx.img" + --local create_vm_from_img = sjava("create from img"); + --create_vm_from_img:AddParam1('create --name ' .. env.vmname .. ' -p' .. img_path); + + local create_vm_from_img = sjava("create"); + create_vm_from_img:AddParam1('create --name ' .. env.vmname .. ' --base 1'); + + local launch = sjava("launch"); + launch:AddParam1('launch -n ' .. env.vmname); + launch:SetSuccessToken("Success"); + + -- wait until Emulator initialization would be completed + local check = ssdb("launch check"); + check:AddParam1("ps -A | grep menu-screen"); + check:SetSuccessToken("menu-screen"); + check:SetTimeout(2, 160000, "menu-screen"); -- repeat command until timeout + + tc_launch = cmd_suite("emulator launching test"); + tc_launch:AddCmdTest(create_vm_from_img); + tc_launch:AddCmdTest(launch); + tc_launch:AddCmdTest(check); + + tc_launch:SetLevel(1); -- set to tclevel + + em_suite:AddTest(tc_launch); +end + + +function prepare_compliance_check(env) + + em_suite = TsEM("start emulator"); + + -- add launching test case for the compliance check + launch_for_image(em_suite); + + -- add to test model + AddTestSuite(em_suite); + + em_suite:runTest(); + +end + + diff --git a/vts/src/main.cpp b/vts/src/main.cpp index ca60159..4108587 100644 --- a/vts/src/main.cpp +++ b/vts/src/main.cpp @@ -87,8 +87,10 @@ int main(int argc, char** argv) return 1; } - //ReportMgr* mgr = GetReportMgr(); - //mgr->Destroy(); + TCModel* model = GetTCModel(); + + ReportMgr* mgr = model->GetReportMgr(); + mgr->Destroy(); //lua_close(L); return 0; diff --git a/vts/src/tcbase.cpp b/vts/src/tcbase.cpp index 61cdf4e..d8cc0f8 100644 --- a/vts/src/tcbase.cpp +++ b/vts/src/tcbase.cpp @@ -17,7 +17,7 @@ namespace te_test { TObj::TObj(const char* name) : m_bOptional(false), m_parent(NULL), m_tclevel(eTC_LEVEL_TESTCASE), - m_bResult(false), m_name(name), m_desc("-"), + m_bResult(true), m_name(name), m_desc("-"), m_tot_cnt(0), m_succ_cnt(0), m_fail_cnt(0), m_not_tested(0), m_RepeatCount(1) { m_model = GetTCModel(); diff --git a/vts/src/tcbase.h b/vts/src/tcbase.h index e525af0..56b2fc0 100644 --- a/vts/src/tcbase.h +++ b/vts/src/tcbase.h @@ -45,6 +45,9 @@ public: bool GetResult(std::string& result) { + if (m_successToken.empty()) + return true; + std::string::size_type iPos; iPos = result.find(m_successToken.c_str(), 0); if (iPos == std::string::npos) -- 2.7.4