Unifies test naming standard

free/src/test/scala/cats/free/CofreeTests.scala → free/src/test/scala/cats/free/CofreeSuite.scala

@@ -7,9 +7,9 @@ import cats.syntax.list._
 import cats.tests.{CatsSuite, Spooky}
 import org.scalacheck.{Arbitrary, Cogen, Gen}
 
-class CofreeTests extends CatsSuite {
+class CofreeSuite extends CatsSuite {
 
-  import CofreeTests._
+  import CofreeSuite._
 
   implicit val iso = SemigroupalTests.Isomorphisms.invariant[Cofree[Option, ?]]
 
@@ -116,9 +116,9 @@ class CofreeTests extends CatsSuite {
 
 }
 
-object CofreeTests extends CofreeTestsInstances
+object CofreeSuite extends CofreeSuiteInstances
 
-sealed trait CofreeTestsInstances {
+sealed trait CofreeSuiteInstances {
 
   type CofreeNel[A] = Cofree[Option, A]
   type CofreeRoseTree[A] = Cofree[List, A]

free/src/test/scala/cats/free/CoyonedaTests.scala → free/src/test/scala/cats/free/CoyonedaSuite.scala

@@ -7,7 +7,7 @@ import cats.laws.discipline.{FunctorTests, SerializableTests}
 
 import org.scalacheck.Arbitrary
 
-class CoyonedaTests extends CatsSuite {
+class CoyonedaSuite extends CatsSuite {
   implicit def coyonedaArbitrary[F[_] : Functor, A : Arbitrary](implicit F: Arbitrary[F[A]]): Arbitrary[Coyoneda[F, A]] =
     Arbitrary(F.arbitrary.map(Coyoneda.lift))
 

free/src/test/scala/cats/free/FreeApplicativeTests.scala → free/src/test/scala/cats/free/FreeApplicativeSuite.scala

@@ -8,8 +8,8 @@ import cats.data.State
 
 import org.scalacheck.{Arbitrary, Gen}
 
-class FreeApplicativeTests extends CatsSuite {
-  import FreeApplicativeTests._
+class FreeApplicativeSuite extends CatsSuite {
+  import FreeApplicativeSuite._
 
   implicit val iso = SemigroupalTests.Isomorphisms.invariant[FreeApplicative[Option, ?]]
 
@@ -130,7 +130,7 @@ class FreeApplicativeTests extends CatsSuite {
   }
 }
 
-object FreeApplicativeTests {
+object FreeApplicativeSuite {
   private def freeGen[F[_], A](maxDepth: Int)(implicit F: Arbitrary[F[A]], FF: Arbitrary[(A, A) => A], A: Arbitrary[A]): Gen[FreeApplicative[F, A]] = {
     val noFlatMapped = Gen.oneOf(
       A.arbitrary.map(FreeApplicative.pure[F, A]),

free/src/test/scala/cats/free/FreeInvariantMonoidalTests.scala → free/src/test/scala/cats/free/FreeInvariantMonoidalSuite.scala

@@ -6,9 +6,9 @@ import cats.free.FreeInvariantMonoidal
 import cats.laws.discipline.{InvariantMonoidalTests, SerializableTests}
 import cats.laws.discipline.SemigroupalTests.Isomorphisms
 import org.scalacheck.{Arbitrary, Gen}
-import cats.tests.CsvCodecInvariantMonoidalTests._
+import cats.tests.CsvCodecInvariantMonoidalSuite._
 
-class FreeInvariantMonoidalTests extends CatsSuite {
+class FreeInvariantMonoidalSuite extends CatsSuite {
   implicit def freeInvariantMonoidalArbitrary[F[_], A](implicit F: Arbitrary[F[A]], A: Arbitrary[A]): Arbitrary[FreeInvariantMonoidal[F, A]] =
     Arbitrary(
       Gen.oneOf(

free/src/test/scala/cats/free/FreeTests.scala → free/src/test/scala/cats/free/FreeSuite.scala

@@ -10,8 +10,8 @@ import cats.tests.CatsSuite
 import org.scalacheck.{Arbitrary, Gen, Cogen}
 import Arbitrary.arbFunction1
 
-class FreeTests extends CatsSuite {
-  import FreeTests._
+class FreeSuite extends CatsSuite {
+  import FreeSuite._
 
   implicit val iso = SemigroupalTests.Isomorphisms.invariant[Free[Option, ?]]
 
@@ -195,7 +195,7 @@ class FreeTests extends CatsSuite {
   }
 }
 
-object FreeTests extends FreeTestsInstances {
+object FreeSuite extends FreeSuiteInstances {
   import cats.instances.function._
 
   implicit def trampolineArbitrary[A:Arbitrary]: Arbitrary[Trampoline[A]] =
@@ -205,7 +205,7 @@ object FreeTests extends FreeTestsInstances {
     freeEq[Function0, A]
 }
 
-sealed trait FreeTestsInstances {
+sealed trait FreeSuiteInstances {
   val headOptionU = λ[FunctionK[List,Option]](_.headOption)
 
   private def freeGen[F[_], A](maxDepth: Int)(implicit F: Arbitrary[F[A]], A: Arbitrary[A]): Gen[Free[F, A]] = {

free/src/test/scala/cats/free/FreeTTests.scala → free/src/test/scala/cats/free/FreeTSuite.scala

@@ -10,9 +10,9 @@ import cats.tests.CatsSuite
 import cats.instances.option._
 import org.scalacheck.{Arbitrary, Gen, Cogen}
 
-class FreeTTests extends CatsSuite {
+class FreeTSuite extends CatsSuite {
 
-  import FreeTTests._
+  import FreeTSuite._
 
   {
     implicit val freeTFlatMap: FlatMap[FreeTOption] = FreeT.catsFreeFlatMapForFreeT[Option, Option]
@@ -137,7 +137,7 @@ class FreeTTests extends CatsSuite {
 
 }
 
-object FreeTTests extends FreeTTestsInstances {
+object FreeTSuite extends FreeTSuiteInstances {
 
   import Arbitrary._
   import org.scalacheck.Arbitrary
@@ -167,12 +167,12 @@ object FreeTTests extends FreeTTestsInstances {
 
 }
 
-trait FreeTTestsInstances {
+trait FreeTSuiteInstances {
 
   import FreeT._
   import IndexedStateT._
   import cats.kernel.instances.option._
-  import cats.tests.IndexedStateTTests._
+  import cats.tests.IndexedStateTSuite._
   import SemigroupalTests._
 
   type IntState[A] = State[Int, A]

free/src/test/scala/cats/free/YonedaTests.scala → free/src/test/scala/cats/free/YonedaSuite.scala

@@ -6,7 +6,7 @@ import cats.laws.discipline.{FunctorTests, SerializableTests}
 
 import org.scalacheck.Arbitrary
 
-class YonedaTests extends CatsSuite {
+class YonedaSuite extends CatsSuite {
   implicit def yonedaArbitrary[F[_] : Functor, A](implicit F: Arbitrary[F[A]]): Arbitrary[Yoneda[F, A]] =
     Arbitrary(F.arbitrary.map(Yoneda(_)))
 

jvm/src/test/scala/cats/tests/FutureTests.scala → jvm/src/test/scala/cats/tests/FutureSuite.scala

@@ -14,7 +14,7 @@ import org.scalacheck.{Arbitrary, Cogen}
 import org.scalacheck.Arbitrary.arbitrary
 import org.scalacheck.rng.Seed
 
-class FutureTests extends CatsSuite {
+class FutureSuite extends CatsSuite {
   val timeout = 3.seconds
 
   def futureEither[A](f: Future[A]): Future[Either[Throwable, A]] =

tests/src/test/scala-2.11+/cats/tests/RegressionTests.scala

@@ -2,9 +2,9 @@ package cats
 package tests
 
 
-import ExtraRegressionTests._
+import ExtraRegressionSuite._
 
-class ExtraRegressionTests extends CatsSuite {
+class ExtraRegressionSuite extends CatsSuite {
   /**
    * Placed here to work around scala/bug#6260 on scala 2.10
    */
@@ -14,7 +14,7 @@ class ExtraRegressionTests extends CatsSuite {
 }
 
 
-object ExtraRegressionTests {
+object ExtraRegressionSuite {
   final case class First[A](getFirst: A) extends AnyVal
   object First {
     implicit def showInstance[A](implicit ev: Show[A]): Show[First[A]] = new Show[First[A]] {

tests/src/test/scala/cats/tests/AlgebraInvariantTests.scala → tests/src/test/scala/cats/tests/AlgebraInvariantSuite.scala

@@ -3,12 +3,12 @@ package tests
 
 import cats.Invariant
 import cats.kernel._
-import cats.kernel.laws.discipline.{SemigroupTests => SemigroupLawTests, MonoidTests => MonoidLawTests, GroupTests => GroupLawTests, _}
+import cats.kernel.laws.discipline.{SemigroupTests, MonoidTests, GroupTests, _}
 import cats.laws.discipline.{InvariantMonoidalTests, InvariantTests, SerializableTests, SemigroupalTests}
 import cats.laws.discipline.eq._
 import org.scalacheck.{Arbitrary, Gen}
 
-class AlgebraInvariantTests extends CatsSuite {
+class AlgebraInvariantSuite extends CatsSuite {
 
   val intMultiplication: CommutativeMonoid[Int] = new CommutativeMonoid[Int] {
     val empty = 1
@@ -61,25 +61,25 @@ class AlgebraInvariantTests extends CatsSuite {
 
 
 
-  checkAll("InvariantMonoidal[Semigroup]", SemigroupLawTests[Int](InvariantMonoidal[Semigroup].pure(0)).semigroup)
+  checkAll("InvariantMonoidal[Semigroup]", SemigroupTests[Int](InvariantMonoidal[Semigroup].pure(0)).semigroup)
   checkAll("InvariantMonoidal[CommutativeSemigroup]", CommutativeSemigroupTests[Int](InvariantMonoidal[CommutativeSemigroup].pure(0)).commutativeSemigroup)
 
   checkAll("Semigroupal[Monoid]", SemigroupalTests[Monoid].semigroupal[Int, Int, Int])
 
 
   {
     val S: Semigroup[Int] = Semigroup[Int].imap(identity)(identity)
-    checkAll("Semigroup[Int]", SemigroupLawTests[Int](S).semigroup)
+    checkAll("Semigroup[Int]", SemigroupTests[Int](S).semigroup)
   }
 
   {
     val S: Monoid[Int] = Monoid[Int].imap(identity)(identity)
-    checkAll("Monoid[Int]", MonoidLawTests[Int](S).monoid)
+    checkAll("Monoid[Int]", MonoidTests[Int](S).monoid)
   }
 
   {
     val S: Group[Int] = Group[Int].imap(identity)(identity)
-    checkAll("Group[Int]", GroupLawTests[Int](S).group)
+    checkAll("Group[Int]", GroupTests[Int](S).group)
   }
 
   {

tests/src/test/scala/cats/tests/ApplicativeErrorCheck.scala → tests/src/test/scala/cats/tests/ApplicativeErrorSuite.scala

@@ -3,7 +3,7 @@ package tests
 
 import cats.data.EitherT
 
-class ApplicativeErrorCheck extends CatsSuite {
+class ApplicativeErrorSuite extends CatsSuite {
   val failed: Option[Int] =
     (()).raiseError[Option, Int]
 

tests/src/test/scala/cats/tests/ApplicativeTests.scala → tests/src/test/scala/cats/tests/ApplicativeSuite.scala

@@ -4,7 +4,7 @@ package tests
 import cats.Applicative
 
 
-class ApplicativeCheck extends CatsSuite {
+class ApplicativeSuite extends CatsSuite {
 
   test("Applicative#traverse is equivalent to Traverse#traverse") {
     val f: (Int) => Option[Int] = x => Some(x + 1)

tests/src/test/scala/cats/tests/AsTests.scala → tests/src/test/scala/cats/tests/AsSuite.scala

@@ -4,7 +4,7 @@ package tests
 import cats.laws.discipline.{CategoryTests, SerializableTests}
 import org.scalacheck.{Arbitrary, Gen}
 import cats.arrow.Category
-class AsTests extends CatsSuite {
+class AsSuite extends CatsSuite {
   import evidence._
 
   def toMap[A, B, X](fa: List[X])(implicit ev: X <~< (A,B)): Map[A,B] = {

tests/src/test/scala/cats/tests/BifoldableTests.scala → tests/src/test/scala/cats/tests/BifoldableSuite.scala

@@ -3,7 +3,7 @@ package tests
 
 import cats.laws.discipline.{BifoldableTests, SerializableTests}
 
-class BifoldableTest extends CatsSuite {
+class BifoldableSuite extends CatsSuite {
   type EitherEither[A, B] = Either[Either[A, B], Either[A, B]]
   val eitherComposeEither: Bifoldable[EitherEither] =
     Bifoldable[Either].compose[Either]

tests/src/test/scala/cats/tests/BifunctorTests.scala → tests/src/test/scala/cats/tests/BifunctorSuite.scala

@@ -4,7 +4,7 @@ package tests
 import cats.Bifunctor
 import cats.laws.discipline.{BifunctorTests, FunctorTests, SerializableTests}
 
-class BifunctorTest extends CatsSuite {
+class BifunctorSuite extends CatsSuite {
   type Tuple2Either[A, B] = (Either[A, B], Either[A, B])
   val tuple2ComposeEither: Bifunctor[Tuple2Either] =
     Bifunctor[Tuple2].compose[Either]

tests/src/test/scala/cats/tests/BitSetTests.scala → tests/src/test/scala/cats/tests/BitSetSuite.scala

@@ -5,7 +5,7 @@ import org.scalacheck.Arbitrary.arbitrary
 
 import scala.collection.immutable.BitSet
 
-class BitSetTests extends CatsSuite {
+class BitSetSuite extends CatsSuite {
   implicit val arbitraryBitSet: Arbitrary[BitSet] =
     Arbitrary(arbitrary[List[Short]].map(ns => BitSet(ns.map(_ & 0xffff): _*)))
 

tests/src/test/scala/cats/tests/BitraverseTests.scala → tests/src/test/scala/cats/tests/BitraverseSuite.scala

@@ -3,7 +3,7 @@ package tests
 
 import cats.laws.discipline.{BitraverseTests, SerializableTests}
 
-class BitraverseTest extends CatsSuite {
+class BitraverseSuite extends CatsSuite {
   type EitherTuple2[A, B] = Either[(A, B), (A, B)]
   val eitherComposeTuple2: Bitraverse[EitherTuple2] =
     Bitraverse[Either].compose[Tuple2]

tests/src/test/scala/cats/tests/CategoryTests.scala → tests/src/test/scala/cats/tests/CategorySuite.scala

@@ -1,19 +1,19 @@
 package cats
 package tests
 
-import cats.kernel.laws.discipline.{MonoidTests => MonoidLawTests}
+import cats.kernel.laws.discipline.MonoidTests
 
 import cats.arrow.Category
 import cats.laws.discipline.{MonoidKTests, SerializableTests}
 import cats.laws.discipline.eq.catsLawsEqForFn1
 
-class CategoryTest extends CatsSuite {
+class CategorySuite extends CatsSuite {
   val functionCategory = Category[Function1]
   type Endo[A] = Function1[A, A]
 
   checkAll("Category[Function1].algebraK", MonoidKTests[Endo](functionCategory.algebraK).monoidK[Int])
   checkAll("Category[Function1].algebraK", SerializableTests.serializable(functionCategory.algebraK))
 
   val functionAlgebra = functionCategory.algebra[Int]
-  checkAll("Category[Function1].algebra[Int]", MonoidLawTests[Endo[Int]](functionAlgebra).monoid)
+  checkAll("Category[Function1].algebra[Int]", MonoidTests[Endo[Int]](functionAlgebra).monoid)
 }

tests/src/test/scala/cats/tests/CokleisliTests.scala → tests/src/test/scala/cats/tests/CokleisliSuite.scala

@@ -9,7 +9,7 @@ import cats.laws.discipline.arbitrary._
 import cats.laws.discipline.eq._
 import org.scalacheck.Arbitrary
 
-class CokleisliTests extends SlowCatsSuite {
+class CokleisliSuite extends SlowCatsSuite {
 
   implicit override val generatorDrivenConfig: PropertyCheckConfiguration =
     slowCheckConfiguration.copy(

tests/src/test/scala/cats/tests/ComposeTest.scala → tests/src/test/scala/cats/tests/ComposeSuite.scala

@@ -1,21 +1,20 @@
 package cats
 package tests
 
-import cats.kernel.laws.discipline.{SemigroupTests => SemigroupLawTests}
-
+import cats.kernel.laws.discipline.SemigroupTests
 import cats.arrow.Compose
 import cats.laws.discipline.{SemigroupKTests, SerializableTests}
 import cats.laws.discipline.eq.catsLawsEqForFn1
 
-class ComposeTest extends CatsSuite {
+class ComposeSuite extends CatsSuite {
   val functionCompose = Compose[Function1]
   type Endo[A] = Function1[A, A]
 
   checkAll("Compose[Function1].algebraK", SemigroupKTests[Endo](functionCompose.algebraK).semigroupK[Int])
   checkAll("Compose[Function1].algebraK", SerializableTests.serializable(functionCompose.algebraK))
 
   val functionAlgebra = functionCompose.algebra[Int]
-  checkAll("Compose[Function1].algebra[Int]", SemigroupLawTests[Endo[Int]](functionAlgebra).semigroup)
+  checkAll("Compose[Function1].algebra[Int]", SemigroupTests[Endo[Int]](functionAlgebra).semigroup)
 
   test("syntax") {
     (((_: Int) + 1) <<< ((_: Int) / 2))(2) should be(2)

tests/src/test/scala/cats/tests/ConstTests.scala → tests/src/test/scala/cats/tests/ConstSuite.scala

@@ -2,19 +2,13 @@ package cats
 package tests
 
 
-import cats.kernel.laws.discipline.{
-  MonoidTests => MonoidLawTests,
-  SemigroupTests => SemigroupLawTests,
-  OrderTests => OrderLawTests,
-  PartialOrderTests => PartialOrderLawTests,
-  EqTests => EqLawTests
-}
+import cats.kernel.laws.discipline.{MonoidTests, SemigroupTests, OrderTests, PartialOrderTests, EqTests}
 import cats.Contravariant
 import cats.data.{Const, NonEmptyList}
 import cats.laws.discipline._
 import cats.laws.discipline.arbitrary._
 
-class ConstTests extends CatsSuite {
+class ConstSuite extends CatsSuite {
 
   implicit val iso = SemigroupalTests.Isomorphisms.invariant[Const[String, ?]](Const.catsDataTraverseForConst)
 
@@ -36,17 +30,17 @@ class ConstTests extends CatsSuite {
   }
 
   // Algebra checks for Serializability of instances as part of the laws
-  checkAll("Monoid[Const[Int, String]]", MonoidLawTests[Const[Int, String]].monoid)
+  checkAll("Monoid[Const[Int, String]]", MonoidTests[Const[Int, String]].monoid)
 
-  checkAll("Const[NonEmptyList[Int], String]", SemigroupLawTests[Const[NonEmptyList[Int], String]].semigroup)
+  checkAll("Const[NonEmptyList[Int], String]", SemigroupTests[Const[NonEmptyList[Int], String]].semigroup)
 
   // Note while Eq is a superclass of PartialOrder and PartialOrder a superclass
   // of Order, you can get different instances with different (more general) constraints.
   // For instance, you can get an Order for Const if the first type parameter has an Order,
   // but you can also get just an Eq for Const if the first type parameter has just an Eq
-  checkAll("Const[Map[Int, Int], String]", EqLawTests[Const[Map[Int, Int], String]].eqv)
-  checkAll("PartialOrder[Const[Set[Int], String]]", PartialOrderLawTests[Const[Set[Int], String]].partialOrder)
-  checkAll("Order[Const[Int, String]]", OrderLawTests[Const[Int, String]].order)
+  checkAll("Const[Map[Int, Int], String]", EqTests[Const[Map[Int, Int], String]].eqv)
+  checkAll("PartialOrder[Const[Set[Int], String]]", PartialOrderTests[Const[Set[Int], String]].partialOrder)
+  checkAll("Order[Const[Int, String]]", OrderTests[Const[Int, String]].order)
 
   checkAll("Const[String, Int]", ContravariantTests[Const[String, ?]].contravariant[Int, Int, Int])
   checkAll("Contravariant[Const[String, ?]]", SerializableTests.serializable(Contravariant[Const[String, ?]]))

tests/src/test/scala/cats/tests/ContravariantTests.scala → tests/src/test/scala/cats/tests/ContravariantSuite.scala

@@ -4,7 +4,7 @@ package tests
 import cats.data.Const
 import org.scalactic.CanEqual
 
-class ContravariantTest extends CatsSuite {
+class ContravariantSuite extends CatsSuite {
 
   test("narrow equals contramap(identity)") {
     implicit val constInst = Const.catsDataContravariantForConst[Int]