Commit 8410f73c authored by Noel Alonso's avatar Noel Alonso
Browse files

Adapta tests para integrar schemaRegistry local

parent 182d896c

vessels-view/src/test/java/es/redmic/test/vesselsview/integration/common/CommonIntegrationTest.java

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



import org.junit.ClassRule;

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

import org.springframework.test.annotation.DirtiesContext;



import es.redmic.testutils.documentation.DocumentationViewBaseTest;



@DirtiesContext

public abstract class CommonIntegrationTest extends DocumentationViewBaseTest {



	@ClassRule

	public static KafkaEmbedded embeddedKafka = new KafkaEmbedded(1);

}

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

+20 −2
Original line number Diff line number Diff line
@@ -11,20 +11,26 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. 
import java.util.Arrays;

import java.util.UUID;



import javax.annotation.PostConstruct;



import org.junit.After;

import org.junit.Before;

import org.junit.ClassRule;

import org.junit.Test;

import org.junit.runner.RunWith;

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

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

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

import org.springframework.http.MediaType;

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

import org.springframework.test.annotation.DirtiesContext;

import org.springframework.test.context.TestPropertySource;

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

import org.springframework.test.web.servlet.setup.MockMvcBuilders;



import es.redmic.models.es.common.query.dto.MetadataQueryDTO;

import es.redmic.models.es.common.query.dto.MgetDTO;

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

import es.redmic.testutils.documentation.DocumentationViewBaseTest;

import es.redmic.vesselsview.VesselsViewApplication;

import es.redmic.vesselsview.model.Vessel;

import es.redmic.vesselsview.model.VesselType;
@@ -32,7 +38,9 @@ import es.redmic.vesselsview.repository.VesselESRepository; 


@SpringBootTest(classes = { VesselsViewApplication.class })

@RunWith(SpringJUnit4ClassRunner.class)

public class VesselControllerTest extends CommonIntegrationTest {

@TestPropertySource(properties = { "schema.registry.port=18081" })

@DirtiesContext

public class VesselControllerTest extends DocumentationViewBaseTest {



	@Value("${documentation.VESSEL_HOST}")

