Replaced FEST with assertJ

Author: cmaglie

app/.classpath

@@ -45,14 +45,16 @@
 	<classpathentry kind="lib" path="lib/xml-apis-1.3.04.jar"/>
 	<classpathentry kind="lib" path="lib/xml-apis-ext-1.3.04.jar"/>
 	<classpathentry kind="lib" path="lib/xmlgraphics-commons-2.0.jar"/>
-	<classpathentry kind="lib" path="test-lib/junit-4.11.jar"/>
-	<classpathentry kind="lib" path="test-lib/fest-assert-1.2.jar"/>
-	<classpathentry kind="lib" path="test-lib/fest-reflect-1.2.jar"/>
-	<classpathentry kind="lib" path="test-lib/fest-swing-1.2.jar"/>
-	<classpathentry kind="lib" path="test-lib/fest-util-1.1.2.jar"/>
 	<classpathentry kind="lib" path="test-lib/jcip-annotations-1.0.jar"/>
 	<classpathentry kind="lib" path="lib/jtouchbar-1.0.0.jar"/>
 	<classpathentry kind="lib" path="lib/commons-lang3-3.8.1.jar"/>
 	<classpathentry kind="lib" path="lib/jssc-2.8.0-arduino4.jar"/>
+	<classpathentry kind="lib" path="test-lib/assertj-swing-junit-3.9.2.jar"/>
+	<classpathentry kind="lib" path="test-lib/assertj-core-1.7.1.jar"/>
+	<classpathentry kind="lib" path="test-lib/assertj-swing-1.2.0.jar"/>
+	<classpathentry kind="lib" path="test-lib/assertj-swing-junit-1.2.0.jar"/>
+	<classpathentry kind="lib" path="test-lib/assertj-swing-junit-4.5-1.2.0.jar"/>
+	<classpathentry kind="lib" path="test-lib/fest-util-1.2.5.jar"/>
+	<classpathentry kind="lib" path="test-lib/junit-4.5.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

app/test-lib/assertj-core-1.7.1.jar

@@ -29,17 +29,15 @@
 
 package processing.app;
 
-import cc.arduino.files.DeleteFilesOnShutdown;
-import org.fest.swing.edt.FailOnThreadViolationRepaintManager;
-import org.fest.swing.edt.GuiActionRunner;
-import org.fest.swing.edt.GuiQuery;
+import javax.swing.JPopupMenu;
+
+import org.assertj.swing.edt.FailOnThreadViolationRepaintManager;
+import org.assertj.swing.edt.GuiActionRunner;
+import org.assertj.swing.edt.GuiQuery;
 import org.junit.After;
 import org.junit.Before;
-import processing.app.helpers.ArduinoFrameFixture;
-import processing.app.helpers.FileUtils;
 
