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-3253 temporary branch SwingJS upgrade with testNG fixes Java 8
[jalview.git]
/
test
/
jalview
/
gui
/
AlignFrameTest.java
diff --git
a/test/jalview/gui/AlignFrameTest.java
b/test/jalview/gui/AlignFrameTest.java
index
454ff61
..
568d285
100644
(file)
--- a/
test/jalview/gui/AlignFrameTest.java
+++ b/
test/jalview/gui/AlignFrameTest.java
@@
-66,6
+66,9
@@
public class AlignFrameTest
{
JvOptionPane.setInteractiveMode(false);
JvOptionPane.setMockResponse(JvOptionPane.CANCEL_OPTION);
{
JvOptionPane.setInteractiveMode(false);
JvOptionPane.setMockResponse(JvOptionPane.CANCEL_OPTION);
+
+ // BH 2020.03.22 solved the assertEquals(c, i_faded) problem below
+ Jalview.setSynchronous(true);
}
@Test(groups = "Functional")
}
@Test(groups = "Functional")
@@
-164,7
+167,7
@@
public class AlignFrameTest
@AfterMethod(alwaysRun = true)
public void tearDown()
{
@AfterMethod(alwaysRun = true)
public void tearDown()
{
- Desktop.instance.closeAll_actionPerformed(null);
+ Desktop.getInstance().closeAll_actionPerformed(null);
}
/**
}
/**
@@
-175,7
+178,7
@@
public class AlignFrameTest
public void setUp()
{
Cache.loadProperties("test/jalview/io/testProps.jvprops");
public void setUp()
{
Cache.loadProperties("test/jalview/io/testProps.jvprops");
- Cache.applicationProperties.setProperty("SHOW_IDENTITY",
+ Cache.getInstance().applicationProperties.setProperty("SHOW_IDENTITY",
Boolean.TRUE.toString());
af = new FileLoader().LoadFileWaitTillLoaded("examples/uniref50.fa",
DataSourceType.FILE);
Boolean.TRUE.toString());
af = new FileLoader().LoadFileWaitTillLoaded("examples/uniref50.fa",
DataSourceType.FILE);