test: Added tests for config bindings

Signed-off-by: Yash Pandey (YP) <[email protected]>

Author: EmperorYP7

bindings/python/py_model.cpp

@@ -29,6 +29,8 @@ void bindPyModel(py::module &m) {
         .def(py::init<>())
         .def(py::init<const std::string &>())
 
+        .def_readonly_static("required_sections", &casbin::Model::required_sections)
+
         .def("HasSection", &casbin::Model::HasSection)
         .def("AddDef", &casbin::Model::AddDef, "AddDef adds an assertion to the model.")
         .def("LoadModel", &casbin::Model::LoadModel, "LoadModel loads the model from model CONF file.")

casbin/config/config.cpp

@@ -114,6 +114,9 @@ std::shared_ptr<Config> Config::NewConfigFromText(const std::string& text) {
     return c;
 }
 
+Config::Config() {
+}
+
 Config::Config(const std::string& conf_name) {
     this->Parse(conf_name);
 }

casbin/model/model.cpp

@@ -39,7 +39,7 @@ std::unordered_map<std::string, std::string> Model::section_name_map = {
 
 std::vector<std::string> Model::required_sections{"r","p","e","m"};
 
-void Model::LoadModelFromConfig(std::shared_ptr<ConfigInterface> cfg) {
+void Model::LoadModelFromConfig(std::shared_ptr<Config>& cfg) {
     for (auto [section_name, _] : section_name_map)
         LoadSection(this ,cfg, section_name);
 

casbin/model/model.h

@@ -24,6 +24,7 @@
 #include "assertion.h"
 #include "function.h"
 #include "scope_config.h"
+#include "../config/config.h"
 
 namespace casbin {
 
@@ -68,7 +69,7 @@ class Model {
         // LoadModelFromText loads the model from the text.
         void LoadModelFromText(const std::string& text);
 
-        void LoadModelFromConfig(std::shared_ptr<ConfigInterface> cfg);
+        void LoadModelFromConfig(std::shared_ptr<Config>& cfg);
 
         // PrintModel prints the model to the log.
         void PrintModel();

tests/model_test.cpp

@@ -50,7 +50,7 @@ TEST(TestModel, TestNewModelFromString) {
 
 TEST(TestModel, TestLoadModelFromConfig) {
     InitTest();
-     std::shared_ptr<casbin::Model> model = casbin::Model::NewModel();
+    std::shared_ptr<casbin::Model> model = casbin::Model::NewModel();
     model->LoadModelFromConfig(basic_config);
 
     model = casbin::Model::NewModel();

tests/python/config_path.py

@@ -28,3 +28,4 @@
 priority_model_path = relative_path + 'examples/priority_model.conf'
 priority_policy_path = relative_path + 'examples/priority_policy.csv'
 basic_model_without_spaces_path = relative_path + 'examples/basic_model_without_spaces.conf'
+testini_path = relative_path + 'casbin/config/testdata/testini.ini'

tests/python/pycasbin_test_suite.py

@@ -18,6 +18,7 @@
 import pycasbin
 import test_enforcer
 import test_model
+import test_config
 
 def suite():
 
@@ -27,6 +28,7 @@ def suite():
 
     suite.addTest(loader.loadTestsFromModule(test_enforcer))
     suite.addTest(loader.loadTestsFromModule(test_model))
+    suite.addTest(loader.loadTestsFromModule(test_config))
 
     return suite
 

tests/python/test_config.py

@@ -0,0 +1,39 @@
+#  Copyright 2021 The casbin Authors. All Rights Reserved.
+#
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+
+import pycasbin as casbin
+from config_path import *
+import unittest
+
+class TestConfig(unittest.TestCase):
+
+    def setUp(self):
+        self.config = None
+
+    def tearDown(self):
+        self.config = None
+
+    def test_Debug(self):
+        self.config = casbin.Config.NewConfig(testini_path)
+        self.assertTrue(self.config.GetBool('debug'))
+
+    def test_URL(self):
+        self.config = casbin.Config.NewConfig(testini_path)
+        self.assertEqual(self.config.GetString('url'), 'act.wiki')
+
+    def test_Redis(self):
+        self.config = casbin.Config.NewConfig(testini_path)
+        values = self.config.GetStrings('redis::redis.key')
+        self.assertEqual('push1', values[0])
+        self.assertEqual('push2', values[1])

tests/python/test_model.py

@@ -18,18 +18,30 @@
 
 class TestModel(unittest.TestCase):
 
-    # def setUp(self):
-        # self.basic_config = casbin.Config.NewConfig(basic_model_path)
+    def setUp(self):
+        self.model = None
+        self.config = None
+
+    def cleanUp(self):
+        self.model = None
+        self.config = None
+
+    def tearDown(self):
+        self.model = None
+        self.config = None
 
     def test_NewModel(self):
-        model = casbin.Model.NewModel()
-        self.assertIsNotNone(model)
+        self.cleanUp()
+        self.model = casbin.Model.NewModel()
+        self.assertIsNotNone(self.model)
 
     def test_NewModelFromFile(self):
-        model = casbin.Model.NewModelFromFile(basic_model_path)
-        self.assertIsNotNone(model)
+        self.cleanUp()
+        self.model = casbin.Model.NewModelFromFile(basic_model_path)
+        self.assertIsNotNone(self.model)
 
     def test_NewModelFromString(self):
+        self.cleanUp()
         model_string = """[request_definition]
 r = sub, obj, act
 
@@ -41,19 +53,40 @@ def test_NewModelFromString(self):
 
 [matchers]
 m = r.sub == p.sub && r.obj == p.obj && r.act == p.act"""
-        model = casbin.Model.NewModelFromString(model_string)
-        self.assertIsNotNone(model)
+        self.model = casbin.Model.NewModelFromString(model_string)
+        self.assertIsNotNone(self.model)
 
     def test_LoadModelFromConfig(self):
-        basic_config = casbin.Config.NewConfig(basic_model_path)
-        model = casbin.Model.NewModel()
-        model.LoadModelFromConfig(basic_config)
-        # model = casbin.Model.NewModel()
-        # config = casbin.Config.NewConfigFromText("")
-        # model.LoadModelFromConfig(config)
+        self.cleanUp()
+        self.config = casbin.Config.NewConfig(basic_model_path)
+        self.model = casbin.Model.NewModel()
+        self.model.LoadModelFromConfig(self.config)
+        self.model = casbin.Model.NewModel()
+        self.config = casbin.Config.NewConfigFromText('')
+        # self.assertRaises('', model.LoadModelFromConfig(basic_config))
 
     def test_HasSection(self):
-        # config = casbin.Config.NewConfig(basic_model_path)
-        # model = casbin.Model.NewModel()
-        # casbin.LoadModelFromConfig(model, basic_config)
+        self.cleanUp()
+        self.config = casbin.Config.NewConfig(basic_model_path)
+        self.model = casbin.Model.NewModel()
+        self.model.LoadModelFromConfig(self.config)
+        for required_section in casbin.Model.required_sections:
+            self.assertTrue(self.model.HasSection(required_section))
+
+        self.cleanUp()
+        self.model = casbin.Model.NewModel()
+        self.config = casbin.Config.NewConfigFromText('')
+        # self.assertRaises('', model.LoadModelFromConfig(config))
+
+        for required_section in casbin.Model.required_sections:
+            self.assertFalse(self.model.HasSection(required_section))
+
+    def test_ModelAddDef(self):
+        self.cleanUp()
+        self.model = casbin.Model.NewModel()
+        s = 'r'
+        v = 'sub, obj, act'
+
+        self.assertTrue(self.model.AddDef(s, s, v))
 
+        self.assertFalse(self.model.AddDef(s, s, ''))