You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@axis.apache.org by ve...@apache.org on 2012/11/07 20:41:02 UTC

svn commit: r1406772 - in /axis/axis1/java/trunk/integration: pom.xml src/test/java/test/wsdl/attachments/AttachmentTestCase.java src/test/java/test/wsdl/attachments/B1Impl.java src/test/wsdl/attachments/mime.wsdl

Author: veithen
Date: Wed Nov  7 19:41:02 2012
New Revision: 1406772

URL: http://svn.apache.org/viewvc?rev=1406772&view=rev
Log:
Increased test coverage for image serialization/deserialization.

Modified:
    axis/axis1/java/trunk/integration/pom.xml
    axis/axis1/java/trunk/integration/src/test/java/test/wsdl/attachments/AttachmentTestCase.java
    axis/axis1/java/trunk/integration/src/test/java/test/wsdl/attachments/B1Impl.java
    axis/axis1/java/trunk/integration/src/test/wsdl/attachments/mime.wsdl

Modified: axis/axis1/java/trunk/integration/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis1/java/trunk/integration/pom.xml?rev=1406772&r1=1406771&r2=1406772&view=diff
==============================================================================
--- axis/axis1/java/trunk/integration/pom.xml (original)
+++ axis/axis1/java/trunk/integration/pom.xml Wed Nov  7 19:41:02 2012
@@ -1551,6 +1551,7 @@
                                 <exclude>test/wsdl/marshall2/types/**</exclude>
                             </excludes>
                             <systemPropertyVariables>
+                                <java.awt.headless>true</java.awt.headless>
                                 <test.functional.ServicePort>${test.functional.ServicePort}</test.functional.ServicePort>
                             </systemPropertyVariables>
                         </configuration>

Modified: axis/axis1/java/trunk/integration/src/test/java/test/wsdl/attachments/AttachmentTestCase.java
URL: http://svn.apache.org/viewvc/axis/axis1/java/trunk/integration/src/test/java/test/wsdl/attachments/AttachmentTestCase.java?rev=1406772&r1=1406771&r2=1406772&view=diff
==============================================================================
--- axis/axis1/java/trunk/integration/src/test/java/test/wsdl/attachments/AttachmentTestCase.java (original)
+++ axis/axis1/java/trunk/integration/src/test/java/test/wsdl/attachments/AttachmentTestCase.java Wed Nov  7 19:41:02 2012
@@ -20,8 +20,11 @@ package test.wsdl.attachments;
 
 import javax.mail.internet.MimeBodyPart;
 import javax.mail.internet.MimeMultipart;
+import javax.xml.rpc.holders.FloatHolder;
+import javax.xml.rpc.holders.StringHolder;
 
 import org.apache.axis.attachments.OctetStream;
+import org.apache.axis.holders.ImageHolder;
 
 import test.HttpTestUtil;
 
@@ -46,6 +49,17 @@ public class AttachmentTestCase extends 
         return mpRoot;
     }
 
+    public void testGetCompanyInfo() throws Exception {
+        FloatHolder result = new FloatHolder();
+        StringHolder docs = new StringHolder();
+        ImageHolder logo = new ImageHolder();
+        getBinding().getCompanyInfo("IBM", result, docs, logo);
+        assertEquals(134, (int)(result.value*10));
+        assertEquals("IBM", docs.value);
+        assertEquals(24, logo.value.getWidth(null));
+        assertEquals(24, logo.value.getHeight(null));
+    }
+    
     public void testGetCompanyInfo2() throws Exception {
         assertEquals("GetCompanyInfo2", getBinding().getCompanyInfo2(0, "GetCompanyInfo2", null));
     }

Modified: axis/axis1/java/trunk/integration/src/test/java/test/wsdl/attachments/B1Impl.java
URL: http://svn.apache.org/viewvc/axis/axis1/java/trunk/integration/src/test/java/test/wsdl/attachments/B1Impl.java?rev=1406772&r1=1406771&r2=1406772&view=diff
==============================================================================
--- axis/axis1/java/trunk/integration/src/test/java/test/wsdl/attachments/B1Impl.java (original)
+++ axis/axis1/java/trunk/integration/src/test/java/test/wsdl/attachments/B1Impl.java Wed Nov  7 19:41:02 2012
@@ -7,9 +7,17 @@
 
 package test.wsdl.attachments;
 
+import java.awt.Graphics;
+import java.awt.image.BufferedImage;
+import java.rmi.RemoteException;
+
 import javax.mail.MessagingException;
 import javax.mail.internet.MimeBodyPart;
 import javax.mail.internet.MimeMultipart;
+import javax.xml.rpc.holders.FloatHolder;
+import javax.xml.rpc.holders.StringHolder;
+
+import org.apache.axis.holders.ImageHolder;
 
 public class B1Impl implements test.wsdl.attachments.Pt1 {
 
@@ -24,6 +32,16 @@ public class B1Impl implements test.wsdl
         return mpRoot;
     }
 
+    public void getCompanyInfo(String tickerSymbol, FloatHolder result, StringHolder docs, ImageHolder logo) throws RemoteException {
+        result.value = 13.4f;
+        docs.value = tickerSymbol;
+        BufferedImage image = new BufferedImage(24, 24, BufferedImage.TYPE_INT_ARGB);
+        Graphics g = image.createGraphics();
+        g.drawLine(0, 0, 24, 24);
+        g.dispose();
+        logo.value = image;
+    }
+
     public java.lang.String getCompanyInfo2(float result, java.lang.String docs, java.awt.Image logo) throws java.rmi.RemoteException {
         return docs;
     }

Modified: axis/axis1/java/trunk/integration/src/test/wsdl/attachments/mime.wsdl
URL: http://svn.apache.org/viewvc/axis/axis1/java/trunk/integration/src/test/wsdl/attachments/mime.wsdl?rev=1406772&r1=1406771&r2=1406772&view=diff
==============================================================================
--- axis/axis1/java/trunk/integration/src/test/wsdl/attachments/mime.wsdl (original)
+++ axis/axis1/java/trunk/integration/src/test/wsdl/attachments/mime.wsdl Wed Nov  7 19:41:02 2012
@@ -59,12 +59,10 @@
   </message>
 
   <portType name="pt1">
-<!--
     <operation name="GetCompanyInfo">
       <input message="tns:pt1"/>
       <output message="tns:pt2"/>
     </operation>
--->
     <operation name="GetCompanyInfo2">
       <input message="tns:pt2"/>
       <output message="tns:pt1"/>
@@ -110,7 +108,6 @@
   <binding name="b1" type="tns:pt1">
     <soap:binding style="rpc"
                   transport="http://schemas.xmlsoap.org/soap/http"/>
-<!--
     <operation name="GetCompanyInfo">
       <soap:operation soapAction="http://example.com/GetCompanyInfo"/>
       <input>
@@ -131,7 +128,6 @@
         </mime:multipartRelated>
       </output>
     </operation>
--->
     <operation name="GetCompanyInfo2">
       <soap:operation soapAction="http://example.com/GetCompanyInfo2"/>
       <input>