From: kiramt Date: Tue, 21 Mar 2017 19:42:32 +0000 (+0000) Subject: JAL-2307 Fixed SiftsClient unit test X-Git-Tag: Release_2_10_2~3^2~150^2 X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;ds=sidebyside;h=32f013e4de40a95ac786d49a30e802a00bb8f1ba;p=jalview.git JAL-2307 Fixed SiftsClient unit test --- diff --git a/test/jalview/ws/sifts/SiftsClientTest.java b/test/jalview/ws/sifts/SiftsClientTest.java index d805e47..7f8adc9 100644 --- a/test/jalview/ws/sifts/SiftsClientTest.java +++ b/test/jalview/ws/sifts/SiftsClientTest.java @@ -38,6 +38,8 @@ import java.io.File; import java.io.IOException; import java.util.ArrayList; import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; import org.testng.Assert; import org.testng.FileAssert; @@ -280,7 +282,19 @@ public class SiftsClientTest "A", testSeq, null); Assert.assertEquals(testSeq.getStart(), 1); Assert.assertEquals(testSeq.getEnd(), 147); - Assert.assertEquals(actualMapping, expectedMapping); + // Can't do Assert.assertEquals(actualMapping, expectedMapping); + // because this fails in our version of TestNG + Assert.assertEquals(actualMapping.size(), expectedMapping.size()); + Iterator> it = expectedMapping.entrySet() + .iterator(); + while (it.hasNext()) + { + Map.Entry pair = it.next(); + Assert.assertTrue(actualMapping.containsKey(pair.getKey())); + Assert.assertEquals(actualMapping.get(pair.getKey()), + pair.getValue()); + } + } catch (Exception e) { e.printStackTrace(); @@ -399,7 +413,21 @@ groups = { "Network" }, Assert.assertEquals(strucMapping.getMappingDetailsOutput(), expectedMappingOutput); - Assert.assertEquals(strucMapping.getMapping(), expectedMapping); + + // Can't do Assert.assertEquals(strucMapping.getMapping(), expectedMapping); + // because this fails in our version of TestNG + Assert.assertEquals(strucMapping.getMapping().size(), + expectedMapping.size()); + Iterator> it = expectedMapping.entrySet() + .iterator(); + while (it.hasNext()) + { + Map.Entry pair = it.next(); + Assert.assertTrue(strucMapping.getMapping() + .containsKey(pair.getKey())); + Assert.assertEquals(strucMapping.getMapping().get(pair.getKey()), + pair.getValue()); + } } @Test(groups = { "Network" })