Index: ssts-web/src/test/java/test/forgon/disinfectsystem/packing/PackingTableManagerTests.java =================================================================== diff -u -r16603 -r16604 --- ssts-web/src/test/java/test/forgon/disinfectsystem/packing/PackingTableManagerTests.java (.../PackingTableManagerTests.java) (revision 16603) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/packing/PackingTableManagerTests.java (.../PackingTableManagerTests.java) (revision 16604) @@ -1,5 +1,10 @@ package test.forgon.disinfectsystem.packing; -import static org.testng.Assert.*; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertFalse; +import static org.testng.Assert.assertNotNull; +import static org.testng.Assert.assertNull; +import static org.testng.Assert.assertTrue; +import static org.testng.Assert.fail; import java.lang.Thread.State; import java.text.SimpleDateFormat; @@ -19,8 +24,6 @@ import net.sf.json.JSONObject; import org.apache.log4j.Logger; -import org.hibernate.Session; -import org.hibernate.Transaction; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.PlatformTransactionManager; import org.springframework.transaction.TransactionStatus; @@ -83,7 +86,7 @@ public void setUnpackAmount(int unpackAmount) { this.unpackAmount = unpackAmount; } - + // 并发调用该方法,验证死锁是否会发生 @Test public void testFindPackingRecordTableListConcurrent() throws Exception { @@ -150,6 +153,7 @@ // do test initCSSDData(); + makeActiveUser("cssduser1"); // 创建Test开胸包的装配任务 TousseDefinition td = tousseDefinitionManager.getTousseDefinitionByName("Test开胸包"); @@ -180,7 +184,6 @@ @Test public void testPackingTousseConcurrent() throws Exception{ - initDataInSeperateThread(); for (int i =0 ; i< MAX_THREADS ;i++){ @@ -209,7 +212,10 @@ } } - // 在单独的线程中初始化数据,并且提交事务,以便初始化的数据在子线程中能够获取到 + /** + * 在单独的线程中初始化数据,并且提交事务,以便初始化的数据在子线程中能够获取到 + * @throws TimeoutException + */ protected void initDataInSeperateThread() throws TimeoutException { new Thread(){ public void run() { @@ -226,6 +232,8 @@ private void packingTousse(){ + makeActiveUser("cssduser1"); + String packingTaskIds = globalPackingTask.getId().toString(); // PackingTask found = packingManager.getPackingTaskById(packingTaskIds); @@ -348,7 +356,7 @@ assertEquals(MAX_THREADS * invokeCount * amountPerPack, totalTousses); } - @Test + //@Test public void testPackTousseAndForeignProxyDisinfectionConcurrent() throws TimeoutException { initDataInSeperateThread();