Index: ssts-web/src/test/java/test/forgon/disinfectsystem/printRecyclingApplicationConfig/service/PrintConfigManagerTests.java =================================================================== diff -u -r12331 -r21008 --- ssts-web/src/test/java/test/forgon/disinfectsystem/printRecyclingApplicationConfig/service/PrintConfigManagerTests.java (.../PrintConfigManagerTests.java) (revision 12331) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/printRecyclingApplicationConfig/service/PrintConfigManagerTests.java (.../PrintConfigManagerTests.java) (revision 21008) @@ -1,18 +1,30 @@ package test.forgon.disinfectsystem.printRecyclingApplicationConfig.service; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + +import java.util.ArrayList; +import java.util.List; +import java.util.stream.Collectors; + import net.sf.json.JSONArray; import net.sf.json.JSONObject; -import static org.junit.Assert.*; +import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.testng.annotations.Test; -import com.forgon.disinfectsystem.printRecyclingApplicationConfig.service.PrintConfigManager; - import test.forgon.disinfectsystem.AbstractCSSDTest; + +import com.forgon.disinfectsystem.printRecyclingApplicationConfig.service.PrintConfigManager; +import com.forgon.systemsetting.model.HttpOption; +import com.forgon.systemsetting.service.HttpOptionManager; public class PrintConfigManagerTests extends AbstractCSSDTest{ @Autowired private PrintConfigManager printConfigManager; + @Autowired + private HttpOptionManager httpOptionManager; @Test public void testGetTousseItemGroupingTypes() { @@ -21,7 +33,7 @@ JSONObject obj = printConfigManager.getTousseItemGroupingTypes(); assertNotNull(obj); - assertEquals(5, obj.optInt("total")); + assertEquals(7, obj.optInt("total")); JSONArray array = obj.getJSONArray("items"); @@ -39,5 +51,15 @@ assertEquals("一次性物品", array.getJSONObject(4).optString("type")); assertEquals("", array.getJSONObject(4).optString("tousseGroupName")); + + assertEquals("一次性物品", array.getJSONObject(5).optString("type")); + assertEquals("一次性物品", array.getJSONObject(6).optString("type")); + + List disposableTypes = new ArrayList<>(); + disposableTypes.add(array.getJSONObject(5).optString("tousseGroupName")); + disposableTypes.add(array.getJSONObject(6).optString("tousseGroupName")); + List disposableGoodsTypes = httpOptionManager.getHttpOptionListById(HttpOption.SYSTEMSETTING_DIPOSABLEGOODS_TYPE); + List options = disposableGoodsTypes.stream().map(p->p.getOptionText()).collect(Collectors.toList()); + assertTrue(CollectionUtils.containsAll(disposableTypes, options)); } }