[maven] branch MNG-6999 updated: Adjustments based on review comments

[rf...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

rfscholte pushed a commit to branch MNG-6999
in repository https://gitbox.apache.org/repos/asf/maven.git


The following commit(s) were added to refs/heads/MNG-6999 by this push:
     new 9a69861  Adjustments based on review comments
9a69861 is described below

commit 9a69861c0052cc7ba66fc6c5db2f9c17f3f30410
Author: rfscholte <rf...@apache.org>
AuthorDate: Thu Oct 22 18:38:47 2020 +0200

    Adjustments based on review comments
---
 .../maven/internal/aether/ConsumerModelSourceTransformerTest.java  | 7 ++++---
 .../org/apache/maven/xml/sax/filter/ConsumerPomXMLFilterTest.java  | 1 -
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/maven-core/src/test/java/org/apache/maven/internal/aether/ConsumerModelSourceTransformerTest.java b/maven-core/src/test/java/org/apache/maven/internal/aether/ConsumerModelSourceTransformerTest.java
index 9476f3e..2828610d 100644
--- a/maven-core/src/test/java/org/apache/maven/internal/aether/ConsumerModelSourceTransformerTest.java
+++ b/maven-core/src/test/java/org/apache/maven/internal/aether/ConsumerModelSourceTransformerTest.java
@@ -34,14 +34,15 @@ public class ConsumerModelSourceTransformerTest
     private ConsumerModelSourceTransformer transformer = new ConsumerModelSourceTransformer();
 
     @Test
-    public void test() throws Exception
+    public void transform() throws Exception
     {
         Path beforePomFile = Paths.get( "src/test/resources/projects/transform/before.pom").toAbsolutePath();
         Path afterPomFile = Paths.get( "src/test/resources/projects/transform/after.pom").toAbsolutePath();
 
-        try( InputStream in = transformer.transform( beforePomFile, new NoTransformerContext() ) )
+        try( InputStream expected = Files.newInputStream( afterPomFile ); 
+             InputStream result = transformer.transform( beforePomFile, new NoTransformerContext() ) )
         {
-            XmlAssert.assertThat( in ).and( Files.newInputStream( afterPomFile ) ).areIdentical();
+            XmlAssert.assertThat( result ).and( expected ).areIdentical();
         }
     }
 
diff --git a/maven-xml/src/test/java/org/apache/maven/xml/sax/filter/ConsumerPomXMLFilterTest.java b/maven-xml/src/test/java/org/apache/maven/xml/sax/filter/ConsumerPomXMLFilterTest.java
index 29c47d4..c5cfc18 100644
--- a/maven-xml/src/test/java/org/apache/maven/xml/sax/filter/ConsumerPomXMLFilterTest.java
+++ b/maven-xml/src/test/java/org/apache/maven/xml/sax/filter/ConsumerPomXMLFilterTest.java
@@ -236,7 +236,6 @@ public class ConsumerPomXMLFilterTest extends AbstractXMLFilterTests
     }
     
     @Test
-//    @Ignore
     public void lexicalHandler() throws Exception
     {
         String input = "<project><!--before--><modules>"