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/03/08 18:15:05 UTC
svn commit: r516103 [4/11] - in /incubator/cxf/trunk: ./
common/common/src/test/java/org/apache/cxf/common/annotation/
common/common/src/test/java/org/apache/cxf/common/classloader/
common/common/src/test/java/org/apache/cxf/common/commands/ common/com...
Modified: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/client/HeaderTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/client/HeaderTest.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/client/HeaderTest.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/client/HeaderTest.java Thu Mar 8 09:14:44 2007
@@ -25,43 +25,37 @@
import org.w3c.dom.Document;
import org.apache.cxf.aegis.AbstractAegisTest;
-import org.apache.cxf.aegis.databinding.AegisDatabinding;
import org.apache.cxf.aegis.util.XmlConstants;
-import org.apache.cxf.endpoint.Client;
import org.apache.cxf.frontend.ClientProxyFactoryBean;
import org.apache.cxf.frontend.ServerFactoryBean;
-import org.apache.cxf.service.Service;
import org.apache.cxf.service.factory.ReflectionServiceFactoryBean;
import org.apache.cxf.service.invoker.BeanInvoker;
-import org.apache.cxf.wsdl.WSDLBuilder;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
-public class HeaderTest extends AbstractAegisTest
-{
- public void setUp()
- throws Exception
- {
+public class HeaderTest extends AbstractAegisTest {
+ @Before
+ public void setUp() throws Exception {
super.setUp();
ReflectionServiceFactoryBean factory = new ReflectionServiceFactoryBean() {
- public boolean isHeader(Method method, int j)
- {
+ public boolean isHeader(Method method, int j) {
return true;
}
- protected boolean isInParam(Method method, int j)
- {
+ protected boolean isInParam(Method method, int j) {
return j == 0;
}
- protected boolean isOutParam(Method method, int j)
- {
+ protected boolean isOutParam(Method method, int j) {
return j == -1 || j == 1;
}
-
+
};
-
+
factory.setInvoker(new BeanInvoker(new EchoImpl()));
-
+
ServerFactoryBean svrFac = new ServerFactoryBean();
svrFac.setAddress("Echo");
setupAegis(svrFac);
@@ -70,31 +64,27 @@
svrFac.setBus(getBus());
svrFac.create();
}
-
- public void testHeaders() throws Exception
- {
- // not working yet
- }
- public void xtestHeaders() throws Exception
- {
+
+ @Test
+ @Ignore
+ public void testHeaders() throws Exception {
ClientProxyFactoryBean proxyFac = new ClientProxyFactoryBean();
proxyFac.setAddress("Echo");
proxyFac.setServiceClass(Echo.class);
proxyFac.setBus(getBus());
setupAegis(proxyFac.getClientFactoryBean());
-
- Echo echo = (Echo) proxyFac.create();
-
-
+
+ Echo echo = (Echo)proxyFac.create();
+
Holder<String> h = new Holder<String>();
assertEquals("hi", echo.echo("hi", h));
assertEquals("header2", h.value);
-
+
Document wsdl = getWSDLDocument("Echo");
addNamespace("wsdlsoap", XmlConstants.WSDL11_NS);
assertValid("//wsdl:input/wsdlsoap:header[@message='tns:echoRequestHeaders'][@part='in0']", wsdl);
assertValid("//wsdl:output/wsdlsoap:header[@message='tns:echoResponseHeaders'][@part='out']", wsdl);
assertValid("//wsdl:output/wsdlsoap:header[@message='tns:echoResponseHeaders'][@part='out0']", wsdl);
- }
+ }
}
Modified: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/integration/WrappedTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/integration/WrappedTest.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/integration/WrappedTest.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/integration/WrappedTest.java Thu Mar 8 09:14:44 2007
@@ -26,18 +26,22 @@
import org.apache.cxf.aegis.services.ArrayService;
import org.apache.cxf.aegis.services.BeanService;
import org.apache.cxf.transport.local.LocalTransportFactory;
+import org.junit.Before;
+import org.junit.Test;
/**
* @author <a href="mailto:dan@envoisolutions.com">Dan Diephouse</a>
* @since Feb 21, 2004
*/
public class WrappedTest extends AbstractAegisTest {
+ @Before
public void setUp() throws Exception {
super.setUp();
createService(BeanService.class, "BeanService", null);
createService(ArrayService.class, "Array", new QName("urn:Array", "Array"));
}
+ @Test
public void testBeanService() throws Exception {
Node response = invoke("BeanService", LocalTransportFactory.TRANSPORT_ID, "bean11.xml");
@@ -48,16 +52,17 @@
assertValid("//sb:getSimpleBeanResponse/sb:return/sb:bleh[text()=\"bleh\"]", response);
}
+ @Test
public void testBeanServiceWSDL() throws Exception {
Node doc = getWSDLDocument("BeanService");
assertValid("/wsdl:definitions/wsdl:types", doc);
assertValid("/wsdl:definitions/wsdl:types/xsd:schema", doc);
- assertValid("/wsdl:definitions/wsdl:types/" +
- "xsd:schema[@targetNamespace='http://services.aegis.cxf.apache.org']",
+ assertValid("/wsdl:definitions/wsdl:types/"
+ + "xsd:schema[@targetNamespace='http://services.aegis.cxf.apache.org']",
doc);
- assertValid(
- "//xsd:schema[@targetNamespace='http://services.aegis.cxf.apache.org']/xsd:element[@name='getSubmitBean']",
+ assertValid("//xsd:schema[@targetNamespace='http://services.aegis.cxf.apache.org']/"
+ + "xsd:element[@name='getSubmitBean']",
doc);
assertValid("//xsd:element[@name='getSubmitBean']/xsd:complexType/xsd:sequence"
+ "/xsd:element[@name='bleh'][@type='xsd:string'][@nillable='true']", doc);
@@ -72,17 +77,20 @@
assertValid(
"/wsdl:definitions/wsdl:types"
+ "/xsd:schema[@targetNamespace='http://services.aegis.cxf.apache.org']"
- + "/xsd:complexType[@name=\"SimpleBean\"]/xsd:sequence/xsd:element[@name=\"bleh\"][@nillable='true']",
+ + "/xsd:complexType[@name=\"SimpleBean\"]/xsd:sequence/xsd:element"
+ + "[@name=\"bleh\"][@nillable='true']",
doc);
assertValid(
"/wsdl:definitions/wsdl:types"
+ "/xsd:schema[@targetNamespace='http://services.aegis.cxf.apache.org']"
- + "/xsd:complexType[@name=\"SimpleBean\"]/xsd:sequence/xsd:element[@name=\"howdy\"][@nillable='true']",
+ + "/xsd:complexType[@name=\"SimpleBean\"]/xsd:sequence/xsd:element"
+ + "[@name=\"howdy\"][@nillable='true']",
doc);
assertValid(
"/wsdl:definitions/wsdl:types"
+ "/xsd:schema[@targetNamespace='http://services.aegis.cxf.apache.org']"
- + "/xsd:complexType[@name=\"SimpleBean\"]/xsd:sequence/xsd:element[@type=\"xsd:string\"]",
+ + "/xsd:complexType[@name=\"SimpleBean\"]/xsd:sequence/xsd:element"
+ + "[@type=\"xsd:string\"]",
doc);
}
@@ -140,10 +148,12 @@
// assertValid("//xsd:schema[@targetNamespace='urn:Array']/xsd:element[@name='SubmitBeanArray']",
// doc);
// assertValid(
- // "//xsd:element[@name='SubmitStringArray']/xsd:complexType/xsd:sequence/xsd:element[@name='array'][@type='tns:ArrayOfString']",
+ // "//xsd:element[@name='SubmitStringArray']/xsd:complexType/xsd:sequence/xsd:element"
+ // + "[@name='array'][@type='tns:ArrayOfString']",
// doc);
// assertValid(
- // "//xsd:element[@name='SubmitBeanArray']/xsd:complexType/xsd:sequence/xsd:element[@name='array'][@type='ns1:ArrayOfSimpleBean']",
+ // "//xsd:element[@name='SubmitBeanArray']/xsd:complexType/xsd:sequence/xsd:element"
+ // + "[@name='array'][@type='ns1:ArrayOfSimpleBean']",
// doc);
// }
}
Modified: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/AddNumbers.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/AddNumbers.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/AddNumbers.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/AddNumbers.java Thu Mar 8 09:14:44 2007
@@ -18,10 +18,8 @@
*/
package org.apache.cxf.aegis.services;
-public class AddNumbers
-{
- public int add(int one, int two)
- {
- return one+two;
+public class AddNumbers {
+ public int add(int one, int two) {
+ return one + two;
}
}
Modified: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/ArrayService.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/ArrayService.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/ArrayService.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/ArrayService.java Thu Mar 8 09:14:44 2007
@@ -23,29 +23,24 @@
*
* @author <a href="mailto:dan@envoisolutions.com">Dan Diephouse</a>
*/
-public class ArrayService
-{
- public SimpleBean[] getBeanArray()
- {
+public class ArrayService {
+ public SimpleBean[] getBeanArray() {
SimpleBean bean = new SimpleBean();
bean.setBleh("bleh");
bean.setHowdy("howdy");
-
- return new SimpleBean[] { bean };
+
+ return new SimpleBean[] {bean};
}
- public String[] getStringArray()
- {
- return new String[] { "bleh", "bleh" };
+ public String[] getStringArray() {
+ return new String[] {"bleh", "bleh"};
}
-
- public boolean SubmitStringArray( String[] array )
- {
+
+ public boolean submitStringArray(String[] array) {
return true;
}
-
- public boolean SubmitBeanArray( SimpleBean[] array )
- {
+
+ public boolean submitBeanArray(SimpleBean[] array) {
return true;
}
}
Modified: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/BeanService.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/BeanService.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/BeanService.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/BeanService.java Thu Mar 8 09:14:44 2007
@@ -21,19 +21,16 @@
/**
* @author <a href="mailto:dan@envoisolutions.com">Dan Diephouse</a>
*/
-public class BeanService
-{
- public SimpleBean getSimpleBean()
- {
+public class BeanService {
+ public SimpleBean getSimpleBean() {
SimpleBean bean = new SimpleBean();
bean.setBleh("bleh");
bean.setHowdy("howdy");
-
+
return bean;
}
-
- public String getSubmitBean( SimpleBean bean, String bleh )
- {
+
+ public String getSubmitBean(SimpleBean bean, String bleh) {
return bean.getBleh();
}
Modified: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/ComplexService.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/ComplexService.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/ComplexService.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/ComplexService.java Thu Mar 8 09:14:44 2007
@@ -20,12 +20,10 @@
import org.apache.cxf.aegis.services.ns1.Complex1;
-public class ComplexService
-{
- public Complex1 getComplex1()
- {
+public class ComplexService {
+ public Complex1 getComplex1() {
Complex1 c1 = new Complex1();
-
+
return c1;
}
Modified: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/DataBean.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/DataBean.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/DataBean.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/DataBean.java Thu Mar 8 09:14:44 2007
@@ -18,17 +18,14 @@
*/
package org.apache.cxf.aegis.services;
-public class DataBean
-{
+public class DataBean {
private byte[] data = new byte[0];
- public byte[] getData()
- {
+ public byte[] getData() {
return data;
}
- public void setData(byte[] data)
- {
+ public void setData(byte[] data) {
this.data = data;
}
}
Modified: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/DataService.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/DataService.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/DataService.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/DataService.java Thu Mar 8 09:14:44 2007
@@ -18,10 +18,8 @@
*/
package org.apache.cxf.aegis.services;
-public class DataService
-{
- public DataBean getData()
- {
+public class DataService {
+ public DataBean getData() {
return new DataBean();
}
}
Modified: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/Echo.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/Echo.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/Echo.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/Echo.java Thu Mar 8 09:14:44 2007
@@ -23,10 +23,8 @@
*
* @author <a href="mailto:dan@envoisolutions.com">Dan Diephouse</a>
*/
-public class Echo
-{
- public String echo( String echo )
- {
+public class Echo {
+ public String echo(String echo) {
return echo;
}
}
Modified: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/EchoOverload.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/EchoOverload.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/EchoOverload.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/EchoOverload.java Thu Mar 8 09:14:44 2007
@@ -18,9 +18,8 @@
*/
package org.apache.cxf.aegis.services;
-public interface EchoOverload
-{
- public String echo( String echo );
-
- public String echo( String echo, String echo2 );
+public interface EchoOverload {
+ String echo(String echo);
+
+ String echo(String echo, String echo2);
}
Modified: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/EchoOverloadImpl.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/EchoOverloadImpl.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/EchoOverloadImpl.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/EchoOverloadImpl.java Thu Mar 8 09:14:44 2007
@@ -18,15 +18,12 @@
*/
package org.apache.cxf.aegis.services;
-public class EchoOverloadImpl implements EchoOverload
-{
- public String echo( String echo )
- {
+public class EchoOverloadImpl implements EchoOverload {
+ public String echo(String echo) {
return echo;
}
-
- public String echo( String echo, String echo2 )
- {
+
+ public String echo(String echo, String echo2) {
return echo + echo2;
}
}
Modified: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/PrimitiveService.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/PrimitiveService.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/PrimitiveService.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/PrimitiveService.java Thu Mar 8 09:14:44 2007
@@ -21,15 +21,12 @@
/**
* @author <a href="mailto:dan@envoisolutions.com">Dan Diephouse</a>
*/
-public class PrimitiveService
-{
- public Integer echoInteger( Integer integer )
- {
+public class PrimitiveService {
+ public Integer echoInteger(Integer integer) {
return integer;
}
- public int echoInt( int integer )
- {
+ public int echoInt(int integer) {
return integer;
}
}
Modified: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/SimpleBean.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/SimpleBean.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/SimpleBean.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/SimpleBean.java Thu Mar 8 09:14:44 2007
@@ -23,29 +23,24 @@
*
* @author <a href="mailto:dan@envoisolutions.com">Dan Diephouse</a>
*/
-public class SimpleBean
-{
+public class SimpleBean {
private String bleh;
-
+
private String howdy;
- public String getBleh()
- {
+ public String getBleh() {
return bleh;
}
- public void setBleh(String bleh)
- {
+ public void setBleh(String bleh) {
this.bleh = bleh;
}
-
- public String getHowdy()
- {
+
+ public String getHowdy() {
return howdy;
}
- public void setHowdy(String howdy)
- {
+ public void setHowdy(String howdy) {
this.howdy = howdy;
}
}
Modified: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/StaticEcho.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/StaticEcho.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/StaticEcho.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/StaticEcho.java Thu Mar 8 09:14:44 2007
@@ -23,16 +23,13 @@
*
* @author <a href="mailto:dan@envoisolutions.com">Dan Diephouse</a>
*/
-public class StaticEcho
-{
-
- public static String echoStatic( String echo )
- {
+public class StaticEcho {
+
+ public static String echoStatic(String echo) {
return echo;
}
-
- public String echo( String echo )
- {
+
+ public String echo(String echo) {
return echo;
}
}
Modified: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/VoidService.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/VoidService.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/VoidService.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/VoidService.java Thu Mar 8 09:14:44 2007
@@ -18,9 +18,7 @@
*/
package org.apache.cxf.aegis.services;
-public class VoidService
-{
- public void doNothing()
- {
+public class VoidService {
+ public void doNothing() {
}
}
Modified: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/base64/BinaryDataTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/base64/BinaryDataTest.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/base64/BinaryDataTest.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/base64/BinaryDataTest.java Thu Mar 8 09:14:44 2007
@@ -22,8 +22,10 @@
import org.apache.cxf.aegis.AbstractAegisTest;
import org.apache.cxf.transport.local.LocalTransportFactory;
+import org.junit.Test;
public class BinaryDataTest extends AbstractAegisTest {
+ @Test
public void testBinary() throws Exception {
createService(BinaryDataService.class, null);
Modified: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/ns1/Complex1.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/ns1/Complex1.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/ns1/Complex1.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/ns1/Complex1.java Thu Mar 8 09:14:44 2007
@@ -20,18 +20,15 @@
import org.apache.cxf.aegis.services.ns2.Complex2;
-public class Complex1
-{
+public class Complex1 {
private Complex2 property;
- public Complex2 getProperty()
- {
+ public Complex2 getProperty() {
return property;
}
-
- public void setProperty(Complex2 property)
- {
+
+ public void setProperty(Complex2 property) {
this.property = property;
}
-
+
}
Modified: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/ns2/Complex2.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/ns2/Complex2.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/ns2/Complex2.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/ns2/Complex2.java Thu Mar 8 09:14:44 2007
@@ -18,17 +18,14 @@
*/
package org.apache.cxf.aegis.services.ns2;
-public class Complex2
-{
+public class Complex2 {
private String property;
- public String getProperty()
- {
+ public String getProperty() {
return property;
}
- public void setProperty(String property)
- {
+ public void setProperty(String property) {
this.property = property;
}
}
Modified: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/AnnotatedBean1.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/AnnotatedBean1.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/AnnotatedBean1.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/AnnotatedBean1.java Thu Mar 8 09:14:44 2007
@@ -1,40 +1,51 @@
+/**
+ * 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.aegis.type.java5;
-public class AnnotatedBean1
-{
+public class AnnotatedBean1 {
private String elementProperty;
private String attributeProperty;
private String bogusProperty;
-
+
@XmlAttribute
- public String getAttributeProperty()
- {
+ public String getAttributeProperty() {
return attributeProperty;
}
-
- public void setAttributeProperty(String attributeProperty)
- {
+
+ public void setAttributeProperty(String attributeProperty) {
this.attributeProperty = attributeProperty;
}
-
- public String getBogusProperty()
- {
+
+ public String getBogusProperty() {
return bogusProperty;
}
-
- public void setBogusProperty(String bogusProperty)
- {
+
+ public void setBogusProperty(String bogusProperty) {
this.bogusProperty = bogusProperty;
}
-
- @XmlElement(type=CustomStringType.class)
- public String getElementProperty()
- {
+
+ @XmlElement(type = CustomStringType.class)
+ public String getElementProperty() {
return elementProperty;
}
-
- public void setElementProperty(String elementProperty)
- {
+
+ public void setElementProperty(String elementProperty) {
this.elementProperty = elementProperty;
}
}
Modified: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/AnnotatedBean2.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/AnnotatedBean2.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/AnnotatedBean2.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/AnnotatedBean2.java Thu Mar 8 09:14:44 2007
@@ -1,41 +1,52 @@
+/**
+ * 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.aegis.type.java5;
-public class AnnotatedBean2
-{
+public class AnnotatedBean2 {
private String elementProperty;
private String attributeProperty;
private String ignoredProperty;
-
- @XmlAttribute(name="attribute")
- public String getAttributeProperty()
- {
+
+ @XmlAttribute(name = "attribute")
+ public String getAttributeProperty() {
return attributeProperty;
}
-
- public void setAttributeProperty(String attributeProperty)
- {
+
+ public void setAttributeProperty(String attributeProperty) {
this.attributeProperty = attributeProperty;
}
- @XmlElement(name="element")
- public String getElementProperty()
- {
+ @XmlElement(name = "element")
+ public String getElementProperty() {
return elementProperty;
}
-
- public void setElementProperty(String elementProperty)
- {
+
+ public void setElementProperty(String elementProperty) {
this.elementProperty = elementProperty;
}
@IgnoreProperty
- public String getIgnoredProperty()
- {
+ public String getIgnoredProperty() {
return ignoredProperty;
}
- public void setIgnoredProperty(String ignoredProperty)
- {
+ public void setIgnoredProperty(String ignoredProperty) {
this.ignoredProperty = ignoredProperty;
}
}
Modified: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/AnnotatedBean3.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/AnnotatedBean3.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/AnnotatedBean3.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/AnnotatedBean3.java Thu Mar 8 09:14:44 2007
@@ -1,17 +1,32 @@
+/**
+ * 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.aegis.type.java5;
-public class AnnotatedBean3
-{
+public class AnnotatedBean3 {
private String attributeProperty;
- @XmlAttribute(name="attribute")
- public String getAttributeProperty()
- {
+ @XmlAttribute(name = "attribute")
+ public String getAttributeProperty() {
return attributeProperty;
}
-
- public void setAttributeProperty(String attributeProperty)
- {
+
+ public void setAttributeProperty(String attributeProperty) {
this.attributeProperty = attributeProperty;
}
}
Modified: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/AnnotatedBean4.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/AnnotatedBean4.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/AnnotatedBean4.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/AnnotatedBean4.java Thu Mar 8 09:14:44 2007
@@ -1,31 +1,44 @@
+/**
+ * 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.aegis.type.java5;
@XmlType(extensibleElements = false, extensibleAttributes = false)
-public class AnnotatedBean4
-{
- private String nillableProperty = null;
+public class AnnotatedBean4 {
+ private String nillableProperty;
- private String minOccursProperty = null;
+ private String minOccursProperty;
@XmlElement(nillable = false)
- public String getNillableProperty()
- {
+ public String getNillableProperty() {
return nillableProperty;
}
- public void setNillableProperty(String nillableProperty)
- {
+ public void setNillableProperty(String nillableProperty) {
this.nillableProperty = nillableProperty;
}
@XmlElement(minOccurs = "1")
- public String getMinOccursProperty()
- {
+ public String getMinOccursProperty() {
return minOccursProperty;
}
- public void setMinOccursProperty(String minOccursProperty)
- {
+ public void setMinOccursProperty(String minOccursProperty) {
this.minOccursProperty = minOccursProperty;
}
}
Modified: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/AnnotatedService.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/AnnotatedService.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/AnnotatedService.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/AnnotatedService.java Thu Mar 8 09:14:44 2007
@@ -1,23 +1,38 @@
+/**
+ * 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.aegis.type.java5;
-public class AnnotatedService
-{
- public AnnotatedBean1 getAnnotatedBean1()
- {
+public class AnnotatedService {
+ public AnnotatedBean1 getAnnotatedBean1() {
AnnotatedBean1 bean = new AnnotatedBean1();
bean.setAttributeProperty("attribute");
bean.setBogusProperty("bogus");
bean.setElementProperty("element");
-
+
return bean;
}
-
- public AnnotatedBean2 getAnnotatedBean2()
- {
+
+ public AnnotatedBean2 getAnnotatedBean2() {
AnnotatedBean2 bean = new AnnotatedBean2();
bean.setAttributeProperty("attribute");
bean.setElementProperty("element");
-
+
return bean;
}
}
Modified: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/AnnotatedTypeTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/AnnotatedTypeTest.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/AnnotatedTypeTest.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/AnnotatedTypeTest.java Thu Mar 8 09:14:44 2007
@@ -1,3 +1,21 @@
+/**
+ * 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.aegis.type.java5;
import java.util.Iterator;
@@ -14,128 +32,134 @@
import org.apache.cxf.aegis.util.XmlConstants;
import org.apache.cxf.endpoint.Server;
import org.apache.cxf.service.Service;
+import org.junit.Before;
+import org.junit.Test;
-public class AnnotatedTypeTest
- extends AbstractAegisTest
-{
+public class AnnotatedTypeTest extends AbstractAegisTest {
private TypeMapping tm;
private Service service;
-
- public void setUp() throws Exception
- {
+
+ @Before
+ public void setUp() throws Exception {
super.setUp();
-
+
Server s = createService(AnnotatedService.class, null);
service = s.getEndpoint().getService();
-
- tm = (TypeMapping) service.get(TypeMapping.class.getName());
+
+ tm = (TypeMapping)service.get(TypeMapping.class.getName());
}
- public void testTM()
- {
- assertTrue( tm.getTypeCreator() instanceof XMLTypeCreator );
+ @Test
+ public void testTM() {
+ assertTrue(tm.getTypeCreator() instanceof XMLTypeCreator);
}
-
- public void testType()
- {
+
+ @Test
+ public void testType() {
AnnotatedTypeInfo info = new AnnotatedTypeInfo(tm, AnnotatedBean1.class, "urn:foo");
-
+
Iterator elements = info.getElements();
assertTrue(elements.hasNext());
- QName element = (QName) elements.next();
+ QName element = (QName)elements.next();
assertTrue(elements.hasNext());
-
- element = (QName) elements.next();
+
+ element = (QName)elements.next();
assertFalse(elements.hasNext());
-
+
Type custom = info.getType(element);
assertTrue(custom instanceof CustomStringType);
-
+
Iterator atts = info.getAttributes();
assertTrue(atts.hasNext());
atts.next();
assertFalse(atts.hasNext());
-
- assertTrue ( info.isExtensibleElements() );
- assertTrue( info.isExtensibleAttributes() );
+
+ assertTrue(info.isExtensibleElements());
+ assertTrue(info.isExtensibleAttributes());
}
- public void testAegisType()
- {
- BeanType type = (BeanType) tm.getTypeCreator().createType(AnnotatedBean3.class);
+ @Test
+ public void testAegisType() {
+ BeanType type = (BeanType)tm.getTypeCreator().createType(AnnotatedBean3.class);
assertFalse(type.getTypeInfo().getAttributes().hasNext());
-
+
Iterator itr = type.getTypeInfo().getElements();
assertTrue(itr.hasNext());
- QName q = (QName) itr.next();
+ QName q = (QName)itr.next();
assertEquals("attProp", q.getLocalPart());
}
-
- public void testExtensibilityOff()
- {
- BeanType type = (BeanType) tm.getTypeCreator().createType(AnnotatedBean4.class);
-
- assertFalse ( type.getTypeInfo().isExtensibleElements() );
- assertFalse ( type.getTypeInfo().isExtensibleAttributes() );
- }
-
- public void testNillableAndMinOccurs()
- {
- BeanType type = (BeanType) tm.getTypeCreator().createType(AnnotatedBean4.class);
- AnnotatedTypeInfo info = (AnnotatedTypeInfo) type.getTypeInfo();
+
+ @Test
+ public void testExtensibilityOff() {
+ BeanType type = (BeanType)tm.getTypeCreator().createType(AnnotatedBean4.class);
+
+ assertFalse(type.getTypeInfo().isExtensibleElements());
+ assertFalse(type.getTypeInfo().isExtensibleAttributes());
+ }
+
+ @Test
+ public void testNillableAndMinOccurs() {
+ BeanType type = (BeanType)tm.getTypeCreator().createType(AnnotatedBean4.class);
+ AnnotatedTypeInfo info = (AnnotatedTypeInfo)type.getTypeInfo();
Iterator elements = info.getElements();
assertTrue(elements.hasNext());
// nillable first
- QName element = (QName) elements.next();
- if ( "minOccursProperty".equals( element.getLocalPart() ) )
- {
- assertEquals(1, info.getMinOccurs( element ) );
+ QName element = (QName)elements.next();
+ if ("minOccursProperty".equals(element.getLocalPart())) {
+ assertEquals(1, info.getMinOccurs(element));
+ } else {
+ assertFalse(info.isNillable(element));
}
- else
- {
- assertFalse( info.isNillable( element ) );
- }
-
+
assertTrue(elements.hasNext());
// minOccurs = 1 second
- element = (QName) elements.next();
- if ( "minOccursProperty".equals( element.getLocalPart() ) )
- {
- assertEquals(1, info.getMinOccurs( element ) );
+ element = (QName)elements.next();
+ if ("minOccursProperty".equals(element.getLocalPart())) {
+ assertEquals(1, info.getMinOccurs(element));
+ } else {
+ assertFalse(info.isNillable(element));
}
- else
- {
- assertFalse( info.isNillable( element ) );
- }
}
- public void testWSDL() throws Exception
- {
+ @Test
+ public void testWSDL() throws Exception {
Document wsdl = getWSDLDocument("AnnotatedService");
addNamespace("xsd", XmlConstants.XSD);
- assertValid("//xsd:complexType[@name='AnnotatedBean1']/xsd:sequence/xsd:element[@name='elementProperty']", wsdl);
- assertValid("//xsd:complexType[@name='AnnotatedBean1']/xsd:attribute[@name='attributeProperty']", wsdl);
- assertValid("//xsd:complexType[@name='AnnotatedBean1']/xsd:sequence/xsd:element[@name='bogusProperty']", wsdl);
-
- assertValid("//xsd:complexType[@name='AnnotatedBean2']/xsd:sequence/xsd:element[@name='element'][@type='xsd:string']", wsdl);
- assertValid("//xsd:complexType[@name='AnnotatedBean2']/xsd:attribute[@name='attribute'][@type='xsd:string']", wsdl);
- }
-
- public void testGetSetRequired() throws Exception
- {
+ assertValid(
+ "//xsd:complexType[@name='AnnotatedBean1']/xsd:sequence/xsd:"
+ + "element[@name='elementProperty']",
+ wsdl);
+ assertValid("//xsd:complexType[@name='AnnotatedBean1']/xsd:attribute"
+ + "[@name='attributeProperty']",
+ wsdl);
+ assertValid(
+ "//xsd:complexType[@name='AnnotatedBean1']/xsd:sequence/xsd:element"
+ + "[@name='bogusProperty']",
+ wsdl);
+
+ assertValid(
+ "//xsd:complexType[@name='AnnotatedBean2']/xsd:sequence/xsd:element"
+ + "[@name='element'][@type='xsd:string']",
+ wsdl);
+ assertValid(
+ "//xsd:complexType[@name='AnnotatedBean2']/xsd:attribute"
+ + "[@name='attribute'][@type='xsd:string']",
+ wsdl);
+ }
+
+ @Test
+ public void testGetSetRequired() throws Exception {
BeanType type = new BeanType(new AnnotatedTypeInfo(tm, BadBean.class, "urn:foo"));
type.setSchemaType(new QName("urn:foo", "BadBean"));
-
+
assertFalse(type.getTypeInfo().getElements().hasNext());
}
-
- public static class BadBean
- {
- public void setString(String string)
- {
+
+ public static class BadBean {
+ public void setString(String string) {
}
}
}
Modified: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/CollectionTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/CollectionTest.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/CollectionTest.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/CollectionTest.java Thu Mar 8 09:14:44 2007
@@ -1,3 +1,21 @@
+/**
+ * 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.aegis.type.java5;
import java.beans.Introspector;
@@ -19,11 +37,14 @@
import org.apache.cxf.aegis.type.java5.dto.DTOService;
import org.apache.cxf.aegis.type.java5.dto.ObjectDTO;
import org.apache.cxf.transport.local.LocalTransportFactory;
+import org.junit.Before;
+import org.junit.Test;
public class CollectionTest extends AbstractAegisTest {
private CustomTypeMapping tm;
private Java5TypeCreator creator;
+ @Before
public void setUp() throws Exception {
super.setUp();
@@ -34,6 +55,7 @@
}
@SuppressWarnings("unchecked")
+ @Test
public void testType() throws Exception {
Method m = CollectionService.class.getMethod("getStrings", new Class[0]);
@@ -53,6 +75,7 @@
}
@SuppressWarnings("unchecked")
+ @Test
public void testRecursiveCollections() throws Exception {
Method m = CollectionService.class.getMethod("getStringCollections", new Class[0]);
@@ -79,6 +102,7 @@
}
@SuppressWarnings("unchecked")
+ @Test
public void testPDType() throws Exception {
PropertyDescriptor pd = Introspector.getBeanInfo(CollectionDTO.class, Object.class)
.getPropertyDescriptors()[0];
@@ -93,9 +117,10 @@
assertTrue(type.getTypeClass().isAssignableFrom(String.class));
}
+ @Test
public void testCollectionDTO() {
- CustomTypeMapping tm = new CustomTypeMapping();
- Java5TypeCreator creator = new Java5TypeCreator();
+ tm = new CustomTypeMapping();
+ creator = new Java5TypeCreator();
creator.setConfiguration(new Configuration());
tm.setTypeCreator(creator);
@@ -115,9 +140,10 @@
assertEquals(String.class, comType.getTypeClass());
}
+ @Test
public void testObjectDTO() {
- CustomTypeMapping tm = new CustomTypeMapping();
- Java5TypeCreator creator = new Java5TypeCreator();
+ tm = new CustomTypeMapping();
+ creator = new Java5TypeCreator();
creator.setConfiguration(new Configuration());
tm.setTypeCreator(creator);
@@ -139,13 +165,14 @@
assertEquals(Object.class, comType.getTypeClass());
}
+ @Test
public void testCollectionDTOService() throws Exception {
createService(DTOService.class, null);
- invoke("DTOService",
- LocalTransportFactory.TRANSPORT_ID,
+ invoke("DTOService", LocalTransportFactory.TRANSPORT_ID,
"/org/apache/cxf/aegis/type/java5/dto/GetDTO.xml");
}
+ @Test
public void testCollectionServiceWSDL() throws Exception {
createService(CollectionService.class, null);
@@ -153,12 +180,15 @@
assertValid("//xsd:element[@name='return'][@type='ArrayOfString']", wsdl);
}
+ @Test
public void testUnannotatedStrings() throws Exception {
createService(CollectionService.class, null);
-
+
Document doc = getWSDLDocument("CollectionService");
// printNode(doc);
- assertValid("//xsd:element[@name='getUnannotatedStringsResponse']/xsd:complexType/xsd:sequence/xsd:element[@type='ArrayOfString']",
+ assertValid(
+ "//xsd:element[@name='getUnannotatedStringsResponse']"
+ + "/xsd:complexType/xsd:sequence/xsd:element[@type='ArrayOfString']",
doc);
}
Modified: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/ConfigurationTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/ConfigurationTest.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/ConfigurationTest.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/ConfigurationTest.java Thu Mar 8 09:14:44 2007
@@ -1,3 +1,21 @@
+/**
+ * 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.aegis.type.java5;
import javax.xml.namespace.QName;
@@ -10,22 +28,20 @@
import org.apache.cxf.aegis.type.XMLTypeCreator;
import org.apache.cxf.aegis.type.basic.BeanType;
import org.apache.cxf.aegis.type.basic.BeanTypeInfo;
+import org.junit.Before;
+import org.junit.Test;
/**
* @author adam
- *
*/
-public class ConfigurationTest
- extends AbstractAegisTest
-{
+public class ConfigurationTest extends AbstractAegisTest {
CustomTypeMapping tm;
- Configuration config = null;
+ Configuration config;
- public void setUp()
- throws Exception
- {
+ @Before
+ public void setUp() throws Exception {
super.setUp();
DefaultTypeMappingRegistry reg = new DefaultTypeMappingRegistry();
@@ -36,65 +52,65 @@
next.setConfiguration(reg.getConfiguration());
creator.setNextCreator(next);
reg.createDefaultMappings();
- tm = (CustomTypeMapping) reg.getDefaultTypeMapping();
+ tm = (CustomTypeMapping)reg.getDefaultTypeMapping();
tm.setTypeCreator(creator);
}
-
- public void testNillableDefaultTrue() throws Exception
- {
- config.setDefaultNillable( true );
+
+ @Test
+ public void testNillableDefaultTrue() throws Exception {
+ config.setDefaultNillable(true);
Type type = tm.getTypeCreator().createType(AnnotatedBean1.class);
- BeanTypeInfo info = ((BeanType) type).getTypeInfo();
+ BeanTypeInfo info = ((BeanType)type).getTypeInfo();
assertTrue(info.isNillable(new QName(info.getDefaultNamespace(), "bogusProperty")));
}
-
- public void testNillableDefaultFalse() throws Exception
- {
- config.setDefaultNillable( false );
+
+ @Test
+ public void testNillableDefaultFalse() throws Exception {
+ config.setDefaultNillable(false);
Type type = tm.getTypeCreator().createType(AnnotatedBean1.class);
- BeanTypeInfo info = ((BeanType) type).getTypeInfo();
+ BeanTypeInfo info = ((BeanType)type).getTypeInfo();
assertFalse(info.isNillable(new QName(info.getDefaultNamespace(), "bogusProperty")));
}
-
- public void testMinOccursDefault0() throws Exception
- {
- config.setDefaultMinOccurs( 0 );
+
+ @Test
+ public void testMinOccursDefault0() throws Exception {
+ config.setDefaultMinOccurs(0);
Type type = tm.getTypeCreator().createType(AnnotatedBean1.class);
- BeanTypeInfo info = ((BeanType) type).getTypeInfo();
+ BeanTypeInfo info = ((BeanType)type).getTypeInfo();
assertEquals(info.getMinOccurs(new QName(info.getDefaultNamespace(), "bogusProperty")), 0);
}
-
- public void testMinOccursDefault1() throws Exception
- {
- config.setDefaultMinOccurs( 1 );
+
+ @Test
+ public void testMinOccursDefault1() throws Exception {
+ config.setDefaultMinOccurs(1);
Type type = tm.getTypeCreator().createType(AnnotatedBean1.class);
- BeanTypeInfo info = ((BeanType) type).getTypeInfo();
+ BeanTypeInfo info = ((BeanType)type).getTypeInfo();
assertEquals(info.getMinOccurs(new QName(info.getDefaultNamespace(), "bogusProperty")), 1);
}
-
- public void testExtensibleDefaultTrue() throws Exception
- {
- config.setDefaultExtensibleElements( true );
- config.setDefaultExtensibleAttributes( true );
+
+ @Test
+ public void testExtensibleDefaultTrue() throws Exception {
+ config.setDefaultExtensibleElements(true);
+ config.setDefaultExtensibleAttributes(true);
Type type = tm.getTypeCreator().createType(AnnotatedBean1.class);
- BeanTypeInfo info = ((BeanType) type).getTypeInfo();
+ BeanTypeInfo info = ((BeanType)type).getTypeInfo();
assertTrue(info.isExtensibleElements());
assertTrue(info.isExtensibleAttributes());
}
-
- public void testExtensibleDefaultFalse() throws Exception
- {
- config.setDefaultExtensibleElements( false );
- config.setDefaultExtensibleAttributes( false );
+
+ @Test
+ public void testExtensibleDefaultFalse() throws Exception {
+ config.setDefaultExtensibleElements(false);
+ config.setDefaultExtensibleAttributes(false);
Type type = tm.getTypeCreator().createType(AnnotatedBean1.class);
- BeanTypeInfo info = ((BeanType) type).getTypeInfo();
+ BeanTypeInfo info = ((BeanType)type).getTypeInfo();
assertFalse(info.isExtensibleElements());
assertFalse(info.isExtensibleAttributes());
}
-
-}
\ No newline at end of file
+
+}
Modified: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/CurrencyService.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/CurrencyService.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/CurrencyService.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/CurrencyService.java Thu Mar 8 09:14:44 2007
@@ -1,16 +1,29 @@
+/**
+ * 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.aegis.type.java5;
-public class CurrencyService
-{
- public enum Currency
- {
- USD,
- POUNDS,
- EURO
+public class CurrencyService {
+ public enum Currency {
+ USD, POUNDS, EURO
}
-
- public int convert(int input, Currency inputCurrency, Currency outputCurrency)
- {
+
+ public int convert(int input, Currency inputCurrency, Currency outputCurrency) {
return input;
}
}
Modified: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/CustomStringType.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/CustomStringType.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/CustomStringType.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/CustomStringType.java Thu Mar 8 09:14:44 2007
@@ -1,8 +1,25 @@
+/**
+ * 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.aegis.type.java5;
import org.apache.cxf.aegis.type.basic.StringType;
-public class CustomStringType extends StringType
-{
+public class CustomStringType extends StringType {
}
Modified: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/DualOutService.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/DualOutService.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/DualOutService.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/DualOutService.java Thu Mar 8 09:14:44 2007
@@ -1,3 +1,21 @@
+/**
+ * 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.aegis.type.java5;
import java.util.ArrayList;
@@ -8,19 +26,17 @@
import javax.jws.WebService;
import javax.xml.ws.Holder;
-@WebService(serviceName="DualOutService")
-public class DualOutService
-{
+@WebService(serviceName = "DualOutService")
+public class DualOutService {
@WebMethod
- public String getValues(@WebParam(mode=WebParam.Mode.OUT) Holder<String> out2)
- {
+ public String getValues(@WebParam(mode = WebParam.Mode.OUT)
+ Holder<String> out2) {
out2.value = "hi";
return "hi";
}
-
+
@WebMethod
- public Collection<String> getStrings()
- {
+ public Collection<String> getStrings() {
return new ArrayList<String>();
}
}
Modified: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/DualOutServiceTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/DualOutServiceTest.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/DualOutServiceTest.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/DualOutServiceTest.java Thu Mar 8 09:14:44 2007
@@ -1,3 +1,21 @@
+/**
+ * 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.aegis.type.java5;
import org.w3c.dom.Document;
@@ -5,24 +23,28 @@
import org.apache.cxf.aegis.AbstractAegisTest;
import org.apache.cxf.aegis.util.XmlConstants;
import org.apache.cxf.jaxws.JaxWsServerFactoryBean;
+import org.junit.Test;
-public class DualOutServiceTest
- extends AbstractAegisTest
-{
- public void testWSDL() throws Exception
- {
+public class DualOutServiceTest extends AbstractAegisTest {
+ @Test
+ public void testWSDL() throws Exception {
JaxWsServerFactoryBean sf = new JaxWsServerFactoryBean();
sf.setServiceClass(DualOutService.class);
sf.setAddress("DualOutService");
sf.setBus(getBus());
setupAegis(sf);
sf.create();
-
+
Document wsdl = getWSDLDocument("DualOutService");
assertNotNull(wsdl);
-
+
addNamespace("xsd", XmlConstants.XSD);
- assertValid("//xsd:element[@name='getValuesResponse']//xsd:element[@name='return'][@type='xsd:string']", wsdl);
- assertValid("//xsd:element[@name='getValuesResponse']//xsd:element[@name='out2'][@type='xsd:string']", wsdl);
+ assertValid(
+ "//xsd:element[@name='getValuesResponse']//xsd:element"
+ + "[@name='return'][@type='xsd:string']",
+ wsdl);
+ assertValid(
+ "//xsd:element[@name='getValuesResponse']//xsd:element[@name='out2'][@type='xsd:string']",
+ wsdl);
}
}
Modified: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/EnumTypeTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/EnumTypeTest.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/EnumTypeTest.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/EnumTypeTest.java Thu Mar 8 09:14:44 2007
@@ -1,6 +1,23 @@
+/**
+ * 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.aegis.type.java5;
-import javax.mail.MessageContext;
import javax.xml.namespace.QName;
import org.w3c.dom.Document;
@@ -14,66 +31,67 @@
import org.apache.cxf.aegis.util.XmlConstants;
import org.apache.cxf.aegis.xml.jdom.JDOMReader;
import org.apache.cxf.aegis.xml.jdom.JDOMWriter;
-import org.apache.cxf.binding.soap.SoapConstants;
import org.jdom.Element;
import org.jdom.output.DOMOutputter;
+import org.junit.Before;
+import org.junit.Test;
-public class EnumTypeTest
- extends AbstractAegisTest
-{
+public class EnumTypeTest extends AbstractAegisTest {
private CustomTypeMapping tm;
-
- private enum smallEnum { VALUE1, VALUE2 };
-
- public void setUp() throws Exception
- {
+
+ private enum smallEnum {
+ VALUE1, VALUE2
+ };
+
+ @Before
+ public void setUp() throws Exception {
super.setUp();
-
+
tm = new CustomTypeMapping();
Java5TypeCreator creator = new Java5TypeCreator();
creator.setConfiguration(new Configuration());
tm.setTypeCreator(creator);
}
- public void testType() throws Exception
- {
+ @Test
+ public void testType() throws Exception {
EnumType type = new EnumType();
type.setTypeClass(smallEnum.class);
type.setSchemaType(new QName("urn:test", "test"));
tm.register(type);
-
+
Element root = new Element("root");
JDOMWriter writer = new JDOMWriter(root);
-
+
type.writeObject(smallEnum.VALUE1, writer, new Context());
-
+
assertEquals("VALUE1", root.getValue());
-
+
JDOMReader reader = new JDOMReader(root);
Object value = type.readObject(reader, new Context());
-
+
assertEquals(smallEnum.VALUE1, value);
}
- public void testAutoCreation() throws Exception
- {
- Type type = (Type) tm.getTypeCreator().createType(smallEnum.class);
-
- assertTrue( type instanceof EnumType );
- }
-
- public void testTypeAttributeOnEnum() throws Exception
- {
- Type type = (Type) tm.getTypeCreator().createType(TestEnum.class);
-
+ @Test
+ public void testAutoCreation() throws Exception {
+ Type type = (Type)tm.getTypeCreator().createType(smallEnum.class);
+
+ assertTrue(type instanceof EnumType);
+ }
+
+ @Test
+ public void testTypeAttributeOnEnum() throws Exception {
+ Type type = (Type)tm.getTypeCreator().createType(TestEnum.class);
+
assertEquals("urn:xfire:foo", type.getSchemaType().getNamespaceURI());
-
- assertTrue( type instanceof EnumType );
+
+ assertTrue(type instanceof EnumType);
}
- public void testWSDL() throws Exception
- {
+ @Test
+ public void testWSDL() throws Exception {
EnumType type = new EnumType();
type.setTypeClass(smallEnum.class);
type.setSchemaType(new QName("urn:test", "test"));
@@ -88,11 +106,11 @@
assertValid("//xsd:restriction[@base='xsd:string']/xsd:enumeration[@value='VALUE1']", doc);
assertValid("//xsd:restriction[@base='xsd:string']/xsd:enumeration[@value='VALUE2']", doc);
}
-
- public void testCurrencyService() throws Exception
- {
+
+ @Test
+ public void testCurrencyService() throws Exception {
createService(CurrencyService.class, null);
-
+
Document wsdl = getWSDLDocument("CurrencyService");
assertValid("//xsd:element[@name='inputCurrency'][@nillable='true']", wsdl);
@@ -101,48 +119,43 @@
assertValid("//xsd:restriction[@base='xsd:string']/xsd:enumeration[@value='EURO']", wsdl);
assertValid("//xsd:restriction[@base='xsd:string']/xsd:enumeration[@value='POUNDS']", wsdl);
}
-
-
- public void testNillable() throws Exception
- {
+
+ @Test
+ public void testNillable() throws Exception {
Type type = tm.getTypeCreator().createType(EnumBean.class);
tm.register(type);
-
+
Element root = new Element("root");
JDOMWriter writer = new JDOMWriter(root);
-
+
type.writeObject(new EnumBean(), writer, new Context());
JDOMReader reader = new JDOMReader(root);
Object value = type.readObject(reader, new Context());
-
+
assertTrue(value instanceof EnumBean);
- EnumBean bean = (EnumBean) value;
+ EnumBean bean = (EnumBean)value;
assertNull(bean.getCurrency());
}
-
+
public static class EnumBean {
private Currency currency;
- public Currency getCurrency()
- {
+ public Currency getCurrency() {
return currency;
}
- public void setCurrency(Currency currency)
- {
+ public void setCurrency(Currency currency) {
this.currency = currency;
}
-
- public Currency[] getSomeCurrencies()
- {
- return new Currency[] { Currency.EURO, null };
+
+ public Currency[] getSomeCurrencies() {
+ return new Currency[] {Currency.EURO, null};
}
-
- public void setSomeCurrencies(Currency[] currencies)
- {
-
+
+ public void setSomeCurrencies(Currency[] currencies) {
+
}
}
}
Modified: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/MapTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/MapTest.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/MapTest.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/MapTest.java Thu Mar 8 09:14:44 2007
@@ -1,3 +1,21 @@
+/**
+ * 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.aegis.type.java5;
import java.beans.Introspector;
@@ -17,17 +35,17 @@
import org.apache.cxf.aegis.type.collection.MapType;
import org.apache.cxf.aegis.type.java5.dto.MapDTO;
import org.apache.cxf.aegis.type.java5.dto.MapDTOService;
+import org.junit.Before;
+import org.junit.Test;
-public class MapTest
- extends AbstractAegisTest
-{
+public class MapTest extends AbstractAegisTest {
private CustomTypeMapping tm;
private Java5TypeCreator creator;
- public void setUp() throws Exception
- {
+ @Before
+ public void setUp() throws Exception {
super.setUp();
-
+
tm = new CustomTypeMapping();
creator = new Java5TypeCreator();
creator.setConfiguration(new Configuration());
@@ -35,129 +53,124 @@
}
@SuppressWarnings("unchecked")
- public void testType() throws Exception
- {
+ @Test
+ public void testType() throws Exception {
Method m = MapService.class.getMethod("getMap", new Class[0]);
-
+
Type type = creator.createType(m, -1);
tm.register(type);
- assertTrue( type instanceof MapType );
-
- MapType mapType = (MapType) type;
+ assertTrue(type instanceof MapType);
+
+ MapType mapType = (MapType)type;
QName keyName = mapType.getKeyName();
assertNotNull(keyName);
-
+
type = mapType.getKeyType();
assertNotNull(type);
assertTrue(type.getTypeClass().isAssignableFrom(String.class));
-
+
type = mapType.getValueType();
assertNotNull(type);
assertTrue(type.getTypeClass().isAssignableFrom(Integer.class));
}
- public void testRecursiveType() throws Exception
- {
+ @Test
+ public void testRecursiveType() throws Exception {
Method m = MapService.class.getMethod("getMapOfCollections", new Class[0]);
-
+
Type type = creator.createType(m, -1);
tm.register(type);
- assertTrue( type instanceof MapType );
-
- MapType mapType = (MapType) type;
+ assertTrue(type instanceof MapType);
+
+ MapType mapType = (MapType)type;
QName keyName = mapType.getKeyName();
assertNotNull(keyName);
-
+
type = mapType.getKeyType();
assertNotNull(type);
assertTrue(type instanceof CollectionType);
- assertEquals(String.class, ((CollectionType) type).getComponentType().getTypeClass());
-
+ assertEquals(String.class, ((CollectionType)type).getComponentType().getTypeClass());
+
type = mapType.getValueType();
assertNotNull(type);
assertTrue(type instanceof CollectionType);
- assertEquals(Double.class, ((CollectionType) type).getComponentType().getTypeClass());
+ assertEquals(Double.class, ((CollectionType)type).getComponentType().getTypeClass());
}
-
+
@SuppressWarnings("unchecked")
- public void testPDType() throws Exception
- {
- PropertyDescriptor pd =
- Introspector.getBeanInfo(MapDTO.class, Object.class).getPropertyDescriptors()[0];
+ @Test
+ public void testPDType() throws Exception {
+ PropertyDescriptor pd = Introspector.getBeanInfo(MapDTO.class,
+ Object.class).getPropertyDescriptors()[0];
Type type = creator.createType(pd);
tm.register(type);
- assertTrue( type instanceof MapType );
-
- MapType mapType = (MapType) type;
+ assertTrue(type instanceof MapType);
+
+ MapType mapType = (MapType)type;
QName keyName = mapType.getKeyName();
assertNotNull(keyName);
-
+
type = mapType.getKeyType();
assertNotNull(type);
assertTrue(type.getTypeClass().isAssignableFrom(String.class));
-
+
type = mapType.getValueType();
assertNotNull(type);
assertTrue(type.getTypeClass().isAssignableFrom(Integer.class));
}
@SuppressWarnings("unchecked")
- public void testMapDTO()
- {
- CustomTypeMapping tm = new CustomTypeMapping();
- Java5TypeCreator creator = new Java5TypeCreator();
+ @Test
+ public void testMapDTO() {
+ tm = new CustomTypeMapping();
+ creator = new Java5TypeCreator();
creator.setConfiguration(new Configuration());
tm.setTypeCreator(creator);
-
+
Type dto = creator.createType(MapDTO.class);
Set deps = dto.getDependencies();
-
- Type type = (Type) deps.iterator().next();
- assertTrue( type instanceof MapType );
-
- MapType mapType = (MapType) type;
-
+
+ Type type = (Type)deps.iterator().next();
+ assertTrue(type instanceof MapType);
+
+ MapType mapType = (MapType)type;
+
deps = dto.getDependencies();
assertEquals(1, deps.size());
-
+
type = mapType.getKeyType();
assertNotNull(type);
assertTrue(type.getTypeClass().isAssignableFrom(String.class));
-
+
type = mapType.getValueType();
assertNotNull(type);
assertTrue(type.getTypeClass().isAssignableFrom(Integer.class));
}
-
- public void testMapDTOService() throws Exception
- {
+
+ @Test
+ public void testMapDTOService() throws Exception {
createService(MapDTOService.class, null);
-
- invoke("MapDTOService",
- "/org/apache/cxf/aegis/type/java5/dto/GetDTO.xml");
- }
+ invoke("MapDTOService", "/org/apache/cxf/aegis/type/java5/dto/GetDTO.xml");
+ }
- public void testMapServiceWSDL() throws Exception
- {
+ @Test
+ public void testMapServiceWSDL() throws Exception {
createService(MapDTOService.class, null);
-
+
getWSDLDocument("MapDTOService");
}
-
- public class MapService
- {
- public Map<String,Integer> getMap()
- {
- return null;
+
+ public class MapService {
+ public Map<String, Integer> getMap() {
+ return null;
}
-
- public void setMap(Map<String,Integer> strings) {
-
+
+ public void setMap(Map<String, Integer> strings) {
+
}
-
- public Map<Collection<String>,Collection<Double>> getMapOfCollections()
- {
+
+ public Map<Collection<String>, Collection<Double>> getMapOfCollections() {
return null;
}
}
Modified: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/OperationNSTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/OperationNSTest.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/OperationNSTest.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/OperationNSTest.java Thu Mar 8 09:14:44 2007
@@ -1,3 +1,21 @@
+/**
+ * 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.aegis.type.java5;
import java.util.List;
@@ -14,10 +32,12 @@
import org.apache.cxf.aegis.databinding.AegisDatabinding;
import org.apache.cxf.aegis.util.XmlConstants;
import org.apache.cxf.jaxws.JaxWsServerFactoryBean;
-import org.apache.cxf.service.Service;
+import org.junit.Before;
+import org.junit.Test;
public class OperationNSTest extends AbstractAegisTest {
+ @Before
public void setUp() throws Exception {
super.setUp();
@@ -29,6 +49,7 @@
sf.create();
}
+ @Test
public void testWSDL() throws Exception {
Document wsdl = getWSDLDocument("NotificationService");
@@ -41,30 +62,33 @@
@WebMethod(operationName = "Notify", action = "")
@Oneway
- public void Notify(@WebParam(name = "Notify", targetNamespace = "http://docs.oasis-open.org/wsn/b-2")
- Document Notify);
+ void notify(@WebParam(name = "Notify",
+ targetNamespace = "http://docs.oasis-open.org/wsn/b-2")
+ Document notify);
@WebMethod(operationName = "query", action = "")
- @WebResult(name = "queryResponse", targetNamespace = "http://www.sics.se/NotificationLog")
- public List<Document> query(
- @WebParam(name = "xpath", targetNamespace = "http://www.sics.se/NotificationLog")
- String xpath);
+ @WebResult(name = "queryResponse",
+ targetNamespace = "http://www.sics.se/NotificationLog")
+ List<Document> query(@WebParam(name = "xpath",
+ targetNamespace = "http://www.sics.se/NotificationLog")
+ String xpath);
@WebMethod(operationName = "Notify2", action = "")
@Oneway
- public void Notify2(
- @WebParam(name = "Notify", targetNamespace = "http://docs.oasis-open.org/wsn/2004/06/wsn-WS-BaseNotification-1.2-draft-01.xsd")
- Document Notify);
+ void notify2(@WebParam(name = "Notify",
+ targetNamespace = "http://docs.oasis-open.org/wsn/2004/"
+ + "06/wsn-WS-BaseNotification-1.2-draft-01.xsd")
+ Document notify);
}
@WebService(endpointInterface = "org.apache.cxf.aegis.type.java5.OperationNSTest$NotificationLog",
- serviceName="NotificationService")
+ serviceName = "NotificationService")
public static class NotificationLogImpl implements NotificationLog {
- public void Notify(Document Notify) {
+ public void notify(Document notify) {
}
- public void Notify2(Document Notify) {
+ public void notify2(Document notify) {
}
public List<Document> query(String xpath) {
Modified: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/TestEnum.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/TestEnum.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/TestEnum.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/TestEnum.java Thu Mar 8 09:14:44 2007
@@ -1,8 +1,24 @@
+/**
+ * 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.aegis.type.java5;
-@XmlType(namespace="urn:xfire:foo")
-public enum TestEnum
-{
- VALUE1,
- VALUE2
+@XmlType(namespace = "urn:xfire:foo")
+public enum TestEnum {
+ VALUE1, VALUE2
}