From 1cf39accd3b4acfe0f02ff8100c936c4dbaeee1e Mon Sep 17 00:00:00 2001 From: gmungoc Date: Mon, 11 Mar 2019 15:36:36 +0000 Subject: [PATCH] JAL-3127 fix faulty merge --- test/jalview/project/Jalview2xmlTests.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/jalview/project/Jalview2xmlTests.java b/test/jalview/project/Jalview2xmlTests.java index 1250748..d902fa2 100644 --- a/test/jalview/project/Jalview2xmlTests.java +++ b/test/jalview/project/Jalview2xmlTests.java @@ -164,7 +164,7 @@ public class Jalview2xmlTests extends Jalview2xmlBase af = new FileLoader().LoadFileWaitTillLoaded(tfile, DataSourceType.FILE); assertNotNull(af, "Failed to import new project"); - assertSame(viewport.getGlobalColourScheme().getClass(), + assertSame(af.getViewport().getGlobalColourScheme().getClass(), TCoffeeColourScheme.class, "Didn't set T-coffee colourscheme for imported project."); System.out.println( -- 1.7.10.2