Skip to content

Commit 292a138

Browse files
psaikkonenpsaikkonen
committed
Merge remote-tracking branch 'origin/development' into development
2 parents 4593297 + d4272a6 commit 292a138

4 files changed

Lines changed: 36 additions & 28 deletions

File tree

‎pom.xml‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@
8080
<plugin>
8181
<groupId>org.apache.maven.plugins</groupId>
8282
<artifactId>maven-source-plugin</artifactId>
83-
<version>3.0.1</version>
83+
<version>3.1.0</version>
8484
<executions>
8585
<execution>
8686
<id>attach-sources</id>
@@ -93,7 +93,7 @@
9393
<plugin>
9494
<groupId>org.apache.maven.plugins</groupId>
9595
<artifactId>maven-javadoc-plugin</artifactId>
96-
<version>3.0.1</version>
96+
<version>3.1.1</version>
9797
<executions>
9898
<execution>
9999
<id>attach-javadocs</id>
@@ -107,7 +107,7 @@
107107
<plugin>
108108
<groupId>org.codehaus.mojo</groupId>
109109
<artifactId>build-helper-maven-plugin</artifactId>
110-
<version>1.10</version>
110+
<version>3.0.0</version>
111111
<executions>
112112
<execution>
113113
<id>attach-artifacts</id>
@@ -169,7 +169,7 @@
169169
<plugin>
170170
<groupId>org.apache.maven.plugins</groupId>
171171
<artifactId>maven-surefire-plugin</artifactId>
172-
<version>3.0.0-M1</version>
172+
<version>2.22.2</version>
173173
<configuration>
174174
<argLine>
175175
-javaagent:${settings.localRepository}/org/jmockit/jmockit/${jmockit.version}/jmockit-${jmockit.version}.jar
@@ -189,7 +189,7 @@
189189
</plugin>
190190
<plugin>
191191
<artifactId>maven-compiler-plugin</artifactId>
192-
<version>3.6.1</version>
192+
<version>3.8.1</version>
193193
<configuration>
194194
<source>1.8</source>
195195
<target>1.8</target>
@@ -198,7 +198,7 @@
198198
<plugin>
199199
<groupId>org.apache.maven.plugins</groupId>
200200
<artifactId>maven-jar-plugin</artifactId>
201-
<version>3.0.2</version>
201+
<version>3.2.0</version>
202202
<configuration>
203203
<archive>
204204
<manifest>
@@ -217,7 +217,7 @@
217217
</plugin>
218218
<plugin>
219219
<artifactId>maven-assembly-plugin</artifactId>
220-
<version>3.0.0</version>
220+
<version>3.2.0</version>
221221
<executions>
222222
<execution>
223223
<phase>package</phase>
@@ -240,7 +240,7 @@
240240
<plugin>
241241
<groupId>org.robotframework</groupId>
242242
<artifactId>robotframework-maven-plugin</artifactId>
243-
<version>1.4.7</version>
243+
<version>1.5.1</version>
244244
<executions>
245245
<execution>
246246
<id>acceptance tests</id>
@@ -251,6 +251,7 @@
251251
<configuration>
252252
<includes>
253253
<include>smoke</include>
254+
<!-- <include>set-datepicker</include>-->
254255
</includes>
255256
<excludes>
256257
<exclude>not-ready</exclude>
@@ -300,7 +301,7 @@
300301
<plugin>
301302
<groupId>org.apache.maven.plugins</groupId>
302303
<artifactId>maven-shade-plugin</artifactId>
303-
<version>3.1.0</version>
304+
<version>3.2.1</version>
304305
<executions>
305306
<execution>
306307
<phase>package</phase>
@@ -350,7 +351,7 @@
350351
<dependency>
351352
<groupId>org.apache.maven</groupId>
352353
<artifactId>maven-model</artifactId>
353-
<version>3.6.0</version>
354+
<version>3.6.2</version>
354355
</dependency>
355356
<dependency>
356357
<groupId>org.jmockit</groupId>
@@ -366,7 +367,7 @@
366367
<dependency>
367368
<groupId>org.testfx</groupId>
368369
<artifactId>testfx-core</artifactId>
369-
<version>4.0.15-alpha</version>
370+
<version>4.0.16-alpha</version>
370371
</dependency>
371372
<dependency>
372373
<groupId>org.testfx</groupId>
@@ -381,7 +382,7 @@
381382
<dependency>
382383
<groupId>org.robotframework</groupId>
383384
<artifactId>robotframework</artifactId>
384-
<version>3.0.4</version>
385+
<version>3.1.2</version>
385386
</dependency>
386387
<dependency>
387388
<groupId>org.hamcrest</groupId>
@@ -391,7 +392,7 @@
391392
<dependency>
392393
<groupId>com.google.guava</groupId>
393394
<artifactId>guava</artifactId>
394-
<version>27.0.1-jre</version>
395+
<version>28.1-jre</version>
395396
</dependency>
396397
<dependency>
397398
<groupId>com.github.ombre42</groupId>
@@ -401,7 +402,7 @@
401402
<dependency>
402403
<groupId>org.apache.commons</groupId>
403404
<artifactId>commons-lang3</artifactId>
404-
<version>3.7</version>
405+
<version>3.9</version>
405406
</dependency>
406407
<dependency>
407408
<groupId>commons-io</groupId>

