Skip to content

Commit b77b816

Browse files
authored
Merge pull request #31 from eficode/verification-keywords
add negative checking keywords, fixes #18
2 parents 8dff2e6 + 4e585aa commit b77b816

File tree

15 files changed

+849
-284
lines changed

15 files changed

+849
-284
lines changed

src/main/java/javafxlibrary/keywords/AdditionalKeywords/ApplicationLauncher.java

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -235,11 +235,23 @@ public void clearObjectMap() {
235235

236236

237237
@RobotKeyword("Returns the class name of currently active JavaFX Application")
238+
public String getCurrentApplication() {
239+
try {
240+
return getCurrentSessionApplicationName();
241+
} catch (Exception e) {
242+
throw new JavaFXLibraryNonFatalException("Problem getting current application name.", e);
243+
}
244+
}
245+
246+
@Deprecated
247+
@RobotKeyword("*DEPRECATED in version 0.6.0!* Use `Get Current Application` keyword instead.\n\n"
248+
+ "Returns the class name of currently active JavaFX Application\n")
238249
public String currentApplication() {
239250
try {
240251
return getCurrentSessionApplicationName();
241252
} catch (Exception e) {
242253
throw new JavaFXLibraryNonFatalException("Problem getting current application name.", e);
243254
}
244255
}
256+
245257
}

src/main/java/javafxlibrary/keywords/AdditionalKeywords/ConvenienceKeywords.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
public class ConvenienceKeywords extends TestFxAdapter {
5757

5858
@Deprecated
59-
@RobotKeyword("*DEPRECATED!!* Use keyword `Find` instead.\n\n" +
59+
@RobotKeyword("*DEPRECATED in version 0.6.0!* Use keyword `Find` instead.\n\n" +
6060
"finder that mimics _xpath_ style search.\n\n"
6161
+ "``query`` is a query locator, see `3.1 Using queries`.\n\n"
6262
+ "``failIfNotFound`` specifies if keyword should fail if nothing is found. By default it's false and "
@@ -139,7 +139,7 @@ public void callObjectMethodInFxApplicationThread(Object object, String method,
139139
}
140140

141141
@Deprecated
142-
@RobotKeyword("*DEPRECATED!!* Use keyword `Find` instead.\n\n"
142+
@RobotKeyword("*DEPRECATED in version 0.6.0!* Use keyword `Find` instead.\n\n"
143143
+ "Returns the *first* node matching the query. \n\n"
144144
+ "``query`` is the Class name String to use in lookup.\n"
145145
+ "\nExample:\n"
@@ -157,7 +157,7 @@ public Object findClass(final String query) {
157157
}
158158

159159
@Deprecated
160-
@RobotKeyword("*DEPRECATED!!* Use keyword `Find All` instead.\n\n"
160+
@RobotKeyword("*DEPRECATED in version 0.6.0!* Use keyword `Find All` instead.\n\n"
161161
+ "Returns *all* descendant nodes of given node matching the query. \n\n"
162162
+ "``node`` is the starting point Object:Node from where to start looking, see `3.2 Using objects`. \n\n"
163163
+ "``query`` is a query locator, see `3.1 Using queries`.\n\n"
@@ -196,7 +196,7 @@ public List<Object> findAllFromNode(Object node, String query) {
196196
}
197197

198198
@Deprecated
199-
@RobotKeyword("*DEPRECATED!!* Use keyword `Find All` instead.\n\n"
199+
@RobotKeyword("*DEPRECATED in version 0.6.0!* Use keyword `Find All` instead.\n\n"
200200
+ "Returns *all* nodes matching query AND given pseudo-class state. \r\n"
201201
+ "``query`` is a query locator, see `3.1 Using queries`.\n\n"
202202
+ "``pseudo`` is a String value specifying pseudo class value.\n\n"
@@ -235,7 +235,7 @@ public List<Object> findAllWithPseudoClass(String query, String pseudo) {
235235
}
236236

237237
@Deprecated
238-
@RobotKeyword("*DEPRECATED!!* Use keyword `Find` instead.\n\n"
238+
@RobotKeyword("*DEPRECATED in version 0.6.0!* Use keyword `Find` instead.\n\n"
239239
+ "Returns the *first* descendant node of given node matching the query. \n\n"
240240
+ "``node`` is the starting point Object:Node from where to start looking, see `3.2 Using objects`. \n\n"
241241
+ "``query`` is a query locator, see `3.1 Using queries`.\n\n"
@@ -437,7 +437,7 @@ public Set<PseudoClass> getPseudoClassStates(Object locator) {
437437

438438
// TODO: Should this be deleted? Find All From Node has the same functionality
439439
@Deprecated
440-
@RobotKeyword("*DEPRECATED!!* Use keyword `Find` instead.\n\n"
440+
@RobotKeyword("*DEPRECATED in version 0.6.0!* Use keyword `Find` instead.\n\n"
441441
+ "Returns *all* descendant nodes of given node matching the given Java class name. \n\n"
442442
+ "``locator`` is either a _query_ or _Object_ for node whose children will be queried, see "
443443
+ "`3.2 Using locators as keyword arguments`. \n\n"
@@ -488,7 +488,7 @@ public String getNodeText(Object locator) {
488488
}
489489

490490
@Deprecated
491-
@RobotKeyword("*DEPRECATED!!* Use keyword `Find` instead.\n\n"
491+
@RobotKeyword("*DEPRECATED in version 0.6.0!* Use keyword `Find` instead.\n\n"
492492
+ "Returns height value of the node. \n\n"
493493
+ "``locator`` is either a _query_ or _Object_ for a node whose getHeight method will be called, see "
494494
+ "`3. Locating or specifying UI elements`. \n\n")
@@ -582,7 +582,7 @@ public String getObjectClassName(Object locator) {
582582
}
583583

584584
@Deprecated
585-
@RobotKeyword("*DEPRECATED!!* Use keyword `Get Scene` instead.\n\n"
585+
@RobotKeyword("*DEPRECATED in version 0.6.0!* Use keyword `Get Scene` instead.\n\n"
586586
+"Returns given locators Scene object. \n\n"
587587
+ "``locator`` is either a _query_ or a _Node_, see `3.2 Using locators as keyword arguments`\n\n")
588588
@ArgumentNames({ "locator" })
@@ -661,7 +661,7 @@ public Object getPrimaryScreenBounds() {
661661

662662
@RobotKeyword("Returns the library version from POM file")
663663
public String getLibraryVersion() {
664-
return HelperFunctions.loadRobotLibraryVersion();
664+
return HelperFunctions.getVersion();
665665
}
666666

667667
@RobotKeyword("Returns the value of cell in the given location\n\n"

0 commit comments

Comments
 (0)