diff --git a/src/main/java/pres/auxiliary/tool/sql/DataBaseType.java b/src/main/java/pres/auxiliary/db/DataBaseType.java similarity index 93% rename from src/main/java/pres/auxiliary/tool/sql/DataBaseType.java rename to src/main/java/pres/auxiliary/db/DataBaseType.java index 7157d43..680e345 100644 --- a/src/main/java/pres/auxiliary/tool/sql/DataBaseType.java +++ b/src/main/java/pres/auxiliary/db/DataBaseType.java @@ -1,4 +1,4 @@ -package pres.auxiliary.tool.sql; +package pres.auxiliary.db; /** *

文件名：DataBaseType.java

diff --git a/src/main/java/pres/auxiliary/tool/sql/DatabaseException.java b/src/main/java/pres/auxiliary/db/DatabaseException.java similarity index 92% rename from src/main/java/pres/auxiliary/tool/sql/DatabaseException.java rename to src/main/java/pres/auxiliary/db/DatabaseException.java index fe9848b..7e8bb19 100644 --- a/src/main/java/pres/auxiliary/tool/sql/DatabaseException.java +++ b/src/main/java/pres/auxiliary/db/DatabaseException.java @@ -1,4 +1,4 @@ -package pres.auxiliary.tool.sql; +package pres.auxiliary.db; /** *

文件名：DatabaseException.java

diff --git a/src/main/java/pres/auxiliary/tool/sql/SqlAction.java b/src/main/java/pres/auxiliary/db/SqlAction.java similarity index 96% rename from src/main/java/pres/auxiliary/tool/sql/SqlAction.java rename to src/main/java/pres/auxiliary/db/SqlAction.java index 4ee3818..46d8639 100644 --- a/src/main/java/pres/auxiliary/tool/sql/SqlAction.java +++ b/src/main/java/pres/auxiliary/db/SqlAction.java @@ -1,4 +1,4 @@ -package pres.auxiliary.tool.sql; +package pres.auxiliary.db; import java.sql.Connection; import java.sql.DriverManager; diff --git a/src/main/java/pres/auxiliary/tool/http/EasyHttp.java b/src/main/java/pres/auxiliary/http/EasyHttp.java similarity index 95% rename from src/main/java/pres/auxiliary/tool/http/EasyHttp.java rename to src/main/java/pres/auxiliary/http/EasyHttp.java index fe86768..8ccb7ba 100644 --- a/src/main/java/pres/auxiliary/tool/http/EasyHttp.java +++ b/src/main/java/pres/auxiliary/http/EasyHttp.java @@ -1,4 +1,4 @@ -package pres.auxiliary.tool.http; +package pres.auxiliary.http; import java.io.IOException; import java.net.URI; diff --git a/src/main/java/pres/auxiliary/tool/http/EasyResponse.java b/src/main/java/pres/auxiliary/http/EasyResponse.java similarity index 95% rename from src/main/java/pres/auxiliary/tool/http/EasyResponse.java rename to src/main/java/pres/auxiliary/http/EasyResponse.java index c6590f4..9697f23 100644 --- a/src/main/java/pres/auxiliary/tool/http/EasyResponse.java +++ b/src/main/java/pres/auxiliary/http/EasyResponse.java @@ -1,4 +1,4 @@ -package pres.auxiliary.tool.http; +package pres.auxiliary.http; import java.io.BufferedWriter; import java.io.File; diff --git a/src/main/java/pres/auxiliary/tool/http/EasyResponseUtil.java b/src/main/java/pres/auxiliary/http/EasyResponseUtil.java similarity index 75% rename from src/main/java/pres/auxiliary/tool/http/EasyResponseUtil.java rename to src/main/java/pres/auxiliary/http/EasyResponseUtil.java index 41acc93..6ef03e3 100644 --- a/src/main/java/pres/auxiliary/tool/http/EasyResponseUtil.java +++ b/src/main/java/pres/auxiliary/http/EasyResponseUtil.java @@ -1,4 +1,4 @@ -package pres.auxiliary.tool.http; +package pres.auxiliary.http; public class EasyResponseUtil { public static void compareResponse(EasyResponse response1, EasyResponse response2) { diff --git a/src/main/java/pres/auxiliary/tool/http/HeadType.java b/src/main/java/pres/auxiliary/http/HeadType.java similarity index 93% rename from src/main/java/pres/auxiliary/tool/http/HeadType.java rename to src/main/java/pres/auxiliary/http/HeadType.java index da34a6c..6882d39 100644 --- a/src/main/java/pres/auxiliary/tool/http/HeadType.java +++ b/src/main/java/pres/auxiliary/http/HeadType.java @@ -1,4 +1,4 @@ -package pres.auxiliary.tool.http; +package pres.auxiliary.http; /** *

文件名：HeadType.java

diff --git a/src/main/java/pres/auxiliary/tool/http/RequestType.java b/src/main/java/pres/auxiliary/http/RequestType.java similarity index 86% rename from src/main/java/pres/auxiliary/tool/http/RequestType.java rename to src/main/java/pres/auxiliary/http/RequestType.java index 453c851..2d55a08 100644 --- a/src/main/java/pres/auxiliary/tool/http/RequestType.java +++ b/src/main/java/pres/auxiliary/http/RequestType.java @@ -1,4 +1,4 @@ -package pres.auxiliary.tool.http; +package pres.auxiliary.http; /** *

文件名：RequestType.java

diff --git a/src/main/java/pres/auxiliary/work/selenium/brower/AbstractBrower.java b/src/main/java/pres/auxiliary/selenium/brower/AbstractBrower.java similarity index 96% rename from src/main/java/pres/auxiliary/work/selenium/brower/AbstractBrower.java rename to src/main/java/pres/auxiliary/selenium/brower/AbstractBrower.java index 7454a2d..27e4be9 100644 --- a/src/main/java/pres/auxiliary/work/selenium/brower/AbstractBrower.java +++ b/src/main/java/pres/auxiliary/selenium/brower/AbstractBrower.java @@ -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; /** *

文件名：AbstractBrower.java

diff --git a/src/main/java/pres/auxiliary/work/selenium/brower/ChromeBrower.java b/src/main/java/pres/auxiliary/selenium/brower/ChromeBrower.java similarity index 96% rename from src/main/java/pres/auxiliary/work/selenium/brower/ChromeBrower.java rename to src/main/java/pres/auxiliary/selenium/brower/ChromeBrower.java index f8e0fa2..34b73ce 100644 --- a/src/main/java/pres/auxiliary/work/selenium/brower/ChromeBrower.java +++ b/src/main/java/pres/auxiliary/selenium/brower/ChromeBrower.java @@ -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; /** *

文件名：ChromeBrower.java

diff --git a/src/main/java/pres/auxiliary/work/selenium/brower/FirefoxBrower.java b/src/main/java/pres/auxiliary/selenium/brower/FirefoxBrower.java similarity index 93% rename from src/main/java/pres/auxiliary/work/selenium/brower/FirefoxBrower.java rename to src/main/java/pres/auxiliary/selenium/brower/FirefoxBrower.java index 81c1f86..46591eb 100644 --- a/src/main/java/pres/auxiliary/work/selenium/brower/FirefoxBrower.java +++ b/src/main/java/pres/auxiliary/selenium/brower/FirefoxBrower.java @@ -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; /** *

文件名：FirefoxBrower.java

diff --git a/src/main/java/pres/auxiliary/work/selenium/brower/IeBrower.java b/src/main/java/pres/auxiliary/selenium/brower/IeBrower.java similarity index 96% rename from src/main/java/pres/auxiliary/work/selenium/brower/IeBrower.java rename to src/main/java/pres/auxiliary/selenium/brower/IeBrower.java index b3a6f1d..c77ebdf 100644 --- a/src/main/java/pres/auxiliary/work/selenium/brower/IeBrower.java +++ b/src/main/java/pres/auxiliary/selenium/brower/IeBrower.java @@ -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; /** *

文件名：IeBrower.java

diff --git a/src/main/java/pres/auxiliary/work/selenium/brower/IncorrectPageException.java b/src/main/java/pres/auxiliary/selenium/brower/IncorrectPageException.java similarity index 92% rename from src/main/java/pres/auxiliary/work/selenium/brower/IncorrectPageException.java rename to src/main/java/pres/auxiliary/selenium/brower/IncorrectPageException.java index ea49166..1734400 100644 --- a/src/main/java/pres/auxiliary/work/selenium/brower/IncorrectPageException.java +++ b/src/main/java/pres/auxiliary/selenium/brower/IncorrectPageException.java @@ -1,4 +1,4 @@ -package pres.auxiliary.work.selenium.brower; +package pres.auxiliary.selenium.brower; /** *

文件名：IncorrectPageException.java

diff --git a/src/main/java/pres/auxiliary/work/selenium/datadriven/DataDriverFunction.java b/src/main/java/pres/auxiliary/selenium/datadriven/DataDriverFunction.java similarity index 90% rename from src/main/java/pres/auxiliary/work/selenium/datadriven/DataDriverFunction.java rename to src/main/java/pres/auxiliary/selenium/datadriven/DataDriverFunction.java index aba2778..7e5e7e6 100644 --- a/src/main/java/pres/auxiliary/work/selenium/datadriven/DataDriverFunction.java +++ b/src/main/java/pres/auxiliary/selenium/datadriven/DataDriverFunction.java @@ -1,4 +1,4 @@ -package pres.auxiliary.work.selenium.datadriven; +package pres.auxiliary.selenium.datadriven; /** *

文件名：DataDriverFunction.java

diff --git a/src/main/java/pres/auxiliary/work/selenium/datadriven/DataFunction.java b/src/main/java/pres/auxiliary/selenium/datadriven/DataFunction.java similarity index 86% rename from src/main/java/pres/auxiliary/work/selenium/datadriven/DataFunction.java rename to src/main/java/pres/auxiliary/selenium/datadriven/DataFunction.java index 5dec1fb..3df38d1 100644 --- a/src/main/java/pres/auxiliary/work/selenium/datadriven/DataFunction.java +++ b/src/main/java/pres/auxiliary/selenium/datadriven/DataFunction.java @@ -1,4 +1,4 @@ -package pres.auxiliary.work.selenium.datadriven; +package pres.auxiliary.selenium.datadriven; import java.util.function.Function; diff --git a/src/main/java/pres/auxiliary/work/selenium/datadriven/DataMode.java b/src/main/java/pres/auxiliary/selenium/datadriven/DataMode.java similarity index 86% rename from src/main/java/pres/auxiliary/work/selenium/datadriven/DataMode.java rename to src/main/java/pres/auxiliary/selenium/datadriven/DataMode.java index accd7d5..43ca17b 100644 --- a/src/main/java/pres/auxiliary/work/selenium/datadriven/DataMode.java +++ b/src/main/java/pres/auxiliary/selenium/datadriven/DataMode.java @@ -1,4 +1,4 @@ -package pres.auxiliary.work.selenium.datadriven; +package pres.auxiliary.selenium.datadriven; /** * 用于定义可向数据驱动中添加的预设模型 diff --git a/src/main/java/pres/auxiliary/work/selenium/datadriven/DataNotFoundException.java b/src/main/java/pres/auxiliary/selenium/datadriven/DataNotFoundException.java similarity index 87% rename from src/main/java/pres/auxiliary/work/selenium/datadriven/DataNotFoundException.java rename to src/main/java/pres/auxiliary/selenium/datadriven/DataNotFoundException.java index f7d8e53..e68c7ce 100644 --- a/src/main/java/pres/auxiliary/work/selenium/datadriven/DataNotFoundException.java +++ b/src/main/java/pres/auxiliary/selenium/datadriven/DataNotFoundException.java @@ -1,4 +1,4 @@ -package pres.auxiliary.work.selenium.datadriven; +package pres.auxiliary.selenium.datadriven; public class DataNotFoundException extends RuntimeException { diff --git a/src/main/java/pres/auxiliary/work/selenium/datadriven/Functions.java b/src/main/java/pres/auxiliary/selenium/datadriven/Functions.java similarity index 97% rename from src/main/java/pres/auxiliary/work/selenium/datadriven/Functions.java rename to src/main/java/pres/auxiliary/selenium/datadriven/Functions.java index 18aedc3..e55c494 100644 --- a/src/main/java/pres/auxiliary/work/selenium/datadriven/Functions.java +++ b/src/main/java/pres/auxiliary/selenium/datadriven/Functions.java @@ -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; diff --git a/src/main/java/pres/auxiliary/work/selenium/datadriven/SplitType.java b/src/main/java/pres/auxiliary/selenium/datadriven/SplitType.java similarity index 89% rename from src/main/java/pres/auxiliary/work/selenium/datadriven/SplitType.java rename to src/main/java/pres/auxiliary/selenium/datadriven/SplitType.java index 8945dbf..01ba2c1 100644 --- a/src/main/java/pres/auxiliary/work/selenium/datadriven/SplitType.java +++ b/src/main/java/pres/auxiliary/selenium/datadriven/SplitType.java @@ -1,4 +1,4 @@ -package pres.auxiliary.work.selenium.datadriven; +package pres.auxiliary.selenium.datadriven; public enum SplitType { /** diff --git a/src/main/java/pres/auxiliary/work/selenium/datadriven/TestNGDataDriver.java b/src/main/java/pres/auxiliary/selenium/datadriven/TestNGDataDriver.java similarity index 96% rename from src/main/java/pres/auxiliary/work/selenium/datadriven/TestNGDataDriver.java rename to src/main/java/pres/auxiliary/selenium/datadriven/TestNGDataDriver.java index 9b2fc35..bdcea44 100644 --- a/src/main/java/pres/auxiliary/work/selenium/datadriven/TestNGDataDriver.java +++ b/src/main/java/pres/auxiliary/selenium/datadriven/TestNGDataDriver.java @@ -1,4 +1,4 @@ -package pres.auxiliary.work.selenium.datadriven; +package pres.auxiliary.selenium.datadriven; import java.io.File; import java.io.IOException; diff --git a/src/main/java/pres/auxiliary/work/selenium/element/Element.java b/src/main/java/pres/auxiliary/selenium/element/Element.java similarity index 92% rename from src/main/java/pres/auxiliary/work/selenium/element/Element.java rename to src/main/java/pres/auxiliary/selenium/element/Element.java index a9ec7ca..4cbe11f 100644 --- a/src/main/java/pres/auxiliary/work/selenium/element/Element.java +++ b/src/main/java/pres/auxiliary/selenium/element/Element.java @@ -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; } diff --git a/src/main/java/pres/auxiliary/work/selenium/element/ElementData.java b/src/main/java/pres/auxiliary/selenium/element/ElementData.java similarity index 92% rename from src/main/java/pres/auxiliary/work/selenium/element/ElementData.java rename to src/main/java/pres/auxiliary/selenium/element/ElementData.java index e1720fd..8e13781 100644 --- a/src/main/java/pres/auxiliary/work/selenium/element/ElementData.java +++ b/src/main/java/pres/auxiliary/selenium/element/ElementData.java @@ -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; /** *

文件名：ElementData.java

diff --git a/src/main/java/pres/auxiliary/work/selenium/element/ElementType.java b/src/main/java/pres/auxiliary/selenium/element/ElementType.java similarity index 89% rename from src/main/java/pres/auxiliary/work/selenium/element/ElementType.java rename to src/main/java/pres/auxiliary/selenium/element/ElementType.java index 181270b..5ccfcfe 100644 --- a/src/main/java/pres/auxiliary/work/selenium/element/ElementType.java +++ b/src/main/java/pres/auxiliary/selenium/element/ElementType.java @@ -1,4 +1,4 @@ -package pres.auxiliary.work.selenium.element; +package pres.auxiliary.selenium.element; /** *

文件名：EelementType.java

diff --git a/src/main/java/pres/auxiliary/work/selenium/element/ExceptionAction.java b/src/main/java/pres/auxiliary/selenium/element/ExceptionAction.java similarity index 87% rename from src/main/java/pres/auxiliary/work/selenium/element/ExceptionAction.java rename to src/main/java/pres/auxiliary/selenium/element/ExceptionAction.java index abe723a..0bc250b 100644 --- a/src/main/java/pres/auxiliary/work/selenium/element/ExceptionAction.java +++ b/src/main/java/pres/auxiliary/selenium/element/ExceptionAction.java @@ -1,4 +1,4 @@ -package pres.auxiliary.work.selenium.element; +package pres.auxiliary.selenium.element; import java.util.function.Consumer; diff --git a/src/main/java/pres/auxiliary/work/selenium/element/CommonBy.java b/src/main/java/pres/auxiliary/selenium/element/FindCommonElement.java similarity index 89% rename from src/main/java/pres/auxiliary/work/selenium/element/CommonBy.java rename to src/main/java/pres/auxiliary/selenium/element/FindCommonElement.java index 465dde2..1f4f6b6 100644 --- a/src/main/java/pres/auxiliary/work/selenium/element/CommonBy.java +++ b/src/main/java/pres/auxiliary/selenium/element/FindCommonElement.java @@ -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; /** *

文件名：CommonBy.java

@@ -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 { *

* 注意： *

    - *
  1. 下标允许传入负数，具体的参数逻辑可以参考{@link MultiBy#getElement(int)}方法的参数说明。
    2. + *
  2. 下标允许传入负数，具体的参数逻辑可以参考{@link FindMultiElement#getElement(int)}方法的参数说明。
    3. *
  3. 若下标超出当前从页面获取到元素的最大值时，其不会抛出异常，但当调用{@link Element#getWebElement()} * 方法时，则会抛出元素不存在异常。
    4. *
diff --git a/src/main/java/pres/auxiliary/work/selenium/element/DataListBy.java b/src/main/java/pres/auxiliary/selenium/element/FindDataListElement.java similarity index 81% rename from src/main/java/pres/auxiliary/work/selenium/element/DataListBy.java rename to src/main/java/pres/auxiliary/selenium/element/FindDataListElement.java index 2c74501..d219e54 100644 --- a/src/main/java/pres/auxiliary/work/selenium/element/DataListBy.java +++ b/src/main/java/pres/auxiliary/selenium/element/FindDataListElement.java @@ -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; /** *

文件名：DataListBy.java

@@ -16,12 +16,12 @@ import pres.auxiliary.work.selenium.brower.AbstractBrower; * @version Ver1.0 * */ -public class DataListBy extends MultiBy { +public class FindDataListElement extends FindMultiElement { /** * 构造方法，初始化浏览器对象 * @param brower {@link AbstractBrower}类对象 */ - public DataListBy(AbstractBrower brower) { + public FindDataListElement(AbstractBrower brower) { super(brower); } diff --git a/src/main/java/pres/auxiliary/work/selenium/element/AbstractBy.java b/src/main/java/pres/auxiliary/selenium/element/FindElement.java similarity index 94% rename from src/main/java/pres/auxiliary/work/selenium/element/AbstractBy.java rename to src/main/java/pres/auxiliary/selenium/element/FindElement.java index 69830cf..766c205 100644 --- a/src/main/java/pres/auxiliary/work/selenium/element/AbstractBy.java +++ b/src/main/java/pres/auxiliary/selenium/element/FindElement.java @@ -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; /** *

文件名：AbstractElement.java

@@ -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(); diff --git a/src/main/java/pres/auxiliary/work/selenium/element/MultiBy.java b/src/main/java/pres/auxiliary/selenium/element/FindMultiElement.java similarity index 92% rename from src/main/java/pres/auxiliary/work/selenium/element/MultiBy.java rename to src/main/java/pres/auxiliary/selenium/element/FindMultiElement.java index 4b4a266..461fe97 100644 --- a/src/main/java/pres/auxiliary/work/selenium/element/MultiBy.java +++ b/src/main/java/pres/auxiliary/selenium/element/FindMultiElement.java @@ -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; /** *

@@ -25,7 +25,7 @@ import pres.auxiliary.work.selenium.brower.AbstractBrower; * @version Ver1.0 * */ -public abstract class MultiBy> extends AbstractBy { +public abstract class FindMultiElement> extends FindElement { /** * 用于记录当前元素集合中第一个元素是否为不可选择的元素，用于对元素的随机返回 */ @@ -36,7 +36,7 @@ public abstract class MultiBy> extends AbstractBy { * * @param brower {@link AbstractBrower}类对象 */ - public MultiBy(AbstractBrower brower) { + public FindMultiElement(AbstractBrower brower) { super(brower); } diff --git a/src/main/java/pres/auxiliary/work/selenium/element/SelectBy.java b/src/main/java/pres/auxiliary/selenium/element/FindSelectElement.java similarity index 92% rename from src/main/java/pres/auxiliary/work/selenium/element/SelectBy.java rename to src/main/java/pres/auxiliary/selenium/element/FindSelectElement.java index 25ff913..2cd5bb2 100644 --- a/src/main/java/pres/auxiliary/work/selenium/element/SelectBy.java +++ b/src/main/java/pres/auxiliary/selenium/element/FindSelectElement.java @@ -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; /** *

文件名：SelectBy.java

@@ -50,7 +50,7 @@ import pres.auxiliary.work.selenium.brower.AbstractBrower; * @version Ver1.0 * */ -public class SelectBy extends MultiBy { +public class FindSelectElement extends FindMultiElement { /** * 定义标准下拉选项的tagname */ @@ -69,7 +69,7 @@ public class SelectBy extends MultiBy { * 构造方法，初始化浏览器对象 * @param brower {@link AbstractBrower}类对象 */ - public SelectBy(AbstractBrower brower) { + public FindSelectElement(AbstractBrower brower) { super(brower); } @@ -101,7 +101,7 @@ public class SelectBy extends MultiBy { } @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) { diff --git a/src/main/java/pres/auxiliary/work/selenium/element/UnrecognizableLocationModeException.java b/src/main/java/pres/auxiliary/selenium/element/UnrecognizableLocationModeException.java similarity index 92% rename from src/main/java/pres/auxiliary/work/selenium/element/UnrecognizableLocationModeException.java rename to src/main/java/pres/auxiliary/selenium/element/UnrecognizableLocationModeException.java index a46ac37..a0a29a7 100644 --- a/src/main/java/pres/auxiliary/work/selenium/element/UnrecognizableLocationModeException.java +++ b/src/main/java/pres/auxiliary/selenium/element/UnrecognizableLocationModeException.java @@ -1,38 +1,38 @@ -package pres.auxiliary.work.selenium.element; - -/** - *

文件名：UnrecognizableLocationModeException.java

- *

用途：在元素定位方式无法被识别的情况下，抛出的异常

- *

编码时间：2019年9月24日下午3:19:43

- *

修改时间：2019年9月24日下午3:19:43

- * @author 彭宇琦 - * @version Ver1.0 - * @since JDK 12 - * - */ -public class UnrecognizableLocationModeException extends RuntimeException { - - private static final long serialVersionUID = 1L; - - public UnrecognizableLocationModeException() { - super(); - } - - public UnrecognizableLocationModeException(String message, Throwable cause, boolean enableSuppression, - boolean writableStackTrace) { - super(message, cause, enableSuppression, writableStackTrace); - } - - public UnrecognizableLocationModeException(String message, Throwable cause) { - super(message, cause); - } - - public UnrecognizableLocationModeException(String message) { - super(message); - } - - public UnrecognizableLocationModeException(Throwable cause) { - super(cause); - } - -} +package pres.auxiliary.selenium.element; + +/** + *

文件名：UnrecognizableLocationModeException.java

+ *

用途：在元素定位方式无法被识别的情况下，抛出的异常

+ *

编码时间：2019年9月24日下午3:19:43

+ *

修改时间：2019年9月24日下午3:19:43

+ * @author 彭宇琦 + * @version Ver1.0 + * @since JDK 12 + * + */ +public class UnrecognizableLocationModeException extends RuntimeException { + + private static final long serialVersionUID = 1L; + + public UnrecognizableLocationModeException() { + super(); + } + + public UnrecognizableLocationModeException(String message, Throwable cause, boolean enableSuppression, + boolean writableStackTrace) { + super(message, cause, enableSuppression, writableStackTrace); + } + + public UnrecognizableLocationModeException(String message, Throwable cause) { + super(message, cause); + } + + public UnrecognizableLocationModeException(String message) { + super(message); + } + + public UnrecognizableLocationModeException(Throwable cause) { + super(cause); + } + +} diff --git a/src/main/java/pres/auxiliary/work/selenium/event/AbstractEvent.java b/src/main/java/pres/auxiliary/selenium/event/AbstractEvent.java similarity index 97% rename from src/main/java/pres/auxiliary/work/selenium/event/AbstractEvent.java rename to src/main/java/pres/auxiliary/selenium/event/AbstractEvent.java index de51957..690adc6 100644 --- a/src/main/java/pres/auxiliary/work/selenium/event/AbstractEvent.java +++ b/src/main/java/pres/auxiliary/selenium/event/AbstractEvent.java @@ -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; /** *

文件名：AbstractEvent.java

diff --git a/src/main/java/pres/auxiliary/work/selenium/event/AssertEvent.java b/src/main/java/pres/auxiliary/selenium/event/AssertEvent.java similarity index 96% rename from src/main/java/pres/auxiliary/work/selenium/event/AssertEvent.java rename to src/main/java/pres/auxiliary/selenium/event/AssertEvent.java index 003bedb..b86dae4 100644 --- a/src/main/java/pres/auxiliary/work/selenium/event/AssertEvent.java +++ b/src/main/java/pres/auxiliary/selenium/event/AssertEvent.java @@ -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; /** *

diff --git a/src/main/java/pres/auxiliary/work/selenium/event/ClickEvent.java b/src/main/java/pres/auxiliary/selenium/event/ClickEvent.java similarity index 91% rename from src/main/java/pres/auxiliary/work/selenium/event/ClickEvent.java rename to src/main/java/pres/auxiliary/selenium/event/ClickEvent.java index dc40fd0..8084db2 100644 --- a/src/main/java/pres/auxiliary/work/selenium/event/ClickEvent.java +++ b/src/main/java/pres/auxiliary/selenium/event/ClickEvent.java @@ -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; /** *

文件名：ClickEvent.java

diff --git a/src/main/java/pres/auxiliary/work/selenium/event/CompareNumberType.java b/src/main/java/pres/auxiliary/selenium/event/CompareNumberType.java similarity index 89% rename from src/main/java/pres/auxiliary/work/selenium/event/CompareNumberType.java rename to src/main/java/pres/auxiliary/selenium/event/CompareNumberType.java index 32b2af0..a529603 100644 --- a/src/main/java/pres/auxiliary/work/selenium/event/CompareNumberType.java +++ b/src/main/java/pres/auxiliary/selenium/event/CompareNumberType.java @@ -1,4 +1,4 @@ -package pres.auxiliary.work.selenium.event; +package pres.auxiliary.selenium.event; /** *

文件名：CompareNumberType.java

diff --git a/src/main/java/pres/auxiliary/work/selenium/event/EventAction.java b/src/main/java/pres/auxiliary/selenium/event/EventAction.java similarity index 85% rename from src/main/java/pres/auxiliary/work/selenium/event/EventAction.java rename to src/main/java/pres/auxiliary/selenium/event/EventAction.java index cc6f27c..0488894 100644 --- a/src/main/java/pres/auxiliary/work/selenium/event/EventAction.java +++ b/src/main/java/pres/auxiliary/selenium/event/EventAction.java @@ -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; /** *

文件名：EventAction.java

diff --git a/src/main/java/pres/auxiliary/work/selenium/event/EventInformation.java b/src/main/java/pres/auxiliary/selenium/event/EventInformation.java similarity index 90% rename from src/main/java/pres/auxiliary/work/selenium/event/EventInformation.java rename to src/main/java/pres/auxiliary/selenium/event/EventInformation.java index 56f2c48..452c6c4 100644 --- a/src/main/java/pres/auxiliary/work/selenium/event/EventInformation.java +++ b/src/main/java/pres/auxiliary/selenium/event/EventInformation.java @@ -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; /** *

文件名：EventInformation.java

diff --git a/src/main/java/pres/auxiliary/work/selenium/event/EventProxy.java b/src/main/java/pres/auxiliary/selenium/event/EventProxy.java similarity index 95% rename from src/main/java/pres/auxiliary/work/selenium/event/EventProxy.java rename to src/main/java/pres/auxiliary/selenium/event/EventProxy.java index 134fb0c..4cdc1d6 100644 --- a/src/main/java/pres/auxiliary/work/selenium/event/EventProxy.java +++ b/src/main/java/pres/auxiliary/selenium/event/EventProxy.java @@ -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; /** *

文件名：EventProxy.java

diff --git a/src/main/java/pres/auxiliary/work/selenium/event/JsEvent.java b/src/main/java/pres/auxiliary/selenium/event/JsEvent.java similarity index 95% rename from src/main/java/pres/auxiliary/work/selenium/event/JsEvent.java rename to src/main/java/pres/auxiliary/selenium/event/JsEvent.java index 5c8ccf6..6cb26cd 100644 --- a/src/main/java/pres/auxiliary/work/selenium/event/JsEvent.java +++ b/src/main/java/pres/auxiliary/selenium/event/JsEvent.java @@ -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; /** *

diff --git a/src/main/java/pres/auxiliary/work/selenium/event/TextEvent.java b/src/main/java/pres/auxiliary/selenium/event/TextEvent.java similarity index 94% rename from src/main/java/pres/auxiliary/work/selenium/event/TextEvent.java rename to src/main/java/pres/auxiliary/selenium/event/TextEvent.java index 1120d9c..f3d7210 100644 --- a/src/main/java/pres/auxiliary/work/selenium/event/TextEvent.java +++ b/src/main/java/pres/auxiliary/selenium/event/TextEvent.java @@ -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; /** *

文件名：TextEvent.java

diff --git a/src/main/java/pres/auxiliary/work/selenium/event/WaitEvent.java b/src/main/java/pres/auxiliary/selenium/event/WaitEvent.java similarity index 95% rename from src/main/java/pres/auxiliary/work/selenium/event/WaitEvent.java rename to src/main/java/pres/auxiliary/selenium/event/WaitEvent.java index 755a93b..83690a6 100644 --- a/src/main/java/pres/auxiliary/work/selenium/event/WaitEvent.java +++ b/src/main/java/pres/auxiliary/selenium/event/WaitEvent.java @@ -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; /** *

文件名：WaitEvent.java

diff --git a/src/main/java/pres/auxiliary/work/selenium/event/extend/ControlException.java b/src/main/java/pres/auxiliary/selenium/event/extend/ControlException.java similarity index 92% rename from src/main/java/pres/auxiliary/work/selenium/event/extend/ControlException.java rename to src/main/java/pres/auxiliary/selenium/event/extend/ControlException.java index ce131a5..5bd99d2 100644 --- a/src/main/java/pres/auxiliary/work/selenium/event/extend/ControlException.java +++ b/src/main/java/pres/auxiliary/selenium/event/extend/ControlException.java @@ -1,4 +1,4 @@ -package pres.auxiliary.work.selenium.event.extend; +package pres.auxiliary.selenium.event.extend; /** *

文件名：ControlException.java

diff --git a/src/main/java/pres/auxiliary/work/selenium/event/extend/DataTableEvent.java b/src/main/java/pres/auxiliary/selenium/event/extend/DataTableEvent.java similarity index 91% rename from src/main/java/pres/auxiliary/work/selenium/event/extend/DataTableEvent.java rename to src/main/java/pres/auxiliary/selenium/event/extend/DataTableEvent.java index 7d481fd..e343647 100644 --- a/src/main/java/pres/auxiliary/work/selenium/event/extend/DataTableEvent.java +++ b/src/main/java/pres/auxiliary/selenium/event/extend/DataTableEvent.java @@ -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; /** *

@@ -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 { /** * 用于添加一列元素 *

- * 注意：传入的{@link DataListBy}类对象中元素的名称请勿与其他元素名称一致，否则会覆盖原有的元素列。 + * 注意：传入的{@link FindDataListElement}类对象中元素的名称请勿与其他元素名称一致，否则会覆盖原有的元素列。 * 其元素名称将作为列表名称，可通过该名称获取当前列 *

* * @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()); } }); } diff --git a/src/main/java/pres/auxiliary/work/selenium/event/extend/GroupEvent.java b/src/main/java/pres/auxiliary/selenium/event/extend/GroupEvent.java similarity index 96% rename from src/main/java/pres/auxiliary/work/selenium/event/extend/GroupEvent.java rename to src/main/java/pres/auxiliary/selenium/event/extend/GroupEvent.java index 3eb39c5..b505e90 100644 --- a/src/main/java/pres/auxiliary/work/selenium/event/extend/GroupEvent.java +++ b/src/main/java/pres/auxiliary/selenium/event/extend/GroupEvent.java @@ -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; diff --git a/src/main/java/pres/auxiliary/work/selenium/location/AbstractLocation.java b/src/main/java/pres/auxiliary/selenium/location/AbstractLocation.java similarity index 92% rename from src/main/java/pres/auxiliary/work/selenium/location/AbstractLocation.java rename to src/main/java/pres/auxiliary/selenium/location/AbstractLocation.java index a74aebb..9fbe42b 100644 --- a/src/main/java/pres/auxiliary/work/selenium/location/AbstractLocation.java +++ b/src/main/java/pres/auxiliary/selenium/location/AbstractLocation.java @@ -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; /** *

文件名：AbstractReadConfig.java

diff --git a/src/main/java/pres/auxiliary/work/selenium/location/ByType.java b/src/main/java/pres/auxiliary/selenium/location/ByType.java similarity index 91% rename from src/main/java/pres/auxiliary/work/selenium/location/ByType.java rename to src/main/java/pres/auxiliary/selenium/location/ByType.java index db914e4..6831fb5 100644 --- a/src/main/java/pres/auxiliary/work/selenium/location/ByType.java +++ b/src/main/java/pres/auxiliary/selenium/location/ByType.java @@ -1,4 +1,4 @@ -package pres.auxiliary.work.selenium.location; +package pres.auxiliary.selenium.location; /** *

diff --git a/src/main/java/pres/auxiliary/work/selenium/location/IncorrectFileException.java b/src/main/java/pres/auxiliary/selenium/location/IncorrectFileException.java similarity index 90% rename from src/main/java/pres/auxiliary/work/selenium/location/IncorrectFileException.java rename to src/main/java/pres/auxiliary/selenium/location/IncorrectFileException.java index 9bb0037..2e1c099 100644 --- a/src/main/java/pres/auxiliary/work/selenium/location/IncorrectFileException.java +++ b/src/main/java/pres/auxiliary/selenium/location/IncorrectFileException.java @@ -1,4 +1,4 @@ -package pres.auxiliary.work.selenium.location; +package pres.auxiliary.selenium.location; /** * 路径文件有误时抛出的异常 diff --git a/src/main/java/pres/auxiliary/work/selenium/location/JsonLocation.java b/src/main/java/pres/auxiliary/selenium/location/JsonLocation.java similarity index 94% rename from src/main/java/pres/auxiliary/work/selenium/location/JsonLocation.java rename to src/main/java/pres/auxiliary/selenium/location/JsonLocation.java index 60b8bcd..e86591a 100644 --- a/src/main/java/pres/auxiliary/work/selenium/location/JsonLocation.java +++ b/src/main/java/pres/auxiliary/selenium/location/JsonLocation.java @@ -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; /** *

文件名：JsonLocation.java

diff --git a/src/main/java/pres/auxiliary/work/selenium/location/NoFileLocation.java b/src/main/java/pres/auxiliary/selenium/location/NoFileLocation.java similarity index 94% rename from src/main/java/pres/auxiliary/work/selenium/location/NoFileLocation.java rename to src/main/java/pres/auxiliary/selenium/location/NoFileLocation.java index e6cf9b4..2a12b91 100644 --- a/src/main/java/pres/auxiliary/work/selenium/location/NoFileLocation.java +++ b/src/main/java/pres/auxiliary/selenium/location/NoFileLocation.java @@ -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; /** *

文件名：NoFileLocation.java

diff --git a/src/main/java/pres/auxiliary/work/selenium/location/ReadLocation.java b/src/main/java/pres/auxiliary/selenium/location/ReadLocation.java similarity index 91% rename from src/main/java/pres/auxiliary/work/selenium/location/ReadLocation.java rename to src/main/java/pres/auxiliary/selenium/location/ReadLocation.java index c1dfb0e..4bb977f 100644 --- a/src/main/java/pres/auxiliary/work/selenium/location/ReadLocation.java +++ b/src/main/java/pres/auxiliary/selenium/location/ReadLocation.java @@ -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; /** *

文件名：ReadLocation.java

diff --git a/src/main/java/pres/auxiliary/work/selenium/location/TextLocation.java b/src/main/java/pres/auxiliary/selenium/location/TextLocation.java similarity index 96% rename from src/main/java/pres/auxiliary/work/selenium/location/TextLocation.java rename to src/main/java/pres/auxiliary/selenium/location/TextLocation.java index 11a64a0..82c68f4 100644 --- a/src/main/java/pres/auxiliary/work/selenium/location/TextLocation.java +++ b/src/main/java/pres/auxiliary/selenium/location/TextLocation.java @@ -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; /** *

文件名：TextLcation.java

diff --git a/src/main/java/pres/auxiliary/work/selenium/location/UndefinedElementException.java b/src/main/java/pres/auxiliary/selenium/location/UndefinedElementException.java similarity index 92% rename from src/main/java/pres/auxiliary/work/selenium/location/UndefinedElementException.java rename to src/main/java/pres/auxiliary/selenium/location/UndefinedElementException.java index ec7c44e..3adf9f8 100644 --- a/src/main/java/pres/auxiliary/work/selenium/location/UndefinedElementException.java +++ b/src/main/java/pres/auxiliary/selenium/location/UndefinedElementException.java @@ -1,4 +1,4 @@ -package pres.auxiliary.work.selenium.location; +package pres.auxiliary.selenium.location; /** *

文件名：UndefinedElementException.java

diff --git a/src/main/java/pres/auxiliary/work/selenium/location/WriteLocation.java b/src/main/java/pres/auxiliary/selenium/location/WriteLocation.java similarity index 90% rename from src/main/java/pres/auxiliary/work/selenium/location/WriteLocation.java rename to src/main/java/pres/auxiliary/selenium/location/WriteLocation.java index 9b53b46..c827d3d 100644 --- a/src/main/java/pres/auxiliary/work/selenium/location/WriteLocation.java +++ b/src/main/java/pres/auxiliary/selenium/location/WriteLocation.java @@ -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; /** *

文件名：WriteLocation.java

diff --git a/src/main/java/pres/auxiliary/work/selenium/location/WriteTempletLocation.java b/src/main/java/pres/auxiliary/selenium/location/WriteTempletLocation.java similarity index 94% rename from src/main/java/pres/auxiliary/work/selenium/location/WriteTempletLocation.java rename to src/main/java/pres/auxiliary/selenium/location/WriteTempletLocation.java index de56cc2..ce82f2b 100644 --- a/src/main/java/pres/auxiliary/work/selenium/location/WriteTempletLocation.java +++ b/src/main/java/pres/auxiliary/selenium/location/WriteTempletLocation.java @@ -1,4 +1,4 @@ -package pres.auxiliary.work.selenium.location; +package pres.auxiliary.selenium.location; /** *

文件名：WriteTempletLocation.java

diff --git a/src/main/java/pres/auxiliary/work/selenium/location/XmlLocation.java b/src/main/java/pres/auxiliary/selenium/location/XmlLocation.java similarity index 94% rename from src/main/java/pres/auxiliary/work/selenium/location/XmlLocation.java rename to src/main/java/pres/auxiliary/selenium/location/XmlLocation.java index 0bf2eb8..5a72072 100644 --- a/src/main/java/pres/auxiliary/work/selenium/location/XmlLocation.java +++ b/src/main/java/pres/auxiliary/selenium/location/XmlLocation.java @@ -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; /** *

diff --git a/src/main/java/pres/auxiliary/work/selenium/page/Page.java b/src/main/java/pres/auxiliary/selenium/page/Page.java similarity index 94% rename from src/main/java/pres/auxiliary/work/selenium/page/Page.java rename to src/main/java/pres/auxiliary/selenium/page/Page.java index 0c485ae..e4bfdad 100644 --- a/src/main/java/pres/auxiliary/work/selenium/page/Page.java +++ b/src/main/java/pres/auxiliary/selenium/page/Page.java @@ -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; /** *

文件名：Page.java

diff --git a/src/main/java/pres/auxiliary/work/selenium/tool/ExcelRecord.java b/src/main/java/pres/auxiliary/selenium/tool/ExcelRecord.java similarity index 96% rename from src/main/java/pres/auxiliary/work/selenium/tool/ExcelRecord.java rename to src/main/java/pres/auxiliary/selenium/tool/ExcelRecord.java index 62121ff..ad38094 100644 --- a/src/main/java/pres/auxiliary/work/selenium/tool/ExcelRecord.java +++ b/src/main/java/pres/auxiliary/selenium/tool/ExcelRecord.java @@ -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; /** *

文件名：ExcelRecord.java

diff --git a/src/main/java/pres/auxiliary/work/selenium/tool/IncorrectDirectoryException.java b/src/main/java/pres/auxiliary/selenium/tool/IncorrectDirectoryException.java similarity index 89% rename from src/main/java/pres/auxiliary/work/selenium/tool/IncorrectDirectoryException.java rename to src/main/java/pres/auxiliary/selenium/tool/IncorrectDirectoryException.java index b56972b..0d55d56 100644 --- a/src/main/java/pres/auxiliary/work/selenium/tool/IncorrectDirectoryException.java +++ b/src/main/java/pres/auxiliary/selenium/tool/IncorrectDirectoryException.java @@ -1,4 +1,4 @@ -package pres.auxiliary.work.selenium.tool; +package pres.auxiliary.selenium.tool; public class IncorrectDirectoryException extends RuntimeException { diff --git a/src/main/java/pres/auxiliary/work/selenium/tool/RecognitionImage.java b/src/main/java/pres/auxiliary/selenium/tool/RecognitionImage.java similarity index 96% rename from src/main/java/pres/auxiliary/work/selenium/tool/RecognitionImage.java rename to src/main/java/pres/auxiliary/selenium/tool/RecognitionImage.java index 8221a7f..33fb73b 100644 --- a/src/main/java/pres/auxiliary/work/selenium/tool/RecognitionImage.java +++ b/src/main/java/pres/auxiliary/selenium/tool/RecognitionImage.java @@ -1,4 +1,4 @@ -package pres.auxiliary.work.selenium.tool; +package pres.auxiliary.selenium.tool; import java.awt.Rectangle; import java.awt.image.BufferedImage; diff --git a/src/main/java/pres/auxiliary/work/selenium/tool/RecordType.java b/src/main/java/pres/auxiliary/selenium/tool/RecordType.java similarity index 90% rename from src/main/java/pres/auxiliary/work/selenium/tool/RecordType.java rename to src/main/java/pres/auxiliary/selenium/tool/RecordType.java index 9e906c0..ec2fea8 100644 --- a/src/main/java/pres/auxiliary/work/selenium/tool/RecordType.java +++ b/src/main/java/pres/auxiliary/selenium/tool/RecordType.java @@ -1,4 +1,4 @@ -package pres.auxiliary.work.selenium.tool; +package pres.auxiliary.selenium.tool; /** *

文件名：RecordType.java

diff --git a/src/main/java/pres/auxiliary/work/selenium/tool/Screenshot.java b/src/main/java/pres/auxiliary/selenium/tool/Screenshot.java similarity index 95% rename from src/main/java/pres/auxiliary/work/selenium/tool/Screenshot.java rename to src/main/java/pres/auxiliary/selenium/tool/Screenshot.java index 49bc4a9..0f8cadd 100644 --- a/src/main/java/pres/auxiliary/work/selenium/tool/Screenshot.java +++ b/src/main/java/pres/auxiliary/selenium/tool/Screenshot.java @@ -1,4 +1,4 @@ -package pres.auxiliary.work.selenium.tool; +package pres.auxiliary.selenium.tool; import java.io.File; import java.io.IOException; diff --git a/src/main/java/pres/auxiliary/work/testcase/file/AbstractTestCaseWrite.java b/src/main/java/pres/auxiliary/testcase/file/AbstractTestCaseWrite.java similarity index 92% rename from src/main/java/pres/auxiliary/work/testcase/file/AbstractTestCaseWrite.java rename to src/main/java/pres/auxiliary/testcase/file/AbstractTestCaseWrite.java index 340e389..b369b08 100644 --- a/src/main/java/pres/auxiliary/work/testcase/file/AbstractTestCaseWrite.java +++ b/src/main/java/pres/auxiliary/testcase/file/AbstractTestCaseWrite.java @@ -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; /** *

文件名：AbstractTestCaseWrite.java

diff --git a/src/main/java/pres/auxiliary/work/testcase/file/BasicTestCaseWrite.java b/src/main/java/pres/auxiliary/testcase/file/BasicTestCaseWrite.java similarity index 94% rename from src/main/java/pres/auxiliary/work/testcase/file/BasicTestCaseWrite.java rename to src/main/java/pres/auxiliary/testcase/file/BasicTestCaseWrite.java index ae0f59f..3faf7ee 100644 --- a/src/main/java/pres/auxiliary/work/testcase/file/BasicTestCaseWrite.java +++ b/src/main/java/pres/auxiliary/testcase/file/BasicTestCaseWrite.java @@ -1,30 +1,30 @@ -package pres.auxiliary.work.testcase.file; - -import java.io.File; - -import org.dom4j.DocumentException; - -/** - *

文件名：BasicTestCaseWrite.java

- *

用途：在无相应的测试用例文件类时，可使用本类，对自定义的一个测试用例模板进行编辑

- *

编码时间：2020年4月5日 下午6:51:54

- *

修改时间：2020年4月5日 下午6:51:54

- * @author 彭宇琦 - * @version Ver1.0 - * @since JDK 12 - */ -public class BasicTestCaseWrite extends AbstractTestCaseWrite { - /** - * 通过测试文件模板xml配置文件和测试用例文件来构造AbstractTestCaseWrite类。当配置文件中 - * 只存在一个sheet标签时，则直接获取其对应sheet下所有column标签的id属性；若存在 - * 多个sheet标签时，则读取第一个sheet标签，如需切换sheet标签，则可调用{@link #switchSheet(String)} 方法。 - * - * @param configFile 测试文件模板xml配置文件类对象 - * @param caseFile 测试用例文件类对象 - * @throws DocumentException - * @throws IncorrectFileException 文件格式或路径不正确时抛出的异常 - */ - public BasicTestCaseWrite(File configFile, File caseFile) throws DocumentException { - super(configFile, caseFile); - } -} +package pres.auxiliary.testcase.file; + +import java.io.File; + +import org.dom4j.DocumentException; + +/** + *

文件名：BasicTestCaseWrite.java

+ *

用途：在无相应的测试用例文件类时，可使用本类，对自定义的一个测试用例模板进行编辑

+ *

编码时间：2020年4月5日 下午6:51:54

+ *

修改时间：2020年4月5日 下午6:51:54

+ * @author 彭宇琦 + * @version Ver1.0 + * @since JDK 12 + */ +public class BasicTestCaseWrite extends AbstractTestCaseWrite { + /** + * 通过测试文件模板xml配置文件和测试用例文件来构造AbstractTestCaseWrite类。当配置文件中 + * 只存在一个sheet标签时，则直接获取其对应sheet下所有column标签的id属性；若存在 + * 多个sheet标签时，则读取第一个sheet标签，如需切换sheet标签，则可调用{@link #switchSheet(String)} 方法。 + * + * @param configFile 测试文件模板xml配置文件类对象 + * @param caseFile 测试用例文件类对象 + * @throws DocumentException + * @throws IncorrectFileException 文件格式或路径不正确时抛出的异常 + */ + public BasicTestCaseWrite(File configFile, File caseFile) throws DocumentException { + super(configFile, caseFile); + } +} diff --git a/src/main/java/pres/auxiliary/work/testcase/file/CommonTestCaseWrite.java b/src/main/java/pres/auxiliary/testcase/file/CommonTestCaseWrite.java similarity index 99% rename from src/main/java/pres/auxiliary/work/testcase/file/CommonTestCaseWrite.java rename to src/main/java/pres/auxiliary/testcase/file/CommonTestCaseWrite.java index 7247078..a885ed8 100644 --- a/src/main/java/pres/auxiliary/work/testcase/file/CommonTestCaseWrite.java +++ b/src/main/java/pres/auxiliary/testcase/file/CommonTestCaseWrite.java @@ -1,4 +1,4 @@ -package pres.auxiliary.work.testcase.file; +package pres.auxiliary.testcase.file; import java.io.File; import java.util.ArrayList; diff --git a/src/main/java/pres/auxiliary/work/testcase/file/FieldType.java b/src/main/java/pres/auxiliary/testcase/file/FieldType.java similarity index 92% rename from src/main/java/pres/auxiliary/work/testcase/file/FieldType.java rename to src/main/java/pres/auxiliary/testcase/file/FieldType.java index b4d8ba6..c214235 100644 --- a/src/main/java/pres/auxiliary/work/testcase/file/FieldType.java +++ b/src/main/java/pres/auxiliary/testcase/file/FieldType.java @@ -1,4 +1,4 @@ -package pres.auxiliary.work.testcase.file; +package pres.auxiliary.testcase.file; /** *

文件名：FieidType.java

diff --git a/src/main/java/pres/auxiliary/work/testcase/file/IncorrectFileException.java b/src/main/java/pres/auxiliary/testcase/file/IncorrectFileException.java similarity index 91% rename from src/main/java/pres/auxiliary/work/testcase/file/IncorrectFileException.java rename to src/main/java/pres/auxiliary/testcase/file/IncorrectFileException.java index 01c3959..bef8e47 100644 --- a/src/main/java/pres/auxiliary/work/testcase/file/IncorrectFileException.java +++ b/src/main/java/pres/auxiliary/testcase/file/IncorrectFileException.java @@ -1,4 +1,4 @@ -package pres.auxiliary.work.testcase.file; +package pres.auxiliary.testcase.file; /** *

文件名：IncorrectFileException.java

diff --git a/src/main/java/pres/auxiliary/work/testcase/file/JiraTestCaseWrite.java b/src/main/java/pres/auxiliary/testcase/file/JiraTestCaseWrite.java similarity index 94% rename from src/main/java/pres/auxiliary/work/testcase/file/JiraTestCaseWrite.java rename to src/main/java/pres/auxiliary/testcase/file/JiraTestCaseWrite.java index 2fe90f2..3fb2b03 100644 --- a/src/main/java/pres/auxiliary/work/testcase/file/JiraTestCaseWrite.java +++ b/src/main/java/pres/auxiliary/testcase/file/JiraTestCaseWrite.java @@ -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; /** *

文件名：JiraTestCaseWrite.java

diff --git a/src/main/java/pres/auxiliary/work/testcase/templet/Case.java b/src/main/java/pres/auxiliary/testcase/templet/Case.java similarity index 95% rename from src/main/java/pres/auxiliary/work/testcase/templet/Case.java rename to src/main/java/pres/auxiliary/testcase/templet/Case.java index fa8bbb8..c72ccab 100644 --- a/src/main/java/pres/auxiliary/work/testcase/templet/Case.java +++ b/src/main/java/pres/auxiliary/testcase/templet/Case.java @@ -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; /** *

文件名：Case.java

diff --git a/src/main/java/pres/auxiliary/work/testcase/templet/CaseContentException.java b/src/main/java/pres/auxiliary/testcase/templet/CaseContentException.java similarity index 91% rename from src/main/java/pres/auxiliary/work/testcase/templet/CaseContentException.java rename to src/main/java/pres/auxiliary/testcase/templet/CaseContentException.java index 8fafaef..ddc619e 100644 --- a/src/main/java/pres/auxiliary/work/testcase/templet/CaseContentException.java +++ b/src/main/java/pres/auxiliary/testcase/templet/CaseContentException.java @@ -1,4 +1,4 @@ -package pres.auxiliary.work.testcase.templet; +package pres.auxiliary.testcase.templet; /** *

文件名：CaseContentException.java

diff --git a/src/main/java/pres/auxiliary/work/testcase/templet/DataListCase.java b/src/main/java/pres/auxiliary/testcase/templet/DataListCase.java similarity index 96% rename from src/main/java/pres/auxiliary/work/testcase/templet/DataListCase.java rename to src/main/java/pres/auxiliary/testcase/templet/DataListCase.java index bdece13..a90f6e8 100644 --- a/src/main/java/pres/auxiliary/work/testcase/templet/DataListCase.java +++ b/src/main/java/pres/auxiliary/testcase/templet/DataListCase.java @@ -1,4 +1,4 @@ -package pres.auxiliary.work.testcase.templet; +package pres.auxiliary.testcase.templet; import java.io.File; diff --git a/src/main/java/pres/auxiliary/work/testcase/templet/InformationCase.java b/src/main/java/pres/auxiliary/testcase/templet/InformationCase.java similarity index 97% rename from src/main/java/pres/auxiliary/work/testcase/templet/InformationCase.java rename to src/main/java/pres/auxiliary/testcase/templet/InformationCase.java index 618a194..0cf968a 100644 --- a/src/main/java/pres/auxiliary/work/testcase/templet/InformationCase.java +++ b/src/main/java/pres/auxiliary/testcase/templet/InformationCase.java @@ -1,4 +1,4 @@ -package pres.auxiliary.work.testcase.templet; +package pres.auxiliary.testcase.templet; import java.io.File; import java.util.Arrays; diff --git a/src/main/java/pres/auxiliary/work/testcase/templet/LabelNotFoundException.java b/src/main/java/pres/auxiliary/testcase/templet/LabelNotFoundException.java similarity index 88% rename from src/main/java/pres/auxiliary/work/testcase/templet/LabelNotFoundException.java rename to src/main/java/pres/auxiliary/testcase/templet/LabelNotFoundException.java index 8555ab3..60e087e 100644 --- a/src/main/java/pres/auxiliary/work/testcase/templet/LabelNotFoundException.java +++ b/src/main/java/pres/auxiliary/testcase/templet/LabelNotFoundException.java @@ -1,4 +1,4 @@ -package pres.auxiliary.work.testcase.templet; +package pres.auxiliary.testcase.templet; public class LabelNotFoundException extends RuntimeException { diff --git a/src/main/java/pres/auxiliary/work/testcase/templet/LabelType.java b/src/main/java/pres/auxiliary/testcase/templet/LabelType.java similarity index 90% rename from src/main/java/pres/auxiliary/work/testcase/templet/LabelType.java rename to src/main/java/pres/auxiliary/testcase/templet/LabelType.java index 2b380b9..f7761d1 100644 --- a/src/main/java/pres/auxiliary/work/testcase/templet/LabelType.java +++ b/src/main/java/pres/auxiliary/testcase/templet/LabelType.java @@ -1,4 +1,4 @@ -package pres.auxiliary.work.testcase.templet; +package pres.auxiliary.testcase.templet; /** *

文件名：LabelType.java

diff --git a/src/main/java/pres/auxiliary/work/testcase/templet/MapCase.java b/src/main/java/pres/auxiliary/testcase/templet/MapCase.java similarity index 95% rename from src/main/java/pres/auxiliary/work/testcase/templet/MapCase.java rename to src/main/java/pres/auxiliary/testcase/templet/MapCase.java index a26ee8f..1bc2e78 100644 --- a/src/main/java/pres/auxiliary/work/testcase/templet/MapCase.java +++ b/src/main/java/pres/auxiliary/testcase/templet/MapCase.java @@ -1,4 +1,4 @@ -package pres.auxiliary.work.testcase.templet; +package pres.auxiliary.testcase.templet; import java.io.File; import java.util.Arrays; diff --git a/src/main/java/pres/auxiliary/work/testcase/templet/UserCase.java b/src/main/java/pres/auxiliary/testcase/templet/UserCase.java similarity index 96% rename from src/main/java/pres/auxiliary/work/testcase/templet/UserCase.java rename to src/main/java/pres/auxiliary/testcase/templet/UserCase.java index 86a72fe..5dc39b6 100644 --- a/src/main/java/pres/auxiliary/work/testcase/templet/UserCase.java +++ b/src/main/java/pres/auxiliary/testcase/templet/UserCase.java @@ -1,4 +1,4 @@ -package pres.auxiliary.work.testcase.templet; +package pres.auxiliary.testcase.templet; import java.io.File; diff --git a/src/main/java/pres/auxiliary/work/testcase/templet/VideoCase.java b/src/main/java/pres/auxiliary/testcase/templet/VideoCase.java similarity index 96% rename from src/main/java/pres/auxiliary/work/testcase/templet/VideoCase.java rename to src/main/java/pres/auxiliary/testcase/templet/VideoCase.java index 3e00fa3..f889033 100644 --- a/src/main/java/pres/auxiliary/work/testcase/templet/VideoCase.java +++ b/src/main/java/pres/auxiliary/testcase/templet/VideoCase.java @@ -1,4 +1,4 @@ -package pres.auxiliary.work.testcase.templet; +package pres.auxiliary.testcase.templet; import java.io.File; diff --git a/src/main/java/pres/auxiliary/tool/file/ExcelConfigXmlTool.java b/src/main/java/pres/auxiliary/tool/file/ExcelConfigXmlTool.java index fb0bfd9..aa8e416 100644 --- a/src/main/java/pres/auxiliary/tool/file/ExcelConfigXmlTool.java +++ b/src/main/java/pres/auxiliary/tool/file/ExcelConfigXmlTool.java @@ -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; /** *

文件名：ConfigXmlTool.java

diff --git a/src/main/java/pres/auxiliary/tool/file/excel/AbstractWriteExcel.java b/src/main/java/pres/auxiliary/tool/file/excel/AbstractWriteExcel.java index 72285ee..2a142f1 100644 --- a/src/main/java/pres/auxiliary/tool/file/excel/AbstractWriteExcel.java +++ b/src/main/java/pres/auxiliary/tool/file/excel/AbstractWriteExcel.java @@ -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; /** *

diff --git a/src/main/java/pres/auxiliary/tool/file/excel/CreateExcelFile.java b/src/main/java/pres/auxiliary/tool/file/excel/CreateExcelFile.java index 3f289f7..0e3b5e5 100644 --- a/src/main/java/pres/auxiliary/tool/file/excel/CreateExcelFile.java +++ b/src/main/java/pres/auxiliary/tool/file/excel/CreateExcelFile.java @@ -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; /** *

diff --git a/src/main/java/pres/auxiliary/tool/file/excel/WriteExcel.java b/src/main/java/pres/auxiliary/tool/file/excel/WriteExcel.java index b9288c6..aebe576 100644 --- a/src/main/java/pres/auxiliary/tool/file/excel/WriteExcel.java +++ b/src/main/java/pres/auxiliary/tool/file/excel/WriteExcel.java @@ -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; /** *

文件名：WriteExcel.java