Remove last .gets

lloydmeta · Feb 20, 2015 · 98edbff · 98edbff
1 parent 9f42453
commit 98edbff
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/enumeratum-play/src/test/scala/enumeratum/JsonSpec.scala b/enumeratum-play/src/test/scala/enumeratum/JsonSpec.scala
@@ -31,7 +31,7 @@ class JsonSpec extends FunSpec with Matchers {
     val format = Json.formats(Dummy)
 
     it("should create a format that works with valid values") {
-      format.reads(JsString("A")).asOpt.get should be(Dummy.A)
+      format.reads(JsString("A")).asOpt.value should be(Dummy.A)
     }
 
     it("should create a format that fails with invalid values") {

diff --git a/enumeratum-play/src/test/scala/enumeratum/UrlBindersSpec.scala b/enumeratum-play/src/test/scala/enumeratum/UrlBindersSpec.scala
@@ -2,6 +2,8 @@ package enumeratum
 
 import UrlBinders._
 import org.scalatest._
+import org.scalatest.OptionValues._
+import org.scalatest.EitherValues._
 
 /**
  * Created by Lloyd on 2/3/15.
@@ -13,7 +15,7 @@ class UrlBindersSpec extends FunSpec with Matchers {
     val subject = pathBinder(Dummy)
 
     it("should create an enumeration binder that can bind strings corresponding to enum strings") {
-      subject.bind("hello", "A").right.get shouldBe Dummy.A
+      subject.bind("hello", "A").right.value shouldBe Dummy.A
     }
 
     it("should create an enumeration binder that cannot bind strings not found in the enumeration") {
@@ -32,11 +34,11 @@ class UrlBindersSpec extends FunSpec with Matchers {
     val subject = queryBinder(Dummy)
 
     it("should create an enumeration binder that can bind strings corresponding to enum strings regardless of case") {
-      subject.bind("hello", Map("hello" -> Seq("A"))).get.right.get should be(Dummy.A)
+      subject.bind("hello", Map("hello" -> Seq("A"))).value.right.value should be(Dummy.A)
     }
 
     it("should create an enumeration binder that cannot bind strings not found in the enumeration") {
-      subject.bind("hello", Map("hello" -> Seq("Z"))).get should be('left)
+      subject.bind("hello", Map("hello" -> Seq("Z"))).value should be('left)
       subject.bind("hello", Map("helloz" -> Seq("A"))) shouldBe None
     }