Commit 00e376d6 authored Apr 22, 2019 by Noel Alonso

Arregla test por añadir nueva propiedad a query

parent a14b5902

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

+2 −0

Original line number	Diff line number	Diff line
		@@ -197,6 +197,7 @@ public class VesselTrackingControllerTest extends DocumentationViewBaseTest {
		// no registrados
		HashMap<String, Object> query = mapper.convertValue(dataQuery, HashMap.class);
		query.remove("accessibilityIds");
		query.remove("activityId");

		// @formatter:off

		@@ -249,6 +250,7 @@ public class VesselTrackingControllerTest extends DocumentationViewBaseTest {
		// no registrados
		HashMap<String, Object> query = mapper.convertValue(dataQuery, HashMap.class);
		query.remove("accessibilityIds");
		query.remove("activityId");

		// @formatter:off

vessels-view/src/test/resources/data/schemas/vesseltrackingqueryschema.json

+1 −1

Original line number	Diff line number	Diff line
		{"schema":{"$schema":"http://json-schema.org/draft-04/schema#","title":"Data Query DTO","type":"object","properties":{"from":{"type":["integer","null"],"default":"0"},"size":{"type":["integer","null"],"default":"100"},"terms":{"type":["object","null"],"additionalProperties":true},"sorts":{"type":["array","null"],"uniqueItems":true,"items":{"$ref":"#/definitions/SortDTO"}},"returnFields":{"type":["array","null"],"uniqueItems":true,"items":{"type":"string"}},"text":{"$ref":"#/definitions/TextQueryDTO"},"suggest":{"$ref":"#/definitions/SuggestQueryDTO"},"regexp":{"type":["array","null"],"uniqueItems":true,"items":{"$ref":"#/definitions/RegexpDTO"}},"postFilter":{"type":["object","null"],"additionalProperties":true},"aggs":{"type":["array","null"],"uniqueItems":true,"items":{"$ref":"#/definitions/AggsPropertiesDTO"}},"bbox":{"$ref":"#/definitions/BboxQueryDTO","description":"Obtiene registros de geometrías comprendidas dentro de los límites especificados."},"precision":{"$ref":"#/definitions/PrecisionQueryDTO"},"qFlags":{"type":["array","null"],"maxItems":11,"uniqueItems":true,"items":{"type":"string"}},"vFlags":{"type":["array","null"],"maxItems":5,"uniqueItems":true,"items":{"type":"string"}},"dateLimits":{"$ref":"#/definitions/DateLimitsDTO"},"interval":{"type":["string","null"]},"z":{"$ref":"#/definitions/ZRangeDTO"},"value":{"type":["array","null"],"uniqueItems":true,"items":{"$ref":"#/definitions/ValueQueryDTO"}}},"definitions":{"SortDTO":{"type":["object","null"],"properties":{"field":{"type":"string"},"order":{"type":"string"}},"required":["field","order"]},"TextQueryDTO":{"type":["object","null"],"properties":{"text":{"type":"string","minLength":2},"searchFields":{"type":["array","null"],"uniqueItems":true,"items":{"type":"string"}},"highlightFields":{"type":["array","null"],"uniqueItems":true,"items":{"type":"string"}}},"required":["text"]},"SuggestQueryDTO":{"type":["object","null"],"properties":{"text":{"type":"string","minLength":2},"searchFields":{"type":["array","null"],"uniqueItems":true,"items":{"type":"string"}},"size":{"type":["integer","null"]}},"required":["text"]},"RegexpDTO":{"type":["object","null"],"properties":{"field":{"type":"string"},"exp":{"type":"string"}},"required":["field","exp"]},"AggsPropertiesDTO":{"type":["object","null"],"properties":{"field":{"type":"string"},"term":{"type":"string"},"nested":{"type":["string","null"]},"size":{"type":["integer","null"],"default":"20"},"minCount":{"type":["integer","null"]}},"required":["field","term"]},"BboxQueryDTO":{"type":["object","null"],"properties":{"bottomRightLat":{"type":"number","minimum":-90,"maximum":90},"bottomRightLon":{"type":"number","minimum":-180,"maximum":180},"topLeftLat":{"type":"number","minimum":-90,"maximum":90},"topLeftLon":{"type":"number","minimum":-180,"maximum":180}},"required":["bottomRightLat","bottomRightLon","topLeftLat","topLeftLon"]},"PrecisionQueryDTO":{"type":["object","null"],"properties":{"min":{"type":["number","null"]},"max":{"type":["number","null"]}}},"DateLimitsDTO":{"type":["object","null"],"properties":{"startDate":{"type":["string","null"],"format":"date-time"},"endDate":{"type":["string","null"],"format":"date-time"}}},"ZRangeDTO":{"type":["object","null"],"properties":{"min":{"type":["number","null"]},"max":{"type":["number","null"]}}},"ValueQueryDTO":{"type":["object","null"],"properties":{"op":{"type":"number"},"operator":{"type":"string","enum":["Equal","NotEqual","Greater","Less","GreaterOrEqual","LessOrEqual"]}},"required":["op","operator"]}}}}
		No newline at end of file
		{"schema":{"$schema":"http://json-schema.org/draft-04/schema#","title":"Data Query DTO","type":"object","properties":{"from":{"type":["integer","null"],"default":"0"},"size":{"type":["integer","null"],"default":"100"},"terms":{"type":["object","null"],"additionalProperties":true},"sorts":{"type":["array","null"],"uniqueItems":true,"items":{"$ref":"#/definitions/SortDTO"}},"returnFields":{"type":["array","null"],"uniqueItems":true,"items":{"type":"string"}},"text":{"$ref":"#/definitions/TextQueryDTO"},"suggest":{"$ref":"#/definitions/SuggestQueryDTO"},"regexp":{"type":["array","null"],"uniqueItems":true,"items":{"$ref":"#/definitions/RegexpDTO"}},"postFilter":{"type":["object","null"],"additionalProperties":true},"aggs":{"type":["array","null"],"uniqueItems":true,"items":{"$ref":"#/definitions/AggsPropertiesDTO"}},"activityId":{"type":["string","null"]},"bbox":{"$ref":"#/definitions/BboxQueryDTO","description":"Obtiene registros de geometrías comprendidas dentro de los límites especificados."},"precision":{"$ref":"#/definitions/PrecisionQueryDTO"},"qFlags":{"type":["array","null"],"maxItems":11,"uniqueItems":true,"items":{"type":"string"}},"vFlags":{"type":["array","null"],"maxItems":5,"uniqueItems":true,"items":{"type":"string"}},"dateLimits":{"$ref":"#/definitions/DateLimitsDTO"},"interval":{"type":["string","null"]},"z":{"$ref":"#/definitions/ZRangeDTO"},"value":{"type":["array","null"],"uniqueItems":true,"items":{"$ref":"#/definitions/ValueQueryDTO"}}},"definitions":{"SortDTO":{"type":["object","null"],"properties":{"field":{"type":"string"},"order":{"type":"string"}},"required":["field","order"]},"TextQueryDTO":{"type":["object","null"],"properties":{"text":{"type":"string","minLength":2},"searchFields":{"type":["array","null"],"uniqueItems":true,"items":{"type":"string"}},"highlightFields":{"type":["array","null"],"uniqueItems":true,"items":{"type":"string"}}},"required":["text"]},"SuggestQueryDTO":{"type":["object","null"],"properties":{"text":{"type":"string","minLength":2},"searchFields":{"type":["array","null"],"uniqueItems":true,"items":{"type":"string"}},"size":{"type":["integer","null"]}},"required":["text"]},"RegexpDTO":{"type":["object","null"],"properties":{"field":{"type":"string"},"exp":{"type":"string"}},"required":["field","exp"]},"AggsPropertiesDTO":{"type":["object","null"],"properties":{"field":{"type":"string"},"term":{"type":"string"},"nested":{"type":["string","null"]},"size":{"type":["integer","null"],"default":"20"},"minCount":{"type":["integer","null"]}},"required":["field","term"]},"BboxQueryDTO":{"type":["object","null"],"properties":{"bottomRightLat":{"type":"number","minimum":-90,"maximum":90},"bottomRightLon":{"type":"number","minimum":-180,"maximum":180},"topLeftLat":{"type":"number","minimum":-90,"maximum":90},"topLeftLon":{"type":"number","minimum":-180,"maximum":180}},"required":["bottomRightLat","bottomRightLon","topLeftLat","topLeftLon"]},"PrecisionQueryDTO":{"type":["object","null"],"properties":{"min":{"type":["number","null"]},"max":{"type":["number","null"]}}},"DateLimitsDTO":{"type":["object","null"],"properties":{"startDate":{"type":["string","null"],"format":"date-time"},"endDate":{"type":["string","null"],"format":"date-time"}}},"ZRangeDTO":{"type":["object","null"],"properties":{"min":{"type":["number","null"]},"max":{"type":["number","null"]}}},"ValueQueryDTO":{"type":["object","null"],"properties":{"op":{"type":"number"},"operator":{"type":"string","enum":["Equal","NotEqual","Greater","Less","GreaterOrEqual","LessOrEqual"]}},"required":["op","operator"]}}}}
		No newline at end of file