Merge branch 'develop' of https://github.com/SANSA-Stack/SANSA-Inference

into develop
SANSA-Stack · Jun 27, 2020 · d7b8918 · d7b8918
2 parents b129dd6 + 02b91cc
commit d7b8918
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 11 deletions.
diff --git a/sansa-inference-common/pom.xml b/sansa-inference-common/pom.xml
@@ -96,11 +96,6 @@
       <artifactId>scalatest_${scala.binary.version}</artifactId>
     </dependency>
 
-    <dependency>
-      <groupId>org.scalatestplus</groupId>
-      <artifactId>scalatestplus-junit_${scala.binary.version}</artifactId>
-    </dependency>
-
     <dependency>
       <groupId>org.scalatestplus</groupId>
       <artifactId>junit-4-12_${scala.binary.version}</artifactId>

diff --git a/...inference-tests/src/test/scala/net/sansa_stack/test/conformance/ConformanceTestBase.scala b/...inference-tests/src/test/scala/net/sansa_stack/test/conformance/ConformanceTestBase.scala
@@ -8,9 +8,8 @@ import com.typesafe.scalalogging.LazyLogging
 import org.apache.jena.rdf.model.Model
 import org.apache.jena.shared.PrefixMapping
 import org.junit.runner.RunWith
-import org.scalatestplus.junit.JUnitRunner
-import org.scalatest.BeforeAndAfterAll
-import org.scalatest.flatspec.AnyFlatSpec
+import org.scalatest.junit.JUnitRunner
+import org.scalatest.{BeforeAndAfterAll, FlatSpec}
 
 import net.sansa_stack.inference.data.{RDF, RDFOps}
 
@@ -22,7 +21,7 @@ import net.sansa_stack.inference.data.{RDF, RDFOps}
   */
 @RunWith(classOf[JUnitRunner])
 abstract class ConformanceTestBase[Rdf <: RDF](val rdfOps: RDFOps[Rdf])
-  extends AnyFlatSpec
+  extends FlatSpec
     with BeforeAndAfterAll
     with LazyLogging {
 

diff --git a/...e-tests/src/test/scala/net/sansa_stack/test/conformance/OWLHorstConformanceTestBase.scala b/...e-tests/src/test/scala/net/sansa_stack/test/conformance/OWLHorstConformanceTestBase.scala
@@ -2,7 +2,7 @@ package net.sansa_stack.test.conformance
 
 import net.sansa_stack.inference.data.{RDF, RDFOps}
 import org.junit.runner.RunWith
-import org.scalatestplus.junit.JUnitRunner
+import org.scalatest.junit.JUnitRunner
 
 /**
   * The class is to test the conformance of each materialization rule of OWL Horst entailment.

diff --git a/...rence-tests/src/test/scala/net/sansa_stack/test/conformance/RDFSConformanceTestBase.scala b/...rence-tests/src/test/scala/net/sansa_stack/test/conformance/RDFSConformanceTestBase.scala
@@ -2,7 +2,7 @@ package net.sansa_stack.test.conformance
 
 import net.sansa_stack.inference.data.{RDF, RDFOps}
 import org.junit.runner.RunWith
-import org.scalatestplus.junit.JUnitRunner
+import org.scalatest.junit.JUnitRunner
 
 
 /**