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-3829 more info on test fail - seems to be flaky
[jalview.git]
/
test
/
jalview
/
gui
/
FeatureSettingsTest.java
diff --git
a/test/jalview/gui/FeatureSettingsTest.java
b/test/jalview/gui/FeatureSettingsTest.java
index
321adf6
..
f09c7c7
100644
(file)
--- a/
test/jalview/gui/FeatureSettingsTest.java
+++ b/
test/jalview/gui/FeatureSettingsTest.java
@@
-4,6
+4,13
@@
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertNull;
import static org.testng.Assert.assertTrue;
import static org.testng.Assert.assertNull;
import static org.testng.Assert.assertTrue;
+import java.awt.Color;
+import java.io.File;
+import java.io.IOException;
+import java.util.HashMap;
+
+import org.testng.annotations.Test;
+
import jalview.api.FeatureColourI;
import jalview.datamodel.SequenceFeature;
import jalview.datamodel.SequenceI;
import jalview.api.FeatureColourI;
import jalview.datamodel.SequenceFeature;
import jalview.datamodel.SequenceI;
@@
-15,13
+22,7
@@
import jalview.io.FileLoader;
import jalview.schemes.FeatureColour;
import jalview.schemes.FeatureColourTest;
import jalview.util.matcher.Condition;
import jalview.schemes.FeatureColour;
import jalview.schemes.FeatureColourTest;
import jalview.util.matcher.Condition;
-
-import java.awt.Color;
-import java.io.File;
-import java.io.IOException;
-import java.util.HashMap;
-
-import org.testng.annotations.Test;
+import jalview.viewmodel.seqfeatures.FeatureRendererModel;
public class FeatureSettingsTest
{
public class FeatureSettingsTest
{
@@
-50,7
+51,7
@@
public class FeatureSettingsTest
/*
* set colour schemes for features
*/
/*
* set colour schemes for features
*/
- FeatureRenderer fr = af.getFeatureRenderer();
+ FeatureRendererModel fr = af.getFeatureRenderer();
// type1: red
fr.setColour("type1", new FeatureColour(Color.red));
// type1: red
fr.setColour("type1", new FeatureColour(Color.red));
@@
-61,8
+62,8
@@
public class FeatureSettingsTest
fr.setColour("type2", byLabel);
// type3: by score above threshold
fr.setColour("type2", byLabel);
// type3: by score above threshold
- FeatureColourI byScore = new FeatureColour(Color.BLACK, Color.BLUE, 1,
- 10);
+ FeatureColourI byScore = new FeatureColour(null, Color.BLACK,
+ Color.BLUE, null, 1, 10);
byScore.setAboveThreshold(true);
byScore.setThreshold(2f);
fr.setColour("type3", byScore);
byScore.setAboveThreshold(true);
byScore.setThreshold(2f);
fr.setColour("type3", byScore);
@@
-74,8
+75,8
@@
public class FeatureSettingsTest
fr.setColour("type4", byAF);
// type5: by attribute CSQ:PolyPhen below threshold
fr.setColour("type4", byAF);
// type5: by attribute CSQ:PolyPhen below threshold
- FeatureColourI byPolyPhen = new FeatureColour(Color.BLACK, Color.BLUE,
- 1, 10);
+ FeatureColourI byPolyPhen = new FeatureColour(null, Color.BLACK,
+ Color.BLUE, null, 1, 10);
byPolyPhen.setBelowThreshold(true);
byPolyPhen.setThreshold(3f);
byPolyPhen.setAttributeName("CSQ", "PolyPhen");
byPolyPhen.setBelowThreshold(true);
byPolyPhen.setThreshold(3f);
byPolyPhen.setAttributeName("CSQ", "PolyPhen");
@@
-159,7
+160,7
@@
public class FeatureSettingsTest
assertEquals(fr.getFeatureFilter("type2").toStableString(),
"(Score LE 2.4) AND (Score GT 1.1)");
assertEquals(fr.getFeatureFilter("type3").toStableString(),
assertEquals(fr.getFeatureFilter("type2").toStableString(),
"(Score LE 2.4) AND (Score GT 1.1)");
assertEquals(fr.getFeatureFilter("type3").toStableString(),
- "(AF Contains X) OR (CSQ:PolyPhen NE 0.0)");
+ "(AF Contains X) OR (CSQ:PolyPhen NE 0)");
}
/**
}
/**
@@
-219,7
+220,7
@@
public class FeatureSettingsTest
/*
* graduated colour with threshold is html-encoded
*/
/*
* graduated colour with threshold is html-encoded
*/
- fc = new FeatureColour(Color.red, Color.blue, 2f, 10f);
+ fc = new FeatureColour(null, Color.red, Color.blue, null, 2f, 10f);
fc.setBelowThreshold(true);
fc.setThreshold(4f);
assertEquals(FeatureSettings.getColorTooltip(fc, false),
fc.setBelowThreshold(true);
fc.setThreshold(4f);
assertEquals(FeatureSettings.getColorTooltip(fc, false),