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 d63c4b03e7e06cd9d3fc647b1f7147a9f3026fe6..88eb060e22f257bd5d0f2bc45c79ea4af067136c 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 @@ -2,7 +2,6 @@ package lcsb.mapviewer.converter.graphics; import lcsb.mapviewer.commands.CreateHierarchyCommand; import lcsb.mapviewer.converter.graphics.AbstractImageGenerator.Params; -import lcsb.mapviewer.converter.model.celldesigner.CellDesignerXmlParser; import lcsb.mapviewer.model.graphics.PolylineData; import lcsb.mapviewer.model.map.layout.graphics.Layer; import lcsb.mapviewer.model.map.layout.graphics.LayerText; @@ -32,6 +31,7 @@ public class NormalImageGeneratorTest extends GraphicsTestFunctions { LayerText layerText = createText(); Layer layer = new Layer(); + layer.setName(CreateHierarchyCommand.PATHWAY_LAYER_NAME); layer.addLayerText(layerText); layer.setVisible(true); model.addLayer(layer); @@ -45,13 +45,12 @@ public class NormalImageGeneratorTest extends GraphicsTestFunctions { @Test public void testArtificialInHierarchicalView() throws Exception { - CellDesignerXmlParser parser = new CellDesignerXmlParser(); Model model = createCompartmentModel(); Layer layer = model.getLayers().iterator().next(); layer.addLayerText(new LayerText(new Rectangle2D.Double(10, 10, 500, 500), "X asd")); layer.addLayerText(new LayerText(new Rectangle2D.Double(20, 20, 200, 200), "Y qwe ret")); - layer.addLayerText(new LayerText(new Rectangle2D.Double(100, 100, 199, 220), "Z dgf fsd aaewq ret")); + layer.addLayerText(new LayerText(new Rectangle2D.Double(100, 100, 199, 220), "Z dgf fsd xxx ret")); new CreateHierarchyCommand(model, 1, 8).execute(); model.getCompartments().get(1).setTransparencyLevel("2"); diff --git a/converter-sbml/src/test/java/lcsb/mapviewer/converter/model/sbml/SbmlExporterTest.java b/converter-sbml/src/test/java/lcsb/mapviewer/converter/model/sbml/SbmlExporterTest.java index f9578be9aa77b284f941b057b83bbe3e3cc49870..ab1037f51e3da0184f35922e050803aa310f0969 100644 --- a/converter-sbml/src/test/java/lcsb/mapviewer/converter/model/sbml/SbmlExporterTest.java +++ b/converter-sbml/src/test/java/lcsb/mapviewer/converter/model/sbml/SbmlExporterTest.java @@ -1,6 +1,5 @@ package lcsb.mapviewer.converter.model.sbml; -import lcsb.mapviewer.commands.CreateHierarchyCommand; import lcsb.mapviewer.common.Configuration; import lcsb.mapviewer.common.comparator.ListComparator; import lcsb.mapviewer.converter.ConverterParams; @@ -742,7 +741,7 @@ public class SbmlExporterTest extends SbmlTestFunctions { final Layer layer = new Layer(); layer.setLayerId(1); - layer.setName(CreateHierarchyCommand.TEXT_LAYER_NAME); + layer.setName("text"); final LayerText text = new LayerText(new Rectangle2D.Double(10, 20, 30, 40), "str a"); text.setZ(0); layer.addLayerText(text); diff --git a/service/src/test/java/lcsb/mapviewer/services/impl/ProjectServiceNoTransactionTest.java b/service/src/test/java/lcsb/mapviewer/services/impl/ProjectServiceNoTransactionTest.java index 000a7709de727c9ec0257db9e571669131b4dacb..6de23de428a1ec2bed75aee1a3d6dc1bdb6b7571 100644 --- a/service/src/test/java/lcsb/mapviewer/services/impl/ProjectServiceNoTransactionTest.java +++ b/service/src/test/java/lcsb/mapviewer/services/impl/ProjectServiceNoTransactionTest.java @@ -572,7 +572,7 @@ public class ProjectServiceNoTransactionTest extends TestUtils { for (final ZipEntryFile entry : params.getZipEntries()) { complexParams.entry(entry); } - Model model = parser.createModel(complexParams); + Model model = parser.createModel(complexParams, new Project()); assertNotNull(model); assertEquals("main", model.getName());