Author: davsclaus
Date: Tue Nov 13 10:35:20 2012
New Revision: 1408670
URL: http://svn.apache.org/viewvc?rev=1408670&view=rev
Log:
Skip test that cannot run on aix
Added:
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/TestHelper.java
(with props)
Modified:
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfJavaMtomProducerPayloadTest.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomConsumerPayloadModeTest.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomConsumerTest.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomDisabledProducerPayloadModeTest.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomPOJOProducerTest.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomProducerPayloadModeTest.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomRouterPayloadModeTest.java
Added:
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/TestHelper.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/TestHelper.java?rev=1408670&view=auto
==============================================================================
---
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/TestHelper.java
(added)
+++
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/TestHelper.java
Tue Nov 13 10:35:20 2012
@@ -0,0 +1,41 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.cxf;
+
+import java.util.Locale;
+
+/**
+ *
+ */
+public final class TestHelper {
+
+ private TestHelper() {
+ }
+
+ /**
+ * Is this OS the given platform.
+ * <p/>
+ * Uses <tt>os.name</tt> from the system properties to determine the OS.
+ *
+ * @param platform such as Windows
+ * @return <tt>true</tt> if its that platform.
+ */
+ public static boolean isPlatform(String platform) {
+ String osName = System.getProperty("os.name").toLowerCase(Locale.US);
+ return osName.indexOf(platform.toLowerCase(Locale.US)) > -1;
+ }
+}
Propchange:
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/TestHelper.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/TestHelper.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified:
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfJavaMtomProducerPayloadTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfJavaMtomProducerPayloadTest.java?rev=1408670&r1=1408669&r2=1408670&view=diff
==============================================================================
---
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfJavaMtomProducerPayloadTest.java
(original)
+++
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfJavaMtomProducerPayloadTest.java
Tue Nov 13 10:35:20 2012
@@ -22,6 +22,7 @@ import javax.xml.ws.Holder;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
+import org.apache.camel.component.cxf.TestHelper;
import org.junit.Test;
public class CxfJavaMtomProducerPayloadTest extends CxfMtomConsumerTest {
@@ -35,6 +36,11 @@ public class CxfJavaMtomProducerPayloadT
return;
}
+ // skip test on aix
+ if (TestHelper.isPlatform("aix")) {
+ return;
+ }
+
final Holder<byte[]> photo = new
Holder<byte[]>("RequestFromCXF".getBytes("UTF-8"));
final Holder<Image> image = new Holder<Image>(getImage("/java.jpg"));
Modified:
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomConsumerPayloadModeTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomConsumerPayloadModeTest.java?rev=1408670&r1=1408669&r2=1408670&view=diff
==============================================================================
---
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomConsumerPayloadModeTest.java
(original)
+++
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomConsumerPayloadModeTest.java
Tue Nov 13 10:35:20 2012
@@ -38,6 +38,7 @@ import org.apache.camel.ExchangePattern;
import org.apache.camel.Processor;
import org.apache.camel.component.cxf.CXFTestSupport;
import org.apache.camel.component.cxf.CxfPayload;
+import org.apache.camel.component.cxf.TestHelper;
import org.apache.camel.converter.jaxp.XmlConverter;
import org.apache.cxf.binding.soap.SoapHeader;
import org.apache.cxf.helpers.DOMUtils;
@@ -65,6 +66,15 @@ public class CxfMtomConsumerPayloadModeT
@Test
public void testConsumer() throws Exception {
+ if (MtomTestHelper.isAwtHeadless(logger, null)) {
+ return;
+ }
+
+ // skip test on aix
+ if (TestHelper.isPlatform("aix")) {
+ return;
+ }
+
context.createProducerTemplate().send("cxf:bean:consumerEndpoint", new
Processor() {
public void process(Exchange exchange) throws Exception {
Modified:
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomConsumerTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomConsumerTest.java?rev=1408670&r1=1408669&r2=1408670&view=diff
==============================================================================
---
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomConsumerTest.java
(original)
+++
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomConsumerTest.java
Tue Nov 13 10:35:20 2012
@@ -31,6 +31,7 @@ import org.apache.camel.Message;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.cxf.CXFTestSupport;
+import org.apache.camel.component.cxf.TestHelper;
import org.apache.camel.cxf.mtom_feature.Hello;
import org.apache.camel.cxf.mtom_feature.HelloService;
import org.apache.camel.test.junit4.CamelTestSupport;
@@ -99,6 +100,11 @@ public class CxfMtomConsumerTest extends
return;
}
+ // skip test on aix
+ if (TestHelper.isPlatform("aix")) {
+ return;
+ }
+
Holder<byte[]> photo = new
Holder<byte[]>("RequestFromCXF".getBytes("UTF-8"));
Holder<Image> image = new Holder<Image>(getImage("/java.jpg"));
Modified:
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomDisabledProducerPayloadModeTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomDisabledProducerPayloadModeTest.java?rev=1408670&r1=1408669&r2=1408670&view=diff
==============================================================================
---
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomDisabledProducerPayloadModeTest.java
(original)
+++
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomDisabledProducerPayloadModeTest.java
Tue Nov 13 10:35:20 2012
@@ -40,6 +40,7 @@ import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
import org.apache.camel.Processor;
import org.apache.camel.component.cxf.CxfPayload;
+import org.apache.camel.component.cxf.TestHelper;
import org.apache.camel.cxf.mtom_feature.Hello;
import org.apache.cxf.attachment.AttachmentDataSource;
import org.apache.cxf.binding.soap.SoapHeader;
@@ -77,6 +78,11 @@ public class CxfMtomDisabledProducerPayl
return;
}
+ // skip test on aix
+ if (TestHelper.isPlatform("aix")) {
+ return;
+ }
+
Exchange exchange =
context.createProducerTemplate().send("direct:testEndpoint", new Processor() {
public void process(Exchange exchange) throws Exception {
Modified:
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomPOJOProducerTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomPOJOProducerTest.java?rev=1408670&r1=1408669&r2=1408670&view=diff
==============================================================================
---
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomPOJOProducerTest.java
(original)
+++
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomPOJOProducerTest.java
Tue Nov 13 10:35:20 2012
@@ -16,7 +16,6 @@
*/
package org.apache.camel.component.cxf.mtom;
-
import java.awt.Image;
import java.awt.image.BufferedImage;
@@ -32,6 +31,7 @@ import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.component.cxf.CXFTestSupport;
+import org.apache.camel.component.cxf.TestHelper;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -40,6 +40,7 @@ import org.springframework.test.context.
import
org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
import static org.junit.Assert.assertEquals;
+
/**
* Unit test for exercising MTOM enabled end-to-end router in PAYLOAD mode
*
@@ -75,6 +76,11 @@ public class CxfMtomPOJOProducerTest ext
return;
}
+ // skip test on aix
+ if (TestHelper.isPlatform("aix")) {
+ return;
+ }
+
final Holder<byte[]> photo = new
Holder<byte[]>(MtomTestHelper.REQ_PHOTO_DATA);
final Holder<Image> image = new Holder<Image>(getImage("/java.jpg"));
Modified:
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomProducerPayloadModeTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomProducerPayloadModeTest.java?rev=1408670&r1=1408669&r2=1408670&view=diff
==============================================================================
---
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomProducerPayloadModeTest.java
(original)
+++
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomProducerPayloadModeTest.java
Tue Nov 13 10:35:20 2012
@@ -40,6 +40,7 @@ import org.apache.camel.ExchangePattern;
import org.apache.camel.Processor;
import org.apache.camel.component.cxf.CXFTestSupport;
import org.apache.camel.component.cxf.CxfPayload;
+import org.apache.camel.component.cxf.TestHelper;
import org.apache.camel.converter.jaxp.XmlConverter;
import org.apache.cxf.binding.soap.SoapHeader;
import org.apache.cxf.helpers.DOMUtils;
@@ -89,6 +90,11 @@ public class CxfMtomProducerPayloadModeT
return;
}
+ // skip test on aix
+ if (TestHelper.isPlatform("aix")) {
+ return;
+ }
+
// START SNIPPET: producer
Exchange exchange =
context.createProducerTemplate().send("direct:testEndpoint", new Processor() {
Modified:
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomRouterPayloadModeTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomRouterPayloadModeTest.java?rev=1408670&r1=1408669&r2=1408670&view=diff
==============================================================================
---
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomRouterPayloadModeTest.java
(original)
+++
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomRouterPayloadModeTest.java
Tue Nov 13 10:35:20 2012
@@ -16,7 +16,6 @@
*/
package org.apache.camel.component.cxf.mtom;
-
import java.awt.Image;
import java.awt.image.BufferedImage;
import java.net.URL;
@@ -31,6 +30,7 @@ import junit.framework.Assert;
import org.apache.camel.CamelContext;
import org.apache.camel.component.cxf.CXFTestSupport;
+import org.apache.camel.component.cxf.TestHelper;
import org.apache.camel.cxf.mtom_feature.Hello;
import org.apache.camel.cxf.mtom_feature.HelloService;
import org.junit.After;
@@ -41,6 +41,7 @@ import org.springframework.test.context.
import
org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
import static org.junit.Assert.assertNotNull;
+
/**
* Unit test for exercising MTOM enabled end-to-end router in PAYLOAD mode
*
@@ -76,6 +77,11 @@ public class CxfMtomRouterPayloadModeTes
if (MtomTestHelper.isAwtHeadless(logger, null)) {
return;
}
+
+ // skip test on aix
+ if (TestHelper.isPlatform("aix")) {
+ return;
+ }
Holder<byte[]> photo = new
Holder<byte[]>(MtomTestHelper.REQ_PHOTO_DATA);
Holder<Image> image = new Holder<Image>(getImage("/java.jpg"));
