Support for more Joda time classes (#32)

Plus update Kotlin to 1.3.61 and detekt to 1.2.0

Author: mattmook

build.gradle.kts

@@ -19,7 +19,7 @@ import com.github.benmanes.gradle.versions.updates.DependencyUpdatesTask
 
 plugins {
     id("com.github.ben-manes.versions") version "0.27.0"
-    id("io.gitlab.arturbosch.detekt") version "1.1.1"
+    id("io.gitlab.arturbosch.detekt") version "1.2.0"
     id("com.appmattus.markdown") version "0.6.0"
 }
 
@@ -29,7 +29,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.60")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.61")
         classpath("com.android.tools.build:gradle:3.5.2")
     }
 }
@@ -67,7 +67,7 @@ tasks.withType(DependencyUpdatesTask::class.java).all {
 }
 
 dependencies {
-    detektPlugins("io.gitlab.arturbosch.detekt:detekt-formatting:1.1.1")
+    detektPlugins("io.gitlab.arturbosch.detekt:detekt-formatting:1.2.0")
 }
 
 detekt {

fixture/build.gradle.kts

@@ -26,7 +26,7 @@ apply(from = "$rootDir/gradle/scripts/jacoco.gradle.kts")
 
 dependencies {
     implementation(kotlin("stdlib-jdk8"))
-    implementation("io.github.classgraph:classgraph:4.8.54")
+    implementation("io.github.classgraph:classgraph:4.8.56")
     implementation(kotlin("reflect"))
 
     compileOnly("joda-time:joda-time:2.10.5")

fixture/src/main/kotlin/com/appmattus/kotlinfixture/resolver/JodaTimeResolver.kt

@@ -23,6 +23,7 @@ import org.joda.time.DateTime
 import org.joda.time.DateTimeZone
 import org.joda.time.Duration
 import org.joda.time.Instant
+import org.joda.time.Interval
 import org.joda.time.LocalDate
 import org.joda.time.LocalDateTime
 import org.joda.time.LocalTime
@@ -42,6 +43,8 @@ internal class JodaTimeResolver : Resolver {
                 DateTime::class -> DateTime(context.generateInstant(), context.randomDateTimeZone())
                 Period::class -> context.generatePeriod()
                 Duration::class -> context.generateDuration()
+                DateTimeZone::class -> context.randomDateTimeZone()
+                Interval::class -> context.generateInterval()
                 else -> Unresolved
             }
         } else {
@@ -80,6 +83,11 @@ internal class JodaTimeResolver : Resolver {
         }
     }
 
+    private fun Context.generateInterval(): Interval {
+        val instants = listOf(resolve(typeOf<Instant>()) as Instant, resolve(typeOf<Instant>()) as Instant).sorted()
+        return Interval(instants[0], instants[1])
+    }
+
     companion object {
         private val hasJodaTime: Boolean by lazy {
             try {

fixture/src/test/kotlin/com/appmattus/kotlinfixture/ComparisonTest.kt

@@ -404,6 +404,8 @@ class ComparisonTest {
                 arrayOf(typeOf<org.joda.time.DateTime>(), VALID, VALID, VALID, VALID),
                 arrayOf(typeOf<org.joda.time.Duration>(), VALID, VALID, IGNORE, VALID),
                 arrayOf(typeOf<org.joda.time.Period>(), VALID, NOT_RANDOM, NOT_RANDOM, NOT_RANDOM),
+                arrayOf(typeOf<org.joda.time.DateTimeZone>(), VALID, UNSUPPORTED, UNSUPPORTED, UNSUPPORTED),
+                arrayOf(typeOf<org.joda.time.Interval>(), VALID, UNSUPPORTED, UNSUPPORTED, UNSUPPORTED),
 
                 // Tuples
                 arrayOf(typeOf<Pair<String, String>>(), VALID, UNSUPPORTED, VALID, VALID),

fixture/src/test/kotlin/com/appmattus/kotlinfixture/resolver/AbstractClassResolverTest.kt

@@ -46,6 +46,7 @@ class AbstractClassResolverTest {
         assertEquals(Unresolved, result)
     }
 
+    @Suppress("UnnecessaryAbstractClass")
     abstract class SingleAbstractClass {
         object OnlySubclass : SingleAbstractClass()
     }
@@ -57,7 +58,7 @@ class AbstractClassResolverTest {
         assertEquals(SingleAbstractClass.OnlySubclass::class, result)
     }
 
-    @Suppress("unused")
+    @Suppress("unused", "UnnecessaryAbstractClass")
     abstract class MultiAbstractClass {
         object SubclassA : MultiAbstractClass()
         object SubclassB : MultiAbstractClass()
@@ -99,7 +100,7 @@ class AbstractClassResolverTest {
         assertEquals(SingleInterfaceClass.OnlySubclass::class, result)
     }
 
-    @Suppress("unused")
+    @Suppress("unused", "UnnecessaryAbstractClass")
     abstract class MultiInterfaceClass {
         object SubclassA : MultiInterfaceClass()
         object SubclassB : MultiInterfaceClass()

fixture/src/test/kotlin/com/appmattus/kotlinfixture/resolver/JodaTimeResolverTest.kt

@@ -23,8 +23,10 @@ import com.appmattus.kotlinfixture.config.Configuration
 import com.appmattus.kotlinfixture.config.ConfigurationBuilder
 import com.appmattus.kotlinfixture.config.before
 import org.joda.time.DateTime
+import org.joda.time.DateTimeZone
 import org.joda.time.Duration
 import org.joda.time.Instant
+import org.joda.time.Interval
 import org.joda.time.LocalDate
 import org.joda.time.LocalDateTime
 import org.joda.time.LocalTime
@@ -110,7 +112,9 @@ class JodaTimeResolverTest {
                 arrayOf(LocalDateTime::class),
                 arrayOf(DateTime::class),
                 arrayOf(Period::class),
-                arrayOf(Duration::class)
+                arrayOf(Duration::class),
+                arrayOf(DateTimeZone::class),
+                arrayOf(Interval::class)
             )
         }
     }