Index: ssts-web/src/test/java/test/forgon/disinfectsystem/basedatamanager/toussedefinition/service/TousseDefinitionManagerTests.java =================================================================== diff -u -r14104 -r16787 --- ssts-web/src/test/java/test/forgon/disinfectsystem/basedatamanager/toussedefinition/service/TousseDefinitionManagerTests.java (.../TousseDefinitionManagerTests.java) (revision 14104) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/basedatamanager/toussedefinition/service/TousseDefinitionManagerTests.java (.../TousseDefinitionManagerTests.java) (revision 16787) @@ -213,17 +213,18 @@ assertEquals(0, array.size()); + //因为包名称、拼音码、五笔码、外部编码(外部编码只判断以该搜索字符串开头的内容)等属性没有包含T1的器械包,所以数量为0 json = tousseDefinitionManager.searchTousseDefinition("T1", TousseDefinition.PACKAGE_TYPE_INSIDE, null,false); totalCount = (Integer) json.get("totalCount"); - assertEquals(1, totalCount); + assertEquals(0, totalCount); array = (JSONArray)json.get("data"); - assertEquals(1, array.size()); + assertEquals(0, array.size()); s = array.toString(); - assertTrue(s.indexOf("开胸包") > 0); + assertFalse(s.indexOf("开胸包") > 0); assertFalse(s.indexOf("开颅包") > 0); assertFalse(s.indexOf("开口包") > 0); @@ -232,21 +233,21 @@ assertFalse(s.indexOf("止血带(20条/扎)") > 0); assertFalse(s.indexOf("手术衣") > 0); + //因为包名称、拼音码、五笔码、外部编码(外部编码只判断以该搜索字符串开头的内容)等属性没有包含T2的器械包,所以数量为0 json = tousseDefinitionManager.searchTousseDefinition("T2", TousseDefinition.PACKAGE_TYPE_INSIDE, null,false); - totalCount = (Integer) json.get("totalCount"); - assertEquals(2, totalCount); + assertEquals(0, totalCount); array = (JSONArray)json.get("data"); - assertEquals(2, array.size()); + assertEquals(0, array.size()); s = array.toString(); assertFalse(s.indexOf("开胸包") > 0); - assertTrue(s.indexOf("开颅包") > 0); + assertFalse(s.indexOf("开颅包") > 0); assertFalse(s.indexOf("开口包") > 0); - assertTrue(s.indexOf("TestOR胆加仪") > 0); + assertFalse(s.indexOf("TestOR胆加仪") > 0); }