JBossWS SVN: r8321 - stack/metro/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-10-02 09:35:51 -0400 (Thu, 02 Oct 2008)
New Revision: 8321
Modified:
stack/metro/trunk/modules/testsuite/test-excludes-jboss500.txt
stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt
Log:
[JBWS-2165] re-enabling excludes
Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss500.txt
===================================================================
--- stack/metro/trunk/modules/testsuite/test-excludes-jboss500.txt 2008-10-02 13:34:05 UTC (rev 8320)
+++ stack/metro/trunk/modules/testsuite/test-excludes-jboss500.txt 2008-10-02 13:35:51 UTC (rev 8321)
@@ -39,6 +39,9 @@
# [JBWS-2131] NoSuchElementException during wsdl generation at deploy
org/jboss/test/ws/jaxws/jbws1702/**
+# [JBWS-2165] Fix xop tests with maven build
+org/jboss/test/ws/jaxws/samples/xop/**
+
# [JBWS-2247] Write test for JBWS-1190 from scratch using MessageContext properties
org/jboss/test/ws/jaxws/jbws1190/**
Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt
===================================================================
--- stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt 2008-10-02 13:34:05 UTC (rev 8320)
+++ stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt 2008-10-02 13:35:51 UTC (rev 8321)
@@ -39,6 +39,9 @@
# [JBWS-2131] NoSuchElementException during wsdl generation at deploy
org/jboss/test/ws/jaxws/jbws1702/**
+# [JBWS-2165] Fix xop tests with maven build
+org/jboss/test/ws/jaxws/samples/xop/**
+
# [JBWS-2247] Write test for JBWS-1190 from scratch using MessageContext properties
org/jboss/test/ws/jaxws/jbws1190/**
16 years, 5 months
JBossWS SVN: r8320 - framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-10-02 09:34:05 -0400 (Thu, 02 Oct 2008)
New Revision: 8320
Modified:
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBareTestCase.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPWrappedTestCase.java
Log:
[JBWS-2165] rollback -r 8317:8316: setting the factory props doesn't work when previous tests are run loading sjsx factories. The whole testsuite need to be run with the same StAX implementation.
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBareTestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBareTestCase.java 2008-10-02 10:43:24 UTC (rev 8319)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBareTestCase.java 2008-10-02 13:34:05 UTC (rev 8320)
@@ -49,15 +49,6 @@
{
public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-samples-xop-doclit/bare";
-
- private String xmlInputFactoryValue;
- private String xmlOutputFactoryValue;
- private String xmlEventFactoryValue;
-
- private static final String XML_INPUT_FACTORY = "javax.xml.stream.XMLInputFactory";
- private static final String XML_OUTPUT_FACTORY = "javax.xml.stream.XMLOutputFactory";
- private static final String XML_EVENT_FACTORY = "javax.xml.stream.XMLEventFactory";
- private static final String NOT_SET = "NOT_SET";
public static Test suite()
{
@@ -66,18 +57,6 @@
protected void setUp() throws Exception
{
- if (isIntegrationMetro())
- {
- //use Woodstox as a workaround for JBWS-2165 on AS 5
- xmlInputFactoryValue = System.getProperty(XML_INPUT_FACTORY, NOT_SET);
- xmlOutputFactoryValue = System.getProperty(XML_OUTPUT_FACTORY, NOT_SET);
- xmlEventFactoryValue = System.getProperty(XML_EVENT_FACTORY, NOT_SET);
-
- System.setProperty(XML_INPUT_FACTORY, "com.ctc.wstx.stax.WstxInputFactory");
- System.setProperty(XML_OUTPUT_FACTORY, "com.ctc.wstx.stax.WstxOutputFactory");
- System.setProperty(XML_EVENT_FACTORY, "com.ctc.wstx.stax.WstxEventFactory");
- }
-
QName serviceName = new QName("http://doclit.xop.samples.jaxws.ws.test.jboss.org/", "MTOMService");
URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl");
@@ -85,40 +64,6 @@
port = service.getPort(MTOMEndpoint.class);
binding = (SOAPBinding)((BindingProvider)port).getBinding();
}
-
- protected void tearDown() throws Exception
- {
- if (isIntegrationMetro())
- {
- //restore StAX implementation factories
- if (NOT_SET.equals(xmlInputFactoryValue))
- {
- System.clearProperty(XML_INPUT_FACTORY);
- }
- else
- {
- System.setProperty(XML_INPUT_FACTORY, xmlInputFactoryValue);
- }
-
- if (NOT_SET.equals(xmlOutputFactoryValue))
- {
- System.clearProperty(XML_OUTPUT_FACTORY);
- }
- else
- {
- System.setProperty(XML_OUTPUT_FACTORY, xmlOutputFactoryValue);
- }
-
- if (NOT_SET.equals(xmlEventFactoryValue))
- {
- System.clearProperty(XML_EVENT_FACTORY);
- }
- else
- {
- System.setProperty(XML_EVENT_FACTORY, xmlEventFactoryValue);
- }
- }
- }
/**
* Consumption of XOP packages (not inlined) should resolve the correct java type.
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPWrappedTestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPWrappedTestCase.java 2008-10-02 10:43:24 UTC (rev 8319)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPWrappedTestCase.java 2008-10-02 13:34:05 UTC (rev 8320)
@@ -49,16 +49,6 @@
public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-samples-xop-doclit/wrapped";
private WrappedEndpoint port;
-
- private String xmlInputFactoryValue;
- private String xmlOutputFactoryValue;
- private String xmlEventFactoryValue;
-
- private static final String XML_INPUT_FACTORY = "javax.xml.stream.XMLInputFactory";
- private static final String XML_OUTPUT_FACTORY = "javax.xml.stream.XMLOutputFactory";
- private static final String XML_EVENT_FACTORY = "javax.xml.stream.XMLEventFactory";
- private static final String NOT_SET = "NOT_SET";
-
public static Test suite()
{
@@ -67,18 +57,7 @@
protected void setUp() throws Exception
{
- if (isIntegrationMetro())
- {
- //use Woodstox as a workaround for JBWS-2165 on AS 5
- xmlInputFactoryValue = System.getProperty(XML_INPUT_FACTORY, NOT_SET);
- xmlOutputFactoryValue = System.getProperty(XML_OUTPUT_FACTORY, NOT_SET);
- xmlEventFactoryValue = System.getProperty(XML_EVENT_FACTORY, NOT_SET);
-
- System.setProperty(XML_INPUT_FACTORY, "com.ctc.wstx.stax.WstxInputFactory");
- System.setProperty(XML_OUTPUT_FACTORY, "com.ctc.wstx.stax.WstxOutputFactory");
- System.setProperty(XML_EVENT_FACTORY, "com.ctc.wstx.stax.WstxEventFactory");
- }
-
+
QName serviceName = new QName("http://doclit.xop.samples.jaxws.ws.test.jboss.org/", "WrappedService");
URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl");
@@ -89,40 +68,6 @@
binding.setMTOMEnabled(true);
}
-
- protected void tearDown() throws Exception
- {
- if (isIntegrationMetro())
- {
- //restore StAX implementation factories
- if (NOT_SET.equals(xmlInputFactoryValue))
- {
- System.clearProperty(XML_INPUT_FACTORY);
- }
- else
- {
- System.setProperty(XML_INPUT_FACTORY, xmlInputFactoryValue);
- }
-
- if (NOT_SET.equals(xmlOutputFactoryValue))
- {
- System.clearProperty(XML_OUTPUT_FACTORY);
- }
- else
- {
- System.setProperty(XML_OUTPUT_FACTORY, xmlOutputFactoryValue);
- }
-
- if (NOT_SET.equals(xmlEventFactoryValue))
- {
- System.clearProperty(XML_EVENT_FACTORY);
- }
- else
- {
- System.setProperty(XML_EVENT_FACTORY, xmlEventFactoryValue);
- }
- }
- }
public void testParameterAnnotation() throws Exception
{
16 years, 5 months
JBossWS SVN: r8319 - stack/metro/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-10-02 06:43:24 -0400 (Thu, 02 Oct 2008)
New Revision: 8319
Modified:
stack/metro/trunk/modules/testsuite/test-excludes-jboss500.txt
Log:
[JBWS-2165] Removing exclude and running with Woodstox as a workaround
Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss500.txt
===================================================================
--- stack/metro/trunk/modules/testsuite/test-excludes-jboss500.txt 2008-10-02 10:28:36 UTC (rev 8318)
+++ stack/metro/trunk/modules/testsuite/test-excludes-jboss500.txt 2008-10-02 10:43:24 UTC (rev 8319)
@@ -39,9 +39,6 @@
# [JBWS-2131] NoSuchElementException during wsdl generation at deploy
org/jboss/test/ws/jaxws/jbws1702/**
-# [JBWS-2165] Fix xop tests with maven build
-org/jboss/test/ws/jaxws/samples/xop/**
-
# [JBWS-2247] Write test for JBWS-1190 from scratch using MessageContext properties
org/jboss/test/ws/jaxws/jbws1190/**
16 years, 5 months
JBossWS SVN: r8318 - stack/metro/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-10-02 06:28:36 -0400 (Thu, 02 Oct 2008)
New Revision: 8318
Modified:
stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt
Log:
[JBWS-2165] Removing exclude and running with Woodstox as a workaround
Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt
===================================================================
--- stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt 2008-10-02 10:22:40 UTC (rev 8317)
+++ stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt 2008-10-02 10:28:36 UTC (rev 8318)
@@ -39,9 +39,6 @@
# [JBWS-2131] NoSuchElementException during wsdl generation at deploy
org/jboss/test/ws/jaxws/jbws1702/**
-# [JBWS-2165] Fix xop tests with maven build
-org/jboss/test/ws/jaxws/samples/xop/**
-
# [JBWS-2247] Write test for JBWS-1190 from scratch using MessageContext properties
org/jboss/test/ws/jaxws/jbws1190/**
16 years, 5 months
JBossWS SVN: r8317 - framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-10-02 06:22:40 -0400 (Thu, 02 Oct 2008)
New Revision: 8317
Modified:
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBareTestCase.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPWrappedTestCase.java
Log:
[JBWS-2165] Using Woodstox on client side when in Metro integration
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBareTestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBareTestCase.java 2008-10-01 06:32:55 UTC (rev 8316)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBareTestCase.java 2008-10-02 10:22:40 UTC (rev 8317)
@@ -49,6 +49,15 @@
{
public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-samples-xop-doclit/bare";
+
+ private String xmlInputFactoryValue;
+ private String xmlOutputFactoryValue;
+ private String xmlEventFactoryValue;
+
+ private static final String XML_INPUT_FACTORY = "javax.xml.stream.XMLInputFactory";
+ private static final String XML_OUTPUT_FACTORY = "javax.xml.stream.XMLOutputFactory";
+ private static final String XML_EVENT_FACTORY = "javax.xml.stream.XMLEventFactory";
+ private static final String NOT_SET = "NOT_SET";
public static Test suite()
{
@@ -57,6 +66,18 @@
protected void setUp() throws Exception
{
+ if (isIntegrationMetro())
+ {
+ //use Woodstox as a workaround for JBWS-2165 on AS 5
+ xmlInputFactoryValue = System.getProperty(XML_INPUT_FACTORY, NOT_SET);
+ xmlOutputFactoryValue = System.getProperty(XML_OUTPUT_FACTORY, NOT_SET);
+ xmlEventFactoryValue = System.getProperty(XML_EVENT_FACTORY, NOT_SET);
+
+ System.setProperty(XML_INPUT_FACTORY, "com.ctc.wstx.stax.WstxInputFactory");
+ System.setProperty(XML_OUTPUT_FACTORY, "com.ctc.wstx.stax.WstxOutputFactory");
+ System.setProperty(XML_EVENT_FACTORY, "com.ctc.wstx.stax.WstxEventFactory");
+ }
+
QName serviceName = new QName("http://doclit.xop.samples.jaxws.ws.test.jboss.org/", "MTOMService");
URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl");
@@ -64,6 +85,40 @@
port = service.getPort(MTOMEndpoint.class);
binding = (SOAPBinding)((BindingProvider)port).getBinding();
}
+
+ protected void tearDown() throws Exception
+ {
+ if (isIntegrationMetro())
+ {
+ //restore StAX implementation factories
+ if (NOT_SET.equals(xmlInputFactoryValue))
+ {
+ System.clearProperty(XML_INPUT_FACTORY);
+ }
+ else
+ {
+ System.setProperty(XML_INPUT_FACTORY, xmlInputFactoryValue);
+ }
+
+ if (NOT_SET.equals(xmlOutputFactoryValue))
+ {
+ System.clearProperty(XML_OUTPUT_FACTORY);
+ }
+ else
+ {
+ System.setProperty(XML_OUTPUT_FACTORY, xmlOutputFactoryValue);
+ }
+
+ if (NOT_SET.equals(xmlEventFactoryValue))
+ {
+ System.clearProperty(XML_EVENT_FACTORY);
+ }
+ else
+ {
+ System.setProperty(XML_EVENT_FACTORY, xmlEventFactoryValue);
+ }
+ }
+ }
/**
* Consumption of XOP packages (not inlined) should resolve the correct java type.
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPWrappedTestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPWrappedTestCase.java 2008-10-01 06:32:55 UTC (rev 8316)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPWrappedTestCase.java 2008-10-02 10:22:40 UTC (rev 8317)
@@ -49,6 +49,16 @@
public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-samples-xop-doclit/wrapped";
private WrappedEndpoint port;
+
+ private String xmlInputFactoryValue;
+ private String xmlOutputFactoryValue;
+ private String xmlEventFactoryValue;
+
+ private static final String XML_INPUT_FACTORY = "javax.xml.stream.XMLInputFactory";
+ private static final String XML_OUTPUT_FACTORY = "javax.xml.stream.XMLOutputFactory";
+ private static final String XML_EVENT_FACTORY = "javax.xml.stream.XMLEventFactory";
+ private static final String NOT_SET = "NOT_SET";
+
public static Test suite()
{
@@ -57,7 +67,18 @@
protected void setUp() throws Exception
{
-
+ if (isIntegrationMetro())
+ {
+ //use Woodstox as a workaround for JBWS-2165 on AS 5
+ xmlInputFactoryValue = System.getProperty(XML_INPUT_FACTORY, NOT_SET);
+ xmlOutputFactoryValue = System.getProperty(XML_OUTPUT_FACTORY, NOT_SET);
+ xmlEventFactoryValue = System.getProperty(XML_EVENT_FACTORY, NOT_SET);
+
+ System.setProperty(XML_INPUT_FACTORY, "com.ctc.wstx.stax.WstxInputFactory");
+ System.setProperty(XML_OUTPUT_FACTORY, "com.ctc.wstx.stax.WstxOutputFactory");
+ System.setProperty(XML_EVENT_FACTORY, "com.ctc.wstx.stax.WstxEventFactory");
+ }
+
QName serviceName = new QName("http://doclit.xop.samples.jaxws.ws.test.jboss.org/", "WrappedService");
URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl");
@@ -68,6 +89,40 @@
binding.setMTOMEnabled(true);
}
+
+ protected void tearDown() throws Exception
+ {
+ if (isIntegrationMetro())
+ {
+ //restore StAX implementation factories
+ if (NOT_SET.equals(xmlInputFactoryValue))
+ {
+ System.clearProperty(XML_INPUT_FACTORY);
+ }
+ else
+ {
+ System.setProperty(XML_INPUT_FACTORY, xmlInputFactoryValue);
+ }
+
+ if (NOT_SET.equals(xmlOutputFactoryValue))
+ {
+ System.clearProperty(XML_OUTPUT_FACTORY);
+ }
+ else
+ {
+ System.setProperty(XML_OUTPUT_FACTORY, xmlOutputFactoryValue);
+ }
+
+ if (NOT_SET.equals(xmlEventFactoryValue))
+ {
+ System.clearProperty(XML_EVENT_FACTORY);
+ }
+ else
+ {
+ System.setProperty(XML_EVENT_FACTORY, xmlEventFactoryValue);
+ }
+ }
+ }
public void testParameterAnnotation() throws Exception
{
16 years, 5 months
JBossWS SVN: r8316 - common/trunk/src/main/java/org/jboss/wsf/test.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-10-01 02:32:55 -0400 (Wed, 01 Oct 2008)
New Revision: 8316
Modified:
common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java
Log:
always propagate exception
Modified: common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java
===================================================================
--- common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2008-09-30 18:33:04 UTC (rev 8315)
+++ common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2008-10-01 06:32:55 UTC (rev 8316)
@@ -208,13 +208,9 @@
jbossVersion = "jboss40";
else throw new IllegalStateException("Unsupported jboss version: " + jbossVersion);
}
- catch (IllegalStateException ex)
- {
- throw ex;
- }
catch (Exception ex)
{
- // ignore, we are not running on jboss-4.2 or greater
+ throw new RuntimeException(ex);
}
if (integrationTarget.startsWith(jbossVersion) == false)
16 years, 5 months