Merge pull request #31 from tonicebrian/bump-scalatest

Bump scalatest/scalastic version to 3.1.0

README.md

@@ -58,7 +58,7 @@ Contributors:
 
 * [Eric Prud'hommeaux](https://www.w3.org/People/Eric/)
 * [Bogdan Roman](https://github.com/bogdanromanx)
-* [Toni Cebrían](http://www.tonicebrian.com/)
+* [Toni Cebrián](http://www.tonicebrian.com/)
 * [Andrew Berezovskyi](https://github.com/berezovskyi)
 
 ## Adopters

modules/depGraphs/src/test/scala/es/weso/depgraphs/DepGraphTest.scala

@@ -1,9 +1,11 @@
 package es.weso.depgraphs
 
-import org.scalatest._
+import org.scalatest._
+import org.scalatest.funspec.AnyFunSpec
+import org.scalatest.matchers.should.Matchers
 
 class DepGraphTest
-  extends FunSpec
+  extends AnyFunSpec
   with Matchers
   with EitherValues {
 

modules/rbe/src/test/scala/es/weso/collection/BagTest.scala

@@ -1,12 +1,9 @@
 package es.weso.collection
 
-import org.scalatest._
-import org.scalatestplus.scalacheck._
+import org.scalatest.funspec.AnyFunSpec
+import org.scalatest.matchers.should.Matchers
 
-class BagTest
-  extends FunSpec
-  with Matchers
-  with Checkers {
+class BagTest extends AnyFunSpec with Matchers {
 
   describe("A Bag") {
 
@@ -41,8 +38,8 @@ class BagTest
     }
 
     it("should calculate delta") {
-      val bag = Bag.toBag(List(1, 1, 2, 2, 3))
-      val delta = Bag.delta(Seq(1, 2), bag)
+      val bag      = Bag.toBag(List(1, 1, 2, 2, 3))
+      val delta    = Bag.delta(Seq(1, 2), bag)
       val expected = Bag.toBag(List(1, 1, 2, 2))
       delta should be(expected)
     }
@@ -76,7 +73,7 @@ class BagTest
       )
     }
 
-*/
+   */
   }
 
 }

modules/rbe/src/test/scala/es/weso/collection/SortedMapBagTest.scala

@@ -1,20 +1,18 @@
 package es.weso.collection
 
-import org.scalatest._
-import org.scalatestplus.scalacheck._
+import org.scalatest.funspec.AnyFunSpec
+import org.scalatest.matchers.should.Matchers
 
 import scala.collection.SortedMap
 
-class SortedMapBagTest extends FunSpec with Matchers with Checkers {
+class SortedMapBagTest extends AnyFunSpec with Matchers {
 
   describe("A SortedMap Bag") {
     it("Should add one element and have multiplicity 1") {
       val sm: SortedMap[Char, Int] = SortedMap[Char, Int]()
-      val bag = BagSortedMap[Char](sm)
-      val expected = SortedMap[Char, Int]('b' -> 3)
+      val bag                      = BagSortedMap[Char](sm)
+      val expected                 = SortedMap[Char, Int]('b' -> 3)
       bag.add('b', 3).asSortedMap should be(expected)
     }
-
   }
-
-}
+}

modules/rbe/src/test/scala/es/weso/rbe/RbeTest.scala

@@ -1,10 +1,10 @@
 package es.weso.rbe
 
-import org.scalatest._
+import org.scalatest.matchers.should.Matchers
 import es.weso.collection._
-import org.scalatestplus.scalacheck._
+import org.scalatest.funspec.AnyFunSpec
 
-class RbeTest extends FunSpec with Matchers with ScalaCheckDrivenPropertyChecks {
+class RbeTest extends AnyFunSpec with Matchers {
 
   describe("Symbols") {
     val rbe = Or(And(Symbol("a", 1, 3), Symbol("b", 1, 1)), Symbol("b", 2, 3))
@@ -16,4 +16,4 @@ class RbeTest extends FunSpec with Matchers with ScalaCheckDrivenPropertyChecks
     rbe.noSymbolsInBag(Bag("a", "c")) should be(false)
   }
 
-}
+}

modules/rbe/src/test/scala/es/weso/rbe/interval/BagMatchers.scala

@@ -2,9 +2,11 @@ package es.weso.rbe.interval
 
 import es.weso.collection.Bag
 import es.weso.rbe.Rbe
-import org.scalatest._
+import org.scalatest._
+import org.scalatest.funspec.AnyFunSpec
+import org.scalatest.matchers.should.Matchers
 
-trait BagMatchers extends FunSpec with Matchers {
+trait BagMatchers extends AnyFunSpec with Matchers {
   def matchBag[A](rbe: Rbe[A], bag: Bag[A], open: Boolean = true) = {
     it(s"${rbe} should match ${bag}. Open: $open") {
       val checker = IntervalChecker(rbe)

modules/rbe/src/test/scala/es/weso/rbe/interval/IntervalSingleTest.scala

@@ -2,9 +2,9 @@ package es.weso.rbe.interval
 
 import es.weso.collection._
 import es.weso.rbe._
-import org.scalatest._
+import org.scalatest.funspec.AnyFunSpec
 
-class IntervalSingleTest extends FunSpec with BagMatchers {
+class IntervalSingleTest extends AnyFunSpec with BagMatchers {
 
   describe("Single test") {
     //    noMatchBag(Repeat(Symbol("a", 1, 1), 0, 0), Bag.toBag(List("a")))

modules/rbe/src/test/scala/es/weso/rbe/interval/IntervalTest.scala

@@ -2,9 +2,11 @@ package es.weso.rbe.interval
 
 import es.weso.collection._
 import es.weso.rbe._
-import org.scalatest._
+import org.scalatest._
+import org.scalatest.funspec.AnyFunSpec
+import org.scalatest.matchers.should.Matchers
 
-class IntervalTest extends FunSpec with Matchers with BagMatchers {
+class IntervalTest extends AnyFunSpec with Matchers with BagMatchers {
 
   describe("Intervals calculation") {
 

modules/shapeMaps/src/test/scala/es/weso/shapeMaps/ResultShapeMapTest.scala

@@ -2,9 +2,11 @@ package es.weso.shapeMaps
 
 import es.weso.rdf.jena.RDFAsJenaModel
 import es.weso.rdf.nodes._
-import org.scalatest._
+import org.scalatest._
+import org.scalatest.funspec.AnyFunSpec
+import org.scalatest.matchers.should.Matchers
 
-class ResultShapeMapTest extends FunSpec with Matchers with TryValues with OptionValues {
+class ResultShapeMapTest extends AnyFunSpec with Matchers with TryValues with OptionValues {
 
 /*  describe("ResultShapeMaps") {
     val rdfStr =

modules/shapeMaps/src/test/scala/es/weso/shapeMaps/ShapeMapJsonTest.scala

@@ -3,9 +3,11 @@ package es.weso.shapeMaps
 import es.weso.utils.json.JsonCompare
 import es.weso.rdf._
 import es.weso.rdf.nodes._
-import org.scalatest._
+import org.scalatest._
+import org.scalatest.funspec.AnyFunSpec
+import org.scalatest.matchers.should.Matchers
 
-class ShapeMapJsonTest extends FunSpec with Matchers with TryValues with OptionValues {
+class ShapeMapJsonTest extends AnyFunSpec with Matchers with TryValues with OptionValues {
 
   describe(s"Parse Json shapemaps") {
     it("can parse Json example") {

modules/shapeMaps/src/test/scala/es/weso/shapeMaps/ShapeMapTest.scala

@@ -4,9 +4,11 @@ import org.scalatest._
 import es.weso.rdf.nodes._
 import es.weso.rdf.jena.RDFAsJenaModel
 import es.weso.rdf._
-import es.weso.rdf.path.PredicatePath
+import es.weso.rdf.path.PredicatePath
+import org.scalatest.funspec.AnyFunSpec
+import org.scalatest.matchers.should.Matchers
 
-class ShapeMapTest extends FunSpec with Matchers with TryValues with OptionValues {
+class ShapeMapTest extends AnyFunSpec with Matchers with TryValues with OptionValues {
 
   describe("ShapeMaps") {
 

modules/shex/src/test/scala/es/weso/shex/CardinalityTest.scala

@@ -1,7 +1,9 @@
 package es.weso.shex
-import org.scalatest._
+import org.scalatest._
+import org.scalatest.funspec.AnyFunSpec
+import org.scalatest.matchers.should.Matchers
 
-class CardinalityTest extends FunSpec with Matchers with EitherValues {
+class CardinalityTest extends AnyFunSpec with Matchers with EitherValues {
 
   describe(s"Cardinality test") {
     checkBetween(2,1,IntMax(5))

modules/shex/src/test/scala/es/weso/shex/NormalizeShapeTest.scala

@@ -2,9 +2,11 @@ package es.weso.shex
 
 import es.weso.rdf.nodes._
 import es.weso.shex.normalized.{Constraint, NormalizedShape}
-import org.scalatest._
+import org.scalatest._
+import org.scalatest.funspec.AnyFunSpec
+import org.scalatest.matchers.should.Matchers
 
-class NormalizeShapeTest extends FunSpec with Matchers with EitherValues {
+class NormalizeShapeTest extends AnyFunSpec with Matchers with EitherValues {
 
   describe(s"Normalize shape with IRI") {
     val shexStr =

modules/shex/src/test/scala/es/weso/shex/PathsTest.scala

@@ -1,9 +1,11 @@
 package es.weso.shex
 
 import es.weso.rdf.nodes._
-import org.scalatest._
+import org.scalatest._
+import org.scalatest.funspec.AnyFunSpec
+import org.scalatest.matchers.should.Matchers
 
-class PathsTest extends FunSpec with Matchers with EitherValues {
+class PathsTest extends AnyFunSpec with Matchers with EitherValues {
 
   describe(s"Calculates paths of a shape") {
       val shexStr =

modules/shex/src/test/scala/es/weso/shex/SchemaEncodeJsonEqualsJsonTest.scala

@@ -14,9 +14,11 @@ import io.circe.parser.parse
 import io.circe.syntax._
 import cats.data.EitherT
 import org.scalatest._
-import cats.effect._
+import cats.effect._
+import org.scalatest.funspec.AnyFunSpec
+import org.scalatest.matchers.should.Matchers
 
-class SchemaEncodeJsonEqualsJsonTest extends FunSpec with JsonTest with Matchers with EitherValues {
+class SchemaEncodeJsonEqualsJsonTest extends AnyFunSpec with JsonTest with Matchers with EitherValues {
 
   val conf: Config = ConfigFactory.load()
   val schemasFolder = conf.getString("schemasFolder")

modules/shex/src/test/scala/es/weso/shex/SchemaParseShowEqualsCompatTest.scala

@@ -14,9 +14,11 @@ import es.weso.utils.FileUtils._
 import io.circe.syntax._
 import org.scalatest._
 import cats.data.EitherT
-import cats.effect._
+import cats.effect._
+import org.scalatest.funspec.AnyFunSpec
+import org.scalatest.matchers.should.Matchers
 
-class SchemaParseShowEqualsCompatTest extends FunSpec with JsonTest with Matchers with EitherValues with OptionValues {
+class SchemaParseShowEqualsCompatTest extends AnyFunSpec with JsonTest with Matchers with EitherValues with OptionValues {
 
   val conf: Config = ConfigFactory.load()
   val schemasFolder = conf.getString("schemasFolder")

modules/shex/src/test/scala/es/weso/shex/ShExJsonSingleTest.scala

@@ -6,9 +6,11 @@ import scala.io._
 import es.weso.shex.implicits.decoderShEx._
 import es.weso.shex.implicits.encoderShEx._
 import es.weso.shex.implicits.showShEx._
-import es.weso.utils.json._
+import es.weso.utils.json._
+import org.scalatest.funspec.AnyFunSpec
+import org.scalatest.matchers.should.Matchers
 
-class ShExJsonSingleTest extends FunSpec with JsonTest with Matchers with EitherValues {
+class ShExJsonSingleTest extends AnyFunSpec with JsonTest with Matchers with EitherValues {
 
   val conf: Config = ConfigFactory.load()
   val schemasFolder = conf.getString("schemasFolder")

modules/shex/src/test/scala/es/weso/shex/ShExJsonTest.scala

@@ -8,9 +8,11 @@ import es.weso.shex.implicits.encoderShEx._
 import es.weso.shex.implicits.showShEx._
 import es.weso.utils.json._
 import es.weso.utils.FileUtils._
-import cats.effect._
+import cats.effect._
+import org.scalatest.funspec.AnyFunSpec
+import org.scalatest.matchers.should.Matchers
 
-class ShExJsonTest extends FunSpec with JsonTest with Matchers with EitherValues {
+class ShExJsonTest extends AnyFunSpec with JsonTest with Matchers with EitherValues {
 
   val conf: Config = ConfigFactory.load()
   val schemasFolder = conf.getString("schemasFolder")

modules/shex/src/test/scala/es/weso/shex/WellFormedTest.scala

@@ -1,7 +1,9 @@
 package es.weso.shex
-import org.scalatest._
+import org.scalatest._
+import org.scalatest.funspec.AnyFunSpec
+import org.scalatest.matchers.should.Matchers
 
-class WellFormedTest extends FunSpec with Matchers with EitherValues {
+class WellFormedTest extends AnyFunSpec with Matchers with EitherValues {
 
   describe(s"WellFormedTest") {
 

modules/shex/src/test/scala/es/weso/shex/actions/TestSemanticActionTest.scala

@@ -2,9 +2,11 @@ package es.weso.shex.actions
 
 import es.weso.rdf.jena.RDFAsJenaModel
 import es.weso.rdf.nodes.IRI
-import org.scalatest._
+import org.scalatest._
+import org.scalatest.funspec.AnyFunSpec
+import org.scalatest.matchers.should.Matchers
 
-class TestSemanticActionTest extends FunSpec with Matchers with EitherValues {
+class TestSemanticActionTest extends AnyFunSpec with Matchers with EitherValues {
 
   describe(s"Test of TestSemanticAction processor") {
     it(s"Should run print code") {

modules/shex/src/test/scala/es/weso/shex/btValidator/BtValidatorTest.scala

@@ -7,9 +7,11 @@ import es.weso.rdf.nodes.{IRI, RDFNode}
 import es.weso.rdf.triples.RDFTriple
 import es.weso.rdf.PREFIXES._
 import es.weso.shapeMaps.{IRILabel, ShapeMapLabel}
-import es.weso.shex._
+import es.weso.shex._
+import org.scalatest.funspec.AnyFunSpec
+import org.scalatest.matchers.should.Matchers
 
-class BtValidatorTest extends FunSpec with Matchers with EitherValues {
+class BtValidatorTest extends AnyFunSpec with Matchers with EitherValues {
 
   describe(s"BtValidator semantics") {
     it(s"Should validate OK") {

modules/shex/src/test/scala/es/weso/shex/compact/CompactShowTest.scala

@@ -2,9 +2,11 @@ package es.weso.shex.compact
 
 import cats.implicits._
 import es.weso.shex.Schema
-import org.scalatest._
+import org.scalatest._
+import org.scalatest.funspec.AnyFunSpec
+import org.scalatest.matchers.should.Matchers
 
-class CompactShowTest extends FunSpec with Matchers with EitherValues {
+class CompactShowTest extends AnyFunSpec with Matchers with EitherValues {
 
   describe(s"Compact show test") {
    shouldShowAndParse(

modules/shex/src/test/scala/es/weso/shex/compact/CompactSyntaxLocalTest.scala

@@ -10,9 +10,11 @@ import es.weso.shex.compact.Parser._
 import es.weso.shex.compact.CompactShow._
 import es.weso.shex.implicits.eqShEx._
 import cats._
-import es.weso.rdf.nodes.IRI
+import es.weso.rdf.nodes.IRI
+import org.scalatest.funspec.AnyFunSpec
+import org.scalatest.matchers.should.Matchers
 
-class CompactSyntaxLocalTest extends FunSpec with Matchers with EitherValues {
+class CompactSyntaxLocalTest extends AnyFunSpec with Matchers with EitherValues {
 
   val conf: Config = ConfigFactory.load()
   val shexLocalFolder = conf.getString("shexLocalFolder")

modules/shex/src/test/scala/es/weso/shex/compact/CompareJsonSingleTest.scala

@@ -11,11 +11,13 @@ import es.weso.utils.FileUtils._
 import es.weso.utils.json.{JsonCompare, JsonTest}
 import io.circe.parser._
 import io.circe.syntax._
-import org.scalatest.{EitherValues, FunSpec, Matchers}
+import org.scalatest.EitherValues
 
-import scala.io._
+import scala.io._
+import org.scalatest.funspec.AnyFunSpec
+import org.scalatest.matchers.should.Matchers
 
-class CompareJsonSingleTest extends FunSpec with JsonTest with Matchers with EitherValues {
+class CompareJsonSingleTest extends AnyFunSpec with JsonTest with Matchers with EitherValues {
 
   val name = "1val1emptylanguageStemMinuslanguage3"
   val conf: Config = ConfigFactory.load()

modules/shex/src/test/scala/es/weso/shex/compact/CompareJsonTest.scala

@@ -9,11 +9,13 @@ import es.weso.utils.FileUtils._
 import es.weso.utils.json.JsonTest
 import io.circe.parser._
 import io.circe.syntax._
-import org.scalatest.{EitherValues, FunSpec, Matchers}
+import org.scalatest.EitherValues
 
-import scala.io._
+import scala.io._
+import org.scalatest.funspec.AnyFunSpec
+import org.scalatest.matchers.should.Matchers
 
-class CompareJsonTest extends FunSpec with JsonTest with Matchers with EitherValues {
+class CompareJsonTest extends AnyFunSpec with JsonTest with Matchers with EitherValues {
 
   val conf: Config = ConfigFactory.load()
   val schemasFolder = conf.getString("schemasFolder")