Merge pull request #108 from InsanusMokrassar/2.3.0

2.3.0

.github/workflows/kdocs.yml

@@ -10,10 +10,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-java@v1
         with:
-          java-version: 11
+          java-version: 17
-      - name: Fix android 32.0.0 dx
-        continue-on-error: true
-        run: cd /usr/local/lib/android/sdk/build-tools/32.0.0/ && cp d8 dx && cd lib  && cp d8.jar dx.jar
       - name: Build
         run: ./gradlew dokkaHtml
       - name: Publish KDocs

.github/workflows/publishing_packages.yml

@@ -7,7 +7,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-java@v1
         with:
-          java-version: 11
+          java-version: 17
       - name: Update version
         run: |
           branch="`echo "${{ github.ref }}" | grep -o "[^/]*$"`"

CHANGELOG.md

@@ -1,5 +1,81 @@
 # Changelog
 
+## 2.3.0
+
+* `doWhile` now will guarantee that it will not call `doOnce` more than once for time
+
+## 2.2.9
+
+* `Version`:
+  * `Kotlin`: `1.9.23`
+  * `Serialization`: `1.6.3`
+  * `Klock`: `5.3.2`
+* Fixes in build-in schedulers
+
+## 2.2.8
+
+* `Version`:
+  * `Coroutines`: `1.8.0`
+
+## 2.2.7
+
+* `Version`:
+  * `Klock`: `5.3.1`
+  * `AndroidXWork`: `2.9.0`
+
+## 2.2.6
+
+**Since this version klock depdendency replaced with `com.soywiz.korge:korlibs-time`**
+
+* `Version`:
+  * `Klock`: `5.3.0`
+
+## 2.2.5
+
+* `Versions`
+  * `Kotlin`: `1.9.22`
+  * `Serialization`: `1.6.2`
+
+## 2.2.4
+
+* `Versions`
+  * `Kotlin`: `1.9.21`
+  * `Serialization`: `1.6.1`
+
+## 2.2.3
+
+**THIS UPDATE CONTAINS UPGRADE OF USED JDK UP TO 17**
+
+* Versions
+  * `Kotlin`: `1.9.20`
+
+## 2.2.2
+
+* Versions
+  * `Kotlin`: `1.9.20-RC`
+  * `Android` (min/target): `34`
+
+## 2.2.1
+
+* Potential fix of [#65](https://github.com/InsanusMokrassar/krontab/issues/65)
+* Versions
+  * `Kotlin`: `1.9.20-Beta`
+  * `Klock`: `4.0.10`
+  * `Serialization`: `1.6.0`
+
+## 2.2.0
+
+* Versions
+  * `Kotlin`: `1.9.0`
+  * `Coroutines`: `1.7.3`
+  * `Klock`: `4.0.9`
+
+## 2.1.2
+
+* Versions
+  * `Coroutines`: `1.7.2`
+* All callbacks for standard extensions like `doInfinity` now fully inline
+
 ## 2.1.1
 
 * `asFlowWithoutDelays` and `asTzFlowWithoutDelays` will have nullable `since` parameters with default to `null`

build.gradle

@@ -61,6 +61,7 @@ kotlin {
     }
     linuxX64()
     mingwX64()
+    linuxArm64()
 
 
     sourceSets {
@@ -70,7 +71,7 @@ kotlin {
                 api "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlin_coroutines_version"
                 api "org.jetbrains.kotlinx:kotlinx-serialization-core:$kotlin_serialization_version"
 
-                api "com.soywiz.korlibs.klock:klock:$klockVersion"
+                api "com.soywiz.korge:korlibs-time:$klockVersion"
             }
         }
 
@@ -97,7 +98,7 @@ kotlin {
                 implementation kotlin('test-js')
             }
         }
