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 2016/10/09 20:29:03 UTC
svn commit: r1764006 - in
/webservices/axiom/trunk/testing/axiom-truth/src/main/java/org/apache/axiom/truth:
AbstractOMContainerSubject.java OMAttributeSubject.java OMElementSubject.java
Author: veithen
Date: Sun Oct 9 20:29:02 2016
New Revision: 1764006
URL: http://svn.apache.org/viewvc?rev=1764006&view=rev
Log:
Replaces usages of deprecated methods.
Modified:
webservices/axiom/trunk/testing/axiom-truth/src/main/java/org/apache/axiom/truth/AbstractOMContainerSubject.java
webservices/axiom/trunk/testing/axiom-truth/src/main/java/org/apache/axiom/truth/OMAttributeSubject.java
webservices/axiom/trunk/testing/axiom-truth/src/main/java/org/apache/axiom/truth/OMElementSubject.java
Modified: webservices/axiom/trunk/testing/axiom-truth/src/main/java/org/apache/axiom/truth/AbstractOMContainerSubject.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-truth/src/main/java/org/apache/axiom/truth/AbstractOMContainerSubject.java?rev=1764006&r1=1764005&r2=1764006&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-truth/src/main/java/org/apache/axiom/truth/AbstractOMContainerSubject.java (original)
+++ webservices/axiom/trunk/testing/axiom-truth/src/main/java/org/apache/axiom/truth/AbstractOMContainerSubject.java Sun Oct 9 20:29:02 2016
@@ -30,7 +30,7 @@ public abstract class AbstractOMContaine
}
public final void hasNumberOfChildren(int expected) {
- OMNode child = getSubject().getFirstOMChild();
+ OMNode child = actual().getFirstOMChild();
int actual = 0;
while (child != null) {
actual++;
Modified: webservices/axiom/trunk/testing/axiom-truth/src/main/java/org/apache/axiom/truth/OMAttributeSubject.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-truth/src/main/java/org/apache/axiom/truth/OMAttributeSubject.java?rev=1764006&r1=1764005&r2=1764006&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-truth/src/main/java/org/apache/axiom/truth/OMAttributeSubject.java (original)
+++ webservices/axiom/trunk/testing/axiom-truth/src/main/java/org/apache/axiom/truth/OMAttributeSubject.java Sun Oct 9 20:29:02 2016
@@ -30,13 +30,13 @@ public final class OMAttributeSubject ex
}
public void hasValue(String expected) {
- if (!Objects.equal(getSubject().getAttributeValue(), expected)) {
+ if (!Objects.equal(actual().getAttributeValue(), expected)) {
fail("has value", expected);
}
}
public void hasPrefix(String expected) {
- if (!Objects.equal(getSubject().getPrefix(), expected)) {
+ if (!Objects.equal(actual().getPrefix(), expected)) {
fail("has prefix", expected);
}
}
Modified: webservices/axiom/trunk/testing/axiom-truth/src/main/java/org/apache/axiom/truth/OMElementSubject.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-truth/src/main/java/org/apache/axiom/truth/OMElementSubject.java?rev=1764006&r1=1764005&r2=1764006&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-truth/src/main/java/org/apache/axiom/truth/OMElementSubject.java (original)
+++ webservices/axiom/trunk/testing/axiom-truth/src/main/java/org/apache/axiom/truth/OMElementSubject.java Sun Oct 9 20:29:02 2016
@@ -31,13 +31,13 @@ public final class OMElementSubject exte
}
public void hasNoNamespaceDeclarations() {
- if (getSubject().getAllDeclaredNamespaces().hasNext()) {
+ if (actual().getAllDeclaredNamespaces().hasNext()) {
fail("has no namespace declarations");
}
}
public void hasNamespaceDeclaration(OMNamespace ns) {
- for (Iterator<OMNamespace> it = getSubject().getAllDeclaredNamespaces(); it.hasNext(); ) {
+ for (Iterator<OMNamespace> it = actual().getAllDeclaredNamespaces(); it.hasNext(); ) {
if (it.next().equals(ns)) {
return;
}