Index: ssts-web/src/test/java/test/forgon/selenium/apply/factory/ApplyGoodBoFactory.java =================================================================== diff -u -r18279 -r18284 --- ssts-web/src/test/java/test/forgon/selenium/apply/factory/ApplyGoodBoFactory.java (.../ApplyGoodBoFactory.java) (revision 18279) +++ ssts-web/src/test/java/test/forgon/selenium/apply/factory/ApplyGoodBoFactory.java (.../ApplyGoodBoFactory.java) (revision 18284) @@ -1,11 +1,11 @@ -package test_4_1.apply.factory; +package test.forgon.selenium.apply.factory; import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; -import test_4_1.apply.applyConstants.ApplyBtnEnum; -import test_4_1.apply.applyConstants.ApplyGoodPrefixEnum; -import test_4_1.apply.applyConstants.DeskIconEnum; -import test_4_1.apply.bo.ApplyGoodBo; +import test.forgon.selenium.apply.applyConstants.ApplyBtnEnum; +import test.forgon.selenium.apply.applyConstants.ApplyGoodPrefixEnum; +import test.forgon.selenium.apply.applyConstants.DeskIconEnum; +import test.forgon.selenium.apply.bo.ApplyGoodBo; /** * @author zhonghaowen Index: ssts-web/src/test/java/test/forgon/selenium/apply/service/BorrowApplyServiceImpl.java =================================================================== diff -u -r18279 -r18284 --- ssts-web/src/test/java/test/forgon/selenium/apply/service/BorrowApplyServiceImpl.java (.../BorrowApplyServiceImpl.java) (revision 18279) +++ ssts-web/src/test/java/test/forgon/selenium/apply/service/BorrowApplyServiceImpl.java (.../BorrowApplyServiceImpl.java) (revision 18284) @@ -1,11 +1,11 @@ -package test_4_1.apply.service; +package test.forgon.selenium.apply.service; import org.openqa.selenium.By; import org.openqa.selenium.Keys; -import test_4_1.SettingConstants; -import test_4_1.apply.bo.ApplyGoodBo; -import test_4_1.apply.helper.ApplyHelper; -import test_4_1.tools.Utils; +import test.forgon.selenium.SettingConstants; +import test.forgon.selenium.apply.bo.ApplyGoodBo; +import test.forgon.selenium.apply.helper.ApplyHelper; +import test.forgon.selenium.tools.Utils; import java.util.LinkedHashMap; import java.util.Map; Index: ssts-web/src/test/java/test/forgon/selenium/apply/chain/ChainConsumer.java =================================================================== diff -u -r18279 -r18284 --- ssts-web/src/test/java/test/forgon/selenium/apply/chain/ChainConsumer.java (.../ChainConsumer.java) (revision 18279) +++ ssts-web/src/test/java/test/forgon/selenium/apply/chain/ChainConsumer.java (.../ChainConsumer.java) (revision 18284) @@ -1,7 +1,7 @@ -package test_4_1.apply.chain; +package test.forgon.selenium.apply.chain; -import test_4_1.apply.applyConstants.ActionEnum; -import test_4_1.apply.applyConstants.DeskIconEnum; +import test.forgon.selenium.apply.applyConstants.ActionEnum; +import test.forgon.selenium.apply.applyConstants.DeskIconEnum; /** * @author zhonghaowen Index: ssts-web/src/test/java/test/forgon/selenium/Recyle.java =================================================================== diff -u -r18279 -r18284 --- ssts-web/src/test/java/test/forgon/selenium/Recyle.java (.../Recyle.java) (revision 18279) +++ ssts-web/src/test/java/test/forgon/selenium/Recyle.java (.../Recyle.java) (revision 18284) @@ -1,7 +1,7 @@ /** * */ -package test_4_1; +package test.forgon.selenium; import static org.testng.AssertJUnit.assertTrue; @@ -26,8 +26,8 @@ import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import org.apache.log4j.Logger; -import test_4_1.factory.WaitFactory; -import test_4_1.tools.Utils; +import test.forgon.selenium.factory.WaitFactory; +import test.forgon.selenium.tools.Utils; /** * @author cherry 2016-02-25 Index: ssts-web/src/test/java/test/forgon/selenium/sterilization/service/impl/ZsyySterilization.java =================================================================== diff -u -r18279 -r18284 --- ssts-web/src/test/java/test/forgon/selenium/sterilization/service/impl/ZsyySterilization.java (.../ZsyySterilization.java) (revision 18279) +++ ssts-web/src/test/java/test/forgon/selenium/sterilization/service/impl/ZsyySterilization.java (.../ZsyySterilization.java) (revision 18284) @@ -1,4 +1,4 @@ -package test_4_1.sterilization.service.impl; +package test.forgon.selenium.sterilization.service.impl; import java.text.SimpleDateFormat; import java.util.Calendar; @@ -19,9 +19,9 @@ import org.openqa.selenium.support.ui.Wait; import org.testng.AssertJUnit; -import test_4_1.sterilization.helper.SterilizationHelper; -import test_4_1.sterilization.service.Sterilization; -import test_4_1.tools.Utils; +import test.forgon.selenium.sterilization.helper.SterilizationHelper; +import test.forgon.selenium.sterilization.service.Sterilization; +import test.forgon.selenium.tools.Utils; public class ZsyySterilization implements Sterilization { Index: ssts-web/src/test/java/test/forgon/selenium/apply/service/Gdsy3ApplyServiceImpl.java =================================================================== diff -u -r18279 -r18284 --- ssts-web/src/test/java/test/forgon/selenium/apply/service/Gdsy3ApplyServiceImpl.java (.../Gdsy3ApplyServiceImpl.java) (revision 18279) +++ ssts-web/src/test/java/test/forgon/selenium/apply/service/Gdsy3ApplyServiceImpl.java (.../Gdsy3ApplyServiceImpl.java) (revision 18284) @@ -1,8 +1,8 @@ -package test_4_1.apply.service; +package test.forgon.selenium.apply.service; import org.openqa.selenium.WebElement; -import test_4_1.apply.bo.ApplyGoodBo; -import test_4_1.apply.helper.ApplyHelper; +import test.forgon.selenium.apply.bo.ApplyGoodBo; +import test.forgon.selenium.apply.helper.ApplyHelper; import java.util.LinkedHashMap; import java.util.Map; Index: ssts-web/src/test/java/test/forgon/selenium/Wash.java =================================================================== diff -u -r18279 -r18284 --- ssts-web/src/test/java/test/forgon/selenium/Wash.java (.../Wash.java) (revision 18279) +++ ssts-web/src/test/java/test/forgon/selenium/Wash.java (.../Wash.java) (revision 18284) @@ -1,7 +1,7 @@ /** * */ -package test_4_1; +package test.forgon.selenium; import java.util.NoSuchElementException; import java.util.concurrent.TimeUnit; @@ -19,7 +19,7 @@ import org.openqa.selenium.support.ui.FluentWait; import org.openqa.selenium.support.ui.Wait; -import test_4_1.tools.Utils; +import test.forgon.selenium.tools.Utils; /** * @author cherry 2016-03-01 Index: ssts-web/src/test/java/test/forgon/selenium/Disinfection.java =================================================================== diff -u -r18279 -r18284 --- ssts-web/src/test/java/test/forgon/selenium/Disinfection.java (.../Disinfection.java) (revision 18279) +++ ssts-web/src/test/java/test/forgon/selenium/Disinfection.java (.../Disinfection.java) (revision 18284) @@ -1,7 +1,7 @@ /** * */ -package test_4_1; +package test.forgon.selenium; import net.sf.json.JSONObject; @@ -30,8 +30,8 @@ import org.openqa.selenium.support.ui.FluentWait; import org.openqa.selenium.support.ui.Wait; -import test_4_1.sterilization.helper.SterilizationHelper; -import test_4_1.tools.Utils; +import test.forgon.selenium.sterilization.helper.SterilizationHelper; +import test.forgon.selenium.tools.Utils; /** * @author cherry 2016-03-02 Index: ssts-web/src/test/java/test/forgon/selenium/apply/chain/GdsyApplyHandler.java =================================================================== diff -u -r18279 -r18284 --- ssts-web/src/test/java/test/forgon/selenium/apply/chain/GdsyApplyHandler.java (.../GdsyApplyHandler.java) (revision 18279) +++ ssts-web/src/test/java/test/forgon/selenium/apply/chain/GdsyApplyHandler.java (.../GdsyApplyHandler.java) (revision 18284) @@ -1,15 +1,15 @@ -package test_4_1.apply.chain; +package test.forgon.selenium.apply.chain; import org.openqa.selenium.By; import org.openqa.selenium.WebElement; -import test_4_1.SettingConstants; -import test_4_1.apply.applyConstants.ActionEnum; -import test_4_1.apply.applyConstants.ApplyBtnEnum; -import test_4_1.apply.applyConstants.DeskIconEnum; -import test_4_1.apply.bo.ApplyGoodBo; -import test_4_1.apply.factory.ApplyGoodBoFactory; -import test_4_1.apply.helper.ApplyHelper; -import test_4_1.tools.Utils; +import test.forgon.selenium.SettingConstants; +import test.forgon.selenium.apply.applyConstants.ActionEnum; +import test.forgon.selenium.apply.applyConstants.ApplyBtnEnum; +import test.forgon.selenium.apply.applyConstants.DeskIconEnum; +import test.forgon.selenium.apply.bo.ApplyGoodBo; +import test.forgon.selenium.apply.factory.ApplyGoodBoFactory; +import test.forgon.selenium.apply.helper.ApplyHelper; +import test.forgon.selenium.tools.Utils; /** * @author zhonghaowen Index: ssts-web/src/test/java/test/forgon/selenium/apply/dataProvider/ApplyDataProvider.java =================================================================== diff -u -r18279 -r18284 --- ssts-web/src/test/java/test/forgon/selenium/apply/dataProvider/ApplyDataProvider.java (.../ApplyDataProvider.java) (revision 18279) +++ ssts-web/src/test/java/test/forgon/selenium/apply/dataProvider/ApplyDataProvider.java (.../ApplyDataProvider.java) (revision 18284) @@ -1,4 +1,4 @@ -package test_4_1.apply.dataProvider; +package test.forgon.selenium.apply.dataProvider; import org.testng.annotations.DataProvider; Index: ssts-web/src/test/java/test/forgon/selenium/apply/service/BorrowApplyService.java =================================================================== diff -u -r18279 -r18284 --- ssts-web/src/test/java/test/forgon/selenium/apply/service/BorrowApplyService.java (.../BorrowApplyService.java) (revision 18279) +++ ssts-web/src/test/java/test/forgon/selenium/apply/service/BorrowApplyService.java (.../BorrowApplyService.java) (revision 18284) @@ -1,6 +1,6 @@ -package test_4_1.apply.service; +package test.forgon.selenium.apply.service; -import test_4_1.apply.bo.ApplyGoodBo; +import test.forgon.selenium.apply.bo.ApplyGoodBo; /** * @author zhonghaowen Index: ssts-web/src/test/java/test/forgon/selenium/Consume.java =================================================================== diff -u -r18279 -r18284 --- ssts-web/src/test/java/test/forgon/selenium/Consume.java (.../Consume.java) (revision 18279) +++ ssts-web/src/test/java/test/forgon/selenium/Consume.java (.../Consume.java) (revision 18284) @@ -1,4 +1,4 @@ -package test_4_1; +package test.forgon.selenium; import org.testng.annotations.AfterMethod; import org.testng.annotations.Test; @@ -8,7 +8,7 @@ import org.openqa.selenium.Keys; import org.openqa.selenium.WebElement; -import test_4_1.tools.Utils; +import test.forgon.selenium.tools.Utils; /** * @author cherry 2016-06-01 Index: ssts-web/src/test/java/test/forgon/selenium/factory/WaitFactory.java =================================================================== diff -u -r18279 -r18284 --- ssts-web/src/test/java/test/forgon/selenium/factory/WaitFactory.java (.../WaitFactory.java) (revision 18279) +++ ssts-web/src/test/java/test/forgon/selenium/factory/WaitFactory.java (.../WaitFactory.java) (revision 18284) @@ -1,10 +1,10 @@ -package test_4_1.factory; +package test.forgon.selenium.factory; import org.openqa.selenium.StaleElementReferenceException; import org.openqa.selenium.WebDriver; import org.openqa.selenium.support.ui.FluentWait; import org.openqa.selenium.support.ui.Wait; -import test_4_1.tools.Utils; +import test.forgon.selenium.tools.Utils; import java.util.NoSuchElementException; import java.util.concurrent.TimeUnit; Index: ssts-web/src/test/java/test/forgon/selenium/Materials_Godown_Entry.java =================================================================== diff -u -r18279 -r18284 --- ssts-web/src/test/java/test/forgon/selenium/Materials_Godown_Entry.java (.../Materials_Godown_Entry.java) (revision 18279) +++ ssts-web/src/test/java/test/forgon/selenium/Materials_Godown_Entry.java (.../Materials_Godown_Entry.java) (revision 18284) @@ -1,7 +1,7 @@ /** * */ -package test_4_1; +package test.forgon.selenium; import org.testng.annotations.AfterMethod; import org.testng.annotations.Test; @@ -11,7 +11,7 @@ import org.openqa.selenium.Keys; import org.openqa.selenium.WebElement; -import test_4_1.tools.Utils; +import test.forgon.selenium.tools.Utils; /** * @author cherry 2016-04-21 Index: ssts-web/src/test/java/test/forgon/selenium/UserRecord.java =================================================================== diff -u -r18279 -r18284 --- ssts-web/src/test/java/test/forgon/selenium/UserRecord.java (.../UserRecord.java) (revision 18279) +++ ssts-web/src/test/java/test/forgon/selenium/UserRecord.java (.../UserRecord.java) (revision 18284) @@ -1,4 +1,4 @@ -package test_4_1; +package test.forgon.selenium; import java.util.NoSuchElementException; import java.util.concurrent.TimeUnit; @@ -16,7 +16,7 @@ import org.testng.annotations.AfterMethod; import org.testng.annotations.Test; -import test_4_1.tools.Utils; +import test.forgon.selenium.tools.Utils; public class UserRecord { /** Index: ssts-web/src/test/java/test/forgon/selenium/apply/service/ApplyService.java =================================================================== diff -u -r18279 -r18284 --- ssts-web/src/test/java/test/forgon/selenium/apply/service/ApplyService.java (.../ApplyService.java) (revision 18279) +++ ssts-web/src/test/java/test/forgon/selenium/apply/service/ApplyService.java (.../ApplyService.java) (revision 18284) @@ -1,7 +1,7 @@ -package test_4_1.apply.service; +package test.forgon.selenium.apply.service; import org.openqa.selenium.WebElement; -import test_4_1.apply.bo.ApplyGoodBo; +import test.forgon.selenium.apply.bo.ApplyGoodBo; /** * @author zhonghaowen Index: ssts-web/src/test/java/test/forgon/selenium/apply/service/GdsyApplyServiceImpl.java =================================================================== diff -u -r18279 -r18284 --- ssts-web/src/test/java/test/forgon/selenium/apply/service/GdsyApplyServiceImpl.java (.../GdsyApplyServiceImpl.java) (revision 18279) +++ ssts-web/src/test/java/test/forgon/selenium/apply/service/GdsyApplyServiceImpl.java (.../GdsyApplyServiceImpl.java) (revision 18284) @@ -1,17 +1,17 @@ -package test_4_1.apply.service; +package test.forgon.selenium.apply.service; import org.openqa.selenium.By; import org.openqa.selenium.WebElement; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import test_4_1.apply.applyConstants.ApplyBtnEnum; -import test_4_1.apply.applyConstants.DeskIconEnum; -import test_4_1.apply.bo.ApplyGoodBo; -import test_4_1.apply.dataProvider.ApplyDataProvider; -import test_4_1.apply.factory.ApplyGoodBoFactory; -import test_4_1.apply.helper.ApplyActionHelper; -import test_4_1.apply.helper.ApplyHelper; -import test_4_1.tools.Utils; +import test.forgon.selenium.apply.applyConstants.ApplyBtnEnum; +import test.forgon.selenium.apply.applyConstants.DeskIconEnum; +import test.forgon.selenium.apply.bo.ApplyGoodBo; +import test.forgon.selenium.apply.dataProvider.ApplyDataProvider; +import test.forgon.selenium.apply.factory.ApplyGoodBoFactory; +import test.forgon.selenium.apply.helper.ApplyActionHelper; +import test.forgon.selenium.apply.helper.ApplyHelper; +import test.forgon.selenium.tools.Utils; import java.util.LinkedHashMap; import java.util.Map; Index: ssts-web/src/test/java/test/forgon/selenium/SettingConstants.java =================================================================== diff -u -r18279 -r18284 --- ssts-web/src/test/java/test/forgon/selenium/SettingConstants.java (.../SettingConstants.java) (revision 18279) +++ ssts-web/src/test/java/test/forgon/selenium/SettingConstants.java (.../SettingConstants.java) (revision 18284) @@ -1,4 +1,4 @@ -package test_4_1; +package test.forgon.selenium; /** * @author zhonghaowen Index: ssts-web/src/test/java/test/forgon/selenium/sterilization/helper/SterilizationHelper.java =================================================================== diff -u -r18279 -r18284 --- ssts-web/src/test/java/test/forgon/selenium/sterilization/helper/SterilizationHelper.java (.../SterilizationHelper.java) (revision 18279) +++ ssts-web/src/test/java/test/forgon/selenium/sterilization/helper/SterilizationHelper.java (.../SterilizationHelper.java) (revision 18284) @@ -1,4 +1,4 @@ -package test_4_1.sterilization.helper; +package test.forgon.selenium.sterilization.helper; import java.util.LinkedList; import java.util.List; Index: ssts-web/src/test/java/test/forgon/selenium/apply/chain/FillFormHandler.java =================================================================== diff -u -r18279 -r18284 --- ssts-web/src/test/java/test/forgon/selenium/apply/chain/FillFormHandler.java (.../FillFormHandler.java) (revision 18279) +++ ssts-web/src/test/java/test/forgon/selenium/apply/chain/FillFormHandler.java (.../FillFormHandler.java) (revision 18284) @@ -1,13 +1,13 @@ -package test_4_1.apply.chain; +package test.forgon.selenium.apply.chain; import org.openqa.selenium.WebElement; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import test_4_1.apply.applyConstants.ActionEnum; -import test_4_1.apply.applyConstants.ApplyBtnEnum; -import test_4_1.apply.bo.ApplyGoodBo; -import test_4_1.apply.adapter.ApplyServiceAdapter; -import test_4_1.tools.Utils; +import test.forgon.selenium.apply.applyConstants.ActionEnum; +import test.forgon.selenium.apply.applyConstants.ApplyBtnEnum; +import test.forgon.selenium.apply.bo.ApplyGoodBo; +import test.forgon.selenium.apply.adapter.ApplyServiceAdapter; +import test.forgon.selenium.tools.Utils; /** * @author zhonghaowen Index: ssts-web/src/test/java/test/forgon/selenium/apply/adapter/ApplyServiceAdapter.java =================================================================== diff -u -r18279 -r18284 --- ssts-web/src/test/java/test/forgon/selenium/apply/adapter/ApplyServiceAdapter.java (.../ApplyServiceAdapter.java) (revision 18279) +++ ssts-web/src/test/java/test/forgon/selenium/apply/adapter/ApplyServiceAdapter.java (.../ApplyServiceAdapter.java) (revision 18284) @@ -1,8 +1,8 @@ -package test_4_1.apply.adapter; +package test.forgon.selenium.apply.adapter; -import test_4_1.apply.bo.ApplyGoodBo; -import test_4_1.apply.service.ApplyComboService; -import test_4_1.apply.service.ApplyService; +import test.forgon.selenium.apply.bo.ApplyGoodBo; +import test.forgon.selenium.apply.service.ApplyComboService; +import test.forgon.selenium.apply.service.ApplyService; /** * @author zhonghaowen Index: ssts-web/src/test/java/test/forgon/selenium/sterilization/service/impl/Zd5ySterilization.java =================================================================== diff -u -r18279 -r18284 --- ssts-web/src/test/java/test/forgon/selenium/sterilization/service/impl/Zd5ySterilization.java (.../Zd5ySterilization.java) (revision 18279) +++ ssts-web/src/test/java/test/forgon/selenium/sterilization/service/impl/Zd5ySterilization.java (.../Zd5ySterilization.java) (revision 18284) @@ -1,4 +1,4 @@ -package test_4_1.sterilization.service.impl; +package test.forgon.selenium.sterilization.service.impl; import java.text.SimpleDateFormat; import java.util.Calendar; @@ -19,9 +19,9 @@ import org.openqa.selenium.support.ui.Wait; import org.testng.AssertJUnit; -import test_4_1.sterilization.helper.SterilizationHelper; -import test_4_1.sterilization.service.Sterilization; -import test_4_1.tools.Utils; +import test.forgon.selenium.sterilization.helper.SterilizationHelper; +import test.forgon.selenium.sterilization.service.Sterilization; +import test.forgon.selenium.tools.Utils; public class Zd5ySterilization implements Sterilization { Index: ssts-web/src/test/java/test/forgon/selenium/apply/chain/OtherApplyHandler.java =================================================================== diff -u -r18279 -r18284 --- ssts-web/src/test/java/test/forgon/selenium/apply/chain/OtherApplyHandler.java (.../OtherApplyHandler.java) (revision 18279) +++ ssts-web/src/test/java/test/forgon/selenium/apply/chain/OtherApplyHandler.java (.../OtherApplyHandler.java) (revision 18284) @@ -1,17 +1,17 @@ -package test_4_1.apply.chain; +package test.forgon.selenium.apply.chain; import org.openqa.selenium.By; import org.openqa.selenium.WebElement; -import test_4_1.SettingConstants; -import test_4_1.apply.applyConstants.ActionEnum; -import test_4_1.apply.applyConstants.ApplyBtnEnum; -import test_4_1.apply.applyConstants.DeskIconEnum; -import test_4_1.apply.bo.ApplyGoodBo; -import test_4_1.apply.factory.ApplyGoodBoFactory; -import test_4_1.apply.helper.ApplyHelper; -import test_4_1.apply.service.ApplyService; -import test_4_1.apply.service.ApplyServiceImpl; -import test_4_1.tools.Utils; +import test.forgon.selenium.SettingConstants; +import test.forgon.selenium.apply.applyConstants.ActionEnum; +import test.forgon.selenium.apply.applyConstants.ApplyBtnEnum; +import test.forgon.selenium.apply.applyConstants.DeskIconEnum; +import test.forgon.selenium.apply.bo.ApplyGoodBo; +import test.forgon.selenium.apply.factory.ApplyGoodBoFactory; +import test.forgon.selenium.apply.helper.ApplyHelper; +import test.forgon.selenium.apply.service.ApplyService; +import test.forgon.selenium.apply.service.ApplyServiceImpl; +import test.forgon.selenium.tools.Utils; /** * @author zhonghaowen Index: ssts-web/src/test/java/test/forgon/selenium/apply/chain/ComboFillFormHandler.java =================================================================== diff -u -r18279 -r18284 --- ssts-web/src/test/java/test/forgon/selenium/apply/chain/ComboFillFormHandler.java (.../ComboFillFormHandler.java) (revision 18279) +++ ssts-web/src/test/java/test/forgon/selenium/apply/chain/ComboFillFormHandler.java (.../ComboFillFormHandler.java) (revision 18284) @@ -1,18 +1,18 @@ -package test_4_1.apply.chain; +package test.forgon.selenium.apply.chain; import org.openqa.selenium.By; import org.openqa.selenium.WebElement; -import test_4_1.SettingConstants; -import test_4_1.apply.applyConstants.ActionEnum; -import test_4_1.apply.applyConstants.ApplyBtnEnum; -import test_4_1.apply.bo.ApplyGoodBo; -import test_4_1.apply.factory.ApplyGoodBoFactory; -import test_4_1.apply.service.ApplyComboService; -import test_4_1.apply.service.ApplyComboServiceImpl; -import test_4_1.apply.service.ApplyService; -import test_4_1.apply.adapter.ApplyServiceAdapter; -import test_4_1.apply.service.ApplyServiceImpl; -import test_4_1.tools.Utils; +import test.forgon.selenium.SettingConstants; +import test.forgon.selenium.apply.applyConstants.ActionEnum; +import test.forgon.selenium.apply.applyConstants.ApplyBtnEnum; +import test.forgon.selenium.apply.bo.ApplyGoodBo; +import test.forgon.selenium.apply.factory.ApplyGoodBoFactory; +import test.forgon.selenium.apply.service.ApplyComboService; +import test.forgon.selenium.apply.service.ApplyComboServiceImpl; +import test.forgon.selenium.apply.service.ApplyService; +import test.forgon.selenium.apply.adapter.ApplyServiceAdapter; +import test.forgon.selenium.apply.service.ApplyServiceImpl; +import test.forgon.selenium.tools.Utils; /** * @author zhonghaowen Index: ssts-web/src/test/java/test/forgon/selenium/Assemble.java =================================================================== diff -u -r18279 -r18284 --- ssts-web/src/test/java/test/forgon/selenium/Assemble.java (.../Assemble.java) (revision 18279) +++ ssts-web/src/test/java/test/forgon/selenium/Assemble.java (.../Assemble.java) (revision 18284) @@ -1,4 +1,4 @@ -package test_4_1; +package test.forgon.selenium; import java.util.NoSuchElementException; import java.util.concurrent.TimeUnit; @@ -20,7 +20,7 @@ import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import test_4_1.tools.Utils; +import test.forgon.selenium.tools.Utils; /** * @author cherry 2016-03-02 Index: ssts-web/src/test/java/test/forgon/selenium/tools/LoginUtil.java =================================================================== diff -u -r18279 -r18284 --- ssts-web/src/test/java/test/forgon/selenium/tools/LoginUtil.java (.../LoginUtil.java) (revision 18279) +++ ssts-web/src/test/java/test/forgon/selenium/tools/LoginUtil.java (.../LoginUtil.java) (revision 18284) @@ -1,6 +1,6 @@ -package test_4_1.tools; +package test.forgon.selenium.tools; -import test_4_1.Login; +import test.forgon.selenium.Login; /** * @author zhonghaowen Index: ssts-web/src/test/java/test/forgon/selenium/sterilization/service/impl/GdsySterilization.java =================================================================== diff -u -r18279 -r18284 --- ssts-web/src/test/java/test/forgon/selenium/sterilization/service/impl/GdsySterilization.java (.../GdsySterilization.java) (revision 18279) +++ ssts-web/src/test/java/test/forgon/selenium/sterilization/service/impl/GdsySterilization.java (.../GdsySterilization.java) (revision 18284) @@ -1,4 +1,4 @@ -package test_4_1.sterilization.service.impl; +package test.forgon.selenium.sterilization.service.impl; import java.text.SimpleDateFormat; import java.util.Calendar; @@ -12,9 +12,9 @@ import org.openqa.selenium.interactions.Actions; import org.testng.AssertJUnit; -import test_4_1.sterilization.helper.SterilizationHelper; -import test_4_1.sterilization.service.Sterilization; -import test_4_1.tools.Utils; +import test.forgon.selenium.sterilization.helper.SterilizationHelper; +import test.forgon.selenium.sterilization.service.Sterilization; +import test.forgon.selenium.tools.Utils; /** * 广东省医的灭菌 * @author Chenjiaru Index: ssts-web/src/test/java/test/forgon/selenium/example/MyTest.java =================================================================== diff -u -r18279 -r18284 --- ssts-web/src/test/java/test/forgon/selenium/example/MyTest.java (.../MyTest.java) (revision 18279) +++ ssts-web/src/test/java/test/forgon/selenium/example/MyTest.java (.../MyTest.java) (revision 18284) @@ -1,7 +1,7 @@ /** * */ -package test_4_1.example; +package test.forgon.selenium.example; import static org.testng.AssertJUnit.assertTrue; Index: ssts-web/src/test/java/test/forgon/selenium/apply/applyConstants/DeskIconEnum.java =================================================================== diff -u -r18279 -r18284 --- ssts-web/src/test/java/test/forgon/selenium/apply/applyConstants/DeskIconEnum.java (.../DeskIconEnum.java) (revision 18279) +++ ssts-web/src/test/java/test/forgon/selenium/apply/applyConstants/DeskIconEnum.java (.../DeskIconEnum.java) (revision 18284) @@ -1,4 +1,4 @@ -package test_4_1.apply.applyConstants; +package test.forgon.selenium.apply.applyConstants; /** * @author zhonghaowen Index: ssts-web/src/test/java/test/forgon/selenium/apply/ApplyTest.java =================================================================== diff -u -r18279 -r18284 --- ssts-web/src/test/java/test/forgon/selenium/apply/ApplyTest.java (.../ApplyTest.java) (revision 18279) +++ ssts-web/src/test/java/test/forgon/selenium/apply/ApplyTest.java (.../ApplyTest.java) (revision 18284) @@ -1,4 +1,4 @@ -package test_4_1.apply; +package test.forgon.selenium.apply; import org.openqa.selenium.By; import org.openqa.selenium.NoSuchElementException; @@ -13,19 +13,19 @@ import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import test_4_1.SettingConstants; -import test_4_1.apply.applyConstants.ApplyBtnEnum; -import test_4_1.apply.applyConstants.DeskIconEnum; -import test_4_1.apply.bo.ApplyGoodBo; -import test_4_1.apply.chain.ChainConsumer; -import test_4_1.apply.factory.ApplyGoodBoFactory; -import test_4_1.apply.helper.ApplyHelper; -import test_4_1.apply.service.ApplyService; -import test_4_1.apply.service.ApplyServiceImpl; -import test_4_1.apply.service.BorrowApplyService; -import test_4_1.apply.service.BorrowApplyServiceImpl; -import test_4_1.tools.LoginUtil; -import test_4_1.tools.Utils; +import test.forgon.selenium.SettingConstants; +import test.forgon.selenium.apply.applyConstants.ApplyBtnEnum; +import test.forgon.selenium.apply.applyConstants.DeskIconEnum; +import test.forgon.selenium.apply.bo.ApplyGoodBo; +import test.forgon.selenium.apply.chain.ChainConsumer; +import test.forgon.selenium.apply.factory.ApplyGoodBoFactory; +import test.forgon.selenium.apply.helper.ApplyHelper; +import test.forgon.selenium.apply.service.ApplyService; +import test.forgon.selenium.apply.service.ApplyServiceImpl; +import test.forgon.selenium.apply.service.BorrowApplyService; +import test.forgon.selenium.apply.service.BorrowApplyServiceImpl; +import test.forgon.selenium.tools.LoginUtil; +import test.forgon.selenium.tools.Utils; import java.util.concurrent.TimeUnit; import java.util.function.Function; Index: ssts-web/src/test/java/test/forgon/selenium/Apply.java =================================================================== diff -u -r18279 -r18284 --- ssts-web/src/test/java/test/forgon/selenium/Apply.java (.../Apply.java) (revision 18279) +++ ssts-web/src/test/java/test/forgon/selenium/Apply.java (.../Apply.java) (revision 18284) @@ -1,7 +1,7 @@ /** * */ -package test_4_1; +package test.forgon.selenium; import org.testng.annotations.Test; import org.testng.Assert; @@ -22,7 +22,7 @@ import org.openqa.selenium.support.ui.FluentWait; import org.openqa.selenium.support.ui.Wait; -import test_4_1.tools.Utils; +import test.forgon.selenium.tools.Utils; /** * @author cherry 2016-07-18 Index: ssts-web/src/test/java/test/forgon/selenium/apply/service/ApplyComboService.java =================================================================== diff -u -r18279 -r18284 --- ssts-web/src/test/java/test/forgon/selenium/apply/service/ApplyComboService.java (.../ApplyComboService.java) (revision 18279) +++ ssts-web/src/test/java/test/forgon/selenium/apply/service/ApplyComboService.java (.../ApplyComboService.java) (revision 18284) @@ -1,6 +1,6 @@ -package test_4_1.apply.service; +package test.forgon.selenium.apply.service; -import test_4_1.apply.bo.ApplyGoodBo; +import test.forgon.selenium.apply.bo.ApplyGoodBo; /** * @author zhonghaowen Index: ssts-web/src/test/java/test/forgon/selenium/One_use.java =================================================================== diff -u -r18279 -r18284 --- ssts-web/src/test/java/test/forgon/selenium/One_use.java (.../One_use.java) (revision 18279) +++ ssts-web/src/test/java/test/forgon/selenium/One_use.java (.../One_use.java) (revision 18284) @@ -1,4 +1,4 @@ -package test_4_1; +package test.forgon.selenium; import org.testng.annotations.AfterMethod; import org.testng.annotations.Test; @@ -18,7 +18,7 @@ import org.openqa.selenium.support.ui.FluentWait; import org.openqa.selenium.support.ui.Wait; -import test_4_1.tools.Utils; +import test.forgon.selenium.tools.Utils; /** * @author cherry 2016-06-01 Index: ssts-web/src/test/java/test/forgon/selenium/apply/chain/GdsyFillFormHandler.java =================================================================== diff -u -r18279 -r18284 --- ssts-web/src/test/java/test/forgon/selenium/apply/chain/GdsyFillFormHandler.java (.../GdsyFillFormHandler.java) (revision 18279) +++ ssts-web/src/test/java/test/forgon/selenium/apply/chain/GdsyFillFormHandler.java (.../GdsyFillFormHandler.java) (revision 18284) @@ -1,14 +1,14 @@ -package test_4_1.apply.chain; +package test.forgon.selenium.apply.chain; import org.openqa.selenium.WebElement; -import test_4_1.SettingConstants; -import test_4_1.apply.applyConstants.ActionEnum; -import test_4_1.apply.applyConstants.ApplyBtnEnum; -import test_4_1.apply.bo.ApplyGoodBo; -import test_4_1.apply.factory.ApplyGoodBoFactory; -import test_4_1.apply.service.ApplyService; -import test_4_1.apply.adapter.ApplyServiceAdapter; -import test_4_1.apply.service.GdsyApplyServiceImpl; +import test.forgon.selenium.SettingConstants; +import test.forgon.selenium.apply.applyConstants.ActionEnum; +import test.forgon.selenium.apply.applyConstants.ApplyBtnEnum; +import test.forgon.selenium.apply.bo.ApplyGoodBo; +import test.forgon.selenium.apply.factory.ApplyGoodBoFactory; +import test.forgon.selenium.apply.service.ApplyService; +import test.forgon.selenium.apply.adapter.ApplyServiceAdapter; +import test.forgon.selenium.apply.service.GdsyApplyServiceImpl; /** * @author zhonghaowen Index: ssts-web/src/test/java/test/forgon/selenium/apply/applyConstants/ApplyEnum.java =================================================================== diff -u -r18279 -r18284 --- ssts-web/src/test/java/test/forgon/selenium/apply/applyConstants/ApplyEnum.java (.../ApplyEnum.java) (revision 18279) +++ ssts-web/src/test/java/test/forgon/selenium/apply/applyConstants/ApplyEnum.java (.../ApplyEnum.java) (revision 18284) @@ -1,4 +1,4 @@ -package test_4_1.apply.applyConstants; +package test.forgon.selenium.apply.applyConstants; /** * @author zhonghaowen Index: ssts-web/src/test/java/test/forgon/selenium/Reject.java =================================================================== diff -u -r18279 -r18284 --- ssts-web/src/test/java/test/forgon/selenium/Reject.java (.../Reject.java) (revision 18279) +++ ssts-web/src/test/java/test/forgon/selenium/Reject.java (.../Reject.java) (revision 18284) @@ -1,4 +1,4 @@ -package test_4_1; +package test.forgon.selenium; import org.testng.annotations.AfterMethod; import org.testng.annotations.Test; @@ -8,7 +8,7 @@ import org.openqa.selenium.Keys; import org.openqa.selenium.WebElement; -import test_4_1.tools.Utils; +import test.forgon.selenium.tools.Utils; /** * @author cherry 2016-06-01 Index: ssts-web/src/test/java/test/forgon/selenium/tools/TestUtils.java =================================================================== diff -u -r18279 -r18284 --- ssts-web/src/test/java/test/forgon/selenium/tools/TestUtils.java (.../TestUtils.java) (revision 18279) +++ ssts-web/src/test/java/test/forgon/selenium/tools/TestUtils.java (.../TestUtils.java) (revision 18284) @@ -1,7 +1,7 @@ /** * */ -package test_4_1.tools; +package test.forgon.selenium.tools; import java.util.Set; Index: ssts-web/src/test/java/test/forgon/selenium/apply/chain/NormalFillFormHandler.java =================================================================== diff -u -r18279 -r18284 --- ssts-web/src/test/java/test/forgon/selenium/apply/chain/NormalFillFormHandler.java (.../NormalFillFormHandler.java) (revision 18279) +++ ssts-web/src/test/java/test/forgon/selenium/apply/chain/NormalFillFormHandler.java (.../NormalFillFormHandler.java) (revision 18284) @@ -1,16 +1,16 @@ -package test_4_1.apply.chain; +package test.forgon.selenium.apply.chain; import org.openqa.selenium.By; import org.openqa.selenium.WebElement; -import test_4_1.SettingConstants; -import test_4_1.apply.adapter.ApplyServiceAdapter; -import test_4_1.apply.applyConstants.ActionEnum; -import test_4_1.apply.applyConstants.ApplyBtnEnum; -import test_4_1.apply.bo.ApplyGoodBo; -import test_4_1.apply.factory.ApplyGoodBoFactory; -import test_4_1.apply.service.ApplyService; -import test_4_1.apply.service.ApplyServiceImpl; -import test_4_1.tools.Utils; +import test.forgon.selenium.SettingConstants; +import test.forgon.selenium.apply.adapter.ApplyServiceAdapter; +import test.forgon.selenium.apply.applyConstants.ActionEnum; +import test.forgon.selenium.apply.applyConstants.ApplyBtnEnum; +import test.forgon.selenium.apply.bo.ApplyGoodBo; +import test.forgon.selenium.apply.factory.ApplyGoodBoFactory; +import test.forgon.selenium.apply.service.ApplyService; +import test.forgon.selenium.apply.service.ApplyServiceImpl; +import test.forgon.selenium.tools.Utils; /** * @author zhonghaowen Index: ssts-web/src/test/java/test/forgon/selenium/apply/service/ApplyComboServiceImpl.java =================================================================== diff -u -r18279 -r18284 --- ssts-web/src/test/java/test/forgon/selenium/apply/service/ApplyComboServiceImpl.java (.../ApplyComboServiceImpl.java) (revision 18279) +++ ssts-web/src/test/java/test/forgon/selenium/apply/service/ApplyComboServiceImpl.java (.../ApplyComboServiceImpl.java) (revision 18284) @@ -1,11 +1,11 @@ -package test_4_1.apply.service; +package test.forgon.selenium.apply.service; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import test_4_1.apply.applyConstants.DeskIconEnum; -import test_4_1.apply.bo.ApplyGoodBo; -import test_4_1.apply.helper.ApplyActionHelper; -import test_4_1.apply.helper.ApplyHelper; +import test.forgon.selenium.apply.applyConstants.DeskIconEnum; +import test.forgon.selenium.apply.bo.ApplyGoodBo; +import test.forgon.selenium.apply.helper.ApplyActionHelper; +import test.forgon.selenium.apply.helper.ApplyHelper; import java.util.HashMap; import java.util.LinkedHashMap; Index: ssts-web/src/test/java/test/forgon/selenium/Login.java =================================================================== diff -u -r18279 -r18284 --- ssts-web/src/test/java/test/forgon/selenium/Login.java (.../Login.java) (revision 18279) +++ ssts-web/src/test/java/test/forgon/selenium/Login.java (.../Login.java) (revision 18284) @@ -1,4 +1,4 @@ -package test_4_1; +package test.forgon.selenium; import static org.testng.AssertJUnit.assertEquals; import static org.testng.AssertJUnit.assertTrue; @@ -10,7 +10,7 @@ import org.openqa.selenium.By; import org.openqa.selenium.NoAlertPresentException; -import test_4_1.tools.Utils; +import test.forgon.selenium.tools.Utils; /** * @author cherry 2016-07-18 Index: ssts-web/src/test/java/test/forgon/selenium/tools/Path.java =================================================================== diff -u -r18279 -r18284 --- ssts-web/src/test/java/test/forgon/selenium/tools/Path.java (.../Path.java) (revision 18279) +++ ssts-web/src/test/java/test/forgon/selenium/tools/Path.java (.../Path.java) (revision 18284) @@ -1,4 +1,4 @@ -package test_4_1.tools; +package test.forgon.selenium.tools; import java.io.File; import java.io.IOException; Index: ssts-web/src/test/java/test/forgon/selenium/apply/chain/GdsyFillFormHandler3.java =================================================================== diff -u -r18279 -r18284 --- ssts-web/src/test/java/test/forgon/selenium/apply/chain/GdsyFillFormHandler3.java (.../GdsyFillFormHandler3.java) (revision 18279) +++ ssts-web/src/test/java/test/forgon/selenium/apply/chain/GdsyFillFormHandler3.java (.../GdsyFillFormHandler3.java) (revision 18284) @@ -1,14 +1,14 @@ -package test_4_1.apply.chain; +package test.forgon.selenium.apply.chain; import org.openqa.selenium.WebElement; -import test_4_1.SettingConstants; -import test_4_1.apply.adapter.ApplyServiceAdapter; -import test_4_1.apply.applyConstants.ActionEnum; -import test_4_1.apply.applyConstants.ApplyBtnEnum; -import test_4_1.apply.bo.ApplyGoodBo; -import test_4_1.apply.factory.ApplyGoodBoFactory; -import test_4_1.apply.service.ApplyService; -import test_4_1.apply.service.Gdsy3ApplyServiceImpl; +import test.forgon.selenium.SettingConstants; +import test.forgon.selenium.apply.adapter.ApplyServiceAdapter; +import test.forgon.selenium.apply.applyConstants.ActionEnum; +import test.forgon.selenium.apply.applyConstants.ApplyBtnEnum; +import test.forgon.selenium.apply.bo.ApplyGoodBo; +import test.forgon.selenium.apply.factory.ApplyGoodBoFactory; +import test.forgon.selenium.apply.service.ApplyService; +import test.forgon.selenium.apply.service.Gdsy3ApplyServiceImpl; /** * @author zhonghaowen Index: ssts-web/src/test/java/test/forgon/selenium/sterilization/SterilizationTest.java =================================================================== diff -u -r18279 -r18284 --- ssts-web/src/test/java/test/forgon/selenium/sterilization/SterilizationTest.java (.../SterilizationTest.java) (revision 18279) +++ ssts-web/src/test/java/test/forgon/selenium/sterilization/SterilizationTest.java (.../SterilizationTest.java) (revision 18284) @@ -1,4 +1,4 @@ -package test_4_1.sterilization; +package test.forgon.selenium.sterilization; import java.text.SimpleDateFormat; import java.util.Calendar; @@ -9,9 +9,9 @@ import org.testng.AssertJUnit; import org.testng.annotations.Test; -import test_4_1.Disinfection; -import test_4_1.sterilization.helper.SterilizationHelper; -import test_4_1.tools.Utils; +import test.forgon.selenium.Disinfection; +import test.forgon.selenium.sterilization.helper.SterilizationHelper; +import test.forgon.selenium.tools.Utils; import org.apache.commons.lang3.StringUtils; import org.openqa.selenium.By; Index: ssts-web/src/test/java/test/forgon/selenium/apply/helper/ApplyHelper.java =================================================================== diff -u -r18279 -r18284 --- ssts-web/src/test/java/test/forgon/selenium/apply/helper/ApplyHelper.java (.../ApplyHelper.java) (revision 18279) +++ ssts-web/src/test/java/test/forgon/selenium/apply/helper/ApplyHelper.java (.../ApplyHelper.java) (revision 18284) @@ -1,4 +1,4 @@ -package test_4_1.apply.helper; +package test.forgon.selenium.apply.helper; import org.apache.commons.lang3.BooleanUtils; import org.apache.commons.lang3.ObjectUtils; @@ -8,11 +8,11 @@ import org.openqa.selenium.support.ui.WebDriverWait; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import test_4_1.Constants; -import test_4_1.SettingConstants; -import test_4_1.apply.applyConstants.ApplyEnum; -import test_4_1.apply.bo.ApplyGoodBo; -import test_4_1.tools.Utils; +import test.forgon.selenium.Constants; +import test.forgon.selenium.SettingConstants; +import test.forgon.selenium.apply.applyConstants.ApplyEnum; +import test.forgon.selenium.apply.bo.ApplyGoodBo; +import test.forgon.selenium.tools.Utils; import java.util.LinkedHashMap; import java.util.Map; Index: ssts-web/src/test/java/test/forgon/selenium/apply/helper/ApplyActionHelper.java =================================================================== diff -u -r18279 -r18284 --- ssts-web/src/test/java/test/forgon/selenium/apply/helper/ApplyActionHelper.java (.../ApplyActionHelper.java) (revision 18279) +++ ssts-web/src/test/java/test/forgon/selenium/apply/helper/ApplyActionHelper.java (.../ApplyActionHelper.java) (revision 18284) @@ -1,17 +1,17 @@ -package test_4_1.apply.helper; +package test.forgon.selenium.apply.helper; import org.openqa.selenium.By; import org.openqa.selenium.WebElement; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import test_4_1.SettingConstants; -import test_4_1.apply.applyConstants.ApplyBtnEnum; -import test_4_1.apply.applyConstants.ApplyEnum; -import test_4_1.apply.applyConstants.DeskIconEnum; -import test_4_1.apply.bo.ApplyGoodBo; -import test_4_1.apply.factory.ApplyGoodBoFactory; -import test_4_1.tools.LoginUtil; -import test_4_1.tools.Utils; +import test.forgon.selenium.SettingConstants; +import test.forgon.selenium.apply.applyConstants.ApplyBtnEnum; +import test.forgon.selenium.apply.applyConstants.ApplyEnum; +import test.forgon.selenium.apply.applyConstants.DeskIconEnum; +import test.forgon.selenium.apply.bo.ApplyGoodBo; +import test.forgon.selenium.apply.factory.ApplyGoodBoFactory; +import test.forgon.selenium.tools.LoginUtil; +import test.forgon.selenium.tools.Utils; import java.util.Set; Index: ssts-web/src/test/java/test/forgon/selenium/Constants.java =================================================================== diff -u -r18279 -r18284 --- ssts-web/src/test/java/test/forgon/selenium/Constants.java (.../Constants.java) (revision 18279) +++ ssts-web/src/test/java/test/forgon/selenium/Constants.java (.../Constants.java) (revision 18284) @@ -1,4 +1,4 @@ -package test_4_1; +package test.forgon.selenium; /** * * @author Terry Kwan Index: ssts-web/src/test/java/test/forgon/selenium/apply/bo/ApplyGoodBo.java =================================================================== diff -u -r18279 -r18284 --- ssts-web/src/test/java/test/forgon/selenium/apply/bo/ApplyGoodBo.java (.../ApplyGoodBo.java) (revision 18279) +++ ssts-web/src/test/java/test/forgon/selenium/apply/bo/ApplyGoodBo.java (.../ApplyGoodBo.java) (revision 18284) @@ -1,6 +1,6 @@ -package test_4_1.apply.bo; +package test.forgon.selenium.apply.bo; -import test_4_1.apply.applyConstants.ApplyGoodPrefixEnum; +import test.forgon.selenium.apply.applyConstants.ApplyGoodPrefixEnum; /** * @author zhonghaowen Index: ssts-web/src/test/java/test/forgon/selenium/PackingHistory.java =================================================================== diff -u -r18279 -r18284 --- ssts-web/src/test/java/test/forgon/selenium/PackingHistory.java (.../PackingHistory.java) (revision 18279) +++ ssts-web/src/test/java/test/forgon/selenium/PackingHistory.java (.../PackingHistory.java) (revision 18284) @@ -1,4 +1,4 @@ -package test_4_1; +package test.forgon.selenium; import org.openqa.selenium.By; import org.openqa.selenium.JavascriptExecutor; @@ -9,7 +9,7 @@ import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import test_4_1.tools.Utils; +import test.forgon.selenium.tools.Utils; /** * @author cherry 2016-03-02 Index: ssts-web/src/test/java/test/forgon/selenium/Review.java =================================================================== diff -u -r18279 -r18284 --- ssts-web/src/test/java/test/forgon/selenium/Review.java (.../Review.java) (revision 18279) +++ ssts-web/src/test/java/test/forgon/selenium/Review.java (.../Review.java) (revision 18284) @@ -1,7 +1,7 @@ /** * */ -package test_4_1; +package test.forgon.selenium; import java.util.List; @@ -13,7 +13,7 @@ import org.openqa.selenium.WebElement; import org.openqa.selenium.interactions.Actions; -import test_4_1.tools.Utils; +import test.forgon.selenium.tools.Utils; /** * @author cherry 2016-03-02 Index: ssts-web/src/test/java/test/forgon/selenium/sterilization/service/impl/OtherSterilization.java =================================================================== diff -u -r18279 -r18284 --- ssts-web/src/test/java/test/forgon/selenium/sterilization/service/impl/OtherSterilization.java (.../OtherSterilization.java) (revision 18279) +++ ssts-web/src/test/java/test/forgon/selenium/sterilization/service/impl/OtherSterilization.java (.../OtherSterilization.java) (revision 18284) @@ -1,6 +1,6 @@ -package test_4_1.sterilization.service.impl; +package test.forgon.selenium.sterilization.service.impl; -import test_4_1.sterilization.service.Sterilization; +import test.forgon.selenium.sterilization.service.Sterilization; public class OtherSterilization implements Sterilization { Index: ssts-web/src/test/java/test/forgon/selenium/Delivery.java =================================================================== diff -u -r18279 -r18284 --- ssts-web/src/test/java/test/forgon/selenium/Delivery.java (.../Delivery.java) (revision 18279) +++ ssts-web/src/test/java/test/forgon/selenium/Delivery.java (.../Delivery.java) (revision 18284) @@ -1,4 +1,4 @@ -package test_4_1; +package test.forgon.selenium; import java.util.List; @@ -11,7 +11,7 @@ import org.openqa.selenium.Keys; import org.openqa.selenium.WebElement; -import test_4_1.tools.Utils; +import test.forgon.selenium.tools.Utils; public class Delivery { @BeforeMethod Index: ssts-web/src/test/java/test/forgon/selenium/apply/applyConstants/ApplyGoodPrefixEnum.java =================================================================== diff -u -r18279 -r18284 --- ssts-web/src/test/java/test/forgon/selenium/apply/applyConstants/ApplyGoodPrefixEnum.java (.../ApplyGoodPrefixEnum.java) (revision 18279) +++ ssts-web/src/test/java/test/forgon/selenium/apply/applyConstants/ApplyGoodPrefixEnum.java (.../ApplyGoodPrefixEnum.java) (revision 18284) @@ -1,6 +1,6 @@ -package test_4_1.apply.applyConstants; +package test.forgon.selenium.apply.applyConstants; -import test_4_1.SettingConstants; +import test.forgon.selenium.SettingConstants; /** * @author zhonghaowen Index: ssts-web/src/test/java/test/forgon/selenium/tools/SeleniumRuntimeData.java =================================================================== diff -u -r18279 -r18284 --- ssts-web/src/test/java/test/forgon/selenium/tools/SeleniumRuntimeData.java (.../SeleniumRuntimeData.java) (revision 18279) +++ ssts-web/src/test/java/test/forgon/selenium/tools/SeleniumRuntimeData.java (.../SeleniumRuntimeData.java) (revision 18284) @@ -1,7 +1,7 @@ /** * */ -package test_4_1.tools; +package test.forgon.selenium.tools; import java.util.HashSet; import java.util.LinkedList; Index: ssts-web/src/test/java/test/forgon/selenium/apply/applyConstants/ApplyBtnEnum.java =================================================================== diff -u -r18279 -r18284 --- ssts-web/src/test/java/test/forgon/selenium/apply/applyConstants/ApplyBtnEnum.java (.../ApplyBtnEnum.java) (revision 18279) +++ ssts-web/src/test/java/test/forgon/selenium/apply/applyConstants/ApplyBtnEnum.java (.../ApplyBtnEnum.java) (revision 18284) @@ -1,4 +1,4 @@ -package test_4_1.apply.applyConstants; +package test.forgon.selenium.apply.applyConstants; /** * @author zhonghaowen Index: ssts-web/src/test/java/test/forgon/selenium/apply/chain/GdsyApplyHandler3.java =================================================================== diff -u -r18279 -r18284 --- ssts-web/src/test/java/test/forgon/selenium/apply/chain/GdsyApplyHandler3.java (.../GdsyApplyHandler3.java) (revision 18279) +++ ssts-web/src/test/java/test/forgon/selenium/apply/chain/GdsyApplyHandler3.java (.../GdsyApplyHandler3.java) (revision 18284) @@ -1,15 +1,15 @@ -package test_4_1.apply.chain; +package test.forgon.selenium.apply.chain; import org.openqa.selenium.By; import org.openqa.selenium.WebElement; -import test_4_1.SettingConstants; -import test_4_1.apply.applyConstants.ActionEnum; -import test_4_1.apply.applyConstants.ApplyBtnEnum; -import test_4_1.apply.applyConstants.DeskIconEnum; -import test_4_1.apply.bo.ApplyGoodBo; -import test_4_1.apply.factory.ApplyGoodBoFactory; -import test_4_1.apply.helper.ApplyHelper; -import test_4_1.tools.Utils; +import test.forgon.selenium.SettingConstants; +import test.forgon.selenium.apply.applyConstants.ActionEnum; +import test.forgon.selenium.apply.applyConstants.ApplyBtnEnum; +import test.forgon.selenium.apply.applyConstants.DeskIconEnum; +import test.forgon.selenium.apply.bo.ApplyGoodBo; +import test.forgon.selenium.apply.factory.ApplyGoodBoFactory; +import test.forgon.selenium.apply.helper.ApplyHelper; +import test.forgon.selenium.tools.Utils; /** * @author zhonghaowen Index: ssts-web/src/test/java/test/forgon/selenium/ALL.java =================================================================== diff -u -r18279 -r18284 --- ssts-web/src/test/java/test/forgon/selenium/ALL.java (.../ALL.java) (revision 18279) +++ ssts-web/src/test/java/test/forgon/selenium/ALL.java (.../ALL.java) (revision 18284) @@ -1,4 +1,4 @@ -package test_4_1; +package test.forgon.selenium; import org.apache.log4j.Logger; import org.openqa.selenium.By; @@ -9,11 +9,11 @@ import org.testng.annotations.Test; import test.forgon.disinfectsystem.AbstractCSSDTest; -import test_4_1.apply.applyConstants.DeskIconEnum; -import test_4_1.apply.chain.ChainConsumer; -import test_4_1.sterilization.SterilizationTest; -import test_4_1.tools.LoginUtil; -import test_4_1.tools.Utils; +import test.forgon.selenium.apply.applyConstants.DeskIconEnum; +import test.forgon.selenium.apply.chain.ChainConsumer; +import test.forgon.selenium.sterilization.SterilizationTest; +import test.forgon.selenium.tools.LoginUtil; +import test.forgon.selenium.tools.Utils; /** * @author cherry 2017-02-06 Index: ssts-web/src/test/java/test/forgon/selenium/apply/applyConstants/ActionEnum.java =================================================================== diff -u -r18279 -r18284 --- ssts-web/src/test/java/test/forgon/selenium/apply/applyConstants/ActionEnum.java (.../ActionEnum.java) (revision 18279) +++ ssts-web/src/test/java/test/forgon/selenium/apply/applyConstants/ActionEnum.java (.../ActionEnum.java) (revision 18284) @@ -1,4 +1,4 @@ -package test_4_1.apply.applyConstants; +package test.forgon.selenium.apply.applyConstants; /** * @author zhonghaowen Index: ssts-web/src/test/java/test/forgon/selenium/apply/GdsyApplyTest.java =================================================================== diff -u -r18279 -r18284 --- ssts-web/src/test/java/test/forgon/selenium/apply/GdsyApplyTest.java (.../GdsyApplyTest.java) (revision 18279) +++ ssts-web/src/test/java/test/forgon/selenium/apply/GdsyApplyTest.java (.../GdsyApplyTest.java) (revision 18284) @@ -1,4 +1,4 @@ -package test_4_1.apply; +package test.forgon.selenium.apply; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -7,17 +7,17 @@ import org.testng.annotations.BeforeMethod; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; -import test_4_1.SettingConstants; -import test_4_1.apply.applyConstants.ApplyBtnEnum; -import test_4_1.apply.applyConstants.DeskIconEnum; -import test_4_1.apply.bo.ApplyGoodBo; -import test_4_1.apply.chain.ChainConsumer; -import test_4_1.apply.factory.ApplyGoodBoFactory; -import test_4_1.apply.helper.ApplyHelper; -import test_4_1.apply.service.ApplyService; -import test_4_1.apply.service.GdsyApplyServiceImpl; -import test_4_1.tools.LoginUtil; -import test_4_1.tools.Utils; +import test.forgon.selenium.SettingConstants; +import test.forgon.selenium.apply.applyConstants.ApplyBtnEnum; +import test.forgon.selenium.apply.applyConstants.DeskIconEnum; +import test.forgon.selenium.apply.bo.ApplyGoodBo; +import test.forgon.selenium.apply.chain.ChainConsumer; +import test.forgon.selenium.apply.factory.ApplyGoodBoFactory; +import test.forgon.selenium.apply.helper.ApplyHelper; +import test.forgon.selenium.apply.service.ApplyService; +import test.forgon.selenium.apply.service.GdsyApplyServiceImpl; +import test.forgon.selenium.tools.LoginUtil; +import test.forgon.selenium.tools.Utils; /** * @author zhonghaowen Index: ssts-web/src/test/java/test/forgon/selenium/tools/Utils.java =================================================================== diff -u -r18279 -r18284 --- ssts-web/src/test/java/test/forgon/selenium/tools/Utils.java (.../Utils.java) (revision 18279) +++ ssts-web/src/test/java/test/forgon/selenium/tools/Utils.java (.../Utils.java) (revision 18284) @@ -1,4 +1,4 @@ -package test_4_1.tools; +package test.forgon.selenium.tools; import java.io.IOException; import java.io.InputStream; Index: ssts-web/src/test/java/test/forgon/selenium/apply/ComboApplyTest.java =================================================================== diff -u -r18279 -r18284 --- ssts-web/src/test/java/test/forgon/selenium/apply/ComboApplyTest.java (.../ComboApplyTest.java) (revision 18279) +++ ssts-web/src/test/java/test/forgon/selenium/apply/ComboApplyTest.java (.../ComboApplyTest.java) (revision 18284) @@ -1,21 +1,21 @@ -package test_4_1.apply; +package test.forgon.selenium.apply; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.Assert; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import test_4_1.Login; -import test_4_1.SettingConstants; -import test_4_1.apply.applyConstants.ApplyBtnEnum; -import test_4_1.apply.applyConstants.DeskIconEnum; -import test_4_1.apply.bo.ApplyGoodBo; -import test_4_1.apply.factory.ApplyGoodBoFactory; -import test_4_1.apply.helper.ApplyHelper; -import test_4_1.apply.service.ApplyComboService; -import test_4_1.apply.service.ApplyComboServiceImpl; -import test_4_1.tools.Utils; +import test.forgon.selenium.Login; +import test.forgon.selenium.SettingConstants; +import test.forgon.selenium.apply.applyConstants.ApplyBtnEnum; +import test.forgon.selenium.apply.applyConstants.DeskIconEnum; +import test.forgon.selenium.apply.bo.ApplyGoodBo; +import test.forgon.selenium.apply.factory.ApplyGoodBoFactory; +import test.forgon.selenium.apply.helper.ApplyHelper; +import test.forgon.selenium.apply.service.ApplyComboService; +import test.forgon.selenium.apply.service.ApplyComboServiceImpl; +import test.forgon.selenium.tools.Utils; /** * @author zhonghaowen Index: ssts-web/src/test/java/test/forgon/selenium/sterilization/service/Sterilization.java =================================================================== diff -u -r18279 -r18284 --- ssts-web/src/test/java/test/forgon/selenium/sterilization/service/Sterilization.java (.../Sterilization.java) (revision 18279) +++ ssts-web/src/test/java/test/forgon/selenium/sterilization/service/Sterilization.java (.../Sterilization.java) (revision 18284) @@ -1,4 +1,4 @@ -package test_4_1.sterilization.service; +package test.forgon.selenium.sterilization.service; /** * 自动化测试-灭菌模块抽象出来的接口,目前任何灭菌都有以下四种最基本的操作,有一些比较特殊的医院需要,
* 灭菌完成确认或者灭菌卸载等操作等等,则由实现类自己扩展 Index: ssts-web/src/test/java/test/forgon/selenium/apply/chain/ApplyHandler.java =================================================================== diff -u -r18279 -r18284 --- ssts-web/src/test/java/test/forgon/selenium/apply/chain/ApplyHandler.java (.../ApplyHandler.java) (revision 18279) +++ ssts-web/src/test/java/test/forgon/selenium/apply/chain/ApplyHandler.java (.../ApplyHandler.java) (revision 18284) @@ -1,8 +1,8 @@ -package test_4_1.apply.chain; +package test.forgon.selenium.apply.chain; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import test_4_1.apply.applyConstants.ActionEnum; +import test.forgon.selenium.apply.applyConstants.ActionEnum; /** * @author zhonghaowen Index: ssts-web/src/test/java/test/forgon/selenium/apply/service/ApplyServiceImpl.java =================================================================== diff -u -r18279 -r18284 --- ssts-web/src/test/java/test/forgon/selenium/apply/service/ApplyServiceImpl.java (.../ApplyServiceImpl.java) (revision 18279) +++ ssts-web/src/test/java/test/forgon/selenium/apply/service/ApplyServiceImpl.java (.../ApplyServiceImpl.java) (revision 18284) @@ -1,18 +1,18 @@ -package test_4_1.apply.service; +package test.forgon.selenium.apply.service; import org.openqa.selenium.By; import org.openqa.selenium.WebElement; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import test_4_1.SettingConstants; -import test_4_1.apply.applyConstants.ApplyBtnEnum; -import test_4_1.apply.applyConstants.DeskIconEnum; -import test_4_1.apply.bo.ApplyGoodBo; -import test_4_1.apply.dataProvider.ApplyDataProvider; -import test_4_1.apply.factory.ApplyGoodBoFactory; -import test_4_1.apply.helper.ApplyActionHelper; -import test_4_1.apply.helper.ApplyHelper; -import test_4_1.tools.Utils; +import test.forgon.selenium.SettingConstants; +import test.forgon.selenium.apply.applyConstants.ApplyBtnEnum; +import test.forgon.selenium.apply.applyConstants.DeskIconEnum; +import test.forgon.selenium.apply.bo.ApplyGoodBo; +import test.forgon.selenium.apply.dataProvider.ApplyDataProvider; +import test.forgon.selenium.apply.factory.ApplyGoodBoFactory; +import test.forgon.selenium.apply.helper.ApplyActionHelper; +import test.forgon.selenium.apply.helper.ApplyHelper; +import test.forgon.selenium.tools.Utils; import java.util.LinkedHashMap; import java.util.Map;