X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fio%2FAnnotatedPDBFileInputTest.java;fp=test%2Fjalview%2Fio%2FAnnotatedPDBFileInputTest.java;h=d07f28c59c628928d517bb9b9742b1c0c4103488;hb=7d67fb613ec026dc9a265e351e7fab542e3f1d61;hp=9a07ef789408a18d30b1cd729dde95d6e4601ef2;hpb=02e38bb826828ab2991584cf4b737c0138cb6c44;p=jalview.git diff --git a/test/jalview/io/AnnotatedPDBFileInputTest.java b/test/jalview/io/AnnotatedPDBFileInputTest.java index 9a07ef7..d07f28c 100644 --- a/test/jalview/io/AnnotatedPDBFileInputTest.java +++ b/test/jalview/io/AnnotatedPDBFileInputTest.java @@ -85,8 +85,8 @@ public class AnnotatedPDBFileInputTest { for (int q = p + 1; q < avec.length; q++) { - assertTrue("Found a duplicate annotation row " - + avec[p].label, avec[p] != avec[q]); + assertTrue("Found a duplicate annotation row " + avec[p].label, + avec[p] != avec[q]); } } } @@ -104,7 +104,7 @@ public class AnnotatedPDBFileInputTest if (StructureImportSettings.getDefaultPDBFileParser().equals( StructureParser.JALVIEW_PARSER)) { - assertTrue(MCview.PDBfile.isCalcIdForFile(aa, pdbId)); + assertTrue(MCview.PDBfile.isCalcIdForFile(aa, pdbId)); } } } @@ -122,9 +122,9 @@ public class AnnotatedPDBFileInputTest SequenceFeature[] sf = al.getSequenceAt(0).getSequenceFeatures(); assertEquals(296, sf.length); assertEquals("RESNUM", sf[0].getType()); - assertEquals("GLU:19 1gaqA", sf[0].getDescription()); + assertEquals("GLU: 19 1gaqA", sf[0].getDescription()); assertEquals("RESNUM", sf[295].getType()); - assertEquals("TYR:314 1gaqA", sf[295].getDescription()); + assertEquals("TYR: 314 1gaqA", sf[295].getDescription()); /* * 1GAQ/B @@ -132,9 +132,9 @@ public class AnnotatedPDBFileInputTest sf = al.getSequenceAt(1).getSequenceFeatures(); assertEquals(98, sf.length); assertEquals("RESNUM", sf[0].getType()); - assertEquals("ALA:1 1gaqB", sf[0].getDescription()); + assertEquals("ALA: 1 1gaqB", sf[0].getDescription()); assertEquals("RESNUM", sf[97].getType()); - assertEquals("ALA:98 1gaqB", sf[97].getDescription()); + assertEquals("ALA: 98 1gaqB", sf[97].getDescription()); /* * 1GAQ/C @@ -142,9 +142,9 @@ public class AnnotatedPDBFileInputTest sf = al.getSequenceAt(2).getSequenceFeatures(); assertEquals(296, sf.length); assertEquals("RESNUM", sf[0].getType()); - assertEquals("GLU:19 1gaqC", sf[0].getDescription()); + assertEquals("GLU: 19 1gaqC", sf[0].getDescription()); assertEquals("RESNUM", sf[295].getType()); - assertEquals("TYR:314 1gaqC", sf[295].getDescription()); + assertEquals("TYR: 314 1gaqC", sf[295].getDescription()); } @Test(groups = { "Functional" }) @@ -221,8 +221,8 @@ public class AnnotatedPDBFileInputTest sq = sq.getDatasetSequence(); } assertNotNull(sq.getAllPDBEntries()); - assertEquals("Expected only one PDB ID", - sq.getAllPDBEntries().size(), 1); + assertEquals("Expected only one PDB ID", 1, sq.getAllPDBEntries() + .size()); for (PDBEntry pdbentry : sq.getAllPDBEntries()) { System.err.println("PDB Entry " + pdbentry.getId() + " "