Index: ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/TestDisinfectGoodsInvoiceWithDiffAncestorTousseDefinition.java =================================================================== diff -u -r26085 -r26269 --- ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/TestDisinfectGoodsInvoiceWithDiffAncestorTousseDefinition.java (.../TestDisinfectGoodsInvoiceWithDiffAncestorTousseDefinition.java) (revision 26085) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/TestDisinfectGoodsInvoiceWithDiffAncestorTousseDefinition.java (.../TestDisinfectGoodsInvoiceWithDiffAncestorTousseDefinition.java) (revision 26269) @@ -1,5 +1,6 @@ package test.forgon.disinfectsystem.invoicemanager.service; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; import java.util.ArrayList; import java.util.Date; @@ -8,7 +9,6 @@ import net.sf.json.JSONArray; import net.sf.json.JSONObject; -import org.springframework.test.annotation.Rollback; import org.junit.Test; import test.forgon.constant.Constants; @@ -99,7 +99,6 @@ } @Test - @Rollback(false) public void testSendAllDisifectGoods(){ prepareData(); WareHouse wareHouse_CSSD = wareHouseManager.getDefaultWareHouseByUnitCode(Constants.ORG_UNIT_CODE_CSSD); Index: ssts-web/src/test/java/test/forgon/disinfectsystem/importbasedata/EquivalenceTest.java =================================================================== diff -u -r26085 -r26269 --- ssts-web/src/test/java/test/forgon/disinfectsystem/importbasedata/EquivalenceTest.java (.../EquivalenceTest.java) (revision 26085) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/importbasedata/EquivalenceTest.java (.../EquivalenceTest.java) (revision 26269) @@ -1,8 +1,7 @@ package test.forgon.disinfectsystem.importbasedata; -import junit.framework.Assert; - -import org.testng.annotations.BeforeMethod; +import org.junit.Assert; +import org.junit.Before; import org.junit.Test; import com.forgon.disinfectsystem.entity.assestmanagement.DisposableGoods; @@ -20,7 +19,7 @@ private static JsonObject rootJsonObject; - @BeforeMethod + @Before public static void prepare(){ JsonObjectFromResourceFactoryBean fb = new JsonObjectFromResourceFactoryBean(); fb.setCharset("UTF-8"); Index: ssts-web/src/test/java/test/forgon/disinfectsystem/dataProvider/application/CustomTousseRecyclingApplicationProvider.java =================================================================== diff -u -r17726 -r26269 --- ssts-web/src/test/java/test/forgon/disinfectsystem/dataProvider/application/CustomTousseRecyclingApplicationProvider.java (.../CustomTousseRecyclingApplicationProvider.java) (revision 17726) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/dataProvider/application/CustomTousseRecyclingApplicationProvider.java (.../CustomTousseRecyclingApplicationProvider.java) (revision 26269) @@ -2,10 +2,11 @@ import net.sf.json.JSONArray; import net.sf.json.JSONObject; -import org.testng.annotations.DataProvider; import test.forgon.disinfectsystem.constants.CustomTousseConstant; import test.forgon.disinfectsystem.dataProvider.tousseDefinition.MaterialDataProvider; +import com.tngtech.java.junit.dataprovider.DataProvider; + /** * @author zhonghaowen * @apiNote 自定义器械包数据驱动 @@ -15,7 +16,7 @@ - @DataProvider(name = "customTousseTreeDataProvider") + @DataProvider("customTousseTreeDataProvider") public static Object[][] customTousseTreeDataProvider() { JSONObject material1 = MaterialDataProvider.createCustomMaterial(CustomTousseConstant.Test镊子, 5); JSONObject material2 = MaterialDataProvider.createCustomMaterial(CustomTousseConstant.Test钳子, 2); Index: ssts-web/src/test/java/test/forgon/disinfectsystem/goodsstock/service/GoodsStockManagerTests.java =================================================================== diff -u -r26085 -r26269 --- ssts-web/src/test/java/test/forgon/disinfectsystem/goodsstock/service/GoodsStockManagerTests.java (.../GoodsStockManagerTests.java) (revision 26085) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/goodsstock/service/GoodsStockManagerTests.java (.../GoodsStockManagerTests.java) (revision 26269) @@ -1,17 +1,16 @@ package test.forgon.disinfectsystem.goodsstock.service; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; - import java.util.ArrayList; import java.util.List; import org.hibernate.exception.GenericJDBCException; +import org.junit.Test; import org.springframework.dao.CannotAcquireLockException; import org.springframework.orm.hibernate4.HibernateJdbcException; import org.springframework.orm.hibernate4.HibernateSystemException; -import org.springframework.test.annotation.Rollback; -import org.junit.Test; import test.forgon.constant.Constants; import test.forgon.disinfectsystem.AbstractCSSDTest; @@ -29,7 +28,6 @@ * @throws Exception */ @Test - @Rollback(false) public void testSaveOrUpdateGoodsStockForOut() throws Exception{ prepareOut(); @@ -144,7 +142,6 @@ * @throws Exception */ @Test - @Rollback(false) public void testSaveOrUpdateGoodsStockForIn() throws Exception{ prepareIn(); int threadCount = 90;//线程数量 Index: ssts-web/src/test/java/test/forgon/disinfectsystem/packing/controller/PackingReviewControllerTests.java =================================================================== diff -u -r26085 -r26269 --- ssts-web/src/test/java/test/forgon/disinfectsystem/packing/controller/PackingReviewControllerTests.java (.../PackingReviewControllerTests.java) (revision 26085) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/packing/controller/PackingReviewControllerTests.java (.../PackingReviewControllerTests.java) (revision 26269) @@ -16,7 +16,7 @@ import org.springframework.test.web.servlet.ResultActions; import org.springframework.test.web.servlet.setup.DefaultMockMvcBuilder; import org.springframework.test.web.servlet.setup.MockMvcBuilders; -import org.testng.annotations.BeforeClass; +import org.junit.Before; import org.junit.Test; import test.forgon.disinfectsystem.AbstractCSSDTest; @@ -34,7 +34,7 @@ private MockMvc mockMvc; - @BeforeClass + @Before public void setUp() throws Exception { DefaultMockMvcBuilder builder = MockMvcBuilders.webAppContextSetup(webApplicationContext); mockMvc = builder.build(); Index: ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/ContainerStatusTests.java =================================================================== diff -u -r26085 -r26269 --- ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/ContainerStatusTests.java (.../ContainerStatusTests.java) (revision 26085) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/ContainerStatusTests.java (.../ContainerStatusTests.java) (revision 26269) @@ -14,8 +14,8 @@ import net.sf.json.JSONObject; import org.springframework.beans.factory.annotation.Autowired; -import org.testng.annotations.AfterMethod; -import org.testng.annotations.BeforeMethod; +import org.junit.After; +import org.junit.Before; import org.junit.Test; import test.forgon.constant.Constants; @@ -62,14 +62,14 @@ /** * 在测试用例运行前运行,每一个测试方法运行前都运行一次。记住篮筐状态,测试用例运行结束后还原状态 */ - @BeforeMethod + @Before public void setUp() { containerOriginalStatus = getContainerStatus(Constants.Barcode.CLASSIFY_BASKET_1); } /** * 还原清洗篮筐的原始状态。每一个测试方法运行后都运行一次 */ - @AfterMethod + @After public void tearDown() { runWithTransNewManager.runWith_TRANS_NEW(new RunWithTransNewTask() { @Override Index: ssts-web/src/test/java/test/forgon/disinfectsystem/goodFilterConfig/GoodFilterConfigTest.java =================================================================== diff -u -r26151 -r26269 --- ssts-web/src/test/java/test/forgon/disinfectsystem/goodFilterConfig/GoodFilterConfigTest.java (.../GoodFilterConfigTest.java) (revision 26151) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/goodFilterConfig/GoodFilterConfigTest.java (.../GoodFilterConfigTest.java) (revision 26269) @@ -16,7 +16,7 @@ import org.apache.commons.collections4.CollectionUtils; import org.junit.Test; import org.springframework.orm.hibernate4.HibernateTemplate; -import org.testng.annotations.BeforeClass; +import org.junit.Before; import test.forgon.constant.Constants; import test.forgon.disinfectsystem.AbstractCSSDTest; @@ -54,7 +54,7 @@ private GoodFilterConfigManager goodFilterConfigManagerImpl; - @BeforeClass + @Before public void setUp() { initCSSDData(); makeActiveUser("admin"); Index: ssts-web/src/test/java/test/forgon/disinfectsystem/reports/TestDepartmentMonthDetail.java =================================================================== diff -u -r26085 -r26269 --- ssts-web/src/test/java/test/forgon/disinfectsystem/reports/TestDepartmentMonthDetail.java (.../TestDepartmentMonthDetail.java) (revision 26085) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/reports/TestDepartmentMonthDetail.java (.../TestDepartmentMonthDetail.java) (revision 26269) @@ -2,7 +2,7 @@ * 测试明细核算报表 */ package test.forgon.disinfectsystem.reports; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; import java.math.BigDecimal; import java.text.SimpleDateFormat; @@ -17,9 +17,8 @@ import net.sf.json.JSONObject; import org.apache.commons.collections4.CollectionUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.test.annotation.Rollback; import org.junit.Test; +import org.springframework.beans.factory.annotation.Autowired; import test.forgon.constant.Constants; import test.forgon.disinfectsystem.AbstractCSSDTest; @@ -100,7 +99,6 @@ */ @SuppressWarnings("unchecked") @Test - @Rollback(value=false) public void test() { // 准备初始数据 initCSSDData(); Index: ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/DeleteRecyclingRecordItemTests.java =================================================================== diff -u -r26085 -r26269 --- ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/DeleteRecyclingRecordItemTests.java (.../DeleteRecyclingRecordItemTests.java) (revision 26085) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/DeleteRecyclingRecordItemTests.java (.../DeleteRecyclingRecordItemTests.java) (revision 26269) @@ -1,9 +1,9 @@ package test.forgon.disinfectsystem.recyclingrecord.service; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; - - - import java.util.HashMap; import java.util.List; import java.util.Map; @@ -12,9 +12,8 @@ import net.sf.json.JSONArray; import net.sf.json.JSONObject; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.test.annotation.Rollback; import org.junit.Test; +import org.springframework.beans.factory.annotation.Autowired; import test.forgon.disinfectsystem.AbstractCSSDTest; @@ -246,7 +245,6 @@ * 删除回收已装配的器械包 */ @Test - @Rollback(true) public void testDeleteRecylingItemAfterPacking(){ prepareData(); //Test开胸包 -5;Test开颅包 -5;Test开口包 -2;Test穿刺包 -2 Index: ssts-web/src/test/java/test/forgon/disinfectsystem/material/service/MaterialEntryManagerTests.java =================================================================== diff -u -r26085 -r26269 --- ssts-web/src/test/java/test/forgon/disinfectsystem/material/service/MaterialEntryManagerTests.java (.../MaterialEntryManagerTests.java) (revision 26085) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/material/service/MaterialEntryManagerTests.java (.../MaterialEntryManagerTests.java) (revision 26269) @@ -1,9 +1,9 @@ package test.forgon.disinfectsystem.material.service; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; - - import java.util.ArrayList; import java.util.Collection; import java.util.Date; @@ -18,9 +18,8 @@ import org.apache.commons.beanutils.BeanUtilsBean2; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.Predicate; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.test.annotation.Rollback; import org.junit.Test; +import org.springframework.beans.factory.annotation.Autowired; import test.forgon.constant.Constants; import test.forgon.disinfectsystem.AbstractCSSDTest; @@ -336,7 +335,6 @@ * @throws Exception */ @Test - @Rollback(value=false) public void testSaveInventoryRecords() throws Exception{ prepare(); //2.添加材料 @@ -363,7 +361,6 @@ * @throws Exception */ @Test - @Rollback(value=false) public void testSaveInventoryRecord() throws Exception{ prepare(); //2.添加材料 @@ -510,7 +507,6 @@ * @throws Exception */ @Test - @Rollback(value=false) public void testSaveMaterialEntry() throws Exception{ prepare(); //3.准备材料 @@ -538,7 +534,6 @@ * @throws Exception */ @Test - @Rollback(value=false) public void testSaveAppropriate() throws Exception{ prepare(); //3.准备材料 Index: ssts-web/src/test/java/test/forgon/disinfectsystem/useRecord/UseRecordManagerTests.java =================================================================== diff -u -r26160 -r26269 --- ssts-web/src/test/java/test/forgon/disinfectsystem/useRecord/UseRecordManagerTests.java (.../UseRecordManagerTests.java) (revision 26160) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/useRecord/UseRecordManagerTests.java (.../UseRecordManagerTests.java) (revision 26269) @@ -8,12 +8,11 @@ import org.apache.commons.beanutils.BeanUtils; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang.StringUtils; +import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.orm.hibernate4.HibernateTemplate; -import org.springframework.test.annotation.Rollback; import org.testng.Assert; import org.testng.AssertJUnit; -import org.junit.Test; import test.forgon.constant.Constants; import test.forgon.disinfectsystem.AbstractCSSDTest; @@ -417,7 +416,6 @@ * 7.备注的格式 (config.js配置) */ @Test - @Rollback(false) public void testUseRecordConvertRecyclingApplicationScene1(){ //场景1:器械包全部都要发货、使用记录转换的申请单要发货、合单、一次性物品要转换、一次性物品要与器械包合并转换、转换申请单不合并 @@ -799,7 +797,6 @@ * 场景2 */ @Test - @Rollback(false) public void testUseRecordConvertRecyclingApplicationScene2(){ //场景2:器械包全部都要发货、使用记录转换的申请单要发货、合单、一次性物品要转换、一次性物品要与器械包合并转换、转换申请单按手术间合并 @@ -810,7 +807,6 @@ * 场景3 */ @Test - @Rollback(false) public void testUseRecordConvertRecyclingApplicationScene3(){ //场景4:器械包全部都要发货、使用记录转换的申请单要发货、合单、一次性物品要转换、一次性物品不要与器械包合并转换、转换申请单不合并 initUseRecordConvertRecyclingApplication(yes , yes , applicationFormTypeMerge,yes,no,convertMergeRegularNone); @@ -820,7 +816,6 @@ * 场景4 */ @Test - @Rollback(false) public void testUseRecordConvertRecyclingApplicationScene4(){ //场景5:器械包全部都要发货、使用记录转换的申请单要发货、合单、一次性物品要转换、一次性物品不要与器械包合并转换、转换申请单按手术间合并 initUseRecordConvertRecyclingApplication(yes , yes , applicationFormTypeMerge,yes,no,convertMergeRegularOperationRoom); @@ -829,7 +824,6 @@ * 场景5 */ @Test - @Rollback(false) public void testUseRecordConvertRecyclingApplicationScene5(){ //场景7:器械包全部都要发货、使用记录转换的申请单要发货、合单、一次性物品不转换、一次性物品与器械包合并转换无所谓、转换申请单不合并 initUseRecordConvertRecyclingApplication(yes , yes , applicationFormTypeMerge,no,null,convertMergeRegularNone); @@ -838,7 +832,6 @@ * 场景6 */ @Test - @Rollback(false) public void testUseRecordConvertRecyclingApplicationScene6(){ //场景8:器械包全部都要发货、使用记录转换的申请单要发货、合单、一次性物品不转换、一次性物品要与器械包合并转换、转换申请单按手术间合并 initUseRecordConvertRecyclingApplication(yes , yes , applicationFormTypeMerge,no,null,convertMergeRegularOperationRoom); @@ -847,7 +840,6 @@ * 场景7 */ /*@Test - @Rollback(false) public void testUseRecordConvertRecyclingApplicationScene7(){ //场景12:器械包全部都要发货、使用记录转换的申请单要发货、分单、一次性物品要转换、一次性物品要与器械包合并转换、转换申请单按科室合并 initUseRecordConvertRecyclingApplication(yes , yes , applicationFormTypeSplit,yes,yes,convertMergeRegularDepart); @@ -856,7 +848,6 @@ * 场景8 */ @Test - @Rollback(false) public void testUseRecordConvertRecyclingApplicationScene8(){ //场景13:器械包全部都要发货、使用记录转换的申请单要发货、分单、一次性物品要转换、一次性物品不要与器械包合并转换、转换申请单不合并 initUseRecordConvertRecyclingApplication(yes , yes , applicationFormTypeSplit,yes,no,convertMergeRegularNone); @@ -865,7 +856,6 @@ * 场景9 */ @Test - @Rollback(false) public void testUseRecordConvertRecyclingApplicationScene9(){ //场景14:器械包全部都要发货、使用记录转换的申请单要发货、分单、一次性物品要转换、一次性物品不要与器械包合并转换、转换申请单按手术间合并 initUseRecordConvertRecyclingApplication(yes , yes , applicationFormTypeSplit,yes,no,convertMergeRegularOperationRoom); @@ -874,7 +864,6 @@ * 场景10 */ @Test - @Rollback(false) public void testUseRecordConvertRecyclingApplicationScene10(){ //场景16:器械包全部都要发货、使用记录转换的申请单要发货、分单、一次性物品不转换、一次性物品与器械包合并转换无所谓、转换申请单不合并 initUseRecordConvertRecyclingApplication(yes , yes , applicationFormTypeSplit,no,null,convertMergeRegularNone); @@ -883,7 +872,6 @@ * 场景11 */ @Test - @Rollback(false) public void testUseRecordConvertRecyclingApplicationScene11(){ //场景17:器械包全部都要发货、使用记录转换的申请单要发货、分单、一次性物品不转换、一次性物品要与器械包合并转换、转换申请单按手术间合并 initUseRecordConvertRecyclingApplication(yes , yes , applicationFormTypeSplit,no,null,convertMergeRegularOperationRoom); @@ -892,7 +880,6 @@ * 场景12 */ @Test - @Rollback(false) public void testUseRecordConvertRecyclingApplicationScene12(){ //场景19:器械包全部都要发货、使用记录转换的申请单不要发货、合单、一次性物品要转换、一次性物品要与器械包合并转换、转换申请单不合并 initUseRecordConvertRecyclingApplication(yes , no , applicationFormTypeMerge,yes,yes,convertMergeRegularNone); @@ -901,7 +888,6 @@ * 场景13 */ @Test - @Rollback(false) public void testUseRecordConvertRecyclingApplicationScene13(){ //场景20:器械包全部都要发货、使用记录转换的申请单要发货、合单、一次性物品要转换、一次性物品要与器械包合并转换、转换申请单按手术间合并 initUseRecordConvertRecyclingApplication(yes , no , applicationFormTypeMerge,yes,yes,convertMergeRegularOperationRoom); @@ -910,7 +896,6 @@ * 场景14 */ @Test - @Rollback(false) public void testUseRecordConvertRecyclingApplicationScene14(){ //场景22:器械包全部都要发货、使用记录转换的申请单要发货、合单、一次性物品要转换、一次性物品不要与器械包合并转换、转换申请单不合并 initUseRecordConvertRecyclingApplication(yes , no , applicationFormTypeMerge,yes,no,convertMergeRegularNone); @@ -919,7 +904,6 @@ * 场景15 */ @Test - @Rollback(false) public void testUseRecordConvertRecyclingApplicationScene15(){ //场景23:器械包全部都要发货、使用记录转换的申请单要发货、合单、一次性物品要转换、一次性物品不要与器械包合并转换、转换申请单按手术间合并 initUseRecordConvertRecyclingApplication(yes , no , applicationFormTypeMerge,yes,no,convertMergeRegularOperationRoom); @@ -928,7 +912,6 @@ * 场景16 */ @Test - @Rollback(false) public void testUseRecordConvertRecyclingApplicationScene16(){ //场景25:器械包全部都要发货、使用记录转换的申请单要发货、合单、一次性物品不转换、一次性物品与器械包合并转换无所谓、转换申请单不合并 initUseRecordConvertRecyclingApplication(yes , no , applicationFormTypeMerge,no,null,convertMergeRegularNone); @@ -937,7 +920,6 @@ * 场景17 */ @Test - @Rollback(false) public void testUseRecordConvertRecyclingApplicationScene17(){ //场景26:器械包全部都要发货、使用记录转换的申请单要发货、合单、一次性物品不转换、一次性物品要与器械包合并转换、转换申请单按手术间合并 initUseRecordConvertRecyclingApplication(yes , no , applicationFormTypeMerge,no,null,convertMergeRegularOperationRoom); @@ -946,15 +928,13 @@ * 场景18 */ /*@Test - @Rollback(false) public void testUseRecordConvertRecyclingApplicationScene18(){ //场景30:器械包全部都要发货、使用记录转换的申请单要发货、分单、一次性物品要转换、一次性物品要与器械包合并转换、转换申请单按科室合并 initUseRecordConvertRecyclingApplication(yes , no , applicationFormTypeSplit,yes,yes,convertMergeRegularDepart); }*/ /** * 场景19 */ @Test - @Rollback(false) public void testUseRecordConvertRecyclingApplicationScene19(){ //场景31:器械包全部都要发货、使用记录转换的申请单不要发货、分单、一次性物品要转换、一次性物品不要与器械包合并转换、转换申请单不合并 initUseRecordConvertRecyclingApplication(yes , no , applicationFormTypeSplit,yes,no,convertMergeRegularNone); @@ -963,7 +943,6 @@ * 场景20 */ @Test - @Rollback(false) public void testUseRecordConvertRecyclingApplicationScene20(){ //场景32:器械包全部都要发货、使用记录转换的申请单不要发货、分单、一次性物品要转换、一次性物品不要与器械包合并转换、转换申请单按手术间合并 initUseRecordConvertRecyclingApplication(yes , no , applicationFormTypeSplit,yes,no,convertMergeRegularOperationRoom); @@ -972,15 +951,13 @@ * 场景21 */ @Test - @Rollback(false) public void testUseRecordConvertRecyclingApplicationScene21(){ //场景34:器械包全部都要发货、使用记录转换的申请单要发货、分单、一次性物品不转换、一次性物品与器械包合并转换无所谓、转换申请单不合并 initUseRecordConvertRecyclingApplication(yes , no , applicationFormTypeSplit,no,null,convertMergeRegularNone); } /** * 场景22 */ @Test - @Rollback(false) public void testUseRecordConvertRecyclingApplicationScene22(){ //场景35:器械包全部都要发货、使用记录转换的申请单要发货、分单、一次性物品不转换、一次性物品要与器械包合并转换、转换申请单按手术间合并 initUseRecordConvertRecyclingApplication(yes , no , applicationFormTypeSplit,no,null,convertMergeRegularOperationRoom); @@ -989,7 +966,6 @@ * 场景23 */ @Test - @Rollback(false) public void testUseRecordConvertRecyclingApplicationScene23(){ //场景37:使用记录的器械包:部分要发货、使用记录转换的申请单要发货、合单、一次性物品要转换、一次性物品要与器械包合并转换、转换申请单不合并 initUseRecordConvertRecyclingApplication(part , yes , applicationFormTypeMerge,yes,yes,convertMergeRegularNone); @@ -998,7 +974,6 @@ * 场景24 */ @Test - @Rollback(false) public void testUseRecordConvertRecyclingApplicationScene24(){ //场景38:使用记录的器械包:部分要发货、使用记录转换的申请单要发货、合单、一次性物品要转换、一次性物品要与器械包合并转换、转换申请单按手术间合并 initUseRecordConvertRecyclingApplication(part , yes , applicationFormTypeMerge,yes,yes,convertMergeRegularOperationRoom); @@ -1007,15 +982,13 @@ * 场景25 */ @Test - @Rollback(false) public void testUseRecordConvertRecyclingApplicationScene25(){ //场景40:使用记录的器械包:部分要发货、使用记录转换的申请单要发货、合单、一次性物品要转换、一次性物品不要与器械包合并转换、转换申请单不合并 initUseRecordConvertRecyclingApplication(part , yes , applicationFormTypeMerge,yes,no,convertMergeRegularNone); } /** * 场景26 */ @Test - @Rollback(false) public void testUseRecordConvertRecyclingApplicationScene26(){ //场景41:使用记录的器械包:部分要发货、使用记录转换的申请单要发货、合单、一次性物品要转换、一次性物品不要与器械包合并转换、转换申请单按手术间合并 initUseRecordConvertRecyclingApplication(part , yes , applicationFormTypeMerge, yes,no,convertMergeRegularOperationRoom); @@ -1024,7 +997,6 @@ * 场景27 */ @Test - @Rollback(false) public void testUseRecordConvertRecyclingApplicationScene27(){ //场景43:使用记录的器械包:部分要发货、使用记录转换的申请单要发货、合单、一次性物品不转换、一次性物品与器械包合并转换无所谓、转换申请单不合并 initUseRecordConvertRecyclingApplication(part , yes , applicationFormTypeMerge,no,null,convertMergeRegularNone); @@ -1033,7 +1005,6 @@ * 场景28 */ @Test - @Rollback(false) public void testUseRecordConvertRecyclingApplicationScene28(){ //场景44:使用记录的器械包:部分要发货、使用记录转换的申请单要发货、合单、一次性物品不转换、一次性物品要与器械包合并转换、转换申请单按手术间合并 initUseRecordConvertRecyclingApplication(part , yes , applicationFormTypeMerge, no,null,convertMergeRegularOperationRoom); @@ -1042,15 +1013,13 @@ * 场景29 */ @Test - @Rollback(false) public void testUseRecordConvertRecyclingApplicationScene29(){ //场景49:使用记录的器械包:部分要发货、使用记录转换的申请单要发货、分单、一次性物品要转换、一次性物品不要与器械包合并转换、转换申请单不合并 initUseRecordConvertRecyclingApplication(part , yes , applicationFormTypeSplit,yes,no,convertMergeRegularNone); } /** * 场景30 */ @Test - @Rollback(false) public void testUseRecordConvertRecyclingApplicationScene30(){ //场景50:使用记录的器械包:部分要发货、使用记录转换的申请单要发货、分单、一次性物品要转换、一次性物品不要与器械包合并转换、转换申请单按手术间合并 initUseRecordConvertRecyclingApplication(part , yes , applicationFormTypeSplit, yes,no,convertMergeRegularOperationRoom); @@ -1059,7 +1028,6 @@ * 场景31 */ @Test - @Rollback(false) public void testUseRecordConvertRecyclingApplicationScene31(){ //场景52:使用记录的器械包:部分要发货、使用记录转换的申请单要发货、分单、一次性物品不转换、一次性物品与器械包合并转换无所谓、转换申请单不合并 initUseRecordConvertRecyclingApplication(part , yes , applicationFormTypeSplit,no,null,convertMergeRegularNone); @@ -1069,7 +1037,6 @@ * 场景32 */ @Test - @Rollback(false) public void testUseRecordConvertRecyclingApplicationScene32(){ //场景53:使用记录的器械包:部分要发货、使用记录转换的申请单要发货、分单、一次性物品不转换、一次性物品要与器械包合并转换、转换申请单按手术间合并 initUseRecordConvertRecyclingApplication(part , yes , applicationFormTypeSplit, no,null,convertMergeRegularOperationRoom); @@ -1079,7 +1046,6 @@ * 场景33 */ @Test - @Rollback(false) public void testUseRecordConvertRecyclingApplicationScene33(){ //场景55:使用记录的器械包:部分要发货、使用记录转换的申请单不要发货、合单、一次性物品要转换、一次性物品要与器械包合并转换、转换申请单不合并 initUseRecordConvertRecyclingApplication(part , no , applicationFormTypeMerge,yes,yes,convertMergeRegularNone); @@ -1089,7 +1055,6 @@ * 场景34 */ @Test - @Rollback(false) public void testUseRecordConvertRecyclingApplicationScene34(){ //场景56:使用记录的器械包:部分要发货、使用记录转换的申请单要发货、合单、一次性物品要转换、一次性物品要与器械包合并转换、转换申请单按手术间合并 initUseRecordConvertRecyclingApplication(part , no , applicationFormTypeMerge,yes,yes,convertMergeRegularOperationRoom); @@ -1099,7 +1064,6 @@ * 场景35 */ @Test - @Rollback(false) public void testUseRecordConvertRecyclingApplicationScene35(){ //场景58:使用记录的器械包:部分要发货、使用记录转换的申请单要发货、合单、一次性物品要转换、一次性物品不要与器械包合并转换、转换申请单不合并 initUseRecordConvertRecyclingApplication(part , no , applicationFormTypeMerge,yes,no,convertMergeRegularNone); @@ -1109,7 +1073,6 @@ * 场景36 */ @Test - @Rollback(false) public void testUseRecordConvertRecyclingApplicationScene36(){ //场景59:使用记录的器械包:部分要发货、使用记录转换的申请单要发货、合单、一次性物品要转换、一次性物品不要与器械包合并转换、转换申请单按手术间合并 initUseRecordConvertRecyclingApplication(part , no , applicationFormTypeMerge,yes,no,convertMergeRegularOperationRoom); @@ -1119,7 +1082,6 @@ * 场景37 */ @Test - @Rollback(false) public void testUseRecordConvertRecyclingApplicationScene37(){ //场景61:使用记录的器械包:部分要发货、使用记录转换的申请单要发货、合单、一次性物品不转换、一次性物品与器械包合并转换无所谓、转换申请单不合并 initUseRecordConvertRecyclingApplication(part , no , applicationFormTypeMerge,no,null,convertMergeRegularNone); @@ -1129,7 +1091,6 @@ * 场景38 */ @Test - @Rollback(false) public void testUseRecordConvertRecyclingApplicationScene38(){ //场景62:使用记录的器械包:部分要发货、使用记录转换的申请单要发货、合单、一次性物品不转换、一次性物品要与器械包合并转换、转换申请单按手术间合并 initUseRecordConvertRecyclingApplication(part , no , applicationFormTypeMerge,no,null,convertMergeRegularOperationRoom); @@ -1139,7 +1100,6 @@ * 场景39 */ @Test - @Rollback(false) public void testUseRecordConvertRecyclingApplicationScene39(){ //场景67:使用记录的器械包:部分要发货、使用记录转换的申请单要发货、分单、一次性物品要转换、一次性物品不要与器械包合并转换、转换申请单不合并 initUseRecordConvertRecyclingApplication(part , no , applicationFormTypeSplit,yes,no,convertMergeRegularNone); @@ -1149,7 +1109,6 @@ * 场景40 */ @Test - @Rollback(false) public void testUseRecordConvertRecyclingApplicationScene40(){ //场景68:使用记录的器械包:部分要发货、使用记录转换的申请单要发货、分单、一次性物品要转换、一次性物品不要与器械包合并转换、转换申请单按手术间合并 initUseRecordConvertRecyclingApplication(part , no , applicationFormTypeSplit,yes,no,convertMergeRegularOperationRoom); @@ -1159,7 +1118,6 @@ * 场景41 */ @Test - @Rollback(false) public void testUseRecordConvertRecyclingApplicationScene41(){ //场景70:使用记录的器械包:部分要发货、使用记录转换的申请单要发货、分单、一次性物品不转换、一次性物品与器械包合并转换无所谓、转换申请单不合并 initUseRecordConvertRecyclingApplication(part , no , applicationFormTypeSplit,no,null,convertMergeRegularNone); @@ -1169,7 +1127,6 @@ * 场景42 */ @Test - @Rollback(false) public void testUseRecordConvertRecyclingApplicationScene42(){ //场景71:使用记录的器械包:部分要发货、使用记录转换的申请单要发货、分单、一次性物品不转换、一次性物品要与器械包合并转换、转换申请单按手术间合并 initUseRecordConvertRecyclingApplication(part , no , applicationFormTypeSplit,no,null,convertMergeRegularOperationRoom); @@ -1179,7 +1136,6 @@ * 场景43 */ @Test - @Rollback(false) public void testUseRecordConvertRecyclingApplicationScene43(){ //场景73:器械包全部都不要发货、使用记录转换的申请单要发货、合单、一次性物品要转换、一次性物品要与器械包合并转换、转换申请单不合并 initUseRecordConvertRecyclingApplication(no , yes , applicationFormTypeMerge,yes,yes,convertMergeRegularNone); @@ -1189,7 +1145,6 @@ * 场景44 */ @Test - @Rollback(false) public void testUseRecordConvertRecyclingApplicationScene44(){ //场景74:器械包全部都不要发货、使用记录转换的申请单要发货、合单、一次性物品要转换、一次性物品要与器械包合并转换、转换申请单按手术间合并 initUseRecordConvertRecyclingApplication(no , yes , applicationFormTypeMerge,yes,yes,convertMergeRegularOperationRoom); @@ -1199,7 +1154,6 @@ * 场景45 */ @Test - @Rollback(false) public void testUseRecordConvertRecyclingApplicationScene45(){ //场景76:器械包全部都不要发货、使用记录转换的申请单要发货、合单、一次性物品要转换、一次性物品不要与器械包合并转换、转换申请单不合并 initUseRecordConvertRecyclingApplication(no , yes , applicationFormTypeMerge,yes,no,convertMergeRegularNone); @@ -1209,7 +1163,6 @@ * 场景46 */ @Test - @Rollback(false) public void testUseRecordConvertRecyclingApplicationScene46(){ //场景77:器械包全部都不要发货、使用记录转换的申请单要发货、合单、一次性物品要转换、一次性物品不要与器械包合并转换、转换申请单按手术间合并 initUseRecordConvertRecyclingApplication(no , yes , applicationFormTypeMerge,yes,no,convertMergeRegularOperationRoom); @@ -1219,7 +1172,6 @@ * 场景47 */ @Test - @Rollback(false) public void testUseRecordConvertRecyclingApplicationScene47(){ //场景79:器械包全部都不要发货、使用记录转换的申请单要发货、合单、一次性物品不转换、一次性物品与器械包合并转换无所谓、转换申请单不合并 initUseRecordConvertRecyclingApplication(no , yes , applicationFormTypeMerge,no,null,convertMergeRegularNone); @@ -1229,7 +1181,6 @@ * 场景48 */ @Test - @Rollback(false) public void testUseRecordConvertRecyclingApplicationScene48(){ //场景80:器械包全部都不要发货、使用记录转换的申请单要发货、合单、一次性物品不转换、一次性物品要与器械包合并转换、转换申请单按手术间合并 initUseRecordConvertRecyclingApplication(no , yes , applicationFormTypeMerge,no,null,convertMergeRegularOperationRoom); @@ -1239,7 +1190,6 @@ * 场景49 */ @Test - @Rollback(false) public void testUseRecordConvertRecyclingApplicationScene49(){ //场景85:器械包全部都不要发货、使用记录转换的申请单要发货、分单、一次性物品要转换、一次性物品不要与器械包合并转换、转换申请单不合并 initUseRecordConvertRecyclingApplication(no , yes , applicationFormTypeSplit,yes,no,convertMergeRegularNone); @@ -1249,7 +1199,6 @@ * 场景50 */ @Test - @Rollback(false) public void testUseRecordConvertRecyclingApplicationScene50(){ //场景86:器械包全部都不要发货、使用记录转换的申请单要发货、分单、一次性物品要转换、一次性物品不要与器械包合并转换、转换申请单按手术间合并 initUseRecordConvertRecyclingApplication(no , yes , applicationFormTypeSplit,yes,no,convertMergeRegularOperationRoom); @@ -1259,7 +1208,6 @@ * 场景51 */ @Test - @Rollback(false) public void testUseRecordConvertRecyclingApplicationScene51(){ //场景88:器械包全部都不要发货、使用记录转换的申请单要发货、分单、一次性物品不转换、一次性物品与器械包合并转换无所谓、转换申请单不合并 initUseRecordConvertRecyclingApplication(no , yes , applicationFormTypeSplit,no,null,convertMergeRegularNone); @@ -1269,7 +1217,6 @@ * 场景52 */ @Test - @Rollback(false) public void testUseRecordConvertRecyclingApplicationScene52(){ //场景89:器械包全部都不要发货、使用记录转换的申请单要发货、分单、一次性物品不转换、一次性物品要与器械包合并转换、转换申请单按手术间合并 initUseRecordConvertRecyclingApplication(no , yes , applicationFormTypeSplit,no,null,convertMergeRegularOperationRoom); @@ -1279,7 +1226,6 @@ * 场景53 */ @Test - @Rollback(false) public void testUseRecordConvertRecyclingApplicationScene53(){ //场景91:器械包全部都不要发货、使用记录转换的申请单不要发货、合单、一次性物品要转换、一次性物品要与器械包合并转换、转换申请单不合并 initUseRecordConvertRecyclingApplication(no , no , applicationFormTypeMerge,yes,yes,convertMergeRegularNone); @@ -1289,7 +1235,6 @@ * 场景54 */ @Test - @Rollback(false) public void testUseRecordConvertRecyclingApplicationScene54(){ //场景92:器械包全部都不要发货、使用记录转换的申请单要发货、合单、一次性物品要转换、一次性物品要与器械包合并转换、转换申请单按手术间合并 initUseRecordConvertRecyclingApplication(no , no , applicationFormTypeMerge,yes,yes,convertMergeRegularOperationRoom); @@ -1299,7 +1244,6 @@ * 场景55 */ @Test - @Rollback(false) public void testUseRecordConvertRecyclingApplicationScene55(){ //场景94:器械包全部都不要发货、使用记录转换的申请单要发货、合单、一次性物品要转换、一次性物品不要与器械包合并转换、转换申请单不合并 initUseRecordConvertRecyclingApplication(no , no , applicationFormTypeMerge,yes,no,convertMergeRegularNone); @@ -1309,7 +1253,6 @@ * 场景56 */ @Test - @Rollback(false) public void testUseRecordConvertRecyclingApplicationScene56(){ //场景95:器械包全部都不要发货、使用记录转换的申请单要发货、合单、一次性物品要转换、一次性物品不要与器械包合并转换、转换申请单按手术间合并 initUseRecordConvertRecyclingApplication(no , no , applicationFormTypeMerge,yes,no,convertMergeRegularOperationRoom); @@ -1319,7 +1262,6 @@ * 场景57 */ @Test - @Rollback(false) public void testUseRecordConvertRecyclingApplicationScene57(){ //场景97:器械包全部都不要发货、使用记录转换的申请单要发货、合单、一次性物品不转换、一次性物品与器械包合并转换无所谓、转换申请单不合并 initUseRecordConvertRecyclingApplication(no , no , applicationFormTypeMerge,no,null,convertMergeRegularNone); @@ -1329,7 +1271,6 @@ * 场景58 */ @Test - @Rollback(false) public void testUseRecordConvertRecyclingApplicationScene58(){ //场景98:器械包全部都不要发货、使用记录转换的申请单要发货、合单、一次性物品不转换、一次性物品要与器械包合并转换、转换申请单按手术间合并 initUseRecordConvertRecyclingApplication(no , no , applicationFormTypeMerge,no,null,convertMergeRegularOperationRoom); @@ -1339,7 +1280,6 @@ * 场景59 */ @Test - @Rollback(false) public void testUseRecordConvertRecyclingApplicationScene59(){ //场景103:器械包全部都不要发货、使用记录转换的申请单要发货、分单、一次性物品要转换、一次性物品不要与器械包合并转换、转换申请单不合并 initUseRecordConvertRecyclingApplication(no , no , applicationFormTypeSplit,yes,no,convertMergeRegularNone); @@ -1349,7 +1289,6 @@ * 场景60 */ @Test - @Rollback(false) public void testUseRecordConvertRecyclingApplicationScene60(){ //场景104:器械包全部都不要发货、使用记录转换的申请单要发货、分单、一次性物品要转换、一次性物品不要与器械包合并转换、转换申请单按手术间合并 initUseRecordConvertRecyclingApplication(no , no , applicationFormTypeSplit,yes,no,convertMergeRegularOperationRoom); @@ -1359,7 +1298,6 @@ * 场景61 */ @Test - @Rollback(false) public void testUseRecordConvertRecyclingApplicationScene61(){ //场景106:器械包全部都不要发货、使用记录转换的申请单要发货、分单、一次性物品不转换、一次性物品与器械包合并转换无所谓、转换申请单不合并 initUseRecordConvertRecyclingApplication(no , no , applicationFormTypeSplit,no,null,convertMergeRegularNone); @@ -1369,7 +1307,6 @@ * 场景62 */ @Test - @Rollback(false) public void testUseRecordConvertRecyclingApplicationScene62(){ //场景107:器械包全部都不要发货、使用记录转换的申请单要发货、分单、一次性物品不转换、一次性物品要与器械包合并转换、转换申请单按手术间合并 initUseRecordConvertRecyclingApplication(no , no , applicationFormTypeSplit,no,null,convertMergeRegularOperationRoom); @@ -1379,7 +1316,6 @@ * 场景63 */ @Test - @Rollback(false) public void testUseRecordConvertRecyclingApplicationScene63(){ //场景107:器械包全部都要发货、使用记录转换的申请单要发货、分单、一次性物品转换、一次性物品要与器械包不合并转换、转换申请单按科科室进行合并 initUseRecordConvertRecyclingApplication(yes , yes , applicationFormTypeSplit,yes,null,convertMergeRegularDepart); @@ -1389,7 +1325,6 @@ * 场景64 */ @Test - @Rollback(false) public void testUseRecordConvertRecyclingApplicationScene64(){ //场景107:器械包全部都要发货、使用记录转换的申请单要发货、合单、一次性物品转换、一次性物品要与器械包不合并转换、转换申请单按科室进行合并 initUseRecordConvertRecyclingApplication(yes , yes , applicationFormTypeMerge,yes,null,convertMergeRegularDepart); Index: ssts-web/src/test/java/test/forgon/disinfectsystem/expensivegoods/service/ExpensiveGoodsTests.java =================================================================== diff -u -r26085 -r26269 --- ssts-web/src/test/java/test/forgon/disinfectsystem/expensivegoods/service/ExpensiveGoodsTests.java (.../ExpensiveGoodsTests.java) (revision 26085) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/expensivegoods/service/ExpensiveGoodsTests.java (.../ExpensiveGoodsTests.java) (revision 26269) @@ -7,8 +7,8 @@ import net.sf.json.JSONArray; import net.sf.json.JSONObject; -import org.testng.annotations.AfterClass; -import org.testng.annotations.BeforeClass; +import org.junit.After; +import org.junit.Before; import org.junit.Test; import com.forgon.disinfectsystem.entity.assestmanagement.ExpensiveGoods; @@ -21,9 +21,6 @@ import static org.testng.Assert.*; import test.forgon.disinfectsystem.AbstractCSSDTest; -import org.springframework.test.annotation.Rollback; - - public class ExpensiveGoodsTests extends AbstractCSSDTest { private Long registrationCertificationId_1 = null; @@ -47,8 +44,7 @@ * 添加一个高值耗材定义，用于测试高值耗材型号 * 添加2个高值耗材定义，用于测试删除高值耗材 */ - @BeforeClass - @Rollback(false) + @Before public void beforeClass(){ RegistrationCertification registrationCertification = null; @@ -153,8 +149,7 @@ /** * 删除开始创建的数据 */ - @AfterClass - @Rollback(false) + @After public void afterClass(){ objectDao.deleteAll(expensiveGoodsList); objectDao.deleteAll(expensiveGoodsSupplierList); Index: ssts-web/src/test/java/test/forgon/disinfectsystem/recall/TousseInstanceRecallTests.java =================================================================== diff -u -r26085 -r26269 --- ssts-web/src/test/java/test/forgon/disinfectsystem/recall/TousseInstanceRecallTests.java (.../TousseInstanceRecallTests.java) (revision 26085) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/recall/TousseInstanceRecallTests.java (.../TousseInstanceRecallTests.java) (revision 26269) @@ -1,5 +1,5 @@ package test.forgon.disinfectsystem.recall; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; import java.text.ParseException; import java.text.SimpleDateFormat; @@ -16,10 +16,9 @@ import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang.StringUtils; import org.hibernate.Session; +import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.test.annotation.Rollback; import org.testng.AssertJUnit; -import org.junit.Test; import test.forgon.constant.Constants; import test.forgon.disinfectsystem.AbstractCSSDTest; @@ -52,7 +51,6 @@ * 测试聚合包灭菌(无灭菌筐审核) */ @Test - @Rollback(value=false) public void testComboTousseInstanceRecall() { //初始化数据 initCSSDData(); Index: ssts-web/src/test/java/test/forgon/disinfectsystem/expensivegoods/service/ExpensiveGoodsGodownTest.java =================================================================== diff -u -r26085 -r26269 --- ssts-web/src/test/java/test/forgon/disinfectsystem/expensivegoods/service/ExpensiveGoodsGodownTest.java (.../ExpensiveGoodsGodownTest.java) (revision 26085) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/expensivegoods/service/ExpensiveGoodsGodownTest.java (.../ExpensiveGoodsGodownTest.java) (revision 26269) @@ -1,12 +1,29 @@ package test.forgon.disinfectsystem.expensivegoods.service; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertNotNull; +import static org.testng.Assert.assertTrue; + import java.util.ArrayList; import java.util.Collection; import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; +import net.sf.json.JSONObject; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.GrantedAuthority; +import org.springframework.security.core.authority.SimpleGrantedAuthority; +import org.springframework.security.core.context.SecurityContextHolder; + +import test.forgon.disinfectsystem.AbstractCSSDTest; + import com.forgon.directory.vo.LoginUserData; import com.forgon.disinfectsystem.entity.assestmanagement.ExpensiveGoods; import com.forgon.disinfectsystem.entity.assestmanagement.ExpensiveGoodsGodownEntry; @@ -27,23 +44,6 @@ import com.forgon.serialnumber.model.SerialNum; import com.forgon.tools.date.DateTools; -import freemarker.template.utility.DateUtil; -import static org.testng.Assert.*; -import net.sf.json.JSONObject; - -import org.testng.annotations.BeforeClass; -import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; -import org.springframework.security.core.Authentication; -import org.springframework.security.core.GrantedAuthority; -import org.springframework.security.core.authority.SimpleGrantedAuthority; -import org.springframework.security.core.context.SecurityContextHolder; -import org.springframework.test.annotation.Rollback; -import org.testng.annotations.AfterClass; -import org.junit.Test; - -import test.forgon.constant.Constants; -import test.forgon.disinfectsystem.AbstractCSSDTest; - public class ExpensiveGoodsGodownTest extends AbstractCSSDTest{ private ExpensiveGoodsSupplier madeCompany1 = new ExpensiveGoodsSupplier(); @@ -78,8 +78,7 @@ * 高值耗材物品： goods1,goods2 * 高值耗材申请单：exIP1 */ - @BeforeClass - @Rollback(false) + @Before public void buildInitData(){ //默认有效日期为当前日期后10天 @@ -172,8 +171,7 @@ /** * 删除开始创建的数据 */ - @AfterClass - @Rollback(false) + @After public void afterClass(){ objectDao.deleteAll(expensiveGoodsList); // objectDao.deleteAll(registrationCertificationList); Index: ssts-web/src/test/java/test/forgon/disinfectsystem/dataProvider/orgUnit/OrgUnitDataProvider.java =================================================================== diff -u -r17506 -r26269 --- ssts-web/src/test/java/test/forgon/disinfectsystem/dataProvider/orgUnit/OrgUnitDataProvider.java (.../OrgUnitDataProvider.java) (revision 17506) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/dataProvider/orgUnit/OrgUnitDataProvider.java (.../OrgUnitDataProvider.java) (revision 26269) @@ -3,7 +3,7 @@ import com.forgon.directory.model.OrgUnit; import com.forgon.directory.service.OrgUnitManager; import com.forgon.tools.SpringBeanManger; -import org.testng.annotations.DataProvider; +import com.tngtech.java.junit.dataprovider.DataProvider; /** * @author zhonghaowen @@ -25,7 +25,7 @@ } - @DataProvider(name = "orgUnitProvider") + @DataProvider("orgUnitProvider") public static Object[][] orgUnitProvider() { OrgUnit orgUnit = createOrgUnit("testCSSD"); return new Object[][]{{orgUnit}}; Index: ssts-web/src/test/java/test/forgon/disinfectsystem/sterileLoading/SterileLoadingManagerTests.java =================================================================== diff -u -r26085 -r26269 --- ssts-web/src/test/java/test/forgon/disinfectsystem/sterileLoading/SterileLoadingManagerTests.java (.../SterileLoadingManagerTests.java) (revision 26085) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/sterileLoading/SterileLoadingManagerTests.java (.../SterileLoadingManagerTests.java) (revision 26269) @@ -1,15 +1,14 @@ package test.forgon.disinfectsystem.sterileLoading; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; - import java.util.ArrayList; import java.util.Date; import java.util.List; +import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.test.annotation.Rollback; import org.testng.AssertJUnit; -import org.junit.Test; import test.forgon.constant.Constants; import test.forgon.disinfectsystem.AbstractCSSDTest; @@ -42,7 +41,6 @@ * 分别回收自不同科室 */ @Test - @Rollback(false) public void testSterileLoadingNormalAndComboTousse() { initCSSDData(); TousseDefinition comboTd_聚合包 = tousseDefinitionManager.getTousseDefinitionByName("Test聚合包"); Index: ssts-web/src/test/java/test/forgon/disinfectsystem/sterileRecord/SterieRecordManagerTests.java =================================================================== diff -u -r26085 -r26269 --- ssts-web/src/test/java/test/forgon/disinfectsystem/sterileRecord/SterieRecordManagerTests.java (.../SterieRecordManagerTests.java) (revision 26085) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/sterileRecord/SterieRecordManagerTests.java (.../SterieRecordManagerTests.java) (revision 26269) @@ -1,5 +1,5 @@ package test.forgon.disinfectsystem.sterileRecord; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; import java.text.ParseException; import java.text.SimpleDateFormat; @@ -13,10 +13,9 @@ import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang.StringUtils; import org.hibernate.Session; +import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.test.annotation.Rollback; import org.testng.AssertJUnit; -import org.junit.Test; import test.forgon.constant.Constants; import test.forgon.disinfectsystem.AbstractCSSDTest; @@ -56,7 +55,6 @@ * 测试聚合包灭菌(无灭菌筐审核) */ @Test - @Rollback(value=false) public void testComboTousseInstanceSterileWithoutBasket() { //初始化数据 initCSSDData(); @@ -339,7 +337,6 @@ * 测试聚合包灭菌(扫描至灭菌筐) */ @Test - @Rollback(value=false) public void testComboTousseInstanceSterileScanBasket() { //初始化数据 initCSSDData(); Index: ssts-web/src/test/java/test/forgon/disinfectsystem/toussetransition/service/TousseTransitionRecordManagerTests.java =================================================================== diff -u -r26085 -r26269 --- ssts-web/src/test/java/test/forgon/disinfectsystem/toussetransition/service/TousseTransitionRecordManagerTests.java (.../TousseTransitionRecordManagerTests.java) (revision 26085) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/toussetransition/service/TousseTransitionRecordManagerTests.java (.../TousseTransitionRecordManagerTests.java) (revision 26269) @@ -1,8 +1,8 @@ package test.forgon.disinfectsystem.toussetransition.service; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; - import java.util.ArrayList; import java.util.Collection; import java.util.HashSet; @@ -13,9 +13,8 @@ import net.sf.json.JSONArray; import net.sf.json.JSONObject; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.test.annotation.Rollback; import org.junit.Test; +import org.springframework.beans.factory.annotation.Autowired; import test.forgon.constant.Constants; @@ -101,7 +100,6 @@ * Test开胸包 idCardBarcode xxxxxxxxx（条码） */ @Test - @Rollback(true) public void testSaveWithAddNewAndChangeUrgent(){ initCSSDData(); //---1、准备使用记录转换申请单后的数据，其中申请单中,Test开胸包2个,加急0个,Test开中包3个,加急1个 @@ -331,7 +329,6 @@ * Test开颅包 预回收2个 扫描条码1个(标识牌条码) 未扫描1个 无 * Test开口包 预回收2个 扫描条码0个 未扫描2个 无 */ - @Rollback(true) @Test public void testAddRecyclingApplication(){ initCSSDData(); Index: ssts-web/src/test/java/test/forgon/disinfectsystem/waste/TousseInstanceWasteTests.java =================================================================== diff -u -r26085 -r26269 --- ssts-web/src/test/java/test/forgon/disinfectsystem/waste/TousseInstanceWasteTests.java (.../TousseInstanceWasteTests.java) (revision 26085) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/waste/TousseInstanceWasteTests.java (.../TousseInstanceWasteTests.java) (revision 26269) @@ -1,15 +1,14 @@ package test.forgon.disinfectsystem.waste; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; - import java.util.ArrayList; import java.util.Date; import java.util.List; +import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.test.annotation.Rollback; import org.testng.AssertJUnit; -import org.junit.Test; import test.forgon.constant.Constants; import test.forgon.disinfectsystem.AbstractCSSDTest; @@ -35,7 +34,6 @@ * 测试聚合包废弃 */ @Test - @Rollback(false) public void testComboTousseWaste() { initCSSDData(); TousseDefinition comboTd_聚合包 = tousseDefinitionManager.getTousseDefinitionByName("Test聚合包"); Index: ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/RecyclingAutoReturnBorrowTests.java =================================================================== diff -u -r26085 -r26269 --- ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/RecyclingAutoReturnBorrowTests.java (.../RecyclingAutoReturnBorrowTests.java) (revision 26085) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/RecyclingAutoReturnBorrowTests.java (.../RecyclingAutoReturnBorrowTests.java) (revision 26269) @@ -1,9 +1,9 @@ package test.forgon.disinfectsystem.recyclingrecord.service; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; - - import java.util.ArrayList; import java.util.Arrays; import java.util.Date; @@ -16,9 +16,8 @@ import net.sf.json.JSONObject; import org.apache.commons.collections4.CollectionUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.test.annotation.Rollback; import org.junit.Test; +import org.springframework.beans.factory.annotation.Autowired; import test.forgon.constant.Constants; import test.forgon.disinfectsystem.AbstractCSSDTest; @@ -66,7 +65,6 @@ * 回收的包数量大于借物的数量 */ @Test - @Rollback(true) public void testRecycleWithReturnAllBorrow(){ initCSSDData(); tousses = new String[]{"Test开胸包","Test开口包","Test穿刺包"}; @@ -169,7 +167,6 @@ * 回收的包数量大于借物的数量,但是加急数量在本来的回收单上有,在还物单的回收记录上也有，丢失报损也一样 */ @Test - @Rollback(true) public void testRecycleWithReturnAllBorrow2(){ initCSSDData(); tousses = new String[]{"Test开胸包","Test开口包","Test穿刺包"}; @@ -292,7 +289,6 @@ * 拆包清洗,借5个,回收3个,其中1个拆包入两个篮筐，另外两个分别入第三个和第四个篮筐 */ @Test - @Rollback(true) public void testpartReturnWithNotEntirelyWashAndMultiBasket(){ initCSSDData(); tousses = new String[]{"Test开颅包"}; @@ -462,7 +458,6 @@ * 拆包清洗,借两个包，回收两个包。回收的两个包入同一个篮筐 */ @Test - @Rollback(true) public void testAllReturnWithNotEntirelyWashAndOneBasket(){ initCSSDData(); tousses = new String[]{"Test开颅包"}; @@ -541,7 +536,6 @@ * 借了2个Test开颅包，回收3个，并且丢失2个标识牌,并且有丢失备注 */ @Test - @Rollback(false) public void testRecycleAutoReturnAllBorrowWithIdCardLost(){ initCSSDData(); tousses = new String[]{"Test开颅包"}; Index: ssts-web/src/test/java/test/forgon/disinfectsystem/packing/SterilizationRecordManagerTestsForSaveOrUpdateSterilizationRecord.java =================================================================== diff -u -r26085 -r26269 --- ssts-web/src/test/java/test/forgon/disinfectsystem/packing/SterilizationRecordManagerTestsForSaveOrUpdateSterilizationRecord.java (.../SterilizationRecordManagerTestsForSaveOrUpdateSterilizationRecord.java) (revision 26085) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/packing/SterilizationRecordManagerTestsForSaveOrUpdateSterilizationRecord.java (.../SterilizationRecordManagerTestsForSaveOrUpdateSterilizationRecord.java) (revision 26269) @@ -1,16 +1,15 @@ package test.forgon.disinfectsystem.packing; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; - import java.util.ArrayList; import java.util.Calendar; import java.util.Date; import java.util.List; import java.util.Map; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.test.annotation.Rollback; import org.junit.Test; +import org.springframework.beans.factory.annotation.Autowired; import test.forgon.constant.Constants; import test.forgon.disinfectsystem.AbstractCSSDTest; @@ -381,7 +380,6 @@ * 同一种包定义,包实例数量1000个,都是篮筐外灭菌 */ @Test - @Rollback(false) public void testWithSameTousseDefinition(){ int basketCount = 0; //灭菌筐的数量 int basketTousseCount = 0; //入灭菌筐里的包实例的数量 Index: ssts-web/src/test/java/test/forgon/disinfectsystem/packing/controller/PackingControllerTests.java =================================================================== diff -u -r26085 -r26269 --- ssts-web/src/test/java/test/forgon/disinfectsystem/packing/controller/PackingControllerTests.java (.../PackingControllerTests.java) (revision 26085) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/packing/controller/PackingControllerTests.java (.../PackingControllerTests.java) (revision 26269) @@ -13,7 +13,7 @@ import org.springframework.test.web.servlet.ResultActions; import org.springframework.test.web.servlet.setup.DefaultMockMvcBuilder; import org.springframework.test.web.servlet.setup.MockMvcBuilders; -import org.testng.annotations.BeforeClass; +import org.junit.Before; import org.junit.Test; import test.forgon.disinfectsystem.AbstractCSSDTest; @@ -30,7 +30,7 @@ private MockMvc mockMvc; - @BeforeClass + @Before public void setUp() { DefaultMockMvcBuilder builder = MockMvcBuilders.webAppContextSetup(webApplicationContext);