X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=test%2Fjalview%2Fproject%2FJalview2xmlTests.java;fp=test%2Fjalview%2Fproject%2FJalview2xmlTests.java;h=e0f0db3fd4ad9ef3ad4c0db28f5c613a3986da64;hb=16d109024847af92482237e43f99b82fd997451a;hp=afc445e5108b4929e877bfaa381fbc6f395afdbf;hpb=7091ed4ecff294623230f96ed93f9a5689ea5938;p=jalview.git diff --git a/test/jalview/project/Jalview2xmlTests.java b/test/jalview/project/Jalview2xmlTests.java index afc445e..e0f0db3 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(