Merge pull request #38247 from dillaman/wip-librbd-test-rename

test/librbd: rename tests to match proper namespaces

Reviewed-by: Mykola Golub <mgolub@suse.com>
This commit is contained in:
Mykola Golub 2020-11-24 17:15:29 +02:00 committed by GitHub
commit acf3b72b4d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 18 deletions

View File

@ -14,7 +14,7 @@ const unsigned char TEST_IV[16] = {2};
const unsigned char TEST_IV_2[16] = {3};
const unsigned char TEST_DATA[4096] = {4};
struct TestDataCryptor : public TestFixture {
struct TestCryptoOpensslDataCryptor : public TestFixture {
DataCryptor *cryptor;
void SetUp() override {
@ -30,28 +30,28 @@ struct TestDataCryptor : public TestFixture {
}
};
TEST_F(TestDataCryptor, InvalidCipherName) {
TEST_F(TestCryptoOpensslDataCryptor, InvalidCipherName) {
EXPECT_EQ(-EINVAL, cryptor->init(nullptr, TEST_KEY, sizeof(TEST_KEY)));
EXPECT_EQ(-EINVAL, cryptor->init("", TEST_KEY, sizeof(TEST_KEY)));
EXPECT_EQ(-EINVAL, cryptor->init("Invalid", TEST_KEY, sizeof(TEST_KEY)));
}
TEST_F(TestDataCryptor, InvalidKey) {
TEST_F(TestCryptoOpensslDataCryptor, InvalidKey) {
EXPECT_EQ(-EINVAL, cryptor->init(TEST_CIPHER_NAME, nullptr, 0));
EXPECT_EQ(-EINVAL, cryptor->init(TEST_CIPHER_NAME, nullptr,
sizeof(TEST_KEY)));
EXPECT_EQ(-EINVAL, cryptor->init(TEST_CIPHER_NAME, TEST_KEY, 1));
}
TEST_F(TestDataCryptor, GetContextInvalidMode) {
TEST_F(TestCryptoOpensslDataCryptor, GetContextInvalidMode) {
EXPECT_EQ(nullptr, cryptor->get_context(static_cast<CipherMode>(-1)));
}
TEST_F(TestDataCryptor, ReturnNullContext) {
TEST_F(TestCryptoOpensslDataCryptor, ReturnNullContext) {
cryptor->return_context(nullptr, static_cast<CipherMode>(-1));
}
TEST_F(TestDataCryptor, ReturnContextInvalidMode) {
TEST_F(TestCryptoOpensslDataCryptor, ReturnContextInvalidMode) {
auto ctx = cryptor->get_context(CipherMode::CIPHER_MODE_ENC);
ASSERT_NE(ctx, nullptr);
cryptor->return_context(ctx, CipherMode::CIPHER_MODE_DEC);
@ -60,7 +60,7 @@ TEST_F(TestDataCryptor, ReturnContextInvalidMode) {
cryptor->return_context(ctx, static_cast<CipherMode>(-1));
}
TEST_F(TestDataCryptor, EncryptDecrypt) {
TEST_F(TestCryptoOpensslDataCryptor, EncryptDecrypt) {
auto ctx = cryptor->get_context(CipherMode::CIPHER_MODE_ENC);
ASSERT_NE(ctx, nullptr);
cryptor->init_context(ctx, TEST_IV, sizeof(TEST_IV));
@ -78,7 +78,7 @@ TEST_F(TestDataCryptor, EncryptDecrypt) {
cryptor->return_context(ctx, CipherMode::CIPHER_MODE_DEC);
}
TEST_F(TestDataCryptor, ReuseContext) {
TEST_F(TestCryptoOpensslDataCryptor, ReuseContext) {
auto ctx = cryptor->get_context(CipherMode::CIPHER_MODE_ENC);
ASSERT_NE(ctx, nullptr);
@ -105,7 +105,7 @@ TEST_F(TestDataCryptor, ReuseContext) {
cryptor->return_context(ctx2, CipherMode::CIPHER_MODE_ENC);
}
TEST_F(TestDataCryptor, InvalidIVLength) {
TEST_F(TestCryptoOpensslDataCryptor, InvalidIVLength) {
auto ctx = cryptor->get_context(CipherMode::CIPHER_MODE_ENC);
ASSERT_NE(ctx, nullptr);

View File

@ -21,7 +21,7 @@ MATCHER_P(CompareArrayToString, s, "") {
return (memcmp(arg, s.c_str(), s.length()) == 0);
}
struct TestMockBlockCrypto : public TestFixture {
struct TestMockCryptoBlockCrypto : public TestFixture {
MockDataCryptor cryptor;
ceph::ref_t<BlockCrypto<MockCryptoContext>> bc;
int cryptor_block_size = 2;
@ -73,7 +73,7 @@ struct TestMockBlockCrypto : public TestFixture {
}
};
TEST_F(TestMockBlockCrypto, Encrypt) {
TEST_F(TestMockCryptoBlockCrypto, Encrypt) {
uint32_t image_offset = 0x1234 * block_size;
ceph::bufferlist data1;
@ -104,19 +104,19 @@ TEST_F(TestMockBlockCrypto, Encrypt) {
ASSERT_TRUE(data.is_aligned(block_size));
}
TEST_F(TestMockBlockCrypto, UnalignedImageOffset) {
TEST_F(TestMockCryptoBlockCrypto, UnalignedImageOffset) {
ceph::bufferlist data;
data.append("1234");
ASSERT_EQ(-EINVAL, bc->encrypt(&data, 2));
}
TEST_F(TestMockBlockCrypto, UnalignedDataLength) {
TEST_F(TestMockCryptoBlockCrypto, UnalignedDataLength) {
ceph::bufferlist data;
data.append("123");
ASSERT_EQ(-EINVAL, bc->encrypt(&data, 0));
}
TEST_F(TestMockBlockCrypto, GetContextError) {
TEST_F(TestMockCryptoBlockCrypto, GetContextError) {
ceph::bufferlist data;
data.append("1234");
EXPECT_CALL(cryptor, get_context(CipherMode::CIPHER_MODE_ENC)).WillOnce(
@ -124,7 +124,7 @@ TEST_F(TestMockBlockCrypto, GetContextError) {
ASSERT_EQ(-EIO, bc->encrypt(&data, 0));
}
TEST_F(TestMockBlockCrypto, InitContextError) {
TEST_F(TestMockCryptoBlockCrypto, InitContextError) {
ceph::bufferlist data;
data.append("1234");
expect_get_context(CipherMode::CIPHER_MODE_ENC);
@ -132,7 +132,7 @@ TEST_F(TestMockBlockCrypto, InitContextError) {
ASSERT_EQ(-123, bc->encrypt(&data, 0));
}
TEST_F(TestMockBlockCrypto, UpdateContextError) {
TEST_F(TestMockCryptoBlockCrypto, UpdateContextError) {
ceph::bufferlist data;
data.append("1234");
expect_get_context(CipherMode::CIPHER_MODE_ENC);

View File

@ -14,7 +14,7 @@ using ::testing::Return;
namespace librbd {
namespace crypto {
struct TestMockCryptoContextPool : public ::testing::Test {
struct TestMockCryptoCryptoContextPool : public ::testing::Test {
MockDataCryptor cryptor;
void expect_get_context(CipherMode mode) {
@ -28,7 +28,7 @@ struct TestMockCryptoContextPool : public ::testing::Test {
}
};
TEST_F(TestMockCryptoContextPool, Test) {
TEST_F(TestMockCryptoCryptoContextPool, Test) {
CryptoContextPool<MockCryptoContext> pool(&cryptor, 1);
expect_get_context(CipherMode::CIPHER_MODE_ENC);