From bb35d18080baefdd21cbce8f8ca848907cb68ddc Mon Sep 17 00:00:00 2001 From: mnhock Date: Sun, 6 Dec 2015 14:39:59 +0100 Subject: [PATCH 1/2] Improve exception messages to properly include specified sources Closes gh-4687 --- .../boot/cli/command/run/SpringApplicationRunner.java | 4 +++- .../org/springframework/boot/cli/command/test/TestRunner.java | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/run/SpringApplicationRunner.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/run/SpringApplicationRunner.java index 8cca767f730..bc66001b03f 100644 --- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/run/SpringApplicationRunner.java +++ b/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; } diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/test/TestRunner.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/test/TestRunner.java index 138b677caa3..484191c0ba7 100644 --- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/test/TestRunner.java +++ b/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 From 2efc4b8332e52a48001cfa5ca684157399cbedfa Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Mon, 7 Dec 2015 13:19:28 +0000 Subject: [PATCH 2/2] Add tests to verify improved exception message formatting --- .../run/SpringApplicationRunnerTests.java | 50 +++++++++++++++++++ .../cli/command/test/TestRunnerTests.java | 47 +++++++++++++++++ 2 files changed, 97 insertions(+) create mode 100644 spring-boot-cli/src/test/java/org/springframework/boot/cli/command/run/SpringApplicationRunnerTests.java create mode 100644 spring-boot-cli/src/test/java/org/springframework/boot/cli/command/test/TestRunnerTests.java diff --git a/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/run/SpringApplicationRunnerTests.java b/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/run/SpringApplicationRunnerTests.java new file mode 100644 index 00000000000..c003f6635ab --- /dev/null +++ b/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/run/SpringApplicationRunnerTests.java @@ -0,0 +1,50 @@ +/* + * 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(); + } + +} diff --git a/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/test/TestRunnerTests.java b/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/test/TestRunnerTests.java new file mode 100644 index 00000000000..85d2e27c98c --- /dev/null +++ b/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/test/TestRunnerTests.java @@ -0,0 +1,47 @@ +/* + * 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(); + } + +}