Skip to content

Commit 4707b56

Browse files
author
Mark
committed
User Tests optimized
1 parent cfa040d commit 4707b56

File tree

3 files changed

+65
-24
lines changed

3 files changed

+65
-24
lines changed

‎src/test/java/com/arangodb/ArangoDriverAuthTest.java‎

Lines changed: 29 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import static org.junit.Assert.assertThat;
2222
import static org.junit.Assert.fail;
2323

24+
import org.junit.After;
2425
import org.junit.Test;
2526

2627
/**
@@ -31,6 +32,24 @@
3132
*/
3233
public class ArangoDriverAuthTest {
3334

35+
private static final String USER_MIN_A = "user-A";
36+
private static final String USER_A = "userA";
37+
private static final String USER_B = "userB";
38+
private static final String USER_JAP_A = "ゆーざーA";
39+
40+
@After
41+
public void after() {
42+
ArangoConfigure configure = new ArangoConfigure();
43+
configure.init();
44+
ArangoDriver driver = new ArangoDriver(configure);
45+
for (String username : new String[] { USER_A, USER_B, USER_MIN_A, USER_JAP_A }) {
46+
try {
47+
driver.deleteUser(username);
48+
} catch (ArangoException e) {
49+
}
50+
}
51+
}
52+
3453
@Test
3554
public void test_auth() throws ArangoException {
3655

@@ -77,7 +96,7 @@ public void test_auth_added_user() throws ArangoException {
7796
ArangoDriver driver = new ArangoDriver(configure);
7897

7998
// Create User
80-
final String username = "userA";
99+
final String username = USER_A;
81100
try {
82101
driver.createUser(username, "passA", true, null);
83102
} catch (ArangoException e) {
@@ -108,15 +127,15 @@ public void test_auth_added_user_inactive() throws ArangoException {
108127

109128
// Create User
110129
try {
111-
driver.createUser("userB", "passB", false, null);
130+
driver.createUser(USER_B, "passB", false, null);
112131
} catch (ArangoException e) {
113-
driver.replaceUser("userB", "passB", false, null);
132+
driver.replaceUser(USER_B, "passB", false, null);
114133
}
115134

116135
configure.shutdown();
117136

118137
configure = new ArangoConfigure();
119-
configure.setUser("userB");
138+
configure.setUser(USER_B);
120139
configure.setPassword("passB");
121140
configure.init();
122141
driver = new ArangoDriver(configure);
@@ -146,15 +165,15 @@ public void test_auth_multibyte_username() throws ArangoException {
146165

147166
// Create User
148167
try {
149-
driver.createUser("ゆーざーA", "pass", false, null);
168+
driver.createUser(USER_JAP_A, "pass", false, null);
150169
} catch (ArangoException e) {
151-
driver.replaceUser("ゆーざーA", "pass", false, null);
170+
driver.replaceUser(USER_JAP_A, "pass", false, null);
152171
}
153172

154173
configure.shutdown();
155174

156175
ArangoConfigure configure2 = new ArangoConfigure();
157-
configure2.setUser("ゆーざーA");
176+
configure2.setUser(USER_JAP_A);
158177
configure2.setPassword("pass");
159178
configure2.init();
160179
ArangoDriver driver2 = new ArangoDriver(configure2);
@@ -183,15 +202,15 @@ public void test_auth_multibyte_password() throws ArangoException {
183202

184203
// Create User
185204
try {
186-
driver.createUser("user-A", "パスワード", false, null);
205+
driver.createUser(USER_MIN_A, "パスワード", false, null);
187206
} catch (ArangoException e) {
188-
driver.replaceUser("user-A", "パスワード", false, null);
207+
driver.replaceUser(USER_MIN_A, "パスワード", false, null);
189208
}
190209

191210
configure.shutdown();
192211

193212
configure = new ArangoConfigure();
194-
configure.setUser("user-A");
213+
configure.setUser(USER_MIN_A);
195214
configure.setPassword("パスワード");
196215
configure.init();
197216
driver = new ArangoDriver(configure);

‎src/test/java/com/arangodb/ArangoDriverDatabaseAndUserTest.java‎

Lines changed: 31 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,18 @@
3737
*/
3838
public class ArangoDriverDatabaseAndUserTest {
3939

40+
private static final String _SYSTEM = "_system";
41+
42+
private static final String USER1 = "user1";
43+
private static final String USER2 = "user2";
44+
private static final String USER3 = "user3";
45+
private static final String USER4 = "user4";
46+
47+
private static final String PASS1 = "pass1";
48+
private static final String PASS2 = "pass2";
49+
private static final String PASS3 = "pass3";
50+
private static final String PASS4 = "pass4";
51+
4052
private ArangoConfigure configure;
4153
private ArangoDriver driver;
4254
private static final String DATABASE = "db-1";
@@ -56,6 +68,12 @@ public void after() {
5668
driver.deleteDatabase(DATABASE);
5769
} catch (final ArangoException e) {
5870
}
71+
for (String username : new String[] { USER1, USER2, USER3, USER4 }) {
72+
try {
73+
driver.deleteUser(username);
74+
} catch (ArangoException e) {
75+
}
76+
}
5977
configure.shutdown();
6078
}
6179

@@ -72,26 +90,26 @@ public void test_create_database_with_users_and_database_user() throws ArangoExc
7290
} catch (final ArangoException e) {
7391
}
7492

75-
final BooleanResultEntity entity = driver.createDatabase(DATABASE, new UserEntity("user1", "pass1", true, null),
76-
new UserEntity("user2", "pass2", false, null),
77-
new UserEntity("user3", "pass3", true, new MapBuilder().put("attr1", "value1").get()),
78-
new UserEntity("user4", "pass4", false, new MapBuilder().put("attr2", "value2").get()));
93+
final BooleanResultEntity entity = driver.createDatabase(DATABASE, new UserEntity(USER1, PASS1, true, null),
94+
new UserEntity(USER2, PASS2, false, null),
95+
new UserEntity(USER3, PASS3, true, new MapBuilder().put("attr1", "value1").get()),
96+
new UserEntity(USER4, PASS4, false, new MapBuilder().put("attr2", "value2").get()));
7997
assertThat(entity.getResult(), is(true));
80-
driver.grantDatabaseAccess("user1", "_system");
81-
driver.grantDatabaseAccess("user4", DATABASE);
98+
driver.grantDatabaseAccess(USER1, _SYSTEM);
99+
driver.grantDatabaseAccess(USER4, DATABASE);
82100

83101
// change default db
84102
driver.setDefaultDatabase(DATABASE);
85103

86104
// user1 can access
87-
configure.setUser("user1");
88-
configure.setPassword("pass1");
105+
configure.setUser(USER1);
106+
configure.setPassword(PASS1);
89107
final StringsResultEntity res2 = driver.getDatabases(true);
90-
assertThat(res2.getResult(), is(Arrays.asList("_system", DATABASE)));
108+
assertThat(res2.getResult(), is(Arrays.asList(_SYSTEM, DATABASE)));
91109

92110
// user2 cannot access (inactive)
93-
configure.setUser("user2");
94-
configure.setPassword("pass2");
111+
configure.setUser(USER2);
112+
configure.setPassword(PASS2);
95113
try {
96114
driver.getUsers();
97115
fail();
@@ -102,8 +120,8 @@ public void test_create_database_with_users_and_database_user() throws ArangoExc
102120
configure.setUser("root");
103121
configure.setPassword("");
104122

105-
final StringsResultEntity res3 = driver.getDatabases("user1", "pass1");
106-
assertThat(res3.getResult(), is(Arrays.asList("_system", DATABASE)));
123+
final StringsResultEntity res3 = driver.getDatabases(USER1, PASS1);
124+
assertThat(res3.getResult(), is(Arrays.asList(_SYSTEM, DATABASE)));
107125
}
108126

109127
}

‎src/test/java/com/arangodb/ArangoDriverUsersTest.java‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
import java.util.Map;
3131
import java.util.TreeMap;
3232

33+
import org.junit.After;
3334
import org.junit.Before;
3435
import org.junit.Test;
3536

@@ -45,6 +46,7 @@
4546
public class ArangoDriverUsersTest extends BaseTest {
4647

4748
@Before
49+
@After
4850
public void setup() throws ArangoException {
4951
// delete user
5052
for (final String user : new String[] { "user1", "user2", "user3", "user4", "testuser", "テスト☆ユーザー", "user-A",
@@ -312,6 +314,8 @@ public void test_update_user_404() throws ArangoException {
312314
@Test
313315
public void test_get_users() throws ArangoException {
314316

317+
int expectedUserSize = driver.getUsers().size() + 3;
318+
315319
driver.createUser("user1", "pass1", true, null);
316320
driver.createUser("user2", "pass2", false, null);
317321
driver.createUser("user3", "pass3", true, new MapBuilder().put("key", "value").get());
@@ -326,7 +330,7 @@ public int compare(final UserEntity o1, final UserEntity o2) {
326330
});
327331

328332
// validate
329-
assertThat(users.size(), is(4)); // user1,2,3 and root
333+
assertThat(users.size(), is(expectedUserSize)); // user1,2,3 and root
330334
assertThat(users.get(0).getUsername(), is("root"));
331335

332336
assertThat(users.get(1).getUsername(), is("user1"));

0 commit comments

Comments
 (0)