Authored by 陈林

增加出售场景与浏览场景混合。review by 李犇

@@ -26,14 +26,9 @@ module.exports = { @@ -26,14 +26,9 @@ module.exports = {
26 { op: 'YB_PAGE_ENTER', name: "进入商品列表页面", equals: {"TYPE_ID":"ufo_productList"} }, 26 { op: 'YB_PAGE_ENTER', name: "进入商品列表页面", equals: {"TYPE_ID":"ufo_productList"} },
27 { op: 'UFO_PRD_LIST_L', name: "商品列表第一页商品ID曝光", types: { PRD_LIST: String } }, 27 { op: 'UFO_PRD_LIST_L', name: "商品列表第一页商品ID曝光", types: { PRD_LIST: String } },
28 28
29 - { op: 'YB_PAGE_EXIT', name: "退出商品列表页面", equals: {"TYPE_ID":"ufo_productList"} },  
30 -  
31 - { op: 'UFO_MAIN_EVENT', name: "商品点击", types: { PRD_ID: String } }, 29 + { op: 'UFO_PRD_LIST_C', name: "商品列表页面点击商品", types: { PRD_ID: String } },
32 { op: 'YB_PAGE_ENTER', name: "进入商品详情页面", equals: {"TYPE_ID":"ufo_productDetail"} }, 30 { op: 'YB_PAGE_ENTER', name: "进入商品详情页面", equals: {"TYPE_ID":"ufo_productDetail"} },
33 - { op: 'UFO_PRD_DT_INFO', name: "商品详情页面上报", equals: {"FP_NAME":"aFP_UFOHome"}, types: {PRD_ID: String} },  
34 -  
35 - { op: 'YB_PAGE_EXIT', name: "退出商品详情页面", equals: {"TYPE_ID":"ufo_productDetail"} },  
36 - 31 + { op: 'UFO_PRD_DT_INFO', name: "商品详情页面上报", equals: {"FP_NAME":"aFP_UFOSeriesList"}, types: {PRD_ID: String} },
37 32
38 ] 33 ]
39 }; 34 };
@@ -9,18 +9,6 @@ const { @@ -9,18 +9,6 @@ const {
9 9
10 module.exports = { 10 module.exports = {
11 [ANDROID_CASE_UFO_SELL]:[ 11 [ANDROID_CASE_UFO_SELL]:[
12 - { op: 'YB_LAUNCH_APP', name: '启动app', single: true},  
13 - { op: 'YB_ENTER_CHOICE', name: '性别男女入口', single: true},  
14 -  
15 - { op: 'YB_UFO', name: 'TAB BAR 点击UFO'},  
16 - { op: 'UFO_BROWSE_HOME', name: 'UFO首页浏览上报'},  
17 - { op: 'UFO_MAIN_START', name: "UFO频道打开", single: true},  
18 - { op: 'YB_SHOW_EVENT', name: "曝光事件", types: { DATA: Array } },  
19 -  
20 - { op: 'UFO_MAIN_EVENT', name: "商品点击", types: { PRD_ID: String } },  
21 - { op: 'YB_PAGE_ENTER', name: "进入商品详情页面", equals: {"TYPE_ID":"ufo_productDetail"} },  
22 - { op: 'UFO_PRD_DT_INFO', name: "商品详情页面上报", equals: {"FP_NAME":"aFP_UFOHome"}, types: {PRD_ID: String} },  
23 -  
24 { op: 'UFO_PRD_DT_SALE_C', name: "商品详情点击购买按钮", types: {PRD_ID: String} }, 12 { op: 'UFO_PRD_DT_SALE_C', name: "商品详情点击购买按钮", types: {PRD_ID: String} },
25 13
26 { op: 'YB_PAGE_EXIT', name: "退出商品详情页面", equals: {"TYPE_ID":"ufo_productDetail"} }, 14 { op: 'YB_PAGE_EXIT', name: "退出商品详情页面", equals: {"TYPE_ID":"ufo_productDetail"} },
@@ -28,6 +16,10 @@ module.exports = { @@ -28,6 +16,10 @@ module.exports = {
28 16
29 { op: 'UFO_SALE_ORD', name: "UFO出售结果", types: { PRD_ID: String, PRD_SKU: String} }, 17 { op: 'UFO_SALE_ORD', name: "UFO出售结果", types: { PRD_ID: String, PRD_SKU: String} },
30 18
  19 + { op: 'YB_PAGE_FINISH', name: "关闭出售页面", equals: {"TYPE_ID":"ufo_sellVC"} },
  20 + { op: 'YB_PAGE_EXIT', name: "关闭出售页面", equals: {"TYPE_ID":"ufo_sellVC"} },
  21 + { op: 'YB_PAGE_ENTER', name: "进入商品详情页面", equals: {"TYPE_ID":"ufo_productDetail"} },
  22 +
31 23
32 ] 24 ]
33 }; 25 };
@@ -36,12 +36,12 @@ describe(ANDROID_CASE_UFO_BROWSE, 'Android UFO首页测试用例', async(driver) @@ -36,12 +36,12 @@ describe(ANDROID_CASE_UFO_BROWSE, 'Android UFO首页测试用例', async(driver)
36 // 暂停 36 // 暂停
37 await driver.sleep(ACTION_PAUSE_TIME); 37 await driver.sleep(ACTION_PAUSE_TIME);
38 38
39 - //退出系列列表  
40 - let quitSearialView = await driver.waitForElementByXPath('/hierarchy/android.widget.FrameLayout/android.widget.LinearLayout/android.widget.FrameLayout/android.widget.LinearLayout/android.widget.RelativeLayout/android.widget.LinearLayout/android.widget.FrameLayout/android.view.ViewGroup/android.view.ViewGroup/android.view.ViewGroup/android.view.ViewGroup/android.view.ViewGroup[2]/android.view.ViewGroup/android.view.ViewGroup/android.view.ViewGroup[1]/android.view.ViewGroup/android.widget.ImageView', FIND_VIEW_OVER_TIME);  
41 - await quitSearialView.click(); 39 + // //退出系列列表
  40 + // let quitSearialView = await driver.waitForElementByXPath('/hierarchy/android.widget.FrameLayout/android.widget.LinearLayout/android.widget.FrameLayout/android.widget.LinearLayout/android.widget.RelativeLayout/android.widget.LinearLayout/android.widget.FrameLayout/android.view.ViewGroup/android.view.ViewGroup/android.view.ViewGroup/android.view.ViewGroup/android.view.ViewGroup[2]/android.view.ViewGroup/android.view.ViewGroup/android.view.ViewGroup[1]/android.view.ViewGroup/android.widget.ImageView', FIND_VIEW_OVER_TIME);
  41 + // await quitSearialView.click();
42 42
43 //进入商品详情 43 //进入商品详情
44 - let goodsView = await driver.waitForElementByXPath('/hierarchy/android.widget.FrameLayout/android.widget.FrameLayout/android.view.ViewGroup[1]/android.widget.LinearLayout/android.widget.FrameLayout/android.widget.LinearLayout/android.widget.FrameLayout/android.widget.RelativeLayout/android.widget.FrameLayout[1]/android.widget.RelativeLayout/android.widget.FrameLayout/android.widget.FrameLayout/android.view.ViewGroup/android.view.ViewGroup/android.view.ViewGroup/android.view.ViewGroup/android.view.ViewGroup[2]/android.view.ViewGroup/android.widget.ScrollView/android.view.ViewGroup/android.view.ViewGroup[6]/android.view.ViewGroup', FIND_VIEW_OVER_TIME); 44 + let goodsView = await driver.waitForElementByXPath('/hierarchy/android.widget.FrameLayout/android.widget.LinearLayout/android.widget.FrameLayout/android.widget.LinearLayout/android.widget.RelativeLayout/android.widget.LinearLayout/android.widget.FrameLayout/android.view.ViewGroup/android.view.ViewGroup/android.view.ViewGroup/android.view.ViewGroup/android.view.ViewGroup[1]/android.widget.ScrollView/android.view.ViewGroup/android.view.ViewGroup/android.view.ViewGroup/android.view.ViewGroup[1]/android.view.ViewGroup/android.view.ViewGroup[1]', FIND_VIEW_OVER_TIME);
45 await goodsView.click(); 45 await goodsView.click();
46 46
47 // 暂停 47 // 暂停