#648 fix tests commented for 2.13 (#659)

optics-dev · Apr 30, 2019 · 72e5792 · 72e5792
1 parent d7c6cb1
commit 72e5792
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 40 deletions.
diff --git a/core/shared/src/main/scala/monocle/function/Index.scala b/core/shared/src/main/scala/monocle/function/Index.scala
@@ -57,7 +57,9 @@ object Index extends IndexFunctions{
     if (i < 0)
       Optional[Stream[A], A](_ => None)(_ => identity)
     else
-      Optional[Stream[A], A](_.drop(i).headOption)(a => s => Try(s.updated(i, a)).getOrElse(s))
+      Optional[Stream[A], A](_.drop(i).headOption)(a => s =>
+        s.zipWithIndex.map{ case (value, index) => if(i == index) a else value }
+      )
   )
 
   implicit val stringIndex: Index[String, Int, Char] = Index(

diff --git a/example/src/test/scala/monocle/function/IndexExample.scala b/example/src/test/scala/monocle/function/IndexExample.scala
@@ -15,15 +15,14 @@ class IndexExample extends MonocleSuite {
     (IMap("One" -> 1, "Two" -> 2) applyOptional index("One") set 2) shouldEqual IMap("One" -> 2, "Two" -> 2)
   }
 
-// TODO commented for 2.13
-//  test("index creates an Optional from a List, IList, Vector or Stream to a value at the index") {
-//    (List(0,1,2,3) applyOptional index(1) getOption) shouldEqual Some(1)
-//    (List(0,1,2,3) applyOptional index(8) getOption) shouldEqual None
-//
-//    (Vector(0,1,2,3) applyOptional index(1) modify(_ + 1)) shouldEqual Vector(0,2,2,3)
-//    // setting or modifying a value at an index without value is a no op
-//    (Stream(0,1,2,3) applyOptional index(64) set 10)       shouldEqual Stream(0,1,2,3)
-//  }
+  test("index creates an Optional from a List, IList, Vector or Stream to a value at the index") {
+    (List(0,1,2,3) applyOptional index(1) getOption) shouldEqual Some(1)
+    (List(0,1,2,3) applyOptional index(8) getOption) shouldEqual None
+
+    (Vector(0,1,2,3) applyOptional index(1) modify(_ + 1)) shouldEqual Vector(0,2,2,3)
+    // setting or modifying a value at an index without value is a no op
+    (Stream(0,1,2,3) applyOptional index(64) set 10)       shouldEqual Stream(0,1,2,3)
+  }
 
   test("index creates an Optional from a OneAnd to a value at the index") {
     (OneAnd(1, List(2,3)) applyOptional index(0) getOption) shouldEqual Some(1)

diff --git a/test/shared/src/test/scala/monocle/function/AtSpec.scala b/test/shared/src/test/scala/monocle/function/AtSpec.scala
@@ -9,20 +9,4 @@ class AtSpec extends MonocleSuite {
 
   checkAll("fromIso", AtTests[MMap[Int, String], Int, Option[String]])
 
-// TODO commented for 2.13
-//  test("remove deletes a key") {
-//
-//    val mapAndIndexGen: Gen[(Map[Int, String], Int)] = for {
-//      m <- Arbitrary.arbitrary[Map[Int, String]]
-//      i <- if(m.isEmpty) Arbitrary.arbInt.arbitrary
-//      else Gen.frequency(
-//        (8, Gen.oneOf(m.keys.toList)),
-//        (2, Arbitrary.arbInt.arbitrary))
-//    } yield (m, i)
-//
-//    forAll(mapAndIndexGen) { case (m, i) =>
-//      remove(i)(m) should be (m - i)
-//    }
-//  }
-
 }
diff --git a/test/shared/src/test/scala/monocle/std/StreamSpec.scala b/test/shared/src/test/scala/monocle/std/StreamSpec.scala
@@ -10,8 +10,7 @@ class StreamSpec extends MonocleSuite {
   checkAll("cons Stream", ConsTests[Stream[Int], Int])
   checkAll("snoc Stream", SnocTests[Stream[Int], Int])
   checkAll("each Stream", EachTests[Stream[Int], Int])
-  // TODO commented for 2.13
-//  checkAll("index Stream", IndexTests[Stream[Int], Int, Int])
+  checkAll("index Stream", IndexTests[Stream[Int], Int, Int])
   checkAll("filterIndex Stream", FilterIndexTests[Stream[Int], Int, Int])
 
   checkAll("plated Stream", TraversalTests(plate[Stream[Int]]))

diff --git a/test/shared/src/test/scala/monocle/unsafe/UnsafeSelectSpec.scala b/test/shared/src/test/scala/monocle/unsafe/UnsafeSelectSpec.scala
@@ -4,7 +4,6 @@ import monocle.MonocleSuite
 import monocle.law.discipline.OptionalTests
 import monocle.macros.GenLens
 import org.scalacheck.Arbitrary
-
 import scalaz.Equal
 
 
@@ -22,17 +21,13 @@ class UnsafeSelectSpec extends MonocleSuite {
     prism.getOption(prism.reverseGet(valueBad)) shouldEqual None
   }
 
-// TODO commented for 2.13
-//  test("Predicate should work") {
-//    val p: Int => Boolean = _ > 10
-//    val prism = UnsafeSelect.unsafeSelect(p)
-//
-//    val genPass = Arbitrary.arbitrary[Int].retryUntil(p)
-//    forAll(genPass)(i => prism.getOption(i) shouldEqual Some(i))
-//
-//    val genFail = Arbitrary.arbitrary[Int].retryUntil(!p(_))
-//    forAll(genFail)(i => prism.getOption(i) shouldEqual None)
-//  }
+  test("Predicate should work") {
+    val p: Int => Boolean = _ > 10
+    val prism = UnsafeSelect.unsafeSelect(p)
+
+    prism.getOption(12) shouldEqual Some(12)
+    prism.getOption(8) shouldEqual None
+  }
 
   case class Person(name: String, age: Int)