diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/comics/data/ArtistRepository.java b/kontor-spring/src/main/java/de/thpeetz/kontor/comics/data/ArtistRepository.java deleted file mode 100644 index a5b94f2..0000000 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/comics/data/ArtistRepository.java +++ /dev/null @@ -1,17 +0,0 @@ -package de.thpeetz.kontor.comics.data; - -import java.util.List; - -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.Query; -import org.springframework.data.repository.query.Param; - -public interface ArtistRepository extends JpaRepository { - @Query("select a from Artist a " + - "where lower(a.name) like lower(concat('%', :searchTerm, '%')) ") - List search(@Param("searchTerm") String searchTerm); - - List findByNameIgnoreCase(String name); - - Artist findByName(String name); -} diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/comics/data/ComicRepository.java b/kontor-spring/src/main/java/de/thpeetz/kontor/comics/data/ComicRepository.java deleted file mode 100644 index 3a3e61f..0000000 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/comics/data/ComicRepository.java +++ /dev/null @@ -1,19 +0,0 @@ -package de.thpeetz.kontor.comics.data; - -import java.util.List; - -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.Query; -import org.springframework.data.repository.query.Param; - -public interface ComicRepository extends JpaRepository { - @Query("select c from Comic c " + - "where lower(c.title) like lower(concat('%', :searchTerm, '%')) ") - List search(@Param("searchTerm") String searchTerm); - - Comic findByTitleAndPublisher(String title, Publisher publisher); - - List findByTitle(String title); - - List findByTitleIgnoreCase(String title); -} diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/comics/data/ComicWorkRepository.java b/kontor-spring/src/main/java/de/thpeetz/kontor/comics/data/ComicWorkRepository.java deleted file mode 100644 index 6b3540a..0000000 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/comics/data/ComicWorkRepository.java +++ /dev/null @@ -1,15 +0,0 @@ -package de.thpeetz.kontor.comics.data; - -import java.util.List; - -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.Query; - -public interface ComicWorkRepository extends JpaRepository { - - @Query("SELECT c from ComicWork c where c.comic = ?1 and c.artist = ?2 and c.workType = ?3") - ComicWork findbyComicAndArtistAndWorktype(Comic comic, Artist artist, Worktype worktype); - - @Query("select c from ComicWork c where c.comic = ?1") - List findByComic(Comic comic); -} diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/comics/data/IssueRepository.java b/kontor-spring/src/main/java/de/thpeetz/kontor/comics/data/IssueRepository.java deleted file mode 100644 index af10705..0000000 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/comics/data/IssueRepository.java +++ /dev/null @@ -1,17 +0,0 @@ -package de.thpeetz.kontor.comics.data; - -import java.util.List; - -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.Query; -import org.springframework.data.repository.query.Param; - -public interface IssueRepository extends JpaRepository { - @Query("select i from Issue i " + - "where lower(i.issueNumber) like lower(concat('%', :searchTerm, '%')) ") - List search(@Param("searchTerm") String searchTerm); - - List findByComic(Comic comic); - - Issue findByComicAndIssueNumber(Comic comic, String issueNumber); -} diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/comics/data/PublisherRepository.java b/kontor-spring/src/main/java/de/thpeetz/kontor/comics/data/PublisherRepository.java deleted file mode 100644 index 5b5587d..0000000 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/comics/data/PublisherRepository.java +++ /dev/null @@ -1,17 +0,0 @@ -package de.thpeetz.kontor.comics.data; - -import java.util.List; - -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.Query; -import org.springframework.data.repository.query.Param; - -public interface PublisherRepository extends JpaRepository { - @Query("select p from Publisher p " + - "where lower(p.name) like lower(concat('%', :searchTerm, '%')) ") - List search(@Param("searchTerm") String searchTerm); - - Publisher findByName(String name); - - List findByNameIgnoreCase(String name); -} diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/comics/data/StoryArcRepository.java b/kontor-spring/src/main/java/de/thpeetz/kontor/comics/data/StoryArcRepository.java deleted file mode 100644 index a74619f..0000000 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/comics/data/StoryArcRepository.java +++ /dev/null @@ -1,17 +0,0 @@ -package de.thpeetz.kontor.comics.data; - -import java.util.List; - -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.Query; -import org.springframework.data.repository.query.Param; - -public interface StoryArcRepository extends JpaRepository { - @Query("select s from StoryArc s " + - "where lower(s.name) like lower(concat('%', :searchTerm, '%')) ") - List search(@Param("searchTerm") String searchTerm); - - StoryArc findByNameAndComic(String name, Comic comic); - - List findByComic(Comic comic); -} diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/comics/data/TradePaperbackRepository.java b/kontor-spring/src/main/java/de/thpeetz/kontor/comics/data/TradePaperbackRepository.java deleted file mode 100644 index fba26ad..0000000 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/comics/data/TradePaperbackRepository.java +++ /dev/null @@ -1,20 +0,0 @@ -package de.thpeetz.kontor.comics.data; - -import java.util.List; - -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.Query; -import org.springframework.data.repository.query.Param; - -public interface TradePaperbackRepository extends JpaRepository { - @Query("select t from TradePaperback t " + - "where lower(t.name) like lower(concat('%', :searchTerm, '%')) ") - List search(@Param("searchTerm") String searchTerm); - - List findByComic(Comic comic); - - List findByNameAndComic(String name, Comic comic); - - @Query("select t from TradePaperback t where t.name = ?1 and t.comic = ?2 and t.issueStart = ?3 and t.issueEnd = ?4") - TradePaperback findByFields(String name, Comic comic, int start, int end); -} diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/comics/data/VolumeRepository.java b/kontor-spring/src/main/java/de/thpeetz/kontor/comics/data/VolumeRepository.java deleted file mode 100644 index 3b70670..0000000 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/comics/data/VolumeRepository.java +++ /dev/null @@ -1,13 +0,0 @@ -package de.thpeetz.kontor.comics.data; - -import java.util.List; - -import org.springframework.data.jpa.repository.JpaRepository; - -public interface VolumeRepository extends JpaRepository { - - List findByName(String name); - - List findByComic(Comic comic); - -} diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/comics/data/WorktypeRepository.java b/kontor-spring/src/main/java/de/thpeetz/kontor/comics/data/WorktypeRepository.java deleted file mode 100644 index 2afebaf..0000000 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/comics/data/WorktypeRepository.java +++ /dev/null @@ -1,18 +0,0 @@ -package de.thpeetz.kontor.comics.data; - -import java.util.List; - -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.Query; -import org.springframework.data.repository.query.Param; - -public interface WorktypeRepository extends JpaRepository { - @Query("select w from Worktype w " + - "where lower(w.name) like lower(concat('%', :searchTerm, '%')) ") - List search(@Param("searchTerm") String searchTerm); - - - Worktype findByName(String name); - - List findByNameIgnoreCase(String name); -} diff --git a/kontor-spring/src/test/java/de/thpeetz/kontor/comics/data/ArtistRepositoryTest.java b/kontor-spring/src/test/java/de/thpeetz/kontor/comics/data/ArtistRepositoryTest.java deleted file mode 100644 index 96d53f8..0000000 --- a/kontor-spring/src/test/java/de/thpeetz/kontor/comics/data/ArtistRepositoryTest.java +++ /dev/null @@ -1,73 +0,0 @@ -package de.thpeetz.kontor.comics.data; - -import static org.junit.jupiter.api.Assertions.*; - -import java.util.List; - -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.MethodOrderer.OrderAnnotation; -import org.junit.jupiter.api.Order; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.TestMethodOrder; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; - -@SpringBootTest -@TestMethodOrder(OrderAnnotation.class) -class ArtistRepositoryTest { - - private Artist stanLee; - private static final String ARTISTNAME = "Lee, Stan"; - - @Autowired - ArtistRepository artistRepository; - - @BeforeEach - void setupData() { - stanLee = new Artist(); - stanLee.setName(ARTISTNAME); - } - - @Test - @Order(1) - void checkInitialLoad() { - int count = artistRepository.findAll().size(); - assertEquals(5, count); - } - - @Test - @Order(2) - void saveArtist() { - int count = artistRepository.findAll().size(); - artistRepository.save(stanLee); - assertEquals(count+1, artistRepository.findAll().size()); - } - - @Test - @Order(3) - void findArtist() { - List artists = artistRepository.findByNameIgnoreCase("lEE, sTAN"); - assertTrue(artists.size() > 0); - assertEquals(artists.get(0).getName(), stanLee.getName()); - } - - @Test - @Order(4) - void searchArtist() { - List artists = artistRepository.search("Lee"); - assertEquals(1, artists.size()); - assertEquals(ARTISTNAME, artists.get(0).getName()); - List artists2 = artistRepository.search("Stan"); - assertEquals(1, artists2.size()); - assertEquals(ARTISTNAME, artists2.get(0).getName()); - } - - @Test - @Order(5) - void deleteArtist() { - int count = artistRepository.findAll().size(); - Artist artist = artistRepository.findByName(ARTISTNAME); - artistRepository.delete(artist); - assertEquals(count-1, artistRepository.findAll().size()); - } -} diff --git a/kontor-spring/src/test/java/de/thpeetz/kontor/comics/data/ComicRepositoryTest.java b/kontor-spring/src/test/java/de/thpeetz/kontor/comics/data/ComicRepositoryTest.java deleted file mode 100644 index 70c0d54..0000000 --- a/kontor-spring/src/test/java/de/thpeetz/kontor/comics/data/ComicRepositoryTest.java +++ /dev/null @@ -1,53 +0,0 @@ -package de.thpeetz.kontor.comics.data; - -import static org.junit.jupiter.api.Assertions.*; - -import java.util.List; -import java.util.stream.Collectors; - -import org.junit.jupiter.api.Test; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; - -@SpringBootTest -class ComicRepositoryTest { - - @Autowired - private ComicRepository comicRepository; - - @Autowired - private PublisherRepository publisherRepository; - - @Test - void testFindByTitle() { - List comics = comicRepository.findByTitle("Emma Frost"); - assertEquals(1, comics.size()); - assertEquals("Emma Frost", comics.get(0).getTitle()); - Publisher publisher = comics.get(0).getPublisher(); - assertEquals("Marvel", publisher.getName()); - } - - @Test - void testFindByTitleIgnoreCase() { - List comics = comicRepository.findByTitleIgnoreCase("x-men"); - assertEquals(1, comics.size()); - assertEquals("X-Men", comics.get(0).getTitle()); - } - @Test - void testFindByTitleAndPublisher() { - Publisher publisher = publisherRepository.findByName("Marvel"); - assertNotNull(publisher); - Comic found = comicRepository.findByTitleAndPublisher("Emma Frost", publisher); - assertNotNull(found); - assertEquals("Emma Frost", found.getTitle()); - assertEquals("Marvel", found.getPublisher().getName()); - - } - - @Test - void testSearch() { - List comics = comicRepository.search("X-men"); - assertEquals(11, comics.size()); - assertTrue(comics.stream().map(comic -> comic.getTitle()).collect(Collectors.toList()).contains("Astonishing X-Men")); - } -} diff --git a/kontor-spring/src/test/java/de/thpeetz/kontor/comics/data/ComicWorkRepositoryTest.java b/kontor-spring/src/test/java/de/thpeetz/kontor/comics/data/ComicWorkRepositoryTest.java deleted file mode 100644 index 0902b84..0000000 --- a/kontor-spring/src/test/java/de/thpeetz/kontor/comics/data/ComicWorkRepositoryTest.java +++ /dev/null @@ -1,83 +0,0 @@ -package de.thpeetz.kontor.comics.data; - -import static org.junit.jupiter.api.Assertions.*; - -import org.junit.jupiter.api.MethodOrderer.OrderAnnotation; -import org.junit.jupiter.api.Order; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.TestMethodOrder; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; - -import de.thpeetz.kontor.comics.services.ComicService; - -@SpringBootTest -@TestMethodOrder(OrderAnnotation.class) -class ComicWorkRepositoryTest { - - @Autowired - private ComicWorkRepository comicWorkRepository; - - @Autowired - private ComicRepository comicRepository; - - @Autowired - private WorktypeRepository worktypeRepository; - - @Autowired - private ArtistRepository artistRepository; - - @Autowired - private ComicService comicService; - - @Test - @Order(1) - void checkInitialLoad() { - int count = comicWorkRepository.findAll().size(); - assertEquals(18, count); - } - - @Test - @Order(2) - void saveComicWork() { - int count = comicWorkRepository.findAll().size(); - Artist artist = artistRepository.findByName("Turner, Michael"); - Worktype worktype = worktypeRepository.findByName("Writer"); - Comic comic = comicRepository.findByTitle("Emma Frost").get(0); - ComicWork comicWork = new ComicWork(); - comicWork.setArtist(artist); - comicWork.setComic(comic); - comicWork.setWorkType(worktype); - comicWorkRepository.save(comicWork); - assertEquals(count + 1, comicWorkRepository.findAll().size()); - } - - @Test - @Order(3) - void findByComicAndArtistAndComicWork() { - assertEquals(19, comicWorkRepository.count()); - Artist artist = artistRepository.findByName("Turner, Michael"); - Worktype worktype = worktypeRepository.findByName("Writer"); - Comic comic = comicRepository.findByTitle("Emma Frost").get(0); - ComicWork comicWork = comicWorkRepository.findbyComicAndArtistAndWorktype(comic, artist, worktype); - assertNotNull(comicWork); - assertEquals(comicWork.getArtist().getName(), artist.getName()); - assertEquals(comicWork.getComic().getTitle(), comic.getTitle()); - assertEquals(comicWork.getWorkType().getName(), worktype.getName()); - ComicWork notFound = comicWorkRepository.findbyComicAndArtistAndWorktype(comic, artist, null); - assertNull(notFound); - } - - @Test - @Order(4) - void deleteComicWork() { - long count = comicWorkRepository.count(); - Artist artist = artistRepository.findByName("Turner, Michael"); - Worktype worktype = worktypeRepository.findByName("Writer"); - Comic comic = comicRepository.findByTitle("Emma Frost").get(0); - ComicWork comicWork = comicWorkRepository.findbyComicAndArtistAndWorktype(comic, artist, worktype); - assertNotNull(comicWork); - comicService.deleteComicWork(comicWork); - assertEquals(count - 1, comicWorkRepository.count()); - } -} diff --git a/kontor-spring/src/test/java/de/thpeetz/kontor/comics/data/IssueRepositoryTest.java b/kontor-spring/src/test/java/de/thpeetz/kontor/comics/data/IssueRepositoryTest.java deleted file mode 100644 index 8d3be93..0000000 --- a/kontor-spring/src/test/java/de/thpeetz/kontor/comics/data/IssueRepositoryTest.java +++ /dev/null @@ -1,45 +0,0 @@ -package de.thpeetz.kontor.comics.data; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertNotNull; - -import java.util.List; - -import org.junit.jupiter.api.Test; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; - -import de.thpeetz.kontor.comics.TestConstants; -import de.thpeetz.kontor.comics.services.ComicService; - -@SpringBootTest -class IssueRepositoryTest { - - @Autowired - private IssueRepository issueRepository; - - @Autowired - private ComicService comicService; - - @Test - void testFindByComic() { - Comic comic = TestConstants.getComicWithIssues(comicService); - List issues = issueRepository.findByComic(comic); - assertEquals(TestConstants.BATTLE_POPE_ISSUE_COUNT, issues.size()); - } - - @Test - void testFindByComicAndIssueNumber() { - Comic comic = TestConstants.getComicWithIssues(comicService); - Issue issue = issueRepository.findByComicAndIssueNumber(comic, "12"); - assertNotNull(issue); - assertFalse(issue.getIsRead()); - } - - @Test - void testSearch() { - List issues = issueRepository.search("2"); - assertEquals(187, issues.size()); - } -} diff --git a/kontor-spring/src/test/java/de/thpeetz/kontor/comics/data/PublisherRepositoryTest.java b/kontor-spring/src/test/java/de/thpeetz/kontor/comics/data/PublisherRepositoryTest.java deleted file mode 100644 index 50175b4..0000000 --- a/kontor-spring/src/test/java/de/thpeetz/kontor/comics/data/PublisherRepositoryTest.java +++ /dev/null @@ -1,68 +0,0 @@ -package de.thpeetz.kontor.comics.data; - -import static org.junit.jupiter.api.Assertions.*; - -import java.util.List; - -import org.junit.jupiter.api.MethodOrderer.OrderAnnotation; -import org.junit.jupiter.api.Order; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.TestMethodOrder; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; - -import de.thpeetz.kontor.comics.TestConstants; - -@SpringBootTest -@TestMethodOrder(OrderAnnotation.class) -class PublisherRepositoryTest { - - @Autowired - private PublisherRepository publisherRepository; - - @Test - @Order(1) - void checkInitialLoad() { - assertEquals(TestConstants.PUBLISHER_COUNT, publisherRepository.findAll().size()); - } - - @Test - @Order(2) - void savePublisher() { - Publisher publisher = new Publisher(); - publisher.setName(TestConstants.PUBLISHER_NAME); - publisherRepository.save(publisher); - assertEquals(TestConstants.PUBLISHER_COUNT + 1, publisherRepository.findAll().size()); - } - - @Test - @Order(3) - void findPublisherByName() { - Publisher publisher = publisherRepository.findByName(TestConstants.PUBLISHER_NAME); - assertNotNull(publisher); - assertEquals(TestConstants.PUBLISHER_NAME, publisher.getName()); - Publisher notFound = publisherRepository.findByName("Cow"); - assertNull(notFound); - List publishers = publisherRepository - .findByNameIgnoreCase(TestConstants.PUBLISHER_NAME.toLowerCase()); - assertEquals(1, publishers.size()); - assertEquals(TestConstants.PUBLISHER_NAME, publishers.get(0).getName()); - } - - @Test - @Order(4) - void searchPublisher() { - List publishers = publisherRepository.search("Cow"); - assertEquals(1, publishers.size()); - assertEquals("Top Cow Productions", publishers.get(0).getName()); - } - - @Test - @Order(5) - void deletePublisher() { - Publisher publisher = publisherRepository.findByName(TestConstants.PUBLISHER_NAME); - assertNotNull(publisher); - publisherRepository.delete(publisher); - assertEquals(TestConstants.PUBLISHER_COUNT, publisherRepository.findAll().size()); - } -} diff --git a/kontor-spring/src/test/java/de/thpeetz/kontor/comics/data/StoryArcRepositoryTest.java b/kontor-spring/src/test/java/de/thpeetz/kontor/comics/data/StoryArcRepositoryTest.java deleted file mode 100644 index 52bad7e..0000000 --- a/kontor-spring/src/test/java/de/thpeetz/kontor/comics/data/StoryArcRepositoryTest.java +++ /dev/null @@ -1,45 +0,0 @@ -package de.thpeetz.kontor.comics.data; - -import static org.junit.jupiter.api.Assertions.*; - -import java.util.List; - -import org.junit.jupiter.api.Test; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; - -import de.thpeetz.kontor.comics.TestConstants; -import de.thpeetz.kontor.comics.services.ComicService; - -@SpringBootTest -class StoryArcRepositoryTest { - - @Autowired - private StoryArcRepository storyArcRepository; - - @Autowired - private ComicService comicService; - - @Test - void testSearch() { - List storyArcs = storyArcRepository.search("Learn"); - assertNotNull(storyArcs); - assertEquals(1, storyArcs.size()); - } - - @Test - void findByComic() { - Comic comic = TestConstants.getComicWithStoryArcs(comicService); - List storyArcs = storyArcRepository.findByComic(comic); - assertNotNull(storyArcs); - assertEquals(3, storyArcs.size()); - } - - @Test - void findByNameAndComic() { - Comic comic = TestConstants.getComicWithStoryArcs(comicService); - StoryArc storyArc = storyArcRepository.findByNameAndComic("Higher Learning", comic); - assertNotNull(storyArc); - assertEquals("Emma Frost", storyArc.getComic().getTitle()); - } -} diff --git a/kontor-spring/src/test/java/de/thpeetz/kontor/comics/data/TradePaperbackRepositoryTest.java b/kontor-spring/src/test/java/de/thpeetz/kontor/comics/data/TradePaperbackRepositoryTest.java deleted file mode 100644 index 2c66c12..0000000 --- a/kontor-spring/src/test/java/de/thpeetz/kontor/comics/data/TradePaperbackRepositoryTest.java +++ /dev/null @@ -1,59 +0,0 @@ -package de.thpeetz.kontor.comics.data; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertTrue; - -import java.util.List; - -import org.junit.jupiter.api.Test; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; - -import de.thpeetz.kontor.comics.TestConstants; -import de.thpeetz.kontor.comics.services.ComicService; - -@SpringBootTest -class TradePaperbackRepositoryTest { - - @Autowired - private TradePaperbackRepository tradePaperbackRepository; - - @Autowired - private ComicService comicService; - - @Test - void testSearch() { - List tradePaperbacks = tradePaperbackRepository.search("Dragon"); - assertNotNull(tradePaperbacks); - assertEquals(1, tradePaperbacks.size()); - } - - @Test - void testFindByComic() { - Comic comic = TestConstants.getComicWithTradePaperbacks(comicService); - List tradePaperbacks = tradePaperbackRepository.findByComic(comic); - assertNotNull(tradePaperbacks); - assertEquals(TestConstants.SOJOURN_TPB_COUNT, tradePaperbacks.size()); - } - - @Test - void testFindByNameAndComic() { - Comic comic = TestConstants.getComicWithTradePaperbacks(comicService); - List tradePaperbacks = tradePaperbackRepository - .findByNameAndComic(TestConstants.SOJOURN_TPB_NAME, comic); - assertNotNull(tradePaperbacks); - assertTrue(tradePaperbacks.size() > 0); - assertEquals(TestConstants.SOJOURN_TPB_COMIC_TITLE, tradePaperbacks.get(0).getComic().getTitle()); - } - - @Test - void testFindByFields() { - Comic comic = TestConstants.getComicWithTradePaperbacks(comicService); - TradePaperback tradePaperback = tradePaperbackRepository.findByFields(TestConstants.SOJOURN_TPB_NAME, - comic, TestConstants.SOJOURN_TPB_START, TestConstants.SOJOURN_TPB_END); - assertNotNull(tradePaperback); - assertEquals(TestConstants.SOJOURN_TPB_COMIC_TITLE, tradePaperback.getComic().getTitle()); - assertEquals(TestConstants.SOJOURN_TPB_END, tradePaperback.getIssueEnd()); - } -} diff --git a/kontor-spring/src/test/java/de/thpeetz/kontor/comics/data/VolumeRepositoryTest.java b/kontor-spring/src/test/java/de/thpeetz/kontor/comics/data/VolumeRepositoryTest.java deleted file mode 100644 index ce04a11..0000000 --- a/kontor-spring/src/test/java/de/thpeetz/kontor/comics/data/VolumeRepositoryTest.java +++ /dev/null @@ -1,61 +0,0 @@ -package de.thpeetz.kontor.comics.data; - -import static org.junit.jupiter.api.Assertions.*; - -import java.util.List; - -import org.junit.jupiter.api.Test; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; - -import de.thpeetz.kontor.comics.TestConstants; -import de.thpeetz.kontor.comics.services.ComicService; - -@SpringBootTest -class VolumeRepositoryTest { - - @Autowired - private VolumeRepository volumeRepository; - - @Autowired - private ComicRepository comicRepository; - - @Autowired - private ComicService comicService; - - @Test - void testFindByComic() { - Comic comic = TestConstants.getComicWithoutReferences(comicService); - assertEquals(0, comic.getVolumes().size()); - Volume volume = new Volume(); - volume.setName(TestConstants.VOLUME_NAME); - volume.setComic(comic); - Volume savedInstance = volumeRepository.save(volume); - assertNotNull(savedInstance); - - List found = volumeRepository.findByComic(comic); - assertEquals(1, found.size()); - - comicService.deleteVolume(found.get(0)); - assertEquals(0, comic.getVolumes().size()); - assertEquals(TestConstants.VOLUME_COUNT, volumeRepository.count()); - } - - @Test - void testFindByName() { - Comic comic = TestConstants.getComicWithoutReferences(comicService); - assertEquals(0, comic.getVolumes().size()); - Volume volume = new Volume(); - volume.setName(TestConstants.VOLUME_NAME); - volume.setComic(comic); - Volume savedInstance = volumeRepository.save(volume); - assertNotNull(savedInstance); - - List found = volumeRepository.findByName(TestConstants.VOLUME_NAME); - assertEquals(1, found.size()); - - comicService.deleteVolume(found.get(0)); - assertEquals(0, comic.getVolumes().size()); - assertEquals(TestConstants.VOLUME_COUNT, volumeRepository.count()); - } -} diff --git a/kontor-spring/src/test/java/de/thpeetz/kontor/comics/data/WorktypeRepositoryTest.java b/kontor-spring/src/test/java/de/thpeetz/kontor/comics/data/WorktypeRepositoryTest.java deleted file mode 100644 index 5dae5e8..0000000 --- a/kontor-spring/src/test/java/de/thpeetz/kontor/comics/data/WorktypeRepositoryTest.java +++ /dev/null @@ -1,46 +0,0 @@ -package de.thpeetz.kontor.comics.data; - -import static org.junit.jupiter.api.Assertions.*; - -import java.util.List; -import java.util.stream.Collectors; - -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.MethodOrderer.OrderAnnotation; -import org.junit.jupiter.api.Order; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.TestMethodOrder; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; - -import de.thpeetz.kontor.comics.TestConstants; - -@SpringBootTest -class WorktypeRepositoryTest { - - @Autowired - private WorktypeRepository worktypeRepository; - - @Test - void findWorktypeByName() { - Worktype found = worktypeRepository.findByName("Writer"); - assertNotNull(found); - Worktype notFound = worktypeRepository.findByName("er"); - assertNull(notFound); - } - - @Test - void findWorktypeByNameIgnoreCase() { - List worktypes = worktypeRepository.findByNameIgnoreCase("Writer".toLowerCase()); - assertNotNull(worktypes); - assertEquals(1, worktypes.size()); - assertEquals("Writer", worktypes.get(0).getName()); - } - - @Test - void searchWorktype() { - List worktypes = worktypeRepository.search("er"); - assertEquals(3, worktypes.size()); - assertTrue(worktypes.stream().map(worktype -> worktype.getName()).collect(Collectors.toList()).contains("Writer")); - } -}