You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2007/04/11 21:19:38 UTC
svn commit: r527617 - in /incubator/cxf/trunk:
buildtools/src/main/resources/ rt/databinding/aegis/
rt/databinding/aegis/src/main/appended-resources/
rt/databinding/aegis/src/main/appended-resources/META-INF/
rt/databinding/aegis/src/main/generated/ rt...
Author: dkulp
Date: Wed Apr 11 12:19:35 2007
New Revision: 527617
URL: http://svn.apache.org/viewvc?view=rev&rev=527617
Log:
Update tools tests to be JUnit 4 and put @Ignore flags on disabled/not working tests
Update Aegis to be checkstyle compliant
Add extra NOTICE stuff for Aegis
Added:
incubator/cxf/trunk/rt/databinding/aegis/src/main/appended-resources/
incubator/cxf/trunk/rt/databinding/aegis/src/main/appended-resources/META-INF/
incubator/cxf/trunk/rt/databinding/aegis/src/main/appended-resources/META-INF/NOTICE (with props)
incubator/cxf/trunk/rt/databinding/aegis/src/main/generated/
incubator/cxf/trunk/rt/databinding/aegis/src/main/generated/org/
incubator/cxf/trunk/rt/databinding/aegis/src/main/generated/org/apache/
incubator/cxf/trunk/rt/databinding/aegis/src/main/generated/org/apache/cxf/
incubator/cxf/trunk/rt/databinding/aegis/src/main/generated/org/apache/cxf/aegis/
incubator/cxf/trunk/rt/databinding/aegis/src/main/generated/org/apache/cxf/aegis/util/
incubator/cxf/trunk/rt/databinding/aegis/src/main/generated/org/apache/cxf/aegis/util/jdom/
incubator/cxf/trunk/rt/databinding/aegis/src/main/generated/org/apache/cxf/aegis/util/jdom/StaxBuilder.java
- copied unchanged from r527513, incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/jdom/StaxBuilder.java
incubator/cxf/trunk/rt/databinding/aegis/src/main/resources/
incubator/cxf/trunk/rt/databinding/aegis/src/main/resources/META-INF/
incubator/cxf/trunk/rt/databinding/aegis/src/main/resources/META-INF/NOTICE.jdom (with props)
Removed:
incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/jdom/StaxBuilder.java
Modified:
incubator/cxf/trunk/buildtools/src/main/resources/notice-supplements.xml
incubator/cxf/trunk/rt/databinding/aegis/pom.xml
incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/date/XsDateTimeFormat.java
incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/ProcessorTestBase.java
incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToProcessorTest.java
incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToWSDLNoAnnoTest.java
incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToWSDLProcessorTest.java
incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderNoAnnoTest.java
incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderTest.java
incubator/cxf/trunk/tools/wsdlto/misc/src/test/java/org/apache/cxf/tools/misc/processor/WSDLToServiceProcessorTest.java
incubator/cxf/trunk/tools/wsdlto/misc/src/test/java/org/apache/cxf/tools/misc/processor/WSDLToSoapProcessorTest.java
incubator/cxf/trunk/tools/wsdlto/misc/src/test/java/org/apache/cxf/tools/misc/processor/WSDLToXMLProcessorTest.java
incubator/cxf/trunk/tools/wsdlto/misc/src/test/java/org/apache/cxf/tools/misc/processor/XSDToWSDLProcessorTest.java
incubator/cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java
incubator/cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenOptionTest.java
incubator/cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java
incubator/cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/validator/ValidatorTest.java
Modified: incubator/cxf/trunk/buildtools/src/main/resources/notice-supplements.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/buildtools/src/main/resources/notice-supplements.xml?view=diff&rev=527617&r1=527616&r2=527617
==============================================================================
--- incubator/cxf/trunk/buildtools/src/main/resources/notice-supplements.xml (original)
+++ incubator/cxf/trunk/buildtools/src/main/resources/notice-supplements.xml Wed Apr 11 12:19:35 2007
@@ -1,86 +1,83 @@
<?xml version="1.0" encoding="UTF-8"?>
<supplementalDataModels>
- <supplements>
- <supplement>
- <project>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- <name>Sun JAXB Reference Implementation Runtime</name>
- <organization>
- <name>Sun Microsystems</name>
- <url>http://www.sun.com/</url>
- </organization>
- <licenses>
- <license>
- <name>COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0</name>
- <url>http://www.sun.com/cddl/cddl.html</url>
- </license>
- </licenses>
- </project>
+ <supplement>
+ <project>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <name>Sun JAXB Reference Implementation Runtime</name>
+ <organization>
+ <name>Sun Microsystems</name>
+ <url>http://www.sun.com/</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0</name>
+ <url>http://www.sun.com/cddl/cddl.html</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-xjc</artifactId>
+ <name>Sun JAXB Reference Implementation Tools</name>
+ <organization>
+ <name>Sun Microsystems</name>
+ <url>http://www.sun.com/</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0</name>
+ <url>http://www.sun.com/cddl/cddl.html</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>com.sun.xml.messaging.saaj</groupId>
+ <artifactId>saaj-impl</artifactId>
+ <name>Sun SAAJ Reference Implementation</name>
+ <organization>
+ <name>Sun Microsystems</name>
+ <url>http://www.sun.com/</url>
+ </organization>
+ </project>
+ </supplement>
- </supplement>
- <supplement>
- <project>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-xjc</artifactId>
- <name>Sun JAXB Reference Implementation Tools</name>
- <organization>
- <name>Sun Microsystems</name>
- <url>http://www.sun.com/</url>
- </organization>
- <licenses>
- <license>
- <name>COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0</name>
- <url>http://www.sun.com/cddl/cddl.html</url>
- </license>
- </licenses>
- </project>
- </supplement>
- <supplement>
- <project>
- <groupId>com.sun.xml.messaging.saaj</groupId>
- <artifactId>saaj-impl</artifactId>
- <name>Sun SAAJ Reference Implementation</name>
- <organization>
- <name>Sun Microsystems</name>
- <url>http://www.sun.com/</url>
- </organization>
- </project>
- </supplement>
-
- <supplement>
- <project>
- <groupId>javax.xml.ws</groupId>
- <artifactId>jaxws-api</artifactId>
- <name>Java API for XML-Based Web Services (JAX-WS API)</name>
- <organization>
- <name>Sun Microsystems</name>
- <url>http://www.sun.com/</url>
- </organization>
- <licenses>
- <license>
- <name>COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0</name>
- <url>http://www.sun.com/cddl/cddl.html</url>
- </license>
- </licenses>
- </project>
- </supplement>
- <supplement>
- <project>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <name>Java Architecture for XML Binding (JAXB API)</name>
- <organization>
- <name>Sun Microsystems</name>
- <url>http://www.sun.com/</url>
- </organization>
- <licenses>
- <license>
- <name>COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0</name>
- <url>http://www.sun.com/cddl/cddl.html</url>
- </license>
- </licenses>
- </project>
- </supplement>
- </supplements>
+ <supplement>
+ <project>
+ <groupId>javax.xml.ws</groupId>
+ <artifactId>jaxws-api</artifactId>
+ <name>Java API for XML-Based Web Services (JAX-WS API)</name>
+ <organization>
+ <name>Sun Microsystems</name>
+ <url>http://www.sun.com/</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0</name>
+ <url>http://www.sun.com/cddl/cddl.html</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <name>Java Architecture for XML Binding (JAXB API)</name>
+ <organization>
+ <name>Sun Microsystems</name>
+ <url>http://www.sun.com/</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0</name>
+ <url>http://www.sun.com/cddl/cddl.html</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
</supplementalDataModels>
Modified: incubator/cxf/trunk/rt/databinding/aegis/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/pom.xml?view=diff&rev=527617&r1=527616&r2=527617
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/pom.xml (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/pom.xml Wed Apr 11 12:19:35 2007
@@ -41,6 +41,11 @@
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-simple</artifactId>
<version>${project.version}</version>
</dependency>
@@ -122,37 +127,24 @@
</dependency>
</dependencies>
- <repositories>
- <repository>
- <id>codehaus</id>
- <name>Codehaus</name>
- <url>http://repository.codehaus.org</url>
- </repository>
- </repositories>
-
<build>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <dependencies>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-buildtools</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.0</version>
<executions>
<execution>
- <id>validate</id>
- <phase>validate</phase>
- <configuration>
- <failsOnError>false</failsOnError>
- <consoleOutput>false</consoleOutput>
- </configuration>
+ <id>add-source</id>
+ <phase>generate-sources</phase>
<goals>
- <goal>checkstyle</goal>
+ <goal>add-source</goal>
</goals>
+ <configuration>
+ <sources>
+ <source>${basedir}/src/main/generated</source>
+ </sources>
+ </configuration>
</execution>
</executions>
</plugin>
Added: incubator/cxf/trunk/rt/databinding/aegis/src/main/appended-resources/META-INF/NOTICE
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/main/appended-resources/META-INF/NOTICE?view=auto&rev=527617
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/main/appended-resources/META-INF/NOTICE (added)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/main/appended-resources/META-INF/NOTICE Wed Apr 11 12:19:35 2007
@@ -0,0 +1,7 @@
+
+The product contains code (StaxBuilder.java) that is
+ Copyright (C) 2000-2004 Jason Hunter & Brett McLaughlin.
+ All rights reserved.
+ See the NOTICE.jdom file for additional information
+
+
Propchange: incubator/cxf/trunk/rt/databinding/aegis/src/main/appended-resources/META-INF/NOTICE
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/cxf/trunk/rt/databinding/aegis/src/main/appended-resources/META-INF/NOTICE
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/date/XsDateTimeFormat.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/date/XsDateTimeFormat.java?view=diff&rev=527617&r1=527616&r2=527617
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/date/XsDateTimeFormat.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/date/XsDateTimeFormat.java Wed Apr 11 12:19:35 2007
@@ -24,6 +24,10 @@
import java.util.Calendar;
import java.util.TimeZone;
+import javax.xml.datatype.DatatypeConfigurationException;
+import javax.xml.datatype.DatatypeFactory;
+import javax.xml.datatype.XMLGregorianCalendar;
+
/**
* <p>
* An instance of {@link java.text.Format}, which may be used to parse and
@@ -49,20 +53,6 @@
this(true, true);
}
- private int parseInt(String pString, int pOffset, StringBuffer pDigits) {
- int length = pString.length();
- pDigits.setLength(0);
- while (pOffset < length) {
- char c = pString.charAt(pOffset);
- if (Character.isDigit(c)) {
- pDigits.append(c);
- ++pOffset;
- } else {
- break;
- }
- }
- return pOffset;
- }
public Object parseObject(String pString, ParsePosition pParsePosition) {
if (pString == null) {
@@ -72,166 +62,31 @@
throw new NullPointerException("The ParsePosition argument must not be null.");
}
int offset = pParsePosition.getIndex();
- int length = pString.length();
+ int idxSpc = pString.indexOf(' ', offset);
+ int idxCom = pString.indexOf(',', offset);
- boolean isMinus = false;
- StringBuffer digits = new StringBuffer();
- int year;
- int month;
- int mday;
- if (parseDate) {
- // Sign
- if (offset < length) {
- char c = pString.charAt(offset);
- if (c == '+') {
- ++offset;
- } else if (c == '-') {
- ++offset;
- isMinus = true;
- }
- }
-
- offset = parseInt(pString, offset, digits);
- if (digits.length() < 4) {
- pParsePosition.setErrorIndex(offset);
- return null;
- }
- year = Integer.parseInt(digits.toString());
-
- if (offset < length && pString.charAt(offset) == '-') {
- ++offset;
- } else {
- pParsePosition.setErrorIndex(offset);
- return null;
- }
-
- offset = parseInt(pString, offset, digits);
- if (digits.length() != 2) {
- pParsePosition.setErrorIndex(offset);
- return null;
- }
- month = Integer.parseInt(digits.toString());
-
- if (offset < length && pString.charAt(offset) == '-') {
- ++offset;
- } else {
- pParsePosition.setErrorIndex(offset);
- return null;
- }
-
- offset = parseInt(pString, offset, digits);
- if (digits.length() != 2) {
- pParsePosition.setErrorIndex(offset);
- return null;
- }
- mday = Integer.parseInt(digits.toString());
-
- if (parseTime) {
- if (offset < length && pString.charAt(offset) == 'T') {
- ++offset;
- } else {
- pParsePosition.setErrorIndex(offset);
- return null;
- }
- }
- } else {
- year = 0;
- month = 0;
- mday = 0;
+ if (idxCom != -1 && idxCom < idxSpc) {
+ idxSpc = idxCom;
}
-
- int hour;
- int minute;
- int second;
- int millis;
- if (parseTime) {
- offset = parseInt(pString, offset, digits);
- if (digits.length() != 2) {
- pParsePosition.setErrorIndex(offset);
- return null;
- }
- hour = Integer.parseInt(digits.toString());
-
- if (offset < length && pString.charAt(offset) == ':') {
- ++offset;
- } else {
- pParsePosition.setErrorIndex(offset);
- return null;
- }
-
- offset = parseInt(pString, offset, digits);
- if (digits.length() != 2) {
- pParsePosition.setErrorIndex(offset);
- return null;
- }
- minute = Integer.parseInt(digits.toString());
-
- if (offset < length && pString.charAt(offset) == ':') {
- ++offset;
- } else {
- pParsePosition.setErrorIndex(offset);
- return null;
- }
-
- offset = parseInt(pString, offset, digits);
- if (digits.length() != 2) {
- pParsePosition.setErrorIndex(offset);
- return null;
- }
- second = Integer.parseInt(digits.toString());
-
- if (offset < length && pString.charAt(offset) == '.') {
- ++offset;
- offset = parseInt(pString, offset, digits);
- if (digits.length() > 0) {
- int cut = Math.min(3, digits.length());
- millis = Integer.parseInt(digits.substring(0, cut).toString());
- } else {
- millis = 0;
- }
- } else {
- millis = 0;
- }
+ String newVal = null;
+ if (idxSpc == -1) {
+ newVal = pString.substring(offset);
} else {
- hour = 0;
- minute = 0;
- second = 0;
- millis = 0;
+ newVal = pString.substring(offset, idxSpc);
}
-
- digits.setLength(0);
- digits.append("GMT");
- if (offset < length) {
- char c = pString.charAt(offset);
- if (c == 'Z') {
- // Ignore UTC, it is the default
- ++offset;
- } else if (c == '+' || c == '-') {
- digits.append(c);
- ++offset;
- for (int i = 0; i < 5; i++) {
- if (offset >= length) {
- pParsePosition.setErrorIndex(offset);
- return null;
- }
- c = pString.charAt(offset);
- if ((i != 2 && Character.isDigit(c)) || (i == 2 && c == ':')) {
- digits.append(c);
- } else {
- pParsePosition.setErrorIndex(offset);
- return null;
- }
- ++offset;
- }
- }
+ DatatypeFactory factory;
+ try {
+ factory = DatatypeFactory.newInstance();
+ XMLGregorianCalendar cal = factory.newXMLGregorianCalendar(newVal);
+
+ pParsePosition.setIndex(idxSpc);
+ return cal.toGregorianCalendar();
+ } catch (DatatypeConfigurationException e) {
+ pParsePosition.setErrorIndex(offset);
}
-
- Calendar cal = Calendar.getInstance(TimeZone.getTimeZone(digits.toString()));
- cal.set(isMinus ? -year : year, parseDate ? month - 1 : month, mday, hour, minute, second);
- cal.set(Calendar.MILLISECOND, millis);
- pParsePosition.setIndex(offset);
- return cal;
+ return null;
}
+
private void append(StringBuffer pBuffer, int pNum, int pMinLen) {
String s = Integer.toString(pNum);
Added: incubator/cxf/trunk/rt/databinding/aegis/src/main/resources/META-INF/NOTICE.jdom
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/main/resources/META-INF/NOTICE.jdom?view=auto&rev=527617
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/main/resources/META-INF/NOTICE.jdom (added)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/main/resources/META-INF/NOTICE.jdom Wed Apr 11 12:19:35 2007
@@ -0,0 +1,49 @@
+ Copyright (C) 2000-2004 Jason Hunter & Brett McLaughlin.
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ 1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions, and the disclaimer that follows
+ these conditions in the documentation and/or other materials
+ provided with the distribution.
+
+ 3. The name "JDOM" must not be used to endorse or promote products
+ derived from this software without prior written permission. For
+ written permission, please contact <request_AT_jdom_DOT_org>.
+
+ 4. Products derived from this software may not be called "JDOM", nor
+ may "JDOM" appear in their name, without prior written permission
+ from the JDOM Project Management <request_AT_jdom_DOT_org>.
+
+ In addition, we request (but do not require) that you include in the
+ end-user documentation provided with the redistribution and/or in the
+ software itself an acknowledgement equivalent to the following:
+ "This product includes software developed by the
+ JDOM Project (http://www.jdom.org/)."
+ Alternatively, the acknowledgment may be graphical using the logos
+ available at http://www.jdom.org/images/logos.
+
+ THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL THE JDOM AUTHORS OR THE PROJECT
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGE.
+
+ This software consists of voluntary contributions made by many
+ individuals on behalf of the JDOM Project and was originally
+ created by Jason Hunter <jhunter_AT_jdom_DOT_org> and
+ Brett McLaughlin <brett_AT_jdom_DOT_org>. For more information
+ on the JDOM Project, please see <http://www.jdom.org/>.
Propchange: incubator/cxf/trunk/rt/databinding/aegis/src/main/resources/META-INF/NOTICE.jdom
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/cxf/trunk/rt/databinding/aegis/src/main/resources/META-INF/NOTICE.jdom
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/ProcessorTestBase.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/ProcessorTestBase.java?view=diff&rev=527617&r1=527616&r2=527617
==============================================================================
--- incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/ProcessorTestBase.java (original)
+++ incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/ProcessorTestBase.java Wed Apr 11 12:19:35 2007
@@ -29,14 +29,17 @@
import java.net.URLClassLoader;
import java.util.StringTokenizer;
-import junit.framework.TestCase;
import org.apache.cxf.helpers.FileUtils;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
-public class ProcessorTestBase extends TestCase {
+public class ProcessorTestBase extends Assert {
protected ToolContext env = new ToolContext();
protected File output;
+ @Before
public void setUp() throws Exception {
URL url = getClass().getResource(".");
output = new File(url.toURI());
@@ -44,6 +47,8 @@
FileUtils.mkDir(output);
}
+
+ @After
public void tearDown() {
FileUtils.removeDir(output);
output = null;
Modified: incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToProcessorTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToProcessorTest.java?view=diff&rev=527617&r1=527616&r2=527617
==============================================================================
--- incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToProcessorTest.java (original)
+++ incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToProcessorTest.java Wed Apr 11 12:19:35 2007
@@ -30,24 +30,19 @@
import org.apache.cxf.tools.common.ToolConstants;
import org.apache.cxf.tools.common.ToolContext;
import org.apache.cxf.tools.common.WSDLConstants;
+import org.junit.Test;
public class JavaToProcessorTest extends ProcessorTestBase {
JavaToProcessor processor = new JavaToProcessor();
private WSDLHelper wsdlHelper = new WSDLHelper();
-
- public void setUp() throws Exception {
- super.setUp();
- }
-
- public void tearDown() {
- super.tearDown();
- }
-
+
+ @Test
public void testGetWSDLVersion() {
processor.setEnvironment(new ToolContext());
assertEquals(WSDLConstants.WSDLVersion.WSDL11, processor.getWSDLVersion());
}
+ @Test
public void testSimpleClass() throws Exception {
ToolContext context = new ToolContext();
context.put(ToolConstants.CFG_OUTPUTFILE, output.getPath() + "/doc_wrapped_bare.wsdl");
@@ -66,6 +61,7 @@
}
+ @Test
public void testCalculator() throws Exception {
ToolContext context = new ToolContext();
context.put(ToolConstants.CFG_OUTPUTFILE, output.getPath() + "/calculator_rpc.wsdl");
Modified: incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToWSDLNoAnnoTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToWSDLNoAnnoTest.java?view=diff&rev=527617&r1=527616&r2=527617
==============================================================================
--- incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToWSDLNoAnnoTest.java (original)
+++ incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToWSDLNoAnnoTest.java Wed Apr 11 12:19:35 2007
@@ -21,23 +21,30 @@
import org.apache.cxf.tools.common.ProcessorTestBase;
import org.apache.cxf.tools.common.ToolConstants;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
public class JavaToWSDLNoAnnoTest extends ProcessorTestBase {
private JavaToWSDLProcessor j2wProcessor;
+ @Before
public void setUp() throws Exception {
super.setUp();
j2wProcessor = new JavaToWSDLProcessor();
System.setProperty("java.class.path", getClassPath());
}
+
+ @After
public void tearDown() {
super.tearDown();
j2wProcessor = null;
}
+ @Test
public void testGeneratedWithElementryClass() throws Exception {
env.put(ToolConstants.CFG_OUTPUTFILE, output.getPath() + "/doc_bare.wsdl");
env.put(ToolConstants.CFG_CLASSNAME, "org.apache.cxf.tools.fortest.classnoanno.docbare.Stock");
@@ -47,6 +54,7 @@
}
+ @Test
public void testGeneratedWithDocWrappedClass() throws Exception {
env.put(ToolConstants.CFG_OUTPUTFILE, output.getPath() + "/doc_wrapped.wsdl");
env.put(ToolConstants.CFG_CLASSNAME,
@@ -57,6 +65,7 @@
}
+ @Test
public void testGeneratedWithRPCClass() throws Exception {
env.put(ToolConstants.CFG_OUTPUTFILE, output.getPath() + "/rpc.wsdl");
env.put(ToolConstants.CFG_CLASSNAME, "org.apache.cxf.tools.fortest.classnoanno.rpc.Stock");
Modified: incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToWSDLProcessorTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToWSDLProcessorTest.java?view=diff&rev=527617&r1=527616&r2=527617
==============================================================================
--- incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToWSDLProcessorTest.java (original)
+++ incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToWSDLProcessorTest.java Wed Apr 11 12:19:35 2007
@@ -51,6 +51,9 @@
import org.apache.cxf.tools.wsdlto.core.FrontEndProfile;
import org.apache.cxf.tools.wsdlto.core.PluginLoader;
import org.apache.cxf.tools.wsdlto.frontend.jaxws.JAXWSContainer;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
public class JavaToWSDLProcessorTest extends ProcessorTestBase {
@@ -61,6 +64,7 @@
private WSDLHelper wsdlHelper = new WSDLHelper();
private File classFile;
+ @Before
public void setUp() throws Exception {
super.setUp();
j2wProcessor = new JavaToWSDLProcessor();
@@ -73,13 +77,15 @@
env.put(DataBindingProfile.class, PluginLoader.getInstance().getDataBindingProfile("jaxb"));
}
+ @After
public void tearDown() {
super.tearDown();
j2wProcessor = null;
wj2Processor = null;
}
- public void testAsyn() throws Exception {
+ @Test
+ public void testAsync() throws Exception {
env.put(ToolConstants.CFG_COMPILE, "compile");
env.put(ToolConstants.CFG_OUTPUTDIR, output.getCanonicalPath());
@@ -107,6 +113,7 @@
}
+ @Test
public void testDocWrapparBare() throws Exception {
env.put(ToolConstants.CFG_COMPILE, "compile");
env.put(ToolConstants.CFG_OUTPUTDIR, output.getCanonicalPath());
@@ -134,6 +141,7 @@
}
+ @Test
public void testDocLitUseClassPathFlag() throws Exception {
env.put(ToolConstants.CFG_COMPILE, "compile");
env.put(ToolConstants.CFG_OUTPUTDIR, output.getCanonicalPath());
@@ -162,6 +170,7 @@
}
+ @Test
public void testRPCLit() throws Exception {
env.put(ToolConstants.CFG_COMPILE, "compile");
env.put(ToolConstants.CFG_OUTPUTDIR, output.getCanonicalPath());
@@ -214,6 +223,7 @@
}
}
+ @Test
public void testSOAP12() throws Exception {
env.put(ToolConstants.CFG_COMPILE, "compile");
env.put(ToolConstants.CFG_OUTPUTDIR, output.getCanonicalPath());
@@ -265,6 +275,7 @@
}
}
+ @Test
public void testRPCWithoutParentBindingAnnotation() throws Exception {
env.put(ToolConstants.CFG_OUTPUTFILE, output.getPath() + "/rpc_lit_service_no_anno.wsdl");
env.put(ToolConstants.CFG_CLASSNAME, "org.apache.cxf.tools.fortest.withannotation.rpc.Hello");
@@ -295,6 +306,7 @@
}
}
+ @Test
public void testDocWrappedWithoutWrapperClass() {
env.put(ToolConstants.CFG_OUTPUTFILE, output.getPath() + "/doc_lit_wrapped_no_anno.wsdl");
env.put(ToolConstants.CFG_CLASSNAME, "org.apache.cxf.tools.fortest.withannotation.doc.HelloWrapped");
@@ -310,6 +322,7 @@
}
}
+ @Test
public void testSOAPBindingRPCOnMethod() {
env.put(ToolConstants.CFG_OUTPUTFILE, output.getPath() + "/rpc_on_method.wsdl");
env.put(ToolConstants.CFG_CLASSNAME,
@@ -327,6 +340,7 @@
}
}
+ @Test
public void testDocWrappedWithLocalName() {
Map<String, String> ns = new HashMap<String, String>();
ns.put("xsd", "http://www.w3.org/2001/XMLSchema");
@@ -352,6 +366,7 @@
}
}
+ @Test
public void testDocWrappedNoWebParam() {
Map<String, String> ns = new HashMap<String, String>();
ns.put("xsd", "http://www.w3.org/2001/XMLSchema");
@@ -375,6 +390,7 @@
}
}
+ @Test
public void testSoapHeader() throws Exception {
Map<String, String> ns = new HashMap<String, String>();
ns.put("wsdl", "http://schemas.xmlsoap.org/wsdl/");
@@ -434,6 +450,7 @@
}
}
+ @Test
public void testCXF188() throws Exception {
env.put(ToolConstants.CFG_OUTPUTFILE, output.getPath() + "/cxf188.wsdl");
env.put(ToolConstants.CFG_CLASSNAME, "org.apache.cxf.tools.fortest.cxf188.Demo");
Modified: incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderNoAnnoTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderNoAnnoTest.java?view=diff&rev=527617&r1=527616&r2=527617
==============================================================================
--- incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderNoAnnoTest.java (original)
+++ incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderNoAnnoTest.java Wed Apr 11 12:19:35 2007
@@ -25,19 +25,20 @@
import org.apache.cxf.service.model.ServiceInfo;
import org.apache.cxf.tools.common.ProcessorTestBase;
import org.apache.cxf.tools.java2wsdl.generator.wsdl11.WSDL11Generator;
+import org.junit.Before;
+import org.junit.Test;
public class JaxwsServiceBuilderNoAnnoTest extends ProcessorTestBase {
JaxwsServiceBuilder builder = new JaxwsServiceBuilder();
WSDL11Generator generator = new WSDL11Generator();
+
+ @Before
public void setUp() throws Exception {
super.setUp();
builder.setBus(BusFactory.getDefaultBus());
}
- public void tearDown() {
- }
-
// Revisit:
// * Missing wsdl:types
// * getPrice MUST refeter to schema element
@@ -45,6 +46,7 @@
// <wsdl:part name="arg0" type="xsd:string"/>
// </wsdl:message>
// CXF-521
+ @Test
public void testGeneratedWithElementryClass() throws Exception {
builder.setServiceClass(org.apache.cxf.tools.fortest.classnoanno.docbare.Stock.class);
ServiceInfo service = builder.build();
@@ -55,6 +57,7 @@
}
// Passed
+ @Test
public void testGeneratedWithDocWrappedClass() throws Exception {
builder.setServiceClass(org.apache.cxf.tools.fortest.classnoanno.docwrapped.Stock.class);
ServiceInfo service = builder.build();
@@ -73,6 +76,7 @@
// * input message of binding operation "getPrice" MUST specify a value for the "namespace" attribute
// * output message of binding operation "getPrice" MUST specify a value for the "namespace" attribute
// CXF-522
+ @Test
public void testGeneratedWithRPCClass() throws Exception {
builder.setServiceClass(org.apache.cxf.tools.fortest.classnoanno.rpc.Stock.class);
ServiceInfo service = builder.build();
Modified: incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderTest.java?view=diff&rev=527617&r1=527616&r2=527617
==============================================================================
--- incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderTest.java (original)
+++ incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderTest.java Wed Apr 11 12:19:35 2007
@@ -29,16 +29,21 @@
import org.apache.cxf.tools.java2wsdl.generator.wsdl11.WSDL11Generator;
import org.apache.cxf.tools.util.AnnotationUtil;
import org.apache.hello_world_rpclit.GreeterRPCLit;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
public class JaxwsServiceBuilderTest extends ProcessorTestBase {
JaxwsServiceBuilder builder = new JaxwsServiceBuilder();
WSDL11Generator generator = new WSDL11Generator();
+ @Before
public void setUp() throws Exception {
super.setUp();
builder.setBus(BusFactory.getDefaultBus());
}
+ @Test
public void testGetOutputFile() {
builder.setServiceClass(Stock.class);
assertNull(builder.getOutputFile());
@@ -49,7 +54,9 @@
assertTrue(expected.equals(builder.getOutputFile()));
}
- public void xtestWrapped() {
+ @Test
+ @Ignore
+ public void testWrapped() {
builder.setServiceClass(org.apache.cxf.tools.fortest.withannotation.doc.Hello.class);
ServiceInfo service = builder.build();
generator.setServiceModel(service);
@@ -60,7 +67,9 @@
}
//FIXME: CXF-519
- public void xtestAsyn() throws Exception {
+ @Test
+ @Ignore
+ public void testAsync() throws Exception {
builder.setServiceClass(org.apache.hello_world_async_soap_http.GreeterAsync.class);
ServiceInfo service = builder.build();
generator.setServiceModel(service);
@@ -74,6 +83,7 @@
assertFileEquals(expectedFile, output.getAbsolutePath());
}
+ @Test
public void testRPCLit() throws Exception {
builder.setServiceClass(GreeterRPCLit.class);
ServiceInfo service = builder.build();
@@ -90,7 +100,9 @@
}
// TODO:
- public void xtestDocWrapparBare() throws Exception {
+ @Test
+ @Ignore
+ public void testDocWrapparBare() throws Exception {
builder.setServiceClass(org.apache.hello_world_doc_wrapped_bare.Greeter.class);
ServiceInfo service = builder.build();
@@ -104,7 +116,9 @@
}
//FIXME: CXF-519
- public void xtestDocLit() throws Exception {
+ @Test
+ @Ignore
+ public void testDocLit() throws Exception {
builder.setServiceClass(org.apache.hello_world_doc_lit.Greeter.class);
ServiceInfo service = builder.build();
generator.setServiceModel(service);
@@ -119,7 +133,9 @@
}
// TODO:
- public void xtestSOAP12() throws Exception {
+ @Test
+ @Ignore
+ public void testSOAP12() throws Exception {
builder.setServiceClass(org.apache.hello_world_soap12_http.Greeter.class);
ServiceInfo service = builder.build();
@@ -132,7 +148,9 @@
}
// TODO:
- public void xtestRPCWithoutParentBindingAnnotation() throws Exception {
+ @Test
+ @Ignore
+ public void testRPCWithoutParentBindingAnnotation() throws Exception {
builder.setServiceClass(org.apache.cxf.tools.fortest.withannotation.rpc.Hello.class);
ServiceInfo service = builder.build();
@@ -145,7 +163,9 @@
}
// TODO:
- public void xtestDocWrappedWithoutWrapperClass() throws Exception {
+ @Test
+ @Ignore
+ public void testDocWrappedWithoutWrapperClass() throws Exception {
builder.setServiceClass(org.apache.cxf.tools.fortest.withannotation.doc.HelloWrapped.class);
ServiceInfo service = builder.build();
@@ -158,7 +178,9 @@
}
// TODO:
- public void xtestSOAPBindingRPCOnMethod() throws Exception {
+ @Test
+ @Ignore
+ public void testSOAPBindingRPCOnMethod() throws Exception {
builder.setServiceClass(org.apache.cxf.tools.fortest.withannotation.rpc.HelloWrongAnnotation.class);
ServiceInfo service = builder.build();
@@ -171,7 +193,9 @@
}
// TODO:
- public void xtestDocWrappedWithLocalName() throws Exception {
+ @Test
+ @Ignore
+ public void testDocWrappedWithLocalName() throws Exception {
builder.setServiceClass(org.apache.cxf.tools.fortest.withannotation.doc.Stock.class);
ServiceInfo service = builder.build();
@@ -184,7 +208,9 @@
}
// TODO:
- public void xtestDocWrappedNoWebParam() throws Exception {
+ @Test
+ @Ignore
+ public void testDocWrappedNoWebParam() throws Exception {
builder.setServiceClass(org.apache.cxf.tools.fortest.withannotation.doc.HelloWithNoWebParam.class);
ServiceInfo service = builder.build();
@@ -196,7 +222,9 @@
}
// TODO:
- public void xtestSoapHeader() throws Exception {
+ @Test
+ @Ignore
+ public void testSoapHeader() throws Exception {
builder.setServiceClass(org.apache.samples.headers.HeaderTester.class);
ServiceInfo service = builder.build();
@@ -210,7 +238,9 @@
}
// TODO:
- public void xtestCXF188() throws Exception {
+ @Test
+ @Ignore
+ public void testCXF188() throws Exception {
Class clz = AnnotationUtil.loadClass("org.apache.cxf.tools.fortest.cxf188.Demo", getClass()
.getClassLoader());
builder.setServiceClass(clz);
Modified: incubator/cxf/trunk/tools/wsdlto/misc/src/test/java/org/apache/cxf/tools/misc/processor/WSDLToServiceProcessorTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/misc/src/test/java/org/apache/cxf/tools/misc/processor/WSDLToServiceProcessorTest.java?view=diff&rev=527617&r1=527616&r2=527617
==============================================================================
--- incubator/cxf/trunk/tools/wsdlto/misc/src/test/java/org/apache/cxf/tools/misc/processor/WSDLToServiceProcessorTest.java (original)
+++ incubator/cxf/trunk/tools/wsdlto/misc/src/test/java/org/apache/cxf/tools/misc/processor/WSDLToServiceProcessorTest.java Wed Apr 11 12:19:35 2007
@@ -32,15 +32,19 @@
import org.apache.cxf.tools.common.ToolException;
import org.apache.cxf.tools.misc.WSDLToService;
import org.apache.cxf.transport.jms.AddressType;
+import org.junit.Before;
+import org.junit.Test;
public class WSDLToServiceProcessorTest extends ProcessorTestBase {
+ @Before
public void setUp() throws Exception {
super.setUp();
env.put(ToolConstants.CFG_OUTPUTDIR, output.getCanonicalPath());
}
+ @Test
public void testNewService() throws Exception {
String[] args = new String[] {"-transport", "http", "-e", "serviceins", "-p", "portins", "-n",
"Greeter_SOAPBinding", "-a",
@@ -87,6 +91,7 @@
}
}
+ @Test
public void testNewServiceSoap12() throws Exception {
String[] args = new String[] {"-soap12", "-transport", "http",
"-e", "SOAPService", "-p", "SoapPort", "-n",
@@ -130,6 +135,7 @@
}
+ @Test
public void testDefaultLocation() throws Exception {
String[] args = new String[] {"-transport", "http", "-e", "serviceins", "-p", "portins", "-n",
@@ -175,6 +181,7 @@
}
}
+ @Test
public void testJMSNewService() throws Exception {
String[] args = new String[] {"-transport", "jms", "-e", "serviceins", "-p", "portins", "-n",
"HelloWorldPortBinding", "-jpu", "tcp://localhost:61616", "-jcf",
@@ -246,6 +253,7 @@
}
}
+ @Test
public void testServiceExist() throws Exception {
WSDLToServiceProcessor processor = new WSDLToServiceProcessor();
@@ -270,6 +278,7 @@
}
}
+ @Test
public void testBindingNotExist() throws Exception {
WSDLToServiceProcessor processor = new WSDLToServiceProcessor();
Modified: incubator/cxf/trunk/tools/wsdlto/misc/src/test/java/org/apache/cxf/tools/misc/processor/WSDLToSoapProcessorTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/misc/src/test/java/org/apache/cxf/tools/misc/processor/WSDLToSoapProcessorTest.java?view=diff&rev=527617&r1=527616&r2=527617
==============================================================================
--- incubator/cxf/trunk/tools/wsdlto/misc/src/test/java/org/apache/cxf/tools/misc/processor/WSDLToSoapProcessorTest.java (original)
+++ incubator/cxf/trunk/tools/wsdlto/misc/src/test/java/org/apache/cxf/tools/misc/processor/WSDLToSoapProcessorTest.java Wed Apr 11 12:19:35 2007
@@ -44,15 +44,19 @@
import org.apache.cxf.tools.common.extensions.soap.SoapOperation;
import org.apache.cxf.tools.misc.WSDLToSoap;
import org.apache.cxf.tools.util.SOAPBindingUtil;
+import org.junit.Before;
+import org.junit.Test;
public class WSDLToSoapProcessorTest extends ProcessorTestBase {
+ @Before
public void setUp() throws Exception {
super.setUp();
env.put(ToolConstants.CFG_OUTPUTDIR, output.getCanonicalPath());
}
+ @Test
public void testDocLitWithFault() throws Exception {
String[] args = new String[] {"-i", "Greeter", "-d", output.getCanonicalPath(),
getLocation("/misctools_wsdl/hello_world_doc_lit.wsdl")};
@@ -128,6 +132,7 @@
}
}
+ @Test
public void testRpcLitWithoutFault() throws Exception {
String[] args = new String[] {"-i", "GreeterRPCLit", "-n",
"http://apache.org/hello_world_rpclit_test", "-b",
@@ -201,6 +206,7 @@
}
}
+ @Test
public void testNewSoap12Binding() throws Exception {
String[] args = new String[] {"-i", "Greeter",
"-soap12",
@@ -268,6 +274,7 @@
}
}
+ @Test
public void testAddSoap12Binding() throws Exception {
String[] args = new String[] {"-i", "Greeter",
"-soap12",
@@ -352,6 +359,7 @@
}
}
+ @Test
public void testPartValidation() throws Exception {
WSDLToSoapProcessor processor = new WSDLToSoapProcessor();
env.put(ToolConstants.CFG_PORTTYPE, "Greeter");
@@ -374,6 +382,7 @@
}
}
+ @Test
public void testWithoutBinding() throws Exception {
String[] args = new String[] {"-i", "Greeter",
"-b", "Greeter_SOAPBinding",
@@ -438,6 +447,7 @@
}
}
+ @Test
public void testBindingExist() throws Exception {
WSDLToSoapProcessor processor = new WSDLToSoapProcessor();
env.put(ToolConstants.CFG_WSDLURL, getLocation("/misctools_wsdl/hello_world_rpc_lit.wsdl"));
@@ -455,6 +465,7 @@
}
}
+ @Test
public void testPortTypeNotExist() throws Exception {
WSDLToSoapProcessor processor = new WSDLToSoapProcessor();
env.put(ToolConstants.CFG_WSDLURL, getLocation("/misctools_wsdl/hello_world_rpc_lit.wsdl"));
@@ -473,6 +484,7 @@
}
}
+ @Test
public void testNameSpaceMissing() throws Exception {
WSDLToSoapProcessor processor = new WSDLToSoapProcessor();
env.put(ToolConstants.CFG_WSDLURL, getLocation("/misctools_wsdl/hello_world_rpc_lit.wsdl"));
Modified: incubator/cxf/trunk/tools/wsdlto/misc/src/test/java/org/apache/cxf/tools/misc/processor/WSDLToXMLProcessorTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/misc/src/test/java/org/apache/cxf/tools/misc/processor/WSDLToXMLProcessorTest.java?view=diff&rev=527617&r1=527616&r2=527617
==============================================================================
--- incubator/cxf/trunk/tools/wsdlto/misc/src/test/java/org/apache/cxf/tools/misc/processor/WSDLToXMLProcessorTest.java (original)
+++ incubator/cxf/trunk/tools/wsdlto/misc/src/test/java/org/apache/cxf/tools/misc/processor/WSDLToXMLProcessorTest.java Wed Apr 11 12:19:35 2007
@@ -34,18 +34,19 @@
import org.apache.cxf.tools.common.ToolConstants;
import org.apache.cxf.tools.common.ToolException;
import org.apache.cxf.tools.misc.WSDLToXML;
+import org.junit.Before;
+import org.junit.Test;
public class WSDLToXMLProcessorTest extends ProcessorTestBase {
+ @Before
public void setUp() throws Exception {
super.setUp();
env.put(ToolConstants.CFG_OUTPUTDIR, output.getCanonicalPath());
}
- public void tearDown() {
- }
-
+ @Test
public void testAllDefault() throws Exception {
String[] args = new String[] {"-i", "Greeter", "-d", output.getCanonicalPath(),
getLocation("/misctools_wsdl/hello_world.wsdl")};
Modified: incubator/cxf/trunk/tools/wsdlto/misc/src/test/java/org/apache/cxf/tools/misc/processor/XSDToWSDLProcessorTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/misc/src/test/java/org/apache/cxf/tools/misc/processor/XSDToWSDLProcessorTest.java?view=diff&rev=527617&r1=527616&r2=527617
==============================================================================
--- incubator/cxf/trunk/tools/wsdlto/misc/src/test/java/org/apache/cxf/tools/misc/processor/XSDToWSDLProcessorTest.java (original)
+++ incubator/cxf/trunk/tools/wsdlto/misc/src/test/java/org/apache/cxf/tools/misc/processor/XSDToWSDLProcessorTest.java Wed Apr 11 12:19:35 2007
@@ -26,14 +26,19 @@
import org.apache.cxf.tools.common.ProcessorTestBase;
import org.apache.cxf.tools.common.ToolConstants;
import org.apache.cxf.tools.misc.XSDToWSDL;
+import org.junit.Before;
+import org.junit.Test;
public class XSDToWSDLProcessorTest
extends ProcessorTestBase {
+
+ @Before
public void setUp() throws Exception {
super.setUp();
env.put(ToolConstants.CFG_OUTPUTDIR, output.getCanonicalPath());
}
+ @Test
public void testNewTypes() throws Exception {
String[] args = new String[] {"-t", "http://org.apache/invoice", "-n", "Invoice", "-d",
output.getCanonicalPath(), "-o", "Invoice_xsd.wsdl",
@@ -64,6 +69,7 @@
}
+ @Test
public void testDefaultFileName() throws Exception {
String[] args = new String[] {"-t", "http://org.apache/invoice", "-n", "Invoice", "-d",
output.getCanonicalPath(), getLocation("/misctools_wsdl/Invoice.xsd")};
Modified: incubator/cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java?view=diff&rev=527617&r1=527616&r2=527617
==============================================================================
--- incubator/cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java (original)
+++ incubator/cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java Wed Apr 11 12:19:35 2007
@@ -35,6 +35,9 @@
import org.apache.cxf.tools.wsdlto.core.FrontEndProfile;
import org.apache.cxf.tools.wsdlto.core.PluginLoader;
import org.apache.cxf.tools.wsdlto.frontend.jaxws.JAXWSContainer;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
import org.mortbay.jetty.Server;
import org.mortbay.jetty.handler.ResourceHandler;
@@ -43,6 +46,8 @@
private JAXWSContainer processor;
private ClassLoader classLoader;
+
+ @Before
public void setUp() throws Exception {
super.setUp();
File classFile = new java.io.File(output.getCanonicalPath() + "/classes");
@@ -61,12 +66,15 @@
}
+
+ @After
public void tearDown() {
super.tearDown();
processor = null;
env = null;
}
+ @Test
public void testBug305729() throws Exception {
env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl2java_wsdl/bug305729/hello_world.wsdl"));
processor.setContext(env);
@@ -75,6 +83,7 @@
assertNotNull("Process message with no part wsdl error", output);
}
+ @Test
public void testBug305773() throws Exception {
env.put(ToolConstants.CFG_COMPILE, "compile");
@@ -95,6 +104,7 @@
}
+ @Test
public void testBug305700() throws Exception {
env.put(ToolConstants.CFG_COMPILE, "compile");
env.put(ToolConstants.CFG_OUTPUTDIR, output.getCanonicalPath());
@@ -105,6 +115,7 @@
processor.execute();
}
+ @Test
public void testNamespacePackageMapping1() throws Exception {
env.addNamespacePackageMap("http://apache.org/hello_world_soap_http/types", "org.apache.types");
env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl2java_wsdl/hello_world.wsdl"));
@@ -127,6 +138,7 @@
assertNotNull(clz);
}
+ @Test
public void testNamespacePackageMapping2() throws Exception {
env.addNamespacePackageMap("http://apache.org/hello_world_soap_http", "org.apache");
env.addNamespacePackageMap("http://apache.org/hello_world_soap_http/types", "org.apache.types");
@@ -146,6 +158,7 @@
clz = classLoader.loadClass("org.apache.Greeter");
}
+ @Test
public void testNamespacePackageMapping3() throws Exception {
env.put(ToolConstants.CFG_PACKAGENAME, "org.cxf");
env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl2java_wsdl/hello_world.wsdl"));
@@ -163,6 +176,7 @@
assertTrue("Generate " + clz.getName() + "error", clz.isInterface());
}
+ @Test
public void testBug305772() throws Exception {
env.put(ToolConstants.CFG_COMPILE, "compile");
env.put(ToolConstants.CFG_ANT, ToolConstants.CFG_ANT);
@@ -182,6 +196,7 @@
}
+ @Test
public void testExcludeNSWithPackageName() throws Exception {
String[] args = new String[] {"-d", output.getCanonicalPath(), "-nexclude",
@@ -203,6 +218,7 @@
}
+ @Test
public void testExcludeNSWithoutPackageName() throws Exception {
String[] args = new String[] {"-d", output.getCanonicalPath(), "-nexclude",
@@ -216,6 +232,7 @@
}
+ @Test
public void testCommandLine() throws Exception {
String[] args = new String[] {"-compile", "-d", output.getCanonicalPath(), "-classdir",
output.getCanonicalPath() + "/classes", "-p", "org.cxf", "-p",
@@ -227,6 +244,7 @@
assertTrue("Generate " + clz.getName() + "error", clz.isInterface());
}
+ @Test
public void testDefaultLoadNSMappingOFF() throws Exception {
String[] args = new String[] {"-dns", "false", "-d", output.getCanonicalPath(),
getLocation("/wsdl2java_wsdl/basic_callback.wsdl")};
@@ -249,6 +267,7 @@
assertEquals(11, files.length);
}
+ @Test
public void testDefaultLoadNSMappingON() throws Exception {
String[] args = new String[] {"-d", output.getCanonicalPath(),
getLocation("/wsdl2java_wsdl/basic_callback.wsdl")};
@@ -271,6 +290,7 @@
assertEquals(11, files.length);
}
+ @Test
public void testBug305924ForNestedBinding() {
try {
String[] args = new String[] {"-all", "-compile", "-classdir",
@@ -291,6 +311,7 @@
}
}
+ @Test
public void testBug305924ForExternalBinding() {
try {
String[] args = new String[] {"-all", "-compile", "-classdir",
@@ -311,18 +332,21 @@
}
}
+ @Test
public void testLocatorWithJaxbBinding() throws Exception {
env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl2java_wsdl/locator_with_jaxbbinding.wsdl"));
processor.setContext(env);
processor.execute();
}
+ @Test
public void testWsdlNoService() throws Exception {
env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl2java_wsdl/helloworld_withnoservice.wsdl"));
processor.setContext(env);
processor.execute();
}
+ @Test
public void testNoServiceImport() throws Exception {
env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl2java_wsdl/helloworld_noservice_import.wsdl"));
processor.setContext(env);
@@ -332,6 +356,7 @@
cls = classLoader.loadClass("org.apache.hello_world2.Greeter2");
}
+ @Test
public void testServiceNS() throws Exception {
env.put(ToolConstants.CFG_ALL, ToolConstants.CFG_ALL);
env.put(ToolConstants.CFG_WSDLURL,
@@ -362,6 +387,7 @@
assertTrue("Service QName in client is not correct", index > -1);
}
+ @Test
public void testNoServiceNOPortType() throws Exception {
env.put(ToolConstants.CFG_ALL, ToolConstants.CFG_ALL);
env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl2java_wsdl/no_port_or_service.wsdl"));
@@ -372,6 +398,7 @@
}
// CXF-492
+ @Test
public void testDefatultNsMap() throws Exception {
env.put(ToolConstants.CFG_ALL, ToolConstants.CFG_ALL);
env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl2java_wsdl/cxf492/locator.wsdl"));
@@ -389,6 +416,7 @@
assertTrue(address.exists());
}
+ @Test
public void testHelloWorldExternalBindingFile() throws Exception {
Server server = new Server(8585);
ResourceHandler reshandler = new ResourceHandler();
Modified: incubator/cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenOptionTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenOptionTest.java?view=diff&rev=527617&r1=527616&r2=527617
==============================================================================
--- incubator/cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenOptionTest.java (original)
+++ incubator/cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenOptionTest.java Wed Apr 11 12:19:35 2007
@@ -27,11 +27,15 @@
import org.apache.cxf.tools.wsdlto.core.FrontEndProfile;
import org.apache.cxf.tools.wsdlto.core.PluginLoader;
import org.apache.cxf.tools.wsdlto.frontend.jaxws.JAXWSContainer;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
public class CodeGenOptionTest extends ProcessorTestBase {
private JAXWSContainer processor;
private ClassLoader classLoader;
+ @Before
public void setUp() throws Exception {
super.setUp();
File classFile = new java.io.File(output.getCanonicalPath() + "/classes");
@@ -50,6 +54,7 @@
}
+ @After
public void tearDown() {
super.tearDown();
processor = null;
@@ -57,6 +62,7 @@
}
+ @Test
public void testFlagForGenStandAlone() throws Exception {
env.put(ToolConstants.CFG_GEN_TYPES, ToolConstants.CFG_GEN_TYPES);
env.put(ToolConstants.CFG_GEN_SEI, ToolConstants.CFG_GEN_SEI);
@@ -74,6 +80,7 @@
}
+ @Test
public void testFlagForGenAdditional() throws Exception {
env.put(ToolConstants.CFG_IMPL, ToolConstants.CFG_IMPL);
env.put(ToolConstants.CFG_SERVER, ToolConstants.CFG_SERVER);
@@ -87,6 +94,7 @@
}
+ @Test
public void testHelloWorldExternalBindingFile() throws Exception {
env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl2java_wsdl/hello_world_jaxws_base.wsdl"));
env.put(ToolConstants.CFG_BINDING, getLocation("/wsdl2java_wsdl/hello_world_jaxws_binding.wsdl"));
Modified: incubator/cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java?view=diff&rev=527617&r1=527616&r2=527617
==============================================================================
--- incubator/cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java (original)
+++ incubator/cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java Wed Apr 11 12:19:35 2007
@@ -44,11 +44,16 @@
import org.apache.cxf.tools.wsdlto.core.FrontEndProfile;
import org.apache.cxf.tools.wsdlto.core.PluginLoader;
import org.apache.cxf.tools.wsdlto.frontend.jaxws.JAXWSContainer;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
public class CodeGenTest extends ProcessorTestBase {
private JAXWSContainer processor;
private ClassLoader classLoader;
+ @Before
public void setUp() throws Exception {
super.setUp();
File classFile = new java.io.File(output.getCanonicalPath() + "/classes");
@@ -66,12 +71,14 @@
processor = new JAXWSContainer(null);
}
+ @After
public void tearDown() {
super.tearDown();
processor = null;
env = null;
}
+ @Test
public void testRPCLit() throws Exception {
env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl2java_wsdl/hello_world_rpc_lit.wsdl"));
@@ -119,6 +126,7 @@
}
+ @Test
public void testAsynMethod() throws Exception {
env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl2java_wsdl/hello_world_async.wsdl"));
processor.setContext(env);
@@ -153,6 +161,7 @@
}
+ @Test
public void testHelloWorldSoap12() throws Exception {
env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl2java_wsdl/hello_world_soap12.wsdl"));
processor.setContext(env);
@@ -216,6 +225,7 @@
assertEquals("org.apache.hello_world_soap12_http.PingMeFault", exceptionCls[0].getName());
}
+ @Test
public void testHelloWorld() throws Exception {
env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl2java_wsdl/hello_world.wsdl"));
processor.setContext(env);
@@ -294,6 +304,7 @@
}
+ @Test
public void testDocLitHolder() throws Exception {
env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl2java_wsdl/mapping-doc-literal.wsdl"));
processor.setContext(env);
@@ -317,42 +328,43 @@
assertEquals("OUT", webParamAnno.mode().name());
}
-// public void testSchemaImport() throws Exception {
-// env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl2java_wsdl/hello_world_schema_import.wsdl"));
+ @Test
+ @Ignore
+ public void testSchemaImport() throws Exception {
+ env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl2java_wsdl/hello_world_schema_import.wsdl"));
+ processor.setContext(env);
+ processor.execute();
-// processor.setContext(env);
-// processor.execute();
+ assertNotNull(output);
-// assertNotNull(output);
+ File org = new File(output, "org");
+ assertTrue(org.exists());
+ File apache = new File(org, "apache");
+ assertTrue(apache.exists());
+ File[] files = apache.listFiles();
+ assertEquals(2, files.length);
+ File helloworldsoaphttp = new File(apache, "hello_world_soap_http");
+ assertTrue(helloworldsoaphttp.exists());
+ File types = new File(helloworldsoaphttp, "types");
+ assertTrue(types.exists());
+ files = helloworldsoaphttp.listFiles();
+ assertEquals(1, files.length);
+ files = types.listFiles();
+ assertEquals(files.length, 10);
+ File schemaImport = new File(apache, "schema_import");
+ assertTrue(schemaImport.exists());
+ files = schemaImport.listFiles();
+ assertEquals(4, files.length);
-// File org = new File(output, "org");
-// assertTrue(org.exists());
-// File apache = new File(org, "apache");
-// assertTrue(apache.exists());
-// File[] files = apache.listFiles();
-// assertEquals(2, files.length);
-// File helloworldsoaphttp = new File(apache, "hello_world_soap_http");
-// assertTrue(helloworldsoaphttp.exists());
-// File types = new File(helloworldsoaphttp, "types");
-// assertTrue(types.exists());
-// files = helloworldsoaphttp.listFiles();
-// assertEquals(1, files.length);
-// files = types.listFiles();
-// assertEquals(files.length, 10);
-// File schemaImport = new File(apache, "schema_import");
-// assertTrue(schemaImport.exists());
-// files = schemaImport.listFiles();
-// assertEquals(4, files.length);
-
-// Class clz = classLoader.loadClass("org.apache.schema_import.Greeter");
-// assertEquals(4, clz.getMethods().length);
-
-// Method method = clz.getMethod("pingMe", new Class[] {});
-// assertEquals("void", method.getReturnType().getSimpleName());
-// assertEquals("Exception class is not generated ", 1, method.getExceptionTypes().length);
+ Class clz = classLoader.loadClass("org.apache.schema_import.Greeter");
+ assertEquals(4, clz.getMethods().length);
-// }
+ Method method = clz.getMethod("pingMe", new Class[] {});
+ assertEquals("void", method.getReturnType().getSimpleName());
+ assertEquals("Exception class is not generated ", 1, method.getExceptionTypes().length);
+ }
+ @Test
public void testExceptionNameCollision() throws Exception {
env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl2java_wsdl/InvoiceServer.wsdl"));
@@ -386,6 +398,7 @@
}
+ @Test
public void testAllNameCollision() throws Exception {
env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl2java_wsdl/hello_world_collision.wsdl"));
env.put(ToolConstants.CFG_PACKAGENAME, "org.apache");
@@ -416,6 +429,7 @@
clz = classLoader.loadClass("org.apache.Greeter_Service");
}
+ @Test
public void testImportNameCollision() throws Exception {
env.put(ToolConstants.CFG_WSDLURL,
getLocation("/wsdl2java_wsdl/helloworld-portname_servicename.wsdl"));
@@ -442,6 +456,7 @@
clz = classLoader.loadClass("org.apache.HelloWorldServiceImpl_Service");
}
+ @Test
public void testSoapHeader() throws Exception {
env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl2java_wsdl/soap_header.wsdl"));
env.put(ToolConstants.CFG_PACKAGENAME, "org.apache");
@@ -481,6 +496,7 @@
}
+ @Test
public void testHolderHeader() throws Exception {
env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl2java_wsdl/hello_world_holder.wsdl"));
processor.setContext(env);
@@ -506,6 +522,7 @@
}
+ @Test
public void testWSAddress() throws Exception {
env.addNamespacePackageMap("http://apache.org/hello_world_soap_http", "ws.address");
env.put(ToolConstants.CFG_BINDING, getLocation("/wsdl2java_wsdl/ws_address_binding.wsdl"));
@@ -533,6 +550,7 @@
.getResource("ws/address/Greeter_handler.xml"));
}
+ @Test
public void testVoidInOutMethod() throws Exception {
env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl2java_wsdl/interoptestdoclit.wsdl"));
processor.setContext(env);
@@ -565,6 +583,7 @@
}
}
+ @Test
public void testWsdlImport() throws Exception {
env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl2java_wsdl/hello_world_wsdl_import.wsdl"));
processor.setContext(env);
@@ -591,6 +610,7 @@
.getCanonicalName());
}
+ @Test
public void testWebFault() throws Exception {
env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl2java_wsdl/InvoiceServer-issue305570.wsdl"));
processor.setContext(env);
@@ -613,6 +633,7 @@
}
+ @Test
public void testMultiSchemaParsing() throws Exception {
env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl2java_wsdl/multi_schema.wsdl"));
@@ -631,6 +652,7 @@
assertEquals(3, files.length);
}
+ @Test
public void testDefaultParameterOrder() throws Exception {
env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl2java_wsdl/bug161/header2.wsdl"));
processor.setContext(env);
@@ -642,6 +664,7 @@
}
@SuppressWarnings("unchecked")
+ @Test
public void testSupportXMLBindingBare() throws Exception {
env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl2java_wsdl/xml_http_bare.wsdl"));
processor.setContext(env);
@@ -657,6 +680,7 @@
}
+ @Test
public void testSupportXMLBindingWrapped() throws Exception {
env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl2java_wsdl/xml_http_wrapped.wsdl"));
processor.setContext(env);
@@ -670,6 +694,7 @@
assertNotNull("WrapperBean Annotation could not be found", reqAnno);
}
+ @Test
public void testRouterWSDL() throws Exception {
env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl2java_wsdl/router.wsdl"));
processor.setContext(env);
@@ -688,6 +713,7 @@
}
+ @Test
public void testWSDLContainsJavaKeywords() throws Exception {
env.put(ToolConstants.CFG_WSDLURL,
@@ -703,6 +729,7 @@
}
+ @Test
public void testInvalidMepOperation() throws Exception {
try {
env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl2java_wsdl/invalid_mep.wsdl"));
@@ -714,6 +741,7 @@
}
}
+ @Test
public void testWSDLWithEnumType() throws Exception {
env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl2java_wsdl/hello_world_with_enum_type.wsdl"));
processor.setContext(env);
@@ -722,6 +750,7 @@
assertNotNull("Enum class could not be found", clz);
}
+ @Test
public void testSWAMime() throws Exception {
env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl2java_wsdl/swa-mime.wsdl"));
@@ -740,6 +769,7 @@
assertEquals("javax.activation.DataHandler", typeClass.getName());
}
+ @Test
public void testRPCHeader() throws Exception {
env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl2java_wsdl/soapheader_rpc.wsdl"));
processor.setContext(env);
@@ -776,6 +806,7 @@
}
}
+ @Test
public void testRefTNS() throws Exception {
env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl2java_wsdl/locator.wsdl"));
processor.setContext(env);
@@ -811,6 +842,7 @@
}
+ @Test
public void testWebFaultAnnotaion() throws Exception {
env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl2java_wsdl/jms_test_rpc_fault.wsdl"));
env.put(ToolConstants.CFG_SERVICENAME, "HelloWorldService");
Modified: incubator/cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/validator/ValidatorTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/validator/ValidatorTest.java?view=diff&rev=527617&r1=527616&r2=527617
==============================================================================
--- incubator/cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/validator/ValidatorTest.java (original)
+++ incubator/cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/validator/ValidatorTest.java Wed Apr 11 12:19:35 2007
@@ -25,10 +25,13 @@
import org.apache.cxf.tools.wsdlto.core.FrontEndProfile;
import org.apache.cxf.tools.wsdlto.core.PluginLoader;
import org.apache.cxf.tools.wsdlto.frontend.jaxws.JAXWSContainer;
+import org.junit.Before;
+import org.junit.Test;
public class ValidatorTest extends ProcessorTestBase {
private WSDLToJavaContainer processor;
+ @Before
public void setUp() throws Exception {
super.setUp();
env.put(ToolConstants.CFG_VERBOSE, ToolConstants.CFG_VERBOSE);
@@ -38,6 +41,7 @@
//env.put(ToolConstants.CFG_VALIDATE_WSDL, ToolConstants.CFG_VALIDATE_WSDL);
}
+ @Test
public void testXMLFormat() throws Exception {
processor = new JAXWSContainer(null);
env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl2java_wsdl/xml_format_root.wsdl"));