Fix some testing XML files checkout with incorrect eol

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

Hide file tree

Showing 6 changed files with 8 additions and 4 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" );
     }
 
     /**
@@ -1099,7 +1099,7 @@ public void testDocdeclTextWithEntitiesUnix()
     public void testDocdeclTextWithEntitiesDOS()
         throws IOException
     {
-        testDocdeclTextWithEntities( "test-entities-dos.xml" );
+        testDocdeclTextWithEntities( "test-entities-DOS.xml" );
     }
 
     private void testDocdeclTextWithEntities( String filename )
@@ -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" );
     }
 
     /**
@@ -1162,7 +1162,7 @@ public void testDocdeclTextWithEntitiesInAttributesUnix()
     public void testDocdeclTextWithEntitiesInAttributesDOS()
         throws IOException
     {
-        testDocdeclTextWithEntitiesInAttributes( "test-entities-in-attr-dos.xml" );
+        testDocdeclTextWithEntitiesInAttributes( "test-entities-in-attr-DOS.xml" );
     }
 
     private void testDocdeclTextWithEntitiesInAttributes( String filename )

diff --git a/src/test/resources/xml/test-entities-dos.xml → src/test/resources/xml/test-entities-DOS.xml b/src/test/resources/xml/test-entities-dos.xml → src/test/resources/xml/test-entities-DOS.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
diff --git a/...sources/xml/test-entities-in-attr-dos.xml → ...sources/xml/test-entities-in-attr-DOS.xml b/...sources/xml/test-entities-in-attr-dos.xml → ...sources/xml/test-entities-in-attr-DOS.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