-import javax.swing.*;
-import java.util.Random;
+import processing.app.helpers.ArduinoFrameFixture;
 
 public abstract class AbstractGUITest extends AbstractWithPreferencesTest {
 

app/test-lib/assertj-swing-1.2.0.jar

@@ -29,12 +29,13 @@
 
 package processing.app;
 
-import org.fest.swing.fixture.JMenuItemFixture;
 import org.junit.Test;
 import processing.app.helpers.SketchTextAreaFixture;
 
 import static org.junit.Assert.assertEquals;
 
+import org.assertj.swing.fixture.JMenuItemFixture;
+
 public class AutoformatProducesOneUndoActionTest extends AbstractGUITest {
 
   public static final String SOURCE_BEFORE = "void setup() {\n" +

app/test-lib/assertj-swing-junit-1.2.0.jar

@@ -29,11 +29,12 @@
 
 package processing.app;
 
-import org.fest.swing.fixture.JMenuItemFixture;
+import static org.junit.Assert.assertEquals;
+
+import org.assertj.swing.fixture.JMenuItemFixture;
 import org.junit.Test;
-import processing.app.helpers.SketchTextAreaFixture;
 
-import static org.junit.Assert.assertEquals;
+import processing.app.helpers.SketchTextAreaFixture;
 
 public class AutoformatSavesCaretPositionTest extends AbstractGUITest {
 

app/test-lib/assertj-swing-junit-3.9.2.jar

@@ -29,11 +29,12 @@
 
 package processing.app;
 
-import org.fest.swing.fixture.JMenuItemFixture;
+import static org.junit.Assert.assertEquals;
+
+import org.assertj.swing.fixture.JMenuItemFixture;
 import org.junit.Test;
-import processing.app.helpers.SketchTextAreaFixture;
 
-import static org.junit.Assert.assertEquals;
+import processing.app.helpers.SketchTextAreaFixture;
 
 public class AutoformatTest extends AbstractGUITest {
 

app/test-lib/assertj-swing-junit-4.5-1.2.0.jar

@@ -33,9 +33,9 @@
 
 import java.awt.Frame;
 
-import org.fest.swing.edt.GuiActionRunner;
-import org.fest.swing.edt.GuiQuery;
-import org.fest.swing.fixture.JMenuItemFixture;
+import org.assertj.swing.edt.GuiActionRunner;
+import org.assertj.swing.edt.GuiQuery;
+import org.assertj.swing.fixture.JMenuItemFixture;
 import org.junit.Test;
 
 import processing.app.helpers.SketchTextAreaFixture;

app/test-lib/fest-assert-1.2.jar

@@ -29,7 +29,8 @@
 
 package processing.app;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
 
 import java.io.File;
 import java.io.IOException;
@@ -39,7 +40,7 @@
 import java.util.Arrays;
 
 import org.apache.commons.compress.utils.IOUtils;
-import org.fest.assertions.Assertions;
+import org.assertj.core.api.Assertions;
 import org.junit.BeforeClass;
 import org.junit.Test;
 

app/test-lib/fest-reflect-1.2.jar

@@ -29,13 +29,14 @@
 
 package processing.app;
 
+import static org.junit.Assert.assertFalse;
+
 import org.junit.After;
 import org.junit.Assume;
 import org.junit.Before;
 import org.junit.Test;
 
 import processing.app.debug.TargetBoard;
-import static org.junit.Assert.assertNotEquals;
 
 public class DefaultTargetTest extends AbstractWithPreferencesTest {
 
@@ -63,6 +64,6 @@ public void testDefaultTarget() throws Exception {
     Assume.assumeNotNull(BaseNoGui.getTargetPlatform());
 
     TargetBoard targetBoard = BaseNoGui.getTargetBoard();
-    assertNotEquals("unreal_board", targetBoard.getId());
+    assertFalse("unreal_board".equals(targetBoard.getId()));
   }
 }

app/test-lib/fest-swing-1.2.jar

@@ -29,20 +29,21 @@
 
 package processing.app;
 
-import org.fest.swing.core.KeyPressInfo;
-import org.fest.swing.core.matcher.DialogMatcher;
-import org.fest.swing.finder.WindowFinder;
-import org.fest.swing.fixture.DialogFixture;
-import org.junit.Test;
-import processing.app.helpers.SketchTextAreaFixture;
+import static org.junit.Assert.assertEquals;
+import static processing.app.I18n.tr;
 
-import javax.swing.*;
 import java.awt.event.KeyEvent;
 
-import static org.junit.Assert.assertEquals;
-import static processing.app.I18n.tr;
+import org.assertj.swing.core.KeyPressInfo;
+import org.assertj.swing.core.matcher.DialogMatcher;
+import org.assertj.swing.fixture.DialogFixture;
+import org.junit.Test;
+
+import processing.app.helpers.SketchTextAreaFixture;
 
-public class HittingEscapeOnCloseConfirmationDialogTest extends AbstractGUITest {
+
+public class HittingEscapeOnCloseConfirmationDialogTest
+    extends AbstractGUITest {
 
   @Test
   public void shouldJustCloseTheDialog() throws Exception {
@@ -52,11 +53,10 @@ public void shouldJustCloseTheDialog() throws Exception {
     window.close();
 
     DialogMatcher matcher = DialogMatcher.withTitle(tr("Close")).andShowing();
-    DialogFixture dialog = WindowFinder.findDialog(matcher).using(window.robot);
+    DialogFixture dialog = window.findJDialog(matcher);
     dialog.pressAndReleaseKey(KeyPressInfo.keyCode(KeyEvent.VK_ESCAPE));
 
-    EditorConsole console = (EditorConsole) window.scrollPane("console").component();
-
+    EditorConsole console = window.getEditor().console;
     assertEquals("", console.getText());
   }
 }