Skip to content

Commit

Permalink
Fixed issues after rebasing [#432]
Browse files Browse the repository at this point in the history
  • Loading branch information
@mcpierce @BRUCELLA2
mcpierce authored and BRUCELLA2 committed Aug 7, 2020
1 parent a9ca5f5 commit 8aa8c24
Show file tree
Hide file tree
Showing 5 changed files with 44 additions and 38 deletions.
10 changes: 8 additions & 2 deletions ...d-rest-api/src/test/java/org/comixedproject/controller/library/LibraryControllerTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -228,15 +228,21 @@ public void testConvertComics() {
Mockito.doNothing().when(taskManager).runTask(Mockito.any(WorkerTask.class));

libraryController.convertComics(
new ConvertComicsRequest(idList, TEST_ARCHIVE_TYPE, TEST_RENAME_PAGES, TEST_DELETE_PAGES));
new ConvertComicsRequest(
idList,
TEST_ARCHIVE_TYPE,
TEST_RENAME_PAGES,
TEST_DELETE_PAGES,
TEST_DELETE_ORIGINAL_COMIC));

Mockito.verify(taskManager, Mockito.times(1)).runTask(convertComicsWorkerTask);
Mockito.verify(convertComicsWorkerTask, Mockito.times(1)).setIdList(idList);
Mockito.verify(convertComicsWorkerTask, Mockito.times(1))
.setTargetArchiveType(TEST_ARCHIVE_TYPE);
Mockito.verify(convertComicsWorkerTask, Mockito.times(1)).setRenamePages(TEST_RENAME_PAGES);
Mockito.verify(convertComicsWorkerTask, Mockito.times(1)).setDeletePages(TEST_DELETE_PAGES);
Mockito.verify(convertComicsWorkerTask, Mockito.times(1)).setDeleteOriginal(TEST_DELETE_ORIGINAL_COMIC);
Mockito.verify(convertComicsWorkerTask, Mockito.times(1))
.setDeleteOriginal(TEST_DELETE_ORIGINAL_COMIC);
}

