Rename

typelevel · Oct 24, 2017 · a5948aa · a5948aa
1 parent 8ff298e
commit a5948aa
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 18 deletions.
diff --git a/core/src/main/scala/cats/instances/sortedMap.scala b/core/src/main/scala/cats/instances/sortedMap.scala
@@ -98,7 +98,7 @@ trait SortedMapInstances extends SortedMapInstances1 {
 }
 
 trait SortedMapInstances1 {
-  implicit def catsKernelStdEqForSortedMap[K: Order, V: Eq]: Eq[SortedMap[K, V]] =
+  implicit def catsStdEqForSortedMap[K: Order, V: Eq]: Eq[SortedMap[K, V]] =
     new SortedMapEq[K, V]
 }
 

diff --git a/...est/scala/cats/tests/SortedMapTests.scala → ...est/scala/cats/tests/SortedMapSuite.scala b/...est/scala/cats/tests/SortedMapTests.scala → ...est/scala/cats/tests/SortedMapSuite.scala
@@ -1,12 +1,13 @@
 package cats
 package tests
 
-import cats.kernel.laws.discipline.{HashTests => HashLawTests, MonoidTests => MonoidLawTests}
+import cats.kernel.laws.discipline.{HashTests, MonoidTests}
 import cats.laws.discipline.{FlatMapTests, SemigroupalTests, SerializableTests, TraverseTests}
 import cats.laws.discipline.arbitrary._
+
 import scala.collection.immutable.SortedMap
 
-class SortedMapTests extends CatsSuite {
+class SortedMapSuite extends CatsSuite {
   implicit val iso = SemigroupalTests.Isomorphisms.invariant[SortedMap[Int, ?]]
 
   checkAll("SortedMap[Int, Int]", SemigroupalTests[SortedMap[Int, ?]].semigroupal[Int, Int, Int])
@@ -26,7 +27,7 @@ class SortedMapTests extends CatsSuite {
     }
   }
 
-  checkAll("Hash[SortedMap[Int, String]]" , HashLawTests[SortedMap[Int, String]].hash)
-  checkAll("Monoid[SortedMap[String, Int]]", MonoidLawTests[SortedMap[String, Int]].monoid)
+  checkAll("Hash[SortedMap[Int, String]]" , HashTests[SortedMap[Int, String]].hash)
+  checkAll("Monoid[SortedMap[String, Int]]", MonoidTests[SortedMap[String, Int]].monoid)
   checkAll("Monoid[SortedMap[String, Int]]", SerializableTests.serializable(Monoid[SortedMap[String, Int]]))
 }
diff --git a/...est/scala/cats/tests/SortedSetTests.scala → ...est/scala/cats/tests/SortedSetSuite.scala b/...est/scala/cats/tests/SortedSetTests.scala → ...est/scala/cats/tests/SortedSetSuite.scala
@@ -3,28 +3,26 @@ package tests
 
 import cats.kernel.{BoundedSemilattice, Semilattice}
 import cats.laws.discipline.{FoldableTests, SemigroupKTests, SerializableTests}
-import cats.kernel.laws.discipline.{BoundedSemilatticeTests, HashTests => HashLawTests, MonoidTests => MonoidLawTests, PartialOrderTests => PartialOrderLawTests}
+import cats.kernel.laws.discipline.{BoundedSemilatticeTests, HashTests, PartialOrderTests}
 import cats.laws.discipline.arbitrary._
 
 import scala.collection.immutable.SortedSet
 
-class SortedSetTests extends CatsSuite {
-  checkAll("SortedSet[Int]", MonoidLawTests[SortedSet[Int]].monoid)
-
+class SortedSetSuite extends CatsSuite {
   checkAll("SortedSet[Int]", SemigroupKTests[SortedSet].semigroupK[Int])
   checkAll("SemigroupK[SortedSet]", SerializableTests.serializable(SemigroupK[SortedSet]))
 
   checkAll("SortedSet[Int]", FoldableTests[SortedSet].foldable[Int, Int])
-  checkAll("PartialOrder[SortedSet[Int]]", PartialOrderLawTests[SortedSet[Int]].partialOrder)
-  checkAll("PartialOrder[SortedSet[Int]].reverse", PartialOrderLawTests(PartialOrder[SortedSet[Int]].reverse).partialOrder)
-  checkAll("PartialOrder[SortedSet[Int]].reverse.reverse", PartialOrderLawTests(PartialOrder[SortedSet[Int]].reverse.reverse).partialOrder)
+  checkAll("PartialOrder[SortedSet[Int]]", PartialOrderTests[SortedSet[Int]].partialOrder)
+  checkAll("PartialOrder[SortedSet[Int]].reverse", PartialOrderTests(PartialOrder[SortedSet[Int]].reverse).partialOrder)
+  checkAll("PartialOrder[SortedSet[Int]].reverse.reverse", PartialOrderTests(PartialOrder[SortedSet[Int]].reverse.reverse).partialOrder)
 
-  checkAll("BoundedSemilattice[SortedSet[Int]]", BoundedSemilatticeTests[SortedSet[Int]].boundedSemilattice)
-  checkAll("BoundedSemilattice[SortedSet[Int]]", SerializableTests.serializable(BoundedSemilattice[SortedSet[Int]]))
+  checkAll("BoundedSemilattice[SortedSet[String]]", BoundedSemilatticeTests[SortedSet[String]].boundedSemilattice)
+  checkAll("BoundedSemilattice[SortedSet[String]]", SerializableTests.serializable(BoundedSemilattice[SortedSet[String]]))
 
-  checkAll("Semilattice.asMeetPartialOrder[SortedSet[Int]]", PartialOrderLawTests(Semilattice.asMeetPartialOrder[SortedSet[Int]]).partialOrder)
-  checkAll("Semilattice.asJoinPartialOrder[SortedSet[Int]]", PartialOrderLawTests(Semilattice.asJoinPartialOrder[SortedSet[Int]]).partialOrder)
-  checkAll("Hash[SortedSet[Int]]" , HashLawTests[SortedSet[Int]].hash)
+  checkAll("Semilattice.asMeetPartialOrder[SortedSet[Int]]", PartialOrderTests(Semilattice.asMeetPartialOrder[SortedSet[Int]]).partialOrder)
+  checkAll("Semilattice.asJoinPartialOrder[SortedSet[Int]]", PartialOrderTests(Semilattice.asJoinPartialOrder[SortedSet[Int]]).partialOrder)
+  checkAll("Hash[SortedSet[Int]]" , HashTests[SortedSet[Int]].hash)
 
 
   test("show keeps separate entries for items that map to identical strings"){
@@ -35,4 +33,4 @@ class SortedSetTests extends CatsSuite {
     // duplicate items in the codomain.
     SortedSet(1, 2, 3).show should === ("SortedSet(1, 1, 1)")
   }
-}
+}