cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject [2/4] cxf git commit: Remove some ignored tests
Date Fri, 18 Aug 2017 20:28:07 GMT
Remove some ignored tests


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/e3abb5e1
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/e3abb5e1
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/e3abb5e1

Branch: refs/heads/master
Commit: e3abb5e1c016da5dedd6a035b0fd5507aa339314
Parents: 6259640
Author: Daniel Kulp <dkulp@apache.org>
Authored: Fri Aug 18 14:28:43 2017 -0400
Committer: Daniel Kulp <dkulp@apache.org>
Committed: Fri Aug 18 15:28:36 2017 -0400

----------------------------------------------------------------------
 .../cxf/aegis/integration/WrappedTest.java      | 21 ------
 .../jaxrs/provider/JAXBElementProviderTest.java |  3 -
 .../cxf/javascript/JsHttpRequestTest.java       |  6 +-
 .../apache/cxf/javascript/QueryHandlerTest.java | 11 ---
 .../apache/cxf/javascript/RPCClientTest.java    | 58 +---------------
 .../cxf/javascript/types/AttributeTest.java     | 73 --------------------
 .../src/test/resources/RPCClientTestBeans.xml   |  2 +-
 .../test/resources/XMLHttpRequestTestBeans.xml  |  2 +-
 .../org/apache/cxf/javascript/RPCTests.js       |  2 +
 .../spring/BeanDefinitionParsersTest.java       | 69 ------------------
 .../jms/uri/URIConfiguredConduitTest.java       |  5 +-
 .../systest/jaxws/LocatorClientServerTest.java  | 36 ----------
 12 files changed, 11 insertions(+), 277 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/e3abb5e1/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/integration/WrappedTest.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/integration/WrappedTest.java
b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/integration/WrappedTest.java
index 6307f3f..024711e 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/integration/WrappedTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/integration/WrappedTest.java
@@ -122,27 +122,6 @@ public class WrappedTest extends AbstractAegisTest {
                     doc);
     }
 
