Author: krosenvold
Date: Wed Sep 16 19:41:59 2015
New Revision: 1703454
URL: http://svn.apache.org/r1703454
Log:
Made creation of all symlinks part of the testcase, so we do not rely on
symlink support in os creating release.
Fixes release problem
Added:
maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/io/SymlinkTestSetup.java
Modified:
maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/io/DirectoryScannerTest.java
maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/io/FileUtilsTest.java
Modified:
maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/io/DirectoryScannerTest.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/io/DirectoryScannerTest.java?rev=1703454&r1=1703453&r2=1703454&view=diff
==============================================================================
---
maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/io/DirectoryScannerTest.java
(original)
+++
maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/io/DirectoryScannerTest.java
Wed Sep 16 19:41:59 2015
@@ -19,6 +19,7 @@ package org.apache.maven.shared.utils.io
* under the License.
*/
+import org.apache.maven.shared.utils.Os;
import org.apache.maven.shared.utils.testhelpers.FileTestHelper;
import org.junit.Assert;
import org.junit.Ignore;
@@ -34,6 +35,8 @@ import java.util.List;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
+import static org.junit.Assume.assumeFalse;
+import static org.junit.Assume.assumeTrue;
public class DirectoryScannerTest
{
@@ -120,9 +123,10 @@ public class DirectoryScannerTest
}
@Test
- public void checkSymlinkBehaviour(){
+ public void checkSymlinkBehaviour()
+ {
DirectoryScanner ds = new DirectoryScanner();
- ds.setBasedir( new File("src/test/resources/symlinks/src") );
+ ds.setBasedir( new File( "src/test/resources/symlinks/src" ) );
ds.setFollowSymlinks( false );
ds.scan();
String[] includedDirectories = ds.getIncludedDirectories();
@@ -133,12 +137,16 @@ public class DirectoryScannerTest
}
@Test
- @Ignore("Wait until we can run with assembly 2.5 which will support
symlinks properly")
public void followSymlinksFalse()
+ throws IOException
{
- if (!Java7Support.isAtLeastJava7()) return;
+ assumeFalse( Os.isFamily( Os.FAMILY_WINDOWS ) );
+ assumeTrue( Java7Support.isAtLeastJava7() );
+
+ File testDir = SymlinkTestSetup.createStandardSymlinkTestDir( new
File( "target/test/symlinkTestCase" ) );
+
DirectoryScanner ds = new DirectoryScanner();
- ds.setBasedir( new File( "src/test/resources/symlinks/src/" ) );
+ ds.setBasedir( testDir );
ds.setFollowSymlinks( false );
ds.scan();
List<String> included = Arrays.asList( ds.getIncludedFiles() );
@@ -168,10 +176,15 @@ public class DirectoryScannerTest
@Test
public void followSymlinks()
+ throws IOException
{
- if (!Java7Support.isAtLeastJava7()) return;
+ assumeFalse( Os.isFamily( Os.FAMILY_WINDOWS ) );
+ assumeTrue( Java7Support.isAtLeastJava7() );
+
DirectoryScanner ds = new DirectoryScanner();
- ds.setBasedir( new File( "src/test/resources/symlinks/src/" ) );
+ File testDir = SymlinkTestSetup.createStandardSymlinkTestDir( new
File( "target/test/symlinkTestCase" ) );
+
+ ds.setBasedir( testDir );
ds.setFollowSymlinks( true );
ds.scan();
List<String> included = Arrays.asList( ds.getIncludedFiles() );
@@ -189,6 +202,10 @@ public class DirectoryScannerTest
assertEquals( 5, includedDirs.size() );
}
+ /*
+ Creates a standard directory layout with symlinks and files.
+ */
+
@Test
public void testSimpleExcludes()
throws Exception
@@ -362,7 +379,8 @@ public class DirectoryScannerTest
assertEquals( 2, removedFiles.length );
}
- @Ignore( "Enable this test to run performance checks" ) @Test
+ @Ignore( "Enable this test to run performance checks" )
+ @Test
public void performanceTest()
throws Exception
{
Modified:
maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/io/FileUtilsTest.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/io/FileUtilsTest.java?rev=1703454&r1=1703453&r2=1703454&view=diff
==============================================================================
---
maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/io/FileUtilsTest.java
(original)
+++
maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/io/FileUtilsTest.java
Wed Sep 16 19:41:59 2015
@@ -29,7 +29,14 @@ import org.junit.Test;
import org.junit.rules.TemporaryFolder;
import org.junit.rules.TestName;
-import java.io.*;
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
import java.net.URL;
import java.util.Arrays;
import java.util.HashSet;
@@ -37,7 +44,11 @@ import java.util.List;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.not;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import static org.junit.Assume.assumeFalse;
import static org.junit.Assume.assumeThat;
import static org.junit.Assume.assumeTrue;
import static org.junit.matchers.JUnitMatchers.containsString;
@@ -428,8 +439,13 @@ public class FileUtilsTest
throws Exception
{
assumeTrue( Java7Support.isAtLeastJava7() );
+ assumeFalse( Os.isFamily( Os.FAMILY_WINDOWS ) );
+
File destination = new File( tempFolder.getRoot(), "symCopy.txt" );
- FileUtils.copyFile( new File("src/test/resources/symlinks/src/symR"),
destination );
+
+ File testDir = SymlinkTestSetup.createStandardSymlinkTestDir( new
File( "target/test/symlinkCopy" ) );
+
+ FileUtils.copyFile( new File( testDir, "symR" ), destination );
assertTrue( Java7Support.isSymLink( destination ));
}
Added:
maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/io/SymlinkTestSetup.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/io/SymlinkTestSetup.java?rev=1703454&view=auto
==============================================================================
---
maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/io/SymlinkTestSetup.java
(added)
+++
maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/io/SymlinkTestSetup.java
Wed Sep 16 19:41:59 2015
@@ -0,0 +1,63 @@
+package org.apache.maven.shared.utils.io;
+
+
+import java.io.File;
+import java.io.IOException;
+
+import static org.apache.commons.io.FileUtils.write;
+
+/*
+ * 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.
+ */
+public class SymlinkTestSetup
+{
+ /**
+ * Creates a standard directory layout with symlinks and files.
+ */
+ public static File createStandardSymlinkTestDir( File root )
+ throws IOException
+ {
+ File srcDir = new File( root, "/src" );
+ srcDir.mkdirs();
+ File target = new File( srcDir, "targetDir" );
+ target.mkdirs();
+ write( new File( target, "targetFile.txt" ), "a regular File payload"
);
+ File aRegularDir = new File( srcDir, "aRegularDir" );
+ aRegularDir.mkdirs();
+ write( new File( aRegularDir, "aRegularFile.txt" ), "a regular File
payload" );
+
+ File dirOnTheOutside = new File( root, "dirOnTheOutside" );
+ dirOnTheOutside.mkdirs();
+ write( new File( dirOnTheOutside, "FileInDirOnTheOutside.txt" ), "a
file in dir on the outside" );
+ write( new File( root, "onTheOutside.txt" ), "A file on the outside" );
+ write( new File( srcDir, "fileR.txt" ), "FileR payload" );
+ write( new File( srcDir, "fileW.txt" ), "FileW payload" );
+ write( new File( srcDir, "fileX.txt" ), "FileX payload" );
+ // todo: set file attributes (not used here)
+
+ Java7Support.createSymbolicLink( new File( srcDir, "symDir" ), new
File( "targetDir" ) );
+ Java7Support.createSymbolicLink( new File( srcDir,
"symLinkToDirOnTheOutside" ),
+ new File( "../dirOnTheOutside" ) );
+ Java7Support.createSymbolicLink( new File( srcDir,
"symLinkToFileOnTheOutside" ),
+ new File( "../onTheOutside.txt" ) );
+ Java7Support.createSymbolicLink( new File( srcDir, "symR" ), new File(
"fileR.txt" ) );
+ Java7Support.createSymbolicLink( new File( srcDir, "symW" ), new File(
"fileW.txt" ) );
+ Java7Support.createSymbolicLink( new File( srcDir, "symX" ), new File(
"fileX.txt" ) );
+ return srcDir;
+ }
+}
