X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fws%2FPDBSequenceFetcherTest.java;fp=test%2Fjalview%2Fws%2FPDBSequenceFetcherTest.java;h=9efcef2434e6429521c333f3a275f8377927cb8b;hb=f18ea3ce4e450b363c5092a340d26bbed18e43a1;hp=ba90dd804df35b056697837db753bd1dc2072730;hpb=842713f26c299ec867320918a721ff5be9df7dbb;p=jalview.git diff --git a/test/jalview/ws/PDBSequenceFetcherTest.java b/test/jalview/ws/PDBSequenceFetcherTest.java index ba90dd8..9efcef2 100644 --- a/test/jalview/ws/PDBSequenceFetcherTest.java +++ b/test/jalview/ws/PDBSequenceFetcherTest.java @@ -146,21 +146,24 @@ public class PDBSequenceFetcherTest sq.getAllPDBEntries().size() > 0); // FIXME: should test that all residues extracted as sequences from // chains in structure have a mapping to data in the structure - StringBuilder errors = new StringBuilder(); List prev = null; int lastp = -1; - for (int rs = sq.getStart(); rs < sq.getStart() - + sq.getLength(); rs++) + for (int col = 1; col <= sq.getLength(); col++) { - List sf = sq.findFeatures(rs, rs, "RESNUM"); + List sf = sq.findFeatures(col, col, "RESNUM"); if (sf.size() != 1) { errors.append( - "Expected feature at " + rs + ": saw " + sf.size()); + str.id + ": " + + "Expected one feature at column (position): " + + (col - 1) + + " (" + sq.findPosition(col - 1) + ")" + + ": saw " + + sf.size()); errors.append("\n"); if (prev != null) { - errors.append("Last Feature was at " + lastp + ": " + errors.append("Last Feature was at position " + lastp + ": " + prev.get(0).toString()); errors.append("\n"); } @@ -168,7 +171,7 @@ public class PDBSequenceFetcherTest else { prev = sf; - lastp = rs; + lastp = sq.findPosition(col - 1); } } if (errors.length() > 0)