fixes #975

Improve default ignorePatterns
spring-projects-experimental · Oct 19, 2023 · f16447e · f16447e
1 parent f8cac7c
commit f16447e
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/sbm-support-rewrite/src/main/java/org/springframework/sbm/parsers/ModuleParser.java b/sbm-support-rewrite/src/main/java/org/springframework/sbm/parsers/ModuleParser.java
@@ -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()));
 

diff --git a/...ort-rewrite/src/test/java/org/springframework/sbm/parsers/CompareParserRecipeRunTest.java b/...ort-rewrite/src/test/java/org/springframework/sbm/parsers/CompareParserRecipeRunTest.java
@@ -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
@@ -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);
@@ -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
     }
 

diff --git a/sbm-support-rewrite/src/test/java/org/springframework/sbm/parsers/ParserPropertiesTest.java b/sbm-support-rewrite/src/test/java/org/springframework/sbm/parsers/ParserPropertiesTest.java
@@ -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/**");
         }
 
     }