Skip to content

Commit fefac95

Browse files
cmagliecmaglie
committed
Replaced FEST with assertJ
1 parent 21cc311 commit fefac95

29 files changed

+127
-439
lines changed

Diff for: ‎app/.classpath

+7-5
Original file line numberDiff line numberDiff line change
@@ -45,14 +45,16 @@
4545
<classpathentry kind="lib" path="lib/xml-apis-1.3.04.jar"/>
4646
<classpathentry kind="lib" path="lib/xml-apis-ext-1.3.04.jar"/>
4747
<classpathentry kind="lib" path="lib/xmlgraphics-commons-2.0.jar"/>
48-
<classpathentry kind="lib" path="test-lib/junit-4.11.jar"/>
49-
<classpathentry kind="lib" path="test-lib/fest-assert-1.2.jar"/>
50-
<classpathentry kind="lib" path="test-lib/fest-reflect-1.2.jar"/>
51-
<classpathentry kind="lib" path="test-lib/fest-swing-1.2.jar"/>
52-
<classpathentry kind="lib" path="test-lib/fest-util-1.1.2.jar"/>
5348
<classpathentry kind="lib" path="test-lib/jcip-annotations-1.0.jar"/>
5449
<classpathentry kind="lib" path="lib/jtouchbar-1.0.0.jar"/>
5550
<classpathentry kind="lib" path="lib/commons-lang3-3.8.1.jar"/>
5651
<classpathentry kind="lib" path="lib/jssc-2.8.0-arduino4.jar"/>
52+
<classpathentry kind="lib" path="test-lib/assertj-swing-junit-3.9.2.jar"/>
53+
<classpathentry kind="lib" path="test-lib/assertj-core-1.7.1.jar"/>
54+
<classpathentry kind="lib" path="test-lib/assertj-swing-1.2.0.jar"/>
55+
<classpathentry kind="lib" path="test-lib/assertj-swing-junit-1.2.0.jar"/>
56+
<classpathentry kind="lib" path="test-lib/assertj-swing-junit-4.5-1.2.0.jar"/>
57+
<classpathentry kind="lib" path="test-lib/fest-util-1.2.5.jar"/>
58+
<classpathentry kind="lib" path="test-lib/junit-4.5.jar"/>
5759
<classpathentry kind="output" path="bin"/>
5860
</classpath>

Diff for: ‎app/test-lib/assertj-core-1.7.1.jar

604 KB
Binary file not shown.

Diff for: ‎app/test-lib/assertj-swing-1.2.0.jar

846 KB
Binary file not shown.

Diff for: ‎app/test-lib/assertj-swing-junit-1.2.0.jar

64.4 KB
Binary file not shown.

Diff for: ‎app/test-lib/assertj-swing-junit-3.9.2.jar

202 KB
Binary file not shown.

Diff for: ‎app/test-lib/assertj-swing-junit-4.5-1.2.0.jar

4.5 KB
Binary file not shown.

Diff for: ‎app/test-lib/fest-assert-1.2.jar

-87.8 KB
Binary file not shown.

Diff for: ‎app/test-lib/fest-reflect-1.2.jar

-36.3 KB
Binary file not shown.

Diff for: ‎app/test-lib/fest-swing-1.2.jar

-712 KB
Binary file not shown.

Diff for: ‎app/test-lib/fest-util-1.1.2.jar

-18.5 KB
Binary file not shown.

Diff for: ‎app/test-lib/fest-util-1.2.5.jar

31.7 KB
Binary file not shown.

Diff for: ‎app/test-lib/fest.LICENSE.ASL-2.0.txt

-202
This file was deleted.

Diff for: ‎app/test-lib/junit-4.11.jar

-282 KB
Binary file not shown.

Diff for: ‎app/test-lib/junit-4.5.jar

194 KB
Binary file not shown.

Diff for: ‎app/test/processing/app/AbstractGUITest.java

+6-8
Original file line numberDiff line numberDiff line change
@@ -29,17 +29,15 @@
2929

3030
package processing.app;
3131

32-
import cc.arduino.files.DeleteFilesOnShutdown;
33-
import org.fest.swing.edt.FailOnThreadViolationRepaintManager;
34-
import org.fest.swing.edt.GuiActionRunner;
35-
import org.fest.swing.edt.GuiQuery;
32+
import javax.swing.JPopupMenu;
33+
34+
import org.assertj.swing.edt.FailOnThreadViolationRepaintManager;
35+
import org.assertj.swing.edt.GuiActionRunner;
36+
import org.assertj.swing.edt.GuiQuery;
3637
import org.junit.After;
3738
import org.junit.Before;
38-
import processing.app.helpers.ArduinoFrameFixture;
39-
import processing.app.helpers.FileUtils;
4039

41-
import javax.swing.*;
42-
import java.util.Random;
40+
import processing.app.helpers.ArduinoFrameFixture;
4341

