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
68f0282
..
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")
@@
-158,7
+161,6
@@
public class AlignFrameTest
* use read-only test properties file
*/
Cache.loadProperties("test/jalview/io/testProps.jvprops");
* use read-only test properties file
*/
Cache.loadProperties("test/jalview/io/testProps.jvprops");
- Cache.setPropertyNoSave("SHOW_JWS2_SERVICES", Boolean.FALSE.toString());
Jalview.main(new String[] { "-nonews" });
}
Jalview.main(new String[] { "-nonews" });
}
@@
-176,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.setPropertyNoSave("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);
@@
-342,7
+344,6
@@
public class AlignFrameTest
@Test(groups = "Functional")
public void testColourThresholdActions()
{
@Test(groups = "Functional")
public void testColourThresholdActions()
{
-
AlignViewport av = af.getViewport();
AlignmentI al = av.getAlignment();
AlignViewport av = af.getViewport();
AlignmentI al = av.getAlignment();
@@
-376,12
+377,7
@@
public class AlignFrameTest
SliderPanel sp = SliderPanel.getSliderPanel();
assertTrue(sp.isForConservation());
assertEquals(sp.getValue(), 30); // initial slider setting
SliderPanel sp = SliderPanel.getSliderPanel();
assertTrue(sp.isForConservation());
assertEquals(sp.getValue(), 30); // initial slider setting
-
- // BH 2019.08.28 this was necessary so that rs was updated
- af.changeColour_actionPerformed(JalviewColourScheme.Helix.toString());
-
sp.valueChanged(10);
sp.valueChanged(10);
-
assertSame(rs, av.getResidueShading());
c = rs.findColour('I', 14, ferCapan);
Color i_faded = new Color(196, 186, 196);
assertSame(rs, av.getResidueShading());
c = rs.findColour('I', 14, ferCapan);
Color i_faded = new Color(196, 186, 196);
@@
-506,21
+502,6
@@
public class AlignFrameTest
assertEquals(c, s_original);
}
assertEquals(c, s_original);
}
- private void waitSome()
- {
-
- // just a hack
- synchronized (this)
- {
- try
- {
- wait(250);
- } catch (InterruptedException e)
- {
- }
- }
- }
-
/**
* Verify that making a New View transfers alignment and group colour schemes,
* including any thresholds, to the new view. Because New View is performed by
/**
* Verify that making a New View transfers alignment and group colour schemes,
* including any thresholds, to the new view. Because New View is performed by