User Tests fixed, ArangoDriver.getUsers() now works always on _system

Author: Mark

src/main/java/com/arangodb/ArangoDriver.java

@@ -101,6 +101,8 @@
  */
 public class ArangoDriver extends BaseArangoDriver {
 
+	private static final String DATABASE_SYSTEM = "_system";
+	private static final String COLLECTION_USERS = "_users";
 	private static final String GRAPH_NAME = "graphName";
 	private static final String VERTEX_EXAMPLE = "vertexExample";
 	private final ArangoConfigure configure;
@@ -2950,7 +2952,8 @@ public DefaultEntity grantDatabaseAccess(String username, String database) throw
 	 * @throws ArangoException
 	 */
 	public List<DocumentEntity<UserEntity>> getUsersDocument() throws ArangoException {
-		final DocumentCursor<UserEntity> documentCursor = executeSimpleAllDocuments("_users", 0, 0, UserEntity.class);
+		final DocumentCursor<UserEntity> documentCursor = simpleDriver.executeSimpleAllDocuments(DATABASE_SYSTEM,
+			COLLECTION_USERS, 0, 0, UserEntity.class);
 		return documentCursor.asList();
 	}
 
@@ -2961,7 +2964,8 @@ public List<DocumentEntity<UserEntity>> getUsersDocument() throws ArangoExceptio
 	 * @throws ArangoException
 	 */
 	public List<UserEntity> getUsers() throws ArangoException {
-		final DocumentCursor<UserEntity> documentCursor = executeSimpleAllDocuments("_users", 0, 0, UserEntity.class);
+		final DocumentCursor<UserEntity> documentCursor = simpleDriver.executeSimpleAllDocuments(DATABASE_SYSTEM,
+			COLLECTION_USERS, 0, 0, UserEntity.class);
 		return documentCursor.asEntityList();
 	}
 

src/test/java/com/arangodb/ArangoDriverCursorTest.java

@@ -283,6 +283,7 @@ public void test_warning() throws ArangoException {
 		}
 		driver.truncateCollection(collectionName);
 
+		driver.setDefaultDatabase(null);
 		final String query = "return _users + 1";
 		final Map<String, Object> bindVars = new HashMap<String, Object>();
 		final CursorResult<Long> cursor = driver.executeAqlQuery(query, bindVars, null, Long.class);

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

@@ -77,29 +77,19 @@ public void test_create_database_with_users_and_database_user() throws ArangoExc
 			new UserEntity("user3", "pass3", true, new MapBuilder().put("attr1", "value1").get()),
 			new UserEntity("user4", "pass4", false, new MapBuilder().put("attr2", "value2").get()));
 		assertThat(entity.getResult(), is(true));
+		driver.grantDatabaseAccess("user1", "_system");
+		driver.grantDatabaseAccess("user4", DATABASE);
 
 		// change default db
-		try {
-			driver.createUser("user1", "pass1", true, null);
-		} catch (final ArangoException e) {
-		}
 		driver.setDefaultDatabase(DATABASE);
 
-		// root user cannot access
-		try {
-			driver.getUsers();
-			fail();
-		} catch (final ArangoException e) {
-			assertThat(e.isUnauthorized(), is(true));
-		}
-
 		// user1 can access
 		configure.setUser("user1");
 		configure.setPassword("pass1");
 		final StringsResultEntity res2 = driver.getDatabases(true);
 		assertThat(res2.getResult(), is(Arrays.asList("_system", DATABASE)));
 
-		// user2 cannot access
+		// user2 cannot access (inactive)
 		configure.setUser("user2");
 		configure.setPassword("pass2");
 		try {
@@ -109,9 +99,11 @@ public void test_create_database_with_users_and_database_user() throws ArangoExc
 			assertThat(e.isUnauthorized(), is(true));
 		}
 
+		configure.setUser("root");
+		configure.setPassword("");
+
 		final StringsResultEntity res3 = driver.getDatabases("user1", "pass1");
 		assertThat(res3.getResult(), is(Arrays.asList("_system", DATABASE)));
-
 	}
 
 }