updated Kotlin tests

Author: scmacdon

kotlin/services/location/src/main/java/com/example/location/HelloLocation.kt

@@ -5,6 +5,7 @@ package com.example.location
 
 import aws.sdk.kotlin.services.location.LocationClient
 import aws.sdk.kotlin.services.location.model.ListGeofencesRequest
+import kotlin.system.exitProcess
 
 // snippet-start:[location.kotlin.hello.main]
 /**
@@ -31,11 +32,11 @@ suspend fun main(args: Array<String>) {
             
             """.trimIndent()
 
-    //if (args.size != 1) {
-    ///    println(usage)
-    //    exitProcess(0)
-    // }
-    val colletionName = "Collection100" //args[0]
+    if (args.size != 1) {
+         println(usage)
+         exitProcess(0)
+     }
+    val colletionName = args[0]
     listGeofences(colletionName)
 }
 
@@ -44,15 +45,14 @@ suspend fun main(args: Array<String>) {
  *
  * @param collectionName the name of the geofence collection
  */
-private suspend fun listGeofences(collectionName: String) {
+suspend fun listGeofences(collectionName: String) {
     val request = ListGeofencesRequest {
         this.collectionName = collectionName
     }
 
     LocationClient { region = "us-east-1" }.use { client ->
         val response = client.listGeofences(request)
         val geofences = response.entries
-
         if (geofences.isNullOrEmpty()) {
             println("No Geofences found")
         } else {

kotlin/services/location/src/main/java/com/example/location/scenario/LocationScenario.kt

@@ -34,6 +34,7 @@ import aws.sdk.kotlin.services.location.model.PositionFiltering
 import aws.sdk.kotlin.services.location.model.PutGeofenceRequest
 import aws.sdk.kotlin.services.location.model.TravelMode
 import java.util.Scanner
+import kotlin.system.exitProcess
 
 // snippet-start:[location.kotlin.scenario.main]
 /**
@@ -47,7 +48,6 @@ https://docs.aws.amazon.com/sdk-for-kotlin/latest/developer-guide/setup.html
 val scanner = Scanner(System.`in`)
 val DASHES = String(CharArray(80)).replace("\u0000", "-")
 suspend fun main(args: Array<String>) {
-
     val usage = """
 
             Usage:    <mapName> <keyName> <collectionName> <geoId> <trackerName> <calculatorName> <deviceId>
@@ -63,18 +63,18 @@ suspend fun main(args: Array<String>) {
             
             """.trimIndent()
 
-    // if (args.size != 7) {
-    //     println(usage)
-    //     exitProcess(0)
-    // }
+    if (args.size != 7) {
+        println(usage)
+        exitProcess(0)
+    }
 
-    val mapName = "AWSMap301"; //args[0]
-    val keyName = "AWSApiKey301"; //args[1]
-    val collectionName = "AWSLocationCollection301"; //args[2]
-    val geoId = "geoId301";//args[3]
-    val trackerName = "geoTracker301" // args[4]
-    val calculatorName = "AWSRouteCalc301"; //args[5]
-    val deviceId = "iPhone-112356"
+    val mapName = args[0]
+    val keyName = args[1]
+    val collectionName = args[2]
+    val geoId = args[3]
+    val trackerName = args[4]
+    val calculatorName = args[5]
+    val deviceId = args[6]
 
     println(
         """
@@ -328,7 +328,6 @@ suspend fun deleteTracker(trackerName: String) {
     LocationClient { region = "us-east-1" }.use { client ->
         client.deleteTracker(trackerRequest)
         println("The tracker $trackerName was deleted.")
-
     }
 }
 // snippet-end:[location.kotlin.delete.tracker.main]

kotlin/services/location/src/test/java/LocationTest.kt

@@ -1,6 +1,7 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
+import com.example.location.listGeofences
 import com.example.location.scenario.calcDistance
 import com.example.location.scenario.createGeofenceCollection
 import com.example.location.scenario.createKey
@@ -22,17 +23,20 @@ import kotlinx.coroutines.runBlocking
 import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.MethodOrderer
 import org.junit.jupiter.api.Order
-import org.junit.jupiter.api.Tag
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.TestInstance
 import org.junit.jupiter.api.TestMethodOrder
+import org.slf4j.Logger
+import org.slf4j.LoggerFactory
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 @TestMethodOrder(MethodOrderer.OrderAnnotation::class)
 class LocationTest {
+    private val logger: Logger = LoggerFactory.getLogger(LocationTest::class.java)
     private val mapName = "TestMap"
     private val keyName = "TestKey"
     private val collectionName = "TestCollection"
+    private val existingCollectione = "Collection100"
     private val geoId = "TestGeo"
     private val trackerName = "TestTracker"
     private var mapArn = ""
@@ -41,7 +45,6 @@ class LocationTest {
     var deviceId = "iPhone-112359" // Use the iPhone's identifier from Swift
 
     @Test
-    @Tag("IntegrationTest")
     @Order(1)
     fun testScenario() = runBlocking {
         println("===== Starting Full Location Service Scenario Test =====")
@@ -52,15 +55,15 @@ class LocationTest {
                 .onFailure { it.printStackTrace() }
                 .getOrThrow()
 
-            println("Created Map: $mapArn")
+            logger.info("Created Map: $mapArn")
 
             // Step 2: Create Key
             keyArn = runCatching { createKey(keyName, mapArn) }
                 .onSuccess { Assertions.assertNotNull(it, "Expected key ARN to be non-null") }
                 .onFailure { it.printStackTrace() }
                 .getOrThrow()
 
-            println("Created Key: $keyArn")
+            logger.info("Created Key: $keyArn")
 
             // Step 3: Geofencing
             runCatching { createGeofenceCollection(collectionName) }
@@ -130,9 +133,20 @@ class LocationTest {
             val cleanupSuccess = cleanupResults.all { it.isSuccess }
             Assertions.assertTrue(cleanupSuccess, "Some resources failed to delete")
 
-            println("===== Cleanup Completed Successfully =====")
+            logger.info("===== Cleanup Completed Successfully =====")
         }
 
-        println("🎉 Test 1 Passed Successfully!")
+        logger.info("🎉 Test 1 Passed Successfully!")
+    }
+
+    @Test
+    @Order(2)
+    fun testHello() = runBlocking {
+        runCatching { listGeofences(existingCollectione) }
+            .onSuccess { println("Hello passed") }
+            .onFailure { it.printStackTrace() }
+            .getOrThrow()
+
+        logger.info("🎉 Test 2 Passed Successfully!")
     }
 }