Lint Usecases

Gerrit Garbereder · Gerrit Garbereder · commit 25067e8f667f · 2023-06-18T08:01:04.000+03:00
diff --git a/Task-Tracker-Usecases/build.gradle.kts b/Task-Tracker-Usecases/build.gradle.kts
@@ -2,6 +2,7 @@ plugins {
     kotlin("multiplatform") version "1.8.22"
     id("maven-publish")
     id("com.google.devtools.ksp") version "1.8.22-1.0.11"
+    id("org.jlleitschuh.gradle.ktlint") version "11.4.0"
 }
 
 group = "com.garbereder.tasktracker.usecases"
@@ -37,7 +38,6 @@ kotlin {
         else -> throw GradleException("Host OS is not supported in Kotlin/Native.")
     }
 
-    
     sourceSets {
         val commonMain by getting {
             dependencies {
@@ -60,10 +60,19 @@ kotlin {
     }
 }
 
+ktlint {
+    filter {
+        // https://github.com/JLLeitschuh/ktlint-gradle/issues/522#issuecomment-958756817
+        exclude { entry ->
+            entry.file.toString().contains("generated")
+        }
+    }
+}
+
 dependencies {
     configurations
         .filter { it.name.startsWith("ksp") && it.name.contains("Test") }
         .forEach {
             add(it.name, "io.mockative:mockative-processor:1.4.1")
         }
-}
+}
diff --git a/Task-Tracker-Usecases/settings.gradle.kts b/Task-Tracker-Usecases/settings.gradle.kts
@@ -1,3 +1,2 @@
 
 rootProject.name = "Task-Tracker-Usecases"
-
diff --git a/Task-Tracker-Usecases/src/commonMain/kotlin/com/garbereder/tasktracker/usecases/UseCase.kt b/Task-Tracker-Usecases/src/commonMain/kotlin/com/garbereder/tasktracker/usecases/UseCase.kt
@@ -2,4 +2,4 @@ package com.garbereder.tasktracker.usecases
 
 interface UseCase<out T> {
     fun invoke(): T
-}
+}
diff --git a/Task-Tracker-Usecases/src/commonMain/kotlin/com/garbereder/tasktracker/usecases/tasks/AddActivity.kt b/Task-Tracker-Usecases/src/commonMain/kotlin/com/garbereder/tasktracker/usecases/tasks/AddActivity.kt
@@ -2,13 +2,8 @@ package com.garbereder.tasktracker.usecases.tasks
 
 import com.garbereder.tasktracker.entities.Activity
 import com.garbereder.tasktracker.entities.ActivityCollection
-import com.garbereder.tasktracker.entities.Task
 import com.garbereder.tasktracker.usecases.UseCase
-import kotlinx.datetime.Clock
 
-import kotlinx.datetime.TimeZone
-import kotlinx.datetime.toLocalDateTime
-
-class AddActivity(private val collection: ActivityCollection, private val activity: Activity): UseCase<Unit> {
+class AddActivity(private val collection: ActivityCollection, private val activity: Activity) : UseCase<Unit> {
     override fun invoke(): Unit = collection.add(activity)
-}
+}
diff --git a/Task-Tracker-Usecases/src/commonMain/kotlin/com/garbereder/tasktracker/usecases/tasks/AddTask.kt b/Task-Tracker-Usecases/src/commonMain/kotlin/com/garbereder/tasktracker/usecases/tasks/AddTask.kt
@@ -6,4 +6,4 @@ import com.garbereder.tasktracker.usecases.UseCase
 
 class AddTask constructor(private val collection: TaskCollection, private val taskName: String) : UseCase<Unit> {
     override fun invoke() = collection.add(Task("${collection.size() + 1}", taskName))
-}
+}
diff --git a/Task-Tracker-Usecases/src/commonMain/kotlin/com/garbereder/tasktracker/usecases/tasks/ListTasks.kt b/Task-Tracker-Usecases/src/commonMain/kotlin/com/garbereder/tasktracker/usecases/tasks/ListTasks.kt
@@ -4,6 +4,6 @@ import com.garbereder.tasktracker.entities.Task
 import com.garbereder.tasktracker.entities.TaskCollection
 import com.garbereder.tasktracker.usecases.UseCase
 
