antelder 2002/11/15 09:27:54 Modified: java/test/docStyle NWBankTest.java java/test/docStyle/wsifservice PwspNoCentrbankCurRatesSoap.java Added: java/test/http/net/pointwsp/www/ws/finance ArrayOfCurrency.java Currencyrates.java Currency.java Removed: java/test/docStyle/wsifservice Currencyrates.java Currency.java ArrayOfCurrency.java Log: Fix NWBank axis docstyle test to work with stubs Revision Changes Path 1.2 +10 -10 xml-axis-wsif/java/test/docStyle/NWBankTest.java Index: NWBankTest.java =================================================================== RCS file: /home/cvs/xml-axis-wsif/java/test/docStyle/NWBankTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- NWBankTest.java 15 Nov 2002 16:46:45 -0000 1.1 +++ NWBankTest.java 15 Nov 2002 17:27:53 -0000 1.2 @@ -57,6 +57,9 @@ package docStyle; +import http.net.pointwsp.www.ws.finance.ArrayOfCurrency; +import http.net.pointwsp.www.ws.finance.Currency; +import http.net.pointwsp.www.ws.finance.Currencyrates; import java.io.StringReader; import java.io.StringWriter; @@ -76,12 +79,9 @@ import org.w3c.dom.Node; import org.w3c.dom.NodeList; import org.xml.sax.InputSource; +import util.TestUtilities; -import docStyle.wsifservice.Currencyrates; import docStyle.wsifservice.PwspNoCentrbankCurRatesSoap; -import docStyle.wsifservice.ZipCodeResolverSoap; - -import util.TestUtilities; /** * Junit test to test out the AXIS provider docstyle support. @@ -112,7 +112,7 @@ public void testDynamicAxis() { doitDyn("pwspNoCentrbankCurRatesSoap", "axis"); -//TODO doitStub("pwspNoCentrbankCurRatesSoap", "axis"); + doitStub("pwspNoCentrbankCurRatesSoap", "axis"); } private void doitDyn(String portName, String protocol) { @@ -134,15 +134,15 @@ service.mapType( new javax.xml.namespace.QName("http/www.pointwsp.net/ws/finance", "currencyrates"), - docStyle.wsifservice.Currencyrates.class ); + Currencyrates.class ); service.mapType( new javax.xml.namespace.QName("http/www.pointwsp.net/ws/finance", "ArrayOfCurrency"), - docStyle.wsifservice.ArrayOfCurrency.class); + ArrayOfCurrency.class); service.mapType( new javax.xml.namespace.QName("http/www.pointwsp.net/ws/finance", "currency"), - docStyle.wsifservice.Currency.class); + Currency.class); WSIFPort port = service.getPort(portName); @@ -197,8 +197,8 @@ Object o = stub.GetRatesXML(); assertTrue("unexpected result: " + o, o instanceof Currencyrates); - Currencyrates cr = (Currencyrates) o; - System.out.println("source=" + cr.getSource()); +// Currencyrates cr = (Currencyrates) o; +// System.out.println("source=" + cr.getSource()); } catch (Exception ex) { ex.printStackTrace(); 1.1 xml-axis-wsif/java/test/http/net/pointwsp/www/ws/finance/ArrayOfCurrency.java Index: ArrayOfCurrency.java =================================================================== /** * ArrayOfCurrency.java * * This file was auto-generated from WSDL * by the Apache Axis WSDL2Java emitter. */ package http.net.pointwsp.www.ws.finance; public class ArrayOfCurrency implements java.io.Serializable { private http.net.pointwsp.www.ws.finance.Currency[] currency; public ArrayOfCurrency() { } public http.net.pointwsp.www.ws.finance.Currency[] getCurrency() { return currency; } public void setCurrency(http.net.pointwsp.www.ws.finance.Currency[] currency) { this.currency = currency; } public http.net.pointwsp.www.ws.finance.Currency getCurrency(int i) { return currency[i]; } public void setCurrency(int i, http.net.pointwsp.www.ws.finance.Currency value) { this.currency[i] = value; } private java.lang.Object __equalsCalc = null; public synchronized boolean equals(java.lang.Object obj) { if (!(obj instanceof ArrayOfCurrency)) return false; ArrayOfCurrency other = (ArrayOfCurrency) obj; if (obj == null) return false; if (this == obj) return true; if (__equalsCalc != null) { return (__equalsCalc == obj); } __equalsCalc = obj; boolean _equals; _equals = true && ((currency==null && other.getCurrency()==null) || (currency!=null && java.util.Arrays.equals(currency, other.getCurrency()))); __equalsCalc = null; return _equals; } private boolean __hashCodeCalc = false; public synchronized int hashCode() { if (__hashCodeCalc) { return 0; } __hashCodeCalc = true; int _hashCode = 1; if (getCurrency() != null) { for (int i=0; i<java.lang.reflect.Array.getLength(getCurrency()); i++) { java.lang.Object obj = java.lang.reflect.Array.get(getCurrency(), i); if (obj != null && !obj.getClass().isArray()) { _hashCode += obj.hashCode(); } } } __hashCodeCalc = false; return _hashCode; } // Type metadata private static org.apache.axis.description.TypeDesc typeDesc = new org.apache.axis.description.TypeDesc(ArrayOfCurrency.class); static { org.apache.axis.description.FieldDesc field = new org.apache.axis.description.ElementDesc(); field.setFieldName("currency"); field.setXmlName(new javax.xml.namespace.QName("http/www.pointwsp.net/ws/finance", "currency")); field.setMinOccursIs0(true); typeDesc.addFieldDesc(field); }; /** * Return type metadata object */ public static org.apache.axis.description.TypeDesc getTypeDesc() { return typeDesc; } /** * Get Custom Serializer */ public static org.apache.axis.encoding.Serializer getSerializer( java.lang.String mechType, java.lang.Class _javaType, javax.xml.namespace.QName _xmlType) { return new org.apache.axis.encoding.ser.BeanSerializer( _javaType, _xmlType, typeDesc); } /** * Get Custom Deserializer */ public static org.apache.axis.encoding.Deserializer getDeserializer( java.lang.String mechType, java.lang.Class _javaType, javax.xml.namespace.QName _xmlType) { return new org.apache.axis.encoding.ser.BeanDeserializer( _javaType, _xmlType, typeDesc); } } 1.1 xml-axis-wsif/java/test/http/net/pointwsp/www/ws/finance/Currencyrates.java Index: Currencyrates.java =================================================================== /** * Currencyrates.java * * This file was auto-generated from WSDL * by the Apache Axis WSDL2Java emitter. */ package http.net.pointwsp.www.ws.finance; public class Currencyrates implements java.io.Serializable { private java.lang.String source; private java.lang.String basecurrency; private http.net.pointwsp.www.ws.finance.ArrayOfCurrency ratelist; public Currencyrates() { } public java.lang.String getSource() { return source; } public void setSource(java.lang.String source) { this.source = source; } public java.lang.String getBasecurrency() { return basecurrency; } public void setBasecurrency(java.lang.String basecurrency) { this.basecurrency = basecurrency; } public http.net.pointwsp.www.ws.finance.ArrayOfCurrency getRatelist() { return ratelist; } public void setRatelist(http.net.pointwsp.www.ws.finance.ArrayOfCurrency ratelist) { this.ratelist = ratelist; } private java.lang.Object __equalsCalc = null; public synchronized boolean equals(java.lang.Object obj) { if (!(obj instanceof Currencyrates)) return false; Currencyrates other = (Currencyrates) obj; if (obj == null) return false; if (this == obj) return true; if (__equalsCalc != null) { return (__equalsCalc == obj); } __equalsCalc = obj; boolean _equals; _equals = true && ((source==null && other.getSource()==null) || (source!=null && source.equals(other.getSource()))) && ((basecurrency==null && other.getBasecurrency()==null) || (basecurrency!=null && basecurrency.equals(other.getBasecurrency()))) && ((ratelist==null && other.getRatelist()==null) || (ratelist!=null && ratelist.equals(other.getRatelist()))); __equalsCalc = null; return _equals; } private boolean __hashCodeCalc = false; public synchronized int hashCode() { if (__hashCodeCalc) { return 0; } __hashCodeCalc = true; int _hashCode = 1; if (getSource() != null) { _hashCode += getSource().hashCode(); } if (getBasecurrency() != null) { _hashCode += getBasecurrency().hashCode(); } if (getRatelist() != null) { _hashCode += getRatelist().hashCode(); } __hashCodeCalc = false; return _hashCode; } // Type metadata private static org.apache.axis.description.TypeDesc typeDesc = new org.apache.axis.description.TypeDesc(Currencyrates.class); static { org.apache.axis.description.FieldDesc field = new org.apache.axis.description.ElementDesc(); field.setFieldName("source"); field.setXmlName(new javax.xml.namespace.QName("http/www.pointwsp.net/ws/finance", "source")); field.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string")); field.setMinOccursIs0(true); typeDesc.addFieldDesc(field); field = new org.apache.axis.description.ElementDesc(); field.setFieldName("basecurrency"); field.setXmlName(new javax.xml.namespace.QName("http/www.pointwsp.net/ws/finance", "basecurrency")); field.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string")); field.setMinOccursIs0(true); typeDesc.addFieldDesc(field); field = new org.apache.axis.description.ElementDesc(); field.setFieldName("ratelist"); field.setXmlName(new javax.xml.namespace.QName("http/www.pointwsp.net/ws/finance", "ratelist")); field.setXmlType(new javax.xml.namespace.QName("http/www.pointwsp.net/ws/finance", "ArrayOfCurrency")); field.setMinOccursIs0(true); typeDesc.addFieldDesc(field); }; /** * Return type metadata object */ public static org.apache.axis.description.TypeDesc getTypeDesc() { return typeDesc; } /** * Get Custom Serializer */ public static org.apache.axis.encoding.Serializer getSerializer( java.lang.String mechType, java.lang.Class _javaType, javax.xml.namespace.QName _xmlType) { return new org.apache.axis.encoding.ser.BeanSerializer( _javaType, _xmlType, typeDesc); } /** * Get Custom Deserializer */ public static org.apache.axis.encoding.Deserializer getDeserializer( java.lang.String mechType, java.lang.Class _javaType, javax.xml.namespace.QName _xmlType) { return new org.apache.axis.encoding.ser.BeanDeserializer( _javaType, _xmlType, typeDesc); } } 1.1 xml-axis-wsif/java/test/http/net/pointwsp/www/ws/finance/Currency.java Index: Currency.java =================================================================== /** * Currency.java * * This file was auto-generated from WSDL * by the Apache Axis WSDL2Java emitter. */ package http.net.pointwsp.www.ws.finance; public class Currency implements java.io.Serializable { private java.util.Calendar ratedate; private java.lang.String code; private int unit; private java.math.BigDecimal rate; public Currency() { } public java.util.Calendar getRatedate() { return ratedate; } public void setRatedate(java.util.Calendar ratedate) { this.ratedate = ratedate; } public java.lang.String getCode() { return code; } public void setCode(java.lang.String code) { this.code = code; } public int getUnit() { return unit; } public void setUnit(int unit) { this.unit = unit; } public java.math.BigDecimal getRate() { return rate; } public void setRate(java.math.BigDecimal rate) { this.rate = rate; } private java.lang.Object __equalsCalc = null; public synchronized boolean equals(java.lang.Object obj) { if (!(obj instanceof Currency)) return false; Currency other = (Currency) obj; if (obj == null) return false; if (this == obj) return true; if (__equalsCalc != null) { return (__equalsCalc == obj); } __equalsCalc = obj; boolean _equals; _equals = true && ((ratedate==null && other.getRatedate()==null) || (ratedate!=null && ratedate.equals(other.getRatedate()))) && ((code==null && other.getCode()==null) || (code!=null && code.equals(other.getCode()))) && unit == other.getUnit() && ((rate==null && other.getRate()==null) || (rate!=null && rate.equals(other.getRate()))); __equalsCalc = null; return _equals; } private boolean __hashCodeCalc = false; public synchronized int hashCode() { if (__hashCodeCalc) { return 0; } __hashCodeCalc = true; int _hashCode = 1; if (getRatedate() != null) { _hashCode += getRatedate().hashCode(); } if (getCode() != null) { _hashCode += getCode().hashCode(); } _hashCode += getUnit(); if (getRate() != null) { _hashCode += getRate().hashCode(); } __hashCodeCalc = false; return _hashCode; } // Type metadata private static org.apache.axis.description.TypeDesc typeDesc = new org.apache.axis.description.TypeDesc(Currency.class); static { org.apache.axis.description.FieldDesc field = new org.apache.axis.description.ElementDesc(); field.setFieldName("ratedate"); field.setXmlName(new javax.xml.namespace.QName("http/www.pointwsp.net/ws/finance", "ratedate")); field.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "dateTime")); typeDesc.addFieldDesc(field); field = new org.apache.axis.description.ElementDesc(); field.setFieldName("code"); field.setXmlName(new javax.xml.namespace.QName("http/www.pointwsp.net/ws/finance", "code")); field.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string")); field.setMinOccursIs0(true); typeDesc.addFieldDesc(field); field = new org.apache.axis.description.ElementDesc(); field.setFieldName("unit"); field.setXmlName(new javax.xml.namespace.QName("http/www.pointwsp.net/ws/finance", "unit")); field.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "int")); typeDesc.addFieldDesc(field); field = new org.apache.axis.description.ElementDesc(); field.setFieldName("rate"); field.setXmlName(new javax.xml.namespace.QName("http/www.pointwsp.net/ws/finance", "rate")); field.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "decimal")); typeDesc.addFieldDesc(field); }; /** * Return type metadata object */ public static org.apache.axis.description.TypeDesc getTypeDesc() { return typeDesc; } /** * Get Custom Serializer */ public static org.apache.axis.encoding.Serializer getSerializer( java.lang.String mechType, java.lang.Class _javaType, javax.xml.namespace.QName _xmlType) { return new org.apache.axis.encoding.ser.BeanSerializer( _javaType, _xmlType, typeDesc); } /** * Get Custom Deserializer */ public static org.apache.axis.encoding.Deserializer getDeserializer( java.lang.String mechType, java.lang.Class _javaType, javax.xml.namespace.QName _xmlType) { return new org.apache.axis.encoding.ser.BeanDeserializer( _javaType, _xmlType, typeDesc); } } 1.2 +3 -1 xml-axis-wsif/java/test/docStyle/wsifservice/PwspNoCentrbankCurRatesSoap.java Index: PwspNoCentrbankCurRatesSoap.java =================================================================== RCS file: /home/cvs/xml-axis-wsif/java/test/docStyle/wsifservice/PwspNoCentrbankCurRatesSoap.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- PwspNoCentrbankCurRatesSoap.java 15 Nov 2002 16:46:45 -0000 1.1 +++ PwspNoCentrbankCurRatesSoap.java 15 Nov 2002 17:27:53 -0000 1.2 @@ -7,6 +7,8 @@ package docStyle.wsifservice; +import http.net.pointwsp.www.ws.finance.Currencyrates; + public interface PwspNoCentrbankCurRatesSoap extends java.rmi.Remote { @@ -14,5 +16,5 @@ /** * Last daily rates quoted by norwegian central bank */ - public docStyle.wsifservice.Currencyrates GetRatesXML() throws java.rmi.RemoteException; + public Currencyrates GetRatesXML() throws java.rmi.RemoteException; }