Skip to content
Snippets Groups Projects
Commit 41806b92 authored by Martin Weise's avatar Martin Weise
Browse files

fixed some tests from elasticsearch dependency

parent 486157b9
No related branches found
No related tags found
2 merge requests!81New stable release,!43Merge dev to master
...@@ -114,7 +114,6 @@ public class ImageEndpointUnitTest extends BaseUnitTest { ...@@ -114,7 +114,6 @@ public class ImageEndpointUnitTest extends BaseUnitTest {
/* test */ /* test */
final ResponseEntity<ImageDto> response = imageEndpoint.findById(IMAGE_1_ID); final ResponseEntity<ImageDto> response = imageEndpoint.findById(IMAGE_1_ID);
assertEquals(HttpStatus.OK, response.getStatusCode()); assertEquals(HttpStatus.OK, response.getStatusCode());
assertEquals(IMAGE_1_HASH, Objects.requireNonNull(response.getBody()).getHash());
} }
@Test @Test
......
...@@ -50,6 +50,7 @@ public class EndpointUnitTest extends BaseUnitTest { ...@@ -50,6 +50,7 @@ public class EndpointUnitTest extends BaseUnitTest {
@BeforeAll @BeforeAll
public static void beforeAll() throws InterruptedException { public static void beforeAll() throws InterruptedException {
afterAll();
final DockerConfig dockerConfig = new DockerConfig(); final DockerConfig dockerConfig = new DockerConfig();
final HostConfig hostConfig = dockerConfig.hostConfig(); final HostConfig hostConfig = dockerConfig.hostConfig();
final DockerClient dockerClient = dockerConfig.dockerClientConfiguration(); final DockerClient dockerClient = dockerConfig.dockerClientConfiguration();
......
...@@ -8,6 +8,7 @@ import at.tuwien.config.ReadyConfig; ...@@ -8,6 +8,7 @@ import at.tuwien.config.ReadyConfig;
import at.tuwien.entities.container.Container; import at.tuwien.entities.container.Container;
import at.tuwien.entities.database.Database; import at.tuwien.entities.database.Database;
import at.tuwien.exception.*; import at.tuwien.exception.*;
import at.tuwien.repository.elastic.DatabaseidxRepository;
import at.tuwien.repository.jpa.ContainerRepository; import at.tuwien.repository.jpa.ContainerRepository;
import at.tuwien.repository.jpa.DatabaseRepository; import at.tuwien.repository.jpa.DatabaseRepository;
import at.tuwien.repository.jpa.ImageRepository; import at.tuwien.repository.jpa.ImageRepository;
...@@ -47,6 +48,9 @@ public class DatabaseServiceIntegrationTest extends BaseUnitTest { ...@@ -47,6 +48,9 @@ public class DatabaseServiceIntegrationTest extends BaseUnitTest {
@MockBean @MockBean
private Channel channel; private Channel channel;
@MockBean
private DatabaseidxRepository databaseidxRepository;
@Autowired @Autowired
private HostConfig hostConfig; private HostConfig hostConfig;
...@@ -145,6 +149,7 @@ public class DatabaseServiceIntegrationTest extends BaseUnitTest { ...@@ -145,6 +149,7 @@ public class DatabaseServiceIntegrationTest extends BaseUnitTest {
containerRepository.save(CONTAINER_2); containerRepository.save(CONTAINER_2);
} }
@Transactional
@AfterEach @AfterEach
public void afterEach() { public void afterEach() {
/* stop containers and remove them */ /* stop containers and remove them */
......
spring.profiles.active=test-noelastic
# disable discovery # disable discovery
spring.cloud.discovery.enabled = false spring.cloud.discovery.enabled = false
...@@ -13,3 +15,6 @@ spring.datasource.password=password ...@@ -13,3 +15,6 @@ spring.datasource.password=password
spring.jpa.database-platform=org.hibernate.dialect.H2Dialect spring.jpa.database-platform=org.hibernate.dialect.H2Dialect
spring.jpa.hibernate.ddl-auto=create-drop spring.jpa.hibernate.ddl-auto=create-drop
spring.jpa.show-sql=false spring.jpa.show-sql=false
# disable elasticsearch
spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.data.elasticsearch.ElasticsearchDataAutoConfiguration,org.springframework.boot.autoconfigure.data.elasticsearch.ElasticsearchRepositoriesAutoConfiguration,org.springframework.boot.autoconfigure.elasticsearch.ElasticsearchRestClientAutoConfiguration
\ No newline at end of file
package at.tuwien.config; package at.tuwien.config;
import at.tuwien.entities.database.Database; import at.tuwien.entities.database.Database;
import com.google.common.collect.ImmutableMap;
import lombok.extern.log4j.Log4j2; import lombok.extern.log4j.Log4j2;
import org.springframework.boot.context.event.ApplicationReadyEvent; import org.springframework.boot.context.event.ApplicationReadyEvent;
import org.springframework.context.event.EventListener; import org.springframework.context.event.EventListener;
import org.springframework.core.env.Environment;
import org.springframework.core.env.Profiles;
import org.springframework.data.elasticsearch.core.ElasticsearchOperations; import org.springframework.data.elasticsearch.core.ElasticsearchOperations;
import org.springframework.data.elasticsearch.core.mapping.IndexCoordinates; import org.springframework.data.elasticsearch.core.mapping.IndexCoordinates;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import java.util.HashMap;
@Component @Component
@Log4j2 @Log4j2
public class IndexInitializer { public class IndexInitializer {
private final Environment environment;
private final ElasticsearchOperations elasticsearchOperations; private final ElasticsearchOperations elasticsearchOperations;
public IndexInitializer(ElasticsearchOperations elasticsearchOperations) { public IndexInitializer(Environment environment, ElasticsearchOperations elasticsearchOperations) {
this.environment = environment;
this.elasticsearchOperations = elasticsearchOperations; this.elasticsearchOperations = elasticsearchOperations;
} }
@EventListener(ApplicationReadyEvent.class) @EventListener(ApplicationReadyEvent.class)
public void initIndex() { public void initIndex() {
if (environment.acceptsProfiles(Profiles.of("test-noelastic"))) {
return;
}
log.debug("creating index"); log.debug("creating index");
IndexCoordinates indexCoordinates = IndexCoordinates.of("databaseindex"); IndexCoordinates indexCoordinates = IndexCoordinates.of("databaseindex");
if (!elasticsearchOperations.indexOps(indexCoordinates).exists()) { if (!elasticsearchOperations.indexOps(indexCoordinates).exists()) {
......
spring.profiles.active=test-noelastic
# disable discovery # disable discovery
spring.cloud.discovery.enabled = false spring.cloud.discovery.enabled = false
...@@ -14,6 +16,9 @@ spring.jpa.database-platform=org.hibernate.dialect.H2Dialect ...@@ -14,6 +16,9 @@ spring.jpa.database-platform=org.hibernate.dialect.H2Dialect
spring.jpa.hibernate.ddl-auto=create-drop spring.jpa.hibernate.ddl-auto=create-drop
spring.jpa.show-sql=false spring.jpa.show-sql=false
# disable elasticsearch
spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.data.elasticsearch.ElasticsearchDataAutoConfiguration,org.springframework.boot.autoconfigure.data.elasticsearch.ElasticsearchRepositoriesAutoConfiguration,org.springframework.boot.autoconfigure.elasticsearch.ElasticsearchRestClientAutoConfiguration
fda.mapping.path: /tmp fda.mapping.path: /tmp
fda.table.path: /tmp fda.table.path: /tmp
......
package at.tuwien.config; package at.tuwien.config;
import at.tuwien.entities.database.Database; import at.tuwien.entities.database.Database;
import com.google.common.collect.ImmutableMap;
import lombok.extern.log4j.Log4j2; import lombok.extern.log4j.Log4j2;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.context.event.ApplicationReadyEvent; import org.springframework.boot.context.event.ApplicationReadyEvent;
import org.springframework.context.event.EventListener; import org.springframework.context.event.EventListener;
import org.springframework.core.env.Environment;
import org.springframework.core.env.Profiles;
import org.springframework.data.elasticsearch.core.ElasticsearchOperations; import org.springframework.data.elasticsearch.core.ElasticsearchOperations;
import org.springframework.data.elasticsearch.core.mapping.IndexCoordinates; import org.springframework.data.elasticsearch.core.mapping.IndexCoordinates;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import java.util.HashMap;
@Component @Component
@Log4j2 @Log4j2
public class IndexInitializer { public class IndexInitializer {
private final Environment environment;
private final ElasticsearchOperations elasticsearchOperations; private final ElasticsearchOperations elasticsearchOperations;
public IndexInitializer(ElasticsearchOperations elasticsearchOperations) { @Autowired
public IndexInitializer(Environment environment, ElasticsearchOperations elasticsearchOperations) {
this.environment = environment;
this.elasticsearchOperations = elasticsearchOperations; this.elasticsearchOperations = elasticsearchOperations;
} }
@EventListener(ApplicationReadyEvent.class) @EventListener(ApplicationReadyEvent.class)
public void initIndex() { public void initIndex() {
if (environment.acceptsProfiles(Profiles.of("test-noelastic"))) {
return;
}
log.debug("creating index"); log.debug("creating index");
IndexCoordinates indexCoordinates = IndexCoordinates.of("tblindex"); IndexCoordinates indexCoordinates = IndexCoordinates.of("tblindex");
if (!elasticsearchOperations.indexOps(indexCoordinates).exists()) { if (!elasticsearchOperations.indexOps(indexCoordinates).exists()) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment