You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@axis.apache.org by bi...@apache.org on 2020/04/14 20:01:38 UTC
[axis-axis2-java-core] 06/12: Merge r1686090 to the 1.6 branch for
compatibility with recent Axiom versions.
This is an automated email from the ASF dual-hosted git repository.
billblough pushed a commit to branch 1_6
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git
commit f6ddc6db9c81ccb0e60c21beff4e1c4a17456556
Author: Andreas Veithen <ve...@apache.org>
AuthorDate: Sun Feb 14 21:53:25 2016 +0000
Merge r1686090 to the 1.6 branch for compatibility with recent Axiom versions.
---
.../addressing/EndpointReferenceHelperTest.java | 41 ++++++++++++----------
1 file changed, 23 insertions(+), 18 deletions(-)
diff --git a/modules/kernel/test/org/apache/axis2/addressing/EndpointReferenceHelperTest.java b/modules/kernel/test/org/apache/axis2/addressing/EndpointReferenceHelperTest.java
index 48c5db1..f161e09 100644
--- a/modules/kernel/test/org/apache/axis2/addressing/EndpointReferenceHelperTest.java
+++ b/modules/kernel/test/org/apache/axis2/addressing/EndpointReferenceHelperTest.java
@@ -33,6 +33,11 @@ import java.util.ArrayList;
import java.util.Map;
public class EndpointReferenceHelperTest extends TestCase {
+ private void compareAttributes(OMAttribute expected, OMAttribute actual) {
+ assertEquals(expected.getNamespace(), actual.getNamespace());
+ assertEquals(expected.getLocalName(), actual.getLocalName());
+ assertEquals(expected.getAttributeValue(), actual.getAttributeValue());
+ }
public void testToAndFromOMForFinalSpecEPR() throws Exception {
String address = "http://ws.apache.org/axis2";
@@ -77,19 +82,19 @@ public class EndpointReferenceHelperTest extends TestCase {
assertEquals(epr.getAddress(), deser.getAddress());
ArrayList addrAttrs = deser.getAddressAttributes();
- assertEquals(attr1, addrAttrs.get(0));
- assertEquals(attr2, addrAttrs.get(1));
+ compareAttributes(attr1, (OMAttribute)addrAttrs.get(0));
+ compareAttributes(attr2, (OMAttribute)addrAttrs.get(1));
ArrayList attrs = deser.getAttributes();
- assertEquals(attr1, attrs.get(0));
- assertEquals(attr2, attrs.get(1));
+ compareAttributes(attr1, (OMAttribute)attrs.get(0));
+ compareAttributes(attr2, (OMAttribute)attrs.get(1));
ArrayList metadata = deser.getMetaData();
assertEquals(md1, metadata.get(0));
assertEquals(md2, metadata.get(1));
ArrayList mdAttrs = deser.getMetadataAttributes();
- assertEquals(attr1, mdAttrs.get(0));
- assertEquals(attr2, mdAttrs.get(1));
+ compareAttributes(attr1, (OMAttribute)mdAttrs.get(0));
+ compareAttributes(attr2, (OMAttribute)mdAttrs.get(1));
ArrayList extelts = deser.getExtensibleElements();
assertEquals(ext1, extelts.get(0));
@@ -109,15 +114,15 @@ public class EndpointReferenceHelperTest extends TestCase {
assertEquals(attr2, addrAttrs.get(1));
attrs = deser.getAttributes();
- assertEquals(attr1, attrs.get(0));
- assertEquals(attr2, attrs.get(1));
+ compareAttributes(attr1, (OMAttribute)attrs.get(0));
+ compareAttributes(attr2, (OMAttribute)attrs.get(1));
metadata = deser.getMetaData();
assertEquals(md1, metadata.get(0));
assertEquals(md2, metadata.get(1));
mdAttrs = deser.getMetadataAttributes();
- assertEquals(attr1, mdAttrs.get(0));
- assertEquals(attr2, mdAttrs.get(1));
+ compareAttributes(attr1, (OMAttribute)mdAttrs.get(0));
+ compareAttributes(attr2, (OMAttribute)mdAttrs.get(1));
extelts = deser.getExtensibleElements();
assertEquals(ext1, extelts.get(0));
@@ -187,12 +192,12 @@ public class EndpointReferenceHelperTest extends TestCase {
assertEquals(epr.getAddress(), deser.getAddress());
ArrayList addrAttrs = deser.getAddressAttributes();
- assertEquals(attr1, addrAttrs.get(0));
- assertEquals(attr2, addrAttrs.get(1));
+ compareAttributes(attr1, (OMAttribute)addrAttrs.get(0));
+ compareAttributes(attr2, (OMAttribute)addrAttrs.get(1));
ArrayList attrs = deser.getAttributes();
- assertEquals(attr1, attrs.get(0));
- assertEquals(attr2, attrs.get(1));
+ compareAttributes(attr1, (OMAttribute)attrs.get(0));
+ compareAttributes(attr2, (OMAttribute)attrs.get(1));
//Metadata will be lost unless it is saved as an extensibility element.
ArrayList metadata = deser.getMetaData();
@@ -216,12 +221,12 @@ public class EndpointReferenceHelperTest extends TestCase {
assertEquals(epr.getAddress(), deser.getAddress());
addrAttrs = deser.getAddressAttributes();
- assertEquals(attr1, addrAttrs.get(0));
- assertEquals(attr2, addrAttrs.get(1));
+ compareAttributes(attr1, (OMAttribute)addrAttrs.get(0));
+ compareAttributes(attr2, (OMAttribute)addrAttrs.get(1));
attrs = deser.getAttributes();
- assertEquals(attr1, attrs.get(0));
- assertEquals(attr2, attrs.get(1));
+ compareAttributes(attr1, (OMAttribute)attrs.get(0));
+ compareAttributes(attr2, (OMAttribute)attrs.get(1));
//Metadata will be lost unless it is saved as an extensibility element.
metadata = deser.getMetaData();