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

Cambia uso de la clase de tipos de eventos

parent e52ae6de

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

+7 −7
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ import es.redmic.testutils.kafka.KafkaBaseIntegrationTest; 
import es.redmic.vesselscommands.VesselsCommandsApplication;

import es.redmic.vesselscommands.commands.VesselCommandHandler;

import es.redmic.vesselslib.dto.VesselDTO;

import es.redmic.vesselslib.events.vessel.VesselEventType;

import es.redmic.vesselslib.events.vessel.VesselEventTypes;

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

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

import es.redmic.vesselslib.events.vessel.create.CreateVesselEvent;
@@ -119,7 +119,7 @@ public class VesselCommandHandlerTest extends KafkaBaseIntegrationTest { 
		Event confirm = (Event) blockingQueue.poll(60, TimeUnit.SECONDS);



		assertNotNull(confirm);

		assertEquals(VesselEventType.VESSEL_CREATED.toString(), confirm.getType());

		assertEquals(VesselEventTypes.CREATED, confirm.getType());



		assertEquals(createVesselEvent.getVessel(), ((VesselCreatedEvent) confirm).getVessel());

	}
@@ -140,7 +140,7 @@ public class VesselCommandHandlerTest extends KafkaBaseIntegrationTest { 
		Event confirm = (Event) blockingQueue.poll(60, TimeUnit.SECONDS);



		assertNotNull(confirm);

		assertEquals(VesselEventType.VESSEL_UPDATED.toString(), confirm.getType());

		assertEquals(VesselEventTypes.UPDATED, confirm.getType());

		assertEquals(updateVesselEvent.getVessel(), ((VesselUpdatedEvent) confirm).getVessel());

	}
