Add start point in Storage::checkPolicy()

[platform/core/security/cynara.git] / test / storage / storage / check.cpp

diff --git a/test/storage/storage/check.cpp b/test/storage/storage/check.cpp
index e71e40f..f56e7fe 100644 (file)
--- a/test/storage/storage/check.cpp
+++ b/test/storage/storage/check.cpp
@@ -49,7 +49,7 @@ TEST(storage, checkEmpty) {
     Cynara::Storage storage(backend);
     PolicyKey pk = Helpers::generatePolicyKey();
 
-    EXPECT_CALL(backend, searchDefaultBucket(pk))
+    EXPECT_CALL(backend, searchBucket(defaultPolicyBucketId, pk))
         .WillOnce(ReturnPointee(&emptyBucket));
 
     // Default bucket empty -- return DENY
@@ -66,7 +66,7 @@ TEST(storage, checkSimple) {
     Cynara::Storage storage(backend);
     PolicyKey pk = Helpers::generatePolicyKey();
 
-    EXPECT_CALL(backend, searchDefaultBucket(pk))
+    EXPECT_CALL(backend, searchBucket(defaultPolicyBucketId, pk))
         .WillRepeatedly(ReturnPointee(&bucket));
 
     // Default bucket empty -- return DENY
@@ -81,6 +81,7 @@ TEST(storage, checkSimple) {
     ASSERT_EQ(PredefinedPolicyType::DENY, storage.checkPolicy(pk).policyType());
 }
 
+// TODO: Refactorize to resemble checkNonrecursive()
 TEST(storage, checkBucket) {
     using ::testing::ReturnPointee;
 
@@ -97,9 +98,6 @@ TEST(storage, checkBucket) {
 
     PolicyBucket additionalBucket;
 
-    EXPECT_CALL(backend, searchDefaultBucket(pk))
-        .WillRepeatedly(ReturnPointee(&defaultBucket));
-
     EXPECT_CALL(backend, searchBucket(defaultPolicyBucketId, pk))
         .WillRepeatedly(ReturnPointee(&defaultBucket));
 
@@ -136,9 +134,6 @@ TEST(storage, checkBucketWildcard) {
     FakeStorageBackend backend;
     Cynara::Storage storage(backend);
 
-    EXPECT_CALL(backend, searchDefaultBucket(checkKey))
-        .WillRepeatedly(ReturnPointee(&defaultBucket));
-
     EXPECT_CALL(backend, searchBucket(defaultPolicyBucketId, checkKey))
         .WillRepeatedly(ReturnPointee(&defaultBucket));
 
@@ -166,9 +161,6 @@ TEST(storage, checkBucketWildcardOtherDefault) {
     FakeStorageBackend backend;
     Cynara::Storage storage(backend);
 
-    EXPECT_CALL(backend, searchDefaultBucket(checkKey))
-        .WillRepeatedly(ReturnPointee(&defaultBucket));
-
     EXPECT_CALL(backend, searchBucket(defaultPolicyBucketId, checkKey))
         .WillRepeatedly(ReturnPointee(&defaultBucket));
 
@@ -179,3 +171,21 @@ TEST(storage, checkBucketWildcardOtherDefault) {
     // Should return additional bucket's default policy
     ASSERT_EQ(PredefinedPolicyType::ALLOW, storage.checkPolicy(checkKey));
 }
+
+TEST(storage, checkNonrecursive) {
+    using ::testing::ReturnPointee;
+
+    PolicyKey pk = Helpers::generatePolicyKey();
+    PolicyBucketId bucketId = "a-bucket";
+
+    PolicyBucket bucket(bucketId, PredefinedPolicyType::ALLOW,
+                               { Policy::bucketWithKey(pk, "must-not-be-touched") });
+    FakeStorageBackend backend;
+
+    Cynara::Storage storage(backend);
+
+    EXPECT_CALL(backend, searchBucket(bucketId, pk))
+        .WillOnce(ReturnPointee(&bucket));
+
+    ASSERT_EQ(PredefinedPolicyType::ALLOW, storage.checkPolicy(pk, bucketId, false));
+}