X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fproject%2FJalview2xmlTests.java;h=af52edad5c3f42dd974ce358195f19d29c62317d;hb=b3fb6325a8bc315c5c938faf10ffd2e73d965f16;hp=094e0eab0fdaf47c4a40eb349583f56a85b318ac;hpb=82174e483ca40892252a783eeef9b4d686a33b00;p=jalview.git diff --git a/test/jalview/project/Jalview2xmlTests.java b/test/jalview/project/Jalview2xmlTests.java index 094e0ea..af52eda 100644 --- a/test/jalview/project/Jalview2xmlTests.java +++ b/test/jalview/project/Jalview2xmlTests.java @@ -287,8 +287,6 @@ public class Jalview2xmlTests extends Jalview2xmlBase { int origCount = Desktop.getAlignFrames() == null ? 0 : Desktop.getAlignFrames().length; - System.out - .println("###### Calling FileLoader().LoadFileWaitTillLoaded"); AlignFrame af = new FileLoader().LoadFileWaitTillLoaded( "examples/exampleFile_2_7.jar", DataSourceType.FILE); assertNotNull(af, "Didn't read in the example file correctly."); @@ -1573,7 +1571,8 @@ public class Jalview2xmlTests extends Jalview2xmlBase float[][] vals = ContactMatrix.fromFloatStringToContacts(content, sq.getLength(), sq.getLength()); assertEquals(vals[3][4], paevals[3][4]); - + dummyMat.makeGroups(0.5f, false); + Assert.assertNotSame(dummyMat.getNewick(), ""); AlignmentAnnotation paeCm = sq.addContactList(dummyMat); al.addAnnotation(paeCm); File tfile = File.createTempFile("testStoreAndRecoverPAEmatrix", @@ -1604,6 +1603,10 @@ public class Jalview2xmlTests extends Jalview2xmlBase Assert.assertEquals(oldCM.getContactAt(j), newCM.getContactAt(j)); } } + Assert.assertEquals(restoredMat.hasGroups(), dummyMat.hasGroups()); + Assert.assertEquals(restoredMat.getGroups(), dummyMat.getGroups()); + Assert.assertEquals(restoredMat.hasTree(), dummyMat.hasTree()); + Assert.assertEquals(restoredMat.getNewick(), dummyMat.getNewick()); }