Skip to content

Commit d60764c

Browse files
fabapp2fabapp2
authored
Fixes ProjectContextInitializerTest (#307)
1 parent a83e788 commit d60764c

File tree

1 file changed

+71
-66
lines changed

1 file changed

+71
-66
lines changed

‎components/sbm-core/src/test/java/org/springframework/sbm/project/parser/ProjectContextInitializerTest.java

Lines changed: 71 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@
4242
import org.springframework.sbm.java.refactoring.JavaRefactoringFactoryImpl;
4343
import org.springframework.sbm.java.util.BasePackageCalculator;
4444
import org.springframework.sbm.openrewrite.RewriteExecutionContext;
45+
import org.springframework.sbm.project.RewriteSourceFileWrapper;
46+
import org.springframework.sbm.project.parser.*;
4547
import org.springframework.sbm.project.resource.*;
4648
import org.springframework.sbm.properties.parser.RewritePropertiesParser;
4749
import org.springframework.sbm.xml.parser.RewriteXmlParser;
@@ -56,50 +58,53 @@
5658
import static org.mockito.Mockito.mock;
5759
import static org.springframework.sbm.project.parser.ResourceVerifierTestHelper.*;
5860

59-
//@SpringBootTest(classes = {
60-
// ProjectContextInitializer.class,
61-
// RewriteMavenArtifactDownloader.class,
62-
// JavaProvenanceMarkerFactory.class,
63-
// BasePackageCalculator.class,
64-
// BasePackageCalculator.class,
65-
// ProjectRootPathResolver.class,
66-
// PreconditionVerifier.class,
67-
// ProjectContextFactory.class,
68-
// RewriteMavenParserFactory.class, // FIXME: #7 remove class
69-
// MavenPomCacheProvider.class,
70-
// SbmApplicationProperties.class,
71-
// PathScanner.class,
72-
// RewriteJavaParser.class,
73-
// RewritePlainTextParser.class,
74-
// RewriteYamlParser.class,
75-
// RewriteJsonParser.class,
76-
// ResourceParser.class,
77-
// RewritePropertiesParser.class,
78-
// MavenProjectParser.class,
79-
// RewriteMavenParser.class,
80-
// RewriteXmlParser.class,
81-
// ResourceHelper.class,
82-
// ResourceLoader.class,
83-
// GitSupport.class,
84-
// ScanCommand.class,
85-
// ProjectResourceSetHolder.class,
86-
// JavaRefactoringFactoryImpl.class,
87-
// ProjectResourceWrapperRegistry.class
88-
//}, properties = {"sbm.gitSupportEnabled=false"})
61+
@SpringBootTest(classes = {
62+
ProjectContextInitializer.class,
63+
RewriteMavenArtifactDownloader.class,
64+
JavaProvenanceMarkerFactory.class,
65+
BasePackageCalculator.class,
66+
BasePackageCalculator.class,
67+
ProjectRootPathResolver.class,
68+
PreconditionVerifier.class,
69+
ProjectContextFactory.class,
70+
MavenPomCacheProvider.class,
71+
SbmApplicationProperties.class,
72+
PathScanner.class,
73+
RewriteJavaParser.class,
74+
RewritePlainTextParser.class,
75+
RewriteYamlParser.class,
76+
RewriteJsonParser.class,
77+
ResourceParser.class,
78+
RewritePropertiesParser.class,
79+
MavenProjectParser.class,
80+
RewriteMavenParser.class,
81+
RewriteXmlParser.class,
82+
ResourceHelper.class,
83+
ResourceLoader.class,
84+
GitSupport.class,
85+
ScanCommand.class,
86+
ProjectResourceSetHolder.class,
87+
JavaRefactoringFactoryImpl.class,
88+
ProjectResourceWrapperRegistry.class,
89+
RewriteSourceFileWrapper.class
90+
}, properties = {"sbm.gitSupportEnabled=false"})
8991
@Disabled
9092
class ProjectContextInitializerTest {
9193

94+
public static final int VERSION_PATTERN = 17;
9295
private final Path projectDirectory = Path.of("./testcode/path-scanner").toAbsolutePath().normalize();
9396

94-
// @Autowired
97+
@Autowired
9598
private ProjectContextInitializer sut;
9699

97-
// @Autowired
100+
@Autowired
98101
private ScanCommand scanCommand;
99102

100103
@BeforeEach
101104
void beforeEach() throws IOException {
102-
FileSystemUtils.deleteRecursively(projectDirectory.toAbsolutePath().resolve(".git"));
105+
Path repo = projectDirectory.toAbsolutePath().resolve(".git");
106+
FileSystemUtils.deleteRecursively(repo);
107+
GitSupport.initGit(repo.toFile());
103108
}
104109

105110
@AfterEach
@@ -112,20 +117,20 @@ void afterEach() throws IOException {
112117
@Disabled
113118
void test() {
114119

115-
assertThat(projectDirectory.toAbsolutePath().resolve(".git")).doesNotExist();
120+
//assertThat(projectDirectory.toAbsolutePath().resolve(".git")).doesNotExist();
116121

117122
ApplicationEventPublisher eventPublisher = mock(ApplicationEventPublisher.class);
118123
RewriteExecutionContext executionContext = new RewriteExecutionContext(eventPublisher);
119124
List<Resource> resources = scanCommand.scanProjectRoot(projectDirectory.toString());
120125
ProjectContext projectContext = sut.initProjectContext(projectDirectory, resources, executionContext);
121126
List<RewriteSourceFileHolder<? extends SourceFile>> projectResources = projectContext.getProjectResources().list();
122127

123-
assertThat(projectDirectory.toAbsolutePath().resolve(".git")).exists();
128+
//assertThat(projectDirectory.toAbsolutePath().resolve(".git")).exists();
124129

125130
assertThat(projectResources).hasSize(19);
126131

127132
verifyResource("testcode/pom.xml").wrapsInstanceOf(Xml.Document.class);
128-
verifyIgnored(projectResources, "testcode/path-scanner/.git");
133+
//verifyIgnored(projectResources, "testcode/path-scanner/.git");
129134

130135
verifyResource("testcode/path-scanner/pom.xml")
131136
.wrapsInstanceOf(Xml.Document.class)
@@ -137,7 +142,7 @@ void test() {
137142
noDependencies()
138143
),
139144
buildToolMarker("Maven", "3.6"), // TODO: does this work in all env (taken from .mvn)?
140-
javaVersionMarker(11, "11", "11"),
145+
javaVersionMarker(VERSION_PATTERN, "17", "11"),
141146
javaProjectMarker(null, "com.example:example-project-parent:1.0.0-SNAPSHOT"),
142147
gitProvenanceMarker("master")
143148
)
@@ -157,7 +162,7 @@ void test() {
157162
Scope.Test, List.of("org.jetbrains:annotations:23.0.0")
158163
)),
159164
buildToolMarker("Maven", "3.6"),
160-
javaVersionMarker(11, "11", "11"),
165+
javaVersionMarker(VERSION_PATTERN, "11", "11"),
161166
javaProjectMarker(null, "com.example:module1:1.0.0-SNAPSHOT"),
162167
gitProvenanceMarker("master")
163168
)
@@ -168,7 +173,7 @@ void test() {
168173
.havingMarkers(
169174
javaSourceSetMarker("main", ""),
170175
buildToolMarker("Maven", "3.6"),
171-
javaVersionMarker(11, "11", "11"),
176+
javaVersionMarker(VERSION_PATTERN, "11", "11"),
172177
javaProjectMarker(null, "com.example:module1:1.0.0-SNAPSHOT"),
173178
gitProvenanceMarker("master")
174179
)
@@ -178,9 +183,9 @@ void test() {
178183
.wrapsInstanceOf(PlainText.class)
179184
.havingMarkers(
180185
buildToolMarker("Maven", "3.6"),
181-
javaVersionMarker(11, "11", "11"),
186+
javaVersionMarker(VERSION_PATTERN, "11", "11"),
182187
javaProjectMarker(null, "com.example:module1:1.0.0-SNAPSHOT"),
183-
javaSourceSetMarker("main", 1903),
188+
javaSourceSetMarker("main", 1919),
184189
gitProvenanceMarker("master")
185190
)
186191
.isContainedIn(projectResources);
@@ -189,9 +194,9 @@ void test() {
189194
.wrapsInstanceOf(Xml.Document.class)
190195
.havingMarkers(
191196
buildToolMarker("Maven", "3.6"),
192-
javaVersionMarker(11, "11", "11"),
197+
javaVersionMarker(VERSION_PATTERN, "11", "11"),
193198
javaProjectMarker(null, "com.example:module1:1.0.0-SNAPSHOT"),
194-
javaSourceSetMarker("main", 1903),
199+
javaSourceSetMarker("main", 1919),
195200
gitProvenanceMarker("master")
196201
)
197202
.isContainedIn(projectResources);
@@ -200,9 +205,9 @@ void test() {
200205
.wrapsInstanceOf(Yaml.Documents.class)
201206
.havingMarkers(
202207
buildToolMarker("Maven", "3.6"),
203-
javaVersionMarker(11, "11", "11"),
208+
javaVersionMarker(VERSION_PATTERN, "11", "11"),
204209
javaProjectMarker(null, "com.example:module1:1.0.0-SNAPSHOT"),
205-
javaSourceSetMarker("main", 1903),
210+
javaSourceSetMarker("main", 1919),
206211
gitProvenanceMarker("master")
207212
)
208213
.isContainedIn(projectResources);
@@ -211,9 +216,9 @@ void test() {
211216
.wrapsInstanceOf(Properties.class)
212217
.havingMarkers(
213218
buildToolMarker("Maven", "3.6"),
214-
javaVersionMarker(11, "11", "11"),
219+
javaVersionMarker(VERSION_PATTERN, "11", "11"),
215220
javaProjectMarker(null, "com.example:module1:1.0.0-SNAPSHOT"),
216-
javaSourceSetMarker("main", 1903),
221+
javaSourceSetMarker("main", 1919),
217222
gitProvenanceMarker("master")
218223
)
219224
.isContainedIn(projectResources);
@@ -222,9 +227,9 @@ void test() {
222227
.wrapsInstanceOf(PlainText.class)
223228
.havingMarkers(
224229
buildToolMarker("Maven", "3.6"),
225-
javaVersionMarker(11, "11", "11"),
230+
javaVersionMarker(VERSION_PATTERN, "11", "11"),
226231
javaProjectMarker(null, "com.example:module1:1.0.0-SNAPSHOT"),
227-
javaSourceSetMarker("main", 1903),
232+
javaSourceSetMarker("main", 1919),
228233
gitProvenanceMarker("master")
229234
)
230235
.isContainedIn(projectResources);
@@ -233,19 +238,19 @@ void test() {
233238
.wrapsInstanceOf(PlainText.class)
234239
.havingMarkers(
235240
buildToolMarker("Maven", "3.6"),
236-
javaVersionMarker(11, "11", "11"),
241+
javaVersionMarker(VERSION_PATTERN, "11", "11"),
237242
javaProjectMarker(null, "com.example:module1:1.0.0-SNAPSHOT"),
238-
javaSourceSetMarker("main", 1903),
243+
javaSourceSetMarker("main", 1919),
239244
gitProvenanceMarker("master")
240245
)
241246
.isContainedIn(projectResources);
242247

243248
verifyResource("testcode/path-scanner/module1/src/main/resources/some.txt")
244249
.wrapsInstanceOf(PlainText.class)
245250
.havingMarkers(buildToolMarker("Maven", "3.6"),
246-
javaVersionMarker(11, "11", "11"),
251+
javaVersionMarker(VERSION_PATTERN, "11", "11"),
247252
javaProjectMarker(null, "com.example:module1:1.0.0-SNAPSHOT"),
248-
javaSourceSetMarker("main", 1903),
253+
javaSourceSetMarker("main", 1919),
249254
gitProvenanceMarker("master")
250255
)
251256
.isContainedIn(projectResources);
@@ -254,9 +259,9 @@ void test() {
254259
.wrapsInstanceOf(Xml.Document.class)
255260
.havingMarkers(
256261
buildToolMarker("Maven", "3.6"),
257-
javaVersionMarker(11, "11", "11"),
262+
javaVersionMarker(VERSION_PATTERN, "11", "11"),
258263
javaProjectMarker(null, "com.example:module1:1.0.0-SNAPSHOT"),
259-
javaSourceSetMarker("main", 1903),
264+
javaSourceSetMarker("main", 1919),
260265
gitProvenanceMarker("master")
261266
)
262267
.isContainedIn(projectResources);
@@ -265,9 +270,9 @@ void test() {
265270
.wrapsInstanceOf(Xml.Document.class)
266271
.havingMarkers(
267272
buildToolMarker("Maven", "3.6"),
268-
javaVersionMarker(11, "11", "11"),
273+
javaVersionMarker(VERSION_PATTERN, "11", "11"),
269274
javaProjectMarker(null, "com.example:module1:1.0.0-SNAPSHOT"),
270-
javaSourceSetMarker("main", 1903),
275+
javaSourceSetMarker("main", 1919),
271276
gitProvenanceMarker("master")
272277
)
273278
.isContainedIn(projectResources);
@@ -276,19 +281,19 @@ void test() {
276281
.wrapsInstanceOf(Xml.Document.class)
277282
.havingMarkers(
278283
buildToolMarker("Maven", "3.6"),
279-
javaVersionMarker(11, "11", "11"),
284+
javaVersionMarker(VERSION_PATTERN, "11", "11"),
280285
javaProjectMarker(null, "com.example:module1:1.0.0-SNAPSHOT"),
281-
javaSourceSetMarker("main", 1903),
286+
javaSourceSetMarker("main", 1919),
282287
gitProvenanceMarker("master")
283288
)
284289
.isContainedIn(projectResources);
285290

286291
verifyResource("testcode/path-scanner/module1/src/main/webapp/META-INF/some.xsl")
287292
.wrapsInstanceOf(Xml.Document.class)
288293
.havingMarkers(buildToolMarker("Maven", "3.6"),
289-
javaVersionMarker(11, "11", "11"),
294+
javaVersionMarker(VERSION_PATTERN, "11", "11"),
290295
javaProjectMarker(null, "com.example:module1:1.0.0-SNAPSHOT"),
291-
javaSourceSetMarker("main", 1903),
296+
javaSourceSetMarker("main", 1919),
292297
gitProvenanceMarker("master")
293298
)
294299
.isContainedIn(projectResources);
@@ -297,9 +302,9 @@ void test() {
297302
.wrapsInstanceOf(Xml.Document.class)
298303
.havingMarkers(
299304
buildToolMarker("Maven", "3.6"),
300-
javaVersionMarker(11, "11", "11"),
305+
javaVersionMarker(VERSION_PATTERN, "11", "11"),
301306
javaProjectMarker(null, "com.example:module1:1.0.0-SNAPSHOT"),
302-
javaSourceSetMarker("main", 1903),
307+
javaSourceSetMarker("main", 1919),
303308
gitProvenanceMarker("master")
304309
)
305310
.isContainedIn(projectResources);
@@ -320,7 +325,7 @@ void test() {
320325
)
321326
),
322327
buildToolMarker("Maven", "3.6"),
323-
javaVersionMarker(11, "11", "11"),
328+
javaVersionMarker(VERSION_PATTERN, "11", "11"),
324329
javaProjectMarker(null, "com.example:module2:1.0.0-SNAPSHOT"),
325330
gitProvenanceMarker("master")
326331
)
@@ -330,7 +335,7 @@ void test() {
330335
.wrapsInstanceOf(J.CompilationUnit.class)
331336
.havingMarkers(
332337
buildToolMarker("Maven", "3.6"),
333-
javaVersionMarker(11, "11", "11"),
338+
javaVersionMarker(VERSION_PATTERN, "11", "11"),
334339
javaProjectMarker(null, "com.example:module2:1.0.0-SNAPSHOT"),
335340
javaSourceSetMarker("main", "java.awt.dnd.DragGestureRecognizer, java.nio.channels.ClosedByInterruptException, java.lang.management.ThreadMXBean"),
336341
javaSourceSetMarker("test", "java.awt.dnd.DragGestureRecognizer, java.nio.channels.ClosedByInterruptException, java.lang.management.ThreadMXBean"),
@@ -342,7 +347,7 @@ void test() {
342347
.wrapsInstanceOf(PlainText.class)
343348
.havingMarkers(
344349
buildToolMarker("Maven", "3.6"),
345-
javaVersionMarker(11, "11", "11"),
350+
javaVersionMarker(VERSION_PATTERN, "11", "11"),
346351
javaProjectMarker(null, "com.example:module2:1.0.0-SNAPSHOT"),
347352
javaSourceSetMarker("test", ""),
348353
gitProvenanceMarker("master")

0 commit comments

Comments
 (0)