Vorbereitung Release 0.2.0

kontor-spring/src/test/java/de/thpeetz/kontor/ApplicationTests.java

@@ -1,11 +1,30 @@
 package de.thpeetz.kontor;
 
+import org.junit.Ignore;
 import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
+import java.util.concurrent.TimeUnit;
 
-@SpringBootTest
+import org.apache.camel.test.spring.junit5.CamelSpringBootTest;
+import org.apache.camel.CamelContext;
+import org.apache.camel.builder.NotifyBuilder;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+
+@CamelSpringBootTest
+@SpringBootTest(classes = Application.class)
 class ApplicationTests {
+    @Autowired
+    private CamelContext camelContext;
 
+    @Test
+    @Ignore
+    public void shouldProduceMessages() throws Exception {
+        NotifyBuilder notify = new NotifyBuilder(camelContext).whenDone(1).create();
+        assertTrue(notify.matches(10, TimeUnit.SECONDS));
+    }
     @Test
     void contextLoads() {
         

kontor-spring/src/test/java/de/thpeetz/kontor/comics/data/ArtistTest.java

@@ -4,6 +4,7 @@ import static org.junit.jupiter.api.Assertions.*;
 
 import java.util.List;
 
+import de.thpeetz.kontor.comics.repository.*;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;

kontor-spring/src/test/java/de/thpeetz/kontor/comics/data/ComicTest.java

@@ -4,8 +4,7 @@ import static org.junit.jupiter.api.Assertions.*;
 
 import java.util.List;
 
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
+import de.thpeetz.kontor.comics.repository.*;
 import org.junit.jupiter.api.Order;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestMethodOrder;
@@ -13,7 +12,6 @@ import org.junit.jupiter.api.MethodOrderer.OrderAnnotation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.dao.DataIntegrityViolationException;
-import org.springframework.orm.jpa.JpaSystemException;
 import org.springframework.transaction.TransactionSystemException;
 
 import de.thpeetz.kontor.comics.TestConstants;

kontor-spring/src/test/java/de/thpeetz/kontor/comics/data/IssueTest.java

@@ -4,6 +4,7 @@ import static org.junit.jupiter.api.Assertions.*;
 
 import java.util.List;
 
+import de.thpeetz.kontor.comics.repository.*;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;

kontor-spring/src/test/java/de/thpeetz/kontor/comics/data/PublisherTest.java

@@ -2,6 +2,7 @@ package de.thpeetz.kontor.comics.data;
 
 import static org.junit.jupiter.api.Assertions.*;
 
+import de.thpeetz.kontor.comics.repository.*;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;

kontor-spring/src/test/java/de/thpeetz/kontor/comics/data/StoryArcTest.java

@@ -2,8 +2,7 @@ package de.thpeetz.kontor.comics.data;
 
 import static org.junit.jupiter.api.Assertions.*;
 
-import java.util.List;
-
+import de.thpeetz.kontor.comics.repository.*;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;

kontor-spring/src/test/java/de/thpeetz/kontor/comics/data/TradePaperbackTest.java

@@ -2,6 +2,7 @@ package de.thpeetz.kontor.comics.data;
 
 import static org.junit.jupiter.api.Assertions.*;
 
+import de.thpeetz.kontor.comics.repository.*;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;

kontor-spring/src/test/java/de/thpeetz/kontor/comics/data/VolumeTest.java

@@ -2,8 +2,7 @@ package de.thpeetz.kontor.comics.data;
 
 import static org.junit.jupiter.api.Assertions.*;
 
-import java.util.List;
-
+import de.thpeetz.kontor.comics.repository.*;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;

kontor-spring/src/test/java/de/thpeetz/kontor/comics/data/WorktypeTest.java

@@ -4,6 +4,7 @@ import static org.junit.jupiter.api.Assertions.*;
 
 import java.util.List;
 
+import de.thpeetz.kontor.comics.repository.*;
 import org.junit.jupiter.api.MethodOrderer.OrderAnnotation;
 import org.junit.jupiter.api.Order;
 import org.junit.jupiter.api.Test;
@@ -11,7 +12,6 @@ import org.junit.jupiter.api.TestMethodOrder;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.dao.DataIntegrityViolationException;
-import org.springframework.orm.jpa.JpaSystemException;
 import org.springframework.transaction.TransactionSystemException;
 
 import de.thpeetz.kontor.comics.TestConstants;

kontor-spring/src/test/java/de/thpeetz/kontor/comics/repository/ArtistRepositoryTest.java

@@ -1,9 +1,10 @@
-package de.thpeetz.kontor.comics.data;
+package de.thpeetz.kontor.comics.repository;
 
 import static org.junit.jupiter.api.Assertions.*;
 
 import java.util.List;
 
+import de.thpeetz.kontor.comics.data.*;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.MethodOrderer.OrderAnnotation;
 import org.junit.jupiter.api.Order;

kontor-spring/src/test/java/de/thpeetz/kontor/comics/repository/ComicRepositoryTest.java

@@ -1,10 +1,11 @@
-package de.thpeetz.kontor.comics.data;
+package de.thpeetz.kontor.comics.repository;
 
 import static org.junit.jupiter.api.Assertions.*;
 
 import java.util.List;
 import java.util.stream.Collectors;
 
+import de.thpeetz.kontor.comics.data.*;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;

kontor-spring/src/test/java/de/thpeetz/kontor/comics/repository/ComicWorkRepositoryTest.java

@@ -1,7 +1,8 @@
-package de.thpeetz.kontor.comics.data;
+package de.thpeetz.kontor.comics.repository;
 
 import static org.junit.jupiter.api.Assertions.*;
 
+import de.thpeetz.kontor.comics.data.*;
 import org.junit.jupiter.api.MethodOrderer.OrderAnnotation;
 import org.junit.jupiter.api.Order;
 import org.junit.jupiter.api.Test;

kontor-spring/src/test/java/de/thpeetz/kontor/comics/repository/IssueRepositoryTest.java

@@ -1,4 +1,4 @@
-package de.thpeetz.kontor.comics.data;
+package de.thpeetz.kontor.comics.repository;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -6,6 +6,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 import java.util.List;
 
+import de.thpeetz.kontor.comics.data.*;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;

kontor-spring/src/test/java/de/thpeetz/kontor/comics/repository/PublisherRepositoryTest.java

@@ -1,9 +1,10 @@
-package de.thpeetz.kontor.comics.data;
+package de.thpeetz.kontor.comics.repository;
 
 import static org.junit.jupiter.api.Assertions.*;
 
 import java.util.List;
 
+import de.thpeetz.kontor.comics.data.*;
 import org.junit.jupiter.api.MethodOrderer.OrderAnnotation;
 import org.junit.jupiter.api.Order;
 import org.junit.jupiter.api.Test;

kontor-spring/src/test/java/de/thpeetz/kontor/comics/repository/StoryArcRepositoryTest.java

@@ -1,9 +1,10 @@
-package de.thpeetz.kontor.comics.data;
+package de.thpeetz.kontor.comics.repository;
 
 import static org.junit.jupiter.api.Assertions.*;
 
 import java.util.List;
 
+import de.thpeetz.kontor.comics.data.*;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;

kontor-spring/src/test/java/de/thpeetz/kontor/comics/repository/TradePaperbackRepositoryTest.java

@@ -1,4 +1,4 @@
-package de.thpeetz.kontor.comics.data;
+package de.thpeetz.kontor.comics.repository;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -6,6 +6,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.List;
 
+import de.thpeetz.kontor.comics.data.*;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;

kontor-spring/src/test/java/de/thpeetz/kontor/comics/repository/VolumeRepositoryTest.java

@@ -1,9 +1,10 @@
-package de.thpeetz.kontor.comics.data;
+package de.thpeetz.kontor.comics.repository;
 
 import static org.junit.jupiter.api.Assertions.*;
 
 import java.util.List;
 
+import de.thpeetz.kontor.comics.data.*;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;

kontor-spring/src/test/java/de/thpeetz/kontor/comics/repository/WorktypeRepositoryTest.java

@@ -1,20 +1,15 @@
-package de.thpeetz.kontor.comics.data;
+package de.thpeetz.kontor.comics.repository;
 
 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 de.thpeetz.kontor.comics.data.*;
 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 {
 

kontor-spring/src/test/java/de/thpeetz/kontor/media/data/MediaArticleTest.java

@@ -1,5 +1,6 @@
 package de.thpeetz.kontor.media.data;
 
+import de.thpeetz.kontor.media.repository.MediaArticleRepository;
 import de.thpeetz.kontor.media.services.MediaArticleService;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;

kontor-spring/src/test/java/de/thpeetz/kontor/media/data/MediaFileTest.java

@@ -4,6 +4,8 @@ import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 
+import de.thpeetz.kontor.media.repository.MediaFileRepository;
+
 import java.util.List;
 
 import static org.junit.jupiter.api.Assertions.*;

kontor-spring/src/test/java/de/thpeetz/kontor/media/data/MediaVideoTest.java

@@ -5,6 +5,8 @@ import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 
+import de.thpeetz.kontor.media.repository.MediaVideoRepository;
+
 import static org.junit.jupiter.api.Assertions.*;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 

kontor-spring/src/test/java/de/thpeetz/kontor/media/services/MediaFileServiceTest.java

@@ -1,5 +1,6 @@
 package de.thpeetz.kontor.media.services;
 
+import de.thpeetz.kontor.common.views.SearchFilter;
 import de.thpeetz.kontor.media.TestConstants;
 import de.thpeetz.kontor.media.data.MediaFile;
 import org.junit.jupiter.api.MethodOrderer;
@@ -40,7 +41,9 @@ public class MediaFileServiceTest {
     @Order(3)
     void testDeleteMediaFile() {
         int mediaFileCount = mediaFileService.findAllMediaFiles(null).size();
-        List<MediaFile> mediaFileList = mediaFileService.findAllMediaFiles(TestConstants.URL);
+        SearchFilter searchFilter = new SearchFilter();
+        searchFilter.setSearchTerm(TestConstants.URL);
+        List<MediaFile> mediaFileList = mediaFileService.findAllMediaFiles(searchFilter);
         assertEquals(1, mediaFileList.size());
         mediaFileService.deleteMediaFile(mediaFileList.get(0));
         assertEquals(--mediaFileCount, mediaFileService.findAllMediaFiles(null).size());