Skip to content

Commit fe4385d

Browse files
committed
feat: clean up test project
Signed-off-by: Taoyuesong <tao634774653@gmail.com>
1 parent 909cf1b commit fe4385d

File tree

13 files changed

+1052
-1090
lines changed

13 files changed

+1052
-1090
lines changed
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
namespace Casbin.UnitTests.Mock;
2+
3+
public class TestResource
4+
{
5+
public TestResource(string name, string owner)
6+
{
7+
Name = name;
8+
Owner = owner;
9+
}
10+
11+
public string Name { get; }
12+
13+
public string Owner { get; }
14+
}

Casbin.UnitTests/Mock/TestSubject.cs

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
namespace Casbin.UnitTests.Mock;
2+
3+
public class TestSubject
4+
{
5+
public TestSubject(string name, int age)
6+
{
7+
Name = name;
8+
Age = age;
9+
}
10+
11+
public string Name { get; }
12+
13+
public int Age { get; }
14+
}

Casbin.UnitTests/ModelTests/CachedEnforcerTest.cs

Lines changed: 22 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,19 @@
22
using Casbin.UnitTests.Mock;
33
using Xunit;
44
using Xunit.Abstractions;
5-
using static Casbin.UnitTests.Util.TestUtil;
65

76
namespace Casbin.UnitTests.ModelTests;
87

98
[Collection("Model collection")]
109
public class CachedEnforcerTest
1110
{
12-
private readonly TestModelFixture TestModelFixture;
11+
private readonly TestModelFixture _testModelFixture;
1312
private readonly ITestOutputHelper _testOutputHelper;
1413

1514
public CachedEnforcerTest(ITestOutputHelper testOutputHelper, TestModelFixture testModelFixture)
1615
{
1716
_testOutputHelper = testOutputHelper;
18-
TestModelFixture = testModelFixture;
17+
_testModelFixture = testModelFixture;
1918
}
2019

2120
[Fact]
@@ -32,28 +31,28 @@ public void TestEnforceWithCache()
3231
e.EnableCache(true);
3332
e.EnableAutoCleanEnforceCache(false);
3433

35-
TestEnforce(e, "alice", "data1", "read", true);
36-
TestEnforce(e, "alice", "data1", "write", false);
37-
TestEnforce(e, "alice", "data2", "read", false);
38-
TestEnforce(e, "alice", "data2", "write", false);
34+
Assert.True(e.Enforce("alice", "data1", "read"));
35+
Assert.False(e.Enforce("alice", "data1", "write"));
36+
Assert.False(e.Enforce("alice", "data2", "read"));
37+
Assert.False(e.Enforce("alice", "data2", "write"));
3938

4039
// The cache is enabled, so even if we remove a policy rule, the decision
4140
// for ("alice", "data1", "read") will still be true, as it uses the cached result.
4241
_ = e.RemovePolicy("alice", "data1", "read");
4342

44-
TestEnforce(e, "alice", "data1", "read", true);
45-
TestEnforce(e, "alice", "data1", "write", false);
46-
TestEnforce(e, "alice", "data2", "read", false);
47-
TestEnforce(e, "alice", "data2", "write", false);
43+
Assert.True(e.Enforce("alice", "data1", "read"));
44+
Assert.False(e.Enforce("alice", "data1", "write"));
45+
Assert.False(e.Enforce("alice", "data2", "read"));
46+
Assert.False(e.Enforce("alice", "data2", "write"));
4847

4948
// Now we invalidate the cache, then all first-coming Enforce() has to be evaluated in real-time.
5049
// The decision for ("alice", "data1", "read") will be false now.
5150
e.EnforceCache.Clear();
5251

53-
TestEnforce(e, "alice", "data1", "read", false);
54-
TestEnforce(e, "alice", "data1", "write", false);
55-
TestEnforce(e, "alice", "data2", "read", false);
56-
TestEnforce(e, "alice", "data2", "write", false);
52+
Assert.False(e.Enforce("alice", "data1", "read"));
53+
Assert.False(e.Enforce("alice", "data1", "write"));
54+
Assert.False(e.Enforce("alice", "data2", "read"));
55+
Assert.False(e.Enforce("alice", "data2", "write"));
5756
}
5857

5958
[Fact]
@@ -69,18 +68,18 @@ public void TestAutoCleanCache()
6968
#endif
7069
e.EnableCache(true);
7170

72-
TestEnforce(e, "alice", "data1", "read", true);
73-
TestEnforce(e, "alice", "data1", "write", false);
74-
TestEnforce(e, "alice", "data2", "read", false);
75-
TestEnforce(e, "alice", "data2", "write", false);
71+
Assert.True(e.Enforce("alice", "data1", "read"));
72+
Assert.False(e.Enforce("alice", "data1", "write"));
73+
Assert.False(e.Enforce("alice", "data2", "read"));
74+
Assert.False(e.Enforce("alice", "data2", "write"));
7675

7776
// The cache is enabled, so even if we remove a policy rule, the decision
7877
// for ("alice", "data1", "read") will still be true, as it uses the cached result.
7978
_ = e.RemovePolicy("alice", "data1", "read");
8079

81-
TestEnforce(e, "alice", "data1", "read", false);
82-
TestEnforce(e, "alice", "data1", "write", false);
83-
TestEnforce(e, "alice", "data2", "read", false);
84-
TestEnforce(e, "alice", "data2", "write", false);
80+
Assert.False(e.Enforce("alice", "data1", "read"));
81+
Assert.False(e.Enforce("alice", "data1", "write"));
82+
Assert.False(e.Enforce("alice", "data2", "read"));
83+
Assert.False(e.Enforce("alice", "data2", "write"));
8584
}
8685
}

0 commit comments

Comments
 (0)