From d6c79df3dd5cb30b3382ec9c6b2104cbf7738ff7 Mon Sep 17 00:00:00 2001
From: Piotr Gawron <piotr.gawron@uni.lu>
Date: Fri, 4 Jan 2019 15:36:55 +0100
Subject: [PATCH] unit test refactor
---
.../model/sbml/SbmlExporterTest.java | 45 ++++++++-----------
1 file changed, 19 insertions(+), 26 deletions(-)
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 37a79998a3..b3627d6965 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
@@ -52,10 +52,14 @@ import lcsb.mapviewer.model.map.species.field.Residue;
public class SbmlExporterTest {
Logger logger = Logger.getLogger(SbmlExporterTest.class);
SbmlParser parser = new SbmlParser();
- SbmlExporter exporter = new SbmlExporter();
+ SbmlExporter exporter;
ModelComparator comparator = new ModelComparator();
+ public SbmlExporterTest() {
+ exporter = new SbmlExporter();
+ }
+
@Test
public void testExportCompartment() throws Exception {
Model model = getModelAfterSerializing("testFiles/layoutExample/CompartmentGlyph_Example_level2_level3.xml");
@@ -443,12 +447,7 @@ public class SbmlExporterTest {
@Test
public void testExportProteinState() throws Exception {
Model model = createEmptyModel();
- GenericProtein element = new GenericProtein("id");
- element.setName("test name");
- element.setX(10);
- element.setWidth(10);
- element.setY(10);
- element.setHeight(10);
+ GenericProtein element = createProtein();
element.setStructuralState("xxx");
model.addElement(element);
Model deserializedModel = getModelAfterSerializing(model);
@@ -459,12 +458,7 @@ public class SbmlExporterTest {
@Test
public void testExportPositionToCompartment() throws Exception {
Model model = createEmptyModel();
- GenericProtein element = new GenericProtein("id");
- element.setName("test name");
- element.setX(10);
- element.setWidth(10);
- element.setY(10);
- element.setHeight(10);
+ GenericProtein element = createProtein();
element.setPositionToCompartment(PositionToCompartment.INSIDE);
model.addElement(element);
Model deserializedModel = getModelAfterSerializing(model);
@@ -535,12 +529,7 @@ public class SbmlExporterTest {
@Test
public void testMultiExtensionTypeDefinition() throws Exception {
Model model = createEmptyModel();
- GenericProtein element = new GenericProtein("id");
- element.setName("test name");
- element.setX(10);
- element.setWidth(10);
- element.setY(10);
- element.setHeight(10);
+ GenericProtein element = createProtein();
model.addElement(element);
org.sbml.jsbml.Model sbmlModel = exporter.toSbmlDocument(model).getModel();
@@ -585,12 +574,7 @@ public class SbmlExporterTest {
@Test
public void testExportResidue() throws Exception {
Model model = createEmptyModel();
- GenericProtein element = new GenericProtein("id");
- element.setName("test name");
- element.setX(10);
- element.setWidth(10);
- element.setY(10);
- element.setHeight(10);
+ GenericProtein element = createProtein();
Residue mr = new Residue("x1");
mr.setName("217U");
mr.setState(ModificationState.PHOSPHORYLATED);
@@ -614,6 +598,16 @@ public class SbmlExporterTest {
}
+ private GenericProtein createProtein() {
+ GenericProtein element = new GenericProtein("id");
+ element.setName("test name");
+ element.setX(10);
+ element.setWidth(10);
+ element.setY(10);
+ element.setHeight(10);
+ return element;
+ }
+
@Test
public void testExportNotes() throws Exception {
Model model = createEmptyModel();
@@ -623,5 +617,4 @@ public class SbmlExporterTest {
assertEquals("Notes weren't exported/imported properly", model.getNotes(), deserializedModel.getNotes());
}
-
}
--
GitLab