Fix some testing XML files checkout with incorrect eol

codehaus-plexus · Apr 17, 2022 · f8d155d · f8d155d
1 parent 10f7295
commit f8d155d
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 2 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -6,3 +6,7 @@
 *.css    text
 *.js     text
 *.sql    text
+
+# some files require the correct eol for proper testing
+*dos.xml  text eol=crlf
+*unix.xml text eol=lf
diff --git a/src/test/java/org/codehaus/plexus/util/xml/pull/MXParserTest.java b/src/test/java/org/codehaus/plexus/util/xml/pull/MXParserTest.java
@@ -1081,7 +1081,7 @@ public void testCustomEntityNotFoundInAttrTokenize() throws Exception
     public void testDocdeclTextWithEntitiesUnix()
         throws IOException
     {
-        testDocdeclTextWithEntities( "test-entities.xml" );
+        testDocdeclTextWithEntities( "test-entities-unix.xml" );
     }
 
     /**
@@ -1144,7 +1144,7 @@ private void testDocdeclTextWithEntities( String filename )
     public void testDocdeclTextWithEntitiesInAttributesUnix()
         throws IOException
     {
-        testDocdeclTextWithEntitiesInAttributes( "test-entities-in-attr.xml" );
+        testDocdeclTextWithEntitiesInAttributes( "test-entities-in-attr-unix.xml" );
     }
 
     /**

diff --git a/...t/resources/xml/test-entities-in-attr.xml → ...ources/xml/test-entities-in-attr-unix.xml b/...t/resources/xml/test-entities-in-attr.xml → ...ources/xml/test-entities-in-attr-unix.xml
diff --git a/src/test/resources/xml/test-entities.xml → ...test/resources/xml/test-entities-unix.xml b/src/test/resources/xml/test-entities.xml → ...test/resources/xml/test-entities-unix.xml