From 73bf00bb4428d084c50d3627fa0a6470d515873c Mon Sep 17 00:00:00 2001
From: Eric Bottard <eric.bottard+github@gmail.com>
Date: Wed, 30 Aug 2017 19:06:26 +0200
Subject: [PATCH] Fix #142

---
 .../java/org/springframework/shell/Shell.java |  2 +-
 .../org/springframework/shell/ShellTest.java  | 30 +++++++++++++++----
 2 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/spring-shell-core/src/main/java/org/springframework/shell/Shell.java b/spring-shell-core/src/main/java/org/springframework/shell/Shell.java
index b53f4a1a..78d68660 100644
--- a/spring-shell-core/src/main/java/org/springframework/shell/Shell.java
+++ b/spring-shell-core/src/main/java/org/springframework/shell/Shell.java
@@ -284,7 +284,7 @@ public class Shell implements CommandRegistry {
 	 */
 	private String findLongestCommand(String prefix) {
 		String result = methodTargets.keySet().stream()
-			.filter(prefix::startsWith)
+			.filter(command -> prefix.equals(command) || prefix.startsWith(command + " "))
 			.reduce("", (c1, c2) -> c1.length() > c2.length() ? c1 : c2);
 		return "".equals(result) ? null : result;
 	}
diff --git a/spring-shell-core/src/test/java/org/springframework/shell/ShellTest.java b/spring-shell-core/src/test/java/org/springframework/shell/ShellTest.java
index 933af916..ca4591b1 100644
--- a/spring-shell-core/src/test/java/org/springframework/shell/ShellTest.java
+++ b/spring-shell-core/src/test/java/org/springframework/shell/ShellTest.java
@@ -33,6 +33,7 @@ import org.springframework.context.ApplicationContext;
 
 import static org.assertj.core.api.Assertions.fail;
 import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.isA;
 import static org.mockito.Mockito.doThrow;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
@@ -74,7 +75,7 @@ public class ShellTest {
 	@Test
 	public void commandMatch() throws IOException {
 		when(parameterResolver.supports(any())).thenReturn(true);
-		when(inputProvider.readInput()).thenReturn(() -> "hello world how are you doing ?");
+		when(inputProvider.readInput()).thenReturn(() -> "hello world how are you doing ?", null);
 		valueResult = new ValueResult(null, "test");
 		when(parameterResolver.resolve(any(), any())).thenReturn(valueResult);
 		doThrow(new Exit()).when(resultHandler).handleResult(any());
@@ -94,8 +95,8 @@ public class ShellTest {
 
 	@Test
 	public void commandNotFound() throws IOException {
-		when(inputProvider.readInput()).thenReturn(() -> "hello world how are you doing ?");
-		doThrow(new Exit()).when(resultHandler).handleResult(any(CommandNotFound.class));
+		when(inputProvider.readInput()).thenReturn(() -> "hello world how are you doing ?", null);
+		doThrow(new Exit()).when(resultHandler).handleResult(isA(CommandNotFound.class));
 
 		shell.methodTargets = Collections.singletonMap("bonjour", MethodTarget.of("helloWorld", this, "Say hello"));
 
@@ -108,10 +109,27 @@ public class ShellTest {
 		}
 	}
 
+	@Test
+	// See https://github.com/spring-projects/spring-shell/issues/142
+	public void commandNotFoundPrefix() throws IOException {
+		when(inputProvider.readInput()).thenReturn(() -> "helloworld how are you doing ?", null);
+		doThrow(new Exit()).when(resultHandler).handleResult(isA(CommandNotFound.class));
+
+		shell.methodTargets = Collections.singletonMap("hello", MethodTarget.of("helloWorld", this, "Say hello"));
+
+		try {
+			shell.run(inputProvider);
+			fail("Exit expected");
+		}
+		catch (Exit expected) {
+
+		}
+	}
+
 	@Test
 	public void noCommand() throws IOException {
 		when(parameterResolver.supports(any())).thenReturn(true);
-		when(inputProvider.readInput()).thenReturn(() -> "", () -> "hello world how are you doing ?");
+		when(inputProvider.readInput()).thenReturn(() -> "", () -> "hello world how are you doing ?", null);
 		valueResult = new ValueResult(null, "test");
 		when(parameterResolver.resolve(any(), any())).thenReturn(valueResult);
 		doThrow(new Exit()).when(resultHandler).handleResult(any());
@@ -132,8 +150,8 @@ public class ShellTest {
 	@Test
 	public void commandThrowingAnException() throws IOException {
 		when(parameterResolver.supports(any())).thenReturn(true);
-		when(inputProvider.readInput()).thenReturn(() -> "fail");
-		doThrow(new Exit()).when(resultHandler).handleResult(any(SomeException.class));
+		when(inputProvider.readInput()).thenReturn(() -> "fail", null);
+		doThrow(new Exit()).when(resultHandler).handleResult(isA(SomeException.class));
 
 		shell.methodTargets = Collections.singletonMap("fail", MethodTarget.of("failing", this, "Will throw an exception"));