From ef7d9b36b506d883fabe3abaf52012043b264e9d Mon Sep 17 00:00:00 2001
From: litneet64 <blabla@uwu.com>
Date: Fri, 28 Feb 2020 01:45:47 +0100
Subject: [PATCH] refactor/#4 Refactor for boolean var and remove unit test

---
 .../gui/preferences/PreviewTabViewModel.java  |  4 +-
 .../preferences/PreviewPreferences.java       |  6 +-
 .../gui/preferences/previewTabViewTest.java   | 59 -------------------
 3 files changed, 7 insertions(+), 62 deletions(-)
 delete mode 100644 src/test/java/org/jabref/gui/preferences/previewTabViewTest.java

diff --git a/src/main/java/org/jabref/gui/preferences/PreviewTabViewModel.java b/src/main/java/org/jabref/gui/preferences/PreviewTabViewModel.java
index 1b5d5b97de5..6f71af147e2 100644
--- a/src/main/java/org/jabref/gui/preferences/PreviewTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/PreviewTabViewModel.java
@@ -184,9 +184,9 @@ public void storeSettings() {
             chosenListProperty.add(previewPreferences.getTextBasedPreviewLayout());
         }
 
-        if (!previewPreferences.showPreviewAsExtraTab && showAsExtraTab.getValue() ) {
+        if (!previewPreferences.getShowPreviewAsExtraTab() && showAsExtraTab.getValue() ) {
             restartWarnings.add(Localization.lang("Preview separate tab enabled"));
-        } else if (previewPreferences.showPreviewAsExtraTab && !showAsExtraTab.getValue() ) {
+        } else if (previewPreferences.getShowPreviewAsExtraTab() && !showAsExtraTab.getValue() ) {
             restartWarnings.add(Localization.lang("Preview separate tab disabled"));
 
         }
diff --git a/src/main/java/org/jabref/preferences/PreviewPreferences.java b/src/main/java/org/jabref/preferences/PreviewPreferences.java
index 307fe208859..891cccd12f7 100644
--- a/src/main/java/org/jabref/preferences/PreviewPreferences.java
+++ b/src/main/java/org/jabref/preferences/PreviewPreferences.java
@@ -14,7 +14,7 @@ public class PreviewPreferences {
     private final Number previewPanelDividerPosition;
     private final String previewStyle;
     private final String previewStyleDefault;
-    public final boolean showPreviewAsExtraTab;
+    private final boolean showPreviewAsExtraTab;
 
     public PreviewPreferences(List<PreviewLayout> previewCycle, int previewCyclePosition, Number previewPanelDividerPosition, String previewStyle, String previewStyleDefault, boolean showPreviewAsExtraTab) {
         this.previewCycle = previewCycle;
@@ -25,6 +25,10 @@ public PreviewPreferences(List<PreviewLayout> previewCycle, int previewCyclePosi
         this.showPreviewAsExtraTab = showPreviewAsExtraTab;
     }
 
+    public boolean getShowPreviewAsExtraTab() {
+        return showPreviewAsExtraTab;
+    }
+
     public List<PreviewLayout> getPreviewCycle() {
         return previewCycle;
     }
diff --git a/src/test/java/org/jabref/gui/preferences/previewTabViewTest.java b/src/test/java/org/jabref/gui/preferences/previewTabViewTest.java
deleted file mode 100644
index 62bfe9c53f9..00000000000
--- a/src/test/java/org/jabref/gui/preferences/previewTabViewTest.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package org.jabref.gui.preferences;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.jabref.gui.DialogService;
-import org.jabref.gui.util.TaskExecutor;
-import org.jabref.logic.l10n.Language;
-import org.jabref.logic.l10n.Localization;
-
-import org.jabref.preferences.JabRefPreferences;
-import org.jabref.preferences.PreviewPreferences;
-import org.junit.jupiter.api.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class previewTabViewTest {
-
-    @Test
-    public void extraTabRestartWarningTest() {
-        Logger LOGGER = LoggerFactory.getLogger(previewTabViewTest.class);
-        String warning1 = Localization.lang("Preview separate tab enabled");
-
-        PreviewPreferences prev = mock(PreviewPreferences.class);
-        JabRefPreferences prefs = mock(JabRefPreferences.class);
-        DialogService ds = mock(DialogService.class);
-        TaskExecutor te = mock(TaskExecutor.class);
-        prefs.setLanguage(Language.ENGLISH);
-
-        //Testing restart warning when the extra tab is enabled
-        when(prev.showPreviewAsExtraTab()).thenReturn(false);
-        prefs.storePreviewPreferences(prev);
-
-        PreviewTabViewModel model = new PreviewTabViewModel(ds, prefs, te);
-        model.setExtraTabProperty(true);
-        model.storeSettings();
-        LOGGER.error("6");
-        //assertEquals(warning1, model.getRestartWarnings());
-
-        //Testing restart warning when the extra tab is disabled
-        String warning2 = Localization.lang("Preview separate tab disabled");
-        when(prev.showPreviewAsExtraTab()).thenReturn(true);
-        prefs.storePreviewPreferences(prev);
-
-        PreviewTabViewModel model_2 = new PreviewTabViewModel(ds, prefs, te);
-        model_2.setExtraTabProperty(false);
-        model_2.storeSettings();
-        //assertEquals(warning2, model_2.getRestartWarnings());
-        assertEquals(1,1);
-    }
-
-}