You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2008/03/24 20:28:00 UTC
svn commit: r640535 [2/2] - in /maven/plugins/trunk/maven-war-plugin/src:
it/MWAR-129/ it/MWAR-129/src/main/webapp/WEB-INF/ it/MWAR-139/
it/MWAR-139/src/main/webapp/WEB-INF/ it/MWAR-139/src/main/webresources/
it/MWAR-143/ it/MWAR-143/war-common/ it/MWA...
Modified: maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/util/PathSetTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/util/PathSetTest.java?rev=640535&r1=640534&r2=640535&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/util/PathSetTest.java (original)
+++ maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/util/PathSetTest.java Mon Mar 24 12:27:50 2008
@@ -1,278 +1,278 @@
-package org.apache.maven.plugin.war.util;
-
-/*
- * 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 junit.framework.TestCase;
-import org.codehaus.plexus.util.StringUtils;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Set;
-
-public class PathSetTest
- extends TestCase
-{
-
- /* --------------- Normalization tests --------------*/
-
- /**
- * Test method for 'org.apache.maven.plugin.war.PathSet.normalizeFilePathStatic(String)'
- */
- public void testNormalizeFilePathStatic()
- {
- assertEquals( "Normalized path error", "", PathSet.normalizeFilePathStatic( "" ) );
- assertEquals( "Normalized path error", "", PathSet.normalizeFilePathStatic( "/" ) );
- assertEquals( "Normalized path error", "", PathSet.normalizeFilePathStatic( "////" ) );
- assertEquals( "Normalized path error", "", PathSet.normalizeFilePathStatic( "\\" ) );
- assertEquals( "Normalized path error", "", PathSet.normalizeFilePathStatic( "\\\\\\\\" ) );
-
- assertEquals( "Normalized path error", "abc", PathSet.normalizeFilePathStatic( "abc" ) );
- assertEquals( "Normalized path error", "abc", PathSet.normalizeFilePathStatic( "/abc" ) );
- assertEquals( "Normalized path error", "abc", PathSet.normalizeFilePathStatic( "////abc" ) );
- assertEquals( "Normalized path error", "abc", PathSet.normalizeFilePathStatic( "\\abc" ) );
- assertEquals( "Normalized path error", "abc", PathSet.normalizeFilePathStatic( "\\\\\\\\abc" ) );
-
- assertEquals( "Normalized path error", "abc/def/xyz/", PathSet.normalizeFilePathStatic( "abc/def\\xyz\\" ) );
- assertEquals( "Normalized path error", "abc/def/xyz/", PathSet.normalizeFilePathStatic( "/abc/def/xyz/" ) );
- assertEquals( "Normalized path error", "abc/def/xyz/", PathSet.normalizeFilePathStatic( "////abc/def/xyz/" ) );
- assertEquals( "Normalized path error", "abc/def/xyz/", PathSet.normalizeFilePathStatic( "\\abc/def/xyz/" ) );
- assertEquals( "Normalized path error", "abc/def/xyz/",
- PathSet.normalizeFilePathStatic( "\\\\\\\\abc/def/xyz/" ) );
- }
-
- /**
- * Test method for 'org.apache.maven.plugin.war.PathSet.trimTrailingSlashes(String)'
- */
- public void testTrimTrailingSlashes()
- {
- assertEquals( "Trimed path error", "", PathSet.trimTrailingSlashes( "" ) );
- assertEquals( "Trimed path error", "", PathSet.trimTrailingSlashes( "/" ) );
- assertEquals( "Trimed path error", "", PathSet.trimTrailingSlashes( "//" ) );
- assertEquals( "Trimed path error", "\\", PathSet.trimTrailingSlashes( "\\" ) );
- assertEquals( "Trimed path error", "abc/def\\xyz\\", PathSet.trimTrailingSlashes( "abc/def\\xyz\\" ) );
- assertEquals( "Trimed path error", "abc/def/xyz/", PathSet.trimTrailingSlashes( "/abc/def/xyz/" ) );
- assertEquals( "Trimed path error", "abc/def/xyz/", PathSet.trimTrailingSlashes( "////abc/def/xyz/" ) );
- assertEquals( "Trimed path error", "\\abc/def/xyz\\", PathSet.trimTrailingSlashes( "\\abc/def/xyz\\" ) );
- assertEquals( "Trimed path error", "\\\\\\\\abc/def/xyz",
- PathSet.trimTrailingSlashes( "\\\\\\\\abc/def/xyz" ) );
- }
-
- /* -------------- Operations tests ------------------*/
-
- /**
- * Test method for:
- * <ul>
- * <li>org.apache.maven.plugin.war.PathSet.PathSet()</li>
- * <li>org.apache.maven.plugin.war.PathSet.size()</li>
- * <li>org.apache.maven.plugin.war.PathSet.add()</li>
- * <li>org.apache.maven.plugin.war.PathSet.addAll()</li>
- * <li>org.apache.maven.plugin.war.PathSet.iterate()</li>
- * <li>org.apache.maven.plugin.war.PathSet.contains()</li>
- * <li>org.apache.maven.plugin.war.PathSet.addPrefix(String)</li>
- * </ul>
- */
- public void testPathsSetBasic()
- {
- PathSet ps = new PathSet();
- assertEquals( "Unexpected PathSet size", ps.size(), 0 );
- Iterator iter = ps.iterator();
- assertNotNull( "Iterator is null", iter );
- assertFalse( "Can iterate on empty set", iter.hasNext() );
-
- ps.add( "abc" );
- assertEquals( "Unexpected PathSet size", ps.size(), 1 );
- ps.add( "abc" );
- assertEquals( "Unexpected PathSet size", ps.size(), 1 );
- ps.add( "xyz/abc" );
- assertEquals( "Unexpected PathSet size", ps.size(), 2 );
- ps.add( "///abc" );
- assertEquals( "Unexpected PathSet size", ps.size(), 2 );
- ps.add( "///xyz\\abc" );
- assertEquals( "Unexpected PathSet size", ps.size(), 2 );
-
- ps.addAll( ps );
- assertEquals( "Unexpected PathSet size", ps.size(), 2 );
-
- int i = 0;
- for ( Iterator iter2 = ps.iterator(); iter2.hasNext(); )
- {
- i++;
- String pathstr = (String) iter2.next();
- assertTrue( ps.contains( pathstr ) );
- assertTrue( ps.contains( "/" + pathstr ) );
- assertTrue( ps.contains( "/" + StringUtils.replace( pathstr, '/', '\\' ) ) );
- assertFalse( ps.contains( "/" + StringUtils.replace( pathstr, '/', '\\' ) + "/a" ) );
- assertFalse( ps.contains( "/a/" + StringUtils.replace( pathstr, '/', '\\' ) ) );
- }
- assertEquals( "Wrong count of iterations", 2, i );
-
- ps.addPrefix( "/ab/c/" );
- i = 0;
- for ( Iterator iter2 = ps.iterator(); iter2.hasNext(); )
- {
- i++;
- String pathstr = (String) iter2.next();
- assertTrue( pathstr.startsWith( "ab/c/" ) );
- assertFalse( pathstr.startsWith( "ab/c//" ) );
- assertTrue( ps.contains( pathstr ) );
- assertTrue( ps.contains( "/" + pathstr ) );
- assertTrue( ps.contains( "/" + StringUtils.replace( pathstr, '/', '\\' ) ) );
- assertFalse( ps.contains( "/" + StringUtils.replace( pathstr, '/', '\\' ) + "/a" ) );
- assertFalse( ps.contains( "/ab/" + StringUtils.replace( pathstr, '/', '\\' ) ) );
- }
- assertEquals( "Wrong count of iterations", 2, i );
- }
-
- /**
- * Test method for:
- * <ul>
- * <li>org.apache.maven.plugin.war.PathSet.PathSet(Collection)</li>
- * <li>org.apache.maven.plugin.war.PathSet.PathSet(String[])</li>
- * <li>org.apache.maven.plugin.war.PathSet.Add</li>
- * <li>org.apache.maven.plugin.war.PathSet.AddAll(String[],String)</li>
- * <li>org.apache.maven.plugin.war.PathSet.AddAll(Collection,String)</li>
- * </ul>
- */
- public void testPathsSetAddAlls()
- {
- Set s1set = new HashSet();
- s1set.add( "/a/b" );
- s1set.add( "a/b/c" );
- s1set.add( "a\\b/c" );
- s1set.add( "//1//2\3a" );
-
- String[] s2ar = new String[]{"/a/b", "a2/b2/c2", "a2\\b2/c2", "//21//22\23a"};
-
- PathSet ps1 = new PathSet( s1set );
- assertEquals( "Unexpected PathSet size", 3, ps1.size() );
-
- PathSet ps2 = new PathSet( s2ar );
- assertEquals( "Unexpected PathSet size", 3, ps2.size() );
-
- ps1.addAll( s2ar );
- assertEquals( "Unexpected PathSet size", 5, ps1.size() );
-
- ps2.addAll( s1set );
- assertEquals( "Unexpected PathSet size", 5, ps2.size() );
-
- for ( Iterator iter = ps1.iterator(); iter.hasNext(); )
- {
- String str = (String) iter.next();
- assertTrue( str, ps2.contains( str ) );
- assertTrue( ps2.contains( "/" + str ) );
- assertTrue( ps1.contains( str ) );
- assertTrue( ps1.contains( "/" + str ) );
- }
-
- for ( Iterator iter = ps2.iterator(); iter.hasNext(); )
- {
- String str = (String) iter.next();
- assertTrue( ps1.contains( str ) );
- assertTrue( ps1.contains( "/" + str ) );
- assertTrue( ps2.contains( str ) );
- assertTrue( ps2.contains( "/" + str ) );
- }
-
- ps1.addAll( s2ar, "/pref/" );
- assertEquals( "Unexpected PathSet size", 8, ps1.size() );
-
- ps2.addAll( s2ar, "/pref/" );
- assertEquals( "Unexpected PathSet size", 8, ps2.size() );
-
- for ( Iterator iter = ps1.iterator(); iter.hasNext(); )
- {
- String str = (String) iter.next();
- assertTrue( str, ps2.contains( str ) );
- assertTrue( ps2.contains( "/" + str ) );
- assertTrue( ps1.contains( str ) );
- assertTrue( ps1.contains( "/" + str ) );
- }
-
- for ( Iterator iter = ps2.iterator(); iter.hasNext(); )
- {
- String str = (String) iter.next();
- assertTrue( ps1.contains( str ) );
- assertTrue( ps1.contains( "/" + str ) );
- assertTrue( ps2.contains( str ) );
- assertTrue( ps2.contains( "/" + str ) );
- }
-
- }
-
- /**
- * Test method for 'org.apache.maven.plugin.war.PathSet.addAllFilesInDirectory(File, String)'
- *
- * @throws IOException if an io error occured
- */
- public void testAddAllFilesInDirectory()
- throws IOException
- {
- PathSet ps = new PathSet();
-
- /* Preparing directory structure*/
- File testDir = new File( "target/testAddAllFilesInDirectory" );
- testDir.mkdirs();
-
- File f1 = new File( testDir, "f1" );
- f1.createNewFile();
- File f2 = new File( testDir, "f2" );
- f2.createNewFile();
-
- File d1 = new File( testDir, "d1" );
- File d1d2 = new File( testDir, "d1/d2" );
- d1d2.mkdirs();
- File d1d2f1 = new File( d1d2, "f1" );
- d1d2f1.createNewFile();
- File d1d2f2 = new File( d1d2, "f2" );
- d1d2f2.createNewFile();
-
- ps.addAllFilesInDirectory( new File( "target/testAddAllFilesInDirectory" ), "123/" );
- assertEquals( "Unexpected PathSet size", 4, ps.size() );
-
- /*No changes after adding duplicates*/
- ps.addAllFilesInDirectory( new File( "target/testAddAllFilesInDirectory" ), "123/" );
- assertEquals( "Unexpected PathSet size", 4, ps.size() );
-
- /*Cleanup*/
-
- f1.delete();
- f2.delete();
-
- /*No changes after adding a subset of files*/
- ps.addAllFilesInDirectory( new File( "target/testAddAllFilesInDirectory" ), "123/" );
- assertEquals( "Unexpected PathSet size", 4, ps.size() );
-
- d1d2f1.delete();
- d1d2f2.delete();
- d1d2.delete();
- d1.delete();
- testDir.delete();
-
- assertTrue( ps.contains( "123/f1" ) );
- assertTrue( ps.contains( "/123/f1" ) );
- assertTrue( ps.contains( "123\\f1" ) );
- assertTrue( ps.contains( "123\\f2" ) );
- assertTrue( ps.contains( "\\123/d1\\d2/f1" ) );
- assertTrue( ps.contains( "123\\d1/d2\\f2" ) );
- assertFalse( ps.contains( "123\\f3" ) );
- }
-}
+package org.apache.maven.plugin.war.util;
+
+/*
+ * 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 junit.framework.TestCase;
+import org.codehaus.plexus.util.StringUtils;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Set;
+
+public class PathSetTest
+ extends TestCase
+{
+
+ /* --------------- Normalization tests --------------*/
+
+ /**
+ * Test method for 'org.apache.maven.plugin.war.PathSet.normalizeFilePathStatic(String)'
+ */
+ public void testNormalizeFilePathStatic()
+ {
+ assertEquals( "Normalized path error", "", PathSet.normalizeFilePathStatic( "" ) );
+ assertEquals( "Normalized path error", "", PathSet.normalizeFilePathStatic( "/" ) );
+ assertEquals( "Normalized path error", "", PathSet.normalizeFilePathStatic( "////" ) );
+ assertEquals( "Normalized path error", "", PathSet.normalizeFilePathStatic( "\\" ) );
+ assertEquals( "Normalized path error", "", PathSet.normalizeFilePathStatic( "\\\\\\\\" ) );
+
+ assertEquals( "Normalized path error", "abc", PathSet.normalizeFilePathStatic( "abc" ) );
+ assertEquals( "Normalized path error", "abc", PathSet.normalizeFilePathStatic( "/abc" ) );
+ assertEquals( "Normalized path error", "abc", PathSet.normalizeFilePathStatic( "////abc" ) );
+ assertEquals( "Normalized path error", "abc", PathSet.normalizeFilePathStatic( "\\abc" ) );
+ assertEquals( "Normalized path error", "abc", PathSet.normalizeFilePathStatic( "\\\\\\\\abc" ) );
+
+ assertEquals( "Normalized path error", "abc/def/xyz/", PathSet.normalizeFilePathStatic( "abc/def\\xyz\\" ) );
+ assertEquals( "Normalized path error", "abc/def/xyz/", PathSet.normalizeFilePathStatic( "/abc/def/xyz/" ) );
+ assertEquals( "Normalized path error", "abc/def/xyz/", PathSet.normalizeFilePathStatic( "////abc/def/xyz/" ) );
+ assertEquals( "Normalized path error", "abc/def/xyz/", PathSet.normalizeFilePathStatic( "\\abc/def/xyz/" ) );
+ assertEquals( "Normalized path error", "abc/def/xyz/",
+ PathSet.normalizeFilePathStatic( "\\\\\\\\abc/def/xyz/" ) );
+ }
+
+ /**
+ * Test method for 'org.apache.maven.plugin.war.PathSet.trimTrailingSlashes(String)'
+ */
+ public void testTrimTrailingSlashes()
+ {
+ assertEquals( "Trimed path error", "", PathSet.trimTrailingSlashes( "" ) );
+ assertEquals( "Trimed path error", "", PathSet.trimTrailingSlashes( "/" ) );
+ assertEquals( "Trimed path error", "", PathSet.trimTrailingSlashes( "//" ) );
+ assertEquals( "Trimed path error", "\\", PathSet.trimTrailingSlashes( "\\" ) );
+ assertEquals( "Trimed path error", "abc/def\\xyz\\", PathSet.trimTrailingSlashes( "abc/def\\xyz\\" ) );
+ assertEquals( "Trimed path error", "abc/def/xyz/", PathSet.trimTrailingSlashes( "/abc/def/xyz/" ) );
+ assertEquals( "Trimed path error", "abc/def/xyz/", PathSet.trimTrailingSlashes( "////abc/def/xyz/" ) );
+ assertEquals( "Trimed path error", "\\abc/def/xyz\\", PathSet.trimTrailingSlashes( "\\abc/def/xyz\\" ) );
+ assertEquals( "Trimed path error", "\\\\\\\\abc/def/xyz",
+ PathSet.trimTrailingSlashes( "\\\\\\\\abc/def/xyz" ) );
+ }
+
+ /* -------------- Operations tests ------------------*/
+
+ /**
+ * Test method for:
+ * <ul>
+ * <li>org.apache.maven.plugin.war.PathSet.PathSet()</li>
+ * <li>org.apache.maven.plugin.war.PathSet.size()</li>
+ * <li>org.apache.maven.plugin.war.PathSet.add()</li>
+ * <li>org.apache.maven.plugin.war.PathSet.addAll()</li>
+ * <li>org.apache.maven.plugin.war.PathSet.iterate()</li>
+ * <li>org.apache.maven.plugin.war.PathSet.contains()</li>
+ * <li>org.apache.maven.plugin.war.PathSet.addPrefix(String)</li>
+ * </ul>
+ */
+ public void testPathsSetBasic()
+ {
+ PathSet ps = new PathSet();
+ assertEquals( "Unexpected PathSet size", ps.size(), 0 );
+ Iterator iter = ps.iterator();
+ assertNotNull( "Iterator is null", iter );
+ assertFalse( "Can iterate on empty set", iter.hasNext() );
+
+ ps.add( "abc" );
+ assertEquals( "Unexpected PathSet size", ps.size(), 1 );
+ ps.add( "abc" );
+ assertEquals( "Unexpected PathSet size", ps.size(), 1 );
+ ps.add( "xyz/abc" );
+ assertEquals( "Unexpected PathSet size", ps.size(), 2 );
+ ps.add( "///abc" );
+ assertEquals( "Unexpected PathSet size", ps.size(), 2 );
+ ps.add( "///xyz\\abc" );
+ assertEquals( "Unexpected PathSet size", ps.size(), 2 );
+
+ ps.addAll( ps );
+ assertEquals( "Unexpected PathSet size", ps.size(), 2 );
+
+ int i = 0;
+ for ( Iterator iter2 = ps.iterator(); iter2.hasNext(); )
+ {
+ i++;
+ String pathstr = (String) iter2.next();
+ assertTrue( ps.contains( pathstr ) );
+ assertTrue( ps.contains( "/" + pathstr ) );
+ assertTrue( ps.contains( "/" + StringUtils.replace( pathstr, '/', '\\' ) ) );
+ assertFalse( ps.contains( "/" + StringUtils.replace( pathstr, '/', '\\' ) + "/a" ) );
+ assertFalse( ps.contains( "/a/" + StringUtils.replace( pathstr, '/', '\\' ) ) );
+ }
+ assertEquals( "Wrong count of iterations", 2, i );
+
+ ps.addPrefix( "/ab/c/" );
+ i = 0;
+ for ( Iterator iter2 = ps.iterator(); iter2.hasNext(); )
+ {
+ i++;
+ String pathstr = (String) iter2.next();
+ assertTrue( pathstr.startsWith( "ab/c/" ) );
+ assertFalse( pathstr.startsWith( "ab/c//" ) );
+ assertTrue( ps.contains( pathstr ) );
+ assertTrue( ps.contains( "/" + pathstr ) );
+ assertTrue( ps.contains( "/" + StringUtils.replace( pathstr, '/', '\\' ) ) );
+ assertFalse( ps.contains( "/" + StringUtils.replace( pathstr, '/', '\\' ) + "/a" ) );
+ assertFalse( ps.contains( "/ab/" + StringUtils.replace( pathstr, '/', '\\' ) ) );
+ }
+ assertEquals( "Wrong count of iterations", 2, i );
+ }
+
+ /**
+ * Test method for:
+ * <ul>
+ * <li>org.apache.maven.plugin.war.PathSet.PathSet(Collection)</li>
+ * <li>org.apache.maven.plugin.war.PathSet.PathSet(String[])</li>
+ * <li>org.apache.maven.plugin.war.PathSet.Add</li>
+ * <li>org.apache.maven.plugin.war.PathSet.AddAll(String[],String)</li>
+ * <li>org.apache.maven.plugin.war.PathSet.AddAll(Collection,String)</li>
+ * </ul>
+ */
+ public void testPathsSetAddAlls()
+ {
+ Set s1set = new HashSet();
+ s1set.add( "/a/b" );
+ s1set.add( "a/b/c" );
+ s1set.add( "a\\b/c" );
+ s1set.add( "//1//2\3a" );
+
+ String[] s2ar = new String[]{"/a/b", "a2/b2/c2", "a2\\b2/c2", "//21//22\23a"};
+
+ PathSet ps1 = new PathSet( s1set );
+ assertEquals( "Unexpected PathSet size", 3, ps1.size() );
+
+ PathSet ps2 = new PathSet( s2ar );
+ assertEquals( "Unexpected PathSet size", 3, ps2.size() );
+
+ ps1.addAll( s2ar );
+ assertEquals( "Unexpected PathSet size", 5, ps1.size() );
+
+ ps2.addAll( s1set );
+ assertEquals( "Unexpected PathSet size", 5, ps2.size() );
+
+ for ( Iterator iter = ps1.iterator(); iter.hasNext(); )
+ {
+ String str = (String) iter.next();
+ assertTrue( str, ps2.contains( str ) );
+ assertTrue( ps2.contains( "/" + str ) );
+ assertTrue( ps1.contains( str ) );
+ assertTrue( ps1.contains( "/" + str ) );
+ }
+
+ for ( Iterator iter = ps2.iterator(); iter.hasNext(); )
+ {
+ String str = (String) iter.next();
+ assertTrue( ps1.contains( str ) );
+ assertTrue( ps1.contains( "/" + str ) );
+ assertTrue( ps2.contains( str ) );
+ assertTrue( ps2.contains( "/" + str ) );
+ }
+
+ ps1.addAll( s2ar, "/pref/" );
+ assertEquals( "Unexpected PathSet size", 8, ps1.size() );
+
+ ps2.addAll( s2ar, "/pref/" );
+ assertEquals( "Unexpected PathSet size", 8, ps2.size() );
+
+ for ( Iterator iter = ps1.iterator(); iter.hasNext(); )
+ {
+ String str = (String) iter.next();
+ assertTrue( str, ps2.contains( str ) );
+ assertTrue( ps2.contains( "/" + str ) );
+ assertTrue( ps1.contains( str ) );
+ assertTrue( ps1.contains( "/" + str ) );
+ }
+
+ for ( Iterator iter = ps2.iterator(); iter.hasNext(); )
+ {
+ String str = (String) iter.next();
+ assertTrue( ps1.contains( str ) );
+ assertTrue( ps1.contains( "/" + str ) );
+ assertTrue( ps2.contains( str ) );
+ assertTrue( ps2.contains( "/" + str ) );
+ }
+
+ }
+
+ /**
+ * Test method for 'org.apache.maven.plugin.war.PathSet.addAllFilesInDirectory(File, String)'
+ *
+ * @throws IOException if an io error occured
+ */
+ public void testAddAllFilesInDirectory()
+ throws IOException
+ {
+ PathSet ps = new PathSet();
+
+ /* Preparing directory structure*/
+ File testDir = new File( "target/testAddAllFilesInDirectory" );
+ testDir.mkdirs();
+
+ File f1 = new File( testDir, "f1" );
+ f1.createNewFile();
+ File f2 = new File( testDir, "f2" );
+ f2.createNewFile();
+
+ File d1 = new File( testDir, "d1" );
+ File d1d2 = new File( testDir, "d1/d2" );
+ d1d2.mkdirs();
+ File d1d2f1 = new File( d1d2, "f1" );
+ d1d2f1.createNewFile();
+ File d1d2f2 = new File( d1d2, "f2" );
+ d1d2f2.createNewFile();
+
+ ps.addAllFilesInDirectory( new File( "target/testAddAllFilesInDirectory" ), "123/" );
+ assertEquals( "Unexpected PathSet size", 4, ps.size() );
+
+ /*No changes after adding duplicates*/
+ ps.addAllFilesInDirectory( new File( "target/testAddAllFilesInDirectory" ), "123/" );
+ assertEquals( "Unexpected PathSet size", 4, ps.size() );
+
+ /*Cleanup*/
+
+ f1.delete();
+ f2.delete();
+
+ /*No changes after adding a subset of files*/
+ ps.addAllFilesInDirectory( new File( "target/testAddAllFilesInDirectory" ), "123/" );
+ assertEquals( "Unexpected PathSet size", 4, ps.size() );
+
+ d1d2f1.delete();
+ d1d2f2.delete();
+ d1d2.delete();
+ d1.delete();
+ testDir.delete();
+
+ assertTrue( ps.contains( "123/f1" ) );
+ assertTrue( ps.contains( "/123/f1" ) );
+ assertTrue( ps.contains( "123\\f1" ) );
+ assertTrue( ps.contains( "123\\f2" ) );
+ assertTrue( ps.contains( "\\123/d1\\d2/f1" ) );
+ assertTrue( ps.contains( "123\\d1/d2\\f2" ) );
+ assertFalse( ps.contains( "123\\f3" ) );
+ }
+}
Propchange: maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/util/PathSetTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/util/WebappStructureTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-war-plugin/src/test/resources/overlays/overlay-one/WEB-INF/web.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-war-plugin/src/test/resources/overlays/overlay-two/WEB-INF/web.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-war-plugin/src/test/resources/unit/dependencies/default.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/plugins/trunk/maven-war-plugin/src/test/resources/unit/manifest/basic-manifest-test/plugin-config.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/test/resources/unit/manifest/basic-manifest-test/plugin-config.xml?rev=640535&r1=640534&r2=640535&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/test/resources/unit/manifest/basic-manifest-test/plugin-config.xml (original)
+++ maven/plugins/trunk/maven-war-plugin/src/test/resources/unit/manifest/basic-manifest-test/plugin-config.xml Mon Mar 24 12:27:50 2008
@@ -1,33 +1,33 @@
-<!--
-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.
--->
-
-<project>
- <name>war-plugin-test</name>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-war-plugin</artifactId>
- <configuration>
- <project implementation="org.apache.maven.plugin.war.stub.MavenProjectBasicStub" />
- <warSourceDirectory>${basedir}/target/test-classes/unit/manifest/basic-manifest-test/src/main</warSourceDirectory>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
+<!--
+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.
+-->
+
+<project>
+ <name>war-plugin-test</name>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-war-plugin</artifactId>
+ <configuration>
+ <project implementation="org.apache.maven.plugin.war.stub.MavenProjectBasicStub" />
+ <warSourceDirectory>${basedir}/target/test-classes/unit/manifest/basic-manifest-test/src/main</warSourceDirectory>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: maven/plugins/trunk/maven-war-plugin/src/test/resources/unit/manifest/basic-manifest-test/plugin-config.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/plugins/trunk/maven-war-plugin/src/test/resources/unit/manifest/manifest-with-classpath/plugin-config.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/test/resources/unit/manifest/manifest-with-classpath/plugin-config.xml?rev=640535&r1=640534&r2=640535&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/test/resources/unit/manifest/manifest-with-classpath/plugin-config.xml (original)
+++ maven/plugins/trunk/maven-war-plugin/src/test/resources/unit/manifest/manifest-with-classpath/plugin-config.xml Mon Mar 24 12:27:50 2008
@@ -1,39 +1,39 @@
-<!--
-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.
--->
-
-<project>
- <name>war-plugin-test</name>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-war-plugin</artifactId>
- <configuration>
- <project implementation="org.apache.maven.plugin.war.stub.MavenProjectArtifactsStub"/>
- <warSourceDirectory>
- ${basedir}/target/test-classes/unit/manifest/manifest-with-classpath/src/main</warSourceDirectory>
- <archive>
- <manifest>
- <addClasspath>true</addClasspath>
- </manifest>
- </archive>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
+<!--
+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.
+-->
+
+<project>
+ <name>war-plugin-test</name>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-war-plugin</artifactId>
+ <configuration>
+ <project implementation="org.apache.maven.plugin.war.stub.MavenProjectArtifactsStub"/>
+ <warSourceDirectory>
+ ${basedir}/target/test-classes/unit/manifest/manifest-with-classpath/src/main</warSourceDirectory>
+ <archive>
+ <manifest>
+ <addClasspath>true</addClasspath>
+ </manifest>
+ </archive>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: maven/plugins/trunk/maven-war-plugin/src/test/resources/unit/manifest/manifest-with-classpath/plugin-config.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/plugins/trunk/maven-war-plugin/src/test/resources/unit/manifest/manifest-with-main-class/plugin-config.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/test/resources/unit/manifest/manifest-with-main-class/plugin-config.xml?rev=640535&r1=640534&r2=640535&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/test/resources/unit/manifest/manifest-with-main-class/plugin-config.xml (original)
+++ maven/plugins/trunk/maven-war-plugin/src/test/resources/unit/manifest/manifest-with-main-class/plugin-config.xml Mon Mar 24 12:27:50 2008
@@ -1,38 +1,38 @@
-<!--
-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.
--->
-
-<project>
- <name>war-plugin-test</name>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-war-plugin</artifactId>
- <configuration>
- <project implementation="org.apache.maven.plugin.war.stub.MavenProjectArtifactsStub" />
- <warSourceDirectory>${basedir}/target/test-classes/unit/manifest/manifest-with-main-class/src/main</warSourceDirectory>
- <archive>
- <manifest>
- <mainClass>org.dummy.test.SomeClass</mainClass>
- </manifest>
- </archive>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
+<!--
+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.
+-->
+
+<project>
+ <name>war-plugin-test</name>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-war-plugin</artifactId>
+ <configuration>
+ <project implementation="org.apache.maven.plugin.war.stub.MavenProjectArtifactsStub" />
+ <warSourceDirectory>${basedir}/target/test-classes/unit/manifest/manifest-with-main-class/src/main</warSourceDirectory>
+ <archive>
+ <manifest>
+ <mainClass>org.dummy.test.SomeClass</mainClass>
+ </manifest>
+ </archive>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: maven/plugins/trunk/maven-war-plugin/src/test/resources/unit/manifest/manifest-with-main-class/plugin-config.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/plugins/trunk/maven-war-plugin/src/test/resources/unit/manifest/manifest-with-other-attrs/plugin-config.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/test/resources/unit/manifest/manifest-with-other-attrs/plugin-config.xml?rev=640535&r1=640534&r2=640535&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/test/resources/unit/manifest/manifest-with-other-attrs/plugin-config.xml (original)
+++ maven/plugins/trunk/maven-war-plugin/src/test/resources/unit/manifest/manifest-with-other-attrs/plugin-config.xml Mon Mar 24 12:27:50 2008
@@ -1,41 +1,41 @@
-<!--
-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.
--->
-
-<project>
- <name>war-plugin-test</name>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-war-plugin</artifactId>
- <configuration>
- <project implementation="org.apache.maven.plugin.war.stub.MavenProjectBasicStub"/>
- <warSourceDirectory>
- ${basedir}/target/test-classes/unit/manifest/manifest-with-other-attrs/src/main</warSourceDirectory>
- <archive>
- <manifest>
- <addExtensions>true</addExtensions>
- <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
- <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
- </manifest>
- </archive>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
+<!--
+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.
+-->
+
+<project>
+ <name>war-plugin-test</name>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-war-plugin</artifactId>
+ <configuration>
+ <project implementation="org.apache.maven.plugin.war.stub.MavenProjectBasicStub"/>
+ <warSourceDirectory>
+ ${basedir}/target/test-classes/unit/manifest/manifest-with-other-attrs/src/main</warSourceDirectory>
+ <archive>
+ <manifest>
+ <addExtensions>true</addExtensions>
+ <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+ <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+ </manifest>
+ </archive>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: maven/plugins/trunk/maven-war-plugin/src/test/resources/unit/manifest/manifest-with-other-attrs/plugin-config.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-war-plugin/src/test/resources/unit/waroverlays/default.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-war-plugin/src/test/resources/unit/warziptest/war-with-zip.xml
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Mon Mar 24 12:27:50 2008
@@ -1 +1 @@
-LF
+native