From b41593acb874aa4b8547bac0f0bf9c5c512e0299 Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Mon, 19 Aug 2024 21:45:35 +0200 Subject: [PATCH] Fix FetcherTests (#11644) * Fix FetcherTests * Discard changes to src/test/java/org/jabref/logic/importer/fetcher/OpenAccessDoiTest.java --- .../importer/fetcher/GrobidCitationFetcher.java | 1 - .../logic/importer/fetcher/BvbFetcherTest.java | 2 +- .../fetcher/GrobidCitationFetcherTest.java | 4 ++-- .../logic/importer/fetcher/GvkFetcherTest.java | 4 ++-- .../importer/fetcher/SpringerFetcherTest.java | 14 ++++++++++++++ 5 files changed, 19 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/jabref/logic/importer/fetcher/GrobidCitationFetcher.java b/src/main/java/org/jabref/logic/importer/fetcher/GrobidCitationFetcher.java index 0576c90e6ea..47d4fc35c14 100644 --- a/src/main/java/org/jabref/logic/importer/fetcher/GrobidCitationFetcher.java +++ b/src/main/java/org/jabref/logic/importer/fetcher/GrobidCitationFetcher.java @@ -44,7 +44,6 @@ public GrobidCitationFetcher(GrobidPreferences grobidPreferences, ImportFormatPr * server has to look up the entry. * * @return A BibTeX string if extraction is successful - * @throws FetcherException */ private Optional parseUsingGrobid(String plainText) throws FetcherException { try { diff --git a/src/test/java/org/jabref/logic/importer/fetcher/BvbFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/BvbFetcherTest.java index 8361a7953f3..76a5d661def 100644 --- a/src/test/java/org/jabref/logic/importer/fetcher/BvbFetcherTest.java +++ b/src/test/java/org/jabref/logic/importer/fetcher/BvbFetcherTest.java @@ -78,7 +78,7 @@ public void simpleSearchQueryURLCorrect() throws Exception { String query = "java jdk"; QueryNode luceneQuery = new StandardSyntaxParser().parse(query, NO_EXPLICIT_FIELD); URL url = fetcher.getURLForQuery(luceneQuery); - assertEquals("bvbr.bib-bvb.de:5661/bvb01sru?version=1.1&recordSchema=marcxml&operation=searchRetrieve&query=java%20jdk&maximumRecords=30", url.toString()); + assertEquals("http://bvbr.bib-bvb.de:5661/bvb01sru?version=1.1&recordSchema=marcxml&operation=searchRetrieve&query=java%20jdk&maximumRecords=30", url.toString()); } @Test diff --git a/src/test/java/org/jabref/logic/importer/fetcher/GrobidCitationFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/GrobidCitationFetcherTest.java index 99f5a815978..26b72bae0ac 100644 --- a/src/test/java/org/jabref/logic/importer/fetcher/GrobidCitationFetcherTest.java +++ b/src/test/java/org/jabref/logic/importer/fetcher/GrobidCitationFetcherTest.java @@ -122,8 +122,8 @@ public void grobidPerformSearchWithEmptyStringsTest() throws FetcherException { @ParameterizedTest @MethodSource("provideInvalidInput") public void grobidPerformSearchWithInvalidDataTest(String invalidInput) throws FetcherException { - List entries = grobidCitationFetcher.performSearch(invalidInput); - assertEquals(Collections.emptyList(), entries); + assertThrows(FetcherException.class, () -> + grobidCitationFetcher.performSearch("invalidInput"), "performSearch should throw an FetcherException."); } @Test diff --git a/src/test/java/org/jabref/logic/importer/fetcher/GvkFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/GvkFetcherTest.java index f98a9780056..1fc6cc1cb8e 100644 --- a/src/test/java/org/jabref/logic/importer/fetcher/GvkFetcherTest.java +++ b/src/test/java/org/jabref/logic/importer/fetcher/GvkFetcherTest.java @@ -70,7 +70,7 @@ public void simpleSearchQueryURLCorrect() throws Exception { String query = "java jdk"; QueryNode luceneQuery = new StandardSyntaxParser().parse(query, AbstractQueryTransformer.NO_EXPLICIT_FIELD); URL url = fetcher.getURLForQuery(luceneQuery); - assertEquals("https://sru.k10plus.de/opac-de-627?version=1.1&operation=searchRetrieve&query=pica.all%3Djava+and+pica.all%3Djdk&maximumRecords=50&recordSchema=picaxml&sortKeys=Year%2C%2C1", url.toString()); + assertEquals("https://sru.k10plus.de/opac-de-627?version=1.1&operation=searchRetrieve&query=pica.all%3Djava%20and%20pica.all%3Djdk&maximumRecords=50&recordSchema=picaxml&sortKeys=Year%2C%2C1", url.toString()); } @Test @@ -78,7 +78,7 @@ public void complexSearchQueryURLCorrect() throws Exception { String query = "kon:java tit:jdk"; QueryNode luceneQuery = new StandardSyntaxParser().parse(query, AbstractQueryTransformer.NO_EXPLICIT_FIELD); URL url = fetcher.getURLForQuery(luceneQuery); - assertEquals("https://sru.k10plus.de/opac-de-627?version=1.1&operation=searchRetrieve&query=pica.kon%3Djava+and+pica.tit%3Djdk&maximumRecords=50&recordSchema=picaxml&sortKeys=Year%2C%2C1", url.toString()); + assertEquals("https://sru.k10plus.de/opac-de-627?version=1.1&operation=searchRetrieve&query=pica.kon%3Djava%20and%20pica.tit%3Djdk&maximumRecords=50&recordSchema=picaxml&sortKeys=Year%2C%2C1", url.toString()); } @Test diff --git a/src/test/java/org/jabref/logic/importer/fetcher/SpringerFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/SpringerFetcherTest.java index 7ad008e2d53..332c3f8d147 100644 --- a/src/test/java/org/jabref/logic/importer/fetcher/SpringerFetcherTest.java +++ b/src/test/java/org/jabref/logic/importer/fetcher/SpringerFetcherTest.java @@ -168,6 +168,19 @@ public void supportsYearRangeSearch() { } @Test + @Disabled("401 as of 2024-08-18") + @Override + public void supportsAuthorSearch() { + } + + @Test + @Disabled("401 as of 2024-08-18") + @Override + public void supportsJournalSearch() { + } + + @Test + @Disabled("401 as of 2024-08-18") public void supportsPhraseSearch() throws Exception { // Normal search should match due to Redmiles, Elissa M., phrase search on the other hand should not find it. BibEntry expected = new BibEntry(StandardEntryType.InCollection) @@ -193,6 +206,7 @@ public void supportsPhraseSearch() throws Exception { } @Test + @Disabled("401 as of 2024-08-18") public void supportsBooleanANDSearch() throws Exception { List resultJustByAuthor = fetcher.performSearch("author:\"Redmiles, David\""); List result = fetcher.performSearch("author:\"Redmiles, David\" AND journal:\"Computer Supported Cooperative Work\"");