From 41e011f0b4877f03e5c53c5bd6714f126bdd6c70 Mon Sep 17 00:00:00 2001 From: Benja Gooder Date: Thu, 7 Feb 2019 19:08:44 -0500 Subject: [PATCH 1/3] Made a new test class asdfa --- .../java/org/jabref/JUnitGitOffMyLawn.java | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 src/test/java/org/jabref/JUnitGitOffMyLawn.java diff --git a/src/test/java/org/jabref/JUnitGitOffMyLawn.java b/src/test/java/org/jabref/JUnitGitOffMyLawn.java new file mode 100644 index 00000000000..cc1b620d610 --- /dev/null +++ b/src/test/java/org/jabref/JUnitGitOffMyLawn.java @@ -0,0 +1,20 @@ +package org.jabref; + +import org.junit.Test; + +import static org.junit.Assert.*; + +/**public class JUnitGitOffMyLawn { + + // I DON'T WORK + @Test + public void givenJabref_whenBugs_thenFixes() { + MyClass sut = new MyClass(); // MyClass is tested + + // assert statements + assertEquals(0, sut.add(10, 0)); + assertEquals(0, sut.add(0, 10)); + assertEquals(0, sut.add(0, 0)); + } + +}**/ From 3c1e1f65c438b37da3568637ece13622508be946 Mon Sep 17 00:00:00 2001 From: John Besse Date: Sun, 10 Feb 2019 10:39:16 -0500 Subject: [PATCH 2/3] move to GOML week5 branch --- .../gui/importer/ImportInspectionDialog.java | 1 + .../gui/DuplicateResolverDialogTest.java | 47 +++++++++++++++++++ 2 files changed, 48 insertions(+) create mode 100644 src/test/java/org/jabref/gui/DuplicateResolverDialogTest.java diff --git a/src/main/java/org/jabref/gui/importer/ImportInspectionDialog.java b/src/main/java/org/jabref/gui/importer/ImportInspectionDialog.java index 2ce86d731c4..b2e45d10c4e 100644 --- a/src/main/java/org/jabref/gui/importer/ImportInspectionDialog.java +++ b/src/main/java/org/jabref/gui/importer/ImportInspectionDialog.java @@ -1051,6 +1051,7 @@ public void mousePressed(MouseEvent e) { if (other.isPresent()) { // This will be true if the duplicate is in the existing // database. + //TODO: this could be where duplicate resolving bug starts DuplicateResolverDialog diag = new DuplicateResolverDialog(getFrame(), other.get(), first, DuplicateResolverDialog.DuplicateResolverType.INSPECTION); diff --git a/src/test/java/org/jabref/gui/DuplicateResolverDialogTest.java b/src/test/java/org/jabref/gui/DuplicateResolverDialogTest.java new file mode 100644 index 00000000000..6e8fb87b69d --- /dev/null +++ b/src/test/java/org/jabref/gui/DuplicateResolverDialogTest.java @@ -0,0 +1,47 @@ +package org.jabref.gui; + +import javafx.stage.Stage; +import javafx.stage.StageStyle; +import org.jabref.model.entry.BibEntry; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.*; + +class DuplicateResolverDialogTest { + + @Test + void givenNewDuplicateResolverDialogAndEmptyParameters_whenNothing_thenNoError() { + Stage stage = new Stage(); + JabRefFrame frame = new JabRefFrame(stage); + BibEntry one = new BibEntry(); + BibEntry two = new BibEntry(); + DuplicateResolverDialog.DuplicateResolverType type = DuplicateResolverDialog.DuplicateResolverType.IMPORT_CHECK; + + DuplicateResolverDialog sut = new DuplicateResolverDialog(frame, one, two, type); + } + + @Test + void givenNewStage_whenNothing_thenNoError() { + Stage sut = new Stage(); + + } + + @Test + void givenNewJabRefFrame_whenNothing_thenNoError() { + Stage stage = new Stage(); + JabRefFrame sut = new JabRefFrame(stage); + + } + + @Test + void givenNewBibEntry_whenNothing_thenNoError() { + BibEntry sut = new BibEntry(); + + } + + @Test + void givenNewDuplicateResolverType_whenNothing_thenNoError() { + DuplicateResolverDialog.DuplicateResolverType sut = DuplicateResolverDialog.DuplicateResolverType.IMPORT_CHECK; + assertEquals(DuplicateResolverDialog.DuplicateResolverType.IMPORT_CHECK,sut); + } +} From 1636f78added8d653c7ab95f3399438fc349a89f Mon Sep 17 00:00:00 2001 From: John Besse Date: Sun, 10 Feb 2019 16:01:01 -0500 Subject: [PATCH 3/3] Tested as much as possible without JavaFX unit tests; need functional TestFX for more testing --- .../gui/DuplicateResolverDialogTest.java | 45 ++++++++++++++++--- 1 file changed, 38 insertions(+), 7 deletions(-) diff --git a/src/test/java/org/jabref/gui/DuplicateResolverDialogTest.java b/src/test/java/org/jabref/gui/DuplicateResolverDialogTest.java index 6e8fb87b69d..71269acdfb0 100644 --- a/src/test/java/org/jabref/gui/DuplicateResolverDialogTest.java +++ b/src/test/java/org/jabref/gui/DuplicateResolverDialogTest.java @@ -2,15 +2,17 @@ import javafx.stage.Stage; import javafx.stage.StageStyle; +import org.jabref.gui.mergeentries.MergeEntries; +import org.jabref.model.database.BibDatabaseMode; import org.jabref.model.entry.BibEntry; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.*; - +//trying to find how this is linked to BibTexKey Duplicate Check throws NPE Bug#4614 class DuplicateResolverDialogTest { @Test - void givenNewDuplicateResolverDialogAndEmptyParameters_whenNothing_thenNoError() { + void givenNewDuplicateResolverDialogAndEmptyParameters_whenInitializing_thenNoError() { Stage stage = new Stage(); JabRefFrame frame = new JabRefFrame(stage); BibEntry one = new BibEntry(); @@ -21,27 +23,56 @@ void givenNewDuplicateResolverDialogAndEmptyParameters_whenNothing_thenNoError() } @Test - void givenNewStage_whenNothing_thenNoError() { - Stage sut = new Stage(); + void givenUninitializedStage_whenInitializing_thenNoError() { + Stage sut; + + } + + @Test + void givenInitializedStage_whenInitializing_thenNoError() { + Stage sut = new Stage(StageStyle.DECORATED); } @Test - void givenNewJabRefFrame_whenNothing_thenNoError() { + void givenNewJabRefFrame_whenInitializing_thenNoError() { Stage stage = new Stage(); JabRefFrame sut = new JabRefFrame(stage); } @Test - void givenNewBibEntry_whenNothing_thenNoError() { + void givenNewBibEntry_whenInitializing_thenNoError() { BibEntry sut = new BibEntry(); } @Test - void givenNewDuplicateResolverType_whenNothing_thenNoError() { + void givenNewDuplicateResolverTypeIMPORT_CHECK_whenInitializing_thenEqualsIMPORT_CHECK() { DuplicateResolverDialog.DuplicateResolverType sut = DuplicateResolverDialog.DuplicateResolverType.IMPORT_CHECK; assertEquals(DuplicateResolverDialog.DuplicateResolverType.IMPORT_CHECK,sut); } + + @Test + void givenNewDuplicateResolverResultKEEP_LEFT_whenInitializing_thenEqualsIMPORT_CHECK() { + DuplicateResolverDialog.DuplicateResolverResult sut = DuplicateResolverDialog.DuplicateResolverResult.KEEP_LEFT; + assertEquals(DuplicateResolverDialog.DuplicateResolverResult.KEEP_LEFT,sut); + } + + @Test + public void givenDuplicateResolverDialog_whenGetMergedEntry_thenMergedBibEntryMeReturned(){ + Stage stage = new Stage(); + JabRefFrame frame = new JabRefFrame(stage); + BibEntry one = new BibEntry(); + BibEntry two = new BibEntry(); + DuplicateResolverDialog.DuplicateResolverType type = DuplicateResolverDialog.DuplicateResolverType.IMPORT_CHECK; + + DuplicateResolverDialog testDialog = new DuplicateResolverDialog(frame, one, two, type); + + BibEntry sut = testDialog.getMergedEntry(); + BibDatabaseMode mode = BibDatabaseMode.BIBTEX; + + MergeEntries ans = new MergeEntries(one, two, mode); + assertEquals(ans, sut); + } }