From 6fd662945f7f08eba4298fac27b271ba5ad490dd Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Mon, 16 May 2022 15:40:15 +0200
Subject: [PATCH] fix tests

---
 Habitica/build.gradle                                       | 2 +-
 .../habitrpg/android/habitica/extensions/Date-Extensions.kt | 2 +-
 .../android/habitica/extensions/DateExtensionsTest.kt       | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Habitica/build.gradle b/Habitica/build.gradle
index 820919791..e9c7e11fa 100644
--- a/Habitica/build.gradle
+++ b/Habitica/build.gradle
@@ -165,7 +165,7 @@ android {
         buildConfigField "String", "TESTING_LEVEL", "\"production\""
         resConfigs 'en', 'bg', 'de', 'en-rGB', 'es', 'fr', 'hr-rHR', 'in', 'it', 'iw', 'ja', 'ko', 'lt', 'nl', 'pl', 'pt-rBR', 'pt-rPT', 'ru', 'tr', 'zh', 'zh-rTW'
 
-        versionCode 3503
+        versionCode 3504
         versionName "3.6"
 
         targetSdkVersion 32
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/Date-Extensions.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/Date-Extensions.kt
index 778f8853b..003ef6a6e 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/Date-Extensions.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/Date-Extensions.kt
@@ -96,7 +96,7 @@ fun Long.getShortRemainingString(): String {
     val diffDays = diff.toInt(DurationUnit.DAYS)
     diff -= diffDays.toDuration(DurationUnit.DAYS)
     val diffHours = diff.toInt(DurationUnit.HOURS)
-    diff -= diffDays.toDuration(DurationUnit.HOURS)
+    diff -= diffHours.toDuration(DurationUnit.HOURS)
     val diffMinutes = diff.toInt(DurationUnit.MINUTES)
     diff -= diffMinutes.toDuration(DurationUnit.MINUTES)
     val diffSeconds = diff.toInt(DurationUnit.SECONDS)
diff --git a/Habitica/src/test/java/com/habitrpg/android/habitica/extensions/DateExtensionsTest.kt b/Habitica/src/test/java/com/habitrpg/android/habitica/extensions/DateExtensionsTest.kt
index 5ac79ad04..e86077e14 100644
--- a/Habitica/src/test/java/com/habitrpg/android/habitica/extensions/DateExtensionsTest.kt
+++ b/Habitica/src/test/java/com/habitrpg/android/habitica/extensions/DateExtensionsTest.kt
@@ -8,16 +8,16 @@ class DateExtensionsTest : BaseAnnotationTestCase() {
 
     @Test
     fun testGetShortRemainingStringWithDay() {
-        "24d 1h 3m" shouldBe (Date().time + 2077400000L).getShortRemainingString()
+        (Date().time + 2077400000L).getShortRemainingString() shouldBe "24d 1h 3m"
     }
 
     @Test
     fun testGetShortRemainingStringWithHour() {
-        "5h 46m" shouldBe (Date().time + 20774000L).getShortRemainingString()
+        (Date().time + 20774000L).getShortRemainingString() shouldBe "5h 46m"
     }
 
     @Test
     fun testGetShortRemainingStringWithMinute() {
-        "34m 37s" shouldBe (Date().time + 2077400L).getShortRemainingString()
+        (Date().time + 2077400L).getShortRemainingString() shouldBe "34m 37s"
     }
 }