Author: bvahdat
Date: Sat Jun 9 12:49:00 2012
New Revision: 1348383
URL: http://svn.apache.org/viewvc?rev=1348383&view=rev
Log:
CAMEL-5339: Fixed the failed tests on the CI-Server while building on JDK 7.
Modified:
camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentDuplicateNamesTest.java
camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentRedeliveryTest.java
camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentTest.java
camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentsUmlautIssueTest.java
camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailHtmlAttachmentTest.java
camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/junit4/TestSupport.java
Modified:
camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentDuplicateNamesTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentDuplicateNamesTest.java?rev=1348383&r1=1348382&r2=1348383&view=diff
==============================================================================
---
camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentDuplicateNamesTest.java
(original)
+++
camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentDuplicateNamesTest.java
Sat Jun 9 12:49:00 2012
@@ -81,7 +81,11 @@ public class MailAttachmentDuplicateName
DataHandler handler = out.getIn().getAttachment("logo.jpeg");
assertNotNull("The logo should be there", handler);
- assertEquals("image/jpeg; name=logo.jpeg", handler.getContentType());
+ if (isJava16()) {
+ assertEquals("image/jpeg; name=logo.jpeg",
handler.getContentType());
+ } else {
+ assertEquals("application/octet-stream; name=logo.jpeg",
handler.getContentType());
+ }
producer.stop();
}
Modified:
camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentRedeliveryTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentRedeliveryTest.java?rev=1348383&r1=1348382&r2=1348383&view=diff
==============================================================================
---
camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentRedeliveryTest.java
(original)
+++
camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentRedeliveryTest.java
Sat Jun 9 12:49:00 2012
@@ -80,7 +80,12 @@ public class MailAttachmentRedeliveryTes
DataHandler handler = out.getIn().getAttachment("logo.jpeg");
assertNotNull("The logo should be there", handler);
- assertEquals("image/jpeg; name=logo.jpeg", handler.getContentType());
+ if (isJava16()) {
+ assertEquals("image/jpeg; name=logo.jpeg",
handler.getContentType());
+ } else {
+ assertEquals("application/octet-stream; name=logo.jpeg",
handler.getContentType());
+ }
+
assertEquals("Handler name should be the file name", "logo.jpeg",
handler.getName());
producer.stop();
Modified:
camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentTest.java?rev=1348383&r1=1348382&r2=1348383&view=diff
==============================================================================
---
camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentTest.java
(original)
+++
camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentTest.java
Sat Jun 9 12:49:00 2012
@@ -80,7 +80,12 @@ public class MailAttachmentTest extends
DataHandler handler = out.getIn().getAttachment("logo.jpeg");
assertNotNull("The logo should be there", handler);
- assertEquals("image/jpeg; name=logo.jpeg", handler.getContentType());
+ if (isJava16()) {
+ assertEquals("image/jpeg; name=logo.jpeg",
handler.getContentType());
+ } else {
+ assertEquals("application/octet-stream; name=logo.jpeg",
handler.getContentType());
+ }
+
assertEquals("Handler name should be the file name", "logo.jpeg",
handler.getName());
producer.stop();
Modified:
camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentsUmlautIssueTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentsUmlautIssueTest.java?rev=1348383&r1=1348382&r2=1348383&view=diff
==============================================================================
---
camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentsUmlautIssueTest.java
(original)
+++
camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentsUmlautIssueTest.java
Sat Jun 9 12:49:00 2012
@@ -78,7 +78,12 @@ public class MailAttachmentsUmlautIssueT
DataHandler handler = out.getIn().getAttachment(name);
assertNotNull("The " + name + " should be there", handler);
- assertEquals("image/jpeg; name=\"" + name + "\"",
handler.getContentType());
+ if (isJava16()) {
+ assertEquals("image/jpeg; name=\"" + name + "\"",
handler.getContentType());
+ } else {
+ assertEquals("application/octet-stream; name=\"" + name + "\"",
handler.getContentType());
+ }
+
assertEquals("Handler name should be the file name", name,
handler.getName());
producer.stop();
Modified:
camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailHtmlAttachmentTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailHtmlAttachmentTest.java?rev=1348383&r1=1348382&r2=1348383&view=diff
==============================================================================
---
camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailHtmlAttachmentTest.java
(original)
+++
camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailHtmlAttachmentTest.java
Sat Jun 9 12:49:00 2012
@@ -84,7 +84,11 @@ public class MailHtmlAttachmentTest exte
assertTrue("logo should be more than 1000 bytes", bytes.length > 1000);
// content type should match
- assertEquals("image/jpeg; name=logo.jpeg", handler.getContentType());
+ if (isJava16()) {
+ assertEquals("image/jpeg; name=logo.jpeg",
handler.getContentType());
+ } else {
+ assertEquals("application/octet-stream; name=logo.jpeg",
handler.getContentType());
+ }
// save logo for visual inspection
template.sendBodyAndHeader("file://target", bytes, Exchange.FILE_NAME,
"maillogo.jpg");
Modified:
camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/junit4/TestSupport.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/junit4/TestSupport.java?rev=1348383&r1=1348382&r2=1348383&view=diff
==============================================================================
---
camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/junit4/TestSupport.java
(original)
+++
camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/junit4/TestSupport.java
Sat Jun 9 12:49:00 2012
@@ -529,6 +529,16 @@ public abstract class TestSupport extend
}
/**
+ * Is this Java 1.6
+ *
+ * @return <tt>true</tt> if its Java 1.6, <tt>false</tt> if its not (for
example Java 1.7 or better)
+ */
+ public static boolean isJava16() {
+ String javaVersion =
System.getProperty("java.version").toLowerCase(Locale.US);
+ return javaVersion.startsWith("1.6");
+ }
+
+ /**
* Gets the current test method name
*
* @return the method name
