Merge branch 'gpml-mapping-change' into 'master'

mapping modified - input arrow is translated into reactant not a modulation

See merge request !993

pathvisio/src/main/java/lcsb/mapviewer/wikipathway/model/InteractionMapping.java

@@ -38,7 +38,7 @@ public enum InteractionMapping {
    */
   ARROW(GpmlInteractionType.ARROW, GpmlLineType.SOLID,
       StateTransitionReaction.class, false,
-      Modulation.class, true,
+      Reactant.class, false,
       Product.class, false),
 
   /**
@@ -111,7 +111,7 @@ public enum InteractionMapping {
    */
   CONVERSION(GpmlInteractionType.CONVERSION, GpmlLineType.SOLID,
       StateTransitionReaction.class, false,
-      Modulation.class, true,
+      Reactant.class, false,
       Product.class, false),
 
   /**

pathvisio/src/test/java/lcsb/mapviewer/wikipathway/ReactionGpmlInputToModelTest.java

@@ -81,11 +81,11 @@ public class ReactionGpmlInputToModelTest extends WikipathwaysTestFunctions {
       assertTrue(modifier instanceof Modulation);
     }
 
-    assertNull(reactant);
+    assertNotNull(reactant);
     assertNull(product);
-    assertNotNull(modifier);
+    assertNull(modifier);
 
-    assertEquals(1, getWarnings().size());
+    assertEquals(0, getWarnings().size());
 
     Model model2 = serializeModelOverCellDesignerParser(model1);
 
@@ -291,11 +291,11 @@ public class ReactionGpmlInputToModelTest extends WikipathwaysTestFunctions {
       assertTrue(modifier instanceof Modulation);
     }
 
-    assertNull(reactant);
+    assertNotNull(reactant);
     assertNull(product);
-    assertNotNull(modifier);
+    assertNull(modifier);
 
-    assertEquals(1, getWarnings().size());
+    assertEquals(0, getWarnings().size());
 
     Model model2 = serializeModelOverCellDesignerParser(model1);