Skip to content

Commit 1af2236

Browse files
committed
fixes #975
1 parent f8cac7c commit 1af2236

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

sbm-support-rewrite/src/main/java/org/springframework/sbm/parsers/ModuleParser.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ public List<SourceFile> processMainSources(
128128
mainProjectProvenance.add(sourceSet("main", dependencies, typeCache));
129129

130130
// FIXME: 945 Why target and not all main?
131-
List<Path> parsedJavaPaths = mainJavaSources.stream().map(ResourceUtil::getPath).toList();
131+
List<Path> parsedJavaPaths = javaSourcesInTarget.stream().map(ResourceUtil::getPath).toList();
132132
Stream<SourceFile> parsedJava = cus.map(addProvenance(baseDir, mainProjectProvenance, parsedJavaPaths));
133133
log.debug("[%s] Scanned %d java source files in main scope.".formatted(currentProject, mainJavaSources.size()));
134134

sbm-support-rewrite/src/test/java/org/springframework/sbm/parsers/CompareParserRecipeRunTest.java

+3-5
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@
4545
* @author Fabian Krüger
4646
*/
4747
@SpringBootTest(classes = {SbmSupportRewriteConfiguration.class, SbmTestConfiguration.class})
48-
@Issue("https://github.com/spring-projects-experimental/spring-boot-migrator/issues/975")
4948
public class CompareParserRecipeRunTest {
5049

5150
@Autowired
@@ -58,9 +57,8 @@ public class CompareParserRecipeRunTest {
5857
private ExecutionContext executionContext;
5958

6059
@Test
61-
@DisplayName("runningRecipe")
62-
@ExpectedToFail("FIXME: #975")
63-
void runningRecipe() {
60+
@DisplayName("Running a recipe with RewriteMavenParser should yield the same result as with RewriteProjectParser")
61+
void runningARecipeWithRewriteMavenParserYieldsTheSameResultAsWithRewriteProjectParser() {
6462
Path baseDir = TestProjectHelper.getMavenProject("parser-recipe-run");
6563
RewriteProjectParsingResult sutParsingResult = sut.parse(baseDir);
6664
RewriteProjectParsingResult compParsingResult = comparingParser.parse(baseDir);
@@ -105,7 +103,7 @@ public J.ClassDeclaration visitClassDeclaration(J.ClassDeclaration classDecl, Ex
105103
// Run Parser independent from Maven
106104
counter.setRelease(0);
107105
RecipeRun sutRecipeRun = recipe.run(new InMemoryLargeSourceSet(sutParsingResult.sourceFiles()), executionContext);
108-
assertThat(counter.get()).isEqualTo(3); // differs, should be 2
106+
assertThat(counter.get()).isEqualTo(2); // differs, should be 2
109107
assertThat(sutRecipeRun.getChangeset().getAllResults()).hasSize(1); // is 0
110108
}
111109

0 commit comments

Comments
 (0)