From 0d384e75ba5f950d389281226e56515be195b604 Mon Sep 17 00:00:00 2001 From: Gabriel Belingueres Date: Sun, 17 Apr 2022 04:01:59 -0300 Subject: [PATCH] Fix some testing XML files checkout with incorrect eol --- .gitattributes | 4 ++++ .../org/codehaus/plexus/util/xml/pull/MXParserTest.java | 8 ++++---- .../xml/{test-entities-dos.xml => test-entities-DOS.xml} | 0 .../xml/{test-entities.xml => test-entities-UNIX.xml} | 0 ...ties-in-attr-dos.xml => test-entities-in-attr-DOS.xml} | 0 ...ntities-in-attr.xml => test-entities-in-attr-UNIX.xml} | 0 6 files changed, 8 insertions(+), 4 deletions(-) rename src/test/resources/xml/{test-entities-dos.xml => test-entities-DOS.xml} (100%) rename src/test/resources/xml/{test-entities.xml => test-entities-UNIX.xml} (100%) rename src/test/resources/xml/{test-entities-in-attr-dos.xml => test-entities-in-attr-DOS.xml} (100%) rename src/test/resources/xml/{test-entities-in-attr.xml => test-entities-in-attr-UNIX.xml} (100%) diff --git a/.gitattributes b/.gitattributes index 3bb3b5ea..ccd9f864 100644 --- 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 index 6fc6e9c6..27ba5f8c 100644 --- 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 b/src/test/resources/xml/test-entities-DOS.xml similarity index 100% rename from src/test/resources/xml/test-entities-dos.xml rename to src/test/resources/xml/test-entities-DOS.xml diff --git a/src/test/resources/xml/test-entities.xml b/src/test/resources/xml/test-entities-UNIX.xml similarity index 100% rename from src/test/resources/xml/test-entities.xml rename to src/test/resources/xml/test-entities-UNIX.xml diff --git a/src/test/resources/xml/test-entities-in-attr-dos.xml b/src/test/resources/xml/test-entities-in-attr-DOS.xml similarity index 100% rename from src/test/resources/xml/test-entities-in-attr-dos.xml rename to src/test/resources/xml/test-entities-in-attr-DOS.xml diff --git a/src/test/resources/xml/test-entities-in-attr.xml b/src/test/resources/xml/test-entities-in-attr-UNIX.xml similarity index 100% rename from src/test/resources/xml/test-entities-in-attr.xml rename to src/test/resources/xml/test-entities-in-attr-UNIX.xml