You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ga...@apache.org on 2007/09/19 19:34:07 UTC
svn commit: r577397 - in
/geronimo/server/branches/2.0/testsuite/webservices-testsuite/jaxws-tests/jaxws-war/src/test:
java/org/apache/geronimo/testsuite/testset/JaxWSTest.java
resources/request1.xml resources/request2.xml
Author: gawor
Date: Wed Sep 19 10:34:06 2007
New Revision: 577397
URL: http://svn.apache.org/viewvc?rev=577397&view=rev
Log:
fix test. jax-ws assumes unqualified schema
Added:
geronimo/server/branches/2.0/testsuite/webservices-testsuite/jaxws-tests/jaxws-war/src/test/resources/request2.xml
Modified:
geronimo/server/branches/2.0/testsuite/webservices-testsuite/jaxws-tests/jaxws-war/src/test/java/org/apache/geronimo/testsuite/testset/JaxWSTest.java
geronimo/server/branches/2.0/testsuite/webservices-testsuite/jaxws-tests/jaxws-war/src/test/resources/request1.xml
Modified: geronimo/server/branches/2.0/testsuite/webservices-testsuite/jaxws-tests/jaxws-war/src/test/java/org/apache/geronimo/testsuite/testset/JaxWSTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/testsuite/webservices-testsuite/jaxws-tests/jaxws-war/src/test/java/org/apache/geronimo/testsuite/testset/JaxWSTest.java?rev=577397&r1=577396&r2=577397&view=diff
==============================================================================
--- geronimo/server/branches/2.0/testsuite/webservices-testsuite/jaxws-tests/jaxws-war/src/test/java/org/apache/geronimo/testsuite/testset/JaxWSTest.java (original)
+++ geronimo/server/branches/2.0/testsuite/webservices-testsuite/jaxws-tests/jaxws-war/src/test/java/org/apache/geronimo/testsuite/testset/JaxWSTest.java Wed Sep 19 10:34:06 2007
@@ -56,20 +56,19 @@
@Test
public void testInvocation1() throws Exception {
- testInvocation("/servlet1");
+ testInvocation("/servlet1", "/request1.xml");
}
@Test
public void testInvocation2() throws Exception {
- testInvocation("/servlet2");
+ testInvocation("/servlet2", "/request2.xml");
}
- @Test
- private void testInvocation(String servlet) throws Exception {
+ private void testInvocation(String servlet, String requestFile) throws Exception {
String warName = System.getProperty("webAppName");
assertNotNull("Web application name not specified", warName);
- InputStream requestInput = JaxWSTest.class.getResourceAsStream("/request1.xml");
+ InputStream requestInput = JaxWSTest.class.getResourceAsStream(requestFile);
assertNotNull("SOAP request not specified", requestInput);
URL url = new URL(baseURL + warName + servlet);
Modified: geronimo/server/branches/2.0/testsuite/webservices-testsuite/jaxws-tests/jaxws-war/src/test/resources/request1.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/testsuite/webservices-testsuite/jaxws-tests/jaxws-war/src/test/resources/request1.xml?rev=577397&r1=577396&r2=577397&view=diff
==============================================================================
--- geronimo/server/branches/2.0/testsuite/webservices-testsuite/jaxws-tests/jaxws-war/src/test/resources/request1.xml (original)
+++ geronimo/server/branches/2.0/testsuite/webservices-testsuite/jaxws-tests/jaxws-war/src/test/resources/request1.xml Wed Sep 19 10:34:06 2007
@@ -19,8 +19,8 @@
-->
<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/">
<soap:Body>
- <greetMe xmlns="http://apache.org/greeter_control/types">
+ <x:greetMe xmlns:x="http://apache.org/greeter_control/types">
<requestType>foo bar</requestType>
- </greetMe>
+ </x:greetMe>
</soap:Body>
</soap:Envelope>
Added: geronimo/server/branches/2.0/testsuite/webservices-testsuite/jaxws-tests/jaxws-war/src/test/resources/request2.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/testsuite/webservices-testsuite/jaxws-tests/jaxws-war/src/test/resources/request2.xml?rev=577397&view=auto
==============================================================================
--- geronimo/server/branches/2.0/testsuite/webservices-testsuite/jaxws-tests/jaxws-war/src/test/resources/request2.xml (added)
+++ geronimo/server/branches/2.0/testsuite/webservices-testsuite/jaxws-tests/jaxws-war/src/test/resources/request2.xml Wed Sep 19 10:34:06 2007
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/">
+ <soap:Body>
+ <greetMe xmlns="http://apache.org/greeter_control/types">
+ <requestType>foo bar</requestType>
+ </greetMe>
+ </soap:Body>
+</soap:Envelope>