-class ListTasks(private val collection: TaskCollection): UseCase<Iterator<Task>> {
+class ListTasks(private val collection: TaskCollection) : UseCase<Iterator<Task>> {
     override fun invoke(): Iterator<Task> = collection.iterator()
-}
+}
diff --git a/Task-Tracker-Usecases/src/commonMain/kotlin/com/garbereder/tasktracker/usecases/tasks/LoadActivities.kt b/Task-Tracker-Usecases/src/commonMain/kotlin/com/garbereder/tasktracker/usecases/tasks/LoadActivities.kt
@@ -3,7 +3,6 @@ package com.garbereder.tasktracker.usecases.tasks
 import com.garbereder.tasktracker.entities.ActivityCollection
 import com.garbereder.tasktracker.usecases.UseCase
 
-class LoadActivities(private val reader: ActivityCollectionReader): UseCase<ActivityCollection> {
+class LoadActivities(private val reader: ActivityCollectionReader) : UseCase<ActivityCollection> {
     override fun invoke(): ActivityCollection = reader.read()
-
 }
diff --git a/Task-Tracker-Usecases/src/commonMain/kotlin/com/garbereder/tasktracker/usecases/tasks/LoadTasks.kt b/Task-Tracker-Usecases/src/commonMain/kotlin/com/garbereder/tasktracker/usecases/tasks/LoadTasks.kt
@@ -5,4 +5,4 @@ import com.garbereder.tasktracker.usecases.UseCase
 
 class LoadTasks(private val reader: TaskCollectionReader) : UseCase<TaskCollection> {
     override fun invoke(): TaskCollection = this.reader.read()
-}
+}
diff --git a/Task-Tracker-Usecases/src/commonMain/kotlin/com/garbereder/tasktracker/usecases/tasks/RemoveTask.kt b/Task-Tracker-Usecases/src/commonMain/kotlin/com/garbereder/tasktracker/usecases/tasks/RemoveTask.kt
@@ -4,6 +4,6 @@ import com.garbereder.tasktracker.entities.Task
 import com.garbereder.tasktracker.entities.TaskCollection
 import com.garbereder.tasktracker.usecases.UseCase
 
-class RemoveTask(private val collection: TaskCollection, private val task: Task): UseCase<Unit> {
+class RemoveTask(private val collection: TaskCollection, private val task: Task) : UseCase<Unit> {
     override fun invoke() = collection.remove(task)
-}
+}
diff --git a/Task-Tracker-Usecases/src/commonMain/kotlin/com/garbereder/tasktracker/usecases/tasks/StartActivity.kt b/Task-Tracker-Usecases/src/commonMain/kotlin/com/garbereder/tasktracker/usecases/tasks/StartActivity.kt
@@ -4,10 +4,9 @@ import com.garbereder.tasktracker.entities.Activity
 import com.garbereder.tasktracker.entities.Task
 import com.garbereder.tasktracker.usecases.UseCase
 import kotlinx.datetime.Clock
-
 import kotlinx.datetime.TimeZone
 import kotlinx.datetime.toLocalDateTime
 
-class StartActivity(private val task: Task): UseCase<Activity> {
+class StartActivity(private val task: Task) : UseCase<Activity> {
     override fun invoke(): Activity = Activity("1", Clock.System.now().toLocalDateTime(TimeZone.currentSystemDefault()), null, task)
-}
+}
diff --git a/Task-Tracker-Usecases/src/commonMain/kotlin/com/garbereder/tasktracker/usecases/tasks/StopActivity.kt b/Task-Tracker-Usecases/src/commonMain/kotlin/com/garbereder/tasktracker/usecases/tasks/StopActivity.kt
@@ -1,13 +1,11 @@
 package com.garbereder.tasktracker.usecases.tasks
 
 import com.garbereder.tasktracker.entities.Activity
-import com.garbereder.tasktracker.entities.Task
 import com.garbereder.tasktracker.usecases.UseCase
 import kotlinx.datetime.Clock
