Author: veithen
Date: Sun Apr 18 21:18:33 2010
New Revision: 935414
URL: http://svn.apache.org/viewvc?rev=935414&view=rev
Log:
Absorbed the lonely test case in SOAPDiscardTestBase into
SOAP11EnvelopeTestBase and extended its scope to DOOM.
Added:
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/java/org/apache/axiom/soap/SOAP11EnvelopeTestBase.java
(with props)
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/java/org/apache/axiom/soap/SOAP12EnvelopeTestBase.java
(with props)
Removed:
webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/soap/SOAPDiscardTestBase.java
webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/soap/impl/llom/SOAPDiscardTest.java
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/test/java/org/apache/axiom/soap/impl/dom/SOAP11EnvelopeTest.java
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/test/java/org/apache/axiom/soap/impl/dom/SOAP12EnvelopeTest.java
webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/test/java/org/apache/axiom/soap/impl/llom/SOAP11EnvelopeTest.java
webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/test/java/org/apache/axiom/soap/impl/llom/SOAP12EnvelopeTest.java
Added:
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/java/org/apache/axiom/soap/SOAP11EnvelopeTestBase.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/java/org/apache/axiom/soap/SOAP11EnvelopeTestBase.java?rev=935414&view=auto
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/java/org/apache/axiom/soap/SOAP11EnvelopeTestBase.java
(added)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/java/org/apache/axiom/soap/SOAP11EnvelopeTestBase.java
Sun Apr 18 21:18:33 2010
@@ -0,0 +1,36 @@
+/*
+ * 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.
+ */
+package org.apache.axiom.soap;
+
+import org.apache.axiom.om.OMMetaFactory;
+
+public class SOAP11EnvelopeTestBase extends SOAPEnvelopeTestBase {
+ public SOAP11EnvelopeTestBase(OMMetaFactory omMetaFactory) {
+ super(omMetaFactory, SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI);
+ }
+
+ // TODO: this should actually go to SOAPEnvelopeTestBase because it
applies equally well to SOAP 1.1 and 1.2;
+ // however, this causes a test failure in axiom-parser-tests with
SJSXP
+ // Regression test for WSCOMMONS-235 (see r567512)
+ public void testDiscardHeader() throws Exception {
+ SOAPEnvelope envelope = getTestMessage(MESSAGE);
+ envelope.getHeader().discard();
+ envelope.getBody().toStringWithConsume();
+ }
+}
Propchange:
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/java/org/apache/axiom/soap/SOAP11EnvelopeTestBase.java
------------------------------------------------------------------------------
svn:eol-style = native
Added:
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/java/org/apache/axiom/soap/SOAP12EnvelopeTestBase.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/java/org/apache/axiom/soap/SOAP12EnvelopeTestBase.java?rev=935414&view=auto
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/java/org/apache/axiom/soap/SOAP12EnvelopeTestBase.java
(added)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/java/org/apache/axiom/soap/SOAP12EnvelopeTestBase.java
Sun Apr 18 21:18:33 2010
@@ -0,0 +1,27 @@
+/*
+ * 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.
+ */
+package org.apache.axiom.soap;
+
+import org.apache.axiom.om.OMMetaFactory;
+
+public class SOAP12EnvelopeTestBase extends SOAPEnvelopeTestBase {
+ public SOAP12EnvelopeTestBase(OMMetaFactory omMetaFactory) {
+ super(omMetaFactory, SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI);
+ }
+}
Propchange:
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/java/org/apache/axiom/soap/SOAP12EnvelopeTestBase.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/test/java/org/apache/axiom/soap/impl/dom/SOAP11EnvelopeTest.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/test/java/org/apache/axiom/soap/impl/dom/SOAP11EnvelopeTest.java?rev=935414&r1=935413&r2=935414&view=diff
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/test/java/org/apache/axiom/soap/impl/dom/SOAP11EnvelopeTest.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/test/java/org/apache/axiom/soap/impl/dom/SOAP11EnvelopeTest.java
Sun Apr 18 21:18:33 2010
@@ -20,11 +20,10 @@
package org.apache.axiom.soap.impl.dom;
import org.apache.axiom.om.impl.dom.factory.OMDOMMetaFactory;
-import org.apache.axiom.soap.SOAP11Constants;
-import org.apache.axiom.soap.SOAPEnvelopeTestBase;
+import org.apache.axiom.soap.SOAP11EnvelopeTestBase;
-public class SOAP11EnvelopeTest extends SOAPEnvelopeTestBase {
+public class SOAP11EnvelopeTest extends SOAP11EnvelopeTestBase {
public SOAP11EnvelopeTest() {
- super(new OMDOMMetaFactory(),
SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI);
+ super(new OMDOMMetaFactory());
}
}
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/test/java/org/apache/axiom/soap/impl/dom/SOAP12EnvelopeTest.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/test/java/org/apache/axiom/soap/impl/dom/SOAP12EnvelopeTest.java?rev=935414&r1=935413&r2=935414&view=diff
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/test/java/org/apache/axiom/soap/impl/dom/SOAP12EnvelopeTest.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/test/java/org/apache/axiom/soap/impl/dom/SOAP12EnvelopeTest.java
Sun Apr 18 21:18:33 2010
@@ -20,11 +20,10 @@
package org.apache.axiom.soap.impl.dom;
import org.apache.axiom.om.impl.dom.factory.OMDOMMetaFactory;
-import org.apache.axiom.soap.SOAP12Constants;
-import org.apache.axiom.soap.SOAPEnvelopeTestBase;
+import org.apache.axiom.soap.SOAP12EnvelopeTestBase;
-public class SOAP12EnvelopeTest extends SOAPEnvelopeTestBase {
+public class SOAP12EnvelopeTest extends SOAP12EnvelopeTestBase {
public SOAP12EnvelopeTest() {
- super(new OMDOMMetaFactory(),
SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI);
+ super(new OMDOMMetaFactory());
}
}
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/test/java/org/apache/axiom/soap/impl/llom/SOAP11EnvelopeTest.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/test/java/org/apache/axiom/soap/impl/llom/SOAP11EnvelopeTest.java?rev=935414&r1=935413&r2=935414&view=diff
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/test/java/org/apache/axiom/soap/impl/llom/SOAP11EnvelopeTest.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/test/java/org/apache/axiom/soap/impl/llom/SOAP11EnvelopeTest.java
Sun Apr 18 21:18:33 2010
@@ -20,11 +20,10 @@
package org.apache.axiom.soap.impl.llom;
import org.apache.axiom.om.impl.llom.factory.OMLinkedListMetaFactory;
-import org.apache.axiom.soap.SOAP11Constants;
-import org.apache.axiom.soap.SOAPEnvelopeTestBase;
+import org.apache.axiom.soap.SOAP11EnvelopeTestBase;
-public class SOAP11EnvelopeTest extends SOAPEnvelopeTestBase {
+public class SOAP11EnvelopeTest extends SOAP11EnvelopeTestBase {
public SOAP11EnvelopeTest() {
- super(new OMLinkedListMetaFactory(),
SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI);
+ super(new OMLinkedListMetaFactory());
}
}
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/test/java/org/apache/axiom/soap/impl/llom/SOAP12EnvelopeTest.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/test/java/org/apache/axiom/soap/impl/llom/SOAP12EnvelopeTest.java?rev=935414&r1=935413&r2=935414&view=diff
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/test/java/org/apache/axiom/soap/impl/llom/SOAP12EnvelopeTest.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/test/java/org/apache/axiom/soap/impl/llom/SOAP12EnvelopeTest.java
Sun Apr 18 21:18:33 2010
@@ -20,11 +20,10 @@
package org.apache.axiom.soap.impl.llom;
import org.apache.axiom.om.impl.llom.factory.OMLinkedListMetaFactory;
-import org.apache.axiom.soap.SOAP12Constants;
-import org.apache.axiom.soap.SOAPEnvelopeTestBase;
+import org.apache.axiom.soap.SOAP12EnvelopeTestBase;
-public class SOAP12EnvelopeTest extends SOAPEnvelopeTestBase {
+public class SOAP12EnvelopeTest extends SOAP12EnvelopeTestBase {
public SOAP12EnvelopeTest() {
- super(new OMLinkedListMetaFactory(),
SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI);
+ super(new OMLinkedListMetaFactory());
}
}
