Fixing unit tests

ammachado · ammachado · commit bb4f70d7a550 · 2023-11-08T04:47:34.000-08:00
diff --git a/components/sbm-core/src/test/java/org/springframework/sbm/build/api/Module_searchTestJava_Test.java b/components/sbm-core/src/test/java/org/springframework/sbm/build/api/Module_searchTestJava_Test.java
@@ -66,9 +66,7 @@ void withNoClassesInSrcTestJava_providesEmptyProjectResources() {
 
             ProjectContext context = builder.build();
 
-            verifySearchTest(context, projectResourceSet -> {
-                assertThat(projectResourceSet.list()).isEmpty();
-            }, "");
+            verifySearchTest(context, projectResourceSet -> assertThat(projectResourceSet.list()).isEmpty(), "");
         }
 
         @Test
diff --git a/components/sbm-recipes-boot-upgrade/src/main/java/org/springframework/sbm/boot/upgrade_27_30/report/helper/ChangesToDataPropertiesHelper.java b/components/sbm-recipes-boot-upgrade/src/main/java/org/springframework/sbm/boot/upgrade_27_30/report/helper/ChangesToDataPropertiesHelper.java
@@ -68,10 +68,10 @@ public boolean evaluate(ProjectContext context) {
                     .collect(Collectors.toList());
             if (!propertiesFound.isEmpty()) {
                 if (data.containsKey("matches")) {
-                    data.get("matches").add(new Match(absolutePath.toString(), p.getSourcePath().toString(), propertiesFound));
+                    data.get("matches").add(new Match(absolutePath.toUri().toString(), p.getSourcePath().toString(), propertiesFound));
                 } else {
                     List<Match> matches = new ArrayList<>();
-                    matches.add(new Match(absolutePath.toString(), p.getSourcePath().toString(), propertiesFound));
+                    matches.add(new Match(absolutePath.toUri().toString(), p.getSourcePath().toString(), propertiesFound));
                     data.put("matches", matches);
                 }
             }
@@ -87,7 +87,7 @@ public Map<String, List<Match>> getData() {
 
     @RequiredArgsConstructor
     @Getter
-    public class Match {
+    public static class Match {
         private final String absolutePath;
         private final String relativePath;
         private final List<Object> propertiesFound;
diff --git a/components/sbm-recipes-boot-upgrade/src/main/resources/recipes/27_30/report/sbu30-report.yaml b/components/sbm-recipes-boot-upgrade/src/main/resources/recipes/27_30/report/sbu30-report.yaml
@@ -233,7 +233,7 @@
             The scan found properties with `spring.data` prefix but no dependency matching `org.springframework.data:.*`.
 
             <#list matches as match>
-              * file://${match.absolutePath}[`${match.relativePath}`]<#lt>
+              * ${match.absolutePath}[`${match.relativePath}`]<#lt>
               <#list match.propertiesFound as property>
               ** `${property}`<#lt>
               </#list>
@@ -392,7 +392,7 @@
             
                 @Override
                 public void configurePathMatch(PathMatchConfigurer configurer) {
-                  configurer.setUseTrailingSlashMatch(true);
+                    configurer.setUseTrailingSlashMatch(true);
                 }
             }
             ----
@@ -443,11 +443,10 @@
                 @Configuration
                 public class WebConfiguration implements WebMvcConfigurer {
                 
-                  @Override
-                  public void configurePathMatch(PathMatchConfigurer configurer) {
-                    configurer.setUseTrailingSlashMatch(true);
-                  }
-              
+                    @Override
+                    public void configurePathMatch(PathMatchConfigurer configurer) {
+                        configurer.setUseTrailingSlashMatch(true);
+                    }
                 }
                 ----
 
diff --git a/components/sbm-recipes-boot-upgrade/src/test/java/org/springframework/sbm/boot/upgrade/common/actions/CreateAutoconfigurationActionTest.java b/components/sbm-recipes-boot-upgrade/src/test/java/org/springframework/sbm/boot/upgrade/common/actions/CreateAutoconfigurationActionTest.java
@@ -23,6 +23,7 @@
 import org.springframework.sbm.project.resource.ProjectResource;
 import org.springframework.sbm.project.resource.TestProjectContext;
 
+import java.nio.file.Path;
 import java.util.List;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -71,7 +72,7 @@ public void itDeletesSourceWhenMovedToNewFile() {
 
         String content = getSpringFactoryFile();
 
-        assertThat(content).isEqualTo("""
+        assertThat(content).isEqualToNormalizingNewlines("""
                 hello.world=something
                 """);
     }
@@ -95,7 +96,7 @@ public void shouldMoveMultipleProperties() {
 
         String content = getNewAutoConfigFileContents();
 
-        assertThat(content).isEqualTo("""
+        assertThat(content).isEqualToNormalizingNewlines("""
                 XYZ
                 ABC
                 DEF"""
@@ -128,15 +129,15 @@ public void moduleInsideModuleMavenSetup() {
     private void assertSpringConfigFileContentsInProject(String project) {
         List<ProjectResource> content = getAutoConfigFileAsProjectResource();
         assertThat(content).hasSize(1);
-        assertThat(content.get(0).getAbsolutePath().toString())
-                .isEqualTo(TestProjectContext.getDefaultProjectRoot()
-                        + "/" + project + "/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports");
+        assertThat(content.get(0).getAbsolutePath())
+                .isEqualTo(TestProjectContext.getDefaultProjectRoot().resolve(Path.of(project,
+                        "src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports").normalize()));
 
         List<ProjectResource> oldFile = getFileAsProjectResource(EXISTING_SPRING_FACTORIES_FILE);
         assertThat(oldFile).hasSize(1);
-        assertThat(oldFile.get(0).getAbsolutePath().toString())
-                .isEqualTo(TestProjectContext.getDefaultProjectRoot() +
-                        "/" + project + "/src/main/resources/META-INF/spring.factories");
+        assertThat(oldFile.get(0).getAbsolutePath())
+                .isEqualTo(TestProjectContext.getDefaultProjectRoot().resolve(Path.of(project,
+                        "/src/main/resources/META-INF/spring.factories")));
 
         assertThat(oldFile.get(0).print()).isEqualTo("");
     }
diff --git a/components/sbm-recipes-boot-upgrade/src/test/java/org/springframework/sbm/boot/upgrade_24_25/recipes/Boot_24_25_UpdateDependenciesRecipeTest.java b/components/sbm-recipes-boot-upgrade/src/test/java/org/springframework/sbm/boot/upgrade_24_25/recipes/Boot_24_25_UpdateDependenciesRecipeTest.java
@@ -44,7 +44,7 @@ void updateWithParentPom() {
                         <version>2.5.6</version>
                         <relativePath/> <!-- lookup parent from repository -->
                     </parent>
-                """
+                """.replace("\n", System.lineSeparator())
         );
     }
 }
diff --git a/components/sbm-recipes-boot-upgrade/src/test/java/org/springframework/sbm/boot/upgrade_27_30/ChangeJavaxPackagesToJakartaTest.java b/components/sbm-recipes-boot-upgrade/src/test/java/org/springframework/sbm/boot/upgrade_27_30/ChangeJavaxPackagesToJakartaTest.java
@@ -15,14 +15,15 @@
  */
 package org.springframework.sbm.boot.upgrade_27_30;
 
+import org.intellij.lang.annotations.Language;
 import org.junit.jupiter.api.Test;
 import org.openrewrite.java.ChangePackage;
 import org.springframework.sbm.engine.context.ProjectContext;
 import org.springframework.sbm.java.api.JavaSource;
 import org.springframework.sbm.project.resource.TestProjectContext;
+import org.springframework.sbm.utils.LinuxWindowsPathUnifier;
 
 import java.util.List;
-import java.util.stream.Collectors;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -31,34 +32,43 @@ public class ChangeJavaxPackagesToJakartaTest {
     @Test
     void collectingJavaxPackages() {
 
-        String javaClass1 =
-                "package com.example;\n" +
-                "import javax.money.MonetaryAmount;\n" +
-                "public class SomeClass {\n" +
-                "  public MonetaryAmount convertToEntityAttribute() {\n" +
-                "      return null;\n" +
-                "  }\n" +
-                "}";
-
-        String javaClass2 =
-                "package com.example;\n" +
-                "import javax.persistence.Converter;\n" +
-                "public class SomeClass2 {\n" +
-                "  public Converter getConverter() {\n" +
-                "      return null;\n" +
-                "  }\n" +
-                "}";
+        @Language("java")
+        String javaClass1 = """
+                package com.example;
+                import javax.money.MonetaryAmount;
+                public class SomeClass {
+                  public MonetaryAmount convertToEntityAttribute() {
+                      return null;
+                  }
+                }
+                """;
+
+        @Language("java")
+        String javaClass2 = """
+                package com.example;
+                import javax.persistence.Converter;
+                public class SomeClass2 {
+                  public Converter getConverter() {
+                      return null;
+                  }
+                }
+                """;
+
+        @Language("java")
+        String javaClass3 = """
+                package com.example;
+                public class NoImports {}
+                """;
+
+        @Language("java")
+        String javaClass4 = """
+                package com.example;
+                import java.math.BigDecimal;
+                public class OtherImports {
+                  private BigDecimal number;
+                }
+                """;
 
-        String javaClass3 =
-                "package com.example;\n" +
-                "public class NoImports {}";
-
-        String javaClass4 =
-                "package com.example;\n" +
-                "import java.math.BigDecimal;\n" +
-                "public class OtherImports {\n" +
-                "  private BigDecimal number;\n" +
-                "}";
         ProjectContext context = TestProjectContext.buildProjectContext()
                 .withBuildFileHavingDependencies("javax.money:money-api:1.1")
                 .withJavaSource("src/main/java", javaClass1)
@@ -67,13 +77,13 @@ void collectingJavaxPackages() {
                 .withJavaSource("src/main/java", javaClass4)
                 .build();
 
-        List<JavaSource> matches = context.getProjectJavaSources().asStream()
+        List<JavaSource> matches = context.getProjectJavaSources().stream()
                 .filter(js -> js.hasImportStartingWith("javax."))
-                .collect(Collectors.toList());
+                .toList();
 
         assertThat(matches).hasSize(2);
-        assertThat(matches.get(0).getSourcePath().toString()).isEqualTo("src/main/java/com/example/SomeClass.java");
-        assertThat(matches.get(1).getSourcePath().toString()).isEqualTo("src/main/java/com/example/SomeClass2.java");
+        assertThat(LinuxWindowsPathUnifier.unifyPath(matches.get(0).getSourcePath())).isEqualTo("src/main/java/com/example/SomeClass.java");
+        assertThat(LinuxWindowsPathUnifier.unifyPath(matches.get(1).getSourcePath())).isEqualTo("src/main/java/com/example/SomeClass2.java");
         matches.forEach(m -> System.out.println(m.getSourcePath()));
 
     }
diff --git a/components/sbm-recipes-boot-upgrade/src/test/java/org/springframework/sbm/boot/upgrade_27_30/report/helper/BannerSupportReportSectionTest.java b/components/sbm-recipes-boot-upgrade/src/test/java/org/springframework/sbm/boot/upgrade_27_30/report/helper/BannerSupportReportSectionTest.java
@@ -49,7 +49,7 @@ public void rendersBannerSupportInformation() {
                                 The scan found banner image files here:
                                                                 
                                 * `%1$s`
-                                * `%2%s`
+                                * `%2$s`
                                                         
                                 ==== Remediation
                                  
diff --git a/components/sbm-recipes-boot-upgrade/src/test/java/org/springframework/sbm/boot/upgrade_27_30/report/helper/ChangesToDataPropertiesReportSectionTest.java b/components/sbm-recipes-boot-upgrade/src/test/java/org/springframework/sbm/boot/upgrade_27_30/report/helper/ChangesToDataPropertiesReportSectionTest.java
@@ -24,6 +24,8 @@
 import org.springframework.sbm.openrewrite.RewriteExecutionContext;
 import org.springframework.sbm.project.resource.TestProjectContext;
 
+import java.nio.file.Path;
+
 
 /**
  * @author Fabian Krüger
@@ -40,6 +42,10 @@ void changesToDataPropertiesSection_renders() {
                 .withProjectResource("src/main/resources/application-another.properties", "spring.data.here=there")
                 .build();
 
+        Path projectRoot = context.getProjectRootDirectory();
+        Path props1 = Path.of("src", "main", "resources", "application.properties");
+        Path props2 = Path.of("src", "main", "resources", "application-another.properties");
+
         SpringBootUpgradeReportTestSupport.generatedSection("Changes to Data Properties")
                 .fromProjectContext(context)
                 .shouldRenderAs(
@@ -53,16 +59,23 @@ void changesToDataPropertiesSection_renders() {
                         ==== Why is the application affected
                         The scan found properties with `spring.data` prefix but no dependency matching `org.springframework.data:.*`.
                         
-                        * file://<PATH>/src/main/resources/application.properties[`src/main/resources/application.properties`]
+                        * %s[`%s`]
                         ** `spring.data.foo`
-                        * file://<PATH>/src/main/resources/application-another.properties[`src/main/resources/application-another.properties`]
+                        * %s[`%s`]
                         ** `spring.data.here`
                                            
                         ==== Remediation
                         Either add `spring-data` dependency, rename the property or remove it in case it's not required anymore.
                                            
                                            
-                        """);
+                        """.formatted(
+                                projectRoot.resolve(props1).toUri(),
+                                props1,
+                                projectRoot.resolve(props2).toUri(),
+                                props2
+
+                                )
+                );
     }
 
     @Test
diff --git a/components/sbm-recipes-boot-upgrade/src/test/java/org/springframework/sbm/boot/upgrade_27_30/report/helper/SpringFactoriesHelperTest.java b/components/sbm-recipes-boot-upgrade/src/test/java/org/springframework/sbm/boot/upgrade_27_30/report/helper/SpringFactoriesHelperTest.java
@@ -19,6 +19,8 @@
 import org.springframework.sbm.engine.context.ProjectContext;
 import org.springframework.sbm.project.resource.TestProjectContext;
 
+import java.nio.file.Path;
+
 import static org.assertj.core.api.Assertions.assertThat;
 
 class SpringFactoriesHelperTest {
@@ -43,6 +45,9 @@ public void detectsFileWithSpringFactories() {
 
         assertThat(sut.getData()).isNotNull();
         assertThat(sut.getData().get("files")).hasSize(1);
-        assertThat(sut.getData().get("files").get(0)).contains("src/main/resources/META-INF/spring.factories");
+
+        Path actual = context.getProjectRootDirectory().resolve(Path.of("src/main/resources/META-INF/spring.factories"));
+        Path expected = Path.of(sut.getData().get("files").get(0));
+        assertThat(expected).isEqualTo(actual);
     }
 }
diff --git a/components/sbm-recipes-boot-upgrade/src/test/java/org/springframework/sbm/boot/upgrade_27_30/report/helper/SpringMVCAndWebFluxUrlMatchingChangesReportSectionTest.java b/components/sbm-recipes-boot-upgrade/src/test/java/org/springframework/sbm/boot/upgrade_27_30/report/helper/SpringMVCAndWebFluxUrlMatchingChangesReportSectionTest.java
@@ -165,10 +165,11 @@ public void configurePathMatch(PathMatchConfigurer configurer) {
                 
                 
                 """.formatted(
-                        projectRoot.resolve(restController1Path).toUri(),
-                        restController1Path,
+                        // Note the controller order here, sorted by package / absolute path
                         projectRoot.resolve(restController2Path).toUri(),
-                        restController2Path
+                        restController2Path,
+                        projectRoot.resolve(restController1Path).toUri(),
+                        restController1Path
                 );
 
         SpringBootUpgradeReportTestSupport.generatedSection("Spring MVC and WebFlux URL matching changes")
diff --git a/docs/boot-3.0.0-M3-upgrade.adoc b/docs/boot-3.0.0-M3-upgrade.adoc
@@ -61,7 +61,7 @@ All variables used in the template must be provided by `getData`.
             The scan found properties with `spring.data` prefix but no dependency matching `org.springframework.data:.*`.
 
             <#list matches as match> <2>
-              * file://${match.absolutePath}[`${match.relativePath}`]
+              * ${match.absolutePath.toUri()}[`${match.relativePath}`]
               <#list match.propertiesFound as property>
               ** `${property}`
               </#list>
@@ -232,7 +232,7 @@ https://github.com/Buzzardo/spring-style-guide/blob/master/spring-style-guide.ad
             The scan found properties with `spring.data` prefix but no dependency matching `org.springframework.data:.*`.
 
             <#list matches as match>
-              * file://${match.absolutePath}[`${match.relativePath}`]
+              * ${match.absolutePath.toUri()}[`${match.relativePath}`]
               <#list match.propertiesFound as property>
               ** `${property}`
               </#list>

Original file line number	Diff line number	Diff line change
`@@ -66,9 +66,7 @@ void withNoClassesInSrcTestJava_providesEmptyProjectResources() {`
`66`	`66`
`67`	`67`	`ProjectContext context = builder.build();`
`68`	`68`
`69`		`- verifySearchTest(context, projectResourceSet -> {`
`70`		`- assertThat(projectResourceSet.list()).isEmpty();`
`71`		`- }, "");`
	`69`	`+ verifySearchTest(context, projectResourceSet -> assertThat(projectResourceSet.list()).isEmpty(), "");`
`72`	`70`	`}`
`73`	`71`
`74`	`72`	`@Test`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ void updateWithParentPom() {`
`44`	`44`	`<version>2.5.6</version>`
`45`	`45`	`<relativePath/> <!-- lookup parent from repository -->`
`46`	`46`	`</parent>`
`47`		`- """`
	`47`	`+ """.replace("\n", System.lineSeparator())`
`48`	`48`	`);`
`49`	`49`	`}`
`50`	`50`	`}`