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

Adapta tests para evitar conflictos de kafka

parent d727a5e1

vessels-commands/src/main/java/es/redmic/vesselscommands/streams/VesselEventStreams.java

+6 −6
Original line number Diff line number Diff line
@@ -60,8 +60,6 @@ public class VesselEventStreams extends EventStreams { 


	private Event getCreatedEvent(Event confirmedEvent, Event requestEvent) {



		logger.debug("Creando evento de creado exitoso para Vessel");



		if (!isSameSession(confirmedEvent, requestEvent)) {

			String message = "Recibido evento de petición con id de sessión diferente al evento de confirmación para item "

					+ confirmedEvent.getAggregateId();
@@ -75,6 +73,8 @@ public class VesselEventStreams extends EventStreams { 
			return null;

		}



		logger.debug("Creando evento de creado exitoso para Vessel");



		VesselDTO vessel = ((VesselEvent) requestEvent).getVessel();



		if (confirmedEvent.getType().equals(VesselEventType.CREATE_VESSEL_CONFIRMED.name())) {
@@ -109,8 +109,6 @@ public class VesselEventStreams extends EventStreams { 


	private Event getUpdatedEvent(Event confirmedEvent, Event requestEvent) {



		logger.debug("Creando evento de modificado exitoso para Vessel");



		if (!isSameSession(confirmedEvent, requestEvent)) {

			String message = "Recibido evento de petición con id de sessión diferente al evento de confirmación para item "

					+ confirmedEvent.getAggregateId();
@@ -124,6 +122,8 @@ public class VesselEventStreams extends EventStreams { 
			return null;

		}



		logger.debug("Creando evento de modificado exitoso para Vessel");



		VesselDTO vessel = ((VesselEvent) requestEvent).getVessel();



		if (confirmedEvent.getType().equals(VesselEventType.UPDATE_VESSEL_CONFIRMED.name())) {
@@ -162,14 +162,14 @@ public class VesselEventStreams extends EventStreams { 


	private Event getCancelledEvent(Event failedEvent, Event lastSuccessEvent) {



		logger.debug("Creando evento de cancelación para Vessel");



		if (!(lastSuccessEvent.getType().equals(VesselEventType.VESSEL_CREATED.name())

				|| lastSuccessEvent.getType().equals(VesselEventType.VESSEL_UPDATED.name()))) {

			logger.error("Se esperaba un evento satisfactorio de tipo CREATED o UPDATED para Vessel.");

			return null;

		}



		logger.debug("Creando evento de cancelación para Vessel");



		VesselDTO vessel = ((VesselEvent) lastSuccessEvent).getVessel();



		EventError eventError = (EventError) failedEvent;

vessels-commands/src/main/java/es/redmic/vesselscommands/streams/VesselTypeEventStreams.java

+6 −6
Original line number Diff line number Diff line
@@ -47,8 +47,6 @@ public class VesselTypeEventStreams extends EventStreams { 


	private Event getCreatedEvent(Event confirmedEvent, Event requestEvent) {



		logger.debug("Creando evento de creado exitoso");



		if (!isSameSession(confirmedEvent, requestEvent)) {

			String message = "Recibido evento de petición con id de sessión diferente al evento de confirmación para item "

					+ confirmedEvent.getAggregateId();
@@ -62,6 +60,8 @@ public class VesselTypeEventStreams extends EventStreams { 
			return null;

		}



		logger.debug("Creando evento de creado exitoso para VesselType");



		VesselTypeDTO vesselType = ((VesselTypeEvent) requestEvent).getVesselType();



		if (confirmedEvent.getType().equals(VesselTypeEventType.CREATE_VESSELTYPE_CONFIRMED.name())) {
@@ -96,8 +96,6 @@ public class VesselTypeEventStreams extends EventStreams { 


	private Event getUpdatedEvent(Event confirmedEvent, Event requestEvent) {



		logger.debug("Creando evento de modificado exitoso para VesselType");



		if (!isSameSession(confirmedEvent, requestEvent)) {

			String message = "Recibido evento de petición con id de sessión diferente al evento de confirmación para item "

					+ confirmedEvent.getAggregateId();
@@ -111,6 +109,8 @@ public class VesselTypeEventStreams extends EventStreams { 
			return null;

		}



		logger.debug("Creando evento de modificado exitoso para VesselType");



		VesselTypeDTO vesselType = ((VesselTypeEvent) requestEvent).getVesselType();



		if (confirmedEvent.getType().equals(VesselTypeEventType.UPDATE_VESSELTYPE_CONFIRMED.name())) {
@@ -150,14 +150,14 @@ public class VesselTypeEventStreams extends EventStreams { 


	private Event getCancelledEvent(Event failedEvent, Event lastSuccessEvent) {



		logger.debug("Creando evento de cancelación");



		if (!(lastSuccessEvent.getType().equals(VesselTypeEventType.VESSELTYPE_CREATED.name())

				|| lastSuccessEvent.getType().equals(VesselTypeEventType.VESSELTYPE_UPDATED.name()))) {

			logger.error("Se esperaba un evento satisfactorio de tipo CREATED o UPDATED.");

			return null;

		}



		logger.debug("Creando evento de cancelación para VesselType");



		VesselTypeDTO vesselType = ((VesselTypeEvent) lastSuccessEvent).getVesselType();



		EventError eventError = (EventError) failedEvent;

vessels-commands/src/main/resources/application.properties

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ spring.profiles.active=@spring.profiles.active@ 


logging.level.root=info

logging.level.org.springframework=info

logging.level.org.apache.kafka=error

logging.level.es.redmic=debug



spring.kafka.bootstrap-servers=${spring.kafka.bootstrap-servers}

vessels-commands/src/test/java/es/redmic/test/vesselscommands/integration/common/CommonIntegrationTest.java

deleted100644 → 0
+0 −23
Original line number Diff line number Diff line 
package es.redmic.test.vesselscommands.integration.common;



import org.junit.ClassRule;

import org.springframework.boot.test.context.SpringBootTest;

import org.springframework.kafka.test.rule.KafkaEmbedded;

import org.springframework.test.annotation.DirtiesContext;

import org.springframework.test.context.ActiveProfiles;



import es.redmic.vesselscommands.VesselsCommandsApplication;



@SpringBootTest(classes = { VesselsCommandsApplication.class })

@ActiveProfiles("test")

@DirtiesContext

public abstract class CommonIntegrationTest {



	// number of brokers.

	private final static Integer numBrokers = 3;

	// partitions per topic.

	private final static Integer partitionsPerTopic = 3;



	@ClassRule

	public static KafkaEmbedded embeddedKafka = new KafkaEmbedded(numBrokers, true, partitionsPerTopic);

}

vessels-commands/src/test/java/es/redmic/test/vesselscommands/integration/translation/ExceptionsTranslationTest.java

+11 −2
Original line number Diff line number Diff line
@@ -8,21 +8,30 @@ import java.util.Locale; 


import org.junit.Assert;

import org.junit.Before;

import org.junit.ClassRule;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.Mock;

import org.springframework.beans.factory.annotation.Autowired;

import org.springframework.boot.test.context.SpringBootTest;

import org.springframework.context.MessageSource;

import org.springframework.kafka.test.rule.KafkaEmbedded;

import org.springframework.test.context.ActiveProfiles;

import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;



import es.redmic.commandslib.exceptions.HistoryNotFoundException;

import es.redmic.exception.common.PatternUtils;

import es.redmic.test.vesselscommands.integration.common.CommonIntegrationTest;

import es.redmic.vesselscommands.VesselsCommandsApplication;

import es.redmic.vesselscommands.aggregate.VesselAggregate;

import es.redmic.vesselscommands.commands.UpdateVesselCommand;



@RunWith(SpringJUnit4ClassRunner.class)

public class ExceptionsTranslationTest extends CommonIntegrationTest {

@SpringBootTest(classes = { VesselsCommandsApplication.class })

@ActiveProfiles("test")

public class ExceptionsTranslationTest {



	@ClassRule

	public static KafkaEmbedded embeddedKafka = new KafkaEmbedded(1);



	@Autowired

	MessageSource messageSource;