git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 8aa94d3)
JAL-3127 fix faulty merge
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 11 Mar 2019 15:36:36 +0000 (15:36 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 11 Mar 2019 15:36:36 +0000 (15:36 +0000)
test/jalview/project/Jalview2xmlTests.java patch | blob | history

diff --git a/test/jalview/project/Jalview2xmlTests.java b/test/jalview/project/Jalview2xmlTests.java
index 1250748..d902fa2 100644 (file)
--- 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(