@Test
Expand Down
8 changes: 5 additions & 3 deletions comixed-tasks/src/main/java/org/comixedproject/task/model/ConvertComicWorkerTask.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,9 @@
import org.comixedproject.handlers.ComicFileHandler;
import org.comixedproject.model.archives.ArchiveType;
import org.comixedproject.model.comic.Comic;
import org.comixedproject.model.library.ReadingList;
import org.comixedproject.service.comic.ComicService;
import org.comixedproject.service.library.ReadingListService;
import org.comixedproject.service.task.TaskService;
import org.comixedproject.task.encoders.ProcessComicWorkerTaskEncoder;
import org.springframework.beans.factory.ObjectFactory;
Expand All @@ -58,7 +60,7 @@ public class ConvertComicWorkerTask extends AbstractWorkerTask {
private ObjectFactory<ProcessComicWorkerTaskEncoder> processComicTaskEncoderObjectFactory;

@Autowired private ComicFileHandler comicFileHandler;
@Autowired private ReadingListRepository readingListRepository;
@Autowired private ReadingListService readingListService;

@Getter @Setter private Comic comic;
@Getter @Setter private ArchiveType targetArchiveType;
Expand Down Expand Up @@ -116,7 +118,7 @@ private void deleteOriginal() throws WorkerTaskException {
try {
FileUtils.forceDelete(file);
log.debug("Removing comic from repository: id={}", this.comic.getId());
this.comicRepository.delete(this.comic);
this.comicService.delete(this.comic);
} catch (IOException error) {
log.error("Unable to delete comic: {}", filename, error);
throw new WorkerTaskException("failed to delete comic", error);
Expand All @@ -138,7 +140,7 @@ private void updateReadingList(final Comic originalComic, final Comic convertedC
}
readingList.getComics().add(convertedComic);
log.debug("Updating reading list: {}", readingList.getName());
this.readingListRepository.save(readingList);
this.readingListService.save(readingList);
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions ...sks/src/test/java/org/comixedproject/task/encoders/ConvertComicWorkerTaskEncoderTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ public void testEncode() {
result.getProperty(ConvertComicWorkerTaskEncoder.DELETE_PAGES));
assertEquals(
String.valueOf(TEST_DELETE_ORIGINAL_COMIC),
result.getProperty(ConvertComicTaskEncoder.DELETE_ORIGINAL_COMIC));
result.getProperty(ConvertComicWorkerTaskEncoder.DELETE_ORIGINAL_COMIC));
}

@Test
Expand All @@ -89,7 +89,7 @@ public void testDecode() {
.thenReturn(String.valueOf(TEST_RENAME_PAGES));
Mockito.when(task.getProperty(ConvertComicWorkerTaskEncoder.DELETE_PAGES))
.thenReturn(String.valueOf(TEST_DELETE_PAGES));
Mockito.when(task.getProperty(ConvertComicTaskEncoder.DELETE_ORIGINAL_COMIC))
Mockito.when(task.getProperty(ConvertComicWorkerTaskEncoder.DELETE_ORIGINAL_COMIC))
.thenReturn(String.valueOf(TEST_DELETE_ORIGINAL_COMIC));

ConvertComicWorkerTask result = encoder.decode(task);
Expand Down
52 changes: 25 additions & 27 deletions comixed-tasks/src/test/java/org/comixedproject/task/model/ConvertComicWorkerTaskTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
import org.comixedproject.model.library.ReadingList;
import org.comixedproject.model.tasks.Task;
import org.comixedproject.service.comic.ComicService;
import org.comixedproject.service.library.ReadingListService;
import org.comixedproject.service.task.TaskService;
import org.comixedproject.task.encoders.ProcessComicWorkerTaskEncoder;
import org.junit.Assert;
Expand Down Expand Up @@ -71,15 +72,15 @@ class ConvertComicWorkerTaskTest {
@Mock private Task processComicTask;
@Mock private TaskService taskService;
@Mock private ComicFileHandler comicFileHandler;
@Mock private ReadingListRepository readingListRepository;
@Mock private ReadingListService readingListService;

public ConvertComicWorkerTaskTest() {}

@Test
public void testSetComic() {
task.setComic(originalComic);
task.setComic(sourceComic);

assertSame(originalComic, task.getComic());
assertSame(sourceComic, task.getComic());
}

@Test
Expand Down Expand Up @@ -113,7 +114,7 @@ public void testSetDeleteOriginal() {
@Test
public void testStartTaskWithoutDeleteOriginal()
throws IOException, ArchiveAdaptorException, WorkerTaskException {
task.setComic(originalComic);
task.setComic(sourceComic);
task.setTargetArchiveType(targetArchiveType);
task.setRenamePages(TEST_RENAME_PAGES);
task.setDeletePages(TEST_DELETE_PAGES);
Expand All @@ -122,43 +123,41 @@ public void testStartTaskWithoutDeleteOriginal()
Set<ReadingList> readingListSet = new HashSet<>();
ReadingList readingList = new ReadingList();
readingList.setName("test");
readingList.getComics().add(originalComic);
readingList.getComics().add(sourceComic);
readingListSet.add(readingList);

Mockito.when(comicFileHandler.getArchiveAdaptorFor(Mockito.any(ArchiveType.class)))
.thenReturn(targetArchiveAdaptor);
Mockito.when(targetArchiveAdaptor.saveComic(Mockito.any(Comic.class), Mockito.anyBoolean()))
.thenReturn(savedComic);
Mockito.when(comicService.save(Mockito.any(Comic.class))).thenReturn(storedComic);
Mockito.when(comicService.save(Mockito.any(Comic.class))).thenReturn(savedComic);
Mockito.when(processComicTaskEncoderObjectFactory.getObject())
.thenReturn(processComicTaskEncoder);
Mockito.when(processComicTaskEncoder.encode()).thenReturn(processComicTask);
Mockito.when(taskService.save(Mockito.any(Task.class))).thenReturn(processComicTask);

Mockito.when(originalComic.getReadingLists()).thenReturn(readingListSet);
Mockito.when(readingListRepository.save(Mockito.any(ReadingList.class)))
.thenReturn(readingList);
Mockito.when(sourceComic.getReadingLists()).thenReturn(readingListSet);
Mockito.when(readingListService.save(Mockito.any(ReadingList.class))).thenReturn(readingList);
/*
Mockito.when(sourceComic.getFilename()).thenReturn(TEST_ORIGINAL_COMIC_FILENAME);
PowerMockito.mockStatic(FileUtils.class);
*/

task.startTask();

Mockito.verify(originalComic, Mockito.times(1)).removeDeletedPages(TEST_DELETE_PAGES);
Mockito.verify(sourceComic, Mockito.times(1)).removeDeletedPages(TEST_DELETE_PAGES);
Mockito.verify(targetArchiveAdaptor, Mockito.times(1))
.saveComic(originalComic, TEST_RENAME_PAGES);
.saveComic(sourceComic, TEST_RENAME_PAGES);
Mockito.verify(savedComic, Mockito.times(1)).setDateLastUpdated(Mockito.any(Date.class));
Mockito.verify(comicRepository, Mockito.times(1)).save(savedComic);
Mockito.verify(comicService, Mockito.times(1)).save(savedComic);
Mockito.verify(processComicTaskEncoder, Mockito.times(1)).setComic(convertedComic);
Mockito.verify(processComicTaskEncoder, Mockito.times(1)).setDeleteBlockedPages(false);
Mockito.verify(processComicTaskEncoder, Mockito.times(1)).setIgnoreMetadata(false);
Mockito.verify(taskRepository, Mockito.times(1)).save(processComicTask);
Mockito.verify(readingListRepository, Mockito.times(1)).save(readingList);
Mockito.verify(taskService, Mockito.times(1)).save(processComicTask);
Mockito.verify(readingListService, Mockito.times(1)).save(readingList);

Assert.assertTrue(
"Reading list don't contain original comic",
readingList.getComics().contains(originalComic));
"Reading list don't contain original comic", readingList.getComics().contains(sourceComic));
Assert.assertTrue(
"Reading list don't contain converted comic",
readingList.getComics().contains(convertedComic));
Expand All @@ -167,7 +166,7 @@ public void testStartTaskWithoutDeleteOriginal()
@Test
public void testStartTaskWithDeleteOriginal()
throws IOException, ArchiveAdaptorException, WorkerTaskException {
task.setComic(originalComic);
task.setComic(sourceComic);
task.setTargetArchiveType(targetArchiveType);
task.setRenamePages(TEST_RENAME_PAGES);
task.setDeletePages(TEST_DELETE_PAGES);
Expand All @@ -176,33 +175,32 @@ public void testStartTaskWithDeleteOriginal()
Set<ReadingList> readingListSet = new HashSet<>();
ReadingList readingList = new ReadingList();
readingList.setName("test");
readingList.getComics().add(originalComic);
readingList.getComics().add(sourceComic);
readingListSet.add(readingList);

Mockito.when(comicFileHandler.getArchiveAdaptorFor(Mockito.any(ArchiveType.class)))
.thenReturn(targetArchiveAdaptor);
Mockito.when(targetArchiveAdaptor.saveComic(Mockito.any(Comic.class), Mockito.anyBoolean()))
.thenReturn(savedComic);
Mockito.when(comicRepository.save(Mockito.any(Comic.class))).thenReturn(convertedComic);
Mockito.when(comicService.save(Mockito.any(Comic.class))).thenReturn(convertedComic);
Mockito.when(processComicTaskEncoderObjectFactory.getObject())
.thenReturn(processComicTaskEncoder);
Mockito.when(processComicTaskEncoder.encode()).thenReturn(processComicTask);
Mockito.when(taskRepository.save(Mockito.any(Task.class))).thenReturn(processComicTask);
Mockito.when(taskService.save(Mockito.any(Task.class))).thenReturn(processComicTask);

Mockito.when(originalComic.getReadingLists()).thenReturn(readingListSet);
Mockito.when(readingListRepository.save(Mockito.any(ReadingList.class)))
.thenReturn(readingList);
Mockito.when(sourceComic.getReadingLists()).thenReturn(readingListSet);
Mockito.when(readingListService.save(Mockito.any(ReadingList.class))).thenReturn(readingList);

Mockito.when(originalComic.getFilename()).thenReturn(TEST_ORIGINAL_COMIC_FILENAME);
Mockito.when(sourceComic.getFilename()).thenReturn(TEST_ORIGINAL_COMIC_FILENAME);
PowerMockito.mockStatic(FileUtils.class);
PowerMockito.doNothing().when(FileUtils.class);
FileUtils.forceDelete(Mockito.any());

task.startTask();

Mockito.verify(originalComic, Mockito.times(1)).removeDeletedPages(TEST_DELETE_PAGES);
Mockito.verify(sourceComic, Mockito.times(1)).removeDeletedPages(TEST_DELETE_PAGES);
Mockito.verify(targetArchiveAdaptor, Mockito.times(1))
.saveComic(originalComic, TEST_RENAME_PAGES);
.saveComic(sourceComic, TEST_RENAME_PAGES);
Mockito.verify(savedComic, Mockito.times(1)).setDateLastUpdated(Mockito.any(Date.class));
Mockito.verify(comicService, Mockito.times(1)).save(savedComic);
Mockito.verify(processComicTaskEncoder, Mockito.times(1)).setComic(savedComic);
Expand All @@ -211,7 +209,7 @@ public void testStartTaskWithDeleteOriginal()
Mockito.verify(taskService, Mockito.times(1)).save(processComicTask);

Assert.assertFalse(
"Reading list contain original comic", readingList.getComics().contains(originalComic));
"Reading list contain original comic", readingList.getComics().contains(sourceComic));
Assert.assertTrue(
"Reading list don't contain converted comic",
readingList.getComics().contains(convertedComic));
Expand Down
8 changes: 4 additions & 4 deletions comixed-tasks/src/test/java/org/comixedproject/task/model/ConvertComicsWorkerTaskTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@

package org.comixedproject.task.model;

import static junit.framework.TestCase.*;
import static junit.framework.TestCase.assertEquals;
import static junit.framework.TestCase.assertSame;

import java.util.ArrayList;
import java.util.List;
Expand Down Expand Up @@ -100,8 +101,7 @@ public void testGetDescription() {

String expectedDescription =
String.format(
"Preparing to save %d comic%s",
this.comicList.size(), this.comicList.size() == 1 ? "" : "s");
"Preparing to save %d comic%s", this.idList.size(), this.idList.size() == 1 ? "" : "s");
assertEquals(expectedDescription, task.getDescription());
}

Expand Down Expand Up @@ -132,7 +132,7 @@ public void testStartTask() throws WorkerTaskException, ComicException {
.setRenamePages(TEST_RENAME_PAGES);
Mockito.verify(convertComicTaskEncoder, Mockito.times(idList.size()))
.setDeletePages(TEST_DELETE_PAGES);
Mockito.verify(convertComicTaskEncoder, Mockito.times(comicList.size()))
Mockito.verify(convertComicTaskEncoder, Mockito.times(idList.size()))
.setDeleteOriginal(TEST_DELETE_ORIGINAL_COMIC);
Mockito.verify(taskService, Mockito.times(idList.size())).save(taskArgumentCaptor.getValue());
}
Expand Down

0 comments on commit 8aa8c24

Please sign in to comment.