Skip to content

Commit 53c54c2

Browse files
rjrudinrjrudin
committed
Renamed test roles to make it clear they're for the Java Client
Avoids me thinking that e.g. "rest-evaluator" is an actual MarkLogic OOTB role. Tossed "java-test-" on as a prefix for several existing test-only roles.
1 parent 5df0ce8 commit 53c54c2

File tree

12 files changed

+56
-56
lines changed

12 files changed

+56
-56
lines changed

‎marklogic-client-api/src/test/java/com/marklogic/client/test/SemanticsPermissionsTest.java‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ public static void beforeClass() {
3636
Common.connect();
3737
gmgr = Common.client.newGraphManager();
3838
String triple = "<s> <p> <o>.";
39-
GraphPermissions perms = gmgr.permission("read-privileged", Capability.READ)
40-
.permission("write-privileged", Capability.UPDATE);
39+
GraphPermissions perms = gmgr.permission("java-test-read-privileged", Capability.READ)
40+
.permission("java-test-write-privileged", Capability.UPDATE);
4141
gmgr.write(graphUri, new StringHandle(triple).withMimetype(RDFMimeTypes.NTRIPLES), perms);
4242
}
4343

@@ -62,7 +62,7 @@ public void A_testReadPemission() throws Exception {
6262
}
6363

