dims 2002/12/22 18:48:42
Modified: java/src/org/apache/axis/encoding/ser
MimeMultipartDataHandlerDeserializer.java
Added: java/test/wsdl/attachments AttachmentTestCase.java
B1Impl.java
Log:
Fix for Bug 15148 - test.wsdl.attachments test error is masked
Revision Changes Path
1.1 xml-axis/java/test/wsdl/attachments/AttachmentTestCase.java
Index: AttachmentTestCase.java
===================================================================
/**
* AttachmentTestCase.java
*
* This file was auto-generated from WSDL
* by the Apache Axis WSDL2Java emitter.
*/
package test.wsdl.attachments;
import javax.mail.internet.MimeBodyPart;
import javax.mail.internet.MimeMultipart;
public class AttachmentTestCase extends junit.framework.TestCase {
public AttachmentTestCase(java.lang.String name) {
super(name);
}
private MimeMultipart createMimeMultipart(String data) throws Exception {
// create the root multipart
MimeMultipart mpRoot = new MimeMultipart("mixed");
// Add text
MimeBodyPart mbp1 = new MimeBodyPart();
mbp1.setText(data);
mpRoot.addBodyPart(mbp1);
return mpRoot;
}
public void test1AttachmentPortRPCGetCompanyInfo2() throws Exception {
test.wsdl.attachments.Pt1 binding;
try {
binding = new
test.wsdl.attachments.AttachmentLocator().getAttachmentPortRPC();
} catch (javax.xml.rpc.ServiceException jre) {
if (jre.getLinkedCause() != null)
jre.getLinkedCause().printStackTrace();
throw new junit.framework.AssertionFailedError("JAX-RPC ServiceException
caught: " + jre);
}
assertTrue("binding is null", binding != null);
// Test operation
java.lang.String value = null;
value = binding.getCompanyInfo2(0, new java.lang.String("GetCompanyInfo2"),
null);
assertEquals(value, "GetCompanyInfo2");
}
public void test2AttachmentPortRPCInputPlainText() throws Exception {
test.wsdl.attachments.Pt1 binding;
try {
binding = new
test.wsdl.attachments.AttachmentLocator().getAttachmentPortRPC();
} catch (javax.xml.rpc.ServiceException jre) {
if (jre.getLinkedCause() != null)
jre.getLinkedCause().printStackTrace();
throw new junit.framework.AssertionFailedError("JAX-RPC ServiceException
caught: " + jre);
}
assertTrue("binding is null", binding != null);
// Test operation
binding.inputPlainText(new java.lang.String("InputPlainText"));
// TBD - validate results
}
public void test3AttachmentPortRPCInoutPlainText() throws Exception {
test.wsdl.attachments.Pt1 binding;
try {
binding = new
test.wsdl.attachments.AttachmentLocator().getAttachmentPortRPC();
} catch (javax.xml.rpc.ServiceException jre) {
if (jre.getLinkedCause() != null)
jre.getLinkedCause().printStackTrace();
throw new junit.framework.AssertionFailedError("JAX-RPC ServiceException
caught: " + jre);
}
assertTrue("binding is null", binding != null);
// Test operation
java.lang.String value = null;
value = binding.inoutPlainText(new java.lang.String("InoutPlainText"));
// TBD - validate results
assertEquals(value, "InoutPlainText");
}
public void test4AttachmentPortRPCEchoPlainText() throws Exception {
test.wsdl.attachments.Pt1 binding;
try {
binding = new
test.wsdl.attachments.AttachmentLocator().getAttachmentPortRPC();
} catch (javax.xml.rpc.ServiceException jre) {
if (jre.getLinkedCause() != null)
jre.getLinkedCause().printStackTrace();
throw new junit.framework.AssertionFailedError("JAX-RPC ServiceException
caught: " + jre);
}
assertTrue("binding is null", binding != null);
// Test operation
java.lang.String value = null;
value = binding.echoPlainText(new java.lang.String("EchoPlainText"));
// TBD - validate results
assertEquals(value, "EchoPlainText");
}
public void test5AttachmentPortRPCOutputPlainText() throws Exception {
test.wsdl.attachments.Pt1 binding;
try {
binding = new
test.wsdl.attachments.AttachmentLocator().getAttachmentPortRPC();
} catch (javax.xml.rpc.ServiceException jre) {
if (jre.getLinkedCause() != null)
jre.getLinkedCause().printStackTrace();
throw new junit.framework.AssertionFailedError("JAX-RPC ServiceException
caught: " + jre);
}
assertTrue("binding is null", binding != null);
// Test operation
java.lang.String value = null;
value = binding.outputPlainText();
// TBD - validate results
assertEquals(value, "OutputPlainText");
}
public void test6AttachmentPortRPCInputMimeMultipart() throws Exception {
test.wsdl.attachments.Pt1 binding;
try {
binding = new
test.wsdl.attachments.AttachmentLocator().getAttachmentPortRPC();
} catch (javax.xml.rpc.ServiceException jre) {
if (jre.getLinkedCause() != null)
jre.getLinkedCause().printStackTrace();
throw new junit.framework.AssertionFailedError("JAX-RPC ServiceException
caught: " + jre);
}
assertTrue("binding is null", binding != null);
// Test operation
binding.inputMimeMultipart(createMimeMultipart("InputMimeMultipart"));
// TBD - validate results
}
public void test7AttachmentPortRPCInoutMimeMultipart() throws Exception {
test.wsdl.attachments.Pt1 binding;
try {
binding = new
test.wsdl.attachments.AttachmentLocator().getAttachmentPortRPC();
} catch (javax.xml.rpc.ServiceException jre) {
if (jre.getLinkedCause() != null)
jre.getLinkedCause().printStackTrace();
throw new junit.framework.AssertionFailedError("JAX-RPC ServiceException
caught: " + jre);
}
assertTrue("binding is null", binding != null);
// Test operation
javax.mail.internet.MimeMultipart value = null;
value =
binding.inoutMimeMultipart(createMimeMultipart("InoutMimeMultipart"));
// TBD - validate results
}
public void test8AttachmentPortRPCEchoMimeMultipart() throws Exception {
test.wsdl.attachments.Pt1 binding;
try {
binding = new
test.wsdl.attachments.AttachmentLocator().getAttachmentPortRPC();
} catch (javax.xml.rpc.ServiceException jre) {
if (jre.getLinkedCause() != null)
jre.getLinkedCause().printStackTrace();
throw new junit.framework.AssertionFailedError("JAX-RPC ServiceException
caught: " + jre);
}
assertTrue("binding is null", binding != null);
// Test operation
javax.mail.internet.MimeMultipart value = null;
value = binding.echoMimeMultipart(createMimeMultipart("EchoMimeMultipart"));
// TBD - validate results
}
public void test9AttachmentPortRPCOutputMimeMultipart() throws Exception {
test.wsdl.attachments.Pt1 binding;
try {
binding = new
test.wsdl.attachments.AttachmentLocator().getAttachmentPortRPC();
} catch (javax.xml.rpc.ServiceException jre) {
if (jre.getLinkedCause() != null)
jre.getLinkedCause().printStackTrace();
throw new junit.framework.AssertionFailedError("JAX-RPC ServiceException
caught: " + jre);
}
assertTrue("binding is null", binding != null);
// Test operation
javax.mail.internet.MimeMultipart value = null;
value = binding.outputMimeMultipart();
// TBD - validate results
}
}
1.1 xml-axis/java/test/wsdl/attachments/B1Impl.java
Index: B1Impl.java
===================================================================
/**
* B1Impl.java
*
* This file was auto-generated from WSDL
* by the Apache Axis WSDL2Java emitter.
*/
package test.wsdl.attachments;
import javax.mail.MessagingException;
import javax.mail.internet.MimeBodyPart;
import javax.mail.internet.MimeMultipart;
public class B1Impl implements test.wsdl.attachments.Pt1 {
private MimeMultipart createMimeMultipart(String data) throws MessagingException
{
// create the root multipart
MimeMultipart mpRoot = new MimeMultipart("mixed");
// Add text
MimeBodyPart mbp1 = new MimeBodyPart();
mbp1.setText(data);
mpRoot.addBodyPart(mbp1);
return mpRoot;
}
public java.lang.String getCompanyInfo2(float result, java.lang.String docs,
java.awt.Image logo) throws java.rmi.RemoteException {
return docs;
}
public void inputPlainText(java.lang.String body) throws
java.rmi.RemoteException {
}
public java.lang.String inoutPlainText(java.lang.String body) throws
java.rmi.RemoteException {
return body;
}
public java.lang.String echoPlainText(java.lang.String body) throws
java.rmi.RemoteException {
return body;
}
public java.lang.String outputPlainText() throws java.rmi.RemoteException {
return "OutputPlainText";
}
public void inputMimeMultipart(javax.mail.internet.MimeMultipart body) throws
java.rmi.RemoteException {
}
public javax.mail.internet.MimeMultipart
inoutMimeMultipart(javax.mail.internet.MimeMultipart body) throws
java.rmi.RemoteException {
return body;
}
public javax.mail.internet.MimeMultipart
echoMimeMultipart(javax.mail.internet.MimeMultipart body) throws
java.rmi.RemoteException {
return body;
}
public javax.mail.internet.MimeMultipart outputMimeMultipart() throws
java.rmi.RemoteException {
try {
return createMimeMultipart("outputMimeMultipart");
} catch (MessagingException me) {
throw new java.rmi.RemoteException(me.getMessage(), me);
}
}
}
1.5 +1 -6
xml-axis/java/src/org/apache/axis/encoding/ser/MimeMultipartDataHandlerDeserializer.java
Index: MimeMultipartDataHandlerDeserializer.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/encoding/ser/MimeMultipartDataHandlerDeserializer.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- MimeMultipartDataHandlerDeserializer.java 11 Dec 2002 22:38:15 -0000 1.4
+++ MimeMultipartDataHandlerDeserializer.java 23 Dec 2002 02:48:42 -0000 1.5
@@ -89,12 +89,7 @@
setValue(mmp);
}
catch (Exception e) {
- // FIXME bug 15148 - we need to propigate these errors,
- // but this breaks the test.wsdl/attachments multi-part tests,
- // which pass empty stuff over the wire, which seems to screw
- // up the MimeMultipart class. Why did this ever work?
- // throw new SAXException(e);
- setValue(null);
+ throw new SAXException(e);
}
}
} // startElement