-
 import kotlinx.datetime.TimeZone
 import kotlinx.datetime.toLocalDateTime
 
-class StopActivity(private val activity: Activity): UseCase<Activity> {
+class StopActivity(private val activity: Activity) : UseCase<Activity> {
     override fun invoke(): Activity = activity.copy(end = Clock.System.now().toLocalDateTime(TimeZone.currentSystemDefault()))
-}
+}
diff --git a/Task-Tracker-Usecases/src/commonMain/kotlin/com/garbereder/tasktracker/usecases/tasks/TaskCollectionReader.kt b/Task-Tracker-Usecases/src/commonMain/kotlin/com/garbereder/tasktracker/usecases/tasks/TaskCollectionReader.kt
@@ -4,4 +4,4 @@ import com.garbereder.tasktracker.entities.TaskCollection
 
 interface TaskCollectionReader {
     fun read(): TaskCollection
-}
+}
diff --git a/Task-Tracker-Usecases/src/commonMain/kotlin/com/garbereder/tasktracker/usecases/tasks/TaskCollectionReaderFactory.kt b/Task-Tracker-Usecases/src/commonMain/kotlin/com/garbereder/tasktracker/usecases/tasks/TaskCollectionReaderFactory.kt
@@ -2,4 +2,4 @@ package com.garbereder.tasktracker.usecases.tasks
 
 interface TaskCollectionReaderFactory {
     fun create(): TaskCollectionReader
-}
+}
diff --git a/Task-Tracker-Usecases/src/commonTest/kotlin/com/garbereder/tasktracker/usecases/tasks/AddActivityTest.kt b/Task-Tracker-Usecases/src/commonTest/kotlin/com/garbereder/tasktracker/usecases/tasks/AddActivityTest.kt
@@ -3,13 +3,17 @@ package com.garbereder.tasktracker.usecases.tasks
 import com.garbereder.tasktracker.entities.Activity
 import com.garbereder.tasktracker.entities.ActivityCollection
 import com.garbereder.tasktracker.entities.Task
-import com.garbereder.tasktracker.entities.TaskCollection
-import io.mockative.*
+import io.mockative.Mock
+import io.mockative.classOf
+import io.mockative.given
+import io.mockative.mock
+import io.mockative.once
+import io.mockative.thenDoNothing
+import io.mockative.verify
 import kotlinx.datetime.Clock
 import kotlinx.datetime.TimeZone
 import kotlinx.datetime.toLocalDateTime
 import kotlin.test.Test
