@@ -23,10 +23,13 @@ import org.junit.jupiter.api.Order
2323import org.junit.jupiter.api.Test
2424import org.junit.jupiter.api.TestInstance
2525import org.junit.jupiter.api.TestMethodOrder
26+ import org.slf4j.Logger
27+ import org.slf4j.LoggerFactory
2628
2729@TestInstance(TestInstance .Lifecycle .PER_CLASS )
2830@TestMethodOrder(OrderAnnotation ::class )
2931class AthenaTest {
32+ private val logger: Logger = LoggerFactory .getLogger(AthenaTest ::class .java)
3033 private var nameQuery: String? = null
3134 private var queryString: String? = null
3235 private var database: String? = null
@@ -43,39 +46,28 @@ class AthenaTest {
4346 queryString = values.queryString.toString()
4447 database = values.database.toString()
4548 outputLocation = values.outputLocation.toString()
46-
47- // Uncomment this code block if you prefer using a config.properties file to retrieve AWS values required for these tests.
48- /*
49- val input: InputStream = this.javaClass.getClassLoader().getResourceAsStream("config.properties")
50- val prop = Properties()
51- prop.load(input)
52- nameQuery = prop.getProperty("nameQuery")
53- queryString = prop.getProperty("queryString")
54- database = prop.getProperty("database")
55- outputLocation = prop.getProperty("outputLocation")
56- */
5749 }
5850
5951 @Test
6052 @Order(1 )
6153 fun createNamedQueryTest () = runBlocking {
6254 queryId = createNamedQuery(queryString.toString(), nameQuery.toString(), database.toString())
6355 queryId?.let { assertTrue(it.isNotEmpty()) }
64- println (" Test 1 passed" )
56+ logger.info (" Test 1 passed" )
6557 }
6658
6759 @Test
6860 @Order(2 )
6961 fun listNamedQueryTest () = runBlocking {
7062 listNamedQueries()
71- println (" Test 2 passed" )
63+ logger.info (" Test 2 passed" )
7264 }
7365
7466 @Test
7567 @Order(3 )
7668 fun listQueryExecutionsTest () = runBlocking {
7769 listQueryIds()
78- println (" Test 3 passed" )
70+ logger.info (" Test 3 passed" )
7971 }
8072
8173 @Test
@@ -84,14 +76,14 @@ class AthenaTest {
8476 val queryExecutionId = submitAthenaQuery(queryString.toString(), database.toString(), outputLocation.toString())
8577 waitForQueryToComplete(queryExecutionId)
8678 processResultRows(queryExecutionId)
87- println (" Test 4 passed" )
79+ logger.info (" Test 4 passed" )
8880 }
8981
9082 @Test
9183 @Order(5 )
9284 fun deleteNamedQueryTest () = runBlocking {
9385 deleteQueryName(queryId)
94- println (" Test 5 passed" )
86+ logger.info (" Test 5 passed" )
9587 }
9688
9789 private suspend fun getSecretValues (): String {
@@ -101,7 +93,6 @@ class AthenaTest {
10193 }
10294 SecretsManagerClient {
10395 region = " us-east-1"
104- credentialsProvider = EnvironmentCredentialsProvider ()
10596 }.use { secretClient ->
10697 val valueResponse = secretClient.getSecretValue(valueRequest)
10798 return valueResponse.secretString.toString()
0 commit comments