You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kr...@apache.org on 2014/10/15 19:59:06 UTC
svn commit: r1632144 - in /maven/shared/trunk/maven-filtering/src/test:
java/org/apache/maven/shared/filtering/ units-files/MSHARED-325/
Author: krosenvold
Date: Wed Oct 15 17:59:06 2014
New Revision: 1632144
URL: http://svn.apache.org/r1632144
Log:
[MSHARED-325] Failing testcases. Submitted by Mikolaj Izdebski, applied unchanged.
Added:
maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/InvalidMarkTest.java
maven/shared/trunk/maven-filtering/src/test/units-files/MSHARED-325/
maven/shared/trunk/maven-filtering/src/test/units-files/MSHARED-325/payload
Modified:
maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/AbstractInterpolatorFilterReaderLineEndingTest.java
maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/InterpolatorFilterReaderLineEndingTest.java
maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/MultiDelimiterInterpolatorFilterReaderLineEndingTest.java
Modified: maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/AbstractInterpolatorFilterReaderLineEndingTest.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/AbstractInterpolatorFilterReaderLineEndingTest.java?rev=1632144&r1=1632143&r2=1632144&view=diff
==============================================================================
--- maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/AbstractInterpolatorFilterReaderLineEndingTest.java (original)
+++ maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/AbstractInterpolatorFilterReaderLineEndingTest.java Wed Oct 15 17:59:06 2014
@@ -26,6 +26,8 @@ import static org.mockito.Mockito.when;
import java.io.Reader;
import java.io.StringReader;
+import java.util.Arrays;
+import java.util.HashSet;
import org.codehaus.plexus.interpolation.Interpolator;
import org.codehaus.plexus.interpolation.RecursionInterceptor;
@@ -99,11 +101,23 @@ public abstract class AbstractInterpolat
reader = getAbc_AbcReader( in, interpolator );
assertEquals( "DONE", IOUtil.toString( reader ) );
}
-
+
+ // MSHARED-235: reader exceeds readAheadLimit
+ @Test
+ public void testMarkInvalid() throws Exception
+ {
+ Reader in = new StringReader( "@\").replace(p,\"]\").replace(q,\"" );
+ Reader reader = getAtReader( in, interpolator, "\\" );
+
+ assertEquals( "@\").replace(p,\"]\").replace(q,\"", IOUtil.toString( reader ) );
+ }
+
protected abstract Reader getAbc_AbcReader( Reader in, Interpolator interpolator );
protected abstract Reader getAaa_AaaReader( Reader in, Interpolator interpolator );
protected abstract Reader getDollarBracesReader( Reader in, Interpolator interpolator, String escapeString );
+
+ protected abstract Reader getAtReader( Reader in, Interpolator interpolator, String escapeString );
}
\ No newline at end of file
Modified: maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/InterpolatorFilterReaderLineEndingTest.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/InterpolatorFilterReaderLineEndingTest.java?rev=1632144&r1=1632143&r2=1632144&view=diff
==============================================================================
--- maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/InterpolatorFilterReaderLineEndingTest.java (original)
+++ maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/InterpolatorFilterReaderLineEndingTest.java Wed Oct 15 17:59:06 2014
@@ -45,4 +45,12 @@ public class InterpolatorFilterReaderLin
reader.setEscapeString( escapeString );
return reader;
}
+
+ @Override
+ protected Reader getAtReader( Reader in, Interpolator interpolator, String escapeString )
+ {
+ InterpolatorFilterReaderLineEnding reader = new InterpolatorFilterReaderLineEnding( in, interpolator, "@", "@", true );
+ reader.setEscapeString( escapeString );
+ return reader;
+ }
}
Added: maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/InvalidMarkTest.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/InvalidMarkTest.java?rev=1632144&view=auto
==============================================================================
--- maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/InvalidMarkTest.java (added)
+++ maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/InvalidMarkTest.java Wed Oct 15 17:59:06 2014
@@ -0,0 +1,75 @@
+package org.apache.maven.shared.filtering;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import java.io.File;
+import java.util.Collections;
+
+import org.apache.maven.model.Resource;
+import org.codehaus.plexus.PlexusTestCase;
+import org.apache.maven.shared.utils.io.FileUtils;
+
+/**
+ * @author Mikolaj Izdebski
+ */
+public class InvalidMarkTest
+ extends PlexusTestCase
+{
+ File outputDirectory = new File( getBasedir(), "target/LongLineTest" );
+
+ protected void setUp()
+ throws Exception
+ {
+ super.setUp();
+ if ( outputDirectory.exists() )
+ {
+ FileUtils.forceDelete( outputDirectory );
+ }
+ outputDirectory.mkdirs();
+ }
+
+ public void testEscape()
+ throws Exception
+ {
+ MavenResourcesFiltering mavenResourcesFiltering = (MavenResourcesFiltering) lookup( MavenResourcesFiltering.class
+ .getName() );
+
+ Resource resource = new Resource();
+ resource.setDirectory( "src/test/units-files/MSHARED-325" );
+ resource.setFiltering( true );
+
+ MavenResourcesExecution mavenResourcesExecution = new MavenResourcesExecution( Collections.singletonList( resource ),
+ outputDirectory,
+ new StubMavenProject( new File(".") ),
+ "UTF-8",
+ Collections.<String>emptyList(),
+ Collections.<String>emptyList(),
+ new StubMavenSession() );
+
+ try
+ {
+ mavenResourcesFiltering.filterResources( mavenResourcesExecution );
+ }
+ catch ( MavenFilteringException e )
+ {
+ fail();
+ }
+ }
+}
Modified: maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/MultiDelimiterInterpolatorFilterReaderLineEndingTest.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/MultiDelimiterInterpolatorFilterReaderLineEndingTest.java?rev=1632144&r1=1632143&r2=1632144&view=diff
==============================================================================
--- maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/MultiDelimiterInterpolatorFilterReaderLineEndingTest.java (original)
+++ maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/MultiDelimiterInterpolatorFilterReaderLineEndingTest.java Wed Oct 15 17:59:06 2014
@@ -74,6 +74,15 @@ public class MultiDelimiterInterpolatorF
reader.setEscapeString( escapeString );
return reader;
}
+
+ @Override
+ protected Reader getAtReader( Reader in, Interpolator interpolator, String escapeString )
+ {
+ MultiDelimiterInterpolatorFilterReaderLineEnding reader = new MultiDelimiterInterpolatorFilterReaderLineEnding( in, interpolator, true );
+ reader.setDelimiterSpecs( Collections.singleton( "@" ) );
+ reader.setEscapeString( escapeString );
+ return reader;
+ }
// MSHARED-199: Filtering doesn't work if 2 delimiters are used on the same line, the first one being left open
@Test
@@ -106,5 +115,4 @@ public class MultiDelimiterInterpolatorF
assertEquals( " url=\"jdbc:oracle:thin:@DB_SERVER:DB_PORT:DB_NAME\"", IOUtil.toString( reader ) );
}
-
}
Added: maven/shared/trunk/maven-filtering/src/test/units-files/MSHARED-325/payload
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-filtering/src/test/units-files/MSHARED-325/payload?rev=1632144&view=auto
==============================================================================
--- maven/shared/trunk/maven-filtering/src/test/units-files/MSHARED-325/payload (added)
+++ maven/shared/trunk/maven-filtering/src/test/units-files/MSHARED-325/payload Wed Oct 15 17:59:06 2014
@@ -0,0 +1 @@
+@").replace(p,"]").replace(q,
\ No newline at end of file