export to cell designer contains compartment notes

f8a7ea7e · Piotr Gawron · 6dc4c0f7 · f8a7ea7e · f8a7ea7e
Commit f8a7ea7e authored 7 years ago by Piotr Gawron
--- a/converter-CellDesigner/src/main/java/lcsb/mapviewer/converter/model/celldesigner/compartment/CompartmentXmlParser.java
+++ b/converter-CellDesigner/src/main/java/lcsb/mapviewer/converter/model/celldesigner/compartment/CompartmentXmlParser.java
@@ -156,6 +156,15 @@ public class CompartmentXmlParser extends AbstractElementXmlParser<CellDesignerC
 		sb.append("</celldesigner:extension>\n");
 		sb.append(xmlAnnotationParser.dataSetToXmlString(compartment.getMiriamData()));
 		sb.append("</annotation>\n");
+		sb.append("<notes>");
+		sb.append("<html xmlns=\"http://www.w3.org/1999/xhtml\"><head><title/></head><body>");
+		RestAnnotationParser rap = new RestAnnotationParser();
+		sb.append(rap.createAnnotationString(compartment));
+		if (compartment.getNotes() != null) {
+			sb.append(compartment.getNotes());
+		}
+		sb.append("</body></html>");
+		sb.append("</notes>\n");
 		sb.append("</compartment>\n");
 		return sb.toString();
 	}

--- a/converter-CellDesigner/src/test/java/lcsb/mapviewer/converter/model/celldesigner/CellDesignerXmlParserTest.java
+++ b/converter-CellDesigner/src/test/java/lcsb/mapviewer/converter/model/celldesigner/CellDesignerXmlParserTest.java
@@ -980,8 +980,11 @@ public class CellDesignerXmlParserTest extends CellDesignerTestFunctions {
 		try {
 			CellDesignerXmlParser parser = new CellDesignerXmlParser();
 			Model model = parser.createModel(new ConverterParams().filename("testFiles/compartment_with_notes.xml"));
+			model.setName(null);
 			assertNotNull(model);
-			assertEquals("notes", model.getCompartments().get(0).getNotes());
+			String str = parser.toXml(model);
+			Model model2 = parser.createModel(new ConverterParams().inputStream(new ByteArrayInputStream(str.getBytes(StandardCharsets.UTF_8))));
+			assertEquals(0, new ModelComparator().compare(model, model2));
 		} catch (Exception e) {
 			e.printStackTrace();
 			throw e;