Index: ssts-web/src/test/java/test/forgon/disinfectsystem/application/service/InvoicePlanPrintByRecyclingNumberTests.java =================================================================== diff -u -r29658 -r29664 --- ssts-web/src/test/java/test/forgon/disinfectsystem/application/service/InvoicePlanPrintByRecyclingNumberTests.java (.../InvoicePlanPrintByRecyclingNumberTests.java) (revision 29658) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/application/service/InvoicePlanPrintByRecyclingNumberTests.java (.../InvoicePlanPrintByRecyclingNumberTests.java) (revision 29664) @@ -95,10 +95,10 @@ printScope.put("isMergePrintMultipleSelectedApplications", false); List printList = new ArrayList(); - + List printedTousseItemOfTestNeike = new ArrayList(); recyclingApplicationManager.getPrintObjectOfDept(printScope, - "testNeike", "李晓敏", printList, new ArrayList()); - + "testNeike", "李晓敏", printList, printedTousseItemOfTestNeike); + assertEquals(3, printedTousseItemOfTestNeike.size()); assertEquals(1, printList.size()); PrintSummaryVo vo = printList.get(0); @@ -176,10 +176,10 @@ printScope.put("isMergePrintMultipleSelectedApplications", false); List printList = new ArrayList(); - + List printedTousseOfTestNeike = new ArrayList(); recyclingApplicationManager.getPrintObjectOfDept(printScope, - "testNeike", "李晓敏", printList, new ArrayList()); - + "testNeike", "李晓敏", printList, printedTousseOfTestNeike); + assertEquals(3, printedTousseOfTestNeike.size()); assertEquals(1, printList.size()); PrintSummaryVo vo = printList.get(0); @@ -334,10 +334,10 @@ printScope.put("rowsPerPage", 3); List summaryList = new ArrayList(); - + List printedTousseItemOfTestNeike = new ArrayList(); recyclingApplicationManager.getPrintObjectOfDept(printScope, - "testNeike", "李晓敏", summaryList, new ArrayList()); - + "testNeike", "李晓敏", summaryList, printedTousseItemOfTestNeike); + assertEquals(9, printedTousseItemOfTestNeike.size()); assertEquals(2, summaryList.size()); // 断言第1张打印单内容 Index: ssts-web/src/test/java/test/forgon/disinfectsystem/application/service/InvoicePlanPrint2ByApplyNumberTests.java =================================================================== diff -u -r29658 -r29664 --- ssts-web/src/test/java/test/forgon/disinfectsystem/application/service/InvoicePlanPrint2ByApplyNumberTests.java (.../InvoicePlanPrint2ByApplyNumberTests.java) (revision 29658) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/application/service/InvoicePlanPrint2ByApplyNumberTests.java (.../InvoicePlanPrint2ByApplyNumberTests.java) (revision 29664) @@ -103,10 +103,10 @@ printScope.put("isMergePrintMultipleSelectedApplications", false); List printList = new ArrayList(); - + List printedTousseItemOfTestNeike = new ArrayList(); recyclingApplicationManager.getPrintObjectOfDept(printScope, - "testNeike", "李晓敏", printList, new ArrayList()); - + "testNeike", "李晓敏", printList, printedTousseItemOfTestNeike); + assertEquals(3, printedTousseItemOfTestNeike.size()); assertEquals(2, printList.size()); PrintSummaryVo vo = printList.get(0); @@ -262,9 +262,10 @@ List summaryList = new ArrayList(); + List printedTousseItemsOfTestNeike = new ArrayList(); recyclingApplicationManager.getPrintObjectOfDept(printScope, - "testNeike", "李晓敏", summaryList, new ArrayList()); - + "testNeike", "李晓敏", summaryList, printedTousseItemsOfTestNeike); + assertEquals(12, printedTousseItemsOfTestNeike.size()); assertEquals(2, summaryList.size()); // 断言第1张打印单内容 @@ -512,10 +513,10 @@ printScope.put("rowsPerPage", 2); List summaryList = new ArrayList(); - + List printedTousseItemsOfTestNeike = new ArrayList(); recyclingApplicationManager.getPrintObjectOfDept(printScope, - "testNeike", "李晓敏", summaryList, new ArrayList()); - + "testNeike", "李晓敏", summaryList, printedTousseItemsOfTestNeike); + assertEquals(12, printedTousseItemsOfTestNeike.size()); assertEquals(2, summaryList.size()); // 断言第1组打印单内容 @@ -967,9 +968,10 @@ printScope.put("isMergePrintMultipleSelectedApplications", true); List printList = new ArrayList(); - + List printedTousseItems = new ArrayList(); recyclingApplicationManager.getPrintObjectOfDept(printScope, - "testNeike", "李晓敏", printList, new ArrayList()); + "testNeike", "李晓敏", printList, printedTousseItems); + assertEquals(7, printedTousseItems.size()); assertEquals(1, printList.size()); @@ -1335,9 +1337,10 @@ printScope.put("rowsPerPage", 10); List summaryList = new ArrayList(); - + List printedTousseItems = new ArrayList(); recyclingApplicationManager.getPrintObjectOfDept(printScope, - "testNeike", "李晓敏", summaryList, new ArrayList()); + "testNeike", "李晓敏", summaryList, printedTousseItems); + assertEquals(12, printedTousseItems.size()); assertEquals(3, summaryList.size()); @@ -1422,9 +1425,10 @@ // 测试外科的打印测试 summaryList.clear(); assertEquals(0, summaryList.size()); + List printedTousseItemOfTestWaike = new ArrayList(); recyclingApplicationManager.getPrintObjectOfDept(printScope, - "testWaike", "李晓敏", summaryList, new ArrayList()); - + "testWaike", "李晓敏", summaryList, printedTousseItemOfTestWaike); + assertEquals(7, printedTousseItemOfTestWaike.size()); assertEquals(2, summaryList.size()); // 断言第1张打印单内容 Index: ssts-web/src/test/java/test/forgon/disinfectsystem/application/service/InvoicePlanPrintByApplyNumberTests.java =================================================================== diff -u -r29658 -r29664 --- ssts-web/src/test/java/test/forgon/disinfectsystem/application/service/InvoicePlanPrintByApplyNumberTests.java (.../InvoicePlanPrintByApplyNumberTests.java) (revision 29658) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/application/service/InvoicePlanPrintByApplyNumberTests.java (.../InvoicePlanPrintByApplyNumberTests.java) (revision 29664) @@ -1,8 +1,6 @@ package test.forgon.disinfectsystem.application.service; import static org.junit.Assert.*; - - import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; @@ -95,10 +93,10 @@ printScope.put("isMergePrintMultipleSelectedApplications", false); List printList = new ArrayList(); - + List printedTousseItemOfTestNeike = new ArrayList(); recyclingApplicationManager.getPrintObjectOfDept(printScope, - "testNeike", "李晓敏", printList, new ArrayList()); - + "testNeike", "李晓敏", printList, printedTousseItemOfTestNeike); + assertEquals(3, printedTousseItemOfTestNeike.size()); assertEquals(1, printList.size()); PrintSummaryVo vo = printList.get(0); @@ -170,10 +168,10 @@ printScope.put("isMergePrintMultipleSelectedApplications", false); List printList = new ArrayList(); - + List printedTousseItemOfTestNeike = new ArrayList(); recyclingApplicationManager.getPrintObjectOfDept(printScope, - "testNeike", "李晓敏", printList, new ArrayList()); - + "testNeike", "李晓敏", printList, printedTousseItemOfTestNeike); + assertEquals(3, printedTousseItemOfTestNeike.size()); assertEquals(1, printList.size()); PrintSummaryVo vo = printList.get(0); @@ -305,10 +303,10 @@ printScope.put("rowsPerPage", 10); List summaryList = new ArrayList(); - + List printedTousseItemsOfTestNeike = new ArrayList(); recyclingApplicationManager.getPrintObjectOfDept(printScope, - "testNeike", "李晓敏", summaryList, new ArrayList()); - + "testNeike", "李晓敏", summaryList, printedTousseItemsOfTestNeike); + assertEquals(12, printedTousseItemsOfTestNeike.size()); assertEquals(2, summaryList.size()); // 断言第1张打印单内容 @@ -521,10 +519,10 @@ printScope.put("isMergePrintMultipleSelectedApplications", true); List summaryList = new ArrayList(); - + List printedTousseItemOfTestNeike = new ArrayList(); recyclingApplicationManager.getPrintObjectOfDept(printScope, - "testNeike", "李晓敏", summaryList, new ArrayList()); - + "testNeike", "李晓敏", summaryList, printedTousseItemOfTestNeike); + assertEquals(12, printedTousseItemOfTestNeike.size()); assertEquals(2, summaryList.size()); // 断言器械包打印单的内容 @@ -771,10 +769,10 @@ printScope.put("isMergePrintMultipleSelectedApplications", true); List summaryList = new ArrayList(); - + List printedTousseItemOfTestNeike = new ArrayList(); recyclingApplicationManager.getPrintObjectOfDept(printScope, - "testNeike", "李晓敏", summaryList, new ArrayList()); - + "testNeike", "李晓敏", summaryList, printedTousseItemOfTestNeike); + assertEquals(13, printedTousseItemOfTestNeike.size()); assertEquals(3, summaryList.size()); // 断言器械包打印单的内容 @@ -1252,9 +1250,10 @@ printScope.put("isMergePrintMultipleSelectedApplications", true); List printList = new ArrayList(); - + List printedTousseItems = new ArrayList(); recyclingApplicationManager.getPrintObjectOfDept(printScope, - "testNeike", "李晓敏", printList, new ArrayList()); + "testNeike", "李晓敏", printList, printedTousseItems); + assertEquals(7, printedTousseItems.size()); assertEquals(1, printList.size()); @@ -1615,9 +1614,10 @@ List summaryList = new ArrayList(); + List printedTousseItemsOfTestNeike = new ArrayList(); recyclingApplicationManager.getPrintObjectOfDept(printScope, - "testNeike", "李晓敏", summaryList, new ArrayList()); - + "testNeike", "李晓敏", summaryList, printedTousseItemsOfTestNeike); + assertEquals(12, printedTousseItemsOfTestNeike.size()); assertEquals(3, summaryList.size()); // 断言第1张打印单内容