Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix exceptions to do with init and intro keywords #71

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Fix exceptions to do with init and intro keywords #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
11131cd
Fix several exceptions to do with init and intro keywords
raider001 Dec 26, 2023
becda59
Update pom.xml
raider001 Dec 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Expand Up @@ -60,7 +60,7 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlet</artifactId>
<version>11.0.3</version>
<version>11.0.19</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
Expand Down
15 changes: 10 additions & 5 deletions src/main/java/org/robotframework/remoteserver/servlet/ServerMethods.java
View file
Open in desktop
Expand Up @@ -52,8 +52,10 @@ public ServerMethods(RemoteServerServlet servlet) {
public List<String> get_keyword_names() {
try {
List<String> names = servlet.getLibrary().getKeywordNames();
if (names == null || names.size() == 0)
if (names == null || names.isEmpty())
throw new RuntimeException("No keywords found in the test library");
if (!names.contains("__intro__")) names.add("__intro__");
if (!names.contains("__init__")) names.add("__init__");
if (!names.contains("stop_remote_server")) names.add("stop_remote_server");
return names;
} catch (Throwable e) {
Expand Down Expand Up @@ -157,12 +159,12 @@ public Map<String, Object> run_keyword(String keyword, List<String> args) {
* @return A string array of argument specifications for the given keyword.
*/
public List<String> get_keyword_arguments(String keyword) {
if (keyword.equalsIgnoreCase("stop_remote_server")) {
return Arrays.asList();
}
if (keyword.equalsIgnoreCase("stop_remote_server")) return Collections.emptyList();
if (keyword.equalsIgnoreCase("__intro__")) return Collections.emptyList();
if (keyword.equalsIgnoreCase("__init__")) return Collections.emptyList();
try {
List<String> args = servlet.getLibrary().getKeywordArguments(keyword);
return args == null ? Arrays.<String>asList() : args;
return args == null ? Collections.emptyList() : args;
} catch (Throwable e) {
log.warn("", e);
throw new RuntimeException(e);
Expand All @@ -177,6 +179,9 @@ public List<String> get_keyword_arguments(String keyword) {
* @return A documentation string for the given keyword.
*/
public String get_keyword_documentation(String keyword) {
if (keyword.equalsIgnoreCase("__init__")) {
return "";
}
if (keyword.equalsIgnoreCase("stop_remote_server")) {
return "Stops the remote server.\n\nThe server may be configured so that users cannot stop it.";
}
Expand Down