External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-20 10:40:06 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Tests: Avoid Illegal reflective access in deep copy test. (#11079)

Browse source 
* check that problem is only the recursive test

* fix ArrayList being recursed into.
This commit is contained in:
Susucre 2023-09-06 04:26:52 +02:00 • committed by GitHub
parent 3129064163
commit e247d27eb0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

21
Mage.Verify/src/test/java/mage/verify/VerifyCardDataTest.java
View file

@ -1714,6 +1714,22 @@ public class VerifyCardDataTest {
fail(originalCard, "copy", "not same class for " + msg + "<" + obj1.getClass() + ">" + "]"); fail(originalCard, "copy", "not same class for " + msg + "<" + obj1.getClass() + ">" + "]");
return; return;
} }
if (class1.equals(ArrayList.class)) {
List list1 = (ArrayList) obj1;
List list2 = (ArrayList) obj2;
Iterator it1 = list1.iterator();
Iterator it2 = list2.iterator();
int i = 0;
while (it1.hasNext() && it2.hasNext()) {
compareClassRecursive(it1.next(), it2.next(), originalCard, msg + "<" + obj1.getClass() + ">" + "[" + i++ + "]", maxDepth - 1, alreadyChecked, useRecursive);
}
if (it1.hasNext() || it2.hasNext()) {
fail(originalCard, "copy", "not same size for (ArrayList) " + msg + "]");
}
return;
}
List<Field> ability2Fields = Arrays.stream(class2.getDeclaredFields()).collect(Collectors.toList()); List<Field> ability2Fields = Arrays.stream(class2.getDeclaredFields()).collect(Collectors.toList());
// Special fields for CardImpl.class // Special fields for CardImpl.class
@ -1727,6 +1743,7 @@ public class VerifyCardDataTest {
int fieldIndex = 0; int fieldIndex = 0;
for (Field field1 : class1.getDeclaredFields()) { for (Field field1 : class1.getDeclaredFields()) {
Field field2 = ability2Fields.get(fieldIndex); Field field2 = ability2Fields.get(fieldIndex);
field1.setAccessible(true); field1.setAccessible(true);
field2.setAccessible(true); field2.setAccessible(true);
try { try {
@ -1805,7 +1822,7 @@ public class VerifyCardDataTest {
compareClassRecursive(it1.next(), it2.next(), originalCard, msg + "<" + obj1.getClass() + ">" + "[" + i++ + "]", maxDepth - 1, alreadyChecked, useRecursive); compareClassRecursive(it1.next(), it2.next(), originalCard, msg + "<" + obj1.getClass() + ">" + "[" + i++ + "]", maxDepth - 1, alreadyChecked, useRecursive);
} }
if (it1.hasNext() || it2.hasNext()) { if (it1.hasNext() || it2.hasNext()) {
fail(originalCard, "copy", "not same size for " + msg + "]"); fail(originalCard, "copy", "not same size for (Collection) " + msg + "]");
} }
} else if (obj1 instanceof Map) { } else if (obj1 instanceof Map) {
Map map1 = (Map) obj1; Map map1 = (Map) obj1;
@ -1814,7 +1831,7 @@ public class VerifyCardDataTest {
compareClassRecursive(el1, ((Map<?, ?>) obj2).get(i), originalCard, msg + "<" + obj1.getClass() + ">" + ".(" + i + ")", maxDepth - 1, alreadyChecked, useRecursive); compareClassRecursive(el1, ((Map<?, ?>) obj2).get(i), originalCard, msg + "<" + obj1.getClass() + ">" + ".(" + i + ")", maxDepth - 1, alreadyChecked, useRecursive);
}); });
if (map1.size() != map2.size()) { if (map1.size() != map2.size()) {
fail(originalCard, "copy", "not same size for " + msg + "]"); fail(originalCard, "copy", "not same size for (Map) " + msg + "]");
} }
} }
} }