Add auto imports for integration testing

JUnit tests can now be @SpringApplicationConfiguration
and @IntegrationTest without any explicit imports. Also
makes @RunWith(SpringJUnit4ClassRunner) optional.

Fixes gh-969
This commit is contained in:
Dave Syer
2014-05-28 10:46:46 +01:00
parent 3d76d9d73b
commit 3d9da64382
6 changed files with 100 additions and 3 deletions

View File

@@ -38,12 +38,14 @@ public class JUnitCompilerAutoConfiguration extends CompilerAutoConfiguration {
@Override
public void applyDependencies(DependencyCustomizer dependencies)
throws CompilationFailedException {
dependencies.add("junit").add("spring-test", "hamcrest-library");
dependencies.add("spring-boot-starter-test");
}
@Override
public void applyImports(ImportCustomizer imports) throws CompilationFailedException {
imports.addStarImports("org.junit").addStaticStars("org.junit.Assert")
public void applyImports(ImportCustomizer imports)
throws CompilationFailedException {
imports.addStarImports("org.junit")
.addStaticStars("org.junit.Assert")
.addStaticStars("org.hamcrest.MatcherAssert")
.addStaticStars("org.hamcrest.Matchers");
}

View File

@@ -0,0 +1,64 @@
/*
* Copyright 2012-2013 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.compiler.autoconfigure;
import groovy.lang.GroovyClassLoader;
import org.codehaus.groovy.ast.AnnotationNode;
import org.codehaus.groovy.ast.ClassHelper;
import org.codehaus.groovy.ast.ClassNode;
import org.codehaus.groovy.ast.expr.ClassExpression;
import org.codehaus.groovy.classgen.GeneratorContext;
import org.codehaus.groovy.control.CompilationFailedException;
import org.codehaus.groovy.control.SourceUnit;
import org.codehaus.groovy.control.customizers.ImportCustomizer;
import org.springframework.boot.cli.compiler.AstUtils;
import org.springframework.boot.cli.compiler.CompilerAutoConfiguration;
import org.springframework.boot.cli.compiler.GroovyCompilerConfiguration;
/**
* {@link CompilerAutoConfiguration} for Spring Test
*
* @author Dave Syer
*/
public class SpringTestCompilerAutoConfiguration extends CompilerAutoConfiguration {
@Override
public boolean matches(ClassNode classNode) {
return AstUtils.hasAtLeastOneAnnotation(classNode, "SpringApplicationConfiguration");
}
@Override
public void apply(GroovyClassLoader loader,
GroovyCompilerConfiguration configuration,
GeneratorContext generatorContext, SourceUnit source,
ClassNode classNode) throws CompilationFailedException {
if (!AstUtils.hasAtLeastOneAnnotation(classNode, "RunWith")) {
AnnotationNode runwith = new AnnotationNode(ClassHelper.make("RunWith"));
runwith.addMember("value", new ClassExpression(ClassHelper.make("SpringJUnit4ClassRunner")));
classNode.addAnnotation(runwith);
}
}
@Override
public void applyImports(ImportCustomizer imports)
throws CompilationFailedException {
imports.addStarImports("org.junit.runner")
.addStarImports("org.springframework.boot.test")
.addStarImports("org.springframework.test.context.junit4");
}
}

View File

@@ -21,6 +21,7 @@ package org.springframework.boot.cli.compiler.grape;
*
* @author Andy Wilkinson
*/
@SuppressWarnings("serial")
public class DependencyResolutionFailedException extends RuntimeException {
/**