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

Cambia schemaRegistry a server local, adapta tests

parent 5febc7c2

src/main/resources/application-test.properties

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ redmic.elasticsearch.check.mappings=false 
#Kafka config

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



spring.kafka.properties.schema.registry.url=http://redmic.net:18081

spring.kafka.properties.schema.registry.url=http://localhost:${schema.registry.port}



# DATASOURCE (DataSourceAutoConfiguration & DataSourceProperties)

spring.datasource.jdbc-url=jdbc:postgresql://redmic.net:5432/redmic?stringtype=unspecified&currentSchema=sde

src/test/java/es/redmic/test/tasks/integration/common/IntegrationTestBase.java

+9 −1
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ import java.net.URISyntaxException; 
import java.nio.file.Files;



import javax.activation.MimetypesFileTypeMap;

import javax.annotation.PostConstruct;



import org.apache.commons.logging.Log;

import org.apache.commons.logging.LogFactory;
@@ -25,11 +26,12 @@ import es.redmic.exception.mediastorage.MSFileNotFoundException; 
import es.redmic.mediastorage.service.FileUtils;

import es.redmic.mediastorage.service.MediaStorageServiceItfc;

import es.redmic.tasks.TasksApplication;

import es.redmic.testutils.kafka.KafkaBaseIntegrationTest;



@SpringBootTest(classes = { TasksApplication.class })

@ActiveProfiles("test")

@DirtiesContext

public abstract class IntegrationTestBase {

public abstract class IntegrationTestBase extends KafkaBaseIntegrationTest {



	protected final static String JOB_PARAMETER_KEY = "parameters";
@@ -38,6 +40,12 @@ public abstract class IntegrationTestBase { 
	@ClassRule

	public static KafkaEmbedded embeddedKafka = new KafkaEmbedded(1);



	@PostConstruct

	public void IntegrationTestBasePostConstruct() throws Exception {



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

	}



	@Autowired

	MediaStorageServiceItfc mediaStorage;

src/test/java/es/redmic/test/tasks/integration/ingest/data/document/IngestDataDocumentTest.java

+2 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ import org.junit.runner.RunWith; 
import org.springframework.beans.factory.annotation.Autowired;

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

import org.springframework.boot.test.mock.mockito.MockBean;

import org.springframework.test.context.TestPropertySource;

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



import es.redmic.db.administrative.service.DocumentService;
@@ -35,6 +36,7 @@ import es.redmic.test.tasks.integration.ingest.common.IngestBaseTest; 
import es.redmic.test.tasks.utils.mapper.JsonToBeanTestUtil;



@RunWith(SpringJUnit4ClassRunner.class)

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

public class IngestDataDocumentTest extends IngestBaseTest {



	@MockBean

src/test/java/es/redmic/test/tasks/integration/ingest/geodata/area/IngestDataAreaTest.java

+2 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ import org.junit.runner.RunWith; 
import org.springframework.beans.factory.annotation.Autowired;

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

import org.springframework.boot.test.mock.mockito.MockBean;

import org.springframework.test.context.TestPropertySource;

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



import es.redmic.db.geodata.area.service.AreaService;
@@ -25,6 +26,7 @@ import es.redmic.tasks.ingest.model.matching.common.dto.ItemNameDTO; 
import es.redmic.test.tasks.integration.ingest.common.IngestBaseTest;



@RunWith(SpringJUnit4ClassRunner.class)

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

public class IngestDataAreaTest extends IngestBaseTest {



	@MockBean

src/test/java/es/redmic/test/tasks/integration/ingest/geodata/tracking/IngestDataTrackingTest.java

+2 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ import org.junit.runner.RunWith; 
import org.springframework.beans.factory.annotation.Autowired;

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

import org.springframework.boot.test.mock.mockito.MockBean;

import org.springframework.test.context.TestPropertySource;

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



import es.redmic.db.geodata.tracking.platform.service.PlatformTrackingService;
@@ -30,6 +31,7 @@ import es.redmic.test.tasks.integration.ingest.common.IngestBaseTest; 
import es.redmic.test.tasks.utils.mapper.JsonToBeanTestUtil;



@RunWith(SpringJUnit4ClassRunner.class)

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

public class IngestDataTrackingTest extends IngestBaseTest {



	@MockBean