From 1869d05591ed75e3ef1aa743c0a288aa02405c1c Mon Sep 17 00:00:00 2001 From: "Alinson S. Xavier" Date: Thu, 21 Jan 2021 06:43:57 -0600 Subject: [PATCH] ScoreTest: Use static imports for hamcrest --- .../isoron/uhabits/core/models/ScoreTest.kt | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/models/ScoreTest.kt b/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/models/ScoreTest.kt index 329d34656..2c8c629b2 100644 --- a/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/models/ScoreTest.kt +++ b/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/models/ScoreTest.kt @@ -19,7 +19,7 @@ package org.isoron.uhabits.core.models import org.hamcrest.MatcherAssert.assertThat -import org.hamcrest.number.IsCloseTo +import org.hamcrest.number.IsCloseTo.closeTo import org.isoron.uhabits.core.BaseUnitTest import org.isoron.uhabits.core.models.Score.Companion.compute import org.junit.Before @@ -36,26 +36,26 @@ class ScoreTest : BaseUnitTest() { fun test_compute_withDailyHabit() { var check = 1 val freq = 1.0 - assertThat(compute(freq, 0.0, check.toDouble()), IsCloseTo.closeTo(0.051922, E)) - assertThat(compute(freq, 0.5, check.toDouble()), IsCloseTo.closeTo(0.525961, E)) - assertThat(compute(freq, 0.75, check.toDouble()), IsCloseTo.closeTo(0.762981, E)) + assertThat(compute(freq, 0.0, check.toDouble()), closeTo(0.051922, E)) + assertThat(compute(freq, 0.5, check.toDouble()), closeTo(0.525961, E)) + assertThat(compute(freq, 0.75, check.toDouble()), closeTo(0.762981, E)) check = 0 - assertThat(compute(freq, 0.0, check.toDouble()), IsCloseTo.closeTo(0.0, E)) - assertThat(compute(freq, 0.5, check.toDouble()), IsCloseTo.closeTo(0.474039, E)) - assertThat(compute(freq, 0.75, check.toDouble()), IsCloseTo.closeTo(0.711058, E)) + assertThat(compute(freq, 0.0, check.toDouble()), closeTo(0.0, E)) + assertThat(compute(freq, 0.5, check.toDouble()), closeTo(0.474039, E)) + assertThat(compute(freq, 0.75, check.toDouble()), closeTo(0.711058, E)) } @Test fun test_compute_withNonDailyHabit() { var check = 1 val freq = 1 / 3.0 - assertThat(compute(freq, 0.0, check.toDouble()), IsCloseTo.closeTo(0.030314, E)) - assertThat(compute(freq, 0.5, check.toDouble()), IsCloseTo.closeTo(0.515157, E)) - assertThat(compute(freq, 0.75, check.toDouble()), IsCloseTo.closeTo(0.757578, E)) + assertThat(compute(freq, 0.0, check.toDouble()), closeTo(0.030314, E)) + assertThat(compute(freq, 0.5, check.toDouble()), closeTo(0.515157, E)) + assertThat(compute(freq, 0.75, check.toDouble()), closeTo(0.757578, E)) check = 0 - assertThat(compute(freq, 0.0, check.toDouble()), IsCloseTo.closeTo(0.0, E)) - assertThat(compute(freq, 0.5, check.toDouble()), IsCloseTo.closeTo(0.484842, E)) - assertThat(compute(freq, 0.75, check.toDouble()), IsCloseTo.closeTo(0.727263, E)) + assertThat(compute(freq, 0.0, check.toDouble()), closeTo(0.0, E)) + assertThat(compute(freq, 0.5, check.toDouble()), closeTo(0.484842, E)) + assertThat(compute(freq, 0.75, check.toDouble()), closeTo(0.727263, E)) } companion object {