Skip to content

Commit

Permalink
Add test cases for testng-team#2540
Browse files Browse the repository at this point in the history 
Fix testng-team#2540
  • Loading branch information
@juherr
juherr committed May 15, 2021
1 parent 4c41296 commit 74e83ae
Show file tree
Hide file tree
Showing 4 changed files with 342 additions and 55 deletions.
199 changes: 152 additions & 47 deletions core/src/main/java/org/testng/Assert.java
View file
Expand Up @@ -14,6 +14,9 @@
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import java.util.stream.StreamSupport;

import org.testng.collections.Lists;

Expand Down Expand Up @@ -1094,7 +1097,7 @@ public static void assertEquals(Collection<?> actual, Collection<?> expected) {
* @param message the assertion error message
*/
public static void assertEquals(Collection<?> actual, Collection<?> expected, String message) {
if (Objects.equals(actual, expected)) {
if (actual == expected) { // We don't use Objects.equals here because order is checked
return;
}

Expand Down Expand Up @@ -1146,7 +1149,7 @@ public static void assertEquals(Iterator<?> actual, Iterator<?> expected) {
* @param message the assertion error message
*/
public static void assertEquals(Iterator<?> actual, Iterator<?> expected, String message) {
if (Objects.equals(actual, expected)) {
if (actual == expected) { // We don't use Objects.equals here because order is checked
return;
}
if (actual == null || expected == null) {
Expand Down Expand Up @@ -1203,7 +1206,7 @@ public static void assertEquals(Iterable<?> actual, Iterable<?> expected) {
* @param message the assertion error message
*/
public static void assertEquals(Iterable<?> actual, Iterable<?> expected, String message) {
if (Objects.equals(actual, expected)) {
if (actual == expected) { // We don't use Objects.equals here because order is checked
return;
}

Expand Down Expand Up @@ -1238,7 +1241,7 @@ public static void assertEquals(Object[] actual, Object[] expected, String messa
if (message != null) {
fail(message);
} else {
fail("Arrays not equal: " + Arrays.toString(expected) + " and " + Arrays.toString(actual));
fail("Arrays not equal: expected: " + Arrays.toString(expected) + " and actual: " + Arrays.toString(actual));
}
}
if (actual.length != expected.length) {
Expand Down Expand Up @@ -1278,13 +1281,13 @@ public static void assertEquals(Object[] actual, Object[] expected, String messa
* @param message the assertion error message
*/
public static void assertEqualsNoOrder(Object[] actual, Object[] expected, String message) {
if (Arrays.equals(actual, expected)) {
if (actual == expected) { // We don't use Arrays.equals here because order is not checked
return;
}

if ((actual == null && expected != null) || (actual != null && expected == null)) {
if (actual == null || expected == null) {
failAssertNoEqual(
"Arrays not equal: " + Arrays.toString(expected) + " and " + Arrays.toString(actual),
"Arrays not equal: expected: " + Arrays.toString(expected) + " and actual: " + Arrays.toString(actual),
message);
}

Expand All @@ -1293,18 +1296,51 @@ public static void assertEqualsNoOrder(Object[] actual, Object[] expected, Strin
"Arrays do not have the same size:" + actual.length + " != " + expected.length, message);
}

List<Object> actualCollection = Lists.newArrayList();
actualCollection.addAll(Arrays.asList(actual));
List<Object> actualCollection = Lists.newArrayList(actual);
for (Object o : expected) {
actualCollection.remove(o);
}
if (actualCollection.size() != 0) {
if (!actualCollection.isEmpty()) {
failAssertNoEqual(
"Arrays not equal: " + Arrays.toString(expected) + " and " + Arrays.toString(actual),
"Arrays not equal: expected: " + Arrays.toString(expected) + " and actual: " + Arrays.toString(actual),
message);
}
}

public static void assertEqualsNoOrder(Collection<?> actual, Collection<?> expected, String message) {
List<?> actualCollection = Lists.newArrayList(actual);
for (Object o : expected) {
actualCollection.remove(o);
}
if (!actualCollection.isEmpty()) {
failAssertNoEqual(
"Collections not equal: expected: " + expected + " and actual: " + actual,
message);
}
}

public static void assertEqualsNoOrder(Iterator<?> actual, Iterator<?> expected, String message) {
List<?> actualCollection = Lists.newArrayList(actual);
while (expected.hasNext()) {
actualCollection.remove(expected.next());
}
if (!actualCollection.isEmpty()) {
failAssertNoEqual(
"Iterators not equal: expected: " + toString(expected) + " and actual: " + toString(actual),
message);
}
}

private static String toString(Iterator<?> iterator) {
if (iterator == null) {
return null;
}
Iterable<Object> iterable = () -> (Iterator<Object>) iterator;
return StreamSupport.stream(iterable.spliterator(), false)
.map(Object::toString)
.collect(Collectors.joining(", "));
}

private static void failAssertNoEqual(String defaultMessage, String message) {
if (message != null) {
fail(message);
Expand Down Expand Up @@ -1337,6 +1373,14 @@ public static void assertEqualsNoOrder(Object[] actual, Object[] expected) {
assertEqualsNoOrder(actual, expected, null);
}

public static void assertEqualsNoOrder(Collection<?> actual, Collection<?> expected) {
assertEqualsNoOrder(actual, expected, null);
}

public static void assertEqualsNoOrder(Iterator<?> actual, Iterator<?> expected) {
assertEqualsNoOrder(actual, expected, null);
}

/**
* Asserts that two sets are equal.
*
Expand All @@ -1350,8 +1394,43 @@ public static void assertEquals(Set<?> actual, Set<?> expected) {
/**
* returns not equal reason or null if equal
*/
private static String getNotEqualReason(Collection<?> actual, Collection<?> expected) {
if (actual == expected) { // We don't use Arrays.equals here because order is checked
return null;
}

if (actual == null || expected == null) {
// Keep the back compatible
return "Collections not equal: expected: " + expected + " and actual: " + actual;
}

if (!Objects.equals(actual, expected)) {
return "Collections differ: expected " + expected + " but got " + actual;
}

return getNotEqualReason(actual.iterator(), expected.iterator());
}

private static String getNotEqualReason(Iterator<?> actual, Iterator<?> expected) {
if (actual == expected) { // We don't use Arrays.equals here because order is checked
return null;
}

if (actual == null || expected == null) {
// Keep the back compatible
return "Iterators not equal: expected: " + toString(expected) + " and actual: " + toString(actual);
}

while (actual.hasNext() && expected.hasNext()) {
if (!Objects.equals(actual.next(), expected.next())) {
return "Iterators not same element order: expected: " + toString(expected) + " and actual: " + toString(actual);
}
}
return null;
}

private static String getNotEqualReason(Set<?> actual, Set<?> expected) {
if (Objects.equals(actual, expected)) {
if (actual == expected) { // We don't use Arrays.equals here because order is checked
return null;
}

Expand All @@ -1363,7 +1442,7 @@ private static String getNotEqualReason(Set<?> actual, Set<?> expected) {
if (!Objects.equals(actual, expected)) {
return "Sets differ: expected " + expected + " but got " + actual;
}
return null;
return getNotEqualReason(actual.iterator(), expected.iterator());
}

/**
Expand Down Expand Up @@ -1555,64 +1634,90 @@ public static void assertNotEquals(Object actual, Object expected, String messag
assertNotEqualsImpl(actual, expected, message);
}

public static void assertNotEquals(Object actual1, Object actual2) {
assertNotEquals(actual1, actual2, null);
public static void assertNotEquals(Object[] actual, Object[] expected, String message) {
assertArrayNotEquals(actual, expected, message);
}

public static void assertNotEquals(Iterator<?> actual, Iterator<?> expected, String message) {
String notEqualReason = getNotEqualReason(actual, expected);
if (notEqualReason == null) {
Assert.fail(format(actual, expected, message, false));
}
}

public static void assertNotEquals(Collection<?> actual, Collection<?> expected, String message) {
String notEqualReason = getNotEqualReason(actual, expected);
if (notEqualReason == null) {
Assert.fail(format(actual, expected, message, false));
}
}

static void assertNotEquals(String actual1, String actual2, String message) {
assertNotEquals((Object) actual1, (Object) actual2, message);
public static void assertNotEquals(Object actual, Object expected) {
assertNotEquals(actual, expected, null);
}

static void assertNotEquals(String actual1, String actual2) {
assertNotEquals(actual1, actual2, null);
public static void assertNotEquals(Collection<?> actual, Collection<?> expected) {
assertNotEquals(actual, expected, null);
}

static void assertNotEquals(long actual1, long actual2, String message) {
assertNotEquals(Long.valueOf(actual1), Long.valueOf(actual2), message);
public static void assertNotEquals(Iterator<?> actual, Iterator<?> expected) {
assertNotEquals(actual, expected, null);
}

static void assertNotEquals(long actual1, long actual2) {
assertNotEquals(actual1, actual2, null);
static void assertNotEquals(String actual, String expected, String message) {
assertNotEquals((Object) actual, (Object) expected, message);
}

static void assertNotEquals(boolean actual1, boolean actual2, String message) {
assertNotEquals(Boolean.valueOf(actual1), Boolean.valueOf(actual2), message);
static void assertNotEquals(String actual, String expectec) {
assertNotEquals(actual, expectec, null);
}

static void assertNotEquals(boolean actual1, boolean actual2) {
assertNotEquals(actual1, actual2, null);
static void assertNotEquals(long actual, long expected, String message) {
assertNotEquals(Long.valueOf(actual), Long.valueOf(expected), message);
}

static void assertNotEquals(byte actual1, byte actual2, String message) {
assertNotEquals(Byte.valueOf(actual1), Byte.valueOf(actual2), message);
static void assertNotEquals(long actual, long expected) {
assertNotEquals(actual, expected, null);
}

static void assertNotEquals(byte actual1, byte actual2) {
assertNotEquals(actual1, actual2, null);
static void assertNotEquals(boolean actual, boolean expected, String message) {
assertNotEquals(Boolean.valueOf(actual), Boolean.valueOf(expected), message);
}

static void assertNotEquals(char actual1, char actual2, String message) {
assertNotEquals(Character.valueOf(actual1), Character.valueOf(actual2), message);
static void assertNotEquals(boolean actual, boolean expected) {
assertNotEquals(actual, expected, null);
}

static void assertNotEquals(char actual1, char actual2) {
assertNotEquals(actual1, actual2, null);
static void assertNotEquals(byte actual, byte expected, String message) {
assertNotEquals(Byte.valueOf(actual), Byte.valueOf(expected), message);
}

static void assertNotEquals(short actual1, short actual2, String message) {
assertNotEquals(Short.valueOf(actual1), Short.valueOf(actual2), message);
static void assertNotEquals(byte actual, byte expected) {
assertNotEquals(actual, expected, null);
}

static void assertNotEquals(short actual1, short actual2) {
assertNotEquals(actual1, actual2, null);
static void assertNotEquals(char actual, char expected, String message) {
assertNotEquals(Character.valueOf(actual), Character.valueOf(expected), message);
}

static void assertNotEquals(int actual1, int actual2, String message) {
assertNotEquals(Integer.valueOf(actual1), Integer.valueOf(actual2), message);
static void assertNotEquals(char actual, char expected) {
assertNotEquals(actual, expected, null);
}

static void assertNotEquals(short actual, short expected, String message) {
assertNotEquals(Short.valueOf(actual), Short.valueOf(expected), message);
}

static void assertNotEquals(int actual1, int actual2) {
assertNotEquals(actual1, actual2, null);
static void assertNotEquals(short actual, short expected) {
assertNotEquals(actual, expected, null);
}

static void assertNotEquals(int actual, int expected, String message) {
assertNotEquals(Integer.valueOf(actual), Integer.valueOf(expected), message);
}

static void assertNotEquals(int actual, int expected) {
assertNotEquals(actual, expected, null);
}

public static void assertNotEquals(float actual, float expected, float delta, String message) {
Expand All @@ -1621,8 +1726,8 @@ public static void assertNotEquals(float actual, float expected, float delta, St
}
}

public static void assertNotEquals(float actual1, float actual2, float delta) {
assertNotEquals(actual1, actual2, delta, null);
public static void assertNotEquals(float actual, float expected, float delta) {
assertNotEquals(actual, expected, delta, null);
}

public static void assertNotEquals(double actual, double expected, double delta, String message) {
Expand Down Expand Up @@ -1675,8 +1780,8 @@ public static void assertNotEqualsDeep(Map<?, ?> actual, Map<?, ?> expected, Str
}
}

public static void assertNotEquals(double actual1, double actual2, double delta) {
assertNotEquals(actual1, actual2, delta, null);
public static void assertNotEquals(double actual, double expected, double delta) {
assertNotEquals(actual, expected, delta, null);
}

/**
Expand Down
15 changes: 9 additions & 6 deletions core/src/main/java/org/testng/collections/Lists.java
View file
@@ -1,11 +1,6 @@
package org.testng.collections;

import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.LinkedList;
import java.util.List;
import java.util.*;
import java.util.function.BiPredicate;
import java.util.stream.Collectors;

Expand All @@ -29,6 +24,14 @@ public static <K> List<K> newArrayList(Collection<K> c) {
return new ArrayList<>(c);
}

public static <K> List<K> newArrayList(Iterator<K> c) {
List<K> result = new ArrayList<>();
while (c.hasNext()) {
result.add(c.next());
}
return result;
}

@SafeVarargs
public static <K> List<K> newArrayList(K... elements) {
List<K> result = new ArrayList<>();
Expand Down
2 changes: 1 addition & 1 deletion core/src/test/java/org/testng/AssertTest.java
View file
Expand Up @@ -353,7 +353,7 @@ public void testAssertEqualsNoOrderWithDuplicate() {

@Test
public void testAssertEqualsNoOrderWithBothNull() {
Assert.assertEqualsNoOrder(null, null);
Assert.assertEqualsNoOrder((Object[]) null, (Object[]) null);
}

@Test(expectedExceptions = AssertionError.class)
Expand Down

0 comments on commit 74e83ae

Please sign in to comment.