JAL-2136 merged develop into branch to fix build failure

[jalview.git] / test / jalview / ws / sifts / SiftsClientTest.java

diff --git a/test/jalview/ws/sifts/SiftsClientTest.java b/test/jalview/ws/sifts/SiftsClientTest.java
index 6a1fa1f..fc07749 100644 (file)
--- a/test/jalview/ws/sifts/SiftsClientTest.java
+++ b/test/jalview/ws/sifts/SiftsClientTest.java
@@ -38,8 +38,9 @@ import jalview.xml.binding.sifts.Entry.Entity;
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
 
 import org.testng.Assert;
 import org.testng.FileAssert;
@@ -282,15 +283,17 @@ 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());
-      // Test key set
-      Assert.assertEquals(actualMapping.keySet(), expectedMapping.keySet());
-      // Test entry set
-      for (int key : expectedMapping.keySet())
+      Iterator<Map.Entry<Integer, int[]>> it = expectedMapping.entrySet()
+              .iterator();
+      while (it.hasNext())
       {
-        Assert.assertTrue(Arrays.equals(expectedMapping.get(key),
-                actualMapping.get(key)));
+        Map.Entry<Integer, int[]> pair = it.next();
+        Assert.assertTrue(actualMapping.containsKey(pair.getKey()));
+        Assert.assertEquals(actualMapping.get(pair.getKey()),
+                pair.getValue());
       }
     } catch (Exception e)
     {
@@ -412,17 +415,19 @@ 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());
-    // Test key set
-    Assert.assertEquals(strucMapping.getMapping().keySet(),
-            expectedMapping.keySet());
-    // Test entry set
-    for (int key : expectedMapping.keySet())
+    Iterator<Map.Entry<Integer, int[]>> it = expectedMapping.entrySet()
+            .iterator();
+    while (it.hasNext())
     {
-      Assert.assertTrue(Arrays.equals(expectedMapping.get(key),
-              strucMapping.getMapping().get(key)));
+      Map.Entry<Integer, int[]> pair = it.next();
+      Assert.assertTrue(strucMapping.getMapping()
+              .containsKey(pair.getKey()));
+      Assert.assertEquals(strucMapping.getMapping().get(pair.getKey()),
+              pair.getValue());
     }
   }