test to see if the build testing passes this test.
Slight modifications from Mungo's last commit to account for recent
changes in public/private fields, but that is all.
Passing tests on Bob's Windows machine.
- private static Cache getInstance()
+ public static Cache getInstance()
{
return (Cache) ApplicationSingletonProvider.getInstance(Cache.class);
}
{
return (Cache) ApplicationSingletonProvider.getInstance(Cache.class);
}
/** Jalview Properties */
// BH 2019.05.08 was static
@SuppressWarnings("serial")
/** Jalview Properties */
// BH 2019.05.08 was static
@SuppressWarnings("serial")
- private Properties applicationProperties = new Properties()
+ public Properties applicationProperties = new Properties()
{
// override results in properties output in alphabetical order
@Override
{
// override results in properties output in alphabetical order
@Override
* 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" });
}
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);
@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();
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());
-
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);
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