You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2010/04/10 10:49:01 UTC
svn commit: r932678 - in /camel/trunk:
camel-core/src/test/java/org/apache/camel/
components/camel-castor/src/test/java/org/apache/camel/dataformat/castor/
components/camel-test/src/main/java/org/apache/camel/test/
components/camel-test/src/main/java/o...
Author: davsclaus
Date: Sat Apr 10 08:49:01 2010
New Revision: 932678
URL: http://svn.apache.org/viewvc?rev=932678&view=rev
Log:
Do not run camel-castor tests on IBM jvms.
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/TestSupport.java
camel/trunk/components/camel-castor/src/test/java/org/apache/camel/dataformat/castor/MarshalDomainObjectTest.java
camel/trunk/components/camel-castor/src/test/java/org/apache/camel/dataformat/castor/MarshalWithMappingDomainObjectTest.java
camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/TestSupport.java
camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/junit4/TestSupport.java
camel/trunk/components/camel-test/src/test/java/org/apache/camel/test/patterns/FilterTest.java
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/TestSupport.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/TestSupport.java?rev=932678&r1=932677&r2=932678&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/TestSupport.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/TestSupport.java Sat Apr 10 08:49:01 2010
@@ -455,7 +455,20 @@ public abstract class TestSupport extend
*/
public static boolean isPlatform(String platform) {
String osName = System.getProperty("os.name").toLowerCase(Locale.US);
- return osName.indexOf(platform.toLowerCase()) > -1;
+ return osName.indexOf(platform.toLowerCase(Locale.US)) > -1;
+ }
+
+ /**
+ * Is this Java by the given vendor.
+ * <p/>
+ * Uses <tt>java.vendor</tt> from the system properties to determine the vendor.
+ *
+ * @param vendor such as IBM
+ * @return <tt>true</tt> if its that vendor.
+ */
+ public static boolean isJavaVendor(String vendor) {
+ String javaVendor = System.getProperty("java.vendor").toLowerCase(Locale.US);
+ return javaVendor.indexOf(vendor.toLowerCase(Locale.US)) > -1;
}
}
Modified: camel/trunk/components/camel-castor/src/test/java/org/apache/camel/dataformat/castor/MarshalDomainObjectTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-castor/src/test/java/org/apache/camel/dataformat/castor/MarshalDomainObjectTest.java?rev=932678&r1=932677&r2=932678&view=diff
==============================================================================
--- camel/trunk/components/camel-castor/src/test/java/org/apache/camel/dataformat/castor/MarshalDomainObjectTest.java (original)
+++ camel/trunk/components/camel-castor/src/test/java/org/apache/camel/dataformat/castor/MarshalDomainObjectTest.java Sat Apr 10 08:49:01 2010
@@ -29,7 +29,7 @@ public class MarshalDomainObjectTest ext
@Test
public void testMarshalDomainObject() throws Exception {
// some platform cannot test using Castor as it uses a SUN dependent Xerces
- if (isPlatform("aix")) {
+ if (isJavaVendor("IBM")) {
return;
}
@@ -49,7 +49,7 @@ public class MarshalDomainObjectTest ext
@Test
public void testMarshalDomainObjectTwice() throws Exception {
// some platform cannot test using Castor as it uses a SUN dependent Xerces
- if (isPlatform("aix")) {
+ if (isJavaVendor("IBM")) {
return;
}
Modified: camel/trunk/components/camel-castor/src/test/java/org/apache/camel/dataformat/castor/MarshalWithMappingDomainObjectTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-castor/src/test/java/org/apache/camel/dataformat/castor/MarshalWithMappingDomainObjectTest.java?rev=932678&r1=932677&r2=932678&view=diff
==============================================================================
--- camel/trunk/components/camel-castor/src/test/java/org/apache/camel/dataformat/castor/MarshalWithMappingDomainObjectTest.java (original)
+++ camel/trunk/components/camel-castor/src/test/java/org/apache/camel/dataformat/castor/MarshalWithMappingDomainObjectTest.java Sat Apr 10 08:49:01 2010
@@ -29,7 +29,7 @@ public class MarshalWithMappingDomainObj
@Test
public void testMarshalDomainObject() throws Exception {
// some platform cannot test using Castor as it uses a SUN dependent Xerces
- if (isPlatform("aix")) {
+ if (isJavaVendor("IBM")) {
return;
}
@@ -47,7 +47,7 @@ public class MarshalWithMappingDomainObj
@Test
public void testUnmarshalDomainObject() throws Exception {
// some platform cannot test using Castor as it uses a SUN dependent Xerces
- if (isPlatform("aix")) {
+ if (isJavaVendor("IBM")) {
return;
}
Modified: camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/TestSupport.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/TestSupport.java?rev=932678&r1=932677&r2=932678&view=diff
==============================================================================
--- camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/TestSupport.java (original)
+++ camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/TestSupport.java Sat Apr 10 08:49:01 2010
@@ -455,7 +455,20 @@ public abstract class TestSupport extend
*/
public static boolean isPlatform(String platform) {
String osName = System.getProperty("os.name").toLowerCase(Locale.US);
- return osName.indexOf(platform.toLowerCase()) > -1;
+ return osName.indexOf(platform.toLowerCase(Locale.US)) > -1;
+ }
+
+ /**
+ * Is this Java by the given vendor.
+ * <p/>
+ * Uses <tt>java.vendor</tt> from the system properties to determine the vendor.
+ *
+ * @param vendor such as IBM
+ * @return <tt>true</tt> if its that vendor.
+ */
+ public static boolean isJavaVendor(String vendor) {
+ String javaVendor = System.getProperty("java.vendor").toLowerCase(Locale.US);
+ return javaVendor.indexOf(vendor.toLowerCase(Locale.US)) > -1;
}
}
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=932678&r1=932677&r2=932678&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 Apr 10 08:49:01 2010
@@ -454,7 +454,20 @@ public abstract class TestSupport extend
*/
public static boolean isPlatform(String platform) {
String osName = System.getProperty("os.name").toLowerCase(Locale.US);
- return osName.indexOf(platform.toLowerCase()) > -1;
+ return osName.indexOf(platform.toLowerCase(Locale.US)) > -1;
+ }
+
+ /**
+ * Is this Java by the given vendor.
+ * <p/>
+ * Uses <tt>java.vendor</tt> from the system properties to determine the vendor.
+ *
+ * @param vendor such as IBM
+ * @return <tt>true</tt> if its that vendor.
+ */
+ public static boolean isJavaVendor(String vendor) {
+ String javaVendor = System.getProperty("java.vendor").toLowerCase(Locale.US);
+ return javaVendor.indexOf(vendor.toLowerCase(Locale.US)) > -1;
}
}
Modified: camel/trunk/components/camel-test/src/test/java/org/apache/camel/test/patterns/FilterTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-test/src/test/java/org/apache/camel/test/patterns/FilterTest.java?rev=932678&r1=932677&r2=932678&view=diff
==============================================================================
--- camel/trunk/components/camel-test/src/test/java/org/apache/camel/test/patterns/FilterTest.java (original)
+++ camel/trunk/components/camel-test/src/test/java/org/apache/camel/test/patterns/FilterTest.java Sat Apr 10 08:49:01 2010
@@ -25,7 +25,8 @@ import org.apache.camel.test.CamelTestSu
/**
* Tests filtering using Camel Test
- * @version $Revision$
+ *
+ * @version $Revision$
*/
// START SNIPPET: example
public class FilterTest extends CamelTestSupport {