Skip to content

A
auto-test-case
提交 c6fb351f authored 作者: 黄承天's avatar 黄承天
浏览文件
操作

[fix]

修复统计数据错误的问题
上级 3a6c3ae1
全部展开 隐藏空白字符变更
内嵌 并排
正在显示 包含 14 行增加 和 7 行删除
src/main/java/com/zjty/autotest/common/action/TargetType.java
浏览文件 @ c6fb351f
......@@ -6,6 +6,8 @@ public interface TargetType {
String ID = "id";
String NAME = "name";
String LINK_TEXT = "linkText";
String XPATH_POSITION = "xpath:position";
......
src/main/java/com/zjty/autotest/service/ReportService.java
浏览文件 @ c6fb351f
......@@ -89,7 +89,6 @@ public class ReportService {
.map(ReportVo::getUnFinished)
.reduce(Integer::sum)
.orElse(-1);
;
Integer successes = reports.stream()
.map(ReportVo::getSuccesses)
.reduce(Integer::sum)
......@@ -103,7 +102,10 @@ public class ReportService {
.map(Step::getCostTime)
.reduce(Long::sum)
.orElse(-1L);
long averageCostTime = totalCostTime / total;
long averageCostTime = -1L;
if (total != 0) {
averageCostTime = totalCostTime / total;
}
Integer litterThan1s = reports.stream()
.map(this::getLittlerThan1s)
.reduce(Integer::sum)
......
src/main/java/com/zjty/autotest/service/SeleniumExecutor.java
浏览文件 @ c6fb351f
......@@ -98,6 +98,7 @@ public class SeleniumExecutor {
name = testCase.getName();
this.params = params;
List<Command> commands = testCase.getCommands();
total = commands.size();
//根据浏览器 获取driver
this.browser = browser;
if (nonNull(headless)) {
......@@ -316,7 +317,6 @@ public class SeleniumExecutor {
seleniumHelper.setHistoryHandles(driver.getWindowHandles());
}
new Actions(driver).moveToElement(element).perform();
seleniumHelper.waitSomeTime();
costTime = System.currentTimeMillis() - stepStartTime;
success = true;
if (newWindow) {
......@@ -419,6 +419,7 @@ public class SeleniumExecutor {
success = true;
break;
default:
log.warn("未识别的操作类型:{}", type);
return null;
}
} catch (Exception e) {
......@@ -482,6 +483,8 @@ public class SeleniumExecutor {
return driver.findElement(By.cssSelector(value));
case ID:
return driver.findElement(By.id(value));
case NAME:
return driver.findElement(By.name(value));
case LINK_TEXT:
return driver.findElement(By.linkText(value));
case XPATH_ID_RELATIVE:
......@@ -503,6 +506,7 @@ public class SeleniumExecutor {
try {
switch (type) {
case "name":
return driver.findElement(By.name(value));
case "css":
return driver.findElement(By.cssSelector(value));
case "id":
......
src/main/java/com/zjty/autotest/util/WebDriverUtil.java
浏览文件 @ c6fb351f
......@@ -45,6 +45,7 @@ public class WebDriverUtil {
if (headless) {
firefoxOptions.addArguments("--headless");
}
// firefoxOptions.setBinary("/opt/apps/org.mozilla.firefox/files/lib/firefox-esr/firefox-esr");
return new FirefoxDriver(firefoxOptions);
case Browser.CHROME:
System.setProperty("webdriver.chrome.driver", WebDriverUtil.CHROME + executable);
......
src/main/resources/adapter/index.html
浏览文件 @ c6fb351f
<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="favicon.ico"><title>seleniumide1</title><link href="static/css/app.13f51c79.css" rel="preload" as="style" crossorigin><link href="static/css/chunk-vendors.46785edb.css" rel="preload" as="style" crossorigin><link href="static/js/app.7e6480ca.js" rel="preload" as="script" crossorigin><link href="static/js/chunk-vendors.be5d5368.js" rel="preload" as="script" crossorigin><link href="static/css/chunk-vendors.46785edb.css" rel="stylesheet" crossorigin><link href="static/css/app.13f51c79.css" rel="stylesheet" crossorigin></head><body style="background-color: #eef1fa;"><div id="app"></div><script src="static/js/chunk-vendors.be5d5368.js" crossorigin></script><script src="static/js/app.7e6480ca.js" crossorigin></script></body></html>
\ No newline at end of file
<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="favicon.ico"><title>seleniumide1</title><link href="static/css/app.52163bfd.css" rel="preload" as="style" crossorigin><link href="static/css/chunk-vendors.fef80702.css" rel="preload" as="style" crossorigin><link href="static/js/app.386e4ded.js" rel="preload" as="script" crossorigin><link href="static/js/chunk-vendors.dda05319.js" rel="preload" as="script" crossorigin><link href="static/css/chunk-vendors.fef80702.css" rel="stylesheet" crossorigin><link href="static/css/app.52163bfd.css" rel="stylesheet" crossorigin></head><body style="background-color: #eef1fa;"><div id="app"></div><script src="static/js/chunk-vendors.dda05319.js" crossorigin></script><script src="static/js/app.386e4ded.js" crossorigin></script></body></html>
\ No newline at end of file
src/main/resources/adapter/static/css/app.13f51c79.css deleted 100755 → 0
浏览文件 @ 3a6c3ae1
#app{font-family:Avenir,Helvetica,Arial,sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;text-align:center;margin:0;padding:0;box-sizing:border-box;color:#2c3e50}#app /deep/ .el-header{padding:0;height:86px;background-color:#fff;width:100vw;display:flex;align-items:center}.title{font-size:34px;color:#383874;font-weight:bolder;padding-left:2rem;cursor:pointer}#nav{padding:30px}#nav a{font-weight:700;color:#2c3e50}#nav a.router-link-exact-active{color:#42b983}.input{float:right;margin-bottom:1rem}.input /deep/ .el-button{background-color:#383874;color:#fff;letter-spacing:1px;font-size:20px}.table /deep/ .el-table .el-link{margin-right:10px}.table /deep/ .el-dialog__wrapper{display:flex;justify-content:center;align-items:center}.table /deep/ .el-dialog .el-dialog__header{display:flex;margin-left:5%;padding-left:0;width:90%;border-bottom:1px solid #5059d5}.table /deep/ .el-dialog .el-dialog__header /deep/ .el-dialog__title{color:#383874;font-size:15px;font-weight:bolder;letter-spacing:1px}.table /deep/ .el-dialog .el-dialog__footer /deep/ .dialog-footer .el-button{height:34px;width:80px;color:#fff;border-radius:8px;border:none}.table /deep/ .el-dialog .el-dialog__footer /deep/ .dialog-footer .el-button--default{background-color:#383874}.table /deep/ .el-dialog .el-dialog__footer /deep/ .dialog-footer .el-button--primary{background-color:#ee4b4a}.table /deep/ .el-table .el-table__header .has-gutter tr th{background-color:#383874;color:#fff;letter-spacing:1px}#components-layout-demo-basic[data-v-7021b388]{text-align:center}.ant-layout-header[data-v-7021b388]{font-size:2em;background-color:#fff;text-align:left}.ant-layout-footer[data-v-7021b388]{line-height:1.5}.middle[data-v-7021b388]{background-color:#eef1fa}.ant-layout-sider[data-v-7021b388]{background-color:#fff;line-height:40px;height:500px;margin-top:10px}.testExampleList[data-v-7021b388]{height:240px;overflow:auto;overflow-y:overlay}.ant-layout-content[data-v-7021b388]{color:#fff;height:auto;line-height:60px;position:relative;margin-left:20px}.ant-layout[data-v-7021b388]{margin-bottom:48px}.ant-layout[data-v-7021b388]:last-child{margin:0}.script[data-v-7021b388]{display:inline-block;font-size:2em;color:#383874;font-weight:700}.uploadScript[data-v-7021b388]{float:right;height:40px;width:100px;line-height:40px;margin-top:15px;border-radius:5%;border:none;background-color:#383874}.exampleHeader[data-v-7021b388]{height:30px;width:67%;display:flex;justify-content:center;align-items:center;float:right;margin-right:15%;border-bottom:1px solid #383874}.square[data-v-7021b388]{height:12px;width:12px;background-color:#383874}.testExampleTitle[data-v-7021b388]{overflow:hidden;text-overflow:ellipsis;white-space:nowrap;margin-left:10px;margin-right:30px}.allPlay[data-v-7021b388]{height:20px;width:20px}.example[data-v-7021b388]{height:auto;width:60%;float:right;margin-right:15%;border-bottom:1px dashed #383874;color:#dbdbdb}.circle[data-v-7021b388]{display:inline-block;height:8px;width:8px;background-color:#383874;border-radius:50%}.exampleName[data-v-7021b388]{width:50px;text-align:left;margin-left:5%;display:inline-block}.playBtn[data-v-7021b388]{margin-left:23%;display:inline-block;height:15px;width:15px}.tableTitle[data-v-7021b388]{font-size:2em;color:#383874;font-weight:700}[data-v-7021b388] .ant-table-header{background-color:#383874}[data-v-7021b388] .ant-table-header .ant-table-thead th{color:#fff;background-color:#383874;text-align:center}[data-v-7021b388] .ant-table-tbody td{text-align:center}.terminal[data-v-7021b388]{margin-left:10%;color:#383874}.browserSelect[data-v-7021b388]{margin-left:10%;margin-top:10%;color:#383874}.terminalTitle[data-v-7021b388]{display:inline-block;width:100px}.ant-checkbox-wrapper[data-v-7021b388]{color:#7778a3}[data-v-7021b388] .ant-modal-footer{display:flex;justify-content:center}[data-v-7021b388] .ant-modal-footer .ant-btn:first-child{display:none}[data-v-7021b388] .ant-modal-footer .ant-btn{background-color:#383874}.testNameTitle[data-v-7021b388]{margin-left:10%}.scriptUploadTitle[data-v-7021b388]{margin-top:10%;margin-bottom:10%;margin-left:30%}.testName[data-v-7021b388]{width:100px;text-align:center;display:inline-block;color:#383874}.testNameInp[data-v-7021b388]{width:250px;border:none;border-radius:0;border-bottom:1px solid #383874;display:inline-block}.scriptUpload[data-v-7021b388]{width:100px;text-align:center;display:inline-block;color:#383874}.uploadScript[data-v-7021b388]{width:80px;display:inline-block}.uploadBtn[data-v-7021b388]{border-radius:10px;border-color:#383874;background-color:#fff;color:#383874}[data-v-7021b388] .upload .ant-upload-list-item-info{margin-left:22%}[data-v-7021b388] .upload .ant-upload-list-item-card-actions{right:50%}.readBtn[data-v-dca473b4]{color:#383874;background-color:#fff;border:none}.deleteBtn[data-v-dca473b4]{color:red;background-color:#fff;border:none}.return[data-v-89295848]{text-align:left;margin-left:3%;color:#383874;font-size:1.5em;font-weight:700}.content[data-v-89295848]{height:100%;width:80%;margin-top:20px;margin-left:10%;text-align:left}h1[data-v-89295848]{color:#383874;font-weight:700}.infoTitle[data-v-89295848]{margin-top:10px}.icon[data-v-89295848]{display:inline-block;height:10px;width:5px;background-color:#383874}.baseInfo[data-v-89295848]{margin-left:5px;color:#383874;display:inline-block}.mainLine[data-v-89295848]{margin-top:10px;color:#383874}.secondLine[data-v-89295848]{margin-top:10px}.detailInfo[data-v-89295848]{width:200px;margin-right:100px}.ant-table-wrapper[data-v-89295848]{margin-top:20px}[data-v-89295848] .ant-table-header{background-color:#383874}[data-v-89295848] .ant-table-wrapper .ant-table-thead th{text-align:center;background-color:#383874;color:#fff}[data-v-89295848] .ant-table-wrapper td{text-align:center}.process-left /deep/ .el-table .el-table__body .el-table__row td{font-size:20px;letter-spacing:1px;overflow:hidden;word-wrap:nowrap}.process-left /deep/ .el-table .el-table__body .el-table__row td :first-child{color:#383874;font-weight:bolder}.back{position:absolute;font-size:25px;font-weight:bolder;letter-spacing:1px;bottom:45px;left:25px;z-index:1000;cursor:pointer}.back img{padding-bottom:5px}.process{display:flex;justify-content:space-around;margin-top:35px}.process-left{position:relative;width:224px}.process-left .single{background-color:#fff}.process-left ul{height:54px;padding:0;margin:0;width:100%;display:flex;justify-content:space-between;align-items:center;font-size:20px;font-weight:bolder}.process-left ul li{cursor:pointer;width:50%;list-style:none;text-align:center}.process-left ul .success{color:#15b769}.process-left ul .wait{color:#bbb}.process-right{color:#383874;font-weight:bolder;font-size:20px;width:1540px;height:933px;flex-direction:column}.process-right,.process-right .right-header{display:flex;justify-content:space-between}.process-right .right-content{height:825px;width:100%;background-color:#2a2a30;color:#1b4f1e;overflow:scroll}.process-right .right-content .font-content{margin:20px;text-align:start;font-size:25px;letter-spacing:1px}.process-right .right-content .font-content span{margin-right:10px}.process-right .right-bottom{display:flex;justify-content:flex-end}.process-right .right-bottom .bottom-font{margin-left:120px;color:#7778a3}
\ No newline at end of file
src/main/resources/adapter/static/css/chunk-vendors.46785edb.css deleted 100755 → 0
浏览文件 @ 3a6c3ae1
This source diff could not be displayed because it is too large. You can view the blob instead.
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论