-        androidTest {
+        androidUnitTest {
             dependencies {
                 implementation kotlin('test-junit')
             }
@@ -109,7 +110,7 @@ apply plugin: 'com.getkeepsafe.dexcount'
 
 android {
     compileSdk "$android_compileSdkVersion".toInteger()
-    buildToolsVersion "$android_buildToolsVersion"
+    buildToolsVersion = "$android_buildToolsVersion"
     namespace "${group}.${project.name}"
 
     defaultConfig {
@@ -128,8 +129,8 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
-        targetCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_17
     }
 
     sourceSets {
@@ -141,6 +142,6 @@ android {
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
+    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_17
 }

github_release.gradle

@@ -18,13 +18,13 @@ if (new File(projectDir, "secret.gradle").exists()) {
     githubRelease {
         token "${project.property('GITHUB_RELEASE_TOKEN')}"
 
-        owner "InsanusMokrassar"
+        owner = "InsanusMokrassar"
-        repo "${rootProject.name}"
+        repo = "${rootProject.name}"
 
-        tagName "v${project.version}"
+        tagName = "v${project.version}"
-        releaseName "${project.version}"
+        releaseName = "${project.version}"
-        targetCommitish "${project.version}"
+        targetCommitish = "${project.version}"
 
-        body getCurrentVersionChangelog("${project.version}")
+        body = getCurrentVersionChangelog("${project.version}")
     }
 }

gradle.properties

@@ -9,32 +9,32 @@ android.useAndroidX=true
 android.enableJetifier=false
 
 
-kotlin_version=1.8.22
+kotlin_version=1.9.23
-kotlin_coroutines_version=1.6.4
+kotlin_coroutines_version=1.8.0
-kotlin_serialization_version=1.5.1
+kotlin_serialization_version=1.6.3
 
-dokka_version=1.8.20
+dokka_version=1.9.20
 
-klockVersion=4.0.3
+klockVersion=5.4.0
 
 ## Github reease
 
-github_release_plugin_version=2.4.1
+github_release_plugin_version=2.5.2
 
 ## Android
 
-android_gradle_version=7.4.2
+android_gradle_version=8.1.4
 android_minSdkVersion=21
-android_compileSdkVersion=33
+android_compileSdkVersion=34
-android_buildToolsVersion=33.0.2
+android_buildToolsVersion=34.0.0
 dexcount_version=4.0.0
 junit_version=4.12
 test_ext_junit_version=1.1.3
 espresso_core=3.4.0
 
-androidx_work_version=2.8.1
+androidx_work_version=2.9.0
 
 ## Common
 
-version=2.1.1
+version=2.3.0
-android_code_version=28
+android_code_version=40

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip

publish.gradle

@@ -1,7 +1,7 @@
 apply plugin: 'maven-publish'
 
 task javadocsJar(type: Jar) {
-    classifier = 'javadoc'
+    archiveClassifier = 'javadoc'
 }
 
 publishing {
@@ -50,18 +50,14 @@ publishing {
             
                 }
             }
-            if (project.hasProperty('GITEA_TOKEN') || System.getenv('GITEA_TOKEN') != null) {
+            if ((project.hasProperty('INMONEXUS_USER') || System.getenv('INMONEXUS_USER') != null) && (project.hasProperty('INMONEXUS_PASSWORD') || System.getenv('INMONEXUS_PASSWORD') != null)) {
                 maven {
-                    name = "Gitea"
+                    name = "InmoNexus"
-                    url = uri("https://git.inmo.dev/api/packages/InsanusMokrassar/maven")
+                    url = uri("https://nexus.inmo.dev/repository/maven-releases/")
             
-                    credentials(HttpHeaderCredentials) {
+                    credentials {
-                        name = "Authorization"
+                        username = project.hasProperty('INMONEXUS_USER') ? project.property('INMONEXUS_USER') : System.getenv('INMONEXUS_USER')
-                        value = project.hasProperty('GITEA_TOKEN') ? project.property('GITEA_TOKEN') : System.getenv('GITEA_TOKEN')
+                        password = project.hasProperty('INMONEXUS_PASSWORD') ? project.property('INMONEXUS_PASSWORD') : System.getenv('INMONEXUS_PASSWORD')
-                    }
-            
-                    authentication {
-                        header(HttpHeaderAuthentication)
                     }
             
                 }
@@ -96,4 +92,27 @@ if (project.hasProperty("signing.gnupg.keyName")) {
             dependsOn(it)
         }
     }
+
+    // Workaround to make android sign operations depend on signing tasks
+    project.getTasks().withType(AbstractPublishToMaven.class).configureEach {
+        def signingTasks = project.getTasks().withType(Sign.class)
+        mustRunAfter(signingTasks)
+    }
+    // Workaround to make test tasks use sign
+    project.getTasks().withType(Sign.class).configureEach { signTask ->
+        def withoutSign = (signTask.name.startsWith("sign") ? signTask.name.minus("sign") : signTask.name)
+        def pubName = withoutSign.endsWith("Publication") ? withoutSign.substring(0, withoutSign.length() - "Publication".length()) : withoutSign
+        // These tasks only exist for native targets, hence findByName() to avoid trying to find them for other targets
+
+        // Task ':linkDebugTest<platform>' uses this output of task ':sign<platform>Publication' without declaring an explicit or implicit dependency
+        def debugTestTask = tasks.findByName("linkDebugTest$pubName")
+        if (debugTestTask != null) {
+            signTask.mustRunAfter(debugTestTask)
+        }
+        // Task ':compileTestKotlin<platform>' uses this output of task ':sign<platform>Publication' without declaring an explicit or implicit dependency
+        def testTask = tasks.findByName("compileTestKotlin$pubName")
+        if (testTask != null) {
+            signTask.mustRunAfter(testTask)
+        }
+    }
 }

publish.kpsb

@@ -1 +1 @@
-{"licenses":[{"id":"Apache-2.0","title":"Apache Software License 2.0","url":"https://github.com/InsanusMokrassar/krontab/blob/master/LICENSE"}],"mavenConfig":{"name":"Krontab","description":"It is an analog of crontab util for Kotlin Coroutines","url":"https://github.com/InsanusMokrassar/krontab","vcsUrl":"https://github.com/InsanusMokrassar/krontab.git","developers":[{"id":"InsanusMokrassar","name":"Ovsiannikov Aleksei","eMail":"ovsyannikov.alexey95@gmail.com"}],"repositories":[{"name":"GithubPackages","url":"https://maven.pkg.github.com/InsanusMokrassar/krontab"},{"name":"Gitea","url":"https://git.inmo.dev/api/packages/InsanusMokrassar/maven","credsType":{"type":"dev.inmo.kmppscriptbuilder.core.models.MavenPublishingRepository.CredentialsType.HttpHeaderCredentials","headerName":"Authorization","headerValueProperty":"GITEA_TOKEN"}},{"name":"sonatype","url":"https://oss.sonatype.org/service/local/staging/deploy/maven2/"}],"gpgSigning":{"type":"dev.inmo.kmppscriptbuilder.core.models.GpgSigning.Optional"}}}
+{"licenses":[{"id":"Apache-2.0","title":"Apache Software License 2.0","url":"https://github.com/InsanusMokrassar/krontab/blob/master/LICENSE"}],"mavenConfig":{"name":"Krontab","description":"It is an analog of crontab util for Kotlin Coroutines","url":"https://github.com/InsanusMokrassar/krontab","vcsUrl":"https://github.com/InsanusMokrassar/krontab.git","developers":[{"id":"InsanusMokrassar","name":"Ovsiannikov Aleksei","eMail":"ovsyannikov.alexey95@gmail.com"}],"repositories":[{"name":"GithubPackages","url":"https://maven.pkg.github.com/InsanusMokrassar/krontab"},{"name":"InmoNexus","url":"https://nexus.inmo.dev/repository/maven-releases/"},{"name":"sonatype","url":"https://oss.sonatype.org/service/local/staging/deploy/maven2/"}],"gpgSigning":{"type":"dev.inmo.kmppscriptbuilder.core.models.GpgSigning.Optional"}}}

src/androidMain/kotlin/KronSchedulerWork.kt

@@ -3,6 +3,7 @@ package dev.inmo.krontab
 import android.content.Context
 import androidx.work.*
 import korlibs.time.DateTime
+import korlibs.time.millisecondsLong
 import java.util.concurrent.TimeUnit
 
 /**

src/commonMain/kotlin/Executes.kt

@@ -2,6 +2,7 @@ package dev.inmo.krontab
 
 import korlibs.time.DateTime
 import korlibs.time.DateTimeTz
+import korlibs.time.millisecondsLong
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.isActive
 import kotlin.coroutines.coroutineContext
@@ -14,7 +15,7 @@ import kotlin.coroutines.coroutineContext
  *
  * WARNING!!! In case if [KronScheduler.next] of [this] instance will return null, [block] will be called immediately
  */
-suspend inline fun <T> KronScheduler.doOnce(noinline block: suspend (DateTime) -> T): T {
+suspend inline fun <T> KronScheduler.doOnce(block: (DateTime) -> T): T {
     val time = nextOrNow().also {
         delay((it - DateTime.now()).millisecondsLong)
     }
@@ -29,7 +30,7 @@ suspend inline fun <T> KronScheduler.doOnce(noinline block: suspend (DateTime) -
  * WARNING!!! In case if [KronScheduler.next] of [this] instance will return null, [block] will be called immediately
  */
 @Deprecated("Replaceable", ReplaceWith("doOnce", "dev.inmo.krontab.doOnce"))
-suspend inline fun <T> KronScheduler.doOnceLocal(noinline block: suspend (DateTime) -> T): T = doOnce(block)
+suspend inline fun <T> KronScheduler.doOnceLocal(block: (DateTime) -> T): T = doOnce(block)
 
 /**
  * Execute [block] once at the [KronScheduler.next] time and return result of [block] calculation.
@@ -53,7 +54,7 @@ suspend inline fun <T> KronScheduler.doOnceTz(noinline block: suspend (DateTimeT
  */
 suspend inline fun <T> doOnce(
     scheduleConfig: String,
-    noinline block: suspend (DateTime) -> T
+    block: (DateTime) -> T
 ) = buildSchedule(scheduleConfig).doOnce(block)
 
 /**
@@ -69,24 +70,42 @@ suspend inline fun <T> doOnceTz(
 /**
  * Will execute [block] while it will return true as a result of its calculation
  */
-suspend inline fun KronScheduler.doWhile(noinline block: suspend (DateTime) -> Boolean) {
+suspend inline fun KronScheduler.doWhile(block: (DateTime) -> Boolean) {
+    var latest: DateTime? = null
     do {
         delay(1L)
-    } while (doOnce(block))
+        val result = doOnce {
+            if (latest != it) {
+                latest = it
+                block(it)
+            } else {
+                null
+            }
+        }
+    } while (result == null || result)
 }
 /**
  * Will execute [block] while it will return true as a result of its calculation
  */
 @Deprecated("Replaceable", ReplaceWith("doWhile", "dev.inmo.krontab.doWhile"))
-suspend inline fun KronScheduler.doWhileLocal(noinline block: suspend (DateTime) -> Boolean) = doWhile(block)
+suspend inline fun KronScheduler.doWhileLocal(block: (DateTime) -> Boolean) = doWhile(block)
 
 /**
  * Will execute [block] while it will return true as a result of its calculation
  */
 suspend inline fun KronScheduler.doWhileTz(noinline block: suspend (DateTimeTz) -> Boolean) {
+    var latest: DateTimeTz? = null
     do {
         delay(1L)
-    } while (doOnceTz(block))
+        val result = doOnceTz {
+            if (latest != it) {
+                latest = it
+                block(it)
+            } else {
+                null
+            }
+        }
+    } while (result == null || result)
 }
 
 /**
@@ -96,7 +115,7 @@ suspend inline fun KronScheduler.doWhileTz(noinline block: suspend (DateTimeTz)
  */
 suspend inline fun doWhile(
     scheduleConfig: String,
-    noinline block: suspend (DateTime) -> Boolean
+    block: (DateTime) -> Boolean
 ) = buildSchedule(scheduleConfig).doWhile(block)
 
 /**
@@ -107,7 +126,7 @@ suspend inline fun doWhile(
 @Deprecated("Replaceable", ReplaceWith("doWhile", "dev.inmo.krontab.doWhile"))
 suspend inline fun doWhileLocal(
     scheduleConfig: String,
-    noinline block: suspend (DateTime) -> Boolean
+    block: (DateTime) -> Boolean
 ) = doWhile(scheduleConfig, block)
 
 /**
@@ -124,7 +143,7 @@ suspend inline fun doWhileTz(
 /**
  * Will execute [block] without any checking of result
  */
-suspend inline fun KronScheduler.doInfinity(noinline block: suspend (DateTime) -> Unit) = doWhile {
+suspend inline fun KronScheduler.doInfinity(block: (DateTime) -> Unit) = doWhile {
     block(it)
     coroutineContext.isActive
 }
@@ -132,7 +151,7 @@ suspend inline fun KronScheduler.doInfinity(noinline block: suspend (DateTime) -
  * Will execute [block] without any checking of result
  */
 @Deprecated("Replaceable", ReplaceWith("doInfinity", "dev.inmo.krontab.doInfinity"))
-suspend inline fun KronScheduler.doInfinityLocal(noinline block: suspend (DateTime) -> Unit) = doInfinity(block)
+suspend inline fun KronScheduler.doInfinityLocal(block: (DateTime) -> Unit) = doInfinity(block)
 
 /**
  * Will execute [block] without any checking of result
@@ -149,7 +168,7 @@ suspend inline fun KronScheduler.doInfinityTz(noinline block: suspend (DateTimeT
  */
 suspend inline fun doInfinity(
     scheduleConfig: String,
-    noinline block: suspend (DateTime) -> Unit
+    block: (DateTime) -> Unit
 ) = buildSchedule(scheduleConfig).doInfinity(block)
 
 /**
@@ -160,7 +179,7 @@ suspend inline fun doInfinity(
 @Deprecated("Replaceable", ReplaceWith("doInfinity", "dev.inmo.krontab.doInfinity"))
 suspend inline fun doInfinityLocal(
     scheduleConfig: String,
-    noinline block: suspend (DateTime) -> Unit
+    block: (DateTime) -> Unit
 ) = doInfinity(scheduleConfig, block)
 
 /**

src/commonMain/kotlin/SchedulerShortcuts.kt

@@ -34,35 +34,60 @@ val EverySecondScheduler: KronScheduler by lazy {
  * [KronScheduler.next] will always return [korlibs.time.DateTime.now] + one minute
  */
 val EveryMinuteScheduler: KronScheduler by lazy {
-    buildSchedule { minutes { 0 every 1 } }
+    buildSchedule {
+        seconds { at(0) }
+        minutes { 0 every 1 }
+    }
 }
 
 /**
  * [KronScheduler.next] will always return [korlibs.time.DateTime.now] + one hour
  */
 val EveryHourScheduler: KronScheduler by lazy {
-    buildSchedule { hours { 0 every 1 } }
+    buildSchedule {
+        seconds { at(0) }
+        minutes { at(0) }
+        hours { 0 every 1 }
+    }
 }
 
 /**
  * [KronScheduler.next] will always return [korlibs.time.DateTime.now] + one day
  */
 val EveryDayOfMonthScheduler: KronScheduler by lazy {
-    buildSchedule { dayOfMonth { 0 every 1 } }
+    buildSchedule {
+        seconds { at(0) }
+        minutes { at(0) }
+        hours { at(0) }
+        dayOfMonth { 0 every 1 }
+    }
 }
 
 /**
  * [KronScheduler.next] will always return [korlibs.time.DateTime.now] + one month
  */
 val EveryMonthScheduler: KronScheduler by lazy {
-    buildSchedule { months { 0 every 1 } }
+    buildSchedule {
+        seconds { at(0) }
+        minutes { at(0) }
+        hours { at(0) }
+        dayOfMonth { at(0) }
+        months { 0 every 1 }
+    }
 }
 
 /**
  * [KronScheduler.next] will always return [korlibs.time.DateTime.now] + one year
  */
 val EveryYearScheduler: KronScheduler by lazy {
-    buildSchedule { years { 0 every 1 } }
+    buildSchedule {
+        seconds { at(0) }
+        minutes { at(0) }
+        hours { at(0) }
+        dayOfMonth { at(0) }
+        months { at(0) }
+        years { 0 every 1 }
+    }
 }
 
 /**

src/commonMain/kotlin/builder/SchedulerBuilder.kt

@@ -182,15 +182,24 @@ class SchedulerBuilder(
      */
     fun build(): KronScheduler = offset ?.let {
         createKronSchedulerWithOffset(
-            seconds,
+            seconds = seconds,
-            minutes,
+            minutes = minutes,
-            hours,
+            hours = hours,
-            dayOfMonth,
+            dayOfMonth = dayOfMonth,
-            month,
+            month = month,
-            year,
+            years = year,
-            dayOfWeek,
+            weekDays = dayOfWeek,
-            TimezoneOffset(it.minutes),
+            offset = TimezoneOffset(it.minutes),
-            milliseconds ?: millisecondsArrayDefault
+            milliseconds = milliseconds ?: millisecondsArrayDefault
         )
-    } ?: createKronScheduler(seconds, minutes, hours, dayOfMonth, month, year, dayOfWeek, milliseconds ?: millisecondsArrayDefault)
+    } ?: createKronScheduler(
+        seconds = seconds,
+        minutes = minutes,
+        hours = hours,
+        dayOfMonth = dayOfMonth,
+        month = month,
+        years = year,
+        weekDays = dayOfWeek,
+        milliseconds = milliseconds ?: millisecondsArrayDefault
+    )
 }

src/commonMain/kotlin/internal/NearDateTimeCalculator.kt

@@ -108,13 +108,19 @@ internal fun NearDateTimeCalculatorDays(
         } else {
             dateTime
         })
-        dateTime.copy(
+        val newDateTime = dateTime.copy(
             dayOfMonth = min(dateTime.month.days(dateTime.year), newOne.toInt() + 1), // index1
             hour = 0,
             minute = 0,
             second = 0,
             milliseconds = 0
         )
+        // If day of month has not been changed, use old dateTime due to no changes required
+        if (newDateTime.dayOfMonth == dateTime.dayOfMonth) {
+            dateTime
+        } else {
+            newDateTime
+        }
     }
 )
 

src/commonMain/kotlin/utils/SchedulerFlow.kt

@@ -5,6 +5,7 @@ import korlibs.time.DateTimeTz
 import korlibs.time.milliseconds
 import dev.inmo.krontab.KronScheduler
 import dev.inmo.krontab.next
+import korlibs.time.millisecondsLong
 import kotlinx.coroutines.currentCoroutineContext
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.Flow

src/commonTest/kotlin/BuildersTest.kt

@@ -0,0 +1,38 @@
+package dev.inmo.krontab.utils
+
+import dev.inmo.krontab.*
+import korlibs.time.*
+import kotlinx.coroutines.test.runTest
+import kotlin.test.Test
+import kotlin.test.assertEquals
+import kotlin.time.Duration.Companion.milliseconds
+import kotlin.time.Duration.Companion.minutes
+import kotlin.time.Duration.Companion.seconds
+
+class BuildersTest {
+    @Test
+    fun presetsWorksCorrectly() {
+        val data = mapOf(
+            EverySecondScheduler to { it: DateTime -> if (it.milliseconds > 0 ) it + 1.seconds - it.milliseconds.milliseconds else it },
+            EveryMinuteScheduler to { it: DateTime -> if (it.seconds > 0 || it.milliseconds > 0 ) it + 1.minutes - it.seconds.seconds - it.milliseconds.milliseconds else it },
+            EveryHourScheduler to { it: DateTime -> if (it.minutes > 0 || it.seconds > 0 || it.milliseconds > 0 ) it + 1.hours - it.minutes.minutes - it.seconds.seconds - it.milliseconds.milliseconds else it },
+            EveryDayOfMonthScheduler to { it: DateTime -> if (it.hours > 0 || it.minutes > 0 || it.seconds > 0 || it.milliseconds > 0 ) it + 1.days - it.hours.hours - it.minutes.minutes - it.seconds.seconds - it.milliseconds.milliseconds else it },
+            EveryMonthScheduler to { it: DateTime -> if (it.dayOfMonth > 1 || it.hours > 0 || it.minutes > 0 || it.seconds > 0 || it.milliseconds > 0 ) (it + 1.months).copy(dayOfMonth = 1, hour = 0, minute = 0, second = 0, milliseconds = 0) else it },
+        )
+        val samples = 10000
+
+        runTest {
+            var now = DateTime.now()
+            for (i in 0 until samples) {
+                data.forEach { (scheduler, expectCalculator) ->
+                    val expectValue = expectCalculator(now)
+                    val newNow = scheduler.nextOrRelative(now)
+
+                    assertEquals(expectValue, newNow, "For time ${now.toStringDefault()} calculated wrong value: ${newNow.toStringDefault()} is not equal to ${expectValue.toStringDefault()}")
+
+                    now = newNow
+                }
+            }
+        }
+    }
+}