chenping 7 ヶ月 前
コミット
afdf42e2f3

+ 1 - 1
config.properties

@@ -1,4 +1,4 @@
 driver.browser.type=firefox
-driver.url=https://www.baidu.com
+driver.url=http://192.168.1.251:51001
 driver.implicit.wait=15
 driver.headless=true

+ 1 - 1
src/main/java/com/zoomwin/base/BaseService.java

@@ -374,7 +374,7 @@ public class BaseService {
                     apiUrl, result.getBizCode(), result.getMessage()
             );
             try {
-                takeScreenshot("screenshot\\api\\error\\"+System.currentTimeMillis(), "调用API响应失败");
+                takeScreenshot("screenshot"+File.separator+"api"+File.separator+"error"+File.separator+System.currentTimeMillis(), "调用API响应失败");
             } catch (IOException e) {
                logger.error("调用API业务响应截图失败");
             }

+ 3 - 1
src/main/java/com/zoomwin/controller/BaiduSearchController.java

@@ -3,6 +3,7 @@ package com.zoomwin.controller;
 import io.qameta.allure.*;
 import com.zoomwin.service.BaiduService;
 
+import java.io.File;
 import java.io.IOException;
 import org.testng.annotations.Test;
 
@@ -34,7 +35,8 @@ public class BaiduSearchController {
         try {
             Thread.sleep(2000);
             Allure.step("将百度搜索内容进行截图");
-            baiduService.takeScreenshot("screenshot\\baidu", "百度搜索结果截图");
+
+            baiduService.takeScreenshot("screenshot"+ File.separator+"baidu", "百度搜索结果截图");
             // 退出浏览器驱动
             baiduService.quitDriver();
         } catch (IOException | InterruptedException e) {

+ 4 - 2
src/main/java/com/zoomwin/controller/LoginController.java

@@ -5,6 +5,7 @@ import io.qameta.allure.*;
 import com.zoomwin.service.LoginService;
 import org.testng.annotations.Test;
 
+import java.io.File;
 import java.io.IOException;
 
 public class LoginController {
@@ -26,12 +27,13 @@ public class LoginController {
             Allure.step("在验证码输入框中输入验证码");
             loginService.inputCodeContent("10");
             Allure.step("登录界面截图");
-            loginService.takeScreenshot("screenshot\\login", "登录界面截图");
+
+            loginService.takeScreenshot("screenshot"+File.separator+"login", "登录界面截图");
             Allure.step("点击登录按钮");
             loginService.clickLoginButton();
             Thread.sleep(2000);
             Allure.step("将登录成功界面截图");
-            loginService.takeScreenshot("screenshot\\login", "登录结果截图");
+            loginService.takeScreenshot("screenshot"+File.separator+"login", "登录结果截图");
             // 退出浏览器驱动
             //loginService.quitDriver();
         } catch (IOException | InterruptedException e) {

+ 3 - 2
src/main/java/com/zoomwin/controller/UserController.java

@@ -5,6 +5,7 @@ import com.zoomwin.service.UserService;
 import io.qameta.allure.*;
 import org.testng.annotations.Test;
 
+import java.io.File;
 import java.io.IOException;
 
 public class UserController {
@@ -26,11 +27,11 @@ public class UserController {
             Thread.sleep(2000);
             Allure.step("录入员工信息");
             userService.inputAddUserInfo();
-            loginService.takeScreenshot("screenshot\\user", "录入员工信息截图");
+            loginService.takeScreenshot("screenshot"+ File.separator+"user", "录入员工信息截图");
             Allure.step("保存员工信息");
             userService.submit();
             Thread.sleep(1000);
-            loginService.takeScreenshot("screenshot\\user", "保存员工信息截图");
+            loginService.takeScreenshot("screenshot"+ File.separator+"user", "保存员工信息截图");
         } catch (InterruptedException |IOException e) {
             throw new RuntimeException(e);
 

+ 13 - 13
testng.xml

@@ -4,22 +4,22 @@
     <test verbose="2" preserve-order="true"
           name="AIOT平台功能测试">
         <classes>
-            <class name="com.zoomwin.controller.BaiduSearchController">
-                <methods>
-                    <include name="testBaiduSearchContent"></include>
-                </methods>
-            </class>
-<!--            <class name="com.zoomwin.controller.LoginController" >-->
-<!--                <methods>-->
-<!--                    <include name="testLogin"/>-->
-
-<!--                </methods>-->
-<!--            </class>-->
-<!--            <class name="com.zoomwin.controller.UserController">-->
+<!--            <class name="com.zoomwin.controller.BaiduSearchController">-->
 <!--                <methods>-->
-<!--                    <include name="testAddUser"/>-->
+<!--                    <include name="testBaiduSearchContent"></include>-->
 <!--                </methods>-->
 <!--            </class>-->
+            <class name="com.zoomwin.controller.LoginController" >
+                <methods>
+                    <include name="testLogin"/>
+
+                </methods>
+            </class>
+            <class name="com.zoomwin.controller.UserController">
+                <methods>
+                    <include name="testAddUser"/>
+                </methods>
+            </class>
         </classes>
     </test>
 </suite>