Commit e9616fc6 authored by Noel Alonso's avatar Noel Alonso
Browse files

Arregla test por cambio en mapper

parent 0a94a96c

vessels-view/src/test/java/es/redmic/test/vesselsview/unit/mapper/VesselTrackingMapperTest.java

+31 −13
Original line number Diff line number Diff line 
package es.redmic.test.vesselsview.unit.mapper;



import java.io.IOException;

import java.util.HashMap;

import java.util.Map;



import org.json.JSONException;

import org.junit.Before;
@@ -14,16 +16,19 @@ import com.fasterxml.jackson.core.JsonParseException; 
import com.fasterxml.jackson.databind.JavaType;

import com.fasterxml.jackson.databind.JsonMappingException;



import es.redmic.models.es.common.dto.JSONCollectionDTO;

import es.redmic.models.es.data.common.model.DataSearchWrapper;

import es.redmic.models.es.geojson.common.dto.GeoJSONFeatureCollectionDTO;

import es.redmic.models.es.geojson.wrapper.GeoSearchWrapper;

import es.redmic.testutils.utils.JsonToBeanTestUtil;

import es.redmic.vesselslib.dto.tracking.VesselTrackingDTO;

import es.redmic.vesselsview.config.MapperScanBean;

import es.redmic.vesselsview.mapper.vessel.VesselESMapper;

import es.redmic.vesselsview.mapper.vesseltracking.VesselTrackingESMapper;

import es.redmic.vesselsview.mapper.vesseltracking.VesselTrackingPropertiesESMapper;

import es.redmic.vesselsview.mapper.vesseltype.VesselTypeESMapper;

import es.redmic.vesselsview.model.vesseltracking.VesselTracking;

import es.redmic.viewlib.common.mapper.es2dto.DataCollectionESMapper;

import es.redmic.viewlib.common.mapper.es2dto.DataItemESMapper;

import es.redmic.viewlib.common.mapper.es2dto.FeatureCollectionMapper;

import es.redmic.viewlib.common.mapper.es2dto.FeatureMapper;

import ma.glasnost.orika.MappingContext;



@RunWith(MockitoJUnitRunner.class)

public class VesselTrackingMapperTest {
@@ -32,13 +37,19 @@ public class VesselTrackingMapperTest { 
	VesselTrackingESMapper mapper;



	@InjectMocks

	DataCollectionESMapper dataCollectionMapper;

	VesselTrackingPropertiesESMapper mapperProperties;



	@InjectMocks

	DataItemESMapper dataItemMapper;

	VesselESMapper mapperVessel;



	@InjectMocks

	VesselTypeESMapper vesselTypeESMapper;

	VesselTypeESMapper mapperVesselType;



	@InjectMocks

	FeatureCollectionMapper geoDataCollectionMapper;



	@InjectMocks

	FeatureMapper geoDataItemMapper;



	protected MapperScanBean factory = new MapperScanBean().build();
@@ -55,8 +66,11 @@ public class VesselTrackingMapperTest { 
	public void setupTest() throws IOException {



		factory.addMapper(mapper);

		factory.addMapper(dataCollectionMapper);

		factory.addMapper(dataItemMapper);

		factory.addMapper(mapperProperties);

		factory.addMapper(mapperVessel);

		factory.addMapper(mapperVesselType);

		factory.addMapper(geoDataCollectionMapper);

		factory.addMapper(geoDataItemMapper);

	}



	@Test
@@ -76,14 +90,18 @@ public class VesselTrackingMapperTest { 
	@Test

	public void mapperSearchWrapperToDto() throws JsonParseException, JsonMappingException, IOException, JSONException {



		JavaType type = JsonToBeanTestUtil.getParametizedType(DataSearchWrapper.class, VesselTracking.class);

		JavaType type = JsonToBeanTestUtil.getParametizedType(GeoSearchWrapper.class, VesselTracking.class);



		DataSearchWrapper<?> searchWrapperModel = (DataSearchWrapper<?>) JsonToBeanTestUtil.getBean(searchWrapperPath,

		GeoSearchWrapper<?> searchWrapperModel = (GeoSearchWrapper<?>) JsonToBeanTestUtil.getBean(searchWrapperPath,

				type);

		String expected = JsonToBeanTestUtil.getJsonString(searchDTOPath);



		JSONCollectionDTO searchDTO = factory.getMapperFacade().map(searchWrapperModel.getHits(),

				JSONCollectionDTO.class);

		Map<Object, Object> globalProperties = new HashMap<Object, Object>();

		globalProperties.put("targetTypeDto", VesselTrackingDTO.class);

		MappingContext context = new MappingContext(globalProperties);



		GeoJSONFeatureCollectionDTO searchDTO = factory.getMapperFacade().map(searchWrapperModel.getHits(),

				GeoJSONFeatureCollectionDTO.class, context);



		String searchDTOString = JsonToBeanTestUtil.writeValueAsString(searchDTO);

vessels-view/src/test/resources/data/dto/vesseltracking/searchWrapperVesselTrackingDTO.json

+46 −49
Original line number Diff line number Diff line 
{

	"total": 1,

	"_meta": {

		"max_score": null

	},

	"_aggs": {

		

	},

	"data": [

		{

	"type": "FeatureCollection",

	"features": [{

		"_meta": {

			"score": 1.0,

			"version": 1,
@@ -16,11 +9,9 @@ 
		"id": "vesseltracking-mmsi-tstamp-247039300-34342329243244232",

		"uuid": "sdsd323sdds_3ed",

		"type": "Feature",

			"geometry": {

				"type": "Point",

				"coordinates": [-16.35215172, 28.35351045]

			},

		"properties": {

			"inserted": "2017-05-23T11:37:12.052+00:00",

			"updated": "2017-05-23T11:37:12.052+00:00",

			"activity": "r.1.8.22",

			"vessel": {

				"id": "d5673b99-f3d1-444d-aa47-d821aaebc11e",
@@ -34,21 +25,27 @@ 
				},

				"name": "GRANDE ITALIA",

				"callSign": "IBTF",

					"beam": 33.5,

				"length": 300.3,

					"updated": "2017-05-23T12:35:12.052+00:00",

					"inserted": "2017-05-23T12:35:12.052+00:00"

				"beam": 33.5,

				"inserted": "2017-05-23T12:35:12.052+00:00",

				"updated": "2017-05-23T12:35:12.052+00:00"

			},

			"date": "2017-05-23T11:35:12.052+00:00",

				"updated": "2017-05-23T11:37:12.052+00:00",

				"inserted": "2017-05-23T11:37:12.052+00:00",

			"cog": 23.3,

			"sog": 23.3,

			"heading": 12,

			"navStat": 33,

			"dest": "Santa Cruz de Tenerife",

			"eta": "00:00 00:00"

		},

		"geometry": {

			"type": "Point",

			"coordinates": [-16.35215172, 28.35351045]

		}

		}

	]

	}],

	"_aggs": {},

	"_meta": {

		"max_score": null

	},

	"total": 1

}
 
 No newline at end of file