Skip to content

Commit 3d27e01

Browse files
divy9881divy9881
committed
fix: filePath function removal.
Signed-off-by: DivyPatel9881 <[email protected]>
1 parent 253ab24 commit 3d27e01

File tree

5 files changed

+47
-165
lines changed

5 files changed

+47
-165
lines changed

‎test/test_config.cpp‎

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -19,32 +19,10 @@ namespace test_config
1919
Config* config;
2020

2121
TEST_METHOD_INITIALIZE(InitializeConfig) {
22-
string filepath = filePath("/casbin/config/testdata/testini.ini");
22+
string filepath = "../../casbin/config/testdata/testini.ini";
2323
config = Config::NewConfig(filepath);
2424
}
2525

26-
string filePath(string filepath) {
27-
char* root = _getcwd(NULL, 0);
28-
string rootStr = string(root);
29-
30-
vector <string> directories = Split(rootStr, "\\", -1);
31-
vector<string>::iterator it = find(directories.begin(), directories.end(), "x64");
32-
vector <string> left{ *(it-1) };
33-
it = find_end(directories.begin(), directories.end(), left.begin(), left.end());
34-
int index = int(directories.size() + (it - directories.end()));
35-
36-
vector <string> finalDirectories(directories.begin(), directories.begin() + index + 1);
37-
38-
vector<string> userD = Split(filepath, "/", -1);
39-
for (int i = 1; i < userD.size(); i++)
40-
finalDirectories.push_back(userD[i]);
41-
42-
string filepath1 = finalDirectories[0];
43-
for (int i = 1; i < finalDirectories.size(); i++)
44-
filepath1 = filepath1 + "/" + finalDirectories[i];
45-
return filepath1;
46-
}
47-
4826
TEST_METHOD(TestDebug) {
4927
Assert::IsTrue(config->GetBool("debug"));
5028
}

‎test/test_enforcer.cpp‎

