From 33a3e3c7efaf085212c56aea2a1e6681a0794285 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Fri, 26 Apr 2024 17:13:07 -0700 Subject: [PATCH 1/2] Revert "Execute AI tests only when GitHub is running coverage" This reverts commit 0405c69d987be5bf80db9cf56cb2debf0dc8ac6b. --- .../kotlin/net/thauvin/erik/mobibot/DisableOnCiCondition.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/DisableOnCiCondition.kt b/src/test/kotlin/net/thauvin/erik/mobibot/DisableOnCiCondition.kt index 6aa79df..b0f4771 100644 --- a/src/test/kotlin/net/thauvin/erik/mobibot/DisableOnCiCondition.kt +++ b/src/test/kotlin/net/thauvin/erik/mobibot/DisableOnCiCondition.kt @@ -42,7 +42,7 @@ import org.junit.jupiter.api.extension.ExtensionContext */ class DisableOnCiCondition : ExecutionCondition { override fun evaluateExecutionCondition(context: ExtensionContext): ConditionEvaluationResult { - return if (System.getenv("CI") != null && System.getenv("COVERAGE_SDK") == null) { + return if (System.getenv("CI") != null) { ConditionEvaluationResult.disabled("Test disabled on CI") } else { ConditionEvaluationResult.enabled("Test enabled") From 4f9ff1b64137402e82542c53212d4a00672fa2d6 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Fri, 26 Apr 2024 17:36:11 -0700 Subject: [PATCH 2/2] Execute ChatGpt test only when GitHub is running coverage --- pom.xml | 6 ++++++ src/bld/java/net/thauvin/erik/MobibotBuild.java | 1 + .../net/thauvin/erik/mobibot/modules/ChatGptTest.kt | 13 +++++++++---- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index a4e0575..512be76 100644 --- a/pom.xml +++ b/pom.xml @@ -57,6 +57,12 @@ 1.2.0 compile + + org.jetbrains.kotlin + kotlin-stdlib + 1.9.23 + compile + org.jetbrains.kotlinx kotlinx-coroutines-core diff --git a/src/bld/java/net/thauvin/erik/MobibotBuild.java b/src/bld/java/net/thauvin/erik/MobibotBuild.java index 56565b1..a5e5957 100644 --- a/src/bld/java/net/thauvin/erik/MobibotBuild.java +++ b/src/bld/java/net/thauvin/erik/MobibotBuild.java @@ -91,6 +91,7 @@ public class MobibotBuild extends Project { .include(dependency("com.google.guava", "guava", "33.1.0-jre")) .include(dependency("com.google.cloud", "google-cloud-vertexai", "1.2.0")) // Kotlin + .include(dependency("org.jetbrains.kotlin", "kotlin-stdlib", kotlin)) .include(dependency("org.jetbrains.kotlinx", "kotlinx-coroutines-core", "1.8.0")) .include(dependency("org.jetbrains.kotlinx", "kotlinx-cli-jvm", "0.3.6")) // Logging diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/modules/ChatGptTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/modules/ChatGptTest.kt index e38e81b..c031295 100644 --- a/src/test/kotlin/net/thauvin/erik/mobibot/modules/ChatGptTest.kt +++ b/src/test/kotlin/net/thauvin/erik/mobibot/modules/ChatGptTest.kt @@ -47,6 +47,15 @@ class ChatGptTest : LocalProperties() { .hasNoCause() } + @Test + fun testChatOnCoverage() { + if (System.getenv("CI") == null || System.getenv("COVERAGE_SDK") != null) { + assertThat( + ChatGpt.chat("how do I encode a URL in java?", getProperty(ChatGpt.API_KEY_PROP), 60) + ).contains("URLEncoder") + } + } + @Test @DisableOnCi fun testChat() { @@ -55,10 +64,6 @@ class ChatGptTest : LocalProperties() { ChatGpt.chat("how do I make an HTTP request in Javascript?", apiKey, 100) ).contains("XMLHttpRequest") - assertThat( - ChatGpt.chat("how do I encode a URL in java?", apiKey, 60) - ).contains("URLEncoder") - assertFailure { ChatGpt.chat("1 liter to gallon", apiKey, -1) } .isInstanceOf(ModuleException::class.java) }