You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by ve...@apache.org on 2015/06/14 21:19:00 UTC
svn commit: r1685448 - in
/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om:
OMTestSuiteBuilder.java sourcedelement/TestAddAttribute.java
sourcedelement/TestGetAttribute.java
sourcedelement/TestGetAttributeValue.java
Author: veithen
Date: Sun Jun 14 19:19:00 2015
New Revision: 1685448
URL: http://svn.apache.org/r1685448
Log:
Add more tests that check that various operations on attributes work as expected on OMSourcedElement instances.
Added:
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestAddAttribute.java (with props)
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestGetAttribute.java (with props)
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestGetAttributeValue.java (with props)
Modified:
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/OMTestSuiteBuilder.java
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/OMTestSuiteBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/OMTestSuiteBuilder.java?rev=1685448&r1=1685447&r2=1685448&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/OMTestSuiteBuilder.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/OMTestSuiteBuilder.java Sun Jun 14 19:19:00 2015
@@ -509,6 +509,9 @@ public class OMTestSuiteBuilder extends
addTest(new org.apache.axiom.ts.om.sourcedelement.TestHasName(metaFactory, variant, qname));
}
}
+ for (AddAttributeStrategy strategy : getInstances(AddAttributeStrategy.class)) {
+ addTest(new org.apache.axiom.ts.om.sourcedelement.TestAddAttribute(metaFactory, strategy));
+ }
addTest(new org.apache.axiom.ts.om.sourcedelement.TestByteArrayDS(metaFactory));
addTest(new org.apache.axiom.ts.om.sourcedelement.TestCharArrayDS(metaFactory));
addTest(new org.apache.axiom.ts.om.sourcedelement.TestCloneNonDestructive(metaFactory, true));
@@ -518,6 +521,8 @@ public class OMTestSuiteBuilder extends
addTest(new org.apache.axiom.ts.om.sourcedelement.TestComplete(metaFactory));
addTest(new org.apache.axiom.ts.om.sourcedelement.TestExpand(metaFactory));
addTest(new org.apache.axiom.ts.om.sourcedelement.TestGetAllAttributes(metaFactory));
+ addTest(new org.apache.axiom.ts.om.sourcedelement.TestGetAttribute(metaFactory));
+ addTest(new org.apache.axiom.ts.om.sourcedelement.TestGetAttributeValue(metaFactory));
addTest(new org.apache.axiom.ts.om.sourcedelement.TestGetDocumentFromBuilder(metaFactory));
addTest(new org.apache.axiom.ts.om.sourcedelement.TestGetNamespaceNormalized(metaFactory));
addTest(new org.apache.axiom.ts.om.sourcedelement.TestGetNamespaceNormalized2(metaFactory));
Added: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestAddAttribute.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestAddAttribute.java?rev=1685448&view=auto
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestAddAttribute.java (added)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestAddAttribute.java Sun Jun 14 19:19:00 2015
@@ -0,0 +1,65 @@
+/*
+ * 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.ts.om.sourcedelement;
+
+import static org.apache.axiom.truth.AxiomTestVerb.ASSERT;
+
+import java.util.Iterator;
+
+import javax.xml.namespace.QName;
+
+import org.apache.axiom.om.OMAttribute;
+import org.apache.axiom.om.OMFactory;
+import org.apache.axiom.om.OMMetaFactory;
+import org.apache.axiom.om.OMSourcedElement;
+import org.apache.axiom.ts.AxiomTestCase;
+import org.apache.axiom.ts.dimension.AddAttributeStrategy;
+import org.apache.axiom.ts.om.sourcedelement.util.PullOMDataSource;
+
+/**
+ * Tests that adding an attribute to an {@link OMSourcedElement} overrides a corresponding attribute
+ * that may be produced during expansion.
+ */
+public class TestAddAttribute extends AxiomTestCase {
+ private final AddAttributeStrategy strategy;
+
+ public TestAddAttribute(OMMetaFactory metaFactory, AddAttributeStrategy strategy) {
+ super(metaFactory);
+ this.strategy = strategy;
+ strategy.addTestParameters(this);
+ }
+
+ @Override
+ protected void runTest() throws Throwable {
+ OMFactory factory = metaFactory.getOMFactory();
+ OMSourcedElement element = factory.createOMElement(
+ new PullOMDataSource("<root attr='orgvalue'><child/></root>"), "root", null);
+ // Add an attribute before expansion
+ OMAttribute attr = strategy.addAttribute(element, "attr", null, "newvalue");
+ // Force expansion; this not overwrite the attribute we just added
+ ASSERT.that(element.getFirstOMChild()).isNotNull();
+ OMAttribute attr2 = element.getAttribute(new QName("attr"));
+ ASSERT.that(attr2).isSameAs(attr);
+ ASSERT.that(attr2.getAttributeValue()).isEqualTo("newvalue");
+ Iterator it = element.getAllAttributes();
+ ASSERT.that(it.hasNext()).isTrue();
+ ASSERT.that(it.next()).isSameAs(attr);
+ ASSERT.that(it.hasNext()).isFalse();
+ }
+}
Propchange: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestAddAttribute.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestGetAttribute.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestGetAttribute.java?rev=1685448&view=auto
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestGetAttribute.java (added)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestGetAttribute.java Sun Jun 14 19:19:00 2015
@@ -0,0 +1,51 @@
+/*
+ * 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.ts.om.sourcedelement;
+
+import static org.apache.axiom.truth.AxiomTestVerb.ASSERT;
+
+import javax.xml.namespace.QName;
+
+import org.apache.axiom.om.OMAttribute;
+import org.apache.axiom.om.OMElement;
+import org.apache.axiom.om.OMFactory;
+import org.apache.axiom.om.OMMetaFactory;
+import org.apache.axiom.om.OMSourcedElement;
+import org.apache.axiom.ts.AxiomTestCase;
+import org.apache.axiom.ts.om.sourcedelement.util.PullOMDataSource;
+
+/**
+ * Tests that {@link OMElement#getAttribute(QName)} causes expansion of {@link OMSourcedElement}
+ * instances.
+ */
+public class TestGetAttribute extends AxiomTestCase {
+ public TestGetAttribute(OMMetaFactory metaFactory) {
+ super(metaFactory);
+ }
+
+ @Override
+ protected void runTest() throws Throwable {
+ OMFactory factory = metaFactory.getOMFactory();
+ OMSourcedElement element = factory.createOMElement(
+ new PullOMDataSource("<root attr='value'/>"), "root", null);
+ OMAttribute attr = element.getAttribute(new QName("attr"));
+ ASSERT.that(attr).isNotNull();
+ ASSERT.that(attr.getLocalName()).isEqualTo("attr");
+ }
+}
Propchange: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestGetAttribute.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestGetAttributeValue.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestGetAttributeValue.java?rev=1685448&view=auto
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestGetAttributeValue.java (added)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestGetAttributeValue.java Sun Jun 14 19:19:00 2015
@@ -0,0 +1,48 @@
+/*
+ * 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.ts.om.sourcedelement;
+
+import static org.apache.axiom.truth.AxiomTestVerb.ASSERT;
+
+import javax.xml.namespace.QName;
+
+import org.apache.axiom.om.OMElement;
+import org.apache.axiom.om.OMFactory;
+import org.apache.axiom.om.OMMetaFactory;
+import org.apache.axiom.om.OMSourcedElement;
+import org.apache.axiom.ts.AxiomTestCase;
+import org.apache.axiom.ts.om.sourcedelement.util.PullOMDataSource;
+
+/**
+ * Tests that {@link OMElement#getAttributeValue(QName)} causes expansion of
+ * {@link OMSourcedElement} instances.
+ */
+public class TestGetAttributeValue extends AxiomTestCase {
+ public TestGetAttributeValue(OMMetaFactory metaFactory) {
+ super(metaFactory);
+ }
+
+ @Override
+ protected void runTest() throws Throwable {
+ OMFactory factory = metaFactory.getOMFactory();
+ OMSourcedElement element = factory.createOMElement(
+ new PullOMDataSource("<root attr='value'/>"), "root", null);
+ ASSERT.that(element.getAttributeValue(new QName("attr"))).isEqualTo("value");
+ }
+}
Propchange: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestGetAttributeValue.java
------------------------------------------------------------------------------
svn:eol-style = native