Move rbacModelWithDomains to tier4 and rbacModelWithDeny to tier5

Author: AKonnyaku

.github/workflows/java-benchmark-pr.yml

@@ -24,17 +24,17 @@ jobs:
             exclude: ""
             heap: "2G"
           - name: tier3_milli
-            pattern: ".*(rbacModelSmall|rbacModelMedium|roleManagerMedium|abacModel|rbacModelSizes|rbacModelWithDomains).*"
+            pattern: ".*(rbacModelSmall|rbacModelMedium|roleManagerMedium|abacModel|rbacModelSizes).*"
             duration: "300ms"
             exclude: ".*Parallel.*"
             heap: "2G"
           - name: tier4_write
-            pattern: ".*(ManagementApiBenchmark|priorityModel|rbacModelWithDeny).*"
+            pattern: ".*(ManagementApiBenchmark|priorityModel|rbacModelWithDomains).*"
             duration: "400ms"
             exclude: ".*removePolicy.*"
             heap: "2G"
           - name: tier5_parallel
-            pattern: ".*(concurrentHasLinkWithMatching|removePolicy).*"
+            pattern: ".*(concurrentHasLinkWithMatching|removePolicy|rbacModelWithDeny).*"
             duration: "600ms"
             exclude: ""
             heap: "4G"

ci_debug_helper.sh

@@ -234,5 +234,6 @@
             <artifactId>jackson-databind</artifactId>
             <version>2.18.1</version>
         </dependency>
+
     </dependencies>
 </project>

maven-settings.xml

@@ -32,10 +32,10 @@ public class FrontendUnitTest {
   public void testCasbinJsGetPermissionForUser() throws IOException {
     SyncedEnforcer e = new SyncedEnforcer("examples/rbac_model.conf", "examples/rbac_with_hierarchy_policy.csv");
     HashMap<String, Object> received = new Gson().fromJson(Frontend.casbinJsGetPermissionForUser(e, "alice"), HashMap.class);
-    String expectedModelStr = new String(Files.readAllBytes(Paths.get("examples/rbac_model.conf")));
-    assertEquals(received.get("m"), expectedModelStr);
+    String expectedModelStr = new String(Files.readAllBytes(Paths.get("examples/rbac_model.conf"))).replace("\r\n", "\n");
+    assertEquals(received.get("m").toString().replace("\r\n", "\n"), expectedModelStr);
 
-    String expectedPolicyStr = new String(Files.readAllBytes(Paths.get("examples/rbac_with_hierarchy_policy.csv")));
+    String expectedPolicyStr = new String(Files.readAllBytes(Paths.get("examples/rbac_with_hierarchy_policy.csv"))).replace("\r\n", "\n");
     expectedPolicyStr = Pattern.compile("\n+").matcher(expectedPolicyStr).replaceAll("\n");
     String[] expectedPolicyItem = expectedPolicyStr.split(",|\n");
     int i = 0;