tpeetz/kontor
1
0
Fork 0
Code Issues 7 Pull Requests 2 Actions Packages Projects Releases 3 Wiki Activity

refactor package layout
Gitea Actions Demo / Explore-Gitea-Actions (push) Successful in 7s
Details

Browse Source
This commit is contained in:
Thomas Peetz
2026-08-12 19:05:06 +02:00
parent ecfa0eb6d8
commit ea038ec70c
264 changed files with 1458 additions and 1446 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kontor-spring/src/test/java/de/thpeetz/kontor/comics/ComicConstantsTest.java → kontor-spring/src/test/java/de/thpeetz/kontor/constants/ComicConstantsTest.java
+1 -1
View File
@@ -1,4 +1,4 @@
package de.thpeetz.kontor.comics;
package de.thpeetz.kontor.constants;
import static org.junit.jupiter.api.Assertions.assertEquals;
kontor-spring/src/test/java/de/thpeetz/kontor/bookshelf/TestConstants.java → kontor-spring/src/test/java/de/thpeetz/kontor/constants/TestBookshelfConstants.java
+2 -2
View File
@@ -1,6 +1,6 @@
package de.thpeetz.kontor.bookshelf;
package de.thpeetz.kontor.constants;
public class TestConstants {
public class TestBookshelfConstants {
public static final Integer ARTICLEAUTHOR_COUNT = 0;
public static final Integer ARTICLE_COUNT = 0;
kontor-spring/src/test/java/de/thpeetz/kontor/comics/TestConstants.java → kontor-spring/src/test/java/de/thpeetz/kontor/constants/TestComicConstants.java
+7 -7
View File
@@ -1,12 +1,12 @@
package de.thpeetz.kontor.comics;
package de.thpeetz.kontor.constants;
import de.thpeetz.kontor.comics.data.Artist;
import de.thpeetz.kontor.comics.data.Comic;
import de.thpeetz.kontor.comics.data.Publisher;
import de.thpeetz.kontor.comics.data.Worktype;
import de.thpeetz.kontor.comics.services.ComicService;
import de.thpeetz.kontor.data.comics.Artist;
import de.thpeetz.kontor.data.comics.Comic;
import de.thpeetz.kontor.data.comics.Publisher;
import de.thpeetz.kontor.data.comics.Worktype;
import de.thpeetz.kontor.services.ComicService;
public class TestConstants {
public class TestComicConstants {
public static final String ARTIST_NAME = "Lastname, Firstname";
public static final String COMIC_TITLE = "TestComic";
public static final String WORKTYPE_INKER = "Inker";
kontor-spring/src/test/java/de/thpeetz/kontor/media/TestConstants.java → kontor-spring/src/test/java/de/thpeetz/kontor/constants/TestMediaConstants.java
+2 -2
View File
@@ -1,5 +1,5 @@
package de.thpeetz.kontor.media;
package de.thpeetz.kontor.constants;
public class TestConstants {
public class TestMediaConstants {
public static final String URL = "https://example.com/link.mp4";
}
kontor-spring/src/test/java/de/thpeetz/kontor/tysc/TestConstants.java → kontor-spring/src/test/java/de/thpeetz/kontor/constants/TestTyscConstants.java
+2 -2
View File
@@ -1,6 +1,6 @@
package de.thpeetz.kontor.tysc;
package de.thpeetz.kontor.constants;
public class TestConstants {
public class TestTyscConstants {
public static final Integer CARD_COUNT = 10;
public static final Integer CARD_CARDNUMBER = 999;
kontor-spring/src/test/java/de/thpeetz/kontor/bookshelf/data/ArticleAuthorTest.java → kontor-spring/src/test/java/de/thpeetz/kontor/data/bookshelf/ArticleAuthorTest.java
+13 -9
View File
@@ -1,6 +1,10 @@
package de.thpeetz.kontor.bookshelf.data;
package de.thpeetz.kontor.data.bookshelf;
import de.thpeetz.kontor.constants.TestBookshelfConstants;
import de.thpeetz.kontor.repository.bookshelf.ArticleAuthorRepository;
import de.thpeetz.kontor.repository.bookshelf.ArticleRepository;
import de.thpeetz.kontor.repository.bookshelf.AuthorRepository;
import de.thpeetz.kontor.bookshelf.TestConstants;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.MethodOrderer.OrderAnnotation;
import org.junit.jupiter.api.Order;
@@ -31,7 +35,7 @@ class ArticleAuthorTest {
@Test
@Order(1)
void checkInitialLoad() {
assertEquals(TestConstants.ARTICLEAUTHOR_COUNT, articleAuthorRepository.findAll().size());
assertEquals(TestBookshelfConstants.ARTICLEAUTHOR_COUNT, articleAuthorRepository.findAll().size());
}
@Test
@@ -47,11 +51,11 @@ class ArticleAuthorTest {
@Order(3)
void exceptionThrownWhenSavingIdenticalEntry() {
Author author = new Author();
author.setFirstName(TestConstants.AUTHOR_FIRSTNAME);
author.setLastName(TestConstants.AUTHOR_LASTNAME);
author.setFirstName(TestBookshelfConstants.AUTHOR_FIRSTNAME);
author.setLastName(TestBookshelfConstants.AUTHOR_LASTNAME);
Author savedAuthor = authorRepository.save(author);
Article article = new Article();
article.setTitle(TestConstants.ARTICLE_TITLE);
article.setTitle(TestBookshelfConstants.ARTICLE_TITLE);
Article savedArticle = articleRepository.save(article);
ArticleAuthor articleAuthor = new ArticleAuthor();
articleAuthor.setArticle(article);
@@ -64,14 +68,14 @@ class ArticleAuthorTest {
articleAuthorRepository.save(articleAuthor1);
});
articleAuthorRepository.delete(savedArticleAuthor);
assertEquals(TestConstants.ARTICLEAUTHOR_COUNT, articleAuthorRepository.findAll().size());
assertEquals(TestBookshelfConstants.ARTICLEAUTHOR_COUNT, articleAuthorRepository.findAll().size());
savedAuthor.getArticleAuthors().remove(savedArticleAuthor);
authorRepository.save(savedAuthor);
authorRepository.delete(savedAuthor);
assertEquals(TestConstants.AUTHOR_COUNT, authorRepository.findAll().size());
assertEquals(TestBookshelfConstants.AUTHOR_COUNT, authorRepository.findAll().size());
savedArticle.getAuthors().remove(savedArticleAuthor);
articleRepository.save(savedArticle);
articleRepository.delete(savedArticle);
assertEquals(TestConstants.ARTICLE_COUNT, articleRepository.findAll().size());
assertEquals(TestBookshelfConstants.ARTICLE_COUNT, articleRepository.findAll().size());
}
}
kontor-spring/src/test/java/de/thpeetz/kontor/bookshelf/data/ArticleTest.java → kontor-spring/src/test/java/de/thpeetz/kontor/data/bookshelf/ArticleTest.java
+7 -5
View File
@@ -1,6 +1,8 @@
package de.thpeetz.kontor.bookshelf.data;
package de.thpeetz.kontor.data.bookshelf;
import de.thpeetz.kontor.constants.TestBookshelfConstants;
import de.thpeetz.kontor.repository.bookshelf.ArticleRepository;
import de.thpeetz.kontor.bookshelf.TestConstants;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
@@ -18,7 +20,7 @@ class ArticleTest {
@Test
void checkInitialLoad() {
assertEquals(TestConstants.BOOK_COUNT, articleRepository.findAll().size());
assertEquals(TestBookshelfConstants.BOOK_COUNT, articleRepository.findAll().size());
}
@Test
@@ -32,7 +34,7 @@ class ArticleTest {
@Test
void exceptionThrownWhenSavingIdenticalTitle() {
Article article = new Article();
article.setTitle(TestConstants.ARTICLE_TITLE);
article.setTitle(TestBookshelfConstants.ARTICLE_TITLE);
Article savedArticle = articleRepository.save(article);
Article article1 = new Article();
article1.setTitle(article.getTitle());
@@ -40,6 +42,6 @@ class ArticleTest {
articleRepository.save(article1);
});
articleRepository.delete(savedArticle);
assertEquals(TestConstants.ARTICLE_COUNT, articleRepository.findAll().size());
assertEquals(TestBookshelfConstants.ARTICLE_COUNT, articleRepository.findAll().size());
}
}
kontor-spring/src/test/java/de/thpeetz/kontor/bookshelf/data/AuthorTest.java → kontor-spring/src/test/java/de/thpeetz/kontor/data/bookshelf/AuthorTest.java
+9 -7
View File
@@ -1,6 +1,8 @@
package de.thpeetz.kontor.bookshelf.data;
package de.thpeetz.kontor.data.bookshelf;
import de.thpeetz.kontor.constants.TestBookshelfConstants;
import de.thpeetz.kontor.repository.bookshelf.AuthorRepository;
import de.thpeetz.kontor.bookshelf.TestConstants;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
@@ -25,12 +27,12 @@ class AuthorTest {
@Test
void throwExceptionWhenPlayerSavedWithExistingName() {
assertEquals(TestConstants.AUTHOR_COUNT, authorRepository.findAll().size());
assertEquals(TestBookshelfConstants.AUTHOR_COUNT, authorRepository.findAll().size());
Author existingAuthor = new Author();
existingAuthor.setFirstName(TestConstants.AUTHOR_FIRSTNAME);
existingAuthor.setLastName(TestConstants.AUTHOR_LASTNAME);
existingAuthor.setFirstName(TestBookshelfConstants.AUTHOR_FIRSTNAME);
existingAuthor.setLastName(TestBookshelfConstants.AUTHOR_LASTNAME);
existingAuthor = authorRepository.save(existingAuthor);
assertEquals(TestConstants.AUTHOR_COUNT+1, authorRepository.findAll().size());
assertEquals(TestBookshelfConstants.AUTHOR_COUNT+1, authorRepository.findAll().size());
Author author = new Author();
author.setFirstName(existingAuthor.getFirstName());
author.setLastName(existingAuthor.getLastName());
@@ -39,6 +41,6 @@ class AuthorTest {
});
assertNotNull(existingAuthor);
authorRepository.delete(existingAuthor);
assertEquals(TestConstants.AUTHOR_COUNT, authorRepository.findAll().size());
assertEquals(TestBookshelfConstants.AUTHOR_COUNT, authorRepository.findAll().size());
}
}
kontor-spring/src/test/java/de/thpeetz/kontor/bookshelf/data/BookAuthorTest.java → kontor-spring/src/test/java/de/thpeetz/kontor/data/bookshelf/BookAuthorTest.java
+17 -12
View File
@@ -1,6 +1,11 @@
package de.thpeetz.kontor.bookshelf.data;
package de.thpeetz.kontor.data.bookshelf;
import de.thpeetz.kontor.constants.TestBookshelfConstants;
import de.thpeetz.kontor.repository.bookshelf.AuthorRepository;
import de.thpeetz.kontor.repository.bookshelf.BookAuthorRepository;
import de.thpeetz.kontor.repository.bookshelf.BookRepository;
import de.thpeetz.kontor.repository.bookshelf.BookshelfPublisherRepository;
import de.thpeetz.kontor.bookshelf.TestConstants;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
@@ -29,7 +34,7 @@ class BookAuthorTest {
@Test
void checkInitialLoad() {
assertEquals(TestConstants.BOOKAUTHOR_COUNT, bookAuthorRepository.findAll().size());
assertEquals(TestBookshelfConstants.BOOKAUTHOR_COUNT, bookAuthorRepository.findAll().size());
}
@Test
@@ -43,15 +48,15 @@ class BookAuthorTest {
@Test
void exceptionThrownWhenSavingIdenticalEntry() {
Author author = new Author();
author.setFirstName(TestConstants.AUTHOR_FIRSTNAME);
author.setLastName(TestConstants.AUTHOR_LASTNAME);
author.setFirstName(TestBookshelfConstants.AUTHOR_FIRSTNAME);
author.setLastName(TestBookshelfConstants.AUTHOR_LASTNAME);
Author savedAuthor = authorRepository.save(author);
BookshelfPublisher publisher = new BookshelfPublisher();
publisher.setName(TestConstants.PUBLISHER_NAME);
publisher.setName(TestBookshelfConstants.PUBLISHER_NAME);
BookshelfPublisher savedPublisher = bookshelfPublisherRepository.save(publisher);
Book book = new Book();
book.setTitle(TestConstants.BOOK_TITLE);
book.setIsbn(TestConstants.BOOK_ISBN);
book.setTitle(TestBookshelfConstants.BOOK_TITLE);
book.setIsbn(TestBookshelfConstants.BOOK_ISBN);
book.setPublisher(publisher);
Book savedBook = bookRepository.save(book);
BookAuthor bookAuthor = new BookAuthor();
@@ -71,12 +76,12 @@ class BookAuthorTest {
savedPublisher.getBooks().remove(savedBook);
bookshelfPublisherRepository.save(savedPublisher);
authorRepository.delete(savedAuthor);
assertEquals(TestConstants.AUTHOR_COUNT, authorRepository.findAll().size());
assertEquals(TestBookshelfConstants.AUTHOR_COUNT, authorRepository.findAll().size());
bookRepository.delete(savedBook);
assertEquals(TestConstants.ARTICLE_COUNT, bookRepository.findAll().size());
assertEquals(TestBookshelfConstants.ARTICLE_COUNT, bookRepository.findAll().size());
bookshelfPublisherRepository.delete(savedPublisher);
assertEquals(TestConstants.PUBLISHER_COUNT, bookshelfPublisherRepository.findAll().size());
assertEquals(TestBookshelfConstants.PUBLISHER_COUNT, bookshelfPublisherRepository.findAll().size());
bookAuthorRepository.delete(savedBookAuthor);
assertEquals(TestConstants.ARTICLEAUTHOR_COUNT, bookAuthorRepository.findAll().size());
assertEquals(TestBookshelfConstants.ARTICLEAUTHOR_COUNT, bookAuthorRepository.findAll().size());
}
}
kontor-spring/src/test/java/de/thpeetz/kontor/bookshelf/data/BookTest.java → kontor-spring/src/test/java/de/thpeetz/kontor/data/bookshelf/BookTest.java
+12 -11
View File
@@ -1,11 +1,12 @@
package de.thpeetz.kontor.bookshelf.data;
package de.thpeetz.kontor.data.bookshelf;
import de.thpeetz.kontor.constants.TestBookshelfConstants;
import de.thpeetz.kontor.repository.bookshelf.BookRepository;
import de.thpeetz.kontor.repository.bookshelf.BookshelfPublisherRepository;
import de.thpeetz.kontor.bookshelf.TestConstants;
import de.thpeetz.kontor.comics.data.Publisher;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.orm.jpa.JpaSystemException;
import org.springframework.transaction.TransactionSystemException;
import static org.junit.jupiter.api.Assertions.*;
@@ -21,7 +22,7 @@ class BookTest {
@Test
void checkInitialLoad() {
assertEquals(TestConstants.BOOK_COUNT, bookRepository.findAll().size());
assertEquals(TestBookshelfConstants.BOOK_COUNT, bookRepository.findAll().size());
}
@Test
@@ -35,13 +36,13 @@ class BookTest {
@Test
void exceptionThrownWhenSavingIdenticalISBN() {
BookshelfPublisher publisher = new BookshelfPublisher();
publisher.setName(TestConstants.PUBLISHER_NAME);
publisher.setName(TestBookshelfConstants.PUBLISHER_NAME);
BookshelfPublisher savedPublisher = bookshelfPublisherRepository.save(publisher);
Book book = new Book();
book.setTitle(TestConstants.BOOK_TITLE);
book.setIsbn(TestConstants.BOOK_ISBN);
book.setTitle(TestBookshelfConstants.BOOK_TITLE);
book.setIsbn(TestBookshelfConstants.BOOK_ISBN);
book.setPublisher(savedPublisher);
Book savedBook = bookRepository.save(book);
//TODO Book savedBook = bookRepository.save(book);
Book book1 = new Book();
book1.setTitle(book.getTitle());
book1.setIsbn(book.getIsbn());
@@ -49,8 +50,8 @@ class BookTest {
bookRepository.save(book1);
});
bookRepository.delete(book);
assertEquals(TestConstants.BOOK_COUNT, bookRepository.findAll().size());
assertEquals(TestBookshelfConstants.BOOK_COUNT, bookRepository.findAll().size());
bookshelfPublisherRepository.delete(savedPublisher);
assertEquals(TestConstants.PUBLISHER_COUNT, bookshelfPublisherRepository.findAll().size());
assertEquals(TestBookshelfConstants.PUBLISHER_COUNT, bookshelfPublisherRepository.findAll().size());
}
}
kontor-spring/src/test/java/de/thpeetz/kontor/bookshelf/data/BookshelfPublisherTest.java → kontor-spring/src/test/java/de/thpeetz/kontor/data/bookshelf/BookshelfPublisherTest.java
+7 -6
View File
@@ -1,4 +1,4 @@
package de.thpeetz.kontor.bookshelf.data;
package de.thpeetz.kontor.data.bookshelf;
import static org.junit.jupiter.api.Assertions.*;
@@ -8,7 +8,8 @@ import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.dao.DataIntegrityViolationException;
import org.springframework.transaction.TransactionSystemException;
import de.thpeetz.kontor.bookshelf.TestConstants;
import de.thpeetz.kontor.constants.TestBookshelfConstants;
import de.thpeetz.kontor.repository.bookshelf.BookshelfPublisherRepository;
@SpringBootTest
class BookshelfPublisherTest {
@@ -18,7 +19,7 @@ class BookshelfPublisherTest {
@Test
void checkInitialDataLoad() {
assertEquals(TestConstants.PUBLISHER_COUNT, publisherRepository.findAll().size());
assertEquals(TestBookshelfConstants.PUBLISHER_COUNT, publisherRepository.findAll().size());
}
@Test
@@ -32,14 +33,14 @@ class BookshelfPublisherTest {
@Test
void savePublisherWithIdenticalName() {
BookshelfPublisher publisher1 = new BookshelfPublisher();
publisher1.setName(TestConstants.PUBLISHER_NAME);
publisher1.setName(TestBookshelfConstants.PUBLISHER_NAME);
publisherRepository.save(publisher1);
BookshelfPublisher publisher2 = new BookshelfPublisher();
publisher2.setName(TestConstants.PUBLISHER_NAME);
publisher2.setName(TestBookshelfConstants.PUBLISHER_NAME);
assertThrows(DataIntegrityViolationException.class, () -> {
publisherRepository.save(publisher2);
});
publisherRepository.delete(publisher1);
assertEquals(TestConstants.PUBLISHER_COUNT, publisherRepository.findAll().size());
assertEquals(TestBookshelfConstants.PUBLISHER_COUNT, publisherRepository.findAll().size());
}
}
kontor-spring/src/test/java/de/thpeetz/kontor/comics/data/ArtistTest.java → kontor-spring/src/test/java/de/thpeetz/kontor/data/comics/ArtistTest.java
+5 -5
View File
@@ -1,18 +1,18 @@
package de.thpeetz.kontor.comics.data;
package de.thpeetz.kontor.data.comics;
import static org.junit.jupiter.api.Assertions.*;
import java.util.List;
import de.thpeetz.kontor.comics.repository.*;
import de.thpeetz.kontor.constants.TestComicConstants;
import de.thpeetz.kontor.repository.comics.ArtistRepository;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.dao.DataIntegrityViolationException;
import org.springframework.transaction.TransactionSystemException;
import de.thpeetz.kontor.comics.TestConstants;
@SpringBootTest
class ArtistTest {
@@ -22,7 +22,7 @@ class ArtistTest {
@Test
void checkInitialDataLoad() {
List<Artist> artists = artistRepository.findAll();
assertEquals(TestConstants.ARTIST_COUNT, artists.size());
assertEquals(TestComicConstants.ARTIST_COUNT, artists.size());
}
@Test
kontor-spring/src/test/java/de/thpeetz/kontor/comics/data/ComicTest.java → kontor-spring/src/test/java/de/thpeetz/kontor/data/comics/ComicTest.java
+9 -9
View File
@@ -1,10 +1,9 @@
package de.thpeetz.kontor.comics.data;
package de.thpeetz.kontor.data.comics;
import static org.junit.jupiter.api.Assertions.*;
import java.util.List;
import de.thpeetz.kontor.comics.repository.*;
import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestMethodOrder;
@@ -14,8 +13,9 @@ import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.dao.DataIntegrityViolationException;
import org.springframework.transaction.TransactionSystemException;
import de.thpeetz.kontor.comics.TestConstants;
import de.thpeetz.kontor.comics.services.ComicService;
import de.thpeetz.kontor.constants.TestComicConstants;
import de.thpeetz.kontor.repository.comics.ComicRepository;
import de.thpeetz.kontor.services.ComicService;
@SpringBootTest
@TestMethodOrder(OrderAnnotation.class)
@@ -31,14 +31,14 @@ class ComicTest {
@Order(1)
void checkInitialDataLoad() {
List<Comic> comics = comicRepository.findAll();
assertEquals(TestConstants.COMIC_COUNT, comics.size());
assertEquals(TestComicConstants.COMIC_COUNT, comics.size());
}
@Test
@Order(2)
void exceptionThrownWhenSavingComicWithoutPublisher() {
Comic comic = new Comic();
comic.setTitle(TestConstants.COMIC_TITLE);
comic.setTitle(TestComicConstants.COMIC_TITLE);
assertThrows(TransactionSystemException.class, () -> {
comicRepository.save(comic);
});
@@ -48,7 +48,7 @@ class ComicTest {
@Order(3)
void exceptionThrownWhenSavingComicWithEmptyTitle() {
Comic comic = new Comic();
Publisher publisher = TestConstants.getPublisherForComicTests(comicService);
Publisher publisher = TestComicConstants.getPublisherForComicTests(comicService);
comic.setPublisher(publisher);
assertNull(comic.getTitle());
assertThrows(TransactionSystemException.class, () -> {
@@ -64,9 +64,9 @@ class ComicTest {
@Test
@Order(4)
void exceptionThrownWhenSavingComicWithSameNameFromDifferentPublishers() {
Publisher publisher = TestConstants.getPublisherForComicTests(comicService);
Publisher publisher = TestComicConstants.getPublisherForComicTests(comicService);
Comic comic = new Comic();
comic.setTitle(TestConstants.SOJOURN_TPB_COMIC_TITLE);
comic.setTitle(TestComicConstants.SOJOURN_TPB_COMIC_TITLE);
comic.setPublisher(publisher);
assertThrows(DataIntegrityViolationException.class, () -> {
comicRepository.save(comic);
kontor-spring/src/test/java/de/thpeetz/kontor/comics/data/ComicWorkTest.java → kontor-spring/src/test/java/de/thpeetz/kontor/data/comics/ComicWorkTest.java
+2 -2
View File
@@ -1,4 +1,4 @@
package de.thpeetz.kontor.comics.data;
package de.thpeetz.kontor.data.comics;
import static org.junit.jupiter.api.Assertions.*;
@@ -8,7 +8,7 @@ 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.services.ComicService;
import de.thpeetz.kontor.services.ComicService;
@SpringBootTest
public class ComicWorkTest {
kontor-spring/src/test/java/de/thpeetz/kontor/comics/data/IssueTest.java → kontor-spring/src/test/java/de/thpeetz/kontor/data/comics/IssueTest.java
+9 -9
View File
@@ -1,17 +1,17 @@
package de.thpeetz.kontor.comics.data;
package de.thpeetz.kontor.data.comics;
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;
import org.springframework.transaction.TransactionSystemException;
import de.thpeetz.kontor.comics.TestConstants;
import de.thpeetz.kontor.comics.services.ComicService;
import de.thpeetz.kontor.constants.TestComicConstants;
import de.thpeetz.kontor.repository.comics.IssueRepository;
import de.thpeetz.kontor.services.ComicService;
@SpringBootTest
class IssueTest {
@@ -25,12 +25,12 @@ class IssueTest {
@Test
void checkInitialDataLoad() {
List<Issue> issues = comicService.findAllIssues();
assertEquals(TestConstants.ISSUE_COUNT, issues.size());
assertEquals(TestComicConstants.ISSUE_COUNT, issues.size());
}
@Test
void exceptionThrownWhenSavingIssueWithEmptyNumber() {
Comic comic = TestConstants.getComicWithoutReferences(comicService);
Comic comic = TestComicConstants.getComicWithoutReferences(comicService);
assertNotNull(comic);
Issue issue = new Issue();
issue.setComic(comic);
@@ -42,7 +42,7 @@ class IssueTest {
@Test
void exceptionThrownWhenSavingStoryArcWithoutComic() {
Issue issue = new Issue();
issue.setIssueNumber(TestConstants.ISSUE_ISSUENUMBER);
issue.setIssueNumber(TestComicConstants.ISSUE_ISSUENUMBER);
assertThrows(TransactionSystemException.class, () -> {
issueRepository.save(issue);
});
@@ -50,11 +50,11 @@ class IssueTest {
@Test
void saveStoryArc() {
Comic comic = TestConstants.getComicWithoutReferences(comicService);
Comic comic = TestComicConstants.getComicWithoutReferences(comicService);
assertEquals(0, comic.getStoryArcs().size());
Issue issue = new Issue();
issue.setComic(comic);
issue.setIssueNumber(TestConstants.ISSUE_ISSUENUMBER);
issue.setIssueNumber(TestComicConstants.ISSUE_ISSUENUMBER);
Issue savedInstance = issueRepository.save(issue);
assertNotNull(savedInstance);
comicService.deleteIssue(savedInstance);
kontor-spring/src/test/java/de/thpeetz/kontor/comics/data/PublisherTest.java → kontor-spring/src/test/java/de/thpeetz/kontor/data/comics/PublisherTest.java
+8 -8
View File
@@ -1,16 +1,16 @@
package de.thpeetz.kontor.comics.data;
package de.thpeetz.kontor.data.comics;
import static org.junit.jupiter.api.Assertions.*;
import de.thpeetz.kontor.comics.repository.*;
import de.thpeetz.kontor.constants.TestComicConstants;
import de.thpeetz.kontor.repository.comics.PublisherRepository;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.dao.DataIntegrityViolationException;
import org.springframework.transaction.TransactionSystemException;
import de.thpeetz.kontor.comics.TestConstants;
@SpringBootTest
class PublisherTest {
@@ -19,7 +19,7 @@ class PublisherTest {
@Test
void checkInitialDataLoad() {
assertEquals(TestConstants.PUBLISHER_COUNT, publisherRepository.findAll().size());
assertEquals(TestComicConstants.PUBLISHER_COUNT, publisherRepository.findAll().size());
}
@Test
@@ -33,14 +33,14 @@ class PublisherTest {
@Test
void savePublisherWithIdenticalName() {
Publisher publisher1 = new Publisher();
publisher1.setName(TestConstants.PUBLISHER_NAME);
publisher1.setName(TestComicConstants.PUBLISHER_NAME);
publisherRepository.save(publisher1);
Publisher publisher2 = new Publisher();
publisher2.setName(TestConstants.PUBLISHER_NAME);
publisher2.setName(TestComicConstants.PUBLISHER_NAME);
assertThrows(DataIntegrityViolationException.class, () -> {
publisherRepository.save(publisher2);
});
publisherRepository.delete(publisher1);
assertEquals(TestConstants.PUBLISHER_COUNT, publisherRepository.findAll().size());
assertEquals(TestComicConstants.PUBLISHER_COUNT, publisherRepository.findAll().size());
}
}
kontor-spring/src/test/java/de/thpeetz/kontor/comics/data/StoryArcTest.java → kontor-spring/src/test/java/de/thpeetz/kontor/data/comics/StoryArcTest.java
+9 -9
View File
@@ -1,15 +1,15 @@
package de.thpeetz.kontor.comics.data;
package de.thpeetz.kontor.data.comics;
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;
import org.springframework.transaction.TransactionSystemException;
import de.thpeetz.kontor.comics.TestConstants;
import de.thpeetz.kontor.comics.services.ComicService;
import de.thpeetz.kontor.constants.TestComicConstants;
import de.thpeetz.kontor.repository.comics.StoryArcRepository;
import de.thpeetz.kontor.services.ComicService;
@SpringBootTest
class StoryArcTest {
@@ -22,12 +22,12 @@ class StoryArcTest {
@Test
void checkInitialLoad() {
assertEquals(TestConstants.STORYARC_COUNT, storyArcRepository.findAll().size());
assertEquals(TestComicConstants.STORYARC_COUNT, storyArcRepository.findAll().size());
}
@Test
void exceptionThrownWhenSavingStoryArcWithEmptyName() {
Comic comic = TestConstants.getComicWithoutReferences(comicService);
Comic comic = TestComicConstants.getComicWithoutReferences(comicService);
assertNotNull(comic);
StoryArc storyArc = new StoryArc();
storyArc.setComic(comic);
@@ -39,7 +39,7 @@ class StoryArcTest {
@Test
void exceptionThrownWhenSavingStoryArcWithoutComic() {
StoryArc storyArc = new StoryArc();
storyArc.setName(TestConstants.STORYARC_NAME);
storyArc.setName(TestComicConstants.STORYARC_NAME);
assertThrows(TransactionSystemException.class, () -> {
storyArcRepository.save(storyArc);
});
@@ -47,10 +47,10 @@ class StoryArcTest {
@Test
void saveStoryArc() {
Comic comic = TestConstants.getComicWithoutReferences(comicService);
Comic comic = TestComicConstants.getComicWithoutReferences(comicService);
assertEquals(0, comic.getStoryArcs().size());
StoryArc storyArc = new StoryArc();
storyArc.setName(TestConstants.STORYARC_NAME);
storyArc.setName(TestComicConstants.STORYARC_NAME);
storyArc.setComic(comic);
StoryArc savedInstance = storyArcRepository.save(storyArc);
assertNotNull(savedInstance);
kontor-spring/src/test/java/de/thpeetz/kontor/comics/data/TradePaperbackTest.java → kontor-spring/src/test/java/de/thpeetz/kontor/data/comics/TradePaperbackTest.java
+9 -9
View File
@@ -1,15 +1,15 @@
package de.thpeetz.kontor.comics.data;
package de.thpeetz.kontor.data.comics;
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;
import org.springframework.transaction.TransactionSystemException;
import de.thpeetz.kontor.comics.TestConstants;
import de.thpeetz.kontor.comics.services.ComicService;
import de.thpeetz.kontor.constants.TestComicConstants;
import de.thpeetz.kontor.repository.comics.TradePaperbackRepository;
import de.thpeetz.kontor.services.ComicService;
@SpringBootTest
class TradePaperbackTest {
@@ -22,12 +22,12 @@ class TradePaperbackTest {
@Test
void checkInitialDataLoad() {
assertEquals(TestConstants.TRADEPAPERBACK_COUNT, tradePaperbackRepository.findAll().size());
assertEquals(TestComicConstants.TRADEPAPERBACK_COUNT, tradePaperbackRepository.findAll().size());
}
@Test
void exceptionThrownWhenSavingTradePaperbackWithEmptyName() {
Comic comic = TestConstants.getComicWithoutReferences(comicService);
Comic comic = TestComicConstants.getComicWithoutReferences(comicService);
assertNotNull(comic);
TradePaperback tradePaperback = new TradePaperback();
tradePaperback.setComic(comic);
@@ -39,7 +39,7 @@ class TradePaperbackTest {
@Test
void exceptionThrownWhenSavingTradePaperbackWithoutComic() {
TradePaperback tradePaperback = new TradePaperback();
tradePaperback.setName(TestConstants.TRADEPAPERBACK_NAME);
tradePaperback.setName(TestComicConstants.TRADEPAPERBACK_NAME);
assertThrows(TransactionSystemException.class, () -> {
tradePaperbackRepository.save(tradePaperback);
});
@@ -47,10 +47,10 @@ class TradePaperbackTest {
@Test
void saveTradePaperback() {
Comic comic = TestConstants.getComicWithoutReferences(comicService);
Comic comic = TestComicConstants.getComicWithoutReferences(comicService);
assertEquals(0, comic.getTradePaperbacks().size());
TradePaperback tradePaperback = new TradePaperback();
tradePaperback.setName(TestConstants.TRADEPAPERBACK_NAME);
tradePaperback.setName(TestComicConstants.TRADEPAPERBACK_NAME);
tradePaperback.setComic(comic);
TradePaperback savedInstance = tradePaperbackRepository.save(tradePaperback);
assertNotNull(savedInstance);
kontor-spring/src/test/java/de/thpeetz/kontor/comics/data/VolumeTest.java → kontor-spring/src/test/java/de/thpeetz/kontor/data/comics/VolumeTest.java
+10 -13
View File
@@ -1,15 +1,15 @@
package de.thpeetz.kontor.comics.data;
package de.thpeetz.kontor.data.comics;
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;
import org.springframework.transaction.TransactionSystemException;
import de.thpeetz.kontor.comics.TestConstants;
import de.thpeetz.kontor.comics.services.ComicService;
import de.thpeetz.kontor.constants.TestComicConstants;
import de.thpeetz.kontor.repository.comics.VolumeRepository;
import de.thpeetz.kontor.services.ComicService;
@SpringBootTest
class VolumeTest {
@@ -17,20 +17,17 @@ class VolumeTest {
@Autowired
private VolumeRepository volumeRepository;
@Autowired
private ComicRepository comicRepository;
@Autowired
private ComicService comicService;
@Test
void checkInitialDataLoad() {
assertEquals(TestConstants.VOLUME_COUNT, volumeRepository.count());
assertEquals(TestComicConstants.VOLUME_COUNT, volumeRepository.count());
}
@Test
void exceptionThrownWhenSavingVolumeWithEmptyName() {
Comic comic = TestConstants.getComicWithoutReferences(comicService);
Comic comic = TestComicConstants.getComicWithoutReferences(comicService);
Volume volume = new Volume();
volume.setComic(comic);
assertThrows(TransactionSystemException.class, () -> {
@@ -41,7 +38,7 @@ class VolumeTest {
@Test
void exceptionThrownWhenSavingVolumeWithoutComic() {
Volume volume = new Volume();
volume.setName(TestConstants.VOLUME_NAME);
volume.setName(TestComicConstants.VOLUME_NAME);
assertThrows(TransactionSystemException.class, () -> {
volumeRepository.save(volume);
});
@@ -49,15 +46,15 @@ class VolumeTest {
@Test
void saveVolume() {
Comic comic = TestConstants.getComicWithoutReferences(comicService);
Comic comic = TestComicConstants.getComicWithoutReferences(comicService);
assertEquals(0, comic.getVolumes().size());
Volume volume = new Volume();
volume.setName(TestConstants.VOLUME_NAME);
volume.setName(TestComicConstants.VOLUME_NAME);
volume.setComic(comic);
Volume savedInstance = volumeRepository.save(volume);
assertNotNull(savedInstance);
comicService.deleteVolume(savedInstance);
assertEquals(0, comic.getVolumes().size());
assertEquals(TestConstants.VOLUME_COUNT, volumeRepository.count());
assertEquals(TestComicConstants.VOLUME_COUNT, volumeRepository.count());
}
}
kontor-spring/src/test/java/de/thpeetz/kontor/comics/data/WorktypeTest.java → kontor-spring/src/test/java/de/thpeetz/kontor/data/comics/WorktypeTest.java
+12 -12
View File
@@ -1,10 +1,12 @@
package de.thpeetz.kontor.comics.data;
package de.thpeetz.kontor.data.comics;
import static org.junit.jupiter.api.Assertions.*;
import java.util.List;
import de.thpeetz.kontor.comics.repository.*;
import de.thpeetz.kontor.constants.TestComicConstants;
import de.thpeetz.kontor.repository.comics.WorktypeRepository;
import org.junit.jupiter.api.MethodOrderer.OrderAnnotation;
import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
@@ -14,8 +16,6 @@ import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.dao.DataIntegrityViolationException;
import org.springframework.transaction.TransactionSystemException;
import de.thpeetz.kontor.comics.TestConstants;
@SpringBootTest
@TestMethodOrder(OrderAnnotation.class)
class WorktypeTest {
@@ -33,9 +33,9 @@ class WorktypeTest {
@Test
@Order(2)
void findWorktypeByName() {
Worktype found = worktypeRepository.findByName(TestConstants.WORKTYPE_INKER);
Worktype found = worktypeRepository.findByName(TestComicConstants.WORKTYPE_INKER);
assertNotNull(found);
assertEquals(TestConstants.WORKTYPE_INKER, found.getName());
assertEquals(TestComicConstants.WORKTYPE_INKER, found.getName());
Worktype notFound = worktypeRepository.findByName("er");
assertNull(notFound);
}
@@ -53,10 +53,10 @@ class WorktypeTest {
@Order(4)
void saveWorktypeWithIdenticalName() {
Worktype worktype1 = new Worktype();
worktype1.setName(TestConstants.WORKTYPE_NAME);
worktype1.setName(TestComicConstants.WORKTYPE_NAME);
worktypeRepository.save(worktype1);
Worktype worktype2 = new Worktype();
worktype2.setName(TestConstants.WORKTYPE_NAME);
worktype2.setName(TestComicConstants.WORKTYPE_NAME);
assertThrows(DataIntegrityViolationException.class, () -> {
worktypeRepository.save(worktype2);
});
@@ -67,17 +67,17 @@ class WorktypeTest {
@Order(5)
void saveWorktype() {
Worktype worktype = new Worktype();
worktype.setName(TestConstants.WORKTYPE_NAME);
worktype.setName(TestComicConstants.WORKTYPE_NAME);
worktypeRepository.save(worktype);
assertEquals(TestConstants.WORKTYPE_COUNT + 1, worktypeRepository.count());
assertEquals(TestComicConstants.WORKTYPE_COUNT + 1, worktypeRepository.count());
}
@Test
@Order(6)
void deleteWorktype() {
Worktype worktype = worktypeRepository.findByName(TestConstants.WORKTYPE_NAME);
Worktype worktype = worktypeRepository.findByName(TestComicConstants.WORKTYPE_NAME);
assertNotNull(worktype);
worktypeRepository.delete(worktype);
assertEquals(TestConstants.WORKTYPE_COUNT, worktypeRepository.count());
assertEquals(TestComicConstants.WORKTYPE_COUNT, worktypeRepository.count());
}
}
kontor-spring/src/test/java/de/thpeetz/kontor/media/data/MediaArticleTest.java → kontor-spring/src/test/java/de/thpeetz/kontor/data/media/MediaArticleTest.java
+3 -3
View File
@@ -1,11 +1,11 @@
package de.thpeetz.kontor.media.data;
package de.thpeetz.kontor.data.media;
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;
import org.springframework.boot.test.context.SpringBootTest;
import de.thpeetz.kontor.repository.media.MediaArticleRepository;
import static org.junit.jupiter.api.Assertions.*;
import static org.junit.jupiter.api.Assertions.assertFalse;
kontor-spring/src/test/java/de/thpeetz/kontor/media/data/MediaFileTest.java → kontor-spring/src/test/java/de/thpeetz/kontor/data/media/MediaFileTest.java
+2 -2
View File
@@ -1,10 +1,10 @@
package de.thpeetz.kontor.media.data;
package de.thpeetz.kontor.data.media;
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 de.thpeetz.kontor.repository.media.MediaFileRepository;
import java.util.List;
kontor-spring/src/test/java/de/thpeetz/kontor/tysc/data/CardSetTest.java → kontor-spring/src/test/java/de/thpeetz/kontor/data/tysc/CardSetTest.java
+4 -4
View File
@@ -1,4 +1,4 @@
package de.thpeetz.kontor.tysc.data;
package de.thpeetz.kontor.data.tysc;
import static org.junit.jupiter.api.Assertions.*;
@@ -6,8 +6,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.tysc.TestConstants;
import de.thpeetz.kontor.tysc.services.CardService;
import de.thpeetz.kontor.constants.TestTyscConstants;
import de.thpeetz.kontor.services.CardService;
@SpringBootTest
class CardSetTest {
@@ -17,6 +17,6 @@ class CardSetTest {
@Test
void checkInitialDataLoad() {
assertEquals(TestConstants.CARDSET_COUNT, cardService.findAllCardSets(null).size());
assertEquals(TestTyscConstants.CARDSET_COUNT, cardService.findAllCardSets(null).size());
}
}
kontor-spring/src/test/java/de/thpeetz/kontor/tysc/data/CardTest.java → kontor-spring/src/test/java/de/thpeetz/kontor/data/tysc/CardTest.java
+4 -4
View File
@@ -1,4 +1,4 @@
package de.thpeetz.kontor.tysc.data;
package de.thpeetz.kontor.data.tysc;
import static org.junit.jupiter.api.Assertions.*;
@@ -6,8 +6,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.tysc.TestConstants;
import de.thpeetz.kontor.tysc.services.CardService;
import de.thpeetz.kontor.constants.TestTyscConstants;
import de.thpeetz.kontor.services.CardService;
@SpringBootTest
class CardTest {
@@ -17,6 +17,6 @@ class CardTest {
@Test
void checkInitialDataLoad() {
assertEquals(TestConstants.CARD_COUNT, cardService.findAllCards(null).size());
assertEquals(TestTyscConstants.CARD_COUNT, cardService.findAllCards(null).size());
}
}
kontor-spring/src/test/java/de/thpeetz/kontor/tysc/data/FieldPositionTest.java → kontor-spring/src/test/java/de/thpeetz/kontor/data/tysc/FieldPositionTest.java
+4 -4
View File
@@ -1,14 +1,14 @@
package de.thpeetz.kontor.tysc.data;
package de.thpeetz.kontor.data.tysc;
import static org.junit.jupiter.api.Assertions.*;
import de.thpeetz.kontor.tysc.repository.FieldPositionRepository;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.transaction.TransactionSystemException;
import de.thpeetz.kontor.tysc.TestConstants;
import de.thpeetz.kontor.constants.TestTyscConstants;
import de.thpeetz.kontor.repository.tysc.FieldPositionRepository;
@SpringBootTest
class FieldPositionTest {
@@ -18,7 +18,7 @@ class FieldPositionTest {
@Test
void checkInitialDataLoad() {
assertEquals(Integer.toUnsignedLong(TestConstants.POSITION_COUNT), fieldPositionRepository.count());
assertEquals(Integer.toUnsignedLong(TestTyscConstants.POSITION_COUNT), fieldPositionRepository.count());
}
@Test
kontor-spring/src/test/java/de/thpeetz/kontor/tysc/data/PlayerTest.java → kontor-spring/src/test/java/de/thpeetz/kontor/data/tysc/PlayerTest.java
+4 -4
View File
@@ -1,10 +1,9 @@
package de.thpeetz.kontor.tysc.data;
package de.thpeetz.kontor.data.tysc;
import static org.junit.jupiter.api.Assertions.*;
import java.util.List;
import de.thpeetz.kontor.tysc.repository.PlayerRepository;
import org.junit.jupiter.api.MethodOrderer.OrderAnnotation;
import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
@@ -14,7 +13,8 @@ import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.dao.DataIntegrityViolationException;
import org.springframework.transaction.TransactionSystemException;
import de.thpeetz.kontor.tysc.TestConstants;
import de.thpeetz.kontor.constants.TestTyscConstants;
import de.thpeetz.kontor.repository.tysc.PlayerRepository;
@SpringBootTest
@TestMethodOrder(OrderAnnotation.class)
@@ -27,7 +27,7 @@ class PlayerTest {
@Order(1)
void checkInitialDataLoad() {
List<Player> players = playerRepository.findAll();
assertEquals(TestConstants.PLAYER_COUNT, players.size());
assertEquals(TestTyscConstants.PLAYER_COUNT, players.size());
}
@Test
kontor-spring/src/test/java/de/thpeetz/kontor/tysc/data/RoosterTest.java → kontor-spring/src/test/java/de/thpeetz/kontor/data/tysc/RoosterTest.java
+4 -4
View File
@@ -1,16 +1,16 @@
package de.thpeetz.kontor.tysc.data;
package de.thpeetz.kontor.data.tysc;
import static org.junit.jupiter.api.Assertions.*;
import java.util.List;
import de.thpeetz.kontor.tysc.repository.RoosterRepository;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.dao.DataIntegrityViolationException;
import de.thpeetz.kontor.tysc.TestConstants;
import de.thpeetz.kontor.constants.TestTyscConstants;
import de.thpeetz.kontor.repository.tysc.RoosterRepository;
@SpringBootTest
class RoosterTest {
@@ -21,7 +21,7 @@ class RoosterTest {
@Test
void checkInitialDataLoad() {
List<Rooster> roosters = roosterRepository.findAll();
assertEquals(TestConstants.ROOSTER_COUNT, roosters.size());
assertEquals(TestTyscConstants.ROOSTER_COUNT, roosters.size());
}
@Test
kontor-spring/src/test/java/de/thpeetz/kontor/tysc/data/SportTest.java → kontor-spring/src/test/java/de/thpeetz/kontor/data/tysc/SportTest.java
+4 -4
View File
@@ -1,17 +1,17 @@
package de.thpeetz.kontor.tysc.data;
package de.thpeetz.kontor.data.tysc;
import static org.junit.jupiter.api.Assertions.*;
import java.util.List;
import de.thpeetz.kontor.tysc.repository.SportRepository;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.dao.DataIntegrityViolationException;
import org.springframework.transaction.TransactionSystemException;
import de.thpeetz.kontor.tysc.TestConstants;
import de.thpeetz.kontor.constants.TestTyscConstants;
import de.thpeetz.kontor.repository.tysc.SportRepository;
@SpringBootTest
class SportTest {
@@ -22,7 +22,7 @@ class SportTest {
@Test
void checkInitialDataLoad() {
List<Sport> sports = sportRepository.findAll();
assertEquals(TestConstants.SPORT_COUNT, sports.size());
assertEquals(TestTyscConstants.SPORT_COUNT, sports.size());
}
@Test
kontor-spring/src/test/java/de/thpeetz/kontor/tysc/data/TeamTest.java → kontor-spring/src/test/java/de/thpeetz/kontor/data/tysc/TeamTest.java
+5 -5
View File
@@ -1,16 +1,16 @@
package de.thpeetz.kontor.tysc.data;
package de.thpeetz.kontor.data.tysc;
import static org.junit.jupiter.api.Assertions.*;
import java.util.List;
import de.thpeetz.kontor.tysc.repository.TeamRepository;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.transaction.TransactionSystemException;
import de.thpeetz.kontor.tysc.TestConstants;
import de.thpeetz.kontor.constants.TestTyscConstants;
import de.thpeetz.kontor.repository.tysc.TeamRepository;
@SpringBootTest
class TeamTest {
@@ -21,7 +21,7 @@ class TeamTest {
@Test
void checkInitialDataLoad() {
List<Team> teams = teamRepository.findAll();
assertEquals(TestConstants.TEAM_COUNT, teams.size());
assertEquals(TestTyscConstants.TEAM_COUNT, teams.size());
}
@Test
@@ -35,7 +35,7 @@ class TeamTest {
@Test
void throwExceptionWhenTeamSavedWithoutSport() {
Team team = new Team();
team.setName(TestConstants.TEAM_NAME);
team.setName(TestTyscConstants.TEAM_NAME);
assertThrows(TransactionSystemException.class, () -> {
teamRepository.save(team);
});
kontor-spring/src/test/java/de/thpeetz/kontor/tysc/data/VendorTest.java → kontor-spring/src/test/java/de/thpeetz/kontor/data/tysc/VendorTest.java
+5 -5
View File
@@ -1,18 +1,18 @@
package de.thpeetz.kontor.tysc.data;
package de.thpeetz.kontor.data.tysc;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;
import java.util.List;
import de.thpeetz.kontor.tysc.repository.VendorRepository;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.dao.DataIntegrityViolationException;
import org.springframework.transaction.TransactionSystemException;
import de.thpeetz.kontor.tysc.TestConstants;
import de.thpeetz.kontor.constants.TestTyscConstants;
import de.thpeetz.kontor.repository.tysc.VendorRepository;
@SpringBootTest
class VendorTest {
@@ -23,7 +23,7 @@ class VendorTest {
@Test
void checkInitialDataLoad() {
List<Vendor> vendors = vendorRepository.findAll();
assertEquals(TestConstants.VENDOR_COUNT, vendors.size());
assertEquals(TestTyscConstants.VENDOR_COUNT, vendors.size());
}
@Test
@@ -37,7 +37,7 @@ class VendorTest {
@Test
void exceptionThrownWhenSavingSportWithExistingName() {
Vendor vendor = new Vendor();
vendor.setName(TestConstants.TOPPS_NAME);
vendor.setName(TestTyscConstants.TOPPS_NAME);
assertThrows(DataIntegrityViolationException.class, () -> {
vendorRepository.save(vendor);
});
kontor-spring/src/test/java/de/thpeetz/kontor/media/data/MediaVideoTest.java
-40
View File
@@ -1,40 +0,0 @@
package de.thpeetz.kontor.media.data;
import org.junit.jupiter.api.Order;
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;
@SpringBootTest
public class MediaVideoTest {
@Autowired
private MediaVideoRepository mediaVideoRepository;
@Test
@Order(1)
void checkInitialLoad() {
assertTrue(mediaVideoRepository.findAll().isEmpty());
}
@Test
@Order(2)
void checkDefaultValues() {
MediaVideo mediaVideo = new MediaVideo();
assertNull(mediaVideo.getUrl());
assertNull(mediaVideo.getTitle());
assertNull(mediaVideo.getFileName());
assertNull(mediaVideo.getPath());
assertNull(mediaVideo.getCloudLink());
assertNull(mediaVideo.getCreatedDate());
assertNull(mediaVideo.getLastModifiedDate());
assertNull(mediaVideo.getId());
assertFalse(mediaVideo.isReview());
assertFalse(mediaVideo.isShouldDownload());
}
}
kontor-spring/src/test/java/de/thpeetz/kontor/bookshelf/data/ArticleAuthorRepositoryTest.java → kontor-spring/src/test/java/de/thpeetz/kontor/repository/bookshelf/ArticleAuthorRepositoryTest.java
+19 -15
View File
@@ -1,6 +1,10 @@
package de.thpeetz.kontor.bookshelf.data;
package de.thpeetz.kontor.repository.bookshelf;
import de.thpeetz.kontor.constants.TestBookshelfConstants;
import de.thpeetz.kontor.data.bookshelf.Article;
import de.thpeetz.kontor.data.bookshelf.ArticleAuthor;
import de.thpeetz.kontor.data.bookshelf.Author;
import de.thpeetz.kontor.bookshelf.TestConstants;
import org.junit.jupiter.api.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
@@ -25,31 +29,31 @@ class ArticleAuthorRepositoryTest {
@Order(1)
void saveArticleAuthor() {
Author author = new Author();
author.setFirstName(TestConstants.AUTHOR_FIRSTNAME);
author.setLastName(TestConstants.AUTHOR_LASTNAME);
Author savedAuthor = authorRepository.save(author);
assertEquals(TestConstants.AUTHOR_COUNT+1, authorRepository.findAll().size());
author.setFirstName(TestBookshelfConstants.AUTHOR_FIRSTNAME);
author.setLastName(TestBookshelfConstants.AUTHOR_LASTNAME);
//TODO Author savedAuthor = authorRepository.save(author);
assertEquals(TestBookshelfConstants.AUTHOR_COUNT+1, authorRepository.findAll().size());
Article article = new Article();
article.setTitle(TestConstants.ARTICLE_TITLE);
Article savedArticle = articleRepository.save(article);
article.setTitle(TestBookshelfConstants.ARTICLE_TITLE);
//TODO Article savedArticle = articleRepository.save(article);
ArticleAuthor articleAuthor = new ArticleAuthor();
articleAuthor.setArticle(article);
articleAuthor.setAuthor(author);
ArticleAuthor savedArticleAuthor = articleAuthorRepository.save(articleAuthor);
assertEquals(TestConstants.ARTICLEAUTHOR_COUNT+1, articleAuthorRepository.findAll().size());
//TODO ArticleAuthor savedArticleAuthor = articleAuthorRepository.save(articleAuthor);
assertEquals(TestBookshelfConstants.ARTICLEAUTHOR_COUNT+1, articleAuthorRepository.findAll().size());
}
@Test
@Order(2)
void testFindByArticle() {
Article article = articleRepository.findByTitle(TestConstants.ARTICLE_TITLE).get(0);
Article article = articleRepository.findByTitle(TestBookshelfConstants.ARTICLE_TITLE).get(0);
assertEquals(1, articleAuthorRepository.findByArticle(article).size());
}
@Test
@Order(3)
void testFindByAuthor() {
Author author = authorRepository.findByFirstNameAndLastName(TestConstants.AUTHOR_FIRSTNAME, TestConstants.AUTHOR_LASTNAME);
Author author = authorRepository.findByFirstNameAndLastName(TestBookshelfConstants.AUTHOR_FIRSTNAME, TestBookshelfConstants.AUTHOR_LASTNAME);
assertEquals(1, articleAuthorRepository.findByAuthor(author).size());
}
@@ -65,10 +69,10 @@ class ArticleAuthorRepositoryTest {
article.getAuthors().remove(articleAuthor);
article = articleRepository.save(article);
articleAuthorRepository.delete(articleAuthor);
assertEquals(TestConstants.ARTICLEAUTHOR_COUNT, articleAuthorRepository.findAll().size());
assertEquals(TestBookshelfConstants.ARTICLEAUTHOR_COUNT, articleAuthorRepository.findAll().size());
authorRepository.delete(author);
assertEquals(TestConstants.AUTHOR_COUNT, authorRepository.findAll().size());
assertEquals(TestBookshelfConstants.AUTHOR_COUNT, authorRepository.findAll().size());
articleRepository.delete(article);
assertEquals(TestConstants.ARTICLE_COUNT, articleRepository.findAll().size());
assertEquals(TestBookshelfConstants.ARTICLE_COUNT, articleRepository.findAll().size());
}
}
kontor-spring/src/test/java/de/thpeetz/kontor/bookshelf/data/ArticleRepositoryTest.java → kontor-spring/src/test/java/de/thpeetz/kontor/repository/bookshelf/ArticleRepositoryTest.java
+11 -9
View File
@@ -1,6 +1,8 @@
package de.thpeetz.kontor.bookshelf.data;
package de.thpeetz.kontor.repository.bookshelf;
import de.thpeetz.kontor.constants.TestBookshelfConstants;
import de.thpeetz.kontor.data.bookshelf.Article;
import de.thpeetz.kontor.bookshelf.TestConstants;
import org.junit.jupiter.api.MethodOrderer;
import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
@@ -22,30 +24,30 @@ class ArticleRepositoryTest {
@Test
@Order(1)
void checkInitialLoad() {
assertEquals(TestConstants.ARTICLE_COUNT, articleRepository.findAll().size());
assertEquals(TestBookshelfConstants.ARTICLE_COUNT, articleRepository.findAll().size());
}
@Test
@Order(2)
void saveArticle() {
Article article = new Article();
article.setTitle(TestConstants.ARTICLE_TITLE);
article.setTitle(TestBookshelfConstants.ARTICLE_TITLE);
articleRepository.save(article);
assertEquals(TestConstants.ARTICLE_COUNT+1, articleRepository.findAll().size());
assertEquals(TestBookshelfConstants.ARTICLE_COUNT+1, articleRepository.findAll().size());
}
@Test
@Order(3)
void search() {
List<Article> articles = articleRepository.search(TestConstants.ARTICLE_TITLE.substring(2,5));
List<Article> articles = articleRepository.search(TestBookshelfConstants.ARTICLE_TITLE.substring(2,5));
assertEquals(1, articles.size());
assertEquals(0, articleRepository.search(TestConstants.BOOK_TITLE).size());
assertEquals(0, articleRepository.search(TestBookshelfConstants.BOOK_TITLE).size());
}
@Test
@Order(4)
void findByTitle() {
List<Article> articles = articleRepository.search(TestConstants.ARTICLE_TITLE);
List<Article> articles = articleRepository.search(TestBookshelfConstants.ARTICLE_TITLE);
assertEquals(1, articles.size());
}
@@ -56,6 +58,6 @@ class ArticleRepositoryTest {
assertEquals(1, articles.size());
assertEquals(0, articles.get(0).getAuthors().size());
articleRepository.delete(articles.get(0));
assertEquals(TestConstants.ARTICLE_COUNT, articleRepository.findAll().size());
assertEquals(TestBookshelfConstants.ARTICLE_COUNT, articleRepository.findAll().size());
}
}
kontor-spring/src/test/java/de/thpeetz/kontor/bookshelf/data/AuthorRepositoryTest.java → kontor-spring/src/test/java/de/thpeetz/kontor/repository/bookshelf/AuthorRepositoryTest.java
+10 -8
View File
@@ -1,6 +1,8 @@
package de.thpeetz.kontor.bookshelf.data;
package de.thpeetz.kontor.repository.bookshelf;
import de.thpeetz.kontor.constants.TestBookshelfConstants;
import de.thpeetz.kontor.data.bookshelf.Author;
import de.thpeetz.kontor.bookshelf.TestConstants;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.MethodOrderer.OrderAnnotation;
import org.junit.jupiter.api.Order;
@@ -25,17 +27,17 @@ class AuthorRepositoryTest {
@Test
@Order(1)
void checkInitialLoad() {
assertEquals(TestConstants.AUTHOR_COUNT, authorRepository.findAll().size());
assertEquals(TestBookshelfConstants.AUTHOR_COUNT, authorRepository.findAll().size());
}
@Test
@Order(2)
void saveAutor() {
Author author = new Author();
author.setFirstName(TestConstants.AUTHOR_FIRSTNAME);
author.setLastName(TestConstants.AUTHOR_LASTNAME);
author.setFirstName(TestBookshelfConstants.AUTHOR_FIRSTNAME);
author.setLastName(TestBookshelfConstants.AUTHOR_LASTNAME);
authorRepository.save(author);
assertEquals(TestConstants.AUTHOR_COUNT+1, authorRepository.findAll().size());
assertEquals(TestBookshelfConstants.AUTHOR_COUNT+1, authorRepository.findAll().size());
}
@Test
@@ -61,9 +63,9 @@ class AuthorRepositoryTest {
@Test
@Order(5)
void deleteAuthor() {
Author existingAuthor = authorRepository.findByFirstNameAndLastName(TestConstants.AUTHOR_FIRSTNAME, TestConstants.AUTHOR_LASTNAME);
Author existingAuthor = authorRepository.findByFirstNameAndLastName(TestBookshelfConstants.AUTHOR_FIRSTNAME, TestBookshelfConstants.AUTHOR_LASTNAME);
assertNotNull(existingAuthor);
authorRepository.delete(existingAuthor);
assertEquals(TestConstants.AUTHOR_COUNT, authorRepository.findAll().size());
assertEquals(TestBookshelfConstants.AUTHOR_COUNT, authorRepository.findAll().size());
}
}
kontor-spring/src/test/java/de/thpeetz/kontor/bookshelf/data/BookAuthorRepositoryTest.java → kontor-spring/src/test/java/de/thpeetz/kontor/repository/bookshelf/BookAuthorRepositoryTest.java
+21 -16
View File
@@ -1,6 +1,11 @@
package de.thpeetz.kontor.bookshelf.data;
package de.thpeetz.kontor.repository.bookshelf;
import de.thpeetz.kontor.constants.TestBookshelfConstants;
import de.thpeetz.kontor.data.bookshelf.Author;
import de.thpeetz.kontor.data.bookshelf.Book;
import de.thpeetz.kontor.data.bookshelf.BookAuthor;
import de.thpeetz.kontor.data.bookshelf.BookshelfPublisher;
import de.thpeetz.kontor.bookshelf.TestConstants;
import org.junit.jupiter.api.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
@@ -30,25 +35,25 @@ class BookAuthorRepositoryTest {
@Order(1)
void saveBookAuthor() {
Author author = new Author();
author.setFirstName(TestConstants.AUTHOR_FIRSTNAME);
author.setLastName(TestConstants.AUTHOR_LASTNAME);
author.setFirstName(TestBookshelfConstants.AUTHOR_FIRSTNAME);
author.setLastName(TestBookshelfConstants.AUTHOR_LASTNAME);
Author savedAuthor = authorRepository.save(author);
assertEquals(TestConstants.AUTHOR_COUNT+1, authorRepository.findAll().size());
assertEquals(TestBookshelfConstants.AUTHOR_COUNT+1, authorRepository.findAll().size());
BookshelfPublisher publisher = new BookshelfPublisher();
publisher.setName(TestConstants.PUBLISHER_NAME);
publisher.setName(TestBookshelfConstants.PUBLISHER_NAME);
BookshelfPublisher savedPublisher = bookshelfPublisherRepository.save(publisher);
assertEquals(TestConstants.PUBLISHER_COUNT+1, bookshelfPublisherRepository.findAll().size());
assertEquals(TestBookshelfConstants.PUBLISHER_COUNT+1, bookshelfPublisherRepository.findAll().size());
Book book = new Book();
book.setTitle(TestConstants.ARTICLE_TITLE);
book.setIsbn(TestConstants.BOOK_ISBN);
book.setTitle(TestBookshelfConstants.ARTICLE_TITLE);
book.setIsbn(TestBookshelfConstants.BOOK_ISBN);
book.setPublisher(savedPublisher);
Book savedBook = bookRepository.save(book);
assertEquals(TestConstants.BOOK_COUNT+1, bookRepository.findAll().size());
assertEquals(TestBookshelfConstants.BOOK_COUNT+1, bookRepository.findAll().size());
BookAuthor bookAuthor = new BookAuthor();
bookAuthor.setBook(savedBook);
bookAuthor.setAuthor(savedAuthor);
BookAuthor savedBookAuthor = bookAuthorRepository.save(bookAuthor);
assertEquals(TestConstants.BOOKAUTHOR_COUNT+1, bookAuthorRepository.findAll().size());
//TODO BookAuthor savedBookAuthor = bookAuthorRepository.save(bookAuthor);
assertEquals(TestBookshelfConstants.BOOKAUTHOR_COUNT+1, bookAuthorRepository.findAll().size());
}
@Test
@@ -83,12 +88,12 @@ class BookAuthorRepositoryTest {
bookshelfPublisherRepository.save(publisher);
book = bookRepository.save(book);
bookshelfPublisherRepository.delete(publisher);
assertEquals(TestConstants.PUBLISHER_COUNT, bookshelfPublisherRepository.findAll().size());
assertEquals(TestBookshelfConstants.PUBLISHER_COUNT, bookshelfPublisherRepository.findAll().size());
bookAuthorRepository.delete(bookAuthor);
assertEquals(TestConstants.BOOKAUTHOR_COUNT, bookAuthorRepository.findAll().size());
assertEquals(TestBookshelfConstants.BOOKAUTHOR_COUNT, bookAuthorRepository.findAll().size());
authorRepository.delete(author);
assertEquals(TestConstants.AUTHOR_COUNT, authorRepository.findAll().size());
assertEquals(TestBookshelfConstants.AUTHOR_COUNT, authorRepository.findAll().size());
bookRepository.delete(book);
assertEquals(TestConstants.BOOK_COUNT, bookRepository.findAll().size());
assertEquals(TestBookshelfConstants.BOOK_COUNT, bookRepository.findAll().size());
}
}
kontor-spring/src/test/java/de/thpeetz/kontor/bookshelf/data/BookRepositoryTest.java → kontor-spring/src/test/java/de/thpeetz/kontor/repository/bookshelf/BookRepositoryTest.java
+21 -18
View File
@@ -1,6 +1,9 @@
package de.thpeetz.kontor.bookshelf.data;
package de.thpeetz.kontor.repository.bookshelf;
import de.thpeetz.kontor.constants.TestBookshelfConstants;
import de.thpeetz.kontor.data.bookshelf.Book;
import de.thpeetz.kontor.data.bookshelf.BookshelfPublisher;
import de.thpeetz.kontor.bookshelf.TestConstants;
import org.junit.jupiter.api.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
@@ -23,65 +26,65 @@ class BookRepositoryTest {
@Test
@Order(1)
void checkInitialLoad(){
assertEquals(TestConstants.BOOK_COUNT, bookRepository.findAll().size());
assertEquals(TestBookshelfConstants.BOOK_COUNT, bookRepository.findAll().size());
}
@Test
@Order(2)
void saveBook() {
BookshelfPublisher publisher = new BookshelfPublisher();
publisher.setName(TestConstants.PUBLISHER_NAME);
publisher.setName(TestBookshelfConstants.PUBLISHER_NAME);
bookshelfPublisherRepository.save(publisher);
Book book = new Book();
book.setTitle(TestConstants.BOOK_TITLE);
book.setIsbn(TestConstants.BOOK_ISBN);
book.setTitle(TestBookshelfConstants.BOOK_TITLE);
book.setIsbn(TestBookshelfConstants.BOOK_ISBN);
book.setPublisher(publisher);
bookRepository.save(book);
assertEquals(TestConstants.BOOK_COUNT+1, bookRepository.findAll().size());
assertEquals(TestBookshelfConstants.BOOK_COUNT+1, bookRepository.findAll().size());
}
@Test
@Order(3)
void search() {
List<Book> books = bookRepository.search(TestConstants.BOOK_TITLE.substring(2,5));
List<Book> books = bookRepository.search(TestBookshelfConstants.BOOK_TITLE.substring(2,5));
assertEquals(1, books.size());
assertEquals(1, bookRepository.search(TestConstants.BOOK_ISBN.substring(3,7)).size());
assertEquals(1, bookRepository.search(TestBookshelfConstants.BOOK_ISBN.substring(3,7)).size());
assertEquals(0, bookRepository.search("Article").size());
}
@Test
@Order(4)
void findByTitle() {
List<Book> books = bookRepository.findByTitle(TestConstants.BOOK_TITLE);
List<Book> books = bookRepository.findByTitle(TestBookshelfConstants.BOOK_TITLE);
assertEquals(1, books.size());
assertEquals(TestConstants.BOOK_ISBN, books.get(0).getIsbn());
assertEquals(TestBookshelfConstants.BOOK_ISBN, books.get(0).getIsbn());
}
@Test
@Order(5)
void findByTitleIgnoreCase() {
List<Book> books = bookRepository.findByTitleIgnoreCase(TestConstants.BOOK_TITLE.toLowerCase());
List<Book> books = bookRepository.findByTitleIgnoreCase(TestBookshelfConstants.BOOK_TITLE.toLowerCase());
assertEquals(1, books.size());
assertEquals(TestConstants.BOOK_ISBN, books.get(0).getIsbn());
assertEquals(TestBookshelfConstants.BOOK_ISBN, books.get(0).getIsbn());
}
@Test
@Order(6)
void findByIsbn() {
List<Book> books = bookRepository.findByIsbn(TestConstants.BOOK_ISBN);
List<Book> books = bookRepository.findByIsbn(TestBookshelfConstants.BOOK_ISBN);
assertEquals(1, books.size());
assertEquals(TestConstants.BOOK_TITLE, books.get(0).getTitle());
assertEquals(TestBookshelfConstants.BOOK_TITLE, books.get(0).getTitle());
}
@Test
@Order(7)
void deleteBook() {
List<Book> books = bookRepository.findByIsbn(TestConstants.BOOK_ISBN);
List<Book> books = bookRepository.findByIsbn(TestBookshelfConstants.BOOK_ISBN);
Book book = books.get(0);
BookshelfPublisher publisher = book.getPublisher();
bookshelfPublisherRepository.delete(publisher);
bookRepository.delete(book);
assertEquals(TestConstants.BOOK_COUNT, bookRepository.findAll().size());
assertEquals(TestConstants.PUBLISHER_COUNT, bookshelfPublisherRepository.findAll().size());
assertEquals(TestBookshelfConstants.BOOK_COUNT, bookRepository.findAll().size());
assertEquals(TestBookshelfConstants.PUBLISHER_COUNT, bookshelfPublisherRepository.findAll().size());
}
}
kontor-spring/src/test/java/de/thpeetz/kontor/bookshelf/data/BookshelfPublisherRepositoryTest.java → kontor-spring/src/test/java/de/thpeetz/kontor/repository/bookshelf/BookshelfPublisherRepositoryTest.java
+16 -15
View File
@@ -1,4 +1,4 @@
package de.thpeetz.kontor.bookshelf.data;
package de.thpeetz.kontor.repository.bookshelf;
import static org.junit.jupiter.api.Assertions.*;
@@ -11,7 +11,8 @@ import org.junit.jupiter.api.TestMethodOrder;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import de.thpeetz.kontor.bookshelf.TestConstants;
import de.thpeetz.kontor.constants.TestBookshelfConstants;
import de.thpeetz.kontor.data.bookshelf.BookshelfPublisher;
import lombok.extern.slf4j.Slf4j;
@Slf4j
@@ -25,48 +26,48 @@ class BookshelfPublisherRepositoryTest {
@Test
@Order(1)
void checkInitialLoad() {
assertEquals(TestConstants.PUBLISHER_COUNT, publisherRepository.findAll().size());
assertEquals(TestBookshelfConstants.PUBLISHER_COUNT, publisherRepository.findAll().size());
}
@Test
@Order(2)
void savePublisher() {
BookshelfPublisher publisher = new BookshelfPublisher();
publisher.setName(TestConstants.PUBLISHER_NAME);
publisher.setName(TestBookshelfConstants.PUBLISHER_NAME);
publisherRepository.save(publisher);
assertEquals(TestConstants.PUBLISHER_COUNT + 1, publisherRepository.findAll().size());
assertEquals(TestBookshelfConstants.PUBLISHER_COUNT + 1, publisherRepository.findAll().size());
}
@Test
@Order(3)
void findPublisherByName() {
assertEquals(TestConstants.PUBLISHER_COUNT + 1, publisherRepository.findAll().size());
assertEquals(TestBookshelfConstants.PUBLISHER_COUNT + 1, publisherRepository.findAll().size());
log.info("Liste der Publisher: {}", publisherRepository.findAll());
BookshelfPublisher publisher = publisherRepository.findByName(TestConstants.PUBLISHER_NAME);
BookshelfPublisher publisher = publisherRepository.findByName(TestBookshelfConstants.PUBLISHER_NAME);
assertNotNull(publisher);
assertEquals(TestConstants.PUBLISHER_NAME, publisher.getName());
BookshelfPublisher notFound = publisherRepository.findByName(TestConstants.PUBLISHER_SEARCH);
assertEquals(TestBookshelfConstants.PUBLISHER_NAME, publisher.getName());
BookshelfPublisher notFound = publisherRepository.findByName(TestBookshelfConstants.PUBLISHER_SEARCH);
assertNull(notFound);
List<BookshelfPublisher> publishers = publisherRepository
.findByNameIgnoreCase(TestConstants.PUBLISHER_NAME.toLowerCase());
.findByNameIgnoreCase(TestBookshelfConstants.PUBLISHER_NAME.toLowerCase());
assertEquals(1, publishers.size());
assertEquals(TestConstants.PUBLISHER_NAME, publishers.get(0).getName());
assertEquals(TestBookshelfConstants.PUBLISHER_NAME, publishers.get(0).getName());
}
@Test
@Order(4)
void searchPublisher() {
List<BookshelfPublisher> publishers = publisherRepository.search(TestConstants.PUBLISHER_NAME.substring(2, 6));
List<BookshelfPublisher> publishers = publisherRepository.search(TestBookshelfConstants.PUBLISHER_NAME.substring(2, 6));
assertEquals(1, publishers.size());
assertEquals(TestConstants.PUBLISHER_NAME, publishers.get(0).getName());
assertEquals(TestBookshelfConstants.PUBLISHER_NAME, publishers.get(0).getName());
}
@Test
@Order(5)
void deletePublisher() {
BookshelfPublisher publisher = publisherRepository.findByName(TestConstants.PUBLISHER_NAME);
BookshelfPublisher publisher = publisherRepository.findByName(TestBookshelfConstants.PUBLISHER_NAME);
assertNotNull(publisher);
publisherRepository.delete(publisher);
assertEquals(TestConstants.PUBLISHER_COUNT, publisherRepository.findAll().size());
assertEquals(TestBookshelfConstants.PUBLISHER_COUNT, publisherRepository.findAll().size());
}
}
kontor-spring/src/test/java/de/thpeetz/kontor/comics/repository/ArtistRepositoryTest.java → kontor-spring/src/test/java/de/thpeetz/kontor/repository/comics/ArtistRepositoryTest.java
+3 -2
View File
@@ -1,10 +1,11 @@
package de.thpeetz.kontor.comics.repository;
package de.thpeetz.kontor.repository.comics;
import static org.junit.jupiter.api.Assertions.*;
import java.util.List;
import de.thpeetz.kontor.comics.data.*;
import de.thpeetz.kontor.data.comics.Artist;
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 → kontor-spring/src/test/java/de/thpeetz/kontor/repository/comics/ComicRepositoryTest.java
+4 -2
View File
@@ -1,11 +1,13 @@
package de.thpeetz.kontor.comics.repository;
package de.thpeetz.kontor.repository.comics;
import static org.junit.jupiter.api.Assertions.*;
import java.util.List;
import java.util.stream.Collectors;
import de.thpeetz.kontor.comics.data.*;
import de.thpeetz.kontor.data.comics.Comic;
import de.thpeetz.kontor.data.comics.Publisher;
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 → kontor-spring/src/test/java/de/thpeetz/kontor/repository/comics/ComicWorkRepositoryTest.java
+6 -3
View File
@@ -1,8 +1,7 @@
package de.thpeetz.kontor.comics.repository;
package de.thpeetz.kontor.repository.comics;
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;
@@ -10,7 +9,11 @@ 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;
import de.thpeetz.kontor.data.comics.Artist;
import de.thpeetz.kontor.data.comics.Comic;
import de.thpeetz.kontor.data.comics.ComicWork;
import de.thpeetz.kontor.data.comics.Worktype;
import de.thpeetz.kontor.services.ComicService;
@SpringBootTest
@TestMethodOrder(OrderAnnotation.class)
kontor-spring/src/test/java/de/thpeetz/kontor/comics/repository/IssueRepositoryTest.java → kontor-spring/src/test/java/de/thpeetz/kontor/repository/comics/IssueRepositoryTest.java
+8 -7
View File
@@ -1,4 +1,4 @@
package de.thpeetz.kontor.comics.repository;
package de.thpeetz.kontor.repository.comics;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -6,13 +6,14 @@ 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;
import de.thpeetz.kontor.comics.TestConstants;
import de.thpeetz.kontor.comics.services.ComicService;
import de.thpeetz.kontor.constants.TestComicConstants;
import de.thpeetz.kontor.data.comics.Comic;
import de.thpeetz.kontor.data.comics.Issue;
import de.thpeetz.kontor.services.ComicService;
@SpringBootTest
class IssueRepositoryTest {
@@ -25,14 +26,14 @@ class IssueRepositoryTest {
@Test
void testFindByComic() {
Comic comic = TestConstants.getComicWithIssues(comicService);
Comic comic = TestComicConstants.getComicWithIssues(comicService);
List<Issue> issues = issueRepository.findByComic(comic);
assertEquals(TestConstants.BATTLE_POPE_ISSUE_COUNT, issues.size());
assertEquals(TestComicConstants.BATTLE_POPE_ISSUE_COUNT, issues.size());
}
@Test
void testFindByComicAndIssueNumber() {
Comic comic = TestConstants.getComicWithIssues(comicService);
Comic comic = TestComicConstants.getComicWithIssues(comicService);
Issue issue = issueRepository.findByComicAndIssueNumber(comic, "12");
assertNotNull(issue);
assertFalse(issue.getIsRead());
kontor-spring/src/test/java/de/thpeetz/kontor/comics/repository/PublisherRepositoryTest.java → kontor-spring/src/test/java/de/thpeetz/kontor/repository/comics/PublisherRepositoryTest.java
+13 -13
View File
@@ -1,10 +1,12 @@
package de.thpeetz.kontor.comics.repository;
package de.thpeetz.kontor.repository.comics;
import static org.junit.jupiter.api.Assertions.*;
import java.util.List;
import de.thpeetz.kontor.comics.data.*;
import de.thpeetz.kontor.constants.TestComicConstants;
import de.thpeetz.kontor.data.comics.Publisher;
import org.junit.jupiter.api.MethodOrderer.OrderAnnotation;
import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
@@ -12,8 +14,6 @@ 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 {
@@ -24,30 +24,30 @@ class PublisherRepositoryTest {
@Test
@Order(1)
void checkInitialLoad() {
assertEquals(TestConstants.PUBLISHER_COUNT, publisherRepository.findAll().size());
assertEquals(TestComicConstants.PUBLISHER_COUNT, publisherRepository.findAll().size());
}
@Test
@Order(2)
void savePublisher() {
Publisher publisher = new Publisher();
publisher.setName(TestConstants.PUBLISHER_NAME);
publisher.setName(TestComicConstants.PUBLISHER_NAME);
publisherRepository.save(publisher);
assertEquals(TestConstants.PUBLISHER_COUNT + 1, publisherRepository.findAll().size());
assertEquals(TestComicConstants.PUBLISHER_COUNT + 1, publisherRepository.findAll().size());
}
@Test
@Order(3)
void findPublisherByName() {
Publisher publisher = publisherRepository.findByName(TestConstants.PUBLISHER_NAME);
Publisher publisher = publisherRepository.findByName(TestComicConstants.PUBLISHER_NAME);
assertNotNull(publisher);
assertEquals(TestConstants.PUBLISHER_NAME, publisher.getName());
assertEquals(TestComicConstants.PUBLISHER_NAME, publisher.getName());
Publisher notFound = publisherRepository.findByName("Cow");
assertNull(notFound);
List<Publisher> publishers = publisherRepository
.findByNameIgnoreCase(TestConstants.PUBLISHER_NAME.toLowerCase());
.findByNameIgnoreCase(TestComicConstants.PUBLISHER_NAME.toLowerCase());
assertEquals(1, publishers.size());
assertEquals(TestConstants.PUBLISHER_NAME, publishers.get(0).getName());
assertEquals(TestComicConstants.PUBLISHER_NAME, publishers.get(0).getName());
}
@Test
@@ -61,9 +61,9 @@ class PublisherRepositoryTest {
@Test
@Order(5)
void deletePublisher() {
Publisher publisher = publisherRepository.findByName(TestConstants.PUBLISHER_NAME);
Publisher publisher = publisherRepository.findByName(TestComicConstants.PUBLISHER_NAME);
assertNotNull(publisher);
publisherRepository.delete(publisher);
assertEquals(TestConstants.PUBLISHER_COUNT, publisherRepository.findAll().size());
assertEquals(TestComicConstants.PUBLISHER_COUNT, publisherRepository.findAll().size());
}
}
kontor-spring/src/test/java/de/thpeetz/kontor/comics/repository/StoryArcRepositoryTest.java → kontor-spring/src/test/java/de/thpeetz/kontor/repository/comics/StoryArcRepositoryTest.java
+7 -6
View File
@@ -1,16 +1,17 @@
package de.thpeetz.kontor.comics.repository;
package de.thpeetz.kontor.repository.comics;
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;
import de.thpeetz.kontor.comics.TestConstants;
import de.thpeetz.kontor.comics.services.ComicService;
import de.thpeetz.kontor.constants.TestComicConstants;
import de.thpeetz.kontor.data.comics.Comic;
import de.thpeetz.kontor.data.comics.StoryArc;
import de.thpeetz.kontor.services.ComicService;
@SpringBootTest
class StoryArcRepositoryTest {
@@ -30,7 +31,7 @@ class StoryArcRepositoryTest {
@Test
void findByComic() {
Comic comic = TestConstants.getComicWithStoryArcs(comicService);
Comic comic = TestComicConstants.getComicWithStoryArcs(comicService);
List<StoryArc> storyArcs = storyArcRepository.findByComic(comic);
assertNotNull(storyArcs);
assertEquals(3, storyArcs.size());
@@ -38,7 +39,7 @@ class StoryArcRepositoryTest {
@Test
void findByNameAndComic() {
Comic comic = TestConstants.getComicWithStoryArcs(comicService);
Comic comic = TestComicConstants.getComicWithStoryArcs(comicService);
StoryArc storyArc = storyArcRepository.findByNameAndComic("Higher Learning", comic);
assertNotNull(storyArc);
assertEquals("Emma Frost", storyArc.getComic().getTitle());
kontor-spring/src/test/java/de/thpeetz/kontor/comics/repository/TradePaperbackRepositoryTest.java → kontor-spring/src/test/java/de/thpeetz/kontor/repository/comics/TradePaperbackRepositoryTest.java
+15 -14
View File
@@ -1,4 +1,4 @@
package de.thpeetz.kontor.comics.repository;
package de.thpeetz.kontor.repository.comics;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -6,13 +6,14 @@ 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;
import de.thpeetz.kontor.comics.TestConstants;
import de.thpeetz.kontor.comics.services.ComicService;
import de.thpeetz.kontor.constants.TestComicConstants;
import de.thpeetz.kontor.data.comics.Comic;
import de.thpeetz.kontor.data.comics.TradePaperback;
import de.thpeetz.kontor.services.ComicService;
@SpringBootTest
class TradePaperbackRepositoryTest {
@@ -32,29 +33,29 @@ class TradePaperbackRepositoryTest {
@Test
void testFindByComic() {
Comic comic = TestConstants.getComicWithTradePaperbacks(comicService);
Comic comic = TestComicConstants.getComicWithTradePaperbacks(comicService);
List<TradePaperback> tradePaperbacks = tradePaperbackRepository.findByComic(comic);
assertNotNull(tradePaperbacks);
assertEquals(TestConstants.SOJOURN_TPB_COUNT, tradePaperbacks.size());
assertEquals(TestComicConstants.SOJOURN_TPB_COUNT, tradePaperbacks.size());
}
@Test
void testFindByNameAndComic() {
Comic comic = TestConstants.getComicWithTradePaperbacks(comicService);
Comic comic = TestComicConstants.getComicWithTradePaperbacks(comicService);
List<TradePaperback> tradePaperbacks = tradePaperbackRepository
.findByNameAndComic(TestConstants.SOJOURN_TPB_NAME, comic);
.findByNameAndComic(TestComicConstants.SOJOURN_TPB_NAME, comic);
assertNotNull(tradePaperbacks);
assertTrue(tradePaperbacks.size() > 0);
assertEquals(TestConstants.SOJOURN_TPB_COMIC_TITLE, tradePaperbacks.get(0).getComic().getTitle());
assertEquals(TestComicConstants.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);
Comic comic = TestComicConstants.getComicWithTradePaperbacks(comicService);
TradePaperback tradePaperback = tradePaperbackRepository.findByFields(TestComicConstants.SOJOURN_TPB_NAME,
comic, TestComicConstants.SOJOURN_TPB_START, TestComicConstants.SOJOURN_TPB_END);
assertNotNull(tradePaperback);
assertEquals(TestConstants.SOJOURN_TPB_COMIC_TITLE, tradePaperback.getComic().getTitle());
assertEquals(TestConstants.SOJOURN_TPB_END, tradePaperback.getIssueEnd());
assertEquals(TestComicConstants.SOJOURN_TPB_COMIC_TITLE, tradePaperback.getComic().getTitle());
assertEquals(TestComicConstants.SOJOURN_TPB_END, tradePaperback.getIssueEnd());
}
}
kontor-spring/src/test/java/de/thpeetz/kontor/comics/repository/VolumeRepositoryTest.java → kontor-spring/src/test/java/de/thpeetz/kontor/repository/comics/VolumeRepositoryTest.java
+12 -14
View File
@@ -1,16 +1,17 @@
package de.thpeetz.kontor.comics.repository;
package de.thpeetz.kontor.repository.comics;
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;
import de.thpeetz.kontor.comics.TestConstants;
import de.thpeetz.kontor.comics.services.ComicService;
import de.thpeetz.kontor.constants.TestComicConstants;
import de.thpeetz.kontor.data.comics.Comic;
import de.thpeetz.kontor.data.comics.Volume;
import de.thpeetz.kontor.services.ComicService;
@SpringBootTest
class VolumeRepositoryTest {
@@ -18,18 +19,15 @@ class VolumeRepositoryTest {
@Autowired
private VolumeRepository volumeRepository;
@Autowired
private ComicRepository comicRepository;
@Autowired
private ComicService comicService;
@Test
void testFindByComic() {
Comic comic = TestConstants.getComicWithoutReferences(comicService);
Comic comic = TestComicConstants.getComicWithoutReferences(comicService);
assertEquals(0, comic.getVolumes().size());
Volume volume = new Volume();
volume.setName(TestConstants.VOLUME_NAME);
volume.setName(TestComicConstants.VOLUME_NAME);
volume.setComic(comic);
Volume savedInstance = volumeRepository.save(volume);
assertNotNull(savedInstance);
@@ -39,24 +37,24 @@ class VolumeRepositoryTest {
comicService.deleteVolume(found.get(0));
assertEquals(0, comic.getVolumes().size());
assertEquals(TestConstants.VOLUME_COUNT, volumeRepository.count());
assertEquals(TestComicConstants.VOLUME_COUNT, volumeRepository.count());
}
@Test
void testFindByName() {
Comic comic = TestConstants.getComicWithoutReferences(comicService);
Comic comic = TestComicConstants.getComicWithoutReferences(comicService);
assertEquals(0, comic.getVolumes().size());
Volume volume = new Volume();
volume.setName(TestConstants.VOLUME_NAME);
volume.setName(TestComicConstants.VOLUME_NAME);
volume.setComic(comic);
Volume savedInstance = volumeRepository.save(volume);
assertNotNull(savedInstance);
List<Volume> found = volumeRepository.findByName(TestConstants.VOLUME_NAME);
List<Volume> found = volumeRepository.findByName(TestComicConstants.VOLUME_NAME);
assertEquals(1, found.size());
comicService.deleteVolume(found.get(0));
assertEquals(0, comic.getVolumes().size());
assertEquals(TestConstants.VOLUME_COUNT, volumeRepository.count());
assertEquals(TestComicConstants.VOLUME_COUNT, volumeRepository.count());
}
}
kontor-spring/src/test/java/de/thpeetz/kontor/comics/repository/WorktypeRepositoryTest.java → kontor-spring/src/test/java/de/thpeetz/kontor/repository/comics/WorktypeRepositoryTest.java
+3 -2
View File
@@ -1,11 +1,12 @@
package de.thpeetz.kontor.comics.repository;
package de.thpeetz.kontor.repository.comics;
import static org.junit.jupiter.api.Assertions.*;
import java.util.List;
import java.util.stream.Collectors;
import de.thpeetz.kontor.comics.data.*;
import de.thpeetz.kontor.data.comics.Worktype;
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/tysc/repository/CardRepositoryTest.java → kontor-spring/src/test/java/de/thpeetz/kontor/repository/tysc/CardRepositoryTest.java
+6 -5
View File
@@ -1,14 +1,15 @@
package de.thpeetz.kontor.tysc.repository;
package de.thpeetz.kontor.repository.tysc;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import java.util.List;
import de.thpeetz.kontor.tysc.data.Card;
import de.thpeetz.kontor.tysc.data.CardSet;
import de.thpeetz.kontor.tysc.data.Rooster;
import de.thpeetz.kontor.tysc.data.Vendor;
import de.thpeetz.kontor.data.tysc.Card;
import de.thpeetz.kontor.data.tysc.CardSet;
import de.thpeetz.kontor.data.tysc.Rooster;
import de.thpeetz.kontor.data.tysc.Vendor;
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/tysc/repository/CardSetRepositoryTest.java → kontor-spring/src/test/java/de/thpeetz/kontor/repository/tysc/CardSetRepositoryTest.java
+7 -7
View File
@@ -1,17 +1,17 @@
package de.thpeetz.kontor.tysc.repository;
package de.thpeetz.kontor.repository.tysc;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import java.util.List;
import de.thpeetz.kontor.tysc.data.CardSet;
import de.thpeetz.kontor.tysc.data.Vendor;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import de.thpeetz.kontor.tysc.TestConstants;
import de.thpeetz.kontor.constants.TestTyscConstants;
import de.thpeetz.kontor.data.tysc.CardSet;
import de.thpeetz.kontor.data.tysc.Vendor;
@SpringBootTest
class CardSetRepositoryTest {
@@ -24,15 +24,15 @@ class CardSetRepositoryTest {
@Test
void testFindByName() {
List<CardSet> cardSets = cardSetRepository.findByName(TestConstants.CARDSET_MYSTIQUE_NAME);
List<CardSet> cardSets = cardSetRepository.findByName(TestTyscConstants.CARDSET_MYSTIQUE_NAME);
assertEquals(1, cardSets.size());
}
@Test
void testFindByNameAndVendor() {
Vendor fleer = vendorRepository.findByName(TestConstants.VENDOR_FLEER);
Vendor fleer = vendorRepository.findByName(TestTyscConstants.VENDOR_FLEER);
assertNotNull(fleer);
CardSet cardSet = cardSetRepository.findByNameAndVendor(TestConstants.CARDSET_MYSTIQUE_NAME, fleer);
CardSet cardSet = cardSetRepository.findByNameAndVendor(TestTyscConstants.CARDSET_MYSTIQUE_NAME, fleer);
assertNotNull(cardSet);
}
kontor-spring/src/test/java/de/thpeetz/kontor/tysc/repository/FieldPositionRepositoryTest.java → kontor-spring/src/test/java/de/thpeetz/kontor/repository/tysc/FieldPositionRepositoryTest.java
+13 -13
View File
@@ -1,17 +1,17 @@
package de.thpeetz.kontor.tysc.repository;
package de.thpeetz.kontor.repository.tysc;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import java.util.List;
import de.thpeetz.kontor.tysc.data.FieldPosition;
import de.thpeetz.kontor.tysc.data.Sport;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import de.thpeetz.kontor.tysc.TestConstants;
import de.thpeetz.kontor.constants.TestTyscConstants;
import de.thpeetz.kontor.data.tysc.FieldPosition;
import de.thpeetz.kontor.data.tysc.Sport;
@SpringBootTest
class FieldPositionRepositoryTest {
@@ -24,33 +24,33 @@ class FieldPositionRepositoryTest {
@Test
void testFindByShortName() {
FieldPosition position = fieldPositionRepository.findByShortName(TestConstants.QUARTERBACK_SHORTNAME);
FieldPosition position = fieldPositionRepository.findByShortName(TestTyscConstants.QUARTERBACK_SHORTNAME);
assertNotNull(position);
assertEquals(TestConstants.QUARTERBACK_NAME, position.getName());
assertEquals(TestTyscConstants.QUARTERBACK_NAME, position.getName());
}
@Test
void testFindByShortNameAndSport() {
Sport sport = sportRepository.findByName(TestConstants.FOOTBALL_NAME);
FieldPosition position = fieldPositionRepository.findByShortNameAndSport(TestConstants.QUARTERBACK_SHORTNAME, sport);
Sport sport = sportRepository.findByName(TestTyscConstants.FOOTBALL_NAME);
FieldPosition position = fieldPositionRepository.findByShortNameAndSport(TestTyscConstants.QUARTERBACK_SHORTNAME, sport);
assertNotNull(position);
assertEquals(TestConstants.QUARTERBACK_NAME, position.getName());
assertEquals(TestTyscConstants.QUARTERBACK_NAME, position.getName());
}
@Test
void testFindByShortNameIgnoreCase() {
List<FieldPosition> positions = fieldPositionRepository
.findByShortNameIgnoreCase(TestConstants.QUARTERBACK_SHORTNAME.toLowerCase());
.findByShortNameIgnoreCase(TestTyscConstants.QUARTERBACK_SHORTNAME.toLowerCase());
assertNotNull(positions);
assertEquals(1, positions.size());
assertEquals(TestConstants.QUARTERBACK_NAME, positions.get(0).getName());
assertEquals(TestTyscConstants.QUARTERBACK_NAME, positions.get(0).getName());
}
@Test
void testFindBySport() {
Sport sport = sportRepository.findByName(TestConstants.FOOTBALL_NAME);
Sport sport = sportRepository.findByName(TestTyscConstants.FOOTBALL_NAME);
List<FieldPosition> positions = fieldPositionRepository.findBySport(sport);
assertEquals(TestConstants.FOOTBALL_POSITION_COUNT, positions.size());
assertEquals(TestTyscConstants.FOOTBALL_POSITION_COUNT, positions.size());
}
@Test
kontor-spring/src/test/java/de/thpeetz/kontor/tysc/repository/PlayerRepositoryTest.java → kontor-spring/src/test/java/de/thpeetz/kontor/repository/tysc/PlayerRepositoryTest.java
+3 -2
View File
@@ -1,10 +1,11 @@
package de.thpeetz.kontor.tysc.repository;
package de.thpeetz.kontor.repository.tysc;
import static org.junit.jupiter.api.Assertions.assertEquals;
import java.util.List;
import de.thpeetz.kontor.tysc.data.Player;
import de.thpeetz.kontor.data.tysc.Player;
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/tysc/repository/RoosterRepositoryTest.java → kontor-spring/src/test/java/de/thpeetz/kontor/repository/tysc/RoosterRepositoryTest.java
+6 -5
View File
@@ -1,13 +1,14 @@
package de.thpeetz.kontor.tysc.repository;
package de.thpeetz.kontor.repository.tysc;
import static org.junit.jupiter.api.Assertions.*;
import java.util.List;
import de.thpeetz.kontor.tysc.data.FieldPosition;
import de.thpeetz.kontor.tysc.data.Player;
import de.thpeetz.kontor.tysc.data.Rooster;
import de.thpeetz.kontor.tysc.data.Team;
import de.thpeetz.kontor.data.tysc.FieldPosition;
import de.thpeetz.kontor.data.tysc.Player;
import de.thpeetz.kontor.data.tysc.Rooster;
import de.thpeetz.kontor.data.tysc.Team;
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/tysc/repository/SportRepositoryTest.java → kontor-spring/src/test/java/de/thpeetz/kontor/repository/tysc/SportRepositoryTest.java
+8 -8
View File
@@ -1,16 +1,16 @@
package de.thpeetz.kontor.tysc.repository;
package de.thpeetz.kontor.repository.tysc;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import java.util.List;
import de.thpeetz.kontor.tysc.data.Sport;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import de.thpeetz.kontor.tysc.TestConstants;
import de.thpeetz.kontor.constants.TestTyscConstants;
import de.thpeetz.kontor.data.tysc.Sport;
@SpringBootTest
class SportRepositoryTest {
@@ -20,17 +20,17 @@ class SportRepositoryTest {
@Test
void testFindByName() {
Sport sport = sportRepository.findByName(TestConstants.FOOTBALL_NAME);
Sport sport = sportRepository.findByName(TestTyscConstants.FOOTBALL_NAME);
assertNotNull(sport);
assertEquals(TestConstants.FOOTBALL_TEAM_COUNT, sport.getTeams().size());
assertEquals(TestConstants.FOOTBALL_POSITION_COUNT, sport.getPositions().size());
assertEquals(TestTyscConstants.FOOTBALL_TEAM_COUNT, sport.getTeams().size());
assertEquals(TestTyscConstants.FOOTBALL_POSITION_COUNT, sport.getPositions().size());
}
@Test
void testFindByNameIgnoreCase() {
List<Sport> sports = sportRepository.findByNameIgnoreCase(TestConstants.FOOTBALL_NAME.toLowerCase());
List<Sport> sports = sportRepository.findByNameIgnoreCase(TestTyscConstants.FOOTBALL_NAME.toLowerCase());
assertNotNull(sports);
assertEquals(TestConstants.FOOTBALL_TEAM_COUNT, sports.get(0).getTeams().size());
assertEquals(TestTyscConstants.FOOTBALL_TEAM_COUNT, sports.get(0).getTeams().size());
}
@Test
kontor-spring/src/test/java/de/thpeetz/kontor/tysc/repository/TeamRepositoryTest.java → kontor-spring/src/test/java/de/thpeetz/kontor/repository/tysc/TeamRepositoryTest.java
+7 -7
View File
@@ -1,15 +1,15 @@
package de.thpeetz.kontor.tysc.repository;
package de.thpeetz.kontor.repository.tysc;
import static org.junit.jupiter.api.Assertions.assertEquals;
import java.util.List;
import de.thpeetz.kontor.tysc.data.Team;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import de.thpeetz.kontor.tysc.TestConstants;
import de.thpeetz.kontor.constants.TestTyscConstants;
import de.thpeetz.kontor.data.tysc.Team;
@SpringBootTest
class TeamRepositoryTest {
@@ -19,15 +19,15 @@ class TeamRepositoryTest {
@Test
void testFindByName() {
Team team = teamRepository.findByName(TestConstants.DOLPHINS_NAME);
assertEquals(TestConstants.DOLPHINS_SHORT, team.getShortName());
Team team = teamRepository.findByName(TestTyscConstants.DOLPHINS_NAME);
assertEquals(TestTyscConstants.DOLPHINS_SHORT, team.getShortName());
}
@Test
void testFindByNameIgnoreCase() {
List<Team> teams = teamRepository.findByNameIgnoreCase(TestConstants.DOLPHINS_NAME.toLowerCase());
List<Team> teams = teamRepository.findByNameIgnoreCase(TestTyscConstants.DOLPHINS_NAME.toLowerCase());
assertEquals(1, teams.size());
assertEquals(TestConstants.DOLPHINS_SHORT, teams.get(0).getShortName());
assertEquals(TestTyscConstants.DOLPHINS_SHORT, teams.get(0).getShortName());
}
@Test
kontor-spring/src/test/java/de/thpeetz/kontor/tysc/repository/VendorRepositoryTest.java → kontor-spring/src/test/java/de/thpeetz/kontor/repository/tysc/VendorRepositoryTest.java
+7 -7
View File
@@ -1,16 +1,16 @@
package de.thpeetz.kontor.tysc.repository;
package de.thpeetz.kontor.repository.tysc;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import java.util.List;
import de.thpeetz.kontor.tysc.data.Vendor;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import de.thpeetz.kontor.tysc.TestConstants;
import de.thpeetz.kontor.constants.TestTyscConstants;
import de.thpeetz.kontor.data.tysc.Vendor;
@SpringBootTest
class VendorRepositoryTest {
@@ -20,17 +20,17 @@ class VendorRepositoryTest {
@Test
void testFindByName() {
Vendor vendor = vendorRepository.findByName(TestConstants.TOPPS_NAME);
Vendor vendor = vendorRepository.findByName(TestTyscConstants.TOPPS_NAME);
assertNotNull(vendor);
assertEquals(TestConstants.TOPPS_NAME, vendor.getName());
assertEquals(TestTyscConstants.TOPPS_NAME, vendor.getName());
}
@Test
void testFindByNameIgnoreCase() {
List<Vendor> vendors = vendorRepository.findByNameIgnoreCase(TestConstants.TOPPS_NAME.toLowerCase());
List<Vendor> vendors = vendorRepository.findByNameIgnoreCase(TestTyscConstants.TOPPS_NAME.toLowerCase());
assertNotNull(vendors);
assertEquals(1, vendors.size());
assertEquals(TestConstants.TOPPS_NAME, vendors.get(0).getName());
assertEquals(TestTyscConstants.TOPPS_NAME, vendors.get(0).getName());
}
@Test
kontor-spring/src/test/java/de/thpeetz/kontor/bookshelf/services/BookshelfServiceTest.java → kontor-spring/src/test/java/de/thpeetz/kontor/services/BookshelfServiceTest.java
+21 -20
View File
@@ -1,9 +1,10 @@
package de.thpeetz.kontor.bookshelf.services;
package de.thpeetz.kontor.services;
import de.thpeetz.kontor.constants.TestBookshelfConstants;
import de.thpeetz.kontor.data.bookshelf.Author;
import de.thpeetz.kontor.data.bookshelf.Book;
import de.thpeetz.kontor.data.bookshelf.BookshelfPublisher;
import de.thpeetz.kontor.bookshelf.TestConstants;
import de.thpeetz.kontor.bookshelf.data.Author;
import de.thpeetz.kontor.bookshelf.data.Book;
import de.thpeetz.kontor.bookshelf.data.BookshelfPublisher;
import org.junit.jupiter.api.MethodOrderer.OrderAnnotation;
import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
@@ -27,70 +28,70 @@ class BookshelfServiceTest {
@Order(1)
void testFindAllPublishers() {
List<BookshelfPublisher> publishers = bookshelfService.findAllPublishers(null);
assertEquals(TestConstants.PUBLISHER_COUNT, publishers.size());
assertEquals(TestBookshelfConstants.PUBLISHER_COUNT, publishers.size());
}
@Test
@Order(2)
void testSavePublisher() {
BookshelfPublisher publisher = new BookshelfPublisher();
publisher.setName(TestConstants.PUBLISHER_NAME);
publisher.setName(TestBookshelfConstants.PUBLISHER_NAME);
bookshelfService.savePublisher(publisher);
assertEquals(TestConstants.PUBLISHER_COUNT + 1, bookshelfService.findAllPublishers(null).size());
assertEquals(TestBookshelfConstants.PUBLISHER_COUNT + 1, bookshelfService.findAllPublishers(null).size());
}
@Test
@Order(3)
void testFindPublisherByName() {
assertEquals(TestConstants.PUBLISHER_COUNT + 1, bookshelfService.findAllPublishers(null).size());
BookshelfPublisher publisher = bookshelfService.findPublisherByName(TestConstants.PUBLISHER_NAME);
assertEquals(TestBookshelfConstants.PUBLISHER_COUNT + 1, bookshelfService.findAllPublishers(null).size());
BookshelfPublisher publisher = bookshelfService.findPublisherByName(TestBookshelfConstants.PUBLISHER_NAME);
assertNotNull(publisher);
}
@Test
@Order(4)
void testDeletePublisher() {
List<BookshelfPublisher> publishers = bookshelfService.findAllPublishers(TestConstants.PUBLISHER_NAME);
List<BookshelfPublisher> publishers = bookshelfService.findAllPublishers(TestBookshelfConstants.PUBLISHER_NAME);
assertEquals(1, publishers.size());
bookshelfService.deletePublisher(publishers.get(0));
assertEquals(TestConstants.PUBLISHER_COUNT, bookshelfService.findAllPublishers(null).size());
assertEquals(TestBookshelfConstants.PUBLISHER_COUNT, bookshelfService.findAllPublishers(null).size());
}
@Test
@Order(5)
void testFindAllAuthors() {
assertEquals(TestConstants.AUTHOR_COUNT, bookshelfService.findAllAuthors(null).size());
assertEquals(TestBookshelfConstants.AUTHOR_COUNT, bookshelfService.findAllAuthors(null).size());
}
@Test
@Order(6)
void testSaveAuthor() {
Author author = new Author();
author.setFirstName(TestConstants.AUTHOR_FIRSTNAME);
author.setLastName(TestConstants.AUTHOR_LASTNAME);
author.setFirstName(TestBookshelfConstants.AUTHOR_FIRSTNAME);
author.setLastName(TestBookshelfConstants.AUTHOR_LASTNAME);
bookshelfService.saveAuthor(author);
assertEquals(TestConstants.AUTHOR_COUNT+1, bookshelfService.findAllAuthors(null).size());
assertEquals(TestBookshelfConstants.AUTHOR_COUNT+1, bookshelfService.findAllAuthors(null).size());
}
@Test
@Order(7)
void testDeleteAuthor() {
List<Author> authors = bookshelfService.findAllAuthors(TestConstants.AUTHOR_FIRSTNAME);
List<Author> authors = bookshelfService.findAllAuthors(TestBookshelfConstants.AUTHOR_FIRSTNAME);
assertEquals(1, authors.size());
bookshelfService.deleteAuthor(authors.get(0));
assertEquals(TestConstants.AUTHOR_COUNT, bookshelfService.findAllAuthors(null).size());
assertEquals(TestBookshelfConstants.AUTHOR_COUNT, bookshelfService.findAllAuthors(null).size());
}
@Test
@Order(8)
void findAllBooks() {
assertEquals(TestConstants.BOOK_COUNT, bookshelfService.findAllBooks(null).size());
assertEquals(TestBookshelfConstants.BOOK_COUNT, bookshelfService.findAllBooks(null).size());
}
@Test
@Order(9)
void saveBook() {
assertEquals(TestConstants.BOOK_COUNT, bookshelfService.findAllBooks(null).size());
assertEquals(TestBookshelfConstants.BOOK_COUNT, bookshelfService.findAllBooks(null).size());
}
@Test
kontor-spring/src/test/java/de/thpeetz/kontor/tysc/services/CardServiceTest.java → kontor-spring/src/test/java/de/thpeetz/kontor/services/CardServiceTest.java
+25 -25
View File
@@ -1,4 +1,4 @@
package de.thpeetz.kontor.tysc.services;
package de.thpeetz.kontor.services;
import static org.junit.jupiter.api.Assertions.*;
@@ -11,11 +11,11 @@ import org.junit.jupiter.api.TestMethodOrder;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import de.thpeetz.kontor.tysc.TestConstants;
import de.thpeetz.kontor.tysc.data.Card;
import de.thpeetz.kontor.tysc.data.CardSet;
import de.thpeetz.kontor.tysc.data.Rooster;
import de.thpeetz.kontor.tysc.data.Vendor;
import de.thpeetz.kontor.constants.TestTyscConstants;
import de.thpeetz.kontor.data.tysc.Card;
import de.thpeetz.kontor.data.tysc.CardSet;
import de.thpeetz.kontor.data.tysc.Rooster;
import de.thpeetz.kontor.data.tysc.Vendor;
@SpringBootTest
@TestMethodOrder(OrderAnnotation.class)
@@ -30,7 +30,7 @@ class CardServiceTest {
@Test
@Order(1)
void testFindAllVendors() {
assertEquals(TestConstants.VENDOR_COUNT, cardService.findAllVendors(null).size());
assertEquals(TestTyscConstants.VENDOR_COUNT, cardService.findAllVendors(null).size());
assertEquals(2, cardService.findAllVendors("pp").size());
}
@@ -38,89 +38,89 @@ class CardServiceTest {
@Order(2)
void testSaveVendor() {
Vendor vendor = new Vendor();
vendor.setName(TestConstants.VENDOR_NAME);
vendor.setName(TestTyscConstants.VENDOR_NAME);
vendor = cardService.saveVendor(vendor);
assertNotNull(vendor);
assertEquals(TestConstants.VENDOR_COUNT + 1, cardService.findAllVendors(null).size());
assertEquals(TestTyscConstants.VENDOR_COUNT + 1, cardService.findAllVendors(null).size());
}
@Test
@Order(3)
void testDeleteVendor() {
List<Vendor> vendors = cardService.findAllVendors(TestConstants.VENDOR_NAME);
List<Vendor> vendors = cardService.findAllVendors(TestTyscConstants.VENDOR_NAME);
assertEquals(1, vendors.size());
Vendor vendor = vendors.get(0);
cardService.deleteVendor(vendor);
assertEquals(TestConstants.VENDOR_COUNT, cardService.findAllVendors(null).size());
assertEquals(TestTyscConstants.VENDOR_COUNT, cardService.findAllVendors(null).size());
}
@Test
@Order(4)
void testFindAllCardSets() {
assertEquals(TestConstants.CARDSET_COUNT, cardService.findAllCardSets(null).size());
assertEquals(TestTyscConstants.CARDSET_COUNT, cardService.findAllCardSets(null).size());
assertEquals(1, cardService.findAllCardSets("Ultra").size());
}
@Test
@Order(5)
void testSaveCardSet() {
List<Vendor> vendors = cardService.findAllVendors(TestConstants.VENDOR_FLEER);
List<Vendor> vendors = cardService.findAllVendors(TestTyscConstants.VENDOR_FLEER);
assertEquals(1, vendors.size());
Vendor vendor = vendors.get(0);
CardSet cardSet = new CardSet();
cardSet.setName(TestConstants.CARDSET_NAME);
cardSet.setName(TestTyscConstants.CARDSET_NAME);
cardSet.setVendor(vendor);
cardSet.setInsertSet(false);
cardSet.setParallelSet(false);
cardService.saveCardSet(cardSet);
assertEquals(TestConstants.CARDSET_COUNT + 1, cardService.findAllCardSets(null).size());
assertEquals(TestTyscConstants.CARDSET_COUNT + 1, cardService.findAllCardSets(null).size());
}
@Test
@Order(6)
void testDeleteCardSet() {
List<CardSet> cardSets = cardService.findAllCardSets(TestConstants.CARDSET_NAME);
List<CardSet> cardSets = cardService.findAllCardSets(TestTyscConstants.CARDSET_NAME);
assertEquals(1, cardSets.size());
CardSet cardSet = cardSets.get(0);
cardService.deleteCardSet(cardSet);
assertEquals(TestConstants.CARDSET_COUNT, cardService.findAllCardSets(null).size());
assertEquals(TestTyscConstants.CARDSET_COUNT, cardService.findAllCardSets(null).size());
}
@Test
@Order(7)
void testFindAllCards() {
assertEquals(TestConstants.CARD_COUNT, cardService.findAllCards(null).size());
assertEquals(TestTyscConstants.CARD_COUNT, cardService.findAllCards(null).size());
assertEquals(1, cardService.findAllCards("112").size());
}
@Test
@Order(8)
void testSaveCard() {
List<Vendor> vendors = cardService.findAllVendors(TestConstants.VENDOR_FLEER);
List<Vendor> vendors = cardService.findAllVendors(TestTyscConstants.VENDOR_FLEER);
assertEquals(1, vendors.size());
Vendor vendor = vendors.get(0);
List<CardSet> cardSets = cardService.findAllCardSets(TestConstants.CARDSET_MYSTIQUE_NAME);
List<CardSet> cardSets = cardService.findAllCardSets(TestTyscConstants.CARDSET_MYSTIQUE_NAME);
assertEquals(3, cardSets.size());
CardSet cardSet = cardSets.get(0);
List<Rooster> roosters = sportService.findAllRoosters();
Rooster rooster = roosters.get(0);
Card card = new Card();
card.setCardNumber(TestConstants.CARD_CARDNUMBER);
card.setCardNumber(TestTyscConstants.CARD_CARDNUMBER);
card.setCardSet(cardSet);
card.setVendor(vendor);
card.setRooster(rooster);
card.setYear(TestConstants.CARD_YEAR);
card.setYear(TestTyscConstants.CARD_YEAR);
cardService.saveCard(card);
assertEquals(TestConstants.CARD_COUNT + 1, cardService.findAllCards(null).size());
assertEquals(TestTyscConstants.CARD_COUNT + 1, cardService.findAllCards(null).size());
}
@Test
@Order(9)
void testDeleteCard() {
List<Card> cards = cardService.findAllCards(TestConstants.CARD_CARDNUMBER.toString());
List<Card> cards = cardService.findAllCards(TestTyscConstants.CARD_CARDNUMBER.toString());
assertEquals(1, cards.size());
Card card = cards.get(0);
cardService.deleteCard(card);
assertEquals(TestConstants.CARD_COUNT, cardService.findAllCards(null).size());
assertEquals(TestTyscConstants.CARD_COUNT, cardService.findAllCards(null).size());
}
}
kontor-spring/src/test/java/de/thpeetz/kontor/comics/services/ComicServiceTest.java → kontor-spring/src/test/java/de/thpeetz/kontor/services/ComicServiceTest.java
+76 -78
View File
@@ -1,4 +1,4 @@
package de.thpeetz.kontor.comics.services;
package de.thpeetz.kontor.services;
import static org.junit.jupiter.api.Assertions.*;
@@ -8,34 +8,32 @@ 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.slf4j.Logger;
import org.slf4j.LoggerFactory;
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.data.Artist;
import de.thpeetz.kontor.comics.data.Comic;
import de.thpeetz.kontor.comics.data.ComicWork;
import de.thpeetz.kontor.comics.data.Issue;
import de.thpeetz.kontor.comics.data.Publisher;
import de.thpeetz.kontor.comics.data.StoryArc;
import de.thpeetz.kontor.comics.data.TradePaperback;
import de.thpeetz.kontor.comics.data.Volume;
import de.thpeetz.kontor.comics.data.Worktype;
import de.thpeetz.kontor.constants.TestComicConstants;
import de.thpeetz.kontor.data.comics.Artist;
import de.thpeetz.kontor.data.comics.Comic;
import de.thpeetz.kontor.data.comics.ComicWork;
import de.thpeetz.kontor.data.comics.Issue;
import de.thpeetz.kontor.data.comics.Publisher;
import de.thpeetz.kontor.data.comics.StoryArc;
import de.thpeetz.kontor.data.comics.TradePaperback;
import de.thpeetz.kontor.data.comics.Volume;
import de.thpeetz.kontor.data.comics.Worktype;
@SpringBootTest
@TestMethodOrder(OrderAnnotation.class)
class ComicServiceTest {
private static final Logger log = LoggerFactory.getLogger(ComicServiceTest.class);
//TODO private static final Logger log = LoggerFactory.getLogger(ComicServiceTest.class);
@Autowired
private ComicService comicService;
@Test
@Order(1)
void testFindAllArtists() {
assertEquals(TestConstants.ARTIST_COUNT, comicService.findAllArtists(null).size());
assertEquals(TestComicConstants.ARTIST_COUNT, comicService.findAllArtists(null).size());
assertEquals(1, comicService.findAllArtists("Turn").size());
}
@@ -53,24 +51,24 @@ class ComicServiceTest {
@Order(2)
void testSaveArtist() {
Artist artist = new Artist();
artist.setName(TestConstants.ARTIST_NAME);
artist.setName(TestComicConstants.ARTIST_NAME);
comicService.saveArtist(artist);
assertEquals(TestConstants.ARTIST_COUNT + 1, comicService.findAllArtists(null).size());
assertEquals(TestComicConstants.ARTIST_COUNT + 1, comicService.findAllArtists(null).size());
}
@Test
@Order(3)
void testDeleteArtist() {
List<Artist> artists = comicService.findAllArtists(TestConstants.ARTIST_NAME);
List<Artist> artists = comicService.findAllArtists(TestComicConstants.ARTIST_NAME);
assertEquals(1, artists.size());
comicService.deleteArtist(artists.get(0));
assertEquals(TestConstants.ARTIST_COUNT, comicService.findAllArtists(null).size());
assertEquals(TestComicConstants.ARTIST_COUNT, comicService.findAllArtists(null).size());
}
@Test
@Order(4)
void testFindAllPublishers() {
assertEquals(TestConstants.PUBLISHER_COUNT, comicService.findAllPublishers(null).size());
assertEquals(TestComicConstants.PUBLISHER_COUNT, comicService.findAllPublishers(null).size());
assertEquals(1, comicService.findAllPublishers("Cow").size());
}
@@ -80,32 +78,32 @@ class ComicServiceTest {
Publisher publisher = comicService.findPublisherByName("Marvel");
assertNotNull(publisher);
assertNotNull(publisher.getComics());
assertEquals(TestConstants.MARVEL_COMIC_COUNT, publisher.getComics().size());
assertNull(comicService.findPublisherByName(TestConstants.PUBLISHER_NAME));
assertEquals(TestComicConstants.MARVEL_COMIC_COUNT, publisher.getComics().size());
assertNull(comicService.findPublisherByName(TestComicConstants.PUBLISHER_NAME));
}
@Test
@Order(5)
void testSavePublisher() {
Publisher publisher = new Publisher();
publisher.setName(TestConstants.PUBLISHER_NAME);
publisher.setName(TestComicConstants.PUBLISHER_NAME);
comicService.savePublisher(publisher);
assertEquals(TestConstants.PUBLISHER_COUNT + 1, comicService.findAllPublishers(null).size());
assertEquals(TestComicConstants.PUBLISHER_COUNT + 1, comicService.findAllPublishers(null).size());
}
@Test
@Order(6)
void testDeletePublisher() {
List<Publisher> publishers = comicService.findAllPublishers(TestConstants.PUBLISHER_NAME);
List<Publisher> publishers = comicService.findAllPublishers(TestComicConstants.PUBLISHER_NAME);
assertEquals(1, publishers.size());
comicService.deletePublisher(publishers.get(0));
assertEquals(TestConstants.PUBLISHER_COUNT, comicService.findAllPublishers(null).size());
assertEquals(TestComicConstants.PUBLISHER_COUNT, comicService.findAllPublishers(null).size());
}
@Test
@Order(7)
void testFindAllWorktypes() {
assertEquals(TestConstants.WORKTYPE_COUNT, comicService.findAllWorktypes(null).size());
assertEquals(TestComicConstants.WORKTYPE_COUNT, comicService.findAllWorktypes(null).size());
assertEquals(1, comicService.findAllWorktypes("ite").size());
}
@@ -120,25 +118,25 @@ class ComicServiceTest {
assertNotNull(worktype);
assertNotNull(worktype.getComicWorks());
assertTrue(worktype.getComicWorks().isEmpty());
assertNull(comicService.findWorktypeByName(TestConstants.WORKTYPE_NAME));
assertNull(comicService.findWorktypeByName(TestComicConstants.WORKTYPE_NAME));
}
@Test
@Order(8)
void testSaveWorktype() {
Worktype worktype = new Worktype();
worktype.setName(TestConstants.WORKTYPE_NAME);
worktype.setName(TestComicConstants.WORKTYPE_NAME);
comicService.saveWorktype(worktype);
assertEquals(TestConstants.WORKTYPE_COUNT + 1, comicService.findAllWorktypes(null).size());
assertEquals(TestComicConstants.WORKTYPE_COUNT + 1, comicService.findAllWorktypes(null).size());
}
@Test
@Order(9)
void testDeleteWorktype() {
List<Worktype> worktypes = comicService.findAllWorktypes(TestConstants.WORKTYPE_NAME);
List<Worktype> worktypes = comicService.findAllWorktypes(TestComicConstants.WORKTYPE_NAME);
assertEquals(1, worktypes.size());
comicService.deleteWorktype(worktypes.get(0));
assertEquals(TestConstants.WORKTYPE_COUNT, comicService.findAllWorktypes(null).size());
assertEquals(TestComicConstants.WORKTYPE_COUNT, comicService.findAllWorktypes(null).size());
}
@Test
@@ -154,38 +152,38 @@ class ComicServiceTest {
void testSaveComic() {
Publisher marvel = comicService.findAllPublishers("Marvel").get(0);
Comic comic = new Comic();
comic.setTitle(TestConstants.COMIC_TITLE);
comic.setTitle(TestComicConstants.COMIC_TITLE);
comic.setPublisher(marvel);
comicService.saveComic(comic);
assertEquals(TestConstants.COMIC_COUNT + 1, comicService.findAllComics(null).size());
assertEquals(TestComicConstants.COMIC_COUNT + 1, comicService.findAllComics(null).size());
}
@Test
@Order(12)
void testDeleteComic() {
assertEquals(TestConstants.COMIC_COUNT + 1, comicService.findAllComics(null).size());
List<Comic> comics = comicService.findAllComics(TestConstants.COMIC_TITLE);
assertEquals(TestComicConstants.COMIC_COUNT + 1, comicService.findAllComics(null).size());
List<Comic> comics = comicService.findAllComics(TestComicConstants.COMIC_TITLE);
assertEquals(1, comics.size());
Comic comic = comicService.findComicByTitle(TestConstants.COMIC_TITLE);
Comic comic = comicService.findComicByTitle(TestComicConstants.COMIC_TITLE);
assertNotNull(comic);
comicService.deleteComic(comic);
Publisher marvel = comicService.findPublisherByName("Marvel");
assertNotNull(marvel.getComics());
assertEquals(TestConstants.MARVEL_COMIC_COUNT, marvel.getComics().size());
assertEquals(0, comicService.findAllComics(TestConstants.COMIC_TITLE).size());
assertEquals(TestConstants.COMIC_COUNT, comicService.findAllComics(null).size());
assertEquals(TestComicConstants.MARVEL_COMIC_COUNT, marvel.getComics().size());
assertEquals(0, comicService.findAllComics(TestComicConstants.COMIC_TITLE).size());
assertEquals(TestComicConstants.COMIC_COUNT, comicService.findAllComics(null).size());
}
@Test
@Order(13)
void testFindAllIssues() {
assertEquals(TestConstants.ISSUE_COUNT, comicService.findAllIssues().size());
assertEquals(TestComicConstants.ISSUE_COUNT, comicService.findAllIssues().size());
}
@Test
@Order(14)
void testFindAllIssuesForComic() {
Comic comic = TestConstants.getComicWithIssues(comicService);
Comic comic = TestComicConstants.getComicWithIssues(comicService);
List<Issue> issues = comicService.findAllIssuesForComic(comic);
assertEquals(12, issues.size());
}
@@ -193,13 +191,13 @@ class ComicServiceTest {
@Test
@Order(15)
void testSaveIssue() {
Comic comic = TestConstants.getComicWithoutReferences(comicService);
Comic comic = TestComicConstants.getComicWithoutReferences(comicService);
Issue issue = new Issue();
issue.setComic(comic);
issue.setIssueNumber(TestConstants.ISSUE_ISSUENUMBER);
issue.setIssueNumber(TestComicConstants.ISSUE_ISSUENUMBER);
comicService.saveIssue(issue);
assertEquals(TestConstants.ISSUE_COUNT + 1, comicService.findAllIssues().size());
comic = TestConstants.getComicWithoutReferences(comicService);
assertEquals(TestComicConstants.ISSUE_COUNT + 1, comicService.findAllIssues().size());
comic = TestComicConstants.getComicWithoutReferences(comicService);
assertNotNull(comic.getIssues());
assertEquals(1, comic.getIssues().size());
}
@@ -207,96 +205,96 @@ class ComicServiceTest {
@Test
@Order(16)
void testDeleteIssue() {
Comic comic = TestConstants.getComicWithoutReferences(comicService);
Comic comic = TestComicConstants.getComicWithoutReferences(comicService);
List<Issue> issues = comicService.findAllIssuesForComic(comic);
assertEquals(1, issues.size());
comicService.deleteIssue(issues.get(0));
assertEquals(TestConstants.ISSUE_COUNT, comicService.findAllIssues().size());
assertEquals(TestComicConstants.ISSUE_COUNT, comicService.findAllIssues().size());
}
@Test
@Order(17)
void testFindAllTradePaperbacks() {
assertEquals(TestConstants.TRADEPAPERBACK_COUNT, comicService.findAllTradePaperbacks(null).size());
assertEquals(TestComicConstants.TRADEPAPERBACK_COUNT, comicService.findAllTradePaperbacks(null).size());
assertEquals(7, comicService.findAllTradePaperbacks("of").size());
}
@Test
@Order(18)
void testSaveTradePaperBack() {
Comic comic = TestConstants.getComicWithoutReferences(comicService);
Comic comic = TestComicConstants.getComicWithoutReferences(comicService);
TradePaperback tradePaperback = new TradePaperback();
tradePaperback.setComic(comic);
tradePaperback.setName(TestConstants.TRADEPAPERBACK_NAME);
tradePaperback.setName(TestComicConstants.TRADEPAPERBACK_NAME);
comicService.saveTradePaperBack(tradePaperback);
assertEquals(TestConstants.TRADEPAPERBACK_COUNT + 1, comicService.findAllTradePaperbacks(null).size());
assertEquals(TestComicConstants.TRADEPAPERBACK_COUNT + 1, comicService.findAllTradePaperbacks(null).size());
}
@Test
@Order(19)
void testDeleteTradePaperBack() {
List<TradePaperback> tradePaperbacks = comicService.findAllTradePaperbacks(TestConstants.TRADEPAPERBACK_NAME);
List<TradePaperback> tradePaperbacks = comicService.findAllTradePaperbacks(TestComicConstants.TRADEPAPERBACK_NAME);
assertEquals(1, tradePaperbacks.size());
comicService.deleteTradePaperBack(tradePaperbacks.get(0));
assertEquals(TestConstants.TRADEPAPERBACK_COUNT, comicService.findAllTradePaperbacks(null).size());
assertEquals(TestComicConstants.TRADEPAPERBACK_COUNT, comicService.findAllTradePaperbacks(null).size());
}
@Test
@Order(20)
void testFindAllStoryArcs() {
assertEquals(TestConstants.STORYARC_COUNT, comicService.findAllStoryArcs().size());
assertEquals(TestComicConstants.STORYARC_COUNT, comicService.findAllStoryArcs().size());
}
@Test
@Order(21)
void testFindAllStoryArcsForComic() {
assertEquals(TestConstants.STORYARC_COUNT, comicService.findAllStoryArcsForComic(null).size());
Comic comic = TestConstants.getComicWithStoryArcs(comicService);
assertEquals(TestComicConstants.STORYARC_COUNT, comicService.findAllStoryArcsForComic(null).size());
Comic comic = TestComicConstants.getComicWithStoryArcs(comicService);
assertEquals(3, comicService.findAllStoryArcsForComic(comic).size());
}
@Test
@Order(22)
void testSaveStoryArc() {
Comic comic = TestConstants.getComicWithoutReferences(comicService);
Comic comic = TestComicConstants.getComicWithoutReferences(comicService);
StoryArc storyArc = new StoryArc();
storyArc.setName(TestConstants.STORYARC_NAME);
storyArc.setName(TestComicConstants.STORYARC_NAME);
storyArc.setComic(comic);
comicService.saveStoryArc(storyArc);
assertEquals(TestConstants.STORYARC_COUNT + 1, comicService.findAllStoryArcs().size());
assertEquals(TestComicConstants.STORYARC_COUNT + 1, comicService.findAllStoryArcs().size());
}
@Test
@Order(23)
void testDeleteStoryArc() {
Comic comic = TestConstants.getComicWithoutReferences(comicService);
Comic comic = TestComicConstants.getComicWithoutReferences(comicService);
List<StoryArc> storyArcs = comicService.findAllStoryArcsForComic(comic);
assertEquals(1, storyArcs.size());
comicService.deleteStoryArc(storyArcs.get(0));
assertEquals(TestConstants.STORYARC_COUNT, comicService.findAllStoryArcs().size());
assertEquals(TestComicConstants.STORYARC_COUNT, comicService.findAllStoryArcs().size());
}
@Test
@Order(24)
void testFindAllVolumes() {
assertEquals(TestConstants.VOLUME_COUNT, comicService.findAllVolumes().size());
assertEquals(TestComicConstants.VOLUME_COUNT, comicService.findAllVolumes().size());
}
@Test
@Order(25)
void testSaveVolume() {
Comic comic = TestConstants.getComicWithoutReferences(comicService);
Comic comic = TestComicConstants.getComicWithoutReferences(comicService);
Volume volume = new Volume();
volume.setName(TestConstants.VOLUME_NAME);
volume.setName(TestComicConstants.VOLUME_NAME);
volume.setComic(comic);
comicService.saveVolume(volume);
assertEquals(TestConstants.VOLUME_COUNT + 1, comicService.findAllVolumes().size());
assertEquals(TestComicConstants.VOLUME_COUNT + 1, comicService.findAllVolumes().size());
}
@Test
@Order(26)
void testFindAllVolumesForComic() {
Comic comic = TestConstants.getComicWithoutReferences(comicService);
Comic comic = TestComicConstants.getComicWithoutReferences(comicService);
List<Volume> volumes = comicService.findAllVolumesForComic(comic);
assertEquals(1, volumes.size());
}
@@ -304,38 +302,38 @@ class ComicServiceTest {
@Test
@Order(27)
void testDeleteVolume() {
Comic comic = TestConstants.getComicWithoutReferences(comicService);
Comic comic = TestComicConstants.getComicWithoutReferences(comicService);
List<Volume> volumes = comicService.findAllVolumesForComic(comic);
comicService.deleteVolume(volumes.get(0));
assertEquals(TestConstants.VOLUME_COUNT, comicService.findAllVolumes().size());
assertEquals(TestComicConstants.VOLUME_COUNT, comicService.findAllVolumes().size());
}
@Test
@Order(28)
void testFindAllComicWorks() {
assertEquals(TestConstants.COMICWORK_COUNT, comicService.findAllComicWorks().size());
assertEquals(TestComicConstants.COMICWORK_COUNT, comicService.findAllComicWorks().size());
}
@Test
@Order(29)
void testSaveComicWork() {
Comic comic = TestConstants.getComicWithoutReferences(comicService);
Artist artist = TestConstants.getArtistWithoutReferences(comicService);
Worktype worktype = TestConstants.getWorktypeWithoutReferences(comicService);
Comic comic = TestComicConstants.getComicWithoutReferences(comicService);
Artist artist = TestComicConstants.getArtistWithoutReferences(comicService);
Worktype worktype = TestComicConstants.getWorktypeWithoutReferences(comicService);
ComicWork comicWork = new ComicWork();
comicWork.setComic(comic);
comicWork.setArtist(artist);
comicWork.setWorkType(worktype);
comicService.saveComicWork(comicWork);
assertEquals(TestConstants.COMICWORK_COUNT + 1, comicService.findAllComicWorks().size());
assertEquals(TestComicConstants.COMICWORK_COUNT + 1, comicService.findAllComicWorks().size());
}
@Test
@Order(30)
void testDeleteComicWork() {
Comic comic = TestConstants.getComicWithoutReferences(comicService);
Artist artist = TestConstants.getArtistWithoutReferences(comicService);
Worktype worktype = TestConstants.getWorktypeWithoutReferences(comicService);
Comic comic = TestComicConstants.getComicWithoutReferences(comicService);
Artist artist = TestComicConstants.getArtistWithoutReferences(comicService);
Worktype worktype = TestComicConstants.getWorktypeWithoutReferences(comicService);
List<ComicWork> comicWorks = comic.getComicWorks();
assertNotNull(comicWorks);
assertNotNull(artist.getComicWorks());
@@ -345,6 +343,6 @@ class ComicServiceTest {
assertEquals(1, worktype.getComicWorks().size());
ComicWork comicWork = comicWorks.get(0);
comicService.deleteComicWork(comicWork);
assertEquals(TestConstants.COMICWORK_COUNT, comicService.findAllComicWorks().size());
assertEquals(TestComicConstants.COMICWORK_COUNT, comicService.findAllComicWorks().size());
}
}
kontor-spring/src/test/java/de/thpeetz/kontor/media/services/MediaArticleServiceTest.java → kontor-spring/src/test/java/de/thpeetz/kontor/services/MediaArticleServiceTest.java
+5 -5
View File
@@ -1,7 +1,7 @@
package de.thpeetz.kontor.media.services;
package de.thpeetz.kontor.services;
import de.thpeetz.kontor.media.TestConstants;
import de.thpeetz.kontor.media.data.MediaArticle;
import de.thpeetz.kontor.constants.TestMediaConstants;
import de.thpeetz.kontor.data.media.MediaArticle;
import lombok.extern.slf4j.Slf4j;
import org.junit.jupiter.api.MethodOrderer;
import org.junit.jupiter.api.Order;
@@ -33,7 +33,7 @@ class MediaArticleServiceTest {
void saveMediaArticle() {
int mediaArticleCount = mediaArticleService.findAllMediaArticles(null).size();
MediaArticle mediaArticle = new MediaArticle();
mediaArticle.setUrl(TestConstants.URL);
mediaArticle.setUrl(TestMediaConstants.URL);
mediaArticleService.saveMediaArticle(mediaArticle);
assertEquals(++mediaArticleCount, mediaArticleService.findAllMediaArticles(null).size());
}
@@ -42,7 +42,7 @@ class MediaArticleServiceTest {
@Order(3)
void deleteMediaArticle() {
int mediaArticleCount = mediaArticleService.findAllMediaArticles(null).size();
List<MediaArticle> mediaArticleList = mediaArticleService.findAllMediaArticles(TestConstants.URL);
List<MediaArticle> mediaArticleList = mediaArticleService.findAllMediaArticles(TestMediaConstants.URL);
assertEquals(1, mediaArticleService.findAllMediaArticles(null).size());
mediaArticleService.deleteMediaArticle(mediaArticleList.get(0));
assertEquals(--mediaArticleCount, mediaArticleService.findAllMediaArticles(null).size());
kontor-spring/src/test/java/de/thpeetz/kontor/media/services/MediaFileServiceTest.java → kontor-spring/src/test/java/de/thpeetz/kontor/services/MediaFileServiceTest.java
+7 -6
View File
@@ -1,8 +1,9 @@
package de.thpeetz.kontor.media.services;
package de.thpeetz.kontor.services;
import de.thpeetz.kontor.constants.TestMediaConstants;
import de.thpeetz.kontor.data.media.MediaFile;
import de.thpeetz.kontor.views.common.SearchFilter;
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;
import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
@@ -32,7 +33,7 @@ public class MediaFileServiceTest {
void testSaveMediaFile() {
int mediaFileCount = mediaFileService.findAllMediaFiles(null).size();
MediaFile mediaFile = new MediaFile();
mediaFile.setUrl(TestConstants.URL);
mediaFile.setUrl(TestMediaConstants.URL);
mediaFileService.saveMediaFile(mediaFile);
assertEquals(mediaFileCount +1, mediaFileService.findAllMediaFiles(null).size());
}
@@ -42,7 +43,7 @@ public class MediaFileServiceTest {
void testDeleteMediaFile() {
int mediaFileCount = mediaFileService.findAllMediaFiles(null).size();
SearchFilter searchFilter = new SearchFilter();
searchFilter.setSearchTerm(TestConstants.URL);
searchFilter.setSearchTerm(TestMediaConstants.URL);
List<MediaFile> mediaFileList = mediaFileService.findAllMediaFiles(searchFilter);
assertEquals(1, mediaFileList.size());
mediaFileService.deleteMediaFile(mediaFileList.get(0));
kontor-spring/src/test/java/de/thpeetz/kontor/media/services/MediaVideoServiceTest.java → kontor-spring/src/test/java/de/thpeetz/kontor/services/MediaVideoServiceTest.java
+5 -6
View File
@@ -1,8 +1,7 @@
package de.thpeetz.kontor.media.services;
package de.thpeetz.kontor.services;
import de.thpeetz.kontor.media.TestConstants;
import de.thpeetz.kontor.media.data.MediaArticle;
import de.thpeetz.kontor.media.data.MediaVideo;
import de.thpeetz.kontor.constants.TestMediaConstants;
import de.thpeetz.kontor.data.media.MediaVideo;
import lombok.extern.slf4j.Slf4j;
import org.junit.jupiter.api.MethodOrderer;
import org.junit.jupiter.api.Test;
@@ -32,7 +31,7 @@ public class MediaVideoServiceTest {
void saveMediaVideo() {
int mediaVideoCount = mediaVideoService.findAllMediaVideos(null).size();
MediaVideo mediaVideo = new MediaVideo();
mediaVideo.setUrl(TestConstants.URL);
mediaVideo.setUrl(TestMediaConstants.URL);
mediaVideoService.saveMediaVideo(mediaVideo);
assertEquals(++mediaVideoCount, mediaVideoService.findAllMediaVideos(null).size());
}
@@ -40,7 +39,7 @@ public class MediaVideoServiceTest {
@Test
void deleteMediaVideo() {
int mediaVideoCount = mediaVideoService.findAllMediaVideos(null).size();
List<MediaVideo> mediaVideoList = mediaVideoService.findAllMediaVideos(TestConstants.URL);
List<MediaVideo> mediaVideoList = mediaVideoService.findAllMediaVideos(TestMediaConstants.URL);
assertEquals(1, mediaVideoList.size());
mediaVideoService.deleteMediaVideo(mediaVideoList.get(0));
assertEquals(--mediaVideoCount, mediaVideoService.findAllMediaVideos(null).size());
kontor-spring/src/test/java/de/thpeetz/kontor/tysc/services/SportServiceTest.java → kontor-spring/src/test/java/de/thpeetz/kontor/services/SportServiceTest.java
+46 -46
View File
@@ -1,10 +1,9 @@
package de.thpeetz.kontor.tysc.services;
package de.thpeetz.kontor.services;
import static org.junit.jupiter.api.Assertions.*;
import java.util.List;
import de.thpeetz.kontor.tysc.data.FieldPosition;
import org.junit.jupiter.api.MethodOrderer.OrderAnnotation;
import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
@@ -12,11 +11,12 @@ import org.junit.jupiter.api.TestMethodOrder;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import de.thpeetz.kontor.tysc.TestConstants;
import de.thpeetz.kontor.tysc.data.Player;
import de.thpeetz.kontor.tysc.data.Rooster;
import de.thpeetz.kontor.tysc.data.Sport;
import de.thpeetz.kontor.tysc.data.Team;
import de.thpeetz.kontor.constants.TestTyscConstants;
import de.thpeetz.kontor.data.tysc.FieldPosition;
import de.thpeetz.kontor.data.tysc.Player;
import de.thpeetz.kontor.data.tysc.Rooster;
import de.thpeetz.kontor.data.tysc.Sport;
import de.thpeetz.kontor.data.tysc.Team;
@SpringBootTest
@TestMethodOrder(OrderAnnotation.class)
@@ -30,7 +30,7 @@ class SportServiceTest {
@Order(1)
void testFindAllSports() {
List<Sport> sports = sportService.findAllSports(null);
assertEquals(TestConstants.SPORT_COUNT, sports.size());
assertEquals(TestTyscConstants.SPORT_COUNT, sports.size());
assertEquals(3, sportService.findAllSports("ball").size());
}
@@ -38,35 +38,35 @@ class SportServiceTest {
@Order(2)
void testSaveSport() {
Sport sport = new Sport();
sport.setName(TestConstants.SPORT_NAME);
sport.setName(TestTyscConstants.SPORT_NAME);
sport = sportService.saveSport(sport);
assertNotNull(sport);
assertEquals(TestConstants.SPORT_COUNT+1, sportService.findAllSports(null).size());
assertEquals(TestTyscConstants.SPORT_COUNT+1, sportService.findAllSports(null).size());
}
@Test
@Order(3)
void testDeleteSport() {
List<Sport> sports = sportService.findAllSports(TestConstants.SPORT_NAME);
List<Sport> sports = sportService.findAllSports(TestTyscConstants.SPORT_NAME);
assertEquals(1, sports.size());
Sport sport = sports.get(0);
sportService.deleteSport(sport);
assertEquals(TestConstants.SPORT_COUNT, sportService.findAllSports(null).size());
assertEquals(TestTyscConstants.SPORT_COUNT, sportService.findAllSports(null).size());
}
@Test
@Order(4)
void testFindAllPlayers() {
assertEquals(TestConstants.PLAYER_COUNT, sportService.findAllPlayers(null).size());
assertEquals(TestConstants.PLAYER_CHRIS_COUNT, sportService.findAllPlayers(TestConstants.PLAYER_CHRIS_NAME).size());
assertEquals(TestTyscConstants.PLAYER_COUNT, sportService.findAllPlayers(null).size());
assertEquals(TestTyscConstants.PLAYER_CHRIS_COUNT, sportService.findAllPlayers(TestTyscConstants.PLAYER_CHRIS_NAME).size());
}
@Test
@Order(5)
void testSavePlayer() {
Player player = new Player();
player.setFirstName(TestConstants.PLAYER_FIRSTNAME);
player.setLastName(TestConstants.PLAYER_LASTNAME);
player.setFirstName(TestTyscConstants.PLAYER_FIRSTNAME);
player.setLastName(TestTyscConstants.PLAYER_LASTNAME);
player = sportService.savePlayer(player);
assertNotNull(player);
}
@@ -74,87 +74,87 @@ class SportServiceTest {
@Test
@Order(6)
void testDeletePlayer() {
List<Player> players = sportService.findAllPlayers(TestConstants.PLAYER_LASTNAME);
List<Player> players = sportService.findAllPlayers(TestTyscConstants.PLAYER_LASTNAME);
assertEquals(1, players.size());
Player player = players.get(0);
sportService.deletePlayer(player);
assertEquals(TestConstants.PLAYER_COUNT, sportService.findAllPlayers(null).size());
assertEquals(TestTyscConstants.PLAYER_COUNT, sportService.findAllPlayers(null).size());
}
@Test
@Order(7)
void testFindAllPositions() {
assertEquals(TestConstants.POSITION_COUNT, sportService.findAllPositions(null).size());
assertEquals(TestConstants.POSITION_CENTER_COUNT, sportService.findAllPositions(TestConstants.POSITION_CENTER).size());
assertEquals(TestTyscConstants.POSITION_COUNT, sportService.findAllPositions(null).size());
assertEquals(TestTyscConstants.POSITION_CENTER_COUNT, sportService.findAllPositions(TestTyscConstants.POSITION_CENTER).size());
}
@Test
@Order(8)
void testFindAllPositionsForSport() {
List<Sport> sports = sportService.findAllSports(TestConstants.FOOTBALL_NAME);
List<Sport> sports = sportService.findAllSports(TestTyscConstants.FOOTBALL_NAME);
assertEquals(1, sports.size());
Sport football = sports.get(0);
assertEquals(TestConstants.FOOTBALL_POSITION_COUNT, sportService.findAllPositionsForSport(football).size());
assertEquals(TestTyscConstants.FOOTBALL_POSITION_COUNT, sportService.findAllPositionsForSport(football).size());
}
@Test
@Order(9)
void testSavePosition() {
List<Sport> sports = sportService.findAllSports(TestConstants.FOOTBALL_NAME);
List<Sport> sports = sportService.findAllSports(TestTyscConstants.FOOTBALL_NAME);
Sport football = sports.get(0);
FieldPosition position = new FieldPosition();
position.setSport(football);
position.setName(TestConstants.POSITION_NAME);
position.setShortName(TestConstants.POSITION_SHORTNAME);
position.setName(TestTyscConstants.POSITION_NAME);
position.setShortName(TestTyscConstants.POSITION_SHORTNAME);
sportService.savePosition(position);
assertEquals(TestConstants.POSITION_COUNT+1, sportService.findAllPositions(null).size());
assertEquals(TestTyscConstants.POSITION_COUNT+1, sportService.findAllPositions(null).size());
}
@Test
@Order(10)
void testDeletePosition() {
List<FieldPosition> positions = sportService.findAllPositions(TestConstants.POSITION_NAME);
List<FieldPosition> positions = sportService.findAllPositions(TestTyscConstants.POSITION_NAME);
assertEquals(1, positions.size());
FieldPosition position = positions.get(0);
sportService.deletePosition(position);
assertEquals(TestConstants.POSITION_COUNT, sportService.findAllPositions(null).size());
assertEquals(TestTyscConstants.POSITION_COUNT, sportService.findAllPositions(null).size());
}
@Test
@Order(11)
void testFindAllTeams() {
assertEquals(TestConstants.TEAM_COUNT, sportService.findAllTeams(null).size());
assertEquals(TestTyscConstants.TEAM_COUNT, sportService.findAllTeams(null).size());
assertEquals(1, sportService.findAllTeams("sharks").size());
}
@Test
@Order(12)
void testSaveTeam() {
List<Sport> sports = sportService.findAllSports(TestConstants.FOOTBALL_NAME);
List<Sport> sports = sportService.findAllSports(TestTyscConstants.FOOTBALL_NAME);
Sport football = sports.get(0);
Team team = new Team();
team.setSport(football);
team.setName(TestConstants.TEAM_NAME);
team.setShortName(TestConstants.TEAM_SHORTNAME);
team.setName(TestTyscConstants.TEAM_NAME);
team.setShortName(TestTyscConstants.TEAM_SHORTNAME);
sportService.saveTeam(team);
assertEquals(TestConstants.TEAM_COUNT+1, sportService.findAllTeams(null).size());
assertEquals(TestTyscConstants.TEAM_COUNT+1, sportService.findAllTeams(null).size());
}
@Test
@Order(13)
void testDeleteTeam() {
List<Team> teams = sportService.findAllTeams(TestConstants.TEAM_NAME);
List<Team> teams = sportService.findAllTeams(TestTyscConstants.TEAM_NAME);
assertEquals(1, teams.size());
Team team = teams.get(0);
sportService.deleteTeam(team);
assertEquals(TestConstants.TEAM_COUNT, sportService.findAllTeams(null).size());
assertEquals(TestTyscConstants.TEAM_COUNT, sportService.findAllTeams(null).size());
}
@Test
@Order(14)
void testFindAllRoosters() {
assertEquals(TestConstants.ROOSTER_COUNT, sportService.findAllRoosters().size());
assertEquals(TestTyscConstants.ROOSTER_COUNT, sportService.findAllRoosters().size());
}
@Test
@@ -175,26 +175,26 @@ class SportServiceTest {
@Order(16)
void testSaveRooster() {
Rooster rooster = new Rooster();
Player player = sportService.findAllPlayers(TestConstants.PLAYER_CHRIS_NAME).get(0);
Player player = sportService.findAllPlayers(TestTyscConstants.PLAYER_CHRIS_NAME).get(0);
rooster.setPlayer(player);
Team team = sportService.findAllTeams(TestConstants.DOLPHINS_NAME).get(0);
Team team = sportService.findAllTeams(TestTyscConstants.DOLPHINS_NAME).get(0);
rooster.setTeam(team);
FieldPosition position = sportService.findAllPositions(TestConstants.QUARTERBACK_NAME).get(0);
FieldPosition position = sportService.findAllPositions(TestTyscConstants.QUARTERBACK_NAME).get(0);
rooster.setPosition(position);
rooster.setYear(TestConstants.ROOSTER_YEAR);
rooster.setYear(TestTyscConstants.ROOSTER_YEAR);
sportService.saveRooster(rooster);
assertEquals(TestConstants.ROOSTER_COUNT+1, sportService.findAllRoosters().size());
assertEquals(TestTyscConstants.ROOSTER_COUNT+1, sportService.findAllRoosters().size());
}
@Test
@Order(17)
void testDeleteRooster() {
Team team = sportService.findAllTeams(TestConstants.DOLPHINS_NAME).get(0);
Player player = sportService.findAllPlayers(TestConstants.PLAYER_CHRIS_NAME).get(0);
FieldPosition position = sportService.findAllPositions(TestConstants.QUARTERBACK_NAME).get(0);
Rooster rooster = sportService.findRoosterByFields(team, player, position, TestConstants.ROOSTER_YEAR);
Team team = sportService.findAllTeams(TestTyscConstants.DOLPHINS_NAME).get(0);
Player player = sportService.findAllPlayers(TestTyscConstants.PLAYER_CHRIS_NAME).get(0);
FieldPosition position = sportService.findAllPositions(TestTyscConstants.QUARTERBACK_NAME).get(0);
Rooster rooster = sportService.findRoosterByFields(team, player, position, TestTyscConstants.ROOSTER_YEAR);
assertNotNull(rooster);
sportService.deleteRooster(rooster);
assertEquals(TestConstants.ROOSTER_COUNT, sportService.findAllRoosters().size());
assertEquals(TestTyscConstants.ROOSTER_COUNT, sportService.findAllRoosters().size());
}
}