From b8a41dcd85faa37fb2869bb870fc92ffe0d564a8 Mon Sep 17 00:00:00 2001 From: Vladimir Krivosheev Date: Fri, 4 Nov 2016 17:14:19 +0100 Subject: [PATCH] fix test `credentials with empty username - KeePass` --- platform/credential-store/src/PasswordSafeImpl.kt | 2 +- platform/credential-store/test/CredentialStoreTestSuite.kt | 2 +- platform/credential-store/test/PasswordSafeTest.kt | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/platform/credential-store/src/PasswordSafeImpl.kt b/platform/credential-store/src/PasswordSafeImpl.kt index c1ea8e1dfc85..8cb2bdca6b90 100644 --- a/platform/credential-store/src/PasswordSafeImpl.kt +++ b/platform/credential-store/src/PasswordSafeImpl.kt @@ -64,7 +64,7 @@ class PasswordSafeImpl @JvmOverloads constructor(val settings: PasswordSafeSetti override fun set(attributes: CredentialAttributes, credentials: Credentials?) { currentProvider.set(attributes, credentials) - if (attributes.isPasswordMemoryOnly && credentials.isFulfilled()) { + if (attributes.isPasswordMemoryOnly && !credentials?.password.isNullOrEmpty()) { // we must store because otherwise on get will be no password memoryHelperProvider.value.set(attributes.toPasswordStoreable(), credentials) } diff --git a/platform/credential-store/test/CredentialStoreTestSuite.kt b/platform/credential-store/test/CredentialStoreTestSuite.kt index de9e4ac090f7..d881002695ef 100644 --- a/platform/credential-store/test/CredentialStoreTestSuite.kt +++ b/platform/credential-store/test/CredentialStoreTestSuite.kt @@ -19,5 +19,5 @@ import org.junit.runner.RunWith import org.junit.runners.Suite @RunWith(Suite::class) -@Suite.SuiteClasses(FileCredentialStoreTest::class, CredentialSerializeTest::class, CredentialStoreTest::class, MasterPasswordMigrationTest::class) +@Suite.SuiteClasses(FileCredentialStoreTest::class, CredentialSerializeTest::class, CredentialStoreTest::class, PasswordSafeTest::class, MasterPasswordMigrationTest::class) internal class CredentialStoreTestSuite \ No newline at end of file diff --git a/platform/credential-store/test/PasswordSafeTest.kt b/platform/credential-store/test/PasswordSafeTest.kt index 563eda38bd32..1c217480712e 100644 --- a/platform/credential-store/test/PasswordSafeTest.kt +++ b/platform/credential-store/test/PasswordSafeTest.kt @@ -150,8 +150,7 @@ class PasswordSafeTest { val ps = PasswordSafeImpl(settings, KeePassCredentialStore(baseDirectory = tempDirManager.newPath())) val id = "test PasswordSafeTest.credentials with empty username" - val attributes = CredentialAttributes(id, null, null, true) - + val attributes = CredentialAttributes(id, isPasswordMemoryOnly = true) try { val credentials = Credentials(null, "passphrase") ps.set(attributes, credentials)