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

Fixed some base unit dtos

parent 665c456c
No related branches found
No related tags found
2 merge requests!146Resolve "Remove old queries",!144Revert
...@@ -2309,6 +2309,20 @@ public abstract class BaseUnitTest { ...@@ -2309,6 +2309,20 @@ public abstract class BaseUnitTest {
.creator(USER_1) .creator(USER_1)
.build(); .build();
public final static Table TABLE_7_NOCOLS = Table.builder()
.id(TABLE_7_ID)
.created(Instant.now())
.internalName(TABLE_7_INTERNAL_NAME)
.description(TABLE_7_DESCRIPTION)
.name(TABLE_7_NAME)
.lastModified(TABLE_7_LAST_MODIFIED)
.tdbid(DATABASE_1_ID)
.queueName(TABLE_7_QUEUE_NAME)
.routingKey(TABLE_7_ROUTING_KEY)
.columns(List.of())
.creator(USER_1)
.build();
public final static Long VIEW_1_ID = 1L; public final static Long VIEW_1_ID = 1L;
public final static Boolean VIEW_1_INITIAL_VIEW = false; public final static Boolean VIEW_1_INITIAL_VIEW = false;
public final static String VIEW_1_NAME = "JUnit"; public final static String VIEW_1_NAME = "JUnit";
...@@ -2433,8 +2447,8 @@ public abstract class BaseUnitTest { ...@@ -2433,8 +2447,8 @@ public abstract class BaseUnitTest {
.exchangeName(DATABASE_1_EXCHANGE) .exchangeName(DATABASE_1_EXCHANGE)
.creator(USER_1) .creator(USER_1)
.owner(USER_1) .owner(USER_1)
.tables(List.of(TABLE_1, TABLE_2, TABLE_3)) .tables(List.of(TABLE_1, TABLE_2, TABLE_3, TABLE_7))
.views(List.of(VIEW_4)) .views(List.of(VIEW_1))
.build(); .build();
public final static Database DATABASE_2 = Database.builder() public final static Database DATABASE_2 = Database.builder()
......
...@@ -18,6 +18,7 @@ import lombok.extern.log4j.Log4j2; ...@@ -18,6 +18,7 @@ import lombok.extern.log4j.Log4j2;
import org.junit.Rule; import org.junit.Rule;
import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.api.extension.ExtendWith;
import org.junit.rules.Timeout; import org.junit.rules.Timeout;
...@@ -94,6 +95,12 @@ public class ViewIdxRepositoryIntegrationTest extends BaseUnitTest { ...@@ -94,6 +95,12 @@ public class ViewIdxRepositoryIntegrationTest extends BaseUnitTest {
DockerConfig.removeAllNetworks(); DockerConfig.removeAllNetworks();
} }
@BeforeEach
public void beforeEach() {
DATABASE_1.setTables(List.of(TABLE_1, TABLE_2, TABLE_3, TABLE_7));
DATABASE_1.setViews(List.of(VIEW_1));
}
@Test @Test
public void save_succeeds() throws UserNotFoundException, DatabaseConnectionException, ViewMalformedException, public void save_succeeds() throws UserNotFoundException, DatabaseConnectionException, ViewMalformedException,
QueryMalformedException, DatabaseNotFoundException { QueryMalformedException, DatabaseNotFoundException {
......
...@@ -105,8 +105,9 @@ public class TableServiceIntegrationTest extends BaseUnitTest { ...@@ -105,8 +105,9 @@ public class TableServiceIntegrationTest extends BaseUnitTest {
tableRepository.save(TABLE_1_NOCOLS); tableRepository.save(TABLE_1_NOCOLS);
tableRepository.save(TABLE_2_NOCOLS); tableRepository.save(TABLE_2_NOCOLS);
tableRepository.save(TABLE_3_NOCOLS); tableRepository.save(TABLE_3_NOCOLS);
tableRepository.save(TABLE_4_NOCOLS); tableRepository.save(TABLE_7_NOCOLS);
DATABASE_1.setTables(List.of()); DATABASE_1.setTables(List.of());
DATABASE_1.setViews(List.of());
databaseRepository.save(DATABASE_1); databaseRepository.save(DATABASE_1);
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment