avoid adding !!

google-gemini · Jul 17, 2024 · aa1905f · aa1905f
1 parent 9926154
commit aa1905f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/common/src/test/java/com/google/ai/client/generativeai/common/UnarySnapshotTests.kt b/common/src/test/java/com/google/ai/client/generativeai/common/UnarySnapshotTests.kt
@@ -316,7 +316,8 @@ internal class UnarySnapshotTests {
         val response = apiController.generateContent(textGenerateContentRequest("prompt"))
         val callPart = (response.candidates!!.first().content!!.parts.first() as FunctionCallPart)
 
-        callPart.functionCall.args!!["season"] shouldBe null
+        callPart.functionCall.args shouldNotBe null
+        callPart.functionCall.args?.get("season") shouldBe null
       }
     }
 
@@ -333,7 +334,8 @@ internal class UnarySnapshotTests {
             it.parts.first().shouldBeInstanceOf<FunctionCallPart>()
           }
 
-        callPart.functionCall.args!!["current"] shouldBe "true"
+        callPart.functionCall.args shouldNotBe null
+        callPart.functionCall.args?.get("current") shouldBe "true"
       }
     }
 
@@ -342,7 +344,9 @@ internal class UnarySnapshotTests {
     goldenUnaryFile("success-function-call-empty-arguments.json") {
       withTimeout(testTimeout) {
         val response = apiController.generateContent(textGenerateContentRequest("prompt"))
-        val callPart = (response.candidates!!.first().content!!.parts.first() as FunctionCallPart)
+        val content = response.candidates.shouldNotBeNullOrEmpty().first().content
+        content.shouldNotBeNull()
+        val callPart = content.parts.shouldNotBeNullOrEmpty().first() as FunctionCallPart
 
         callPart.functionCall.name shouldBe "current_time"
         callPart.functionCall.args shouldBe null

diff --git a/generativeai/src/test/java/com/google/ai/client/generativeai/GenerativeModelTests.kt b/generativeai/src/test/java/com/google/ai/client/generativeai/GenerativeModelTests.kt
@@ -209,8 +209,9 @@ internal class GenerativeModelTests {
     response.functionCalls.firstOrNull()?.let {
       it.shouldNotBeNull()
       it.name shouldBe "getExchangeRate"
-      it.args!! shouldContain ("currencyFrom" to "USD")
-      it.args!! shouldContain ("currencyTo" to "EUR")
+      it.args.shouldNotBeNull()
+      it.args?.shouldContain("currencyFrom" to "USD")
+      it.args?.shouldContain("currencyTo" to "EUR")
     }
 
     coEvery { mockApiController.generateContent(any()) } returns