Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update sbt-tpolecat version #301

Merged
merged 1 commit into from
May 24, 2024
Merged

Update sbt-tpolecat version #301

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions e-scala/src/main/scala/e/scala/EOr.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ sealed trait EOr[+A]:
*/
def onError[U](f: E => U): EOr[A] =
self match
case Failure(e) => f(e); this
case Failure(e) => val _ = f(e); this
case _ => this

/** Performs a side-effect using value in this, if it exists
Expand All @@ -173,7 +173,7 @@ sealed trait EOr[+A]:
*/
def onValue[U](f: A => U): EOr[A] =
self match
case Success(a) => f(a); this
case Success(a) => val _ = f(a); this
case _ => this

/** Alias of `onValue`
Expand Down
20 changes: 10 additions & 10 deletions e-scala/src/test/scala/e/scala/EOrTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@ class EOrTest extends ESuite:
property("Constructing an EOr"):
EOr.unit.assertValue(())

forAll: (e: E) =>
val _ = forAll: (e: E) =>
EOr[String](e).assertError(e)
e.toEOr[String].assertError(e)

forAll: (string: String) =>
val _ = forAll: (string: String) =>
EOr[String](string).assertValue(string)
string.toEOr.assertValue(string)

forAll: (option: Option[String]) =>
val _ = forAll: (option: Option[String]) =>
val none = E.name("None")

val eor1 = EOr.fromOption(option)(none)
Expand All @@ -26,15 +26,15 @@ class EOrTest extends ESuite:
val eor2 = option.toEOr(none)
assertEquals(eor1, eor2)

forAll: (either: Either[Int, String]) =>
val _ = forAll: (either: Either[Int, String]) =>
val toE = (i: Int) => E.code(i)
val eor1 = EOr.fromEither(either)(toE)
either.fold(i => eor1.assertError(toE(i)), s => eor1.assertValue(s))

val eor2 = either.toEOr(toE)
assertEquals(eor1, eor2)

forAll: (t: Try[String]) =>
val _ = forAll: (t: Try[String]) =>
val toE = (th: Throwable) => E.message(th.getMessage)
val eor1 = EOr.fromTry(t)(toE)
t.fold(t => eor1.assertError(toE(t)), s => eor1.assertValue(s))
Expand Down Expand Up @@ -124,14 +124,14 @@ class EOrTest extends ESuite:
var counter = 0
var previous = 0

"test".toEOr.onError: _ =>
val _ = "test".toEOr.onError: _ =>
previous = counter
counter = previous + 1
assertEquals(counter, 0)
assertEquals(previous, 0)

forAll: (e: E) =>
e.toEOr[String]
val _ = e.toEOr[String]
.onError: _ =>
previous = counter
counter = previous + 1
Expand All @@ -141,7 +141,7 @@ class EOrTest extends ESuite:
val e = E.code(1)
var counter = 0
var previous = 0
e.toEOr[String]
val _ = e.toEOr[String]
.onValue: _ =>
previous = counter
counter = previous + 1
Expand All @@ -150,7 +150,7 @@ class EOrTest extends ESuite:
assertEquals(previous, 0)

forAll: (s: String) =>
s.toEOr.onValue: _ =>
val _ = s.toEOr.onValue: _ =>
previous = counter
counter = previous + 1
assertEquals(counter, previous + 1)
Expand Down Expand Up @@ -271,7 +271,7 @@ class EOrTest extends ESuite:
assertNotEquals(eor3.hashCode(), eor4.hashCode())

property("Converting an EOr to String"):
forAll: (e: E) =>
val _ = forAll: (e: E) =>
assertEquals(e.toEOr[String].toString, e.toString)

forAll: (i: Int) =>
Expand Down
32 changes: 16 additions & 16 deletions e-scala/src/test/scala/e/scala/ETest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class ETest extends ESuite:
empty.assertData(Map.empty)
empty.assertTime(None)

forAll:
val _ = forAll:
(
code: Option[Int],
name: Option[String],
Expand Down Expand Up @@ -48,23 +48,23 @@ class ETest extends ESuite:
E(time = time).assertTime(time)
time.foreach(t => E.time(t).assertTime(Some(t)))

forAll: (cause: E) =>
val _ = forAll: (cause: E) =>
val e = E.cause(cause)
assert(e.hasCause)
assert(e.causes.contains(cause))

forAll: (k: String, v: String) =>
val _ = forAll: (k: String, v: String) =>
val e = E.data(k, v)
assert(e.hasData)
assertEquals(e.data.get(k), Some(v))

forAll: (t: (String, String)) =>
val _ = forAll: (t: (String, String)) =>
val e = E.data(t)
val (k, v) = t
assert(e.hasData)
assertEquals(e.data.get(k), Some(v))

forAll(genNow): (generatedNow: Long) =>
val _ = forAll(genNow): (generatedNow: Long) =>
val e = E.now
assert(e.hasTime)
assertAlmostSame(generatedNow, e.time.get)
Expand All @@ -80,44 +80,44 @@ class ETest extends ESuite:
assertEquals(e, E.empty)

property("Getting a modified copy an E"):
forAll: (e: E, code: Int) =>
val _ = forAll: (e: E, code: Int) =>
e.code(code).assertCode(Some(code))

forAll: (e: E, name: String) =>
val _ = forAll: (e: E, name: String) =>
e.name(name).assertName(Some(name))

forAll: (e: E, message: String) =>
val _ = forAll: (e: E, message: String) =>
e.message(message).assertMessage(Some(message))

forAll: (e: E, causes: List[E]) =>
val _ = forAll: (e: E, causes: List[E]) =>
val modified = e.causes(causes)
assert(modified.hasCause)
causes.foreach(c => assert(modified.causes.contains(c)))

forAll: (e: E, cause: E) =>
val _ = forAll: (e: E, cause: E) =>
val modified = e.cause(cause)
assert(modified.hasCause)
assert(modified.causes.contains(cause))

forAll: (e: E, data: Map[String, String]) =>
val _ = forAll: (e: E, data: Map[String, String]) =>
val modified = e.data(data)
assert(modified.hasData)

forAll: (e: E, k: String, v: String) =>
val _ = forAll: (e: E, k: String, v: String) =>
val modified = e.data(k, v)
assert(modified.hasData)
assertEquals(modified.data.get(k), Some(v))

forAll: (e: E, t: (String, String)) =>
val _ = forAll: (e: E, t: (String, String)) =>
val modified = e.data(t)
val (k, v) = t
assert(modified.hasData)
assertEquals(modified.data.get(k), Some(v))

forAll: (e: E, time: Long) =>
val _ = forAll: (e: E, time: Long) =>
e.time(time).assertTime(Some(time))

forAll(genE, genNow): (e: E, generatedNow: Long) =>
val _ = forAll(genE, genNow): (e: E, generatedNow: Long) =>
val modified = e.now
assert(modified.hasTime)
assertAlmostSame(generatedNow, modified.time.get)
Expand All @@ -139,7 +139,7 @@ class ETest extends ESuite:
assertEquals(EException(e), e.toException)

property("Constructing an E from a Throwable"):
forAll: (message: String) =>
val _ = forAll: (message: String) =>
val ex = new Exception(message)
val e = E.message(message)

Expand Down
2 changes: 1 addition & 1 deletion project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ addSbtPlugin("com.github.sbt" % "sbt-release" % "1.4.0")
addSbtPlugin("net.aichler" % "sbt-jupiter-interface" % "0.11.1")
addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.5.2")
addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.2.1")
addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.4.4")
addSbtPlugin("org.typelevel" % "sbt-tpolecat" % "0.5.1")
Loading