Merge branch 'node-issue' into 'devel_16.0.x'

nodejs 9 is not supported anymore

See merge request !1360

.gitlab-ci.yml

@@ -19,6 +19,8 @@ before_script:
 #by default we configure postgres database
   - mkdir /etc/minerva/
   - cp test-postgres-db-ci.properties /etc/minerva/db.properties
+  - echo '-k' > ~/.curlrc
+  - touch /etc/apt/apt.conf.d/99verify-peer.conf && echo >>/etc/apt/apt.conf.d/99verify-peer.conf "Acquire { https::Verify-Peer false }"
 
 test:frontend:
   stage: test
@@ -151,7 +153,7 @@ test:frontend:
   script: &test_backend_web_definition
     - apt-get update
     - DEBIAN_FRONTEND=noninteractive apt-get install -y curl gnupg git ant
-    - curl -sL https://deb.nodesource.com/setup_9.x | bash -
+    - curl -sL https://deb.nodesource.com/setup_12.x | bash -
     - DEBIAN_FRONTEND=noninteractive apt-get install -y nodejs
     - mvn -DskipTests=true clean install -pl web -am
     - mvn test -pl web
@@ -327,7 +329,7 @@ build_war:
 
     - apt-get update
     - DEBIAN_FRONTEND=noninteractive apt-get install -y curl gnupg git ant
-    - curl -sL https://deb.nodesource.com/setup_9.x | bash -
+    - curl -sL https://deb.nodesource.com/setup_12.x | bash -
     - DEBIAN_FRONTEND=noninteractive apt-get install -y nodejs
     - ant maven-build-with-doc
     - cp web/target/*.war minerva.war
@@ -338,7 +340,7 @@ test:dependency_conflict:
   script:
     - apt-get update
     - DEBIAN_FRONTEND=noninteractive apt-get install -y curl gnupg git ant
-    - curl -sL https://deb.nodesource.com/setup_9.x | bash -
+    - curl -sL https://deb.nodesource.com/setup_12.x | bash -
     - DEBIAN_FRONTEND=noninteractive apt-get install -y nodejs
 
     - mvn clean install -DskipTests=true

annotation/src/test/java/lcsb/mapviewer/annotation/services/annotators/ReconAnnotatorTest.java

@@ -149,11 +149,11 @@ public class ReconAnnotatorTest extends AnnotationTestFunctions {
   @Test
   public void testAnnotatingForOxygen() throws Exception {
     SimpleMolecule molecule = new SimpleMolecule("id");
-    molecule.setName("o2");
+    molecule.setName("h2o");
     reconAnnotator.annotateElement(molecule);
     assertTrue(molecule.getMiriamData().size() > 0);
     assertEquals(0, getWarnings().size());
-    assertEquals("O2", molecule.getFormula());
+    assertEquals("H2O", molecule.getFormula());
   }
 
   @Test