Skip to content

Commit b05ebac

Browse files
authored
Add githandler mock to crawler test to fix NPE (#7133)
Pass githandler to crawler to enable mock Signed-off-by: Dominik Voigt <[email protected]>
1 parent 9d7b93d commit b05ebac

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed

src/main/java/org/jabref/gui/StartLiteratureReviewAction.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import org.jabref.gui.util.FileDialogConfiguration;
1111
import org.jabref.gui.util.TaskExecutor;
1212
import org.jabref.logic.crawler.Crawler;
13+
import org.jabref.logic.crawler.git.GitHandler;
1314
import org.jabref.logic.importer.ParseException;
1415
import org.jabref.logic.l10n.Localization;
1516
import org.jabref.model.entry.BibEntryTypesManager;
@@ -49,7 +50,7 @@ public void execute() {
4950
}
5051
final Crawler crawler;
5152
try {
52-
crawler = new Crawler(studyDefinitionFile.get(), fileUpdateMonitor, JabRefPreferences.getInstance().getImportFormatPreferences(), JabRefPreferences.getInstance().getSavePreferences(), new BibEntryTypesManager());
53+
crawler = new Crawler(studyDefinitionFile.get(), new GitHandler(studyDefinitionFile.get().getParent()), fileUpdateMonitor, JabRefPreferences.getInstance().getImportFormatPreferences(), JabRefPreferences.getInstance().getSavePreferences(), new BibEntryTypesManager());
5354
} catch (IOException | ParseException | GitAPIException e) {
5455
LOGGER.error("Error during reading of study definition file.", e);
5556
dialogService.showErrorDialogAndWait(Localization.lang("Error during reading of study definition file."), e);

src/main/java/org/jabref/logic/crawler/Crawler.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ public class Crawler {
3131
*
3232
* @param studyDefinitionFile The path to the study definition file that contains the list of targeted E-Libraries and used cross-library queries
3333
*/
34-
public Crawler(Path studyDefinitionFile, FileUpdateMonitor fileUpdateMonitor, ImportFormatPreferences importFormatPreferences, SavePreferences savePreferences, BibEntryTypesManager bibEntryTypesManager) throws IllegalArgumentException, IOException, ParseException, GitAPIException {
34+
public Crawler(Path studyDefinitionFile, GitHandler gitHandler, FileUpdateMonitor fileUpdateMonitor, ImportFormatPreferences importFormatPreferences, SavePreferences savePreferences, BibEntryTypesManager bibEntryTypesManager) throws IllegalArgumentException, IOException, ParseException, GitAPIException {
3535
Path studyRepositoryRoot = studyDefinitionFile.getParent();
36-
studyRepository = new StudyRepository(studyRepositoryRoot, new GitHandler(studyRepositoryRoot), importFormatPreferences, fileUpdateMonitor, savePreferences, bibEntryTypesManager);
36+
studyRepository = new StudyRepository(studyRepositoryRoot, gitHandler, importFormatPreferences, fileUpdateMonitor, savePreferences, bibEntryTypesManager);
3737
Study study = studyRepository.getStudy();
3838
LibraryEntryToFetcherConverter libraryEntryToFetcherConverter = new LibraryEntryToFetcherConverter(study.getActiveLibraryEntries(), importFormatPreferences);
3939
this.studyFetcher = new StudyFetcher(libraryEntryToFetcherConverter.getActiveFetchers(), study.getSearchQueryStrings());

src/test/java/org/jabref/logic/crawler/CrawlerTest.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import java.nio.file.Path;
77

88
import org.jabref.logic.bibtex.FieldContentFormatterPreferences;
9+
import org.jabref.logic.crawler.git.GitHandler;
910
import org.jabref.logic.exporter.SavePreferences;
1011
import org.jabref.logic.importer.ImportFormatPreferences;
1112
import org.jabref.logic.util.io.FileUtil;
@@ -31,11 +32,13 @@ class CrawlerTest {
3132
ImportFormatPreferences importFormatPreferences;
3233
SavePreferences savePreferences;
3334
BibEntryTypesManager entryTypesManager;
35+
GitHandler gitHandler = mock(GitHandler.class, Answers.RETURNS_DEFAULTS);
3436

3537
@Test
3638
public void testWhetherAllFilesAreCreated() throws Exception {
3739
setUp();
3840
Crawler testCrawler = new Crawler(getPathToStudyDefinitionFile(),
41+
gitHandler,
3942
new DummyFileUpdateMonitor(),
4043
importFormatPreferences,
4144
savePreferences,

0 commit comments

Comments
 (0)