o Backing this off. Fix will take more time to also pass 'testEdgeCas…

…es'. git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1770784 13f79535-47bb-0310-9956-ffa450edef68
apache · Nov 21, 2016 · 754624f · 754624f
1 parent d71dfda
commit 754624f
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 44 deletions.
diff --git a/...ava/org/apache/maven/shared/filtering/AbstractInterpolatorFilterReaderLineEndingTest.java b/...ava/org/apache/maven/shared/filtering/AbstractInterpolatorFilterReaderLineEndingTest.java
@@ -77,13 +77,13 @@ public void testDefaults()
         reader = getDollarBracesReader( in, interpolator, "\\" );
         assertEquals( "escape dollar with expression ${a}", IOUtil.toString( reader ) );
 
-        in = new StringReader( "escape escape string before expression \\\\${a}" );
-        reader = getDollarBracesReader( in, interpolator, "\\" );
-        assertEquals( "escape escape string before expression \\DONE_A", IOUtil.toString( reader ) );
-
-        in = new StringReader( "escape escape string and expression \\\\\\${a}" );
-        reader = getDollarBracesReader( in, interpolator, "\\" );
-        assertEquals( "escape escape string before expression \\${a}", IOUtil.toString( reader ) );
+//        in = new StringReader( "escape escape string before expression \\\\${a}" );
+//        reader = getDollarBracesReader( in, interpolator, "\\" );
+//        assertEquals( "escape escape string before expression \\DONE_A", IOUtil.toString( reader ) );
+//
+//        in = new StringReader( "escape escape string and expression \\\\\\${a}" );
+//        reader = getDollarBracesReader( in, interpolator, "\\" );
+//        assertEquals( "escape escape string before expression \\${a}", IOUtil.toString( reader ) );
 
         in = new StringReader( "unknown expression ${unknown}" );
         reader = getDollarBracesReader( in, interpolator, "\\" );

diff --git a/...g/src/test/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFilteringTest.java b/...g/src/test/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFilteringTest.java
@@ -871,43 +871,43 @@ public void testMSHARED81()
     /**
      * unit test for MRESOURCES-230 : https://issues.apache.org/jira/browse/MRESOURCES-230
      */
-    public void testCorrectlyEscapesEscapeString()
-        throws Exception
-    {
-        StubMavenProject mavenProject = new StubMavenProject( new File( "/foo/bar" ) );
-
-        mavenProject.setVersion( "1.0" );
-        mavenProject.addProperty( "a", "DONE_A" );
-
-        MavenResourcesFiltering mavenResourcesFiltering = lookup( MavenResourcesFiltering.class );
-
-        List<Resource> resources = new ArrayList<Resource>();
-        resources.add( new Resource()
-        {
-
-            {
-                setDirectory( getBasedir() + "/src/test/units-files/MRESOURCES-230" );
-                setFiltering( true );
-            }
-
-        } );
-        resources.get( 0 ).addExclude( "expected.txt" );
-
-        File output = new File( outputDirectory, "MRESOURCES-230" );
-        MavenResourcesExecution mavenResourcesExecution =
-            new MavenResourcesExecution( resources, output, mavenProject, "UTF-8", Collections.<String>emptyList(),
-                                         Collections.<String>emptyList(), new StubMavenSession() );
-        mavenResourcesExecution.setIncludeEmptyDirs( true );
-        mavenResourcesExecution.setEscapeString( "\\" );
-
-        mavenResourcesFiltering.filterResources( mavenResourcesExecution );
-
-        final String filtered = FileUtils.fileRead( new File( output, "resource.txt" ), "UTF-8" );
-        final String expected =
-            FileUtils.fileRead( new File( getBasedir() + "/src/test/units-files/MRESOURCES-230/expected.txt" ) );
-
-        assertEquals( expected, filtered );
-    }
+//    public void testCorrectlyEscapesEscapeString()
+//        throws Exception
+//    {
+//        StubMavenProject mavenProject = new StubMavenProject( new File( "/foo/bar" ) );
+//
+//        mavenProject.setVersion( "1.0" );
+//        mavenProject.addProperty( "a", "DONE_A" );
+//
+//        MavenResourcesFiltering mavenResourcesFiltering = lookup( MavenResourcesFiltering.class );
+//
+//        List<Resource> resources = new ArrayList<Resource>();
+//        resources.add( new Resource()
+//        {
+//
+//            {
+//                setDirectory( getBasedir() + "/src/test/units-files/MRESOURCES-230" );
+//                setFiltering( true );
+//            }
+//
+//        } );
+//        resources.get( 0 ).addExclude( "expected.txt" );
+//
+//        File output = new File( outputDirectory, "MRESOURCES-230" );
+//        MavenResourcesExecution mavenResourcesExecution =
+//            new MavenResourcesExecution( resources, output, mavenProject, "UTF-8", Collections.<String>emptyList(),
+//                                         Collections.<String>emptyList(), new StubMavenSession() );
+//        mavenResourcesExecution.setIncludeEmptyDirs( true );
+//        mavenResourcesExecution.setEscapeString( "\\" );
+//
+//        mavenResourcesFiltering.filterResources( mavenResourcesExecution );
+//
+//        final String filtered = FileUtils.fileRead( new File( output, "resource.txt" ), "UTF-8" );
+//        final String expected =
+//            FileUtils.fileRead( new File( getBasedir() + "/src/test/units-files/MRESOURCES-230/expected.txt" ) );
+//
+//        assertEquals( expected, filtered );
+//    }
 
     /**
      * unit test for edge cases : https://issues.apache.org/jira/browse/MSHARED-228