diff --git a/converter-graphics/src/test/java/lcsb/mapviewer/converter/graphics/NormalImageGeneratorTest.java b/converter-graphics/src/test/java/lcsb/mapviewer/converter/graphics/NormalImageGeneratorTest.java index 347ca0dbaa86ed9dfb550641e2585eb97bf592c1..b4671daa3184a7bf4ae294210259a07dd12907a9 100644 --- a/converter-graphics/src/test/java/lcsb/mapviewer/converter/graphics/NormalImageGeneratorTest.java +++ b/converter-graphics/src/test/java/lcsb/mapviewer/converter/graphics/NormalImageGeneratorTest.java @@ -1,9 +1,6 @@ package lcsb.mapviewer.converter.graphics; -import static org.junit.Assert.assertFalse; - import java.awt.Color; -import java.awt.Graphics2D; import java.awt.geom.Point2D; import java.awt.geom.Rectangle2D; @@ -12,10 +9,8 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; -import lcsb.mapviewer.commands.ColorExtractor; import lcsb.mapviewer.commands.CreateHierarchyCommand; import lcsb.mapviewer.converter.graphics.AbstractImageGenerator.Params; -import lcsb.mapviewer.converter.graphics.bioEntity.element.species.ComplexConverter; import lcsb.mapviewer.model.graphics.PolylineData; import lcsb.mapviewer.model.map.layout.graphics.Layer; import lcsb.mapviewer.model.map.layout.graphics.LayerText; @@ -34,26 +29,6 @@ public class NormalImageGeneratorTest { public void tearDown() throws Exception { } - Double scale; - private Boolean artifitialCalled; - - public void setScale(Double sc) { - scale = sc; - } - - class TmpComplexConverter extends ComplexConverter { - public TmpComplexConverter(ColorExtractor colorExtractor) { - super(colorExtractor); - } - - @Override - public void drawText(Complex compAlias, Graphics2D graphics, ConverterParams params) { - setScale(params.getScale()); - super.drawText(compAlias, graphics, params); - } - - } - private Model createCompartmentModel() { Model model = new ModelFullIndexed(null); model.setWidth(526); @@ -84,43 +59,6 @@ public class NormalImageGeneratorTest { return model; } - @Test - public void testArtifitialInNonHierarchicalView() throws Exception { - scale = null; - try { - // TODO fix it - // AliasConverter.addAliasConverter(PathwayCompartment.class, new - // TmpArtifitialConverter()); - - setArtifitialCalled(false); - Model model = createCompartmentModel(); - new CreateHierarchyCommand(model, 2, 2).execute(); - new PngImageGenerator(new Params().scale(2).width(600).height(600).model(model)); - - assertFalse(getArtifitialCalled()); - - } catch (Exception e) { - e.printStackTrace(); - throw e; - } - } - - /** - * @return the artifitialCalled - * @see #artifitialCalled - */ - public Boolean getArtifitialCalled() { - return artifitialCalled; - } - - /** - * @param artifitialCalled - * the artifitialCalled to set - * @see #artifitialCalled - */ - public void setArtifitialCalled(Boolean artifitialCalled) { - this.artifitialCalled = artifitialCalled; - } @Test public void testArtifitialInHierarchicalView() throws Exception {