Commit 4be22bb1 authored by Noel Alonso's avatar Noel Alonso
Browse files

Amplía tests de sugerencias

parent 5c41b8aa

vessels-view/src/main/java/es/redmic/vesselsview/common/query/VesselTrackingQueryUtils.java

0 → 100644
+50 −0
Original line number Diff line number Diff line 
package es.redmic.vesselsview.common.query;



import java.util.HashSet;



import org.elasticsearch.index.query.BoolQueryBuilder;

import org.elasticsearch.index.query.QueryBuilder;



import es.redmic.elasticsearchlib.common.query.DataQueryUtils;

import es.redmic.models.es.common.query.dto.DataQueryDTO;



public abstract class VesselTrackingQueryUtils extends DataQueryUtils {



	// @FORMATTER:OFF



	/*-public final static BoolQueryBuilder INTERNAL_QUERY = QueryBuilders.boolQuery()

			.must(QueryBuilders.boolQuery()

					.should(QueryBuilders.termQuery(INTRACK_PATH + ".id", DataPrefixType.PLATFORM_TRACKING))

					.should(QueryBuilders.termQuery(INTRACK_PATH + ".id", DataPrefixType.ANIMAL_TRACKING)));-*/



	// @FORMATTER:ON



	public static BoolQueryBuilder getQuery(DataQueryDTO queryDTO, QueryBuilder internalQuery,

			QueryBuilder partialQuery) {

		return getTrackingQuery(queryDTO, internalQuery, partialQuery);

	}



	protected static BoolQueryBuilder getTrackingQuery(DataQueryDTO queryDTO, QueryBuilder internalQuery,

			QueryBuilder partialQuery) {



		BoolQueryBuilder query = getGeoDataQuery(queryDTO, internalQuery, partialQuery);



		/*-addMustTermIfExist(query, getZQuery(INTRACK_PATH, Z_PROPERTY, SEARCH_BY_Z_RANGE_SCRIPT, queryDTO.getZ()));

		addMustTermIfExist(query, getDateLimitsQuery(queryDTO.getDateLimits(), INTRACK_PATH + "." + DATE_PROPERTY));

		addMustTermIfExist(query, getFlagQuery(queryDTO.getQFlags(), INTRACK_PATH + "." + QFLAG_PROPERTY));

		addMustTermIfExist(query, getFlagQuery(queryDTO.getVFlags(), INTRACK_PATH + "." + VFLAG_PROPERTY));

		addMustTermIfExist(query, getPrecisionQuery(queryDTO.getPrecision()));-*/



		return getResultQuery(query);

	}



	@SuppressWarnings("serial")

	public static HashSet<String> getFieldsExcludedOnQuery() {



		return new HashSet<String>() {

			{

				// add(VALUE_QUERY_FIELD);

			}

		};

	}

}
 
 No newline at end of file

vessels-view/src/test/java/es/redmic/test/vesselsview/integration/controller/VesselControllerTest.java

+20 −10
Original line number Diff line number Diff line 
package es.redmic.test.vesselsview.integration.controller;



import static org.hamcrest.CoreMatchers.endsWith;

import static org.hamcrest.CoreMatchers.is;

import static org.hamcrest.CoreMatchers.notNullValue;

import static org.hamcrest.CoreMatchers.startsWith;

import static org.springframework.restdocs.mockmvc.MockMvcRestDocumentation.documentationConfiguration;

import static org.springframework.restdocs.mockmvc.RestDocumentationRequestBuilders.get;

import static org.springframework.restdocs.mockmvc.RestDocumentationRequestBuilders.post;
@@ -9,10 +11,10 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. 
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;



import java.util.Arrays;

import java.util.UUID;



import javax.annotation.PostConstruct;



import org.apache.commons.lang.RandomStringUtils;

import org.junit.After;

import org.junit.Before;

