曾谨 / EssaAuto

Commit 22a05aab17eb3b591461fb0d76e8cd2e23752f25

Authored by huangyuanbo914@163.com
2 parents 492c1c63 d2051686

Merge branch 'dev_test' of http://gitlab.essa.top:88/zengjin/EssaAuto into dev_test 

# Conflicts:
#	src/main/java/com/essa/pageObject/HomePage.java
Showing 6 changed files with 24 additions and 62 deletions   Show diff stats
Inline Side-by-side
src/main/java/com/essa/framework/BasePage1.java deleted
View file @492c1c6
@@ -1,38 +0,0 @@ @@ -1,38 +0,0 @@
1 -package com.essa.framework;  
2 -  
3 -import org.openqa.selenium.WebDriver;  
4 -import org.openqa.selenium.WebElement;  
5 -  
6 -public class BasePage1 {  
7 - public static WebDriver driver;  
8 - /**  
9 - * 构造方法  
10 - * @param driver  
11 - */  
12 - public BasePage1(WebDriver driver) {  
13 - BasePage.driver = driver;  
14 - }  
15 - /**  
16 - * 填写文本  
17 - * @param element 元素  
18 - * @param text 文本值  
19 - */  
20 - protected void sendKeys(WebElement element, String text) {  
21 - element.clear();// 清除原有文本  
22 - element.sendKeys(text);  
23 - }  
24 - /**  
25 - * 鼠标左键点击  
26 - * @param element 元素  
27 - */  
28 - protected void click(WebElement element) {  
29 - element.click();  
30 - }  
31 - /**  
32 - * 获取当前页面的标题  
33 - * @return 标题  
34 - */  
35 - protected String getCurrentPageTitle() {  
36 - return driver.getTitle();  
37 - }  
38 -}  
src/main/java/com/essa/pageObject/Documentary/PODocumentaryPage.java deleted
View file @492c1c6
@@ -1,17 +0,0 @@ @@ -1,17 +0,0 @@
1 -package com.essa.pageObject.Documentary;  
2 -  
3 -import org.openqa.selenium.WebDriver;  
4 -  
5 -import com.essa.framework.BasePage;  
6 -  
7 -/**  
8 - * @author Administrator  
9 - *PO跟单页面  
10 - */  
11 -public class PODocumentaryPage extends BasePage {  
12 -  
13 - public PODocumentaryPage(WebDriver driver) {  
14 - super(driver);  
15 - }  
16 -  
17 -}  
src/main/java/com/essa/pageObject/SupplierOperationsTrackPage.java renamed to src/main/java/com/essa/pageObject/SupplierManage/SupplierOperationsTrackPage.java
  Show/Hide comments   View file @22a05aa
1 -package com.essa.pageObject; 1 +package com.essa.pageObject.SupplierManage;
2 2
3 import org.openqa.selenium.WebDriver; 3 import org.openqa.selenium.WebDriver;
4 import org.openqa.selenium.WebElement; 4 import org.openqa.selenium.WebElement;
@@ -6,6 +6,11 @@ import org.openqa.selenium.support.FindBy; @@ -6,6 +6,11 @@ import org.openqa.selenium.support.FindBy;
6 6
7 import com.essa.framework.BasePage; 7 import com.essa.framework.BasePage;
8 8
  9 +/*
  10 +* @Description:BD跟进管理页面
  11 +* @Author: ZengJin
  12 +* @CreateTime: 2018/10/29
  13 +*/
9 public class SupplierOperationsTrackPage extends BasePage { 14 public class SupplierOperationsTrackPage extends BasePage {
10 public SupplierOperationsTrackPage(WebDriver driver) { 15 public SupplierOperationsTrackPage(WebDriver driver) {
11 super(driver); 16 super(driver);
src/main/java/com/essa/pageObject/SupplierStrengthPage.java renamed to src/main/java/com/essa/pageObject/SupplierManage/SupplierStrengthPage.java
  Show/Hide comments   View file @22a05aa
1 -package com.essa.pageObject; 1 +package com.essa.pageObject.SupplierManage;
2 2
3 import java.util.List; 3 import java.util.List;
4 4
@@ -8,7 +8,11 @@ import org.openqa.selenium.WebElement; @@ -8,7 +8,11 @@ import org.openqa.selenium.WebElement;
8 import org.openqa.selenium.support.FindBy; 8 import org.openqa.selenium.support.FindBy;
9 9
10 import com.essa.framework.BasePage; 10 import com.essa.framework.BasePage;
11 - 11 +/*
  12 +* @Description:综合实力评估页面
  13 +* @Author: ZengJin
  14 +* @CreateTime: 2018/10/29
  15 +*/
12 public class SupplierStrengthPage extends BasePage{ 16 public class SupplierStrengthPage extends BasePage{
13 public SupplierStrengthPage(WebDriver driver) { 17 public SupplierStrengthPage(WebDriver driver) {
14 super(driver); 18 super(driver);
src/main/java/com/essa/testSuite/SendEmail.java
  Show/Hide comments   View file @22a05aa
@@ -16,7 +16,11 @@ import javax.mail.internet.InternetAddress; @@ -16,7 +16,11 @@ import javax.mail.internet.InternetAddress;
16 import javax.mail.internet.MimeBodyPart; 16 import javax.mail.internet.MimeBodyPart;
17 import javax.mail.internet.MimeMessage; 17 import javax.mail.internet.MimeMessage;
18 import javax.mail.internet.MimeMultipart; 18 import javax.mail.internet.MimeMultipart;
19 - 19 +/*
  20 +* @Description:发送邮件的demo
  21 +* @Author: ZengJin
  22 +* @CreateTime: 2018/10/29
  23 +*/
20 public class SendEmail { 24 public class SendEmail {
21 25
22 public static void main(String[] args) { 26 public static void main(String[] args) {
src/main/java/com/essa/testSuite/TestDevelopmentAbility.java
  Show/Hide comments   View file @22a05aa
@@ -3,8 +3,8 @@ package com.essa.testSuite; @@ -3,8 +3,8 @@ package com.essa.testSuite;
3 import com.essa.framework.SystemConstant; 3 import com.essa.framework.SystemConstant;
4 import com.essa.pageObject.BaseTest; 4 import com.essa.pageObject.BaseTest;
5 import com.essa.pageObject.HomePage; 5 import com.essa.pageObject.HomePage;
6 -import com.essa.pageObject.SupplierOperationsTrackPage;  
7 -import com.essa.pageObject.SupplierStrengthPage; 6 +import com.essa.pageObject.SupplierManage.SupplierOperationsTrackPage;
  7 +import com.essa.pageObject.SupplierManage.SupplierStrengthPage;
8 import org.openqa.selenium.WebDriver; 8 import org.openqa.selenium.WebDriver;
9 import org.openqa.selenium.support.PageFactory; 9 import org.openqa.selenium.support.PageFactory;
10 import org.testng.annotations.AfterClass; 10 import org.testng.annotations.AfterClass;
@@ -16,7 +16,11 @@ import org.testng.asserts.SoftAssert; @@ -16,7 +16,11 @@ import org.testng.asserts.SoftAssert;
16 import java.io.IOException; 16 import java.io.IOException;
17 17
18 import static org.testng.Assert.assertEquals; 18 import static org.testng.Assert.assertEquals;
19 - 19 +/*
  20 +* @Description:综合实力评估
  21 +* @Author: ZengJin
  22 +* @CreateTime: 2018/10/29
  23 +*/
20 public class TestDevelopmentAbility extends BaseTest { 24 public class TestDevelopmentAbility extends BaseTest {
21 25
22 WebDriver driver; 26 WebDriver driver;