Simple GUI Test

Integration tests are now separated from the normal unit tests and have to be called manually.

.travis.yml

@@ -6,8 +6,14 @@ sudo: false
 before_install:
   - chmod +x gradlew
 
+# allow gui testing on travis
+before_script:
+  - "export DISPLAY=:99.0"
+  - "sh -e /etc/init.d/xvfb start"
+  - sleep 3 # give xvfb some time to start
+
 script:
-  - ./gradlew test --info
+  - ./gradlew test testIntegration --info
 
 # cache gradle dependencies
 cache:

build.gradle

@@ -62,6 +62,9 @@ repositories {
 configurations {
     antlr3
     antlr4
+
+    integrationTestCompile.extendsFrom testCompile
+    integrationTestRuntime.extendsFrom testRuntime
 }
 
 dependencies {
@@ -100,6 +103,7 @@ dependencies {
 
     testCompile 'junit:junit:4.12'
     testCompile 'org.mockito:mockito-core:1.10.19'
+    integrationTestCompile 'org.assertj:assertj-swing-junit:3.0.2'
 
     compile 'org.jsoup:jsoup:1.8.3'
     compile 'com.mashape.unirest:unirest-java:1.4.7'
@@ -115,6 +119,14 @@ sourceSets {
             srcDirs = ["src/main/java", "src/main/gen"]
         }
     }
+    integrationTest {
+        java {
+            compileClasspath += main.output + test.output
+            runtimeClasspath += main.output + test.output
+            srcDir file('src/integration-test/java')
+        }
+        resources.srcDir file('src/integration-test/resources')
+    }
 }
 
 processResources {
@@ -204,6 +216,15 @@ test {
     }
 }
 
+task integrationTest(type: Test) {
+    testClassesDir = sourceSets.integrationTest.output.classesDir
+    classpath = sourceSets.integrationTest.runtimeClasspath
+}
+
+tasks.withType(Test) {
+    reports.html.destination = file("${reporting.baseDir}/${name}")
+}
+
 jacocoTestReport {
     reports {
         xml.enabled = true // coveralls plugin depends on xml format report

src/integration-test/java/net/sf/jabref/gui/AWTExceptionHandler.java

@@ -0,0 +1,27 @@
+package net.sf.jabref.gui;
+
+import junit.framework.AssertionFailedError;
+import org.junit.Assert;
+
+import javax.swing.*;
+import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
+
+/**
+ * Can catch any exceptions occuring on the EDT thread for assertion.
+ */
+public class AWTExceptionHandler {
+
+    private final List<Throwable> list = new CopyOnWriteArrayList<>();
+
+    public void installExceptionDetectionInEDT() {
+        SwingUtilities.invokeLater(() -> Thread.currentThread().setUncaughtExceptionHandler((t, e) -> list.add(e)));
+    }
+
+    public void assertNoExceptions() {
+        if(!list.isEmpty()) {
+            throw new AssertionError("Uncaught exception in EDT", list.get(0));
+        }
+    }
+
+}

src/integration-test/java/net/sf/jabref/gui/GUITest.java

@@ -0,0 +1,104 @@
+package net.sf.jabref.gui;
+
+import net.sf.jabref.JabRefMain;
+import net.sf.jabref.gui.preftabs.PreferencesDialog;
+import org.assertj.swing.core.GenericTypeMatcher;
+import org.assertj.swing.dependency.jsr305.Nonnull;
+import org.assertj.swing.fixture.FrameFixture;
+import org.assertj.swing.junit.testcase.AssertJSwingJUnitTestCase;
+import org.junit.Test;
+
+import javax.swing.*;
+
+import static org.assertj.swing.finder.WindowFinder.findDialog;
+import static org.assertj.swing.finder.WindowFinder.findFrame;
+import static org.assertj.swing.launcher.ApplicationLauncher.application;
+
+public class GUITest extends AssertJSwingJUnitTestCase {
+
+    private AWTExceptionHandler awtExceptionHandler;
+
+    @Override
+    protected void onSetUp() {
+        awtExceptionHandler = new AWTExceptionHandler();
+        awtExceptionHandler.installExceptionDetectionInEDT();
+        application(JabRefMain.class).start();
+    }
+
+    @Test
+    public void testExit() {
+        FrameFixture mainFrame = findFrame(JabRefFrame.class).using(robot());
+        exitJabRef(mainFrame);
+    }
+
+    private void exitJabRef(FrameFixture mainFrame) {
+        mainFrame.menuItemWithPath("File", "Quit").click();
+        awtExceptionHandler.assertNoExceptions();
+    }
+
+    @Test
+    public void testNewFile() {
+        FrameFixture mainFrame = findFrame(JabRefFrame.class).using(robot());
+        newDatabase(mainFrame);
+
+        mainFrame.menuItemWithPath("File", "Close database").click();
+        exitJabRef(mainFrame);
+    }
+
+    private void newDatabase(FrameFixture mainFrame) {
+        mainFrame.menuItemWithPath("File", "New BibTeX database").click();
+    }
+
+    @Test
+    public void testCreateBibtexEntry() {
+        FrameFixture mainFrame = findFrame(JabRefFrame.class).using(robot());
+
+        newDatabase(mainFrame);
+
+        mainFrame.menuItemWithPath("BibTeX", "New entry").click();
+        findDialog(EntryTypeDialog.class).using(robot()).button(new GenericTypeMatcher<JButton>(JButton.class) {
+
+            @Override protected boolean isMatching(@Nonnull JButton jButton) {
+                return "Book".equals(jButton.getText());
+            }
+        }).click();
+
+        exitJabRef(mainFrame);
+    }
+
+    @Test
+    public void testOpenAndSavePreferences() {
+        FrameFixture mainFrame = findFrame(JabRefFrame.class).using(robot());
+
+        mainFrame.menuItemWithPath("Options", "Preferences").click();
+        findDialog(PreferencesDialog.class).using(robot()).button(new GenericTypeMatcher<JButton>(JButton.class) {
+
+            @Override protected boolean isMatching(@Nonnull JButton jButton) {
+                return "OK".equals(jButton.getText());
+            }
+        }).click();
+
+        exitJabRef(mainFrame);
+    }
+
+    @Test
+    public void testViewChanges() {
+        FrameFixture mainFrame = findFrame(JabRefFrame.class).using(robot());
+
+        newDatabase(mainFrame);
+
+        mainFrame.menuItemWithPath("View", "Increase table font size").click();
+        mainFrame.menuItemWithPath("View", "Decrease table font size").click();
+        mainFrame.menuItemWithPath("View", "Web search").click();
+        mainFrame.menuItemWithPath("View", "Toggle groups interface").click();
+        mainFrame.menuItemWithPath("View", "Toggle entry preview").click();
+        mainFrame.menuItemWithPath("View", "Switch preview layout").click();
+        mainFrame.menuItemWithPath("View", "Hide/show toolbar").click();
+        mainFrame.menuItemWithPath("View", "Focus entry table").click();
+
+        newDatabase(mainFrame);
+        mainFrame.menuItemWithPath("File", "Close database").click();
+        exitJabRef(mainFrame);
+    }
+
+}

src/main/java/net/sf/jabref/JabRefMain.java

@@ -1,10 +1,12 @@
 package net.sf.jabref;
 
+import javax.swing.*;
+
 /**
  * JabRef MainClass
  */
 public class JabRefMain {
     public static void main(String[] args) {
-        new JabRef().start(args);
+        SwingUtilities.invokeLater(() -> new JabRef().start(args));
     }
 }

src/main/java/net/sf/jabref/gui/JabRefFrame.java

@@ -745,29 +745,16 @@ public void about() {
     // General preferences dialog.  The MacAdapter calls this method when "Preferences..."
     // is selected from the application menu.
     public void preferences() {
-        //PrefsDialog.showPrefsDialog(JabRefFrame.this, prefs);
-        AbstractWorker worker = new AbstractWorker() {
-
-            @Override
-            public void run() {
-                output(Localization.lang("Opening preferences..."));
-                if (prefsDialog == null) {
-                    prefsDialog = new PreferencesDialog(JabRefFrame.this, jabRef);
-                    PositionWindow.placeDialog(prefsDialog, JabRefFrame.this);
-                } else {
-                    prefsDialog.setValues();
-                }
-
-            }
+        output(Localization.lang("Opening preferences..."));
+        if (prefsDialog == null) {
+            prefsDialog = new PreferencesDialog(JabRefFrame.this, jabRef);
+            PositionWindow.placeDialog(prefsDialog, JabRefFrame.this);
+        } else {
+            prefsDialog.setValues();
+        }
 
-            @Override
-            public void update() {
-                prefsDialog.setVisible(true);
-                output("");
-            }
-        };
-        worker.getWorker().run();
-        worker.getCallBack().update();
+        prefsDialog.setVisible(true);
+        output("");
     }
 
     public JabRefPreferences prefs() {

src/main/java/net/sf/jabref/gui/preftabs/PreferencesDialog.java

@@ -248,46 +248,33 @@ public OkAction() {
         @Override
         public void actionPerformed(ActionEvent e) {
 
-            AbstractWorker worker = new AbstractWorker() {
-
-                boolean ready = true;
-
-
-                @Override
-                public void run() {
-                    // First check that all tabs are ready to close:
-                    int count = main.getComponentCount();
-                    Component[] comps = main.getComponents();
-                    for (int i = 0; i < count; i++) {
-                        if (!((PrefsTab) comps[i]).validateSettings()) {
-                            ready = false;
-                            return; // If not, break off.
-                        }
-                    }
-                    // Then store settings and close:
-                    for (int i = 0; i < count; i++) {
-                        ((PrefsTab) comps[i]).storeSettings();
-                    }
-                    Globals.prefs.flush();
-                }
-
-                @Override
-                public void update() {
-                    if (!ready) {
-                        return;
-                    }
-                    setVisible(false);
-                    MainTable.updateRenderers();
-                    GUIGlobals.updateEntryEditorColors();
-                    frame.setupAllTables();
-                    frame.groupSelector.revalidateGroups(); // icons may have
-                    // changed
-                    frame.output(Localization.lang("Preferences recorded."));
+            boolean ready = true;
+
+            // First check that all tabs are ready to close:
+            int count = main.getComponentCount();
+            Component[] comps = main.getComponents();
+            for (int i = 0; i < count; i++) {
+                if (!((PrefsTab) comps[i]).validateSettings()) {
+                    ready = false;
+                    return; // If not, break off.
                 }
-            };
-            worker.getWorker().run();
-            worker.getCallBack().update();
+            }
+            // Then store settings and close:
+            for (int i = 0; i < count; i++) {
+                ((PrefsTab) comps[i]).storeSettings();
+            }
+            Globals.prefs.flush();
 
+            if (!ready) {
+                return;
+            }
+            setVisible(false);
+            MainTable.updateRenderers();
+            GUIGlobals.updateEntryEditorColors();
+            frame.setupAllTables();
+            frame.groupSelector.revalidateGroups(); // icons may have
+            // changed
+            frame.output(Localization.lang("Preferences recorded."));
         }
     }