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
Merge branch 'releases/Release_2_10_4_Branch' into develop
[jalview.git]
/
test
/
jalview
/
renderer
/
seqfeatures
/
FeatureRendererTest.java
diff --git
a/test/jalview/renderer/seqfeatures/FeatureRendererTest.java
b/test/jalview/renderer/seqfeatures/FeatureRendererTest.java
index
03398c0
..
da7cada
100644
(file)
--- a/
test/jalview/renderer/seqfeatures/FeatureRendererTest.java
+++ b/
test/jalview/renderer/seqfeatures/FeatureRendererTest.java
@@
-357,6
+357,14
@@
public class FeatureRendererTest
assertTrue(features.contains(sf2) || features.contains(sf3));
assertFalse(features.contains(sf2) && features.contains(sf3));
assertTrue(features.contains(sf5));
assertTrue(features.contains(sf2) || features.contains(sf3));
assertFalse(features.contains(sf2) && features.contains(sf3));
assertTrue(features.contains(sf5));
+
+ /*
+ * no filtering if transparency is applied
+ */
+ fr.setTransparency(0.5f);
+ features = seq.getSequenceFeatures();
+ fr.filterFeaturesForDisplay(features);
+ assertEquals(features.size(), 5);
}
@Test(groups = "Functional")
}
@Test(groups = "Functional")
@@
-378,11
+386,12
@@
public class FeatureRendererTest
/*
* hide feature type, then unhide
/*
* hide feature type, then unhide
+ * - feature type visibility should not affect the result
*/
FeatureSettingsBean[] data = new FeatureSettingsBean[1];
data[0] = new FeatureSettingsBean("Cath", fc, null, false);
fr.setFeaturePriority(data);
*/
FeatureSettingsBean[] data = new FeatureSettingsBean[1];
data[0] = new FeatureSettingsBean("Cath", fc, null, false);
fr.setFeaturePriority(data);
- assertNull(fr.getColour(sf1));
+ assertEquals(fr.getColour(sf1), Color.red);
data[0] = new FeatureSettingsBean("Cath", fc, null, true);
fr.setFeaturePriority(data);
assertEquals(fr.getColour(sf1), Color.red);
data[0] = new FeatureSettingsBean("Cath", fc, null, true);
fr.setFeaturePriority(data);
assertEquals(fr.getColour(sf1), Color.red);