Index: ssts-web/src/test/java/test/forgon/disinfectsystem/packing/service/PackingManagerTests.java =================================================================== diff -u -r26293 -r35712 --- ssts-web/src/test/java/test/forgon/disinfectsystem/packing/service/PackingManagerTests.java (.../PackingManagerTests.java) (revision 26293) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/packing/service/PackingManagerTests.java (.../PackingManagerTests.java) (revision 35712) @@ -2,15 +2,11 @@ import static org.junit.Assert.*; +import java.util.*; -import java.util.ArrayList; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - import javax.servlet.http.HttpSession; +import com.forgon.tools.json.JSONUtil; import net.sf.json.JSONArray; import net.sf.json.JSONObject; @@ -1580,4 +1576,26 @@ } + @Test + public void testVerifyTousseCanBeAggregated() { + JSONObject retObj = null; + Set ids = new HashSet(); + List tds = objectDao.findByHql("select po from " + + TousseDefinition.class.getSimpleName() + +" po where po.name in('Test开胸包','Test开口包') "); + for (TousseDefinition td : tds) { + ids.add(td.getId().toString()); + } + try { + JSONArray infoArr = packingManager.verifyTousseCanBeAggregated(ids); + retObj = JSONUtil.buildJsonObject(true,infoArr); + } catch (Exception e) { + e.printStackTrace(); + retObj = JSONUtil.buildJsonObject(false,e.getMessage()); + } + System.out.println(retObj.toString()); + assertEquals(retObj.optBoolean("success"), true); + JSONArray data = retObj.optJSONArray("data"); + assertEquals(2, data.size()); + } }