feat: Added tests

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

Author: EmperorYP7

bindings/python/CMakeLists.txt

@@ -18,7 +18,7 @@ set(SOURCES
     py_enforcer.cpp
     py_abac_data.cpp
     py_model.cpp
-)
+        py_config.cpp)
 
 set(HEADERS
     py_casbin.h

bindings/python/main.cpp

@@ -38,6 +38,7 @@ PYBIND11_MODULE(pycasbin, m) {
     bindPyCachedEnforcer(m);
     bindABACData(m);
     bindPyModel(m);
+    bindPyConfig(m);
 
     m.attr("__version__") = PY_CASBIN_VERSION;
 }

bindings/python/py_casbin.h

@@ -22,3 +22,4 @@ void bindPyEnforcer(py::module &m);
 void bindPyCachedEnforcer(py::module &m);
 void bindABACData(py::module &m);
 void bindPyModel(py::module &m);
+void bindPyConfig(py::module &m);

bindings/python/py_config.cpp

@@ -0,0 +1,50 @@
+/*
+* 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.
+*/
+
+#include <pybind11/pybind11.h>
+#include <pybind11/stl.h>
+#include <casbin/casbin.h>
+
+namespace py = pybind11;
+
+void bindPyConfig(py::module &m) {
+    py::class_<casbin::Config>(m, "Config")
+        .def(py::init<>())
+        .def(py::init<const std::string&>())
+        .def_static("NewConfig", &casbin::Config::NewConfig, R"doc(
+           /**
+            * NewConfig create an empty configuration representation from file.
+            *
+            * @param confName the path of the model file.
+            * @return the constructor of Config.
+            */
+        )doc")
+        .def_static("NewConfigFromText", &casbin::Config::NewConfigFromText, R"doc(
+           /**
+            * newConfigFromText create an empty configuration representation from text.
+            *
+            * @param text the model text.
+            * @return the constructor of Config.
+            */
+        )doc")
+        .def("GetBool", &casbin::Config::GetBool)
+        .def("GetInt", &casbin::Config::GetInt)
+        .def("GetFloat", &casbin::Config::GetFloat)
+        .def("GetString", &casbin::Config::GetString)
+        .def("GetStrings", &casbin::Config::GetStrings)
+        .def("Set", &casbin::Config::Set)
+        .def("Get", &casbin::Config::Get);
+}

bindings/python/py_model.cpp

@@ -20,6 +20,10 @@
 
 #include "py_casbin.h"
 
+void PyLoadModelFromConfig(casbin::Model* model, std::shared_ptr<casbin::Config> config) {
+    model->LoadModelFromConfig(config);
+}
+
 void bindPyModel(py::module &m) {
     py::class_<casbin::Model, std::shared_ptr<casbin::Model>>(m, "Model")
         .def(py::init<>())
@@ -52,4 +56,6 @@ void bindPyModel(py::module &m) {
         .def_static("NewModel", &casbin::Model::NewModel, "NewModel creates an empty model.")
         .def_static("NewModelFromFile", &casbin::Model::NewModelFromFile, "NewModelFromFile creates a model from a .CONF file.")
         .def_static("NewModelFromString", &casbin::Model::NewModelFromString, "NewModel creates a model from a std::string which contains model text.");
+
+    m.def("LoadModelFromConfig", &PyLoadModelFromConfig);
 }

casbin/config/config.cpp

@@ -114,6 +114,10 @@ std::shared_ptr<Config> Config::NewConfigFromText(const std::string& text) {
     return c;
 }
 
+Config::Config(const std::string& conf_name) {
+    this->Parse(conf_name);
+}
+
 bool Config::GetBool(std::string_view key) {
     return Get(key).compare("true")==0;
 }

casbin/config/config.h

@@ -64,6 +64,8 @@ class Config : public ConfigInterface {
 
         bool GetBool(std::string_view key);
 
+        Config(const std::string& conf_name);
+
         int GetInt(std::string_view key);
 
         float GetFloat(std::string_view key);

tests/python/test_model.py

@@ -17,6 +17,10 @@
 import unittest
 
 class TestModel(unittest.TestCase):
+
+    # def setUp(self):
+        # self.basic_config = casbin.Config.NewConfig(basic_model_path)
+
     def test_NewModel(self):
         model = casbin.Model.NewModel()
         self.assertIsNotNone(model)
@@ -25,8 +29,31 @@ def test_NewModelFromFile(self):
         model = casbin.Model.NewModelFromFile(basic_model_path)
         self.assertIsNotNone(model)
 
-    # def test_NewModelFromString(self):
-    #     with open(basic_model_path, 'r') as model_file:
-    #         model_string = model_file.read().replace('\n', '')
-    #     model = casbin.Model.NewModelFromString(model_string)
-    #     self.assertIsNotNone(model)
+    def test_NewModelFromString(self):
+        model_string = """[request_definition]
+r = sub, obj, act
+
+[policy_definition]
+p = sub, obj, act
+
+[policy_effect]
+e = some(where (p.eft == allow))
+
+[matchers]
+m = r.sub == p.sub && r.obj == p.obj && r.act == p.act"""
+        model = casbin.Model.NewModelFromString(model_string)
+        self.assertIsNotNone(model)
+
+    def test_LoadModelFromConfig(self):
+        # config = casbin.Config(basic_model_path)
+        # model = casbin.Model.NewModel()
+        # casbin.LoadModelFromConfig(model, basic_config)
+        # model = casbin.Model.NewModel()
+        # config = casbin.Config.NewConfigFromText("")
+        # model.LoadModelFromConfig(config)
+
+    def test_HasSection(self):
+        # config = casbin.Config.NewConfig(basic_model_path)
+        # model = casbin.Model.NewModel()
+        # casbin.LoadModelFromConfig(model, basic_config)
+