You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by su...@apache.org on 2007/07/06 13:07:53 UTC
svn commit: r553835 - in
/webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj: ./
integration/
Author: sumedha
Date: Fri Jul 6 04:07:52 2007
New Revision: 553835
URL: http://svn.apache.org/viewvc?view=rev&rev=553835
Log:
removed system.out. code clean up.
Modified:
webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/AttachmentSerializationTest.java
webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/AttachmentTest.java
webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/PrefixesTest.java
webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/SOAPEnvelopeTest.java
webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/SOAPFaultTest.java
webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/SOAPMessageTest.java
webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/integration/EchoService.java
webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/integration/IntegrationTest.java
Modified: webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/AttachmentSerializationTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/AttachmentSerializationTest.java?view=diff&rev=553835&r1=553834&r2=553835
==============================================================================
--- webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/AttachmentSerializationTest.java (original)
+++ webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/AttachmentSerializationTest.java Fri Jul 6 04:07:52 2007
@@ -126,7 +126,6 @@
msg.writeTo(os);
os.flush();
- msg.writeTo(System.out);
return msg.countAttachments();
}
Modified: webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/AttachmentTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/AttachmentTest.java?view=diff&rev=553835&r1=553834&r2=553835
==============================================================================
--- webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/AttachmentTest.java (original)
+++ webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/AttachmentTest.java Fri Jul 6 04:07:52 2007
@@ -75,8 +75,6 @@
String id = attachment.getContentId();
assertEquals(content, stringContent);
}
- message.writeTo(System.out);
-
message.removeAllAttachments();
assertTrue(message.countAttachments() == 0);
}
@@ -229,32 +227,25 @@
if (!foundHeader1) {
foundHeader1 = true;
//MimeHeaders do match for header1
- //System.out.println("receive: name="+name+", value="+value);
} else {
fail("Error: Received the same header1 header twice");
- //System.out.println("received: name="+name+", value="+value);
}
} else if (name.equalsIgnoreCase("Content-Id") && value.equals("id@abc.com")) {
if (!foundHeader2) {
foundHeader2 = true;
//MimeHeaders do match for header2
- //System.out.println("receive: name="+name+", value="+value);
} else {
fail("Error: Received the same header2 header twice");
- //System.out.println("received: name="+name+", value="+value);
}
} else if (name.equals("Content-Type") && value.equals("text/xml")) {
if (!foundDefaultHeader) {
foundDefaultHeader = true;
//MimeHeaders do match for default header
- //System.out.println("receive: name="+name+", value="+value);
} else {
fail("Error: Received the same default header header twice");
- //System.out.println("received: name="+name+", value="+value);
}
} else {
fail("Error: Received an invalid header");
- //System.out.println("received: name="+name+", value="+value);
}
}
@@ -357,11 +348,9 @@
try {
int statusCode = client.executeMethod(method);
if (statusCode != HttpStatus.SC_OK) {
- //System.err.println("Method failed: " + method.getStatusLine());
return false;
}
- byte[] responseBody = method.getResponseBody();
-
+ //byte[] responseBody = method.getResponseBody();
} catch (HttpException e) {
e.printStackTrace();
return false;
@@ -373,5 +362,4 @@
}
return true;
}
-
-}
+}
\ No newline at end of file
Modified: webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/PrefixesTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/PrefixesTest.java?view=diff&rev=553835&r1=553834&r2=553835
==============================================================================
--- webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/PrefixesTest.java (original)
+++ webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/PrefixesTest.java Fri Jul 6 04:07:52 2007
@@ -78,8 +78,6 @@
new ByteArrayInputStream(
soappacket.getBytes()));
SOAPBody body = msg.getSOAPPart().getEnvelope().getBody();
- msg.writeTo(System.out);
-
validateBody(body.getChildElements());
}
Modified: webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/SOAPEnvelopeTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/SOAPEnvelopeTest.java?view=diff&rev=553835&r1=553834&r2=553835
==============================================================================
--- webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/SOAPEnvelopeTest.java (original)
+++ webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/SOAPEnvelopeTest.java Fri Jul 6 04:07:52 2007
@@ -71,7 +71,6 @@
new ByteArrayInputStream(XML_STRING.getBytes()));
SOAPPart sp = smsg.getSOAPPart();
SOAPEnvelope se = sp.getEnvelope();
- smsg.writeTo(System.out);
assertTrue(se != null);
// validate the body
@@ -86,7 +85,6 @@
new ByteArrayInputStream(XML_STRING.getBytes()));
SOAPPart sp = smsg.getSOAPPart();
SOAPEnvelope se = sp.getEnvelope();
- smsg.writeTo(System.out);
assertTrue(se != null);
SOAPHeader header = se.getHeader();
assertNotNull(header);
@@ -133,8 +131,6 @@
SOAPMessage smsg =
mf.createMessage(mimeheaders, baIS);
- smsg.writeTo(System.out);
-
SOAPEnvelope envelope = smsg.getSOAPPart().getEnvelope();
SOAPBody body = envelope.getBody();
assertTrue(body != null);
@@ -184,7 +180,6 @@
soapMessageWithLeadingComment.getBytes()));
SOAPPart part = message.getSOAPPart();
SOAPEnvelope envelope = part.getEnvelope();
- message.writeTo(System.out);
assertTrue(envelope != null);
assertTrue(envelope.getBody() != null);
}
@@ -210,7 +205,6 @@
soapMessageWithLeadingComment.getBytes()));
SOAPPart part = message.getSOAPPart();
SOAPEnvelope envelope = part.getEnvelope();
- message.writeTo(System.out);
assertTrue(envelope != null);
assertTrue(envelope.getBody() != null);
}
@@ -242,7 +236,6 @@
soapMessageWithLeadingComment.getBytes()));
SOAPPart part = message.getSOAPPart();
SOAPEnvelope envelope = part.getEnvelope();
- message.writeTo(System.out);
assertTrue(envelope != null);
assertTrue(envelope.getBody() != null);
}
@@ -572,4 +565,4 @@
fail("Unexpected Exception: " + e.getMessage());
}
}
-}
+}
\ No newline at end of file
Modified: webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/SOAPFaultTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/SOAPFaultTest.java?view=diff&rev=553835&r1=553834&r2=553835
==============================================================================
--- webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/SOAPFaultTest.java (original)
+++ webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/SOAPFaultTest.java Fri Jul 6 04:07:52 2007
@@ -578,18 +578,15 @@
SOAPBody body = envelope.getBody();
SOAPFault soapFault = body.addFault();
soapFault.addFaultReasonText("myReason", new Locale("en"));
- System.out.println("Adding second text");
soapFault.addFaultReasonText("de-myReason", new Locale("de"));
soapFault.addFaultReasonText("si-myReason", new Locale("si"));
soapMessage.saveChanges();
String faultReasonText = soapFault.getFaultReasonText(new Locale("si"));
- System.out.println(faultReasonText);
-
+ assertNotNull(faultReasonText);
faultReasonText = soapFault.getFaultReasonText(new Locale("ja"));
- System.out.println(faultReasonText);
-
-
+ assertNull(faultReasonText);
+
} catch (Exception e) {
fail("Unexpected Exception : " + e);
}
@@ -634,10 +631,7 @@
SOAPFault soapFault = body.addFault();
Detail detail = soapFault.addDetail();
detail.setAttribute("test", "myvalue");
- System.out.println(soapFault.hasDetail());
soapMessage.saveChanges();
-
-
} catch (Exception e) {
fail("Unexpected Exception : " + e);
}
@@ -650,7 +644,7 @@
SOAPPart soapPart = soapMessage.getSOAPPart();
SOAPEnvelope envelope = soapPart.getEnvelope();
SOAPBody body = envelope.getBody();
- SOAPFault sf = body.addFault();
+ //SOAPFault sf = body.addFault();
Locale expected1 = Locale.ENGLISH;
Locale expected2 = Locale.UK;
@@ -659,11 +653,10 @@
boolean found2 = false;
boolean found3 = false;
- System.out.println("Adding FaultReasonText to SOAPFault");
+ SOAPFault sf = body.addFault(SOAPConstants.SOAP_RECEIVER_FAULT, "Its my fault1", expected1);
sf.addFaultReasonText("Its my fault1", expected1);
sf.addFaultReasonText("Its my fault2", expected2);
sf.addFaultReasonText("Its my fault3", expected3);
- System.out.println("Getting FaultReasonLocales from SOAPFault");
Iterator i = sf.getFaultReasonLocales();
int localeCount = 0;
@@ -671,7 +664,6 @@
localeCount++;
i.next();
}
- System.out.println("Locale iterator count=" + localeCount);
i = sf.getFaultReasonLocales();
int j = 0;
@@ -922,7 +914,6 @@
SOAPMessage message = messageFactory.createMessage();
SOAPBody body = message.getSOAPBody();
SOAPFault fault = body.addFault();
-
assertNotNull(fault.getFaultCodeAsQName());
assertNotNull(fault.getFaultString());
} catch (Exception e) {
Modified: webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/SOAPMessageTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/SOAPMessageTest.java?view=diff&rev=553835&r1=553834&r2=553835
==============================================================================
--- webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/SOAPMessageTest.java (original)
+++ webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/SOAPMessageTest.java Fri Jul 6 04:07:52 2007
@@ -18,8 +18,18 @@
*/
package org.apache.axis2.saaj;
+import junit.extensions.TestSetup;
+import junit.framework.Test;
import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+import org.apache.axis2.description.AxisService;
+import org.apache.axis2.description.Parameter;
+import org.apache.axis2.saaj.integration.EchoService;
+import org.apache.axis2.saaj.integration.IntegrationTest;
+import org.apache.axis2.saaj.integration.UtilServer;
import org.apache.axis2.saaj.util.SAAJDataSource;
+import org.apache.axis2.util.Utils;
import javax.activation.DataHandler;
import javax.xml.namespace.QName;
@@ -55,9 +65,50 @@
public class SOAPMessageTest extends TestCase {
private SOAPMessage msg;
+// static int port;
+// public static final QName SERVICE_NAME = new QName("Echo");
+// public static final QName OPERATION_NAME = new QName("echo");
+//
+// public static final String SAAJ_REPO =
+// System.getProperty("basedir", ".") + "/" + "target/test-resources/saaj-repo";
+//
+// public SOAPMessageTest(String name) {
+// super(name);
+// }
+//
+// protected static String getAddress() {
+// return "http://127.0.0.1:" +
+// port +
+// "/axis2/services/Echo";
+// }
+//
+// public static Test suite() {
+// return new TestSetup(new TestSuite(IntegrationTest.class)) {
+// public void setUp() throws Exception {
+// port = UtilServer.start(SAAJ_REPO);
+// Parameter eneblemtom = new Parameter("enableMTOM", "true");
+// UtilServer.getConfigurationContext().getAxisConfiguration()
+// .addParameter(eneblemtom);
+// }
+//
+// public void tearDown() throws Exception {
+// UtilServer.stop();
+// }
+// };
+// }
+
protected void setUp() throws Exception {
+// final AxisService service = Utils.createSimpleService(SERVICE_NAME,
+// EchoService.class.getName(),
+// OPERATION_NAME);
+// UtilServer.deployService(service);
msg = MessageFactory.newInstance().createMessage();
}
+
+// protected void tearDown() throws Exception {
+// UtilServer.unDeployService(SERVICE_NAME);
+// UtilServer.unDeployClientService();
+// }
public void testSaveRequired() {
try {
Modified: webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/integration/EchoService.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/integration/EchoService.java?view=diff&rev=553835&r1=553834&r2=553835
==============================================================================
--- webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/integration/EchoService.java (original)
+++ webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/integration/EchoService.java Fri Jul 6 04:07:52 2007
@@ -27,15 +27,13 @@
*/
public class EchoService {
public OMElement echo(OMElement element) throws XMLStreamException {
- System.err.println("################ Echo Service was called, Element=" + element);
-
//Praparing the OMElement so that it can be attached to another OM Tree.
//First the OMElement should be completely built in case it is not fully built and still
//some of the xml is in the stream.
element.build();
//Secondly the OMElement should be detached from the current OMTree so that it can be attached
//some other OM Tree. Once detached the OmTree will remove its connections to this OMElement.
-// element.detach();
+ //element.detach();
return element;
}
Modified: webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/integration/IntegrationTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/integration/IntegrationTest.java?view=diff&rev=553835&r1=553834&r2=553835
==============================================================================
--- webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/integration/IntegrationTest.java (original)
+++ webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/integration/IntegrationTest.java Fri Jul 6 04:07:52 2007
@@ -159,9 +159,6 @@
msg.writeTo(baos);
String responseStr = baos.toString();
- System.out.println("\n\n----------------------Message-------------------------\n" +
- responseStr);
- System.out.println("-------------------------------------------------------\n\n");
assertTrue(responseStr.indexOf("This is some text") != -1);
return responseStr;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org