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:46:56 UTC
svn commit: r1172774 - 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:46:55 2011
New Revision: 1172774
URL: http://svn.apache.org/viewvc?rev=1172774&view=rev
Log:
Merged revisions 1152590 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1152590 | davsclaus | 2011-07-31 12:49:15 -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=1172774&r1=1172773&r2=1172774&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:46:55 2011
@@ -428,7 +428,7 @@ public abstract class TestSupport extend
}
}
- if (file.isFile() && file.exists()) {
+ if (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=1172774&r1=1172773&r2=1172774&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:46:55 2011
@@ -417,7 +417,7 @@ public abstract class TestSupport extend
}
}
- if (file.isFile() && file.exists()) {
+ if (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=1172774&r1=1172773&r2=1172774&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:46:55 2011
@@ -407,7 +407,7 @@ public abstract class TestSupport extend
}
}
- if (file.isFile() && file.exists()) {
+ if (file.exists()) {
assertTrue(file.delete(), "Deletion of file: " + file.getAbsolutePath() + " failed");
}
}