曾谨 / EssaAuto

Commit 3b58efeb96fdf8e1acd84cd45a3551a4019dfe95

Authored by zengjin
1 parent 81a4681f

调试完成

Showing 8 changed files with 86 additions and 59 deletions   Show diff stats
Inline Side-by-side
src/main/java/com/essa/framework/BasePage.java
  Show/Hide comments   View file @3b58efe
... ... @@ -676,7 +676,11 @@ public class BasePage {
676 676 */
677 677 protected void dynamicWait(By by) {
678 678 for(int count=0;count<14&&!(isVisibility(by));count++) {
679   - forceWait(500);
  679 + try {
  680 + Thread.sleep(500);
  681 + } catch (Exception e) {
  682 + Logger.Output(LogType.LogTypeName.ERROR, "强行等待失败");
  683 + }
680 684 }
681 685 }
682 686 // /**
... ... @@ -692,7 +696,11 @@ public class BasePage {
692 696 */
693 697 protected void dynamicLoad(By by) {
694 698 for(int count=0;count<14&&isVisibility(by);count++) {
695   - forceWait(500);
  699 + try {
  700 + Thread.sleep(500);
  701 + } catch (Exception e) {
  702 + Logger.Output(LogType.LogTypeName.ERROR, "强行等待失败");
  703 + }
696 704 }
697 705 }
698 706 /**
... ... @@ -723,6 +731,27 @@ public class BasePage {
723 731 }
724 732 return null;
725 733 }
  734 +
  735 + /**
  736 + *粘贴方法
  737 + * @param content 要粘贴的文本
  738 + * @return
  739 + */
  740 + protected void paste(String content){
  741 + StringSelection stringSelection = new StringSelection(content);
  742 + Toolkit.getDefaultToolkit().getSystemClipboard()
  743 + .setContents(stringSelection, null);
  744 + Robot robot = null;
  745 + try {
  746 + robot = new Robot();
  747 + } catch (Exception e1) {
  748 + e1.printStackTrace();
  749 + }
  750 + robot.keyPress(KeyEvent.VK_CONTROL);
  751 + robot.keyPress(KeyEvent.VK_V);
  752 + robot.keyRelease(KeyEvent.VK_V);
  753 + robot.keyRelease(KeyEvent.VK_CONTROL);
  754 + }
726 755  
727 756 /**
728 757 * 获取当前系统时间，得到格式化时间字符串
... ... @@ -736,5 +765,5 @@ public class BasePage {
736 765  
737 766 return df.format(date);
738 767  
739   - }
  768 + }
740 769 }
741 770 \ No newline at end of file
... ...
src/main/java/com/essa/framework/Model.java
  Show/Hide comments   View file @3b58efe
... ... @@ -15,13 +15,13 @@ public class Model {
15 15 public static String env;//所选环境
16 16 public static String buyerAccount;//采购商账号
17 17 public static String buyerPassword;//采购商密码
18   - public static String poNum = "A181117T9194B";//po单号
  18 + public static String poNum = "A181120T9194B";//po单号
19 19 public static int isactivity=0;//是否是活动商品 1：是 0：否
20 20 public static String manager;//商品的类目经理
21 21 public static String serialNum;//待办流水号
22 22 public static String materialName;//物料名称
23 23 public static String projectName;//项目立项书名称
24   - public static String salesman="yanqingping";//业务员
  24 + public static String salesman;//业务员
25 25  
26 26 public static String getSalesman() {
27 27 return salesman;
... ...
src/main/java/com/essa/framework/Tools.java
  Show/Hide comments   View file @3b58efe
... ... @@ -27,6 +27,21 @@ public class Tools {
27 27 String time = format.format(today);
28 28 return time;
29 29 }
  30 + /**
  31 + *格式化当前时间，由于服务器时间与北京时间有误差，这里取值当前时间-5分钟
  32 + * @param
  33 + * @return yyyy/MM/dd HH:mm:ss
  34 + */
  35 + public static String getFormatTime(){
  36 + SimpleDateFormat format = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
  37 + Date today = new Date();
  38 + Calendar cal = Calendar.getInstance();
  39 + cal.setTime(today);
  40 + cal.add(Calendar.MINUTE,-5);
  41 + today = cal.getTime();
  42 + String time = format.format(today);
  43 + return time;
  44 + }
30 45  
31 46 /**
32 47 * 获取当前分和秒，另外加一个随机数，作为注册邮箱的区分的数字
... ...
src/main/java/com/essa/pageObject/LogisticShipp/BookingCarPage.java
  Show/Hide comments   View file @3b58efe
... ... @@ -58,7 +58,9 @@ public class BookingCarPage extends BasePage {
58 58 click(BookingCarSeclType);
59 59 // mywait(BookingCarDate);
60 60 jsExecutorRemoveAttribute(BookingCarDate, "readonly");
61   - sendKeys(BookingCarDate, Tools.getToday());
  61 +// sendKeys(BookingCarDate,);
  62 + click(BookingCarDate);
  63 + paste(Tools.getFormatTime());
62 64 click(SubmitBtn);
63 65 return new BookingCarPage(driver);
64 66 }
... ...
src/main/java/com/essa/pageObject/LogisticShipp/CabinInfoPage.java
  Show/Hide comments   View file @3b58efe
... ... @@ -71,22 +71,17 @@ public class CabinInfoPage extends BasePage {
71 71 mywait(FirstDate);
72 72 SetQuery.sendKeys(Model.getPoNum());
73 73 click(QueryBtn);
74   -// mywait(SelectFirstDate);
75 74 forceWait(1000);
76 75 click(SelectFirstDate);
77 76 click(BookingCabinBtn);
78 77 mywait(SetCabinSONo);
79 78 SetCabinSONo.sendKeys("TestCabinNo");
80   - jsExecutorRemoveAttribute(expectArrivalTime,"readonly");
81   - sendKeys(expectArrivalTime,Tools.getNextMonth());
82 79 jsExecutorRemoveAttribute(LastLoadTimeSet, "readonly");
83   - sendKeys(LastLoadTimeSet, Tools.getToday());//最后装柜时间设置为今天
84   -// LastLoadTimeSet.sendKeys("10/23/2018");
  80 + click(LastLoadTimeSet);
  81 + paste(Tools.getFormatTime());//用键盘粘贴的方式填入时间
85 82 click(Body);
86   -// jsExecutorClick(FileUp);
87 83 actionClick(FileUp);
88 84 uploadFile(Model.getPicPath());
89   -// forceWait(2000);
90 85 dynamicLoad(By.xpath("//img[@ng-src='/img/nopic.jpg']"));//直到默认的图片找不到时，执行下一步
91 86 click(CommitBtn);
92 87 dynamicLoad();
... ...
src/main/java/com/essa/pageObject/StorageManage/HandlingLoadingOrders.java
  Show/Hide comments   View file @3b58efe
... ... @@ -72,7 +72,9 @@ public class HandlingLoadingOrders extends BasePage {
72 72 // SimpleDateFormat zs=new SimpleDateFormat("MM/dd/yyyy");
73 73 // String s =zs.format(new Date());
74 74 // sendKeys(loadCompleteDate,s);
75   - sendKeys(loadCompleteDate, Tools.getToday());
  75 +// sendKeys(loadCompleteDate, Tools.getToday());
  76 + click(loadCompleteDate);
  77 + paste(Tools.getFormatTime());
76 78 click(submit);
77 79 dynamicLoad();
78 80 return new HandlingLoadingOrders(driver);
... ...
src/main/java/com/essa/testSuite/TestLoadContainer.java
  Show/Hide comments   View file @3b58efe
... ... @@ -146,7 +146,7 @@ public class TestLoadContainer extends BaseTest {
146 146 @Test(description = "通知确认船务资料、订车、发车")
147 147 public void confirmLogisticsTest() {
148 148 this.driver = getDriver();
149   - loginValid("chenhong");
  149 + loginValid("chenhong");//
150 150 HomePage homePage = PageFactory.initElements(driver, HomePage.class);
151 151 homePage.toLogisticsShippPage();
152 152  
... ...
src/main/java/swing/SwingMain.java
  Show/Hide comments   View file @3b58efe
... ... @@ -164,9 +164,6 @@ public class SwingMain {
164 164 frmvBy.getContentPane().add(ToCart);
165 165 ToCart.setLayout(null);
166 166  
167   -
168   -
169   -
170 167 //可视化操作选项
171 168 JLabel label_1 = new JLabel("可视化操作：");
172 169 label_1.setBounds(10, 119, 88, 15);
... ... @@ -268,6 +265,19 @@ public class SwingMain {
268 265 browser.setBounds(102, 147, 114, 20);
269 266 browser.setModel(new DefaultComboBoxModel(new String[] { "Chrome", "Firefox", "IE" }));
270 267 frmvBy.getContentPane().add(browser);
  268 +
  269 + //选择图片
  270 + JButton button = new JButton("选择图片");
  271 + button.setFont(new Font("微软雅黑", Font.PLAIN, 14));
  272 + button.setBounds(91, 44, 91, 23);
  273 + addOriginal.add(button);
  274 +
  275 + //必填
  276 + final JLabel notnull = new JLabel("*必填");
  277 + notnull.setFont(new Font("微软雅黑", Font.PLAIN, 12));
  278 + notnull.setBounds(192, 48, 42, 15);
  279 + addOriginal.add(notnull);
  280 + notnull.setForeground(Color.RED);
271 281  
272 282 //场景选择，根据随选场景做对应的交互
273 283 final JComboBox selectScene = new JComboBox();
... ... @@ -282,6 +292,10 @@ public class SwingMain {
282 292 ToCart.setVisible(false);
283 293 POInquiry.setVisible(false);
284 294 register.setVisible(false);
  295 + addOriginal.add(button);
  296 + addOriginal.add(notnull);
  297 + button.setBounds(91, 44, 91, 23);
  298 + notnull.setBounds(192, 48, 42, 15);
285 299 // loadFinish.setVisible(false);
286 300 switch ((String)selectScene.getSelectedItem()){
287 301 default:
... ... @@ -332,10 +346,14 @@ public class SwingMain {
332 346 ja.append(getCurrentTime() + "已选择场景：新增开发商品\r\n");
333 347 break;
334 348 case "装柜完成":
  349 + process.setText(
  350 + "<html><body>装柜流程：<br>1.添加商品到购物车<br>2.询价并拼柜生成PO<br>3.发单、制单<br>4.仓储管理、船务管理至装柜完成<br><br><br></body></html>");
  351 + button.setBounds(0, 120, 91, 23);
  352 + notnull.setBounds(100, 125, 42, 15);
  353 + process.add(button);
  354 + process.add(notnull);
335 355 ToCart.setVisible(true);
336 356 ja.append(getCurrentTime() + "已选择场景：装柜完成，将重启浏览器多次\r\n");
337   - process.setText(
338   - "<html><body>装柜流程：<br>1.添加商品到购物车<br>2.询价并拼柜生成PO<br>3.仓储管理船务管理至装柜完成<br><br><br></body></html>");
339 357 break;
340 358 }
341 359 }
... ... @@ -358,36 +376,19 @@ public class SwingMain {
358 376 supplierName.setText(supplier);
359 377 supplierName.setColumns(10);
360 378  
361   - //选择图片
362   - JButton button = new JButton("选择图片");
363   - button.setFont(new Font("微软雅黑", Font.PLAIN, 14));
364   - button.setBounds(91, 44, 91, 23);
365   - addOriginal.add(button);
366 379  
367 380 JLabel lblSku = new JLabel("商品图片：");
368 381 lblSku.setFont(new Font("微软雅黑", Font.PLAIN, 14));
369 382 lblSku.setBounds(22, 48, 70, 15);
370 383 addOriginal.add(lblSku);
371 384  
372   - final JLabel label_7 = new JLabel("*必填");
373   - label_7.setFont(new Font("微软雅黑", Font.PLAIN, 12));
374   - label_7.setBounds(192, 48, 42, 15);
375   - addOriginal.add(label_7);
376   - label_7.setForeground(Color.RED);
  385 +
377 386  
378 387 //图片地址
379 388 final JLabel picPath = new JLabel("");
380 389 picPath.setVisible(false);
381 390 addOriginal.add(picPath);
382 391  
383   -// //装柜完成场景=============
384   -// final JPanel loadFinish = new JPanel();
385   -// loadFinish.setBounds(231, 42, 230, 128);
386   -//// loadFinish.setVisible(false);
387   -// loadFinish.add(picPath);//添加图片按钮
388   -// loadFinish.add(label_7);//必填项
389   -// frmvBy.getContentPane().add(loadFinish);
390   -// loadFinish.setLayout(null);
391 392  
392 393 JLabel label_5 = new JLabel("采购商编号：");
393 394 label_5.setFont(new Font("微软雅黑", Font.PLAIN, 14));
... ... @@ -419,7 +420,7 @@ public class SwingMain {
419 420 } else {
420 421 ja.append(getCurrentTime() + "选择的图片为：" + s + "\r\n");
421 422 picPath.setText(s);
422   - label_7.setText("已选");
  423 + notnull.setText("已选");
423 424 }
424 425 }
425 426 });
... ... @@ -585,27 +586,16 @@ public class SwingMain {
585 586 switch (Scene){
586 587  
587 588 case "新增市场商品":
588   -// Model.setBuyerNo(buyerNo2.getText());
589   -// Model.setPicPath(picPath.getText());
590   -// Model.setSupplierName(supplierName.getText());
591 589 suites.add(SuitesEnum.ADD_MARKET_GOODS.getSuiteName());
592 590 break;
593 591 case "发布团购":
594 592 AddOriginalGoodsPage.setSupplierName(supplierName.getText());
595   -// Model.setPicPath(picPath.getText());
596 593 suites.add(SuitesEnum.PUBLISH_GROUP_PURCHASE.getSuiteName());
597 594 break;
598 595 case "采购商注册":
599   -// if (!(registerAccount.getText().equals("")
600   -// || registerAccount.getText().equals("若不填写将自动生成"))) {
601   -// Model.setEmail(registerAccount.getText());
602   -// }
603 596 suites.add(SuitesEnum.BUYER_REGISTER.getSuiteName());
604 597 break;
605 598 case "成品询价":
606   -// Model.setBuyerAccount(account.getText());
607   -// Model.setBuyerPassword(password.getText());
608   -// Model.setSkuNo(SkuNo.getText());
609 599 if (Model.getIsactivity() == 1) {
610 600 suites.add(SuitesEnum.ACTIVITY_INQUIRY.getSuiteName());
611 601 }else {
... ... @@ -613,9 +603,6 @@ public class SwingMain {
613 603 }
614 604 break;
615 605 case "生成PO":
616   -// Model.setBuyerAccount(account.getText());
617   -// Model.setBuyerPassword(password.getText());
618   -// Model.setSkuNo(SkuNo.getText());
619 606 if (Model.getIsactivity() == 1) {
620 607 suites.add(SuitesEnum.ACTIVITY_SEND_PO.getSuiteName());
621 608 }else {
... ... @@ -623,22 +610,16 @@ public class SwingMain {
623 610 }
624 611 break;
625 612 case "PO询价":
626   -// Model.setPoNum(po.getText());
627 613 suites.add(SuitesEnum.PO_INQUIRY.getSuiteName());
628 614 break;
629 615 default : //默认新增原厂商品
630 616 AddOriginalGoodsPage.setSupplierName(supplierName.getText());
631   -// Model.setPicPath(picPath.getText());
632 617 suites.add(SuitesEnum.ADD_ORIGINAL_GOODS.getSuiteName());
633 618 break;
634 619 case "新增开发商品":
635   -// Model.setPicPath(picPath.getText());
636 620 suites.add(SuitesEnum.ADD_DEV_GOODS.getSuiteName());
637 621 break;
638 622 case "装柜完成":
639   -// Model.setBuyerAccount(account.getText());
640   -// Model.setBuyerPassword(password.getText());
641   -// Model.setPicPath(picPath.getText());
642 623 suites.add(SuitesEnum.LOAD_FINISH.getSuiteName());
643 624 break;
644 625 }
... ... @@ -677,6 +658,9 @@ public class SwingMain {
677 658 ja.append(getCurrentTime() + "采购商账号：" + Model.getBuyerAccount() + "\r\n");
678 659 ja.append(getCurrentTime() + "PO单号：" + Model.getPoNum() + "\r\n");
679 660 break;
  661 + case "装柜完成":
  662 + ja.append(getCurrentTime() + "PO单号：" + Model.getPoNum() + "\r\n");
  663 + break;
680 664 }
681 665 return null;
682 666 }
... ...