[MNG-7897] Support ${project.rootDirectory} in file profile activation (#1687)

gnodet · web-flow · commit 57082737d81a · 2024-08-29T17:33:49.000+02:00
* [MNG-7897] Support ${project.rootDirectory} in file profile activation * Add a test with the short ${basedir} expression
diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/ProfileActivationFilePathInterpolator.java b/maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/ProfileActivationFilePathInterpolator.java
@@ -81,7 +81,7 @@ public Object getValue(String expression) {
         interpolator.addValueSource(new AbstractValueSource(false) {
             @Override
             public Object getValue(String expression) {
-                if ("rootDirectory".equals(expression)) {
+                if ("project.rootDirectory".equals(expression)) {
                     Path root = rootLocator.findMandatoryRoot(basedir);
                     return root.toFile().getAbsolutePath();
                 }
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/path/ProfileActivationFilePathInterpolator.java b/maven-model-builder/src/main/java/org/apache/maven/model/path/ProfileActivationFilePathInterpolator.java
@@ -82,7 +82,7 @@ public Object getValue(String expression) {
         interpolator.addValueSource(new AbstractValueSource(false) {
             @Override
             public Object getValue(String expression) {
-                if ("rootDirectory".equals(expression)) {
+                if ("project.rootDirectory".equals(expression)) {
                     Path base = basedir != null ? basedir.toPath() : null;
                     Path root = rootLocator.findMandatoryRoot(base);
                     return root.toFile().getAbsolutePath();
diff --git a/maven-model-builder/src/test/java/org/apache/maven/model/profile/activation/FileProfileActivatorTest.java b/maven-model-builder/src/test/java/org/apache/maven/model/profile/activation/FileProfileActivatorTest.java
@@ -67,22 +67,22 @@ void testRootDirectoryWithNull() {
 
         IllegalStateException e = assertThrows(
                 IllegalStateException.class,
-                () -> assertActivation(false, newExistsProfile("${rootDirectory}"), context));
+                () -> assertActivation(false, newExistsProfile("${project.rootDirectory}"), context));
         assertEquals(RootLocator.UNABLE_TO_FIND_ROOT_PROJECT_MESSAGE, e.getMessage());
     }
 
     @Test
     void testRootDirectory() {
-        assertActivation(false, newExistsProfile("${rootDirectory}/someFile.txt"), context);
-        assertActivation(true, newMissingProfile("${rootDirectory}/someFile.txt"), context);
-        assertActivation(true, newExistsProfile("${rootDirectory}"), context);
-        assertActivation(true, newExistsProfile("${rootDirectory}/" + "file.txt"), context);
-        assertActivation(false, newMissingProfile("${rootDirectory}"), context);
-        assertActivation(false, newMissingProfile("${rootDirectory}/" + "file.txt"), context);
+        assertActivation(false, newExistsProfile("${project.rootDirectory}/someFile.txt"), context);
+        assertActivation(true, newMissingProfile("${project.rootDirectory}/someFile.txt"), context);
+        assertActivation(true, newExistsProfile("${project.rootDirectory}"), context);
+        assertActivation(true, newExistsProfile("${project.rootDirectory}/" + "file.txt"), context);
+        assertActivation(false, newMissingProfile("${project.rootDirectory}"), context);
+        assertActivation(false, newMissingProfile("${project.rootDirectory}/" + "file.txt"), context);
     }
 
     @Test
-    void testIsActiveNoFile() {
+    void testIsActiveNoFileWithShortBasedir() {
         assertActivation(false, newExistsProfile(null), context);
         assertActivation(false, newExistsProfile("someFile.txt"), context);
         assertActivation(false, newExistsProfile("${basedir}/someFile.txt"), context);
@@ -92,15 +92,26 @@ void testIsActiveNoFile() {
         assertActivation(true, newMissingProfile("${basedir}/someFile.txt"), context);
     }
 
+    @Test
+    void testIsActiveNoFile() {
+        assertActivation(false, newExistsProfile(null), context);
+        assertActivation(false, newExistsProfile("someFile.txt"), context);
+        assertActivation(false, newExistsProfile("${project.basedir}/someFile.txt"), context);
+
+        assertActivation(false, newMissingProfile(null), context);
+        assertActivation(true, newMissingProfile("someFile.txt"), context);
+        assertActivation(true, newMissingProfile("${project.basedir}/someFile.txt"), context);
+    }
+
     @Test
     void testIsActiveExistsFileExists() {
         assertActivation(true, newExistsProfile("file.txt"), context);
-        assertActivation(true, newExistsProfile("${basedir}"), context);
-        assertActivation(true, newExistsProfile("${basedir}/" + "file.txt"), context);
+        assertActivation(true, newExistsProfile("${project.basedir}"), context);
+        assertActivation(true, newExistsProfile("${project.basedir}/" + "file.txt"), context);
 
         assertActivation(false, newMissingProfile("file.txt"), context);
-        assertActivation(false, newMissingProfile("${basedir}"), context);
-        assertActivation(false, newMissingProfile("${basedir}/" + "file.txt"), context);
+        assertActivation(false, newMissingProfile("${project.basedir}"), context);
+        assertActivation(false, newMissingProfile("${project.basedir}/" + "file.txt"), context);
     }
 
     @Test

Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ public Object getValue(String expression) {`
`81`	`81`	`interpolator.addValueSource(new AbstractValueSource(false) {`
`82`	`82`	`@Override`
`83`	`83`	`public Object getValue(String expression) {`
`84`		`- if ("rootDirectory".equals(expression)) {`
	`84`	`+ if ("project.rootDirectory".equals(expression)) {`
`85`	`85`	`Path root = rootLocator.findMandatoryRoot(basedir);`
`86`	`86`	`return root.toFile().getAbsolutePath();`
`87`	`87`	`}`