From c5296ea039c6ba1cd1728cdbe20e14241e92fbf0 Mon Sep 17 00:00:00 2001
From: William Walker <wnwalker@ucsc.edu>
Date: Wed, 18 Dec 2024 16:06:05 -0800
Subject: [PATCH] Add default params to exposed funs, refactor tests
---
.../kotlin/edu/ucsc/its/temerity/core/Temerity.kt | 8 ++++----
.../kotlin/edu/ucsc/its/temerity/test/DevUserApiTests.kt | 3 ++-
.../kotlin/edu/ucsc/its/temerity/test/ProdReportTests.kt | 6 ++++--
3 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/temerity/src/commonMain/kotlin/edu/ucsc/its/temerity/core/Temerity.kt b/temerity/src/commonMain/kotlin/edu/ucsc/its/temerity/core/Temerity.kt
index 56a3eb3..44a02dd 100644
--- a/temerity/src/commonMain/kotlin/edu/ucsc/its/temerity/core/Temerity.kt
+++ b/temerity/src/commonMain/kotlin/edu/ucsc/its/temerity/core/Temerity.kt
@@ -123,9 +123,9 @@ public class Temerity internal constructor(
@JvmStatic
internal fun createLogger(
- tag: String?,
- config: TemClientConfig?,
- supportKtxNotebook: Boolean,
+ tag: String? = null,
+ config: TemClientConfig? = null,
+ supportKtxNotebook: Boolean = false,
): KermitLogger = LoggerFactory.createLogger(
tag = tag,
config = config,
@@ -533,7 +533,7 @@ public class Temerity internal constructor(
// TODO: Persist user-defined default sort order for subsequent runs
apply { sortByCreationDate(NEW_FIRST) }
}
-
+
else -> apply { sortByCreationDate(sortOrder) }
}
}
diff --git a/temerity/src/jvmTest/kotlin/edu/ucsc/its/temerity/test/DevUserApiTests.kt b/temerity/src/jvmTest/kotlin/edu/ucsc/its/temerity/test/DevUserApiTests.kt
index 0aee5de..57ac043 100644
--- a/temerity/src/jvmTest/kotlin/edu/ucsc/its/temerity/test/DevUserApiTests.kt
+++ b/temerity/src/jvmTest/kotlin/edu/ucsc/its/temerity/test/DevUserApiTests.kt
@@ -21,6 +21,7 @@ import co.touchlab.kermit.Logger
import com.skydoves.sandwich.StatusCode
import com.skydoves.sandwich.ktor.getStatusCode
import edu.ucsc.its.temerity.core.Temerity
+import edu.ucsc.its.temerity.core.Temerity.Companion.createLogger
import edu.ucsc.its.temerity.model.NewUser
import edu.ucsc.its.temerity.model.UserUpdate
import io.kotest.core.spec.style.FunSpec
@@ -32,7 +33,7 @@ class DevUserApiTests :
FunSpec({
val dotenv = dotenvVaultJvm()
- val kermit = createLogger("DevUserApiTests")
+ val kermit = createLogger(tag = "DevUserApiTests")
lateinit var testTemerity: Temerity
beforeTest {
diff --git a/temerity/src/jvmTest/kotlin/edu/ucsc/its/temerity/test/ProdReportTests.kt b/temerity/src/jvmTest/kotlin/edu/ucsc/its/temerity/test/ProdReportTests.kt
index 5eecca7..5ce6590 100644
--- a/temerity/src/jvmTest/kotlin/edu/ucsc/its/temerity/test/ProdReportTests.kt
+++ b/temerity/src/jvmTest/kotlin/edu/ucsc/its/temerity/test/ProdReportTests.kt
@@ -16,9 +16,11 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
package edu.ucsc.its.temerity.test
+
import edu.ucsc.its.temerity.AuditLogSortOrder.NEW_FIRST
import edu.ucsc.its.temerity.core.Temerity
import edu.ucsc.its.temerity.core.Temerity.Companion.createLogger
+import edu.ucsc.its.temerity.core.Temerity.Companion.currentDate
import edu.ucsc.its.temerity.model.EventType.AUTOMATED_SESSION_FAILED_TO_START
import edu.ucsc.its.temerity.model.EventType.AUTOMATED_SESSION_MONITOR
import edu.ucsc.its.temerity.model.EventType.CAPTURE_ERROR
@@ -52,7 +54,7 @@ class ProdReportTests :
FunSpec(),
KoinTest {
- private val kermit: KermitLogger = createLogger("TemerityDevTest")
+ private val kermit: KermitLogger = createLogger(tag = "TemerityDevTest")
init {
coroutineDebugProbes = true
@@ -60,7 +62,7 @@ class ProdReportTests :
val dotenv = dotenvVaultJvm()
lateinit var testTemerity: Temerity
- val today = Temerity.currentDate()
+ val today = currentDate()
beforeTest {
testTemerity = Temerity {
--
GitLab