From 2476f92c3767101b95aab7506ceafbd59a36c671 Mon Sep 17 00:00:00 2001 From: bawangflower <52619481@qq.com> Date: Thu, 8 Dec 2016 17:20:43 +0800 Subject: [PATCH] goPage --- lib/common.js | 12 +++++++-- suite1.js | 9 ++++--- testcase/purchase/purchase.js | 2 +- testcase/purchaseOrder/purchaseOrder.js | 9 +++---- testcase/salesOrder/salesOrder.js | 11 ++++---- testcase/shopIn/shopIn.js | 36 ++++++++++--------------- testcase/wangLai/customer.js | 18 +++++-------- 7 files changed, 47 insertions(+), 50 deletions(-) diff --git a/lib/common.js b/lib/common.js index 7a839d0..fffdbf4 100644 --- a/lib/common.js +++ b/lib/common.js @@ -1005,7 +1005,8 @@ function getTFields(fn1, view, keys, show) { f.index = idx; } } - logDebug("getTFields i=" + i + " key=" + key + " f1=" + f1); + logDebug("getTFields i=" + i + " key=" + key + " f1=" + f1 + " index=" + + f.index); ret[key] = f; } return ret; @@ -1045,6 +1046,14 @@ function getToday(yFmt) { function goPage(page, qr) { var total = qr.totalPageNo; var curPageIndex = qr.curPageNo + "/" + total; + // UIAElementNil from + // target.frontMostApp().mainWindow().staticTexts()["负数代表欠款;黄色欠款报警/undefined"] + if (isUndefined(total)) {// 翻页验证时可能会出错，再取一遍 + delay(0.5); + qr = getQR(); + total = qr.totalPageNo; + curPageIndex = qr.curPageNo + "/" + total; + } if (total > 1 && page <= total && page > 0) { // window.staticTexts()[curPageIndex].tapWithOptions({ tapOffset : { // x : 0.08, y : 0.55 } });//坐标不稳定 @@ -1060,7 +1069,6 @@ function goPage(page, qr) { } else { logDebug("goPage 目标页=" + page + " 总页数=" + total + "，无需换页或失败"); } - } /** * 返回与的结果，如果输入参数是个函数，确保会执行，输入可多个 diff --git a/suite1.js b/suite1.js index 0f1e5b6..4db6b80 100644 --- a/suite1.js +++ b/suite1.js @@ -19,8 +19,8 @@ function test000All() { var caseName="测试用例"; // TITLE_SXE = getTitleSXE();//新综合汇总 列表标题 // testCheckMenuAll();//菜单检查，跑用例前先跑一遍 -// run(caseName, "test160087");// - run(caseName, "test160020_160022");// +// run(caseName, "test110001");// + run(caseName, "onlyTest");// } function onlyTest(){ // delay(); @@ -29,8 +29,9 @@ function onlyTest(){ // target.flickFromTo({ x:515, y:238 }, {x:515, y:197}) // delay(); try{ - -// tapMenu("销售订货", "新增订货+"); + + +// tapMenu("销售订货", "新增订货+"); // var json = { "客户" : "xw", "明细" : [ { "货品" : "3035", "数量" : [ 10 ] } ], // "现金" : 1000, "刷卡" : [ 400 ], "汇款" : [ 600 ] }; // editSalesBill(json, colorSize); diff --git a/testcase/purchase/purchase.js b/testcase/purchase/purchase.js index 5f4e9b7..a96cd60 100644 --- a/testcase/purchase/purchase.js +++ b/testcase/purchase/purchase.js @@ -2444,7 +2444,7 @@ function test120047_2() { var keys = { "款号" : "3035", "厂商" : "Vell", "款号名称" : "jkk", "日期从" : getDay(-15), "到" : getToday(), "门店" : "常青店" }; var fields = getQueryTFields(keys); - var ret = dropDownListCheck(fields["款号"].inedx, "303", "3035jkk"); + var ret = dropDownListCheck(fields["款号"].index, "303", "3035jkk"); query(fields); var qr = getQR(); ret = isAnd(ret, isEqual("3035", qr.data[0]["款号"])); diff --git a/testcase/purchaseOrder/purchaseOrder.js b/testcase/purchaseOrder/purchaseOrder.js index ffdcf9d..5e2a286 100644 --- a/testcase/purchaseOrder/purchaseOrder.js +++ b/testcase/purchaseOrder/purchaseOrder.js @@ -346,11 +346,10 @@ function ts130002_2() { var key1 = { "门店" : "常青店", "厂商" : "Vell", "日期从" : getToday(), "到" : getToday(), "备注" : "123" }// 这个是明细备注 var keys = mixObject(key1, kCode); - var fields = purchaseOrderQueryParticularFields(keys); - query(fields); - var qr = getQR(); + var fields = conditionQuery(keys); + var qr = getQR(), ret; if (qr.data.length > 0) { - var ret = isEqualObject(qr.data[0], exp); + ret = isEqualObject(qr.data[0], exp); } else { ret = false; } @@ -358,7 +357,7 @@ function ts130002_2() { tapButton(window, CLEAR); var text = getTextFields(window); for (var i = 0; i < text.length; i++) { - if (i == 3 || i == 4) { + if (i == fields["日期从"].index || i == fields["到"].index) { ret = ret && isEqual(getToday(), getTextFieldValue(window, i)); } else { ret = ret && isEqual("", getTextFieldValue(window, i)); diff --git a/testcase/salesOrder/salesOrder.js b/testcase/salesOrder/salesOrder.js index 7463627..47e6e4b 100644 --- a/testcase/salesOrder/salesOrder.js +++ b/testcase/salesOrder/salesOrder.js @@ -2179,10 +2179,10 @@ function test160087() { tapMenu("销售订货", "新增订货+"); var json = { "客户" : "xw", - "明细" : [ { "货品" : "3035", "数量" : [ 20 ] }, + "明细" : [ { "货品" : "3035", "数量" : [ 30 ] }, { "货品" : "4562", "数量" : [ 20 ] } ], "现金" : 8000 }; editSalesBill(json, colorSize); - var ret = test160087Field("操作成功"); + var ret = test160087Field("保存成功"); tapMenu("销售开单", "按订货开单"); query(); @@ -2212,6 +2212,7 @@ function test160087Field(msg) { tapPrompt(); var ret = isIn(alertMsg, msg); tapReturn(); + delay();// 等待返回 return ret; } // 兼容160080 @@ -2918,12 +2919,12 @@ function test160170ShopIn() { tapReturn(); tapMenu("门店调入", "在途调拨"); - query(); - tapLine(); + tapButton(window, QUERY); + tapLine(i); tapButtonAndAlert("调 入", OK); tapMenu("门店调入", "按批次查"); query(); - tapLine(i); + tapLine(); ret = isAnd(ret, test160170Field(rmk)); tapReturn(); diff --git a/testcase/shopIn/shopIn.js b/testcase/shopIn/shopIn.js index 7fa8979..98b7ca4 100644 --- a/testcase/shopIn/shopIn.js +++ b/testcase/shopIn/shopIn.js @@ -130,8 +130,7 @@ function ts150013() { function ts140001() { tapMenu("门店调出", "按批次查"); var keys = { "调出门店" : "中洲店" }; - var fields = shopOutQueryBatchFields(keys); - query(fields); + conditionQuery(keys); var qr = getQR(); var outExp = qr.data[0]; tapFirstText(); @@ -145,8 +144,7 @@ function ts140001() { tapMenu("门店调入", "在途调拨"); keys = { "调出门店" : "中洲店", "批次从" : outExp["批次"], "批次到" : outExp["批次"] }; - fields = shopInFlitFields(keys); - query(fields); + conditionQuery(keys); qr = getQR(); var ret = false; if (qr.data.length > 0) { @@ -155,42 +153,37 @@ function ts140001() { ret = isEqualObject2(qr.data[0], outExp); tapLine(); var sIndata = getQRDet().data; - tapButton(window, RETURN); + tapReturn(); ret = isAnd(ret, isEqualDyadicArray(expData, sIndata)); // 验证未调入单的批次应该不显示 tapMenu2("按批次查"); keys = { "调出门店" : "中洲店", "调出批次从" : outExp["批次"], "调出批次到" : outExp["批次"] }; - fields = shopInQueryBatchFields(keys); - query(fields); + conditionQuery(keys); qr = getQR(); ret = isAnd(ret, isEqual(0, qr.data.length)); // 取调入批次 keys = { "日期从" : getDay(-15), "调入门店" : "常青店" }; - fields = shopInQueryBatchFields(keys); - query(fields); + conditionQuery(keys); qr = getQR(); var inBatch = Number(qr.data[0]["批次"]) + 1; // 按明细查应该不显示未调入批次 tapMenu2("按明细查"); - fields = shopInQueryParticularFields(keys); - query(fields); + conditionQuery(keys); qr = getQR(); ret = isAnd(ret, isEqual(1, sub(inBatch, qr.data[0]["批次"]))) tapMenu("货品管理", "当前库存"); keys = { "款号" : code, "颜色" : expData[0]["颜色"], "尺码" : expData[0]["尺码"] }; - var fields = queryGoodsStockFields(keys); - query(fields); + conditionQuery(keys); qr = getQR(); var stData = ts140001Field(qr); tapMenu2("库存分布") keys = { "类别" : "登山服" }; - fields = queryGoodsDistributionFields(keys); - query(fields); + conditionQuery(keys); var date = getDetTS100006(code); tapMenu("门店调入", "在途调拨"); @@ -215,15 +208,14 @@ function ts140001() { tapMenu2("按批次查"); keys = { "调出门店" : "中洲店", "调入门店" : "常青店", "批次从" : inBatch, "批次到" : inBatch, "调出批次从" : outExp["批次"], "调出批次到" : outExp["批次"] }; - fields = shopInQueryBatchFields(keys); - query(fields); + conditionQuery(keys); qr = getQR(); var exp = { "批次" : inBatch, "调出批次" : outExp["批次"], "调出门店" : "中洲店", "调入门店" : "常青店", "送货人" : "总经理200", "数量" : 40, "金额" : 6400, "操作人" : "总经理", "备注" : "InPre" }; tapFirstText(); sIndata = getQRDet().data; - tapButton(window, RETURN); + tapReturn(); ret = isAnd(ret, isEqualObject2(exp, qr.data[0]), isEqualDyadicArray( sIndata, expData)); // 清除 @@ -237,9 +229,9 @@ function ts140001() { } tapMenu2("按明细查"); - keys = { "款号" : code, "款号名称" : name, "调出门店" : "中洲店", "调入门店" : "常青店" }; - fields = shopInQueryParticularFields(keys); - query(fields); + keys = { "日期从" : getToday(), "日期到" : getToday(), "款号" : code, + "款号名称" : name, "调出门店" : "中洲店", "调入门店" : "常青店" }; + var fields = conditionQuery(keys); qr = getQR(); var jo1 = { "调出门店" : "中洲店", "调入门店" : "常青店", "批次" : inBatch, "款号" : code, "名称" : name, "颜色" : "均色", "尺码" : "均码", "数量" : 15, @@ -269,7 +261,7 @@ function ts140001() { // 清除 tapButton(window, CLEAR); for (var i = 0; i < 6; i++) { - if (i == 3 || i == 4) { + if (i == fields["日期从"].index || i == fields["日期到"].index) { ret = ret && isEqual(getToday(), getTextFieldValue(window, i)); } else { ret = ret && isEqual("", getTextFieldValue(window, i)); diff --git a/testcase/wangLai/customer.js b/testcase/wangLai/customer.js index 5f87205..86b885f 100644 --- a/testcase/wangLai/customer.js +++ b/testcase/wangLai/customer.js @@ -140,8 +140,7 @@ function test110001() { var total = qr.total; var keys = { "客户" : "zbs" }; - var qFields = queryCustomerFields(keys); - query(qFields); + conditionQuery(keys); qr = getQR(); var ret = isEqual("赵本山", qr.data[0]["名称"]); @@ -154,13 +153,12 @@ function test110001() { ret = isAnd(ret, isEqual(actual, qr.data[0]["名称"])); keys = { "客户" : "0309" }; - qFields = queryCustomerFields(keys); - query(qFields); + conditionQuery(keys); qr = getQR(); ret = isAnd(ret, isEqual("0309", qr.data[0]["名称"])); - var fields = queryCustomerFields([ "名称", "手机", "地址" ]); - var f = new TField("名称", TF, fields["名称"].index, "xiao"); + var fields = queryCustomerFields([ "客户名称", "手机", "地址" ]); + var f = new TField("客户名称", TF, fields["客户名称"].index, "xiao"); ret = isAnd(ret, checkFuzzyQuery(f, "名称"));// 客户名称模糊查询 f.value = "小"; ret = isAnd(ret, checkFuzzyQuery(f, "名称"));// 客户名称模糊查询 @@ -178,8 +176,7 @@ function test110001() { if (ipadVer >= 7.21) { keys["门店"] = "常青店"; } - qFields = queryCustomerFields(keys); - query(qFields); + conditionQuery(keys); qr = getQR(); // 返回结果确定只有一条 var exp = { "名称" : "赵本山", "生日" : "15-03-06", "店员" : "总经理", @@ -188,13 +185,12 @@ function test110001() { isEqual(1, qr.totalPageNo)); query(); - for (var i = 0; i < 6; i++) { + for (var i = 0; i < 8; i++) { ret = ret && isEqual("", getTextFieldValue(window, i)); } // 清除后显示所有客户 qr = getQR(); ret = isAnd(ret, isEqual(total, qr.total)); - return ret; } @@ -4440,7 +4436,7 @@ function ts110111() { } function ts110112() { tapMenu("销售开单", ADDBILL); - var jo = { "客户" : "sjkh1" }; + var jo = { "客户" : "sjkh1", "未付" : "yes" };// 生成欠款单，使之在客户账款的2级界面显示 var det = editOverLengthBillDet(); var json = mixObject(jo, det); editSalesBill(json, colorSize);// 超长订单，方便数据验证