Skip to content
Snippets Groups Projects
Unverified Commit 324b4bd1 authored by Martin Weise's avatar Martin Weise
Browse files

Fixed the query service test

parent 4079e04a
Branches
Tags
4 merge requests!129New module for citation as they occur multiple,!121Modified logging, modified logging level, modified flasgger endpoint,!113Resolve "Bugs related with Query Service",!109Resolve "Use MariaDB for metadata database"
...@@ -63,7 +63,7 @@ public class Table { ...@@ -63,7 +63,7 @@ public class Table {
@JoinColumn(name = "tdbid", insertable = false, updatable = false) @JoinColumn(name = "tdbid", insertable = false, updatable = false)
private Database database; private Database database;
@OneToMany(fetch = FetchType.LAZY, cascade = CascadeType.MERGE, mappedBy = "table") @OneToMany(fetch = FetchType.EAGER, cascade = CascadeType.MERGE, mappedBy = "table")
@OrderBy("ordinalPosition") @OrderBy("ordinalPosition")
private List<TableColumn> columns; private List<TableColumn> columns;
......
...@@ -8,6 +8,9 @@ import at.tuwien.config.MariaDbConfig; ...@@ -8,6 +8,9 @@ import at.tuwien.config.MariaDbConfig;
import at.tuwien.config.ReadyConfig; import at.tuwien.config.ReadyConfig;
import at.tuwien.exception.*; import at.tuwien.exception.*;
import at.tuwien.listener.impl.RabbitMqListenerImpl; import at.tuwien.listener.impl.RabbitMqListenerImpl;
import at.tuwien.repository.jpa.ContainerRepository;
import at.tuwien.repository.jpa.DatabaseRepository;
import at.tuwien.repository.jpa.ImageRepository;
import at.tuwien.repository.jpa.TableRepository; import at.tuwien.repository.jpa.TableRepository;
import com.github.dockerjava.api.command.CreateContainerResponse; import com.github.dockerjava.api.command.CreateContainerResponse;
import com.github.dockerjava.api.exception.NotModifiedException; import com.github.dockerjava.api.exception.NotModifiedException;
...@@ -55,6 +58,15 @@ public class StoreServiceIntegrationTest extends BaseUnitTest { ...@@ -55,6 +58,15 @@ public class StoreServiceIntegrationTest extends BaseUnitTest {
@Autowired @Autowired
private TableRepository tableRepository; private TableRepository tableRepository;
@Autowired
private ImageRepository imageRepository;
@Autowired
private ContainerRepository containerRepository;
@Autowired
private DatabaseRepository databaseRepository;
@BeforeAll @BeforeAll
public static void beforeAll() { public static void beforeAll() {
afterAll(); afterAll();
...@@ -109,9 +121,12 @@ public class StoreServiceIntegrationTest extends BaseUnitTest { ...@@ -109,9 +121,12 @@ public class StoreServiceIntegrationTest extends BaseUnitTest {
@BeforeEach @BeforeEach
@Transactional @Transactional
public void beforeEach() { public void beforeEach() {
imageRepository.save(IMAGE_1);
containerRepository.save(CONTAINER_1);
databaseRepository.save(DATABASE_1);
TABLE_1.setDatabase(DATABASE_1); TABLE_1.setDatabase(DATABASE_1);
TABLE_2.setDatabase(DATABASE_2);
tableRepository.save(TABLE_1); tableRepository.save(TABLE_1);
TABLE_2.setDatabase(DATABASE_2);
tableRepository.save(TABLE_2); tableRepository.save(TABLE_2);
} }
......
...@@ -11,10 +11,7 @@ import at.tuwien.config.ReadyConfig; ...@@ -11,10 +11,7 @@ import at.tuwien.config.ReadyConfig;
import at.tuwien.entities.database.table.columns.TableColumn; import at.tuwien.entities.database.table.columns.TableColumn;
import at.tuwien.exception.*; import at.tuwien.exception.*;
import at.tuwien.listener.impl.RabbitMqListenerImpl; import at.tuwien.listener.impl.RabbitMqListenerImpl;
import at.tuwien.repository.jpa.DatabaseRepository; import at.tuwien.repository.jpa.*;
import at.tuwien.repository.jpa.ImageRepository;
import at.tuwien.repository.jpa.TableColumnRepository;
import at.tuwien.repository.jpa.TableRepository;
import com.github.dockerjava.api.command.CreateContainerResponse; import com.github.dockerjava.api.command.CreateContainerResponse;
import com.github.dockerjava.api.exception.NotModifiedException; import com.github.dockerjava.api.exception.NotModifiedException;
import com.github.dockerjava.api.model.Bind; import com.github.dockerjava.api.model.Bind;
...@@ -80,12 +77,16 @@ public class TableServiceTest extends BaseUnitTest { ...@@ -80,12 +77,16 @@ public class TableServiceTest extends BaseUnitTest {
@Autowired @Autowired
private TableRepository tableRepository; private TableRepository tableRepository;
@Autowired
private ContainerRepository containerRepository;
@BeforeEach @BeforeEach
@Transactional @Transactional
public void beforeEach() { public void beforeEach() {
imageRepository.save(IMAGE_1); imageRepository.save(IMAGE_1);
IMAGE_1.setDateFormats(List.of(IMAGE_DATE_1, IMAGE_DATE_2)); IMAGE_1.setDateFormats(List.of(IMAGE_DATE_1, IMAGE_DATE_2));
imageRepository.save(IMAGE_1); imageRepository.save(IMAGE_1);
containerRepository.save(CONTAINER_1);
databaseRepository.save(DATABASE_1); databaseRepository.save(DATABASE_1);
TABLE_1.setDatabase(DATABASE_1); TABLE_1.setDatabase(DATABASE_1);
tableRepository.save(TABLE_1); tableRepository.save(TABLE_1);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment