Merge branch 'gh-4687'

spring-boot-cli/src/main/java/org/springframework/boot/cli/command/run/SpringApplicationRunner.java

@@ -22,6 +22,7 @@ import java.lang.reflect.Method;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 import java.util.logging.Level;
@@ -117,7 +118,8 @@ public class SpringApplicationRunner {
 	private Object[] compile() throws IOException {
 		Object[] compiledSources = this.compiler.compile(this.sources);
 		if (compiledSources.length == 0) {
-			throw new RuntimeException("No classes found in '" + this.sources + "'");
+			throw new RuntimeException(
+					"No classes found in '" + Arrays.toString(this.sources) + "'");
 		}
 		return compiledSources;
 	}

spring-boot-cli/src/main/java/org/springframework/boot/cli/command/test/TestRunner.java

@@ -19,6 +19,7 @@ package org.springframework.boot.cli.command.test;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 import org.springframework.boot.cli.compiler.GroovyCompiler;
@@ -55,7 +56,8 @@ public class TestRunner {
 	public void compileAndRunTests() throws Exception {
 		Object[] sources = this.compiler.compile(this.sources);
 		if (sources.length == 0) {
-			throw new RuntimeException("No classes found in '" + this.sources + "'");
+			throw new RuntimeException(
+					"No classes found in '" + Arrays.toString(this.sources) + "'");
 		}
 
 		// Run in new thread to ensure that the context classloader is setup

spring-boot-cli/src/test/java/org/springframework/boot/cli/command/run/SpringApplicationRunnerTests.java

+/*
+ * Copyright 2012-2015 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.boot.cli.command.run;
+
+import java.util.logging.Level;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+
+import static org.hamcrest.Matchers.equalTo;
+import static org.mockito.BDDMockito.given;
+import static org.mockito.Mockito.mock;
+
+/**
+ * Tests for {@link SpringApplicationRunner}.
+ *
+ * @author Andy Wilkinson
+ */
+public class SpringApplicationRunnerTests {
+
+	@Rule
+	public ExpectedException thrown = ExpectedException.none();
+
+	@Test
+	public void exceptionMessageWhenSourcesContainsNoClasses() throws Exception {
+		SpringApplicationRunnerConfiguration configuration = mock(
+				SpringApplicationRunnerConfiguration.class);
+		given(configuration.getClasspath()).willReturn(new String[] { "foo", "bar" });
+		given(configuration.getLogLevel()).willReturn(Level.INFO);
+		this.thrown.expect(RuntimeException.class);
+		this.thrown.expectMessage(equalTo("No classes found in '[foo, bar]'"));
+		new SpringApplicationRunner(configuration, new String[] { "foo", "bar" }).compileAndRun();
+	}
+
+}

spring-boot-cli/src/test/java/org/springframework/boot/cli/command/test/TestRunnerTests.java

+/*
+ * Copyright 2012-2015 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.boot.cli.command.test;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+
+import static org.hamcrest.Matchers.equalTo;
+import static org.mockito.BDDMockito.given;
+import static org.mockito.Mockito.mock;
+
+/**
+ * Tests for {@link TestRunner}.
+ *
+ * @author Andy Wilkinson
+ */
+public class TestRunnerTests {
+
+	@Rule
+	public ExpectedException thrown = ExpectedException.none();
+
+	@Test
+	public void exceptionMessageWhenSourcesContainsNoClasses() throws Exception {
+		TestRunnerConfiguration configuration = mock(TestRunnerConfiguration.class);
+		given(configuration.getClasspath()).willReturn(new String[0]);
+		this.thrown.expect(RuntimeException.class);
+		this.thrown.expectMessage(equalTo("No classes found in '[foo, bar]'"));
+		new TestRunner(configuration, new String[] { "foo", "bar" }, new String[0])
+				.compileAndRunTests();
+	}
+
+}