Loading atlas-view/src/test/java/es/redmic/test/atlasview/integration/controller/LayerControllerTest.java +84 −35 Original line number Diff line number Diff line Loading @@ -59,6 +59,7 @@ import es.redmic.atlasview.model.category.Category; import es.redmic.atlasview.model.layer.Layer; import es.redmic.atlasview.repository.category.CategoryESRepository; import es.redmic.atlasview.repository.layer.LayerESRepository; import es.redmic.models.es.administrative.model.ActivityCompact; import es.redmic.models.es.common.query.dto.AggsPropertiesDTO; import es.redmic.models.es.common.query.dto.BboxQueryDTO; import es.redmic.models.es.common.query.dto.GeoDataQueryDTO; Loading Loading @@ -392,6 +393,54 @@ public class LayerControllerTest extends DocumentationViewBaseTest { repository.delete(layerAtlas.getId(), PARENT_ID); } @Test public void searchLayersPost_ReturnResult_WhenSearchLayersByActivities() throws Exception { SimpleQueryDTO dataQuery = new SimpleQueryDTO(); dataQuery.setSize(1); List<Integer> activityIds = new ArrayList<Integer>(); activityIds.add(135); dataQuery.addTerm("activities", activityIds); Layer layerAtlas = (Layer) JsonToBeanTestUtil.getBean("/data/model/layer/layer.json", Layer.class); layerAtlas.setId("layer-1234b"); layerAtlas.setName("atlas"); layerAtlas.getJoinIndex().setParent(PARENT_ID); List<ActivityCompact> activities = new ArrayList<>() ; ActivityCompact activity = new ActivityCompact(); activity.setId(135L); activity.setName("prueba"); activity.setPath("r.1.10.135"); activities.add(activity); layerAtlas.setActivities(activities); repository.save(layerAtlas, PARENT_ID); Layer layerAtlasC = (Layer) JsonToBeanTestUtil.getBean("/data/model/layer/layer.json", Layer.class); layerAtlasC.setId("layer-1234c"); layerAtlasC.setName("atlasC"); layerAtlasC.getJoinIndex().setParent(PARENT_ID); repository.save(layerAtlasC, PARENT_ID); // @formatter:off this.mockMvc .perform(post(LAYER_PATH + "/_search").content(mapper.writeValueAsString(dataQuery)) .contentType(MediaType.APPLICATION_JSON).accept(MediaType.APPLICATION_JSON)) .andExpect(status().isOk()) .andExpect(jsonPath("$.success", is(true))) .andExpect(jsonPath("$.body.data", notNullValue())) .andExpect(jsonPath("$.body.data[0]", notNullValue())) .andExpect(jsonPath("$.body.data.length()", is(1))); // @formatter:on repository.delete(layerAtlas.getId(), PARENT_ID); repository.delete(layerAtlasC.getId(), PARENT_ID); } @Test public void searchLayersQueryString_Return200_WhenSearchIsCorrect() throws Exception { Loading Loading
atlas-view/src/test/java/es/redmic/test/atlasview/integration/controller/LayerControllerTest.java +84 −35 Original line number Diff line number Diff line Loading @@ -59,6 +59,7 @@ import es.redmic.atlasview.model.category.Category; import es.redmic.atlasview.model.layer.Layer; import es.redmic.atlasview.repository.category.CategoryESRepository; import es.redmic.atlasview.repository.layer.LayerESRepository; import es.redmic.models.es.administrative.model.ActivityCompact; import es.redmic.models.es.common.query.dto.AggsPropertiesDTO; import es.redmic.models.es.common.query.dto.BboxQueryDTO; import es.redmic.models.es.common.query.dto.GeoDataQueryDTO; Loading Loading @@ -392,6 +393,54 @@ public class LayerControllerTest extends DocumentationViewBaseTest { repository.delete(layerAtlas.getId(), PARENT_ID); } @Test public void searchLayersPost_ReturnResult_WhenSearchLayersByActivities() throws Exception { SimpleQueryDTO dataQuery = new SimpleQueryDTO(); dataQuery.setSize(1); List<Integer> activityIds = new ArrayList<Integer>(); activityIds.add(135); dataQuery.addTerm("activities", activityIds); Layer layerAtlas = (Layer) JsonToBeanTestUtil.getBean("/data/model/layer/layer.json", Layer.class); layerAtlas.setId("layer-1234b"); layerAtlas.setName("atlas"); layerAtlas.getJoinIndex().setParent(PARENT_ID); List<ActivityCompact> activities = new ArrayList<>() ; ActivityCompact activity = new ActivityCompact(); activity.setId(135L); activity.setName("prueba"); activity.setPath("r.1.10.135"); activities.add(activity); layerAtlas.setActivities(activities); repository.save(layerAtlas, PARENT_ID); Layer layerAtlasC = (Layer) JsonToBeanTestUtil.getBean("/data/model/layer/layer.json", Layer.class); layerAtlasC.setId("layer-1234c"); layerAtlasC.setName("atlasC"); layerAtlasC.getJoinIndex().setParent(PARENT_ID); repository.save(layerAtlasC, PARENT_ID); // @formatter:off this.mockMvc .perform(post(LAYER_PATH + "/_search").content(mapper.writeValueAsString(dataQuery)) .contentType(MediaType.APPLICATION_JSON).accept(MediaType.APPLICATION_JSON)) .andExpect(status().isOk()) .andExpect(jsonPath("$.success", is(true))) .andExpect(jsonPath("$.body.data", notNullValue())) .andExpect(jsonPath("$.body.data[0]", notNullValue())) .andExpect(jsonPath("$.body.data.length()", is(1))); // @formatter:on repository.delete(layerAtlas.getId(), PARENT_ID); repository.delete(layerAtlasC.getId(), PARENT_ID); } @Test public void searchLayersQueryString_Return200_WhenSearchIsCorrect() throws Exception { Loading