Merge pull request #1942 from foralost/#1941_DateUtilsTest_failing

#1941 DateUtils test fix
DateUtilsTest: Simplify getCalendarUTC
2025-12-06 09:08:52 -06:00 · 2024-04-04 22:03:46 -05:00 · 2024-04-04 21:55:01 -05:00 · 2024-04-04 21:52:27 -05:00 · 2024-04-04 21:45:37 -05:00 · 2024-04-04 21:36:51 -05:00
5 changed files with 8269 additions and 5 deletions
--- a/build.sh
+++ b/build.sh
@@ -64,6 +64,7 @@ fail() {
 core_build() {
    log_info "Building uhabits-core..."
    $GRADLE ktlintCheck || fail
+    $GRADLE lintDebug || fail
    $GRADLE :uhabits-core:build || fail
 }

--- a/uhabits-android/build.gradle.kts
+++ b/uhabits-android/build.gradle.kts
@@ -91,6 +91,12 @@ android {
    buildFeatures {
        viewBinding = true
    }
+
+    lint {
+        baseline = file("lint-baseline.xml")
+        disable += "GradleDependency"
+        warningsAsErrors = true
+    }
 }

 dependencies {
--- a/uhabits-android/lint-baseline.xml
+++ b/uhabits-android/lint-baseline.xml
--- a/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/CommonSteps.kt
+++ b/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/CommonSteps.kt
@@ -132,7 +132,7 @@ object CommonSteps : BaseUserInterfaceTest() {
    }

    @Throws(Exception::class)
-    fun verifyOpensWebsite(url: String) {
+    fun verifyOpensWebsite(url: String?) {
        var browserPkg = "org.chromium.webview_shell"
        if (SDK_INT <= Build.VERSION_CODES.M) {
            browserPkg = "com.android.browser"
--- a/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/utils/DateUtilsTest.kt
+++ b/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/utils/DateUtilsTest.kt
@@ -120,10 +120,15 @@ class DateUtilsTest : BaseUnitTest() {

    @Test
    fun getWeekdaysInMonth() {
-        val february = GregorianCalendar(2018, Calendar.FEBRUARY, 1)
-        val leapFebruary = GregorianCalendar(2020, Calendar.FEBRUARY, 1)
-        val month = GregorianCalendar(2020, Calendar.APRIL, 1)
-        val longMonth = GregorianCalendar(2020, Calendar.AUGUST, 1)
+        fun getCalendarUTC(year: Int, month: Int, dayOfMonth: Int) =
+            GregorianCalendar(year, month, dayOfMonth).apply {
+                timeZone = TimeZone.getTimeZone("UTC")
+            }
+
+        val february = getCalendarUTC(2018, Calendar.FEBRUARY, 1)
+        val leapFebruary = getCalendarUTC(2020, Calendar.FEBRUARY, 1)
+        val month = getCalendarUTC(2020, Calendar.APRIL, 1)
+        val longMonth = getCalendarUTC(2020, Calendar.AUGUST, 1)

        assertThat(
            arrayOf(4, 4, 4, 4, 4, 4, 4),
Author	SHA1	Message	Date
Alinson S. Xavier	46fe683d71	Merge pull request #1942 from foralost/#1941_DateUtilsTest_failing #1941 DateUtils test fix	2024-04-04 22:03:46 -05:00
Alinson S. Xavier	7f6248123c	DateUtilsTest: Simplify getCalendarUTC	2024-04-04 21:55:01 -05:00
Alinson S. Xavier	2024277ebe	Merge branch 'dev' into #1941_DateUtilsTest_failing	2024-04-04 21:52:27 -05:00
Alinson S. Xavier	c216fb01d6	Merge pull request #1785 from hiqua/android_lint_baseline Check android lint violations against current baseline	2024-04-04 21:45:37 -05:00
Alinson S. Xavier	7cb32f486b	lint: disable GradleDependency	2024-04-04 21:36:51 -05:00
Alinson S. Xavier	093591fbaf	Update lint baseline	2024-04-04 21:24:09 -05:00
Alinson S. Xavier	985234cdf3	Merge branch 'dev' into android_lint_baseline	2024-04-04 21:18:22 -05:00
foralost	10074ded32	UTC Calendar fix	2024-03-04 11:31:45 +01:00
Quentin Hibon	25cff3d9b0	Check android lint violations against current baseline	2023-08-07 23:04:46 +02:00