Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit f41626b

Browse files
JariP10JariP10
committed
Java 8 version changes
1 parent cd4549f commit f41626b

16 files changed

+42
-30
lines changed

‎AUTHORS.txt

+1
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,4 @@ Sakari Hoisko Dockerized linux env with X
99
Juho Lehtonen Optimized docker environment.
1010
Juho Saarinen Package improvements, initial monocle support, screenshot bug fix
1111
Turo Soisenniemi Initial java agent support
12+
Jari Parviainen Latest Java 8 version changes

‎pom.xml

+13-2
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,12 @@
5858
<email>[email protected]</email>
5959
<organization>Eficode</organization>
6060
<organizationUrl>http://www.eficode.com</organizationUrl>
61+
</developer>
62+
<developer>
63+
<name>Jari Parviainen</name>
64+
<email>[email protected]</email>
65+
<organization>Eficode</organization>
66+
<organizationUrl>http://www.eficode.com</organizationUrl>
6167
</developer>
6268
</developers>
6369

@@ -381,12 +387,17 @@
381387
<dependency>
382388
<groupId>junit</groupId>
383389
<artifactId>junit</artifactId>
384-
<version>4.13.1</version>
390+
<version>4.13.2</version>
385391
</dependency>
386392
<dependency>
387393
<groupId>org.testfx</groupId>
388394
<artifactId>testfx-core</artifactId>
389-
<version>4.0.16-alpha</version>
395+
<version>4.0.17</version>
396+
</dependency>
397+
<dependency>
398+
<groupId>org.testfx</groupId>
399+
<artifactId>testfx-junit</artifactId>
400+
<version>4.0.17</version>
390401
</dependency>
391402
<dependency>
392403
<groupId>org.testfx</groupId>

‎src/test/java/javafxlibrary/keywords/AdditionalKeywordsTests/ConvenienceKeywords/WaitForEventsInFxApplicationThreadTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
import javafx.application.Platform;
2121
import javafx.scene.control.Button;
22-
import javafxlibrary.TestFxAdapterTest;
22+
import org.testfx.framework.junit.ApplicationTest;
2323
import javafxlibrary.exceptions.JavaFXLibraryNonFatalException;
2424
import javafxlibrary.keywords.AdditionalKeywords.ApplicationLauncher;
2525
import org.junit.Assert;
@@ -28,7 +28,7 @@
2828
import org.junit.Test;
2929
import org.junit.rules.ExpectedException;
3030

