Skip to content

fix: fix sync test by use base enforcer's ClearPolicy and BuildRoleLink. #191

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
EmperorYP7 merged 1 commit into from
Mar 13, 2022
Merged

fix: fix sync test by use base enforcer's ClearPolicy and BuildRoleLink. #191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions casbin/enforcer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,12 +390,13 @@ void Enforcer::ClearPolicy() {

// LoadPolicy reloads the policy from file/database.
void Enforcer::LoadPolicy() {
this->ClearPolicy();
// must use base's LoadPolicy to avoid dead lock
Enforcer::ClearPolicy();
Copy link
Copy Markdown
Contributor

@EmperorYP7 EmperorYP7 Mar 13, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good work on debugging!

m_adapter->LoadPolicy(m_model);
m_model->PrintPolicy();

if(m_auto_build_role_links) {
this->BuildRoleLinks();
Enforcer::BuildRoleLinks();
}
}

Expand Down
77 changes: 39 additions & 38 deletions tests/enforcer_synced_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,57 +18,58 @@

#include <gtest/gtest.h>
#include <casbin/casbin.h>
#include "config_path.h"

namespace {

// void TestSyncFn(casbin::SyncedEnforcer& e, const std::string& sub, const std::string& obj, const std::string& act, bool control) {
// bool response = e.Enforce({ sub, obj, act });
// ASSERT_EQ(response, control);
// }
void TestSyncFn(casbin::SyncedEnforcer& e, const std::string& sub, const std::string& obj, const std::string& act, bool control) {
bool response = e.Enforce({ sub, obj, act });
ASSERT_EQ(response, control);
}

// TEST(TestEnforcerSynced, TestSync) {
// casbin::SyncedEnforcer e(basic_model_path, basic_policy_path);
TEST(TestEnforcerSynced, TestSync) {
casbin::SyncedEnforcer e(basic_model_path, basic_policy_path);

// using namespace std::literals::chrono_literals;
// auto time1 = 200ms;
// e.StartAutoLoadPolicy(time1);
using namespace std::literals::chrono_literals;
auto time1 = 200ms;
e.StartAutoLoadPolicy(time1);

// TestSyncFn(e, "alice", "data1", "read", true);
// TestSyncFn(e, "alice", "data1", "write", false);
// TestSyncFn(e, "alice", "data2", "read", false);
// TestSyncFn(e, "alice", "data2", "write", false);
// TestSyncFn(e, "bob", "data1", "read", false);
// TestSyncFn(e, "bob", "data1", "write", false);
// TestSyncFn(e, "bob", "data2", "read", false);
// TestSyncFn(e, "bob", "data2", "write", true);
TestSyncFn(e, "alice", "data1", "read", true);
TestSyncFn(e, "alice", "data1", "write", false);
TestSyncFn(e, "alice", "data2", "read", false);
TestSyncFn(e, "alice", "data2", "write", false);
TestSyncFn(e, "bob", "data1", "read", false);
TestSyncFn(e, "bob", "data1", "write", false);
TestSyncFn(e, "bob", "data2", "read", false);
TestSyncFn(e, "bob", "data2", "write", true);

// std::this_thread::sleep_for(200ms);
// e.StopAutoLoadPolicy();
// }
std::this_thread::sleep_for(200ms);
e.StopAutoLoadPolicy();
}

// TEST(TestEnforcerSynced, TestStopLoadPolicy) {
// casbin::SyncedEnforcer e(basic_model_path, basic_policy_path);
TEST(TestEnforcerSynced, TestStopLoadPolicy) {
casbin::SyncedEnforcer e(basic_model_path, basic_policy_path);

// using namespace std::literals::chrono_literals;
// std::chrono::duration<int64_t, std::nano> t = 5ms;
using namespace std::literals::chrono_literals;
std::chrono::duration<int64_t, std::nano> t = 5ms;

// e.StartAutoLoadPolicy(t);
e.StartAutoLoadPolicy(t);

// EXPECT_EQ(e.IsAutoLoadingRunning(), true);
EXPECT_EQ(e.IsAutoLoadingRunning(), true);

// TestSyncFn(e , "alice", "data1", "read", true);
// TestSyncFn(e , "alice", "data1", "write", false);
// TestSyncFn(e , "alice", "data2", "read", false);
// TestSyncFn(e , "alice", "data2", "write", false);
// TestSyncFn(e , "bob", "data1", "read", false);
// TestSyncFn(e , "bob", "data1", "write", false);
// TestSyncFn(e , "bob", "data2", "read", false);
// TestSyncFn(e , "bob", "data2", "write", true);
TestSyncFn(e , "alice", "data1", "read", true);
TestSyncFn(e , "alice", "data1", "write", false);
TestSyncFn(e , "alice", "data2", "read", false);
TestSyncFn(e , "alice", "data2", "write", false);
TestSyncFn(e , "bob", "data1", "read", false);
TestSyncFn(e , "bob", "data1", "write", false);
TestSyncFn(e , "bob", "data2", "read", false);
TestSyncFn(e , "bob", "data2", "write", true);

// e.StopAutoLoadPolicy();
// std::this_thread::sleep_for(10ms);
e.StopAutoLoadPolicy();
std::this_thread::sleep_for(10ms);

// EXPECT_EQ(e.IsAutoLoadingRunning(), false);
// }
EXPECT_EQ(e.IsAutoLoadingRunning(), false);
}

} // namespace