From 9a5be9f4cd2caece325a33e820f3acd040ddf309 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 8 Jan 2014 11:43:59 +0000 Subject: [PATCH] Revert "Test that auto configurations can be added by init scripts" The test passes locally, both in Eclipse and on the command line, but fails on the CI server. Revert the addition of the test while I hopefully figure out why. This reverts commit 2e81b1d0d0924f1a24c3c0dd2d686218cd701f06. --- .../CustomCompilerAutoConfiguration.java | 40 ------------------ .../boot/cli/command/InitCommandTests.java | 21 --------- ...oot.cli.compiler.CompilerAutoConfiguration | 1 - .../custom/custom/0.0.1/custom-0.0.1.jar | Bin 3123 -> 2710 bytes 4 files changed, 62 deletions(-) delete mode 100644 spring-boot-cli/src/test/java/cli/command/CustomCompilerAutoConfiguration.java delete mode 100644 spring-boot-cli/src/test/plugins/custom/META-INF/services/org.springframework.boot.cli.compiler.CompilerAutoConfiguration diff --git a/spring-boot-cli/src/test/java/cli/command/CustomCompilerAutoConfiguration.java b/spring-boot-cli/src/test/java/cli/command/CustomCompilerAutoConfiguration.java deleted file mode 100644 index 7da36c57c09..00000000000 --- a/spring-boot-cli/src/test/java/cli/command/CustomCompilerAutoConfiguration.java +++ /dev/null @@ -1,40 +0,0 @@ -/* - * 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 cli.command; - -import groovy.lang.GroovyClassLoader; - -import org.codehaus.groovy.ast.ClassNode; -import org.codehaus.groovy.classgen.GeneratorContext; -import org.codehaus.groovy.control.CompilationFailedException; -import org.codehaus.groovy.control.SourceUnit; -import org.springframework.boot.cli.compiler.CompilerAutoConfiguration; -import org.springframework.boot.cli.compiler.GroovyCompilerConfiguration; - -/** - * @author Andy Wilkinson - */ -public class CustomCompilerAutoConfiguration extends CompilerAutoConfiguration { - - @Override - public void apply(GroovyClassLoader loader, - GroovyCompilerConfiguration configuration, GeneratorContext generatorContext, - SourceUnit source, ClassNode classNode) throws CompilationFailedException { - System.out.println("Customising compiler configuration"); - } - -} diff --git a/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/InitCommandTests.java b/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/InitCommandTests.java index b913bf0adef..f6020ef3b95 100644 --- a/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/InitCommandTests.java +++ b/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/InitCommandTests.java @@ -18,8 +18,6 @@ package org.springframework.boot.cli.command; import groovy.lang.GroovyClassLoader; -import java.util.ServiceLoader; - import org.junit.After; import org.junit.Before; import org.junit.Rule; @@ -27,9 +25,6 @@ import org.junit.Test; import org.springframework.boot.OutputCapture; import org.springframework.boot.cli.Command; import org.springframework.boot.cli.SpringCli; -import org.springframework.boot.cli.compiler.CompilerAutoConfiguration; - -import cli.command.CustomCompilerAutoConfiguration; import static org.junit.Assert.assertTrue; import static org.mockito.Matchers.any; @@ -72,22 +67,6 @@ public class InitCommandTests { this.command.run("src/test/resources/grab.groovy"); verify(this.cli, times(this.defaultCount + 1)).register(any(Command.class)); assertTrue(this.output.toString().contains("Hello Grab")); - - Iterable autoConfigurations = ServiceLoader.load( - CompilerAutoConfiguration.class, Thread.currentThread() - .getContextClassLoader()); - - boolean foundCustomConfiguration = false; - - for (CompilerAutoConfiguration autoConfiguration : autoConfigurations) { - if (CustomCompilerAutoConfiguration.class.getName().equals( - autoConfiguration.getClass().getName())) { - foundCustomConfiguration = true; - break; - } - } - - assertTrue(foundCustomConfiguration); } @Test diff --git a/spring-boot-cli/src/test/plugins/custom/META-INF/services/org.springframework.boot.cli.compiler.CompilerAutoConfiguration b/spring-boot-cli/src/test/plugins/custom/META-INF/services/org.springframework.boot.cli.compiler.CompilerAutoConfiguration deleted file mode 100644 index c59f47ea9ec..00000000000 --- a/spring-boot-cli/src/test/plugins/custom/META-INF/services/org.springframework.boot.cli.compiler.CompilerAutoConfiguration +++ /dev/null @@ -1 +0,0 @@ -cli.command.CustomCompilerAutoConfiguration \ No newline at end of file diff --git a/spring-boot-cli/src/test/plugins/custom/custom/0.0.1/custom-0.0.1.jar b/spring-boot-cli/src/test/plugins/custom/custom/0.0.1/custom-0.0.1.jar index 062524811f1debb1be3f9e66a33f10aaf39583fe..6623163c9317783856e79ad492f9da94a11c282c 100644 GIT binary patch literal 2710 zcmb_eOK%%h6h7CFj6HGsa9(wjwBrU^J5}tqDj;wv1UH5#c52B{B!omY9^blC#xvE- zxDbgAYs7{f5=(vnu%HMeHtf1Yhz0+Ji0{r!GLO1$kr?ZG?!Erb(kv$XJiu3 z-EYcwyh-qtrwnzr_qR58_FDC$r$pTt)Oz#l?E8RMquQjdFNHqs7RdX%-Q0!>_POUk1Tx%5nJ>u)uwNXWZ0h~7s#>p8OU8y`9q-S?T*v^FVJ&!U7 zG`DR=i#}er>RrUxMWnepLK=L7@oh$usC?Hzf)*#3t{#9m5^6_0DPjnkjPF^j-k>yQ zMEQ*(E2f@M`Uejps#pe;P-{6_r8&$BK9Ek)X{^4WGjtXRp=1khfzAI&nPT=Qnn@~A zprq_6S@MB_5{OWd=Al^JJ{i0hF_th-(QpFM#~$lmObAJ-1Z@@}O)wd#7_ebzMeM%Ax| zv8x;Prezph6J!#sL>w5sv>v3srw>il9ox7J9=x>NWc#Y!fA z6MhG8LA=>tDfJ=9`!i*}$I@q|ucGX!@M$+2sDJ>tTZF24550idqBmRW?y{8Z>7Lw7 z02O&o`UStWh>Iqhi%{+=rYEA2RwHVBQkM{F_%5m;(ldk}OzIj!`9CMh|A!tT>T0qD z5KTh(bdg9=s?#Jymcs|Pf9!foN+z3#Q1aV^WQ=G2jhIxHyjMeIf8iW2;@Gjy?2M4h N;qw~mao78&`4{wgdT9Uv literal 3123 zcmb7`eLT~98^?b&gh(DD$BQ+O-DC6A-SLpZSgo1R)QUs1SQCxSaEP4lI}+8QJXKRm zzUb!l#b7P5$ERSNizf!{z7vnc zplL{2I9xo(r*cjgCXbWBXguE6ca zbk+>(m}CQ42Zgj(v}GSf6jWmwDDf7cU{HiI0EmUHlR1Hgv#0*MNw%#VtJe%ERWB{ zbzr;bNCc9@XCzPdYn;If)8My13V*mhAkaX(4Qx^PLg~$AgnNIx5E3;!f)W-?0~LK- zxGm~ps$Vr6j(F7tJ`^}V zZD2G$vp@CbSXSO?J;8o;iVDjQyI%k9zQlI8&wi9nwc>Mb_PN?dvJLKL3L?z$)*N;^ zh;`ag0J9sZ?mJ5!=k*0nTQ++9sLHh06dq2A3kiCQ_w~C|ej(oEg5QA1J6~RuUEWd6 z?n3c29*GhM6rSkJK+Ri~pBngGQp-sR4CY_|iGZpXK^zEVx12fcx+!=Kgm>0=V#h7* z{@L_NYR%7oRl#clRKv!%zeGmo9k(hD6(ueQM+mBR$GZAu05B(>Ba*LC_A;1$?J_KW za0_>$&7>zUfXR#*tr-&qSjJ)p~vogH=J_V<5y2N{6G8NgK@Rb;wc>pn}q+ECtF=9zNi zKohByTbS}4TWCMu0BOEqJhQ=Gr()WREa)~>623%-aCWnIMzXlo`!3&9-QM}$N@W_7 zhly|Xno#px8;VMRAI5iuHLwlYKE}3@{#P`Kn_s7Ds7!2Y@n=RDwa4aP>$A9uK8b+vGQMcv1(!5?=G7%c+__I-sZ|nC*NF(i92e(utP6H)lmwH2j>BYj{X1|sJX6e&f2-s=6 z0wgS3+-Ymb*E((erA~i-kS#R54FA|u(?#op!b7BA+B(Ag&Dm7>X3U+*A_daMMs9Mh z)@^7N+otCC?hc+|g2mm=rj^k8oJm|d`Ko(ElJihNhrKPG7n4|P`+jch0Tsw6a@lLy zf3El5bdLhBG*COy|7=4iCD7#F9r(3XQB_xm8Wl^UMp=!MKIe1C5(+9~`N#2zouf`q z?>`i(XTBaGAGPWUDE8=MB)<~1twNb}I_+t(n^h<&w)Qv%KjY_KW6rG-;EdTG#YPz~ z6bsts#><1=`0~oN11=w3h4P(x&q*5G>X?4AcLgN>xW(vsPc@BOIt zm05xP@#AfebliDc2QS;8Eo^K5VT(zwiK-NK<`X@0&}Mf^S88&qdv146xE;EUJ(7lW z2qrzhu4dF{smXEbu-Y`QGg}Vih>|aDkE>%Q__wI4;gbJ~8FE&6bYFjXSCMLe6Jp3) zC!3{PbFlEO-m|=ky+-a2^Xm1JkHHY|s{uTH#;LQUyCr`b7{uP5jYrHO+Bn!}Hyl}aAx>+)84jr%UhB2yw$XW3LRZGV$pRyx zuC}EWYy%WEuj*S{R7eltbyq&lT~TpTsAqICz`V?0!VZJ3ta&G|34P39_MUSL8&obk z$y&z2WUB18cHh-~W%q#?Zo_(qUoxh)5Ti#$Mr6bv|1j#pUakO0ZUovZ_oi* zXsLaI8<31-L#6QqBq50{K@2G_0y8KBU&a_ohDP!7)8QfN$P