diff options
| author | Bartlomiej Grzelewski <b.grzelewski@samsung.com> | 2018-09-21 12:41:37 +0200 |
|---|---|---|
| committer | Krzysztof Jackiewicz <k.jackiewicz@samsung.com> | 2018-10-03 12:58:27 +0000 |
| commit | 2e5203cfd1f18b4c86dcab6e594d66ff8d0b8c95 (patch) | |
| tree | f8b37fd46ba62440b8f36a7ca3e348efa4dfdf61 /tests | |
| parent | f6e9b94fd69a801f9594b92e8fff59410a089736 (diff) | |
| download | key-manager-2e5203cfd1f18b4c86dcab6e594d66ff8d0b8c95.tar.gz key-manager-2e5203cfd1f18b4c86dcab6e594d66ff8d0b8c95.tar.bz2 key-manager-2e5203cfd1f18b4c86dcab6e594d66ff8d0b8c95.zip | |
Unification of import methods in gstore
Change-Id: I31dca502533360b759d6aea20e75a9e823eccc34
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/test_crypto-logic.cpp | 6 | ||||
| -rw-r--r-- | tests/test_generic-backend.cpp | 5 | ||||
| -rw-r--r-- | tests/test_tz-backend.cpp | 4 |
3 files changed, 5 insertions, 10 deletions
diff --git a/tests/test_crypto-logic.cpp b/tests/test_crypto-logic.cpp index 57843658..f519e27b 100644 --- a/tests/test_crypto-logic.cpp +++ b/tests/test_crypto-logic.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000 - 2017 Samsung Electronics Co., Ltd All Rights Reserved + * Copyright (c) 2017 - 2018 Samsung Electronics Co., Ltd All Rights Reserved * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -91,7 +91,7 @@ BOOST_AUTO_TEST_CASE(row_encryption) Crypto::Data data(DataType(DataType::Type::BINARY_DATA), createRandom(10)); Crypto::Decider decider; Crypto::GStore &store = decider.getStore(data.type, policy); - Token token = store.import(data, policy.password); + Token token = store.import(data, policy.password, RawBuffer()); Name name = "test_data"; ClientId owner = "test_owner"; @@ -113,7 +113,7 @@ BOOST_AUTO_TEST_CASE(row_encryption_negatives) Crypto::Data data(DataType(DataType::Type::BINARY_DATA), createRandom(10)); Crypto::Decider decider; Crypto::GStore &store = decider.getStore(data.type, policy); - Token token = store.import(data, policy.password); + Token token = store.import(data, policy.password, RawBuffer()); Name name = "test_data"; ClientId owner = "test_owner"; diff --git a/tests/test_generic-backend.cpp b/tests/test_generic-backend.cpp index 114d794a..0b39bf37 100644 --- a/tests/test_generic-backend.cpp +++ b/tests/test_generic-backend.cpp @@ -72,10 +72,7 @@ BOOST_AUTO_TEST_CASE(gstore) Exc::Crypto::OperationNotSupported); BOOST_REQUIRE_THROW(store.generateSKey(CryptoAlgorithm(), Password()), Exc::Crypto::OperationNotSupported); - BOOST_REQUIRE_THROW(store.import(Crypto::Data(), Password()), - Exc::Crypto::OperationNotSupported); - BOOST_REQUIRE_THROW(store.importEncrypted(Crypto::Data(), Password(), - RawBuffer()), + BOOST_REQUIRE_THROW(store.import(Crypto::Data(), Password(), RawBuffer()), Exc::Crypto::OperationNotSupported); BOOST_REQUIRE_THROW(store.destroy(Token()), Exc::Crypto::OperationNotSupported); diff --git a/tests/test_tz-backend.cpp b/tests/test_tz-backend.cpp index 853326cb..880211bc 100644 --- a/tests/test_tz-backend.cpp +++ b/tests/test_tz-backend.cpp @@ -30,9 +30,7 @@ BOOST_AUTO_TEST_CASE(store) Exc::Crypto::OperationNotSupported); BOOST_REQUIRE_THROW(store.generateAKey(CryptoAlgorithm(), Password(), Password()), Exc::Crypto::OperationNotSupported); - BOOST_REQUIRE_THROW(store.import(Data(), Password()), - Exc::Crypto::OperationNotSupported); - BOOST_REQUIRE_THROW(store.importEncrypted(Data(), Password(), RawBuffer()), + BOOST_REQUIRE_THROW(store.import(Data(), Password(), RawBuffer()), Exc::Crypto::OperationNotSupported); BOOST_REQUIRE_NO_THROW(store.destroy(Token())); } |