fix merge conflicts and external link creator tests

Author: brandon-lau0

jablib/src/main/java/org/jabref/logic/util/ExternalLinkCreator.java

@@ -37,7 +37,7 @@ public Optional<String> getShortScienceSearchURL(BibEntry entry) {
             if (!baseUrl.contains("{title}")) {
                 try {
                     URIBuilder uriBuilder = new URIBuilder(DEFAULT_SHORTSCIENCE_SEARCH_URL);
-                    uriBuilder.addParameter("q", title);
+                    uriBuilder.addParameter("q", title.trim());
                     author.ifPresent(a -> uriBuilder.addParameter("author", a));
                     return uriBuilder.toString();
                 } catch (URISyntaxException ex) {
@@ -68,7 +68,7 @@ public Optional<String> getGoogleScholarSearchURL(BibEntry entry) {
             if (!baseUrl.contains("{title}")) {
                 try {
                     URIBuilder uriBuilder = new URIBuilder(DEFAULT_GOOGLE_SCHOLAR_SEARCH_URL);
-                    uriBuilder.addParameter("q", title);
+                    uriBuilder.addParameter("q", title.trim());
                     author.ifPresent(a -> uriBuilder.addParameter("author", a));
                     return uriBuilder.toString();
                 } catch (URISyntaxException ex) {

jablib/src/test/java/org/jabref/logic/util/ExternalLinkCreatorTest.java

@@ -35,6 +35,7 @@ public StubImporterPreferences() {
                     true, // persistCustomKeys
                     List.of(), // catalogs
                     null, // defaultPlainCitationParser
+                    5, // citationsRelationsStoreTTL
                     Collections.emptyMap() // searchEngineUrlTemplates
             );
         }
@@ -62,9 +63,12 @@ static Stream<Arguments> specialCharactersProvider() {
     @ParameterizedTest
     @MethodSource("specialCharactersProvider")
     void getShortScienceSearchURLEncodesSpecialCharacters(String title) {
+        ImporterPreferences stubPreferences = new StubImporterPreferences();
+        ExternalLinkCreator linkCreator = new ExternalLinkCreator(stubPreferences);
+
         BibEntry entry = new BibEntry();
         entry.setField(StandardField.TITLE, title);
-        Optional<String> url = getShortScienceSearchURL(entry);
+        Optional<String> url = linkCreator.getShortScienceSearchURL(entry);
         assertTrue(url.isPresent());
         assertTrue(urlIsValid(url.get()));
     }
@@ -77,8 +81,11 @@ void getShortScienceSearchURLEncodesSpecialCharacters(String title) {
         "'JabRef bibliography management', 'https://www.shortscience.org/internalsearch?q=JabRef%20bibliography%20management'"
     })
     void getShortScienceSearchURLEncodesCharacters(String title, String expectedUrl) {
+        ImporterPreferences stubPreferences = new StubImporterPreferences();
+        ExternalLinkCreator linkCreator = new ExternalLinkCreator(stubPreferences);
+
         BibEntry entry = new BibEntry().withField(StandardField.TITLE, title);
-        Optional<String> url = getShortScienceSearchURL(entry);
+        Optional<String> url = linkCreator.getShortScienceSearchURL(entry);
         assertEquals(Optional.of(expectedUrl), url);
     }
 
@@ -91,15 +98,17 @@ void getShortScienceSearchURLReturnsEmptyOnMissingTitle() {
         assertEquals(Optional.empty(), linkCreator.getShortScienceSearchURL(entry));
     }
 
-    @Test
-    void getShortScienceSearchURLLinksToSearchResults() {
+    @ParameterizedTest
+    @CsvSource({
+            "JabRef bibliography management, https://www.shortscience.org/internalsearch?q=JabRef%20bibliography%20management",
+            "Machine learning, https://www.shortscience.org/internalsearch?q=Machine%20learning",
+    })
+    void getShortScienceSearchURLLinksToSearchResults(String title, String expectedUrl) {
         ImporterPreferences stubPreferences = new StubImporterPreferences();
         ExternalLinkCreator linkCreator = new ExternalLinkCreator(stubPreferences);
 
-        // Take an arbitrary article name
-        BibEntry entry = new BibEntry().withField(StandardField.TITLE, "JabRef bibliography management");
+        BibEntry entry = new BibEntry().withField(StandardField.TITLE, title);
         Optional<String> url = linkCreator.getShortScienceSearchURL(entry);
-        // Expected behaviour is to link to the search results page, /internalsearch
-        assertEquals(Optional.of("https://www.shortscience.org/internalsearch?q=JabRef%20bibliography%20management"), url);
+        assertEquals(Optional.of(expectedUrl), url);
     }
 }