import org.junit.ClassRule;
@@ -63,13 +65,17 @@ public class VesselControllerTest extends DocumentationViewBaseTest { 
	@Before

	public void setUp() {



		vessel.setId(UUID.randomUUID().toString());

		String code = RandomStringUtils.random(4, true, false);



		Integer mmsi = Integer.valueOf(RandomStringUtils.random(4, false, true));



		vessel.setId("vessel-mmsi-" + mmsi);

		vessel.setName("Prueba");

		vessel.setImo(1234);

		vessel.setMmsi(5678);

		vessel.setImo(mmsi);

		vessel.setMmsi(mmsi);

		VesselType type = new VesselType();

		type.setId("vessel-mmsi-5678");

		type.setCode("99");

		type.setId("vesseltype-code-" + code);

		type.setCode(code);

		type.setName("Other Type, no additional information");

		type.setName_en("Other Type, no additional information");

		vessel.setType(type);
@@ -181,14 +187,16 @@ public class VesselControllerTest extends DocumentationViewBaseTest { 
		

		this.mockMvc

			.perform(get("/_suggest")

					.param("fields", "{name}")

					.param("fields", new String[] { "name" })

					.param("text", vessel.getName())

					.param("size", "1")

						.accept(MediaType.APPLICATION_JSON))

				.andExpect(status().isOk())

				.andExpect(jsonPath("$.success", is(true)))

				.andExpect(jsonPath("$.body", notNullValue()))

				//.andExpect(jsonPath("$.body.length()", is(1))) TODO: cuando funcionen las sugerencias, arreglar

				.andExpect(jsonPath("$.body.length()", is(1)))

				.andExpect(jsonPath("$.body[0]", startsWith("<b>")))

				.andExpect(jsonPath("$.body[0]", endsWith("</b>")))

					.andDo(getSuggestParametersDescription());

		

		// @formatter:on
@@ -209,8 +217,10 @@ public class VesselControllerTest extends DocumentationViewBaseTest { 
				.andExpect(status().isOk())

				.andExpect(jsonPath("$.success", is(true)))

				.andExpect(jsonPath("$.body", notNullValue()))

				//.andExpect(jsonPath("$.body.length()", is(1))); TODO: cuando funcionen las sugerencias, arreglar 

					.andDo(getMetadataQueryFieldsDescriptor());;

				.andExpect(jsonPath("$.body.length()", is(1)))

				.andExpect(jsonPath("$.body[0]", startsWith("<b>")))

				.andExpect(jsonPath("$.body[0]", endsWith("</b>")))

					.andDo(getMetadataQueryFieldsDescriptor());

				

		

		// @formatter:on

vessels-view/src/test/java/es/redmic/test/vesselsview/integration/controller/VesselTrackingControllerTest.java

+4 −0
Original line number Diff line number Diff line 
package es.redmic.test.vesselsview.integration.controller;



import static org.hamcrest.CoreMatchers.endsWith;

import static org.hamcrest.CoreMatchers.is;

import static org.hamcrest.CoreMatchers.notNullValue;

import static org.hamcrest.CoreMatchers.startsWith;

import static org.springframework.restdocs.mockmvc.MockMvcRestDocumentation.documentationConfiguration;

import static org.springframework.restdocs.mockmvc.RestDocumentationRequestBuilders.get;

import static org.springframework.restdocs.mockmvc.RestDocumentationRequestBuilders.post;
@@ -233,6 +235,8 @@ public class VesselTrackingControllerTest extends DocumentationViewBaseTest { 
				.andExpect(jsonPath("$.success", is(true)))

				.andExpect(jsonPath("$.body", notNullValue()))

				.andExpect(jsonPath("$.body.length()", is(1))) 

				.andExpect(jsonPath("$.body[0]", startsWith("<b>")))

				.andExpect(jsonPath("$.body[0]", endsWith("</b>")))

					.andDo(getDataQueryFieldsDescriptor());

vessels-view/src/test/java/es/redmic/test/vesselsview/integration/controller/VesselTypeControllerTest.java

+14 −6
Original line number Diff line number Diff line 
package es.redmic.test.vesselsview.integration.controller;



import static org.hamcrest.CoreMatchers.endsWith;

import static org.hamcrest.CoreMatchers.is;

import static org.hamcrest.CoreMatchers.notNullValue;

import static org.hamcrest.CoreMatchers.startsWith;

import static org.springframework.restdocs.mockmvc.MockMvcRestDocumentation.documentationConfiguration;

import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;

import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
@@ -9,10 +11,10 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. 
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;



import java.util.Arrays;

import java.util.UUID;



import javax.annotation.PostConstruct;



import org.apache.commons.lang.RandomStringUtils;

import org.junit.After;

import org.junit.Before;

import org.junit.ClassRule;
@@ -65,8 +67,10 @@ public class VesselTypeControllerTest extends DocumentationViewBaseTest { 
	@Before

	public void setUp() {



		vesselType.setId(UUID.randomUUID().toString());

		vesselType.setCode("199");

		String code = RandomStringUtils.random(4, true, false);



		vesselType.setId("vesseltype-code-" + code);

		vesselType.setCode(code);

		vesselType.setName("Other Type, no additional information");

		vesselType.setName_en("Other Type, no additional information");
@@ -175,14 +179,16 @@ public class VesselTypeControllerTest extends DocumentationViewBaseTest { 
		

		this.mockMvc

			.perform(get(VESSELTYPE_PATH + "/_suggest")

					.param("fields", "{name}")

					.param("fields", new String[] { "name" })

					.param("text", vesselType.getName())

					.param("size", "1")

						.accept(MediaType.APPLICATION_JSON))

				.andExpect(status().isOk())

				.andExpect(jsonPath("$.success", is(true)))

				.andExpect(jsonPath("$.body", notNullValue()))

				//.andExpect(jsonPath("$.body.length()", is(1))) TODO: cuando funcionen las sugerencias, arreglar

				.andExpect(jsonPath("$.body.length()", is(1)))

				.andExpect(jsonPath("$.body[0]", startsWith("<b>")))

				.andExpect(jsonPath("$.body[0]", endsWith("</b>")))

					.andDo(getSuggestParametersDescription());

		

		// @formatter:on
@@ -203,7 +209,9 @@ public class VesselTypeControllerTest extends DocumentationViewBaseTest { 
				.andExpect(status().isOk())

				.andExpect(jsonPath("$.success", is(true)))

				.andExpect(jsonPath("$.body", notNullValue()))

				//.andExpect(jsonPath("$.body.length()", is(1))); TODO: cuando funcionen las sugerencias, arreglar 

				.andExpect(jsonPath("$.body.length()", is(1)))

				.andExpect(jsonPath("$.body[0]", startsWith("<b>")))

				.andExpect(jsonPath("$.body[0]", endsWith("</b>")))

					.andDo(getSimpleQueryFieldsDescriptor());;

vessels-view/src/test/java/es/redmic/test/vesselsview/integration/handler/VesselEventHandlerTest.java

+10 −5
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ import java.util.concurrent.TimeUnit; 


import javax.annotation.PostConstruct;



import org.apache.commons.lang.RandomStringUtils;

import org.joda.time.DateTime;

import org.junit.Before;

import org.junit.BeforeClass;
@@ -66,6 +67,10 @@ public class VesselEventHandlerTest extends DocumentationViewBaseTest { 


	private final String USER_ID = "1";



	private String code = RandomStringUtils.random(4, true, false);



	private Integer mmsi = Integer.valueOf(RandomStringUtils.random(4, false, true));



	@Autowired

	MapperScanBeanItfc mapper;
@@ -339,15 +344,15 @@ public class VesselEventHandlerTest extends DocumentationViewBaseTest { 
	protected VesselDTO getVessel() {



		VesselDTO vessel = new VesselDTO();

		vessel.setId("ww1effbf-700f-4dfb-8aba-8212ac2d26b3");

		vessel.setMmsi(1234);

		vessel.setId("vessel-mmsi-" + mmsi);

		vessel.setMmsi(mmsi);

		vessel.setName("Avatar");

		vessel.setImo(1234);

		vessel.setImo(mmsi);

		vessel.setCallSign("PACH");



		VesselTypeDTO vesselType = new VesselTypeDTO();

		vesselType.setCode("70");

		vesselType.setId("1234");

		vesselType.setId("vesseltype-code-" + code);

		vesselType.setCode(code);

		vesselType.setName("Cargo, all ships of this type");

		vesselType.setName_en("Cargo, all ships of this type");

		vessel.setType(vesselType);