@@ -47,22 +47,22 @@ class DevelocityConventionsPluginIntegrationTests {
47
47
@ Test
48
48
void whenThePluginIsAppliedThenBuildScanConventionsAreApplied (@ TempDir File projectDir ) {
49
49
prepareProject (projectDir );
50
- BuildResult result = build (projectDir , "6.0.1" , " verifyBuildScanConfig" );
50
+ BuildResult result = build (projectDir , "verifyBuildScanConfig" );
51
51
assertThat (result .getOutput ()).contains ("Build scan server: https://ge.spring.io" );
52
52
assertThat (result .getOutput ()).contains ("Capture task input files: true" );
53
53
}
54
54
55
55
@ Test
56
56
void whenThePluginIsAppliedThenBuildCacheConventionsAreApplied (@ TempDir File projectDir ) {
57
57
prepareProject (projectDir );
58
- BuildResult result = build (projectDir , "6.0.1" , " verifyBuildCacheConfig" );
58
+ BuildResult result = build (projectDir , "verifyBuildCacheConfig" );
59
59
assertThat (result .getOutput ()).contains ("Build cache server: https://ge.spring.io" );
60
60
}
61
61
62
62
@ Test
63
63
void whenThePluginIsAppliedAndBuildScansAreDisabledThenBuildScanConventionsAreNotApplied (@ TempDir File projectDir ) {
64
64
prepareProject (projectDir );
65
- BuildResult result = build (projectDir , "6.0.1" , " verifyBuildScanConfig" , "--no-scan" );
65
+ BuildResult result = build (projectDir , "verifyBuildScanConfig" , "--no-scan" );
66
66
assertThat (result .getOutput ()).contains ("Build scan server: null" );
67
67
assertThat (result .getOutput ()).contains ("Capture task input files: false" );
68
68
}
@@ -72,7 +72,7 @@ void whenThePluginIsAppliedAndTheSpringBuildTypeIsNotOssThenBuildScanConventions
72
72
@ TempDir File projectDir ) {
73
73
prepareProject (projectDir );
74
74
write (new File (projectDir , "gradle.properties" ), (writer ) -> writer .println ("spring.build-type=other" ));
75
- BuildResult result = build (projectDir , "6.0.1" , " verifyBuildScanConfig" );
75
+ BuildResult result = build (projectDir , "verifyBuildScanConfig" );
76
76
assertThat (result .getOutput ()).contains ("Build scan server: null" );
77
77
assertThat (result .getOutput ()).contains ("Capture task input files: false" );
78
78
}
@@ -81,7 +81,7 @@ void whenThePluginIsAppliedAndTheSpringBuildTypeIsNotOssThenBuildScanConventions
81
81
void whenThePluginIsAppliedAndTheSpringBuildTypeIsOssThenBuildScanConventionsAreApplied (@ TempDir File projectDir ) {
82
82
prepareProject (projectDir );
83
83
write (new File (projectDir , "gradle.properties" ), (writer ) -> writer .println ("spring.build-type=oss" ));
84
- BuildResult result = build (projectDir , "6.0.1" , " verifyBuildScanConfig" );
84
+ BuildResult result = build (projectDir , "verifyBuildScanConfig" );
85
85
assertThat (result .getOutput ()).contains ("Build scan server: https://ge.spring.io" );
86
86
assertThat (result .getOutput ()).contains ("Capture task input files: true" );
87
87
}
@@ -90,7 +90,7 @@ void whenThePluginIsAppliedAndTheSpringBuildTypeIsOssThenBuildScanConventionsAre
90
90
void whenThePluginIsAppliedAndPropertiesTaskIsExecutedThenBuildScanConventionsAreNotApplied (
91
91
@ TempDir File projectDir ) {
92
92
prepareProject (projectDir );
93
- BuildResult result = build (projectDir , "6.0.1" , " properties" , "verifyBuildScanConfig" , "--no-scan" );
93
+ BuildResult result = build (projectDir , "properties" , "verifyBuildScanConfig" , "--no-scan" );
94
94
assertThat (result .getOutput ()).contains ("Build scan server: null" );
95
95
assertThat (result .getOutput ()).contains ("Capture task input files: false" );
96
96
}
@@ -99,23 +99,23 @@ void whenThePluginIsAppliedAndPropertiesTaskIsExecutedThenBuildScanConventionsAr
99
99
void givenMultiProjectBuildWhenThePluginIsAppliedAndPropertiesTaskIsExecutedThenBuildScanConventionsAreNotApplied (
100
100
@ TempDir File projectDir ) {
101
101
prepareMultiModuleProject (projectDir );
102
- BuildResult result = build (projectDir , "6.0.1" , " sub:properties" , "sub:verifyBuildScanConfig" , "--no-scan" );
102
+ BuildResult result = build (projectDir , "sub:properties" , "sub:verifyBuildScanConfig" , "--no-scan" );
103
103
assertThat (result .getOutput ()).contains ("Build scan server: null" );
104
104
assertThat (result .getOutput ()).contains ("Capture task input files: false" );
105
105
}
106
106
107
107
@ Test
108
108
void whenThePluginIsAppliedAndScanIsSpecifiedThenServerIsNotCustomized (@ TempDir File projectDir ) {
109
109
prepareProject (projectDir );
110
- BuildResult result = build (projectDir , "6.0.1" , " verifyBuildScanConfig" , "--scan" );
110
+ BuildResult result = build (projectDir , "verifyBuildScanConfig" , "--scan" );
111
111
assertThat (result .getOutput ()).contains ("Build scan server: null" );
112
112
assertThat (result .getOutput ()).contains ("Capture task input files: true" );
113
113
}
114
114
115
115
@ Test
116
116
void whenThePluginIsAppliedAndBuildCacheIsDisabledThenBuildCacheConventionsAreNotApplied (@ TempDir File projectDir ) {
117
117
prepareProject (projectDir );
118
- BuildResult result = build (projectDir , "6.0.1" , " verifyBuildCacheConfig" , "--no-build-cache" );
118
+ BuildResult result = build (projectDir , "verifyBuildCacheConfig" , "--no-build-cache" );
119
119
assertThat (result .getOutput ()).contains ("Build cache server: null" );
120
120
}
121
121
@@ -124,15 +124,15 @@ void whenThePluginIsAppliedAndTheSpringBuildTypeIsNotOssThenBuildCacheConvention
124
124
@ TempDir File projectDir ) {
125
125
prepareProject (projectDir );
126
126
write (new File (projectDir , "gradle.properties" ), (writer ) -> writer .println ("spring.build-type=other" ));
127
- BuildResult result = build (projectDir , "6.0.1" , " verifyBuildCacheConfig" );
127
+ BuildResult result = build (projectDir , "verifyBuildCacheConfig" );
128
128
assertThat (result .getOutput ()).contains ("Build cache server: null" );
129
129
}
130
130
131
131
@ Test
132
132
void whenThePluginIsAppliedAndTheSpringBuildTypeIsOssThenBuildCacheConventionsAreApplied (@ TempDir File projectDir ) {
133
133
prepareProject (projectDir );
134
134
write (new File (projectDir , "gradle.properties" ), (writer ) -> writer .println ("spring.build-type=oss" ));
135
- BuildResult result = build (projectDir , "6.0.1" , " verifyBuildCacheConfig" );
135
+ BuildResult result = build (projectDir , "verifyBuildCacheConfig" );
136
136
assertThat (result .getOutput ()).contains ("Build cache server: https://ge.spring.io" );
137
137
}
138
138
@@ -206,15 +206,14 @@ private String version() {
206
206
}
207
207
}
208
208
209
- private BuildResult build (File projectDir , String gradleVersion , String ... arguments ) {
209
+ private BuildResult build (File projectDir , String ... arguments ) {
210
210
List <File > classpath = Arrays .asList (new File ("bin/main" ), new File ("build/classes/java/main" ),
211
211
new File ("build/resources/main" ),
212
212
new File (DevelocityPlugin .class .getProtectionDomain ().getCodeSource ().getLocation ().getFile ()),
213
213
new File (ConfigurableBuildScan .class .getProtectionDomain ().getCodeSource ().getLocation ().getFile ()));
214
214
List <String > augmentedArguments = new ArrayList <>(Arrays .asList (arguments ));
215
215
augmentedArguments .add ("--stacktrace" );
216
216
return GradleRunner .create ()
217
- .withGradleVersion (gradleVersion )
218
217
.withProjectDir (projectDir )
219
218
.withPluginClasspath (classpath )
220
219
.withArguments (augmentedArguments )
0 commit comments