-import kotlin.test.assertTrue
 
 class AddActivityTest {
 
@@ -18,7 +22,7 @@ class AddActivityTest {
 
     @Test
     fun invoke_activity_callAdd() {
-        val task = Task("1","TaskName")
+        val task = Task("1", "TaskName")
         val time = Clock.System.now().toLocalDateTime(TimeZone.currentSystemDefault())
         val activity = Activity("1", time, null, task)
 
@@ -30,4 +34,4 @@ class AddActivityTest {
         verify(collection).invocation { add(activity) }
             .wasInvoked(exactly = once)
     }
-}
+}
diff --git a/Task-Tracker-Usecases/src/commonTest/kotlin/com/garbereder/tasktracker/usecases/tasks/AddTaskTests.kt b/Task-Tracker-Usecases/src/commonTest/kotlin/com/garbereder/tasktracker/usecases/tasks/AddTaskTests.kt
@@ -2,16 +2,22 @@ package com.garbereder.tasktracker.usecases.tasks
 
 import com.garbereder.tasktracker.entities.Task
 import com.garbereder.tasktracker.entities.TaskCollection
-import io.mockative.*
-import kotlin.test.*
+import io.mockative.Mock
+import io.mockative.classOf
+import io.mockative.given
+import io.mockative.mock
+import io.mockative.once
+import io.mockative.thenDoNothing
+import io.mockative.verify
+import kotlin.test.Test
 
 class AddTaskTests {
     @Mock
     val collection = mock(classOf<TaskCollection>())
 
     @Test
     fun invoke_noInput_callsThrough() {
-        val task = Task("1","TaskName")
+        val task = Task("1", "TaskName")
         given(collection).invocation { add(task) }
             .thenDoNothing()
         given(collection).invocation { size() }
@@ -24,5 +30,4 @@ class AddTaskTests {
         verify(collection).invocation { add(task) }
             .wasInvoked(exactly = once)
     }
-
-}
+}
diff --git a/Task-Tracker-Usecases/src/commonTest/kotlin/com/garbereder/tasktracker/usecases/tasks/ListTasksTests.kt b/Task-Tracker-Usecases/src/commonTest/kotlin/com/garbereder/tasktracker/usecases/tasks/ListTasksTests.kt
@@ -2,7 +2,12 @@ package com.garbereder.tasktracker.usecases.tasks
 
 import com.garbereder.tasktracker.entities.Task
 import com.garbereder.tasktracker.entities.TaskCollection
-import io.mockative.*
+import io.mockative.Mock
+import io.mockative.classOf
+import io.mockative.given
+import io.mockative.mock
+import io.mockative.once
+import io.mockative.verify
 import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertFalse
@@ -15,8 +20,8 @@ class ListTasksTests {
     @Test
     fun invoke_noInput_callsThrough() {
         val tasks = listOf(
-            Task("1","TaskName"),
-            Task("1","TaskName2")
+            Task("1", "TaskName"),
+            Task("1", "TaskName2")
         )
         given(collection).invocation { iterator() }
             .then { tasks.iterator() }
@@ -26,9 +31,9 @@ class ListTasksTests {
         verify(collection).invocation { iterator() }
             .wasInvoked(exactly = once)
 
-        assertTrue ( it.hasNext() )
+        assertTrue(it.hasNext())
         assertEquals(tasks[0], it.next())
         assertEquals(tasks[1], it.next())
-        assertFalse ( it.hasNext() )
+        assertFalse(it.hasNext())
     }
-}
+}
diff --git a/Task-Tracker-Usecases/src/commonTest/kotlin/com/garbereder/tasktracker/usecases/tasks/LoadActivitiesTests.kt b/Task-Tracker-Usecases/src/commonTest/kotlin/com/garbereder/tasktracker/usecases/tasks/LoadActivitiesTests.kt
@@ -1,15 +1,22 @@
 package com.garbereder.tasktracker.usecases.tasks
 
 import com.garbereder.tasktracker.entities.ActivityCollection
-import io.mockative.*
+import io.mockative.Mock
+import io.mockative.classOf
+import io.mockative.given
+import io.mockative.mock
+import io.mockative.once
+import io.mockative.verify
 import kotlin.test.Test
 import kotlin.test.assertEquals
 
 class LoadActivitiesTests {
     @Mock
     val reader = mock(classOf<ActivityCollectionReader>())
+
     @Mock
     val collection = mock(classOf<ActivityCollection>())
+
     @Test
     fun invoke_noInput_callsThrough() {
         given(reader).invocation { read() }
@@ -21,5 +28,4 @@ class LoadActivitiesTests {
         verify(reader).invocation { read() }
             .wasInvoked(exactly = once)
     }
-
-}
+}
diff --git a/Task-Tracker-Usecases/src/commonTest/kotlin/com/garbereder/tasktracker/usecases/tasks/LoadTasksTests.kt b/Task-Tracker-Usecases/src/commonTest/kotlin/com/garbereder/tasktracker/usecases/tasks/LoadTasksTests.kt
@@ -1,19 +1,22 @@
 package com.garbereder.tasktracker.usecases.tasks
 
-import com.garbereder.tasktracker.entities.Task
 import com.garbereder.tasktracker.entities.TaskCollection
-import com.garbereder.tasktracker.usecases.UseCase
-import io.mockative.*
+import io.mockative.Mock
+import io.mockative.classOf
+import io.mockative.given
+import io.mockative.mock
+import io.mockative.once
+import io.mockative.verify
 import kotlin.test.Test
 import kotlin.test.assertEquals
-import kotlin.test.assertNotNull
-import kotlin.test.assertTrue
 
 class LoadTasksTests {
     @Mock
     val reader = mock(classOf<TaskCollectionReader>())
+
     @Mock
     val collection = mock(classOf<TaskCollection>())
+
     @Test
     fun invoke_noInput_callsThrough() {
         given(reader).invocation { read() }
@@ -25,5 +28,4 @@ class LoadTasksTests {
         verify(reader).invocation { read() }
             .wasInvoked(exactly = once)
     }
-
-}
+}
diff --git a/Task-Tracker-Usecases/src/commonTest/kotlin/com/garbereder/tasktracker/usecases/tasks/RemoveTaskTest.kt b/Task-Tracker-Usecases/src/commonTest/kotlin/com/garbereder/tasktracker/usecases/tasks/RemoveTaskTest.kt
@@ -2,15 +2,19 @@ package com.garbereder.tasktracker.usecases.tasks
 
 import com.garbereder.tasktracker.entities.Task
 import com.garbereder.tasktracker.entities.TaskCollection
-import com.garbereder.tasktracker.entities.TaskNotFoundException
-import io.mockative.*
+import io.mockative.Mock
+import io.mockative.classOf
+import io.mockative.given
+import io.mockative.mock
+import io.mockative.once
+import io.mockative.thenDoNothing
+import io.mockative.verify
 import kotlin.test.Test
-import kotlin.test.assertEquals
-import kotlin.test.assertFailsWith
 
 class RemoveTaskTest {
     @Mock
     val collection = mock(classOf<TaskCollection>())
+
     @Test
     fun invoke_noInput_callsThrough() {
         val task = Task("TaskId", "TaskName")
@@ -21,4 +25,4 @@ class RemoveTaskTest {
         verify(collection).invocation { remove(task) }
             .wasInvoked(exactly = once)
     }
-}
+}
diff --git a/Task-Tracker-Usecases/src/commonTest/kotlin/com/garbereder/tasktracker/usecases/tasks/StartActivityTest.kt b/Task-Tracker-Usecases/src/commonTest/kotlin/com/garbereder/tasktracker/usecases/tasks/StartActivityTest.kt
@@ -11,14 +11,14 @@ class StartActivityTest {
 
     @Test
     fun invoke_noInput_setStart() {
-        val task = Task("1","TaskName")
+        val task = Task("1", "TaskName")
         val before = Clock.System.now().toLocalDateTime(TimeZone.currentSystemDefault())
         val activity = StartActivity(task).invoke()
         val after = Clock.System.now().toLocalDateTime(TimeZone.currentSystemDefault())
 
-        assertTrue( activity.id == "1" )
-        assertTrue( activity.end === null )
-        assertTrue( activity.start >= before )
-        assertTrue( activity.start <= after )
+        assertTrue(activity.id == "1")
+        assertTrue(activity.end === null)
+        assertTrue(activity.start >= before)
+        assertTrue(activity.start <= after)
     }
-}
+}
diff --git a/Task-Tracker-Usecases/src/commonTest/kotlin/com/garbereder/tasktracker/usecases/tasks/StopActivityTest.kt b/Task-Tracker-Usecases/src/commonTest/kotlin/com/garbereder/tasktracker/usecases/tasks/StopActivityTest.kt

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,2 @@`
`1`	`1`
`2`	`2`	`rootProject.name = "Task-Tracker-Usecases"`
`3`		`-`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,6 @@ package com.garbereder.tasktracker.usecases.tasks`
`3`	`3`	`import com.garbereder.tasktracker.entities.ActivityCollection`
`4`	`4`	`import com.garbereder.tasktracker.usecases.UseCase`
`5`	`5`
`6`		`-class LoadActivities(private val reader: ActivityCollectionReader): UseCase<ActivityCollection> {`
	`6`	`+class LoadActivities(private val reader: ActivityCollectionReader) : UseCase<ActivityCollection> {`
`7`	`7`	`override fun invoke(): ActivityCollection = reader.read()`
`8`		`-`
`9`	`8`	`}`