Skip to content
This repository has been archived by the owner on May 12, 2021. It is now read-only.

ODE-1074: Change the method name "contains" to "find". #7

Merged
merged 1 commit into from
May 4, 2018
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ public Boolean visitMap(Object obj, Object other) {
Set ks2 = m2.keySet();
for (Object k1 : ks1){
st.push(k1.toString());
Object k2 = contains(ks2, k1);
Object k2 = find(ks2, k1);
if (k2 == null){
if (!logFalseThrough){
__log.debug("Unequal in Map: cant find key. " + st + "\n missing key: " + k1);
Expand Down Expand Up @@ -175,7 +175,7 @@ public Boolean visitSet(Object obj, Object other){
while (i1.hasNext()){
Object o1 = i1.next();
st.push(":" + o1.getClass().getSimpleName());
if (contains(c2, o1) == null) {
if (find(c2, o1) == null) {
if (!logFalseThrough){
__log.debug("Unequal in Set: Object mismatch. " + st +
"\n" + "can't find " + o1);
Expand All @@ -188,7 +188,7 @@ public Boolean visitSet(Object obj, Object other){
return true;
}

private Object contains(Collection c, Object t1) {
private Object find(Collection c, Object t1) {
Iterator itor = c.iterator();
Object t2;
logFalseThrough = true;
Expand Down