Skip to content

Commit 552cbfc

Browse files
JackyYangPassionJackyYangPassion
committed
fix comma line and align with left parenthesis
1 parent d48d893 commit 552cbfc

File tree

2 files changed

+41
-28
lines changed

2 files changed

+41
-28
lines changed

‎hugegraph-test/src/main/java/com/baidu/hugegraph/unit/cassandra/CassandraTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public class CassandraTest {
4141
@Before
4242
public void setup() {
4343
OptionSpace.register("cassandra",
44-
"com.baidu.hugegraph.backend.store.cassandra.CassandraOptions");
44+
"com.baidu.hugegraph.backend.store.cassandra.CassandraOptions");
4545
}
4646

4747
@After

‎hugegraph-test/src/main/java/com/baidu/hugegraph/unit/core/RolePermissionTest.java‎

Lines changed: 40 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,10 @@ public void testBuiltinAdmin() {
6262

6363
RolePermission hg = RolePermission.all("hg1");
6464
RolePermission role3 = RolePermission.fromJson("{\"roles\":" +
65-
"{\"hg1\":{\"ANY\":" +
66-
"[{\"type\":\"ALL\",\"label\":\"write\",\"properties\":null}" +
67-
"]}" +
68-
"}");
65+
"{\"hg1\":{\"ANY\":" +
66+
"[{\"type\":\"ALL\",\"label\":" +
67+
"\"write\",\"properties\":null}" +
68+
"]}}");
6969
Assert.assertSame(hg, RolePermission.builtin(hg));
7070
Assert.assertSame(hg, RolePermission.fromJson(hg));
7171
Assert.assertTrue(roleContains(hg, role3));
@@ -86,11 +86,11 @@ public void testBuiltinNone() {
8686
Assert.assertSame(none, RolePermission.builtin(role1));
8787

8888
Assert.assertEquals("{\"roles\":{\"none\":{\"NONE\":[" +
89-
"{\"type\":\"ALL\",\"label\":\"*\",\"properties\":null}]}}}"
90-
, none.toJson());
89+
"{\"type\":\"ALL\",\"label\":\"*\",\"properties\":null}]}}}",
90+
none.toJson());
9191
RolePermission role = RolePermission.fromJson("{\"roles\":{\"none\":{\"NONE\":[" +
92-
"{\"type\":\"ALL\",\"label\":\"write\"" +
93-
",\"properties\":null}]}}");
92+
"{\"type\":\"ALL\",\"label\":\"write\"," +
93+
"\"properties\":null}]}}");
9494
Assert.assertTrue(roleContains(none, role));
9595
}
9696

@@ -121,62 +121,75 @@ public void testContains() {
121121
Assert.assertTrue(roleContains(role, r1));
122122

123123
RolePermission r2 = RolePermission.fromJson("{\"roles\":{\"hugegraph\":{\"READ\":[" +
124-
"{\"type\":\"EDGE\",\"label\":\"write\",\"properties\":null}]}}");
124+
"{\"type\":\"EDGE\",\"label\":\"write\"," +
125+
"\"properties\":null}]}}");
125126
Assert.assertTrue(roleContains(role, r2));
126127

127128
RolePermission r3 = RolePermission.fromJson("{\"roles\":{\"hugegraph\":{\"READ\":[" +
128-
"{\"type\":\"EDGE\",\"label\":\"write\"," +
129-
"\"properties\":{\"date\":\"2018-8-8\"}}]}}");
129+
"{\"type\":\"EDGE\",\"label\":\"write\"," +
130+
"\"properties\":{\"date\":\"2018-8-8\"}}]}}");
130131
Assert.assertTrue(roleContains(role, r3));
131132

132133
RolePermission r4 = RolePermission.fromJson("{\"roles\":{\"hugegraph\":{\"WRITE\":[" +
133-
"{\"type\":\"VERTEX\",\"label\":\"person\",\"properties\":" +
134-
"{\"city\":\"Beijing\",\"age\":\"P.gte(20)\"}}]}}");
134+
"{\"type\":\"VERTEX\",\"label\":\"person\"," +
135+
"\"properties\":{\"city\":\"Beijing\"," +
136+
"\"age\":\"P.gte(20)\"}}]}}");
135137
Assert.assertTrue(roleContains(role, r4));
136138

137139
RolePermission r5 = RolePermission.fromJson("{\"roles\":{\"hugegraph\":{\"WRITE\":[" +
138-
"{\"type\":\"VERTEX\",\"label\":\"person\",\"properties\":" +
139-
"{\"city\":\"Beijing\",\"age\":\"P.gte(21)\"}}]}}");
140+
"{\"type\":\"VERTEX\",\"label\":\"person\"," +
141+
"\"properties\":{\"city\":\"Beijing\"," +
142+
"\"age\":\"P.gte(21)\"}}]}}");
140143
Assert.assertFalse(roleContains(role, r5));
141144

