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 2012/11/13 11:35:22 UTC
svn commit: r1408670 - in
/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf:
./ mtom/
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"));
Re: svn commit: r1408670 - in /camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf: ./ mtom/
Posted by Daniel Kulp <dk...@apache.org>.
On Nov 14, 2012, at 2:07 AM, Claus Ibsen <cl...@gmail.com> wrote:
> On Tue, Nov 13, 2012 at 1:25 PM, Daniel Kulp <dk...@apache.org> wrote:
>>
>>
>> Can I ask why they cannot run on AIX? Other than the images which may not work headless, the tests should be able to run fine. I've afraid this is addressing a symptom, not the actual problem and I prefer to get the problem looked at.
>>
>
> Yeah there was nothing obvious I could see from the junit error that
> indicated why it didn't work on AIX.
> I needed to disable failing tests to have the build and tests be able
> to do a full test suite of the project to also uncover issues further
> down the road.'
If that's the case, I'm -1 on all the "disable on AIX" commits you did. Disabling a test just because you don't know why its failing is not OK. There aren't even descriptions of what's failing, stack traces, whatever, that would allow others on the list help diagnose it. I'm also concerned because we did have these running OK on AIX not too long ago. Thus it may be something with your specific AIX instance. When JB gets back to France, I'll see if we can retry on his AIX box.
> Though its suspicious that these tests are using images and detect for
> headless mode. Wonder if we can use non images for the test?
Well, it's specifically there to test the images. JAX-WS requires mapping certain wsdl constructs to Images as part of the wsdl2java process (although it's a relatively annoying part of the spec, I'd personally prefer DataSource or similar). The test is there to specifically test that part of the spec. Unfortunately, it won't work with headless. (actually, that may need to be re-checked. That was true with Java5, not sure with 6 or 7. I'll double check that today as that could allow re-enabling some test in CXF on trunk that no longer supports 5)
Dan
>
>> Dan
>>
>>
>>
>> On Nov 13, 2012, at 5:35 AM, davsclaus@apache.org wrote:
>>
>>> 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"));
>>>
>>>
>>
>> --
>> Daniel Kulp
>> dkulp@apache.org - http://dankulp.com/blog
>> Talend Community Coder - http://coders.talend.com
>>
>
>
>
> --
> Claus Ibsen
> -----------------
> Red Hat, Inc.
> FuseSource is now part of Red Hat
> Email: cibsen@redhat.com
> Web: http://fusesource.com
> Twitter: davsclaus
> Blog: http://davsclaus.com
> Author of Camel in Action: http://www.manning.com/ibsen
--
Daniel Kulp
dkulp@apache.org - http://dankulp.com/blog
Talend Community Coder - http://coders.talend.com
Re: svn commit: r1408670 - in /camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf:
./ mtom/
Posted by Claus Ibsen <cl...@gmail.com>.
On Tue, Nov 13, 2012 at 1:25 PM, Daniel Kulp <dk...@apache.org> wrote:
>
>
> Can I ask why they cannot run on AIX? Other than the images which may not work headless, the tests should be able to run fine. I've afraid this is addressing a symptom, not the actual problem and I prefer to get the problem looked at.
>
Yeah there was nothing obvious I could see from the junit error that
indicated why it didn't work on AIX.
I needed to disable failing tests to have the build and tests be able
to do a full test suite of the project to also uncover issues further
down the road.
Though its suspicious that these tests are using images and detect for
headless mode. Wonder if we can use non images for the test?
> Dan
>
>
>
> On Nov 13, 2012, at 5:35 AM, davsclaus@apache.org wrote:
>
>> 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"));
>>
>>
>
> --
> Daniel Kulp
> dkulp@apache.org - http://dankulp.com/blog
> Talend Community Coder - http://coders.talend.com
>
--
Claus Ibsen
-----------------
Red Hat, Inc.
FuseSource is now part of Red Hat
Email: cibsen@redhat.com
Web: http://fusesource.com
Twitter: davsclaus
Blog: http://davsclaus.com
Author of Camel in Action: http://www.manning.com/ibsen
Re: svn commit: r1408670 - in /camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf: ./ mtom/
Posted by Daniel Kulp <dk...@apache.org>.
Can I ask why they cannot run on AIX? Other than the images which may not work headless, the tests should be able to run fine. I've afraid this is addressing a symptom, not the actual problem and I prefer to get the problem looked at.
Dan
On Nov 13, 2012, at 5:35 AM, davsclaus@apache.org wrote:
> 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"));
>
>
--
Daniel Kulp
dkulp@apache.org - http://dankulp.com/blog
Talend Community Coder - http://coders.talend.com