31-
public class WaitForEventsInFxApplicationThreadTest extends TestFxAdapterTest {
31+
public class WaitForEventsInFxApplicationThreadTest extends ApplicationTest {
3232

3333
@Rule
3434
public ExpectedException thrown = ExpectedException.none();

‎src/test/java/javafxlibrary/matchers/InstanceOfMatcherTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@
1919

2020
import javafx.scene.control.Button;
2121
import javafx.scene.text.Text;
22-
import javafxlibrary.TestFxAdapterTest;
22+
import org.testfx.framework.junit.ApplicationTest;
2323
import org.junit.Assert;
2424
import org.junit.Test;
2525

26-
public class InstanceOfMatcherTest extends TestFxAdapterTest {
26+
public class InstanceOfMatcherTest extends ApplicationTest {
2727

2828
@Test
2929
public void matchesWithClass() {

‎src/test/java/javafxlibrary/utils/HelperFunctionsTests/CallMethodTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import javafx.scene.control.Button;
44
import javafx.stage.Stage;
5-
import javafxlibrary.TestFxAdapterTest;
5+
import org.testfx.framework.junit.ApplicationTest;
66
import javafxlibrary.exceptions.JavaFXLibraryNonFatalException;
77
import javafxlibrary.utils.HelperFunctions;
88
import org.junit.Assert;
@@ -15,7 +15,7 @@
1515
import static testutils.TestFunctions.setupStageInJavaFXThread;
1616
import static testutils.TestFunctions.waitForEventsInJavaFXThread;
1717

18-
public class CallMethodTest extends TestFxAdapterTest {
18+
public class CallMethodTest extends ApplicationTest {
1919

2020
@Rule
2121
public ExpectedException thrown = ExpectedException.none();

‎src/test/java/javafxlibrary/utils/HelperFunctionsTests/GetAllNodesTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import javafx.scene.control.TextField;
77
import javafx.scene.layout.HBox;
88
import javafx.scene.layout.VBox;
9-
import javafxlibrary.TestFxAdapterTest;
9+
import org.testfx.framework.junit.ApplicationTest;
1010
import javafxlibrary.utils.HelperFunctions;
1111
import org.junit.Assert;
1212
import org.junit.Test;
@@ -15,7 +15,7 @@
1515
import java.util.Arrays;
1616
import java.util.List;
1717

18-
public class GetAllNodesTest extends TestFxAdapterTest {
18+
public class GetAllNodesTest extends ApplicationTest {
1919

2020
private List<Node> children = new ArrayList<>();
2121

‎src/test/java/javafxlibrary/utils/HelperFunctionsTests/IsCompatibleTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
package javafxlibrary.utils.HelperFunctionsTests;
22

33
import javafx.scene.control.Button;
4-
import javafxlibrary.TestFxAdapterTest;
4+
import org.testfx.framework.junit.ApplicationTest;
55
import javafxlibrary.utils.HelperFunctions;
66
import org.junit.Assert;
77
import org.junit.Test;
88

99
import java.util.ArrayList;
1010

11-
public class IsCompatibleTest extends TestFxAdapterTest {
11+
public class IsCompatibleTest extends ApplicationTest {
1212

1313
@Test
1414
public void isCompatible_TestAllValidTypes() {

‎src/test/java/javafxlibrary/utils/HelperFunctionsTests/ObjectToNodeTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import javafx.scene.Node;
44
import javafx.scene.control.Button;
5-
import javafxlibrary.TestFxAdapterTest;
5+
import org.testfx.framework.junit.ApplicationTest;
66
import javafxlibrary.exceptions.JavaFXLibraryNonFatalException;
77
import javafxlibrary.utils.finder.Finder;
88
import javafxlibrary.utils.HelperFunctions;
@@ -15,7 +15,7 @@
1515
import org.junit.Test;
1616
import org.junit.rules.ExpectedException;
1717

18-
public class ObjectToNodeTest extends TestFxAdapterTest {
18+
public class ObjectToNodeTest extends ApplicationTest {
1919

2020
@Mocked
2121
private Finder finder;

‎src/test/java/javafxlibrary/utils/HelperFunctionsTests/ParseClassTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
package javafxlibrary.utils.HelperFunctionsTests;
22

3-
import javafxlibrary.TestFxAdapterTest;
3+
import org.testfx.framework.junit.ApplicationTest;
44
import javafxlibrary.exceptions.JavaFXLibraryNonFatalException;
55
import javafxlibrary.utils.HelperFunctions;
66
import org.junit.Assert;
77
import org.junit.Rule;
88
import org.junit.Test;
99
import org.junit.rules.ExpectedException;
1010

11-
public class ParseClassTest extends TestFxAdapterTest {
11+
public class ParseClassTest extends ApplicationTest {
1212

1313
@Rule
1414
public ExpectedException thrown = ExpectedException.none();

‎src/test/java/javafxlibrary/utils/HelperFunctionsTests/PrintTreeStructureTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import javafx.scene.control.Label;
55
import javafx.scene.layout.HBox;
66
import javafx.scene.layout.VBox;
7-
import javafxlibrary.TestFxAdapterTest;
7+
import org.testfx.framework.junit.ApplicationTest;
88
import javafxlibrary.utils.HelperFunctions;
99
import org.junit.After;
1010
import org.junit.Assert;
@@ -14,7 +14,7 @@
1414
import java.io.ByteArrayOutputStream;
1515
import java.io.PrintStream;
1616

17-
public class PrintTreeStructureTest extends TestFxAdapterTest {
17+
public class PrintTreeStructureTest extends ApplicationTest {
1818

1919
private final ByteArrayOutputStream outContent = new ByteArrayOutputStream();
2020
private final PrintStream originalOut = System.out;

‎src/test/java/javafxlibrary/utils/HelperFunctionsTests/WaitForProgressBarToFinishTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
package javafxlibrary.utils.HelperFunctionsTests;
22

33
import javafx.scene.control.ProgressBar;
4-
import javafxlibrary.TestFxAdapterTest;
4+
import org.testfx.framework.junit.ApplicationTest;
55
import javafxlibrary.exceptions.JavaFXLibraryNonFatalException;
66
import javafxlibrary.utils.HelperFunctions;
77
import org.junit.Before;
88
import org.junit.Rule;
99
import org.junit.Test;
1010
import org.junit.rules.ExpectedException;
1111

12-
public class WaitForProgressBarToFinishTest extends TestFxAdapterTest {
12+
public class WaitForProgressBarToFinishTest extends ApplicationTest {
1313

1414
private ProgressBar progressBar;
1515

‎src/test/java/javafxlibrary/utils/HelperFunctionsTests/WaitUntilDisabledTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import javafx.scene.Node;
44
import javafx.scene.control.Button;
5-
import javafxlibrary.TestFxAdapterTest;
5+
import org.testfx.framework.junit.ApplicationTest;
66
import javafxlibrary.exceptions.JavaFXLibraryTimeoutException;
77
import javafxlibrary.utils.HelperFunctions;
88
import mockit.Mock;
@@ -13,7 +13,7 @@
1313
import org.junit.Test;
1414
import org.junit.rules.ExpectedException;
1515

16-
public class WaitUntilDisabledTest extends TestFxAdapterTest {
16+
public class WaitUntilDisabledTest extends ApplicationTest {
1717

1818
private Button button;
1919

‎src/test/java/javafxlibrary/utils/HelperFunctionsTests/WaitUntilDoesNotExistsTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import javafx.scene.Node;
44
import javafx.scene.control.Button;
5-
import javafxlibrary.TestFxAdapterTest;
5+
import org.testfx.framework.junit.ApplicationTest;
66
import javafxlibrary.exceptions.JavaFXLibraryTimeoutException;
77
import javafxlibrary.utils.HelperFunctions;
88
import javafxlibrary.utils.finder.Finder;
@@ -15,7 +15,7 @@
1515
import testutils.DelayedObject;
1616
import testutils.DelayedObjectRemoval;
1717

18-
public class WaitUntilDoesNotExistsTest extends TestFxAdapterTest {
18+
public class WaitUntilDoesNotExistsTest extends ApplicationTest {
1919

2020
@Mocked private Finder finder;
2121
private Button button;

‎src/test/java/javafxlibrary/utils/HelperFunctionsTests/WaitUntilEnabledTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import javafx.scene.Node;
44
import javafx.scene.control.Button;
5-
import javafxlibrary.TestFxAdapterTest;
5+
import org.testfx.framework.junit.ApplicationTest;
66
import javafxlibrary.exceptions.JavaFXLibraryNonFatalException;
77
import javafxlibrary.exceptions.JavaFXLibraryTimeoutException;
88
import javafxlibrary.utils.HelperFunctions;
@@ -11,7 +11,7 @@
1111
import org.junit.*;
1212
import org.junit.rules.ExpectedException;
1313

14-
public class WaitUntilEnabledTest extends TestFxAdapterTest {
14+
public class WaitUntilEnabledTest extends ApplicationTest {
1515

1616
private Button button;
1717

‎src/test/java/javafxlibrary/utils/HelperFunctionsTests/WaitUntilInvisibleTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import javafx.scene.Node;
44
import javafx.scene.control.Button;
5-
import javafxlibrary.TestFxAdapterTest;
5+
import org.testfx.framework.junit.ApplicationTest;
66
import javafxlibrary.exceptions.JavaFXLibraryTimeoutException;
77
import javafxlibrary.utils.HelperFunctions;
88
import mockit.Mock;
@@ -13,7 +13,7 @@
1313
import org.junit.Test;
1414
import org.junit.rules.ExpectedException;
1515

16-
public class WaitUntilInvisibleTest extends TestFxAdapterTest {
16+
public class WaitUntilInvisibleTest extends ApplicationTest {
1717

1818
private Button button;
1919

‎src/test/java/javafxlibrary/utils/HelperFunctionsTests/WaitUntilVisibleTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22

33
import javafx.scene.Node;
44
import javafx.scene.control.Button;
5-
import javafxlibrary.TestFxAdapterTest;
5+
import org.testfx.framework.junit.ApplicationTest;
66
import javafxlibrary.exceptions.JavaFXLibraryNonFatalException;
77
import javafxlibrary.exceptions.JavaFXLibraryTimeoutException;
88
import javafxlibrary.utils.HelperFunctions;
99
import mockit.*;
1010
import org.junit.*;
1111
import org.junit.rules.ExpectedException;
1212

13-
public class WaitUntilVisibleTest extends TestFxAdapterTest {
13+
public class WaitUntilVisibleTest extends ApplicationTest {
1414

1515
private Button button;
1616

0 commit comments

Comments
 (0)