git://source.jalview.org
/
jalview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
207b06d
)
resolve merge conflict in SiftsClientTest
author
tcofoegbu
<tcnofoegbu@dundee.ac.uk>
Mon, 1 May 2017 14:05:45 +0000
(15:05 +0100)
committer
tcofoegbu
<tcnofoegbu@dundee.ac.uk>
Mon, 1 May 2017 14:05:45 +0000
(15:05 +0100)
test/jalview/ws/sifts/SiftsClientTest.java
patch
|
blob
|
history
diff --git
a/test/jalview/ws/sifts/SiftsClientTest.java
b/test/jalview/ws/sifts/SiftsClientTest.java
index
b50baff
..
3b6858b
100644
(file)
--- a/
test/jalview/ws/sifts/SiftsClientTest.java
+++ b/
test/jalview/ws/sifts/SiftsClientTest.java
@@
-38,7
+38,6
@@
import jalview.xml.binding.sifts.Entry.Entity;
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
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 java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
@@
-284,7
+283,6
@@
public class SiftsClientTest
"A", testSeq, null);
Assert.assertEquals(testSeq.getStart(), 1);
Assert.assertEquals(testSeq.getEnd(), 147);
"A", testSeq, null);
Assert.assertEquals(testSeq.getStart(), 1);
Assert.assertEquals(testSeq.getEnd(), 147);
-<<<<<<< HEAD
// Can't do Assert.assertEquals(actualMapping, expectedMapping);
// because this fails in our version of TestNG
Assert.assertEquals(actualMapping.size(), expectedMapping.size());
// Can't do Assert.assertEquals(actualMapping, expectedMapping);
// because this fails in our version of TestNG
Assert.assertEquals(actualMapping.size(), expectedMapping.size());
@@
-298,18
+296,7
@@
public class SiftsClientTest
pair.getValue());
}
pair.getValue());
}
-=======
- // Assert.assertEquals(actualMapping, expectedMapping);
- Assert.assertEquals(actualMapping.size(), expectedMapping.size());
- // Test key set
- Assert.assertEquals(actualMapping.keySet(), expectedMapping.keySet());
- // Test entry set
- for (int key : expectedMapping.keySet())
- {
- Assert.assertTrue(Arrays.equals(expectedMapping.get(key),
- actualMapping.get(key)));
- }
->>>>>>> f80180a53bf16dc72ecdd4ace0f70c83cb0d274a
+
} catch (Exception e)
{
e.printStackTrace();
} catch (Exception e)
{
e.printStackTrace();
@@
-430,7
+417,6
@@
groups = { "Network" },
Assert.assertEquals(strucMapping.getMappingDetailsOutput(),
expectedMappingOutput);
Assert.assertEquals(strucMapping.getMappingDetailsOutput(),
expectedMappingOutput);
-<<<<<<< HEAD
// Can't do Assert.assertEquals(strucMapping.getMapping(), expectedMapping);
// because this fails in our version of TestNG
Assert.assertEquals(strucMapping.getMapping().size(),
// Can't do Assert.assertEquals(strucMapping.getMapping(), expectedMapping);
// because this fails in our version of TestNG
Assert.assertEquals(strucMapping.getMapping().size(),
@@
-444,19
+430,6
@@
groups = { "Network" },
.containsKey(pair.getKey()));
Assert.assertEquals(strucMapping.getMapping().get(pair.getKey()),
pair.getValue());
.containsKey(pair.getKey()));
Assert.assertEquals(strucMapping.getMapping().get(pair.getKey()),
pair.getValue());
-=======
- // Assert.assertEquals(strucMapping.getMapping(), expectedMapping);
- 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())
- {
- Assert.assertTrue(Arrays.equals(expectedMapping.get(key),
- strucMapping.getMapping().get(key)));
->>>>>>> f80180a53bf16dc72ecdd4ace0f70c83cb0d274a
}
}
}
}