@@ -158,7 +158,7 @@ public class VesselCommandHandlerTest extends KafkaBaseIntegrationTest { 
		Event confirm = (Event) blockingQueue.poll(30, TimeUnit.SECONDS);



		assertNotNull(confirm);

		assertEquals(VesselEventType.VESSEL_DELETED.toString(), confirm.getType());

		assertEquals(VesselEventTypes.DELETED, confirm.getType());

		assertEquals(event.getAggregateId(), confirm.getAggregateId());

		assertEquals(event.getUserId(), confirm.getUserId());

		assertEquals(event.getSessionId(), confirm.getSessionId());
@@ -189,7 +189,7 @@ public class VesselCommandHandlerTest extends KafkaBaseIntegrationTest { 
		Whitebox.invokeMethod(vesselCommandHandler, "getResult", event.getSessionId(), completableFuture);



		assertNotNull(confirm);

		assertEquals(VesselEventType.CREATE_VESSEL_CANCELLED.toString(), confirm.getType());

		assertEquals(VesselEventTypes.CREATE_CANCELLED, confirm.getType());

	}



	// Envía un evento de error de modificación y debe provocar un evento Cancelled
@@ -227,7 +227,7 @@ public class VesselCommandHandlerTest extends KafkaBaseIntegrationTest { 
		Whitebox.invokeMethod(vesselCommandHandler, "getResult", event.getSessionId(), completableFuture);



		assertNotNull(confirm);

		assertEquals(VesselEventType.UPDATE_VESSEL_CANCELLED.toString(), confirm.getType());

		assertEquals(VesselEventTypes.UPDATE_CANCELLED, confirm.getType());

		assertEquals(vesselUpdatedEvent.getVessel(), ((UpdateVesselCancelledEvent) confirm).getVessel());

	}
@@ -265,7 +265,7 @@ public class VesselCommandHandlerTest extends KafkaBaseIntegrationTest { 
		Whitebox.invokeMethod(vesselCommandHandler, "getResult", event.getSessionId(), completableFuture);



		assertNotNull(confirm);

		assertEquals(VesselEventType.DELETE_VESSEL_CANCELLED.toString(), confirm.getType());

		assertEquals(VesselEventTypes.DELETE_CANCELLED, confirm.getType());

		assertEquals(vesselUpdateEvent.getVessel(), ((DeleteVesselCancelledEvent) confirm).getVessel());

	}

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

+4 −4
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ import es.redmic.exception.common.ExceptionType; 
import es.redmic.test.vesselscommands.integration.vesseltype.VesselTypeDataUtil;

import es.redmic.vesselslib.dto.VesselDTO;

import es.redmic.vesselslib.dto.VesselTypeDTO;

import es.redmic.vesselslib.events.vessel.VesselEventType;

import es.redmic.vesselslib.events.vessel.VesselEventTypes;

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

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

import es.redmic.vesselslib.events.vessel.create.CreateVesselFailedEvent;
@@ -34,7 +34,7 @@ public abstract class VesselDataUtil { 
		event.setAggregateId(PREFIX + mmsi);

		event.setDate(DateTime.now());

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

		event.setType(VesselEventType.CREATE_VESSEL.name());

		event.setType(VesselEventTypes.CREATE);

		event.setVersion(1);

		event.setUserId(USER);

		event.setSessionId("sessionIdA");
@@ -75,7 +75,7 @@ public abstract class VesselDataUtil { 
		event.setAggregateId(PREFIX + mmsi);

		event.setDate(DateTime.now());

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

		event.setType(VesselEventType.UPDATE_VESSEL.name());

		event.setType(VesselEventTypes.UPDATE);

		event.setVersion(2);

		event.setUserId(USER);

		event.setSessionId("sessionIdB");
@@ -116,7 +116,7 @@ public abstract class VesselDataUtil { 
		event.setAggregateId(PREFIX + mmsi);

		event.setDate(DateTime.now());

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

		event.setType(VesselEventType.DELETE_VESSEL.name());

		event.setType(VesselEventTypes.DELETE);

		event.setVersion(3);

		event.setUserId(USER);

		event.setSessionId("sessionIdC");

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

+3 −3
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ import es.redmic.brokerlib.avro.common.Event; 
import es.redmic.test.vesselscommands.integration.vesseltype.VesselTypeDataUtil;

import es.redmic.testutils.kafka.KafkaBaseIntegrationTest;

import es.redmic.vesselscommands.VesselsCommandsApplication;

import es.redmic.vesselslib.events.vessel.VesselEventType;

import es.redmic.vesselslib.events.vessel.VesselEventTypes;

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

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

import es.redmic.vesselslib.events.vessel.update.UpdateVesselEvent;
@@ -126,13 +126,13 @@ public class VesselPostUpdateHandlerTest extends KafkaBaseIntegrationTest { 


		Event update = (Event) blockingQueue.poll(30, TimeUnit.SECONDS);

		assertNotNull(update);

		assertEquals(VesselEventType.UPDATE_VESSEL.toString(), update.getType());

		assertEquals(VesselEventTypes.UPDATE, update.getType());

		assertEquals(vesselTypeUpdatedEvent.getVesselType(), ((UpdateVesselEvent) update).getVessel().getType());

		assertEquals(vesselCreatedEvent.getAggregateId(), ((UpdateVesselEvent) update).getAggregateId());



		Event update2 = (Event) blockingQueue.poll(30, TimeUnit.SECONDS);

		assertNotNull(update2);

		assertEquals(VesselEventType.UPDATE_VESSEL.toString(), update2.getType());

		assertEquals(VesselEventTypes.UPDATE, update2.getType());

		assertEquals(vesselTypeUpdatedEvent.getVesselType(), ((UpdateVesselEvent) update2).getVessel().getType());

		assertEquals(vesselCreatedEvent2.getAggregateId(), ((UpdateVesselEvent) update2).getAggregateId());

vessels-commands/src/test/java/es/redmic/test/vesselscommands/integration/vesseltype/VesselTypeCommandHandlerTest.java

+7 −7
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ import es.redmic.testutils.kafka.KafkaBaseIntegrationTest; 
import es.redmic.vesselscommands.VesselsCommandsApplication;

import es.redmic.vesselscommands.commands.VesselTypeCommandHandler;

import es.redmic.vesselslib.dto.VesselTypeDTO;

import es.redmic.vesselslib.events.vesseltype.VesselTypeEventType;

import es.redmic.vesselslib.events.vesseltype.VesselTypeEventTypes;

import es.redmic.vesselslib.events.vesseltype.create.CreateVesselTypeCancelledEvent;

import es.redmic.vesselslib.events.vesseltype.create.CreateVesselTypeConfirmedEvent;

import es.redmic.vesselslib.events.vesseltype.create.CreateVesselTypeEvent;
@@ -121,7 +121,7 @@ public class VesselTypeCommandHandlerTest extends KafkaBaseIntegrationTest { 
		Event confirm = (Event) blockingQueue.poll(120, TimeUnit.SECONDS);



		assertNotNull(confirm);

		assertEquals(VesselTypeEventType.VESSELTYPE_CREATED.toString(), confirm.getType());

		assertEquals(VesselTypeEventTypes.CREATED, confirm.getType());



		assertEquals(createVesselTypeEvent.getVesselType(), ((VesselTypeCreatedEvent) confirm).getVesselType());

	}
@@ -144,7 +144,7 @@ public class VesselTypeCommandHandlerTest extends KafkaBaseIntegrationTest { 
		Event confirm = (Event) blockingQueue.poll(60, TimeUnit.SECONDS);



		assertNotNull(confirm);

		assertEquals(VesselTypeEventType.VESSELTYPE_UPDATED.toString(), confirm.getType());

		assertEquals(VesselTypeEventTypes.UPDATED, confirm.getType());

		assertEquals(updateVesselTypeEvent.getVesselType(), ((VesselTypeUpdatedEvent) confirm).getVesselType());

	}
@@ -162,7 +162,7 @@ public class VesselTypeCommandHandlerTest extends KafkaBaseIntegrationTest { 
		Event confirm = (Event) blockingQueue.poll(60, TimeUnit.SECONDS);



		assertNotNull(confirm);

		assertEquals(VesselTypeEventType.VESSELTYPE_DELETED.toString(), confirm.getType());

		assertEquals(VesselTypeEventTypes.DELETED, confirm.getType());

		assertEquals(event.getAggregateId(), confirm.getAggregateId());

		assertEquals(event.getUserId(), confirm.getUserId());

		assertEquals(event.getSessionId(), confirm.getSessionId());
@@ -194,7 +194,7 @@ public class VesselTypeCommandHandlerTest extends KafkaBaseIntegrationTest { 
		Whitebox.invokeMethod(vesselTypeCommandHandler, "getResult", event.getSessionId(), completableFuture);



		assertNotNull(confirm);

		assertEquals(VesselTypeEventType.CREATE_VESSELTYPE_CANCELLED.toString(), confirm.getType());

		assertEquals(VesselTypeEventTypes.CREATE_CANCELLED, confirm.getType());

	}



	// Envía un evento de error de modificación y debe provocar un evento Cancelled
@@ -231,7 +231,7 @@ public class VesselTypeCommandHandlerTest extends KafkaBaseIntegrationTest { 
		Whitebox.invokeMethod(vesselTypeCommandHandler, "getResult", event.getSessionId(), completableFuture);



		assertNotNull(confirm);

		assertEquals(VesselTypeEventType.UPDATE_VESSELTYPE_CANCELLED.toString(), confirm.getType());

		assertEquals(VesselTypeEventTypes.UPDATE_CANCELLED, confirm.getType());

		assertEquals(vesselTypeUpdateEvent.getVesselType(), ((UpdateVesselTypeCancelledEvent) confirm).getVesselType());

	}
@@ -270,7 +270,7 @@ public class VesselTypeCommandHandlerTest extends KafkaBaseIntegrationTest { 
		Whitebox.invokeMethod(vesselTypeCommandHandler, "getResult", event.getSessionId(), completableFuture);



		assertNotNull(confirm);

		assertEquals(VesselTypeEventType.DELETE_VESSELTYPE_CANCELLED.toString(), confirm.getType());

		assertEquals(VesselTypeEventTypes.DELETE_CANCELLED, confirm.getType());

		assertEquals(vesselTypeUpdateEvent.getVesselType(), ((DeleteVesselTypeCancelledEvent) confirm).getVesselType());

	}

vessels-commands/src/test/java/es/redmic/test/vesselscommands/integration/vesseltype/VesselTypeDataUtil.java

+4 −4
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ import org.joda.time.DateTime; 


import es.redmic.exception.common.ExceptionType;

import es.redmic.vesselslib.dto.VesselTypeDTO;

import es.redmic.vesselslib.events.vesseltype.VesselTypeEventType;

import es.redmic.vesselslib.events.vesseltype.VesselTypeEventTypes;

import es.redmic.vesselslib.events.vesseltype.create.CreateVesselTypeConfirmedEvent;

import es.redmic.vesselslib.events.vesseltype.create.CreateVesselTypeEvent;

import es.redmic.vesselslib.events.vesseltype.create.CreateVesselTypeFailedEvent;
@@ -32,7 +32,7 @@ public abstract class VesselTypeDataUtil { 
		event.setAggregateId(PREFIX + code);

		event.setDate(DateTime.now());

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

		event.setType(VesselTypeEventType.CREATE_VESSELTYPE.name());

		event.setType(VesselTypeEventTypes.CREATE);

		event.setVersion(1);

		event.setUserId(USER);

		event.setSessionId("sessionIdA");
@@ -74,7 +74,7 @@ public abstract class VesselTypeDataUtil { 
		event.setAggregateId(PREFIX + code);

		event.setDate(DateTime.now());

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

		event.setType(VesselTypeEventType.UPDATE_VESSELTYPE.name());

		event.setType(VesselTypeEventTypes.UPDATE);

		event.setVersion(2);

		event.setUserId(USER);

		event.setSessionId("sessionIdB");
@@ -116,7 +116,7 @@ public abstract class VesselTypeDataUtil { 
		event.setAggregateId(PREFIX + code);

		event.setDate(DateTime.now());

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

		event.setType(VesselTypeEventType.DELETE_VESSELTYPE.name());

		event.setType(VesselTypeEventTypes.DELETE);

		event.setVersion(3);

		event.setUserId(USER);

		event.setSessionId("sessionIdC");