‎src/main/java/JavaFXLibrary.java‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
import javax.script.ScriptEngineManager;
4545
import javax.script.ScriptException;
4646
import static javafxlibrary.utils.HelperFunctions.*;
47+
import static org.testfx.util.WaitForAsyncUtils.waitFor;
4748

4849
public class JavaFXLibrary extends AnnotationLibrary {
4950

@@ -64,7 +65,6 @@ public JavaFXLibrary() {
6465

6566
public JavaFXLibrary(boolean headless) {
6667
super(includePatterns);
67-
deleteScreenshotsFrom("report-images/imagecomparison");
6868
if (headless) {
6969
System.setProperty("testfx.robot", "glass");
7070
System.setProperty("testfx.headless", "true");
@@ -99,7 +99,7 @@ public Object runKeyword(String keywordName, Object[] args) {
9999
try {
100100
RobotLog.ignoreDuplicates();
101101
// timeout + 500 ms so that underlying timeout has a chance to expire first
102-
WaitForAsyncUtils.waitFor(getWaitUntilTimeout(TimeUnit.MILLISECONDS) + 500, TimeUnit.MILLISECONDS, () -> {
102+
waitFor(getWaitUntilTimeout(TimeUnit.MILLISECONDS) + 500, TimeUnit.MILLISECONDS, () -> {
103103

104104
try {
105105
retval.set(super.runKeyword(keywordName, finalArgs));
@@ -182,7 +182,7 @@ public static JavaFXLibrary getLibraryInstance() throws ScriptException {
182182

183183
public static void main(String[] args) throws Exception {
184184
JavaFXLibraryRemoteServer.configureLogging();
185-
System.out.println("-------------------- JavaFXLibrary --------------------- ");
185+
System.out.println("---------------------------= JavaFXLibrary =---------------------------- ");
186186
RemoteServer server = new JavaFXLibraryRemoteServer();
187187
server.putLibrary("/RPC2", new JavaFXLibrary());
188188
int port = 8270;
@@ -192,12 +192,13 @@ public static void main(String[] args) throws Exception {
192192
if (args.length > 0)
193193
port = Integer.parseInt(args[0]);
194194
else
195-
System.out.println("RemoteServer for JavaFXLibrary will be started at default port of: " + port +
196-
". If you wish to use another port, restart the library and give port number as an argument.");
195+
System.out.println("RemoteServer for JavaFXLibrary will be started at default port of: " + port + ".\n" +
196+
"If you wish to use another port, restart the library and give port number\n" +
197+
"as an argument.");
197198

198199
server.setPort(port);
199200
server.start();
200-
System.out.println("\n JavaFXLibrary " + ROBOT_LIBRARY_VERSION + " is now available at: " +
201+
System.out.println("\n JavaFXLibrary " + ROBOT_LIBRARY_VERSION + " is now available at: " +
201202
ipAddr.getHostAddress() + ":" + port + "\n");
202203

203204
} catch (NumberFormatException nfe) {

‎src/main/java/javafxlibrary/utils/HelperFunctions.java‎

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@
5454

5555
import javafx.scene.input.KeyCode;
5656
import org.testfx.service.query.PointQuery;
57-
import org.testfx.util.WaitForAsyncUtils;
5857

5958
import java.util.List;
6059
import java.util.concurrent.TimeUnit;
@@ -68,6 +67,9 @@
6867
import static javafxlibrary.utils.TestFxAdapter.objectMap;
6968
import static javafxlibrary.utils.TestFxAdapter.robot;
7069
import static org.testfx.matcher.base.NodeMatchers.*;
70+
import static org.testfx.util.WaitForAsyncUtils.waitFor;
71+
import static org.testfx.util.WaitForAsyncUtils.asyncFx;
72+
import static org.testfx.util.WaitForAsyncUtils.waitForFxEvents;
7173

7274
public class HelperFunctions {
7375

@@ -83,10 +85,15 @@ public static Node waitUntilExists(String target, int timeout, String timeUnit)
8385
+ timeout + ", timeUnit=" + timeUnit);
8486

8587
try {
86-
WaitForAsyncUtils.waitFor((long) timeout, getTimeUnit(timeUnit), () -> createFinder().find(target) != null);
87-
Node node = createFinder().find(target);
88+
waitFor(timeout, getTimeUnit(timeUnit), () -> {
89+
return asyncFx(() -> createFinder().find(target) != null).get();
90+
});
91+
Node node = asyncFx(() -> createFinder().find(target)).get();
8892
// TODO: Add null checks for node.getScene()
89-
WaitForAsyncUtils.waitFor((long) timeout, getTimeUnit(timeUnit), () -> hasValidCoordinates(node));
93+
waitFor(timeout, getTimeUnit(timeUnit), () -> {
94+
return asyncFx(() -> hasValidCoordinates(node)).get();
95+
});
96+
waitForFxEvents();
9097
return node;
9198
} catch (TimeoutException te) {
9299
throw new JavaFXLibraryTimeoutException("Given element \"" + target + "\" was not found within given timeout of "
@@ -108,7 +115,7 @@ public static Node waitUntilVisible(Object target, int timeout) {
108115
RobotLog.trace("Waiting until target \"" + target + "\" becomes visible, timeout=" + timeout);
109116

110117
try {
111-
WaitForAsyncUtils.waitFor((long) timeout, TimeUnit.SECONDS, () -> Matchers.is(isVisible()).matches(finalTarget));
118+
waitFor((long) timeout, TimeUnit.SECONDS, () -> Matchers.is(isVisible()).matches(finalTarget));
112119
return (Node) target;
113120
} catch (JavaFXLibraryNonFatalException nfe) {
114121
throw nfe;
@@ -129,7 +136,7 @@ public static Node waitUntilEnabled(Object target, int timeout) {
129136
RobotLog.trace("Waiting until target \"" + target + "\" becomes enabled, timeout=" + timeout);
130137

131138
try {
132-
WaitForAsyncUtils.waitFor((long) timeout, TimeUnit.SECONDS, () -> Matchers.is(isEnabled()).matches(finalTarget));
139+
waitFor((long) timeout, TimeUnit.SECONDS, () -> Matchers.is(isEnabled()).matches(finalTarget));
133140
return (Node) target;
134141
} catch (JavaFXLibraryNonFatalException nfe) {
135142
throw nfe;
@@ -143,7 +150,7 @@ public static Node waitUntilEnabled(Object target, int timeout) {
143150

144151
public static void waitForProgressBarToFinish(ProgressBar pb, int timeout) {
145152
try {
146-
WaitForAsyncUtils.waitFor((long) timeout, TimeUnit.SECONDS, () -> Matchers.is(ProgressBarMatchers.isComplete()).matches(pb));
153+
waitFor((long) timeout, TimeUnit.SECONDS, () -> Matchers.is(ProgressBarMatchers.isComplete()).matches(pb));
147154
} catch (TimeoutException te) {
148155
throw new JavaFXLibraryNonFatalException("Given ProgressBar did not complete in " + timeout + " seconds!");
149156
}

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import javafx.scene.Node;
44
import javafx.scene.control.Button;
55
import javafxlibrary.TestFxAdapterTest;
6-
import javafxlibrary.exceptions.JavaFXLibraryNonFatalException;
76
import javafxlibrary.exceptions.JavaFXLibraryTimeoutException;
87
import javafxlibrary.utils.finder.Finder;
98
import javafxlibrary.utils.HelperFunctions;

0 commit comments

Comments
 (0)