-    @org.junit.Ignore // uses Jaxen.
-    @Test
-    public void testSubmitJDOMArray() throws Exception {
-
-        org.jdom.xpath.XPath jxpathWalrus =
-            org.jdom.xpath.XPath.newInstance("/a:anyType/iam:walrus");
-        jxpathWalrus.addNamespace("a", "urn:Array");
-        jxpathWalrus.addNamespace("iam", "uri:iam");
-        jxpathWalrus.addNamespace("linux", "uri:linux");
-        jxpathWalrus.addNamespace("planets", "uri:planets");
-
-        invoke("Array", "/org/apache/cxf/aegis/integration/anyTypeArrayJDOM.xml");
-        assertEquals("before items", arrayService.getBeforeValue());
-        assertEquals(3, arrayService.getJdomArray().length);
-        org.jdom.Element e = (org.jdom.Element)
-            jxpathWalrus.selectSingleNode(arrayService.getJdomArray()[0]);
-        assertNotNull(e);
-        assertEquals("tusks", e.getText());
-        assertEquals("after items", arrayService.getAfterValue());
-    }
-
     @Test
     public void testSubmitW3CArray() throws Exception {
         addNamespace("a", "urn:Array");

http://git-wip-us.apache.org/repos/asf/cxf/blob/e3abb5e1/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JAXBElementProviderTest.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JAXBElementProviderTest.java
b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JAXBElementProviderTest.java
index a08f9d0..361a11c 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JAXBElementProviderTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JAXBElementProviderTest.java
@@ -98,7 +98,6 @@ import org.apache.cxf.message.MessageImpl;
 import org.easymock.EasyMock;
 
 import org.junit.Assert;
-import org.junit.Ignore;
 import org.junit.Test;
 
 public class JAXBElementProviderTest extends Assert {
@@ -1230,14 +1229,12 @@ public class JAXBElementProviderTest extends Assert {
 
 
     @Test
-    @Ignore
     public void testReadQualifiedCollection() throws Exception {
         String data = "<ns1:tags xmlns:ns1=\"http://tags\"><ns1:thetag><group>B</group><name>A</name>"
             + "</ns1:thetag><ns1:thetag><group>D</group><name>C</name></ns1:thetag></ns1:tags>";
         doReadQualifiedCollection(data, false);
     }
 
-    @Ignore
     @Test
     public void testReadQualifiedArray() throws Exception {
         String data = "<ns1:tags xmlns:ns1=\"http://tags\"><ns1:thetag><group>B</group><name>A</name>"

http://git-wip-us.apache.org/repos/asf/cxf/blob/e3abb5e1/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/JsHttpRequestTest.java
----------------------------------------------------------------------
diff --git a/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/JsHttpRequestTest.java
b/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/JsHttpRequestTest.java
index 7e359c1..3247f1a 100644
--- a/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/JsHttpRequestTest.java
+++ b/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/JsHttpRequestTest.java
@@ -45,7 +45,6 @@ import org.springframework.context.support.GenericApplicationContext;
 /**
  * This test is ignored by default as it is continually failing on Jenkins.
  */
-@org.junit.Ignore
 public class JsHttpRequestTest extends AbstractCXFSpringTest {
 
     // shadow declaration from base class.
@@ -69,7 +68,7 @@ public class JsHttpRequestTest extends AbstractCXFSpringTest {
 
     @Override
     protected String[] getConfigLocations() {
-        TestUtil.getPortNumber(JsHttpRequestTest.class);
+        TestUtil.getNewPortNumber(JsHttpRequestTest.class);
         return new String[] {"classpath:XMLHttpRequestTestBeans.xml"};
     }
 
@@ -111,8 +110,7 @@ public class JsHttpRequestTest extends AbstractCXFSpringTest {
         assertNotNull(httpObj);
         assertTrue(httpObj instanceof String);
         String httpResponse = (String) httpObj;
-        // check for 'Shalom' in Hebrew as a charset check.
-        assertTrue(httpResponse.contains("\u05e9\u05dc\u05d5\u05dd"));
+        assertTrue(httpResponse.contains("Test"));
         Reader r = getResourceAsReader("/org/apache/cxf/javascript/XML_GreetMeDocLiteralReq.xml");
         String xml = IOUtils.toString(r);
         EndpointImpl endpoint = this.getBean(EndpointImpl.class, "greeter-service-endpoint");

http://git-wip-us.apache.org/repos/asf/cxf/blob/e3abb5e1/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/QueryHandlerTest.java
----------------------------------------------------------------------
diff --git a/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/QueryHandlerTest.java
b/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/QueryHandlerTest.java
index f14645c..5cb10aa 100644
--- a/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/QueryHandlerTest.java
+++ b/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/QueryHandlerTest.java
@@ -46,7 +46,6 @@ public class QueryHandlerTest extends AbstractCXFSpringTest {
     private static final Logger LOG = LogUtils.getL7dLogger(QueryHandlerTest.class);
     private Endpoint hwEndpoint;
     private Endpoint dlbEndpoint;
-    private Endpoint hwgEndpoint;
 
     public QueryHandlerTest() throws Exception {
         super();
@@ -72,8 +71,6 @@ public class QueryHandlerTest extends AbstractCXFSpringTest {
     public void before() {
         ServerFactoryBean serverFactoryBean = getBean(ServerFactoryBean.class, "hw-service-endpoint");
         hwEndpoint = serverFactoryBean.create().getEndpoint();
-        serverFactoryBean = getBean(ServerFactoryBean.class, "hwg-service-endpoint");
-        hwgEndpoint = serverFactoryBean.create().getEndpoint();
         serverFactoryBean = getBean(ServerFactoryBean.class, "dlb-service-endpoint");
         dlbEndpoint = serverFactoryBean.create().getEndpoint();
     }
@@ -128,12 +125,4 @@ public class QueryHandlerTest extends AbstractCXFSpringTest {
         assertFalse(jsString.contains("function CxfApacheOrgUtil"));
     }
 
-    // this is in here since we need to use the query handler to perform the test.
-    @org.junit.Ignore
-    @Test
-    public void namespacePrefixTest() throws Exception {
-        URL endpointURL = new URL(hwgEndpoint.getEndpointInfo().getAddress()  + "?js");
-        String js = getStringFromURL(endpointURL);
-        assertTrue(js.contains("hg_Greeter"));
-    }
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/e3abb5e1/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/RPCClientTest.java
----------------------------------------------------------------------
diff --git a/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/RPCClientTest.java
b/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/RPCClientTest.java
index a3b88e1..afde94a 100644
--- a/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/RPCClientTest.java
+++ b/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/RPCClientTest.java
@@ -27,6 +27,8 @@ import org.apache.cxf.javascript.JavascriptTestUtilities.Notifier;
 import org.apache.cxf.javascript.fortest.SimpleRPCImpl;
 import org.apache.cxf.javascript.fortest.TestBean1;
 import org.apache.cxf.javascript.fortest.TestBean2;
+import org.apache.cxf.testutil.common.TestUtil;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.mozilla.javascript.Context;
@@ -39,6 +41,7 @@ import org.springframework.context.support.GenericApplicationContext;
  */
 
 public class RPCClientTest extends JavascriptRhinoTest {
+    public static final String PORT = TestUtil.getNewPortNumber(RPCClientTest.class);
 
     private static final Logger LOG = LogUtils.getL7dLogger(RPCClientTest.class);
 
@@ -91,51 +94,6 @@ public class RPCClientTest extends JavascriptRhinoTest {
         return null;
     }
 
-    private Void beanFunctionCaller(Context context) {
-
-        TestBean1 b1 = new TestBean1();
-        b1.stringItem = "strung";
-        TestBean1[] beans = new TestBean1[3];
-        beans[0] = new TestBean1();
-        beans[0].stringItem = "zerobean";
-        beans[0].beanTwoNotRequiredItem = new TestBean2("bean2");
-        beans[1] = null;
-        beans[2] = new TestBean1();
-        beans[2].stringItem = "twobean";
-        beans[2].optionalIntArrayItem = new int[2];
-        beans[2].optionalIntArrayItem[0] = 4;
-        beans[2].optionalIntArrayItem[1] = 6;
-
-        Object[] jsBeans = new Object[3];
-        jsBeans[0] = testBean1ToJS(testUtilities, context, beans[0]);
-        jsBeans[1] = null;
-        jsBeans[2] = testBean1ToJS(testUtilities, context, beans[2]);
-
-        Scriptable jsBean1 = testBean1ToJS(testUtilities, context, b1);
-        Scriptable jsBeanArray = context.newArray(testUtilities.getRhinoScope(), jsBeans);
-
-        LOG.info("About to call beanFunctionTest " + getAddress());
-        Notifier notifier =
-            testUtilities.rhinoCallConvert("beanFunctionTest", Notifier.class,
-                                           testUtilities.javaToJS(getAddress()),
-                                           jsBean1,
-                                           jsBeanArray);
-        boolean notified = notifier.waitForJavascript(1000 * 10);
-        assertTrue(notified);
-        Integer errorStatus = testUtilities.rhinoEvaluateConvert("globalErrorStatus", Integer.class);
-        assertNull(errorStatus);
-        String errorText = testUtilities.rhinoEvaluateConvert("globalErrorStatusText", String.class);
-        assertNull(errorText);
-
-        // this method returns void.
-        Scriptable responseObject = (Scriptable)testUtilities.rhinoEvaluate("globalResponseObject");
-        // there is no response, this thing returns 'void'
-        assertNull(responseObject);
-        SimpleRPCImpl impl = getBean(SimpleRPCImpl.class, "rpc-service");
-        TestBean1 b1returned = impl.getLastBean();
-        assertEquals(b1, b1returned);
-        return null;
-    }
 
     @Test
     public void callSimple() {
@@ -149,16 +107,6 @@ public class RPCClientTest extends JavascriptRhinoTest {
         });
     }
 
-    @org.junit.Ignore
-    @Test
-    public void callFunctionWithBeans() {
-        LOG.info("about to call beanFunctionTest");
-        testUtilities.runInsideContext(Void.class, new JSRunnable<Void>() {
-            public Void run(Context context) {
-                return beanFunctionCaller(context);
-            }
-        });
-    }
 
     public static Scriptable testBean1ToJS(JavascriptTestUtilities testUtilities,
                                            Context context,

http://git-wip-us.apache.org/repos/asf/cxf/blob/e3abb5e1/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/types/AttributeTest.java
----------------------------------------------------------------------
diff --git a/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/types/AttributeTest.java
b/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/types/AttributeTest.java
index b773ffa..c15b2ee 100644
--- a/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/types/AttributeTest.java
+++ b/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/types/AttributeTest.java
@@ -20,21 +20,16 @@
 package org.apache.cxf.javascript.types;
 
 import java.io.IOException;
-import java.io.StringReader;
 import java.io.StringWriter;
 import java.util.Collection;
 import java.util.List;
 
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLInputFactory;
 import javax.xml.stream.XMLOutputFactory;
 import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
 import javax.xml.stream.XMLStreamWriter;
 
 import org.apache.cxf.Bus;
 import org.apache.cxf.databinding.DataBinding;
-import org.apache.cxf.databinding.DataReader;
 import org.apache.cxf.databinding.DataWriter;
 import org.apache.cxf.endpoint.Client;
 import org.apache.cxf.javascript.BasicNameManager;
@@ -42,7 +37,6 @@ import org.apache.cxf.javascript.JavascriptTestUtilities;
 import org.apache.cxf.javascript.NameManager;
 import org.apache.cxf.javascript.NamespacePrefixAccumulator;
 import org.apache.cxf.javascript.fortest.AttributeTestBean;
-import org.apache.cxf.javascript.fortest.TestBean1;
 import org.apache.cxf.jaxb.JAXBDataBinding;
 import org.apache.cxf.jaxws.JaxWsProxyFactoryBean;
 import org.apache.cxf.service.model.SchemaInfo;
@@ -54,7 +48,6 @@ import org.springframework.context.support.GenericApplicationContext;
 
 public class AttributeTest extends AbstractCXFSpringTest {
     private JavascriptTestUtilities testUtilities;
-    private XMLInputFactory xmlInputFactory;
     private XMLOutputFactory xmlOutputFactory;
     private Client client;
     private List<ServiceInfo> serviceInfos;
@@ -65,7 +58,6 @@ public class AttributeTest extends AbstractCXFSpringTest {
     public AttributeTest() throws Exception {
         testUtilities = new JavascriptTestUtilities(getClass());
         testUtilities.addDefaultNamespaces();
-        xmlInputFactory = XMLInputFactory.newInstance();
         xmlOutputFactory = XMLOutputFactory.newInstance();
     }
 
@@ -101,71 +93,6 @@ public class AttributeTest extends AbstractCXFSpringTest {
         return stringWriter.toString();
     }
 
-    @Test
-    @org.junit.Ignore
-    public void testSerialization() throws Exception {
-        setupClientAndRhino("simple-dlwu-proxy-factory");
-
-        testUtilities.readResourceIntoRhino("/serializationTests.js");
-        DataBinding dataBinding = clientProxyFactory.getServiceFactory().getDataBinding();
-        assertNotNull(dataBinding);
-
-        Object serialized = testUtilities.rhinoCallInContext("serializeTestBean1_1");
-        assertTrue(serialized instanceof String);
-        String xml = (String)serialized;
-        DataReader<XMLStreamReader> reader = dataBinding.createReader(XMLStreamReader.class);
-        StringReader stringReader = new StringReader(xml);
-        XMLStreamReader xmlStreamReader = xmlInputFactory.createXMLStreamReader(stringReader);
-        QName testBeanQName = new QName("uri:org.apache.cxf.javascript.testns", "TestBean1");
-        Object bean = reader.read(testBeanQName, xmlStreamReader, TestBean1.class);
-        assertNotNull(bean);
-        assertTrue(bean instanceof TestBean1);
-        TestBean1 testBean = (TestBean1)bean;
-        assertEquals("bean1<stringItem", testBean.stringItem);
-        assertEquals(64, testBean.intItem);
-        assertEquals(64000000, testBean.longItem);
-        assertEquals(101, testBean.optionalIntItem);
-        assertNotNull(testBean.optionalIntArrayItem);
-        assertEquals(1, testBean.optionalIntArrayItem.length);
-        assertEquals(543, testBean.optionalIntArrayItem[0]);
-
-        serialized = testUtilities.rhinoCallInContext("serializeTestBean1_2");
-        assertTrue(serialized instanceof String);
-        xml = (String)serialized;
-        reader = dataBinding.createReader(XMLStreamReader.class);
-        stringReader = new StringReader(xml);
-        xmlStreamReader = xmlInputFactory.createXMLStreamReader(stringReader);
-        bean = reader.read(testBeanQName, xmlStreamReader, TestBean1.class);
-        assertNotNull(bean);
-        assertTrue(bean instanceof TestBean1);
-        testBean = (TestBean1)bean;
-        assertEquals("bean1<stringItem", testBean.stringItem);
-        assertEquals(64, testBean.intItem);
-        assertEquals(64000000, testBean.longItem);
-        assertEquals(0, testBean.optionalIntItem);
-        assertNotNull(testBean.optionalIntArrayItem);
-        assertEquals(3, testBean.optionalIntArrayItem.length);
-        assertEquals(543, testBean.optionalIntArrayItem[0]);
-        assertEquals(0, testBean.optionalIntArrayItem[1]);
-        assertEquals(345, testBean.optionalIntArrayItem[2]);
-
-        serialized = testUtilities.rhinoCallInContext("serializeTestBean1_3");
-        assertTrue(serialized instanceof String);
-        xml = (String)serialized;
-        reader = dataBinding.createReader(XMLStreamReader.class);
-        stringReader = new StringReader(xml);
-        xmlStreamReader = xmlInputFactory.createXMLStreamReader(stringReader);
-        bean = reader.read(testBeanQName, xmlStreamReader, TestBean1.class);
-        assertNotNull(bean);
-        assertTrue(bean instanceof TestBean1);
-        testBean = (TestBean1)bean;
-        assertEquals("bean1<stringItem", testBean.stringItem);
-        assertEquals(64, testBean.intItem);
-        assertEquals(43, testBean.longItem);
-        assertEquals(33, testBean.optionalIntItem);
-        assertNull(testBean.optionalIntArrayItem);
-    }
-
     private void setupClientAndRhino(String clientProxyFactoryBeanId) throws IOException
{
         testUtilities.setBus(getBean(Bus.class, "cxf"));
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/e3abb5e1/rt/javascript/javascript-tests/src/test/resources/RPCClientTestBeans.xml
----------------------------------------------------------------------
diff --git a/rt/javascript/javascript-tests/src/test/resources/RPCClientTestBeans.xml b/rt/javascript/javascript-tests/src/test/resources/RPCClientTestBeans.xml
index dc2e0d5..ada69d7 100644
--- a/rt/javascript/javascript-tests/src/test/resources/RPCClientTestBeans.xml
+++ b/rt/javascript/javascript-tests/src/test/resources/RPCClientTestBeans.xml
@@ -21,7 +21,7 @@
     <import resource="classpath:META-INF/cxf/cxf.xml"/>
     <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
     <bean id="rpc-service" class="org.apache.cxf.javascript.fortest.SimpleRPCImpl"/>
-    <jaxws:server id="rpc-service-endpoint" address="http://localhost:${testutil.ports.TestPort}/SimpleRPC">
+    <jaxws:server id="rpc-service-endpoint" address="http://localhost:${testutil.ports.RPCClientTest}/SimpleRPC">
         <jaxws:serviceBean>
             <ref bean="rpc-service"/>
         </jaxws:serviceBean>

http://git-wip-us.apache.org/repos/asf/cxf/blob/e3abb5e1/rt/javascript/javascript-tests/src/test/resources/XMLHttpRequestTestBeans.xml
----------------------------------------------------------------------
diff --git a/rt/javascript/javascript-tests/src/test/resources/XMLHttpRequestTestBeans.xml
b/rt/javascript/javascript-tests/src/test/resources/XMLHttpRequestTestBeans.xml
index 41223e6..f87e9b7 100644
--- a/rt/javascript/javascript-tests/src/test/resources/XMLHttpRequestTestBeans.xml
+++ b/rt/javascript/javascript-tests/src/test/resources/XMLHttpRequestTestBeans.xml
@@ -25,7 +25,7 @@
                     <property name="handler">
                         <bean class="org.eclipse.jetty.server.handler.ResourceHandler">
                             <property name="baseResource">
-                                <bean class="org.eclipse.jetty.util.resource.FileResource">
+                                <bean class="org.eclipse.jetty.util.resource.PathResource">
                                     <constructor-arg value="${staticResourceURL}"/>
                                 </bean>
                             </property>

http://git-wip-us.apache.org/repos/asf/cxf/blob/e3abb5e1/rt/javascript/javascript-tests/src/test/resources/org/apache/cxf/javascript/RPCTests.js
----------------------------------------------------------------------
diff --git a/rt/javascript/javascript-tests/src/test/resources/org/apache/cxf/javascript/RPCTests.js
b/rt/javascript/javascript-tests/src/test/resources/org/apache/cxf/javascript/RPCTests.js
index d875196..368f9f2 100644
--- a/rt/javascript/javascript-tests/src/test/resources/org/apache/cxf/javascript/RPCTests.js
+++ b/rt/javascript/javascript-tests/src/test/resources/org/apache/cxf/javascript/RPCTests.js
@@ -67,3 +67,5 @@ function simpleTest(url, p1, p2)
 	return globalNotifier;
 }
 
+
+

http://git-wip-us.apache.org/repos/asf/cxf/blob/e3abb5e1/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/BeanDefinitionParsersTest.java
----------------------------------------------------------------------
diff --git a/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/BeanDefinitionParsersTest.java
b/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/BeanDefinitionParsersTest.java
deleted file mode 100644
index 07e573b..0000000
--- a/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/BeanDefinitionParsersTest.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/**
- * 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.cxf.transport.http_jetty.spring;
-
-
-import org.w3c.dom.Document;
-
-import org.apache.cxf.staxutils.StaxUtils;
-import org.apache.cxf.transport.http.spring.HttpConduitBeanDefinitionParser;
-import org.apache.cxf.transport.http.spring.HttpDestinationBeanDefinitionParser;
-import org.apache.cxf.transports.http.configuration.HTTPClientPolicy;
-import org.apache.cxf.transports.http.configuration.HTTPServerPolicy;
-
-import org.junit.Assert;
-import org.junit.Test;
-
-import org.springframework.beans.PropertyValue;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-
-@org.junit.Ignore("Not valid as the parser shouldn't be generating the beans themselves,
thats the"
-                  + "job of the factory later on.  Need to update this test to do that.")
-public class BeanDefinitionParsersTest extends Assert {
-    @Test
-    public void testDest()throws Exception {
-        BeanDefinitionBuilder bd = BeanDefinitionBuilder.childBeanDefinition("child");
-
-        HttpDestinationBeanDefinitionParser parser = new HttpDestinationBeanDefinitionParser();
-
-        Document d = StaxUtils.read(getClass().getResourceAsStream("destination.xml"));
-        parser.doParse(d.getDocumentElement(), null, bd);
-
-        PropertyValue[] pvs = bd.getRawBeanDefinition().getPropertyValues().getPropertyValues();
-        assertEquals(2, pvs.length);
-        assertEquals("foobar", ((HTTPServerPolicy) pvs[0].getValue()).getContentEncoding());
-        assertEquals("exact", pvs[1].getValue());
-    }
-
-    @Test
-    public void testConduit()throws Exception {
-        BeanDefinitionBuilder bd = BeanDefinitionBuilder.childBeanDefinition("child");
-
-        HttpConduitBeanDefinitionParser parser = new HttpConduitBeanDefinitionParser();
-
-        Document d = StaxUtils.read(getClass().getResourceAsStream("conduit.xml"));
-        parser.doParse(d.getDocumentElement(), null, bd);
-
-        PropertyValue[] pvs = bd.getRawBeanDefinition().getPropertyValues().getPropertyValues();
-        assertEquals(1, pvs.length);
-        assertEquals(97, ((HTTPClientPolicy) pvs[0].getValue()).getConnectionTimeout(), 0);
-    }
-
-
-}

http://git-wip-us.apache.org/repos/asf/cxf/blob/e3abb5e1/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/uri/URIConfiguredConduitTest.java
----------------------------------------------------------------------
diff --git a/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/uri/URIConfiguredConduitTest.java
b/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/uri/URIConfiguredConduitTest.java
index efd6976..e270c09 100644
--- a/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/uri/URIConfiguredConduitTest.java
+++ b/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/uri/URIConfiguredConduitTest.java
@@ -45,7 +45,8 @@ import org.junit.Test;
  */
 public class URIConfiguredConduitTest {
     private static final String SERVICE_QUEUE = "test";
-    private static final String BROKER_URI = "vm://URIConfiguredConduitTest?broker.persistent=false";
+    private static final String BROKER_URI 
+        = "vm://URIConfiguredConduitTest?broker.persistent=false&broker.useJmx=false";
     private static ConnectionFactory cf;
 
     private enum SyncType {
@@ -58,9 +59,7 @@ public class URIConfiguredConduitTest {
         cf = new ActiveMQConnectionFactory(BROKER_URI);
     }
 
-    // @Ignoring due to continually failing on Jenkins
     @Test
-    @org.junit.Ignore
     public void testSendReceive() throws Exception {
         sendAndReceive(SyncType.sync,
                        "jms:jndi:dynamicQueues/"

http://git-wip-us.apache.org/repos/asf/cxf/blob/e3abb5e1/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/LocatorClientServerTest.java
----------------------------------------------------------------------
diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/LocatorClientServerTest.java
b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/LocatorClientServerTest.java
index 824ac86..8c73622 100644
--- a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/LocatorClientServerTest.java
+++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/LocatorClientServerTest.java
@@ -24,7 +24,6 @@ import java.util.logging.Logger;
 
 import javax.xml.namespace.QName;
 import javax.xml.ws.Endpoint;
-import javax.xml.ws.Holder;
 import javax.xml.ws.wsaddressing.W3CEndpointReference;
 import javax.xml.ws.wsaddressing.W3CEndpointReferenceBuilder;
 
@@ -33,7 +32,6 @@ import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
 import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
 import org.apache.locator.LocatorService;
 import org.apache.locator.LocatorService_Service;
-import org.apache.locator.types.QueryEndpoints;
 
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -72,39 +70,6 @@ public class LocatorClientServerTest extends AbstractBusClientServerTestBase
{
     }
 
     @Test
-    @org.junit.Ignore("not legal if serviceName, portName, address all NULL")
-    public void testLocatorService() throws Exception {
-        URL wsdl = getClass().getResource("/wsdl/locator.wsdl");
-        assertNotNull(wsdl);
-
-        LocatorService_Service ss = new LocatorService_Service(wsdl, serviceName);
-        LocatorService port = ss.getLocatorServicePort();
-        updateAddressPort(port, PORT);
-        W3CEndpointReferenceBuilder builder = new  W3CEndpointReferenceBuilder();
-        W3CEndpointReference w3cEpr = builder.build();
-        port.registerPeerManager(w3cEpr,
-                                 new Holder<W3CEndpointReference>(),
-                                 new Holder<java.lang.String>());
-
-        port.deregisterPeerManager(new java.lang.String());
-
-
-        port.registerEndpoint(null, w3cEpr);
-
-
-        port.deregisterEndpoint(null, w3cEpr);
-
-
-
-        port.lookupEndpoint(new javax.xml.namespace.QName("", ""));
-
-        port.listEndpoints();
-
-        port.queryEndpoints(new QueryEndpoints());
-
-    }
-
-    @Test
     public void testLookupEndpointAndVerifyWsdlLocationAndNamespace() throws Exception {
         URL wsdl = getClass().getResource("/wsdl/locator.wsdl");
         assertNotNull(wsdl);
@@ -131,7 +96,6 @@ public class LocatorClientServerTest extends AbstractBusClientServerTestBase
{
         W3CEndpointReference epr = port.lookupEndpoint(new QName("http://service/2", "Number"));
         String eprString = epr.toString();
         assertTrue(eprString.contains("Metadata"));
-        System.out.println(eprString);
         assertTrue(eprString.contains("wsdlLocation=\"wsdlLoc\""));
     }
 


Mime
View raw message