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 2014/05/31 11:20:57 UTC
svn commit: r1598842 - in
/webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts:
soap/ soap/headerblock/ soap12/headerblock/
Author: veithen
Date: Sat May 31 09:20:57 2014
New Revision: 1598842
URL: http://svn.apache.org/r1598842
Log:
Unify TestSetMustUnderstandBoolean and TestSetRelay.
Added:
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestSetBooleanAttribute.java (contents, props changed)
- copied, changed from r1598841, webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestSetMustUnderstandBoolean.java
Removed:
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestSetMustUnderstandBoolean.java
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/headerblock/TestSetRelay.java
Modified:
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/BooleanAttribute.java
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPTestSuiteBuilder.java
Modified: webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/BooleanAttribute.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/BooleanAttribute.java?rev=1598842&r1=1598841&r2=1598842&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/BooleanAttribute.java (original)
+++ webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/BooleanAttribute.java Sat May 31 09:20:57 2014
@@ -40,6 +40,10 @@ public interface BooleanAttribute {
public boolean getValue(SOAPHeaderBlock headerBlock) {
return headerBlock.getMustUnderstand();
}
+
+ public void setValue(SOAPHeaderBlock headerBlock, boolean value) {
+ headerBlock.setMustUnderstand(value);
+ }
};
BooleanAttribute RELAY = new BooleanAttribute() {
@@ -54,6 +58,10 @@ public interface BooleanAttribute {
public boolean getValue(SOAPHeaderBlock headerBlock) {
return headerBlock.getRelay();
}
+
+ public void setValue(SOAPHeaderBlock headerBlock, boolean value) {
+ headerBlock.setRelay(value);
+ }
};
/**
@@ -80,4 +88,14 @@ public interface BooleanAttribute {
* @return the value returned by the getter method
*/
boolean getValue(SOAPHeaderBlock headerBlock);
+
+ /**
+ * Invoke the setter method for this attribute on the given {@link SOAPHeaderBlock}.
+ *
+ * @param headerBlock
+ * the heaer block
+ * @param value
+ * the value to pass to the setter
+ */
+ void setValue(SOAPHeaderBlock headerBlock, boolean value);
}
Modified: webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPTestSuiteBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPTestSuiteBuilder.java?rev=1598842&r1=1598841&r2=1598842&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPTestSuiteBuilder.java (original)
+++ webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPTestSuiteBuilder.java Sat May 31 09:20:57 2014
@@ -223,6 +223,8 @@ public class SOAPTestSuiteBuilder extend
addTest(new org.apache.axiom.ts.soap.headerblock.TestGetBooleanAttributeDefault(metaFactory, spec, attribute));
addTest(new org.apache.axiom.ts.soap.headerblock.TestGetBooleanAttributeInvalid(metaFactory, spec, attribute, "invalid"));
addTest(new org.apache.axiom.ts.soap.headerblock.TestGetBooleanAttributeInvalid(metaFactory, spec, attribute, "TRUE"));
+ addTest(new org.apache.axiom.ts.soap.headerblock.TestSetBooleanAttribute(metaFactory, spec, attribute, true));
+ addTest(new org.apache.axiom.ts.soap.headerblock.TestSetBooleanAttribute(metaFactory, spec, attribute, false));
}
}
if (supportsOMSourcedElement) {
@@ -231,8 +233,6 @@ public class SOAPTestSuiteBuilder extend
addTest(new org.apache.axiom.ts.soap.headerblock.TestGetMustUnderstand(metaFactory, spec));
addTest(new org.apache.axiom.ts.soap.headerblock.TestGetRole(metaFactory, spec));
addTest(new org.apache.axiom.ts.soap.headerblock.TestGetVersion(metaFactory, spec));
- addTest(new org.apache.axiom.ts.soap.headerblock.TestSetMustUnderstandBoolean(metaFactory, spec, true));
- addTest(new org.apache.axiom.ts.soap.headerblock.TestSetMustUnderstandBoolean(metaFactory, spec, false));
for (int i=0; i<booleanLiterals.length; i++) {
addTest(new org.apache.axiom.ts.soap.headerblock.TestSetMustUnderstandString(metaFactory, spec, booleanLiterals[i]));
}
@@ -341,8 +341,6 @@ public class SOAPTestSuiteBuilder extend
}
addTest(new org.apache.axiom.ts.soap12.headerblock.TestGetRelayWithParser(metaFactory));
addTest(new org.apache.axiom.ts.soap12.headerblock.TestGetRoleWithParser(metaFactory));
- addTest(new org.apache.axiom.ts.soap12.headerblock.TestSetRelay(metaFactory, true));
- addTest(new org.apache.axiom.ts.soap12.headerblock.TestSetRelay(metaFactory, false));
addTest(new org.apache.axiom.ts.soap12.mtom.TestGetXMLStreamReaderMTOMEncoded(metaFactory, true));
addTest(new org.apache.axiom.ts.soap12.mtom.TestGetXMLStreamReaderMTOMEncoded(metaFactory, false));
}
Copied: webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestSetBooleanAttribute.java (from r1598841, webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestSetMustUnderstandBoolean.java)
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestSetBooleanAttribute.java?p2=webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestSetBooleanAttribute.java&p1=webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestSetMustUnderstandBoolean.java&r1=1598841&r2=1598842&rev=1598842&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestSetMustUnderstandBoolean.java (original)
+++ webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestSetBooleanAttribute.java Sat May 31 09:20:57 2014
@@ -23,30 +23,29 @@ import java.util.Iterator;
import org.apache.axiom.om.OMAttribute;
import org.apache.axiom.om.OMMetaFactory;
import org.apache.axiom.om.OMNamespace;
-import org.apache.axiom.soap.SOAPConstants;
import org.apache.axiom.soap.SOAPHeaderBlock;
+import org.apache.axiom.ts.soap.BooleanAttribute;
import org.apache.axiom.ts.soap.SOAPSpec;
-import org.apache.axiom.ts.soap.SOAPTestCase;
-public class TestSetMustUnderstandBoolean extends SOAPTestCase {
+public class TestSetBooleanAttribute extends BooleanAttributeTestCase {
private final boolean value;
- public TestSetMustUnderstandBoolean(OMMetaFactory metaFactory, SOAPSpec spec, boolean value) {
- super(metaFactory, spec);
+ public TestSetBooleanAttribute(OMMetaFactory metaFactory, SOAPSpec spec, BooleanAttribute attribute, boolean value) {
+ super(metaFactory, spec, attribute);
addTestParameter("value", value);
this.value = value;
}
protected void runTest() throws Throwable {
SOAPHeaderBlock soapHeaderBlock = createSOAPHeaderBlock();
- soapHeaderBlock.setMustUnderstand(value);
- assertEquals("getMustUnderstand return value", value, soapHeaderBlock.getMustUnderstand());
+ attribute.setValue(soapHeaderBlock, value);
+ assertEquals(value, attribute.getValue(soapHeaderBlock));
Iterator it = soapHeaderBlock.getAllAttributes();
assertTrue(it.hasNext());
OMAttribute att = (OMAttribute)it.next();
OMNamespace ns = att.getNamespace();
assertEquals(spec.getEnvelopeNamespaceURI(), ns.getNamespaceURI());
- assertEquals(SOAPConstants.ATTR_MUSTUNDERSTAND, att.getLocalName());
+ assertEquals(attribute.getName(), att.getLocalName());
assertEquals(spec.getCanonicalRepresentation(value), att.getAttributeValue());
assertFalse(it.hasNext());
}
Propchange: webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestSetBooleanAttribute.java
------------------------------------------------------------------------------
svn:eol-style = native