You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by mm...@apache.org on 2007/04/30 14:18:52 UTC
svn commit: r533719 - in /incubator/cxf/trunk:
rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/
rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/header/
systests/src/test/java/org/apache/cxf/systest/jms/
tools/common/src/main/java/org/apache/c...
Author: mmao
Date: Mon Apr 30 05:18:51 2007
New Revision: 533719
URL: http://svn.apache.org/viewvc?view=rev&rev=533719
Log:
Fix the JavaModel, Reopen all ignored tests in the last commit
Modified:
incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/HeaderTest.java
incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/header/HeaderClientServerTest.java
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jms/JMSClientServerTest.java
incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaField.java
incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaType.java
Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/HeaderTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/HeaderTest.java?view=diff&rev=533719&r1=533718&r2=533719
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/HeaderTest.java (original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/HeaderTest.java Mon Apr 30 05:18:51 2007
@@ -40,7 +40,6 @@
public class HeaderTest extends AbstractJaxWsTest {
@Test
- @org.junit.Ignore
public void testInvocation() throws Exception {
JaxWsServiceFactoryBean bean = new JaxWsServiceFactoryBean();
Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/header/HeaderClientServerTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/header/HeaderClientServerTest.java?view=diff&rev=533719&r1=533718&r2=533719
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/header/HeaderClientServerTest.java (original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/header/HeaderClientServerTest.java Mon Apr 30 05:18:51 2007
@@ -53,7 +53,6 @@
import org.apache.tests.type_test.choice.SimpleChoice;
import org.apache.tests.type_test.sequence.SimpleStruct;
import org.junit.Before;
-import org.junit.Ignore;
import org.junit.Test;
@@ -81,7 +80,6 @@
}
@Test
- @Ignore
public void testInHeader() throws Exception {
URL wsdl = getClass().getResource("/wsdl/soapheader.wsdl");
assertNotNull(wsdl);
@@ -102,7 +100,6 @@
}
@Test
- @Ignore
public void testOutHeader() throws Exception {
URL wsdl = getClass().getResource("/wsdl/soapheader.wsdl");
assertNotNull(wsdl);
@@ -130,7 +127,6 @@
}
@Test
- @Ignore
public void testInOutHeader() throws Exception {
URL wsdl = getClass().getResource("/wsdl/soapheader.wsdl");
assertNotNull(wsdl);
@@ -167,7 +163,6 @@
}
@Test
- @Ignore
public void testReturnHeader() throws Exception {
URL wsdl = getClass().getResource("/wsdl/soapheader.wsdl");
assertNotNull(wsdl);
@@ -193,7 +188,6 @@
}
@Test
- @Ignore
public void testHeaderPartBeforeBodyPart() throws Exception {
URL wsdl = getClass().getResource("/wsdl/soapheader.wsdl");
assertNotNull(wsdl);
@@ -226,7 +220,6 @@
}
@Test
- @Ignore
public void testHeader4() {
URL wsdl = getClass().getResource("/wsdl/soapheader.wsdl");
assertNotNull(wsdl);
@@ -243,7 +236,6 @@
}
@Test
- @Ignore
public void testRPCInHeader() throws Exception {
URL wsdl = getClass().getResource("/wsdl/soapheader_rpc.wsdl");
assertNotNull(wsdl);
@@ -268,7 +260,6 @@
}
@Test
- @Ignore
public void testRPCInOutHeader() throws Exception {
URL wsdl = getClass().getResource("/wsdl/soapheader_rpc.wsdl");
assertNotNull(wsdl);
@@ -298,7 +289,6 @@
@Test
- @Ignore
public void testHolderOutIsTheFirstMessagePart() throws Exception {
URL wsdl = getClass().getResource("/wsdl/soapheader.wsdl");
assertNotNull(wsdl);
Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jms/JMSClientServerTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jms/JMSClientServerTest.java?view=diff&rev=533719&r1=533718&r2=533719
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jms/JMSClientServerTest.java (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jms/JMSClientServerTest.java Mon Apr 30 05:18:51 2007
@@ -43,7 +43,7 @@
import org.apache.hello_world_doc_lit.Greeter;
import org.apache.hello_world_doc_lit.PingMeFault;
import org.apache.hello_world_doc_lit.SOAPService2;
-//import org.junit.BeforeClass;
+import org.junit.BeforeClass;
import org.junit.Test;
public class JMSClientServerTest extends AbstractBusClientServerTestBase {
@@ -51,7 +51,7 @@
private QName serviceName;
private QName portName;
- @org.junit.Ignore
+ @BeforeClass
public static void startServers() throws Exception {
Map<String, String> props = new HashMap<String, String>();
if (System.getProperty("activemq.store.dir") != null) {
@@ -68,7 +68,6 @@
}
@Test
- @org.junit.Ignore
public void testDocBasicConnection() throws Exception {
serviceName = new QName("http://apache.org/hello_world_doc_lit",
"SOAPService2");
@@ -107,7 +106,6 @@
}
@Test
- @org.junit.Ignore
public void testBasicConnection() throws Exception {
serviceName = new QName("http://cxf.apache.org/hello_world_jms",
"HelloWorldService");
@@ -153,7 +151,6 @@
}
@Test
- @org.junit.Ignore
public void testOneWayTopicConnection() throws Exception {
serviceName = new QName("http://cxf.apache.org/hello_world_jms",
"HelloWorldPubSubService");
@@ -178,7 +175,6 @@
}
@Test
- @org.junit.Ignore
public void testOneWayQueueConnection() throws Exception {
serviceName = new QName("http://cxf.apache.org/hello_world_jms",
"HelloWorldOneWayQueueService");
@@ -203,7 +199,6 @@
}
@Test
- @org.junit.Ignore
public void testContextPropogation() throws Exception {
final String testReturnPropertyName = "Test_Prop";
final String testIgnoredPropertyName = "Test_Prop_No_Return";
Modified: incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaField.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaField.java?view=diff&rev=533719&r1=533718&r2=533719
==============================================================================
--- incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaField.java (original)
+++ incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaField.java Mon Apr 30 05:18:51 2007
@@ -19,6 +19,8 @@
package org.apache.cxf.tools.common.model;
+import org.apache.cxf.tools.util.URIParserUtil;
+
public class JavaField extends JavaType implements JavaAnnotatable {
private String modifier;
private JavaAnnotation annotation;
@@ -50,4 +52,12 @@
public void annotate(Annotator annotator) {
annotator.annotate(this);
}
+
+ public String getName() {
+ if (URIParserUtil.containsReservedKeywords(this.name)) {
+ return "_" + this.name;
+ }
+ return this.name;
+ }
+
}
Modified: incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaType.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaType.java?view=diff&rev=533719&r1=533718&r2=533719
==============================================================================
--- incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaType.java (original)
+++ incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaType.java Mon Apr 30 05:18:51 2007
@@ -25,7 +25,6 @@
import javax.xml.namespace.QName;
import com.sun.xml.bind.api.TypeReference;
-import org.apache.cxf.tools.util.URIParserUtil;
public class JavaType {
@@ -134,9 +133,6 @@
}
public String getName() {
- if (URIParserUtil.containsReservedKeywords(this.name)) {
- return "_" + this.name;
- }
return this.name;
}