Index: ssts-web/src/test/java/test/forgon/disinfectsystem/useRecord/UseRecordManagerTests.java =================================================================== diff -u -r40513 -r40571 --- ssts-web/src/test/java/test/forgon/disinfectsystem/useRecord/UseRecordManagerTests.java (.../UseRecordManagerTests.java) (revision 40513) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/useRecord/UseRecordManagerTests.java (.../UseRecordManagerTests.java) (revision 40571) @@ -11,7 +11,6 @@ import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.MapUtils; import org.apache.commons.lang.StringUtils; -import org.jmesa.util.AssertUtils; import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.orm.hibernate4.HibernateTemplate; @@ -54,7 +53,7 @@ /** * 测试聚合包与普通器械包录入使用记录并转换申请单 */ - //@Test TODO: java.lang.AssertionError: 后台报错,测试用例不通过 expected [2] but found [1] + @Test public void testComboTousseAndNormalTousseFixUseRecord() { //初始化数据 initCSSDData(); @@ -373,6 +372,7 @@ original2.setPatientAge(""); original2.setPatientIDCard(""); original2.setStatus(UseRecord.STATUS_UNAUDITED); + original2.setOperator("使用记录录入人"); List orginalTousseInstanceListForUseRecord2 = new ArrayList(); orginalTousseInstanceListForUseRecord2.add(comboTousseInstance1); orginalTousseInstanceListForUseRecord2.add(comboTousseInstance2);