From 7fbd9463c25151a255955ed24ecd665a764fb84e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Re=C5=9Fat=20SABIQ?= Date: Fri, 16 Feb 2018 16:11:34 +0600 Subject: [PATCH 1/4] Fix-up for #178. --- src/main/java/com/arangodb/entity/ErrorEntity.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/arangodb/entity/ErrorEntity.java b/src/main/java/com/arangodb/entity/ErrorEntity.java index 2bfc9ee11..0010a9f4f 100644 --- a/src/main/java/com/arangodb/entity/ErrorEntity.java +++ b/src/main/java/com/arangodb/entity/ErrorEntity.java @@ -20,12 +20,17 @@ package com.arangodb.entity; +import java.io.Serializable; + /** * @author Mark Vollmary * */ -public class ErrorEntity { - +public class ErrorEntity implements Serializable { + /** + * + */ + private static final long serialVersionUID = -5918898261563691261L; private String errorMessage; private String exception; private int code; From d96558aeb633d7d6e4c55c2286cd89f83f95aaa6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Re=C5=9Fat=20SABIQ?= Date: Wed, 13 Jun 2018 17:24:05 +0600 Subject: [PATCH 2/4] Allow & account for pre-existing users other than ROOT to avoid unnecessary failures in src/test/java/com/arangodb/ArangoDBTest: fixes issue #196. --- src/test/java/com/arangodb/ArangoDBTest.java | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/src/test/java/com/arangodb/ArangoDBTest.java b/src/test/java/com/arangodb/ArangoDBTest.java index 096acfbe1..f17200ad6 100644 --- a/src/test/java/com/arangodb/ArangoDBTest.java +++ b/src/test/java/com/arangodb/ArangoDBTest.java @@ -32,11 +32,14 @@ import static org.junit.Assert.assertThat; import static org.junit.Assert.fail; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; import java.util.HashMap; +import java.util.List; import java.util.Map; +import org.hamcrest.Matcher; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; @@ -191,12 +194,25 @@ public void getUsersOnlyRoot() { @Test public void getUsers() { try { + // Allow & account for pre-existing users other than ROOT + final Collection initialUsers = arangoDB.getUsers(); arangoDB.createUser(USER, PW, null); final Collection users = arangoDB.getUsers(); assertThat(users, is(notNullValue())); - assertThat(users.size(), is(2)); + assertThat(users.size(), is(initialUsers.size()+1)); + + List> matchers = new ArrayList>(users.size()); + // Add initial users, including root + for (UserEntity userEntity : initialUsers) { + Matcher matcher = is(userEntity.getUser()); + if (!matchers.contains(matcher)) + matchers.add(matcher); + } + // Add USER + matchers.add(is(USER)); + for (final UserEntity user : users) { - assertThat(user.getUser(), anyOf(is(ROOT), is(USER))); + assertThat(user.getUser(), anyOf(matchers)); } } finally { arangoDB.deleteUser(USER); From fed7e2b4746674e00a55efa9f1dbee56d66093a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Re=C5=9Fat=20SABIQ?= Date: Wed, 13 Jun 2018 21:43:24 +0600 Subject: [PATCH 3/4] Minor tweak. --- src/test/java/com/arangodb/ArangoDBTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/com/arangodb/ArangoDBTest.java b/src/test/java/com/arangodb/ArangoDBTest.java index f17200ad6..b008bd490 100644 --- a/src/test/java/com/arangodb/ArangoDBTest.java +++ b/src/test/java/com/arangodb/ArangoDBTest.java @@ -63,7 +63,7 @@ /** * @author Mark Vollmary - * + * @author Reşat SABIQ */ @RunWith(Parameterized.class) public class ArangoDBTest { From 68dd27a38bb6b0a268d3df99cd9cce5c561daaed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Re=C5=9Fat=20SABIQ?= Date: Wed, 13 Jun 2018 21:54:31 +0600 Subject: [PATCH 4/4] Minor simplification in initial users loop. --- src/test/java/com/arangodb/ArangoDBTest.java | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/test/java/com/arangodb/ArangoDBTest.java b/src/test/java/com/arangodb/ArangoDBTest.java index b008bd490..1b5188a9a 100644 --- a/src/test/java/com/arangodb/ArangoDBTest.java +++ b/src/test/java/com/arangodb/ArangoDBTest.java @@ -194,21 +194,19 @@ public void getUsersOnlyRoot() { @Test public void getUsers() { try { - // Allow & account for pre-existing users other than ROOT + // Allow & account for pre-existing users other than ROOT: final Collection initialUsers = arangoDB.getUsers(); + arangoDB.createUser(USER, PW, null); final Collection users = arangoDB.getUsers(); assertThat(users, is(notNullValue())); assertThat(users.size(), is(initialUsers.size()+1)); List> matchers = new ArrayList>(users.size()); - // Add initial users, including root - for (UserEntity userEntity : initialUsers) { - Matcher matcher = is(userEntity.getUser()); - if (!matchers.contains(matcher)) - matchers.add(matcher); - } - // Add USER + // Add initial users, including root: + for (final UserEntity userEntity : initialUsers) + matchers.add(is(userEntity.getUser())); + // Add USER: matchers.add(is(USER)); for (final UserEntity user : users) {