Skip to content

Commit e6ddb82

Browse files
gnodetgnodet
committed
Use org.apache.maven.its.plugins:maven-it-plugin-expression:2.1-SNAPSHOT:eval instead of m-help-p
1 parent 950800a commit e6ddb82

File tree

1 file changed

+46
-23
lines changed

1 file changed

+46
-23
lines changed

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

Lines changed: 46 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import java.io.File;
2222
import java.util.List;
2323
import java.util.Objects;
24+
import java.util.Properties;
2425

2526
import org.apache.maven.shared.verifier.VerificationException;
2627
import org.apache.maven.shared.verifier.Verifier;
@@ -31,6 +32,9 @@
3132
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-8230">MNG-8230</a>.
3233
*/
3334
class MavenITmng8230CIFriendlyTest extends AbstractMavenIntegrationTestCase {
35+
36+
private static final String PROPERTIES = "target/expression.properties";
37+
3438
MavenITmng8230CIFriendlyTest() {
3539
super("[4.0.0-beta-5,)");
3640
}
@@ -44,12 +48,16 @@ class MavenITmng8230CIFriendlyTest extends AbstractMavenIntegrationTestCase {
4448
void testitCiFriendlyWithProjectProperties() throws Exception {
4549
File testDir = ResourceExtractor.simpleExtractResources(getClass(), "/mng-8230-ci-friendly-and-gav");
4650

47-
Verifier verifier = newVerifier(new File(testDir, "cif-with-project-props").getAbsolutePath());
48-
verifier.addCliArguments(
49-
"org.apache.maven.plugins:maven-help-plugin:3.3.0:evaluate", "-Dexpression=project.version");
51+
File basedir = new File(testDir, "cif-with-project-props");
52+
Verifier verifier = newVerifier(basedir.getAbsolutePath());
53+
verifier.addCliArgument("-Dexpression.outputFile=" + new File(basedir, PROPERTIES).getPath());
54+
verifier.addCliArgument("-Dexpression.expressions=project/version");
55+
verifier.addCliArgument("org.apache.maven.its.plugins:maven-it-plugin-expression:2.1-SNAPSHOT:eval");
5056
verifier.execute();
5157
verifier.verifyErrorFreeLog();
52-
verifyExactLine(verifier, "1.0-SNAPSHOT");
58+
verifier.verifyFilePresent(PROPERTIES);
59+
Properties props = verifier.loadProperties(PROPERTIES);
60+
assertEquals(props.getProperty("project.version"), "1.0-SNAPSHOT");
5361
}
5462

5563
/**
@@ -61,14 +69,17 @@ void testitCiFriendlyWithProjectProperties() throws Exception {
6169
void testitCiFriendlyWithProjectPropertiesOverride() throws Exception {
6270
File testDir = ResourceExtractor.simpleExtractResources(getClass(), "/mng-8230-ci-friendly-and-gav");
6371

64-
Verifier verifier = newVerifier(new File(testDir, "cif-with-project-props").getAbsolutePath());
65-
verifier.addCliArguments(
66-
"org.apache.maven.plugins:maven-help-plugin:3.3.0:evaluate",
67-
"-Dexpression=project.version",
68-
"-Dci-version=1.1-SNAPSHOT");
72+
File basedir = new File(testDir, "cif-with-project-props");
73+
Verifier verifier = newVerifier(basedir.getAbsolutePath());
74+
verifier.addCliArgument("-Dexpression.outputFile=" + new File(basedir, PROPERTIES).getPath());
75+
verifier.addCliArgument("-Dexpression.expressions=project/version");
76+
verifier.addCliArgument("org.apache.maven.its.plugins:maven-it-plugin-expression:2.1-SNAPSHOT:eval");
77+
verifier.addCliArgument("-Dci-version=1.1-SNAPSHOT");
6978
verifier.execute();
7079
verifier.verifyErrorFreeLog();
71-
verifyExactLine(verifier, "1.1-SNAPSHOT");
80+
verifier.verifyFilePresent(PROPERTIES);
81+
Properties props = verifier.loadProperties(PROPERTIES);
82+
assertEquals(props.getProperty("project.version"), "1.1-SNAPSHOT");
7283
}
7384

7485
/**
@@ -80,14 +91,18 @@ void testitCiFriendlyWithProjectPropertiesOverride() throws Exception {
8091
void testitCiFriendlyWithUserProperties() throws Exception {
8192
File testDir = ResourceExtractor.simpleExtractResources(getClass(), "/mng-8230-ci-friendly-and-gav");
8293

83-
Verifier verifier = newVerifier(new File(testDir, "cif-with-user-props").getAbsolutePath());
84-
verifier.addCliArguments(
85-
"org.apache.maven.plugins:maven-help-plugin:3.3.0:evaluate",
86-
"-Dexpression=project.version",
87-
"-Dci-version=1.1-SNAPSHOT");
94+
File basedir = new File(testDir, "cif-with-user-props");
95+
Verifier verifier = newVerifier(basedir.getAbsolutePath());
96+
97+
verifier.addCliArgument("-Dexpression.outputFile=" + new File(basedir, PROPERTIES).getPath());
98+
verifier.addCliArgument("-Dexpression.expressions=project/version");
99+
verifier.addCliArgument("org.apache.maven.its.plugins:maven-it-plugin-expression:2.1-SNAPSHOT:eval");
100+
verifier.addCliArgument("-Dci-version=1.1-SNAPSHOT");
88101
verifier.execute();
89102
verifier.verifyErrorFreeLog();
90-
verifyExactLine(verifier, "1.1-SNAPSHOT");
103+
verifier.verifyFilePresent(PROPERTIES);
104+
Properties props = verifier.loadProperties(PROPERTIES);
105+
assertEquals(props.getProperty("project.version"), "1.1-SNAPSHOT");
91106
}
92107

93108
/**
@@ -99,9 +114,11 @@ void testitCiFriendlyWithUserProperties() throws Exception {
99114
void testitCiFriendlyWithUserPropertiesNotGiven() throws Exception {
100115
File testDir = ResourceExtractor.simpleExtractResources(getClass(), "/mng-8230-ci-friendly-and-gav");
101116

102-
Verifier verifier = newVerifier(new File(testDir, "cif-with-user-props").getAbsolutePath());
103-
verifier.addCliArguments(
104-
"org.apache.maven.plugins:maven-help-plugin:3.3.0:evaluate", "-Dexpression=project.version");
117+
File basedir = new File(testDir, "cif-with-user-props");
118+
Verifier verifier = newVerifier(basedir.getAbsolutePath());
119+
verifier.addCliArgument("-Dexpression.outputFile=" + new File(basedir, PROPERTIES).getPath());
120+
verifier.addCliArgument("-Dexpression.expressions=project/version");
121+
verifier.addCliArgument("org.apache.maven.its.plugins:maven-it-plugin-expression:2.1-SNAPSHOT:eval");
105122
try {
106123
verifier.execute();
107124
fail("Expected failure");
@@ -118,8 +135,11 @@ void testitCiFriendlyWithUserPropertiesNotGiven() throws Exception {
118135
void testitExpressionInGroupId() throws Exception {
119136
File testDir = ResourceExtractor.simpleExtractResources(getClass(), "/mng-8230-ci-friendly-and-gav");
120137

121-
Verifier verifier = newVerifier(new File(testDir, "exp-in-groupid").getAbsolutePath());
122-
verifier.addCliArguments("validate");
138+
File basedir = new File(testDir, "exp-in-groupid");
139+
Verifier verifier = newVerifier(basedir.getAbsolutePath());
140+
verifier.addCliArgument("-Dexpression.outputFile=" + new File(basedir, PROPERTIES).getPath());
141+
verifier.addCliArgument("-Dexpression.expressions=project/version");
142+
verifier.addCliArgument("org.apache.maven.its.plugins:maven-it-plugin-expression:2.1-SNAPSHOT:eval");
123143
try {
124144
verifier.execute();
125145
fail("Expected failure");
@@ -136,8 +156,11 @@ void testitExpressionInGroupId() throws Exception {
136156
void testitExpressionInArtifactId() throws Exception {
137157
File testDir = ResourceExtractor.simpleExtractResources(getClass(), "/mng-8230-ci-friendly-and-gav");
138158

139-
Verifier verifier = newVerifier(new File(testDir, "exp-in-artifactid").getAbsolutePath());
140-
verifier.addCliArguments("validate");
159+
File basedir = new File(testDir, "exp-in-artifactid");
160+
Verifier verifier = newVerifier(basedir.getAbsolutePath());
161+
verifier.addCliArgument("-Dexpression.outputFile=" + new File(basedir, PROPERTIES).getPath());
162+
verifier.addCliArgument("-Dexpression.expressions=project/version");
163+
verifier.addCliArgument("org.apache.maven.its.plugins:maven-it-plugin-expression:2.1-SNAPSHOT:eval");
141164
try {
142165
verifier.execute();
143166
fail("Expected failure");

0 commit comments

Comments
 (0)