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 for WFCORE-3903, upgrade aesh 1.6, readline 1.9 and extensions 1.5 #3363

Merged
merged 1 commit into from Jun 18, 2018
Merged

Fix for WFCORE-3903, upgrade aesh 1.6, readline 1.9 and extensions 1.5 #3363

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 cli/src/main/java/org/jboss/as/cli/impl/CLICommandCompleter.java
View file
Open in desktop
Expand Up @@ -73,7 +73,7 @@ public static void transferOperation(AeshCompleteOperation from, AeshCompleteOpe
protected void doComplete(CommandContext ctx, AeshCompleteOperation op, Completer completer) {
String buffer = op.getBuffer();
int cursor = op.getCursor();
if (buffer.isEmpty()) {
if (buffer.isEmpty() || cursor == 0) {
completer.addAllCommandNames(ctx, op);
return;
}
Expand Down
6 changes: 3 additions & 3 deletions pom.xml
View file
Open in desktop
Expand Up @@ -140,9 +140,9 @@
<version.javax.json.javax-json-api>1.1.2</version.javax.json.javax-json-api>
<version.junit>4.12</version.junit>
<version.log4j>1.2.17</version.log4j>
<version.org.aesh>1.5</version.org.aesh>
<version.org.aesh-extensions>1.4</version.org.aesh-extensions>
<version.org.aesh-readline>1.8</version.org.aesh-readline>
<version.org.aesh>1.6</version.org.aesh>
<version.org.aesh-extensions>1.5</version.org.aesh-extensions>
<version.org.aesh-readline>1.9</version.org.aesh-readline>
<version.org.apache.ds>2.0.0-M15</version.org.apache.ds>
<!-- TODO Elytron - Bump to M17 -->
<version.org.apache.httpcomponents.httpclient>4.5.2</version.org.apache.httpcomponents.httpclient>
Expand Down
19 changes: 9 additions & 10 deletions ...e/standalone/src/test/java/org/jboss/as/test/integration/management/cli/MoreTestCase.java
View file
Open in desktop
Expand Up @@ -153,16 +153,15 @@ public void testPaging() throws Exception {
checkWithRegex(window, morePattern);
Assert.assertEquals(window, readlineConsole.getTerminalHeight(), countLines(window));

// Testing of key down is blocked by https://issues.jboss.org/browse/WFCORE-3545
// // it sends key down to the console what should return only one new line
// consoleWriter.print(Key.DOWN.getKeyValuesAsString());
// Assert.assertFalse(consoleWriter.checkError());
//
// window = queue.poll(10, TimeUnit.SECONDS);
// Assert.assertNotNull(window);
// checkWithRegex(window, morePattern);
// // we expect 2 because on the second line there is --More(%)-- string
// Assert.assertEquals(window,2, countLines(window));
// it sends key down to the console what should return only one new line
consoleWriter.print(Key.DOWN.getKeyValuesAsString());
Assert.assertFalse(consoleWriter.checkError());

window = queue.poll(10, TimeUnit.SECONDS);
Assert.assertNotNull(window);
checkWithRegex(window, morePattern);
// we expect 2 because on the second line there is --More(%)-- string
Assert.assertEquals(window,2, countLines(window));

consoleWriter.print("q");
Assert.assertFalse(consoleWriter.checkError());
Expand Down