Add InMemoryStorageBackend::hasBucket()

The function will be used by Cynara::Storage to check
if new bucket should be created or an old one updated.

Change-Id: I0c60724a112880010dcde7793346c1bc2fd687dc

diff --git a/src/service/storage/InMemoryStorageBackend.cpp b/src/service/storage/InMemoryStorageBackend.cpp
index 212c13a91a0fe53098307e19d0737f88db8ea4f6..51583c75f9e8c13550417189eaf7375044fbdc31 100644 (file)
--- a/src/service/storage/InMemoryStorageBackend.cpp
+++ b/src/service/storage/InMemoryStorageBackend.cpp
@@ -65,6 +65,10 @@ void InMemoryStorageBackend::deleteBucket(const PolicyBucketId &bucketId) {
     }
 }
 
     }
 }
 

+bool InMemoryStorageBackend::hasBucket(const PolicyBucketId &bucketId) {
+    return buckets().find(bucketId) != buckets().end();
+}
+

 void InMemoryStorageBackend::deletePolicy(const PolicyBucketId &bucketId, const PolicyKey &key) {
     try {
         // TODO: Move the erase code to PolicyCollection maybe?
 void InMemoryStorageBackend::deletePolicy(const PolicyBucketId &bucketId, const PolicyKey &key) {
     try {
         // TODO: Move the erase code to PolicyCollection maybe?

diff --git a/src/service/storage/InMemoryStorageBackend.h b/src/service/storage/InMemoryStorageBackend.h
index 6ed05184adc060a3f4947561c08b9de3f218f69b..f4db5884652083cf6f71d8a6c45d380809244b9a 100644 (file)
--- a/src/service/storage/InMemoryStorageBackend.h
+++ b/src/service/storage/InMemoryStorageBackend.h
@@ -47,6 +47,7 @@ public:
     virtual void insertPolicy(const PolicyBucketId &bucketId, PolicyPtr policy);
     virtual void createBucket(const PolicyBucketId &bucketId, const PolicyResult &defaultPolicy);
     virtual void deleteBucket(const PolicyBucketId &bucketId);
     virtual void insertPolicy(const PolicyBucketId &bucketId, PolicyPtr policy);
     virtual void createBucket(const PolicyBucketId &bucketId, const PolicyResult &defaultPolicy);
     virtual void deleteBucket(const PolicyBucketId &bucketId);

+    virtual bool hasBucket(const PolicyBucketId &bucketId);

     virtual void deletePolicy(const PolicyBucketId &bucketId, const PolicyKey &key);
     virtual void deleteLinking(const PolicyBucketId &bucketId);
 
     virtual void deletePolicy(const PolicyBucketId &bucketId, const PolicyKey &key);
     virtual void deleteLinking(const PolicyBucketId &bucketId);
 

diff --git a/src/service/storage/StorageBackend.h b/src/service/storage/StorageBackend.h
index 06a3a74bd52545201de9197889da1efa7f545d56..005a00d78c66704ab1dddeea52c7f0c7158f7c49 100644 (file)
--- a/src/service/storage/StorageBackend.h
+++ b/src/service/storage/StorageBackend.h
@@ -45,6 +45,7 @@ public:
 
     virtual void createBucket(const PolicyBucketId &bucketId, const PolicyResult &defaultPolicy) = 0;
     virtual void deleteBucket(const PolicyBucketId &bucketId) = 0;
 
     virtual void createBucket(const PolicyBucketId &bucketId, const PolicyResult &defaultPolicy) = 0;
     virtual void deleteBucket(const PolicyBucketId &bucketId) = 0;

+    virtual bool hasBucket(const PolicyBucketId &bucketId) = 0;

 
     virtual void deletePolicy(const PolicyBucketId &bucketId, const PolicyKey &key) = 0;
     virtual void deleteLinking(const PolicyBucketId &bucket) = 0;
 
     virtual void deletePolicy(const PolicyBucketId &bucketId, const PolicyKey &key) = 0;
     virtual void deleteLinking(const PolicyBucketId &bucket) = 0;

diff --git a/test/storage/inmemorystoragebackend/buckets.cpp b/test/storage/inmemorystoragebackend/buckets.cpp
index bf2c87ca26129f0623e533aa2367b491ba7c6acf..37cf0aed70fc5b64b31de9be502060a00e0a6bc4 100644 (file)
--- a/test/storage/inmemorystoragebackend/buckets.cpp
+++ b/test/storage/inmemorystoragebackend/buckets.cpp
@@ -30,13 +30,13 @@
 
 using namespace Cynara;
 
 
 using namespace Cynara;
 

-TEST_F(InMemeoryStorageBackendFixture, addBucket) {
+TEST_F(InMemeoryStorageBackendFixture, createBucket) {

     using ::testing::ReturnRef;
     using ::testing::IsEmpty;
 
     FakeInMemoryStorageBackend backend;
     EXPECT_CALL(backend, buckets())
     using ::testing::ReturnRef;
     using ::testing::IsEmpty;
 
     FakeInMemoryStorageBackend backend;
     EXPECT_CALL(backend, buckets())

-        .WillOnce(ReturnRef(m_buckets));
+        .WillRepeatedly(ReturnRef(m_buckets));

 
     PolicyResult defaultPolicy(PredefinedPolicyType::ALLOW);
     PolicyBucketId bucketId = "new-bucket";
 
     PolicyResult defaultPolicy(PredefinedPolicyType::ALLOW);
     PolicyBucketId bucketId = "new-bucket";


@@ -55,7 +55,7 @@ TEST_F(InMemeoryStorageBackendFixture, deleteBucket) {
 
     FakeInMemoryStorageBackend backend;
     EXPECT_CALL(backend, buckets())
 
     FakeInMemoryStorageBackend backend;
     EXPECT_CALL(backend, buckets())

-        .WillOnce(ReturnRef(m_buckets));
+        .WillRepeatedly(ReturnRef(m_buckets));

 
     PolicyBucketId bucketId = "delete-bucket";
     m_buckets.insert({ bucketId, PolicyBucket() });
 
     PolicyBucketId bucketId = "delete-bucket";
     m_buckets.insert({ bucketId, PolicyBucket() });


@@ -65,12 +65,27 @@ TEST_F(InMemeoryStorageBackendFixture, deleteBucket) {
     ASSERT_THAT(m_buckets, IsEmpty());
 }
 
     ASSERT_THAT(m_buckets, IsEmpty());
 }
 

+TEST_F(InMemeoryStorageBackendFixture, hasBucket) {
+    using ::testing::ReturnRef;
+    using ::testing::IsEmpty;
+
+    FakeInMemoryStorageBackend backend;
+    EXPECT_CALL(backend, buckets())
+        .WillRepeatedly(ReturnRef(m_buckets));
+
+    PolicyBucketId bucketId = "bucket";
+    m_buckets.insert({ bucketId, PolicyBucket() });
+
+    ASSERT_TRUE(backend.hasBucket(bucketId));
+    ASSERT_FALSE(backend.hasBucket("non-existent"));
+}
+

 TEST_F(InMemeoryStorageBackendFixture, deleteNonexistentBucket) {
     using ::testing::ReturnRef;
 
     FakeInMemoryStorageBackend backend;
     EXPECT_CALL(backend, buckets())
 TEST_F(InMemeoryStorageBackendFixture, deleteNonexistentBucket) {
     using ::testing::ReturnRef;
 
     FakeInMemoryStorageBackend backend;
     EXPECT_CALL(backend, buckets())

-        .WillOnce(ReturnRef(m_buckets));
+        .WillRepeatedly(ReturnRef(m_buckets));

 
     EXPECT_THROW(backend.deleteBucket("non-existent"), BucketNotExistsException);
 }
 
     EXPECT_THROW(backend.deleteBucket("non-existent"), BucketNotExistsException);
 }

diff --git a/test/storage/storage/fakestoragebackend.h b/test/storage/storage/fakestoragebackend.h
index d06c67dfafed5678fe9d36fa78530f513bf2f5cb..b2f7a45743f0c664bde12a43bee714b4b13b4ddc 100644 (file)
--- a/test/storage/storage/fakestoragebackend.h
+++ b/test/storage/storage/fakestoragebackend.h
@@ -31,6 +31,7 @@ public:
     MOCK_METHOD2(searchBucket, PolicyBucket(const PolicyBucketId &bucket, const PolicyKey &key));
     MOCK_METHOD2(createBucket, void(const PolicyBucketId &bucketId, const PolicyResult &defaultPolicy));
     MOCK_METHOD1(deleteBucket, void(const PolicyBucketId &bucketId));
     MOCK_METHOD2(searchBucket, PolicyBucket(const PolicyBucketId &bucket, const PolicyKey &key));
     MOCK_METHOD2(createBucket, void(const PolicyBucketId &bucketId, const PolicyResult &defaultPolicy));
     MOCK_METHOD1(deleteBucket, void(const PolicyBucketId &bucketId));

+    MOCK_METHOD1(hasBucket, bool(const PolicyBucketId &bucketId));

     MOCK_METHOD2(deletePolicy, void(const PolicyBucketId &bucketId, const PolicyKey &key));
     MOCK_METHOD1(deleteLinking, void(const PolicyBucketId &bucket));
     MOCK_METHOD2(insertPolicy, void(const PolicyBucketId &bucketId, PolicyPtr policy));
     MOCK_METHOD2(deletePolicy, void(const PolicyBucketId &bucketId, const PolicyKey &key));
     MOCK_METHOD1(deleteLinking, void(const PolicyBucketId &bucket));
     MOCK_METHOD2(insertPolicy, void(const PolicyBucketId &bucketId, PolicyPtr policy));