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

Added different strategy for container service tests

parent 3218971c
No related branches found
No related tags found
1 merge request!106Dev
...@@ -124,12 +124,12 @@ public class ImageServiceIntegrationTest extends BaseUnitTest { ...@@ -124,12 +124,12 @@ public class ImageServiceIntegrationTest extends BaseUnitTest {
} }
@Test @Test
public void delete_hasContainer_succeeds() throws ImageNotFoundException, PersistenceException { public void delete_hasNoContainer_succeeds() throws ImageNotFoundException, PersistenceException {
/* test */ /* test */
imageService.delete(IMAGE_1_ID); imageService.delete(IMAGE_1_ID);
assertTrue(imageRepository.findById(IMAGE_1_ID).isEmpty()); assertTrue(imageRepository.findById(IMAGE_1_ID).isEmpty());
assertTrue(containerRepository.findById(CONTAINER_1_ID).isPresent()); /* container should NEVER be deletable in the metadata db */ assertFalse(containerRepository.findById(CONTAINER_1_ID).isPresent()); /* container should NEVER be deletable in the metadata db */
} }
@Test @Test
......
...@@ -48,8 +48,9 @@ public class Database { ...@@ -48,8 +48,9 @@ public class Database {
}) })
private User creator; private User creator;
@org.springframework.data.annotation.Transient
@ToString.Exclude @ToString.Exclude
@ManyToOne(fetch = FetchType.EAGER, cascade = CascadeType.ALL) @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.MERGE)
@JoinColumns({ @JoinColumns({
@JoinColumn(name = "id", referencedColumnName = "id", insertable = false, updatable = false) @JoinColumn(name = "id", referencedColumnName = "id", insertable = false, updatable = false)
}) })
...@@ -73,7 +74,7 @@ public class Database { ...@@ -73,7 +74,7 @@ public class Database {
}) })
private User contact; private User contact;
@OneToMany(fetch = FetchType.LAZY, cascade = CascadeType.ALL) @OneToMany(fetch = FetchType.LAZY, cascade = CascadeType.MERGE)
@JoinColumns({ @JoinColumns({
@JoinColumn(name = "tdbid", referencedColumnName = "id", insertable = false, updatable = false) @JoinColumn(name = "tdbid", referencedColumnName = "id", insertable = false, updatable = false)
}) })
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment