From ee0763d3e31d2bd85df8e90015a7a3710ba1f32c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20G=C3=B3mez?= Date: Thu, 9 Jun 2016 13:19:30 +0200 Subject: [PATCH 1/2] Fix exercise --- src/main/scala/stdlib/Asserts.scala | 3 +-- src/test/scala/exercises/stdlib/AssertsSpec.scala | 5 +++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/scala/stdlib/Asserts.scala b/src/main/scala/stdlib/Asserts.scala index ade8332b..65341cc8 100644 --- a/src/main/scala/stdlib/Asserts.scala +++ b/src/main/scala/stdlib/Asserts.scala @@ -44,9 +44,8 @@ object Asserts extends FlatSpec with Matchers with exercise.Section { /** Booleans in asserts can test equality. */ - def booleansAsserts(res0: String) { + def booleanAsserts(res0: Int) { val v1 = 4 - val v2 = 4 v1 === res0 /** `===` is an assert. It is from ScalaTest, not from the Scala language. */ diff --git a/src/test/scala/exercises/stdlib/AssertsSpec.scala b/src/test/scala/exercises/stdlib/AssertsSpec.scala index 3db04917..3d8de499 100644 --- a/src/test/scala/exercises/stdlib/AssertsSpec.scala +++ b/src/test/scala/exercises/stdlib/AssertsSpec.scala @@ -13,8 +13,9 @@ class AssertsSpec extends Spec with Checkers { check(Test.testSuccess(Asserts.scalaTestAsserts _, true :: HNil)) } - // FIXME: depends on #259 - // check(testSuccess(Asserts.booleansAsserts _, HNil)) + def `boolean asserts` = { + check(Test.testSuccess(Asserts.booleanAsserts _, 4 :: HNil)) + } def `values asserts` = { check(Test.testSuccess(Asserts.valuesAsserts _, 2 :: HNil)) From 1b136b03d6663f25a499cf75d9249f2465c78897 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20G=C3=B3mez?= Date: Mon, 13 Jun 2016 10:51:56 +0200 Subject: [PATCH 2/2] s/===/shouldEqual/ --- src/main/scala/stdlib/Asserts.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/scala/stdlib/Asserts.scala b/src/main/scala/stdlib/Asserts.scala index 65341cc8..88d9c709 100644 --- a/src/main/scala/stdlib/Asserts.scala +++ b/src/main/scala/stdlib/Asserts.scala @@ -46,9 +46,9 @@ object Asserts extends FlatSpec with Matchers with exercise.Section { */ def booleanAsserts(res0: Int) { val v1 = 4 - v1 === res0 + v1 shouldEqual res0 - /** `===` is an assert. It is from ScalaTest, not from the Scala language. */ + /** `shouldEqual` is an assertion. It is from ScalaTest, not from the Scala language. */ } /** Sometimes we expect you to fill in the values