update mocked data types to use proper override functions

Author: samgst-amazon

plugins/toolkit/jetbrains-ultimate/tst/software/aws/toolkits/jetbrains/datagrip/auth/SecretsManagerAuthWidgetTest.kt

@@ -3,6 +3,7 @@
 
 package software.aws.toolkits.jetbrains.datagrip.auth
 
+import com.intellij.database.dataSource.DatabaseConnectionPoint
 import com.intellij.database.dataSource.LocalDataSource
 import com.intellij.database.dataSource.url.template.UrlEditorModel
 import com.intellij.testFramework.ProjectRule
@@ -72,31 +73,31 @@ class SecretsManagerAuthWidgetTest {
 
     @Test
     fun `Sets region from Redshift URL`() {
-        widget.reset(mock(), false)
+        widget.reset(mock<DatabaseConnectionPoint>(), false)
         val endpointUrl = "jdbc:redshift://redshift-cluster.host.$defaultRegion.redshift.amazonaws.com:5439/dev"
         widget.updateFromUrl(mock<UrlEditorModel> { on { url } doReturn endpointUrl })
         assertThat(widget.getSelectedRegion()?.id).isEqualTo(defaultRegion)
     }
 
     @Test
     fun `Sets region from RDS URL`() {
-        widget.reset(mock(), false)
+        widget.reset(mock<DatabaseConnectionPoint>(), false)
         val endpointUrl = "jdbc:postgresql://abc.host.$defaultRegion.rds.amazonaws.com:5432/dev"
         widget.updateFromUrl(mock<UrlEditorModel> { on { url } doReturn endpointUrl })
         assertThat(widget.getSelectedRegion()?.id).isEqualTo(defaultRegion)
     }
 
     @Test
     fun `Does not unset region on invalid url`() {
-        widget.reset(mock(), false)
+        widget.reset(mock<DatabaseConnectionPoint>(), false)
         val endpointUrl = "jdbc:postgresql://abc.host.$defaultRegion.rds.amazonaws.com:5432/dev"
         widget.updateFromUrl(mock<UrlEditorModel> { on { url } doReturn endpointUrl })
         val badUrl = "jdbc:postgresql://abc.host.1000000%invalidregion.rds.amazonaws.com:5432/dev"
         widget.updateFromUrl(mock<UrlEditorModel> { on { url } doReturn badUrl })
         assertThat(widget.getSelectedRegion()?.id).isEqualTo(defaultRegion)
     }
 
-    private fun buildDataSource(hasSecret: Boolean = true, getUrlFromSecret: Boolean = false): LocalDataSource = mock {
+    private fun buildDataSource(hasSecret: Boolean = true, getUrlFromSecret: Boolean = false): DatabaseConnectionPoint = mock {
         on { additionalProperties } doAnswer {
             mutableMapOf<String, String>().also {
                 it[CREDENTIAL_ID_PROPERTY] = credentialId

plugins/toolkit/jetbrains-ultimate/tst/software/aws/toolkits/jetbrains/services/rds/auth/IamAuthWidgetTest.kt

@@ -3,6 +3,8 @@
 
 package software.aws.toolkits.jetbrains.services.rds.auth
 
+import com.intellij.database.dataSource.DatabaseConnectionConfig
+import com.intellij.database.dataSource.DatabaseConnectionPoint
 import com.intellij.database.dataSource.LocalDataSource
 import com.intellij.database.dataSource.url.template.UrlEditorModel
 import com.intellij.testFramework.ProjectRule
@@ -76,15 +78,15 @@ class IamAuthWidgetTest {
 
     @Test
     fun `Sets region from URL`() {
-        widget.reset(mock(), false)
+        widget.reset(mock<DatabaseConnectionPoint>(), false)
         val endpointUrl = "jdbc:postgresql://abc.host.$defaultRegion.rds.amazonaws.com:5432/dev"
         widget.updateFromUrl(mock<UrlEditorModel> { on { url } doReturn endpointUrl })
         assertThat(widget.getSelectedRegion()?.id).isEqualTo(defaultRegion)
     }
 
     @Test
     fun `Does not unset region on invalid url`() {
-        widget.reset(mock(), false)
+        widget.reset(mock<DatabaseConnectionPoint>(), false)
         val endpointUrl = "jdbc:postgresql://abc.host.$defaultRegion.rds.amazonaws.com:5432/dev"
         widget.updateFromUrl(mock<UrlEditorModel> { on { url } doReturn endpointUrl })
         val badUrl = "jdbc:postgresql://abc.host.1000000%invalidregion.rds.amazonaws.com:5432/dev"
@@ -94,25 +96,25 @@ class IamAuthWidgetTest {
 
     @Test
     fun `Save saves set signing host and port if set`() {
-        widget.reset(mock { on { additionalProperties } doReturn mapOf(RDS_SIGNING_HOST_PROPERTY to "host", RDS_SIGNING_PORT_PROPERTY to "port") }, false)
+        widget.reset(mock<DatabaseConnectionPoint> { on { additionalProperties } doReturn mapOf(RDS_SIGNING_HOST_PROPERTY to "host", RDS_SIGNING_PORT_PROPERTY to "port") }, false)
         val m = mutableMapOf<String, String>()
-        widget.save(mock { on { additionalProperties } doReturn m }, false)
+        widget.save(mock<DatabaseConnectionConfig> { on { additionalProperties } doReturn m }, false)
         assertThat(m[RDS_SIGNING_HOST_PROPERTY]).isEqualTo("host")
         assertThat(m[RDS_SIGNING_PORT_PROPERTY]).isEqualTo("port")
     }
 
     @Test
     fun `Save saves null signing host and port if not set`() {
         val m = mutableMapOf<String, String>()
-        widget.save(mock { on { additionalProperties } doReturn m }, false)
+        widget.save(mock<DatabaseConnectionConfig> { on { additionalProperties } doReturn m }, false)
         assertThat(m[RDS_SIGNING_HOST_PROPERTY]).isNull()
         assertThat(m[RDS_SIGNING_PORT_PROPERTY]).isNull()
     }
 
     private fun buildDataSource(
         hasCredentials: Boolean = true,
         hasRegion: Boolean = true,
-    ): LocalDataSource = mock {
+    ): DatabaseConnectionPoint = mock {
         on { additionalProperties } doAnswer {
             val m = mutableMapOf<String, String>()
             if (hasCredentials) {

plugins/toolkit/jetbrains-ultimate/tst/software/aws/toolkits/jetbrains/services/redshift/auth/IamAuthWidgetTest.kt

@@ -3,6 +3,7 @@
 
 package software.aws.toolkits.jetbrains.services.redshift.auth
 
+import com.intellij.database.dataSource.DatabaseConnectionPoint
 import com.intellij.database.dataSource.LocalDataSource
 import com.intellij.database.dataSource.url.template.UrlEditorModel
 import com.intellij.testFramework.ProjectRule
@@ -56,7 +57,7 @@ class IamAuthWidgetTest {
 
     @Test
     fun `Does not unset region on invalid url`() {
-        widget.reset(mock(), false)
+        widget.reset(mock<DatabaseConnectionPoint>(), false)
         val endpointUrl = "jdbc:redshift://redshift-cluster.host.$defaultRegion.redshift.amazonaws.com:5439/dev"
         widget.updateFromUrl(mock<UrlEditorModel> { on { url } doReturn endpointUrl })
         val badUrl = "jdbc:redshift://redshift-cluster.host.100000%InvalidRegion.redshift.amazonaws.com:5439/dev"
@@ -66,13 +67,13 @@ class IamAuthWidgetTest {
 
     @Test
     fun `Sets region from URL`() {
-        widget.reset(mock(), false)
+        widget.reset(mock<DatabaseConnectionPoint>(), false)
         val endpointUrl = "jdbc:redshift://redshift-cluster.host.$defaultRegion.redshift.amazonaws.com:5439/dev"
         widget.updateFromUrl(mock<UrlEditorModel> { on { url } doReturn endpointUrl })
         assertThat(widget.getSelectedRegion()?.id).isEqualTo(defaultRegion)
     }
 
-    private fun buildDataSource(hasCluster: Boolean = true): LocalDataSource = mock {
+    private fun buildDataSource(hasCluster: Boolean = true): DatabaseConnectionPoint = mock {
         on { additionalProperties } doAnswer {
             mutableMapOf<String, String>().also {
                 it[CREDENTIAL_ID_PROPERTY] = credentialId