This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-integration-testing.git
The following commit(s) were added to refs/heads/master by this push:
new 7559ccf Fix pom content comparison to avoid line ending problems
(#119)
7559ccf is described below
commit 7559ccf3cd1e4f9c8e844d0b46a62b295802d519
Author: Guillaume Nodet <gno...@gmail.com>
AuthorDate: Wed Oct 6 09:29:32 2021 +0200
Fix pom content comparison to avoid line ending problems (#119)
---
.../maven/it/MavenITmng6656BuildConsumer.java | 27 ++++++++++-------
.../maven/it/MavenITmng6957BuildConsumer.java | 35 +++++++++++++---------
2 files changed, 38 insertions(+), 24 deletions(-)
diff --git
a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6656BuildConsumer.java
b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6656BuildConsumer.java
index 6086e5c..51634e0 100644
---
a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6656BuildConsumer.java
+++
b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6656BuildConsumer.java
@@ -23,7 +23,9 @@ import org.apache.maven.it.util.ResourceExtractor;
import org.apache.maven.shared.utils.io.FileUtils;
import java.io.File;
+import java.io.IOException;
import java.util.Arrays;
+import java.util.Collections;
/**
* With the build-consumer the pom.xml will be adjusted during the process.
@@ -71,21 +73,26 @@ public class MavenITmng6656BuildConsumer
verifier.setAutoclean( false );
verifier.addCliOption( "-Dchangelist=MNG6656" );
- verifier.executeGoals( Arrays.asList( "install" ) );
+ verifier.executeGoals( Collections.singletonList( "install" ) );
verifier.verifyErrorFreeLog();
- String content;
- content = FileUtils.fileRead( new File( testDir,
"expected/parent.pom") );
- verifier.assertArtifactContents( "org.sonatype.mavenbook.multi",
"parent", "0.9-MNG6656-SNAPSHOT", "pom", content );
+ assertTextEquals( new File( testDir, "expected/parent.pom"),
+ new File( verifier.getArtifactPath(
"org.sonatype.mavenbook.multi", "parent", "0.9-MNG6656-SNAPSHOT", "pom" ) ) );
- content = FileUtils.fileRead( new File( testDir,
"expected/simple-parent.pom") );
- verifier.assertArtifactContents( "org.sonatype.mavenbook.multi",
"simple-parent", "0.9-MNG6656-SNAPSHOT", "pom", content );
+ assertTextEquals( new File( testDir, "expected/simple-parent.pom"),
+ new File( verifier.getArtifactPath(
"org.sonatype.mavenbook.multi", "simple-parent", "0.9-MNG6656-SNAPSHOT", "pom"
) ) );
- content = FileUtils.fileRead( new File( testDir,
"expected/simple-weather.pom") );
- verifier.assertArtifactContents( "org.sonatype.mavenbook.multi",
"simple-weather", "0.9-MNG6656-SNAPSHOT", "pom", content );
+ assertTextEquals( new File( testDir, "expected/simple-weather.pom"),
+ new File( verifier.getArtifactPath(
"org.sonatype.mavenbook.multi", "simple-weather", "0.9-MNG6656-SNAPSHOT", "pom"
) ) );
- content = FileUtils.fileRead( new File( testDir,
"expected/simple-webapp.pom") );
- verifier.assertArtifactContents( "org.sonatype.mavenbook.multi",
"simple-webapp", "0.9-MNG6656-SNAPSHOT", "pom", content );
+ assertTextEquals( new File( testDir, "expected/simple-webapp.pom"),
+ new File( verifier.getArtifactPath(
"org.sonatype.mavenbook.multi", "simple-webapp", "0.9-MNG6656-SNAPSHOT", "pom"
) ) );
+ }
+
+ static void assertTextEquals( File file1, File file2 )
+ throws IOException
+ {
+ assertEquals( FileUtils.loadFile( file1 ), FileUtils.loadFile( file2 )
);
}
}
diff --git
a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6957BuildConsumer.java
b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6957BuildConsumer.java
index 6486d45..19eb124 100644
---
a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6957BuildConsumer.java
+++
b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6957BuildConsumer.java
@@ -23,7 +23,9 @@ import org.apache.maven.it.util.ResourceExtractor;
import org.apache.maven.shared.utils.io.FileUtils;
import java.io.File;
+import java.io.IOException;
import java.util.Arrays;
+import java.util.Collections;
/**
* With the build-consumer the POM will be adjusted during the process.
@@ -71,27 +73,32 @@ public class MavenITmng6957BuildConsumer
verifier.setAutoclean( false );
verifier.addCliOption( "-Dchangelist=MNG6957" );
- verifier.executeGoals( Arrays.asList( "install" ) );
+ verifier.executeGoals( Collections.singletonList( "install" ) );
verifier.verifyErrorFreeLog();
- String content;
- content = FileUtils.fileRead( new File( testDir,
"expected/parent.pom") );
- verifier.assertArtifactContents( "org.sonatype.mavenbook.multi",
"parent", "0.9-MNG6957-SNAPSHOT", "pom", content );
+ assertTextEquals( new File( testDir, "expected/parent.pom"),
+ new File( verifier.getArtifactPath(
"org.sonatype.mavenbook.multi", "parent", "0.9-MNG6957-SNAPSHOT", "pom" ) ) );
- content = FileUtils.fileRead( new File( testDir,
"expected/simple-parent.pom") );
- verifier.assertArtifactContents( "org.sonatype.mavenbook.multi",
"simple-parent", "0.9-MNG6957-SNAPSHOT", "pom", content );
+ assertTextEquals( new File( testDir, "expected/simple-parent.pom"),
+ new File( verifier.getArtifactPath(
"org.sonatype.mavenbook.multi", "simple-parent", "0.9-MNG6957-SNAPSHOT", "pom"
) ) );
- content = FileUtils.fileRead( new File( testDir,
"expected/simple-weather.pom") );
- verifier.assertArtifactContents( "org.sonatype.mavenbook.multi",
"simple-weather", "0.9-MNG6957-SNAPSHOT", "pom", content );
+ assertTextEquals( new File( testDir, "expected/simple-weather.pom"),
+ new File( verifier.getArtifactPath(
"org.sonatype.mavenbook.multi", "simple-weather", "0.9-MNG6957-SNAPSHOT", "pom"
) ) );
- content = FileUtils.fileRead( new File( testDir,
"expected/simple-webapp.pom") );
- verifier.assertArtifactContents( "org.sonatype.mavenbook.multi",
"simple-webapp", "0.9-MNG6957-SNAPSHOT", "pom", content );
+ assertTextEquals( new File( testDir, "expected/simple-webapp.pom"),
+ new File( verifier.getArtifactPath(
"org.sonatype.mavenbook.multi", "simple-webapp", "0.9-MNG6957-SNAPSHOT", "pom"
) ) );
- content = FileUtils.fileRead( new File( testDir,
"expected/simple-testutils.pom") );
- verifier.assertArtifactContents( "org.sonatype.mavenbook.multi",
"simple-testutils", "0.9-MNG6957-SNAPSHOT", "pom", content );
+ assertTextEquals( new File( testDir, "expected/simple-testutils.pom"),
+ new File( verifier.getArtifactPath(
"org.sonatype.mavenbook.multi", "simple-testutils", "0.9-MNG6957-SNAPSHOT",
"pom" ) ) );
- content = FileUtils.fileRead( new File( testDir,
"expected/utils-parent.pom") );
- verifier.assertArtifactContents( "org.sonatype.mavenbook.multi",
"utils-parent", "0.9-MNG6957-SNAPSHOT", "pom", content );
+ assertTextEquals( new File( testDir, "expected/utils-parent.pom"),
+ new File( verifier.getArtifactPath(
"org.sonatype.mavenbook.multi", "utils-parent", "0.9-MNG6957-SNAPSHOT", "pom" )
) );
+ }
+
+ static void assertTextEquals( File file1, File file2 )
+ throws IOException
+ {
+ assertEquals( FileUtils.loadFile( file1 ), FileUtils.loadFile( file2 )
);
}
}
