From: gyeongseok.seo Date: Wed, 28 Nov 2012 05:37:53 +0000 (+0900) Subject: [Title] Added TcIDE in main.cpp and tc_compliance_web_ide.lua in main.lua, Fixed... X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=78cc7cc63d8b760e44ab576287287869399ef044;p=sdk%2Femulator%2Femulator-test.git [Title] Added TcIDE in main.cpp and tc_compliance_web_ide.lua in main.lua, Fixed env tc. [Desc.] added TcIDE suite. and Added main.lua call web ide tc, and fix web ide's env tc. [Issue] #7526 Change-Id: I966185640de5a7b7ac3851a59a15b47bb72b99bd --- diff --git a/vts/script/main.lua b/vts/script/main.lua index d37300e..0f3b53d 100644 --- a/vts/script/main.lua +++ b/vts/script/main.lua @@ -20,27 +20,29 @@ model:SetEnv(env); local script_path = "..//script//" +-- test case lua file import dofile(script_path .. "tc_emulator_manager.lua") dofile(script_path .. "tc_network.lua") dofile(script_path .. "tc_av.lua") dofile(script_path .. "tc_camera.lua") dofile(script_path .. "tc_event_injector.lua") dofile(script_path .. "tc_skinserver.lua") +dofile(script_path .. "tc_compliance_web_ide.lua") tclib.kill_emulator(); - +-- call test case in each lua file's function test_emulator_manager(env); test_network_check(); test_audio_video(); --test_camera(); test_event_injector(); - +test_compliance_web_ide(env); tclib.kill_emulator(); test_skinserver(); - +-- -- print("All test was completed"); -- diff --git a/vts/script/tc_compliance_web_ide.lua b/vts/script/tc_compliance_web_ide.lua index 7809a59..2b94a34 100644 --- a/vts/script/tc_compliance_web_ide.lua +++ b/vts/script/tc_compliance_web_ide.lua @@ -31,13 +31,13 @@ function add_env_check_test(web_ide_suite) -- wrt check local wrt_check = ssdb("wrt check"); - wrt_check:AddParam1("rpm -qa | grep wrt"); - wrt_check:SetSuccessToken(); -- TODO + wrt_check:AddParam1("rpm -qa | grep wrt | wc -l"); + wrt_check:SetSuccessToken("6"); -- wrt module num 6 (wrt-installer, plugins-common, setting, commons, plugins-tizen, wrt ) -- webkit check local webkit_check = ssdb("webkit check"); webkit_check:AddParam1("rpm -qa | grep webkit"); - webkit_check:SetSuccessToken(); --TODO + webkit_check:SetSuccessToken("webkit2-efl"); -- make tc, and added case tc_env_check = cmd_suite("target enviroment checking test"); @@ -50,7 +50,7 @@ function add_env_check_test(web_ide_suite) tc_env_check:SetLevel(1); -- set to tclevel -- add Test suite - web_ide_suite(tc_env_check); + web_ide_suite:AddTest(tc_env_check); end -- Test - create project diff --git a/vts/src/main.cpp b/vts/src/main.cpp index be8ef89..6d15cca 100644 --- a/vts/src/main.cpp +++ b/vts/src/main.cpp @@ -226,6 +226,12 @@ void register_lua_funcs(lua_State *L) .method("AddNetTest", &TsSS::AddNetTest) .method("Remove", &TsSS::Remove); + m.subclass("TsIDE") + .constructor() + .method("runTest", &TsSS::runTest) + .method("AddTest", &TsSS::AddTest) + .method("Remove", &TsSS::Remove); + m.subclass("TsEventInjector") .constructor() .method("runTest", &TsSS::runTest)