X-Git-Url: http://source.jalview.org/gitweb/?p=jalview.git;a=blobdiff_plain;f=test%2Fjalview%2Fproject%2FJalview2xmlTests.java;h=1250748c853062c6f192d10508d956e708ed2e36;hp=ea3f00b7fc88dd0afc9a52868146e690f0d8e3d4;hb=8aa94d348698138bb5c30715ef0aa15349f47fbb;hpb=a510e9b4726214441e4fdac8a1d6752263c4c73d diff --git a/test/jalview/project/Jalview2xmlTests.java b/test/jalview/project/Jalview2xmlTests.java index ea3f00b..1250748 100644 --- a/test/jalview/project/Jalview2xmlTests.java +++ b/test/jalview/project/Jalview2xmlTests.java @@ -147,12 +147,13 @@ public class Jalview2xmlTests extends Jalview2xmlBase DataSourceType.FILE); assertNotNull(af, "Didn't read input file " + inFile); af.loadJalviewDataFile(inAnnot, DataSourceType.FILE, null, null); - assertSame(af.getViewport().getGlobalColourScheme().getClass(), + AlignViewport viewport = af.getViewport(); + assertSame(viewport.getGlobalColourScheme().getClass(), TCoffeeColourScheme.class, "Didn't set T-coffee colourscheme"); assertNotNull( - ColourSchemeProperty.getColourScheme( - af.getViewport().getAlignment(), - af.getViewport().getGlobalColourScheme() + ColourSchemeProperty.getColourScheme(viewport, + viewport.getAlignment(), + viewport.getGlobalColourScheme() .getSchemeName()), "Recognise T-Coffee score from string"); @@ -163,7 +164,7 @@ public class Jalview2xmlTests extends Jalview2xmlBase af = new FileLoader().LoadFileWaitTillLoaded(tfile, DataSourceType.FILE); assertNotNull(af, "Failed to import new project"); - assertSame(af.getViewport().getGlobalColourScheme().getClass(), + assertSame(viewport.getGlobalColourScheme().getClass(), TCoffeeColourScheme.class, "Didn't set T-coffee colourscheme for imported project."); System.out.println(