Author: echatellier Date: 2015-05-18 09:52:01 +0000 (Mon, 18 May 2015) New Revision: 4226 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4226 Log: Update libs. Move from fest to assertj. Modified: trunk/pom.xml trunk/src/test/java/fr/ifremer/isisfish/ui/AbstractFestIT.java trunk/src/test/java/fr/ifremer/isisfish/ui/input/InputIT.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2015-05-07 16:16:34 UTC (rev 4225) +++ trunk/pom.xml 2015-05-18 09:52:01 UTC (rev 4226) @@ -77,7 +77,7 @@ <dependency> <groupId>org.ow2.asm</groupId> <artifactId>asm</artifactId> - <version>5.0.3</version> + <version>5.0.4</version> <scope>compile</scope> </dependency> @@ -237,29 +237,29 @@ <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-core</artifactId> - <version>2.2</version> + <version>2.3</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-api</artifactId> - <version>2.2</version> + <version>2.3</version> <scope>compile</scope> </dependency> <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-jcl</artifactId> - <version>2.2</version> - <scope>runtime</scope> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-jcl</artifactId> + <version>2.3</version> + <scope>runtime</scope> </dependency> <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-slf4j-impl</artifactId> - <version>2.2</version> - <scope>runtime</scope> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-slf4j-impl</artifactId> + <version>2.3</version> + <scope>runtime</scope> </dependency> <dependency> @@ -387,13 +387,19 @@ <version>4.12</version> <scope>test</scope> </dependency> - + <dependency> - <groupId>org.easytesting</groupId> - <artifactId>fest-swing</artifactId> - <version>1.2.1</version> + <groupId>org.assertj</groupId> + <artifactId>assertj-swing</artifactId> + <version>2.0.0</version> <scope>test</scope> </dependency> + <dependency> + <groupId>org.assertj</groupId> + <artifactId>assertj-swing-junit</artifactId> + <version>2.0.0</version> + <scope>test</scope> + </dependency> </dependencies> <!-- ************************************************************* --> Modified: trunk/src/test/java/fr/ifremer/isisfish/ui/AbstractFestIT.java =================================================================== --- trunk/src/test/java/fr/ifremer/isisfish/ui/AbstractFestIT.java 2015-05-07 16:16:34 UTC (rev 4225) +++ trunk/src/test/java/fr/ifremer/isisfish/ui/AbstractFestIT.java 2015-05-18 09:52:01 UTC (rev 4226) @@ -24,11 +24,11 @@ */ package fr.ifremer.isisfish.ui; -import org.fest.swing.edt.FailOnThreadViolationRepaintManager; -import org.fest.swing.edt.GuiActionRunner; -import org.fest.swing.edt.GuiQuery; -import org.fest.swing.exception.WaitTimedOutError; -import org.fest.swing.fixture.FrameFixture; +import org.assertj.swing.edt.FailOnThreadViolationRepaintManager; +import org.assertj.swing.edt.GuiActionRunner; +import org.assertj.swing.edt.GuiQuery; +import org.assertj.swing.exception.WaitTimedOutError; +import org.assertj.swing.fixture.FrameFixture; import org.junit.After; import org.junit.Assume; import org.junit.Before; @@ -47,7 +47,7 @@ protected FrameFixture mainWindow; @BeforeClass - public static void setUpOnce() { + public static void setUpOnce() throws Exception { Assume.assumeTrue(!java.awt.GraphicsEnvironment.isHeadless()); FailOnThreadViolationRepaintManager.install(); } Modified: trunk/src/test/java/fr/ifremer/isisfish/ui/input/InputIT.java =================================================================== --- trunk/src/test/java/fr/ifremer/isisfish/ui/input/InputIT.java 2015-05-07 16:16:34 UTC (rev 4225) +++ trunk/src/test/java/fr/ifremer/isisfish/ui/input/InputIT.java 2015-05-18 09:52:01 UTC (rev 4226) @@ -28,7 +28,7 @@ import java.io.IOException; import org.apache.commons.lang3.SystemUtils; -import org.fest.swing.core.matcher.JButtonMatcher; +import org.assertj.swing.core.matcher.JButtonMatcher; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -83,9 +83,10 @@ public void testImportRegion() throws IOException { openDemoRegion(); mainWindow.menuItem("menuRegionExport").click(); - File f = new File(SystemUtils.JAVA_IO_TMPDIR, "isis-export.zip"); + File f = File.createTempFile("isis-export", ".zip"); // bug file exists f.deleteOnExit(); mainWindow.fileChooser().selectFile(f).approve(); + mainWindow.optionPane().yesButton().click(); // bug file exists mainWindow.menuItem("menuRegionImportRename").click(); mainWindow.fileChooser().selectFile(f).approve();