diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 527029e8a10..02287ae257c 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,7 +1,7 @@ [versions] apache-commons-collections = "4.4" apache-commons-io = "2.16.0" -assertJ = "3.20.2" # Upgrading leads to SAM errors: https://youtrack.jetbrains.com/issue/KT-17765 +assertJ = "3.26.0" # match with /settings.gradle.kts awsSdk = "2.25.33" commonmark = "0.17.1" diff --git a/plugins/core/core/tst/software/aws/toolkits/core/utils/test/AssertJAsserts.kt b/plugins/core/core/tst/software/aws/toolkits/core/utils/test/AssertJAsserts.kt index 106d7720e8e..ee005af612a 100644 --- a/plugins/core/core/tst/software/aws/toolkits/core/utils/test/AssertJAsserts.kt +++ b/plugins/core/core/tst/software/aws/toolkits/core/utils/test/AssertJAsserts.kt @@ -3,18 +3,27 @@ package software.aws.toolkits.core.utils.test -import org.assertj.core.api.IterableAssert +import org.assertj.core.api.AbstractIterableAssert +import org.assertj.core.api.Assertions.assertThat import org.assertj.core.api.ListAssert import org.assertj.core.api.ObjectAssert +import java.nio.file.Files +import java.nio.file.Path +import java.nio.file.attribute.PosixFilePermissions @Suppress("UNCHECKED_CAST") val ObjectAssert.notNull: ObjectAssert get() = this.isNotNull as ObjectAssert @Suppress("UNCHECKED_CAST") -inline fun IterableAssert<*>.hasOnlyElementsOfType(): IterableAssert = - hasOnlyElementsOfType(SubType::class.java) as IterableAssert +inline fun AbstractIterableAssert<*, *, *, *>.hasOnlyElementsOfTypeKt() = + hasOnlyElementsOfType(SubType::class.java) as AbstractIterableAssert<*, Iterable, SubType, *> @Suppress("UNCHECKED_CAST") inline fun ListAssert<*>.hasOnlyOneElementOfType(): ObjectAssert = (hasOnlyElementsOfType(SubType::class.java) as ListAssert).singleElement() + +fun assertPosixPermissions(path: Path, expected: String) { + val perms = PosixFilePermissions.toString(Files.getPosixFilePermissions(path)) + assertThat(perms).isEqualTo(expected) +} diff --git a/plugins/core/jetbrains-community/tst/software/aws/toolkits/jetbrains/core/credentials/DefaultAwsConnectionManagerTest.kt b/plugins/core/jetbrains-community/tst/software/aws/toolkits/jetbrains/core/credentials/DefaultAwsConnectionManagerTest.kt index 1cfe6d100e4..fb222426679 100644 --- a/plugins/core/jetbrains-community/tst/software/aws/toolkits/jetbrains/core/credentials/DefaultAwsConnectionManagerTest.kt +++ b/plugins/core/jetbrains-community/tst/software/aws/toolkits/jetbrains/core/credentials/DefaultAwsConnectionManagerTest.kt @@ -26,6 +26,7 @@ import software.aws.toolkits.jetbrains.core.region.getDefaultRegion import software.aws.toolkits.jetbrains.services.sts.StsResources import software.aws.toolkits.jetbrains.utils.deserializeState import software.aws.toolkits.jetbrains.utils.rules.HeavyJavaCodeInsightTestFixtureRule +import software.aws.toolkits.jetbrains.utils.satisfiesKt import software.aws.toolkits.jetbrains.utils.serializeState import java.nio.file.Files import java.util.concurrent.CompletableFuture @@ -89,7 +90,7 @@ class DefaultAwsConnectionManagerTest { manager.noStateLoaded() manager.waitUntilConnectionStateIsStable() - assertThat(manager.selectedCredentialIdentifier).notNull.satisfies { + assertThat(manager.selectedCredentialIdentifier).notNull.satisfiesKt { assertThat(it.id).isEqualTo(credentials.id) } } @@ -112,7 +113,7 @@ class DefaultAwsConnectionManagerTest { manager.waitUntilConnectionStateIsStable() - assertThat(manager.selectedRegion).notNull.satisfies { + assertThat(manager.selectedRegion).notNull.satisfiesKt { assertThat(it.id).isEqualTo("us-west-2") } } diff --git a/plugins/core/jetbrains-community/tst/software/aws/toolkits/jetbrains/core/credentials/DefaultConfigFilesFacadeTest.kt b/plugins/core/jetbrains-community/tst/software/aws/toolkits/jetbrains/core/credentials/DefaultConfigFilesFacadeTest.kt index d479bb306ae..13e31e993c9 100644 --- a/plugins/core/jetbrains-community/tst/software/aws/toolkits/jetbrains/core/credentials/DefaultConfigFilesFacadeTest.kt +++ b/plugins/core/jetbrains-community/tst/software/aws/toolkits/jetbrains/core/credentials/DefaultConfigFilesFacadeTest.kt @@ -4,18 +4,16 @@ package software.aws.toolkits.jetbrains.core.credentials import org.assertj.core.api.Assertions.assertThat -import org.assertj.core.api.IterableAssert import org.junit.Assume import org.junit.Rule import org.junit.Test import org.junit.rules.TemporaryFolder import software.amazon.awssdk.profiles.Profile import software.aws.toolkits.core.utils.createParentDirectories +import software.aws.toolkits.core.utils.test.assertPosixPermissions import software.aws.toolkits.core.utils.writeText -import java.nio.file.Files +import software.aws.toolkits.jetbrains.utils.satisfiesKt import java.nio.file.Paths -import java.nio.file.attribute.PosixFilePermission -import java.nio.file.attribute.PosixFilePermissions class DefaultConfigFilesFacadeTest { @@ -33,8 +31,8 @@ class DefaultConfigFilesFacadeTest { assertThat(file).exists().hasContent(DefaultConfigFilesFacade.TEMPLATE) assumeNoException { - assertThat(Files.getPosixFilePermissions(file)).matches("rw-------") - assertThat(Files.getPosixFilePermissions(file.parent)).matches("rwxr-xr-x") + assertPosixPermissions(file, "rw-------") + assertPosixPermissions(file.parent, "rwxr-xr-x") } } @@ -50,8 +48,8 @@ class DefaultConfigFilesFacadeTest { sut.createConfigFile() assumeNoException { - assertThat(Files.getPosixFilePermissions(file)).matches("rw-------") - assertThat(Files.getPosixFilePermissions(file.parent)).matches("rwxrwxrwx") + assertPosixPermissions(file, "rw-------") + assertPosixPermissions(file.parent, "rwxrwxrwx") } } @@ -106,7 +104,7 @@ class DefaultConfigFilesFacadeTest { assertThat(sut.readAllProfiles()) .hasSize(1) - .satisfies { + .satisfiesKt { val entry = it.entries.first() assertThat(entry.key).isEqualTo("profileName") assertThat(entry.value).isEqualTo( @@ -596,10 +594,6 @@ class DefaultConfigFilesFacadeTest { ) } - private fun IterableAssert.matches(permissionString: String) { - containsOnly(*PosixFilePermissions.fromString(permissionString).toTypedArray()) - } - private inline fun assumeNoException(block: () -> Unit) { try { block() diff --git a/plugins/core/jetbrains-community/tst/software/aws/toolkits/jetbrains/core/credentials/DefaultToolkitAuthManagerTest.kt b/plugins/core/jetbrains-community/tst/software/aws/toolkits/jetbrains/core/credentials/DefaultToolkitAuthManagerTest.kt index 824ac0adf57..8104d89d809 100644 --- a/plugins/core/jetbrains-community/tst/software/aws/toolkits/jetbrains/core/credentials/DefaultToolkitAuthManagerTest.kt +++ b/plugins/core/jetbrains-community/tst/software/aws/toolkits/jetbrains/core/credentials/DefaultToolkitAuthManagerTest.kt @@ -31,6 +31,7 @@ import software.aws.toolkits.jetbrains.core.credentials.sso.bearer.InteractiveBe import software.aws.toolkits.jetbrains.core.region.MockRegionProviderRule import software.aws.toolkits.jetbrains.utils.isInstanceOf import software.aws.toolkits.jetbrains.utils.isInstanceOfSatisfying +import software.aws.toolkits.jetbrains.utils.satisfiesKt class DefaultToolkitAuthManagerTest { @JvmField @@ -90,7 +91,7 @@ class DefaultToolkitAuthManagerTest { ) sut.createConnection(profile) - assertThat(sut.state?.ssoProfiles).satisfies { profiles -> + assertThat(sut.state?.ssoProfiles).satisfiesKt { profiles -> assertThat(profiles).isNotNull() assertThat(profiles).singleElement().isEqualTo(profile) } @@ -110,7 +111,7 @@ class DefaultToolkitAuthManagerTest { ) ) - assertThat(sut.listConnections()).singleElement().satisfies { + assertThat(sut.listConnections()).singleElement().satisfiesKt { assertThat(it).isInstanceOfSatisfying { connection -> assertThat(connection.sessionName).isEqualTo("") assertThat(connection.region).isEqualTo(profile.ssoRegion) @@ -138,7 +139,7 @@ class DefaultToolkitAuthManagerTest { ) ) - assertThat(sut.listConnections()).singleElement().satisfies { + assertThat(sut.listConnections()).singleElement().satisfiesKt { assertThat(it).isInstanceOfSatisfying { connection -> assertThat(connection.sessionName).isEqualTo("") assertThat(connection.region).isEqualTo(profile.ssoRegion) @@ -164,7 +165,7 @@ class DefaultToolkitAuthManagerTest { ) ) - assertThat(sut.listConnections()).singleElement().satisfies { + assertThat(sut.listConnections()).singleElement().satisfiesKt { assertThat(it).isInstanceOfSatisfying { connection -> assertThat(connection.sessionName).isEqualTo("add") assertThat(connection.region).isEqualTo("us-east-1") @@ -182,7 +183,7 @@ class DefaultToolkitAuthManagerTest { ) ) - assertThat(sut.listConnections()).singleElement().satisfies { + assertThat(sut.listConnections()).singleElement().satisfiesKt { assertThat(it).isInstanceOfSatisfying { connection -> assertThat(connection.sessionName).isEqualTo("add") assertThat(connection.region).isEqualTo("us-east-1") @@ -332,7 +333,7 @@ class DefaultToolkitAuthManagerTest { val newScopes = listOf("existing1", "new1") loginSso(projectRule.project, "foo", "us-east-1", newScopes) - assertThat(connectionManager.activeConnection() as AwsBearerTokenConnection).satisfies { connection -> + assertThat(connectionManager.activeConnection() as AwsBearerTokenConnection).satisfiesKt { connection -> assertThat(connection.scopes.toSet()).isEqualTo(setOf("existing1", "existing2", "existing3", "new1")) } assertThat(sut.listConnections()).singleElement().isInstanceOfSatisfying { connection -> diff --git a/plugins/core/jetbrains-community/tst/software/aws/toolkits/jetbrains/core/credentials/sso/DiskCacheTest.kt b/plugins/core/jetbrains-community/tst/software/aws/toolkits/jetbrains/core/credentials/sso/DiskCacheTest.kt index 89c7cb597a6..670925a8ee4 100644 --- a/plugins/core/jetbrains-community/tst/software/aws/toolkits/jetbrains/core/credentials/sso/DiskCacheTest.kt +++ b/plugins/core/jetbrains-community/tst/software/aws/toolkits/jetbrains/core/credentials/sso/DiskCacheTest.kt @@ -12,6 +12,7 @@ import org.junit.jupiter.api.condition.DisabledOnOs import org.junit.jupiter.api.condition.OS import org.junit.jupiter.api.io.TempDir import software.aws.toolkits.core.utils.readText +import software.aws.toolkits.core.utils.test.assertPosixPermissions import software.aws.toolkits.core.utils.writeText import java.nio.file.Files import java.nio.file.Path @@ -709,9 +710,4 @@ class DiskCacheTest { .usingRecursiveComparison() .isEqualTo(sut.loadAccessToken(key2)) } - - private fun assertPosixPermissions(path: Path, expected: String) { - val perms = PosixFilePermissions.toString(Files.getPosixFilePermissions(path)) - assertThat(perms).isEqualTo(expected) - } } diff --git a/plugins/core/jetbrains-community/tst/software/aws/toolkits/jetbrains/core/gettingstarted/IdcRolePopupTest.kt b/plugins/core/jetbrains-community/tst/software/aws/toolkits/jetbrains/core/gettingstarted/IdcRolePopupTest.kt index ee4ddc49674..dc541b8fd51 100644 --- a/plugins/core/jetbrains-community/tst/software/aws/toolkits/jetbrains/core/gettingstarted/IdcRolePopupTest.kt +++ b/plugins/core/jetbrains-community/tst/software/aws/toolkits/jetbrains/core/gettingstarted/IdcRolePopupTest.kt @@ -21,6 +21,7 @@ import software.aws.toolkits.core.utils.test.aString import software.aws.toolkits.jetbrains.core.MockClientManagerExtension import software.aws.toolkits.jetbrains.core.credentials.ConfigFilesFacade import software.aws.toolkits.jetbrains.core.region.MockRegionProviderExtension +import software.aws.toolkits.jetbrains.utils.satisfiesKt import software.aws.toolkits.resources.message @ExtendWith(MockKExtension::class) @@ -53,7 +54,7 @@ class IdcRolePopupTest { } } - assertThat(validation).singleElement().satisfies { + assertThat(validation).singleElement().satisfiesKt { assertThat(it.okEnabled).isFalse() assertThat(it.message).contains(message("gettingstarted.setup.error.not_selected")) } diff --git a/plugins/core/jetbrains-community/tst/software/aws/toolkits/jetbrains/core/gettingstarted/SetupAuthenticationDialogTest.kt b/plugins/core/jetbrains-community/tst/software/aws/toolkits/jetbrains/core/gettingstarted/SetupAuthenticationDialogTest.kt index 8d47279fea9..8a34a861c3c 100644 --- a/plugins/core/jetbrains-community/tst/software/aws/toolkits/jetbrains/core/gettingstarted/SetupAuthenticationDialogTest.kt +++ b/plugins/core/jetbrains-community/tst/software/aws/toolkits/jetbrains/core/gettingstarted/SetupAuthenticationDialogTest.kt @@ -37,6 +37,7 @@ import software.aws.toolkits.jetbrains.core.credentials.sono.SONO_REGION import software.aws.toolkits.jetbrains.core.credentials.sono.SONO_URL import software.aws.toolkits.jetbrains.core.gettingstarted.editor.SourceOfEntry import software.aws.toolkits.jetbrains.core.region.MockRegionProviderExtension +import software.aws.toolkits.jetbrains.utils.satisfiesKt import software.aws.toolkits.resources.message import software.aws.toolkits.telemetry.FeatureId @@ -212,7 +213,7 @@ class SetupAuthenticationDialogTest { } } - assertThat(validation).satisfies { + assertThat(validation).satisfiesKt { assertThat(it).hasSize(2) assertThat(it).allSatisfy { error -> assertThat(error.message).contains("Must not be empty") @@ -266,7 +267,7 @@ class SetupAuthenticationDialogTest { } } - assertThat(validation).satisfies { + assertThat(validation).satisfiesKt { assertThat(it).hasSize(3) assertThat(it).allSatisfy { error -> assertThat(error.message).contains("Must not be empty") diff --git a/plugins/core/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/telemetry/TelemetryServiceTest.kt b/plugins/core/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/telemetry/TelemetryServiceTest.kt index c15b2a76615..fc92c007083 100644 --- a/plugins/core/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/telemetry/TelemetryServiceTest.kt +++ b/plugins/core/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/telemetry/TelemetryServiceTest.kt @@ -37,6 +37,7 @@ import software.aws.toolkits.jetbrains.core.credentials.waitUntilConnectionState import software.aws.toolkits.jetbrains.core.region.MockRegionProviderRule import software.aws.toolkits.jetbrains.services.sts.StsResources import software.aws.toolkits.jetbrains.settings.AwsSettings +import software.aws.toolkits.jetbrains.utils.isInstanceOfSatisfying import java.util.concurrent.CountDownLatch import java.util.concurrent.TimeUnit @@ -267,9 +268,11 @@ class TelemetryServiceTest { private fun assertMetricEventsContains(events: Collection, eventName: String, awsAccount: String, awsRegion: String) { assertThat(events).filteredOn { event -> event.data.any { it.name == eventName } - }.anySatisfy { - assertThat(it.awsAccount).isEqualTo(awsAccount) - assertThat(it.awsRegion).isEqualTo(awsRegion) + }.anySatisfy { element -> + assertThat(element).isInstanceOfSatisfying { + assertThat(it.awsAccount).isEqualTo(awsAccount) + assertThat(it.awsRegion).isEqualTo(awsRegion) + } } } } diff --git a/plugins/core/jetbrains-community/tstFixtures/software/aws/toolkits/jetbrains/utils/AssertJMatchers.kt b/plugins/core/jetbrains-community/tstFixtures/software/aws/toolkits/jetbrains/utils/AssertJMatchers.kt index 23ff0f07b9e..28149be11ed 100644 --- a/plugins/core/jetbrains-community/tstFixtures/software/aws/toolkits/jetbrains/utils/AssertJMatchers.kt +++ b/plugins/core/jetbrains-community/tstFixtures/software/aws/toolkits/jetbrains/utils/AssertJMatchers.kt @@ -4,6 +4,7 @@ package software.aws.toolkits.jetbrains.utils import org.assertj.core.api.AbstractAssert +import org.assertj.core.api.AbstractIterableAssert import org.assertj.core.api.AbstractThrowableAssert import org.assertj.core.api.Assertions.assertThat import org.assertj.core.api.CompletableFutureAssert @@ -31,10 +32,23 @@ val CompletionStage.value get() = toCompletableFuture().get(TIMEOUT.toMil val CompletableFutureAssert.hasException get() = this.wait().isCompletedExceptionally +// https://github.com/assertj/assertj/issues/2357 +@Suppress("UNCHECKED_CAST") +fun > AbstractIterableAssert<*, I, E, *>.allSatisfyKt(requirements: Consumer) = + allSatisfy(requirements) as AbstractIterableAssert<*, I, E, *> + +@Suppress("UNCHECKED_CAST") +fun > AbstractIterableAssert<*, I, E, *>.anySatisfyKt(requirements: Consumer) = + anySatisfy(requirements) as AbstractIterableAssert<*, I, E, *> + +@Suppress("UNCHECKED_CAST") +fun AbstractAssert<*, T>.satisfiesKt(requirements: Consumer) = + satisfies(requirements) as AbstractAssert<*, T> + fun , ACTUAL : Throwable> AbstractThrowableAssert.hasCauseWithMessage( message: String ): AbstractThrowableAssert { - satisfies { parentThrowable -> + satisfiesKt { parentThrowable -> assertThat(parentThrowable.cause).isNotNull.hasMessage(message) } return this diff --git a/plugins/toolkit/jetbrains-core/it/software/aws/toolkits/jetbrains/core/credentials/sso/bearer/InteractiveBearerTokenProviderIntegrationTest.kt b/plugins/toolkit/jetbrains-core/it/software/aws/toolkits/jetbrains/core/credentials/sso/bearer/InteractiveBearerTokenProviderIntegrationTest.kt index 52d447608f3..98f1177c3c3 100644 --- a/plugins/toolkit/jetbrains-core/it/software/aws/toolkits/jetbrains/core/credentials/sso/bearer/InteractiveBearerTokenProviderIntegrationTest.kt +++ b/plugins/toolkit/jetbrains-core/it/software/aws/toolkits/jetbrains/core/credentials/sso/bearer/InteractiveBearerTokenProviderIntegrationTest.kt @@ -21,6 +21,7 @@ import software.aws.toolkits.jetbrains.core.credentials.sso.DeviceGrantAccessTok import software.aws.toolkits.jetbrains.core.credentials.sso.DiskCache import software.aws.toolkits.jetbrains.utils.extensions.SsoLogin import software.aws.toolkits.jetbrains.utils.extensions.SsoLoginExtension +import software.aws.toolkits.jetbrains.utils.satisfiesKt import java.nio.file.Path import java.time.Instant @@ -74,7 +75,7 @@ class InteractiveBearerTokenProviderIntegrationTest { id = "test" ) - assertThat(sut.resolveToken()).satisfies { + assertThat(sut.resolveToken()).satisfiesKt { assertThat(it).isNotNull() assertThat(it).isNotEqualTo(initialToken) } diff --git a/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/core/credentials/ConnectionSettingsMenuBuilderTest.kt b/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/core/credentials/ConnectionSettingsMenuBuilderTest.kt index 3c4455a3c50..8f209164740 100644 --- a/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/core/credentials/ConnectionSettingsMenuBuilderTest.kt +++ b/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/core/credentials/ConnectionSettingsMenuBuilderTest.kt @@ -22,6 +22,7 @@ import software.aws.toolkits.jetbrains.core.credentials.ConnectionSettingsMenuBu import software.aws.toolkits.jetbrains.core.credentials.MockAwsConnectionManager.ProjectAccountSettingsManagerRule import software.aws.toolkits.jetbrains.core.region.AwsRegionProvider import software.aws.toolkits.jetbrains.core.region.MockRegionProviderRule +import software.aws.toolkits.jetbrains.utils.satisfiesKt import software.aws.toolkits.resources.message class ConnectionSettingsMenuBuilderTest { @@ -87,7 +88,7 @@ class ConnectionSettingsMenuBuilderTest { .build() val actions = group.getChildren().filterIsInstance() - assertThat(actions).singleElement().satisfies { + assertThat(actions).singleElement().satisfiesKt { assertThat(it.isPopup).isTrue assertThat(it.templatePresentation.text).isEqualTo(message("settings.partitions")) assertThat(it.getChildren()).hasSize(otherPartitions.size) diff --git a/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/core/credentials/metadataservice/ContainerCredentialProviderFactoryTest.kt b/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/core/credentials/metadataservice/ContainerCredentialProviderFactoryTest.kt index 57b36e03ee4..960a862f9ec 100644 --- a/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/core/credentials/metadataservice/ContainerCredentialProviderFactoryTest.kt +++ b/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/core/credentials/metadataservice/ContainerCredentialProviderFactoryTest.kt @@ -23,6 +23,7 @@ import software.aws.toolkits.core.credentials.CredentialType import software.aws.toolkits.core.credentials.CredentialsChangeEvent import software.aws.toolkits.core.credentials.CredentialsChangeListener import software.aws.toolkits.core.rules.SystemPropertyHelper +import software.aws.toolkits.jetbrains.utils.satisfiesKt import java.time.Duration import java.time.Instant import java.time.format.DateTimeFormatter @@ -66,7 +67,7 @@ class ContainerCredentialProviderFactoryTest { sut.setUp(profileLoadCallback) assertThat(credentialChangeEvent.allValues.size).isEqualTo(1) - assertThat(credentialChangeEvent.firstValue).satisfies { + assertThat(credentialChangeEvent.firstValue).satisfiesKt { assertThat(it.modified).isEmpty() assertThat(it.removed).isEmpty() assertThat(it.added).hasSize(1) @@ -80,7 +81,7 @@ class ContainerCredentialProviderFactoryTest { sut.setUp(profileLoadCallback) assertThat(credentialChangeEvent.allValues.size).isEqualTo(1) - assertThat(credentialChangeEvent.firstValue).satisfies { + assertThat(credentialChangeEvent.firstValue).satisfiesKt { assertThat(it.modified).isEmpty() assertThat(it.removed).isEmpty() assertThat(it.added).hasSize(1) diff --git a/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/core/credentials/metadataservice/InstanceRoleCredentialProviderFactoryTest.kt b/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/core/credentials/metadataservice/InstanceRoleCredentialProviderFactoryTest.kt index 4d41cffbe65..e137ecb4d3c 100644 --- a/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/core/credentials/metadataservice/InstanceRoleCredentialProviderFactoryTest.kt +++ b/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/core/credentials/metadataservice/InstanceRoleCredentialProviderFactoryTest.kt @@ -26,6 +26,7 @@ import software.aws.toolkits.core.credentials.CredentialType import software.aws.toolkits.core.credentials.CredentialsChangeEvent import software.aws.toolkits.core.credentials.CredentialsChangeListener import software.aws.toolkits.core.rules.SystemPropertyHelper +import software.aws.toolkits.jetbrains.utils.satisfiesKt import java.time.Duration import java.time.Instant import java.time.format.DateTimeFormatter @@ -99,7 +100,7 @@ class InstanceRoleCredentialProviderFactoryTest { sut.setUp(profileLoadCallback) assertThat(credentialChangeEvent.allValues.size).isEqualTo(1) - assertThat(credentialChangeEvent.firstValue).satisfies { + assertThat(credentialChangeEvent.firstValue).satisfiesKt { assertThat(it.modified).isEmpty() assertThat(it.removed).isEmpty() assertThat(it.added).hasSize(1) diff --git a/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/core/execution/AwsConnectionExtensionSettingsEditorTest.kt b/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/core/execution/AwsConnectionExtensionSettingsEditorTest.kt index f63362eb720..dd591e843e5 100644 --- a/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/core/execution/AwsConnectionExtensionSettingsEditorTest.kt +++ b/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/core/execution/AwsConnectionExtensionSettingsEditorTest.kt @@ -12,6 +12,7 @@ import org.assertj.core.api.ObjectAssert import org.junit.Rule import org.junit.Test import software.aws.toolkits.jetbrains.settings.AwsSettingsRule +import software.aws.toolkits.jetbrains.utils.satisfiesKt class AwsConnectionExtensionSettingsEditorTest { @@ -129,7 +130,7 @@ class AwsConnectionExtensionSettingsEditorTest { private fun ObjectAssert>.isPersistedAs( expected: AwsCredentialInjectionOptions.() -> Unit ) { - satisfies { + satisfiesKt { val updatedConfiguration = createConfiguration { } it.applyTo(updatedConfiguration) assertThat(updatedConfiguration.extensionOptions()).usingRecursiveComparison().isEqualTo(AwsCredentialInjectionOptions(expected)) diff --git a/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/core/notification/MinimumVersionChangeTest.kt b/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/core/notification/MinimumVersionChangeTest.kt index b8c9de2c256..d4e66a00a22 100644 --- a/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/core/notification/MinimumVersionChangeTest.kt +++ b/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/core/notification/MinimumVersionChangeTest.kt @@ -22,6 +22,7 @@ import org.mockito.kotlin.mock import org.mockito.kotlin.stub import software.aws.toolkits.core.rules.SystemPropertyHelper import software.aws.toolkits.jetbrains.utils.rules.NotificationListenerRule +import software.aws.toolkits.jetbrains.utils.satisfiesKt import java.util.Calendar class MinimumVersionChangeTest { @@ -108,7 +109,7 @@ class MinimumVersionChangeTest { sut.runActivity(projectRule.project) - assertThat(notifications.notifications).singleElement().satisfies { + assertThat(notifications.notifications).singleElement().satisfiesKt { assertThat(it.content).matches("""Support for [\w ]+ 2012\.3 is being deprecated .*""".toPattern()) assertThat(it.actions).singleElement() } diff --git a/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/core/region/AwsRegionProviderTest.kt b/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/core/region/AwsRegionProviderTest.kt index 0b9e9637d39..c39d23ad90c 100644 --- a/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/core/region/AwsRegionProviderTest.kt +++ b/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/core/region/AwsRegionProviderTest.kt @@ -19,6 +19,7 @@ import software.aws.toolkits.core.utils.RemoteResourceResolver import software.aws.toolkits.core.utils.exists import software.aws.toolkits.core.utils.writeText import software.aws.toolkits.jetbrains.core.RemoteResourceResolverProvider +import software.aws.toolkits.jetbrains.utils.satisfiesKt import java.nio.file.Files import java.nio.file.Path import java.nio.file.Paths @@ -150,7 +151,7 @@ class AwsRegionProviderTest { val awsRegionProvider = AwsRegionProvider() - assertThat(awsRegionProvider.defaultPartition()).satisfies { + assertThat(awsRegionProvider.defaultPartition()).satisfiesKt { assertThat(it.id).isEqualTo("moon") } } diff --git a/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/core/tools/FourPartVersionTest.kt b/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/core/tools/FourPartVersionTest.kt index 50ac7ccc4ea..009ce0c04ab 100644 --- a/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/core/tools/FourPartVersionTest.kt +++ b/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/core/tools/FourPartVersionTest.kt @@ -7,6 +7,7 @@ import org.assertj.core.api.Assertions.assertThat import org.assertj.core.api.Assertions.assertThatThrownBy import org.junit.Test import software.aws.toolkits.jetbrains.utils.isInstanceOf +import software.aws.toolkits.jetbrains.utils.satisfiesKt class FourPartVersionTest { @Test @@ -33,7 +34,7 @@ class FourPartVersionTest { @Test fun `parts are correct`() { - assertThat(FourPartVersion(1, 2, 3, 4)).satisfies { + assertThat(FourPartVersion(1, 2, 3, 4)).satisfiesKt { assertThat(it.major).isEqualTo(1) assertThat(it.minor).isEqualTo(2) assertThat(it.patch).isEqualTo(3) diff --git a/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/core/tools/SemanticVersionTest.kt b/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/core/tools/SemanticVersionTest.kt index 879d7ee65a4..b153070ecb7 100644 --- a/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/core/tools/SemanticVersionTest.kt +++ b/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/core/tools/SemanticVersionTest.kt @@ -7,6 +7,7 @@ import org.assertj.core.api.Assertions.assertThat import org.assertj.core.api.Assertions.assertThatThrownBy import org.junit.Test import software.aws.toolkits.jetbrains.utils.isInstanceOf +import software.aws.toolkits.jetbrains.utils.satisfiesKt class SemanticVersionTest { @Test @@ -31,7 +32,7 @@ class SemanticVersionTest { @Test fun `parts are correct`() { - assertThat(SemanticVersion(1, 2, 3)).satisfies { + assertThat(SemanticVersion(1, 2, 3)).satisfiesKt { assertThat(it.major).isEqualTo(1) assertThat(it.minor).isEqualTo(2) assertThat(it.patch).isEqualTo(3) diff --git a/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/core/toolwindow/ToolkitToolWindowTest.kt b/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/core/toolwindow/ToolkitToolWindowTest.kt index fcf118bb06b..426d83393e3 100644 --- a/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/core/toolwindow/ToolkitToolWindowTest.kt +++ b/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/core/toolwindow/ToolkitToolWindowTest.kt @@ -11,6 +11,7 @@ import org.assertj.core.api.Assertions.assertThat import org.junit.Before import org.junit.Rule import org.junit.Test +import software.aws.toolkits.jetbrains.utils.satisfiesKt import javax.swing.JLabel class ToolkitToolWindowTest { @@ -56,7 +57,7 @@ class ToolkitToolWindowTest { runInEdt { sut.removeContent(tab) - assertThat(jbToolWindowManager.getToolWindow(sut.toolWindowId)?.contentManager).satisfies { + assertThat(jbToolWindowManager.getToolWindow(sut.toolWindowId)?.contentManager).satisfiesKt { it!! assertThat(it.contentCount).isEqualTo(1) assertThat(it.getContent(0)).isEqualTo(tab2) diff --git a/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/services/cloudformation/stack/UpdaterTest.kt b/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/services/cloudformation/stack/UpdaterTest.kt index e1ac98461b2..f55b63cd87c 100644 --- a/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/services/cloudformation/stack/UpdaterTest.kt +++ b/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/services/cloudformation/stack/UpdaterTest.kt @@ -28,6 +28,7 @@ import software.amazon.awssdk.services.cloudformation.model.StackResource import software.amazon.awssdk.services.cloudformation.model.StackStatus import software.aws.toolkits.core.utils.delegateMock import software.aws.toolkits.jetbrains.core.MockClientManagerRule +import software.aws.toolkits.jetbrains.utils.satisfiesKt import java.time.Duration import java.util.concurrent.Semaphore import java.util.concurrent.TimeUnit @@ -167,7 +168,7 @@ class UpdaterTest { val captor = argumentCaptor>() verify(treeView).fillResources(captor.capture()) - assertThat(captor.firstValue).singleElement().satisfies { + assertThat(captor.firstValue).singleElement().satisfiesKt { assertThat(it.logicalResourceId()).isEqualTo("L1") } } diff --git a/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/services/cloudformation/yaml/YamlCloudFormationTemplateTest.kt b/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/services/cloudformation/yaml/YamlCloudFormationTemplateTest.kt index b0b94abbaa3..3f020695c00 100644 --- a/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/services/cloudformation/yaml/YamlCloudFormationTemplateTest.kt +++ b/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/services/cloudformation/yaml/YamlCloudFormationTemplateTest.kt @@ -23,6 +23,7 @@ import software.aws.toolkits.jetbrains.services.cloudformation.CloudFormationTem import software.aws.toolkits.jetbrains.services.cloudformation.LambdaFunction import software.aws.toolkits.jetbrains.services.cloudformation.SamFunction import software.aws.toolkits.jetbrains.utils.rules.CodeInsightTestFixtureRule +import software.aws.toolkits.jetbrains.utils.satisfiesKt import software.aws.toolkits.resources.message import java.io.File @@ -133,7 +134,7 @@ Parameters: runInEdtAndWait { assertThat(template.parameters().toList()).hasSize(2) val tableTag = template.parameters().firstOrNull { it.logicalName == "TableTag" } - assertThat(tableTag).notNull.satisfies { tag -> + assertThat(tableTag).notNull.satisfiesKt { tag -> assertThat(tag.defaultValue()).isNull() assertThat(tag.description()).isNotNull() assertThat(tag.constraintDescription()).isNull() diff --git a/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/services/cloudwatch/logs/TableUtilsTest.kt b/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/services/cloudwatch/logs/TableUtilsTest.kt index 6de090d4e3c..d2ecf7bde47 100644 --- a/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/services/cloudwatch/logs/TableUtilsTest.kt +++ b/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/services/cloudwatch/logs/TableUtilsTest.kt @@ -13,6 +13,7 @@ import org.mockito.kotlin.whenever import software.amazon.awssdk.services.cloudwatchlogs.model.LogStream import software.aws.toolkits.jetbrains.services.cloudwatch.logs.editor.LogStreamsDateColumn import software.aws.toolkits.jetbrains.services.cloudwatch.logs.editor.LogStreamsStreamColumn +import software.aws.toolkits.jetbrains.utils.satisfiesKt import java.text.SimpleDateFormat import java.time.ZoneId import java.time.ZonedDateTime @@ -35,7 +36,7 @@ class TableUtilsTest { val dateFormat = SimpleDateFormat("M/d/yy", Locale.ENGLISH) val table = JBTable(createTestMode(dateFormat)) - assertThat(table).satisfies { + assertThat(table).satisfiesKt { assertThat(it.getValueAt(0, 0)).isEqualTo("7/11/21") assertThat(it.getValueAt(1, 0)).isEqualTo("6/11/21") assertThat(it.getValueAt(2, 0)).isEqualTo("2/1/21") @@ -47,7 +48,7 @@ class TableUtilsTest { val dateFormat = SimpleDateFormat("MMM d, y", Locale.ENGLISH) val table = JBTable(createTestMode(dateFormat)) - assertThat(table).satisfies { + assertThat(table).satisfiesKt { assertThat(it.getValueAt(0, 0)).isEqualTo("Jul 11, 2021") assertThat(it.getValueAt(1, 0)).isEqualTo("Jun 11, 2021") assertThat(it.getValueAt(2, 0)).isEqualTo("Feb 1, 2021") @@ -59,7 +60,7 @@ class TableUtilsTest { val dateFormat = SimpleDateFormat("d MMM y", Locale.ENGLISH) val table = JBTable(createTestMode(dateFormat)) - assertThat(table).satisfies { + assertThat(table).satisfiesKt { assertThat(it.getValueAt(0, 0)).isEqualTo("11 Jul 2021") assertThat(it.getValueAt(1, 0)).isEqualTo("11 Jun 2021") assertThat(it.getValueAt(2, 0)).isEqualTo("1 Feb 2021") diff --git a/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/services/dynamic/explorer/DynamicResourceResourceTypeNodeTest.kt b/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/services/dynamic/explorer/DynamicResourceResourceTypeNodeTest.kt index b5cd2556439..1fd61c38d43 100644 --- a/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/services/dynamic/explorer/DynamicResourceResourceTypeNodeTest.kt +++ b/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/services/dynamic/explorer/DynamicResourceResourceTypeNodeTest.kt @@ -15,6 +15,7 @@ import software.aws.toolkits.jetbrains.core.explorer.nodes.AwsExplorerEmptyNode import software.aws.toolkits.jetbrains.core.explorer.nodes.AwsExplorerErrorNode import software.aws.toolkits.jetbrains.core.id import software.aws.toolkits.jetbrains.services.dynamic.CloudControlApiResources +import software.aws.toolkits.jetbrains.utils.satisfiesKt import software.aws.toolkits.resources.message class DynamicResourceResourceTypeNodeTest { @@ -35,7 +36,7 @@ class DynamicResourceResourceTypeNodeTest { val sut = DynamicResourceResourceTypeNode(projectRule.project, type) - assertThat(sut.children).hasOnlyOneElementOfType().satisfies { + assertThat(sut.children).hasOnlyOneElementOfType().satisfiesKt { assertThat(it.displayName()).isEqualTo(identifier) } } @@ -47,7 +48,7 @@ class DynamicResourceResourceTypeNodeTest { val sut = DynamicResourceResourceTypeNode(projectRule.project, type) - assertThat(sut.children).hasOnlyOneElementOfType().satisfies { + assertThat(sut.children).hasOnlyOneElementOfType().satisfiesKt { assertThat(it.displayName()).startsWith(message("dynamic_resources.unavailable_in_region", "")) } } diff --git a/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/services/federation/psireferences/ArnPsiReferenceProviderTest.kt b/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/services/federation/psireferences/ArnPsiReferenceProviderTest.kt index 1a70aec35e4..a5821e1e95a 100644 --- a/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/services/federation/psireferences/ArnPsiReferenceProviderTest.kt +++ b/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/services/federation/psireferences/ArnPsiReferenceProviderTest.kt @@ -18,6 +18,7 @@ import org.assertj.core.api.Assertions.assertThat import org.junit.Rule import org.junit.Test import software.aws.toolkits.jetbrains.utils.rules.CodeInsightTestFixtureRule +import software.aws.toolkits.jetbrains.utils.satisfiesKt class ArnPsiReferenceProviderTest { @Rule @@ -68,7 +69,7 @@ class ArnPsiReferenceProviderTest { val (str, match) = pair assertThat(ArnPsiReferenceProvider.ARN_REGEX.findAll(str).toList()) .withFailMessage { "Input should have partially matched regex with single result but did not: $str" } - .satisfies { + .satisfiesKt { assertThat(it).hasSize(1) assertThat(it.first().value).isEqualTo(match) } diff --git a/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/services/lambda/execution/template/LambdaRunLineMarkerContributorTest.kt b/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/services/lambda/execution/template/LambdaRunLineMarkerContributorTest.kt index 9ffa60fc569..95a1dfc8aa8 100644 --- a/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/services/lambda/execution/template/LambdaRunLineMarkerContributorTest.kt +++ b/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/services/lambda/execution/template/LambdaRunLineMarkerContributorTest.kt @@ -12,6 +12,7 @@ import org.junit.Rule import org.junit.Test import software.aws.toolkits.jetbrains.utils.rules.JavaCodeInsightTestFixtureRule import software.aws.toolkits.jetbrains.utils.rules.openFile +import software.aws.toolkits.jetbrains.utils.satisfiesKt class LambdaRunLineMarkerContributorTest { @@ -36,7 +37,7 @@ Resources: runAndAssertionMarks(projectRule.fixture) { marks -> assertThat(marks).hasSize(1) - assertThat(marks.first().lineMarkerInfo.element).isNotNull.satisfies { + assertThat(marks.first().lineMarkerInfo.element).isNotNull.satisfiesKt { assertThat(it!!.text).isEqualTo("ServerlessFunction") } } @@ -58,7 +59,7 @@ Resources: ) runAndAssertionMarks(projectRule.fixture) { marks -> assertThat(marks).hasSize(1) - assertThat(marks.first().lineMarkerInfo.element).isNotNull.satisfies { + assertThat(marks.first().lineMarkerInfo.element).isNotNull.satisfiesKt { assertThat(it!!.text).isEqualTo("LambdaFunction") } } diff --git a/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/utils/execution/steps/BuildViewStepEmitterTest.kt b/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/utils/execution/steps/BuildViewStepEmitterTest.kt index 0fd6a97517b..9042043e277 100644 --- a/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/utils/execution/steps/BuildViewStepEmitterTest.kt +++ b/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/utils/execution/steps/BuildViewStepEmitterTest.kt @@ -22,6 +22,7 @@ import org.mockito.kotlin.eq import org.mockito.kotlin.mock import org.mockito.kotlin.times import org.mockito.kotlin.verify +import software.aws.toolkits.jetbrains.utils.satisfiesKt class BuildViewStepEmitterTest { @Rule @@ -43,7 +44,7 @@ class BuildViewStepEmitterTest { verify(buildView).onEvent(eq(PARENT_ID), capture()) assertThat(allValues).hasSize(1) - assertThat(firstValue).satisfies { + assertThat(firstValue).satisfiesKt { assertThat(it.parentId).isEqualTo(PARENT_ID) }.isInstanceOfSatisfying(StartEvent::class.java) { assertThat(it.message).isEqualTo(stepId) @@ -64,7 +65,7 @@ class BuildViewStepEmitterTest { verify(buildView).onEvent(eq(PARENT_ID), capture()) assertThat(allValues).hasSize(1) - assertThat(firstValue).satisfies { + assertThat(firstValue).satisfiesKt { assertThat(it.parentId).isEqualTo(parentId) assertThat(it.id).isEqualTo(stepId) }.isInstanceOfSatisfying(FinishEvent::class.java) { @@ -88,21 +89,21 @@ class BuildViewStepEmitterTest { assertThat(allValues).hasSize(3) - assertThat(firstValue).satisfies { + assertThat(firstValue).satisfiesKt { assertThat(it.parentId).isEqualTo(parentId) }.isInstanceOfSatisfying(OutputBuildEvent::class.java) { assertThat(it.message).isEqualTo("ChildStep has failed: Test exception") assertThat(it.isStdOut).isFalse() } - assertThat(secondValue).satisfies { + assertThat(secondValue).satisfiesKt { assertThat(it.parentId).isEqualTo(stepId) }.isInstanceOfSatisfying(OutputBuildEvent::class.java) { assertThat(it.message).isEqualTo("ChildStep has failed: Test exception") assertThat(it.isStdOut).isFalse() } - assertThat(thirdValue).satisfies { + assertThat(thirdValue).satisfiesKt { assertThat(it.parentId).isEqualTo(parentId) assertThat(it.id).isEqualTo(stepId) }.isInstanceOfSatisfying(FinishEvent::class.java) { @@ -121,7 +122,7 @@ class BuildViewStepEmitterTest { argumentCaptor().apply { verify(buildView, times(2)).onEvent(eq(PARENT_ID), capture()) - assertThat(firstValue).satisfies { + assertThat(firstValue).satisfiesKt { assertThat(it.parentId).isEqualTo(parentId) }.isInstanceOfSatisfying(OutputBuildEvent::class.java) { assertThat(it.message).contains("ParentStep has failed: java.lang.NullPointerException", "at") @@ -139,7 +140,7 @@ class BuildViewStepEmitterTest { argumentCaptor().apply { verify(buildView, times(2)).onEvent(eq(PARENT_ID), capture()) - assertThat(firstValue).satisfies { + assertThat(firstValue).satisfiesKt { assertThat(it.parentId).isEqualTo(parentId) }.isInstanceOfSatisfying(OutputBuildEvent::class.java) { assertThat(it.message).contains("ParentStep has been canceled") @@ -161,7 +162,7 @@ class BuildViewStepEmitterTest { verify(buildView).onEvent(eq(PARENT_ID), capture()) assertThat(allValues).hasSize(1) - assertThat(firstValue).satisfies { + assertThat(firstValue).satisfiesKt { assertThat(it.parentId).isEqualTo(parentId) assertThat(it.id).isEqualTo(stepId) }.isInstanceOfSatisfying(FinishEvent::class.java) { @@ -183,14 +184,14 @@ class BuildViewStepEmitterTest { argumentCaptor().apply { verify(buildView, times(2)).onEvent(eq(PARENT_ID), capture()) - assertThat(firstValue).satisfies { + assertThat(firstValue).satisfiesKt { assertThat(it.parentId).isEqualTo(PARENT_ID) }.isInstanceOfSatisfying(OutputBuildEvent::class.java) { assertThat(it.message).isEqualTo(message) assertThat(it.isStdOut).isTrue() } - assertThat(secondValue).satisfies { + assertThat(secondValue).satisfiesKt { assertThat(it.parentId).isEqualTo(stepId) }.isInstanceOfSatisfying(OutputBuildEvent::class.java) { assertThat(it.message).isEqualTo(message) @@ -211,14 +212,14 @@ class BuildViewStepEmitterTest { argumentCaptor().apply { verify(buildView, times(2)).onEvent(eq(PARENT_ID), capture()) - assertThat(firstValue).satisfies { + assertThat(firstValue).satisfiesKt { assertThat(it.parentId).isEqualTo(PARENT_ID) }.isInstanceOfSatisfying(OutputBuildEvent::class.java) { assertThat(it.message).isEqualTo(message) assertThat(it.isStdOut).isFalse() } - assertThat(secondValue).satisfies { + assertThat(secondValue).satisfiesKt { assertThat(it.parentId).isEqualTo(stepId) }.isInstanceOfSatisfying(OutputBuildEvent::class.java) { assertThat(it.message).isEqualTo(message) @@ -240,7 +241,7 @@ class BuildViewStepEmitterTest { verify(buildView).onEvent(eq(PARENT_ID), capture()) assertThat(allValues).hasSize(1) - assertThat(firstValue).satisfies { + assertThat(firstValue).satisfiesKt { assertThat(it.parentId).isEqualTo(childId1) }.isInstanceOfSatisfying(StartEvent::class.java) { assertThat(it.message).isEqualTo(childId2) @@ -260,7 +261,7 @@ class BuildViewStepEmitterTest { verify(buildView).onEvent(eq(PARENT_ID), capture()) assertThat(allValues).hasSize(1) - assertThat(firstValue).satisfies { + assertThat(firstValue).satisfiesKt { assertThat(it.parentId).isEqualTo(PARENT_ID) }.isInstanceOfSatisfying(OutputBuildEvent::class.java) { assertThat(it.message).isEqualTo(message) diff --git a/plugins/toolkit/jetbrains-gateway/tst/software/aws/toolkits/jetbrains/gateway/connection/ScpCommandLineTest.kt b/plugins/toolkit/jetbrains-gateway/tst/software/aws/toolkits/jetbrains/gateway/connection/ScpCommandLineTest.kt index 5869eb60638..7f2990bd418 100644 --- a/plugins/toolkit/jetbrains-gateway/tst/software/aws/toolkits/jetbrains/gateway/connection/ScpCommandLineTest.kt +++ b/plugins/toolkit/jetbrains-gateway/tst/software/aws/toolkits/jetbrains/gateway/connection/ScpCommandLineTest.kt @@ -15,6 +15,7 @@ import org.junit.Rule import org.junit.Test import org.junit.rules.TemporaryFolder import software.aws.toolkits.core.utils.test.notNull +import software.aws.toolkits.jetbrains.utils.satisfiesKt import java.nio.file.Path import java.nio.file.attribute.PosixFilePermission import java.util.UUID @@ -102,7 +103,7 @@ class ScpCommandLineTest { val paths = sut.executeScpTest() - assertThat(paths).singleElement().notNull.satisfies { + assertThat(paths).singleElement().notNull.satisfiesKt { assertThat(it.fileName.toString()).isEqualTo(uuid) // is nested assertThat(it.parent.fileName.toString()).isEqualTo(directory.name) diff --git a/plugins/toolkit/jetbrains-gateway/tst/software/aws/toolkits/jetbrains/gateway/welcomescreen/ConfigureActionTest.kt b/plugins/toolkit/jetbrains-gateway/tst/software/aws/toolkits/jetbrains/gateway/welcomescreen/ConfigureActionTest.kt index 8b7eabceace..da43b4aea73 100644 --- a/plugins/toolkit/jetbrains-gateway/tst/software/aws/toolkits/jetbrains/gateway/welcomescreen/ConfigureActionTest.kt +++ b/plugins/toolkit/jetbrains-gateway/tst/software/aws/toolkits/jetbrains/gateway/welcomescreen/ConfigureActionTest.kt @@ -147,7 +147,7 @@ package software.aws.toolkits.jetbrains.gateway.welcomescreen // argumentCaptor().apply { // verify(client).startEnvironment(capture()) // -// assertThat(firstValue.ides()).satisfies { +// assertThat(firstValue.ides()).satisfiesKt { // assertThat(it.size).isEqualTo(1) // assertThat(it.first()).isEqualTo(IdeConfiguration.builder().runtime("ecrImage").build()) // } diff --git a/plugins/toolkit/jetbrains-ultimate/tst/software/aws/toolkits/jetbrains/datagrip/actions/AddSecretsManagerConnectionTest.kt b/plugins/toolkit/jetbrains-ultimate/tst/software/aws/toolkits/jetbrains/datagrip/actions/AddSecretsManagerConnectionTest.kt index a9f04a4c3ef..a25ca627fc1 100644 --- a/plugins/toolkit/jetbrains-ultimate/tst/software/aws/toolkits/jetbrains/datagrip/actions/AddSecretsManagerConnectionTest.kt +++ b/plugins/toolkit/jetbrains-ultimate/tst/software/aws/toolkits/jetbrains/datagrip/actions/AddSecretsManagerConnectionTest.kt @@ -17,6 +17,7 @@ import software.aws.toolkits.jetbrains.datagrip.REGION_ID_PROPERTY import software.aws.toolkits.jetbrains.datagrip.auth.SECRET_ID_PROPERTY import software.aws.toolkits.jetbrains.datagrip.auth.SecretsManagerAuth import software.aws.toolkits.jetbrains.datagrip.auth.SecretsManagerDbSecret +import software.aws.toolkits.jetbrains.utils.satisfiesKt class AddSecretsManagerConnectionTest { @Rule @@ -51,7 +52,7 @@ class AddSecretsManagerConnectionTest { secretArn, "adapter" ) - assertThat(registry.newDataSources).singleElement().satisfies { + assertThat(registry.newDataSources).singleElement().satisfiesKt { assertThat(it.isTemporary).isFalse() assertThat(it.sslCfg?.myEnabled).isTrue() assertThat(it.url).isEqualTo("jdbc:adapter://$address:$port") diff --git a/plugins/toolkit/jetbrains-ultimate/tst/software/aws/toolkits/jetbrains/services/rds/RdsExplorerNodeTest.kt b/plugins/toolkit/jetbrains-ultimate/tst/software/aws/toolkits/jetbrains/services/rds/RdsExplorerNodeTest.kt index 8058a19cda3..19ed6a6e045 100644 --- a/plugins/toolkit/jetbrains-ultimate/tst/software/aws/toolkits/jetbrains/services/rds/RdsExplorerNodeTest.kt +++ b/plugins/toolkit/jetbrains-ultimate/tst/software/aws/toolkits/jetbrains/services/rds/RdsExplorerNodeTest.kt @@ -9,11 +9,12 @@ import org.junit.Rule import org.junit.Test import software.aws.toolkits.core.utils.RuleUtils import software.aws.toolkits.core.utils.test.aString -import software.aws.toolkits.core.utils.test.hasOnlyElementsOfType +import software.aws.toolkits.core.utils.test.hasOnlyElementsOfTypeKt import software.aws.toolkits.jetbrains.core.MockResourceCacheRule import software.aws.toolkits.jetbrains.core.explorer.nodes.RdsExplorerRootNode import software.aws.toolkits.jetbrains.services.rds.resources.LIST_SUPPORTED_CLUSTERS import software.aws.toolkits.jetbrains.services.rds.resources.LIST_SUPPORTED_INSTANCES +import software.aws.toolkits.jetbrains.utils.allSatisfyKt class RdsExplorerNodeTest { @JvmField @@ -48,8 +49,8 @@ class RdsExplorerNodeTest { val databasesNames = instances.values + clusters.values assertThat(serviceRootNode.children) .hasSize(databasesNames.size) - .hasOnlyElementsOfType() - .allSatisfy { + .hasOnlyElementsOfTypeKt() + .allSatisfyKt { assertThat(it.resourceType()).isEqualTo("instance") }.extracting { it.database.identifier @@ -75,7 +76,7 @@ class RdsExplorerNodeTest { val serviceRootNode = sut.buildServiceRootNode(projectRule.project) assertThat(serviceRootNode.children) - .hasOnlyElementsOfType() + .hasOnlyElementsOfTypeKt() .extracting { it.database }.containsOnly(db) diff --git a/plugins/toolkit/jetbrains-ultimate/tst/software/aws/toolkits/jetbrains/services/rds/actions/CreateConfigurationActionTest.kt b/plugins/toolkit/jetbrains-ultimate/tst/software/aws/toolkits/jetbrains/services/rds/actions/CreateConfigurationActionTest.kt index 0487a2538a7..b8cde556777 100644 --- a/plugins/toolkit/jetbrains-ultimate/tst/software/aws/toolkits/jetbrains/services/rds/actions/CreateConfigurationActionTest.kt +++ b/plugins/toolkit/jetbrains-ultimate/tst/software/aws/toolkits/jetbrains/services/rds/actions/CreateConfigurationActionTest.kt @@ -33,6 +33,7 @@ import software.aws.toolkits.jetbrains.services.rds.RdsDatasourceConfiguration import software.aws.toolkits.jetbrains.services.rds.RdsNode import software.aws.toolkits.jetbrains.services.rds.auth.IamAuth import software.aws.toolkits.jetbrains.services.sts.StsResources +import software.aws.toolkits.jetbrains.utils.satisfiesKt import java.util.concurrent.CompletableFuture class CreateConfigurationActionTest { @@ -82,7 +83,7 @@ class CreateConfigurationActionTest { val node = createNode() val registry = DataSourceRegistry(projectRule.project) CreateIamDataSourceAction().createDatasource(node, registry) - assertThat(registry.newDataSources).singleElement().satisfies { + assertThat(registry.newDataSources).singleElement().satisfiesKt { assertThat(it.isTemporary).isFalse() assertThat(it.username).isEqualTo(username) } @@ -100,7 +101,7 @@ class CreateConfigurationActionTest { val node = createNode() val registry = DataSourceRegistry(projectRule.project) CreateIamDataSourceAction().createDatasource(node, registry) - assertThat(registry.newDataSources).singleElement().satisfies { + assertThat(registry.newDataSources).singleElement().satisfiesKt { assertThat(it.isTemporary).isFalse() assertThat(it.username).isEqualTo(masterUsername) } @@ -119,7 +120,7 @@ class CreateConfigurationActionTest { database = database ) ) - assertThat(registry.newDataSources).singleElement().satisfies { + assertThat(registry.newDataSources).singleElement().satisfiesKt { assertThat(it.isTemporary).isFalse() assertThat(it.url).contains(port.toString()) assertThat(it.url).contains(address) @@ -141,7 +142,7 @@ class CreateConfigurationActionTest { database = database ) ) - assertThat(registry.newDataSources).singleElement().satisfies { + assertThat(registry.newDataSources).singleElement().satisfiesKt { assertThat(it.username).isLowerCase().isEqualTo(username.lowercase()) assertThat(it.driverClass).contains("postgres") assertThat(it.url).contains(JDBC_POSTGRES) @@ -160,7 +161,7 @@ class CreateConfigurationActionTest { database = database ) ) - assertThat(registry.newDataSources).singleElement().satisfies { + assertThat(registry.newDataSources).singleElement().satisfiesKt { assertThat(it.username).isLowerCase().isEqualTo(username.lowercase()) assertThat(it.driverClass).contains("postgres") assertThat(it.url).contains(JDBC_POSTGRES) @@ -179,7 +180,7 @@ class CreateConfigurationActionTest { database = database ) ) - assertThat(registry.newDataSources).singleElement().satisfies { + assertThat(registry.newDataSources).singleElement().satisfiesKt { assertThat(it.username).isEqualTo(username) assertThat(it.driverClass).contains("mysql") assertThat(it.url).contains(JDBC_MYSQL) @@ -199,7 +200,7 @@ class CreateConfigurationActionTest { database = database ) ) - assertThat(registry.newDataSources).singleElement().satisfies { + assertThat(registry.newDataSources).singleElement().satisfiesKt { assertThat(it.username).isEqualTo(username) assertThat(it.driverClass).contains("mariadb") assertThat(it.url).contains(JDBC_MYSQL_AURORA) diff --git a/plugins/toolkit/jetbrains-ultimate/tst/software/aws/toolkits/jetbrains/services/redshift/actions/CreateDataSourceActionTest.kt b/plugins/toolkit/jetbrains-ultimate/tst/software/aws/toolkits/jetbrains/services/redshift/actions/CreateDataSourceActionTest.kt index 2a3caec0538..230c040eef4 100644 --- a/plugins/toolkit/jetbrains-ultimate/tst/software/aws/toolkits/jetbrains/services/redshift/actions/CreateDataSourceActionTest.kt +++ b/plugins/toolkit/jetbrains-ultimate/tst/software/aws/toolkits/jetbrains/services/redshift/actions/CreateDataSourceActionTest.kt @@ -18,6 +18,7 @@ import software.aws.toolkits.jetbrains.datagrip.REGION_ID_PROPERTY import software.aws.toolkits.jetbrains.services.redshift.auth.CLUSTER_ID_PROPERTY import software.aws.toolkits.jetbrains.services.redshift.auth.IamAuth import software.aws.toolkits.jetbrains.services.redshift.createDatasource +import software.aws.toolkits.jetbrains.utils.satisfiesKt class CreateDataSourceActionTest { @Rule @@ -53,7 +54,7 @@ class CreateDataSourceActionTest { .dbName(dbName) .build() ) - assertThat(registry.newDataSources).singleElement().satisfies { + assertThat(registry.newDataSources).singleElement().satisfiesKt { assertThat(it.isTemporary).isFalse() assertThat(it.sslCfg?.myEnabled).isTrue() assertThat(it.url).isEqualTo("jdbc:redshift://$address:$port/$dbName")