Lines changed: 8 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -18,28 +18,6 @@ namespace test_enforcer
1818
{
1919
public:
2020

21-
string filePath(string filepath) {
22-
char* root = _getcwd(NULL, 0);
23-
string rootStr = string(root);
24-
25-
vector <string> directories = Split(rootStr, "\\", -1);
26-
vector<string>::iterator it = find(directories.begin(), directories.end(), "x64");
27-
vector <string> left{ *(it - 1) };
28-
it = find_end(directories.begin(), directories.end(), left.begin(), left.end());
29-
int index = int(directories.size() + (it - directories.end()));
30-
31-
vector <string> finalDirectories(directories.begin(), directories.begin() + index + 1);
32-
33-
vector<string> userD = Split(filepath, "/", -1);
34-
for (int i = 1; i < userD.size(); i++)
35-
finalDirectories.push_back(userD[i]);
36-
37-
string filepath1 = finalDirectories[0];
38-
for (int i = 1; i < finalDirectories.size(); i++)
39-
filepath1 = filepath1 + "/" + finalDirectories[i];
40-
return filepath1;
41-
}
42-
4321
void TestEnforce(Enforcer* e, string sub, string dom, string obj, string act, bool res) {
4422
Assert::AreEqual(res, e->Enforce(sub, dom, obj, act));
4523
}
@@ -58,8 +36,8 @@ namespace test_enforcer
5836

5937

6038
TEST_METHOD(TestFourParams) {
61-
string model = filePath("../examples/rbac_with_domains_model.conf");
62-
string policy = filePath("../examples/rbac_with_domains_policy.csv");
39+
string model = "../../examples/rbac_with_domains_model.conf";
40+
string policy = "../../examples/rbac_with_domains_policy.csv";
6341
Enforcer* e = Enforcer::NewEnforcer(model, policy);
6442

6543
TestEnforce(e, "alice", "domain1", "data1", "read", true);
@@ -73,8 +51,8 @@ namespace test_enforcer
7351
}
7452

7553
TEST_METHOD(TestThreeParams) {
76-
string model = filePath("../examples/basic_model_without_spaces.conf");
77-
string policy = filePath("../examples/basic_policy.csv");
54+
string model = "../../examples/basic_model_without_spaces.conf";
55+
string policy = "../../examples/basic_policy.csv";
7856
Enforcer* e = Enforcer::NewEnforcer(model, policy);
7957

8058
TestEnforce(e, { "alice", "data1", "read" }, true);
@@ -88,8 +66,8 @@ namespace test_enforcer
8866
}
8967

9068
TEST_METHOD(TestVectorParams) {
91-
string model = filePath("../examples/basic_model_without_spaces.conf");
92-
string policy = filePath("../examples/basic_policy.csv");
69+
string model = "../../examples/basic_model_without_spaces.conf";
70+
string policy = "../../examples/basic_policy.csv";
9371
Enforcer* e = Enforcer::NewEnforcer(model, policy);
9472

9573
TestEnforce(e, { "alice", "data1", "read" }, true);
@@ -103,8 +81,8 @@ namespace test_enforcer
10381
}
10482

10583
TEST_METHOD(TestMapParams) {
106-
string model = filePath("../examples/basic_model_without_spaces.conf");
107-
string policy = filePath("../examples/basic_policy.csv");
84+
string model = "../../examples/basic_model_without_spaces.conf";
85+
string policy = "../../examples/basic_policy.csv";
10886
Enforcer* e = Enforcer::NewEnforcer(model, policy);
10987

11088
unordered_map<string, string> params = { {"sub","alice"},{"obj","data1"},{"act","read"} };

‎test/test_management_api.cpp‎

Lines changed: 8 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -20,39 +20,9 @@ namespace test_management_api
2020
{
2121
public:
2222

23-
string basic_example;
24-
Config* basic_config;
25-
26-
TEST_METHOD_INITIALIZE(InitializeBasicConfig) {
27-
basic_example = filePath("../examples/basic_model.conf");
28-
basic_config = Config::NewConfig(basic_example);
29-
}
30-
31-
string filePath(string filepath) {
32-
char* root = _getcwd(NULL, 0);
33-
string rootStr = string(root);
34-
35-
vector <string> directories = Split(rootStr, "\\", -1);
36-
vector<string>::iterator it = find(directories.begin(), directories.end(), "x64");
37-
vector <string> left{ *(it - 1) };
38-
it = find_end(directories.begin(), directories.end(), left.begin(), left.end());
39-
int index = int(directories.size() + (it - directories.end()));
40-
41-
vector <string> finalDirectories(directories.begin(), directories.begin() + index + 1);
42-
43-
vector<string> userD = Split(filepath, "/", -1);
44-
for (int i = 1; i < userD.size(); i++)
45-
finalDirectories.push_back(userD[i]);
46-
47-
string filepath1 = finalDirectories[0];
48-
for (int i = 1; i < finalDirectories.size(); i++)
49-
filepath1 = filepath1 + "/" + finalDirectories[i];
50-
return filepath1;
51-
}
52-
5323
TEST_METHOD(TestGetList) {
54-
string model = filePath("../examples/rbac_model.conf");
55-
string policy = filePath("../examples/rbac_policy.csv");
24+
string model = "../../examples/rbac_model.conf";
25+
string policy = "../../examples/rbac_policy.csv";
5626
Enforcer* e = Enforcer :: NewEnforcer(model, policy);
5727

5828
Assert::IsTrue(ArrayEquals(vector<string>{ "alice", "bob", "data2_admin" }, e->GetAllSubjects()));
@@ -111,8 +81,8 @@ namespace test_management_api
11181
}
11282

11383
TEST_METHOD(TestGetPolicyAPI) {
114-
string model = filePath("../examples/rbac_model.conf");
115-
string policy = filePath("../examples/rbac_policy.csv");
84+
string model = "../../examples/rbac_model.conf";
85+
string policy = "../../examples/rbac_policy.csv";
11686
Enforcer* e = Enforcer::NewEnforcer(model, policy);
11787

11888
TestGetPolicy(e, vector<vector<string>>{
@@ -154,8 +124,8 @@ namespace test_management_api
154124

155125

156126
TEST_METHOD(TestModifyPolicyAPI) {
157-
string model = filePath("../examples/rbac_model.conf");
158-
string policy = filePath("../examples/rbac_policy.csv");
127+
string model = "../../examples/rbac_model.conf";
128+
string policy = "../../examples/rbac_policy.csv";
159129
Adapter* adapter = BatchFileAdapter::NewAdapter(policy);
160130
Enforcer* e = Enforcer::NewEnforcer(model, adapter);
161131

@@ -208,8 +178,8 @@ namespace test_management_api
208178
}
209179

210180
TEST_METHOD(TestModifyGroupingPolicyAPI) {
211-
string model = filePath("../examples/rbac_model.conf");
212-
string policy = filePath("../examples/rbac_policy.csv");
181+
string model = "../../examples/rbac_model.conf";
182+
string policy = "../../examples/rbac_policy.csv";
213183
Adapter* adapter = BatchFileAdapter::NewAdapter(policy);
214184
Enforcer* e = Enforcer::NewEnforcer(model, adapter);
215185

‎test/test_model.cpp‎

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -23,32 +23,10 @@ namespace test_model
2323
Config* basic_config;
2424

2525
TEST_METHOD_INITIALIZE(InitializeBasicConfig) {
26-
basic_example = filePath("../examples/basic_model.conf");
26+
basic_example = "../../examples/basic_model.conf";
2727
basic_config = Config::NewConfig(basic_example);
2828
}
2929

30-
string filePath(string filepath) {
31-
char* root = _getcwd(NULL, 0);
32-
string rootStr = string(root);
33-
34-
vector <string> directories = Split(rootStr, "\\", -1);
35-
vector<string>::iterator it = find(directories.begin(), directories.end(), "x64");
36-
vector <string> left{ *(it - 1) };
37-
it = find_end(directories.begin(), directories.end(), left.begin(), left.end());
38-
int index = int(directories.size() + (it - directories.end()));
39-
40-
vector <string> finalDirectories(directories.begin(), directories.begin() + index + 1);
41-
42-
vector<string> userD = Split(filepath, "/", -1);
43-
for (int i = 1; i < userD.size(); i++)
44-
finalDirectories.push_back(userD[i]);
45-
46-
string filepath1 = finalDirectories[0];
47-
for (int i = 1; i < finalDirectories.size(); i++)
48-
filepath1 = filepath1 + "/" + finalDirectories[i];
49-
return filepath1;
50-
}
51-
5230
TEST_METHOD(TestNewModel) {
5331
Model* model = Model::NewModel();
5432
Assert::IsNotNull(model);

0 commit comments

Comments
 (0)