[jbossws-commits] JBossWS SVN: r11908 - in framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes: types and 4 other directories.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Wed Mar 31 06:55:35 EDT 2010
Author: pmacik at redhat.com
Date: 2010-03-31 06:55:29 -0400 (Wed, 31 Mar 2010)
New Revision: 11908
Added:
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/DataTypesTest.java
Modified:
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/DataTypesEJB3DocTest.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/DataTypesEJB3RPCTest.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/DataTypesEJB3WrappedDocTest.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/DataTypesEJB3WrappedRPCTest.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/DataTypesPOJODocTest.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/DataTypesPOJORPCTest.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/DataTypesPOJOWrappedDocTest.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/DataTypesPOJOWrappedRPCTest.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/EndpointEJB3DocImpl.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/EndpointEJB3RPCImpl.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/EndpointEJB3WrappedDocImpl.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/EndpointEJB3WrappedRPCImpl.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/EndpointPOJODocImpl.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/EndpointPOJORPCImpl.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/EndpointPOJOWrappedDocImpl.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/EndpointPOJOWrappedRPCImpl.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/types/ComplexType.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/ejb3/BooleanDocTest.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/ejb3/BooleanRPCTest.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/ejb3/ByteArrayDocTest.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/ejb3/ByteArrayRPCTest.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/ejb3/ByteDocTest.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/ejb3/ByteRPCTest.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/ejb3/CalendarDocTest.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/ejb3/CalendarRPCTest.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/ejb3/DateDocTest.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/ejb3/DateRPCTest.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/ejb3/DoubleDocTest.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/ejb3/DoubleRPCTest.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/ejb3/FloatDocTest.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/ejb3/FloatRPCTest.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/ejb3/IntegerDocTest.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/ejb3/IntegerRPCTest.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/ejb3/LongDocTest.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/ejb3/LongRPCTest.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/ejb3/QNameDocTest.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/ejb3/QNameRPCTest.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/ejb3/ShortDocTest.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/ejb3/ShortRPCTest.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/ejb3/StringDocTest.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/ejb3/StringRPCTest.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/pojo/BooleanDocTest.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/pojo/BooleanRPCTest.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/pojo/ByteArrayDocTest.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/pojo/ByteArrayRPCTest.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/pojo/ByteDocTest.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/pojo/ByteRPCTest.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/pojo/CalendarDocTest.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/pojo/CalendarRPCTest.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/pojo/DateDocTest.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/pojo/DateRPCTest.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/pojo/DoubleDocTest.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/pojo/DoubleRPCTest.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/pojo/FloatDocTest.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/pojo/FloatRPCTest.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/pojo/IntegerDocTest.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/pojo/IntegerRPCTest.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/pojo/LongDocTest.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/pojo/LongRPCTest.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/pojo/QNameDocTest.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/pojo/QNameRPCTest.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/pojo/ShortDocTest.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/pojo/ShortRPCTest.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/pojo/StringDocTest.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/pojo/StringRPCTest.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ejb3/BooleanDocTest.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ejb3/BooleanRPCTest.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ejb3/ByteArrayDocTest.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ejb3/ByteArrayRPCTest.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ejb3/ByteDocTest.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ejb3/ByteRPCTest.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ejb3/CalendarDocTest.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ejb3/CalendarRPCTest.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ejb3/ComplexTypeDocTest.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ejb3/ComplexTypeRPCTest.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ejb3/DateDocTest.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ejb3/DateRPCTest.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ejb3/DoubleDocTest.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ejb3/DoubleRPCTest.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ejb3/FloatDocTest.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ejb3/FloatRPCTest.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ejb3/IntegerDocTest.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ejb3/IntegerRPCTest.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ejb3/LongDocTest.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ejb3/LongRPCTest.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ejb3/QNameDocTest.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ejb3/QNameRPCTest.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ejb3/ShortDocTest.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ejb3/ShortRPCTest.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ejb3/StringDocTest.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ejb3/StringRPCTest.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ejb3/ValuesToComplexTypeDocTest.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ejb3/ValuesToComplexTypeRPCTest.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ejb3/ValuesToStringDocTest.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ejb3/ValuesToStringRPCTest.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/pojo/BooleanDocTest.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/pojo/BooleanRPCTest.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/pojo/ByteArrayDocTest.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/pojo/ByteArrayRPCTest.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/pojo/ByteDocTest.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/pojo/ByteRPCTest.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/pojo/CalendarDocTest.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/pojo/CalendarRPCTest.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/pojo/ComplexTypeDocTest.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/pojo/ComplexTypeRPCTest.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/pojo/DateDocTest.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/pojo/DateRPCTest.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/pojo/DoubleDocTest.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/pojo/DoubleRPCTest.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/pojo/FloatDocTest.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/pojo/FloatRPCTest.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/pojo/IntegerDocTest.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/pojo/IntegerRPCTest.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/pojo/LongDocTest.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/pojo/LongRPCTest.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/pojo/QNameDocTest.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/pojo/QNameRPCTest.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/pojo/ShortDocTest.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/pojo/ShortRPCTest.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/pojo/StringDocTest.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/pojo/StringRPCTest.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/pojo/ValuesToComplexTypeDocTest.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/pojo/ValuesToComplexTypeRPCTest.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/pojo/ValuesToStringDocTest.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/pojo/ValuesToStringRPCTest.java
Log:
[JBWS-2984] Calendar (day+1) issue fixed, tests refactored
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/DataTypesEJB3DocTest.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/DataTypesEJB3DocTest.java 2010-03-31 09:09:06 UTC (rev 11907)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/DataTypesEJB3DocTest.java 2010-03-31 10:55:29 UTC (rev 11908)
@@ -26,16 +26,16 @@
import javax.xml.namespace.QName;
import javax.xml.ws.Service;
-import org.jboss.test.ws.jaxws.benchmark.BenchmarkTest;
import org.jboss.test.ws.jaxws.benchmark.Runner;
/**
* @author pmacik at redhat.com
* @since 09-Mar-2010
*/
-public abstract class DataTypesEJB3DocTest implements BenchmarkTest
+public abstract class DataTypesEJB3DocTest extends DataTypesTest
{
- protected String endpointURL = "http://" + Runner.getServerAddress() + "/jaxws-benchmark-datatypes-ejb3/EndpointEJB3DocImpl";
+ protected String endpointURL = "http://" + Runner.getServerAddress()
+ + "/jaxws-benchmark-datatypes-ejb3/EndpointEJB3DocImpl";
protected String targetNS = "http://datatypes.test.benchmark.jaxws.ws.test.jboss.org/";
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/DataTypesEJB3RPCTest.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/DataTypesEJB3RPCTest.java 2010-03-31 09:09:06 UTC (rev 11907)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/DataTypesEJB3RPCTest.java 2010-03-31 10:55:29 UTC (rev 11908)
@@ -26,16 +26,16 @@
import javax.xml.namespace.QName;
import javax.xml.ws.Service;
-import org.jboss.test.ws.jaxws.benchmark.BenchmarkTest;
import org.jboss.test.ws.jaxws.benchmark.Runner;
/**
* @author pmacik at redhat.com
* @since 09-Mar-2010
*/
-public abstract class DataTypesEJB3RPCTest implements BenchmarkTest
+public abstract class DataTypesEJB3RPCTest extends DataTypesTest
{
- protected String endpointURL = "http://" + Runner.getServerAddress() + "/jaxws-benchmark-datatypes-ejb3/EndpointEJB3RPCImpl";
+ protected String endpointURL = "http://" + Runner.getServerAddress()
+ + "/jaxws-benchmark-datatypes-ejb3/EndpointEJB3RPCImpl";
protected String targetNS = "http://datatypes.test.benchmark.jaxws.ws.test.jboss.org/";
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/DataTypesEJB3WrappedDocTest.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/DataTypesEJB3WrappedDocTest.java 2010-03-31 09:09:06 UTC (rev 11907)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/DataTypesEJB3WrappedDocTest.java 2010-03-31 10:55:29 UTC (rev 11908)
@@ -26,14 +26,13 @@
import javax.xml.namespace.QName;
import javax.xml.ws.Service;
-import org.jboss.test.ws.jaxws.benchmark.BenchmarkTest;
import org.jboss.test.ws.jaxws.benchmark.Runner;
/**
* @author pmacik at redhat.com
* @since 09-Mar-2010
*/
-public abstract class DataTypesEJB3WrappedDocTest implements BenchmarkTest
+public abstract class DataTypesEJB3WrappedDocTest extends DataTypesTest
{
protected String endpointURL = "http://" + Runner.getServerAddress()
+ "/jaxws-benchmark-datatypes-ejb3/EndpointEJB3WrappedDocImpl";
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/DataTypesEJB3WrappedRPCTest.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/DataTypesEJB3WrappedRPCTest.java 2010-03-31 09:09:06 UTC (rev 11907)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/DataTypesEJB3WrappedRPCTest.java 2010-03-31 10:55:29 UTC (rev 11908)
@@ -26,14 +26,13 @@
import javax.xml.namespace.QName;
import javax.xml.ws.Service;
-import org.jboss.test.ws.jaxws.benchmark.BenchmarkTest;
import org.jboss.test.ws.jaxws.benchmark.Runner;
/**
* @author pmacik at redhat.com
* @since 09-Mar-2010
*/
-public abstract class DataTypesEJB3WrappedRPCTest implements BenchmarkTest
+public abstract class DataTypesEJB3WrappedRPCTest extends DataTypesTest
{
protected String endpointURL = "http://" + Runner.getServerAddress()
+ "/jaxws-benchmark-datatypes-ejb3/EndpointEJB3WrappedRPCImpl";
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/DataTypesPOJODocTest.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/DataTypesPOJODocTest.java 2010-03-31 09:09:06 UTC (rev 11907)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/DataTypesPOJODocTest.java 2010-03-31 10:55:29 UTC (rev 11908)
@@ -26,16 +26,16 @@
import javax.xml.namespace.QName;
import javax.xml.ws.Service;
-import org.jboss.test.ws.jaxws.benchmark.BenchmarkTest;
import org.jboss.test.ws.jaxws.benchmark.Runner;
/**
* @author pmacik at redhat.com
* @since 09-Mar-2010
*/
-public abstract class DataTypesPOJODocTest implements BenchmarkTest
+public abstract class DataTypesPOJODocTest extends DataTypesTest
{
- protected String endpointURL = "http://" + Runner.getServerAddress() + "/jaxws-benchmark-datatypes-pojo/EndpointPOJODocImpl";
+ protected String endpointURL = "http://" + Runner.getServerAddress()
+ + "/jaxws-benchmark-datatypes-pojo/EndpointPOJODocImpl";
protected String targetNS = "http://datatypes.test.benchmark.jaxws.ws.test.jboss.org/";
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/DataTypesPOJORPCTest.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/DataTypesPOJORPCTest.java 2010-03-31 09:09:06 UTC (rev 11907)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/DataTypesPOJORPCTest.java 2010-03-31 10:55:29 UTC (rev 11908)
@@ -26,16 +26,16 @@
import javax.xml.namespace.QName;
import javax.xml.ws.Service;
-import org.jboss.test.ws.jaxws.benchmark.BenchmarkTest;
import org.jboss.test.ws.jaxws.benchmark.Runner;
/**
* @author pmacik at redhat.com
* @since 09-Mar-2010
*/
-public abstract class DataTypesPOJORPCTest implements BenchmarkTest
+public abstract class DataTypesPOJORPCTest extends DataTypesTest
{
- protected String endpointURL = "http://" + Runner.getServerAddress() + "/jaxws-benchmark-datatypes-pojo/EndpointPOJORPCImpl";
+ protected String endpointURL = "http://" + Runner.getServerAddress()
+ + "/jaxws-benchmark-datatypes-pojo/EndpointPOJORPCImpl";
protected String targetNS = "http://datatypes.test.benchmark.jaxws.ws.test.jboss.org/";
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/DataTypesPOJOWrappedDocTest.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/DataTypesPOJOWrappedDocTest.java 2010-03-31 09:09:06 UTC (rev 11907)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/DataTypesPOJOWrappedDocTest.java 2010-03-31 10:55:29 UTC (rev 11908)
@@ -26,14 +26,13 @@
import javax.xml.namespace.QName;
import javax.xml.ws.Service;
-import org.jboss.test.ws.jaxws.benchmark.BenchmarkTest;
import org.jboss.test.ws.jaxws.benchmark.Runner;
/**
* @author pmacik at redhat.com
* @since 09-Mar-2010
*/
-public abstract class DataTypesPOJOWrappedDocTest implements BenchmarkTest
+public abstract class DataTypesPOJOWrappedDocTest extends DataTypesTest
{
protected String endpointURL = "http://" + Runner.getServerAddress()
+ "/jaxws-benchmark-datatypes-pojo/EndpointPOJOWrappedDocImpl";
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/DataTypesPOJOWrappedRPCTest.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/DataTypesPOJOWrappedRPCTest.java 2010-03-31 09:09:06 UTC (rev 11907)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/DataTypesPOJOWrappedRPCTest.java 2010-03-31 10:55:29 UTC (rev 11908)
@@ -26,14 +26,13 @@
import javax.xml.namespace.QName;
import javax.xml.ws.Service;
-import org.jboss.test.ws.jaxws.benchmark.BenchmarkTest;
import org.jboss.test.ws.jaxws.benchmark.Runner;
/**
* @author pmacik at redhat.com
* @since 09-Mar-2010
*/
-public abstract class DataTypesPOJOWrappedRPCTest implements BenchmarkTest
+public abstract class DataTypesPOJOWrappedRPCTest extends DataTypesTest
{
protected String endpointURL = "http://" + Runner.getServerAddress()
+ "/jaxws-benchmark-datatypes-pojo/EndpointPOJOWrappedRPCImpl";
Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/DataTypesTest.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/DataTypesTest.java (rev 0)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/DataTypesTest.java 2010-03-31 10:55:29 UTC (rev 11908)
@@ -0,0 +1,152 @@
+package org.jboss.test.ws.jaxws.benchmark.test.datatypes;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Date;
+import java.util.GregorianCalendar;
+import java.util.List;
+
+import javax.xml.datatype.DatatypeConfigurationException;
+import javax.xml.datatype.DatatypeFactory;
+import javax.xml.datatype.Duration;
+import javax.xml.datatype.XMLGregorianCalendar;
+import javax.xml.namespace.QName;
+
+import org.jboss.test.ws.jaxws.benchmark.BenchmarkTest;
+import org.jboss.test.ws.jaxws.benchmark.test.datatypes.types.ComplexType;
+
+public abstract class DataTypesTest implements BenchmarkTest
+{
+
+ protected static final XMLGregorianCalendar testedCalendar;
+
+ protected static final XMLGregorianCalendar expectedCalendar;
+
+ protected static final String testedString = "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<Order orderId=\"1\" orderDate=\"Wed Nov 15 13:45:28 EST 2006\"\n statusCode=\"9\" netAmount=\"59.97\" totalAmount=\"64.92\" tax=\"4.95\">\n <Customer userName=\"user1\" firstName=\"Harry\" lastName=\"Fletcher\"\n state=\"SD\" />\n <OrderLines>\n <OrderLine position=\"1\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"2\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"3\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"4\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </Ord!
erLine>\n <OrderLine position=\"5\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"6\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"7\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"8\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"9\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"10\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n !
<OrderLine position=\"11\" quantity=\"1\">\n <Pr!
oduct pr
oductId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"12\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"13\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"14\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"15\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"16\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"17\" quantity=\"1\">\n <Pro!
duct productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"18\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"19\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"20\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"21\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"22\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"23\" quantity=\"1\">\n !
<Product productId=\"364\" title=\"The 40-Year-Old Virgin !
\"\n
price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"24\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"25\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"26\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"27\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"28\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"29\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \!
"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"30\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"31\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"32\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"33\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"34\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"35\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old !
Virgin \"\n price=\"29.98\" />\n </OrderLi!
ne>\n
<Memo>\n abcdefghijklmnopqrstuvwxyz0123456789!@#$%^°*()_+-=[]{}:\",.?/`~Pada,pada_jahoda,kterou_sěščřžýáíégggaabcdefghijklmnopqrstuvwxyz0123456789!@#$%^°*()_+-=[]{}:\",.?/`~Pahoda,kterou_sni_pan_Lahodaabcdefghijklmnopqrstuvwxyz0123456789!@#$%^°*()_+-=[]{}:\",.?/`~Pada,pada_jahoda,kterou_sni_pan_Lahoda\n </Memo>\n </OrderLines>\n</Order>\n";
+
+ protected static final String expectedString = "Hello World Greeting for '" + testedString + "' today";
+
+ protected static final boolean testedBoolean = true;
+
+ protected static final boolean expectedBoolean = !testedBoolean;
+
+ protected static final byte testedByte = (byte) 63;
+
+ protected static final byte expectedByte = testedByte + 1;
+
+ protected static final byte[] testedByteArray = "!@#$%^°*()_+-=[]{}:\",.?/`~Pada,pada_jahoda,kterou_sěščřžýáíégggaabcdefghijklmnopqrstuvwxyz0123456789"
+ .getBytes();
+
+ protected static final byte[] expectedByteArray;
+
+ protected static final short testedShort = (short) 25;
+
+ protected static final short expectedShort = testedShort + 1;
+
+ protected static final int testedInt = 4567;
+
+ protected static final int expectedInt = testedInt + 1;
+
+ protected static final long testedLong = 1234567890L;
+
+ protected static final long expectedLong = testedLong + 1L;
+
+ protected static final float testedFloat = 6.7f;
+
+ protected static final float expectedFloat = testedFloat + 1.0f;
+
+ protected static final double testedDouble = 8.9;
+
+ protected static final double expectedDouble = testedDouble + 1.0f;
+
+ protected static final QName testedQName = new QName("qname_value");
+
+ protected static final QName expectedQName = new QName("qname_value_modified");
+
+ protected static final ComplexType testedComplexType, expectedComplexType, expectedReturnedComplexType;
+
+ protected static final String expectedValuesString;
+
+ protected static final List<String> testedStringList;
+
+ protected static final List<String> expectedStringList;
+
+ protected static final Date testedDate = new Date(1234567890L);
+
+ protected static final Date expectedDate = new Date(testedDate.getTime() + 86400000L);
+
+ static
+ {
+ DatatypeFactory dtFactory = null;
+ GregorianCalendar calendar = new GregorianCalendar();
+ Duration dayDuration = null;
+ try
+ {
+ dtFactory = DatatypeFactory.newInstance();
+ }
+ catch (DatatypeConfigurationException e)
+ {
+
+ e.printStackTrace();
+ }
+ testedCalendar = dtFactory.newXMLGregorianCalendar(calendar);
+
+ dayDuration = dtFactory.newDuration(86400000L);
+ expectedCalendar = (XMLGregorianCalendar) testedCalendar.clone();
+ expectedCalendar.add(dayDuration);
+
+ testedStringList = new ArrayList<String>();
+ for (int i = 0; i < 10; i++)
+ {
+ testedStringList.add("item " + Math.random());
+ }
+ expectedStringList = new ArrayList<String>(testedStringList);
+ Collections.sort(expectedStringList);
+
+ expectedByteArray = new byte[testedByteArray.length];
+ int len = testedByteArray.length;
+ for (int i = 0; i < len; i++)
+ {
+ expectedByteArray[i] = testedByteArray[len - 1 - i];
+ }
+
+ StringBuffer sb = new StringBuffer();
+ sb.append("[byteValue=" + testedByte);
+ sb.append(" byteArrayValue=" + new String(testedByteArray));
+ sb.append(" shortValue=" + testedShort);
+ sb.append(" intValue=" + testedInt);
+ sb.append(" longValue=" + testedLong);
+ sb.append(" floatValue=" + testedFloat);
+ sb.append(" doubleValue=" + testedDouble);
+ sb.append(" stringValue=" + testedString);
+ sb.append(" qNameValue=" + testedQName);
+ sb.append(" dateValue=" + testedDate);
+ sb.append(" calendarValue=" + testedCalendar);
+ sb.append("]");
+ expectedValuesString = sb.toString();
+
+ List<String> valuesStringList = new ArrayList<String>(11);
+ valuesStringList.add(String.valueOf(testedByte));
+ valuesStringList.add(Arrays.toString(testedByteArray));
+ valuesStringList.add(String.valueOf(testedShort));
+ valuesStringList.add(String.valueOf(testedInt));
+ valuesStringList.add(String.valueOf(testedLong));
+ valuesStringList.add(String.valueOf(testedFloat));
+ valuesStringList.add(String.valueOf(testedDouble));
+ valuesStringList.add(testedString);
+ valuesStringList.add(testedQName.toString());
+ valuesStringList.add(testedDate.toString());
+ valuesStringList.add(testedCalendar.toString());
+
+ expectedReturnedComplexType = new ComplexType(testedByte, testedByteArray, testedShort, testedInt, testedLong,
+ testedFloat, testedDouble, testedString, valuesStringList, testedQName, testedDate, testedCalendar);
+
+ testedComplexType = new ComplexType(testedByte, testedByteArray, testedShort, testedInt, testedLong, testedFloat,
+ testedDouble, testedString, testedStringList, testedQName, testedDate, testedCalendar);
+
+ expectedComplexType = new ComplexType(expectedByte, expectedByteArray, expectedShort, expectedInt, expectedLong,
+ expectedFloat, expectedDouble, expectedString, expectedStringList, expectedQName, expectedDate,
+ expectedCalendar);
+ }
+}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/EndpointEJB3DocImpl.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/EndpointEJB3DocImpl.java 2010-03-31 09:09:06 UTC (rev 11907)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/EndpointEJB3DocImpl.java 2010-03-31 10:55:29 UTC (rev 11908)
@@ -21,13 +21,15 @@
*/
package org.jboss.test.ws.jaxws.benchmark.test.datatypes;
-import java.io.IOException;
import java.math.BigDecimal;
import java.util.Date;
import javax.ejb.Stateless;
import javax.jws.WebParam;
import javax.jws.WebService;
+import javax.xml.datatype.DatatypeConfigurationException;
+import javax.xml.datatype.DatatypeFactory;
+import javax.xml.datatype.Duration;
import javax.xml.datatype.XMLGregorianCalendar;
import javax.xml.namespace.QName;
@@ -37,8 +39,22 @@
*/
@WebService(serviceName = "EndpointDocService", portName = "EndpointDocPort", endpointInterface = "org.jboss.test.ws.jaxws.benchmark.test.datatypes.EndpointDoc")
@Stateless
-public class EndpointEJB3DocImpl
+public class EndpointEJB3DocImpl implements EndpointDoc
{
+ private static Duration dayDuration;
+ static
+ {
+ try
+ {
+ dayDuration = DatatypeFactory.newInstance().newDuration(86400000L);
+ }
+ catch (DatatypeConfigurationException e)
+ {
+ dayDuration = null;
+ e.printStackTrace();
+ }
+ }
+
public String sayHello(@WebParam(name = "toWhom") String toWhom)
{
String greeting = "Hello World Greeting for '" + toWhom + "' today";
@@ -60,7 +76,7 @@
return (byte) (value + 1);
}
- public byte[] reverseByteOrder(@WebParam(name = "data") byte[] data) throws IOException
+ public byte[] reverseByteOrder(@WebParam(name = "data") byte[] data)
{
byte[] retVal = new byte[data.length];
for (int i = 0; i < data.length; i++)
@@ -72,7 +88,7 @@
public XMLGregorianCalendar getCalendarPlusDay(@WebParam(name = "calendar") XMLGregorianCalendar calendar)
{
- calendar.setDay(calendar.getDay() + 1);
+ calendar.add(dayDuration);
return (XMLGregorianCalendar) calendar.clone();
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/EndpointEJB3RPCImpl.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/EndpointEJB3RPCImpl.java 2010-03-31 09:09:06 UTC (rev 11907)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/EndpointEJB3RPCImpl.java 2010-03-31 10:55:29 UTC (rev 11908)
@@ -21,13 +21,15 @@
*/
package org.jboss.test.ws.jaxws.benchmark.test.datatypes;
-import java.io.IOException;
import java.math.BigDecimal;
import java.util.Date;
import javax.ejb.Stateless;
import javax.jws.WebParam;
import javax.jws.WebService;
+import javax.xml.datatype.DatatypeConfigurationException;
+import javax.xml.datatype.DatatypeFactory;
+import javax.xml.datatype.Duration;
import javax.xml.datatype.XMLGregorianCalendar;
import javax.xml.namespace.QName;
@@ -37,8 +39,21 @@
*/
@WebService(serviceName = "EndpointRPCService", portName = "EndpointRPCPort", endpointInterface = "org.jboss.test.ws.jaxws.benchmark.test.datatypes.EndpointRPC")
@Stateless
-public class EndpointEJB3RPCImpl
+public class EndpointEJB3RPCImpl implements EndpointRPC
{
+ private static Duration dayDuration;
+ static
+ {
+ try
+ {
+ dayDuration = DatatypeFactory.newInstance().newDuration(86400000L);
+ }
+ catch (DatatypeConfigurationException e)
+ {
+ dayDuration = null;
+ e.printStackTrace();
+ }
+ }
public String sayHello(@WebParam(name = "toWhom") String toWhom)
{
@@ -61,7 +76,7 @@
return (byte) (value + 1);
}
- public byte[] reverseByteOrder(@WebParam(name = "data") byte[] data) throws IOException
+ public byte[] reverseByteOrder(@WebParam(name = "data") byte[] data)
{
byte[] retVal = new byte[data.length];
for (int i = 0; i < data.length; i++)
@@ -73,7 +88,7 @@
public XMLGregorianCalendar getCalendarPlusDay(@WebParam(name = "calendar") XMLGregorianCalendar calendar)
{
- calendar.setDay(calendar.getDay() + 1);
+ calendar.add(dayDuration);
return (XMLGregorianCalendar) calendar.clone();
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/EndpointEJB3WrappedDocImpl.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/EndpointEJB3WrappedDocImpl.java 2010-03-31 09:09:06 UTC (rev 11907)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/EndpointEJB3WrappedDocImpl.java 2010-03-31 10:55:29 UTC (rev 11908)
@@ -23,12 +23,16 @@
import java.math.BigDecimal;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collections;
import java.util.Date;
import java.util.List;
import javax.ejb.Stateless;
import javax.jws.WebService;
+import javax.xml.datatype.DatatypeConfigurationException;
+import javax.xml.datatype.DatatypeFactory;
+import javax.xml.datatype.Duration;
import javax.xml.datatype.XMLGregorianCalendar;
import javax.xml.namespace.QName;
@@ -40,8 +44,21 @@
*/
@WebService(serviceName = "EndpointWrappedDocService", portName = "EndpointWrappedDocPort", endpointInterface = "org.jboss.test.ws.jaxws.benchmark.test.datatypes.EndpointWrappedDoc")
@Stateless
-public class EndpointEJB3WrappedDocImpl
+public class EndpointEJB3WrappedDocImpl implements EndpointDoc
{
+ private static Duration dayDuration;
+ static
+ {
+ try
+ {
+ dayDuration = DatatypeFactory.newInstance().newDuration(86400000L);
+ }
+ catch (DatatypeConfigurationException e)
+ {
+ dayDuration = null;
+ e.printStackTrace();
+ }
+ }
private static final List<String> stringList;
@@ -87,7 +104,7 @@
public XMLGregorianCalendar getCalendarPlusDay(XMLGregorianCalendar calendar)
{
- calendar.setDay(calendar.getDay() + 1);
+ calendar.add(dayDuration);
return (XMLGregorianCalendar) calendar.clone();
}
@@ -155,7 +172,18 @@
long longValue, float floatValue, double doubleValue, String stringValue, QName qNameValue, Date dateValue,
XMLGregorianCalendar calendarValue)
{
-
+ List<String> stringList = new ArrayList<String>(11);
+ stringList.add(String.valueOf(byteValue));
+ stringList.add(Arrays.toString(byteArrayValue));
+ stringList.add(String.valueOf(shortValue));
+ stringList.add(String.valueOf(intValue));
+ stringList.add(String.valueOf(longValue));
+ stringList.add(String.valueOf(floatValue));
+ stringList.add(String.valueOf(doubleValue));
+ stringList.add(stringValue);
+ stringList.add(qNameValue.toString());
+ stringList.add(dateValue.toString());
+ stringList.add(calendarValue.toString());
return new ComplexType(byteValue, byteArrayValue, shortValue, intValue, longValue, floatValue, doubleValue,
stringValue, stringList, qNameValue, dateValue, calendarValue);
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/EndpointEJB3WrappedRPCImpl.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/EndpointEJB3WrappedRPCImpl.java 2010-03-31 09:09:06 UTC (rev 11907)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/EndpointEJB3WrappedRPCImpl.java 2010-03-31 10:55:29 UTC (rev 11908)
@@ -23,12 +23,16 @@
import java.math.BigDecimal;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collections;
import java.util.Date;
import java.util.List;
import javax.ejb.Stateless;
import javax.jws.WebService;
+import javax.xml.datatype.DatatypeConfigurationException;
+import javax.xml.datatype.DatatypeFactory;
+import javax.xml.datatype.Duration;
import javax.xml.datatype.XMLGregorianCalendar;
import javax.xml.namespace.QName;
@@ -40,12 +44,25 @@
*/
@WebService(serviceName = "EndpointWrappedRPCService", portName = "EndpointWrappedRPCPort", endpointInterface = "org.jboss.test.ws.jaxws.benchmark.test.datatypes.EndpointWrappedRPC")
@Stateless
-public class EndpointEJB3WrappedRPCImpl
+public class EndpointEJB3WrappedRPCImpl implements EndpointRPC
{
private static final List<String> stringList;
+ private static Duration dayDuration;
static
{
+ try
+ {
+ dayDuration = DatatypeFactory.newInstance().newDuration(86400000L);
+ }
+ catch (DatatypeConfigurationException e)
+ {
+ dayDuration = null;
+ e.printStackTrace();
+ }
+ }
+ static
+ {
stringList = new ArrayList<String>();
for (int i = 0; i < 10; i++)
{
@@ -86,7 +103,7 @@
public XMLGregorianCalendar getCalendarPlusDay(XMLGregorianCalendar calendar)
{
- calendar.setDay(calendar.getDay() + 1);
+ calendar.add(dayDuration);
return (XMLGregorianCalendar) calendar.clone();
}
@@ -154,7 +171,18 @@
long longValue, float floatValue, double doubleValue, String stringValue, QName qNameValue, Date dateValue,
XMLGregorianCalendar calendarValue)
{
-
+ List<String> stringList = new ArrayList<String>(11);
+ stringList.add(String.valueOf(byteValue));
+ stringList.add(Arrays.toString(byteArrayValue));
+ stringList.add(String.valueOf(shortValue));
+ stringList.add(String.valueOf(intValue));
+ stringList.add(String.valueOf(longValue));
+ stringList.add(String.valueOf(floatValue));
+ stringList.add(String.valueOf(doubleValue));
+ stringList.add(stringValue);
+ stringList.add(qNameValue.toString());
+ stringList.add(dateValue.toString());
+ stringList.add(calendarValue.toString());
return new ComplexType(byteValue, byteArrayValue, shortValue, intValue, longValue, floatValue, doubleValue,
stringValue, stringList, qNameValue, dateValue, calendarValue);
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/EndpointPOJODocImpl.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/EndpointPOJODocImpl.java 2010-03-31 09:09:06 UTC (rev 11907)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/EndpointPOJODocImpl.java 2010-03-31 10:55:29 UTC (rev 11908)
@@ -21,12 +21,14 @@
*/
package org.jboss.test.ws.jaxws.benchmark.test.datatypes;
-import java.io.IOException;
import java.math.BigDecimal;
import java.util.Date;
import javax.jws.WebParam;
import javax.jws.WebService;
+import javax.xml.datatype.DatatypeConfigurationException;
+import javax.xml.datatype.DatatypeFactory;
+import javax.xml.datatype.Duration;
import javax.xml.datatype.XMLGregorianCalendar;
import javax.xml.namespace.QName;
@@ -35,8 +37,21 @@
* @since 09-Mar-2010
*/
@WebService(serviceName = "EndpointDocService", portName = "EndpointDocPort", endpointInterface = "org.jboss.test.ws.jaxws.benchmark.test.datatypes.EndpointDoc")
-public class EndpointPOJODocImpl
+public class EndpointPOJODocImpl implements EndpointDoc
{
+ private static Duration dayDuration;
+ static
+ {
+ try
+ {
+ dayDuration = DatatypeFactory.newInstance().newDuration(86400000L);
+ }
+ catch (DatatypeConfigurationException e)
+ {
+ dayDuration = null;
+ e.printStackTrace();
+ }
+ }
public String sayHello(@WebParam(name = "toWhom") String toWhom)
{
@@ -59,7 +74,7 @@
return (byte) (value + 1);
}
- public byte[] reverseByteOrder(@WebParam(name = "data") byte[] data) throws IOException
+ public byte[] reverseByteOrder(@WebParam(name = "data") byte[] data)
{
byte[] retVal = new byte[data.length];
for (int i = 0; i < data.length; i++)
@@ -71,7 +86,7 @@
public XMLGregorianCalendar getCalendarPlusDay(@WebParam(name = "calendar") XMLGregorianCalendar calendar)
{
- calendar.setDay(calendar.getDay() + 1);
+ calendar.add(dayDuration);
return (XMLGregorianCalendar) calendar.clone();
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/EndpointPOJORPCImpl.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/EndpointPOJORPCImpl.java 2010-03-31 09:09:06 UTC (rev 11907)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/EndpointPOJORPCImpl.java 2010-03-31 10:55:29 UTC (rev 11908)
@@ -21,12 +21,14 @@
*/
package org.jboss.test.ws.jaxws.benchmark.test.datatypes;
-import java.io.IOException;
import java.math.BigDecimal;
import java.util.Date;
import javax.jws.WebParam;
import javax.jws.WebService;
+import javax.xml.datatype.DatatypeConfigurationException;
+import javax.xml.datatype.DatatypeFactory;
+import javax.xml.datatype.Duration;
import javax.xml.datatype.XMLGregorianCalendar;
import javax.xml.namespace.QName;
@@ -35,8 +37,21 @@
* @since 09-Mar-2010
*/
@WebService(serviceName = "EndpointRPCService", portName = "EndpointRPCPort", endpointInterface = "org.jboss.test.ws.jaxws.benchmark.test.datatypes.EndpointRPC")
-public class EndpointPOJORPCImpl
+public class EndpointPOJORPCImpl implements EndpointRPC
{
+ private static Duration dayDuration;
+ static
+ {
+ try
+ {
+ dayDuration = DatatypeFactory.newInstance().newDuration(86400000L);
+ }
+ catch (DatatypeConfigurationException e)
+ {
+ dayDuration = null;
+ e.printStackTrace();
+ }
+ }
public String sayHello(@WebParam(name = "toWhom") String toWhom)
{
@@ -59,7 +74,7 @@
return (byte) (value + 1);
}
- public byte[] reverseByteOrder(@WebParam(name = "data") byte[] data) throws IOException
+ public byte[] reverseByteOrder(@WebParam(name = "data") byte[] data)
{
byte[] retVal = new byte[data.length];
for (int i = 0; i < data.length; i++)
@@ -71,7 +86,7 @@
public XMLGregorianCalendar getCalendarPlusDay(@WebParam(name = "calendar") XMLGregorianCalendar calendar)
{
- calendar.setDay(calendar.getDay() + 1);
+ calendar.add(dayDuration);
return (XMLGregorianCalendar) calendar.clone();
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/EndpointPOJOWrappedDocImpl.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/EndpointPOJOWrappedDocImpl.java 2010-03-31 09:09:06 UTC (rev 11907)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/EndpointPOJOWrappedDocImpl.java 2010-03-31 10:55:29 UTC (rev 11908)
@@ -23,12 +23,16 @@
import java.math.BigDecimal;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collections;
import java.util.Date;
import java.util.List;
import javax.ejb.Stateless;
import javax.jws.WebService;
+import javax.xml.datatype.DatatypeConfigurationException;
+import javax.xml.datatype.DatatypeFactory;
+import javax.xml.datatype.Duration;
import javax.xml.datatype.XMLGregorianCalendar;
import javax.xml.namespace.QName;
@@ -40,8 +44,21 @@
*/
@WebService(serviceName = "EndpointWrappedDocService", portName = "EndpointWrappedDocPort", endpointInterface = "org.jboss.test.ws.jaxws.benchmark.test.datatypes.EndpointWrappedDoc")
@Stateless
-public class EndpointPOJOWrappedDocImpl
+public class EndpointPOJOWrappedDocImpl implements EndpointDoc
{
+ private static Duration dayDuration;
+ static
+ {
+ try
+ {
+ dayDuration = DatatypeFactory.newInstance().newDuration(86400000L);
+ }
+ catch (DatatypeConfigurationException e)
+ {
+ dayDuration = null;
+ e.printStackTrace();
+ }
+ }
private static final List<String> stringList;
@@ -87,7 +104,7 @@
public XMLGregorianCalendar getCalendarPlusDay(XMLGregorianCalendar calendar)
{
- calendar.setDay(calendar.getDay() + 1);
+ calendar.add(dayDuration);
return (XMLGregorianCalendar) calendar.clone();
}
@@ -155,7 +172,18 @@
long longValue, float floatValue, double doubleValue, String stringValue, QName qNameValue, Date dateValue,
XMLGregorianCalendar calendarValue)
{
-
+ List<String> stringList = new ArrayList<String>(11);
+ stringList.add(String.valueOf(byteValue));
+ stringList.add(Arrays.toString(byteArrayValue));
+ stringList.add(String.valueOf(shortValue));
+ stringList.add(String.valueOf(intValue));
+ stringList.add(String.valueOf(longValue));
+ stringList.add(String.valueOf(floatValue));
+ stringList.add(String.valueOf(doubleValue));
+ stringList.add(stringValue);
+ stringList.add(qNameValue.toString());
+ stringList.add(dateValue.toString());
+ stringList.add(calendarValue.toString());
return new ComplexType(byteValue, byteArrayValue, shortValue, intValue, longValue, floatValue, doubleValue,
stringValue, stringList, qNameValue, dateValue, calendarValue);
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/EndpointPOJOWrappedRPCImpl.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/EndpointPOJOWrappedRPCImpl.java 2010-03-31 09:09:06 UTC (rev 11907)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/EndpointPOJOWrappedRPCImpl.java 2010-03-31 10:55:29 UTC (rev 11908)
@@ -23,12 +23,16 @@
import java.math.BigDecimal;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collections;
import java.util.Date;
import java.util.List;
import javax.ejb.Stateless;
import javax.jws.WebService;
+import javax.xml.datatype.DatatypeConfigurationException;
+import javax.xml.datatype.DatatypeFactory;
+import javax.xml.datatype.Duration;
import javax.xml.datatype.XMLGregorianCalendar;
import javax.xml.namespace.QName;
@@ -40,17 +44,20 @@
*/
@WebService(serviceName = "EndpointWrappedRPCService", portName = "EndpointWrappedRPCPort", endpointInterface = "org.jboss.test.ws.jaxws.benchmark.test.datatypes.EndpointWrappedRPC")
@Stateless
-public class EndpointPOJOWrappedRPCImpl
+public class EndpointPOJOWrappedRPCImpl implements EndpointRPC
{
- private static final List<String> stringList;
-
+ private static Duration dayDuration;
static
{
- stringList = new ArrayList<String>();
- for (int i = 0; i < 10; i++)
+ try
{
- stringList.add("item " + i);
+ dayDuration = DatatypeFactory.newInstance().newDuration(86400000L);
}
+ catch (DatatypeConfigurationException e)
+ {
+ dayDuration = null;
+ e.printStackTrace();
+ }
}
public String sayHello(String toWhom)
@@ -86,7 +93,7 @@
public XMLGregorianCalendar getCalendarPlusDay(XMLGregorianCalendar calendar)
{
- calendar.setDay(calendar.getDay() + 1);
+ calendar.add(dayDuration);
return (XMLGregorianCalendar) calendar.clone();
}
@@ -154,7 +161,18 @@
long longValue, float floatValue, double doubleValue, String stringValue, QName qNameValue, Date dateValue,
XMLGregorianCalendar calendarValue)
{
-
+ List<String> stringList = new ArrayList<String>(11);
+ stringList.add(String.valueOf(byteValue));
+ stringList.add(Arrays.toString(byteArrayValue));
+ stringList.add(String.valueOf(shortValue));
+ stringList.add(String.valueOf(intValue));
+ stringList.add(String.valueOf(longValue));
+ stringList.add(String.valueOf(floatValue));
+ stringList.add(String.valueOf(doubleValue));
+ stringList.add(stringValue);
+ stringList.add(qNameValue.toString());
+ stringList.add(dateValue.toString());
+ stringList.add(calendarValue.toString());
return new ComplexType(byteValue, byteArrayValue, shortValue, intValue, longValue, floatValue, doubleValue,
stringValue, stringList, qNameValue, dateValue, calendarValue);
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/types/ComplexType.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/types/ComplexType.java 2010-03-31 09:09:06 UTC (rev 11907)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/types/ComplexType.java 2010-03-31 10:55:29 UTC (rev 11908)
@@ -35,7 +35,6 @@
*/
public class ComplexType
{
-
private byte byteValue;
private byte[] byteArrayValue;
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/ejb3/BooleanDocTest.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/ejb3/BooleanDocTest.java 2010-03-31 09:09:06 UTC (rev 11907)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/ejb3/BooleanDocTest.java 2010-03-31 10:55:29 UTC (rev 11908)
@@ -21,7 +21,6 @@
*/
package org.jboss.test.ws.jaxws.benchmark.test.datatypes.unwrapped.ejb3;
-import org.jboss.test.ws.jaxws.benchmark.BenchmarkTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.DataTypesEJB3DocTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.EndpointDoc;
@@ -29,16 +28,15 @@
* @author pmacik at redhat.com
* @since 09-Mar-2010
*/
-public class BooleanDocTest extends DataTypesEJB3DocTest implements BenchmarkTest
+public class BooleanDocTest extends DataTypesEJB3DocTest
{
public void performIteration(Object port) throws Exception
{
- boolean ret = ((EndpointDoc) port).negateBoolean(true);
- boolean exp = false;
- if (ret != exp)
+ boolean ret = ((EndpointDoc) port).negateBoolean(testedBoolean);
+ if (ret != expectedBoolean)
{
- throw new Exception("Unexpected result: " + ret);
+ throw new Exception("Unexpected result: " + ret + "\nExpected:" + expectedBoolean);
}
}
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/ejb3/BooleanRPCTest.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/ejb3/BooleanRPCTest.java 2010-03-31 09:09:06 UTC (rev 11907)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/ejb3/BooleanRPCTest.java 2010-03-31 10:55:29 UTC (rev 11908)
@@ -21,7 +21,6 @@
*/
package org.jboss.test.ws.jaxws.benchmark.test.datatypes.unwrapped.ejb3;
-import org.jboss.test.ws.jaxws.benchmark.BenchmarkTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.DataTypesEJB3RPCTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.EndpointRPC;
@@ -29,16 +28,15 @@
* @author pmacik at redhat.com
* @since 09-Mar-2010
*/
-public class BooleanRPCTest extends DataTypesEJB3RPCTest implements BenchmarkTest
+public class BooleanRPCTest extends DataTypesEJB3RPCTest
{
public void performIteration(Object port) throws Exception
{
- boolean ret = ((EndpointRPC) port).negateBoolean(true);
- boolean exp = false;
- if (ret != exp)
+ boolean ret = ((EndpointRPC) port).negateBoolean(testedBoolean);
+ if (ret != expectedBoolean)
{
- throw new Exception("Unexpected result: " + ret);
+ throw new Exception("Unexpected result: " + ret + "\nExpected:" + expectedBoolean);
}
}
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/ejb3/ByteArrayDocTest.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/ejb3/ByteArrayDocTest.java 2010-03-31 09:09:06 UTC (rev 11907)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/ejb3/ByteArrayDocTest.java 2010-03-31 10:55:29 UTC (rev 11908)
@@ -21,7 +21,6 @@
*/
package org.jboss.test.ws.jaxws.benchmark.test.datatypes.unwrapped.ejb3;
-import org.jboss.test.ws.jaxws.benchmark.BenchmarkTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.DataTypesEJB3DocTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.EndpointDoc;
@@ -29,20 +28,14 @@
* @author pmacik at redhat.com
* @since 09-Mar-2010
*/
-public class ByteArrayDocTest extends DataTypesEJB3DocTest implements BenchmarkTest
+public class ByteArrayDocTest extends DataTypesEJB3DocTest
{
- private static final byte[] tested =
- {1, 2, 4, 8, 16, 32, 64};
-
- private static final byte[] exp =
- {64, 32, 16, 8, 4, 2, 1};
-
public void performIteration(Object port) throws Exception
{
- byte[] ret = ((EndpointDoc) port).reverseByteOrder(tested);
+ byte[] ret = ((EndpointDoc) port).reverseByteOrder(testedByteArray);
for (int i = 0; i < ret.length; i++)
{
- if (ret[i] != exp[i])
+ if (ret[i] != expectedByteArray[i])
{
throw new Exception("Unexpected result: [" + i + "] " + ret);
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/ejb3/ByteArrayRPCTest.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/ejb3/ByteArrayRPCTest.java 2010-03-31 09:09:06 UTC (rev 11907)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/ejb3/ByteArrayRPCTest.java 2010-03-31 10:55:29 UTC (rev 11908)
@@ -21,7 +21,6 @@
*/
package org.jboss.test.ws.jaxws.benchmark.test.datatypes.unwrapped.ejb3;
-import org.jboss.test.ws.jaxws.benchmark.BenchmarkTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.DataTypesEJB3RPCTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.EndpointRPC;
@@ -29,20 +28,14 @@
* @author pmacik at redhat.com
* @since 09-Mar-2010
*/
-public class ByteArrayRPCTest extends DataTypesEJB3RPCTest implements BenchmarkTest
+public class ByteArrayRPCTest extends DataTypesEJB3RPCTest
{
- private static final byte[] tested =
- {1, 2, 4, 8, 16, 32, 64};
-
- private static final byte[] exp =
- {64, 32, 16, 8, 4, 2, 1};
-
public void performIteration(Object port) throws Exception
{
- byte[] ret = ((EndpointRPC) port).reverseByteOrder(tested);
+ byte[] ret = ((EndpointRPC) port).reverseByteOrder(testedByteArray);
for (int i = 0; i < ret.length; i++)
{
- if (ret[i] != exp[i])
+ if (ret[i] != expectedByteArray[i])
{
throw new Exception("Unexpected result: [" + i + "] " + ret);
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/ejb3/ByteDocTest.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/ejb3/ByteDocTest.java 2010-03-31 09:09:06 UTC (rev 11907)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/ejb3/ByteDocTest.java 2010-03-31 10:55:29 UTC (rev 11908)
@@ -21,7 +21,6 @@
*/
package org.jboss.test.ws.jaxws.benchmark.test.datatypes.unwrapped.ejb3;
-import org.jboss.test.ws.jaxws.benchmark.BenchmarkTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.DataTypesEJB3DocTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.EndpointDoc;
@@ -29,16 +28,15 @@
* @author pmacik at redhat.com
* @since 09-Mar-2010
*/
-public class ByteDocTest extends DataTypesEJB3DocTest implements BenchmarkTest
+public class ByteDocTest extends DataTypesEJB3DocTest
{
public void performIteration(Object port) throws Exception
{
- int ret = ((EndpointDoc) port).increaseInt(123456);
- int exp = 123457;
- if (ret != exp)
+ int ret = ((EndpointDoc) port).increaseByte(testedByte);
+ if (ret != expectedByte)
{
- throw new Exception("Unexpected result: " + ret);
+ throw new Exception("Unexpected result: " + ret + "\nExpected:" + expectedByte);
}
}
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/ejb3/ByteRPCTest.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/ejb3/ByteRPCTest.java 2010-03-31 09:09:06 UTC (rev 11907)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/ejb3/ByteRPCTest.java 2010-03-31 10:55:29 UTC (rev 11908)
@@ -21,7 +21,6 @@
*/
package org.jboss.test.ws.jaxws.benchmark.test.datatypes.unwrapped.ejb3;
-import org.jboss.test.ws.jaxws.benchmark.BenchmarkTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.DataTypesEJB3RPCTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.EndpointRPC;
@@ -29,16 +28,15 @@
* @author pmacik at redhat.com
* @since 09-Mar-2010
*/
-public class ByteRPCTest extends DataTypesEJB3RPCTest implements BenchmarkTest
+public class ByteRPCTest extends DataTypesEJB3RPCTest
{
public void performIteration(Object port) throws Exception
{
- int ret = ((EndpointRPC) port).increaseInt(123456);
- int exp = 123457;
- if (ret != exp)
+ int ret = ((EndpointRPC) port).increaseByte(testedByte);
+ if (ret != expectedByte)
{
- throw new Exception("Unexpected result: " + ret);
+ throw new Exception("Unexpected result: " + ret + "\nExpected:" + expectedByte);
}
}
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/ejb3/CalendarDocTest.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/ejb3/CalendarDocTest.java 2010-03-31 09:09:06 UTC (rev 11907)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/ejb3/CalendarDocTest.java 2010-03-31 10:55:29 UTC (rev 11908)
@@ -21,13 +21,8 @@
*/
package org.jboss.test.ws.jaxws.benchmark.test.datatypes.unwrapped.ejb3;
-import java.util.GregorianCalendar;
-
-import javax.xml.datatype.DatatypeConfigurationException;
-import javax.xml.datatype.DatatypeFactory;
import javax.xml.datatype.XMLGregorianCalendar;
-import org.jboss.test.ws.jaxws.benchmark.BenchmarkTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.DataTypesEJB3DocTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.EndpointDoc;
@@ -35,39 +30,16 @@
* @author pmacik at redhat.com
* @since 09-Mar-2010
*/
-public class CalendarDocTest extends DataTypesEJB3DocTest implements BenchmarkTest
+public class CalendarDocTest extends DataTypesEJB3DocTest
{
- private static final XMLGregorianCalendar tested;
- private static final XMLGregorianCalendar exp;
-
- static
- {
- DatatypeFactory dtFactory = null;
- GregorianCalendar calendar = new GregorianCalendar();;
- try
- {
- dtFactory = DatatypeFactory.newInstance();
- }
- catch (DatatypeConfigurationException e)
- {
-
- e.printStackTrace();
- }
- tested = dtFactory.newXMLGregorianCalendar(calendar);
-
- exp = dtFactory.newXMLGregorianCalendar(calendar);
- exp.setDay(exp.getDay() + 1);
-
- }
-
public void performIteration(Object port) throws Exception
{
- XMLGregorianCalendar ret = ((EndpointDoc) port).getCalendarPlusDay(tested);
+ XMLGregorianCalendar ret = ((EndpointDoc) port).getCalendarPlusDay(testedCalendar);
- if (!ret.equals(exp))
+ if (!ret.equals(expectedCalendar))
{
- throw new Exception("Unexpected result: " + ret + "\nExpected:" + exp);
+ throw new Exception("Unexpected result: " + ret + "\nExpected:" + expectedCalendar);
}
}
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/ejb3/CalendarRPCTest.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/ejb3/CalendarRPCTest.java 2010-03-31 09:09:06 UTC (rev 11907)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/ejb3/CalendarRPCTest.java 2010-03-31 10:55:29 UTC (rev 11908)
@@ -21,12 +21,8 @@
*/
package org.jboss.test.ws.jaxws.benchmark.test.datatypes.unwrapped.ejb3;
-import java.util.GregorianCalendar; //import java.util.GregorianCalendar;
-import javax.xml.datatype.DatatypeConfigurationException;
-import javax.xml.datatype.DatatypeFactory;
import javax.xml.datatype.XMLGregorianCalendar;
-import org.jboss.test.ws.jaxws.benchmark.BenchmarkTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.DataTypesEJB3RPCTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.EndpointRPC;
@@ -34,40 +30,16 @@
* @author pmacik at redhat.com
* @since 09-Mar-2010
*/
-public class CalendarRPCTest extends DataTypesEJB3RPCTest implements BenchmarkTest
+public class CalendarRPCTest extends DataTypesEJB3RPCTest
{
- private static final XMLGregorianCalendar tested;
-
- private static final XMLGregorianCalendar exp;
-
- static
- {
- DatatypeFactory dtFactory = null;
- GregorianCalendar calendar = new GregorianCalendar();;
- try
- {
- dtFactory = DatatypeFactory.newInstance();
- }
- catch (DatatypeConfigurationException e)
- {
-
- e.printStackTrace();
- }
- tested = dtFactory.newXMLGregorianCalendar(calendar);
-
- exp = dtFactory.newXMLGregorianCalendar(calendar);
- exp.setDay(exp.getDay() + 1);
-
- }
-
public void performIteration(Object port) throws Exception
{
- XMLGregorianCalendar ret = ((EndpointRPC) port).getCalendarPlusDay(tested);
+ XMLGregorianCalendar ret = ((EndpointRPC) port).getCalendarPlusDay(testedCalendar);
- if (!ret.equals(exp))
+ if (!ret.equals(expectedCalendar))
{
- throw new Exception("Unexpected result: " + ret + "\nExpected:" + exp);
+ throw new Exception("Unexpected result: " + ret + "\nExpected:" + expectedCalendar);
}
}
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/ejb3/DateDocTest.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/ejb3/DateDocTest.java 2010-03-31 09:09:06 UTC (rev 11907)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/ejb3/DateDocTest.java 2010-03-31 10:55:29 UTC (rev 11908)
@@ -23,7 +23,6 @@
import java.util.Date;
-import org.jboss.test.ws.jaxws.benchmark.BenchmarkTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.DataTypesEJB3DocTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.EndpointDoc;
@@ -31,19 +30,16 @@
* @author pmacik at redhat.com
* @since 09-Mar-2010
*/
-public class DateDocTest extends DataTypesEJB3DocTest implements BenchmarkTest
+public class DateDocTest extends DataTypesEJB3DocTest
{
- private static final Date tested = new Date(1234567890L);;
- private static final Date exp = new Date(tested.getTime() + 86400000L);;
-
public void performIteration(Object port) throws Exception
{
- Date ret = ((EndpointDoc) port).getDatePlusDay(tested);
+ Date ret = ((EndpointDoc) port).getDatePlusDay(testedDate);
- if (!ret.equals(exp))
+ if (!ret.equals(expectedDate))
{
- throw new Exception("Unexpected result: " + ret);
+ throw new Exception("Unexpected result: " + ret + "\nExpected:" + expectedDate);
}
}
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/ejb3/DateRPCTest.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/ejb3/DateRPCTest.java 2010-03-31 09:09:06 UTC (rev 11907)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/ejb3/DateRPCTest.java 2010-03-31 10:55:29 UTC (rev 11908)
@@ -23,7 +23,6 @@
import java.util.Date;
-import org.jboss.test.ws.jaxws.benchmark.BenchmarkTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.DataTypesEJB3RPCTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.EndpointRPC;
@@ -31,19 +30,16 @@
* @author pmacik at redhat.com
* @since 09-Mar-2010
*/
-public class DateRPCTest extends DataTypesEJB3RPCTest implements BenchmarkTest
+public class DateRPCTest extends DataTypesEJB3RPCTest
{
- private static final Date tested = new Date(1234567890L);;
- private static final Date exp = new Date(tested.getTime() + 86400000L);;
-
public void performIteration(Object port) throws Exception
{
- Date ret = ((EndpointRPC) port).getDatePlusDay(tested);
+ Date ret = ((EndpointRPC) port).getDatePlusDay(testedDate);
- if (!ret.equals(exp))
+ if (!ret.equals(expectedDate))
{
- throw new Exception("Unexpected result: " + ret);
+ throw new Exception("Unexpected result: " + ret + "\nExpected:" + expectedDate);
}
}
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/ejb3/DoubleDocTest.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/ejb3/DoubleDocTest.java 2010-03-31 09:09:06 UTC (rev 11907)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/ejb3/DoubleDocTest.java 2010-03-31 10:55:29 UTC (rev 11908)
@@ -21,7 +21,6 @@
*/
package org.jboss.test.ws.jaxws.benchmark.test.datatypes.unwrapped.ejb3;
-import org.jboss.test.ws.jaxws.benchmark.BenchmarkTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.DataTypesEJB3DocTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.EndpointDoc;
@@ -29,16 +28,15 @@
* @author pmacik at redhat.com
* @since 09-Mar-2010
*/
-public class DoubleDocTest extends DataTypesEJB3DocTest implements BenchmarkTest
+public class DoubleDocTest extends DataTypesEJB3DocTest
{
public void performIteration(Object port) throws Exception
{
- double ret = ((EndpointDoc) port).increaseDouble(123456.0);
- double exp = 123457.0;
- if (ret != exp)
+ double ret = ((EndpointDoc) port).increaseDouble(testedDouble);
+ if (ret != expectedDouble)
{
- throw new Exception("Unexpected result: " + ret);
+ throw new Exception("Unexpected result: " + ret + "\nExpected:" + expectedDouble);
}
}
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/ejb3/DoubleRPCTest.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/ejb3/DoubleRPCTest.java 2010-03-31 09:09:06 UTC (rev 11907)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/ejb3/DoubleRPCTest.java 2010-03-31 10:55:29 UTC (rev 11908)
@@ -21,7 +21,6 @@
*/
package org.jboss.test.ws.jaxws.benchmark.test.datatypes.unwrapped.ejb3;
-import org.jboss.test.ws.jaxws.benchmark.BenchmarkTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.DataTypesEJB3RPCTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.EndpointRPC;
@@ -29,16 +28,15 @@
* @author pmacik at redhat.com
* @since 09-Mar-2010
*/
-public class DoubleRPCTest extends DataTypesEJB3RPCTest implements BenchmarkTest
+public class DoubleRPCTest extends DataTypesEJB3RPCTest
{
public void performIteration(Object port) throws Exception
{
- double ret = ((EndpointRPC) port).increaseDouble(123456.0);
- double exp = 123457.0;
- if (ret != exp)
+ double ret = ((EndpointRPC) port).increaseDouble(testedDouble);
+ if (ret != expectedDouble)
{
- throw new Exception("Unexpected result: " + ret);
+ throw new Exception("Unexpected result: " + ret + "\nExpected:" + expectedDate);
}
}
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/ejb3/FloatDocTest.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/ejb3/FloatDocTest.java 2010-03-31 09:09:06 UTC (rev 11907)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/ejb3/FloatDocTest.java 2010-03-31 10:55:29 UTC (rev 11908)
@@ -21,7 +21,6 @@
*/
package org.jboss.test.ws.jaxws.benchmark.test.datatypes.unwrapped.ejb3;
-import org.jboss.test.ws.jaxws.benchmark.BenchmarkTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.DataTypesEJB3DocTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.EndpointDoc;
@@ -29,16 +28,15 @@
* @author pmacik at redhat.com
* @since 09-Mar-2010
*/
-public class FloatDocTest extends DataTypesEJB3DocTest implements BenchmarkTest
+public class FloatDocTest extends DataTypesEJB3DocTest
{
public void performIteration(Object port) throws Exception
{
- float ret = ((EndpointDoc) port).increaseFloat(123456f);
- float exp = 123457f;
- if (ret != exp)
+ float ret = ((EndpointDoc) port).increaseFloat(testedFloat);
+ if (ret != expectedFloat)
{
- throw new Exception("Unexpected result: " + ret);
+ throw new Exception("Unexpected result: " + ret + "\nExpected:" + expectedFloat);
}
}
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/ejb3/FloatRPCTest.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/ejb3/FloatRPCTest.java 2010-03-31 09:09:06 UTC (rev 11907)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/ejb3/FloatRPCTest.java 2010-03-31 10:55:29 UTC (rev 11908)
@@ -21,7 +21,6 @@
*/
package org.jboss.test.ws.jaxws.benchmark.test.datatypes.unwrapped.ejb3;
-import org.jboss.test.ws.jaxws.benchmark.BenchmarkTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.DataTypesEJB3RPCTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.EndpointRPC;
@@ -29,16 +28,15 @@
* @author pmacik at redhat.com
* @since 09-Mar-2010
*/
-public class FloatRPCTest extends DataTypesEJB3RPCTest implements BenchmarkTest
+public class FloatRPCTest extends DataTypesEJB3RPCTest
{
public void performIteration(Object port) throws Exception
{
- float ret = ((EndpointRPC) port).increaseFloat(123456f);
- float exp = 123457f;
- if (ret != exp)
+ float ret = ((EndpointRPC) port).increaseFloat(testedFloat);
+ if (ret != expectedFloat)
{
- throw new Exception("Unexpected result: " + ret);
+ throw new Exception("Unexpected result: " + ret + "\nExpected:" + expectedFloat);
}
}
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/ejb3/IntegerDocTest.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/ejb3/IntegerDocTest.java 2010-03-31 09:09:06 UTC (rev 11907)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/ejb3/IntegerDocTest.java 2010-03-31 10:55:29 UTC (rev 11908)
@@ -21,7 +21,6 @@
*/
package org.jboss.test.ws.jaxws.benchmark.test.datatypes.unwrapped.ejb3;
-import org.jboss.test.ws.jaxws.benchmark.BenchmarkTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.DataTypesEJB3DocTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.EndpointDoc;
@@ -29,16 +28,15 @@
* @author pmacik at redhat.com
* @since 09-Mar-2010
*/
-public class IntegerDocTest extends DataTypesEJB3DocTest implements BenchmarkTest
+public class IntegerDocTest extends DataTypesEJB3DocTest
{
public void performIteration(Object port) throws Exception
{
- int ret = ((EndpointDoc) port).increaseInt(123456);
- int exp = 123457;
- if (ret != exp)
+ int ret = ((EndpointDoc) port).increaseInt(testedInt);
+ if (ret != expectedInt)
{
- throw new Exception("Unexpected result: " + ret);
+ throw new Exception("Unexpected result: " + ret + "\nExpected:" + expectedInt);
}
}
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/ejb3/IntegerRPCTest.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/ejb3/IntegerRPCTest.java 2010-03-31 09:09:06 UTC (rev 11907)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/ejb3/IntegerRPCTest.java 2010-03-31 10:55:29 UTC (rev 11908)
@@ -21,7 +21,6 @@
*/
package org.jboss.test.ws.jaxws.benchmark.test.datatypes.unwrapped.ejb3;
-import org.jboss.test.ws.jaxws.benchmark.BenchmarkTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.DataTypesEJB3RPCTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.EndpointRPC;
@@ -29,16 +28,15 @@
* @author pmacik at redhat.com
* @since 09-Mar-2010
*/
-public class IntegerRPCTest extends DataTypesEJB3RPCTest implements BenchmarkTest
+public class IntegerRPCTest extends DataTypesEJB3RPCTest
{
public void performIteration(Object port) throws Exception
{
- int ret = ((EndpointRPC) port).increaseInt(123456);
- int exp = 123457;
- if (ret != exp)
+ int ret = ((EndpointRPC) port).increaseInt(testedInt);
+ if (ret != expectedInt)
{
- throw new Exception("Unexpected result: " + ret);
+ throw new Exception("Unexpected result: " + ret + "\nExpected:" + expectedInt);
}
}
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/ejb3/LongDocTest.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/ejb3/LongDocTest.java 2010-03-31 09:09:06 UTC (rev 11907)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/ejb3/LongDocTest.java 2010-03-31 10:55:29 UTC (rev 11908)
@@ -21,7 +21,6 @@
*/
package org.jboss.test.ws.jaxws.benchmark.test.datatypes.unwrapped.ejb3;
-import org.jboss.test.ws.jaxws.benchmark.BenchmarkTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.DataTypesEJB3DocTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.EndpointDoc;
@@ -29,16 +28,15 @@
* @author pmacik at redhat.com
* @since 09-Mar-2010
*/
-public class LongDocTest extends DataTypesEJB3DocTest implements BenchmarkTest
+public class LongDocTest extends DataTypesEJB3DocTest
{
public void performIteration(Object port) throws Exception
{
- long ret = ((EndpointDoc) port).increaseLong(1234567890L);
- long exp = 1234567891L;
- if (ret != exp)
+ long ret = ((EndpointDoc) port).increaseLong(testedLong);
+ if (ret != expectedLong)
{
- throw new Exception("Unexpected result: " + ret);
+ throw new Exception("Unexpected result: " + ret + "\nExpected:" + expectedLong);
}
}
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/ejb3/LongRPCTest.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/ejb3/LongRPCTest.java 2010-03-31 09:09:06 UTC (rev 11907)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/ejb3/LongRPCTest.java 2010-03-31 10:55:29 UTC (rev 11908)
@@ -21,7 +21,6 @@
*/
package org.jboss.test.ws.jaxws.benchmark.test.datatypes.unwrapped.ejb3;
-import org.jboss.test.ws.jaxws.benchmark.BenchmarkTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.DataTypesEJB3RPCTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.EndpointRPC;
@@ -29,16 +28,15 @@
* @author pmacik at redhat.com
* @since 09-Mar-2010
*/
-public class LongRPCTest extends DataTypesEJB3RPCTest implements BenchmarkTest
+public class LongRPCTest extends DataTypesEJB3RPCTest
{
public void performIteration(Object port) throws Exception
{
- long ret = ((EndpointRPC) port).increaseLong(1234567890L);
- long exp = 1234567891L;
- if (ret != exp)
+ long ret = ((EndpointRPC) port).increaseLong(testedLong);
+ if (ret != expectedLong)
{
- throw new Exception("Unexpected result: " + ret);
+ throw new Exception("Unexpected result: " + ret + "\nExpected:" + expectedLong);
}
}
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/ejb3/QNameDocTest.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/ejb3/QNameDocTest.java 2010-03-31 09:09:06 UTC (rev 11907)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/ejb3/QNameDocTest.java 2010-03-31 10:55:29 UTC (rev 11908)
@@ -23,7 +23,6 @@
import javax.xml.namespace.QName;
-import org.jboss.test.ws.jaxws.benchmark.BenchmarkTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.DataTypesEJB3DocTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.EndpointDoc;
@@ -31,18 +30,16 @@
* @author pmacik at redhat.com
* @since 09-Mar-2010
*/
-public class QNameDocTest extends DataTypesEJB3DocTest implements BenchmarkTest
+public class QNameDocTest extends DataTypesEJB3DocTest
{
- public static final QName exp = new QName("qname_value_modified");
-
public void performIteration(Object port) throws Exception
{
- QName ret = ((EndpointDoc) port).modifyQName(new QName("qname_value"));
+ QName ret = ((EndpointDoc) port).modifyQName(testedQName);
- if (!ret.equals(exp))
+ if (!ret.equals(expectedQName))
{
- throw new Exception("Unexpected result: " + ret);
+ throw new Exception("Unexpected result: " + ret + "\nExpected:" + expectedQName);
}
}
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/ejb3/QNameRPCTest.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/ejb3/QNameRPCTest.java 2010-03-31 09:09:06 UTC (rev 11907)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/ejb3/QNameRPCTest.java 2010-03-31 10:55:29 UTC (rev 11908)
@@ -23,7 +23,6 @@
import javax.xml.namespace.QName;
-import org.jboss.test.ws.jaxws.benchmark.BenchmarkTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.DataTypesEJB3RPCTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.EndpointRPC;
@@ -31,16 +30,15 @@
* @author pmacik at redhat.com
* @since 09-Mar-2010
*/
-public class QNameRPCTest extends DataTypesEJB3RPCTest implements BenchmarkTest
+public class QNameRPCTest extends DataTypesEJB3RPCTest
{
- public static final QName exp = new QName("qname_value_modified");
public void performIteration(Object port) throws Exception
{
- QName ret = ((EndpointRPC) port).modifyQName(new QName("qname_value"));
- if (!ret.equals(exp))
+ QName ret = ((EndpointRPC) port).modifyQName(testedQName);
+ if (!ret.equals(expectedQName))
{
- throw new Exception("Unexpected result: " + ret);
+ throw new Exception("Unexpected result: " + ret + "\nExpected:" + expectedQName);
}
}
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/ejb3/ShortDocTest.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/ejb3/ShortDocTest.java 2010-03-31 09:09:06 UTC (rev 11907)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/ejb3/ShortDocTest.java 2010-03-31 10:55:29 UTC (rev 11908)
@@ -21,7 +21,6 @@
*/
package org.jboss.test.ws.jaxws.benchmark.test.datatypes.unwrapped.ejb3;
-import org.jboss.test.ws.jaxws.benchmark.BenchmarkTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.DataTypesEJB3DocTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.EndpointDoc;
@@ -29,16 +28,15 @@
* @author pmacik at redhat.com
* @since 09-Mar-2010
*/
-public class ShortDocTest extends DataTypesEJB3DocTest implements BenchmarkTest
+public class ShortDocTest extends DataTypesEJB3DocTest
{
public void performIteration(Object port) throws Exception
{
- short ret = ((EndpointDoc) port).increaseShort((short) 123);
- short exp = 124;
- if (ret != exp)
+ short ret = ((EndpointDoc) port).increaseShort(testedShort);
+ if (ret != expectedShort)
{
- throw new Exception("Unexpected result: " + ret);
+ throw new Exception("Unexpected result: " + ret + "\nExpected:" + expectedShort);
}
}
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/ejb3/ShortRPCTest.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/ejb3/ShortRPCTest.java 2010-03-31 09:09:06 UTC (rev 11907)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/ejb3/ShortRPCTest.java 2010-03-31 10:55:29 UTC (rev 11908)
@@ -21,7 +21,6 @@
*/
package org.jboss.test.ws.jaxws.benchmark.test.datatypes.unwrapped.ejb3;
-import org.jboss.test.ws.jaxws.benchmark.BenchmarkTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.DataTypesEJB3RPCTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.EndpointRPC;
@@ -29,16 +28,15 @@
* @author pmacik at redhat.com
* @since 09-Mar-2010
*/
-public class ShortRPCTest extends DataTypesEJB3RPCTest implements BenchmarkTest
+public class ShortRPCTest extends DataTypesEJB3RPCTest
{
public void performIteration(Object port) throws Exception
{
- short ret = ((EndpointRPC) port).increaseShort((short) 124);
- short exp = 124;
- if (ret != exp)
+ short ret = ((EndpointRPC) port).increaseShort(testedShort);
+ if (ret != expectedShort)
{
- throw new Exception("Unexpected result: " + ret);
+ throw new Exception("Unexpected result: " + ret + "\nExpected:" + expectedShort);
}
}
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/ejb3/StringDocTest.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/ejb3/StringDocTest.java 2010-03-31 09:09:06 UTC (rev 11907)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/ejb3/StringDocTest.java 2010-03-31 10:55:29 UTC (rev 11908)
@@ -21,7 +21,6 @@
*/
package org.jboss.test.ws.jaxws.benchmark.test.datatypes.unwrapped.ejb3;
-import org.jboss.test.ws.jaxws.benchmark.BenchmarkTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.DataTypesEJB3DocTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.EndpointDoc;
@@ -29,17 +28,15 @@
* @author pmacik at redhat.com
* @since 09-Mar-2010
*/
-public class StringDocTest extends DataTypesEJB3DocTest implements BenchmarkTest
+public class StringDocTest extends DataTypesEJB3DocTest
{
- private static final String MESSAGE = "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<Order orderId=\"1\" orderDate=\"Wed Nov 15 13:45:28 EST 2006\"\n statusCode=\"9\" netAmount=\"59.97\" totalAmount=\"64.92\" tax=\"4.95\">\n <Customer userName=\"user1\" firstName=\"Harry\" lastName=\"Fletcher\"\n state=\"SD\" />\n <OrderLines>\n <OrderLine position=\"1\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"2\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"3\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"4\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>!
\n <OrderLine position=\"5\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"6\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"7\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"8\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"9\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"10\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <Ord!
erLine position=\"11\" quantity=\"1\">\n <Product p!
roductId
=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"12\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"13\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"14\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"15\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"16\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"17\" quantity=\"1\">\n <Product pr!
oductId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"18\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"19\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"20\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"21\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"22\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"23\" quantity=\"1\">\n <Pr!
oduct productId=\"364\" title=\"The 40-Year-Old Virgin \"\n !
price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"24\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"25\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"26\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"27\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"28\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"29\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n !
price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"30\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"31\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"32\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"33\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"34\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"35\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin !
\"\n price=\"29.98\" />\n </OrderLine>\n !
<Mem
o>\n abcdefghijklmnopqrstuvwxyz0123456789!@#$%^°*()_+-=[]{}:\",.?/`~Pada,pada_jahoda,kterou_sěščřžýáíégggaabcdefghijklmnopqrstuvwxyz0123456789!@#$%^°*()_+-=[]{}:\",.?/`~Pahoda,kterou_sni_pan_Lahodaabcdefghijklmnopqrstuvwxyz0123456789!@#$%^°*()_+-=[]{}:\",.?/`~Pada,pada_jahoda,kterou_sni_pan_Lahoda\n </Memo>\n </OrderLines>\n</Order>\n";
public void performIteration(Object port) throws Exception
{
- String ret = ((EndpointDoc) port).sayHello(MESSAGE);
- String exp = "Hello World Greeting for '" + MESSAGE + "' today";
- if (!exp.equals(ret))
+ String ret = ((EndpointDoc) port).sayHello(testedString);
+ if (!ret.equals(expectedString))
{
- throw new Exception("Unexpected result: " + ret);
+ throw new Exception("Unexpected result: " + ret + "\nExpected:" + expectedString);
}
}
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/ejb3/StringRPCTest.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/ejb3/StringRPCTest.java 2010-03-31 09:09:06 UTC (rev 11907)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/ejb3/StringRPCTest.java 2010-03-31 10:55:29 UTC (rev 11908)
@@ -21,7 +21,6 @@
*/
package org.jboss.test.ws.jaxws.benchmark.test.datatypes.unwrapped.ejb3;
-import org.jboss.test.ws.jaxws.benchmark.BenchmarkTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.DataTypesEJB3RPCTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.EndpointRPC;
@@ -29,18 +28,15 @@
* @author pmacik at redhat.com
* @since 09-Mar-2010
*/
-public class StringRPCTest extends DataTypesEJB3RPCTest implements BenchmarkTest
+public class StringRPCTest extends DataTypesEJB3RPCTest
{
- private static final String MESSAGE = "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<Order orderId=\"1\" orderDate=\"Wed Nov 15 13:45:28 EST 2006\"\n statusCode=\"9\" netAmount=\"59.97\" totalAmount=\"64.92\" tax=\"4.95\">\n <Customer userName=\"user1\" firstName=\"Harry\" lastName=\"Fletcher\"\n state=\"SD\" />\n <OrderLines>\n <OrderLine position=\"1\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"2\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"3\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"4\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>!
\n <OrderLine position=\"5\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"6\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"7\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"8\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"9\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"10\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <Ord!
erLine position=\"11\" quantity=\"1\">\n <Product p!
roductId
=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"12\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"13\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"14\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"15\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"16\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"17\" quantity=\"1\">\n <Product pr!
oductId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"18\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"19\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"20\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"21\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"22\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"23\" quantity=\"1\">\n <Pr!
oduct productId=\"364\" title=\"The 40-Year-Old Virgin \"\n !
price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"24\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"25\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"26\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"27\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"28\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"29\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n !
price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"30\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"31\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"32\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"33\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"34\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"35\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin !
\"\n price=\"29.98\" />\n </OrderLine>\n !
<Mem
o>\n abcdefghijklmnopqrstuvwxyz0123456789!@#$%^°*()_+-=[]{}:\",.?/`~Pada,pada_jahoda,kterou_sěščřžýáíégggaabcdefghijklmnopqrstuvwxyz0123456789!@#$%^°*()_+-=[]{}:\",.?/`~Pahoda,kterou_sni_pan_Lahodaabcdefghijklmnopqrstuvwxyz0123456789!@#$%^°*()_+-=[]{}:\",.?/`~Pada,pada_jahoda,kterou_sni_pan_Lahoda\n </Memo>\n </OrderLines>\n</Order>\n";
-
public void performIteration(Object port) throws Exception
{
- String ret = ((EndpointRPC) port).sayHello(MESSAGE);
- String exp = "Hello World Greeting for '" + MESSAGE + "' today";
- if (!exp.equals(ret))
+ String ret = ((EndpointRPC) port).sayHello(testedString);
+ if (!ret.equals(expectedString))
{
- throw new Exception("Unexpected result: " + ret);
+ throw new Exception("Unexpected result: " + ret + "\nExpected:" + expectedString);
}
}
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/pojo/BooleanDocTest.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/pojo/BooleanDocTest.java 2010-03-31 09:09:06 UTC (rev 11907)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/pojo/BooleanDocTest.java 2010-03-31 10:55:29 UTC (rev 11908)
@@ -21,7 +21,6 @@
*/
package org.jboss.test.ws.jaxws.benchmark.test.datatypes.unwrapped.pojo;
-import org.jboss.test.ws.jaxws.benchmark.BenchmarkTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.DataTypesPOJODocTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.EndpointDoc;
@@ -29,16 +28,15 @@
* @author pmacik at redhat.com
* @since 25-Mar-2010
*/
-public class BooleanDocTest extends DataTypesPOJODocTest implements BenchmarkTest
+public class BooleanDocTest extends DataTypesPOJODocTest
{
public void performIteration(Object port) throws Exception
{
- boolean ret = ((EndpointDoc) port).negateBoolean(true);
- boolean exp = false;
- if (ret != exp)
+ boolean ret = ((EndpointDoc) port).negateBoolean(testedBoolean);
+ if (ret != expectedBoolean)
{
- throw new Exception("Unexpected result: " + ret);
+ throw new Exception("Unexpected result: " + ret + "\nExpected:" + expectedBoolean);
}
}
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/pojo/BooleanRPCTest.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/pojo/BooleanRPCTest.java 2010-03-31 09:09:06 UTC (rev 11907)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/pojo/BooleanRPCTest.java 2010-03-31 10:55:29 UTC (rev 11908)
@@ -21,7 +21,6 @@
*/
package org.jboss.test.ws.jaxws.benchmark.test.datatypes.unwrapped.pojo;
-import org.jboss.test.ws.jaxws.benchmark.BenchmarkTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.DataTypesPOJORPCTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.EndpointRPC;
@@ -29,16 +28,15 @@
* @author pmacik at redhat.com
* @since 25-Mar-2010
*/
-public class BooleanRPCTest extends DataTypesPOJORPCTest implements BenchmarkTest
+public class BooleanRPCTest extends DataTypesPOJORPCTest
{
public void performIteration(Object port) throws Exception
{
- boolean ret = ((EndpointRPC) port).negateBoolean(true);
- boolean exp = false;
- if (ret != exp)
+ boolean ret = ((EndpointRPC) port).negateBoolean(testedBoolean);
+ if (ret != expectedBoolean)
{
- throw new Exception("Unexpected result: " + ret);
+ throw new Exception("Unexpected result: " + ret + "\nExpected:" + expectedBoolean);
}
}
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/pojo/ByteArrayDocTest.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/pojo/ByteArrayDocTest.java 2010-03-31 09:09:06 UTC (rev 11907)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/pojo/ByteArrayDocTest.java 2010-03-31 10:55:29 UTC (rev 11908)
@@ -21,7 +21,6 @@
*/
package org.jboss.test.ws.jaxws.benchmark.test.datatypes.unwrapped.pojo;
-import org.jboss.test.ws.jaxws.benchmark.BenchmarkTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.DataTypesPOJODocTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.EndpointDoc;
@@ -29,20 +28,14 @@
* @author pmacik at redhat.com
* @since 25-Mar-2010
*/
-public class ByteArrayDocTest extends DataTypesPOJODocTest implements BenchmarkTest
+public class ByteArrayDocTest extends DataTypesPOJODocTest
{
- private static final byte[] tested =
- {1, 2, 4, 8, 16, 32, 64};
-
- private static final byte[] exp =
- {64, 32, 16, 8, 4, 2, 1};
-
public void performIteration(Object port) throws Exception
{
- byte[] ret = ((EndpointDoc) port).reverseByteOrder(tested);
+ byte[] ret = ((EndpointDoc) port).reverseByteOrder(testedByteArray);
for (int i = 0; i < ret.length; i++)
{
- if (ret[i] != exp[i])
+ if (ret[i] != expectedByteArray[i])
{
throw new Exception("Unexpected result: [" + i + "] " + ret);
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/pojo/ByteArrayRPCTest.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/pojo/ByteArrayRPCTest.java 2010-03-31 09:09:06 UTC (rev 11907)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/pojo/ByteArrayRPCTest.java 2010-03-31 10:55:29 UTC (rev 11908)
@@ -21,7 +21,6 @@
*/
package org.jboss.test.ws.jaxws.benchmark.test.datatypes.unwrapped.pojo;
-import org.jboss.test.ws.jaxws.benchmark.BenchmarkTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.DataTypesPOJORPCTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.EndpointRPC;
@@ -29,20 +28,15 @@
* @author pmacik at redhat.com
* @since 25-Mar-2010
*/
-public class ByteArrayRPCTest extends DataTypesPOJORPCTest implements BenchmarkTest
+public class ByteArrayRPCTest extends DataTypesPOJORPCTest
{
- private static final byte[] tested =
- {1, 2, 4, 8, 16, 32, 64};
- private static final byte[] exp =
- {64, 32, 16, 8, 4, 2, 1};
-
public void performIteration(Object port) throws Exception
{
- byte[] ret = ((EndpointRPC) port).reverseByteOrder(tested);
+ byte[] ret = ((EndpointRPC) port).reverseByteOrder(testedByteArray);
for (int i = 0; i < ret.length; i++)
{
- if (ret[i] != exp[i])
+ if (ret[i] != expectedByteArray[i])
{
throw new Exception("Unexpected result: [" + i + "] " + ret);
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/pojo/ByteDocTest.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/pojo/ByteDocTest.java 2010-03-31 09:09:06 UTC (rev 11907)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/pojo/ByteDocTest.java 2010-03-31 10:55:29 UTC (rev 11908)
@@ -21,7 +21,6 @@
*/
package org.jboss.test.ws.jaxws.benchmark.test.datatypes.unwrapped.pojo;
-import org.jboss.test.ws.jaxws.benchmark.BenchmarkTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.DataTypesPOJODocTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.EndpointDoc;
@@ -29,16 +28,15 @@
* @author pmacik at redhat.com
* @since 25-Mar-2010
*/
-public class ByteDocTest extends DataTypesPOJODocTest implements BenchmarkTest
+public class ByteDocTest extends DataTypesPOJODocTest
{
public void performIteration(Object port) throws Exception
{
- int ret = ((EndpointDoc) port).increaseInt(123456);
- int exp = 123457;
- if (ret != exp)
+ int ret = ((EndpointDoc) port).increaseByte(testedByte);
+ if (ret != expectedByte)
{
- throw new Exception("Unexpected result: " + ret);
+ throw new Exception("Unexpected result: " + ret + "\nExpected:" + expectedByte);
}
}
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/pojo/ByteRPCTest.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/pojo/ByteRPCTest.java 2010-03-31 09:09:06 UTC (rev 11907)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/pojo/ByteRPCTest.java 2010-03-31 10:55:29 UTC (rev 11908)
@@ -21,7 +21,6 @@
*/
package org.jboss.test.ws.jaxws.benchmark.test.datatypes.unwrapped.pojo;
-import org.jboss.test.ws.jaxws.benchmark.BenchmarkTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.DataTypesPOJORPCTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.EndpointRPC;
@@ -29,16 +28,15 @@
* @author pmacik at redhat.com
* @since 25-Mar-2010
*/
-public class ByteRPCTest extends DataTypesPOJORPCTest implements BenchmarkTest
+public class ByteRPCTest extends DataTypesPOJORPCTest
{
public void performIteration(Object port) throws Exception
{
- int ret = ((EndpointRPC) port).increaseInt(123456);
- int exp = 123457;
- if (ret != exp)
+ int ret = ((EndpointRPC) port).increaseByte(testedByte);
+ if (ret != expectedByte)
{
- throw new Exception("Unexpected result: " + ret);
+ throw new Exception("Unexpected result: " + ret + "\nExpected:" + expectedByte);
}
}
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/pojo/CalendarDocTest.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/pojo/CalendarDocTest.java 2010-03-31 09:09:06 UTC (rev 11907)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/pojo/CalendarDocTest.java 2010-03-31 10:55:29 UTC (rev 11908)
@@ -21,13 +21,8 @@
*/
package org.jboss.test.ws.jaxws.benchmark.test.datatypes.unwrapped.pojo;
-import java.util.GregorianCalendar;
-
-import javax.xml.datatype.DatatypeConfigurationException;
-import javax.xml.datatype.DatatypeFactory;
import javax.xml.datatype.XMLGregorianCalendar;
-import org.jboss.test.ws.jaxws.benchmark.BenchmarkTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.DataTypesPOJODocTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.EndpointDoc;
@@ -35,39 +30,15 @@
* @author pmacik at redhat.com
* @since 25-Mar-2010
*/
-public class CalendarDocTest extends DataTypesPOJODocTest implements BenchmarkTest
+public class CalendarDocTest extends DataTypesPOJODocTest
{
- private static final XMLGregorianCalendar tested;
- private static final XMLGregorianCalendar exp;
-
- static
- {
- DatatypeFactory dtFactory = null;
- GregorianCalendar calendar = new GregorianCalendar();;
- try
- {
- dtFactory = DatatypeFactory.newInstance();
- }
- catch (DatatypeConfigurationException e)
- {
-
- e.printStackTrace();
- }
- tested = dtFactory.newXMLGregorianCalendar(calendar);
-
- exp = dtFactory.newXMLGregorianCalendar(calendar);
- exp.setDay(exp.getDay() + 1);
-
- }
-
public void performIteration(Object port) throws Exception
{
- XMLGregorianCalendar ret = ((EndpointDoc) port).getCalendarPlusDay(tested);
-
- if (!ret.equals(exp))
+ XMLGregorianCalendar ret = ((EndpointDoc) port).getCalendarPlusDay(testedCalendar);
+ if (!ret.equals(expectedCalendar))
{
- throw new Exception("Unexpected result: " + ret + "\nExpected:" + exp);
+ throw new Exception("Unexpected result: " + ret + "\nExpected:" + expectedCalendar);
}
}
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/pojo/CalendarRPCTest.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/pojo/CalendarRPCTest.java 2010-03-31 09:09:06 UTC (rev 11907)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/pojo/CalendarRPCTest.java 2010-03-31 10:55:29 UTC (rev 11908)
@@ -21,12 +21,8 @@
*/
package org.jboss.test.ws.jaxws.benchmark.test.datatypes.unwrapped.pojo;
-import java.util.GregorianCalendar; //import java.util.GregorianCalendar;
-import javax.xml.datatype.DatatypeConfigurationException;
-import javax.xml.datatype.DatatypeFactory;
import javax.xml.datatype.XMLGregorianCalendar;
-import org.jboss.test.ws.jaxws.benchmark.BenchmarkTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.DataTypesPOJORPCTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.EndpointRPC;
@@ -34,40 +30,15 @@
* @author pmacik at redhat.com
* @since 25-Mar-2010
*/
-public class CalendarRPCTest extends DataTypesPOJORPCTest implements BenchmarkTest
+public class CalendarRPCTest extends DataTypesPOJORPCTest
{
- private static final XMLGregorianCalendar tested;
-
- private static final XMLGregorianCalendar exp;
-
- static
- {
- DatatypeFactory dtFactory = null;
- GregorianCalendar calendar = new GregorianCalendar();;
- try
- {
- dtFactory = DatatypeFactory.newInstance();
- }
- catch (DatatypeConfigurationException e)
- {
-
- e.printStackTrace();
- }
- tested = dtFactory.newXMLGregorianCalendar(calendar);
-
- exp = dtFactory.newXMLGregorianCalendar(calendar);
- exp.setDay(exp.getDay() + 1);
-
- }
-
public void performIteration(Object port) throws Exception
{
- XMLGregorianCalendar ret = ((EndpointRPC) port).getCalendarPlusDay(tested);
-
- if (!ret.equals(exp))
+ XMLGregorianCalendar ret = ((EndpointRPC) port).getCalendarPlusDay(testedCalendar);
+ if (!ret.equals(expectedCalendar))
{
- throw new Exception("Unexpected result: " + ret + "\nExpected:" + exp);
+ throw new Exception("Unexpected result: " + ret + "\nExpected:" + expectedCalendar);
}
}
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/pojo/DateDocTest.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/pojo/DateDocTest.java 2010-03-31 09:09:06 UTC (rev 11907)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/pojo/DateDocTest.java 2010-03-31 10:55:29 UTC (rev 11908)
@@ -23,7 +23,6 @@
import java.util.Date;
-import org.jboss.test.ws.jaxws.benchmark.BenchmarkTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.DataTypesPOJODocTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.EndpointDoc;
@@ -31,19 +30,16 @@
* @author pmacik at redhat.com
* @since 25-Mar-2010
*/
-public class DateDocTest extends DataTypesPOJODocTest implements BenchmarkTest
+public class DateDocTest extends DataTypesPOJODocTest
{
- private static final Date tested = new Date(1234567890L);;
- private static final Date exp = new Date(tested.getTime() + 86400000L);;
-
public void performIteration(Object port) throws Exception
{
- Date ret = ((EndpointDoc) port).getDatePlusDay(tested);
+ Date ret = ((EndpointDoc) port).getDatePlusDay(testedDate);
- if (!ret.equals(exp))
+ if (!ret.equals(expectedDate))
{
- throw new Exception("Unexpected result: " + ret);
+ throw new Exception("Unexpected result: " + ret + "\nExpected:" + expectedDate);
}
}
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/pojo/DateRPCTest.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/pojo/DateRPCTest.java 2010-03-31 09:09:06 UTC (rev 11907)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/pojo/DateRPCTest.java 2010-03-31 10:55:29 UTC (rev 11908)
@@ -23,7 +23,6 @@
import java.util.Date;
-import org.jboss.test.ws.jaxws.benchmark.BenchmarkTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.DataTypesPOJORPCTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.EndpointRPC;
@@ -31,19 +30,15 @@
* @author pmacik at redhat.com
* @since 25-Mar-2010
*/
-public class DateRPCTest extends DataTypesPOJORPCTest implements BenchmarkTest
+public class DateRPCTest extends DataTypesPOJORPCTest
{
- private static final Date tested = new Date(1234567890L);;
-
- private static final Date exp = new Date(tested.getTime() + 86400000L);;
-
public void performIteration(Object port) throws Exception
{
- Date ret = ((EndpointRPC) port).getDatePlusDay(tested);
+ Date ret = ((EndpointRPC) port).getDatePlusDay(testedDate);
- if (!ret.equals(exp))
+ if (!ret.equals(expectedDate))
{
- throw new Exception("Unexpected result: " + ret);
+ throw new Exception("Unexpected result: " + ret + "\nExpected:" + expectedDate);
}
}
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/pojo/DoubleDocTest.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/pojo/DoubleDocTest.java 2010-03-31 09:09:06 UTC (rev 11907)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/pojo/DoubleDocTest.java 2010-03-31 10:55:29 UTC (rev 11908)
@@ -21,7 +21,6 @@
*/
package org.jboss.test.ws.jaxws.benchmark.test.datatypes.unwrapped.pojo;
-import org.jboss.test.ws.jaxws.benchmark.BenchmarkTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.DataTypesPOJODocTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.EndpointDoc;
@@ -29,16 +28,15 @@
* @author pmacik at redhat.com
* @since 25-Mar-2010
*/
-public class DoubleDocTest extends DataTypesPOJODocTest implements BenchmarkTest
+public class DoubleDocTest extends DataTypesPOJODocTest
{
public void performIteration(Object port) throws Exception
{
- double ret = ((EndpointDoc) port).increaseDouble(123456.0);
- double exp = 123457.0;
- if (ret != exp)
+ double ret = ((EndpointDoc) port).increaseDouble(testedDouble);
+ if (ret != expectedDouble)
{
- throw new Exception("Unexpected result: " + ret);
+ throw new Exception("Unexpected result: " + ret + "\nExpected:" + expectedDouble);
}
}
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/pojo/DoubleRPCTest.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/pojo/DoubleRPCTest.java 2010-03-31 09:09:06 UTC (rev 11907)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/pojo/DoubleRPCTest.java 2010-03-31 10:55:29 UTC (rev 11908)
@@ -21,7 +21,6 @@
*/
package org.jboss.test.ws.jaxws.benchmark.test.datatypes.unwrapped.pojo;
-import org.jboss.test.ws.jaxws.benchmark.BenchmarkTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.DataTypesPOJORPCTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.EndpointRPC;
@@ -29,16 +28,15 @@
* @author pmacik at redhat.com
* @since 25-Mar-2010
*/
-public class DoubleRPCTest extends DataTypesPOJORPCTest implements BenchmarkTest
+public class DoubleRPCTest extends DataTypesPOJORPCTest
{
public void performIteration(Object port) throws Exception
{
- double ret = ((EndpointRPC) port).increaseDouble(123456.0);
- double exp = 123457.0;
- if (ret != exp)
+ double ret = ((EndpointRPC) port).increaseDouble(testedDouble);
+ if (ret != expectedDouble)
{
- throw new Exception("Unexpected result: " + ret);
+ throw new Exception("Unexpected result: " + ret + "\nExpected:" + expectedDouble);
}
}
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/pojo/FloatDocTest.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/pojo/FloatDocTest.java 2010-03-31 09:09:06 UTC (rev 11907)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/pojo/FloatDocTest.java 2010-03-31 10:55:29 UTC (rev 11908)
@@ -21,7 +21,6 @@
*/
package org.jboss.test.ws.jaxws.benchmark.test.datatypes.unwrapped.pojo;
-import org.jboss.test.ws.jaxws.benchmark.BenchmarkTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.DataTypesPOJODocTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.EndpointDoc;
@@ -29,16 +28,15 @@
* @author pmacik at redhat.com
* @since 25-Mar-2010
*/
-public class FloatDocTest extends DataTypesPOJODocTest implements BenchmarkTest
+public class FloatDocTest extends DataTypesPOJODocTest
{
public void performIteration(Object port) throws Exception
{
- float ret = ((EndpointDoc) port).increaseFloat(123456f);
- float exp = 123457f;
- if (ret != exp)
+ float ret = ((EndpointDoc) port).increaseFloat(testedFloat);
+ if (ret != expectedFloat)
{
- throw new Exception("Unexpected result: " + ret);
+ throw new Exception("Unexpected result: " + ret + "\nExpected:" + expectedFloat);
}
}
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/pojo/FloatRPCTest.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/pojo/FloatRPCTest.java 2010-03-31 09:09:06 UTC (rev 11907)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/pojo/FloatRPCTest.java 2010-03-31 10:55:29 UTC (rev 11908)
@@ -21,7 +21,6 @@
*/
package org.jboss.test.ws.jaxws.benchmark.test.datatypes.unwrapped.pojo;
-import org.jboss.test.ws.jaxws.benchmark.BenchmarkTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.DataTypesPOJORPCTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.EndpointRPC;
@@ -29,16 +28,15 @@
* @author pmacik at redhat.com
* @since 25-Mar-2010
*/
-public class FloatRPCTest extends DataTypesPOJORPCTest implements BenchmarkTest
+public class FloatRPCTest extends DataTypesPOJORPCTest
{
public void performIteration(Object port) throws Exception
{
- float ret = ((EndpointRPC) port).increaseFloat(123456f);
- float exp = 123457f;
- if (ret != exp)
+ float ret = ((EndpointRPC) port).increaseFloat(testedFloat);
+ if (ret != expectedFloat)
{
- throw new Exception("Unexpected result: " + ret);
+ throw new Exception("Unexpected result: " + ret + "\nExpected:" + expectedFloat);
}
}
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/pojo/IntegerDocTest.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/pojo/IntegerDocTest.java 2010-03-31 09:09:06 UTC (rev 11907)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/pojo/IntegerDocTest.java 2010-03-31 10:55:29 UTC (rev 11908)
@@ -21,7 +21,6 @@
*/
package org.jboss.test.ws.jaxws.benchmark.test.datatypes.unwrapped.pojo;
-import org.jboss.test.ws.jaxws.benchmark.BenchmarkTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.DataTypesPOJODocTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.EndpointDoc;
@@ -29,16 +28,15 @@
* @author pmacik at redhat.com
* @since 25-Mar-2010
*/
-public class IntegerDocTest extends DataTypesPOJODocTest implements BenchmarkTest
+public class IntegerDocTest extends DataTypesPOJODocTest
{
public void performIteration(Object port) throws Exception
{
- int ret = ((EndpointDoc) port).increaseInt(123456);
- int exp = 123457;
- if (ret != exp)
+ int ret = ((EndpointDoc) port).increaseInt(testedInt);
+ if (ret != expectedInt)
{
- throw new Exception("Unexpected result: " + ret);
+ throw new Exception("Unexpected result: " + ret + "\nExpected:" + expectedInt);
}
}
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/pojo/IntegerRPCTest.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/pojo/IntegerRPCTest.java 2010-03-31 09:09:06 UTC (rev 11907)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/pojo/IntegerRPCTest.java 2010-03-31 10:55:29 UTC (rev 11908)
@@ -21,7 +21,6 @@
*/
package org.jboss.test.ws.jaxws.benchmark.test.datatypes.unwrapped.pojo;
-import org.jboss.test.ws.jaxws.benchmark.BenchmarkTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.DataTypesPOJORPCTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.EndpointRPC;
@@ -29,16 +28,15 @@
* @author pmacik at redhat.com
* @since 25-Mar-2010
*/
-public class IntegerRPCTest extends DataTypesPOJORPCTest implements BenchmarkTest
+public class IntegerRPCTest extends DataTypesPOJORPCTest
{
public void performIteration(Object port) throws Exception
{
- int ret = ((EndpointRPC) port).increaseInt(123456);
- int exp = 123457;
- if (ret != exp)
+ int ret = ((EndpointRPC) port).increaseInt(testedInt);
+ if (ret != expectedInt)
{
- throw new Exception("Unexpected result: " + ret);
+ throw new Exception("Unexpected result: " + ret + "\nExpected:" + expectedInt);
}
}
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/pojo/LongDocTest.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/pojo/LongDocTest.java 2010-03-31 09:09:06 UTC (rev 11907)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/pojo/LongDocTest.java 2010-03-31 10:55:29 UTC (rev 11908)
@@ -21,7 +21,6 @@
*/
package org.jboss.test.ws.jaxws.benchmark.test.datatypes.unwrapped.pojo;
-import org.jboss.test.ws.jaxws.benchmark.BenchmarkTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.DataTypesPOJODocTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.EndpointDoc;
@@ -29,16 +28,15 @@
* @author pmacik at redhat.com
* @since 25-Mar-2010
*/
-public class LongDocTest extends DataTypesPOJODocTest implements BenchmarkTest
+public class LongDocTest extends DataTypesPOJODocTest
{
public void performIteration(Object port) throws Exception
{
- long ret = ((EndpointDoc) port).increaseLong(1234567890L);
- long exp = 1234567891L;
- if (ret != exp)
+ long ret = ((EndpointDoc) port).increaseLong(testedLong);
+ if (ret != expectedLong)
{
- throw new Exception("Unexpected result: " + ret);
+ throw new Exception("Unexpected result: " + ret + "\nExpected:" + expectedLong);
}
}
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/pojo/LongRPCTest.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/pojo/LongRPCTest.java 2010-03-31 09:09:06 UTC (rev 11907)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/pojo/LongRPCTest.java 2010-03-31 10:55:29 UTC (rev 11908)
@@ -21,7 +21,6 @@
*/
package org.jboss.test.ws.jaxws.benchmark.test.datatypes.unwrapped.pojo;
-import org.jboss.test.ws.jaxws.benchmark.BenchmarkTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.DataTypesPOJORPCTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.EndpointRPC;
@@ -29,16 +28,15 @@
* @author pmacik at redhat.com
* @since 25-Mar-2010
*/
-public class LongRPCTest extends DataTypesPOJORPCTest implements BenchmarkTest
+public class LongRPCTest extends DataTypesPOJORPCTest
{
public void performIteration(Object port) throws Exception
{
- long ret = ((EndpointRPC) port).increaseLong(1234567890L);
- long exp = 1234567891L;
- if (ret != exp)
+ long ret = ((EndpointRPC) port).increaseLong(testedLong);
+ if (ret != expectedLong)
{
- throw new Exception("Unexpected result: " + ret);
+ throw new Exception("Unexpected result: " + ret + "\nExpected:" + expectedLong);
}
}
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/pojo/QNameDocTest.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/pojo/QNameDocTest.java 2010-03-31 09:09:06 UTC (rev 11907)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/pojo/QNameDocTest.java 2010-03-31 10:55:29 UTC (rev 11908)
@@ -23,7 +23,6 @@
import javax.xml.namespace.QName;
-import org.jboss.test.ws.jaxws.benchmark.BenchmarkTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.DataTypesPOJODocTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.EndpointDoc;
@@ -31,18 +30,16 @@
* @author pmacik at redhat.com
* @since 25-Mar-2010
*/
-public class QNameDocTest extends DataTypesPOJODocTest implements BenchmarkTest
+public class QNameDocTest extends DataTypesPOJODocTest
{
- public static final QName exp = new QName("qname_value_modified");
-
public void performIteration(Object port) throws Exception
{
- QName ret = ((EndpointDoc) port).modifyQName(new QName("qname_value"));
+ QName ret = ((EndpointDoc) port).modifyQName(testedQName);
- if (!ret.equals(exp))
+ if (!ret.equals(expectedQName))
{
- throw new Exception("Unexpected result: " + ret);
+ throw new Exception("Unexpected result: " + ret + "\nExpected:" + expectedQName);
}
}
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/pojo/QNameRPCTest.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/pojo/QNameRPCTest.java 2010-03-31 09:09:06 UTC (rev 11907)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/pojo/QNameRPCTest.java 2010-03-31 10:55:29 UTC (rev 11908)
@@ -23,7 +23,6 @@
import javax.xml.namespace.QName;
-import org.jboss.test.ws.jaxws.benchmark.BenchmarkTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.DataTypesPOJORPCTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.EndpointRPC;
@@ -31,16 +30,15 @@
* @author pmacik at redhat.com
* @since 25-Mar-2010
*/
-public class QNameRPCTest extends DataTypesPOJORPCTest implements BenchmarkTest
+public class QNameRPCTest extends DataTypesPOJORPCTest
{
- public static final QName exp = new QName("qname_value_modified");
public void performIteration(Object port) throws Exception
{
- QName ret = ((EndpointRPC) port).modifyQName(new QName("qname_value"));
- if (!ret.equals(exp))
+ QName ret = ((EndpointRPC) port).modifyQName(testedQName);
+ if (!ret.equals(expectedQName))
{
- throw new Exception("Unexpected result: " + ret);
+ throw new Exception("Unexpected result: " + ret + "\nExpected:" + expectedQName);
}
}
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/pojo/ShortDocTest.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/pojo/ShortDocTest.java 2010-03-31 09:09:06 UTC (rev 11907)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/pojo/ShortDocTest.java 2010-03-31 10:55:29 UTC (rev 11908)
@@ -21,7 +21,6 @@
*/
package org.jboss.test.ws.jaxws.benchmark.test.datatypes.unwrapped.pojo;
-import org.jboss.test.ws.jaxws.benchmark.BenchmarkTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.DataTypesPOJODocTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.EndpointDoc;
@@ -29,16 +28,15 @@
* @author pmacik at redhat.com
* @since 25-Mar-2010
*/
-public class ShortDocTest extends DataTypesPOJODocTest implements BenchmarkTest
+public class ShortDocTest extends DataTypesPOJODocTest
{
public void performIteration(Object port) throws Exception
{
- short ret = ((EndpointDoc) port).increaseShort((short) 123);
- short exp = 124;
- if (ret != exp)
+ short ret = ((EndpointDoc) port).increaseShort(testedShort);
+ if (ret != expectedShort)
{
- throw new Exception("Unexpected result: " + ret);
+ throw new Exception("Unexpected result: " + ret + "\nExpected:" + expectedShort);
}
}
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/pojo/ShortRPCTest.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/pojo/ShortRPCTest.java 2010-03-31 09:09:06 UTC (rev 11907)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/pojo/ShortRPCTest.java 2010-03-31 10:55:29 UTC (rev 11908)
@@ -21,7 +21,6 @@
*/
package org.jboss.test.ws.jaxws.benchmark.test.datatypes.unwrapped.pojo;
-import org.jboss.test.ws.jaxws.benchmark.BenchmarkTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.DataTypesPOJORPCTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.EndpointRPC;
@@ -29,16 +28,15 @@
* @author pmacik at redhat.com
* @since 25-Mar-2010
*/
-public class ShortRPCTest extends DataTypesPOJORPCTest implements BenchmarkTest
+public class ShortRPCTest extends DataTypesPOJORPCTest
{
public void performIteration(Object port) throws Exception
{
- short ret = ((EndpointRPC) port).increaseShort((short) 124);
- short exp = 124;
- if (ret != exp)
+ short ret = ((EndpointRPC) port).increaseShort(testedShort);
+ if (ret != expectedShort)
{
- throw new Exception("Unexpected result: " + ret);
+ throw new Exception("Unexpected result: " + ret + "\nExpected:" + expectedShort);
}
}
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/pojo/StringDocTest.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/pojo/StringDocTest.java 2010-03-31 09:09:06 UTC (rev 11907)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/pojo/StringDocTest.java 2010-03-31 10:55:29 UTC (rev 11908)
@@ -21,7 +21,6 @@
*/
package org.jboss.test.ws.jaxws.benchmark.test.datatypes.unwrapped.pojo;
-import org.jboss.test.ws.jaxws.benchmark.BenchmarkTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.DataTypesPOJODocTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.EndpointDoc;
@@ -29,17 +28,15 @@
* @author pmacik at redhat.com
* @since 25-Mar-2010
*/
-public class StringDocTest extends DataTypesPOJODocTest implements BenchmarkTest
+public class StringDocTest extends DataTypesPOJODocTest
{
- private static final String MESSAGE = "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<Order orderId=\"1\" orderDate=\"Wed Nov 15 13:45:28 EST 2006\"\n statusCode=\"9\" netAmount=\"59.97\" totalAmount=\"64.92\" tax=\"4.95\">\n <Customer userName=\"user1\" firstName=\"Harry\" lastName=\"Fletcher\"\n state=\"SD\" />\n <OrderLines>\n <OrderLine position=\"1\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"2\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"3\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"4\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>!
\n <OrderLine position=\"5\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"6\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"7\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"8\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"9\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"10\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <Ord!
erLine position=\"11\" quantity=\"1\">\n <Product p!
roductId
=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"12\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"13\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"14\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"15\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"16\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"17\" quantity=\"1\">\n <Product pr!
oductId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"18\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"19\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"20\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"21\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"22\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"23\" quantity=\"1\">\n <Pr!
oduct productId=\"364\" title=\"The 40-Year-Old Virgin \"\n !
price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"24\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"25\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"26\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"27\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"28\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"29\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n !
price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"30\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"31\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"32\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"33\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"34\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"35\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin !
\"\n price=\"29.98\" />\n </OrderLine>\n !
<Mem
o>\n abcdefghijklmnopqrstuvwxyz0123456789!@#$%^°*()_+-=[]{}:\",.?/`~Pada,pada_jahoda,kterou_sěščřžýáíégggaabcdefghijklmnopqrstuvwxyz0123456789!@#$%^°*()_+-=[]{}:\",.?/`~Pahoda,kterou_sni_pan_Lahodaabcdefghijklmnopqrstuvwxyz0123456789!@#$%^°*()_+-=[]{}:\",.?/`~Pada,pada_jahoda,kterou_sni_pan_Lahoda\n </Memo>\n </OrderLines>\n</Order>\n";
public void performIteration(Object port) throws Exception
{
- String ret = ((EndpointDoc) port).sayHello(MESSAGE);
- String exp = "Hello World Greeting for '" + MESSAGE + "' today";
- if (!exp.equals(ret))
+ String ret = ((EndpointDoc) port).sayHello(testedString);
+ if (!ret.equals(expectedString))
{
- throw new Exception("Unexpected result: " + ret);
+ throw new Exception("Unexpected result: " + ret + "\nExpected:" + expectedString);
}
}
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/pojo/StringRPCTest.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/pojo/StringRPCTest.java 2010-03-31 09:09:06 UTC (rev 11907)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/pojo/StringRPCTest.java 2010-03-31 10:55:29 UTC (rev 11908)
@@ -21,7 +21,6 @@
*/
package org.jboss.test.ws.jaxws.benchmark.test.datatypes.unwrapped.pojo;
-import org.jboss.test.ws.jaxws.benchmark.BenchmarkTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.DataTypesPOJORPCTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.EndpointRPC;
@@ -29,18 +28,15 @@
* @author pmacik at redhat.com
* @since 25-Mar-2010
*/
-public class StringRPCTest extends DataTypesPOJORPCTest implements BenchmarkTest
+public class StringRPCTest extends DataTypesPOJORPCTest
{
- private static final String MESSAGE = "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<Order orderId=\"1\" orderDate=\"Wed Nov 15 13:45:28 EST 2006\"\n statusCode=\"9\" netAmount=\"59.97\" totalAmount=\"64.92\" tax=\"4.95\">\n <Customer userName=\"user1\" firstName=\"Harry\" lastName=\"Fletcher\"\n state=\"SD\" />\n <OrderLines>\n <OrderLine position=\"1\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"2\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"3\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"4\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>!
\n <OrderLine position=\"5\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"6\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"7\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"8\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"9\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"10\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <Ord!
erLine position=\"11\" quantity=\"1\">\n <Product p!
roductId
=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"12\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"13\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"14\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"15\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"16\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"17\" quantity=\"1\">\n <Product pr!
oductId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"18\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"19\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"20\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"21\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"22\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"23\" quantity=\"1\">\n <Pr!
oduct productId=\"364\" title=\"The 40-Year-Old Virgin \"\n !
price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"24\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"25\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"26\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"27\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"28\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"29\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n !
price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"30\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"31\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"32\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"33\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"34\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"35\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin !
\"\n price=\"29.98\" />\n </OrderLine>\n !
<Mem
o>\n abcdefghijklmnopqrstuvwxyz0123456789!@#$%^°*()_+-=[]{}:\",.?/`~Pada,pada_jahoda,kterou_sěščřžýáíégggaabcdefghijklmnopqrstuvwxyz0123456789!@#$%^°*()_+-=[]{}:\",.?/`~Pahoda,kterou_sni_pan_Lahodaabcdefghijklmnopqrstuvwxyz0123456789!@#$%^°*()_+-=[]{}:\",.?/`~Pada,pada_jahoda,kterou_sni_pan_Lahoda\n </Memo>\n </OrderLines>\n</Order>\n";
-
public void performIteration(Object port) throws Exception
{
- String ret = ((EndpointRPC) port).sayHello(MESSAGE);
- String exp = "Hello World Greeting for '" + MESSAGE + "' today";
- if (!exp.equals(ret))
+ String ret = ((EndpointRPC) port).sayHello(testedString);
+ if (!ret.equals(expectedString))
{
- throw new Exception("Unexpected result: " + ret);
+ throw new Exception("Unexpected result: " + ret + "\nExpected:" + expectedString);
}
}
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ejb3/BooleanDocTest.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ejb3/BooleanDocTest.java 2010-03-31 09:09:06 UTC (rev 11907)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ejb3/BooleanDocTest.java 2010-03-31 10:55:29 UTC (rev 11908)
@@ -21,7 +21,6 @@
*/
package org.jboss.test.ws.jaxws.benchmark.test.datatypes.wrapped.ejb3;
-import org.jboss.test.ws.jaxws.benchmark.BenchmarkTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.DataTypesEJB3WrappedDocTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.EndpointWrappedDoc;
@@ -29,16 +28,15 @@
* @author pmacik at redhat.com
* @since 09-Mar-2010
*/
-public class BooleanDocTest extends DataTypesEJB3WrappedDocTest implements BenchmarkTest
+public class BooleanDocTest extends DataTypesEJB3WrappedDocTest
{
public void performIteration(Object port) throws Exception
{
- boolean ret = ((EndpointWrappedDoc) port).negateBoolean(true);
- boolean exp = false;
- if (ret != exp)
+ boolean ret = ((EndpointWrappedDoc) port).negateBoolean(testedBoolean);
+ if (ret != expectedBoolean)
{
- throw new Exception("Unexpected result: " + ret + "\nExpected:" + exp);
+ throw new Exception("Unexpected result: " + ret + "\nExpected:" + expectedBoolean);
}
}
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ejb3/BooleanRPCTest.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ejb3/BooleanRPCTest.java 2010-03-31 09:09:06 UTC (rev 11907)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ejb3/BooleanRPCTest.java 2010-03-31 10:55:29 UTC (rev 11908)
@@ -21,7 +21,6 @@
*/
package org.jboss.test.ws.jaxws.benchmark.test.datatypes.wrapped.ejb3;
-import org.jboss.test.ws.jaxws.benchmark.BenchmarkTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.DataTypesEJB3WrappedRPCTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.EndpointWrappedRPC;
@@ -29,16 +28,15 @@
* @author pmacik at redhat.com
* @since 09-Mar-2010
*/
-public class BooleanRPCTest extends DataTypesEJB3WrappedRPCTest implements BenchmarkTest
+public class BooleanRPCTest extends DataTypesEJB3WrappedRPCTest
{
public void performIteration(Object port) throws Exception
{
- boolean ret = ((EndpointWrappedRPC) port).negateBoolean(true);
- boolean exp = false;
- if (ret != exp)
+ boolean ret = ((EndpointWrappedRPC) port).negateBoolean(testedBoolean);
+ if (ret != expectedBoolean)
{
- throw new Exception("Unexpected result: " + ret + "\nExpected:" + exp);
+ throw new Exception("Unexpected result: " + ret + "\nExpected:" + expectedBoolean);
}
}
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ejb3/ByteArrayDocTest.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ejb3/ByteArrayDocTest.java 2010-03-31 09:09:06 UTC (rev 11907)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ejb3/ByteArrayDocTest.java 2010-03-31 10:55:29 UTC (rev 11908)
@@ -21,7 +21,6 @@
*/
package org.jboss.test.ws.jaxws.benchmark.test.datatypes.wrapped.ejb3;
-import org.jboss.test.ws.jaxws.benchmark.BenchmarkTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.DataTypesEJB3WrappedDocTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.EndpointWrappedDoc;
@@ -29,20 +28,15 @@
* @author pmacik at redhat.com
* @since 09-Mar-2010
*/
-public class ByteArrayDocTest extends DataTypesEJB3WrappedDocTest implements BenchmarkTest
+public class ByteArrayDocTest extends DataTypesEJB3WrappedDocTest
{
- private static final byte[] tested =
- {1, 2, 4, 8, 16, 32, 64};
- private static final byte[] exp =
- {64, 32, 16, 8, 4, 2, 1};
-
public void performIteration(Object port) throws Exception
{
- byte[] ret = ((EndpointWrappedDoc) port).reverseByteOrder(tested);
+ byte[] ret = ((EndpointWrappedDoc) port).reverseByteOrder(testedByteArray);
for (int i = 0; i < ret.length; i++)
{
- if (ret[i] != exp[i])
+ if (ret[i] != expectedByteArray[i])
{
throw new Exception("Unexpected result: [" + i + "] " + ret);
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ejb3/ByteArrayRPCTest.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ejb3/ByteArrayRPCTest.java 2010-03-31 09:09:06 UTC (rev 11907)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ejb3/ByteArrayRPCTest.java 2010-03-31 10:55:29 UTC (rev 11908)
@@ -21,7 +21,6 @@
*/
package org.jboss.test.ws.jaxws.benchmark.test.datatypes.wrapped.ejb3;
-import org.jboss.test.ws.jaxws.benchmark.BenchmarkTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.DataTypesEJB3WrappedRPCTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.EndpointWrappedRPC;
@@ -29,20 +28,15 @@
* @author pmacik at redhat.com
* @since 09-Mar-2010
*/
-public class ByteArrayRPCTest extends DataTypesEJB3WrappedRPCTest implements BenchmarkTest
+public class ByteArrayRPCTest extends DataTypesEJB3WrappedRPCTest
{
- private static final byte[] tested =
- {1, 2, 4, 8, 16, 32, 64};
- private static final byte[] exp =
- {64, 32, 16, 8, 4, 2, 1};
-
public void performIteration(Object port) throws Exception
{
- byte[] ret = ((EndpointWrappedRPC) port).reverseByteOrder(tested);
+ byte[] ret = ((EndpointWrappedRPC) port).reverseByteOrder(testedByteArray);
for (int i = 0; i < ret.length; i++)
{
- if (ret[i] != exp[i])
+ if (ret[i] != expectedByteArray[i])
{
throw new Exception("Unexpected result: [" + i + "] " + ret);
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ejb3/ByteDocTest.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ejb3/ByteDocTest.java 2010-03-31 09:09:06 UTC (rev 11907)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ejb3/ByteDocTest.java 2010-03-31 10:55:29 UTC (rev 11908)
@@ -21,7 +21,6 @@
*/
package org.jboss.test.ws.jaxws.benchmark.test.datatypes.wrapped.ejb3;
-import org.jboss.test.ws.jaxws.benchmark.BenchmarkTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.DataTypesEJB3WrappedDocTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.EndpointWrappedDoc;
@@ -29,16 +28,15 @@
* @author pmacik at redhat.com
* @since 09-Mar-2010
*/
-public class ByteDocTest extends DataTypesEJB3WrappedDocTest implements BenchmarkTest
+public class ByteDocTest extends DataTypesEJB3WrappedDocTest
{
public void performIteration(Object port) throws Exception
{
- int ret = ((EndpointWrappedDoc) port).increaseInt(123456);
- int exp = 123457;
- if (ret != exp)
+ int ret = ((EndpointWrappedDoc) port).increaseByte(testedByte);
+ if (ret != expectedByte)
{
- throw new Exception("Unexpected result: " + ret + "\nExpected:" + exp);
+ throw new Exception("Unexpected result: " + ret + "\nExpected:" + expectedByte);
}
}
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ejb3/ByteRPCTest.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ejb3/ByteRPCTest.java 2010-03-31 09:09:06 UTC (rev 11907)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ejb3/ByteRPCTest.java 2010-03-31 10:55:29 UTC (rev 11908)
@@ -21,7 +21,6 @@
*/
package org.jboss.test.ws.jaxws.benchmark.test.datatypes.wrapped.ejb3;
-import org.jboss.test.ws.jaxws.benchmark.BenchmarkTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.DataTypesEJB3WrappedRPCTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.EndpointWrappedRPC;
@@ -29,16 +28,15 @@
* @author pmacik at redhat.com
* @since 09-Mar-2010
*/
-public class ByteRPCTest extends DataTypesEJB3WrappedRPCTest implements BenchmarkTest
+public class ByteRPCTest extends DataTypesEJB3WrappedRPCTest
{
public void performIteration(Object port) throws Exception
{
- int ret = ((EndpointWrappedRPC) port).increaseInt(123456);
- int exp = 123457;
- if (ret != exp)
+ int ret = ((EndpointWrappedRPC) port).increaseByte(testedByte);
+ if (ret != expectedByte)
{
- throw new Exception("Unexpected result: " + ret);
+ throw new Exception("Unexpected result: " + ret + "\nExpected:" + expectedByte);
}
}
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ejb3/CalendarDocTest.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ejb3/CalendarDocTest.java 2010-03-31 09:09:06 UTC (rev 11907)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ejb3/CalendarDocTest.java 2010-03-31 10:55:29 UTC (rev 11908)
@@ -21,12 +21,8 @@
*/
package org.jboss.test.ws.jaxws.benchmark.test.datatypes.wrapped.ejb3;
-import java.util.GregorianCalendar;
-import javax.xml.datatype.DatatypeConfigurationException;
-import javax.xml.datatype.DatatypeFactory;
import javax.xml.datatype.XMLGregorianCalendar;
-import org.jboss.test.ws.jaxws.benchmark.BenchmarkTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.DataTypesEJB3WrappedDocTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.EndpointWrappedDoc;
@@ -34,39 +30,15 @@
* @author pmacik at redhat.com
* @since 09-Mar-2010
*/
-public class CalendarDocTest extends DataTypesEJB3WrappedDocTest implements BenchmarkTest
+public class CalendarDocTest extends DataTypesEJB3WrappedDocTest
{
- private static final XMLGregorianCalendar tested;
- private static final XMLGregorianCalendar exp;
-
- static
- {
- DatatypeFactory dtFactory = null;
- GregorianCalendar calendar = new GregorianCalendar();;
- try
- {
- dtFactory = DatatypeFactory.newInstance();
- }
- catch (DatatypeConfigurationException e)
- {
-
- e.printStackTrace();
- }
- tested = dtFactory.newXMLGregorianCalendar(calendar);
-
- exp = dtFactory.newXMLGregorianCalendar(calendar);
- exp.setDay(exp.getDay() + 1);
-
- }
-
public void performIteration(Object port) throws Exception
{
- XMLGregorianCalendar ret = ((EndpointWrappedDoc) port).getCalendarPlusDay(tested);
-
- if (!ret.equals(exp))
+ XMLGregorianCalendar ret = ((EndpointWrappedDoc) port).getCalendarPlusDay(testedCalendar);
+ if (!ret.equals(expectedCalendar))
{
- throw new Exception("Unexpected result: " + ret + "\nExpected:" + exp);
+ throw new Exception("Unexpected result: " + ret + "\nExpected:" + expectedCalendar);
}
}
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ejb3/CalendarRPCTest.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ejb3/CalendarRPCTest.java 2010-03-31 09:09:06 UTC (rev 11907)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ejb3/CalendarRPCTest.java 2010-03-31 10:55:29 UTC (rev 11908)
@@ -21,13 +21,8 @@
*/
package org.jboss.test.ws.jaxws.benchmark.test.datatypes.wrapped.ejb3;
-import java.util.GregorianCalendar;
-
-import javax.xml.datatype.DatatypeConfigurationException;
-import javax.xml.datatype.DatatypeFactory;
import javax.xml.datatype.XMLGregorianCalendar;
-import org.jboss.test.ws.jaxws.benchmark.BenchmarkTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.DataTypesEJB3WrappedRPCTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.EndpointWrappedRPC;
@@ -35,40 +30,16 @@
* @author pmacik at redhat.com
* @since 09-Mar-2010
*/
-public class CalendarRPCTest extends DataTypesEJB3WrappedRPCTest implements BenchmarkTest
+public class CalendarRPCTest extends DataTypesEJB3WrappedRPCTest
{
- private static final XMLGregorianCalendar tested;
-
- private static final XMLGregorianCalendar exp;
-
- static
- {
- DatatypeFactory dtFactory = null;
- GregorianCalendar calendar = new GregorianCalendar();;
- try
- {
- dtFactory = DatatypeFactory.newInstance();
- }
- catch (DatatypeConfigurationException e)
- {
-
- e.printStackTrace();
- }
- tested = dtFactory.newXMLGregorianCalendar(calendar);
-
- exp = dtFactory.newXMLGregorianCalendar(calendar);
- exp.setDay(exp.getDay() + 1);
-
- }
-
public void performIteration(Object port) throws Exception
{
- XMLGregorianCalendar ret = ((EndpointWrappedRPC) port).getCalendarPlusDay(tested);
+ XMLGregorianCalendar ret = ((EndpointWrappedRPC) port).getCalendarPlusDay(testedCalendar);
- if (!ret.equals(exp))
+ if (!ret.equals(expectedCalendar))
{
- throw new Exception("Unexpected result: " + ret + "\nExpected:" + exp);
+ throw new Exception("Unexpected result: " + ret + "\nExpected:" + expectedCalendar);
}
}
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ejb3/ComplexTypeDocTest.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ejb3/ComplexTypeDocTest.java 2010-03-31 09:09:06 UTC (rev 11907)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ejb3/ComplexTypeDocTest.java 2010-03-31 10:55:29 UTC (rev 11908)
@@ -21,17 +21,6 @@
*/
package org.jboss.test.ws.jaxws.benchmark.test.datatypes.wrapped.ejb3;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.GregorianCalendar;
-import java.util.List;
-
-import javax.xml.datatype.DatatypeConfigurationException;
-import javax.xml.datatype.DatatypeFactory;
-import javax.xml.datatype.XMLGregorianCalendar;
-import javax.xml.namespace.QName;
-
-import org.jboss.test.ws.jaxws.benchmark.BenchmarkTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.DataTypesEJB3WrappedDocTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.EndpointWrappedDoc;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.types.ComplexType;
@@ -40,84 +29,16 @@
* @author pmacik at redhat.com
* @since 09-Mar-2010
*/
-public class ComplexTypeDocTest extends DataTypesEJB3WrappedDocTest implements BenchmarkTest
+public class ComplexTypeDocTest extends DataTypesEJB3WrappedDocTest
{
- private static final String stringValue = "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<Order orderId=\"1\" orderDate=\"Wed Nov 15 13:45:28 EST 2006\"\n statusCode=\"9\" netAmount=\"59.97\" totalAmount=\"64.92\" tax=\"4.95\">\n <Customer userName=\"user1\" firstName=\"Harry\" lastName=\"Fletcher\"\n state=\"SD\" />\n <OrderLines>\n <OrderLine position=\"1\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"2\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"3\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"4\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderL!
ine>\n <OrderLine position=\"5\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"6\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"7\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"8\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"9\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"10\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n !
<OrderLine position=\"11\" quantity=\"1\">\n <Produ!
ct produ
ctId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"12\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"13\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"14\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"15\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n <Memo>\n abcdefghijklmnopqrstuvwxyz0123456789!@#$%^°*()_+-=[]{}:\",.?/`~Pada,pada_jahoda,kterou_sěščřžýáíégggaabcdefghijklmnopqrstuvwxyz0123456789!@#$%^°*()_+-=[]{}:\",.?/`~Pahoda,kterou_sni_pan_Lahodaabcdefghijklmn!
opqrstuvwxyz0123456789!@#$%^°*()_+-=[]{}:\",.?/`~Pada,pada_jahoda,kterou_sni_pan_Lahoda\n </Memo>\n </OrderLines>\n</Order>\n";
- private static final byte byteValue = (byte) 1;
-
- private static final byte[] byteArrayValue = "!@#$%^°*()_+-=[]{}:\",.?/`~Pada,pada_jahoda,kterou_sěščřžýáíégggaabcdefghijklmnopqrstuvwxyz0123456789"
- .getBytes();
-
- private static final byte[] modifiedByteArrayValue;
-
- private static final short shortValue = (short) 3;
-
- private static final int intValue = 4;
-
- private static final long longValue = 5L;
-
- private static final float floatValue = 6.7f;
-
- private static final double doubleValue = 8.9;
-
- private static final QName qNameValue = new QName("eleven");
-
- private static final Date dateValue = new Date();
-
- private static final XMLGregorianCalendar calendarValue, modifiedCalendarValue;
-
- private static final ComplexType tested, exp;
-
- private static final List<String> stringList;
-
- static
- {
- stringList = new ArrayList<String>();
- for (int i = 0; i < 10; i++)
- {
- stringList.add("item " + i);
- }
-
- int length = byteArrayValue.length;
- modifiedByteArrayValue = new byte[length];
- for (int i = 0; i < length; i++)
- {
- modifiedByteArrayValue[i] = byteArrayValue[length - i - 1];
- }
-
- DatatypeFactory dtFactory = null;
- GregorianCalendar calendar = new GregorianCalendar();;
- try
- {
- dtFactory = DatatypeFactory.newInstance();
- }
- catch (DatatypeConfigurationException e)
- {
-
- e.printStackTrace();
- }
- calendarValue = dtFactory.newXMLGregorianCalendar(calendar);
-
- modifiedCalendarValue = dtFactory.newXMLGregorianCalendar(calendar);
- modifiedCalendarValue.setDay(modifiedCalendarValue.getDay() + 1);
-
- tested = new ComplexType(byteValue, byteArrayValue, shortValue, intValue, longValue, floatValue, doubleValue,
- stringValue, stringList, qNameValue, dateValue, calendarValue);
-
- exp = new ComplexType((byte) (byteValue + 1), modifiedByteArrayValue, (short) (shortValue + 1), intValue + 1,
- longValue + 1, floatValue + 1, doubleValue + 1, "Hello World Greeting for '" + stringValue + "' today",
- stringList, new QName(qNameValue.getNamespaceURI(), qNameValue.getLocalPart() + "_modified", qNameValue
- .getPrefix()), new Date(dateValue.getTime() + 86400000L), modifiedCalendarValue);
- }
-
public void performIteration(Object port) throws Exception
{
- ComplexType ret = ((EndpointWrappedDoc) port).modifyComplexType(tested);
- if (!exp.equals(ret))
+ ComplexType ret = ((EndpointWrappedDoc) port).modifyComplexType(testedComplexType);
+ if (!ret.equals(expectedComplexType))
{
- throw new Exception("Unexpected result: " + ret + "\nExpected:" + exp);
+ throw new Exception("Unexpected result: " + ret + "\nExpected:" + expectedComplexType);
}
}
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ejb3/ComplexTypeRPCTest.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ejb3/ComplexTypeRPCTest.java 2010-03-31 09:09:06 UTC (rev 11907)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ejb3/ComplexTypeRPCTest.java 2010-03-31 10:55:29 UTC (rev 11908)
@@ -21,17 +21,6 @@
*/
package org.jboss.test.ws.jaxws.benchmark.test.datatypes.wrapped.ejb3;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.GregorianCalendar;
-import java.util.List;
-
-import javax.xml.datatype.DatatypeConfigurationException;
-import javax.xml.datatype.DatatypeFactory;
-import javax.xml.datatype.XMLGregorianCalendar;
-import javax.xml.namespace.QName;
-
-import org.jboss.test.ws.jaxws.benchmark.BenchmarkTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.DataTypesEJB3WrappedRPCTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.EndpointWrappedRPC;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.types.ComplexType;
@@ -40,84 +29,16 @@
* @author pmacik at redhat.com
* @since 09-Mar-2010
*/
-public class ComplexTypeRPCTest extends DataTypesEJB3WrappedRPCTest implements BenchmarkTest
+public class ComplexTypeRPCTest extends DataTypesEJB3WrappedRPCTest
{
- private static final String stringValue = "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<Order orderId=\"1\" orderDate=\"Wed Nov 15 13:45:28 EST 2006\"\n statusCode=\"9\" netAmount=\"59.97\" totalAmount=\"64.92\" tax=\"4.95\">\n <Customer userName=\"user1\" firstName=\"Harry\" lastName=\"Fletcher\"\n state=\"SD\" />\n <OrderLines>\n <OrderLine position=\"1\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"2\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"3\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"4\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderL!
ine>\n <OrderLine position=\"5\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"6\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"7\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"8\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"9\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"10\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n !
<OrderLine position=\"11\" quantity=\"1\">\n <Produ!
ct produ
ctId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"12\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"13\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"14\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"15\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n <Memo>\n abcdefghijklmnopqrstuvwxyz0123456789!@#$%^°*()_+-=[]{}:\",.?/`~Pada,pada_jahoda,kterou_sěščřžýáíégggaabcdefghijklmnopqrstuvwxyz0123456789!@#$%^°*()_+-=[]{}:\",.?/`~Pahoda,kterou_sni_pan_Lahodaabcdefghijklmn!
opqrstuvwxyz0123456789!@#$%^°*()_+-=[]{}:\",.?/`~Pada,pada_jahoda,kterou_sni_pan_Lahoda\n </Memo>\n </OrderLines>\n</Order>\n";
- private static final byte byteValue = (byte) 1;
-
- private static final byte[] byteArrayValue = "!@#$%^°*()_+-=[]{}:\",.?/`~Pada,pada_jahoda,kterou_sěščřžýáíégggaabcdefghijklmnopqrstuvwxyz0123456789"
- .getBytes();
-
- private static final byte[] modifiedByteArrayValue;
-
- private static final short shortValue = (short) 3;
-
- private static final int intValue = 4;
-
- private static final long longValue = 5L;
-
- private static final float floatValue = 6.7f;
-
- private static final double doubleValue = 8.9;
-
- private static final QName qNameValue = new QName("eleven");
-
- private static final Date dateValue = new Date();
-
- private static final XMLGregorianCalendar calendarValue, modifiedCalendarValue;
-
- private static final ComplexType tested, exp;
-
- private static final List<String> stringList;
-
- static
- {
- stringList = new ArrayList<String>();
- for (int i = 0; i < 10; i++)
- {
- stringList.add("item " + i);
- }
-
- int length = byteArrayValue.length;
- modifiedByteArrayValue = new byte[length];
- for (int i = 0; i < length; i++)
- {
- modifiedByteArrayValue[i] = byteArrayValue[length - i - 1];
- }
-
- DatatypeFactory dtFactory = null;
- GregorianCalendar calendar = new GregorianCalendar();;
- try
- {
- dtFactory = DatatypeFactory.newInstance();
- }
- catch (DatatypeConfigurationException e)
- {
-
- e.printStackTrace();
- }
- calendarValue = dtFactory.newXMLGregorianCalendar(calendar);
-
- modifiedCalendarValue = dtFactory.newXMLGregorianCalendar(calendar);
- modifiedCalendarValue.setDay(modifiedCalendarValue.getDay() + 1);
-
- tested = new ComplexType(byteValue, byteArrayValue, shortValue, intValue, longValue, floatValue, doubleValue,
- stringValue, stringList, qNameValue, dateValue, calendarValue);
-
- exp = new ComplexType((byte) (byteValue + 1), modifiedByteArrayValue, (short) (shortValue + 1), intValue + 1,
- longValue + 1, floatValue + 1, doubleValue + 1, "Hello World Greeting for '" + stringValue + "' today",
- stringList, new QName(qNameValue.getNamespaceURI(), qNameValue.getLocalPart() + "_modified", qNameValue
- .getPrefix()), new Date(dateValue.getTime() + 86400000L), modifiedCalendarValue);
- }
-
public void performIteration(Object port) throws Exception
{
- ComplexType ret = ((EndpointWrappedRPC) port).modifyComplexType(tested);
- if (!exp.equals(ret))
+ ComplexType ret = ((EndpointWrappedRPC) port).modifyComplexType(testedComplexType);
+ if (!ret.equals(expectedComplexType))
{
- throw new Exception("Unexpected result: " + ret + "\nExpected:" + exp);
+ throw new Exception("Unexpected result: " + ret + "\nExpected:" + expectedComplexType);
}
}
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ejb3/DateDocTest.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ejb3/DateDocTest.java 2010-03-31 09:09:06 UTC (rev 11907)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ejb3/DateDocTest.java 2010-03-31 10:55:29 UTC (rev 11908)
@@ -23,7 +23,6 @@
import java.util.Date;
-import org.jboss.test.ws.jaxws.benchmark.BenchmarkTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.DataTypesEJB3WrappedDocTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.EndpointWrappedDoc;
@@ -31,19 +30,16 @@
* @author pmacik at redhat.com
* @since 09-Mar-2010
*/
-public class DateDocTest extends DataTypesEJB3WrappedDocTest implements BenchmarkTest
+public class DateDocTest extends DataTypesEJB3WrappedDocTest
{
- private static final Date tested = new Date(1234567890L);;
- private static final Date exp = new Date(tested.getTime() + 86400000L);;
-
public void performIteration(Object port) throws Exception
{
- Date ret = ((EndpointWrappedDoc) port).getDatePlusDay(tested);
+ Date ret = ((EndpointWrappedDoc) port).getDatePlusDay(testedDate);
- if (!ret.equals(exp))
+ if (!ret.equals(expectedDate))
{
- throw new Exception("Unexpected result: " + ret + "\nExpected:" + exp);
+ throw new Exception("Unexpected result: " + ret + "\nExpected:" + expectedDate);
}
}
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ejb3/DateRPCTest.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ejb3/DateRPCTest.java 2010-03-31 09:09:06 UTC (rev 11907)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ejb3/DateRPCTest.java 2010-03-31 10:55:29 UTC (rev 11908)
@@ -23,7 +23,6 @@
import java.util.Date;
-import org.jboss.test.ws.jaxws.benchmark.BenchmarkTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.DataTypesEJB3WrappedRPCTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.EndpointWrappedRPC;
@@ -31,19 +30,16 @@
* @author pmacik at redhat.com
* @since 09-Mar-2010
*/
-public class DateRPCTest extends DataTypesEJB3WrappedRPCTest implements BenchmarkTest
+public class DateRPCTest extends DataTypesEJB3WrappedRPCTest
{
- private static final Date tested = new Date(1234567890L);;
- private static final Date exp = new Date(tested.getTime() + 86400000L);;
-
public void performIteration(Object port) throws Exception
{
- Date ret = ((EndpointWrappedRPC) port).getDatePlusDay(tested);
+ Date ret = ((EndpointWrappedRPC) port).getDatePlusDay(testedDate);
- if (!ret.equals(exp))
+ if (!ret.equals(expectedDate))
{
- throw new Exception("Unexpected result: " + ret + "\nExpected:" + exp);
+ throw new Exception("Unexpected result: " + ret + "\nExpected:" + expectedDate);
}
}
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ejb3/DoubleDocTest.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ejb3/DoubleDocTest.java 2010-03-31 09:09:06 UTC (rev 11907)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ejb3/DoubleDocTest.java 2010-03-31 10:55:29 UTC (rev 11908)
@@ -21,7 +21,6 @@
*/
package org.jboss.test.ws.jaxws.benchmark.test.datatypes.wrapped.ejb3;
-import org.jboss.test.ws.jaxws.benchmark.BenchmarkTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.DataTypesEJB3WrappedDocTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.EndpointWrappedDoc;
@@ -29,16 +28,15 @@
* @author pmacik at redhat.com
* @since 09-Mar-2010
*/
-public class DoubleDocTest extends DataTypesEJB3WrappedDocTest implements BenchmarkTest
+public class DoubleDocTest extends DataTypesEJB3WrappedDocTest
{
public void performIteration(Object port) throws Exception
{
- double ret = ((EndpointWrappedDoc) port).increaseDouble(123456.0);
- double exp = 123457.0;
- if (ret != exp)
+ double ret = ((EndpointWrappedDoc) port).increaseDouble(testedDouble);
+ if (ret != expectedDouble)
{
- throw new Exception("Unexpected result: " + ret + "\nExpected:" + exp);
+ throw new Exception("Unexpected result: " + ret + "\nExpected:" + expectedDouble);
}
}
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ejb3/DoubleRPCTest.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ejb3/DoubleRPCTest.java 2010-03-31 09:09:06 UTC (rev 11907)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ejb3/DoubleRPCTest.java 2010-03-31 10:55:29 UTC (rev 11908)
@@ -21,7 +21,6 @@
*/
package org.jboss.test.ws.jaxws.benchmark.test.datatypes.wrapped.ejb3;
-import org.jboss.test.ws.jaxws.benchmark.BenchmarkTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.DataTypesEJB3WrappedRPCTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.EndpointWrappedRPC;
@@ -29,16 +28,15 @@
* @author pmacik at redhat.com
* @since 09-Mar-2010
*/
-public class DoubleRPCTest extends DataTypesEJB3WrappedRPCTest implements BenchmarkTest
+public class DoubleRPCTest extends DataTypesEJB3WrappedRPCTest
{
public void performIteration(Object port) throws Exception
{
- double ret = ((EndpointWrappedRPC) port).increaseDouble(123456.0);
- double exp = 123457.0;
- if (ret != exp)
+ double ret = ((EndpointWrappedRPC) port).increaseDouble(testedDouble);
+ if (ret != expectedDouble)
{
- throw new Exception("Unexpected result: " + ret + "\nExpected:" + exp);
+ throw new Exception("Unexpected result: " + ret + "\nExpected:" + expectedDouble);
}
}
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ejb3/FloatDocTest.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ejb3/FloatDocTest.java 2010-03-31 09:09:06 UTC (rev 11907)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ejb3/FloatDocTest.java 2010-03-31 10:55:29 UTC (rev 11908)
@@ -21,7 +21,6 @@
*/
package org.jboss.test.ws.jaxws.benchmark.test.datatypes.wrapped.ejb3;
-import org.jboss.test.ws.jaxws.benchmark.BenchmarkTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.DataTypesEJB3WrappedDocTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.EndpointWrappedDoc;
@@ -29,16 +28,15 @@
* @author pmacik at redhat.com
* @since 09-Mar-2010
*/
-public class FloatDocTest extends DataTypesEJB3WrappedDocTest implements BenchmarkTest
+public class FloatDocTest extends DataTypesEJB3WrappedDocTest
{
public void performIteration(Object port) throws Exception
{
- float ret = ((EndpointWrappedDoc) port).increaseFloat(123456f);
- float exp = 123457f;
- if (ret != exp)
+ float ret = ((EndpointWrappedDoc) port).increaseFloat(testedFloat);
+ if (ret != expectedFloat)
{
- throw new Exception("Unexpected result: " + ret + "\nExpected:" + exp);
+ throw new Exception("Unexpected result: " + ret + "\nExpected:" + expectedFloat);
}
}
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ejb3/FloatRPCTest.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ejb3/FloatRPCTest.java 2010-03-31 09:09:06 UTC (rev 11907)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ejb3/FloatRPCTest.java 2010-03-31 10:55:29 UTC (rev 11908)
@@ -21,7 +21,6 @@
*/
package org.jboss.test.ws.jaxws.benchmark.test.datatypes.wrapped.ejb3;
-import org.jboss.test.ws.jaxws.benchmark.BenchmarkTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.DataTypesEJB3WrappedRPCTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.EndpointWrappedRPC;
@@ -29,16 +28,15 @@
* @author pmacik at redhat.com
* @since 09-Mar-2010
*/
-public class FloatRPCTest extends DataTypesEJB3WrappedRPCTest implements BenchmarkTest
+public class FloatRPCTest extends DataTypesEJB3WrappedRPCTest
{
public void performIteration(Object port) throws Exception
{
- float ret = ((EndpointWrappedRPC) port).increaseFloat(123456f);
- float exp = 123457f;
- if (ret != exp)
+ float ret = ((EndpointWrappedRPC) port).increaseFloat(testedFloat);
+ if (ret != expectedFloat)
{
- throw new Exception("Unexpected result: " + ret + "\nExpected:" + exp);
+ throw new Exception("Unexpected result: " + ret + "\nExpected:" + expectedFloat);
}
}
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ejb3/IntegerDocTest.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ejb3/IntegerDocTest.java 2010-03-31 09:09:06 UTC (rev 11907)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ejb3/IntegerDocTest.java 2010-03-31 10:55:29 UTC (rev 11908)
@@ -21,7 +21,6 @@
*/
package org.jboss.test.ws.jaxws.benchmark.test.datatypes.wrapped.ejb3;
-import org.jboss.test.ws.jaxws.benchmark.BenchmarkTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.DataTypesEJB3WrappedDocTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.EndpointWrappedDoc;
@@ -29,16 +28,15 @@
* @author pmacik at redhat.com
* @since 09-Mar-2010
*/
-public class IntegerDocTest extends DataTypesEJB3WrappedDocTest implements BenchmarkTest
+public class IntegerDocTest extends DataTypesEJB3WrappedDocTest
{
public void performIteration(Object port) throws Exception
{
- int ret = ((EndpointWrappedDoc) port).increaseInt(123456);
- int exp = 123457;
- if (ret != exp)
+ int ret = ((EndpointWrappedDoc) port).increaseInt(testedInt);
+ if (ret != expectedInt)
{
- throw new Exception("Unexpected result: " + ret + "\nExpected:" + exp);
+ throw new Exception("Unexpected result: " + ret + "\nExpected:" + expectedInt);
}
}
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ejb3/IntegerRPCTest.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ejb3/IntegerRPCTest.java 2010-03-31 09:09:06 UTC (rev 11907)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ejb3/IntegerRPCTest.java 2010-03-31 10:55:29 UTC (rev 11908)
@@ -21,7 +21,6 @@
*/
package org.jboss.test.ws.jaxws.benchmark.test.datatypes.wrapped.ejb3;
-import org.jboss.test.ws.jaxws.benchmark.BenchmarkTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.DataTypesEJB3WrappedRPCTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.EndpointWrappedRPC;
@@ -29,16 +28,15 @@
* @author pmacik at redhat.com
* @since 09-Mar-2010
*/
-public class IntegerRPCTest extends DataTypesEJB3WrappedRPCTest implements BenchmarkTest
+public class IntegerRPCTest extends DataTypesEJB3WrappedRPCTest
{
public void performIteration(Object port) throws Exception
{
- int ret = ((EndpointWrappedRPC) port).increaseInt(123456);
- int exp = 123457;
- if (ret != exp)
+ int ret = ((EndpointWrappedRPC) port).increaseInt(testedInt);
+ if (ret != expectedInt)
{
- throw new Exception("Unexpected result: " + ret + "\nExpected:" + exp);
+ throw new Exception("Unexpected result: " + ret + "\nExpected:" + expectedInt);
}
}
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ejb3/LongDocTest.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ejb3/LongDocTest.java 2010-03-31 09:09:06 UTC (rev 11907)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ejb3/LongDocTest.java 2010-03-31 10:55:29 UTC (rev 11908)
@@ -21,7 +21,6 @@
*/
package org.jboss.test.ws.jaxws.benchmark.test.datatypes.wrapped.ejb3;
-import org.jboss.test.ws.jaxws.benchmark.BenchmarkTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.DataTypesEJB3WrappedDocTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.EndpointWrappedDoc;
@@ -29,16 +28,15 @@
* @author pmacik at redhat.com
* @since 09-Mar-2010
*/
-public class LongDocTest extends DataTypesEJB3WrappedDocTest implements BenchmarkTest
+public class LongDocTest extends DataTypesEJB3WrappedDocTest
{
public void performIteration(Object port) throws Exception
{
- long ret = ((EndpointWrappedDoc) port).increaseLong(1234567890L);
- long exp = 1234567891L;
- if (ret != exp)
+ long ret = ((EndpointWrappedDoc) port).increaseLong(testedLong);
+ if (ret != expectedLong)
{
- throw new Exception("Unexpected result: " + ret + "\nExpected:" + exp);
+ throw new Exception("Unexpected result: " + ret + "\nExpected:" + expectedLong);
}
}
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ejb3/LongRPCTest.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ejb3/LongRPCTest.java 2010-03-31 09:09:06 UTC (rev 11907)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ejb3/LongRPCTest.java 2010-03-31 10:55:29 UTC (rev 11908)
@@ -21,7 +21,6 @@
*/
package org.jboss.test.ws.jaxws.benchmark.test.datatypes.wrapped.ejb3;
-import org.jboss.test.ws.jaxws.benchmark.BenchmarkTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.DataTypesEJB3WrappedRPCTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.EndpointWrappedRPC;
@@ -29,16 +28,15 @@
* @author pmacik at redhat.com
* @since 09-Mar-2010
*/
-public class LongRPCTest extends DataTypesEJB3WrappedRPCTest implements BenchmarkTest
+public class LongRPCTest extends DataTypesEJB3WrappedRPCTest
{
public void performIteration(Object port) throws Exception
{
- long ret = ((EndpointWrappedRPC) port).increaseLong(1234567890L);
- long exp = 1234567891L;
- if (ret != exp)
+ long ret = ((EndpointWrappedRPC) port).increaseLong(testedLong);
+ if (ret != expectedLong)
{
- throw new Exception("Unexpected result: " + ret + "\nExpected:" + exp);
+ throw new Exception("Unexpected result: " + ret + "\nExpected:" + expectedLong);
}
}
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ejb3/QNameDocTest.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ejb3/QNameDocTest.java 2010-03-31 09:09:06 UTC (rev 11907)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ejb3/QNameDocTest.java 2010-03-31 10:55:29 UTC (rev 11908)
@@ -23,7 +23,6 @@
import javax.xml.namespace.QName;
-import org.jboss.test.ws.jaxws.benchmark.BenchmarkTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.DataTypesEJB3WrappedDocTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.EndpointWrappedDoc;
@@ -31,18 +30,16 @@
* @author pmacik at redhat.com
* @since 09-Mar-2010
*/
-public class QNameDocTest extends DataTypesEJB3WrappedDocTest implements BenchmarkTest
+public class QNameDocTest extends DataTypesEJB3WrappedDocTest
{
- public static final QName exp = new QName("qname_value_modified");
-
public void performIteration(Object port) throws Exception
{
- QName ret = ((EndpointWrappedDoc) port).modifyQName(new QName("qname_value"));
+ QName ret = ((EndpointWrappedDoc) port).modifyQName(testedQName);
- if (!ret.equals(exp))
+ if (!ret.equals(expectedQName))
{
- throw new Exception("Unexpected result: " + ret + "\nExpected:" + exp);
+ throw new Exception("Unexpected result: " + ret + "\nExpected:" + expectedQName);
}
}
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ejb3/QNameRPCTest.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ejb3/QNameRPCTest.java 2010-03-31 09:09:06 UTC (rev 11907)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ejb3/QNameRPCTest.java 2010-03-31 10:55:29 UTC (rev 11908)
@@ -23,7 +23,6 @@
import javax.xml.namespace.QName;
-import org.jboss.test.ws.jaxws.benchmark.BenchmarkTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.DataTypesEJB3WrappedRPCTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.EndpointWrappedRPC;
@@ -31,16 +30,15 @@
* @author pmacik at redhat.com
* @since 09-Mar-2010
*/
-public class QNameRPCTest extends DataTypesEJB3WrappedRPCTest implements BenchmarkTest
+public class QNameRPCTest extends DataTypesEJB3WrappedRPCTest
{
- public static final QName exp = new QName("qname_value_modified");
public void performIteration(Object port) throws Exception
{
- QName ret = ((EndpointWrappedRPC) port).modifyQName(new QName("qname_value"));
- if (!ret.equals(exp))
+ QName ret = ((EndpointWrappedRPC) port).modifyQName(testedQName);
+ if (!ret.equals(expectedQName))
{
- throw new Exception("Unexpected result: " + ret + "\nExpected:" + exp);
+ throw new Exception("Unexpected result: " + ret + "\nExpected:" + expectedQName);
}
}
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ejb3/ShortDocTest.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ejb3/ShortDocTest.java 2010-03-31 09:09:06 UTC (rev 11907)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ejb3/ShortDocTest.java 2010-03-31 10:55:29 UTC (rev 11908)
@@ -21,7 +21,6 @@
*/
package org.jboss.test.ws.jaxws.benchmark.test.datatypes.wrapped.ejb3;
-import org.jboss.test.ws.jaxws.benchmark.BenchmarkTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.DataTypesEJB3WrappedDocTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.EndpointWrappedDoc;
@@ -29,16 +28,15 @@
* @author pmacik at redhat.com
* @since 09-Mar-2010
*/
-public class ShortDocTest extends DataTypesEJB3WrappedDocTest implements BenchmarkTest
+public class ShortDocTest extends DataTypesEJB3WrappedDocTest
{
public void performIteration(Object port) throws Exception
{
- short ret = ((EndpointWrappedDoc) port).increaseShort((short) 123);
- short exp = 124;
- if (ret != exp)
+ short ret = ((EndpointWrappedDoc) port).increaseShort(testedShort);
+ if (ret != expectedShort)
{
- throw new Exception("Unexpected result: " + ret + "\nExpected:" + exp);
+ throw new Exception("Unexpected result: " + ret + "\nExpected:" + expectedShort);
}
}
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ejb3/ShortRPCTest.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ejb3/ShortRPCTest.java 2010-03-31 09:09:06 UTC (rev 11907)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ejb3/ShortRPCTest.java 2010-03-31 10:55:29 UTC (rev 11908)
@@ -21,7 +21,6 @@
*/
package org.jboss.test.ws.jaxws.benchmark.test.datatypes.wrapped.ejb3;
-import org.jboss.test.ws.jaxws.benchmark.BenchmarkTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.DataTypesEJB3WrappedRPCTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.EndpointWrappedRPC;
@@ -29,16 +28,15 @@
* @author pmacik at redhat.com
* @since 09-Mar-2010
*/
-public class ShortRPCTest extends DataTypesEJB3WrappedRPCTest implements BenchmarkTest
+public class ShortRPCTest extends DataTypesEJB3WrappedRPCTest
{
public void performIteration(Object port) throws Exception
{
- short ret = ((EndpointWrappedRPC) port).increaseShort((short) 124);
- short exp = 124;
- if (ret != exp)
+ short ret = ((EndpointWrappedRPC) port).increaseShort(testedShort);
+ if (ret != expectedShort)
{
- throw new Exception("Unexpected result: " + ret + "\nExpected:" + exp);
+ throw new Exception("Unexpected result: " + ret + "\nExpected:" + expectedShort);
}
}
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ejb3/StringDocTest.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ejb3/StringDocTest.java 2010-03-31 09:09:06 UTC (rev 11907)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ejb3/StringDocTest.java 2010-03-31 10:55:29 UTC (rev 11908)
@@ -21,7 +21,6 @@
*/
package org.jboss.test.ws.jaxws.benchmark.test.datatypes.wrapped.ejb3;
-import org.jboss.test.ws.jaxws.benchmark.BenchmarkTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.DataTypesEJB3WrappedDocTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.EndpointWrappedDoc;
@@ -29,17 +28,15 @@
* @author pmacik at redhat.com
* @since 09-Mar-2010
*/
-public class StringDocTest extends DataTypesEJB3WrappedDocTest implements BenchmarkTest
+public class StringDocTest extends DataTypesEJB3WrappedDocTest
{
- private static final String MESSAGE = "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<Order orderId=\"1\" orderDate=\"Wed Nov 15 13:45:28 EST 2006\"\n statusCode=\"9\" netAmount=\"59.97\" totalAmount=\"64.92\" tax=\"4.95\">\n <Customer userName=\"user1\" firstName=\"Harry\" lastName=\"Fletcher\"\n state=\"SD\" />\n <OrderLines>\n <OrderLine position=\"1\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"2\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"3\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"4\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>!
\n <OrderLine position=\"5\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"6\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"7\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"8\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"9\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"10\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <Ord!
erLine position=\"11\" quantity=\"1\">\n <Product p!
roductId
=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"12\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"13\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"14\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"15\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"16\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"17\" quantity=\"1\">\n <Product pr!
oductId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"18\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"19\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"20\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"21\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"22\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"23\" quantity=\"1\">\n <Pr!
oduct productId=\"364\" title=\"The 40-Year-Old Virgin \"\n !
price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"24\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"25\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"26\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"27\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"28\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"29\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n !
price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"30\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"31\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"32\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"33\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"34\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"35\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin !
\"\n price=\"29.98\" />\n </OrderLine>\n !
<Mem
o>\n abcdefghijklmnopqrstuvwxyz0123456789!@#$%^°*()_+-=[]{}:\",.?/`~Pada,pada_jahoda,kterou_sěščřžýáíégggaabcdefghijklmnopqrstuvwxyz0123456789!@#$%^°*()_+-=[]{}:\",.?/`~Pahoda,kterou_sni_pan_Lahodaabcdefghijklmnopqrstuvwxyz0123456789!@#$%^°*()_+-=[]{}:\",.?/`~Pada,pada_jahoda,kterou_sni_pan_Lahoda\n </Memo>\n </OrderLines>\n</Order>\n";
public void performIteration(Object port) throws Exception
{
- String ret = ((EndpointWrappedDoc) port).sayHello(MESSAGE);
- String exp = "Hello World Greeting for '" + MESSAGE + "' today";
- if (!exp.equals(ret))
+ String ret = ((EndpointWrappedDoc) port).sayHello(testedString);
+ if (!ret.equals(expectedString))
{
- throw new Exception("Unexpected result: " + ret + "\nExpected:" + exp);
+ throw new Exception("Unexpected result: " + ret + "\nExpected:" + expectedString);
}
}
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ejb3/StringRPCTest.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ejb3/StringRPCTest.java 2010-03-31 09:09:06 UTC (rev 11907)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ejb3/StringRPCTest.java 2010-03-31 10:55:29 UTC (rev 11908)
@@ -21,7 +21,6 @@
*/
package org.jboss.test.ws.jaxws.benchmark.test.datatypes.wrapped.ejb3;
-import org.jboss.test.ws.jaxws.benchmark.BenchmarkTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.DataTypesEJB3WrappedRPCTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.EndpointWrappedRPC;
@@ -29,18 +28,15 @@
* @author pmacik at redhat.com
* @since 09-Mar-2010
*/
-public class StringRPCTest extends DataTypesEJB3WrappedRPCTest implements BenchmarkTest
+public class StringRPCTest extends DataTypesEJB3WrappedRPCTest
{
- private static final String MESSAGE = "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<Order orderId=\"1\" orderDate=\"Wed Nov 15 13:45:28 EST 2006\"\n statusCode=\"9\" netAmount=\"59.97\" totalAmount=\"64.92\" tax=\"4.95\">\n <Customer userName=\"user1\" firstName=\"Harry\" lastName=\"Fletcher\"\n state=\"SD\" />\n <OrderLines>\n <OrderLine position=\"1\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"2\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"3\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"4\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>!
\n <OrderLine position=\"5\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"6\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"7\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"8\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"9\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"10\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <Ord!
erLine position=\"11\" quantity=\"1\">\n <Product p!
roductId
=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"12\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"13\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"14\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"15\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"16\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"17\" quantity=\"1\">\n <Product pr!
oductId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"18\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"19\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"20\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"21\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"22\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"23\" quantity=\"1\">\n <Pr!
oduct productId=\"364\" title=\"The 40-Year-Old Virgin \"\n !
price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"24\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"25\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"26\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"27\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"28\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"29\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n !
price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"30\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"31\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"32\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"33\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"34\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"35\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin !
\"\n price=\"29.98\" />\n </OrderLine>\n !
<Mem
o>\n abcdefghijklmnopqrstuvwxyz0123456789!@#$%^°*()_+-=[]{}:\",.?/`~Pada,pada_jahoda,kterou_sěščřžýáíégggaabcdefghijklmnopqrstuvwxyz0123456789!@#$%^°*()_+-=[]{}:\",.?/`~Pahoda,kterou_sni_pan_Lahodaabcdefghijklmnopqrstuvwxyz0123456789!@#$%^°*()_+-=[]{}:\",.?/`~Pada,pada_jahoda,kterou_sni_pan_Lahoda\n </Memo>\n </OrderLines>\n</Order>\n";
-
public void performIteration(Object port) throws Exception
{
- String ret = ((EndpointWrappedRPC) port).sayHello(MESSAGE);
- String exp = "Hello World Greeting for '" + MESSAGE + "' today";
- if (!exp.equals(ret))
+ String ret = ((EndpointWrappedRPC) port).sayHello(testedString);
+ if (!ret.equals(expectedString))
{
- throw new Exception("Unexpected result: " + ret + "\nExpected:" + exp);
+ throw new Exception("Unexpected result: " + ret + "\nExpected:" + expectedString);
}
}
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ejb3/ValuesToComplexTypeDocTest.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ejb3/ValuesToComplexTypeDocTest.java 2010-03-31 09:09:06 UTC (rev 11907)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ejb3/ValuesToComplexTypeDocTest.java 2010-03-31 10:55:29 UTC (rev 11908)
@@ -21,17 +21,6 @@
*/
package org.jboss.test.ws.jaxws.benchmark.test.datatypes.wrapped.ejb3;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.GregorianCalendar;
-import java.util.List;
-
-import javax.xml.datatype.DatatypeConfigurationException;
-import javax.xml.datatype.DatatypeFactory;
-import javax.xml.datatype.XMLGregorianCalendar;
-import javax.xml.namespace.QName;
-
-import org.jboss.test.ws.jaxws.benchmark.BenchmarkTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.DataTypesEJB3WrappedDocTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.EndpointWrappedDoc;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.types.ComplexType;
@@ -40,66 +29,16 @@
* @author pmacik at redhat.com
* @since 09-Mar-2010
*/
-public class ValuesToComplexTypeDocTest extends DataTypesEJB3WrappedDocTest implements BenchmarkTest
+public class ValuesToComplexTypeDocTest extends DataTypesEJB3WrappedDocTest
{
- private static final String stringValue = "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<Order orderId=\"1\" orderDate=\"Wed Nov 15 13:45:28 EST 2006\"\n statusCode=\"9\" netAmount=\"59.97\" totalAmount=\"64.92\" tax=\"4.95\">\n <Customer userName=\"user1\" firstName=\"Harry\" lastName=\"Fletcher\"\n state=\"SD\" />\n <OrderLines>\n <OrderLine position=\"1\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"2\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"3\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"4\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderL!
ine>\n <OrderLine position=\"5\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"6\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"7\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"8\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"9\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"10\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n !
<OrderLine position=\"11\" quantity=\"1\">\n <Produ!
ct produ
ctId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"12\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"13\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"14\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"15\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n <Memo>\n abcdefghijklmnopqrstuvwxyz0123456789!@#$%^°*()_+-=[]{}:\",.?/`~Pada,pada_jahoda,kterou_sěščřžýáíégggaabcdefghijklmnopqrstuvwxyz0123456789!@#$%^°*()_+-=[]{}:\",.?/`~Pahoda,kterou_sni_pan_Lahodaabcdefghijklmn!
opqrstuvwxyz0123456789!@#$%^°*()_+-=[]{}:\",.?/`~Pada,pada_jahoda,kterou_sni_pan_Lahoda\n </Memo>\n </OrderLines>\n</Order>\n";
- private static final byte byteValue = (byte) 1;
-
- private static final byte[] byteArrayValue = "!@#$%^°*()_+-=[]{}:\",.?/`~Pada,pada_jahoda,kterou_sěščřžýáíégggaabcdefghijklmnopqrstuvwxyz0123456789"
- .getBytes();
-
- private static final short shortValue = (short) 3;
-
- private static final int intValue = 4;
-
- private static final long longValue = 5L;
-
- private static final float floatValue = 6.7f;
-
- private static final double doubleValue = 8.9;
-
- private static final QName qNameValue = new QName("eleven");
-
- private static final Date dateValue = new Date();
-
- private static final XMLGregorianCalendar calendarValue;
-
- private static final ComplexType exp;
-
- private static final List<String> stringList;
- static
- {
- stringList = new ArrayList<String>();
- for (int i = 0; i < 10; i++)
- {
- stringList.add("item " + i);
- }
-
- DatatypeFactory dtFactory = null;
- GregorianCalendar calendar = new GregorianCalendar();;
- try
- {
- dtFactory = DatatypeFactory.newInstance();
- }
- catch (DatatypeConfigurationException e)
- {
-
- e.printStackTrace();
- }
- calendarValue = dtFactory.newXMLGregorianCalendar(calendar);
-
- exp = new ComplexType(byteValue, byteArrayValue, shortValue, intValue, longValue, floatValue, doubleValue,
- stringValue, stringList, qNameValue, dateValue, calendarValue);
- }
-
public void performIteration(Object port) throws Exception
{
- ComplexType ret = ((EndpointWrappedDoc) port).valuesToComplexType(byteValue, byteArrayValue, shortValue,
- intValue, longValue, floatValue, doubleValue, stringValue, qNameValue, dateValue, calendarValue);
- if (!exp.equals(ret))
+ ComplexType ret = ((EndpointWrappedDoc) port).valuesToComplexType(testedByte, testedByteArray, testedShort,
+ testedInt, testedLong, testedFloat, testedDouble, testedString, testedQName, testedDate, testedCalendar);
+ if (!ret.equals(expectedReturnedComplexType))
{
- throw new Exception("Unexpected result: " + ret + "\nExpected:" + exp);
+ throw new Exception("Unexpected result: " + ret + "\nExpected:" + expectedReturnedComplexType);
}
}
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ejb3/ValuesToComplexTypeRPCTest.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ejb3/ValuesToComplexTypeRPCTest.java 2010-03-31 09:09:06 UTC (rev 11907)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ejb3/ValuesToComplexTypeRPCTest.java 2010-03-31 10:55:29 UTC (rev 11908)
@@ -21,17 +21,6 @@
*/
package org.jboss.test.ws.jaxws.benchmark.test.datatypes.wrapped.ejb3;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.GregorianCalendar;
-import java.util.List;
-
-import javax.xml.datatype.DatatypeConfigurationException;
-import javax.xml.datatype.DatatypeFactory;
-import javax.xml.datatype.XMLGregorianCalendar;
-import javax.xml.namespace.QName;
-
-import org.jboss.test.ws.jaxws.benchmark.BenchmarkTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.DataTypesEJB3WrappedRPCTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.EndpointWrappedRPC;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.types.ComplexType;
@@ -40,69 +29,16 @@
* @author pmacik at redhat.com
* @since 09-Mar-2010
*/
-public class ValuesToComplexTypeRPCTest extends DataTypesEJB3WrappedRPCTest implements BenchmarkTest
+public class ValuesToComplexTypeRPCTest extends DataTypesEJB3WrappedRPCTest
{
- private static final String stringValue = "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<Order orderId=\"1\" orderDate=\"Wed Nov 15 13:45:28 EST 2006\"\n statusCode=\"9\" netAmount=\"59.97\" totalAmount=\"64.92\" tax=\"4.95\">\n <Customer userName=\"user1\" firstName=\"Harry\" lastName=\"Fletcher\"\n state=\"SD\" />\n <OrderLines>\n <OrderLine position=\"1\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"2\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"3\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"4\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderL!
ine>\n <OrderLine position=\"5\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"6\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"7\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"8\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"9\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"10\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n !
<OrderLine position=\"11\" quantity=\"1\">\n <Produ!
ct produ
ctId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"12\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"13\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"14\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"15\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n <Memo>\n abcdefghijklmnopqrstuvwxyz0123456789!@#$%^°*()_+-=[]{}:\",.?/`~Pada,pada_jahoda,kterou_sěščřžýáíégggaabcdefghijklmnopqrstuvwxyz0123456789!@#$%^°*()_+-=[]{}:\",.?/`~Pahoda,kterou_sni_pan_Lahodaabcdefghijklmn!
opqrstuvwxyz0123456789!@#$%^°*()_+-=[]{}:\",.?/`~Pada,pada_jahoda,kterou_sni_pan_Lahoda\n </Memo>\n </OrderLines>\n</Order>\n";
- private static final byte byteValue = (byte) 1;
-
- private static final byte[] byteArrayValue = "!@#$%^°*()_+-=[]{}:\",.?/`~Pada,pada_jahoda,kterou_sěščřžýáíégggaabcdefghijklmnopqrstuvwxyz0123456789"
- .getBytes();
-
- private static final short shortValue = (short) 3;
-
- private static final int intValue = 4;
-
- private static final long longValue = 5L;
-
- private static final float floatValue = 6.7f;
-
- private static final double doubleValue = 8.9;
-
- private static final QName qNameValue = new QName("eleven");
-
- private static final Date dateValue = new Date();
-
- private static final XMLGregorianCalendar calendarValue, modifiedCalendarValue;
-
- private static final ComplexType exp;
-
- private static final List<String> stringList;
- static
- {
- stringList = new ArrayList<String>();
- for (int i = 0; i < 10; i++)
- {
- stringList.add("item " + i);
- }
-
- DatatypeFactory dtFactory = null;
- GregorianCalendar calendar = new GregorianCalendar();;
- try
- {
- dtFactory = DatatypeFactory.newInstance();
- }
- catch (DatatypeConfigurationException e)
- {
-
- e.printStackTrace();
- }
- calendarValue = dtFactory.newXMLGregorianCalendar(calendar);
-
- modifiedCalendarValue = dtFactory.newXMLGregorianCalendar(calendar);
- modifiedCalendarValue.setDay(modifiedCalendarValue.getDay() + 1);
-
- exp = new ComplexType(byteValue, byteArrayValue, shortValue, intValue, longValue, floatValue, doubleValue,
- stringValue, stringList, qNameValue, dateValue, calendarValue);
- }
-
public void performIteration(Object port) throws Exception
{
- ComplexType ret = ((EndpointWrappedRPC) port).valuesToComplexType(byteValue, byteArrayValue, shortValue,
- intValue, longValue, floatValue, doubleValue, stringValue, qNameValue, dateValue, calendarValue);
- if (!exp.equals(ret))
+ ComplexType ret = ((EndpointWrappedRPC) port).valuesToComplexType(testedByte, testedByteArray, testedShort,
+ testedInt, testedLong, testedFloat, testedDouble, testedString, testedQName, testedDate, testedCalendar);
+ if (!ret.equals(expectedReturnedComplexType))
{
- throw new Exception("Unexpected result: " + ret + "\nExpected:" + exp);
+ throw new Exception("Unexpected result: " + ret + "\nExpected:" + expectedReturnedComplexType);
}
}
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ejb3/ValuesToStringDocTest.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ejb3/ValuesToStringDocTest.java 2010-03-31 09:09:06 UTC (rev 11907)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ejb3/ValuesToStringDocTest.java 2010-03-31 10:55:29 UTC (rev 11908)
@@ -21,15 +21,6 @@
*/
package org.jboss.test.ws.jaxws.benchmark.test.datatypes.wrapped.ejb3;
-import java.util.Date;
-import java.util.GregorianCalendar;
-
-import javax.xml.datatype.DatatypeConfigurationException;
-import javax.xml.datatype.DatatypeFactory;
-import javax.xml.datatype.XMLGregorianCalendar;
-import javax.xml.namespace.QName;
-
-import org.jboss.test.ws.jaxws.benchmark.BenchmarkTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.DataTypesEJB3WrappedDocTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.EndpointWrappedDoc;
@@ -37,73 +28,17 @@
* @author pmacik at redhat.com
* @since 09-Mar-2010
*/
-public class ValuesToStringDocTest extends DataTypesEJB3WrappedDocTest implements BenchmarkTest
+public class ValuesToStringDocTest extends DataTypesEJB3WrappedDocTest
{
- private static final String stringValue = "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<Order orderId=\"1\" orderDate=\"Wed Nov 15 13:45:28 EST 2006\"\n statusCode=\"9\" netAmount=\"59.97\" totalAmount=\"64.92\" tax=\"4.95\">\n <Customer userName=\"user1\" firstName=\"Harry\" lastName=\"Fletcher\"\n state=\"SD\" />\n <OrderLines>\n <OrderLine position=\"1\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"2\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"3\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"4\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderL!
ine>\n <OrderLine position=\"5\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"6\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"7\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"8\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"9\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"10\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n !
<OrderLine position=\"11\" quantity=\"1\">\n <Produ!
ct produ
ctId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"12\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"13\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"14\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"15\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n <Memo>\n abcdefghijklmnopqrstuvwxyz0123456789!@#$%^°*()_+-=[]{}:\",.?/`~Pada,pada_jahoda,kterou_sěščřžýáíégggaabcdefghijklmnopqrstuvwxyz0123456789!@#$%^°*()_+-=[]{}:\",.?/`~Pahoda,kterou_sni_pan_Lahodaabcdefghijklmn!
opqrstuvwxyz0123456789!@#$%^°*()_+-=[]{}:\",.?/`~Pada,pada_jahoda,kterou_sni_pan_Lahoda\n </Memo>\n </OrderLines>\n</Order>\n";
- private static final byte byteValue = (byte) 1;
-
- private static final byte[] byteArrayValue = "!@#$%^°*()_+-=[]{}:\",.?/`~Pada,pada_jahoda,kterou_sěščřžýáíégggaabcdefghijklmnopqrstuvwxyz0123456789"
- .getBytes();
-
- private static final short shortValue = (short) 3;
-
- private static final int intValue = 4;
-
- private static final long longValue = 5L;
-
- private static final float floatValue = 6.7f;
-
- private static final double doubleValue = 8.9;
-
- private static final QName qNameValue = new QName("eleven");
-
- private static final Date dateValue = new Date();
-
- private static final XMLGregorianCalendar calendarValue;
-
- private static final String exp;
-
- static
- {
- DatatypeFactory dtFactory = null;
- GregorianCalendar calendar = new GregorianCalendar();;
- try
- {
- dtFactory = DatatypeFactory.newInstance();
- }
- catch (DatatypeConfigurationException e)
- {
-
- e.printStackTrace();
- }
- calendarValue = dtFactory.newXMLGregorianCalendar(calendar);
-
- StringBuffer sb = new StringBuffer();
- sb.append("[byteValue=" + byteValue);
- sb.append(" byteArrayValue=" + new String(byteArrayValue));
- sb.append(" shortValue=" + shortValue);
- sb.append(" intValue=" + intValue);
- sb.append(" longValue=" + longValue);
- sb.append(" floatValue=" + floatValue);
- sb.append(" doubleValue=" + doubleValue);
- sb.append(" stringValue=" + stringValue);
- sb.append(" qNameValue=" + qNameValue);
- sb.append(" dateValue=" + dateValue);
- sb.append(" calendarValue=" + calendarValue);
- sb.append("]");
-
- exp = sb.toString();
- }
-
public void performIteration(Object port) throws Exception
{
- String ret = ((EndpointWrappedDoc) port).valuesToString(byteValue, byteArrayValue, shortValue, intValue,
- longValue, floatValue, doubleValue, stringValue, qNameValue, dateValue, calendarValue);
- if (!exp.equals(ret))
+ String ret = ((EndpointWrappedDoc) port).valuesToString(testedByte, testedByteArray, testedShort, testedInt,
+ testedLong, testedFloat, testedDouble, testedString, testedQName, testedDate, testedCalendar);
+ if (!ret.equals(expectedValuesString))
{
- throw new Exception("Unexpected result: " + ret + "\nExpected:" + exp);
+ throw new Exception("Unexpected result: " + ret + "\nExpected:" + expectedValuesString);
}
}
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ejb3/ValuesToStringRPCTest.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ejb3/ValuesToStringRPCTest.java 2010-03-31 09:09:06 UTC (rev 11907)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ejb3/ValuesToStringRPCTest.java 2010-03-31 10:55:29 UTC (rev 11908)
@@ -21,15 +21,6 @@
*/
package org.jboss.test.ws.jaxws.benchmark.test.datatypes.wrapped.ejb3;
-import java.util.Date;
-import java.util.GregorianCalendar;
-
-import javax.xml.datatype.DatatypeConfigurationException;
-import javax.xml.datatype.DatatypeFactory;
-import javax.xml.datatype.XMLGregorianCalendar;
-import javax.xml.namespace.QName;
-
-import org.jboss.test.ws.jaxws.benchmark.BenchmarkTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.DataTypesEJB3WrappedRPCTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.EndpointWrappedRPC;
@@ -37,73 +28,17 @@
* @author pmacik at redhat.com
* @since 09-Mar-2010
*/
-public class ValuesToStringRPCTest extends DataTypesEJB3WrappedRPCTest implements BenchmarkTest
+public class ValuesToStringRPCTest extends DataTypesEJB3WrappedRPCTest
{
- private static final String stringValue = "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<Order orderId=\"1\" orderDate=\"Wed Nov 15 13:45:28 EST 2006\"\n statusCode=\"9\" netAmount=\"59.97\" totalAmount=\"64.92\" tax=\"4.95\">\n <Customer userName=\"user1\" firstName=\"Harry\" lastName=\"Fletcher\"\n state=\"SD\" />\n <OrderLines>\n <OrderLine position=\"1\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"2\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"3\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"4\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderL!
ine>\n <OrderLine position=\"5\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"6\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"7\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"8\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"9\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"10\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n !
<OrderLine position=\"11\" quantity=\"1\">\n <Produ!
ct produ
ctId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"12\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"13\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"14\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"15\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n <Memo>\n abcdefghijklmnopqrstuvwxyz0123456789!@#$%^°*()_+-=[]{}:\",.?/`~Pada,pada_jahoda,kterou_sěščřžýáíégggaabcdefghijklmnopqrstuvwxyz0123456789!@#$%^°*()_+-=[]{}:\",.?/`~Pahoda,kterou_sni_pan_Lahodaabcdefghijklmn!
opqrstuvwxyz0123456789!@#$%^°*()_+-=[]{}:\",.?/`~Pada,pada_jahoda,kterou_sni_pan_Lahoda\n </Memo>\n </OrderLines>\n</Order>\n";
- private static final byte byteValue = (byte) 1;
-
- private static final byte[] byteArrayValue = "!@#$%^°*()_+-=[]{}:\",.?/`~Pada,pada_jahoda,kterou_sěščřžýáíégggaabcdefghijklmnopqrstuvwxyz0123456789"
- .getBytes();
-
- private static final short shortValue = (short) 3;
-
- private static final int intValue = 4;
-
- private static final long longValue = 5L;
-
- private static final float floatValue = 6.7f;
-
- private static final double doubleValue = 8.9;
-
- private static final QName qNameValue = new QName("eleven");
-
- private static final Date dateValue = new Date();
-
- private static final XMLGregorianCalendar calendarValue;
-
- private static final String exp;
-
- static
- {
- DatatypeFactory dtFactory = null;
- GregorianCalendar calendar = new GregorianCalendar();;
- try
- {
- dtFactory = DatatypeFactory.newInstance();
- }
- catch (DatatypeConfigurationException e)
- {
-
- e.printStackTrace();
- }
- calendarValue = dtFactory.newXMLGregorianCalendar(calendar);
-
- StringBuffer sb = new StringBuffer();
- sb.append("[byteValue=" + byteValue);
- sb.append(" byteArrayValue=" + new String(byteArrayValue));
- sb.append(" shortValue=" + shortValue);
- sb.append(" intValue=" + intValue);
- sb.append(" longValue=" + longValue);
- sb.append(" floatValue=" + floatValue);
- sb.append(" doubleValue=" + doubleValue);
- sb.append(" stringValue=" + stringValue);
- sb.append(" qNameValue=" + qNameValue);
- sb.append(" dateValue=" + dateValue);
- sb.append(" calendarValue=" + calendarValue);
- sb.append("]");
-
- exp = sb.toString();
- }
-
public void performIteration(Object port) throws Exception
{
- String ret = ((EndpointWrappedRPC) port).valuesToString(byteValue, byteArrayValue, shortValue, intValue,
- longValue, floatValue, doubleValue, stringValue, qNameValue, dateValue, calendarValue);
- if (!exp.equals(ret))
+ String ret = ((EndpointWrappedRPC) port).valuesToString(testedByte, testedByteArray, testedShort, testedInt,
+ testedLong, testedFloat, testedDouble, testedString, testedQName, testedDate, testedCalendar);
+ if (!ret.equals(expectedValuesString))
{
- throw new Exception("Unexpected result: " + ret + "\nExpected:" + exp);
+ throw new Exception("Unexpected result: " + ret + "\nExpected:" + expectedValuesString);
}
}
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/pojo/BooleanDocTest.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/pojo/BooleanDocTest.java 2010-03-31 09:09:06 UTC (rev 11907)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/pojo/BooleanDocTest.java 2010-03-31 10:55:29 UTC (rev 11908)
@@ -21,7 +21,6 @@
*/
package org.jboss.test.ws.jaxws.benchmark.test.datatypes.wrapped.pojo;
-import org.jboss.test.ws.jaxws.benchmark.BenchmarkTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.DataTypesPOJOWrappedDocTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.EndpointWrappedDoc;
@@ -29,16 +28,15 @@
* @author pmacik at redhat.com
* @since 25-Mar-2010
*/
-public class BooleanDocTest extends DataTypesPOJOWrappedDocTest implements BenchmarkTest
+public class BooleanDocTest extends DataTypesPOJOWrappedDocTest
{
public void performIteration(Object port) throws Exception
{
- boolean ret = ((EndpointWrappedDoc) port).negateBoolean(true);
- boolean exp = false;
- if (ret != exp)
+ boolean ret = ((EndpointWrappedDoc) port).negateBoolean(testedBoolean);
+ if (ret != expectedBoolean)
{
- throw new Exception("Unexpected result: " + ret + "\nExpected:" + exp);
+ throw new Exception("Unexpected result: " + ret + "\nExpected:" + expectedBoolean);
}
}
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/pojo/BooleanRPCTest.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/pojo/BooleanRPCTest.java 2010-03-31 09:09:06 UTC (rev 11907)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/pojo/BooleanRPCTest.java 2010-03-31 10:55:29 UTC (rev 11908)
@@ -21,7 +21,6 @@
*/
package org.jboss.test.ws.jaxws.benchmark.test.datatypes.wrapped.pojo;
-import org.jboss.test.ws.jaxws.benchmark.BenchmarkTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.DataTypesPOJOWrappedRPCTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.EndpointWrappedRPC;
@@ -29,16 +28,15 @@
* @author pmacik at redhat.com
* @since 25-Mar-2010
*/
-public class BooleanRPCTest extends DataTypesPOJOWrappedRPCTest implements BenchmarkTest
+public class BooleanRPCTest extends DataTypesPOJOWrappedRPCTest
{
public void performIteration(Object port) throws Exception
{
- boolean ret = ((EndpointWrappedRPC) port).negateBoolean(true);
- boolean exp = false;
- if (ret != exp)
+ boolean ret = ((EndpointWrappedRPC) port).negateBoolean(testedBoolean);
+ if (ret != expectedBoolean)
{
- throw new Exception("Unexpected result: " + ret + "\nExpected:" + exp);
+ throw new Exception("Unexpected result: " + ret + "\nExpected:" + expectedBoolean);
}
}
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/pojo/ByteArrayDocTest.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/pojo/ByteArrayDocTest.java 2010-03-31 09:09:06 UTC (rev 11907)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/pojo/ByteArrayDocTest.java 2010-03-31 10:55:29 UTC (rev 11908)
@@ -21,7 +21,6 @@
*/
package org.jboss.test.ws.jaxws.benchmark.test.datatypes.wrapped.pojo;
-import org.jboss.test.ws.jaxws.benchmark.BenchmarkTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.DataTypesPOJOWrappedDocTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.EndpointWrappedDoc;
@@ -29,20 +28,15 @@
* @author pmacik at redhat.com
* @since 25-Mar-2010
*/
-public class ByteArrayDocTest extends DataTypesPOJOWrappedDocTest implements BenchmarkTest
+public class ByteArrayDocTest extends DataTypesPOJOWrappedDocTest
{
- private static final byte[] tested =
- {1, 2, 4, 8, 16, 32, 64};
- private static final byte[] exp =
- {64, 32, 16, 8, 4, 2, 1};
-
public void performIteration(Object port) throws Exception
{
- byte[] ret = ((EndpointWrappedDoc) port).reverseByteOrder(tested);
+ byte[] ret = ((EndpointWrappedDoc) port).reverseByteOrder(testedByteArray);
for (int i = 0; i < ret.length; i++)
{
- if (ret[i] != exp[i])
+ if (ret[i] != expectedByteArray[i])
{
throw new Exception("Unexpected result: [" + i + "] " + ret);
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/pojo/ByteArrayRPCTest.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/pojo/ByteArrayRPCTest.java 2010-03-31 09:09:06 UTC (rev 11907)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/pojo/ByteArrayRPCTest.java 2010-03-31 10:55:29 UTC (rev 11908)
@@ -21,7 +21,6 @@
*/
package org.jboss.test.ws.jaxws.benchmark.test.datatypes.wrapped.pojo;
-import org.jboss.test.ws.jaxws.benchmark.BenchmarkTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.DataTypesPOJOWrappedRPCTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.EndpointWrappedRPC;
@@ -29,20 +28,15 @@
* @author pmacik at redhat.com
* @since 25-Mar-2010
*/
-public class ByteArrayRPCTest extends DataTypesPOJOWrappedRPCTest implements BenchmarkTest
+public class ByteArrayRPCTest extends DataTypesPOJOWrappedRPCTest
{
- private static final byte[] tested =
- {1, 2, 4, 8, 16, 32, 64};
- private static final byte[] exp =
- {64, 32, 16, 8, 4, 2, 1};
-
public void performIteration(Object port) throws Exception
{
- byte[] ret = ((EndpointWrappedRPC) port).reverseByteOrder(tested);
+ byte[] ret = ((EndpointWrappedRPC) port).reverseByteOrder(testedByteArray);
for (int i = 0; i < ret.length; i++)
{
- if (ret[i] != exp[i])
+ if (ret[i] != expectedByteArray[i])
{
throw new Exception("Unexpected result: [" + i + "] " + ret);
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/pojo/ByteDocTest.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/pojo/ByteDocTest.java 2010-03-31 09:09:06 UTC (rev 11907)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/pojo/ByteDocTest.java 2010-03-31 10:55:29 UTC (rev 11908)
@@ -21,7 +21,6 @@
*/
package org.jboss.test.ws.jaxws.benchmark.test.datatypes.wrapped.pojo;
-import org.jboss.test.ws.jaxws.benchmark.BenchmarkTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.DataTypesPOJOWrappedDocTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.EndpointWrappedDoc;
@@ -29,16 +28,15 @@
* @author pmacik at redhat.com
* @since 25-Mar-2010
*/
-public class ByteDocTest extends DataTypesPOJOWrappedDocTest implements BenchmarkTest
+public class ByteDocTest extends DataTypesPOJOWrappedDocTest
{
public void performIteration(Object port) throws Exception
{
- int ret = ((EndpointWrappedDoc) port).increaseInt(123456);
- int exp = 123457;
- if (ret != exp)
+ int ret = ((EndpointWrappedDoc) port).increaseByte(testedByte);
+ if (ret != expectedByte)
{
- throw new Exception("Unexpected result: " + ret + "\nExpected:" + exp);
+ throw new Exception("Unexpected result: " + ret + "\nExpected:" + expectedByte);
}
}
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/pojo/ByteRPCTest.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/pojo/ByteRPCTest.java 2010-03-31 09:09:06 UTC (rev 11907)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/pojo/ByteRPCTest.java 2010-03-31 10:55:29 UTC (rev 11908)
@@ -21,7 +21,6 @@
*/
package org.jboss.test.ws.jaxws.benchmark.test.datatypes.wrapped.pojo;
-import org.jboss.test.ws.jaxws.benchmark.BenchmarkTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.DataTypesPOJOWrappedRPCTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.EndpointWrappedRPC;
@@ -29,16 +28,15 @@
* @author pmacik at redhat.com
* @since 25-Mar-2010
*/
-public class ByteRPCTest extends DataTypesPOJOWrappedRPCTest implements BenchmarkTest
+public class ByteRPCTest extends DataTypesPOJOWrappedRPCTest
{
public void performIteration(Object port) throws Exception
{
- int ret = ((EndpointWrappedRPC) port).increaseInt(123456);
- int exp = 123457;
- if (ret != exp)
+ int ret = ((EndpointWrappedRPC) port).increaseByte(testedByte);
+ if (ret != expectedByte)
{
- throw new Exception("Unexpected result: " + ret);
+ throw new Exception("Unexpected result: " + ret + "\nExpected:" + expectedByte);
}
}
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/pojo/CalendarDocTest.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/pojo/CalendarDocTest.java 2010-03-31 09:09:06 UTC (rev 11907)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/pojo/CalendarDocTest.java 2010-03-31 10:55:29 UTC (rev 11908)
@@ -21,12 +21,8 @@
*/
package org.jboss.test.ws.jaxws.benchmark.test.datatypes.wrapped.pojo;
-import java.util.GregorianCalendar;
-import javax.xml.datatype.DatatypeConfigurationException;
-import javax.xml.datatype.DatatypeFactory;
import javax.xml.datatype.XMLGregorianCalendar;
-import org.jboss.test.ws.jaxws.benchmark.BenchmarkTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.DataTypesPOJOWrappedDocTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.EndpointWrappedDoc;
@@ -34,39 +30,16 @@
* @author pmacik at redhat.com
* @since 25-Mar-2010
*/
-public class CalendarDocTest extends DataTypesPOJOWrappedDocTest implements BenchmarkTest
+public class CalendarDocTest extends DataTypesPOJOWrappedDocTest
{
- private static final XMLGregorianCalendar tested;
- private static final XMLGregorianCalendar exp;
-
- static
- {
- DatatypeFactory dtFactory = null;
- GregorianCalendar calendar = new GregorianCalendar();;
- try
- {
- dtFactory = DatatypeFactory.newInstance();
- }
- catch (DatatypeConfigurationException e)
- {
-
- e.printStackTrace();
- }
- tested = dtFactory.newXMLGregorianCalendar(calendar);
-
- exp = dtFactory.newXMLGregorianCalendar(calendar);
- exp.setDay(exp.getDay() + 1);
-
- }
-
public void performIteration(Object port) throws Exception
{
- XMLGregorianCalendar ret = ((EndpointWrappedDoc) port).getCalendarPlusDay(tested);
+ XMLGregorianCalendar ret = ((EndpointWrappedDoc) port).getCalendarPlusDay(testedCalendar);
- if (!ret.equals(exp))
+ if (!ret.equals(expectedCalendar))
{
- throw new Exception("Unexpected result: " + ret + "\nExpected:" + exp);
+ throw new Exception("Unexpected result: " + ret + "\nExpected:" + expectedCalendar);
}
}
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/pojo/CalendarRPCTest.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/pojo/CalendarRPCTest.java 2010-03-31 09:09:06 UTC (rev 11907)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/pojo/CalendarRPCTest.java 2010-03-31 10:55:29 UTC (rev 11908)
@@ -21,13 +21,8 @@
*/
package org.jboss.test.ws.jaxws.benchmark.test.datatypes.wrapped.pojo;
-import java.util.GregorianCalendar;
-
-import javax.xml.datatype.DatatypeConfigurationException;
-import javax.xml.datatype.DatatypeFactory;
import javax.xml.datatype.XMLGregorianCalendar;
-import org.jboss.test.ws.jaxws.benchmark.BenchmarkTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.DataTypesPOJOWrappedRPCTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.EndpointWrappedRPC;
@@ -35,40 +30,16 @@
* @author pmacik at redhat.com
* @since 25-Mar-2010
*/
-public class CalendarRPCTest extends DataTypesPOJOWrappedRPCTest implements BenchmarkTest
+public class CalendarRPCTest extends DataTypesPOJOWrappedRPCTest
{
- private static final XMLGregorianCalendar tested;
-
- private static final XMLGregorianCalendar exp;
-
- static
- {
- DatatypeFactory dtFactory = null;
- GregorianCalendar calendar = new GregorianCalendar();;
- try
- {
- dtFactory = DatatypeFactory.newInstance();
- }
- catch (DatatypeConfigurationException e)
- {
-
- e.printStackTrace();
- }
- tested = dtFactory.newXMLGregorianCalendar(calendar);
-
- exp = dtFactory.newXMLGregorianCalendar(calendar);
- exp.setDay(exp.getDay() + 1);
-
- }
-
public void performIteration(Object port) throws Exception
{
- XMLGregorianCalendar ret = ((EndpointWrappedRPC) port).getCalendarPlusDay(tested);
+ XMLGregorianCalendar ret = ((EndpointWrappedRPC) port).getCalendarPlusDay(testedCalendar);
- if (!ret.equals(exp))
+ if (!ret.equals(expectedCalendar))
{
- throw new Exception("Unexpected result: " + ret + "\nExpected:" + exp);
+ throw new Exception("Unexpected result: " + ret + "\nExpected:" + expectedCalendar);
}
}
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/pojo/ComplexTypeDocTest.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/pojo/ComplexTypeDocTest.java 2010-03-31 09:09:06 UTC (rev 11907)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/pojo/ComplexTypeDocTest.java 2010-03-31 10:55:29 UTC (rev 11908)
@@ -21,17 +21,6 @@
*/
package org.jboss.test.ws.jaxws.benchmark.test.datatypes.wrapped.pojo;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.GregorianCalendar;
-import java.util.List;
-
-import javax.xml.datatype.DatatypeConfigurationException;
-import javax.xml.datatype.DatatypeFactory;
-import javax.xml.datatype.XMLGregorianCalendar;
-import javax.xml.namespace.QName;
-
-import org.jboss.test.ws.jaxws.benchmark.BenchmarkTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.DataTypesPOJOWrappedDocTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.EndpointWrappedDoc;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.types.ComplexType;
@@ -40,84 +29,15 @@
* @author pmacik at redhat.com
* @since 25-Mar-2010
*/
-public class ComplexTypeDocTest extends DataTypesPOJOWrappedDocTest implements BenchmarkTest
+public class ComplexTypeDocTest extends DataTypesPOJOWrappedDocTest
{
- private static final String stringValue = "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<Order orderId=\"1\" orderDate=\"Wed Nov 15 13:45:28 EST 2006\"\n statusCode=\"9\" netAmount=\"59.97\" totalAmount=\"64.92\" tax=\"4.95\">\n <Customer userName=\"user1\" firstName=\"Harry\" lastName=\"Fletcher\"\n state=\"SD\" />\n <OrderLines>\n <OrderLine position=\"1\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"2\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"3\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"4\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderL!
ine>\n <OrderLine position=\"5\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"6\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"7\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"8\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"9\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"10\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n !
<OrderLine position=\"11\" quantity=\"1\">\n <Produ!
ct produ
ctId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"12\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"13\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"14\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"15\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n <Memo>\n abcdefghijklmnopqrstuvwxyz0123456789!@#$%^°*()_+-=[]{}:\",.?/`~Pada,pada_jahoda,kterou_sěščřžýáíégggaabcdefghijklmnopqrstuvwxyz0123456789!@#$%^°*()_+-=[]{}:\",.?/`~Pahoda,kterou_sni_pan_Lahodaabcdefghijklmn!
opqrstuvwxyz0123456789!@#$%^°*()_+-=[]{}:\",.?/`~Pada,pada_jahoda,kterou_sni_pan_Lahoda\n </Memo>\n </OrderLines>\n</Order>\n";
-
- private static final byte byteValue = (byte) 1;
-
- private static final byte[] byteArrayValue = "!@#$%^°*()_+-=[]{}:\",.?/`~Pada,pada_jahoda,kterou_sěščřžýáíégggaabcdefghijklmnopqrstuvwxyz0123456789"
- .getBytes();
-
- private static final byte[] modifiedByteArrayValue;
-
- private static final short shortValue = (short) 3;
-
- private static final int intValue = 4;
-
- private static final long longValue = 5L;
-
- private static final float floatValue = 6.7f;
-
- private static final double doubleValue = 8.9;
-
- private static final QName qNameValue = new QName("eleven");
-
- private static final Date dateValue = new Date();
-
- private static final XMLGregorianCalendar calendarValue, modifiedCalendarValue;
-
- private static final ComplexType tested, exp;
-
- private static final List<String> stringList;
-
- static
- {
- stringList = new ArrayList<String>();
- for (int i = 0; i < 10; i++)
- {
- stringList.add("item " + i);
- }
-
- int length = byteArrayValue.length;
- modifiedByteArrayValue = new byte[length];
- for (int i = 0; i < length; i++)
- {
- modifiedByteArrayValue[i] = byteArrayValue[length - i - 1];
- }
-
- DatatypeFactory dtFactory = null;
- GregorianCalendar calendar = new GregorianCalendar();;
- try
- {
- dtFactory = DatatypeFactory.newInstance();
- }
- catch (DatatypeConfigurationException e)
- {
-
- e.printStackTrace();
- }
- calendarValue = dtFactory.newXMLGregorianCalendar(calendar);
-
- modifiedCalendarValue = dtFactory.newXMLGregorianCalendar(calendar);
- modifiedCalendarValue.setDay(modifiedCalendarValue.getDay() + 1);
-
- tested = new ComplexType(byteValue, byteArrayValue, shortValue, intValue, longValue, floatValue, doubleValue,
- stringValue, stringList, qNameValue, dateValue, calendarValue);
-
- exp = new ComplexType((byte) (byteValue + 1), modifiedByteArrayValue, (short) (shortValue + 1), intValue + 1,
- longValue + 1, floatValue + 1, doubleValue + 1, "Hello World Greeting for '" + stringValue + "' today",
- stringList, new QName(qNameValue.getNamespaceURI(), qNameValue.getLocalPart() + "_modified", qNameValue
- .getPrefix()), new Date(dateValue.getTime() + 86400000L), modifiedCalendarValue);
- }
-
public void performIteration(Object port) throws Exception
{
- ComplexType ret = ((EndpointWrappedDoc) port).modifyComplexType(tested);
- if (!exp.equals(ret))
+ ComplexType ret = ((EndpointWrappedDoc) port).modifyComplexType(testedComplexType);
+ if (!ret.equals(expectedComplexType))
{
- throw new Exception("Unexpected result: " + ret + "\nExpected:" + exp);
+ throw new Exception("Unexpected result: " + ret + "\nExpected:" + expectedComplexType);
}
}
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/pojo/ComplexTypeRPCTest.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/pojo/ComplexTypeRPCTest.java 2010-03-31 09:09:06 UTC (rev 11907)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/pojo/ComplexTypeRPCTest.java 2010-03-31 10:55:29 UTC (rev 11908)
@@ -21,17 +21,6 @@
*/
package org.jboss.test.ws.jaxws.benchmark.test.datatypes.wrapped.pojo;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.GregorianCalendar;
-import java.util.List;
-
-import javax.xml.datatype.DatatypeConfigurationException;
-import javax.xml.datatype.DatatypeFactory;
-import javax.xml.datatype.XMLGregorianCalendar;
-import javax.xml.namespace.QName;
-
-import org.jboss.test.ws.jaxws.benchmark.BenchmarkTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.DataTypesPOJOWrappedRPCTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.EndpointWrappedRPC;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.types.ComplexType;
@@ -40,84 +29,16 @@
* @author pmacik at redhat.com
* @since 25-Mar-2010
*/
-public class ComplexTypeRPCTest extends DataTypesPOJOWrappedRPCTest implements BenchmarkTest
+public class ComplexTypeRPCTest extends DataTypesPOJOWrappedRPCTest
{
- private static final String stringValue = "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<Order orderId=\"1\" orderDate=\"Wed Nov 15 13:45:28 EST 2006\"\n statusCode=\"9\" netAmount=\"59.97\" totalAmount=\"64.92\" tax=\"4.95\">\n <Customer userName=\"user1\" firstName=\"Harry\" lastName=\"Fletcher\"\n state=\"SD\" />\n <OrderLines>\n <OrderLine position=\"1\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"2\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"3\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"4\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderL!
ine>\n <OrderLine position=\"5\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"6\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"7\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"8\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"9\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"10\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n !
<OrderLine position=\"11\" quantity=\"1\">\n <Produ!
ct produ
ctId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"12\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"13\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"14\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"15\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n <Memo>\n abcdefghijklmnopqrstuvwxyz0123456789!@#$%^°*()_+-=[]{}:\",.?/`~Pada,pada_jahoda,kterou_sěščřžýáíégggaabcdefghijklmnopqrstuvwxyz0123456789!@#$%^°*()_+-=[]{}:\",.?/`~Pahoda,kterou_sni_pan_Lahodaabcdefghijklmn!
opqrstuvwxyz0123456789!@#$%^°*()_+-=[]{}:\",.?/`~Pada,pada_jahoda,kterou_sni_pan_Lahoda\n </Memo>\n </OrderLines>\n</Order>\n";
- private static final byte byteValue = (byte) 1;
-
- private static final byte[] byteArrayValue = "!@#$%^°*()_+-=[]{}:\",.?/`~Pada,pada_jahoda,kterou_sěščřžýáíégggaabcdefghijklmnopqrstuvwxyz0123456789"
- .getBytes();
-
- private static final byte[] modifiedByteArrayValue;
-
- private static final short shortValue = (short) 3;
-
- private static final int intValue = 4;
-
- private static final long longValue = 5L;
-
- private static final float floatValue = 6.7f;
-
- private static final double doubleValue = 8.9;
-
- private static final QName qNameValue = new QName("eleven");
-
- private static final Date dateValue = new Date();
-
- private static final XMLGregorianCalendar calendarValue, modifiedCalendarValue;
-
- private static final ComplexType tested, exp;
-
- private static final List<String> stringList;
-
- static
- {
- stringList = new ArrayList<String>();
- for (int i = 0; i < 10; i++)
- {
- stringList.add("item " + i);
- }
-
- int length = byteArrayValue.length;
- modifiedByteArrayValue = new byte[length];
- for (int i = 0; i < length; i++)
- {
- modifiedByteArrayValue[i] = byteArrayValue[length - i - 1];
- }
-
- DatatypeFactory dtFactory = null;
- GregorianCalendar calendar = new GregorianCalendar();;
- try
- {
- dtFactory = DatatypeFactory.newInstance();
- }
- catch (DatatypeConfigurationException e)
- {
-
- e.printStackTrace();
- }
- calendarValue = dtFactory.newXMLGregorianCalendar(calendar);
-
- modifiedCalendarValue = dtFactory.newXMLGregorianCalendar(calendar);
- modifiedCalendarValue.setDay(modifiedCalendarValue.getDay() + 1);
-
- tested = new ComplexType(byteValue, byteArrayValue, shortValue, intValue, longValue, floatValue, doubleValue,
- stringValue, stringList, qNameValue, dateValue, calendarValue);
-
- exp = new ComplexType((byte) (byteValue + 1), modifiedByteArrayValue, (short) (shortValue + 1), intValue + 1,
- longValue + 1, floatValue + 1, doubleValue + 1, "Hello World Greeting for '" + stringValue + "' today",
- stringList, new QName(qNameValue.getNamespaceURI(), qNameValue.getLocalPart() + "_modified", qNameValue
- .getPrefix()), new Date(dateValue.getTime() + 86400000L), modifiedCalendarValue);
- }
-
public void performIteration(Object port) throws Exception
{
- ComplexType ret = ((EndpointWrappedRPC) port).modifyComplexType(tested);
- if (!exp.equals(ret))
+ ComplexType ret = ((EndpointWrappedRPC) port).modifyComplexType(testedComplexType);
+ if (!ret.equals(expectedComplexType))
{
- throw new Exception("Unexpected result: " + ret + "\nExpected:" + exp);
+ throw new Exception("Unexpected result: " + ret + "\nExpected:" + expectedComplexType);
}
}
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/pojo/DateDocTest.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/pojo/DateDocTest.java 2010-03-31 09:09:06 UTC (rev 11907)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/pojo/DateDocTest.java 2010-03-31 10:55:29 UTC (rev 11908)
@@ -23,7 +23,6 @@
import java.util.Date;
-import org.jboss.test.ws.jaxws.benchmark.BenchmarkTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.DataTypesPOJOWrappedDocTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.EndpointWrappedDoc;
@@ -31,19 +30,16 @@
* @author pmacik at redhat.com
* @since 25-Mar-2010
*/
-public class DateDocTest extends DataTypesPOJOWrappedDocTest implements BenchmarkTest
+public class DateDocTest extends DataTypesPOJOWrappedDocTest
{
- private static final Date tested = new Date(1234567890L);;
- private static final Date exp = new Date(tested.getTime() + 86400000L);;
-
public void performIteration(Object port) throws Exception
{
- Date ret = ((EndpointWrappedDoc) port).getDatePlusDay(tested);
+ Date ret = ((EndpointWrappedDoc) port).getDatePlusDay(testedDate);
- if (!ret.equals(exp))
+ if (!ret.equals(expectedDate))
{
- throw new Exception("Unexpected result: " + ret + "\nExpected:" + exp);
+ throw new Exception("Unexpected result: " + ret + "\nExpected:" + expectedDate);
}
}
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/pojo/DateRPCTest.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/pojo/DateRPCTest.java 2010-03-31 09:09:06 UTC (rev 11907)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/pojo/DateRPCTest.java 2010-03-31 10:55:29 UTC (rev 11908)
@@ -23,7 +23,6 @@
import java.util.Date;
-import org.jboss.test.ws.jaxws.benchmark.BenchmarkTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.DataTypesPOJOWrappedRPCTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.EndpointWrappedRPC;
@@ -31,19 +30,16 @@
* @author pmacik at redhat.com
* @since 25-Mar-2010
*/
-public class DateRPCTest extends DataTypesPOJOWrappedRPCTest implements BenchmarkTest
+public class DateRPCTest extends DataTypesPOJOWrappedRPCTest
{
- private static final Date tested = new Date(1234567890L);;
- private static final Date exp = new Date(tested.getTime() + 86400000L);;
-
public void performIteration(Object port) throws Exception
{
- Date ret = ((EndpointWrappedRPC) port).getDatePlusDay(tested);
+ Date ret = ((EndpointWrappedRPC) port).getDatePlusDay(testedDate);
- if (!ret.equals(exp))
+ if (!ret.equals(expectedDate))
{
- throw new Exception("Unexpected result: " + ret + "\nExpected:" + exp);
+ throw new Exception("Unexpected result: " + ret + "\nExpected:" + expectedDate);
}
}
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/pojo/DoubleDocTest.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/pojo/DoubleDocTest.java 2010-03-31 09:09:06 UTC (rev 11907)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/pojo/DoubleDocTest.java 2010-03-31 10:55:29 UTC (rev 11908)
@@ -21,7 +21,6 @@
*/
package org.jboss.test.ws.jaxws.benchmark.test.datatypes.wrapped.pojo;
-import org.jboss.test.ws.jaxws.benchmark.BenchmarkTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.DataTypesPOJOWrappedDocTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.EndpointWrappedDoc;
@@ -29,16 +28,15 @@
* @author pmacik at redhat.com
* @since 25-Mar-2010
*/
-public class DoubleDocTest extends DataTypesPOJOWrappedDocTest implements BenchmarkTest
+public class DoubleDocTest extends DataTypesPOJOWrappedDocTest
{
public void performIteration(Object port) throws Exception
{
- double ret = ((EndpointWrappedDoc) port).increaseDouble(123456.0);
- double exp = 123457.0;
- if (ret != exp)
+ double ret = ((EndpointWrappedDoc) port).increaseDouble(testedDouble);
+ if (ret != expectedDouble)
{
- throw new Exception("Unexpected result: " + ret + "\nExpected:" + exp);
+ throw new Exception("Unexpected result: " + ret + "\nExpected:" + expectedDouble);
}
}
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/pojo/DoubleRPCTest.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/pojo/DoubleRPCTest.java 2010-03-31 09:09:06 UTC (rev 11907)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/pojo/DoubleRPCTest.java 2010-03-31 10:55:29 UTC (rev 11908)
@@ -21,7 +21,6 @@
*/
package org.jboss.test.ws.jaxws.benchmark.test.datatypes.wrapped.pojo;
-import org.jboss.test.ws.jaxws.benchmark.BenchmarkTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.DataTypesPOJOWrappedRPCTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.EndpointWrappedRPC;
@@ -29,16 +28,15 @@
* @author pmacik at redhat.com
* @since 25-Mar-2010
*/
-public class DoubleRPCTest extends DataTypesPOJOWrappedRPCTest implements BenchmarkTest
+public class DoubleRPCTest extends DataTypesPOJOWrappedRPCTest
{
public void performIteration(Object port) throws Exception
{
- double ret = ((EndpointWrappedRPC) port).increaseDouble(123456.0);
- double exp = 123457.0;
- if (ret != exp)
+ double ret = ((EndpointWrappedRPC) port).increaseDouble(testedDouble);
+ if (ret != expectedDouble)
{
- throw new Exception("Unexpected result: " + ret + "\nExpected:" + exp);
+ throw new Exception("Unexpected result: " + ret + "\nExpected:" + expectedDouble);
}
}
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/pojo/FloatDocTest.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/pojo/FloatDocTest.java 2010-03-31 09:09:06 UTC (rev 11907)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/pojo/FloatDocTest.java 2010-03-31 10:55:29 UTC (rev 11908)
@@ -21,7 +21,6 @@
*/
package org.jboss.test.ws.jaxws.benchmark.test.datatypes.wrapped.pojo;
-import org.jboss.test.ws.jaxws.benchmark.BenchmarkTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.DataTypesPOJOWrappedDocTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.EndpointWrappedDoc;
@@ -29,16 +28,15 @@
* @author pmacik at redhat.com
* @since 25-Mar-2010
*/
-public class FloatDocTest extends DataTypesPOJOWrappedDocTest implements BenchmarkTest
+public class FloatDocTest extends DataTypesPOJOWrappedDocTest
{
public void performIteration(Object port) throws Exception
{
- float ret = ((EndpointWrappedDoc) port).increaseFloat(123456f);
- float exp = 123457f;
- if (ret != exp)
+ float ret = ((EndpointWrappedDoc) port).increaseFloat(testedFloat);
+ if (ret != expectedFloat)
{
- throw new Exception("Unexpected result: " + ret + "\nExpected:" + exp);
+ throw new Exception("Unexpected result: " + ret + "\nExpected:" + expectedFloat);
}
}
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/pojo/FloatRPCTest.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/pojo/FloatRPCTest.java 2010-03-31 09:09:06 UTC (rev 11907)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/pojo/FloatRPCTest.java 2010-03-31 10:55:29 UTC (rev 11908)
@@ -21,7 +21,6 @@
*/
package org.jboss.test.ws.jaxws.benchmark.test.datatypes.wrapped.pojo;
-import org.jboss.test.ws.jaxws.benchmark.BenchmarkTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.DataTypesPOJOWrappedRPCTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.EndpointWrappedRPC;
@@ -29,16 +28,15 @@
* @author pmacik at redhat.com
* @since 25-Mar-2010
*/
-public class FloatRPCTest extends DataTypesPOJOWrappedRPCTest implements BenchmarkTest
+public class FloatRPCTest extends DataTypesPOJOWrappedRPCTest
{
public void performIteration(Object port) throws Exception
{
- float ret = ((EndpointWrappedRPC) port).increaseFloat(123456f);
- float exp = 123457f;
- if (ret != exp)
+ float ret = ((EndpointWrappedRPC) port).increaseFloat(testedFloat);
+ if (ret != expectedFloat)
{
- throw new Exception("Unexpected result: " + ret + "\nExpected:" + exp);
+ throw new Exception("Unexpected result: " + ret + "\nExpected:" + expectedFloat);
}
}
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/pojo/IntegerDocTest.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/pojo/IntegerDocTest.java 2010-03-31 09:09:06 UTC (rev 11907)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/pojo/IntegerDocTest.java 2010-03-31 10:55:29 UTC (rev 11908)
@@ -21,7 +21,6 @@
*/
package org.jboss.test.ws.jaxws.benchmark.test.datatypes.wrapped.pojo;
-import org.jboss.test.ws.jaxws.benchmark.BenchmarkTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.DataTypesPOJOWrappedDocTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.EndpointWrappedDoc;
@@ -29,16 +28,15 @@
* @author pmacik at redhat.com
* @since 25-Mar-2010
*/
-public class IntegerDocTest extends DataTypesPOJOWrappedDocTest implements BenchmarkTest
+public class IntegerDocTest extends DataTypesPOJOWrappedDocTest
{
public void performIteration(Object port) throws Exception
{
- int ret = ((EndpointWrappedDoc) port).increaseInt(123456);
- int exp = 123457;
- if (ret != exp)
+ int ret = ((EndpointWrappedDoc) port).increaseInt(testedInt);
+ if (ret != expectedInt)
{
- throw new Exception("Unexpected result: " + ret + "\nExpected:" + exp);
+ throw new Exception("Unexpected result: " + ret + "\nExpected:" + expectedInt);
}
}
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/pojo/IntegerRPCTest.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/pojo/IntegerRPCTest.java 2010-03-31 09:09:06 UTC (rev 11907)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/pojo/IntegerRPCTest.java 2010-03-31 10:55:29 UTC (rev 11908)
@@ -21,7 +21,6 @@
*/
package org.jboss.test.ws.jaxws.benchmark.test.datatypes.wrapped.pojo;
-import org.jboss.test.ws.jaxws.benchmark.BenchmarkTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.DataTypesPOJOWrappedRPCTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.EndpointWrappedRPC;
@@ -29,16 +28,15 @@
* @author pmacik at redhat.com
* @since 25-Mar-2010
*/
-public class IntegerRPCTest extends DataTypesPOJOWrappedRPCTest implements BenchmarkTest
+public class IntegerRPCTest extends DataTypesPOJOWrappedRPCTest
{
public void performIteration(Object port) throws Exception
{
- int ret = ((EndpointWrappedRPC) port).increaseInt(123456);
- int exp = 123457;
- if (ret != exp)
+ int ret = ((EndpointWrappedRPC) port).increaseInt(testedInt);
+ if (ret != expectedInt)
{
- throw new Exception("Unexpected result: " + ret + "\nExpected:" + exp);
+ throw new Exception("Unexpected result: " + ret + "\nExpected:" + expectedInt);
}
}
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/pojo/LongDocTest.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/pojo/LongDocTest.java 2010-03-31 09:09:06 UTC (rev 11907)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/pojo/LongDocTest.java 2010-03-31 10:55:29 UTC (rev 11908)
@@ -21,7 +21,6 @@
*/
package org.jboss.test.ws.jaxws.benchmark.test.datatypes.wrapped.pojo;
-import org.jboss.test.ws.jaxws.benchmark.BenchmarkTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.DataTypesPOJOWrappedDocTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.EndpointWrappedDoc;
@@ -29,16 +28,15 @@
* @author pmacik at redhat.com
* @since 25-Mar-2010
*/
-public class LongDocTest extends DataTypesPOJOWrappedDocTest implements BenchmarkTest
+public class LongDocTest extends DataTypesPOJOWrappedDocTest
{
public void performIteration(Object port) throws Exception
{
- long ret = ((EndpointWrappedDoc) port).increaseLong(1234567890L);
- long exp = 1234567891L;
- if (ret != exp)
+ long ret = ((EndpointWrappedDoc) port).increaseLong(testedLong);
+ if (ret != expectedLong)
{
- throw new Exception("Unexpected result: " + ret + "\nExpected:" + exp);
+ throw new Exception("Unexpected result: " + ret + "\nExpected:" + expectedLong);
}
}
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/pojo/LongRPCTest.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/pojo/LongRPCTest.java 2010-03-31 09:09:06 UTC (rev 11907)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/pojo/LongRPCTest.java 2010-03-31 10:55:29 UTC (rev 11908)
@@ -21,7 +21,6 @@
*/
package org.jboss.test.ws.jaxws.benchmark.test.datatypes.wrapped.pojo;
-import org.jboss.test.ws.jaxws.benchmark.BenchmarkTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.DataTypesPOJOWrappedRPCTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.EndpointWrappedRPC;
@@ -29,16 +28,15 @@
* @author pmacik at redhat.com
* @since 25-Mar-2010
*/
-public class LongRPCTest extends DataTypesPOJOWrappedRPCTest implements BenchmarkTest
+public class LongRPCTest extends DataTypesPOJOWrappedRPCTest
{
public void performIteration(Object port) throws Exception
{
- long ret = ((EndpointWrappedRPC) port).increaseLong(1234567890L);
- long exp = 1234567891L;
- if (ret != exp)
+ long ret = ((EndpointWrappedRPC) port).increaseLong(testedLong);
+ if (ret != expectedLong)
{
- throw new Exception("Unexpected result: " + ret + "\nExpected:" + exp);
+ throw new Exception("Unexpected result: " + ret + "\nExpected:" + expectedLong);
}
}
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/pojo/QNameDocTest.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/pojo/QNameDocTest.java 2010-03-31 09:09:06 UTC (rev 11907)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/pojo/QNameDocTest.java 2010-03-31 10:55:29 UTC (rev 11908)
@@ -23,7 +23,6 @@
import javax.xml.namespace.QName;
-import org.jboss.test.ws.jaxws.benchmark.BenchmarkTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.DataTypesPOJOWrappedDocTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.EndpointWrappedDoc;
@@ -31,18 +30,15 @@
* @author pmacik at redhat.com
* @since 25-Mar-2010
*/
-public class QNameDocTest extends DataTypesPOJOWrappedDocTest implements BenchmarkTest
+public class QNameDocTest extends DataTypesPOJOWrappedDocTest
{
- public static final QName exp = new QName("qname_value_modified");
-
public void performIteration(Object port) throws Exception
{
- QName ret = ((EndpointWrappedDoc) port).modifyQName(new QName("qname_value"));
-
- if (!ret.equals(exp))
+ QName ret = ((EndpointWrappedDoc) port).modifyQName(testedQName);
+ if (!ret.equals(expectedQName))
{
- throw new Exception("Unexpected result: " + ret + "\nExpected:" + exp);
+ throw new Exception("Unexpected result: " + ret + "\nExpected:" + expectedQName);
}
}
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/pojo/QNameRPCTest.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/pojo/QNameRPCTest.java 2010-03-31 09:09:06 UTC (rev 11907)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/pojo/QNameRPCTest.java 2010-03-31 10:55:29 UTC (rev 11908)
@@ -23,7 +23,6 @@
import javax.xml.namespace.QName;
-import org.jboss.test.ws.jaxws.benchmark.BenchmarkTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.DataTypesPOJOWrappedRPCTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.EndpointWrappedRPC;
@@ -31,16 +30,16 @@
* @author pmacik at redhat.com
* @since 25-Mar-2010
*/
-public class QNameRPCTest extends DataTypesPOJOWrappedRPCTest implements BenchmarkTest
+public class QNameRPCTest extends DataTypesPOJOWrappedRPCTest
{
public static final QName exp = new QName("qname_value_modified");
public void performIteration(Object port) throws Exception
{
- QName ret = ((EndpointWrappedRPC) port).modifyQName(new QName("qname_value"));
- if (!ret.equals(exp))
+ QName ret = ((EndpointWrappedRPC) port).modifyQName(testedQName);
+ if (!ret.equals(expectedQName))
{
- throw new Exception("Unexpected result: " + ret + "\nExpected:" + exp);
+ throw new Exception("Unexpected result: " + ret + "\nExpected:" + expectedQName);
}
}
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/pojo/ShortDocTest.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/pojo/ShortDocTest.java 2010-03-31 09:09:06 UTC (rev 11907)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/pojo/ShortDocTest.java 2010-03-31 10:55:29 UTC (rev 11908)
@@ -21,7 +21,6 @@
*/
package org.jboss.test.ws.jaxws.benchmark.test.datatypes.wrapped.pojo;
-import org.jboss.test.ws.jaxws.benchmark.BenchmarkTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.DataTypesPOJOWrappedDocTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.EndpointWrappedDoc;
@@ -29,16 +28,15 @@
* @author pmacik at redhat.com
* @since 25-Mar-2010
*/
-public class ShortDocTest extends DataTypesPOJOWrappedDocTest implements BenchmarkTest
+public class ShortDocTest extends DataTypesPOJOWrappedDocTest
{
public void performIteration(Object port) throws Exception
{
- short ret = ((EndpointWrappedDoc) port).increaseShort((short) 123);
- short exp = 124;
- if (ret != exp)
+ short ret = ((EndpointWrappedDoc) port).increaseShort(testedShort);
+ if (ret != expectedShort)
{
- throw new Exception("Unexpected result: " + ret + "\nExpected:" + exp);
+ throw new Exception("Unexpected result: " + ret + "\nExpected:" + expectedShort);
}
}
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/pojo/ShortRPCTest.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/pojo/ShortRPCTest.java 2010-03-31 09:09:06 UTC (rev 11907)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/pojo/ShortRPCTest.java 2010-03-31 10:55:29 UTC (rev 11908)
@@ -21,7 +21,6 @@
*/
package org.jboss.test.ws.jaxws.benchmark.test.datatypes.wrapped.pojo;
-import org.jboss.test.ws.jaxws.benchmark.BenchmarkTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.DataTypesPOJOWrappedRPCTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.EndpointWrappedRPC;
@@ -29,16 +28,15 @@
* @author pmacik at redhat.com
* @since 25-Mar-2010
*/
-public class ShortRPCTest extends DataTypesPOJOWrappedRPCTest implements BenchmarkTest
+public class ShortRPCTest extends DataTypesPOJOWrappedRPCTest
{
public void performIteration(Object port) throws Exception
{
- short ret = ((EndpointWrappedRPC) port).increaseShort((short) 124);
- short exp = 124;
- if (ret != exp)
+ short ret = ((EndpointWrappedRPC) port).increaseShort(testedShort);
+ if (ret != expectedShort)
{
- throw new Exception("Unexpected result: " + ret + "\nExpected:" + exp);
+ throw new Exception("Unexpected result: " + ret + "\nExpected:" + expectedShort);
}
}
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/pojo/StringDocTest.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/pojo/StringDocTest.java 2010-03-31 09:09:06 UTC (rev 11907)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/pojo/StringDocTest.java 2010-03-31 10:55:29 UTC (rev 11908)
@@ -21,7 +21,6 @@
*/
package org.jboss.test.ws.jaxws.benchmark.test.datatypes.wrapped.pojo;
-import org.jboss.test.ws.jaxws.benchmark.BenchmarkTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.DataTypesPOJOWrappedDocTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.EndpointWrappedDoc;
@@ -29,17 +28,15 @@
* @author pmacik at redhat.com
* @since 25-Mar-2010
*/
-public class StringDocTest extends DataTypesPOJOWrappedDocTest implements BenchmarkTest
+public class StringDocTest extends DataTypesPOJOWrappedDocTest
{
- private static final String MESSAGE = "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<Order orderId=\"1\" orderDate=\"Wed Nov 15 13:45:28 EST 2006\"\n statusCode=\"9\" netAmount=\"59.97\" totalAmount=\"64.92\" tax=\"4.95\">\n <Customer userName=\"user1\" firstName=\"Harry\" lastName=\"Fletcher\"\n state=\"SD\" />\n <OrderLines>\n <OrderLine position=\"1\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"2\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"3\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"4\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>!
\n <OrderLine position=\"5\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"6\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"7\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"8\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"9\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"10\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <Ord!
erLine position=\"11\" quantity=\"1\">\n <Product p!
roductId
=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"12\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"13\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"14\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"15\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"16\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"17\" quantity=\"1\">\n <Product pr!
oductId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"18\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"19\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"20\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"21\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"22\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"23\" quantity=\"1\">\n <Pr!
oduct productId=\"364\" title=\"The 40-Year-Old Virgin \"\n !
price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"24\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"25\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"26\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"27\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"28\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"29\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n !
price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"30\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"31\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"32\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"33\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"34\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"35\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin !
\"\n price=\"29.98\" />\n </OrderLine>\n !
<Mem
o>\n abcdefghijklmnopqrstuvwxyz0123456789!@#$%^°*()_+-=[]{}:\",.?/`~Pada,pada_jahoda,kterou_sěščřžýáíégggaabcdefghijklmnopqrstuvwxyz0123456789!@#$%^°*()_+-=[]{}:\",.?/`~Pahoda,kterou_sni_pan_Lahodaabcdefghijklmnopqrstuvwxyz0123456789!@#$%^°*()_+-=[]{}:\",.?/`~Pada,pada_jahoda,kterou_sni_pan_Lahoda\n </Memo>\n </OrderLines>\n</Order>\n";
public void performIteration(Object port) throws Exception
{
- String ret = ((EndpointWrappedDoc) port).sayHello(MESSAGE);
- String exp = "Hello World Greeting for '" + MESSAGE + "' today";
- if (!exp.equals(ret))
+ String ret = ((EndpointWrappedDoc) port).sayHello(testedString);
+ if (!ret.equals(expectedString))
{
- throw new Exception("Unexpected result: " + ret + "\nExpected:" + exp);
+ throw new Exception("Unexpected result: " + ret + "\nExpected:" + expectedString);
}
}
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/pojo/StringRPCTest.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/pojo/StringRPCTest.java 2010-03-31 09:09:06 UTC (rev 11907)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/pojo/StringRPCTest.java 2010-03-31 10:55:29 UTC (rev 11908)
@@ -21,7 +21,6 @@
*/
package org.jboss.test.ws.jaxws.benchmark.test.datatypes.wrapped.pojo;
-import org.jboss.test.ws.jaxws.benchmark.BenchmarkTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.DataTypesPOJOWrappedRPCTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.EndpointWrappedRPC;
@@ -29,18 +28,15 @@
* @author pmacik at redhat.com
* @since 25-Mar-2010
*/
-public class StringRPCTest extends DataTypesPOJOWrappedRPCTest implements BenchmarkTest
+public class StringRPCTest extends DataTypesPOJOWrappedRPCTest
{
- private static final String MESSAGE = "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<Order orderId=\"1\" orderDate=\"Wed Nov 15 13:45:28 EST 2006\"\n statusCode=\"9\" netAmount=\"59.97\" totalAmount=\"64.92\" tax=\"4.95\">\n <Customer userName=\"user1\" firstName=\"Harry\" lastName=\"Fletcher\"\n state=\"SD\" />\n <OrderLines>\n <OrderLine position=\"1\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"2\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"3\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"4\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>!
\n <OrderLine position=\"5\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"6\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"7\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"8\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"9\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"10\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <Ord!
erLine position=\"11\" quantity=\"1\">\n <Product p!
roductId
=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"12\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"13\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"14\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"15\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"16\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"17\" quantity=\"1\">\n <Product pr!
oductId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"18\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"19\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"20\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"21\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"22\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"23\" quantity=\"1\">\n <Pr!
oduct productId=\"364\" title=\"The 40-Year-Old Virgin \"\n !
price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"24\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"25\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"26\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"27\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"28\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"29\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n !
price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"30\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"31\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"32\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"33\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"34\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"35\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin !
\"\n price=\"29.98\" />\n </OrderLine>\n !
<Mem
o>\n abcdefghijklmnopqrstuvwxyz0123456789!@#$%^°*()_+-=[]{}:\",.?/`~Pada,pada_jahoda,kterou_sěščřžýáíégggaabcdefghijklmnopqrstuvwxyz0123456789!@#$%^°*()_+-=[]{}:\",.?/`~Pahoda,kterou_sni_pan_Lahodaabcdefghijklmnopqrstuvwxyz0123456789!@#$%^°*()_+-=[]{}:\",.?/`~Pada,pada_jahoda,kterou_sni_pan_Lahoda\n </Memo>\n </OrderLines>\n</Order>\n";
-
public void performIteration(Object port) throws Exception
{
- String ret = ((EndpointWrappedRPC) port).sayHello(MESSAGE);
- String exp = "Hello World Greeting for '" + MESSAGE + "' today";
- if (!exp.equals(ret))
+ String ret = ((EndpointWrappedRPC) port).sayHello(testedString);
+ if (!ret.equals(expectedString))
{
- throw new Exception("Unexpected result: " + ret + "\nExpected:" + exp);
+ throw new Exception("Unexpected result: " + ret + "\nExpected:" + expectedString);
}
}
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/pojo/ValuesToComplexTypeDocTest.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/pojo/ValuesToComplexTypeDocTest.java 2010-03-31 09:09:06 UTC (rev 11907)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/pojo/ValuesToComplexTypeDocTest.java 2010-03-31 10:55:29 UTC (rev 11908)
@@ -21,17 +21,6 @@
*/
package org.jboss.test.ws.jaxws.benchmark.test.datatypes.wrapped.pojo;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.GregorianCalendar;
-import java.util.List;
-
-import javax.xml.datatype.DatatypeConfigurationException;
-import javax.xml.datatype.DatatypeFactory;
-import javax.xml.datatype.XMLGregorianCalendar;
-import javax.xml.namespace.QName;
-
-import org.jboss.test.ws.jaxws.benchmark.BenchmarkTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.DataTypesPOJOWrappedDocTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.EndpointWrappedDoc;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.types.ComplexType;
@@ -40,66 +29,16 @@
* @author pmacik at redhat.com
* @since 25-Mar-2010
*/
-public class ValuesToComplexTypeDocTest extends DataTypesPOJOWrappedDocTest implements BenchmarkTest
+public class ValuesToComplexTypeDocTest extends DataTypesPOJOWrappedDocTest
{
- private static final String stringValue = "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<Order orderId=\"1\" orderDate=\"Wed Nov 15 13:45:28 EST 2006\"\n statusCode=\"9\" netAmount=\"59.97\" totalAmount=\"64.92\" tax=\"4.95\">\n <Customer userName=\"user1\" firstName=\"Harry\" lastName=\"Fletcher\"\n state=\"SD\" />\n <OrderLines>\n <OrderLine position=\"1\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"2\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"3\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"4\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderL!
ine>\n <OrderLine position=\"5\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"6\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"7\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"8\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"9\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"10\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n !
<OrderLine position=\"11\" quantity=\"1\">\n <Produ!
ct produ
ctId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"12\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"13\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"14\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"15\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n <Memo>\n abcdefghijklmnopqrstuvwxyz0123456789!@#$%^°*()_+-=[]{}:\",.?/`~Pada,pada_jahoda,kterou_sěščřžýáíégggaabcdefghijklmnopqrstuvwxyz0123456789!@#$%^°*()_+-=[]{}:\",.?/`~Pahoda,kterou_sni_pan_Lahodaabcdefghijklmn!
opqrstuvwxyz0123456789!@#$%^°*()_+-=[]{}:\",.?/`~Pada,pada_jahoda,kterou_sni_pan_Lahoda\n </Memo>\n </OrderLines>\n</Order>\n";
- private static final byte byteValue = (byte) 1;
-
- private static final byte[] byteArrayValue = "!@#$%^°*()_+-=[]{}:\",.?/`~Pada,pada_jahoda,kterou_sěščřžýáíégggaabcdefghijklmnopqrstuvwxyz0123456789"
- .getBytes();
-
- private static final short shortValue = (short) 3;
-
- private static final int intValue = 4;
-
- private static final long longValue = 5L;
-
- private static final float floatValue = 6.7f;
-
- private static final double doubleValue = 8.9;
-
- private static final QName qNameValue = new QName("eleven");
-
- private static final Date dateValue = new Date();
-
- private static final XMLGregorianCalendar calendarValue;
-
- private static final ComplexType exp;
-
- private static final List<String> stringList;
- static
- {
- stringList = new ArrayList<String>();
- for (int i = 0; i < 10; i++)
- {
- stringList.add("item " + i);
- }
-
- DatatypeFactory dtFactory = null;
- GregorianCalendar calendar = new GregorianCalendar();;
- try
- {
- dtFactory = DatatypeFactory.newInstance();
- }
- catch (DatatypeConfigurationException e)
- {
-
- e.printStackTrace();
- }
- calendarValue = dtFactory.newXMLGregorianCalendar(calendar);
-
- exp = new ComplexType(byteValue, byteArrayValue, shortValue, intValue, longValue, floatValue, doubleValue,
- stringValue, stringList, qNameValue, dateValue, calendarValue);
- }
-
public void performIteration(Object port) throws Exception
{
- ComplexType ret = ((EndpointWrappedDoc) port).valuesToComplexType(byteValue, byteArrayValue, shortValue,
- intValue, longValue, floatValue, doubleValue, stringValue, qNameValue, dateValue, calendarValue);
- if (!exp.equals(ret))
+ ComplexType ret = ((EndpointWrappedDoc) port).valuesToComplexType(testedByte, testedByteArray, testedShort,
+ testedInt, testedLong, testedFloat, testedDouble, testedString, testedQName, testedDate, testedCalendar);
+ if (!ret.equals(expectedReturnedComplexType))
{
- throw new Exception("Unexpected result: " + ret + "\nExpected:" + exp);
+ throw new Exception("Unexpected result: " + ret + "\nExpected:" + expectedReturnedComplexType);
}
}
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/pojo/ValuesToComplexTypeRPCTest.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/pojo/ValuesToComplexTypeRPCTest.java 2010-03-31 09:09:06 UTC (rev 11907)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/pojo/ValuesToComplexTypeRPCTest.java 2010-03-31 10:55:29 UTC (rev 11908)
@@ -21,17 +21,6 @@
*/
package org.jboss.test.ws.jaxws.benchmark.test.datatypes.wrapped.pojo;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.GregorianCalendar;
-import java.util.List;
-
-import javax.xml.datatype.DatatypeConfigurationException;
-import javax.xml.datatype.DatatypeFactory;
-import javax.xml.datatype.XMLGregorianCalendar;
-import javax.xml.namespace.QName;
-
-import org.jboss.test.ws.jaxws.benchmark.BenchmarkTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.DataTypesPOJOWrappedRPCTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.EndpointWrappedRPC;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.types.ComplexType;
@@ -40,69 +29,16 @@
* @author pmacik at redhat.com
* @since 25-Mar-2010
*/
-public class ValuesToComplexTypeRPCTest extends DataTypesPOJOWrappedRPCTest implements BenchmarkTest
+public class ValuesToComplexTypeRPCTest extends DataTypesPOJOWrappedRPCTest
{
- private static final String stringValue = "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<Order orderId=\"1\" orderDate=\"Wed Nov 15 13:45:28 EST 2006\"\n statusCode=\"9\" netAmount=\"59.97\" totalAmount=\"64.92\" tax=\"4.95\">\n <Customer userName=\"user1\" firstName=\"Harry\" lastName=\"Fletcher\"\n state=\"SD\" />\n <OrderLines>\n <OrderLine position=\"1\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"2\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"3\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"4\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderL!
ine>\n <OrderLine position=\"5\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"6\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"7\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"8\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"9\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"10\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n !
<OrderLine position=\"11\" quantity=\"1\">\n <Produ!
ct produ
ctId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"12\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"13\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"14\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"15\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n <Memo>\n abcdefghijklmnopqrstuvwxyz0123456789!@#$%^°*()_+-=[]{}:\",.?/`~Pada,pada_jahoda,kterou_sěščřžýáíégggaabcdefghijklmnopqrstuvwxyz0123456789!@#$%^°*()_+-=[]{}:\",.?/`~Pahoda,kterou_sni_pan_Lahodaabcdefghijklmn!
opqrstuvwxyz0123456789!@#$%^°*()_+-=[]{}:\",.?/`~Pada,pada_jahoda,kterou_sni_pan_Lahoda\n </Memo>\n </OrderLines>\n</Order>\n";
- private static final byte byteValue = (byte) 1;
-
- private static final byte[] byteArrayValue = "!@#$%^°*()_+-=[]{}:\",.?/`~Pada,pada_jahoda,kterou_sěščřžýáíégggaabcdefghijklmnopqrstuvwxyz0123456789"
- .getBytes();
-
- private static final short shortValue = (short) 3;
-
- private static final int intValue = 4;
-
- private static final long longValue = 5L;
-
- private static final float floatValue = 6.7f;
-
- private static final double doubleValue = 8.9;
-
- private static final QName qNameValue = new QName("eleven");
-
- private static final Date dateValue = new Date();
-
- private static final XMLGregorianCalendar calendarValue, modifiedCalendarValue;
-
- private static final ComplexType exp;
-
- private static final List<String> stringList;
- static
- {
- stringList = new ArrayList<String>();
- for (int i = 0; i < 10; i++)
- {
- stringList.add("item " + i);
- }
-
- DatatypeFactory dtFactory = null;
- GregorianCalendar calendar = new GregorianCalendar();;
- try
- {
- dtFactory = DatatypeFactory.newInstance();
- }
- catch (DatatypeConfigurationException e)
- {
-
- e.printStackTrace();
- }
- calendarValue = dtFactory.newXMLGregorianCalendar(calendar);
-
- modifiedCalendarValue = dtFactory.newXMLGregorianCalendar(calendar);
- modifiedCalendarValue.setDay(modifiedCalendarValue.getDay() + 1);
-
- exp = new ComplexType(byteValue, byteArrayValue, shortValue, intValue, longValue, floatValue, doubleValue,
- stringValue, stringList, qNameValue, dateValue, calendarValue);
- }
-
public void performIteration(Object port) throws Exception
{
- ComplexType ret = ((EndpointWrappedRPC) port).valuesToComplexType(byteValue, byteArrayValue, shortValue,
- intValue, longValue, floatValue, doubleValue, stringValue, qNameValue, dateValue, calendarValue);
- if (!exp.equals(ret))
+ ComplexType ret = ((EndpointWrappedRPC) port).valuesToComplexType(testedByte, testedByteArray, testedShort,
+ testedInt, testedLong, testedFloat, testedDouble, testedString, testedQName, testedDate, testedCalendar);
+ if (!ret.equals(expectedReturnedComplexType))
{
- throw new Exception("Unexpected result: " + ret + "\nExpected:" + exp);
+ throw new Exception("Unexpected result: " + ret + "\nExpected:" + expectedReturnedComplexType);
}
}
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/pojo/ValuesToStringDocTest.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/pojo/ValuesToStringDocTest.java 2010-03-31 09:09:06 UTC (rev 11907)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/pojo/ValuesToStringDocTest.java 2010-03-31 10:55:29 UTC (rev 11908)
@@ -21,15 +21,6 @@
*/
package org.jboss.test.ws.jaxws.benchmark.test.datatypes.wrapped.pojo;
-import java.util.Date;
-import java.util.GregorianCalendar;
-
-import javax.xml.datatype.DatatypeConfigurationException;
-import javax.xml.datatype.DatatypeFactory;
-import javax.xml.datatype.XMLGregorianCalendar;
-import javax.xml.namespace.QName;
-
-import org.jboss.test.ws.jaxws.benchmark.BenchmarkTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.DataTypesPOJOWrappedDocTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.EndpointWrappedDoc;
@@ -37,73 +28,18 @@
* @author pmacik at redhat.com
* @since 25-Mar-2010
*/
-public class ValuesToStringDocTest extends DataTypesPOJOWrappedDocTest implements BenchmarkTest
+public class ValuesToStringDocTest extends DataTypesPOJOWrappedDocTest
{
- private static final String stringValue = "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<Order orderId=\"1\" orderDate=\"Wed Nov 15 13:45:28 EST 2006\"\n statusCode=\"9\" netAmount=\"59.97\" totalAmount=\"64.92\" tax=\"4.95\">\n <Customer userName=\"user1\" firstName=\"Harry\" lastName=\"Fletcher\"\n state=\"SD\" />\n <OrderLines>\n <OrderLine position=\"1\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"2\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"3\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"4\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderL!
ine>\n <OrderLine position=\"5\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"6\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"7\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"8\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"9\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"10\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n !
<OrderLine position=\"11\" quantity=\"1\">\n <Produ!
ct produ
ctId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"12\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"13\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"14\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"15\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n <Memo>\n abcdefghijklmnopqrstuvwxyz0123456789!@#$%^°*()_+-=[]{}:\",.?/`~Pada,pada_jahoda,kterou_sěščřžýáíégggaabcdefghijklmnopqrstuvwxyz0123456789!@#$%^°*()_+-=[]{}:\",.?/`~Pahoda,kterou_sni_pan_Lahodaabcdefghijklmn!
opqrstuvwxyz0123456789!@#$%^°*()_+-=[]{}:\",.?/`~Pada,pada_jahoda,kterou_sni_pan_Lahoda\n </Memo>\n </OrderLines>\n</Order>\n";
- private static final byte byteValue = (byte) 1;
-
- private static final byte[] byteArrayValue = "!@#$%^°*()_+-=[]{}:\",.?/`~Pada,pada_jahoda,kterou_sěščřžýáíégggaabcdefghijklmnopqrstuvwxyz0123456789"
- .getBytes();
-
- private static final short shortValue = (short) 3;
-
- private static final int intValue = 4;
-
- private static final long longValue = 5L;
-
- private static final float floatValue = 6.7f;
-
- private static final double doubleValue = 8.9;
-
- private static final QName qNameValue = new QName("eleven");
-
- private static final Date dateValue = new Date();
-
- private static final XMLGregorianCalendar calendarValue;
-
- private static final String exp;
-
- static
- {
- DatatypeFactory dtFactory = null;
- GregorianCalendar calendar = new GregorianCalendar();;
- try
- {
- dtFactory = DatatypeFactory.newInstance();
- }
- catch (DatatypeConfigurationException e)
- {
-
- e.printStackTrace();
- }
- calendarValue = dtFactory.newXMLGregorianCalendar(calendar);
-
- StringBuffer sb = new StringBuffer();
- sb.append("[byteValue=" + byteValue);
- sb.append(" byteArrayValue=" + new String(byteArrayValue));
- sb.append(" shortValue=" + shortValue);
- sb.append(" intValue=" + intValue);
- sb.append(" longValue=" + longValue);
- sb.append(" floatValue=" + floatValue);
- sb.append(" doubleValue=" + doubleValue);
- sb.append(" stringValue=" + stringValue);
- sb.append(" qNameValue=" + qNameValue);
- sb.append(" dateValue=" + dateValue);
- sb.append(" calendarValue=" + calendarValue);
- sb.append("]");
-
- exp = sb.toString();
- }
-
public void performIteration(Object port) throws Exception
{
- String ret = ((EndpointWrappedDoc) port).valuesToString(byteValue, byteArrayValue, shortValue, intValue,
- longValue, floatValue, doubleValue, stringValue, qNameValue, dateValue, calendarValue);
- if (!exp.equals(ret))
+ String ret = ((EndpointWrappedDoc) port).valuesToString(testedByte, testedByteArray, testedShort, testedInt,
+ testedLong, testedFloat, testedDouble, testedString, testedQName, testedDate, testedCalendar);
+ if (!ret.equals(expectedValuesString))
{
- throw new Exception("Unexpected result: " + ret + "\nExpected:" + exp);
+ throw new Exception("Unexpected result: " + ret + "\nExpected:" + expectedValuesString);
}
+
}
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/pojo/ValuesToStringRPCTest.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/pojo/ValuesToStringRPCTest.java 2010-03-31 09:09:06 UTC (rev 11907)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/pojo/ValuesToStringRPCTest.java 2010-03-31 10:55:29 UTC (rev 11908)
@@ -21,15 +21,6 @@
*/
package org.jboss.test.ws.jaxws.benchmark.test.datatypes.wrapped.pojo;
-import java.util.Date;
-import java.util.GregorianCalendar;
-
-import javax.xml.datatype.DatatypeConfigurationException;
-import javax.xml.datatype.DatatypeFactory;
-import javax.xml.datatype.XMLGregorianCalendar;
-import javax.xml.namespace.QName;
-
-import org.jboss.test.ws.jaxws.benchmark.BenchmarkTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.DataTypesPOJOWrappedRPCTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.EndpointWrappedRPC;
@@ -37,73 +28,17 @@
* @author pmacik at redhat.com
* @since 25-Mar-2010
*/
-public class ValuesToStringRPCTest extends DataTypesPOJOWrappedRPCTest implements BenchmarkTest
+public class ValuesToStringRPCTest extends DataTypesPOJOWrappedRPCTest
{
- private static final String stringValue = "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<Order orderId=\"1\" orderDate=\"Wed Nov 15 13:45:28 EST 2006\"\n statusCode=\"9\" netAmount=\"59.97\" totalAmount=\"64.92\" tax=\"4.95\">\n <Customer userName=\"user1\" firstName=\"Harry\" lastName=\"Fletcher\"\n state=\"SD\" />\n <OrderLines>\n <OrderLine position=\"1\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"2\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"3\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"4\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderL!
ine>\n <OrderLine position=\"5\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"6\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"7\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"8\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"9\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"10\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n !
<OrderLine position=\"11\" quantity=\"1\">\n <Produ!
ct produ
ctId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"12\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"13\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n </OrderLine>\n <OrderLine position=\"14\" quantity=\"1\">\n <Product productId=\"299\" title=\"Pulp Fiction\" price=\"29.99\" />\n </OrderLine>\n <OrderLine position=\"15\" quantity=\"1\">\n <Product productId=\"364\" title=\"The 40-Year-Old Virgin \"\n price=\"29.98\" />\n <Memo>\n abcdefghijklmnopqrstuvwxyz0123456789!@#$%^°*()_+-=[]{}:\",.?/`~Pada,pada_jahoda,kterou_sěščřžýáíégggaabcdefghijklmnopqrstuvwxyz0123456789!@#$%^°*()_+-=[]{}:\",.?/`~Pahoda,kterou_sni_pan_Lahodaabcdefghijklmn!
opqrstuvwxyz0123456789!@#$%^°*()_+-=[]{}:\",.?/`~Pada,pada_jahoda,kterou_sni_pan_Lahoda\n </Memo>\n </OrderLines>\n</Order>\n";
- private static final byte byteValue = (byte) 1;
-
- private static final byte[] byteArrayValue = "!@#$%^°*()_+-=[]{}:\",.?/`~Pada,pada_jahoda,kterou_sěščřžýáíégggaabcdefghijklmnopqrstuvwxyz0123456789"
- .getBytes();
-
- private static final short shortValue = (short) 3;
-
- private static final int intValue = 4;
-
- private static final long longValue = 5L;
-
- private static final float floatValue = 6.7f;
-
- private static final double doubleValue = 8.9;
-
- private static final QName qNameValue = new QName("eleven");
-
- private static final Date dateValue = new Date();
-
- private static final XMLGregorianCalendar calendarValue;
-
- private static final String exp;
-
- static
- {
- DatatypeFactory dtFactory = null;
- GregorianCalendar calendar = new GregorianCalendar();;
- try
- {
- dtFactory = DatatypeFactory.newInstance();
- }
- catch (DatatypeConfigurationException e)
- {
-
- e.printStackTrace();
- }
- calendarValue = dtFactory.newXMLGregorianCalendar(calendar);
-
- StringBuffer sb = new StringBuffer();
- sb.append("[byteValue=" + byteValue);
- sb.append(" byteArrayValue=" + new String(byteArrayValue));
- sb.append(" shortValue=" + shortValue);
- sb.append(" intValue=" + intValue);
- sb.append(" longValue=" + longValue);
- sb.append(" floatValue=" + floatValue);
- sb.append(" doubleValue=" + doubleValue);
- sb.append(" stringValue=" + stringValue);
- sb.append(" qNameValue=" + qNameValue);
- sb.append(" dateValue=" + dateValue);
- sb.append(" calendarValue=" + calendarValue);
- sb.append("]");
-
- exp = sb.toString();
- }
-
public void performIteration(Object port) throws Exception
{
- String ret = ((EndpointWrappedRPC) port).valuesToString(byteValue, byteArrayValue, shortValue, intValue,
- longValue, floatValue, doubleValue, stringValue, qNameValue, dateValue, calendarValue);
- if (!exp.equals(ret))
+ String ret = ((EndpointWrappedRPC) port).valuesToString(testedByte, testedByteArray, testedShort, testedInt,
+ testedLong, testedFloat, testedDouble, testedString, testedQName, testedDate, testedCalendar);
+ if (!ret.equals(expectedValuesString))
{
- throw new Exception("Unexpected result: " + ret + "\nExpected:" + exp);
+ throw new Exception("Unexpected result: " + ret + "\nExpected:" + expectedValuesString);
}
}
}
More information about the jbossws-commits
mailing list