import static org.testng.Assert.assertNull;
import static org.testng.Assert.assertTrue;
+import java.awt.Color;
+import java.util.List;
+
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
import jalview.api.FeatureColourI;
import jalview.datamodel.SequenceFeature;
import jalview.datamodel.SequenceI;
import jalview.gui.AlignFrame;
-import jalview.gui.AlignViewport;
-import jalview.gui.FeatureRenderer;
+import jalview.api.AlignViewportI;
import jalview.io.DataSourceType;
import jalview.io.FileLoader;
import jalview.schemes.FeatureColour;
+import jalview.viewmodel.seqfeatures.FeatureRendererModel;
import jalview.viewmodel.seqfeatures.FeatureRendererModel.FeatureSettingsBean;
-import java.awt.Color;
-import java.util.List;
-
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
/**
* Unit tests for feature colour determination, including but not limited to
* <ul>
*/
public class FeatureColourFinderTest
{
- private AlignViewport av;
+ private AlignViewportI av;
private SequenceI seq;
private AlignFrame af;
- private FeatureRenderer fr;
+ private FeatureRendererModel fr;
- @BeforeTest(alwaysRun = true)
+ @BeforeClass(alwaysRun = true)
public void setUp()
{
// aligned column 8 is sequence position 6
*/
Color min = new Color(100, 50, 150);
Color max = new Color(200, 0, 100);
- FeatureColourI fc = new FeatureColour(min, max, 0, 10);
+ FeatureColourI fc = new FeatureColour(null, min, max, null, 0, 10);
fr.setColour("kd", fc);
fr.featuresAdded();
av.setShowSequenceFeatures(true);
*/
Color min = new Color(100, 50, 150);
Color max = new Color(200, 0, 100);
- FeatureColourI fc = new FeatureColour(min, max, 0, 10);
+ FeatureColourI fc = new FeatureColour(null, min, max, null, 0, 10);
fc.setAboveThreshold(true);
fc.setThreshold(5f);
fr.setColour(kdFeature, fc);