	private String VESSEL_HOST;
@@ -42,6 +50,16 @@ public class VesselControllerTest extends CommonIntegrationTest { 


	Vessel vessel = new Vessel();



	@ClassRule

	public static KafkaEmbedded embeddedKafka = new KafkaEmbedded(1);



	@PostConstruct

	public void CreateVesselFromRestTestPostConstruct() throws Exception {



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

	}



	@Override

	@Before

	public void setUp() {

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

+20 −2
Original line number Diff line number Diff line
@@ -11,27 +11,35 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. 
import java.util.Arrays;

import java.util.UUID;



import javax.annotation.PostConstruct;



import org.junit.After;

import org.junit.Before;

import org.junit.ClassRule;

import org.junit.Test;

import org.junit.runner.RunWith;

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

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

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

import org.springframework.http.MediaType;

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

import org.springframework.test.annotation.DirtiesContext;

import org.springframework.test.context.TestPropertySource;

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

import org.springframework.test.web.servlet.setup.MockMvcBuilders;



import es.redmic.models.es.common.query.dto.MgetDTO;

import es.redmic.models.es.common.query.dto.SimpleQueryDTO;

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

import es.redmic.testutils.documentation.DocumentationViewBaseTest;

import es.redmic.vesselsview.VesselsViewApplication;

import es.redmic.vesselsview.model.VesselType;

import es.redmic.vesselsview.repository.VesselTypeESRepository;



@SpringBootTest(classes = { VesselsViewApplication.class })

@RunWith(SpringJUnit4ClassRunner.class)

public class VesselTypeControllerTest extends CommonIntegrationTest {

@TestPropertySource(properties = { "schema.registry.port=18082" })

@DirtiesContext

public class VesselTypeControllerTest extends DocumentationViewBaseTest {



	@Value("${documentation.VESSELTYPE_HOST}")

	private String VESSELTYPE_HOST;
@@ -44,6 +52,16 @@ public class VesselTypeControllerTest extends CommonIntegrationTest { 


	VesselType vesselType = new VesselType();



	@ClassRule

	public static KafkaEmbedded embeddedKafka = new KafkaEmbedded(1);



	@PostConstruct

	public void CreateVesselFromRestTestPostConstruct() throws Exception {



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

	}



	@Override

	@Before

	public void setUp() {

vessels-view/src/test/java/es/redmic/test/vesselsview/integration/handler/VesselEventHandlerTest.java

+22 −2
Original line number Diff line number Diff line
@@ -11,9 +11,12 @@ import java.util.concurrent.BlockingQueue; 
import java.util.concurrent.LinkedBlockingDeque;

import java.util.concurrent.TimeUnit;



import javax.annotation.PostConstruct;



import org.joda.time.DateTime;

import org.junit.Before;

import org.junit.BeforeClass;

import org.junit.ClassRule;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.springframework.beans.factory.annotation.Autowired;
@@ -23,6 +26,10 @@ import org.springframework.kafka.annotation.KafkaHandler; 
import org.springframework.kafka.annotation.KafkaListener;

import org.springframework.kafka.core.KafkaTemplate;

import org.springframework.kafka.support.SendResult;

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

import org.springframework.test.annotation.DirtiesContext;

import org.springframework.test.context.ActiveProfiles;

import org.springframework.test.context.TestPropertySource;

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

import org.springframework.util.concurrent.ListenableFuture;
@@ -30,7 +37,7 @@ import es.redmic.brokerlib.avro.common.Event; 
import es.redmic.brokerlib.listener.SendListener;

import es.redmic.exception.data.ItemNotFoundException;

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

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

import es.redmic.testutils.documentation.DocumentationViewBaseTest;

import es.redmic.vesselslib.dto.VesselDTO;

import es.redmic.vesselslib.dto.VesselTypeDTO;

import es.redmic.vesselslib.events.vessel.VesselEventType;
@@ -51,7 +58,10 @@ import es.redmic.viewlib.config.MapperScanBeanItfc; 
@SpringBootTest(classes = { VesselsViewApplication.class })

@RunWith(SpringJUnit4ClassRunner.class)

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

public class VesselEventHandlerTest extends CommonIntegrationTest {

@TestPropertySource(properties = { "schema.registry.port=18083" })

@DirtiesContext

@ActiveProfiles("test")

public class VesselEventHandlerTest extends DocumentationViewBaseTest {



	private final String USER_ID = "1";
@@ -69,12 +79,22 @@ public class VesselEventHandlerTest extends CommonIntegrationTest { 
	@Autowired

	VesselESRepository repository;



	@ClassRule

	public static KafkaEmbedded embeddedKafka = new KafkaEmbedded(1);



	@PostConstruct

	public void CreateVesselFromRestTestPostConstruct() throws Exception {



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

	}



	@BeforeClass

	public static void setup() {



		blockingQueue = new LinkedBlockingDeque<>();

	}



	@Override

	@Before

	public void setUp() {

	}

vessels-view/src/test/java/es/redmic/test/vesselsview/integration/handler/VesselTypeEventHandlerTest.java

+21 −2
Original line number Diff line number Diff line
@@ -10,8 +10,11 @@ import java.util.concurrent.BlockingQueue; 
import java.util.concurrent.LinkedBlockingDeque;

import java.util.concurrent.TimeUnit;



import javax.annotation.PostConstruct;



import org.joda.time.DateTime;

import org.junit.BeforeClass;

import org.junit.ClassRule;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.springframework.beans.factory.annotation.Autowired;
@@ -21,6 +24,10 @@ import org.springframework.kafka.annotation.KafkaHandler; 
import org.springframework.kafka.annotation.KafkaListener;

import org.springframework.kafka.core.KafkaTemplate;

import org.springframework.kafka.support.SendResult;

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

import org.springframework.test.annotation.DirtiesContext;

import org.springframework.test.context.ActiveProfiles;

import org.springframework.test.context.TestPropertySource;

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

import org.springframework.util.concurrent.ListenableFuture;
@@ -28,7 +35,7 @@ import es.redmic.brokerlib.avro.common.Event; 
import es.redmic.brokerlib.listener.SendListener;

import es.redmic.exception.data.ItemNotFoundException;

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

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

import es.redmic.testutils.documentation.DocumentationViewBaseTest;

import es.redmic.vesselslib.dto.VesselTypeDTO;

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

import es.redmic.vesselslib.events.vesseltype.create.CreateVesselTypeConfirmedEvent;
@@ -48,7 +55,10 @@ import es.redmic.viewlib.config.MapperScanBeanItfc; 
@SpringBootTest(classes = { VesselsViewApplication.class })

@RunWith(SpringJUnit4ClassRunner.class)

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

public class VesselTypeEventHandlerTest extends CommonIntegrationTest {

@TestPropertySource(properties = { "schema.registry.port=18084" })

@DirtiesContext

@ActiveProfiles("test")

public class VesselTypeEventHandlerTest extends DocumentationViewBaseTest {



	private final String USER_ID = "1";
@@ -66,6 +76,15 @@ public class VesselTypeEventHandlerTest extends CommonIntegrationTest { 
	@Value("${broker.topic.vessel-type}")

	private String VESSEL_TYPE_TOPIC;



	@ClassRule

	public static KafkaEmbedded embeddedKafka = new KafkaEmbedded(1);



	@PostConstruct

	public void CreateVesselFromRestTestPostConstruct() throws Exception {



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

	}



	@BeforeClass

	public static void setup() {