Index: ssts-web/src/test/java/test/forgon/disinfectsystem/recall/AllTests.java =================================================================== diff -u --- ssts-web/src/test/java/test/forgon/disinfectsystem/recall/AllTests.java (revision 0) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/recall/AllTests.java (revision 26155) @@ -0,0 +1,16 @@ +package test.forgon.disinfectsystem.recall; + +import org.junit.runner.RunWith; +import org.junit.runners.Suite; +import org.junit.runners.Suite.SuiteClasses; +/** + * + * @author Terry Kwan + * 2019-04-05 + * + */ +@RunWith(Suite.class) +@SuiteClasses({ TousseInstanceRecallTests.class }) +public class AllTests { + +} Index: ssts-web/src/test/java/test/forgon/disinfectsystem/application/TestDisinfectGoodRecyclingApplication.java =================================================================== diff -u -r26085 -r26155 --- ssts-web/src/test/java/test/forgon/disinfectsystem/application/TestDisinfectGoodRecyclingApplication.java (.../TestDisinfectGoodRecyclingApplication.java) (revision 26085) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/application/TestDisinfectGoodRecyclingApplication.java (.../TestDisinfectGoodRecyclingApplication.java) (revision 26155) @@ -2,18 +2,14 @@ import static org.junit.Assert.*; - - import java.util.ArrayList; import java.util.Collection; import java.util.List; import org.apache.commons.collections4.CollectionUtils; +import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.transaction.annotation.Propagation; -import org.springframework.transaction.annotation.Transactional; -import org.junit.Test; import test.forgon.disinfectsystem.AbstractCSSDTest; import test.forgon.disinfectsystem.application.assertThat.RecyclingApplicationAssert; @@ -31,7 +27,6 @@ * @apiNote 消毒物品申请单 * @since 2017-04-05 */ -@Transactional(propagation = Propagation.NEVER) public class TestDisinfectGoodRecyclingApplication extends AbstractCSSDTest { protected Logger log = LoggerFactory.getLogger(this.getClass()); Index: ssts-web/src/test/java/test/forgon/disinfectsystem/sterileunload/AllTests.java =================================================================== diff -u --- ssts-web/src/test/java/test/forgon/disinfectsystem/sterileunload/AllTests.java (revision 0) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/sterileunload/AllTests.java (revision 26155) @@ -0,0 +1,16 @@ +package test.forgon.disinfectsystem.sterileunload; + +import org.junit.runner.RunWith; +import org.junit.runners.Suite; +import org.junit.runners.Suite.SuiteClasses; +/** + * + * @author Terry Kwan + * 2019-04-05 + * + */ +@RunWith(Suite.class) +@SuiteClasses({ SterileUnloadScanTousseTests.class }) +public class AllTests { + +} Index: ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/AllTests.java =================================================================== diff -u --- ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/AllTests.java (revision 0) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/AllTests.java (revision 26155) @@ -0,0 +1,43 @@ +package test.forgon.disinfectsystem.recyclingrecord; + +import org.junit.runner.RunWith; +import org.junit.runners.Suite; +import org.junit.runners.Suite.SuiteClasses; + +import test.forgon.disinfectsystem.recyclingrecord.dwr.table.RecyclingRecordTableManagerTests; +import test.forgon.disinfectsystem.recyclingrecord.service.AddRecyclingItemsForRecyclingRecord; +import test.forgon.disinfectsystem.recyclingrecord.service.AddRecyclingRecordTests; +import test.forgon.disinfectsystem.recyclingrecord.service.ChangeBasketForRecyclingTests; +import test.forgon.disinfectsystem.recyclingrecord.service.ClassifyBasketsRecyclingSequenceTests; +import test.forgon.disinfectsystem.recyclingrecord.service.ComboRecyclingApplicationTests; +import test.forgon.disinfectsystem.recyclingrecord.service.ContainerManagerTests; +import test.forgon.disinfectsystem.recyclingrecord.service.ContainerStatusTests; +import test.forgon.disinfectsystem.recyclingrecord.service.DeleteRecyclingRecordItemTests; +import test.forgon.disinfectsystem.recyclingrecord.service.ForeignTousseRecyclingTests; +import test.forgon.disinfectsystem.recyclingrecord.service.RecyclingAutoReturnBorrowTests; +import test.forgon.disinfectsystem.recyclingrecord.service.RecyclingBasketTests; +import test.forgon.disinfectsystem.recyclingrecord.service.RecyclingMaterialsTest; +import test.forgon.disinfectsystem.recyclingrecord.service.RecyclingRecordManagerTests; +import test.forgon.disinfectsystem.recyclingrecord.service.TousseIntoBasketRestrictionsTests; +import test.forgon.disinfectsystem.recyclingrecord.service.UnPackingDisinfectGoodsInstanceTests; +/** + * + * @author Terry Kwan + * 2019-04-05 + * + */ +@RunWith(Suite.class) +@SuiteClasses({ AddRecyclingItemsForRecyclingRecord.class, + AddRecyclingRecordTests.class, ChangeBasketForRecyclingTests.class, + ClassifyBasketsRecyclingSequenceTests.class, + ComboRecyclingApplicationTests.class, ContainerManagerTests.class, + ContainerStatusTests.class, DeleteRecyclingRecordItemTests.class, + ForeignTousseRecyclingTests.class, + RecyclingAutoReturnBorrowTests.class, RecyclingBasketTests.class, + RecyclingMaterialsTest.class, RecyclingRecordManagerTests.class, + TousseIntoBasketRestrictionsTests.class, + UnPackingDisinfectGoodsInstanceTests.class, + RecyclingRecordTableManagerTests.class}) +public class AllTests { + +} Index: ssts-web/src/test/java/test/forgon/disinfectsystem/sterileLoading/AllTests.java =================================================================== diff -u --- ssts-web/src/test/java/test/forgon/disinfectsystem/sterileLoading/AllTests.java (revision 0) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/sterileLoading/AllTests.java (revision 26155) @@ -0,0 +1,16 @@ +package test.forgon.disinfectsystem.sterileLoading; + +import org.junit.runner.RunWith; +import org.junit.runners.Suite; +import org.junit.runners.Suite.SuiteClasses; +/** + * + * @author Terry Kwan + * 2019-04-05 + * + */ +@RunWith(Suite.class) +@SuiteClasses({ SterileLoadingManagerTests.class }) +public class AllTests { + +} Index: ssts-web/src/test/java/test/forgon/disinfectsystem/AllTests.java =================================================================== diff -u --- ssts-web/src/test/java/test/forgon/disinfectsystem/AllTests.java (revision 0) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/AllTests.java (revision 26155) @@ -0,0 +1,46 @@ +package test.forgon.disinfectsystem; + +import org.junit.runner.RunWith; +import org.junit.runners.Suite; +import org.junit.runners.Suite.SuiteClasses; +/** + * 消毒追溯系统各模块的测试套件集合 + * 每个模块均有自己的AllTest测试套件 + * + * @author Terry Kwan + * 2019-04-05 + * + */ +@RunWith(Suite.class) +@SuiteClasses({ test.forgon.disinfectsystem.application.AllTests.class, + test.forgon.disinfectsystem.basedatamanager.AllTests.class, + test.forgon.disinfectsystem.borrow.AllTests.class, + test.forgon.disinfectsystem.common.AllTests.class, + test.forgon.disinfectsystem.diposablegoods.AllTests.class, + test.forgon.disinfectsystem.disinfectgoods.AllTests.class, + test.forgon.disinfectsystem.erroranddamage.AllTests.class, + test.forgon.disinfectsystem.expensivegoods.AllTests.class, + test.forgon.disinfectsystem.goodFilterConfig.AllTests.class, + test.forgon.disinfectsystem.goodsstock.AllTests.class, + test.forgon.disinfectsystem.importbasedata.AllTests.class, + test.forgon.disinfectsystem.invoicemanager.AllTests.class, + test.forgon.disinfectsystem.material.AllTests.class, + test.forgon.disinfectsystem.packing.AllTests.class, + test.forgon.disinfectsystem.printRecyclingApplicationConfig.AllTests.class, + test.forgon.disinfectsystem.recall.AllTests.class, + test.forgon.disinfectsystem.recyclingrecord.AllTests.class, + test.forgon.disinfectsystem.reports.AllTests.class, + test.forgon.disinfectsystem.review.AllTests.class, + test.forgon.disinfectsystem.secondsupplyroom.AllTests.class, + test.forgon.disinfectsystem.serialNumber.AllTests.class, + test.forgon.disinfectsystem.sterileLoading.AllTests.class, + test.forgon.disinfectsystem.sterileRecord.AllTests.class, + test.forgon.disinfectsystem.sterileunload.AllTests.class, + test.forgon.disinfectsystem.synthetic.AllTests.class, + test.forgon.disinfectsystem.toussetransition.AllTests.class, + test.forgon.disinfectsystem.useRecord.AllTests.class, + test.forgon.disinfectsystem.waste.AllTests.class, + test.forgon.disinfectsystem.webservice.AllTests.class}) +public class AllTests { + +} Index: ssts-web/src/test/java/test/forgon/disinfectsystem/borrow/AllTests.java =================================================================== diff -u --- ssts-web/src/test/java/test/forgon/disinfectsystem/borrow/AllTests.java (revision 0) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/borrow/AllTests.java (revision 26155) @@ -0,0 +1,16 @@ +package test.forgon.disinfectsystem.borrow; + +import org.junit.runner.RunWith; +import org.junit.runners.Suite; +import org.junit.runners.Suite.SuiteClasses; +/** + * + * @author Terry Kwan + * 2019-04-05 + * + */ +@RunWith(Suite.class) +@SuiteClasses({ BorrowApplicationTest.class }) +public class AllTests { + +} Index: ssts-web/src/test/java/test/forgon/disinfectsystem/goodsstock/AllTests.java =================================================================== diff -u --- ssts-web/src/test/java/test/forgon/disinfectsystem/goodsstock/AllTests.java (revision 0) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/goodsstock/AllTests.java (revision 26155) @@ -0,0 +1,18 @@ +package test.forgon.disinfectsystem.goodsstock; + +import org.junit.runner.RunWith; +import org.junit.runners.Suite; +import org.junit.runners.Suite.SuiteClasses; + +import test.forgon.disinfectsystem.goodsstock.service.GoodsStockManagerTests; +/** + * + * @author Terry Kwan + * 2019-04-05 + * + */ +@RunWith(Suite.class) +@SuiteClasses({ GoodsStockManagerTests.class }) +public class AllTests { + +} Index: ssts-web/src/test/java/test/forgon/disinfectsystem/material/AllTests.java =================================================================== diff -u --- ssts-web/src/test/java/test/forgon/disinfectsystem/material/AllTests.java (revision 0) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/material/AllTests.java (revision 26155) @@ -0,0 +1,21 @@ +package test.forgon.disinfectsystem.material; + +import org.junit.runner.RunWith; +import org.junit.runners.Suite; +import org.junit.runners.Suite.SuiteClasses; + +import test.forgon.disinfectsystem.material.service.DownToRetrieveMaterialDefinitionManagerTest; +import test.forgon.disinfectsystem.material.service.MaterialEntryManagerTests; +import test.forgon.disinfectsystem.material.service.MterialDefinitionManagerTest; +/** + * + * @author Terry Kwan + * 2019-04-05 + * + */ +@RunWith(Suite.class) +@SuiteClasses({ DownToRetrieveMaterialDefinitionManagerTest.class, + MaterialEntryManagerTests.class, MterialDefinitionManagerTest.class }) +public class AllTests { + +} Index: ssts-web/src/test/java/test/forgon/disinfectsystem/sterileRecord/AllTests.java =================================================================== diff -u --- ssts-web/src/test/java/test/forgon/disinfectsystem/sterileRecord/AllTests.java (revision 0) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/sterileRecord/AllTests.java (revision 26155) @@ -0,0 +1,17 @@ +package test.forgon.disinfectsystem.sterileRecord; + +import org.junit.runner.RunWith; +import org.junit.runners.Suite; +import org.junit.runners.Suite.SuiteClasses; +/** + * + * @author Terry Kwan + * 2019-04-05 + * + */ +@RunWith(Suite.class) +@SuiteClasses({ BiologyMonitoringWarningTest.class, + SterieRecordManagerTests.class }) +public class AllTests { + +} Index: ssts-web/src/test/java/test/forgon/disinfectsystem/printRecyclingApplicationConfig/AllTests.java =================================================================== diff -u --- ssts-web/src/test/java/test/forgon/disinfectsystem/printRecyclingApplicationConfig/AllTests.java (revision 0) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/printRecyclingApplicationConfig/AllTests.java (revision 26155) @@ -0,0 +1,18 @@ +package test.forgon.disinfectsystem.printRecyclingApplicationConfig; + +import org.junit.runner.RunWith; +import org.junit.runners.Suite; +import org.junit.runners.Suite.SuiteClasses; + +import test.forgon.disinfectsystem.printRecyclingApplicationConfig.service.PrintConfigManagerTests; +/** + * + * @author Terry Kwan + * 2019-04-05 + * + */ +@RunWith(Suite.class) +@SuiteClasses({ PrintConfigManagerTests.class }) +public class AllTests { + +} Index: ssts-web/src/test/java/test/forgon/disinfectsystem/secondsupplyroom/AllTests.java =================================================================== diff -u --- ssts-web/src/test/java/test/forgon/disinfectsystem/secondsupplyroom/AllTests.java (revision 0) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/secondsupplyroom/AllTests.java (revision 26155) @@ -0,0 +1,18 @@ +package test.forgon.disinfectsystem.secondsupplyroom; + +import org.junit.runner.RunWith; +import org.junit.runners.Suite; +import org.junit.runners.Suite.SuiteClasses; + +import test.forgon.disinfectsystem.secondsupplyroom.service.TestSecondSupplyRoom; +/** + * + * @author Terry Kwan + * 2019-04-05 + * + */ +@RunWith(Suite.class) +@SuiteClasses({ TestSecondSupplyRoom.class }) +public class AllTests { + +} Index: ssts-web/src/test/java/test/forgon/disinfectsystem/common/AllTests.java =================================================================== diff -u --- ssts-web/src/test/java/test/forgon/disinfectsystem/common/AllTests.java (revision 0) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/common/AllTests.java (revision 26155) @@ -0,0 +1,16 @@ +package test.forgon.disinfectsystem.common; + +import org.junit.runner.RunWith; +import org.junit.runners.Suite; +import org.junit.runners.Suite.SuiteClasses; +/** + * + * @author Terry Kwan + * 2019-04-05 + * + */ +@RunWith(Suite.class) +@SuiteClasses({ CssdUtilsTests.class }) +public class AllTests { + +} Index: ssts-web/src/test/java/test/forgon/disinfectsystem/application/AllTests.java =================================================================== diff -u --- ssts-web/src/test/java/test/forgon/disinfectsystem/application/AllTests.java (revision 0) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/application/AllTests.java (revision 26155) @@ -0,0 +1,34 @@ +package test.forgon.disinfectsystem.application; + +import org.junit.runner.RunWith; +import org.junit.runners.Suite; +import org.junit.runners.Suite.SuiteClasses; + +import test.forgon.disinfectsystem.application.dwr.table.RecyclingApplicationTableManagerTests; +import test.forgon.disinfectsystem.application.service.InvoicePlanManagerInvoicePlanStatusTests; +import test.forgon.disinfectsystem.application.service.InvoicePlanPrint2ByApplyNumberTests; +import test.forgon.disinfectsystem.application.service.InvoicePlanPrintByApplyNumberTests; +import test.forgon.disinfectsystem.application.service.InvoicePlanPrintByRecyclingNumberTests; +import test.forgon.disinfectsystem.application.service.RecyclingApplicationManagerTests; +/** + * 申请相关的测试套件 + * + * @author Terry Kwan + * 2019-04-05 + */ +@RunWith(Suite.class) +@SuiteClasses({ TestCustomRecyclingApplication.class, + TestDisinfectGoodRecyclingApplication.class, + TestDisposableGoodRecyclingApplication.class, + TestDressingRecyclingApplication.class, + TestForeignTousseGoodRecyclingApplication.class, + TestRecyclingApplication.class, TestTousseRecyclingApplication.class, + InvoicePlanManagerInvoicePlanStatusTests.class, + InvoicePlanPrint2ByApplyNumberTests.class, + InvoicePlanPrintByApplyNumberTests.class, + InvoicePlanPrintByRecyclingNumberTests.class, + RecyclingApplicationManagerTests.class, + RecyclingApplicationTableManagerTests.class}) +public class AllTests { + +} Index: ssts-web/src/test/java/test/forgon/disinfectsystem/waste/AllTests.java =================================================================== diff -u --- ssts-web/src/test/java/test/forgon/disinfectsystem/waste/AllTests.java (revision 0) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/waste/AllTests.java (revision 26155) @@ -0,0 +1,16 @@ +package test.forgon.disinfectsystem.waste; + +import org.junit.runner.RunWith; +import org.junit.runners.Suite; +import org.junit.runners.Suite.SuiteClasses; +/** + * + * @author Terry Kwan + * 2019-04-05 + * + */ +@RunWith(Suite.class) +@SuiteClasses({ TousseInstanceWasteTests.class }) +public class AllTests { + +} Index: ssts-web/src/test/java/test/forgon/tools/crypto/coder/CoderEncryptionTests.java =================================================================== diff -u -r26085 -r26155 --- ssts-web/src/test/java/test/forgon/tools/crypto/coder/CoderEncryptionTests.java (.../CoderEncryptionTests.java) (revision 26085) +++ ssts-web/src/test/java/test/forgon/tools/crypto/coder/CoderEncryptionTests.java (.../CoderEncryptionTests.java) (revision 26155) @@ -21,7 +21,6 @@ } catch (Exception e) { e.printStackTrace(); } - fail("Not yet implemented"); } } Index: ssts-web/src/test/java/test/forgon/disinfectsystem/webservice/AllTests.java =================================================================== diff -u --- ssts-web/src/test/java/test/forgon/disinfectsystem/webservice/AllTests.java (revision 0) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/webservice/AllTests.java (revision 26155) @@ -0,0 +1,18 @@ +package test.forgon.disinfectsystem.webservice; + +import org.junit.runner.RunWith; +import org.junit.runners.Suite; +import org.junit.runners.Suite.SuiteClasses; + +import test.forgon.disinfectsystem.webservice.service.ServiceManagerTests; +/** + * + * @author Terry Kwan + * 2019-04-05 + * + */ +@RunWith(Suite.class) +@SuiteClasses({ ServiceManagerTests.class }) +public class AllTests { + +} Index: ssts-web/src/test/java/test/forgon/disinfectsystem/application/assertThat/RecyclingApplicationAssert.java =================================================================== diff -u -r26085 -r26155 --- ssts-web/src/test/java/test/forgon/disinfectsystem/application/assertThat/RecyclingApplicationAssert.java (.../RecyclingApplicationAssert.java) (revision 26085) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/application/assertThat/RecyclingApplicationAssert.java (.../RecyclingApplicationAssert.java) (revision 26155) @@ -1,23 +1,23 @@ package test.forgon.disinfectsystem.application.assertThat; -import com.forgon.disinfectsystem.entity.basedatamanager.materialinstance.MaterialInstance; -import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinition; -import com.forgon.disinfectsystem.entity.invoicemanager.InvoicePlan; -import com.forgon.disinfectsystem.entity.recyclingapplication.RecyclingApplication; -import com.forgon.disinfectsystem.entity.tousseitem.TousseItem; -import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.lang3.BooleanUtils; +import static org.junit.Assert.*; import java.util.Collection; import java.util.List; import java.util.Map; import java.util.stream.Collectors; -import static org.junit.Assert.*; -import static org.testng.Assert.assertFalse; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.BooleanUtils; +import com.forgon.disinfectsystem.entity.basedatamanager.materialinstance.MaterialInstance; +import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinition; +import com.forgon.disinfectsystem.entity.invoicemanager.InvoicePlan; +import com.forgon.disinfectsystem.entity.recyclingapplication.RecyclingApplication; +import com.forgon.disinfectsystem.entity.tousseitem.TousseItem; + /** * @author zhonghaowen * @apiNote 申请单的断言类 Index: ssts-web/src/test/java/test/forgon/disinfectsystem/expensivegoods/AllTests.java =================================================================== diff -u --- ssts-web/src/test/java/test/forgon/disinfectsystem/expensivegoods/AllTests.java (revision 0) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/expensivegoods/AllTests.java (revision 26155) @@ -0,0 +1,19 @@ +package test.forgon.disinfectsystem.expensivegoods; + +import org.junit.runner.RunWith; +import org.junit.runners.Suite; +import org.junit.runners.Suite.SuiteClasses; + +import test.forgon.disinfectsystem.expensivegoods.service.ExpensiveGoodsGodownTest; +import test.forgon.disinfectsystem.expensivegoods.service.ExpensiveGoodsTests; +/** + * + * @author Terry Kwan + * 2019-04-05 + * + */ +@RunWith(Suite.class) +@SuiteClasses({ ExpensiveGoodsGodownTest.class, ExpensiveGoodsTests.class }) +public class AllTests { + +} Index: ssts-web/src/test/java/test/forgon/disinfectsystem/diposablegoods/AllTests.java =================================================================== diff -u --- ssts-web/src/test/java/test/forgon/disinfectsystem/diposablegoods/AllTests.java (revision 0) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/diposablegoods/AllTests.java (revision 26155) @@ -0,0 +1,20 @@ +package test.forgon.disinfectsystem.diposablegoods; + +import org.junit.runner.RunWith; +import org.junit.runners.Suite; +import org.junit.runners.Suite.SuiteClasses; + +import test.forgon.disinfectsystem.diposablegoods.service.DiposableGoodsManagerTests; +import test.forgon.disinfectsystem.diposablegoods.service.GoodPurchasePlanManagerTest; +/** + * + * @author Terry Kwan + * 2019-04-05 + * + */ +@RunWith(Suite.class) +@SuiteClasses({ DiposableGoodsManagerTests.class, + GoodPurchasePlanManagerTest.class }) +public class AllTests { + +} Index: ssts-web/src/test/java/test/forgon/disinfectsystem/serialNumber/AllTests.java =================================================================== diff -u --- ssts-web/src/test/java/test/forgon/disinfectsystem/serialNumber/AllTests.java (revision 0) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/serialNumber/AllTests.java (revision 26155) @@ -0,0 +1,19 @@ +package test.forgon.disinfectsystem.serialNumber; + +import org.junit.runner.RunWith; +import org.junit.runners.Suite; +import org.junit.runners.Suite.SuiteClasses; + +import test.forgon.disinfectsystem.serialNumber.service.SerialNumManagerTests; +import test.forgon.disinfectsystem.serialNumber.service.TestSerialNumManager; +/** + * + * @author Terry Kwan + * 2019-04-05 + * + */ +@RunWith(Suite.class) +@SuiteClasses({ SerialNumManagerTests.class, TestSerialNumManager.class }) +public class AllTests { + +} Index: ssts-web/src/test/java/test/forgon/disinfectsystem/reports/AllTests.java =================================================================== diff -u --- ssts-web/src/test/java/test/forgon/disinfectsystem/reports/AllTests.java (revision 0) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/reports/AllTests.java (revision 26155) @@ -0,0 +1,19 @@ +package test.forgon.disinfectsystem.reports; + +import org.junit.runner.RunWith; +import org.junit.runners.Suite; +import org.junit.runners.Suite.SuiteClasses; + +import test.forgon.disinfectsystem.reports.dataindex.DataIndexTests; +/** + * + * @author Terry Kwan + * 2019-04-05 + * + */ +@RunWith(Suite.class) +@SuiteClasses({ TestDepartmentMonthDetail.class, TestTousseOverLoad.class, + DataIndexTests.class }) +public class AllTests { + +} Index: ssts-web/src/test/java/test/forgon/disinfectsystem/packing/AllTests.java =================================================================== diff -u --- ssts-web/src/test/java/test/forgon/disinfectsystem/packing/AllTests.java (revision 0) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/packing/AllTests.java (revision 26155) @@ -0,0 +1,33 @@ +package test.forgon.disinfectsystem.packing; + +import org.junit.runner.RunWith; +import org.junit.runners.Suite; +import org.junit.runners.Suite.SuiteClasses; + +import test.forgon.disinfectsystem.packing.controller.PackingControllerTests; +import test.forgon.disinfectsystem.packing.controller.PackingReviewControllerTests; +import test.forgon.disinfectsystem.packing.service.ComboToussePackingTests; +import test.forgon.disinfectsystem.packing.service.PackingManagerTests; +/** + * + * @author Terry Kwan + * 2019-04-05 + * + */ +@RunWith(Suite.class) +@SuiteClasses({ + InvoicePlanManagerTests.class, + PackingTableManagerTests.class, + PackingTaskTests.class, + PackingWithAutoLoadToContainerTests.class, + SterilizationRecordManagerTests.class, + SterilizationRecordManagerTestsForCompleteSterileRecord.class, + SterilizationRecordManagerTestsForSaveOrUpdateSterilizationRecord.class, + TousseInstanceReviewManagerTests.class, + PackingManagerTests.class, + ComboToussePackingTests.class, + PackingReviewControllerTests.class, + PackingControllerTests.class}) +public class AllTests { + +} Index: ssts-web/src/test/java/test/forgon/disinfectsystem/synthetic/AllTests.java =================================================================== diff -u --- ssts-web/src/test/java/test/forgon/disinfectsystem/synthetic/AllTests.java (revision 0) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/synthetic/AllTests.java (revision 26155) @@ -0,0 +1,18 @@ +package test.forgon.disinfectsystem.synthetic; + +import org.junit.runner.RunWith; +import org.junit.runners.Suite; +import org.junit.runners.Suite.SuiteClasses; + +import test.forgon.disinfectsystem.synthetic.allrecycle.AllRecycleTests; +/** + * + * @author Terry Kwan + * 2019-04-05 + * + */ +@RunWith(Suite.class) +@SuiteClasses({ SterileAndInvoiceTests.class, AllRecycleTests.class }) +public class AllTests { + +} Index: ssts-web/src/test/java/test/forgon/disinfectsystem/basedatamanager/AllTests.java =================================================================== diff -u --- ssts-web/src/test/java/test/forgon/disinfectsystem/basedatamanager/AllTests.java (revision 0) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/basedatamanager/AllTests.java (revision 26155) @@ -0,0 +1,26 @@ +package test.forgon.disinfectsystem.basedatamanager; + +import org.junit.runner.RunWith; +import org.junit.runners.Suite; +import org.junit.runners.Suite.SuiteClasses; + +import test.forgon.disinfectsystem.basedatamanager.departmentapplicationtemplate.service.DepartmentAppTemplateManagerTests; +import test.forgon.disinfectsystem.basedatamanager.maintain.MaintainTests; +import test.forgon.disinfectsystem.basedatamanager.supplyroomconfig.service.SupplyRoomConfigManagerTests; +import test.forgon.disinfectsystem.basedatamanager.toussedefinition.service.DeleteTousseDefinitionTest; +import test.forgon.disinfectsystem.basedatamanager.toussedefinition.service.SaveOrUpdateTousseDefinitionTest; +import test.forgon.disinfectsystem.basedatamanager.toussedefinition.service.TousseDefinitionManagerTests; +/** + * + * @author Terry Kwan + * 2019-04-05 + * + */ +@RunWith(Suite.class) +@SuiteClasses({ DepartmentAppTemplateManagerTests.class, MaintainTests.class, + SupplyRoomConfigManagerTests.class, DeleteTousseDefinitionTest.class, + SaveOrUpdateTousseDefinitionTest.class, + TousseDefinitionManagerTests.class }) +public class AllTests { + +} Index: ssts-web/src/test/java/test/forgon/disinfectsystem/goodFilterConfig/AllTests.java =================================================================== diff -u --- ssts-web/src/test/java/test/forgon/disinfectsystem/goodFilterConfig/AllTests.java (revision 0) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/goodFilterConfig/AllTests.java (revision 26155) @@ -0,0 +1,16 @@ +package test.forgon.disinfectsystem.goodFilterConfig; + +import org.junit.runner.RunWith; +import org.junit.runners.Suite; +import org.junit.runners.Suite.SuiteClasses; +/** + * + * @author Terry Kwan + * 2019-04-05 + * + */ +@RunWith(Suite.class) +@SuiteClasses({ GoodFilterConfigTest.class }) +public class AllTests { + +} Index: ssts-web/src/test/java/test/forgon/disinfectsystem/importbasedata/AllTests.java =================================================================== diff -u --- ssts-web/src/test/java/test/forgon/disinfectsystem/importbasedata/AllTests.java (revision 0) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/importbasedata/AllTests.java (revision 26155) @@ -0,0 +1,17 @@ +package test.forgon.disinfectsystem.importbasedata; + +import org.junit.runner.RunWith; +import org.junit.runners.Suite; +import org.junit.runners.Suite.SuiteClasses; +/** + * + * @author Terry Kwan + * 2019-04-05 + * + */ +@RunWith(Suite.class) +@SuiteClasses({ EquivalenceTest.class, TestExportbaseData.class, + TestImportbaseData.class }) +public class AllTests { + +} Index: ssts-web/src/test/java/test/forgon/disinfectsystem/review/AllTests.java =================================================================== diff -u --- ssts-web/src/test/java/test/forgon/disinfectsystem/review/AllTests.java (revision 0) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/review/AllTests.java (revision 26155) @@ -0,0 +1,16 @@ +package test.forgon.disinfectsystem.review; + +import org.junit.runner.RunWith; +import org.junit.runners.Suite; +import org.junit.runners.Suite.SuiteClasses; +/** + * + * @author Terry Kwan + * 2019-04-05 + * + */ +@RunWith(Suite.class) +@SuiteClasses({ ComboTousseInstanceReviewTests.class }) +public class AllTests { + +} Index: ssts-web/src/test/java/test/forgon/directory/AllTests.java =================================================================== diff -u --- ssts-web/src/test/java/test/forgon/directory/AllTests.java (revision 0) +++ ssts-web/src/test/java/test/forgon/directory/AllTests.java (revision 26155) @@ -0,0 +1,18 @@ +package test.forgon.directory; + +import org.junit.runner.RunWith; +import org.junit.runners.Suite; +import org.junit.runners.Suite.SuiteClasses; + +import test.forgon.directory.service.OrgUnitManagerTest; +/** + * + * @author Terry Kwan + * 2019-04-05 + * + */ +@RunWith(Suite.class) +@SuiteClasses({ OrgUnitManagerTest.class }) +public class AllTests { + +} Index: ssts-web/src/test/java/test/forgon/disinfectsystem/useRecord/AllTests.java =================================================================== diff -u --- ssts-web/src/test/java/test/forgon/disinfectsystem/useRecord/AllTests.java (revision 0) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/useRecord/AllTests.java (revision 26155) @@ -0,0 +1,16 @@ +package test.forgon.disinfectsystem.useRecord; + +import org.junit.runner.RunWith; +import org.junit.runners.Suite; +import org.junit.runners.Suite.SuiteClasses; +/** + * + * @author Terry Kwan + * 2019-04-05 + * + */ +@RunWith(Suite.class) +@SuiteClasses({ UseRecordManagerTests.class }) +public class AllTests { + +} Index: ssts-web/src/test/java/test/forgon/AllTests.java =================================================================== diff -u --- ssts-web/src/test/java/test/forgon/AllTests.java (revision 0) +++ ssts-web/src/test/java/test/forgon/AllTests.java (revision 26155) @@ -0,0 +1,19 @@ +package test.forgon; + +import org.junit.runner.RunWith; +import org.junit.runners.Suite; +import org.junit.runners.Suite.SuiteClasses; +/** + * 所有的Junit单元测试类集合
+ * 不包含自动化测试类 + * @author Terry Kwan + * 2019-04-05 + * + */ +@RunWith(Suite.class) +@SuiteClasses({ test.forgon.disinfectsystem.AllTests.class, + test.forgon.directory.AllTests.class, + test.forgon.system.AllTests.class, test.forgon.tools.AllTests.class }) +public class AllTests { + +} Index: ssts-web/src/test/java/test/forgon/disinfectsystem/toussetransition/AllTests.java =================================================================== diff -u --- ssts-web/src/test/java/test/forgon/disinfectsystem/toussetransition/AllTests.java (revision 0) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/toussetransition/AllTests.java (revision 26155) @@ -0,0 +1,20 @@ +package test.forgon.disinfectsystem.toussetransition; + +import org.junit.runner.RunWith; +import org.junit.runners.Suite; +import org.junit.runners.Suite.SuiteClasses; + +import test.forgon.disinfectsystem.toussetransition.service.TousseTransitionPlanManagerTests; +import test.forgon.disinfectsystem.toussetransition.service.TousseTransitionRecordManagerTests; +/** + * + * @author Terry Kwan + * 2019-04-05 + * + */ +@RunWith(Suite.class) +@SuiteClasses({ TousseTransitionPlanManagerTests.class, + TousseTransitionRecordManagerTests.class }) +public class AllTests { + +} Index: ssts-web/src/test/java/test/forgon/disinfectsystem/disinfectgoods/AllTests.java =================================================================== diff -u --- ssts-web/src/test/java/test/forgon/disinfectsystem/disinfectgoods/AllTests.java (revision 0) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/disinfectgoods/AllTests.java (revision 26155) @@ -0,0 +1,16 @@ +package test.forgon.disinfectsystem.disinfectgoods; + +import org.junit.runner.RunWith; +import org.junit.runners.Suite; +import org.junit.runners.Suite.SuiteClasses; +/** + * + * @author Terry Kwan + * 2019-04-05 + * + */ +@RunWith(Suite.class) +@SuiteClasses({ TestDisinfectGoodsSteriliManager.class }) +public class AllTests { + +} Index: ssts-web/src/test/java/test/forgon/disinfectsystem/borrow/BorrowApplicationTest.java =================================================================== diff -u -r26085 -r26155 --- ssts-web/src/test/java/test/forgon/disinfectsystem/borrow/BorrowApplicationTest.java (.../BorrowApplicationTest.java) (revision 26085) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/borrow/BorrowApplicationTest.java (.../BorrowApplicationTest.java) (revision 26155) @@ -19,7 +19,6 @@ import org.apache.commons.lang.StringUtils; import org.hibernate.Session; import org.junit.Test; -import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.orm.hibernate4.HibernateTemplate; @@ -45,7 +44,6 @@ import com.forgon.disinfectsystem.useRecord.service.UseRecordManager; import com.forgon.disinfectsystem.vo.TousseItemVo; import com.forgon.tools.date.DateTools; -import com.tngtech.java.junit.dataprovider.DataProviderRunner; import com.tngtech.java.junit.dataprovider.UseDataProvider; /** Index: ssts-web/src/test/java/test/forgon/tools/AllTests.java =================================================================== diff -u --- ssts-web/src/test/java/test/forgon/tools/AllTests.java (revision 0) +++ ssts-web/src/test/java/test/forgon/tools/AllTests.java (revision 26155) @@ -0,0 +1,43 @@ +package test.forgon.tools; + +import org.junit.runner.RunWith; +import org.junit.runners.Suite; +import org.junit.runners.Suite.SuiteClasses; + +import test.forgon.tools.concurrent.ConcurrentTest; +import test.forgon.tools.crypto.coder.CoderEncryptionTests; +import test.forgon.tools.date.DateToolsTests; +import test.forgon.tools.format.FormatStringTest; +import test.forgon.tools.hardware.HardWareUtilsTest; +import test.forgon.tools.hibernate.ObjectDaoTests; +import test.forgon.tools.json.GsonUtilsTests; +import test.forgon.tools.json.JSONTest; +import test.forgon.tools.json.JsonObjectTest; +import test.forgon.tools.json.JsonUtilsTests; +import test.forgon.tools.util.BarcodeOperatorsTests; +import test.forgon.tools.util.DateUtilTests; +import test.forgon.tools.util.ForgonNumberUtilsTest; +import test.forgon.tools.util.SqlUtilsTest; +import test.forgon.tools.util.StringUtilTests; + +@RunWith(Suite.class) +@SuiteClasses({ CRCUtilsTest.class, IPAddressValidatorTests.class, + MathToolsTest.class, + StringUtilTests.class, + SqlUtilsTest.class, + ForgonNumberUtilsTest.class, + DateUtilTests.class, + BarcodeOperatorsTests.class, + GsonUtilsTests.class, + JsonObjectTest.class, + JSONTest.class, + JsonUtilsTests.class, + ObjectDaoTests.class, + HardWareUtilsTest.class, + FormatStringTest.class, + DateToolsTests.class, + CoderEncryptionTests.class +}) +public class AllTests { + +} Index: ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/AllTests.java =================================================================== diff -u --- ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/AllTests.java (revision 0) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/AllTests.java (revision 26155) @@ -0,0 +1,56 @@ +package test.forgon.disinfectsystem.invoicemanager; + +import org.junit.runner.RunWith; +import org.junit.runners.Suite; +import org.junit.runners.Suite.SuiteClasses; + +import test.forgon.disinfectsystem.invoicemanager.service.BiologicalMonitoringSituationTest; +import test.forgon.disinfectsystem.invoicemanager.service.ComboTousseInvoiceTests; +import test.forgon.disinfectsystem.invoicemanager.service.InvoiceManagerForComboFormTests; +import test.forgon.disinfectsystem.invoicemanager.service.InvoiceManagerForProxyDisinfectionTest; +import test.forgon.disinfectsystem.invoicemanager.service.InvoiceManagerTests; +import test.forgon.disinfectsystem.invoicemanager.service.InvoicePlanManagerTest; +import test.forgon.disinfectsystem.invoicemanager.service.OperationReservationMergeInvoiceTests; +import test.forgon.disinfectsystem.invoicemanager.service.PDAAssembleSendGoodsInvoiceManagerTests; +import test.forgon.disinfectsystem.invoicemanager.service.PDADuplicateInvoice; +import test.forgon.disinfectsystem.invoicemanager.service.PDASimpleTousseComplexStatusInvoiceManagerTests; +import test.forgon.disinfectsystem.invoicemanager.service.ScanBasketInvoiceTests; +import test.forgon.disinfectsystem.invoicemanager.service.TestDisinfectGoodsInvoiceWithDiffAncestorTousseDefinition; +import test.forgon.disinfectsystem.invoicemanager.service.TestMultiForeignTousseInvoiceManager; +import test.forgon.disinfectsystem.invoicemanager.service.TestPDABorrowTousseGoodsInvoiceManager; +import test.forgon.disinfectsystem.invoicemanager.service.TestPDADiposableGoodsInvoiceManager; +import test.forgon.disinfectsystem.invoicemanager.service.TestPDADisinfectGoodsInvoiceManager; +import test.forgon.disinfectsystem.invoicemanager.service.TestPDAForeignProxyTousseGoodsInvoiceManager; +import test.forgon.disinfectsystem.invoicemanager.service.TestPDAForeignTousseGoodsInvoiceManager; +import test.forgon.disinfectsystem.invoicemanager.service.TestPDAProxyTousseGoodsInvoiceManager; +import test.forgon.disinfectsystem.invoicemanager.service.TestPDAReturnGoodReInvoiceManager; +import test.forgon.disinfectsystem.invoicemanager.service.TestPDATousseInvoiceManager; +/** + * + * @author Terry Kwan + * 2019-04-05 + * + */ +@RunWith(Suite.class) +@SuiteClasses({ BiologicalMonitoringSituationTest.class, + ComboTousseInvoiceTests.class, InvoiceManagerForComboFormTests.class, + InvoiceManagerForProxyDisinfectionTest.class, + InvoiceManagerTests.class, InvoicePlanManagerTest.class, + OperationReservationMergeInvoiceTests.class, + PDAAssembleSendGoodsInvoiceManagerTests.class, + PDADuplicateInvoice.class, + PDASimpleTousseComplexStatusInvoiceManagerTests.class, + ScanBasketInvoiceTests.class, + TestDisinfectGoodsInvoiceWithDiffAncestorTousseDefinition.class, + TestMultiForeignTousseInvoiceManager.class, + TestPDABorrowTousseGoodsInvoiceManager.class, + TestPDADiposableGoodsInvoiceManager.class, + TestPDADisinfectGoodsInvoiceManager.class, + TestPDAForeignProxyTousseGoodsInvoiceManager.class, + TestPDAForeignTousseGoodsInvoiceManager.class, + TestPDAProxyTousseGoodsInvoiceManager.class, + TestPDAReturnGoodReInvoiceManager.class, + TestPDATousseInvoiceManager.class }) +public class AllTests { + +} Index: ssts-web/src/test/java/test/forgon/disinfectsystem/erroranddamage/AllTests.java =================================================================== diff -u --- ssts-web/src/test/java/test/forgon/disinfectsystem/erroranddamage/AllTests.java (revision 0) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/erroranddamage/AllTests.java (revision 26155) @@ -0,0 +1,17 @@ +package test.forgon.disinfectsystem.erroranddamage; + +import org.junit.runner.RunWith; +import org.junit.runners.Suite; +import org.junit.runners.Suite.SuiteClasses; +/** + * + * @author Terry Kwan + * 2019-04-05 + * + */ +@RunWith(Suite.class) +@SuiteClasses({ MaterialSupplementTests.class, + RecyclingErrorAndDamageTests.class }) +public class AllTests { + +} Index: ssts-web/src/test/java/test/forgon/system/AllTests.java =================================================================== diff -u --- ssts-web/src/test/java/test/forgon/system/AllTests.java (revision 0) +++ ssts-web/src/test/java/test/forgon/system/AllTests.java (revision 26155) @@ -0,0 +1,13 @@ +package test.forgon.system; + +import org.junit.runner.RunWith; +import org.junit.runners.Suite; +import org.junit.runners.Suite.SuiteClasses; + +import test.forgon.system.concurrent.service.OptimisticLockManagerTests; + +@RunWith(Suite.class) +@SuiteClasses({ OptimisticLockManagerTests.class }) +public class AllTests { + +}