From abc1e5de8f43538095112ef9bb73f5aa2fdd97da Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Fri, 30 May 2014 17:21:40 +0100 Subject: [PATCH] Fix ifAnyMissingClasses to return false if no classes are missing Fixes #1003 --- .../cli/compiler/DependencyCustomizer.java | 2 +- .../compiler/DependencyCustomizerTests.java | 141 ++++++++++++++++++ 2 files changed, 142 insertions(+), 1 deletion(-) create mode 100644 spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/DependencyCustomizerTests.java diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/DependencyCustomizer.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/DependencyCustomizer.java index c2f4b06e90d..5554f088dd0 100644 --- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/DependencyCustomizer.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/DependencyCustomizer.java @@ -96,7 +96,7 @@ public class DependencyCustomizer { return true; } } - return DependencyCustomizer.this.canAdd(); + return false; } }; } diff --git a/spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/DependencyCustomizerTests.java b/spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/DependencyCustomizerTests.java new file mode 100644 index 00000000000..0d9ecef2a64 --- /dev/null +++ b/spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/DependencyCustomizerTests.java @@ -0,0 +1,141 @@ +/* + * Copyright 2012-2014 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; + +import groovy.lang.Grab; +import groovy.lang.GroovyClassLoader; + +import java.util.List; + +import org.codehaus.groovy.ast.AnnotationNode; +import org.codehaus.groovy.ast.ClassNode; +import org.codehaus.groovy.ast.ModuleNode; +import org.codehaus.groovy.ast.expr.ConstantExpression; +import org.codehaus.groovy.control.SourceUnit; +import org.junit.Before; +import org.junit.Test; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; +import org.springframework.boot.cli.compiler.dependencies.ArtifactCoordinatesResolver; + +import static org.junit.Assert.assertEquals; +import static org.mockito.Mockito.when; + +/** + * Tests for {@link DependencyCustomizer} + * + * @author Andy Wilkinson + */ +public class DependencyCustomizerTests { + + private final ModuleNode moduleNode = new ModuleNode((SourceUnit) null); + + private final ClassNode classNode = new ClassNode(DependencyCustomizerTests.class); + + @Mock + private ArtifactCoordinatesResolver resolver; + + private DependencyCustomizer dependencyCustomizer; + + @Before + public void setUp() { + MockitoAnnotations.initMocks(this); + + when(this.resolver.getGroupId("spring-boot-starter-logging")).thenReturn( + "org.springframework.boot"); + when(this.resolver.getVersion("spring-boot-starter-logging")).thenReturn("1.2.3"); + + this.moduleNode.addClass(this.classNode); + this.dependencyCustomizer = new DependencyCustomizer(new GroovyClassLoader( + getClass().getClassLoader()), this.moduleNode, this.resolver); + } + + @Test + public void basicAdd() { + this.dependencyCustomizer.add("spring-boot-starter-logging"); + List grabAnnotations = this.classNode + .getAnnotations(new ClassNode(Grab.class)); + assertEquals(1, grabAnnotations.size()); + AnnotationNode annotationNode = grabAnnotations.get(0); + assertGrabAnnotation(annotationNode, "org.springframework.boot", + "spring-boot-starter-logging", true); + } + + @Test + public void anyMissingClassesWithMissingClassesPerformsAdd() { + this.dependencyCustomizer.ifAnyMissingClasses("does.not.Exist").add( + "spring-boot-starter-logging"); + assertEquals(1, this.classNode.getAnnotations(new ClassNode(Grab.class)).size()); + } + + @Test + public void anyMissingClassesWithMixtureOfClassesPerformsAdd() { + this.dependencyCustomizer.ifAnyMissingClasses(getClass().getName(), + "does.not.Exist").add("spring-boot-starter-logging"); + assertEquals(1, this.classNode.getAnnotations(new ClassNode(Grab.class)).size()); + } + + @Test + public void anyMissingClassesWithNoMissingClassesDoesNotPerformAdd() { + this.dependencyCustomizer.ifAnyMissingClasses(getClass().getName()).add( + "spring-boot-starter-logging"); + assertEquals(0, this.classNode.getAnnotations(new ClassNode(Grab.class)).size()); + } + + @Test + public void allMissingClassesWithNoMissingClassesDoesNotPerformAdd() { + this.dependencyCustomizer.ifAllMissingClasses(getClass().getName()).add( + "spring-boot-starter-logging"); + assertEquals(0, this.classNode.getAnnotations(new ClassNode(Grab.class)).size()); + } + + @Test + public void allMissingClassesWithMixtureOfClassesDoesNotPerformAdd() { + this.dependencyCustomizer.ifAllMissingClasses(getClass().getName(), + "does.not.Exist").add("spring-boot-starter-logging"); + assertEquals(0, this.classNode.getAnnotations(new ClassNode(Grab.class)).size()); + } + + @Test + public void allMissingClassesWithAllClassesMissingPerformsAdd() { + this.dependencyCustomizer.ifAllMissingClasses("does.not.Exist", + "does.not.exist.Either").add("spring-boot-starter-logging"); + assertEquals(1, this.classNode.getAnnotations(new ClassNode(Grab.class)).size()); + } + + @Test + public void nonTransitiveAdd() { + this.dependencyCustomizer.add("spring-boot-starter-logging", false); + List grabAnnotations = this.classNode + .getAnnotations(new ClassNode(Grab.class)); + assertEquals(1, grabAnnotations.size()); + AnnotationNode annotationNode = grabAnnotations.get(0); + assertGrabAnnotation(annotationNode, "org.springframework.boot", + "spring-boot-starter-logging", false); + } + + private void assertGrabAnnotation(AnnotationNode annotationNode, String group, + String module, boolean transitive) { + assertEquals(group, getMemberValue(annotationNode, "group")); + assertEquals(module, getMemberValue(annotationNode, "module")); + assertEquals(transitive, getMemberValue(annotationNode, "transitive")); + } + + private Object getMemberValue(AnnotationNode annotationNode, String member) { + return ((ConstantExpression) annotationNode.getMember(member)).getValue(); + } +}