Skip to content

S
spring-boot
Commit b5f0f971 authored by Dave Syer's avatar Dave Syer
Browse files
Options

Clean up TestCommand paraphenalia

parent 1ce13cc2
Show whitespace changes
Inline Side-by-side
Showing with 314 additions and 332 deletions
spring-boot-cli/pom.xml
View file @ b5f0f971
......@@ -33,10 +33,6 @@
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
</dependency>
<!-- Optional -->
<dependency>
<groupId>org.codehaus.groovy</groupId>
......@@ -48,11 +44,6 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.spockframework</groupId>
<artifactId>spock-core</artifactId>
<scope>test</scope>
</dependency>
<!-- Provided (to ensure in m2 repo for @grab to resolve) -->
<dependency>
<groupId>org.springframework.integration</groupId>
......@@ -87,8 +78,7 @@
<filtering>true</filtering>
</resource>
<resource>
<directory>testers</directory>
<targetPath>testers</targetPath>
<directory>src/main/groovy</directory>
</resource>
</resources>
<plugins>
......
spring-boot-cli/src/main/java/org/springframework/boot/cli/command/TestCommand.java
View file @ b5f0f971
......@@ -17,27 +17,27 @@
package org.springframework.boot.cli.command;
import groovy.lang.GroovyObject;
import joptsimple.OptionSet;
import org.apache.ivy.util.FileUtil;
import org.springframework.boot.cli.Log;
import org.springframework.boot.cli.command.tester.Failure;
import org.springframework.boot.cli.command.tester.TestResults;
import org.springframework.boot.cli.compiler.GroovyCompiler;
import org.springframework.boot.cli.compiler.GroovyCompilerConfiguration;
import java.io.File;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.io.PrintWriter;
import java.net.URL;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Scanner;
import java.util.Set;
import java.util.logging.Level;
import joptsimple.OptionSet;
import org.apache.ivy.util.FileUtil;
import org.springframework.boot.cli.Log;
import org.springframework.boot.cli.command.tester.Failure;
import org.springframework.boot.cli.command.tester.TestResults;
import org.springframework.boot.cli.compiler.GroovyCompiler;
import org.springframework.boot.cli.compiler.GroovyCompilerConfiguration;
/**
* Invokes testing for autocompiled scripts
*
......@@ -49,7 +49,7 @@ public class TestCommand extends OptionParsingCommand {
public TestCommand() {
super("test", "Test a groovy script", new TestOptionHandler());
this.testOptionHandler = (TestOptionHandler)this.getHandler();
this.testOptionHandler = (TestOptionHandler) this.getHandler();
}
@Override
......@@ -58,10 +58,11 @@ public class TestCommand extends OptionParsingCommand {
}
public TestResults getResults() {
return testOptionHandler.results;
return this.testOptionHandler.results;
}
private static class TestGroovyCompilerConfiguration implements GroovyCompilerConfiguration {
private static class TestGroovyCompilerConfiguration implements
GroovyCompilerConfiguration {
@Override
public boolean isGuessImports() {
return true;
......@@ -104,13 +105,12 @@ public class TestCommand extends OptionParsingCommand {
File[] files = getFileArguments(nonOptionArguments, testerFiles);
/*
* Need to compile the code twice: The first time automatically
* pulls in autoconfigured libraries including test tools. Then
* the compiled code can be scanned to see what libraries were
* activated. Then it can be recompiled, with appropriate tester
* groovy scripts included in the same classloading context. Then
* the testers can be fetched and invoked through reflection against
* the composite AST.
* Need to compile the code twice: The first time automatically pulls in
* autoconfigured libraries including test tools. Then the compiled code can
* be scanned to see what libraries were activated. Then it can be recompiled,
* with appropriate tester groovy scripts included in the same classloading
* context. Then the testers can be fetched and invoked through reflection
* against the composite AST.
*/
// Compile - Pass 1
Object[] sources = this.compiler.sources(files);
......@@ -120,14 +120,16 @@ public class TestCommand extends OptionParsingCommand {
check("org.junit.Test", sources);
testerFiles.add(locateSourceFromUrl("junit", "testers/junit.groovy"));
testing = true;
} catch (ClassNotFoundException e) {
}
catch (ClassNotFoundException e) {
}
try {
check("spock.lang.Specification", sources);
testerFiles.add(locateSourceFromUrl("spock", "testers/spock.groovy"));
testing = true;
} catch (ClassNotFoundException e) {
}
catch (ClassNotFoundException e) {
}
if (testing) {
......@@ -138,7 +140,6 @@ public class TestCommand extends OptionParsingCommand {
files = getFileArguments(nonOptionArguments, testerFiles);
sources = this.compiler.sources(files);
if (sources.length == 0) {
throw new RuntimeException("No classes found in '" + files + "'");
}
......@@ -149,11 +150,12 @@ public class TestCommand extends OptionParsingCommand {
List<Class<?>> compiled = new ArrayList<Class<?>>();
for (Object source : sources) {
if (source.getClass() == Class.class) {
Class<?> sourceClass = (Class<?>)source;
Class<?> sourceClass = (Class<?>) source;
if (sourceClass.getSuperclass().getName().equals("AbstractTester")) {
testers.add(sourceClass);
} else {
compiled.add((Class<?>)source);
}
else {
compiled.add((Class<?>) source);
}
}
}
......@@ -161,8 +163,8 @@ public class TestCommand extends OptionParsingCommand {
this.results = new TestResults();
for (Class<?> tester : testers) {
GroovyObject obj = (GroovyObject)tester.newInstance();
this.results.add((TestResults)obj.invokeMethod("findAndTest", compiled));
GroovyObject obj = (GroovyObject) tester.newInstance();
this.results.add((TestResults) obj.invokeMethod("findAndTest", compiled));
}
printReport(this.results);
......@@ -172,7 +174,8 @@ public class TestCommand extends OptionParsingCommand {
try {
File file = File.createTempFile(name, ".groovy");
file.deleteOnExit();
FileUtil.copy(getClass().getClassLoader().getResourceAsStream(path), file, null);
FileUtil.copy(getClass().getClassLoader().getResourceAsStream(path),
file, null);
return file;
}
catch (IOException ex) {
......@@ -181,13 +184,16 @@ public class TestCommand extends OptionParsingCommand {
}
}
private Class<?> check(String className, Object[] sources) throws ClassNotFoundException {
private Class<?> check(String className, Object[] sources)
throws ClassNotFoundException {
Class<?> classToReturn = null;
ClassNotFoundException classNotFoundException = null;
for (Object source : sources) {
try {
classToReturn = ((Class<?>)source).getClassLoader().loadClass(className);
} catch (ClassNotFoundException e) {
classToReturn = ((Class<?>) source).getClassLoader().loadClass(
className);
}
catch (ClassNotFoundException e) {
classNotFoundException = e;
}
}
......@@ -197,7 +203,6 @@ public class TestCommand extends OptionParsingCommand {
throw classNotFoundException;
}
private File[] getFileArguments(List<?> nonOptionArguments, Set<File> testerFiles) {
List<File> files = new ArrayList<File>();
for (Object option : nonOptionArguments) {
......@@ -215,7 +220,8 @@ public class TestCommand extends OptionParsingCommand {
URL url = getClass().getClassLoader().getResource(filename);
if (url != null) {
if (url.toString().startsWith("file:")) {
files.add(new File(url.toString().substring("file:".length())));
files.add(new File(url.toString().substring(
"file:".length())));
}
}
else {
......@@ -239,10 +245,10 @@ public class TestCommand extends OptionParsingCommand {
private void printReport(TestResults results) throws FileNotFoundException {
PrintWriter writer = new PrintWriter("results.txt");
String header = "Total: " + results.getRunCount() +
", Success: " + (results.getRunCount()-results.getFailureCount()) +
", : Failures: " + results.getFailureCount() + "\n" +
"Passed? " + results.wasSuccessful();
String header = "Total: " + results.getRunCount() + ", Success: "
+ (results.getRunCount() - results.getFailureCount())
+ ", : Failures: " + results.getFailureCount() + "\n" + "Passed? "
+ results.wasSuccessful();
String trailer = "";
String trace = "";
......
spring-boot-cli/src/main/resources/META-INF/springcli.properties deleted 100644 → 0
View file @ 1ce13cc2
groovy.version: ${groovy.version}
hamcrest.version: ${hamcrest.version}
jetty.version: ${jetty.version}
junit.version: ${junit.version}
reactor.version: ${reactor.version}
spock.version: ${spock.version}
spring.version: ${spring.version}
spring-batch.version: ${spring-batch.version}
spring-boot.version: ${project.version}
spring-rabbit.version: ${spring-rabbit.version}
spring-security.version: ${spring-security.version}
spring-integration.version: ${spring-integration.version}
spring-integration-groovydsl.version: ${spring-integration-groovydsl.version}
tomcat.version: ${tomcat.version}
spring-boot-cli/src/test/java/org/springframework/boot/cli/TestCommandIntegrationTests.java
View file @ b5f0f971
......@@ -54,7 +54,7 @@ public class TestCommandIntegrationTests {
@Test
public void noTests() throws Throwable {
TestCommand command = new TestCommand();
command.run("testscripts/book.groovy");
command.run("samples/book.groovy");
TestResults results = command.getResults();
assertEquals(0, results.getRunCount());
assertEquals(0, results.getFailureCount());
......@@ -64,7 +64,7 @@ public class TestCommandIntegrationTests {
@Test
public void empty() throws Exception {
TestCommand command = new TestCommand();
command.run("testscripts/empty.groovy");
command.run("samples/empty.groovy");
TestResults results = command.getResults();
assertEquals(0, results.getRunCount());
assertEquals(0, results.getFailureCount());
......@@ -75,9 +75,10 @@ public class TestCommandIntegrationTests {
public void noFile() throws Exception {
try {
TestCommand command = new TestCommand();
command.run("testscripts/nothing.groovy");
} catch (RuntimeException e) {
assertEquals("Can't find testscripts/nothing.groovy", e.getMessage());
command.run("samples/nothing.groovy");
}
catch (RuntimeException e) {
assertEquals("Can't find samples/nothing.groovy", e.getMessage());
throw e;
}
}
......@@ -85,7 +86,7 @@ public class TestCommandIntegrationTests {
@Test
public void appAndTestsInOneFile() throws Exception {
TestCommand command = new TestCommand();
command.run("testscripts/book_and_tests.groovy");
command.run("samples/book_and_tests.groovy");
TestResults results = command.getResults();
assertEquals(1, results.getRunCount());
assertEquals(0, results.getFailureCount());
......@@ -95,7 +96,7 @@ public class TestCommandIntegrationTests {
@Test
public void appInOneFileTestsInAnotherFile() throws Exception {
TestCommand command = new TestCommand();
command.run("testscripts/book.groovy", "testscripts/test.groovy");
command.run("samples/book.groovy", "samples/test.groovy");
TestResults results = command.getResults();
assertEquals(1, results.getRunCount());
assertEquals(0, results.getFailureCount());
......@@ -105,7 +106,7 @@ public class TestCommandIntegrationTests {
@Test
public void spockTester() throws Exception {
TestCommand command = new TestCommand();
command.run("testscripts/spock.groovy");
command.run("samples/spock.groovy");
TestResults results = command.getResults();
assertEquals(1, results.getRunCount());
assertEquals(0, results.getFailureCount());
......@@ -115,7 +116,7 @@ public class TestCommandIntegrationTests {
@Test
public void spockAndJunitTester() throws Exception {
TestCommand command = new TestCommand();
command.run("testscripts/spock.groovy", "testscripts/book_and_tests.groovy");
command.run("samples/spock.groovy", "samples/book_and_tests.groovy");
TestResults results = command.getResults();
assertEquals(2, results.getRunCount());
assertEquals(0, results.getFailureCount());
......
spring-boot-cli/src/test/resources/commands/handler.groovy
View file @ b5f0f971
package org.test.command
import joptsimple.OptionSet
@Grab("org.eclipse.jgit:org.eclipse.jgit:2.3.1.201302201838-r")
import org.eclipse.jgit.api.Git
@Grab("org.eclipse.jgit:org.eclipse.jgit:2.3.1.201302201838-r") @Grab("org.eclipse.jgit:org.eclipse.jgit:2.3.1.201302201838-r") @Grab("org.eclipse.jgit:org.eclipse.jgit:2.3.1.201302201838-r") @Grab("org.eclipse.jgit:org.eclipse.jgit:2.3.1.201302201838-r") @Grab("org.eclipse.jgit:org.eclipse.jgit:2.3.1.201302201838-r")
import java.lang.Object
class TestCommand extends OptionHandler {
void options() {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment