Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjmisinco2017-08-31 17:57:05 +0000
committerjmisinco2017-08-31 18:02:17 +0000
commit33813d41e1c1d78c0e9a35f569bca982774ae3e4 (patch)
tree739d2185869b4950dabb47ebfcda394e09cf4075
parentf407515d8d28ba9d0c216738b541731cd6c830ec (diff)
downloadorg.eclipse.osee-33813d41e1c1d78c0e9a35f569bca982774ae3e4.tar.gz
org.eclipse.osee-33813d41e1c1d78c0e9a35f569bca982774ae3e4.tar.xz
org.eclipse.osee-33813d41e1c1d78c0e9a35f569bca982774ae3e4.zip
bug[ats_TW1783]: List OR checkgroup has act / exp backwards
-rw-r--r--plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/DiscreteElement.java16
1 files changed, 8 insertions, 8 deletions
diff --git a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/DiscreteElement.java b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/DiscreteElement.java
index 0dffac83a86..42025940d32 100644
--- a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/DiscreteElement.java
+++ b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/DiscreteElement.java
@@ -1360,13 +1360,13 @@ public abstract class DiscreteElement<T extends Comparable<T>> extends Element i
* <li><b>True </b> used to get a pass iff the item is in the list.</li>
* <li><b>False </b> used to get a pass iff the item is not in the list.</li>
* </ul>
- * @param value The EnumBase object to check for.
+ * @param actual The EnumBase object to check for.
* @param list The array of EnumBase objects to look through.
* @return A CheckGroup object that describes all comparisons made and outcomes.
*/
- private CheckGroup inList(ITestAccessor accessor, boolean isInList, T value, T[] list, long elapsedTime) {
+ private CheckGroup inList(ITestAccessor accessor, boolean isInList, T actual, T[] list, long elapsedTime) {
accessor.getLogger().methodCalledOnObject(accessor, this.getFullName(),
- new MethodFormatter().add(isInList).add(value).add(list), this.getMessage());
+ new MethodFormatter().add(isInList).add(actual).add(list), this.getMessage());
CheckGroup checkGroup;
final String not = "Not ";
@@ -1375,18 +1375,18 @@ public abstract class DiscreteElement<T extends Comparable<T>> extends Element i
if (isInList) {
checkGroup = new CheckGroup(Operation.OR, this.getFullName()); // Pass if at least one item
// matches
- for (T val : list) {
+ for (T expected : list) {
// Check if current item in the list matches.
- checkGroup.add(new CheckPoint("List Item: " + i, value.toString(), val.toString(), val.equals(value),
+ checkGroup.add(new CheckPoint("List Item: " + i, expected.toString(), actual.toString(), expected.equals(actual),
elapsedTime));
i++;
}
} else {
checkGroup = new CheckGroup(Operation.AND, this.getFullName()); // Pass iff none of the
// items match
- for (T val : list) {
- checkGroup.add(new CheckPoint("List Item: " + i, not + value.toString(), val.toString(),
- !val.equals(value), elapsedTime));
+ for (T expected : list) {
+ checkGroup.add(new CheckPoint("List Item: " + i, not + expected.toString(), actual.toString(),
+ !expected.equals(actual), elapsedTime));
i++;
}
}

Back to the top