Updated Branches: refs/heads/master 6da42c716 -> d5bf0684c
JGit.FileUtils has trouble with deleting non-existing directories. Win results: Tests run: 9, Failures: 2, Errors: 4, Skipped 0 Project: http://git-wip-us.apache.org/repos/asf/maven-scm/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-scm/commit/d5bf0684 Tree: http://git-wip-us.apache.org/repos/asf/maven-scm/tree/d5bf0684 Diff: http://git-wip-us.apache.org/repos/asf/maven-scm/diff/d5bf0684 Branch: refs/heads/master Commit: d5bf0684c82dedeabd11d27b03a243313e312dbd Parents: 6da42c7 Author: rfscholte <rfscho...@apache.org> Authored: Sun Oct 27 13:39:17 2013 +0100 Committer: rfscholte <rfscho...@apache.org> Committed: Sun Oct 27 13:39:17 2013 +0100 ---------------------------------------------------------------------- .../git/jgit/command/branch/JGitBranchCommandTckTest.java | 5 ++++- .../command/changelog/JGitChangeLogCommandTckTest.java | 5 ++++- .../jgit/command/checkin/JGitCheckInCommandTckTest.java | 5 ++++- .../jgit/command/checkout/JGitCheckOutCommandTckTest.java | 5 ++++- .../git/jgit/command/diff/JGitDiffCommandTckTest.java | 10 +++++++--- .../command/remoteinfo/JGitRemoteInfoCommandTckTest.java | 6 ++++-- .../git/jgit/command/status/JGitStatusCommandTckTest.java | 5 ++++- .../git/jgit/command/tag/JGitTagCommandTckTest.java | 5 ++++- 8 files changed, 35 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven-scm/blob/d5bf0684/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/branch/JGitBranchCommandTckTest.java ---------------------------------------------------------------------- diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/branch/JGitBranchCommandTckTest.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/branch/JGitBranchCommandTckTest.java index cad415e..0ff96e5 100644 --- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/branch/JGitBranchCommandTckTest.java +++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/branch/JGitBranchCommandTckTest.java @@ -45,6 +45,9 @@ public class JGitBranchCommandTckTest protected void deleteDirectory( File directory ) throws IOException { - FileUtils.delete( directory, FileUtils.RECURSIVE | FileUtils.RETRY ); + if ( directory.exists() ) + { + FileUtils.delete( directory, FileUtils.RECURSIVE | FileUtils.RETRY ); + } } } http://git-wip-us.apache.org/repos/asf/maven-scm/blob/d5bf0684/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/changelog/JGitChangeLogCommandTckTest.java ---------------------------------------------------------------------- diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/changelog/JGitChangeLogCommandTckTest.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/changelog/JGitChangeLogCommandTckTest.java index 4bf003e..f52efed 100644 --- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/changelog/JGitChangeLogCommandTckTest.java +++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/changelog/JGitChangeLogCommandTckTest.java @@ -45,6 +45,9 @@ public class JGitChangeLogCommandTckTest protected void deleteDirectory( File directory ) throws IOException { - FileUtils.delete( directory, FileUtils.RECURSIVE | FileUtils.RETRY ); + if ( directory.exists() ) + { + FileUtils.delete( directory, FileUtils.RECURSIVE | FileUtils.RETRY ); + } } } http://git-wip-us.apache.org/repos/asf/maven-scm/blob/d5bf0684/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/checkin/JGitCheckInCommandTckTest.java ---------------------------------------------------------------------- diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/checkin/JGitCheckInCommandTckTest.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/checkin/JGitCheckInCommandTckTest.java index f708713..442dadd 100644 --- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/checkin/JGitCheckInCommandTckTest.java +++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/checkin/JGitCheckInCommandTckTest.java @@ -45,6 +45,9 @@ public class JGitCheckInCommandTckTest protected void deleteDirectory( File directory ) throws IOException { - FileUtils.delete( directory, FileUtils.RECURSIVE | FileUtils.RETRY ); + if( directory.exists() ) + { + FileUtils.delete( directory, FileUtils.RECURSIVE | FileUtils.RETRY ); + } } } http://git-wip-us.apache.org/repos/asf/maven-scm/blob/d5bf0684/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/checkout/JGitCheckOutCommandTckTest.java ---------------------------------------------------------------------- diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/checkout/JGitCheckOutCommandTckTest.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/checkout/JGitCheckOutCommandTckTest.java index 5e349f1..f5cd2a9 100644 --- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/checkout/JGitCheckOutCommandTckTest.java +++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/checkout/JGitCheckOutCommandTckTest.java @@ -46,6 +46,9 @@ public class JGitCheckOutCommandTckTest protected void deleteDirectory( File directory ) throws IOException { - FileUtils.delete( directory, FileUtils.RECURSIVE | FileUtils.RETRY ); + if ( directory.exists() ) + { + FileUtils.delete( directory, FileUtils.RECURSIVE | FileUtils.RETRY ); + } } } http://git-wip-us.apache.org/repos/asf/maven-scm/blob/d5bf0684/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/diff/JGitDiffCommandTckTest.java ---------------------------------------------------------------------- diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/diff/JGitDiffCommandTckTest.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/diff/JGitDiffCommandTckTest.java index 1477c32..7a6a702 100644 --- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/diff/JGitDiffCommandTckTest.java +++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/diff/JGitDiffCommandTckTest.java @@ -26,8 +26,9 @@ import org.apache.maven.scm.provider.git.GitScmTestUtils; import org.apache.maven.scm.provider.git.command.diff.GitDiffCommandTckTest; import org.eclipse.jgit.util.FileUtils; -public class JGitDiffCommandTckTest extends GitDiffCommandTckTest { - +public class JGitDiffCommandTckTest + extends GitDiffCommandTckTest +{ /** * {@inheritDoc} */ @@ -41,6 +42,9 @@ public class JGitDiffCommandTckTest extends GitDiffCommandTckTest { protected void deleteDirectory( File directory ) throws IOException { - FileUtils.delete( directory, FileUtils.RECURSIVE | FileUtils.RETRY ); + if ( directory.exists() ) + { + FileUtils.delete( directory, FileUtils.RECURSIVE | FileUtils.RETRY ); + } } } http://git-wip-us.apache.org/repos/asf/maven-scm/blob/d5bf0684/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/remoteinfo/JGitRemoteInfoCommandTckTest.java ---------------------------------------------------------------------- diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/remoteinfo/JGitRemoteInfoCommandTckTest.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/remoteinfo/JGitRemoteInfoCommandTckTest.java index e932032..03f4922 100644 --- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/remoteinfo/JGitRemoteInfoCommandTckTest.java +++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/remoteinfo/JGitRemoteInfoCommandTckTest.java @@ -35,7 +35,6 @@ import org.eclipse.jgit.util.FileUtils; */ public class JGitRemoteInfoCommandTckTest extends AbstractGitRemoteInfoCommandTckTest { - @Override protected void checkResult( RemoteInfoScmResult result ) { @@ -67,6 +66,9 @@ public class JGitRemoteInfoCommandTckTest extends AbstractGitRemoteInfoCommandTc protected void deleteDirectory( File directory ) throws IOException { - FileUtils.delete( directory, FileUtils.RECURSIVE | FileUtils.RETRY ); + if ( directory.exists() ) + { + FileUtils.delete( directory, FileUtils.RECURSIVE | FileUtils.RETRY ); + } } } http://git-wip-us.apache.org/repos/asf/maven-scm/blob/d5bf0684/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/status/JGitStatusCommandTckTest.java ---------------------------------------------------------------------- diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/status/JGitStatusCommandTckTest.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/status/JGitStatusCommandTckTest.java index eedeb4d..1801c64 100644 --- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/status/JGitStatusCommandTckTest.java +++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/status/JGitStatusCommandTckTest.java @@ -45,6 +45,9 @@ public class JGitStatusCommandTckTest protected void deleteDirectory( File directory ) throws IOException { - FileUtils.delete( directory, FileUtils.RECURSIVE | FileUtils.RETRY ); + if ( directory.exists() ) + { + FileUtils.delete( directory, FileUtils.RECURSIVE | FileUtils.RETRY ); + } } } http://git-wip-us.apache.org/repos/asf/maven-scm/blob/d5bf0684/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/tag/JGitTagCommandTckTest.java ---------------------------------------------------------------------- diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/tag/JGitTagCommandTckTest.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/tag/JGitTagCommandTckTest.java index 30501d6..7f10305 100644 --- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/tag/JGitTagCommandTckTest.java +++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/tag/JGitTagCommandTckTest.java @@ -47,6 +47,9 @@ public class JGitTagCommandTckTest protected void deleteDirectory( File directory ) throws IOException { - FileUtils.delete( directory, FileUtils.RECURSIVE | FileUtils.RETRY ); + if ( directory.exists() ) + { + FileUtils.delete( directory, FileUtils.RECURSIVE | FileUtils.RETRY ); + } } }
