You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by ba...@apache.org on 2009/11/18 17:47:58 UTC
svn commit: r881831 - in
/webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws:
message/ spi/handler/ utility/
Author: barrettj
Date: Wed Nov 18 16:47:57 2009
New Revision: 881831
URL: http://svn.apache.org/viewvc?rev=881831&view=rev
Log:
Change JAXWS unit test println to calls to TestLogger.logger.debug
Modified:
webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/message/FaultTests.java
webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/message/JAXBCustomBuilderTests.java
webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/message/JAXBDSContextTests.java
webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/message/MessagePersistanceTests.java
webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/message/MessageTests.java
webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/spi/handler/DummyLogicalHandler.java
webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/utility/AttachmentUtilityTests.java
Modified: webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/message/FaultTests.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/message/FaultTests.java?rev=881831&r1=881830&r2=881831&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/message/FaultTests.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/message/FaultTests.java Wed Nov 18 16:47:57 2009
@@ -26,6 +26,7 @@
import org.apache.axis2.jaxws.message.factory.MessageFactory;
import org.apache.axis2.jaxws.message.factory.SourceBlockFactory;
import org.apache.axis2.jaxws.registry.FactoryRegistry;
+import org.apache.axis2.jaxws.unitTest.TestLogger;
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamReader;
@@ -318,7 +319,7 @@
byte[] bytes = _getBytes(content);
String faultContent = new String(bytes);
- System.out.println(">> fault content: " + faultContent);
+ TestLogger.logger.debug(">> fault content: " + faultContent);
assertTrue(faultContent.indexOf("faultcode") > 0);
assertTrue(faultContent.indexOf("faultstring") > 0);
}
Modified: webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/message/JAXBCustomBuilderTests.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/message/JAXBCustomBuilderTests.java?rev=881831&r1=881830&r2=881831&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/message/JAXBCustomBuilderTests.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/message/JAXBCustomBuilderTests.java Wed Nov 18 16:47:57 2009
@@ -28,6 +28,7 @@
import org.apache.axis2.datasource.jaxb.JAXBCustomBuilder;
import org.apache.axis2.datasource.jaxb.JAXBDSContext;
import org.apache.axis2.datasource.jaxb.JAXBDataSource;
+import org.apache.axis2.jaxws.unitTest.TestLogger;
import org.apache.axis2.jaxws.message.databinding.JAXBUtils;
import test.EchoString;
import test.ObjectFactory;
@@ -130,9 +131,9 @@
// Make sure the prefix is consistent with the output
String prefix = omNS.getPrefix();
- System.out.println(prefix);
+ TestLogger.logger.debug(prefix);
String text = om.toString();
- System.out.println(text);
+ TestLogger.logger.debug(text);
String searchString = (prefix == null || prefix.length() == 0) ?
"</echoString>" :
"</" + prefix + ":echoString>";
Modified: webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/message/JAXBDSContextTests.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/message/JAXBDSContextTests.java?rev=881831&r1=881830&r2=881831&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/message/JAXBDSContextTests.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/message/JAXBDSContextTests.java Wed Nov 18 16:47:57 2009
@@ -102,7 +102,7 @@
packages.add(Data.class.getPackage().getName());
JAXBDSContext context = new JAXBDSContext(packages);
- System.out.println(context.getJAXBContext().toString());
+ TestLogger.logger.debug(context.getJAXBContext().toString());
// Force marshal by type
context.setProcessType(Data.class);
@@ -146,7 +146,7 @@
packages.add(Data.class.getPackage().getName());
JAXBDSContext context = new JAXBDSContext(packages);
- System.out.println(context.getJAXBContext().toString());
+ TestLogger.logger.debug(context.getJAXBContext().toString());
// Force marshal by type
context.setProcessType(Data[].class);
Modified: webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/message/MessagePersistanceTests.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/message/MessagePersistanceTests.java?rev=881831&r1=881830&r2=881831&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/message/MessagePersistanceTests.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/message/MessagePersistanceTests.java Wed Nov 18 16:47:57 2009
@@ -33,6 +33,7 @@
import org.apache.axis2.Constants;
import org.apache.axis2.Constants.Configuration;
import org.apache.axis2.datasource.jaxb.JAXBDataSource;
+import org.apache.axis2.jaxws.unitTest.TestLogger;
import org.apache.axis2.jaxws.core.MessageContext;
import org.apache.axis2.jaxws.message.databinding.JAXBBlockContext;
import org.apache.axis2.jaxws.message.databinding.impl.JAXBBlockImpl;
@@ -145,7 +146,7 @@
theFile = File.createTempFile("MessagePersistTest", null);
//theFile.deleteOnExit();
theFilename = theFile.getName();
- System.out.println("temp file = [" + theFilename + "]");
+ TestLogger.logger.debug("temp file = [" + theFilename + "]");
// Setup an output stream to a physical file
FileOutputStream outStream = new FileOutputStream(theFile);
@@ -155,7 +156,7 @@
ObjectOutputStream outObjStream = new ObjectOutputStream(outStream);
// Try to save the message context
- System.out.println("saving message context.....");
+ TestLogger.logger.debug("saving message context.....");
outObjStream.writeObject(axisMC);
// Close out the streams
@@ -163,9 +164,9 @@
outObjStream.close();
outStream.flush();
outStream.close();
- System.out.println("....saved message context.....");
+ TestLogger.logger.debug("....saved message context.....");
long filesize = theFile.length();
- System.out.println("file size after save [" + filesize
+ TestLogger.logger.debug("file size after save [" + filesize
+ "] temp file = [" + theFilename + "]");
// Make sure the Axiom structure is intact.
@@ -185,7 +186,7 @@
// To check that the output is correct, get the String contents of the
// reader
String newText = baos.toString();
- System.out.println(newText);
+ TestLogger.logger.debug(newText);
assertTrue(newText.contains(sampleJAXBText));
assertTrue(newText.contains("soap"));
assertTrue(newText.contains("Envelope"));
@@ -201,13 +202,13 @@
ObjectInputStream inObjStream = new ObjectInputStream(inStream);
// try to restore the message context
- System.out.println("restoring a message context.....");
+ TestLogger.logger.debug("restoring a message context.....");
org.apache.axis2.context.MessageContext restoredMC =
(org.apache.axis2.context.MessageContext) inObjStream.readObject();
inObjStream.close();
inStream.close();
- System.out.println("....restored message context.....");
+ TestLogger.logger.debug("....restored message context.....");
// At this point in time, the restoredMessage will be a full tree.
// TODO If this changes, please add more assertions here.
@@ -234,7 +235,7 @@
env = restoredMC.getEnvelope();
env.serializeAndConsume(baos, new OMOutputFormat());
String restoredText = baos.toString();
- System.out.println(restoredText);
+ TestLogger.logger.debug(restoredText);
assertTrue(restoredText.contains(sampleJAXBText));
assertTrue(restoredText.contains("soap"));
assertTrue(restoredText.contains("Envelope"));
@@ -309,7 +310,7 @@
// To check that the output is correct, get the String contents of the
// reader
String newText = baos.toString();
- System.out.println(newText);
+ TestLogger.logger.debug(newText);
assertTrue(newText.contains(sampleJAXBText));
assertTrue(newText.contains("soap"));
assertTrue(newText.contains("Envelope"));
@@ -329,7 +330,7 @@
baos = new ByteArrayOutputStream();
env2.serializeAndConsume(baos, new OMOutputFormat());
String restoredText = baos.toString();
- System.out.println(restoredText);
+ TestLogger.logger.debug(restoredText);
assertTrue(restoredText.contains(sampleJAXBText));
assertTrue(restoredText.contains("soap"));
assertTrue(restoredText.contains("Envelope"));
@@ -399,7 +400,7 @@
theFile = File.createTempFile("MessagePersistTest", null);
//theFile.deleteOnExit();
theFilename = theFile.getName();
- System.out.println("temp file = [" + theFilename + "]");
+ TestLogger.logger.debug("temp file = [" + theFilename + "]");
// Setup an output stream to a physical file
FileOutputStream outStream = new FileOutputStream(theFile);
@@ -409,7 +410,7 @@
ObjectOutputStream outObjStream = new ObjectOutputStream(outStream);
// Try to save the message context
- System.out.println("saving message context.....");
+ TestLogger.logger.debug("saving message context.....");
outObjStream.writeObject(axisMC);
// Close out the streams
@@ -417,9 +418,9 @@
outObjStream.close();
outStream.flush();
outStream.close();
- System.out.println("....saved message context.....");
+ TestLogger.logger.debug("....saved message context.....");
long filesize = theFile.length();
- System.out.println("file size after save [" + filesize
+ TestLogger.logger.debug("file size after save [" + filesize
+ "] temp file = [" + theFilename + "]");
// Make sure the Axiom structure is intact.
@@ -441,7 +442,7 @@
// Make sure the output is correct
String newText = baos.toString();
- System.out.println(newText);
+ TestLogger.logger.debug(newText);
assertTrue(newText.contains("soap"));
assertTrue(newText.contains("Envelope"));
assertTrue(newText.contains("Body"));
@@ -459,13 +460,13 @@
ObjectInputStream inObjStream = new ObjectInputStream(inStream);
// try to restore the message context
- System.out.println("restoring a message context.....");
+ TestLogger.logger.debug("restoring a message context.....");
org.apache.axis2.context.MessageContext restoredMC =
(org.apache.axis2.context.MessageContext) inObjStream.readObject();
inObjStream.close();
inStream.close();
- System.out.println("....restored message context.....");
+ TestLogger.logger.debug("....restored message context.....");
// At this point in time, the restoredMessage will be a full tree.
// TODO If this changes, please add more assertions here.
@@ -478,7 +479,7 @@
outputFormat.setMimeBoundary("MIMEBoundary_Axis2Rocks");
env.serializeAndConsume(baos, outputFormat);
String restoredText = baos.toString();
- System.out.println(restoredText);
+ TestLogger.logger.debug(restoredText);
assertTrue(restoredText.contains("soap"));
assertTrue(restoredText.contains("Envelope"));
assertTrue(restoredText.contains("Body"));
@@ -495,13 +496,13 @@
// attach a stream capable of reading objects from the
// stream connected to the file
inObjStream = new ObjectInputStream(inStream);
- System.out.println("restoring a message context again.....");
+ TestLogger.logger.debug("restoring a message context again.....");
restoredMC =
(org.apache.axis2.context.MessageContext) inObjStream.readObject();
inObjStream.close();
inStream.close();
- System.out.println("....restored message context.....");
+ TestLogger.logger.debug("....restored message context.....");
env = restoredMC.getEnvelope();
env.build();
@@ -604,7 +605,7 @@
env.serializeAndConsume(baos, outputFormat);
String newText = baos.toString();
- System.out.println(newText);
+ TestLogger.logger.debug(newText);
assertTrue(newText.contains("soap"));
assertTrue(newText.contains("Envelope"));
assertTrue(newText.contains("Body"));
@@ -628,7 +629,7 @@
outputFormat.setMimeBoundary("MIMEBoundary_Axis2Rocks");
env2.serializeAndConsume(baos, outputFormat);
String restoredText = baos.toString();
- System.out.println(restoredText);
+ TestLogger.logger.debug(restoredText);
assertTrue(restoredText.contains("soap"));
assertTrue(restoredText.contains("Envelope"));
assertTrue(restoredText.contains("Body"));
Modified: webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/message/MessageTests.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/message/MessageTests.java?rev=881831&r1=881830&r2=881831&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/message/MessageTests.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/message/MessageTests.java Wed Nov 18 16:47:57 2009
@@ -755,7 +755,7 @@
//JAXBBlockContext context = new JAXBBlockContext(jaxbContext);
JAXBBlockContext context = new JAXBBlockContext("javax.xml.ws.wsaddressing");
- System.out.println("JAXBContext= " + context);
+ TestLogger.logger.debug("JAXBContext= " + context);
// Create a JAXBBlock using the Echo object as the content. This simulates
// what occurs on the outbound JAX-WS Dispatch<Object> client
@@ -792,7 +792,7 @@
// To check that the output is correct, get the String contents of the
// reader
String newText = baos.toString();
- System.out.println(newText);
+ TestLogger.logger.debug(newText);
assertTrue(newText.contains("http://somewhere.com/somehow"));
assertTrue(newText.contains("soap"));
assertTrue(newText.contains("Envelope"));
Modified: webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/spi/handler/DummyLogicalHandler.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/spi/handler/DummyLogicalHandler.java?rev=881831&r1=881830&r2=881831&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/spi/handler/DummyLogicalHandler.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/spi/handler/DummyLogicalHandler.java Wed Nov 18 16:47:57 2009
@@ -19,6 +19,8 @@
package org.apache.axis2.jaxws.spi.handler;
+import org.apache.axis2.jaxws.unitTest.TestLogger;
+
import javax.annotation.PostConstruct;
import javax.xml.ws.handler.LogicalHandler;
import javax.xml.ws.handler.LogicalMessageContext;
@@ -28,7 +30,7 @@
@PostConstruct
public void setup() {
- System.out.println("@PostConstruct method invoked.");
+ TestLogger.logger.debug("@PostConstruct method invoked.");
}
public boolean handleMessage(LogicalMessageContext context) {
Modified: webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/utility/AttachmentUtilityTests.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/utility/AttachmentUtilityTests.java?rev=881831&r1=881830&r2=881831&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/utility/AttachmentUtilityTests.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/utility/AttachmentUtilityTests.java Wed Nov 18 16:47:57 2009
@@ -19,6 +19,8 @@
package org.apache.axis2.jaxws.utility;
+import org.apache.axis2.jaxws.unitTest.TestLogger;
+
import java.awt.Image;
import java.io.File;
@@ -40,7 +42,7 @@
Image img1=ImageIO.read(img1File) ;
Image img2= ImageIO.read(img2File);
assertFalse(AttachmentUtils.compareImages(img1, img2));
- System.out.println("Image Compared successfully");
+ TestLogger.logger.debug("Image Compared successfully");
}catch(Exception e){
System.out.println("Image Compare Failed");
e.printStackTrace();
@@ -59,7 +61,7 @@
Image img2= ImageIO.read(img2File);
assertTrue(AttachmentUtils.compareImages(img1, img1));
- System.out.println("Image Compared successfully");
+ TestLogger.logger.debug("Image Compared successfully");
}catch(Exception e){
e.printStackTrace();
System.out.println("Image Compare Failed");