Add util tests.

Author: divy9881

casbin/model/scope_config.cpp

@@ -4,8 +4,8 @@
 
 #include "./scope_config.h"
 
-void* InitializeScope() {
-    return (void*)new int;
+Scope InitializeScope() {
+    return duk_create_heap_default();
 }
 
 void PushFunctionValue(Scope scope, Function f, int nargs){

casbin/model/scope_config.h

@@ -23,7 +23,7 @@ typedef duk_ret_t ReturnType;
 typedef duk_c_function Function;
 typedef duk_idx_t Index;
 
-void* InitializeScope();
+Scope InitializeScope();
 void PushFunctionValue(Scope scope, Function f, int nargs);
 void PushBooleanValue(Scope scope, bool expression);
 void PushTrueValue(Scope scope);

casbin/rbac_api.cpp

@@ -202,7 +202,7 @@ vector<string> Enforcer :: GetImplicitUsersForPermission(vector<string> permissi
 
     vector<string> res;
     for (int i = 0 ; i < users.size() ; i++) {
-        Scope scope = (Scope)InitializeScope();
+        Scope scope = InitializeScope();
         PushObject(scope);
         PushStringPropToObject(scope, "r", users[i], "sub");
         PushStringPropToObject(scope, "r", permission[0], "obj");

casbin/util/built_in_functions.cpp

@@ -21,7 +21,7 @@ ReturnType KeyMatch(Scope scope) {
     string key1 = GetString(scope, 0);
     string key2 = GetString(scope, 1);
 
-    size_t pos = key1.find("*");
+    size_t pos = key2.find("*");
 
     if (pos == string :: npos) {
         PushBooleanValue(scope, key1 == key2);

test/test.vcxproj

@@ -44,6 +44,7 @@
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
     </ClCompile>
     <ClCompile Include="test_model.cpp" />
+    <ClCompile Include="test_util.cpp" />
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />

test/test_util.cpp

@@ -0,0 +1,57 @@
+#pragma once
+
+#include "pch.h"
+
+#include <util.h>
+
+using namespace std;
+
+class TestUtil : public ::testing::Test {
+
+};
+
+void TestEscapeAssertion(string s, string res) {
+    string my_res = EscapeAssertion(s);
+    EXPECT_EQ(my_res, res);
+}
+
+TEST_F(TestUtil, TestEscapeAssertion) {
+    TestEscapeAssertion("r.attr.value == p.attr", "r_attr.value == p_attr");
+    TestEscapeAssertion("r.attp.value || p.attr", "r_attp.value || p_attr");
+    TestEscapeAssertion("r.attp.value &&p.attr", "r_attp.value &&p_attr");
+    TestEscapeAssertion("r.attp.value >p.attr", "r_attp.value >p_attr");
+    TestEscapeAssertion("r.attp.value <p.attr", "r_attp.value <p_attr");
+    TestEscapeAssertion("r.attp.value +p.attr", "r_attp.value +p_attr");
+    TestEscapeAssertion("r.attp.value -p.attr", "r_attp.value -p_attr");
+    TestEscapeAssertion("r.attp.value *p.attr", "r_attp.value *p_attr");
+    TestEscapeAssertion("r.attp.value /p.attr", "r_attp.value /p_attr");
+    TestEscapeAssertion("!r.attp.value /p.attr", "!r_attp.value /p_attr");
+    TestEscapeAssertion("g(r.sub, p.sub) == p.attr", "g(r_sub, p_sub) == p_attr");
+    TestEscapeAssertion("g(r.sub,p.sub) == p.attr", "g(r_sub,p_sub) == p_attr");
+    TestEscapeAssertion("(r.attp.value || p.attr)p.u", "(r_attp.value || p_attr)p_u");
+}
+
+void TestRemoveComments(string s, string res) {
+    string my_res = RemoveComments(s);
+    EXPECT_EQ(my_res, res);
+}
+
+TEST_F(TestUtil, TestRemoveComments) {
+    TestRemoveComments("r.act == p.act # comments", "r.act == p.act");
+    TestRemoveComments("r.act == p.act#comments", "r.act == p.act");
+    TestRemoveComments("r.act == p.act###", "r.act == p.act");
+    TestRemoveComments("### comments", "");
+    TestRemoveComments("r.act == p.act", "r.act == p.act");
+}
+
+void TestArrayEquals(vector<string> a, vector<string> b, bool res) {
+    bool my_res = ArrayEquals(a, b);
+    EXPECT_EQ(my_res, res);
+}
+
+TEST_F(TestUtil, TestArrayEquals) {
+    TestArrayEquals(vector<string> {"a", "b", "c"}, vector<string> {"a", "b", "c"}, true);
+    TestArrayEquals(vector<string> {"a", "b", "c"}, vector<string> {"a", "b"}, false);
+    TestArrayEquals(vector<string> {"a", "b", "c"}, vector<string> {"a", "c", "b"}, false);
+    TestArrayEquals(vector<string> {"a", "b", "c"}, vector<string> {}, false);
+}