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 08b779a2dff81a5ec1bff34557ab7f8fe198dfe5..145e36e21ba025019f5d521ee7215783aa88f87d 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 @@ -2,13 +2,12 @@ package lcsb.mapviewer.converter.model.sbml; import static org.junit.Assert.*; -import java.awt.*; +import java.awt.Color; import java.awt.geom.Line2D; import java.awt.geom.Point2D; import java.io.File; import java.lang.reflect.Modifier; import java.util.*; -import java.util.List; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -22,6 +21,8 @@ import lcsb.mapviewer.common.comparator.LineComparator; import lcsb.mapviewer.common.comparator.ListComparator; import lcsb.mapviewer.converter.ConverterParams; import lcsb.mapviewer.converter.model.celldesigner.CellDesignerXmlParser; +import lcsb.mapviewer.model.graphics.PolylineData; +import lcsb.mapviewer.model.graphics.PolylineDataComparator; import lcsb.mapviewer.model.map.compartment.Compartment; import lcsb.mapviewer.model.map.model.*; import lcsb.mapviewer.model.map.reaction.*; @@ -572,11 +573,17 @@ public class SbmlExporterTest extends SbmlTestFunctions { .createModel(new ConverterParams().filename("testFiles/cell_designer_problems/boolean_logic_gate.xml")); Model model = getModelAfterSerializing(originalModel); - new CellDesignerXmlParser().model2String(model); - List<Line2D> lines1 = originalModel.getReactions().iterator().next().getLines(); - List<Line2D> lines2 = model.getReactions().iterator().next().getLines(); + List<PolylineData> lines1 = new ArrayList<>(); + List<PolylineData> lines2 = new ArrayList<>(); - ListComparator<Line2D> comparator = new ListComparator<>(new LineComparator(Configuration.EPSILON)); + for (ReactionNode node : originalModel.getReactions().iterator().next().getReactionNodes()) { + lines1.add(node.getLine()); + } + for (ReactionNode node : model.getReactions().iterator().next().getReactionNodes()) { + lines2.add(node.getLine()); + } + + ListComparator<PolylineData> comparator = new ListComparator<>(new PolylineDataComparator(Configuration.EPSILON)); assertEquals(0, comparator.compare(lines1, lines2)); }