diff --git a/src/test/java/org/casbin/jcasbin/main/AbacAPIUnitTest.java b/src/test/java/org/casbin/jcasbin/main/AbacAPIUnitTest.java index 3ddc7bfa..7a252eb0 100644 --- a/src/test/java/org/casbin/jcasbin/main/AbacAPIUnitTest.java +++ b/src/test/java/org/casbin/jcasbin/main/AbacAPIUnitTest.java @@ -14,7 +14,6 @@ package org.casbin.jcasbin.main; -import org.casbin.jcasbin.util.Util; import org.junit.Test; import java.util.ArrayList; @@ -24,7 +23,6 @@ import static org.casbin.jcasbin.main.TestUtil.testDomainEnforce; import static org.casbin.jcasbin.main.TestUtil.testEnforce; -import static org.junit.Assert.*; public class AbacAPIUnitTest { @Test @@ -46,6 +44,15 @@ public void testEval() { alice.setAge(60); testEnforce(e, alice, "/data2", "read", false); testEnforce(e, alice, "/data2", "write", false); + + List rule = new ArrayList<>(); + rule.add("\"r.sub.name == 'alice,green'\""); + rule.add("data1"); + rule.add("read"); + e.addPolicy(rule); + + TestEvalRule aliceGreen = new TestEvalRule("alice,green", 18); + testEnforce(e, aliceGreen, "data1", "read", true); } @Test @@ -61,34 +68,6 @@ public void testEvalWithDomain() { testDomainEnforce(e, "bob", "domain2", "data2", "read", true); } - @Test - public void testEvalWithComma() { - Enforcer e = new Enforcer("examples/abac_rule_model.conf"); - List rule = new ArrayList<>(); - rule.add("\"let test=seq.set('alice','bob');include(test,r.sub.name)\""); - rule.add("data1"); - rule.add("read"); - List newRule = new ArrayList<>(); - newRule.add("\"let test=seq.set('bob');include(test,r.sub.name)\""); - newRule.add("data1"); - newRule.add("read"); - assertTrue(e.addPolicy(rule)); - assertFalse(e.addPolicy(rule)); - - Map sub = new HashMap<>(); - sub.put("name", "alice"); - - testEnforce(e, sub, "data1", "read", true); - - assertTrue(e.updatePolicy("p", "p", rule, newRule)); - testEnforce(e, sub, "data1", "read", false); - sub.put("name", "bob"); - testEnforce(e, sub, "data1", "read", true); - - assertTrue(e.removePolicy(newRule)); - testEnforce(e, sub, "data1", "read", false); - } - @Test public void testABACMapRequest() { Enforcer e = new Enforcer("examples/abac_rule_map_model.conf");