diff --git a/src/test/java/it/unibz/inf/isochrone/network/ComparisonTest.java b/src/test/java/it/unibz/inf/isochrone/network/ComparisonTest.java index e0489cb87828133cfcad2b98712aafc1e989d96a..862c02f34436b7e7f59ba220159274b7ec898c98 100644 --- a/src/test/java/it/unibz/inf/isochrone/network/ComparisonTest.java +++ b/src/test/java/it/unibz/inf/isochrone/network/ComparisonTest.java @@ -16,6 +16,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Set; +import java.util.SortedSet; import java.util.TreeSet; import org.slf4j.Logger; @@ -158,12 +159,20 @@ public final class ComparisonTest { LOGGER.debug(" - comparing for isochrone duration: " + params.getDuration()); final MemoryOutput o1 = AlgorithmHelper.run(clazz1, params).getOutput(); final MemoryOutput o2 = AlgorithmHelper.run(clazz2, params).getOutput(); - final Collection<Link> l1 = o1.getLinks(); - final Collection<Link> l2 = o2.getLinks(); - - Assert.assertEquals(l1, l2, n1 + " != " + n2); + Assert.assertEquals(getIds(o1.getNodes()), getIds(o2.getNodes()), "Nodes for class \"" + n1 + "\"" + " != nodes for class \"" + n2 + "\""); + Assert.assertEquals(getIds(o1.getLinks()), getIds(o2.getLinks()), "Links for class \"" + n1 + "\"" + " != links for class \"" + n2 + "\""); } LOGGER.info("-----------------------------"); } } + + private static Collection<Integer> getIds(final Collection<? extends NetworkEntity> l1) { + final SortedSet<Integer> i1 = new TreeSet<>(); + for (final NetworkEntity l : l1) { + i1.add(l.getId()); + } + + return i1; + } } +