Skip to content

RecipeRun differs between parsers #978

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 19, 2023
Merged

RecipeRun differs between parsers #978

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
65c30a5
fixes #975
fabapp2 Oct 19, 2023
28e2620
Merge branch 'version/revamp' into revamp/975-reciperun-differs-betwe…
fabapp2 Oct 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion sbm-support-rewrite/src/main/java/org/springframework/sbm/parsers/ModuleParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ public List<SourceFile> processMainSources(
mainProjectProvenance.add(sourceSet("main", dependencies, typeCache));

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

Expand Down
8 changes: 3 additions & 5 deletions ...ort-rewrite/src/test/java/org/springframework/sbm/parsers/CompareParserRecipeRunTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@
* @author Fabian Krüger
*/
@SpringBootTest(classes = {SbmSupportRewriteConfiguration.class, SbmTestConfiguration.class})
@Issue("https://github.com/spring-projects-experimental/spring-boot-migrator/issues/975")
public class CompareParserRecipeRunTest {

@Autowired
Expand All @@ -58,9 +57,8 @@ public class CompareParserRecipeRunTest {
private ExecutionContext executionContext;

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

Expand Down
2 changes: 1 addition & 1 deletion sbm-support-rewrite/src/test/java/org/springframework/sbm/parsers/ParserPropertiesTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ void defaultActiveProfiles() {
@Test
@DisplayName("parser.ignoredPathPatterns")
void defaultIgnoredPathPatterns() {
assertThat(parserProperties.getIgnoredPathPatterns()).containsExactlyInAnyOrder("target/**", "**.git", "**/target/**", "**.idea");
assertThat(parserProperties.getIgnoredPathPatterns()).containsExactlyInAnyOrder("**.idea/**", "**.git", "**/target/**", "target/**");
}

}
Expand Down