Update Junit to Jupiter 5.0.3

obographs-core/src/test/java/org/geneontology/obographs/core/io/OgJsonGeneratorTest.java

@@ -4,15 +4,15 @@
 import org.geneontology.obographs.core.model.*;
 import org.geneontology.obographs.core.model.meta.SynonymPropertyValue;
 import org.geneontology.obographs.core.model.meta.XrefPropertyValue;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Arrays;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class OgJsonGeneratorTest {
 

obographs-core/src/test/java/org/geneontology/obographs/core/io/OgJsonReaderTest.java

@@ -2,7 +2,7 @@
 
 import org.geneontology.obographs.core.model.GraphDocument;
 import org.geneontology.obographs.core.model.Node;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;

obographs-core/src/test/java/org/geneontology/obographs/core/io/OgProtobufGeneratorTest.java

@@ -1,12 +1,12 @@
 package org.geneontology.obographs.core.io;
 
 import org.apache.commons.io.FileUtils;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.File;
 import java.io.IOException;
 
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class OgProtobufGeneratorTest {
 

obographs-core/src/test/java/org/geneontology/obographs/core/io/OgSchemaGeneratorTest.java

@@ -4,7 +4,7 @@
 import org.geneontology.obographs.core.model.Graph;
 import org.geneontology.obographs.core.model.GraphDocument;
 import org.geneontology.obographs.core.model.Meta;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.File;
 import java.io.IOException;

obographs-core/src/test/java/org/geneontology/obographs/core/model/EdgeTest.java

@@ -1,8 +1,8 @@
 package org.geneontology.obographs.core.model;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class EdgeTest {
 

obographs-core/src/test/java/org/geneontology/obographs/core/model/GraphDocumentTest.java

@@ -3,14 +3,14 @@
 import com.fasterxml.jackson.core.JsonProcessingException;
 import org.geneontology.obographs.core.io.OgJsonGenerator;
 import org.geneontology.obographs.core.io.OgYamlGenerator;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class GraphDocumentTest {
 

obographs-core/src/test/java/org/geneontology/obographs/core/model/GraphTest.java

@@ -3,13 +3,13 @@
 import com.fasterxml.jackson.core.JsonProcessingException;
 import org.geneontology.obographs.core.io.OgJsonGenerator;
 import org.geneontology.obographs.core.io.OgYamlGenerator;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class GraphTest {
 

obographs-core/src/test/java/org/geneontology/obographs/core/model/MetaTest.java

@@ -1,13 +1,13 @@
 package org.geneontology.obographs.core.model;
 
 import org.geneontology.obographs.core.model.meta.*;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 import java.util.Collections;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 
 public class MetaTest {
 

obographs-core/src/test/java/org/geneontology/obographs/core/model/NodeTest.java

@@ -1,9 +1,11 @@
 package org.geneontology.obographs.core.model;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 public class NodeTest {
 
@@ -37,4 +39,13 @@ public static Node buildParent() {
         return new Node.Builder().id(parent_id).label(parent_lbl).build();
     }
 
+    @Test
+    public void testComparator() {
+        Node aa = new Node.Builder().id("a").label("a").build();
+        Node ab = new Node.Builder().id("a").label("b").build();
+
+        assertThat(aa.compareTo(ab), equalTo(-1));
+        assertThat(aa.compareTo(aa), equalTo(0));
+        assertThat(ab.compareTo(aa), equalTo(1));
+    }
 }

obographs-core/src/test/java/org/geneontology/obographs/core/model/axiom/AdvancedAxiomsTest.java

@@ -4,14 +4,14 @@
 import org.geneontology.obographs.core.io.OgJsonGenerator;
 import org.geneontology.obographs.core.io.OgYamlGenerator;
 import org.geneontology.obographs.core.model.*;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class AdvancedAxiomsTest {
 

obographs-core/src/test/java/org/geneontology/obographs/core/model/axiom/DomainRangeAxiomTest.java

@@ -1,8 +1,8 @@
 package org.geneontology.obographs.core.model.axiom;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class DomainRangeAxiomTest {
 

obographs-core/src/test/java/org/geneontology/obographs/core/model/axiom/EquivalentNodesSetTest.java

@@ -1,13 +1,13 @@
 package org.geneontology.obographs.core.model.axiom;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Set;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class EquivalentNodesSetTest {
 

obographs-core/src/test/java/org/geneontology/obographs/core/model/axiom/ExistentialRestrictionAxiomTest.java

@@ -1,9 +1,9 @@
 package org.geneontology.obographs.core.model.axiom;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class ExistentialRestrictionAxiomTest {
 

obographs-core/src/test/java/org/geneontology/obographs/core/model/axiom/LogicalDefinitionAxiomTest.java

@@ -1,14 +1,14 @@
 package org.geneontology.obographs.core.model.axiom;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class LogicalDefinitionAxiomTest {
 

obographs-core/src/test/java/org/geneontology/obographs/core/model/axiom/PropertyChainAxiomTest.java

@@ -1,11 +1,11 @@
 package org.geneontology.obographs.core.model.axiom;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class PropertyChainAxiomTest {
 

obographs-core/src/test/java/org/geneontology/obographs/core/model/meta/SynonymPropertyValueTest.java

@@ -1,12 +1,12 @@
 package org.geneontology.obographs.core.model.meta;
 
 import org.geneontology.obographs.core.model.meta.AbstractSynonymPropertyValue.SCOPES;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class SynonymPropertyValueTest {
 

obographs-core/src/test/java/org/geneontology/obographs/core/model/meta/XrefPropertyValueTest.java

@@ -1,8 +1,8 @@
 package org.geneontology.obographs.core.model.meta;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class XrefPropertyValueTest {
 

obographs-owlapi/src/test/java/org/geneontology/obographs/owlapi/FromOwlPerfTest.java

@@ -4,7 +4,7 @@
 import org.geneontology.obographs.core.io.OgJsonGenerator;
 import org.geneontology.obographs.core.io.OgYamlGenerator;
 import org.geneontology.obographs.core.model.GraphDocument;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.semanticweb.owlapi.apibinding.OWLManager;
 import org.semanticweb.owlapi.model.IRI;
 import org.semanticweb.owlapi.model.OWLOntology;

obographs-owlapi/src/test/java/org/geneontology/obographs/owlapi/FromOwlTest.java

@@ -9,7 +9,7 @@
 import org.geneontology.obographs.core.model.*;
 import org.geneontology.obographs.core.model.AbstractNode.PropertyType;
 import org.geneontology.obographs.core.model.meta.BasicPropertyValue;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.semanticweb.owlapi.apibinding.OWLManager;
 import org.semanticweb.owlapi.model.IRI;
 import org.semanticweb.owlapi.model.OWLOntology;
@@ -28,8 +28,8 @@
 
 import static org.geneontology.obographs.core.model.AbstractNode.RDFTYPES.*;
 import static org.hamcrest.CoreMatchers.equalTo;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.fail;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.fail;
 
 /**
  * Generates json from OWL and tests the content returned for equality.

obographs-owlapi/src/test/java/org/geneontology/obographs/owlapi/PrefixHelperTest.java

@@ -1,14 +1,14 @@
 package org.geneontology.obographs.owlapi;
 
 import com.github.jsonldjava.core.Context;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.semanticweb.owlapi.util.DefaultPrefixManager;
 
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class PrefixHelperTest {
 
@@ -22,9 +22,9 @@ public void testContext() throws IOException {
         PrefixHelper ioh = new PrefixHelper();
         Context context = ioh.getContext();
 
-        assertEquals("Check GO prefix",
+        assertEquals(
                 "http://purl.obolibrary.org/obo/GO_",
-                context.getPrefixes(false).get("GO"));
+                context.getPrefixes(false).get("GO"), "Check GO prefix");
     }
 
     /**
@@ -51,7 +51,7 @@ public void testContextHandling() throws IOException {
         Map<String, String> expected = new HashMap<String, String>();
         expected.put("foo", "http://example.com#");
         expected.put("bar", "http://example.com#");
-        assertEquals("Check JSON prefixes", expected, ioh.getPrefixes());
+        assertEquals(expected, ioh.getPrefixes(), "Check JSON prefixes");
     }
 
     /**
@@ -63,22 +63,22 @@ public void testContextHandling() throws IOException {
     public void testPrefixHandling() throws IOException {
         PrefixHelper ioh = new PrefixHelper(false);
         Map<String, String> expected = new HashMap<String, String>();
-        assertEquals("Check no prefixes", expected, ioh.getPrefixes());
+        assertEquals(expected, ioh.getPrefixes(), "Check no prefixes");
 
         ioh.addPrefix("foo", "http://example.com#");
         expected.put("foo", "http://example.com#");
-        assertEquals("Check foo prefix", expected, ioh.getPrefixes());
+        assertEquals(expected, ioh.getPrefixes(), "Check foo prefix");
 
         String json = String.format("{%n"
                     + "  \"@context\" : {%n"
                     + "    \"foo\" : \"http://example.com#\"%n"
                     + "  }%n"
                     + "}");
-        assertEquals("Check JSON-LD", json, ioh.getContextString());
+        assertEquals(json, ioh.getContextString(), "Check JSON-LD");
 
         ioh.addPrefix("bar: http://example.com#");
         expected.put("bar", "http://example.com#");
-        assertEquals("Check no prefixes", expected, ioh.getPrefixes());
+        assertEquals(expected, ioh.getPrefixes(), "Check no prefixes");
     }
 
     /**
@@ -91,9 +91,9 @@ public void testPrefixManager() throws IOException {
         PrefixHelper ioh = new PrefixHelper();
         DefaultPrefixManager pm = ioh.getPrefixManager();
 
-        assertEquals("Check GO CURIE",
-                "http://purl.obolibrary.org/obo/GO_12345",
-                pm.getIRI("GO:12345").toString());
+        assertEquals("http://purl.obolibrary.org/obo/GO_12345",
+                pm.getIRI("GO:12345").toString(),
+                "Check GO CURIE");
     }
 
 }

pom.xml

@@ -45,6 +45,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <java.version>11</java.version>
         <jackson.version>2.12.7</jackson.version>
+        <junit.jupiter.version>5.3.0</junit.jupiter.version>
     </properties>
 
     <distributionManagement>
@@ -164,9 +165,9 @@
             <version>${jackson.version}</version>
         </dependency>
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.12</version>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <version>${junit.jupiter.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>