From e320d9b7e124d596b6972e6dbfac6f12cb79b597 Mon Sep 17 00:00:00 2001
From: Siedlerchr <siedlerkiller@gmail.com>
Date: Sat, 5 Sep 2020 15:29:20 +0200
Subject: [PATCH] Refactor FXML and other gui elements to current architecture
 Make login to overleaf working Fix test imports

---
 src/main/java/org/jabref/gui/JabRefFrame.java |  2 +-
 .../SynchronizeWithShareLatexAction.java      | 11 +--
 .../gui/sharelatex/ShareLatexLoginDialog.fxml | 17 ++--
 .../sharelatex/ShareLatexLoginDialogView.java | 28 +++---
 .../ShareLatexLoginDialogViewModel.java       |  7 --
 .../sharelatex/ShareLatexProjectDialog.fxml   | 15 ++--
 .../ShareLatexProjectDialogView.java          | 15 ++++
 .../ShareLatexProjectDialogViewModel.java     |  3 +-
 .../logic/sharelatex/ShareLatexParser.java    |  1 -
 .../logic/sharelatex/SharelatexConnector.java | 12 +--
 .../sharelatex/WebSocketClientWrapper.java    |  8 +-
 .../ShareLatexContinueMessageEvent.java       |  2 +-
 .../java/org/jabref/model/sharelatex/Arg.java |  2 +-
 .../sharelatex/ShareLatexJsonMessageTest.java |  2 +-
 .../sharelatex/ShareLatexManagerTest.java     |  7 +-
 .../sharelatex/ShareLatexParserTest.java      | 88 +++++++++----------
 .../sharelatex/SharelatexConnectorTest.java   | 12 +--
 17 files changed, 109 insertions(+), 123 deletions(-)
 rename src/main/{resources => java}/org/jabref/gui/sharelatex/ShareLatexLoginDialog.fxml (77%)
 delete mode 100644 src/main/java/org/jabref/gui/sharelatex/ShareLatexLoginDialogViewModel.java
 rename src/main/{resources => java}/org/jabref/gui/sharelatex/ShareLatexProjectDialog.fxml (65%)

