antelder 2003/01/07 09:49:03
Modified: java/test/mime MimeImpl.java Mime.wsdl MimeTest.java
Mime.java
Log:
Fix the bounceImage4 test by swapping the order of the arguments, so I could use it
in the messaging attachments testcase. Raised bugzilla bug 15837 for the argument
order problem
Revision Changes Path
1.6 +6 -1 xml-axis-wsif/java/test/mime/MimeImpl.java
Index: MimeImpl.java
===================================================================
RCS file: /home/cvs/xml-axis-wsif/java/test/mime/MimeImpl.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- MimeImpl.java 7 Dec 2002 12:33:49 -0000 1.5
+++ MimeImpl.java 7 Jan 2003 17:49:03 -0000 1.6
@@ -157,7 +157,12 @@
return bounceImage(ds);
}
- public DataHandler bounceImage4(DataHandler ds, boolean b) {
+ //TODO: See bugzilla bug 15837
+ public DataHandler bounceImage4(boolean b, DataHandler ds) {
+// return bounceImage4(ds, b);
+// }
+//
+// public DataHandler bounceImage4(DataHandler ds, boolean b) {
if (b && (ds != null))
return bounceImage(ds);
else
1.7 +1 -1 xml-axis-wsif/java/test/mime/Mime.wsdl
Index: Mime.wsdl
===================================================================
RCS file: /home/cvs/xml-axis-wsif/java/test/mime/Mime.wsdl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Mime.wsdl 12 Dec 2002 11:53:15 -0000 1.6
+++ Mime.wsdl 7 Jan 2003 17:49:03 -0000 1.7
@@ -54,8 +54,8 @@
</message>
<message name="BounceImage4Message">
- <part name="file" type="tns:datahandler"/>
<part name="shouldBounce" type="xsd:boolean"/>
+ <part name="file" type="tns:datahandler"/>
</message>
<message name="MultiMimePartsMessage">
1.8 +9 -10 xml-axis-wsif/java/test/mime/MimeTest.java
Index: MimeTest.java
===================================================================
RCS file: /home/cvs/xml-axis-wsif/java/test/mime/MimeTest.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- MimeTest.java 12 Dec 2002 11:53:15 -0000 1.7
+++ MimeTest.java 7 Jan 2003 17:49:03 -0000 1.8
@@ -220,13 +220,12 @@
doit(BOUNCE_IMAGE3, "Mime.wsdl");
}
- // TODO: these 2 fail due to that pesky paramater order problem. Must fix!
- //public void testBounceImage4Default() {
- // doit(BOUNCE_IMAGE4_DEFAULT, "Mime.wsdl");
- //}
- //public void testBounceImage4False() {
- // doit(BOUNCE_IMAGE4_FALSE, "Mime.wsdl");
- //}
+ public void testBounceImage4Default() {
+ doit(BOUNCE_IMAGE4_DEFAULT, "Mime.wsdl");
+ }
+ public void testBounceImage4False() {
+ doit(BOUNCE_IMAGE4_FALSE, "Mime.wsdl");
+ }
/*
* This next test fails because axis will not allow null
@@ -580,20 +579,20 @@
private void bounce_image4_default(WSIFService service, Mime stub, String
portName)
throws Exception {
DataHandler dh1 = new DataHandler(new FileDataSource(imageLocation));
- DataHandler dh2 = stub.bounceImage4(dh1, true);
+ DataHandler dh2 = stub.bounceImage4(true, dh1);
assertTrue(compareFiles(dh1,dh2));
}
private void bounce_image4_false(WSIFService service, Mime stub, String
portName)
throws Exception {
DataHandler dh1 = new DataHandler(new FileDataSource(imageLocation));
- DataHandler dh2 = stub.bounceImage4(dh1, false);
+ DataHandler dh2 = stub.bounceImage4(false, dh1);
assertTrue(dh2==null);
}
private void bounce_image4_null(WSIFService service, Mime stub, String portName)
throws Exception {
- DataHandler dh2 = stub.bounceImage4(null, true);
+ DataHandler dh2 = stub.bounceImage4(true, null);
assertTrue(dh2==null);
}
1.6 +4 -1 xml-axis-wsif/java/test/mime/Mime.java
Index: Mime.java
===================================================================
RCS file: /home/cvs/xml-axis-wsif/java/test/mime/Mime.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Mime.java 7 Dec 2002 12:33:49 -0000 1.5
+++ Mime.java 7 Jan 2003 17:49:03 -0000 1.6
@@ -70,7 +70,10 @@
public Image bounceImage(Image im);
public DataHandler bounceImage2(DataHandler dh);
- public DataHandler bounceImage4(DataHandler dh, boolean b);
+// public DataHandler bounceImage4(DataHandler dh, boolean b);
+//
+// //TODO: See bugzilla bug 15837
+ public DataHandler bounceImage4(boolean b, DataHandler dh);
// Support for javax.xml.transform.Source and
// javax.mail.internet.MimeMultiPart is not implemented yet.
