You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by dk...@apache.org on 2011/09/19 21:45:56 UTC
svn commit: r1172772 - in /camel/branches/camel-2.8.x: ./
components/camel-test/src/main/java/org/apache/camel/test/
components/camel-test/src/main/java/org/apache/camel/test/junit4/
components/camel-testng/src/main/java/org/apache/camel/testng/
Author: dkulp
Date: Mon Sep 19 19:45:56 2011
New Revision: 1172772
URL: http://svn.apache.org/viewvc?rev=1172772&view=rev
Log:
Merged revisions 1152564 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1152564 | davsclaus | 2011-07-31 07:40:37 -0400 (Sun, 31 Jul 2011) | 1 line
CAMEL-4275: camel test kit, deleteDirectory will not fail if deleting of files failed.
........
Modified:
camel/branches/camel-2.8.x/ (props changed)
camel/branches/camel-2.8.x/components/camel-test/src/main/java/org/apache/camel/test/TestSupport.java
camel/branches/camel-2.8.x/components/camel-test/src/main/java/org/apache/camel/test/junit4/TestSupport.java
camel/branches/camel-2.8.x/components/camel-testng/src/main/java/org/apache/camel/testng/TestSupport.java
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-2.8.x/components/camel-test/src/main/java/org/apache/camel/test/TestSupport.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-test/src/main/java/org/apache/camel/test/TestSupport.java?rev=1172772&r1=1172771&r2=1172772&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/components/camel-test/src/main/java/org/apache/camel/test/TestSupport.java (original)
+++ camel/branches/camel-2.8.x/components/camel-test/src/main/java/org/apache/camel/test/TestSupport.java Mon Sep 19 19:45:56 2011
@@ -427,7 +427,10 @@ public abstract class TestSupport extend
deleteDirectory(files[i]);
}
}
- file.delete();
+
+ if (file.isFile() && file.exists()) {
+ assertTrue("Deletion of file: " + file.getAbsolutePath() + " failed", file.delete());
+ }
}
/**
Modified: camel/branches/camel-2.8.x/components/camel-test/src/main/java/org/apache/camel/test/junit4/TestSupport.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-test/src/main/java/org/apache/camel/test/junit4/TestSupport.java?rev=1172772&r1=1172771&r2=1172772&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/components/camel-test/src/main/java/org/apache/camel/test/junit4/TestSupport.java (original)
+++ camel/branches/camel-2.8.x/components/camel-test/src/main/java/org/apache/camel/test/junit4/TestSupport.java Mon Sep 19 19:45:56 2011
@@ -416,7 +416,10 @@ public abstract class TestSupport extend
deleteDirectory(files[i]);
}
}
- file.delete();
+
+ if (file.isFile() && file.exists()) {
+ assertTrue("Deletion of file: " + file.getAbsolutePath() + " failed", file.delete());
+ }
}
/**
Modified: camel/branches/camel-2.8.x/components/camel-testng/src/main/java/org/apache/camel/testng/TestSupport.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-testng/src/main/java/org/apache/camel/testng/TestSupport.java?rev=1172772&r1=1172771&r2=1172772&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/components/camel-testng/src/main/java/org/apache/camel/testng/TestSupport.java (original)
+++ camel/branches/camel-2.8.x/components/camel-testng/src/main/java/org/apache/camel/testng/TestSupport.java Mon Sep 19 19:45:56 2011
@@ -406,7 +406,10 @@ public abstract class TestSupport extend
deleteDirectory(files[i]);
}
}
- file.delete();
+
+ if (file.isFile() && file.exists()) {
+ assertTrue(file.delete(), "Deletion of file: " + file.getAbsolutePath() + " failed");
+ }
}
/**