Bring tests back

evolution-gaming · Feb 11, 2020 · bd05a25 · bd05a25
1 parent 3bb42ae
commit bd05a25
Show file tree

Hide file tree

Showing 5 changed files with 65 additions and 0 deletions.
diff --git a/README.md b/README.md
@@ -20,6 +20,8 @@ trait Cache[F[_], K, V] {
 
   def get(key: K): F[Option[V]]
 
+  def getOrElse(key: K, default: => F[V]): F[V]
+
   /**
     * Does not run `value` concurrently for the same key
     */
@@ -70,6 +72,8 @@ trait SerialMap[F[_], K, V] {
 
   def get(key: K): F[Option[V]]
 
+  def getOrElse(key: K, default: => F[V]): F[V]
+
   def put(key: K, value: V): F[Option[V]]
 
   /**

diff --git a/src/test/scala/com/evolutiongaming/scache/CacheEmptySpec.scala b/src/test/scala/com/evolutiongaming/scache/CacheEmptySpec.scala
@@ -22,6 +22,17 @@ class CacheEmptySpec extends AsyncFunSuite with Matchers {
     result.run()
   }
 
+  test("getOrElse") {
+    val result = for {
+      value <- cache.getOrElse(0, 1.pure[IO])
+      _     <- Sync[IO].delay { value shouldEqual 1 }
+      _     <- cache.put(0, 2)
+      value <- cache.getOrElse(0, 1.pure[IO])
+      _     <- Sync[IO].delay { value shouldEqual 1 }
+    } yield {}
+    result.run()
+  }
+
   test("put") {
     val result = for {
       value <- cache.put(0, 0)

diff --git a/src/test/scala/com/evolutiongaming/scache/CacheFencedTest.scala b/src/test/scala/com/evolutiongaming/scache/CacheFencedTest.scala
@@ -22,6 +22,15 @@ class CacheFencedTest extends AsyncFunSuite with Matchers {
     result.run()
   }
 
+  test("getOrElse succeeds after cache is released") {
+    val result = for {
+      cache <- cache.use(_.pure[IO])
+      a     <- cache.getOrElse(0, 1.pure[IO])
+      _      = a shouldEqual 1
+    } yield {}
+    result.run()
+  }
+
   test(s"put succeeds after cache is released") {
     val result = for {
       cache <- cache.use(_.pure[IO])

diff --git a/src/test/scala/com/evolutiongaming/scache/CacheSpec.scala b/src/test/scala/com/evolutiongaming/scache/CacheSpec.scala
@@ -59,6 +59,30 @@ class CacheSpec extends AsyncFunSuite with Matchers {
     }
 
 
+    test(s"getOrElse: $name") {
+      val result = cache.use { cache =>
+        for {
+          value <- cache.getOrElse(0, 1.pure[IO])
+          _      = value shouldEqual 1
+          _     <- cache.put(0, 2)
+          value <- cache.getOrElse(0, 1.pure[IO])
+          _      = value shouldEqual 2
+        } yield {}
+      }
+      result.run()
+    }
+
+
+    test(s"getOrElse succeeds after cache is released: $name") {
+      val result = for {
+        cache <- cache.use(_.pure[IO])
+        a     <- cache.getOrElse(0, 1.pure[IO])
+        _      = a shouldEqual 1
+      } yield {}
+      result.run()
+    }
+
+
     test(s"put: $name") {
       val result = cache.use { cache =>
         for {

diff --git a/src/test/scala/com/evolutiongaming/scache/SerialMapSpec.scala b/src/test/scala/com/evolutiongaming/scache/SerialMapSpec.scala
@@ -18,6 +18,10 @@ class SerialMapSpec extends AsyncFunSuite with Matchers {
     get[IO].run()
   }
 
+  test("getOrElse") {
+    getOrElse[IO].run()
+  }
+
   test("put") {
     put[IO].run()
   }
@@ -75,6 +79,19 @@ class SerialMapSpec extends AsyncFunSuite with Matchers {
     }
   }
 
+  private def getOrElse[F[_] : Concurrent] = {
+    val key = "key"
+    for {
+      serialMap <- SerialMap.of[F, String, Int]
+      value0    <- serialMap.getOrElse(key, 1.pure[F])
+      _         <- serialMap.put(key, 2)
+      value1    <- serialMap.getOrElse(key, 1.pure[F])
+    } yield {
+      value0 shouldEqual 1
+      value1 shouldEqual 2
+    }
+  }
+
   private def put[F[_] : Concurrent] = {
     val key = "key"
     for {