Author: bentmann
Date: Sun Feb 20 20:09:17 2011
New Revision: 1072705
URL: http://svn.apache.org/viewvc?rev=1072705&view=rev
Log:
o Added license header
Modified:
maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/DefaultMavenFileFilterTest.java
maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/EscapeStringTest.java
maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/IncrementalResourceFilteringTest.java
Modified:
maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/DefaultMavenFileFilterTest.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/DefaultMavenFileFilterTest.java?rev=1072705&r1=1072704&r2=1072705&view=diff
==============================================================================
---
maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/DefaultMavenFileFilterTest.java
(original)
+++
maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/DefaultMavenFileFilterTest.java
Sun Feb 20 20:09:17 2011
@@ -1,13 +1,5 @@
package org.apache.maven.shared.filtering;
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Properties;
-
-import org.codehaus.plexus.PlexusTestCase;
-import org.codehaus.plexus.util.FileUtils;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -27,6 +19,14 @@ import org.codehaus.plexus.util.FileUtil
* under the License.
*/
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Properties;
+
+import org.codehaus.plexus.PlexusTestCase;
+import org.codehaus.plexus.util.FileUtils;
+
/**
* @author <a href="mailto:[email protected]";>olamy</a>
* @version $Id$
Modified:
maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/EscapeStringTest.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/EscapeStringTest.java?rev=1072705&r1=1072704&r2=1072705&view=diff
==============================================================================
---
maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/EscapeStringTest.java
(original)
+++
maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/EscapeStringTest.java
Sun Feb 20 20:09:17 2011
@@ -1,109 +1,110 @@
-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.io.FileInputStream;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Properties;
-
-import org.apache.maven.model.Resource;
-import org.codehaus.plexus.PlexusTestCase;
-import org.codehaus.plexus.util.FileUtils;
-import org.codehaus.plexus.util.IOUtil;
-
-/**
- * @author Olivier Lamy
- *
- */
-public class EscapeStringTest
- extends PlexusTestCase
-{
-
- File outputDirectory = new File( getBasedir(), "target/EscapeStringTest" );
-
- File unitDirectory = new File( getBasedir(),
"src/test/units-files/escape-remove-char" );
-
- protected void setUp()
- throws Exception
- {
- super.setUp();
- if ( outputDirectory.exists() )
- {
- FileUtils.forceDelete( outputDirectory );
- }
- outputDirectory.mkdirs();
- }
-
- public void testEscape()
- throws Exception
- {
- File baseDir = new File( "c:\\foo\\bar" );
- StubMavenProject mavenProject = new StubMavenProject( baseDir );
- mavenProject.setVersion( "1.0" );
- mavenProject.setGroupId( "org.apache" );
- mavenProject.setName( "test project" );
-
- Properties projectProperties = new Properties();
- projectProperties.put( "foo", "bar" );
- projectProperties.put( "java.version", "zloug" );
- projectProperties.put( "replaceThis", "I am the replacement" );
- mavenProject.setProperties( projectProperties );
- MavenResourcesFiltering mavenResourcesFiltering =
(MavenResourcesFiltering) lookup( MavenResourcesFiltering.class
- .getName() );
-
- Resource resource = new Resource();
- List resources = new ArrayList();
- resources.add( resource );
- resource.setDirectory( unitDirectory.getPath() );
- resource.setFiltering( true );
-
- List filtersFile = new ArrayList();
-
- List nonFilteredFileExtensions = Collections.singletonList( "gif" );
-
- MavenResourcesExecution mavenResourcesExecution = new
MavenResourcesExecution( resources, outputDirectory,
-
mavenProject, "UTF-8",
-
filtersFile,
-
nonFilteredFileExtensions,
-
new StubMavenSession() );
- mavenResourcesExecution.setUseDefaultFilterWrappers( true );
-
- mavenResourcesExecution.setEscapeString( "!" );
-
- mavenResourcesFiltering.filterResources( mavenResourcesExecution );
-
- FileInputStream in = null;
- try
- {
- String content = IOUtil.toString( new FileInputStream( new File(
outputDirectory, "content.xml" ) ) );
-
- System.out.println( "content " + content );
- assertTrue( content.contains( "<broken-tag>Content with
replacement: I am the replacement !</broken-tag>" ) );
- assertTrue( content.contains( "<broken-tag>Content with escaped
replacement: Do not ${replaceThis} !</broken-tag>") );
- }
- finally
- {
- IOUtil.close( in );
- }
-
- }
-}
+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.io.FileInputStream;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Properties;
+
+import org.apache.maven.model.Resource;
+import org.codehaus.plexus.PlexusTestCase;
+import org.codehaus.plexus.util.FileUtils;
+import org.codehaus.plexus.util.IOUtil;
+
+/**
+ * @author Olivier Lamy
+ *
+ */
+public class EscapeStringTest
+ extends PlexusTestCase
+{
+
+ File outputDirectory = new File( getBasedir(), "target/EscapeStringTest" );
+
+ File unitDirectory = new File( getBasedir(),
"src/test/units-files/escape-remove-char" );
+
+ protected void setUp()
+ throws Exception
+ {
+ super.setUp();
+ if ( outputDirectory.exists() )
+ {
+ FileUtils.forceDelete( outputDirectory );
+ }
+ outputDirectory.mkdirs();
+ }
+
+ public void testEscape()
+ throws Exception
+ {
+ File baseDir = new File( "c:\\foo\\bar" );
+ StubMavenProject mavenProject = new StubMavenProject( baseDir );
+ mavenProject.setVersion( "1.0" );
+ mavenProject.setGroupId( "org.apache" );
+ mavenProject.setName( "test project" );
+
+ Properties projectProperties = new Properties();
+ projectProperties.put( "foo", "bar" );
+ projectProperties.put( "java.version", "zloug" );
+ projectProperties.put( "replaceThis", "I am the replacement" );
+ mavenProject.setProperties( projectProperties );
+ MavenResourcesFiltering mavenResourcesFiltering =
(MavenResourcesFiltering) lookup( MavenResourcesFiltering.class
+ .getName() );
+
+ Resource resource = new Resource();
+ List resources = new ArrayList();
+ resources.add( resource );
+ resource.setDirectory( unitDirectory.getPath() );
+ resource.setFiltering( true );
+
+ List filtersFile = new ArrayList();
+
+ List nonFilteredFileExtensions = Collections.singletonList( "gif" );
+
+ MavenResourcesExecution mavenResourcesExecution = new
MavenResourcesExecution( resources, outputDirectory,
+
mavenProject, "UTF-8",
+
filtersFile,
+
nonFilteredFileExtensions,
+
new StubMavenSession() );
+ mavenResourcesExecution.setUseDefaultFilterWrappers( true );
+
+ mavenResourcesExecution.setEscapeString( "!" );
+
+ mavenResourcesFiltering.filterResources( mavenResourcesExecution );
+
+ FileInputStream in = null;
+ try
+ {
+ String content = IOUtil.toString( new FileInputStream( new File(
outputDirectory, "content.xml" ) ) );
+
+ System.out.println( "content " + content );
+ assertTrue( content.contains( "<broken-tag>Content with
replacement: I am the replacement !</broken-tag>" ) );
+ assertTrue( content.contains( "<broken-tag>Content with escaped
replacement: Do not ${replaceThis} !</broken-tag>") );
+ }
+ finally
+ {
+ IOUtil.close( in );
+ }
+
+ }
+}
Modified:
maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/IncrementalResourceFilteringTest.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/IncrementalResourceFilteringTest.java?rev=1072705&r1=1072704&r2=1072705&view=diff
==============================================================================
---
maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/IncrementalResourceFilteringTest.java
(original)
+++
maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/IncrementalResourceFilteringTest.java
Sun Feb 20 20:09:17 2011
@@ -1,5 +1,24 @@
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.io.FileInputStream;
import java.io.IOException;
