Commit 03d1b5ca authored by Noel Alonso's avatar Noel Alonso
Browse files

Modifica los tests para evitar conflictos 

Modifica tests por cambio de nombre de propiedad activity

Cambia listener por añadir enrich al ciclo de vida
parent a0aa2e82

vessels-commands/src/docs/asciidocs/vessels-command.adoc

+1 −1
Original line number Diff line number Diff line
@@ -203,7 +203,7 @@ include::{snippets}/create-vessel-tracking-from-rest-test/update-vessel-tracking 




[[resources-delete-vessel-tracking]]

== Delete vessel type

== Delete vessel tracking

 

=== Example

include::{snippets}/create-vessel-tracking-from-rest-test/delete-vessel-tracking_-send-delete-vessel-tracking-event_-if-command-was-success/curl-request.adoc[]

vessels-commands/src/main/java/es/redmic/vesselscommands/service/VesselTrackingCommandService.java

+2 −2
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ public class VesselTrackingCommandService implements CommandGeoServiceItfc<Vesse 


		checkActivityId(activityId);



		vesselTracking.getProperties().setActivityId(activityId);

		vesselTracking.getProperties().setActivity(activityId);



		return commandHandler.save(new CreateVesselTrackingCommand(vesselTracking));

	}
@@ -64,7 +64,7 @@ public class VesselTrackingCommandService implements CommandGeoServiceItfc<Vesse 


		checkActivityId(activityId);



		vesselTracking.getProperties().setActivityId(activityId);

		vesselTracking.getProperties().setActivity(activityId);



		return commandHandler.update(id, new UpdateVesselTrackingCommand(vesselTracking));

	}

vessels-commands/src/test/java/es/redmic/test/vesselscommands/integration/vessel/CreateVesselFromTrackingTest.java→vessels-commands/src/test/java/es/redmic/test/vesselscommands/integration/vessel/CreateVesselFromAISTest.java

+8 −9
Original line number Diff line number Diff line
@@ -34,16 +34,15 @@ import es.redmic.test.vesselscommands.integration.KafkaEmbeddedConfig; 
import es.redmic.testutils.kafka.KafkaBaseIntegrationTest;

import es.redmic.vesselscommands.VesselsCommandsApplication;

import es.redmic.vesselslib.dto.vessel.VesselDTO;

import es.redmic.vesselslib.events.vessel.create.CreateVesselEvent;

import es.redmic.vesselslib.events.vessel.create.EnrichCreateVesselEvent;



@RunWith(SpringJUnit4ClassRunner.class)

@TestPropertySource(properties = { "spring.kafka.consumer.group-id=CreateVesselFromTrackingTest",

		"schema.registry.port=18082" })

@TestPropertySource(properties = { "spring.kafka.consumer.group-id=CreateVesselFromAIS", "schema.registry.port=18082" })

@SpringBootTest(classes = { VesselsCommandsApplication.class })

@ActiveProfiles("test")

@DirtiesContext

@KafkaListener(topics = "${broker.topic.vessel}", groupId = "test")

public class CreateVesselFromTrackingTest extends KafkaBaseIntegrationTest {

@KafkaListener(topics = "${broker.topic.vessel}", groupId = "CreateVesselFromAISTest")

public class CreateVesselFromAISTest extends KafkaBaseIntegrationTest {



	@Value("${broker.topic.realtime.tracking.vessels}")

	String REALTIME_TRACKING_VESSELS_TOPIC;
@@ -58,7 +57,7 @@ public class CreateVesselFromTrackingTest extends KafkaBaseIntegrationTest { 
	protected static BlockingQueue<Object> blockingQueue;



	@PostConstruct

	public void CreateVesselFromTrackingTestPostConstruct() throws Exception {

	public void CreateVesselFromAISTestPostConstruct() throws Exception {

		createSchemaRegistryRestApp(embeddedKafka.getZookeeperConnectionString(), embeddedKafka.getBrokersAsString());

	}
@@ -72,7 +71,7 @@ public class CreateVesselFromTrackingTest extends KafkaBaseIntegrationTest { 
	public void createVessel_SendCreateVesselEvent_IfCommandWasSuccess() throws Exception {



		AISTrackingDTO dto = new AISTrackingDTO();

		dto.setMmsi(1);

		dto.setMmsi(2);

		dto.setImo(1);

		dto.setName("Avatar");

		dto.setType(70);
@@ -89,7 +88,7 @@ public class CreateVesselFromTrackingTest extends KafkaBaseIntegrationTest { 
				.send(REALTIME_TRACKING_VESSELS_TOPIC, "vessel-mmsi-" + dto.getMmsi(), dto);

		future.addCallback(new SendListener());



		VesselDTO vessel = (VesselDTO) blockingQueue.poll(60, TimeUnit.SECONDS);

		VesselDTO vessel = (VesselDTO) blockingQueue.poll(120, TimeUnit.SECONDS);

		assertNotNull(vessel);

		assertEquals(vessel.getMmsi(), dto.getMmsi());

		assertEquals(vessel.getName(), dto.getName());
@@ -101,7 +100,7 @@ public class CreateVesselFromTrackingTest extends KafkaBaseIntegrationTest { 
	}



	@KafkaHandler

	public void listen(CreateVesselEvent createEvent) {

	public void listen(EnrichCreateVesselEvent createEvent) {



		blockingQueue.offer(createEvent.getVessel());

	}

vessels-commands/src/test/java/es/redmic/test/vesselscommands/integration/vessel/CreateVesselFromRestTest.java

+3 −3
Original line number Diff line number Diff line
@@ -66,16 +66,16 @@ import es.redmic.vesselslib.events.vessel.update.UpdateVesselEvent; 
@SpringBootTest(classes = { VesselsCommandsApplication.class })

@ActiveProfiles("test")

@DirtiesContext

@TestPropertySource(properties = { "spring.kafka.consumer.group-id=CreateVesselFromRestTest",

@TestPropertySource(properties = { "spring.kafka.consumer.group-id=CreateVesselFromRest",

		"schema.registry.port=18081" })

@KafkaListener(topics = "${broker.topic.vessel}", groupId = "test")

@KafkaListener(topics = "${broker.topic.vessel}", groupId = "CreateVesselFromRestTest")

public class CreateVesselFromRestTest extends DocumentationCommandBaseTest {



	@ClassRule

	public static KafkaEmbedded embeddedKafka = new KafkaEmbedded(KafkaEmbeddedConfig.NUM_BROKERS, true,

			KafkaEmbeddedConfig.PARTITIONS_PER_TOPIC, KafkaEmbeddedConfig.TOPICS_NAME);



	private final Integer mmsi = 1111;

	private final Integer mmsi = 5555;



	// @formatter:off

vessels-commands/src/test/java/es/redmic/test/vesselscommands/integration/vessel/VesselCommandHandlerTest.java

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ import es.redmic.vesselslib.events.vesseltype.create.VesselTypeCreatedEvent; 
@SpringBootTest(classes = { VesselsCommandsApplication.class })

@ActiveProfiles("test")

@DirtiesContext

@KafkaListener(topics = "${broker.topic.vessel}", groupId = "${random.value}")

@KafkaListener(topics = "${broker.topic.vessel}", groupId = "VesselCommandHandler")

@TestPropertySource(properties = { "spring.kafka.consumer.group-id=VesselCommandHandlerTest",

		"schema.registry.port=18084" })

public class VesselCommandHandlerTest extends KafkaBaseIntegrationTest {