6464
@Test
65-
public void B_testWritePermission() throws Exception {
65+
public void B_testWritePermission() {
6666
// a negative test to ensure a user without update privilege can't write
6767
try {
6868
GraphManager readPrivilegedGmgr = readPrivilegedClient.newGraphManager();
@@ -74,41 +74,41 @@ public void B_testWritePermission() throws Exception {
7474
}
7575

7676
@Test
77-
public void C_testGetPermissions() throws Exception {
77+
public void C_testGetPermissions() {
7878
GraphManager readPrivilegedGmgr = readPrivilegedClient.newGraphManager();
7979
GraphPermissions permissions = readPrivilegedGmgr.getPermissions(graphUri);
8080
assertEquals(6, permissions.size());
81-
assertNotNull(permissions.get("read-privileged"));
82-
assertNotNull(permissions.get("write-privileged"));
83-
assertEquals(1, permissions.get("read-privileged").size());
84-
assertEquals(1, permissions.get("write-privileged").size());
85-
assertEquals(Capability.READ, permissions.get("read-privileged").iterator().next());
86-
assertEquals(Capability.UPDATE, permissions.get("write-privileged").iterator().next());
81+
assertNotNull(permissions.get("java-test-read-privileged"));
82+
assertNotNull(permissions.get("java-test-write-privileged"));
83+
assertEquals(1, permissions.get("java-test-read-privileged").size());
84+
assertEquals(1, permissions.get("java-test-write-privileged").size());
85+
assertEquals(Capability.READ, permissions.get("java-test-read-privileged").iterator().next());
86+
assertEquals(Capability.UPDATE, permissions.get("java-test-write-privileged").iterator().next());
8787
}
8888

8989
@Test
90-
public void D_testWritePermissions() throws Exception {
90+
public void D_testWritePermissions() {
9191
GraphPermissions perms = gmgr.newGraphPermissions();
92-
perms = perms.permission("read-privileged", Capability.EXECUTE);
92+
perms = perms.permission("java-test-read-privileged", Capability.EXECUTE);
9393
gmgr.writePermissions(graphUri, perms);
9494
GraphPermissions permissions = gmgr.getPermissions(graphUri);
9595
assertEquals(5, permissions.size());
96-
assertNotNull(permissions.get("read-privileged"));
97-
assertEquals(1, permissions.get("read-privileged").size());
98-
for ( Capability capability : permissions.get("read-privileged") ) {
96+
assertNotNull(permissions.get("java-test-read-privileged"));
97+
assertEquals(1, permissions.get("java-test-read-privileged").size());
98+
for ( Capability capability : permissions.get("java-test-read-privileged") ) {
9999
assertEquals(Capability.EXECUTE, capability);
100100
}
101101
}
102102

103103
@Test
104-
public void E_testMergePermissions() throws Exception {
105-
GraphPermissions perms = gmgr.permission("read-privileged", Capability.READ);
104+
public void E_testMergePermissions() {
105+
GraphPermissions perms = gmgr.permission("java-test-read-privileged", Capability.READ);
106106
gmgr.mergePermissions(graphUri, perms);
107107
GraphPermissions permissions = gmgr.getPermissions(graphUri);
108108
assertEquals(5, permissions.size());
109-
assertNotNull(permissions.get("read-privileged"));
110-
assertEquals(2, permissions.get("read-privileged").size());
111-
for ( Capability capability : permissions.get("read-privileged") ) {
109+
assertNotNull(permissions.get("java-test-read-privileged"));
110+
assertEquals(2, permissions.get("java-test-read-privileged").size());
111+
for ( Capability capability : permissions.get("java-test-read-privileged") ) {
112112
if ( capability == null ) fail("capability should not be null");
113113
if ( capability != Capability.READ && capability != Capability.EXECUTE ) {
114114
fail("capabilities should be read or execute, not [" + capability + "]");
@@ -117,27 +117,27 @@ public void E_testMergePermissions() throws Exception {
117117
}
118118

119119
@Test
120-
public void F_testDeletePermissions() throws Exception {
120+
public void F_testDeletePermissions() {
121121
gmgr.deletePermissions(graphUri);
122122
GraphPermissions permissions = gmgr.getPermissions(graphUri);
123123
assertEquals(4, permissions.size());
124-
assertNull(permissions.get("read-privileged"));
124+
assertNull(permissions.get("java-test-read-privileged"));
125125
}
126126

127127
@Test
128-
public void G_testSPARQLInsertPermissions() throws Exception {
128+
public void G_testSPARQLInsertPermissions() {
129129
String localGraphUri = graphUri + ".SPARQLPermissions";
130130
String sparql = "INSERT DATA { GRAPH <" + localGraphUri + "> { <s2> <p2> <o2> } }";
131131
SPARQLQueryManager sparqlMgr = Common.client.newSPARQLQueryManager();
132132
SPARQLQueryDefinition qdef = sparqlMgr.newQueryDefinition(sparql)
133-
.withUpdatePermission("write-privileged", Capability.READ)
134-
.withUpdatePermission("write-privileged", Capability.UPDATE);
133+
.withUpdatePermission("java-test-write-privileged", Capability.READ)
134+
.withUpdatePermission("java-test-write-privileged", Capability.UPDATE);
135135
sparqlMgr.executeUpdate(qdef);
136136
GraphPermissions getPermissions = gmgr.getPermissions(localGraphUri);
137137
assertEquals(5, getPermissions.size());
138-
assertNotNull(getPermissions.get("write-privileged"));
139-
assertEquals(2, getPermissions.get("write-privileged").size());
140-
for ( Capability capability : getPermissions.get("write-privileged") ) {
138+
assertNotNull(getPermissions.get("java-test-write-privileged"));
139+
assertEquals(2, getPermissions.get("java-test-write-privileged").size());
140+
for ( Capability capability : getPermissions.get("java-test-write-privileged") ) {
141141
if ( capability == null ) fail("capability should not be null");
142142
if ( capability != Capability.READ && capability != Capability.UPDATE ) {
143143
fail("capabilities should be read or update, not [" + capability + "]");

‎test-app/src/main/ml-config/security/roles/rest-delete-graph.json‎ renamed to ‎test-app/src/main/ml-config/security/roles/java-test-delete-graph.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"role-name": "rest-delete-graph",
2+
"role-name": "java-test-delete-graph",
33
"description": "Addresses a bug found in ML 10.0-8.3 and ML 10.0-9.2 where term-query is needed to delete a graph",
44
"privilege": [
55
{
@@ -8,4 +8,4 @@
88
"kind": "execute"
99
}
1010
]
11-
}
11+
}

‎test-app/src/main/ml-config/security/roles/rest-delete-temporal.json‎ renamed to ‎test-app/src/main/ml-config/security/roles/java-test-delete-temporal.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"role-name": "rest-delete-temporal",
2+
"role-name": "java-test-delete-temporal",
33
"description": "Allows for temporal documents to be deleted as part of test cleanup",
44
"privilege": [
55
{
@@ -13,4 +13,4 @@
1313
"kind": "execute"
1414
}
1515
]
16-
}
16+
}

‎test-app/src/main/ml-config/security/roles/rest-evaluator.json‎ renamed to ‎test-app/src/main/ml-config/security/roles/java-test-evaluator.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"role-name": "rest-evaluator",
3-
"description": "rest-evaluator",
2+
"role-name": "java-test-evaluator",
3+
"description": "Test role for the java-client-api project that can use the /v1/eval endpoint",
44
"role": [
55
"rest-writer"
66
],
@@ -36,4 +36,4 @@
3636
"kind": "execute"
3737
}
3838
]
39-
}
39+
}

‎test-app/src/main/ml-config/security/roles/read-privileged.json‎ renamed to ‎test-app/src/main/ml-config/security/roles/java-test-read-privileged.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
2-
"role-name": "read-privileged",
3-
"description": "read-privileged",
2+
"role-name": "java-test-read-privileged",
3+
"description": "java-client-api test role",
44
"privilege": [
55
{
66
"privilege-name": "rest-reader",
77
"action": "http://marklogic.com/xdmp/privileges/rest-reader",
88
"kind": "execute"
99
}
1010
]
11-
}
11+
}

‎test-app/src/main/ml-config/security/roles/write-privileged.json‎ renamed to ‎test-app/src/main/ml-config/security/roles/java-test-write-privileged.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"role-name": "write-privileged",
3-
"description": "write-privileged",
2+
"role-name": "java-test-write-privileged",
3+
"description": "java-client-api test role",
44
"privilege": [
55
{
66
"privilege-name": "rest-writer",
@@ -13,4 +13,4 @@
1313
"kind": "execute"
1414
}
1515
]
16-
}
16+
}

‎test-app/src/main/ml-config/security/users/read-privileged.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"user-name": "read-privileged",
3-
"description": "read-privileged user",
3+
"description": "Test user for the java-client-api project",
44
"role": [
5-
"read-privileged"
5+
"java-test-read-privileged"
66
],
77
"password": "x"
8-
}
8+
}

‎test-app/src/main/ml-config/security/users/rest-admin.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"description": "rest-admin user",
44
"role": [
55
"rest-admin",
6-
"rest-delete-temporal"
6+
"java-test-delete-temporal"
77
],
88
"password": "x"
9-
}
9+
}

‎test-app/src/main/ml-config/security/users/rest-evaluator.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"user-name": "rest-evaluator",
3-
"description": "rest-evaluator user",
3+
"description": "Test user for the java-client-api-project",
44
"role": [
5-
"rest-evaluator"
5+
"java-test-evaluator"
66
],
77
"password": "x"
8-
}
8+
}

‎test-app/src/main/ml-config/security/users/rest-writer.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"description": "rest-writer user",
44
"role": [
55
"rest-writer",
6-
"rest-delete-graph"
6+
"java-test-delete-graph"
77
],
88
"password": "x"
9-
}
9+
}

0 commit comments

Comments
 (0)