diff --git a/src/main/java/org/jabref/gui/JabRefFrame.java b/src/main/java/org/jabref/gui/JabRefFrame.java
index 7ae3f402b78..d2fc140e5e2 100644
--- a/src/main/java/org/jabref/gui/JabRefFrame.java
+++ b/src/main/java/org/jabref/gui/JabRefFrame.java
@@ -751,7 +751,7 @@ private MenuBar createMenu() {
                 factory.createSubMenu(StandardActions.REMOTE_DB,
                         factory.createMenuItem(StandardActions.CONNECT_TO_SHARED_DB, new ConnectToSharedDatabaseCommand(this)),
                         factory.createMenuItem(StandardActions.PULL_CHANGES_FROM_SHARED_DB, new PullChangesFromSharedAction(stateManager)),
-                        factory.createMenuItem(StandardActions.SYNCHRONIZE_WITH_SHARELATEX, new SynchronizeWithShareLatexAction(dialogService))
+                        factory.createMenuItem(StandardActions.SYNCHRONIZE_WITH_SHARELATEX, new SynchronizeWithShareLatexAction())
                 ),
 
                 new SeparatorMenuItem(),
diff --git a/src/main/java/org/jabref/gui/actions/SynchronizeWithShareLatexAction.java b/src/main/java/org/jabref/gui/actions/SynchronizeWithShareLatexAction.java
index b893f8e46b9..1f780892279 100644
--- a/src/main/java/org/jabref/gui/actions/SynchronizeWithShareLatexAction.java
+++ b/src/main/java/org/jabref/gui/actions/SynchronizeWithShareLatexAction.java
@@ -1,20 +1,11 @@
 package org.jabref.gui.actions;
 
-import org.jabref.gui.DialogService;
 import org.jabref.gui.sharelatex.ShareLatexLoginDialogView;
 
 public class SynchronizeWithShareLatexAction extends SimpleCommand {
 
-    private DialogService dialogService;
-
-    public SynchronizeWithShareLatexAction(DialogService dialogService) {
-        super();
-        this.dialogService = dialogService;
-    }
-
     @Override
     public void execute() {
-        dialogService.showCustomDialogAndWait(
-                new ShareLatexLoginDialogView());
+        new ShareLatexLoginDialogView().showAndWait();
     }
 }
diff --git a/src/main/resources/org/jabref/gui/sharelatex/ShareLatexLoginDialog.fxml b/src/main/java/org/jabref/gui/sharelatex/ShareLatexLoginDialog.fxml
similarity index 77%
rename from src/main/resources/org/jabref/gui/sharelatex/ShareLatexLoginDialog.fxml
rename to src/main/java/org/jabref/gui/sharelatex/ShareLatexLoginDialog.fxml
index 5da7131ce7a..467aebc57a9 100644
--- a/src/main/resources/org/jabref/gui/sharelatex/ShareLatexLoginDialog.fxml
+++ b/src/main/java/org/jabref/gui/sharelatex/ShareLatexLoginDialog.fxml
@@ -2,6 +2,7 @@
 
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.ButtonBar?>
+<?import javafx.scene.control.ButtonType?>
 <?import javafx.scene.control.DialogPane?>
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.control.PasswordField?>
@@ -27,22 +28,18 @@
               </rowConstraints>
                <children>
                   <Label text="Server Address" />
-                  <TextField id="tbAddress" fx:id="tbAddress" prefHeight="25.0" prefWidth="174.0" text="https://www.sharelatex.com" GridPane.columnIndex="1" />
+                  <TextField id="tbAddress" fx:id="tbAddress" prefHeight="25.0" prefWidth="174.0" text="https://www.overleaf.com" GridPane.columnIndex="1" />
                   <TextField id="tbUsername" fx:id="tbUsername" GridPane.columnIndex="1" GridPane.rowIndex="1" />
                   <Label alignment="CENTER_RIGHT" text="%Username" GridPane.rowIndex="1" />
                   <Label text="%Password" GridPane.rowIndex="2" />
                   <PasswordField id="tbPassword" fx:id="tbPassword" GridPane.columnIndex="1" GridPane.rowIndex="2" />
                </children>
             </GridPane>
-         </center>
-         <bottom>
-            <ButtonBar prefHeight="40.0" prefWidth="200.0" BorderPane.alignment="CENTER">
-              <buttons>
-                <Button id="btnLogin" fx:id="btnLogin" mnemonicParsing="false" onAction="#signIn" text="Login" ButtonBar.buttonData="OK_DONE" />
-               	<Button id="btnCancel" cancelButton="true" mnemonicParsing="false" onAction="#closeDialog" text="%Cancel" ButtonBar.buttonData="CANCEL_CLOSE" />
-              </buttons>
-            </ButtonBar>
-         </bottom>
+         </center>        
       </BorderPane>
    </content>
+   <buttonTypes>
+        <ButtonType fx:constant="CLOSE"/>
+        <ButtonType fx:id="connectButton" buttonData="OK_DONE" text="%Connect"/>
+    </buttonTypes>
 </DialogPane>
diff --git a/src/main/java/org/jabref/gui/sharelatex/ShareLatexLoginDialogView.java b/src/main/java/org/jabref/gui/sharelatex/ShareLatexLoginDialogView.java
index a06cd611449..5ac1336f054 100644
--- a/src/main/java/org/jabref/gui/sharelatex/ShareLatexLoginDialogView.java
+++ b/src/main/java/org/jabref/gui/sharelatex/ShareLatexLoginDialogView.java
@@ -5,6 +5,7 @@
 import javafx.fxml.FXML;
 import javafx.scene.control.Alert.AlertType;
 import javafx.scene.control.Button;
+import javafx.scene.control.ButtonType;
 import javafx.scene.control.PasswordField;
 import javafx.scene.control.TextField;
 
@@ -12,33 +13,38 @@
 import org.jabref.gui.FXDialog;
 import org.jabref.gui.Globals;
 import org.jabref.gui.util.BaseDialog;
+import org.jabref.gui.util.ControlHelper;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.sharelatex.ShareLatexManager;
 import org.jabref.logic.sharelatex.SharelatexConnectionProperties;
 
+import com.airhacks.afterburner.views.ViewLoader;
+
 public class ShareLatexLoginDialogView extends BaseDialog<Void> {
 
     @FXML private TextField tbAddress;
     @FXML private TextField tbUsername;
     @FXML private PasswordField tbPassword;
-    @FXML private Button btnLogin;
+    @FXML private ButtonType connectButton;
+
+    private final Button btnLogin;
     @Inject private ShareLatexManager manager;
     @Inject private DialogService dialogService;
 
     private SharelatexConnectionProperties props;
-    private ShareLatexLoginDialogViewModel viewModel;
 
     public ShareLatexLoginDialogView() {
+        ViewLoader.view(this)
+                  .load()
+                  .setAsDialogPane(this);
 
-    }
+        ControlHelper.setAction(connectButton, this.getDialogPane(), event -> signIn());
+        btnLogin = (Button) this.getDialogPane().lookupButton(connectButton);
 
-    @FXML
-    private void initialize() {
-        viewModel = new ShareLatexLoginDialogViewModel();
     }
 
     @FXML
-    private void closeDialog() {
+    private void initialize() {
     }
 
     @FXML
@@ -63,7 +69,7 @@ private void signIn() {
 
                 ShareLatexProjectDialogView dlgprojects = new ShareLatexProjectDialogView();
                 dlgprojects.show();
-                closeDialog();
+                this.close();
 
             }
         } catch (Exception e) {
@@ -71,11 +77,5 @@ private void signIn() {
         }
 
     }
-    /*
-        FXDialog sharelatexProjectDialog = new FXDialog(AlertType.INFORMATION, "Sharelatex Project Dialog");
-        sharelatexProjectDialog.setDialogPane((DialogPane) this.getView());
-        sharelatexProjectDialog.setResizable(true);
-        sharelatexProjectDialog.show();
-        */
 
 }
diff --git a/src/main/java/org/jabref/gui/sharelatex/ShareLatexLoginDialogViewModel.java b/src/main/java/org/jabref/gui/sharelatex/ShareLatexLoginDialogViewModel.java
deleted file mode 100644
index a1eba10e4b4..00000000000
--- a/src/main/java/org/jabref/gui/sharelatex/ShareLatexLoginDialogViewModel.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package org.jabref.gui.sharelatex;
-
-import org.jabref.gui.AbstractViewModel;
-
-public class ShareLatexLoginDialogViewModel extends AbstractViewModel {
-    //default construtor used
-}
diff --git a/src/main/resources/org/jabref/gui/sharelatex/ShareLatexProjectDialog.fxml b/src/main/java/org/jabref/gui/sharelatex/ShareLatexProjectDialog.fxml
similarity index 65%
rename from src/main/resources/org/jabref/gui/sharelatex/ShareLatexProjectDialog.fxml
rename to src/main/java/org/jabref/gui/sharelatex/ShareLatexProjectDialog.fxml
index 3789a95c5b6..efb1baaca9f 100644
--- a/src/main/resources/org/jabref/gui/sharelatex/ShareLatexProjectDialog.fxml
+++ b/src/main/java/org/jabref/gui/sharelatex/ShareLatexProjectDialog.fxml
@@ -1,23 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <?import javafx.scene.control.Button?>
+<?import javafx.scene.control.ButtonType?>
 <?import javafx.scene.control.ButtonBar?>
 <?import javafx.scene.control.DialogPane?>
 <?import javafx.scene.control.TableColumn?>
 <?import javafx.scene.control.TableView?>
 <?import javafx.scene.layout.BorderPane?>
 
-<DialogPane prefHeight="494.0" prefWidth="397.0" xmlns="http://javafx.com/javafx/8.0.141" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.jabref.gui.sharelatex.ShareLatexProjectDialogController">
+<DialogPane prefHeight="494.0" prefWidth="397.0" xmlns="http://javafx.com/javafx/8.0.141" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.jabref.gui.sharelatex.ShareLatexProjectDialogView">
    <content>
       <BorderPane>
-         <bottom>
-            <ButtonBar minWidth="-Infinity" BorderPane.alignment="CENTER">
-              <buttons>
-                <Button fx:id="btnSync" defaultButton="true" mnemonicParsing="false" onAction="#synchronizeLibrary" text="Synchronize Library" />
-                  <Button fx:id="btnCancel" cancelButton="true" mnemonicParsing="false" onAction="#cancelAndClose" text="Cancel" ButtonBar.buttonData="CANCEL_CLOSE" />
-              </buttons>
-            </ButtonBar>
-         </bottom>
          <top>
             <TableView fx:id="tblProjects" BorderPane.alignment="CENTER">
               <columns>
@@ -31,4 +24,8 @@
          </top>
       </BorderPane>
    </content>
+   <buttonTypes>
+        <ButtonType fx:constant="CLOSE"/>
+        <ButtonType fx:id="syncButton" buttonData="OK_DONE" text="%Synchronize Library"/>
+    </buttonTypes>
 </DialogPane>
diff --git a/src/main/java/org/jabref/gui/sharelatex/ShareLatexProjectDialogView.java b/src/main/java/org/jabref/gui/sharelatex/ShareLatexProjectDialogView.java
index 579ac39e5e5..6fbfeae0058 100644
--- a/src/main/java/org/jabref/gui/sharelatex/ShareLatexProjectDialogView.java
+++ b/src/main/java/org/jabref/gui/sharelatex/ShareLatexProjectDialogView.java
@@ -6,17 +6,20 @@
 import javax.inject.Inject;
 
 import javafx.fxml.FXML;
+import javafx.scene.control.ButtonType;
 import javafx.scene.control.TableColumn;
 import javafx.scene.control.TableView;
 import javafx.scene.control.cell.CheckBoxTableCell;
 
 import org.jabref.gui.StateManager;
 import org.jabref.gui.util.BaseDialog;
+import org.jabref.gui.util.ControlHelper;
 import org.jabref.gui.util.DefaultFileUpdateMonitor;
 import org.jabref.logic.sharelatex.ShareLatexManager;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.preferences.PreferencesService;
 
+import com.airhacks.afterburner.views.ViewLoader;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -30,6 +33,9 @@ public class ShareLatexProjectDialogView extends BaseDialog<Void> {
     @FXML private TableColumn<ShareLatexProjectViewModel, String> colLastName;
     @FXML private TableColumn<ShareLatexProjectViewModel, String> colLastModified;
     @FXML private TableView<ShareLatexProjectViewModel> tblProjects;
+
+    @FXML private ButtonType syncButton;
+
     @Inject private ShareLatexManager manager;
     @Inject private StateManager stateManager;
     @Inject private PreferencesService preferences;
@@ -38,6 +44,15 @@ public class ShareLatexProjectDialogView extends BaseDialog<Void> {
 
     @Inject private DefaultFileUpdateMonitor fileMonitor;
 
+    public ShareLatexProjectDialogView() {
+
+        ViewLoader.view(this)
+                  .load()
+                  .setAsDialogPane(this);
+
+        ControlHelper.setAction(syncButton, this.getDialogPane(), event -> synchronizeLibrary());
+    }
+
     @FXML
     private void initialize() {
         viewModel = new ShareLatexProjectDialogViewModel(stateManager, manager, preferences.getImportFormatPreferences(), fileMonitor);
diff --git a/src/main/java/org/jabref/gui/sharelatex/ShareLatexProjectDialogViewModel.java b/src/main/java/org/jabref/gui/sharelatex/ShareLatexProjectDialogViewModel.java
index 90030deeba4..633c8df4291 100644
--- a/src/main/java/org/jabref/gui/sharelatex/ShareLatexProjectDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/sharelatex/ShareLatexProjectDialogViewModel.java
@@ -12,7 +12,6 @@
 import javafx.beans.property.SimpleListProperty;
 import javafx.collections.FXCollections;
 
-import org.jabref.gui.AbstractViewModel;
 import org.jabref.gui.StateManager;
 import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.logic.importer.ParserResult;
@@ -28,7 +27,7 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-public class ShareLatexProjectDialogViewModel extends AbstractViewModel {
+public class ShareLatexProjectDialogViewModel{
 
     private static final Log LOGGER = LogFactory.getLog(ShareLatexProjectDialogViewModel.class);
 
diff --git a/src/main/java/org/jabref/logic/sharelatex/ShareLatexParser.java b/src/main/java/org/jabref/logic/sharelatex/ShareLatexParser.java
index c8708ba3977..492acfba1bc 100644
--- a/src/main/java/org/jabref/logic/sharelatex/ShareLatexParser.java
+++ b/src/main/java/org/jabref/logic/sharelatex/ShareLatexParser.java
@@ -2,7 +2,6 @@
 
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
diff --git a/src/main/java/org/jabref/logic/sharelatex/SharelatexConnector.java b/src/main/java/org/jabref/logic/sharelatex/SharelatexConnector.java
index 540e029c635..772311db9d0 100644
--- a/src/main/java/org/jabref/logic/sharelatex/SharelatexConnector.java
+++ b/src/main/java/org/jabref/logic/sharelatex/SharelatexConnector.java
@@ -40,14 +40,14 @@ public class SharelatexConnector {
     private final WebSocketClientWrapper client = new WebSocketClientWrapper();
 
     private static final class AccessData {
-        public final String CsrfToken;
-        public final String User;
-        public final String Password;
+        public final String _csrf;
+        public final String email;
+        public final String password;
 
         private AccessData(String csrfToken, String user, String password) {
-            CsrfToken = csrfToken;
-            User = user;
-            Password = password;
+            _csrf = csrfToken;
+            email = user;
+            this.password = password;
         }
     }
 
diff --git a/src/main/java/org/jabref/logic/sharelatex/WebSocketClientWrapper.java b/src/main/java/org/jabref/logic/sharelatex/WebSocketClientWrapper.java
index 35289ed4bed..240e7fc1f71 100644
--- a/src/main/java/org/jabref/logic/sharelatex/WebSocketClientWrapper.java
+++ b/src/main/java/org/jabref/logic/sharelatex/WebSocketClientWrapper.java
@@ -135,10 +135,10 @@ public void onClose(Session session, CloseReason closeReason) {
                 }
             }, cec, webSocketchannelUri);
 
-            //TODO: Change Dialog
-            //TODO: On database change event or on save event send new version
-            //TODO: When new db content arrived run merge dialog
-            //TODO: Identfiy active database/Name of database/doc Id (partly done)
+            // TODO: Change Dialog
+            // TODO: On database change event or on save event send new version
+            // TODO: When new db content arrived run merge dialog
+            // TODO: Identfiy active database/Name of database/doc Id (partly done)
 
         } catch (Exception e) {
             e.printStackTrace();
diff --git a/src/main/java/org/jabref/logic/sharelatex/events/ShareLatexContinueMessageEvent.java b/src/main/java/org/jabref/logic/sharelatex/events/ShareLatexContinueMessageEvent.java
index 3f0df281ab7..239ae1961a1 100644
--- a/src/main/java/org/jabref/logic/sharelatex/events/ShareLatexContinueMessageEvent.java
+++ b/src/main/java/org/jabref/logic/sharelatex/events/ShareLatexContinueMessageEvent.java
@@ -1,5 +1,5 @@
 package org.jabref.logic.sharelatex.events;
 
 public class ShareLatexContinueMessageEvent {
-    //empty
+    // empty
 }
diff --git a/src/main/java/org/jabref/model/sharelatex/Arg.java b/src/main/java/org/jabref/model/sharelatex/Arg.java
index e60ce13163b..a70e99995aa 100644
--- a/src/main/java/org/jabref/model/sharelatex/Arg.java
+++ b/src/main/java/org/jabref/model/sharelatex/Arg.java
@@ -36,4 +36,4 @@ public void setVersion(int v) {
         this.version = v;
     }
 
-}
\ No newline at end of file
+}
diff --git a/src/test/java/org/jabref/logic/sharelatex/ShareLatexJsonMessageTest.java b/src/test/java/org/jabref/logic/sharelatex/ShareLatexJsonMessageTest.java
index 7ad1006cfae..bf7bbd27bf8 100644
--- a/src/test/java/org/jabref/logic/sharelatex/ShareLatexJsonMessageTest.java
+++ b/src/test/java/org/jabref/logic/sharelatex/ShareLatexJsonMessageTest.java
@@ -3,7 +3,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/src/test/java/org/jabref/logic/sharelatex/ShareLatexManagerTest.java b/src/test/java/org/jabref/logic/sharelatex/ShareLatexManagerTest.java
index 58a2f9b9988..df5b0cce2b3 100644
--- a/src/test/java/org/jabref/logic/sharelatex/ShareLatexManagerTest.java
+++ b/src/test/java/org/jabref/logic/sharelatex/ShareLatexManagerTest.java
@@ -1,7 +1,8 @@
 package org.jabref.logic.sharelatex;
 
 import java.net.URISyntaxException;
-import org.junit.Test;
+
+import org.junit.jupiter.api.Test;
 
 public class ShareLatexManagerTest {
 
@@ -12,9 +13,9 @@ public void test() throws URISyntaxException {
         try {
             ShareLatexManager manager = new ShareLatexManager();
             manager.login("http://192.168.1.248", "joe@example.com", "test");
-        
+
             //  manager.login("https://www.sharelatex.com", "email ", "password" );
-        
+
             projects = manager.getProjects();
             assertFalse(projects.isEmpty());
         } catch (IOException e) {
diff --git a/src/test/java/org/jabref/logic/sharelatex/ShareLatexParserTest.java b/src/test/java/org/jabref/logic/sharelatex/ShareLatexParserTest.java
index 1574b16619f..7a6f43c323c 100644
--- a/src/test/java/org/jabref/logic/sharelatex/ShareLatexParserTest.java
+++ b/src/test/java/org/jabref/logic/sharelatex/ShareLatexParserTest.java
@@ -49,14 +49,14 @@ public void parseBibTexString() {
 
         String message = "6:::78988+[null,[\"@book{adams1995hitchhiker,       \",\"   title={The Hitchhiker's Guide to the Galaxy},\",\"  author={Adams, D.},\",\"  isbn={9781417642595},\",\"  url={http://books.google.com/books?id=W-xMPgAACAAJ},\",\"  year={199},\",\"  publisher={San Val}\",\"}\",\"\"],74,[],{}]";
         String expected = "@book{adams1995hitchhiker,       \n" +
-                "   title={The Hitchhiker's Guide to the Galaxy},\n" +
-                "  author={Adams, D.},\n" +
-                "  isbn={9781417642595},\n" +
-                "  url={http://books.google.com/books?id=W-xMPgAACAAJ},\n" +
-                "  year={199},\n" +
-                "  publisher={San Val}\n" +
-                "}\n" +
-                "";
+                          "   title={The Hitchhiker's Guide to the Galaxy},\n" +
+                          "  author={Adams, D.},\n" +
+                          "  isbn={9781417642595},\n" +
+                          "  url={http://books.google.com/books?id=W-xMPgAACAAJ},\n" +
+                          "  year={199},\n" +
+                          "  publisher={San Val}\n" +
+                          "}\n" +
+                          "";
 
         String parsed = parser.getBibTexStringFromJsonMessage(message);
         assertEquals(expected, parsed);
@@ -183,44 +183,44 @@ public void testShiftLaterDeleteByFirstDeletes() {
     @Test
     public void testBibTexString() {
         String bibTexBefore = "\n" +
-                "@Testcase{Sam2007,\n" +
-                "  year      = {2007},\n" +
-                "  author    = {Sam And jason},\n" +
-                "  file      = {:Huang2001 - Information Extraction from Voicemail.csv:csv},\n" +
-                "  issue     = {3},\n" +
-                "  journal   = {Wirtschaftsinformatik},\n" +
-                "  keywords  = {software development processes; agile software development environments; time-to-market; Extreme Programming; Crystal methods family; Adaptive Software Development},\n" +
-                "  language  = {english},\n" +
-                "  mrnumber  = {0937-6429},\n" +
-                "  owner     = {Christoph Schwentker},\n" +
-                "  pages     = {237--248},\n" +
-                "  publisher = {Gabler Verlag},\n" +
-                "  timestamp = {2016.08.20},\n" +
-                "  title     = {Agile Entwicklung Web-basierter Systeme},\n" +
-                "  url       = {http://dx.doi.org/10.1007/BF03250842},\n" +
-                "  volume    = {44},\n" +
-                "}\n" +
-                "";
+                              "@Testcase{Sam2007,\n" +
+                              "  year      = {2007},\n" +
+                              "  author    = {Sam And jason},\n" +
+                              "  file      = {:Huang2001 - Information Extraction from Voicemail.csv:csv},\n" +
+                              "  issue     = {3},\n" +
+                              "  journal   = {Wirtschaftsinformatik},\n" +
+                              "  keywords  = {software development processes; agile software development environments; time-to-market; Extreme Programming; Crystal methods family; Adaptive Software Development},\n" +
+                              "  language  = {english},\n" +
+                              "  mrnumber  = {0937-6429},\n" +
+                              "  owner     = {Christoph Schwentker},\n" +
+                              "  pages     = {237--248},\n" +
+                              "  publisher = {Gabler Verlag},\n" +
+                              "  timestamp = {2016.08.20},\n" +
+                              "  title     = {Agile Entwicklung Web-basierter Systeme},\n" +
+                              "  url       = {http://dx.doi.org/10.1007/BF03250842},\n" +
+                              "  volume    = {44},\n" +
+                              "}\n" +
+                              "";
 
         String bibtexAfter = "\n" +
-                "@Testcase{Sam2007,\n" +
-                "  year      = {2007},\n" +
-                "  author    = {Sam And jason},\n" +
-                "  file      = {:Huang2001 - Information Extraction from Voicemail.csv:csv},\n" +
-                "  issue     = {3},\n" +
-                "  journal   = {Test},\n" +
-                "  keywords  = {software development processes; agile software development environments; time-to-market; Extreme Programming; Crystal methods family; Adaptive Software Development},\n" +
-                "  language  = {english},\n" +
-                "  mrnumber  = {0937-6429},\n" +
-                "  owner     = {Christoph Schwentker},\n" +
-                "  pages     = {237--248},\n" +
-                "  publisher = {Gabler Verlag},\n" +
-                "  timestamp = {2016.08.20},\n" +
-                "  title     = {Agile Entwicklung Web-basierter Systeme},\n" +
-                "  url       = {http://dx.doi.org/10.1007/BF03250842},\n" +
-                "  volume    = {44},\n" +
-                "}\n" +
-                "";
+                             "@Testcase{Sam2007,\n" +
+                             "  year      = {2007},\n" +
+                             "  author    = {Sam And jason},\n" +
+                             "  file      = {:Huang2001 - Information Extraction from Voicemail.csv:csv},\n" +
+                             "  issue     = {3},\n" +
+                             "  journal   = {Test},\n" +
+                             "  keywords  = {software development processes; agile software development environments; time-to-market; Extreme Programming; Crystal methods family; Adaptive Software Development},\n" +
+                             "  language  = {english},\n" +
+                             "  mrnumber  = {0937-6429},\n" +
+                             "  owner     = {Christoph Schwentker},\n" +
+                             "  pages     = {237--248},\n" +
+                             "  publisher = {Gabler Verlag},\n" +
+                             "  timestamp = {2016.08.20},\n" +
+                             "  title     = {Agile Entwicklung Web-basierter Systeme},\n" +
+                             "  url       = {http://dx.doi.org/10.1007/BF03250842},\n" +
+                             "  volume    = {44},\n" +
+                             "}\n" +
+                             "";
 
         List<SharelatexDoc> expected = new ArrayList<>();
         SharelatexDoc testDoc = new SharelatexDoc();
diff --git a/src/test/java/org/jabref/logic/sharelatex/SharelatexConnectorTest.java b/src/test/java/org/jabref/logic/sharelatex/SharelatexConnectorTest.java
index a913cbf3f33..4c06a25dacc 100644
--- a/src/test/java/org/jabref/logic/sharelatex/SharelatexConnectorTest.java
+++ b/src/test/java/org/jabref/logic/sharelatex/SharelatexConnectorTest.java
@@ -3,7 +3,7 @@
 import java.io.IOException;
 import java.net.URISyntaxException;
 
-import org.jabref.JabRefExecutorService;
+import org.jabref.gui.JabRefExecutorService;
 import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.util.DummyFileUpdateMonitor;
@@ -16,16 +16,13 @@ public class SharelatexConnectorTest {
 
     @Test
     public void testLogin() throws IOException {
-        //Czrently
+
         SharelatexConnector connector = new SharelatexConnector();
         connector.connectToServer("http://overleaf.com", "developers@jabref.org", "jabref");
-
         // connector.uploadFile("591188ed98ba55690073c29e",Paths.get("X:\\Users\\CS\\Documents\\_JABREFTEMP\\aaaaaaaaaaaaaa.bib"));
         //   connector.uploadFileWithWebClient("591188ed98ba55690073c29e",
         //         Paths.get("X:\\Users\\CS\\Documents\\_JABREFTEMP\\aaaaaaaaaaaaaa.bib"));
-
         JabRefExecutorService.INSTANCE.executeAndWait(() -> {
-
             try {
                 connector.startWebsocketListener("5936d96b1bd5906b0082f53c", new BibDatabaseContext(),
                                                  mock(ImportFormatPreferences.class), new DummyFileUpdateMonitor());
@@ -33,9 +30,6 @@ public void testLogin() throws IOException {
                 // TODO Auto-generated catch block
                 e.printStackTrace();
             }
-
         });
     }
-
-
-}
\ No newline at end of file
+}