Author: bvahdat
Date: Fri Aug 17 18:31:29 2012
New Revision: 1374391
URL: http://svn.apache.org/viewvc?rev=1374391&view=rev
Log:
Merged revisions 1374388 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1374388 | bvahdat | 2012-08-17 20:27:56 +0200 (Fr, 17 Aug 2012) | 1 line
CAMEL-5514:: Warn both through console as well as log if we can not run a
given test.
........
Modified:
camel/branches/camel-2.10.x/ (props changed)
camel/branches/camel-2.10.x/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpServerTestSupport.java
camel/branches/camel-2.10.x/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpsServerTestSupport.java
camel/branches/camel-2.10.x/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpServerTestSupport.java
Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Merged /camel/trunk:r1374388
Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
camel/branches/camel-2.10.x/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpServerTestSupport.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpServerTestSupport.java?rev=1374391&r1=1374390&r2=1374391&view=diff
==============================================================================
---
camel/branches/camel-2.10.x/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpServerTestSupport.java
(original)
+++
camel/branches/camel-2.10.x/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpServerTestSupport.java
Fri Aug 17 18:31:29 2012
@@ -67,8 +67,12 @@ public abstract class FtpServerTestSuppo
NoSuchAlgorithmException nsae =
ObjectHelper.getException(NoSuchAlgorithmException.class, e);
if (nsae != null) {
canTest = false;
+
+ // warn both through console as well as log that we can not
run the test
String name = System.getProperty("os.name");
- System.out.println("SunX509 is not avail on this platform [" +
name + "] Testing is skipped! Real cause: " + nsae.getMessage());
+ String message = nsae.getMessage();
+ System.out.println("SunX509 is not avail on this platform [" +
name + "] Testing is skipped! Real cause: " + message);
+ log.warn("SunX509 is not avail on this platform [{0}] Testing
is skipped! Real cause: {1}", name, message);
} else {
// some other error then throw it so the test can fail
throw e;
Modified:
camel/branches/camel-2.10.x/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpsServerTestSupport.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpsServerTestSupport.java?rev=1374391&r1=1374390&r2=1374391&view=diff
==============================================================================
---
camel/branches/camel-2.10.x/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpsServerTestSupport.java
(original)
+++
camel/branches/camel-2.10.x/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpsServerTestSupport.java
Fri Aug 17 18:31:29 2012
@@ -45,15 +45,18 @@ public abstract class FtpsServerTestSupp
// ignore if algorithm is not on the OS
NoSuchAlgorithmException nsae =
ObjectHelper.getException(NoSuchAlgorithmException.class, e);
if (nsae != null) {
+ // warn both through console as well as log that we can not
run the test
String name = System.getProperty("os.name");
- System.out.println("SunX509 is not avail on this platform [" +
name + "] Testing is skipped! Real cause: " + nsae.getMessage());
+ String message = nsae.getMessage();
+ System.out.println("SunX509 is not avail on this platform [" +
name + "] Testing is skipped! Real cause: " + message);
+ log.warn("SunX509 is not avail on this platform [{0}] Testing
is skipped! Real cause: {1}", name, message);
+
+ return null;
} else {
// some other error then throw it so the test can fail
throw e;
}
}
-
- return null;
}
protected FtpServerFactory doCreateFtpServerFactory() throws Exception {
Modified:
camel/branches/camel-2.10.x/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpServerTestSupport.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpServerTestSupport.java?rev=1374391&r1=1374390&r2=1374391&view=diff
==============================================================================
---
camel/branches/camel-2.10.x/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpServerTestSupport.java
(original)
+++
camel/branches/camel-2.10.x/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpServerTestSupport.java
Fri Aug 17 18:31:29 2012
@@ -60,7 +60,12 @@ public class SftpServerTestSupport exten
NoSuchAlgorithmException nsae =
ObjectHelper.getException(NoSuchAlgorithmException.class, e);
if (nsae != null) {
canTest = false;
- log.warn("SunX509 is not avail on this platform [{0}] Testing
is skipped! Real cause: {1}", System.getProperty("os.name"), nsae.getMessage());
+
+ // warn both through console as well as log that we can not
run the test
+ String name = System.getProperty("os.name");
+ String message = nsae.getMessage();
+ System.out.println("SunX509 is not avail on this platform [" +
name + "] Testing is skipped! Real cause: " + message);
+ log.warn("SunX509 is not avail on this platform [{0}] Testing
is skipped! Real cause: {1}", name, message);
} else {
// some other error then throw it so the test can fail
throw e;