4442
public abstract class AbstractGUITest extends AbstractWithPreferencesTest {
4543

Diff for: ‎app/test/processing/app/AutoformatProducesOneUndoActionTest.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,13 @@
2929

3030
package processing.app;
3131

32-
import org.fest.swing.fixture.JMenuItemFixture;
3332
import org.junit.Test;
3433
import processing.app.helpers.SketchTextAreaFixture;
3534

3635
import static org.junit.Assert.assertEquals;
3736

37+
import org.assertj.swing.fixture.JMenuItemFixture;
38+
3839
public class AutoformatProducesOneUndoActionTest extends AbstractGUITest {
3940

4041
public static final String SOURCE_BEFORE = "void setup() {\n" +

Diff for: ‎app/test/processing/app/AutoformatSavesCaretPositionTest.java

+4-3
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,12 @@
2929

3030
package processing.app;
3131

32-
import org.fest.swing.fixture.JMenuItemFixture;
32+
import static org.junit.Assert.assertEquals;
33+
34+
import org.assertj.swing.fixture.JMenuItemFixture;
3335
import org.junit.Test;
34-
import processing.app.helpers.SketchTextAreaFixture;
3536

36-
import static org.junit.Assert.assertEquals;
37+
import processing.app.helpers.SketchTextAreaFixture;
3738

3839
public class AutoformatSavesCaretPositionTest extends AbstractGUITest {
3940

Diff for: ‎app/test/processing/app/AutoformatTest.java

+4-3
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,12 @@
2929

3030
package processing.app;
3131

32-
import org.fest.swing.fixture.JMenuItemFixture;
32+
import static org.junit.Assert.assertEquals;
33+
34+
import org.assertj.swing.fixture.JMenuItemFixture;
3335
import org.junit.Test;
34-
import processing.app.helpers.SketchTextAreaFixture;
3536

36-
import static org.junit.Assert.assertEquals;
37+
import processing.app.helpers.SketchTextAreaFixture;
3738

3839
public class AutoformatTest extends AbstractGUITest {
3940

Diff for: ‎app/test/processing/app/BlockCommentGeneratesOneUndoActionTest.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@
3333

3434
import java.awt.Frame;
3535

36-
import org.fest.swing.edt.GuiActionRunner;
37-
import org.fest.swing.edt.GuiQuery;
38-
import org.fest.swing.fixture.JMenuItemFixture;
36+
import org.assertj.swing.edt.GuiActionRunner;
37+
import org.assertj.swing.edt.GuiQuery;
38+
import org.assertj.swing.fixture.JMenuItemFixture;
3939
import org.junit.Test;
4040

4141
import processing.app.helpers.SketchTextAreaFixture;

Diff for: ‎app/test/processing/app/CommandLineTest.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@
2929

3030
package processing.app;
3131

32-
import static org.junit.Assert.*;
32+
import static org.junit.Assert.assertEquals;
33+
import static org.junit.Assert.assertNull;
3334

3435
import java.io.File;
3536
import java.io.IOException;
@@ -39,7 +40,7 @@
3940
import java.util.Arrays;
4041

4142
import org.apache.commons.compress.utils.IOUtils;
42-
import org.fest.assertions.Assertions;
43+
import org.assertj.core.api.Assertions;
4344
import org.junit.BeforeClass;
4445
import org.junit.Test;
4546

Diff for: ‎app/test/processing/app/DefaultTargetTest.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,14 @@
2929

3030
package processing.app;
3131

32+
import static org.junit.Assert.assertFalse;
33+
3234
import org.junit.After;
3335
import org.junit.Assume;
3436
import org.junit.Before;
3537
import org.junit.Test;
3638

3739
import processing.app.debug.TargetBoard;
38-
import static org.junit.Assert.assertNotEquals;
3940

4041
public class DefaultTargetTest extends AbstractWithPreferencesTest {
4142

@@ -63,6 +64,6 @@ public void testDefaultTarget() throws Exception {
6364
Assume.assumeNotNull(BaseNoGui.getTargetPlatform());
6465

6566
TargetBoard targetBoard = BaseNoGui.getTargetBoard();
66-
assertNotEquals("unreal_board", targetBoard.getId());
67+
assertFalse("unreal_board".equals(targetBoard.getId()));
6768
}
6869
}

Diff for: ‎app/test/processing/app/HittingEscapeOnCloseConfirmationDialogTest.java

+13-13
Original file line numberDiff line numberDiff line change
@@ -29,20 +29,21 @@
2929

3030
package processing.app;
3131

32-
import org.fest.swing.core.KeyPressInfo;
33-
import org.fest.swing.core.matcher.DialogMatcher;
34-
import org.fest.swing.finder.WindowFinder;
35-
import org.fest.swing.fixture.DialogFixture;
36-
import org.junit.Test;
37-
import processing.app.helpers.SketchTextAreaFixture;
32+
import static org.junit.Assert.assertEquals;
33+
import static processing.app.I18n.tr;
3834

39-
import javax.swing.*;
4035
import java.awt.event.KeyEvent;
4136

42-
import static org.junit.Assert.assertEquals;
43-
import static processing.app.I18n.tr;
37+
import org.assertj.swing.core.KeyPressInfo;
38+
import org.assertj.swing.core.matcher.DialogMatcher;
39+
import org.assertj.swing.fixture.DialogFixture;
40+
import org.junit.Test;
41+
42+
import processing.app.helpers.SketchTextAreaFixture;
4443

45-
public class HittingEscapeOnCloseConfirmationDialogTest extends AbstractGUITest {
44+
45+
public class HittingEscapeOnCloseConfirmationDialogTest
46+
extends AbstractGUITest {
4647

4748
@Test
4849
public void shouldJustCloseTheDialog() throws Exception {
@@ -52,11 +53,10 @@ public void shouldJustCloseTheDialog() throws Exception {
5253
window.close();
5354

5455
DialogMatcher matcher = DialogMatcher.withTitle(tr("Close")).andShowing();
55-
DialogFixture dialog = WindowFinder.findDialog(matcher).using(window.robot);
56+
DialogFixture dialog = window.findJDialog(matcher);
5657
dialog.pressAndReleaseKey(KeyPressInfo.keyCode(KeyEvent.VK_ESCAPE));
5758

58-
EditorConsole console = (EditorConsole) window.scrollPane("console").component();
59-
59+
EditorConsole console = window.getEditor().console;
6060
assertEquals("", console.getText());
6161
}
6262
}

0 commit comments

Comments
 (0)