From b9be53e056d92837d827efc2a70a06ff733ad0b7 Mon Sep 17 00:00:00 2001
From: Carl Christian Snethlage <50491877+calixtus@users.noreply.github.com>
Date: Fri, 18 Sep 2020 08:26:57 +0200
Subject: [PATCH] Fixed tests remaining from bibtexkey to citationkey refactor
 (#6918)

---
 .../java/org/jabref/logic/help/HelpFile.java  | 24 +++++++++----------
 .../migrations/PreferencesMigrations.java     |  9 +++++--
 2 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/src/main/java/org/jabref/logic/help/HelpFile.java b/src/main/java/org/jabref/logic/help/HelpFile.java
index c8fbebb4cbc..2708e913e99 100644
--- a/src/main/java/org/jabref/logic/help/HelpFile.java
+++ b/src/main/java/org/jabref/logic/help/HelpFile.java
@@ -23,23 +23,23 @@ public enum HelpFile {
     AUTOSAVE("general/autosave"),
     // The help page covers both OO and LO.
     OPENOFFICE_LIBREOFFICE("import-export/openofficeintegration"),
-    FETCHER_ACM("import-using-online-bibliographic-database/acmportal"),
-    FETCHER_ADS("import-using-online-bibliographic-database/ads"),
+    FETCHER_ACM("collect/import-using-online-bibliographic-database#acmportal"),
+    FETCHER_ADS("collect/import-using-online-bibliographic-database#ads"),
     FETCHER_BIBSONOMY_SCRAPER(""),
-    FETCHER_CITESEERX("import-using-online-bibliographic-database/citeseer"),
-    FETCHER_DBLP("import-using-online-bibliographic-database/dblp"),
+    FETCHER_CITESEERX("collect/import-using-online-bibliographic-database#citeseer"),
+    FETCHER_DBLP("collect/import-using-online-bibliographic-database#dblp"),
     FETCHER_DIVA("collect/add-entry-using-an-id"),
-    FETCHER_DOAJ("import-using-online-bibliographic-database/doaj"),
+    FETCHER_DOAJ("collect/import-using-online-bibliographic-database#doaj"),
     FETCHER_DOI("collect/add-entry-using-an-id"),
-    FETCHER_GOOGLE_SCHOLAR("import-using-online-bibliographic-database/googlescholar"),
-    FETCHER_GVK("import-using-online-bibliographic-database/gvk"),
-    FETCHER_IEEEXPLORE("import-using-online-bibliographic-database/ieeexplore"),
-    FETCHER_INSPIRE("import-using-online-bibliographic-database/inspire"),
+    FETCHER_GOOGLE_SCHOLAR("collect/import-using-online-bibliographic-database#googlescholar"),
+    FETCHER_GVK("collect/import-using-online-bibliographic-database#gvk"),
+    FETCHER_IEEEXPLORE("collect/import-using-online-bibliographic-database#ieeexplore"),
+    FETCHER_INSPIRE("collect/import-using-online-bibliographic-database#inspire"),
     FETCHER_ISBN("collect/add-entry-using-an-id"),
-    FETCHER_MEDLINE("import-using-online-bibliographic-database/medline"),
-    FETCHER_OAI2_ARXIV("import-using-online-bibliographic-database/arxiv"),
+    FETCHER_MEDLINE("collect/import-using-online-bibliographic-database#medline"),
+    FETCHER_OAI2_ARXIV("collect/import-using-online-bibliographic-database#arxiv"),
     FETCHER_RFC("collect/add-entry-using-an-id"),
-    FETCHER_SPRINGER("import-using-online-bibliographic-database/springer"),
+    FETCHER_SPRINGER("collect/import-using-online-bibliographic-database#springer"),
     FETCHER_TITLE("collect/add-entry-using-an-id"),
     FETCHER_SCIENCEDIRECT(""),
     DATABASE_PROPERTIES("setup/databaseproperties"),
diff --git a/src/main/java/org/jabref/migrations/PreferencesMigrations.java b/src/main/java/org/jabref/migrations/PreferencesMigrations.java
index 9799506bb7d..3d02cab3e72 100644
--- a/src/main/java/org/jabref/migrations/PreferencesMigrations.java
+++ b/src/main/java/org/jabref/migrations/PreferencesMigrations.java
@@ -304,13 +304,18 @@ private static void migrateTypedKeyPrefs(JabRefPreferences prefs, Preferences ol
 
     static void upgradePreviewStyleFromReviewToComment(JabRefPreferences prefs) {
         String currentPreviewStyle = prefs.getPreviewStyle();
-        String migratedStyle = currentPreviewStyle.replace("\\begin{review}<BR><BR><b>Review: </b> \\format[HTMLChars]{\\review} \\end{review}", "\\begin{comment}<BR><BR><b>Comment: </b> \\format[HTMLChars]{\\comment} \\end{comment}");
+        String migratedStyle = currentPreviewStyle.replace("\\begin{review}<BR><BR><b>Review: </b> \\format[HTMLChars]{\\review} \\end{review}", "\\begin{comment}<BR><BR><b>Comment: </b> \\format[HTMLChars]{\\comment} \\end{comment}")
+                                                  .replace("<b><i>\\bibtextype</i><a name=\"\\bibtexkey\">\\begin{bibtexkey} (\\bibtexkey)</a>", "<b><i>\\bibtextype</i><a name=\"\\citationkey\">\\begin{citationkey} (\\citationkey)</a>")
+                                                  .replace("\\end{bibtexkey}</b><br>__NEWLINE__", "\\end{citationkey}</b><br>__NEWLINE__");
         prefs.setPreviewStyle(migratedStyle);
     }
 
     static void upgradePreviewStyleAllowMarkdown(JabRefPreferences prefs) {
         String currentPreviewStyle = prefs.getPreviewStyle();
-        String migratedStyle = currentPreviewStyle.replace("\\format[HTMLChars]{\\comment}", "\\format[Markdown,HTMLChars]{\\comment}");
+        String migratedStyle = currentPreviewStyle.replace("\\format[HTMLChars]{\\comment}", "\\format[Markdown,HTMLChars]{\\comment}")
+                                                  .replace("<b><i>\\bibtextype</i><a name=\"\\bibtexkey\">\\begin{bibtexkey} (\\bibtexkey)</a>", "<b><i>\\bibtextype</i><a name=\"\\citationkey\">\\begin{citationkey} (\\citationkey)</a>")
+                                                  .replace("\\end{bibtexkey}</b><br>__NEWLINE__", "\\end{citationkey}</b><br>__NEWLINE__");
+
         prefs.setPreviewStyle(migratedStyle);
     }