git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-3127 fix faulty merge
[jalview.git]
/
test
/
jalview
/
project
/
Jalview2xmlTests.java
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");
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(
TCoffeeColourScheme.class,
"Didn't set T-coffee colourscheme for imported project.");
System.out.println(