firstTeamn
/
autest
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

修改包名以及类名

This commit is contained in:
彭宇琦 2021-01-05 08:16:09 +08:00
parent eabae21296
commit 6146268c25
79 changed files with 225 additions and 225 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/pres/auxiliary/tool/sql/DataBaseType.java → src/main/java/pres/auxiliary/db/DataBaseType.java
View File

@ -1,4 +1,4 @@
package pres.auxiliary.tool.sql;
package pres.auxiliary.db;
/**
* <p><b>文件名：</b>DataBaseType.java</p>

2
src/main/java/pres/auxiliary/tool/sql/DatabaseException.java → src/main/java/pres/auxiliary/db/DatabaseException.java
View File

@ -1,4 +1,4 @@
package pres.auxiliary.tool.sql;
package pres.auxiliary.db;
/**
* <p><b>文件名：</b>DatabaseException.java</p>

2
src/main/java/pres/auxiliary/tool/sql/SqlAction.java → src/main/java/pres/auxiliary/db/SqlAction.java
View File

@ -1,4 +1,4 @@
package pres.auxiliary.tool.sql;
package pres.auxiliary.db;
import java.sql.Connection;
import java.sql.DriverManager;

2
src/main/java/pres/auxiliary/tool/http/EasyHttp.java → src/main/java/pres/auxiliary/http/EasyHttp.java
View File

@ -1,4 +1,4 @@
package pres.auxiliary.tool.http;
package pres.auxiliary.http;
import java.io.IOException;
import java.net.URI;

2
src/main/java/pres/auxiliary/tool/http/EasyResponse.java → src/main/java/pres/auxiliary/http/EasyResponse.java
View File

@ -1,4 +1,4 @@
package pres.auxiliary.tool.http;
package pres.auxiliary.http;
import java.io.BufferedWriter;
import java.io.File;

2
src/main/java/pres/auxiliary/tool/http/EasyResponseUtil.java → src/main/java/pres/auxiliary/http/EasyResponseUtil.java
View File

@ -1,4 +1,4 @@
package pres.auxiliary.tool.http;
package pres.auxiliary.http;
public class EasyResponseUtil {
public static void compareResponse(EasyResponse response1, EasyResponse response2) {

2
src/main/java/pres/auxiliary/tool/http/HeadType.java → src/main/java/pres/auxiliary/http/HeadType.java
View File

@ -1,4 +1,4 @@
package pres.auxiliary.tool.http;
package pres.auxiliary.http;
/**
* <p><b>文件名：</b>HeadType.java</p>

2
src/main/java/pres/auxiliary/tool/http/RequestType.java → src/main/java/pres/auxiliary/http/RequestType.java
View File

@ -1,4 +1,4 @@
package pres.auxiliary.tool.http;
package pres.auxiliary.http;
/**
* <p><b>文件名：</b>RequestType.java</p>

4
src/main/java/pres/auxiliary/work/selenium/brower/AbstractBrower.java → src/main/java/pres/auxiliary/selenium/brower/AbstractBrower.java
View File

@ -1,4 +1,4 @@
package pres.auxiliary.work.selenium.brower;
package pres.auxiliary.selenium.brower;
import java.io.File;
import java.util.ArrayList;
@ -15,7 +15,7 @@ import org.openqa.selenium.remote.RemoteWebDriver;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import pres.auxiliary.work.selenium.page.Page;
import pres.auxiliary.selenium.page.Page;
/**
* <p><b>文件名：</b>AbstractBrower.java</p>

4
src/main/java/pres/auxiliary/work/selenium/brower/ChromeBrower.java → src/main/java/pres/auxiliary/selenium/brower/ChromeBrower.java
View File

@ -1,4 +1,4 @@
package pres.auxiliary.work.selenium.brower;
package pres.auxiliary.selenium.brower;
import java.io.File;
import java.util.HashMap;
@ -9,7 +9,7 @@ import org.openqa.selenium.chrome.ChromeOptions;
import com.alibaba.fastjson.JSONArray;
import pres.auxiliary.work.selenium.page.Page;
import pres.auxiliary.selenium.page.Page;
/**
* <p><b>文件名：</b>ChromeBrower.java</p>

4
src/main/java/pres/auxiliary/work/selenium/brower/FirefoxBrower.java → src/main/java/pres/auxiliary/selenium/brower/FirefoxBrower.java
View File

@ -1,4 +1,4 @@
package pres.auxiliary.work.selenium.brower;
package pres.auxiliary.selenium.brower;
import java.io.File;
@ -6,7 +6,7 @@ import org.openqa.selenium.WebDriver;
import org.openqa.selenium.firefox.FirefoxDriver;
import org.openqa.selenium.firefox.FirefoxOptions;
import pres.auxiliary.work.selenium.page.Page;
import pres.auxiliary.selenium.page.Page;
/**
* <p><b>文件名：</b>FirefoxBrower.java</p>

4
src/main/java/pres/auxiliary/work/selenium/brower/IeBrower.java → src/main/java/pres/auxiliary/selenium/brower/IeBrower.java
View File

@ -1,11 +1,11 @@
package pres.auxiliary.work.selenium.brower;
package pres.auxiliary.selenium.brower;
import java.io.File;
import org.openqa.selenium.ie.InternetExplorerDriver;
import org.openqa.selenium.ie.InternetExplorerOptions;
import pres.auxiliary.work.selenium.page.Page;
import pres.auxiliary.selenium.page.Page;
/**
* <p><b>文件名：</b>IeBrower.java</p>

2
src/main/java/pres/auxiliary/work/selenium/brower/IncorrectPageException.java → src/main/java/pres/auxiliary/selenium/brower/IncorrectPageException.java
View File

@ -1,4 +1,4 @@
package pres.auxiliary.work.selenium.brower;
package pres.auxiliary.selenium.brower;
/**
* <p><b>文件名：</b>IncorrectPageException.java</p>

2
src/main/java/pres/auxiliary/work/selenium/datadriven/DataDriverFunction.java → src/main/java/pres/auxiliary/selenium/datadriven/DataDriverFunction.java
View File

@ -1,4 +1,4 @@
package pres.auxiliary.work.selenium.datadriven;
package pres.auxiliary.selenium.datadriven;
/**
* <p><b>文件名：</b>DataDriverFunction.java</p>

2
src/main/java/pres/auxiliary/work/selenium/datadriven/DataFunction.java → src/main/java/pres/auxiliary/selenium/datadriven/DataFunction.java
View File

@ -1,4 +1,4 @@
package pres.auxiliary.work.selenium.datadriven;
package pres.auxiliary.selenium.datadriven;
import java.util.function.Function;

2
src/main/java/pres/auxiliary/work/selenium/datadriven/DataMode.java → src/main/java/pres/auxiliary/selenium/datadriven/DataMode.java
View File

@ -1,4 +1,4 @@
package pres.auxiliary.work.selenium.datadriven;
package pres.auxiliary.selenium.datadriven;
/**
* 用于定义可向数据驱动中添加的预设模型

2
src/main/java/pres/auxiliary/work/selenium/datadriven/DataNotFoundException.java → src/main/java/pres/auxiliary/selenium/datadriven/DataNotFoundException.java
View File

@ -1,4 +1,4 @@
package pres.auxiliary.work.selenium.datadriven;
package pres.auxiliary.selenium.datadriven;
public class DataNotFoundException extends RuntimeException {

2
src/main/java/pres/auxiliary/work/selenium/datadriven/Functions.java → src/main/java/pres/auxiliary/selenium/datadriven/Functions.java
View File

@ -1,4 +1,4 @@
package pres.auxiliary.work.selenium.datadriven;
package pres.auxiliary.selenium.datadriven;
import pres.auxiliary.tool.data.RandomString;
import pres.auxiliary.tool.data.StringMode;

2
src/main/java/pres/auxiliary/work/selenium/datadriven/SplitType.java → src/main/java/pres/auxiliary/selenium/datadriven/SplitType.java
View File

@ -1,4 +1,4 @@
package pres.auxiliary.work.selenium.datadriven;
package pres.auxiliary.selenium.datadriven;
public enum SplitType {
/**

2
src/main/java/pres/auxiliary/work/selenium/datadriven/TestNGDataDriver.java → src/main/java/pres/auxiliary/selenium/datadriven/TestNGDataDriver.java
View File

@ -1,4 +1,4 @@
package pres.auxiliary.work.selenium.datadriven;
package pres.auxiliary.selenium.datadriven;
import java.io.File;
import java.io.IOException;

8
src/main/java/pres/auxiliary/work/selenium/element/Element.java → src/main/java/pres/auxiliary/selenium/element/Element.java
View File

@ -1,4 +1,4 @@
package pres.auxiliary.work.selenium.element;
package pres.auxiliary.selenium.element;
import java.util.ArrayList;
@ -29,7 +29,7 @@ public class Element {
/**
* 存储AbstractBy类对象
*/
private AbstractBy abstractBy;
private FindElement abstractBy;
/**
* 构造对象。其传入的下标允许为-1，表示当前元素集合中不存在该元素
@ -37,7 +37,7 @@ public class Element {
* @param elementData 元素信息
* @param abstractBy 元素获取类对象
*/
public Element(int index, ElementData elementData, AbstractBy abstractBy) {
public Element(int index, ElementData elementData, FindElement abstractBy) {
super();
this.index = index;
this.elementData = elementData;
@ -89,7 +89,7 @@ public class Element {
* 返回当前元素的搜索方式类对象
* @return 元素的搜索方式类对象
*/
public AbstractBy getBy() {
public FindElement getBy() {
return abstractBy;
}

8
src/main/java/pres/auxiliary/work/selenium/element/ElementData.java → src/main/java/pres/auxiliary/selenium/element/ElementData.java
View File

@ -1,12 +1,12 @@
package pres.auxiliary.work.selenium.element;
package pres.auxiliary.selenium.element;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Iterator;
import pres.auxiliary.work.selenium.location.AbstractLocation;
import pres.auxiliary.work.selenium.location.ByType;
import pres.auxiliary.work.selenium.location.ReadLocation;
import pres.auxiliary.selenium.location.AbstractLocation;
import pres.auxiliary.selenium.location.ByType;
import pres.auxiliary.selenium.location.ReadLocation;
/**
* <p><b>文件名：</b>ElementData.java</p>

2
src/main/java/pres/auxiliary/work/selenium/element/ElementType.java → src/main/java/pres/auxiliary/selenium/element/ElementType.java
View File

@ -1,4 +1,4 @@
package pres.auxiliary.work.selenium.element;
package pres.auxiliary.selenium.element;
/**
* <p><b>文件名：</b>EelementType.java</p>

2
src/main/java/pres/auxiliary/work/selenium/element/ExceptionAction.java → src/main/java/pres/auxiliary/selenium/element/ExceptionAction.java
View File

@ -1,4 +1,4 @@
package pres.auxiliary.work.selenium.element;
package pres.auxiliary.selenium.element;
import java.util.function.Consumer;

10
src/main/java/pres/auxiliary/work/selenium/element/CommonBy.java → src/main/java/pres/auxiliary/selenium/element/FindCommonElement.java
View File

@ -1,10 +1,10 @@
package pres.auxiliary.work.selenium.element;
package pres.auxiliary.selenium.element;
import java.util.ArrayList;
import org.openqa.selenium.TimeoutException;
import pres.auxiliary.work.selenium.brower.AbstractBrower;
import pres.auxiliary.selenium.brower.AbstractBrower;
/**
* <p><b>文件名：</b>CommonBy.java</p>
@ -17,13 +17,13 @@ import pres.auxiliary.work.selenium.brower.AbstractBrower;
* @version Ver1.0
*
*/
public class CommonBy extends AbstractBy {
public class FindCommonElement extends FindElement {
/**
* 构造方法，初始化浏览器对象
* @param brower {@link AbstractBrower}类对象
*/
public CommonBy(AbstractBrower brower) {
public FindCommonElement(AbstractBrower brower) {
super(brower);
}
@ -60,7 +60,7 @@ public class CommonBy extends AbstractBy {
* <p>
* <b>注意：</b>
* <ol>
* <li>下标允许传入负数，具体的参数逻辑可以参考{@link MultiBy#getElement(int)}方法的参数说明。</li>
* <li>下标允许传入负数，具体的参数逻辑可以参考{@link FindMultiElement#getElement(int)}方法的参数说明。</li>
* <li>若下标超出当前从页面获取到元素的最大值时，其不会抛出异常，但当调用{@link Element#getWebElement()}
* 方法时，则会抛出元素不存在异常。</li>
* </ol>

8
src/main/java/pres/auxiliary/work/selenium/element/DataListBy.java → src/main/java/pres/auxiliary/selenium/element/FindDataListElement.java
View File

@ -1,9 +1,9 @@
package pres.auxiliary.work.selenium.element;
package pres.auxiliary.selenium.element;
import java.util.HashSet;
import java.util.Set;
import pres.auxiliary.work.selenium.brower.AbstractBrower;
import pres.auxiliary.selenium.brower.AbstractBrower;
/**
* <p><b>文件名：</b>DataListBy.java</p>
@ -16,12 +16,12 @@ import pres.auxiliary.work.selenium.brower.AbstractBrower;
* @version Ver1.0
*
*/
public class DataListBy extends MultiBy<DataListBy> {
public class FindDataListElement extends FindMultiElement<FindDataListElement> {
/**
* 构造方法，初始化浏览器对象
* @param brower {@link AbstractBrower}类对象
*/
public DataListBy(AbstractBrower brower) {
public FindDataListElement(AbstractBrower brower) {
super(brower);
}

14
src/main/java/pres/auxiliary/work/selenium/element/AbstractBy.java → src/main/java/pres/auxiliary/selenium/element/FindElement.java
View File

@ -1,4 +1,4 @@
package pres.auxiliary.work.selenium.element;
package pres.auxiliary.selenium.element;
import java.util.ArrayList;
import java.util.List;
@ -10,9 +10,9 @@ import org.openqa.selenium.TimeoutException;
import org.openqa.selenium.WebElement;
import org.openqa.selenium.support.ui.WebDriverWait;
import pres.auxiliary.work.selenium.brower.AbstractBrower;
import pres.auxiliary.work.selenium.location.AbstractLocation;
import pres.auxiliary.work.selenium.location.ByType;
import pres.auxiliary.selenium.brower.AbstractBrower;
import pres.auxiliary.selenium.location.AbstractLocation;
import pres.auxiliary.selenium.location.ByType;
/**
* <p><b>文件名：</b>AbstractElement.java</p>
@ -26,7 +26,7 @@ import pres.auxiliary.work.selenium.location.ByType;
* @version Ver1.0
* @since JDK 1.8
*/
public abstract class AbstractBy {
public abstract class FindElement {
/**
* 存储通过信息获取到的页面元素对象
*/
@ -69,7 +69,7 @@ public abstract class AbstractBy {
* 通过元素信息类对象（{@link ElementData}）构造对象
* @param brower {@link AbstractBrower}类对象
*/
public AbstractBy(AbstractBrower brower) {
public FindElement(AbstractBrower brower) {
this.brower = brower;
}
@ -111,7 +111,7 @@ public abstract class AbstractBy {
* @param isBreakRootFrame 是否需要将窗体切回到顶层
*/
public void setReadMode(AbstractLocation read, boolean isBreakRootFrame) {
AbstractBy.read = read;
FindElement.read = read;
if (isBreakRootFrame) {
switchRootFrame();

8
src/main/java/pres/auxiliary/work/selenium/element/MultiBy.java → src/main/java/pres/auxiliary/selenium/element/FindMultiElement.java
View File

@ -1,11 +1,11 @@
package pres.auxiliary.work.selenium.element;
package pres.auxiliary.selenium.element;
import java.util.ArrayList;
import java.util.List;
import org.openqa.selenium.TimeoutException;
import pres.auxiliary.work.selenium.brower.AbstractBrower;
import pres.auxiliary.selenium.brower.AbstractBrower;
/**
* <p>
@ -25,7 +25,7 @@ import pres.auxiliary.work.selenium.brower.AbstractBrower;
* @version Ver1.0
*
*/
public abstract class MultiBy<T extends MultiBy<T>> extends AbstractBy {
public abstract class FindMultiElement<T extends FindMultiElement<T>> extends FindElement {
/**
* 用于记录当前元素集合中第一个元素是否为不可选择的元素，用于对元素的随机返回
*/
@ -36,7 +36,7 @@ public abstract class MultiBy<T extends MultiBy<T>> extends AbstractBy {
*
* @param brower {@link AbstractBrower}类对象
*/
public MultiBy(AbstractBrower brower) {
public FindMultiElement(AbstractBrower brower) {
super(brower);
}

10
src/main/java/pres/auxiliary/work/selenium/element/SelectBy.java → src/main/java/pres/auxiliary/selenium/element/FindSelectElement.java
View File

@ -1,4 +1,4 @@
package pres.auxiliary.work.selenium.element;
package pres.auxiliary.selenium.element;
import java.util.ArrayList;
import java.util.List;
@ -6,7 +6,7 @@ import java.util.stream.Collectors;
import org.openqa.selenium.support.ui.Select;
import pres.auxiliary.work.selenium.brower.AbstractBrower;
import pres.auxiliary.selenium.brower.AbstractBrower;
/**
* <p><b>文件名：</b>SelectBy.java</p>
@ -50,7 +50,7 @@ import pres.auxiliary.work.selenium.brower.AbstractBrower;
* @version Ver1.0
*
*/
public class SelectBy extends MultiBy<SelectBy> {
public class FindSelectElement extends FindMultiElement<FindSelectElement> {
/**
* 定义标准下拉选项的tagname
*/
@ -69,7 +69,7 @@ public class SelectBy extends MultiBy<SelectBy> {
* 构造方法，初始化浏览器对象
* @param brower {@link AbstractBrower}类对象
*/
public SelectBy(AbstractBrower brower) {
public FindSelectElement(AbstractBrower brower) {
super(brower);
}
@ -101,7 +101,7 @@ public class SelectBy extends MultiBy<SelectBy> {
}
@Override
public SelectBy find(String elementName, String... linkKeys) {
public FindSelectElement find(String elementName, String... linkKeys) {
super.find(elementName, linkKeys);
//判断当前存储的元素集合中是否为空，若为空，则直接返回
if (elementList == null || elementList.size() == 0) {

2
src/main/java/pres/auxiliary/work/selenium/element/UnrecognizableLocationModeException.java → src/main/java/pres/auxiliary/selenium/element/UnrecognizableLocationModeException.java
View File

@ -1,4 +1,4 @@
package pres.auxiliary.work.selenium.element;
package pres.auxiliary.selenium.element;
/**
* <p><b>文件名：</b>UnrecognizableLocationModeException.java</p>

6
src/main/java/pres/auxiliary/work/selenium/event/AbstractEvent.java → src/main/java/pres/auxiliary/selenium/event/AbstractEvent.java
View File

@ -1,4 +1,4 @@
package pres.auxiliary.work.selenium.event;
package pres.auxiliary.selenium.event;
import java.time.Duration;
import java.util.Arrays;
@ -12,8 +12,8 @@ import org.openqa.selenium.StaleElementReferenceException;
import org.openqa.selenium.WebElement;
import org.openqa.selenium.support.ui.WebDriverWait;
import pres.auxiliary.work.selenium.brower.AbstractBrower;
import pres.auxiliary.work.selenium.element.Element;
import pres.auxiliary.selenium.brower.AbstractBrower;
import pres.auxiliary.selenium.element.Element;
/**
* <p><b>文件名：</b>AbstractEvent.java</p>

6
src/main/java/pres/auxiliary/work/selenium/event/AssertEvent.java → src/main/java/pres/auxiliary/selenium/event/AssertEvent.java
View File

@ -1,12 +1,12 @@
package pres.auxiliary.work.selenium.event;
package pres.auxiliary.selenium.event;
import java.util.function.Function;
import org.openqa.selenium.NoSuchElementException;
import org.openqa.selenium.TimeoutException;
import pres.auxiliary.work.selenium.brower.AbstractBrower;
import pres.auxiliary.work.selenium.element.Element;
import pres.auxiliary.selenium.brower.AbstractBrower;
import pres.auxiliary.selenium.element.Element;
/**
* <p>

6
src/main/java/pres/auxiliary/work/selenium/event/ClickEvent.java → src/main/java/pres/auxiliary/selenium/event/ClickEvent.java
View File

@ -1,11 +1,11 @@
package pres.auxiliary.work.selenium.event;
package pres.auxiliary.selenium.event;
import org.openqa.selenium.NoSuchElementException;
import org.openqa.selenium.TimeoutException;
import org.openqa.selenium.interactions.Actions;
import pres.auxiliary.work.selenium.brower.AbstractBrower;
import pres.auxiliary.work.selenium.element.Element;
import pres.auxiliary.selenium.brower.AbstractBrower;
import pres.auxiliary.selenium.element.Element;
/**
* <p><b>文件名：</b>ClickEvent.java</p>

2
src/main/java/pres/auxiliary/work/selenium/event/CompareNumberType.java → src/main/java/pres/auxiliary/selenium/event/CompareNumberType.java
View File

@ -1,4 +1,4 @@
package pres.auxiliary.work.selenium.event;
package pres.auxiliary.selenium.event;
/**
* <p><b>文件名：</b>CompareNumberType.java</p>

4
src/main/java/pres/auxiliary/work/selenium/event/EventAction.java → src/main/java/pres/auxiliary/selenium/event/EventAction.java
View File

@ -1,6 +1,6 @@
package pres.auxiliary.work.selenium.event;
package pres.auxiliary.selenium.event;
import pres.auxiliary.work.selenium.element.Element;
import pres.auxiliary.selenium.element.Element;
/**
* <p><b>文件名：</b>EventAction.java</p>

4
src/main/java/pres/auxiliary/work/selenium/event/EventInformation.java → src/main/java/pres/auxiliary/selenium/event/EventInformation.java
View File

@ -1,10 +1,10 @@
package pres.auxiliary.work.selenium.event;
package pres.auxiliary.selenium.event;
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.Arrays;
import pres.auxiliary.work.selenium.element.Element;
import pres.auxiliary.selenium.element.Element;
/**
* <p><b>文件名：</b>EventInformation.java</p>

8
src/main/java/pres/auxiliary/work/selenium/event/EventProxy.java → src/main/java/pres/auxiliary/selenium/event/EventProxy.java
View File

@ -1,4 +1,4 @@
package pres.auxiliary.work.selenium.event;
package pres.auxiliary.selenium.event;
import java.lang.reflect.Method;
import java.util.ArrayList;
@ -10,9 +10,9 @@ import org.springframework.cglib.proxy.Enhancer;
import org.springframework.cglib.proxy.MethodInterceptor;
import org.springframework.cglib.proxy.MethodProxy;
import pres.auxiliary.work.selenium.brower.AbstractBrower;
import pres.auxiliary.work.selenium.brower.ChromeBrower;
import pres.auxiliary.work.selenium.element.Element;
import pres.auxiliary.selenium.brower.AbstractBrower;
import pres.auxiliary.selenium.brower.ChromeBrower;
import pres.auxiliary.selenium.element.Element;
/**
* <p><b>文件名：</b>EventProxy.java</p>

6
src/main/java/pres/auxiliary/work/selenium/event/JsEvent.java → src/main/java/pres/auxiliary/selenium/event/JsEvent.java
View File

@ -1,4 +1,4 @@
package pres.auxiliary.work.selenium.event;
package pres.auxiliary.selenium.event;
import java.util.ArrayList;
import java.util.Arrays;
@ -13,8 +13,8 @@ import org.openqa.selenium.WebElement;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import pres.auxiliary.work.selenium.brower.AbstractBrower;
import pres.auxiliary.work.selenium.element.Element;
import pres.auxiliary.selenium.brower.AbstractBrower;
import pres.auxiliary.selenium.element.Element;
/**
* <p>

10
src/main/java/pres/auxiliary/work/selenium/event/TextEvent.java → src/main/java/pres/auxiliary/selenium/event/TextEvent.java
View File

@ -1,4 +1,4 @@
package pres.auxiliary.work.selenium.event;
package pres.auxiliary.selenium.event;
import java.io.File;
import java.io.IOException;
@ -11,10 +11,10 @@ import org.openqa.selenium.TimeoutException;
import org.openqa.selenium.WebDriverException;
import org.openqa.selenium.WebElement;
import pres.auxiliary.work.selenium.brower.AbstractBrower;
import pres.auxiliary.work.selenium.element.Element;
import pres.auxiliary.work.selenium.tool.RecognitionImage;
import pres.auxiliary.work.selenium.tool.Screenshot;
import pres.auxiliary.selenium.brower.AbstractBrower;
import pres.auxiliary.selenium.element.Element;
import pres.auxiliary.selenium.tool.RecognitionImage;
import pres.auxiliary.selenium.tool.Screenshot;
/**
* <p><b>文件名：</b>TextEvent.java</p>

6
src/main/java/pres/auxiliary/work/selenium/event/WaitEvent.java → src/main/java/pres/auxiliary/selenium/event/WaitEvent.java
View File

@ -1,4 +1,4 @@
package pres.auxiliary.work.selenium.event;
package pres.auxiliary.selenium.event;
import java.time.Duration;
@ -7,8 +7,8 @@ import org.openqa.selenium.StaleElementReferenceException;
import org.openqa.selenium.TimeoutException;
import org.openqa.selenium.support.ui.WebDriverWait;
import pres.auxiliary.work.selenium.brower.AbstractBrower;
import pres.auxiliary.work.selenium.element.Element;
import pres.auxiliary.selenium.brower.AbstractBrower;
import pres.auxiliary.selenium.element.Element;
/**
* <p><b>文件名：</b>WaitEvent.java</p>

2
src/main/java/pres/auxiliary/work/selenium/event/extend/ControlException.java → src/main/java/pres/auxiliary/selenium/event/extend/ControlException.java
View File

@ -1,4 +1,4 @@
package pres.auxiliary.work.selenium.event.extend;
package pres.auxiliary.selenium.event.extend;
/**
* <p><b>文件名：</b>ControlException.java</p>

28
src/main/java/pres/auxiliary/work/selenium/event/extend/DataTableEvent.java → src/main/java/pres/auxiliary/selenium/event/extend/DataTableEvent.java
View File

@ -1,4 +1,4 @@
package pres.auxiliary.work.selenium.event.extend;
package pres.auxiliary.selenium.event.extend;
import java.util.ArrayList;
import java.util.HashMap;
@ -9,16 +9,16 @@ import java.util.function.BooleanSupplier;
import org.openqa.selenium.Keys;
import pres.auxiliary.selenium.brower.AbstractBrower;
import pres.auxiliary.selenium.element.Element;
import pres.auxiliary.selenium.element.FindDataListElement;
import pres.auxiliary.selenium.event.AbstractEvent;
import pres.auxiliary.selenium.event.AssertEvent;
import pres.auxiliary.selenium.event.ClickEvent;
import pres.auxiliary.selenium.event.TextEvent;
import pres.auxiliary.selenium.event.WaitEvent;
import pres.auxiliary.tool.data.ListUtil;
import pres.auxiliary.tool.data.TableData;
import pres.auxiliary.work.selenium.brower.AbstractBrower;
import pres.auxiliary.work.selenium.element.DataListBy;
import pres.auxiliary.work.selenium.element.Element;
import pres.auxiliary.work.selenium.event.AbstractEvent;
import pres.auxiliary.work.selenium.event.AssertEvent;
import pres.auxiliary.work.selenium.event.ClickEvent;
import pres.auxiliary.work.selenium.event.TextEvent;
import pres.auxiliary.work.selenium.event.WaitEvent;
/**
* <p>
@ -92,7 +92,7 @@ public final class DataTableEvent extends AbstractEvent {
}
/**
* 用于设置是否对传入的元素列表的个数进行严格校验，即在调用{@link #addList(DataListBy)}方法时，
* 用于设置是否对传入的元素列表的个数进行严格校验，即在调用{@link #addList(FindDataListElement)}方法时，
* 若元素个数与初次传入的个数不符且需要严格校验，则抛出异常；反之，则直接进行存储
*
* @param isExamine 是否严格校验元素个数
@ -113,13 +113,13 @@ public final class DataTableEvent extends AbstractEvent {
/**
* 用于添加一列元素
* <p>
* <b>注意：</b>传入的{@link DataListBy}类对象中元素的名称请勿与其他元素名称一致，否则会覆盖原有的元素列。
* <b>注意：</b>传入的{@link FindDataListElement}类对象中元素的名称请勿与其他元素名称一致，否则会覆盖原有的元素列。
* 其元素名称将作为列表名称，可通过该名称获取当前列
* </p>
*
* @param dataListBy 元素列查找对象
*/
public void addList(DataListBy dataListBy) {
public void addList(FindDataListElement dataListBy) {
elementTable.addColumn(dataListBy.getElementData().getName(), new ArrayList<>(Optional.ofNullable(dataListBy)
// 将By对象转换为元素集合
.map(by -> by.getAllElement())
@ -331,7 +331,7 @@ public final class DataTableEvent extends AbstractEvent {
}
/**
* 获取指定行的文本，其行号可传入负数，具体规则可参考{@link DataListBy#getElement(int)}方法
* 获取指定行的文本，其行号可传入负数，具体规则可参考{@link FindDataListElement#getElement(int)}方法
*
* @param rowIndex 指定的行号
* @return 该行元素的文本
@ -442,7 +442,7 @@ public final class DataTableEvent extends AbstractEvent {
String columnName = element.getElementData().getName();
elementTable.clearColumn(columnName);
addList((DataListBy) element.getBy());
addList((FindDataListElement) element.getBy());
}
});
}

2
src/main/java/pres/auxiliary/work/selenium/event/extend/GroupEvent.java → src/main/java/pres/auxiliary/selenium/event/extend/GroupEvent.java
View File

@ -1,4 +1,4 @@
package pres.auxiliary.work.selenium.event.extend;
package pres.auxiliary.selenium.event.extend;
import java.util.ArrayList;
import java.util.Arrays;

4
src/main/java/pres/auxiliary/work/selenium/location/AbstractLocation.java → src/main/java/pres/auxiliary/selenium/location/AbstractLocation.java
View File

@ -1,6 +1,6 @@
package pres.auxiliary.work.selenium.location;
package pres.auxiliary.selenium.location;
import pres.auxiliary.work.selenium.element.ElementType;
import pres.auxiliary.selenium.element.ElementType;
/**
* <p><b>文件名：</b>AbstractReadConfig.java</p>

2
src/main/java/pres/auxiliary/work/selenium/location/ByType.java → src/main/java/pres/auxiliary/selenium/location/ByType.java
View File

@ -1,4 +1,4 @@
package pres.auxiliary.work.selenium.location;
package pres.auxiliary.selenium.location;
/**
* <p>

2
src/main/java/pres/auxiliary/work/selenium/location/IncorrectFileException.java → src/main/java/pres/auxiliary/selenium/location/IncorrectFileException.java
View File

@ -1,4 +1,4 @@
package pres.auxiliary.work.selenium.location;
package pres.auxiliary.selenium.location;
/**
* 路径文件有误时抛出的异常

6
src/main/java/pres/auxiliary/work/selenium/location/JsonLocation.java → src/main/java/pres/auxiliary/selenium/location/JsonLocation.java
View File

@ -1,4 +1,4 @@
package pres.auxiliary.work.selenium.location;
package pres.auxiliary.selenium.location;
import java.io.BufferedReader;
import java.io.File;
@ -11,8 +11,8 @@ import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import pres.auxiliary.work.selenium.element.ElementType;
import pres.auxiliary.work.selenium.location.UndefinedElementException.ExceptionElementType;
import pres.auxiliary.selenium.element.ElementType;
import pres.auxiliary.selenium.location.UndefinedElementException.ExceptionElementType;
/**
* <p><b>文件名：</b>JsonLocation.java</p>

6
src/main/java/pres/auxiliary/work/selenium/location/NoFileLocation.java → src/main/java/pres/auxiliary/selenium/location/NoFileLocation.java
View File

@ -1,4 +1,4 @@
package pres.auxiliary.work.selenium.location;
package pres.auxiliary.selenium.location;
import java.util.ArrayList;
@ -6,8 +6,8 @@ import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import pres.auxiliary.work.selenium.element.ElementType;
import pres.auxiliary.work.selenium.location.UndefinedElementException.ExceptionElementType;
import pres.auxiliary.selenium.element.ElementType;
import pres.auxiliary.selenium.location.UndefinedElementException.ExceptionElementType;
/**
* <p><b>文件名：</b>NoFileLocation.java</p>

4
src/main/java/pres/auxiliary/work/selenium/location/ReadLocation.java → src/main/java/pres/auxiliary/selenium/location/ReadLocation.java
View File

@ -1,8 +1,8 @@
package pres.auxiliary.work.selenium.location;
package pres.auxiliary.selenium.location;
import java.util.ArrayList;
import pres.auxiliary.work.selenium.element.ElementType;
import pres.auxiliary.selenium.element.ElementType;
/**
* <p><b>文件名：</b>ReadLocation.java</p>

4
src/main/java/pres/auxiliary/work/selenium/location/TextLocation.java → src/main/java/pres/auxiliary/selenium/location/TextLocation.java
View File

@ -1,10 +1,10 @@
package pres.auxiliary.work.selenium.location;
package pres.auxiliary.selenium.location;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import pres.auxiliary.work.selenium.element.ElementType;
import pres.auxiliary.selenium.element.ElementType;
/**
* <p><b>文件名：</b>TextLcation.java</p>

2
src/main/java/pres/auxiliary/work/selenium/location/UndefinedElementException.java → src/main/java/pres/auxiliary/selenium/location/UndefinedElementException.java
View File

@ -1,4 +1,4 @@
package pres.auxiliary.work.selenium.location;
package pres.auxiliary.selenium.location;
/**
* <p><b>文件名：</b>UndefinedElementException.java</p>

4
src/main/java/pres/auxiliary/work/selenium/location/WriteLocation.java → src/main/java/pres/auxiliary/selenium/location/WriteLocation.java
View File

@ -1,6 +1,6 @@
package pres.auxiliary.work.selenium.location;
package pres.auxiliary.selenium.location;
import pres.auxiliary.work.selenium.element.ElementType;
import pres.auxiliary.selenium.element.ElementType;
/**
* <p><b>文件名：</b>WriteLocation.java</p>

2
src/main/java/pres/auxiliary/work/selenium/location/WriteTempletLocation.java → src/main/java/pres/auxiliary/selenium/location/WriteTempletLocation.java
View File

@ -1,4 +1,4 @@
package pres.auxiliary.work.selenium.location;
package pres.auxiliary.selenium.location;
/**
* <p><b>文件名：</b>WriteTempletLocation.java</p>

6
src/main/java/pres/auxiliary/work/selenium/location/XmlLocation.java → src/main/java/pres/auxiliary/selenium/location/XmlLocation.java
View File

@ -1,4 +1,4 @@
package pres.auxiliary.work.selenium.location;
package pres.auxiliary.selenium.location;
import java.io.File;
import java.util.ArrayList;
@ -10,8 +10,8 @@ import org.dom4j.DocumentException;
import org.dom4j.Element;
import org.dom4j.io.SAXReader;
import pres.auxiliary.work.selenium.element.ElementType;
import pres.auxiliary.work.selenium.location.UndefinedElementException.ExceptionElementType;
import pres.auxiliary.selenium.element.ElementType;
import pres.auxiliary.selenium.location.UndefinedElementException.ExceptionElementType;
/**
* <p>

4
src/main/java/pres/auxiliary/work/selenium/page/Page.java → src/main/java/pres/auxiliary/selenium/page/Page.java
View File

@ -1,4 +1,4 @@
package pres.auxiliary.work.selenium.page;
package pres.auxiliary.selenium.page;
import java.util.concurrent.TimeUnit;
@ -6,7 +6,7 @@ import org.openqa.selenium.WebDriver;
import com.alibaba.fastjson.JSONObject;
import pres.auxiliary.work.selenium.brower.AbstractBrower;
import pres.auxiliary.selenium.brower.AbstractBrower;
/**
* <p><b>文件名：</b>Page.java</p>

4
src/main/java/pres/auxiliary/work/selenium/tool/ExcelRecord.java → src/main/java/pres/auxiliary/selenium/tool/ExcelRecord.java
View File

@ -1,4 +1,4 @@
package pres.auxiliary.work.selenium.tool;
package pres.auxiliary.selenium.tool;
import java.io.File;
import java.util.ArrayList;
@ -10,10 +10,10 @@ import org.dom4j.Element;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import pres.auxiliary.selenium.brower.AbstractBrower;
import pres.auxiliary.tool.date.Time;
import pres.auxiliary.tool.file.MarkColorsType;
import pres.auxiliary.tool.file.excel.AbstractWriteExcel;
import pres.auxiliary.work.selenium.brower.AbstractBrower;
/**
* <p><b>文件名：</b>ExcelRecord.java</p>

2
src/main/java/pres/auxiliary/work/selenium/tool/IncorrectDirectoryException.java → src/main/java/pres/auxiliary/selenium/tool/IncorrectDirectoryException.java
View File

@ -1,4 +1,4 @@
package pres.auxiliary.work.selenium.tool;
package pres.auxiliary.selenium.tool;
public class IncorrectDirectoryException extends RuntimeException {

2
src/main/java/pres/auxiliary/work/selenium/tool/RecognitionImage.java → src/main/java/pres/auxiliary/selenium/tool/RecognitionImage.java
View File

@ -1,4 +1,4 @@
package pres.auxiliary.work.selenium.tool;
package pres.auxiliary.selenium.tool;
import java.awt.Rectangle;
import java.awt.image.BufferedImage;

2
src/main/java/pres/auxiliary/work/selenium/tool/RecordType.java → src/main/java/pres/auxiliary/selenium/tool/RecordType.java
View File

@ -1,4 +1,4 @@
package pres.auxiliary.work.selenium.tool;
package pres.auxiliary.selenium.tool;
/**
* <p><b>文件名：</b>RecordType.java</p>

2
src/main/java/pres/auxiliary/work/selenium/tool/Screenshot.java → src/main/java/pres/auxiliary/selenium/tool/Screenshot.java
View File

@ -1,4 +1,4 @@
package pres.auxiliary.work.selenium.tool;
package pres.auxiliary.selenium.tool;
import java.io.File;
import java.io.IOException;

6
src/main/java/pres/auxiliary/work/testcase/file/AbstractTestCaseWrite.java → src/main/java/pres/auxiliary/testcase/file/AbstractTestCaseWrite.java
View File

@ -1,4 +1,4 @@
package pres.auxiliary.work.testcase.file;
package pres.auxiliary.testcase.file;
import java.io.File;
import java.util.ArrayList;
@ -6,9 +6,9 @@ import java.util.HashMap;
import org.dom4j.DocumentException;
import pres.auxiliary.testcase.templet.Case;
import pres.auxiliary.testcase.templet.LabelNotFoundException;
import pres.auxiliary.tool.file.excel.AbstractWriteExcel;
import pres.auxiliary.work.testcase.templet.Case;
import pres.auxiliary.work.testcase.templet.LabelNotFoundException;
/**
* <p><b>文件名：</b>AbstractTestCaseWrite.java</p>

2
src/main/java/pres/auxiliary/work/testcase/file/BasicTestCaseWrite.java → src/main/java/pres/auxiliary/testcase/file/BasicTestCaseWrite.java
View File

@ -1,4 +1,4 @@
package pres.auxiliary.work.testcase.file;
package pres.auxiliary.testcase.file;
import java.io.File;

2
src/main/java/pres/auxiliary/work/testcase/file/CommonTestCaseWrite.java → src/main/java/pres/auxiliary/testcase/file/CommonTestCaseWrite.java
View File

@ -1,4 +1,4 @@
package pres.auxiliary.work.testcase.file;
package pres.auxiliary.testcase.file;
import java.io.File;
import java.util.ArrayList;

2
src/main/java/pres/auxiliary/work/testcase/file/FieldType.java → src/main/java/pres/auxiliary/testcase/file/FieldType.java
View File

@ -1,4 +1,4 @@
package pres.auxiliary.work.testcase.file;
package pres.auxiliary.testcase.file;
/**
* <p><b>文件名：</b>FieidType.java</p>

2
src/main/java/pres/auxiliary/work/testcase/file/IncorrectFileException.java → src/main/java/pres/auxiliary/testcase/file/IncorrectFileException.java
View File

@ -1,4 +1,4 @@
package pres.auxiliary.work.testcase.file;
package pres.auxiliary.testcase.file;
/**
* <p><b>文件名：</b>IncorrectFileException.java</p>

4
src/main/java/pres/auxiliary/work/testcase/file/JiraTestCaseWrite.java → src/main/java/pres/auxiliary/testcase/file/JiraTestCaseWrite.java
View File

@ -1,10 +1,10 @@
package pres.auxiliary.work.testcase.file;
package pres.auxiliary.testcase.file;
import java.io.File;
import org.dom4j.DocumentException;
import pres.auxiliary.work.testcase.templet.LabelType;
import pres.auxiliary.testcase.templet.LabelType;
/**
* <p><b>文件名：</b>JiraTestCaseWrite.java</p>

4
src/main/java/pres/auxiliary/work/testcase/templet/Case.java → src/main/java/pres/auxiliary/testcase/templet/Case.java
View File

@ -1,4 +1,4 @@
package pres.auxiliary.work.testcase.templet;
package pres.auxiliary.testcase.templet;
import java.io.File;
import java.util.ArrayList;
@ -11,7 +11,7 @@ import org.dom4j.DocumentException;
import org.dom4j.Element;
import org.dom4j.io.SAXReader;
import pres.auxiliary.work.testcase.file.IncorrectFileException;
import pres.auxiliary.testcase.file.IncorrectFileException;
/**
* <p><b>文件名：</b>Case.java</p>

2
src/main/java/pres/auxiliary/work/testcase/templet/CaseContentException.java → src/main/java/pres/auxiliary/testcase/templet/CaseContentException.java
View File

@ -1,4 +1,4 @@
package pres.auxiliary.work.testcase.templet;
package pres.auxiliary.testcase.templet;
/**
* <p><b>文件名：</b>CaseContentException.java</p>

2
src/main/java/pres/auxiliary/work/testcase/templet/DataListCase.java → src/main/java/pres/auxiliary/testcase/templet/DataListCase.java
View File

@ -1,4 +1,4 @@
package pres.auxiliary.work.testcase.templet;
package pres.auxiliary.testcase.templet;
import java.io.File;

2
src/main/java/pres/auxiliary/work/testcase/templet/InformationCase.java → src/main/java/pres/auxiliary/testcase/templet/InformationCase.java
View File

@ -1,4 +1,4 @@
package pres.auxiliary.work.testcase.templet;
package pres.auxiliary.testcase.templet;
import java.io.File;
import java.util.Arrays;

2
src/main/java/pres/auxiliary/work/testcase/templet/LabelNotFoundException.java → src/main/java/pres/auxiliary/testcase/templet/LabelNotFoundException.java
View File

@ -1,4 +1,4 @@
package pres.auxiliary.work.testcase.templet;
package pres.auxiliary.testcase.templet;
public class LabelNotFoundException extends RuntimeException {

2
src/main/java/pres/auxiliary/work/testcase/templet/LabelType.java → src/main/java/pres/auxiliary/testcase/templet/LabelType.java
View File

@ -1,4 +1,4 @@
package pres.auxiliary.work.testcase.templet;
package pres.auxiliary.testcase.templet;
/**
* <p><b>文件名：</b>LabelType.java</p>

2
src/main/java/pres/auxiliary/work/testcase/templet/MapCase.java → src/main/java/pres/auxiliary/testcase/templet/MapCase.java
View File

@ -1,4 +1,4 @@
package pres.auxiliary.work.testcase.templet;
package pres.auxiliary.testcase.templet;
import java.io.File;
import java.util.Arrays;

2
src/main/java/pres/auxiliary/work/testcase/templet/UserCase.java → src/main/java/pres/auxiliary/testcase/templet/UserCase.java
View File

@ -1,4 +1,4 @@
package pres.auxiliary.work.testcase.templet;
package pres.auxiliary.testcase.templet;
import java.io.File;

2
src/main/java/pres/auxiliary/work/testcase/templet/VideoCase.java → src/main/java/pres/auxiliary/testcase/templet/VideoCase.java
View File

@ -1,4 +1,4 @@
package pres.auxiliary.work.testcase.templet;
package pres.auxiliary.testcase.templet;
import java.io.File;

2
src/main/java/pres/auxiliary/tool/file/ExcelConfigXmlTool.java
View File

@ -8,7 +8,7 @@ import org.dom4j.Document;
import org.dom4j.io.OutputFormat;
import org.dom4j.io.XMLWriter;
import pres.auxiliary.work.selenium.tool.ExcelRecord;
import pres.auxiliary.selenium.tool.ExcelRecord;
/**
* <p><b>文件名：</b>ConfigXmlTool.java</p>

4
src/main/java/pres/auxiliary/tool/file/excel/AbstractWriteExcel.java
View File

@ -37,13 +37,13 @@ import org.dom4j.DocumentHelper;
import org.dom4j.Element;
import org.dom4j.io.SAXReader;
import pres.auxiliary.testcase.file.IncorrectFileException;
import pres.auxiliary.testcase.templet.LabelNotFoundException;
import pres.auxiliary.tool.data.TableData;
import pres.auxiliary.tool.file.MarkColorsType;
import pres.auxiliary.tool.file.TableFileReadUtil;
import pres.auxiliary.tool.file.UnsupportedFileException;
import pres.auxiliary.tool.regex.RegexType;
import pres.auxiliary.work.testcase.file.IncorrectFileException;
import pres.auxiliary.work.testcase.templet.LabelNotFoundException;
/**
* <p>

4
src/main/java/pres/auxiliary/tool/file/excel/CreateExcelFile.java
View File

@ -22,11 +22,11 @@ import org.dom4j.DocumentException;
import org.dom4j.Element;
import org.dom4j.io.SAXReader;
import pres.auxiliary.testcase.file.IncorrectFileException;
import pres.auxiliary.testcase.templet.LabelNotFoundException;
import pres.auxiliary.tool.data.TableData;
import pres.auxiliary.tool.file.TableFileReadUtil;
import pres.auxiliary.tool.file.UnsupportedFileException;
import pres.auxiliary.work.testcase.file.IncorrectFileException;
import pres.auxiliary.work.testcase.templet.LabelNotFoundException;
/**
* <p>

2
src/main/java/pres/auxiliary/tool/file/excel/WriteExcel.java
View File

@ -5,7 +5,7 @@ import java.io.File;
import org.dom4j.Document;
import org.dom4j.DocumentException;
import pres.auxiliary.work.testcase.file.IncorrectFileException;
import pres.auxiliary.testcase.file.IncorrectFileException;
/**
* <p><b>文件名：</b>WriteExcel.java</p>