Merge branch 'version/revamp' into revamp/975-reciperun-differs-betwe…

…en-rewritemavenprojectparser-and-rewriteprojectparser
spring-projects-experimental · Oct 19, 2023 · 98ba2fc · 98ba2fc
2 parents 9f86a90 + f8cac7c
commit 98ba2fc
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 13 deletions.
diff --git a/sbm-support-rewrite/src/main/resources/META-INF/sbm-support-rewrite.properties b/sbm-support-rewrite/src/main/resources/META-INF/sbm-support-rewrite.properties
@@ -27,4 +27,4 @@ parser.sizeThresholdMb=10
 parser.runPerSubmodule=false
 parser.failOnInvalidActiveRecipes=true
 parser.activeProfiles=default
-parser.ignoredPathPatterns=**.idea,**.git,**/target/**,target/**
+parser.ignoredPathPatterns=**.idea/**,**.git,**/target/**,target/**
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
@@ -103,8 +103,8 @@ 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(2); // differs, should be 2
-        assertThat(sutRecipeRun.getChangeset().getAllResults()).hasSize(1); // is 0
+        assertThat(counter.get()).isEqualTo(2);
+        assertThat(sutRecipeRun.getChangeset().getAllResults()).hasSize(1);
     }
 
 }
diff --git a/.../java/org/springframework/sbm/parsers/maven/RewriteMavenProjectParserIntegrationTest.java b/.../java/org/springframework/sbm/parsers/maven/RewriteMavenProjectParserIntegrationTest.java
@@ -18,13 +18,21 @@
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.junitpioneer.jupiter.ExpectedToFail;
+import org.openrewrite.ExecutionContext;
+import org.openrewrite.InMemoryExecutionContext;
+import org.openrewrite.Parser;
+import org.openrewrite.SourceFile;
+import org.openrewrite.tree.ParsingEventListener;
+import org.openrewrite.tree.ParsingExecutionContextView;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.context.TestConfiguration;
 import org.springframework.context.event.EventListener;
 import org.springframework.sbm.boot.autoconfigure.SbmSupportRewriteConfiguration;
+import org.springframework.sbm.parsers.RewriteProjectParser;
 import org.springframework.sbm.parsers.RewriteProjectParsingResult;
 import org.springframework.sbm.parsers.events.FinishedParsingResourceEvent;
+import org.springframework.sbm.parsers.events.RewriteParsingEventListenerAdapter;
 
 import java.nio.file.Path;
 import java.util.ArrayList;
@@ -49,7 +57,14 @@ public class RewriteMavenProjectParserIntegrationTest {
     void shouldPublishBuildEvents() {
 
         Path baseDir = Path.of("./testcode/maven-projects/multi-module-1");
-        RewriteProjectParsingResult parsingResult = sut.parse(baseDir);
+        ExecutionContext executionContext = new InMemoryExecutionContext(t -> {throw new RuntimeException(t);});
+        ParsingExecutionContextView.view(executionContext).setParsingListener(new ParsingEventListener() {
+            @Override
+            public void parsed(Parser.Input input, SourceFile sourceFile) {
+                capturedEvents.add(new FinishedParsingResourceEvent(input, sourceFile));
+            }
+        });
+        RewriteProjectParsingResult parsingResult = sut.parse(baseDir, executionContext);
         assertThat(capturedEvents).hasSize(3);
         assertThat(capturedEvents.get(0).sourceFile().getSourcePath().toString())
                 .isEqualTo("pom.xml");
@@ -58,13 +73,4 @@ void shouldPublishBuildEvents() {
         assertThat(capturedEvents.get(2).sourceFile().getSourcePath().toString())
                 .isEqualTo("module-a/pom.xml");
     }
-
-    @TestConfiguration
-    static class TestEventListener {
-        @EventListener(FinishedParsingResourceEvent.class)
-        public void onEvent(FinishedParsingResourceEvent event) {
-            capturedEvents.add(event);
-        }
-    }
-
 }