Skip to content

Commit 76efdf9

Browse files
slawekjaranowskislawekjaranowski
committed
Promote project.rootDirectory
- enable tests for project.rootDirectory, session.rooDirectory, session.topDirectory
1 parent eeaa133 commit 76efdf9

6 files changed

Lines changed: 18 additions & 178 deletions

File tree

‎core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7038RootdirTest.java‎

Lines changed: 11 additions & 103 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
public class MavenITmng7038RootdirTest extends AbstractMavenIntegrationTestCase {
3131

3232
public MavenITmng7038RootdirTest() {
33-
super("[4.0.0-alpha-6,)");
33+
super("[3.10.0,)");
3434
}
3535

3636
@Test
@@ -58,42 +58,8 @@ public void testRootdir() throws IOException, VerificationException {
5858
Boolean.TRUE.toString(),
5959
props.getProperty("project.properties.activated"));
6060

61-
verifier.verifyFilePresent("module-a/target/pom.properties");
62-
props = verifier.loadProperties("module-a/target/pom.properties");
63-
assertEquals(
64-
"project.properties.rootdir",
65-
new File(testDir, "module-a").getAbsolutePath(),
66-
props.getProperty("project.properties.rootdir"));
67-
assertEquals(
68-
"project.rootDirectory",
69-
new File(testDir, "module-a").getAbsolutePath(),
70-
props.getProperty("project.rootDirectory"));
71-
assertEquals("session.topDirectory", testDir.getAbsolutePath(), props.getProperty("session.topDirectory"));
72-
assertEquals("session.rootDirectory", testDir.getAbsolutePath(), props.getProperty("session.rootDirectory"));
73-
assertEquals(
74-
"project.properties.activated",
75-
Boolean.FALSE.toString(),
76-
props.getProperty("project.properties.activated"));
77-
78-
verifier.verifyFilePresent("module-a/module-a-1/target/pom.properties");
79-
props = verifier.loadProperties("module-a/module-a-1/target/pom.properties");
80-
assertEquals(
81-
"project.properties.rootdir",
82-
new File(testDir, "module-a").getAbsolutePath(),
83-
props.getProperty("project.properties.rootdir"));
84-
assertEquals(
85-
"project.rootDirectory",
86-
new File(testDir, "module-a").getAbsolutePath(),
87-
props.getProperty("project.rootDirectory"));
88-
assertEquals("session.topDirectory", testDir.getAbsolutePath(), props.getProperty("session.topDirectory"));
89-
assertEquals("session.rootDirectory", testDir.getAbsolutePath(), props.getProperty("session.rootDirectory"));
90-
assertEquals(
91-
"project.properties.activated",
92-
Boolean.FALSE.toString(),
93-
props.getProperty("project.properties.activated"));
94-
95-
verifier.verifyFilePresent("module-b/target/pom.properties");
96-
props = verifier.loadProperties("module-b/target/pom.properties");
61+
verifier.verifyFilePresent("module/target/pom.properties");
62+
props = verifier.loadProperties("module/target/pom.properties");
9763
assertEquals(
9864
"project.properties.rootdir",
9965
testDir.getAbsolutePath(),
@@ -106,8 +72,8 @@ public void testRootdir() throws IOException, VerificationException {
10672
Boolean.TRUE.toString(),
10773
props.getProperty("project.properties.activated"));
10874

109-
verifier.verifyFilePresent("module-b/module-b-1/target/pom.properties");
110-
props = verifier.loadProperties("module-b/module-b-1/target/pom.properties");
75+
verifier.verifyFilePresent("module/module-1/target/pom.properties");
76+
props = verifier.loadProperties("module/module-1/target/pom.properties");
11177
assertEquals(
11278
"project.properties.rootdir",
11379
testDir.getAbsolutePath(),
@@ -122,67 +88,9 @@ public void testRootdir() throws IOException, VerificationException {
12288
}
12389

12490
@Test
125-
public void testRootdirWithTopdirAndRoot() throws IOException, VerificationException {
126-
File testDir = ResourceExtractor.simpleExtractResources(getClass(), "/mng-7038-rootdir");
127-
Verifier verifier = newVerifier(new File(testDir, "module-a").getAbsolutePath());
128-
129-
verifier.addCliArgument("validate");
130-
verifier.execute();
131-
verifier.verifyErrorFreeLog();
132-
133-
Properties props;
134-
135-
verifier.verifyFilePresent("target/pom.properties");
136-
props = verifier.loadProperties("target/pom.properties");
137-
assertEquals(
138-
"project.properties.rootdir",
139-
new File(testDir, "module-a").getAbsolutePath(),
140-
props.getProperty("project.properties.rootdir"));
141-
assertEquals(
142-
"project.rootDirectory",
143-
new File(testDir, "module-a").getAbsolutePath(),
144-
props.getProperty("project.rootDirectory"));
145-
assertEquals(
146-
"session.topDirectory",
147-
new File(testDir, "module-a").getAbsolutePath(),
148-
props.getProperty("session.topDirectory"));
149-
assertEquals(
150-
"session.rootDirectory",
151-
new File(testDir, "module-a").getAbsolutePath(),
152-
props.getProperty("session.rootDirectory"));
153-
assertEquals(
154-
"project.properties.activated",
155-
Boolean.FALSE.toString(),
156-
props.getProperty("project.properties.activated"));
157-
158-
verifier.verifyFilePresent("module-a-1/target/pom.properties");
159-
props = verifier.loadProperties("module-a-1/target/pom.properties");
160-
assertEquals(
161-
"project.properties.rootdir",
162-
new File(testDir, "module-a").getAbsolutePath(),
163-
props.getProperty("project.properties.rootdir"));
164-
assertEquals(
165-
"project.rootDirectory",
166-
new File(testDir, "module-a").getAbsolutePath(),
167-
props.getProperty("project.rootDirectory"));
168-
assertEquals(
169-
"session.topDirectory",
170-
new File(testDir, "module-a").getAbsolutePath(),
171-
props.getProperty("session.topDirectory"));
172-
assertEquals(
173-
"session.rootDirectory",
174-
new File(testDir, "module-a").getAbsolutePath(),
175-
props.getProperty("session.rootDirectory"));
176-
assertEquals(
177-
"project.properties.activated",
178-
Boolean.FALSE.toString(),
179-
props.getProperty("project.properties.activated"));
180-
}
181-
182-
@Test
183-
public void testRootdirWithTopdirAndNoRoot() throws IOException, VerificationException {
91+
public void testRootdirWithTopdir() throws IOException, VerificationException {
18492
File testDir = ResourceExtractor.simpleExtractResources(getClass(), "/mng-7038-rootdir");
185-
Verifier verifier = newVerifier(new File(testDir, "module-b").getAbsolutePath());
93+
Verifier verifier = newVerifier(new File(testDir, "module").getAbsolutePath());
18694

18795
verifier.addCliArgument("validate");
18896
verifier.execute();
@@ -199,24 +107,24 @@ public void testRootdirWithTopdirAndNoRoot() throws IOException, VerificationExc
199107
assertEquals("project.rootDirectory", testDir.getAbsolutePath(), props.getProperty("project.rootDirectory"));
200108
assertEquals(
201109
"session.topDirectory",
202-
new File(testDir, "module-b").getAbsolutePath(),
110+
new File(testDir, "module").getAbsolutePath(),
203111
props.getProperty("session.topDirectory"));
204112
assertEquals("session.rootDirectory", testDir.getAbsolutePath(), props.getProperty("session.rootDirectory"));
205113
assertEquals(
206114
"project.properties.activated",
207115
Boolean.TRUE.toString(),
208116
props.getProperty("project.properties.activated"));
209117

210-
verifier.verifyFilePresent("module-b-1/target/pom.properties");
211-
props = verifier.loadProperties("module-b-1/target/pom.properties");
118+
verifier.verifyFilePresent("module-1/target/pom.properties");
119+
props = verifier.loadProperties("module-1/target/pom.properties");
212120
assertEquals(
213121
"project.properties.rootdir",
214122
testDir.getAbsolutePath(),
215123
props.getProperty("project.properties.rootdir"));
216124
assertEquals("project.rootDirectory", testDir.getAbsolutePath(), props.getProperty("project.rootDirectory"));
217125
assertEquals(
218126
"session.topDirectory",
219-
new File(testDir, "module-b").getAbsolutePath(),
127+
new File(testDir, "module").getAbsolutePath(),
220128
props.getProperty("session.topDirectory"));
221129
assertEquals("session.rootDirectory", testDir.getAbsolutePath(), props.getProperty("session.rootDirectory"));
222130
assertEquals(

‎core-it-suite/src/test/resources/mng-7038-rootdir/module-a/pom.xml‎

Lines changed: 0 additions & 36 deletions
This file was deleted.

‎core-it-suite/src/test/resources/mng-7038-rootdir/module-b/module-b-1/pom.xml‎

Lines changed: 0 additions & 32 deletions
This file was deleted.

core-it-suite/src/test/resources/mng-7038-rootdir/module-a/module-a-1/pom.xml renamed to core-it-suite/src/test/resources/mng-7038-rootdir/module/module-1/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ under the License.
2323

2424
<parent>
2525
<groupId>org.apache.maven.its.mng7038</groupId>
26-
<artifactId>module-a</artifactId>
26+
<artifactId>module</artifactId>
2727
<version>1.0</version>
2828
</parent>
2929

30-
<artifactId>module-a-1</artifactId>
30+
<artifactId>module-1</artifactId>
3131

3232
</project>

core-it-suite/src/test/resources/mng-7038-rootdir/module-b/pom.xml renamed to core-it-suite/src/test/resources/mng-7038-rootdir/module/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@ under the License.
2727
<version>1.0</version>
2828
</parent>
2929

30-
<artifactId>module-b</artifactId>
30+
<artifactId>module</artifactId>
3131

3232
<packaging>pom</packaging>
3333

3434
<modules>
35-
<module>module-b-1</module>
35+
<module>module-1</module>
3636
</modules>
3737

3838
</project>

‎core-it-suite/src/test/resources/mng-7038-rootdir/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,15 @@ under the License.
3030
<description>Test project.rootDirectory, session.topDirectory and session.rootDirectory properties.</description>
3131

3232
<modules>
33-
<module>module-a</module>
34-
<module>module-b</module>
33+
<module>module</module>
3534
</modules>
3635

3736
<properties>
3837
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
3938
<maven.compiler.source>1.8</maven.compiler.source>
4039
<maven.compiler.target>1.8</maven.compiler.target>
4140
<rootdir>${project.rootDirectory}</rootdir>
41+
<bsedir>${project.basedir}</bsedir>
4242
<activated>false</activated>
4343
</properties>
4444

@@ -74,7 +74,7 @@ under the License.
7474
<id>rootdir-profile-activation</id>
7575
<activation>
7676
<file>
77-
<exists>${rootDirectory}/.mvn/.gitkeep</exists>
77+
<exists>${project.rootDirectory}/.mvn/.gitkeep</exists>
7878
</file>
7979
</activation>
8080
<properties>

0 commit comments

Comments
 (0)