142145
RolePermission r6 = RolePermission.fromJson("{\"roles\":{\"hugegraph\":{\"WRITE\":[" +
143-
"{\"type\":\"VERTEX\",\"label\":\"person\",\"properties\":null}]}}");
146+
"{\"type\":\"VERTEX\",\"label\":\"person\"," +
147+
"\"properties\":null}]}}");
144148
Assert.assertFalse(roleContains(role, r6));
145149

146150
RolePermission r7 = RolePermission.fromJson("{\"roles\":{\"hugegraph\":{\"WRITE\":[" +
147-
"{\"type\":\"VERTEX\",\"label\":\"person2\",\"properties\":" +
148-
"{\"city\":\"Beijing\",\"age\":\"P.gte(20)\"}}]}}");
151+
"{\"type\":\"VERTEX\",\"label\":\"person2\"," +
152+
"\"properties\":{\"city\":\"Beijing\"," +
153+
"\"age\":\"P.gte(20)\"}}]}}");
149154
Assert.assertFalse(roleContains(role, r7));
150155

151156
RolePermission r8 = RolePermission.fromJson("{\"roles\":{\"hugegraph\":{\"WRITE\":[" +
152-
"{\"type\":\"EDGE\",\"label\":\"person\",\"properties\":" +
153-
"{\"city\":\"Beijing\",\"age\":\"P.gte(20)\"}}]}}");
157+
"{\"type\":\"EDGE\",\"label\":\"person\"," +
158+
"\"properties\":{\"city\":\"Beijing\"," +
159+
"\"age\":\"P.gte(20)\"}}]}}");
154160
Assert.assertFalse(roleContains(role, r8));
155161

156162
role = RolePermission.fromJson("{\"roles\":{\"hugegraph\":{\"READ\":[" +
157-
"{\"type\":\"ALL\",\"label\":\"write\",\"properties\":null}]}}");
163+
"{\"type\":\"ALL\",\"label\":\"write\"," +
164+
"\"properties\":null}]}}");
158165
RolePermission r9 = RolePermission.fromJson("{\"roles\":{\"hugegraph\":{\"READ\":[" +
159-
"{\"type\":\"ALL\",\"label\":\"write\",\"properties\":null}]}}");
166+
"{\"type\":\"ALL\",\"label\":\"write\"," +
167+
"\"properties\":null}]}}");
160168
Assert.assertTrue(roleContains(role, r9));
161169

162170
RolePermission r10 = RolePermission.fromJson("{\"roles\":{\"hugegraph\":{\"READ\":[" +
163-
"{\"type\":\"EDGE\",\"label\":\"write\",\"properties\":null}]}}");
171+
"{\"type\":\"EDGE\",\"label\":\"write\"," +
172+
"\"properties\":null}]}}");
164173
Assert.assertTrue(roleContains(role, r10));
165174

166175
RolePermission r11 = RolePermission.fromJson("{\"roles\":{\"hugegraph\":{\"READ\":[" +
167-
"{\"type\":\"VERTEX\",\"label\":\"write\",\"properties\":null}]}}");
176+
"{\"type\":\"VERTEX\",\"label\":\"write\"," +
177+
"\"properties\":null}]}}");
168178
Assert.assertTrue(roleContains(role, r11));
169179

170180
RolePermission r12 = RolePermission.fromJson("{\"roles\":{\"hugegraph\":{\"READ\":[" +
171-
"{\"type\":\"VERTEX\",\"label\":\"person\",\"properties\":null}]}}");
181+
"{\"type\":\"VERTEX\",\"label\":\"person\"," +
182+
"\"properties\":null}]}}");
172183
Assert.assertFalse(roleContains(role, r12));
173184

174185
RolePermission r13 = RolePermission.fromJson("{\"roles\":{\"hugegraph\":{\"WRITE\":[" +
175-
"{\"type\":\"VERTEX\",\"label\":\"write\",\"properties\":null}]}}");
186+
"{\"type\":\"VERTEX\",\"label\":\"write\"," +
187+
"\"properties\":null}]}}");
176188
Assert.assertFalse(roleContains(role, r13));
177189

178190
RolePermission r14 = RolePermission.fromJson("{\"roles\":{\"hugegraph2\":{\"READ\":[" +
179-
"{\"type\":\"VERTEX\",\"label\":\"write\",\"properties\":null}]}}");
191+
"{\"type\":\"VERTEX\",\"label\":\"write\"," +
192+
"\"properties\":null}]}}");
180193
Assert.assertFalse(roleContains(role, r14));
181194
}
182195

0 commit comments

Comments
 (0)