Skip to content

Commit 32e6aa2

Browse files
author
mpv1989
committed
Add VST / HTTP tests
1 parent 339a260 commit 32e6aa2

File tree

8 files changed

+82
-35
lines changed

8 files changed

+82
-35
lines changed

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,10 @@
4242
import org.junit.After;
4343
import org.junit.Before;
4444
import org.junit.Test;
45+
import org.junit.runner.RunWith;
46+
import org.junit.runners.Parameterized;
4547

48+
import com.arangodb.ArangoDB.Builder;
4649
import com.arangodb.entity.BaseDocument;
4750
import com.arangodb.entity.BaseEdgeDocument;
4851
import com.arangodb.entity.CollectionEntity;
@@ -71,11 +74,16 @@
7174
* @author Mark - mark at arangodb.com
7275
*
7376
*/
77+
@RunWith(Parameterized.class)
7478
public class ArangoCollectionTest extends BaseTest {
7579

7680
private static final String COLLECTION_NAME = "db_collection_test";
7781
private static final String EDGE_COLLECTION_NAME = "db_edge_collection_test";
7882

83+
public ArangoCollectionTest(final Builder builder) {
84+
super(builder);
85+
}
86+
7987
@Before
8088
public void setup() {
8189
db.createCollection(COLLECTION_NAME, null);

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

Lines changed: 18 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,17 @@
3232
import static org.junit.Assert.assertThat;
3333
import static org.junit.Assert.fail;
3434

35+
import java.util.Arrays;
3536
import java.util.Collection;
3637
import java.util.HashMap;
3738
import java.util.Map;
3839

3940
import org.junit.Test;
41+
import org.junit.runner.RunWith;
42+
import org.junit.runners.Parameterized;
43+
import org.junit.runners.Parameterized.Parameters;
4044

45+
import com.arangodb.ArangoDB.Builder;
4146
import com.arangodb.entity.ArangoDBVersion;
4247
import com.arangodb.entity.LogEntity;
4348
import com.arangodb.entity.LogLevel;
@@ -56,15 +61,27 @@
5661
* @author Mark - mark at arangodb.com
5762
*
5863
*/
64+
@RunWith(Parameterized.class)
5965
public class ArangoDBTest {
6066

67+
@Parameters
68+
public static Collection<ArangoDB.Builder> builders() {
69+
return Arrays.asList(new ArangoDB.Builder().useProtocol(Protocol.VST),
70+
new ArangoDB.Builder().useProtocol(Protocol.HTTP));
71+
}
72+
6173
private static final String ROOT = "root";
6274
private static final String USER = "mit dem mund";
6375
private static final String PW = "machts der hund";
76+
private final ArangoDB arangoDB;
77+
78+
public ArangoDBTest(final Builder builder) {
79+
super();
80+
arangoDB = builder.build();
81+
}
6482

6583
@Test
6684
public void getVersion() {
67-
final ArangoDB arangoDB = new ArangoDB.Builder().build();
6885
final ArangoDBVersion version = arangoDB.getVersion();
6986
assertThat(version, is(notNullValue()));
7087
assertThat(version.getServer(), is(notNullValue()));
@@ -73,7 +90,6 @@ public void getVersion() {
7390

7491
@Test
7592
public void createDatabase() {
76-
final ArangoDB arangoDB = new ArangoDB.Builder().build();
7793
final Boolean result = arangoDB.createDatabase(BaseTest.TEST_DB);
7894
assertThat(result, is(true));
7995
try {
@@ -84,7 +100,6 @@ public void createDatabase() {
84100

85101
@Test
86102
public void deleteDatabase() {
87-
final ArangoDB arangoDB = new ArangoDB.Builder().build();
88103
final Boolean resultCreate = arangoDB.createDatabase(BaseTest.TEST_DB);
89104
assertThat(resultCreate, is(true));
90105
final Boolean resultDelete = arangoDB.db(BaseTest.TEST_DB).drop();
@@ -93,7 +108,6 @@ public void deleteDatabase() {
93108

94109
@Test
95110
public void getDatabases() {
96-
final ArangoDB arangoDB = new ArangoDB.Builder().build();
97111
try {
98112
Collection<String> dbs = arangoDB.getDatabases();
99113
assertThat(dbs, is(notNullValue()));
@@ -112,7 +126,6 @@ public void getDatabases() {
112126

113127
@Test
114128
public void getAccessibleDatabases() {
115-
final ArangoDB arangoDB = new ArangoDB.Builder().build();
116129
final Collection<String> dbs = arangoDB.getAccessibleDatabases();
117130
assertThat(dbs, is(notNullValue()));
118131
assertThat(dbs.size(), greaterThan(0));
@@ -121,7 +134,6 @@ public void getAccessibleDatabases() {
121134

122135
@Test
123136
public void getAccessibleDatabasesFor() {
124-
final ArangoDB arangoDB = new ArangoDB.Builder().build();
125137
final Collection<String> dbs = arangoDB.getAccessibleDatabasesFor("root");
126138
assertThat(dbs, is(notNullValue()));
127139
assertThat(dbs.size(), greaterThan(0));
@@ -130,7 +142,6 @@ public void getAccessibleDatabasesFor() {
130142

131143
@Test
132144
public void createUser() {
133-
final ArangoDB arangoDB = new ArangoDB.Builder().build();
134145
try {
135146
final UserEntity result = arangoDB.createUser(USER, PW, null);
136147
assertThat(result, is(notNullValue()));
@@ -143,22 +154,19 @@ public void createUser() {
143154

144155
@Test
145156
public void deleteUser() {
146-
final ArangoDB arangoDB = new ArangoDB.Builder().build();
147157
arangoDB.createUser(USER, PW, null);
148158
arangoDB.deleteUser(USER);
149159
}
150160

151161
@Test
152162
public void getUserRoot() {
153-
final ArangoDB arangoDB = new ArangoDB.Builder().build();
154163
final UserEntity user = arangoDB.getUser(ROOT);
155164
assertThat(user, is(notNullValue()));
156165
assertThat(user.getUser(), is(ROOT));
157166
}
158167

159168
@Test
160169
public void getUser() {
161-
final ArangoDB arangoDB = new ArangoDB.Builder().build();
162170
try {
163171
arangoDB.createUser(USER, PW, null);
164172
final UserEntity user = arangoDB.getUser(USER);
@@ -171,15 +179,13 @@ public void getUser() {
171179

172180
@Test
173181
public void getUsersOnlyRoot() {
174-
final ArangoDB arangoDB = new ArangoDB.Builder().build();
175182
final Collection<UserEntity> users = arangoDB.getUsers();
176183
assertThat(users, is(notNullValue()));
177184
assertThat(users.size(), greaterThan(0));
178185
}
179186

180187
@Test
181188
public void getUsers() {
182-
final ArangoDB arangoDB = new ArangoDB.Builder().build();
183189
try {
184190
arangoDB.createUser(USER, PW, null);
185191
final Collection<UserEntity> users = arangoDB.getUsers();
@@ -195,7 +201,6 @@ public void getUsers() {
195201

196202
@Test
197203
public void updateUserNoOptions() {
198-
final ArangoDB arangoDB = new ArangoDB.Builder().build();
199204
try {
200205
arangoDB.createUser(USER, PW, null);
201206
arangoDB.updateUser(USER, null);
@@ -206,7 +211,6 @@ public void updateUserNoOptions() {
206211

207212
@Test
208213
public void updateUser() {
209-
final ArangoDB arangoDB = new ArangoDB.Builder().build();
210214
try {
211215
final Map<String, Object> extra = new HashMap<String, Object>();
212216
extra.put("hund", false);
@@ -229,7 +233,6 @@ public void updateUser() {
229233

230234
@Test
231235
public void replaceUser() {
232-
final ArangoDB arangoDB = new ArangoDB.Builder().build();
233236
try {
234237
final Map<String, Object> extra = new HashMap<String, Object>();
235238
extra.put("hund", false);
@@ -274,15 +277,13 @@ public void authenticationFailUser() {
274277

275278
@Test
276279
public void execute() throws VPackException {
277-
final ArangoDB arangoDB = new ArangoDB.Builder().build();
278280
final Response response = arangoDB.execute(new Request("_system", RequestType.GET, "/_api/version"));
279281
assertThat(response.getBody(), is(notNullValue()));
280282
assertThat(response.getBody().get("version").isString(), is(true));
281283
}
282284

283285
@Test
284286
public void getLogs() {
285-
final ArangoDB arangoDB = new ArangoDB.Builder().build();
286287
final LogEntity logs = arangoDB.getLogs(null);
287288
assertThat(logs, is(notNullValue()));
288289
assertThat(logs.getTotalAmount(), greaterThan(0L));
@@ -294,23 +295,20 @@ public void getLogs() {
294295

295296
@Test
296297
public void getLogsUpto() {
297-
final ArangoDB arangoDB = new ArangoDB.Builder().build();
298298
final LogEntity logsUpto = arangoDB.getLogs(new LogOptions().upto(LogLevel.WARNING));
299299
assertThat(logsUpto, is(notNullValue()));
300300
assertThat(logsUpto.getLevel(), not(contains(LogLevel.INFO)));
301301
}
302302

303303
@Test
304304
public void getLogsLevel() {
305-
final ArangoDB arangoDB = new ArangoDB.Builder().build();
306305
final LogEntity logsInfo = arangoDB.getLogs(new LogOptions().level(LogLevel.INFO));
307306
assertThat(logsInfo, is(notNullValue()));
308307
assertThat(logsInfo.getLevel(), everyItem(is(LogLevel.INFO)));
309308
}
310309

311310
@Test
312311
public void getLogsStart() {
313-
final ArangoDB arangoDB = new ArangoDB.Builder().build();
314312
final LogEntity logs = arangoDB.getLogs(null);
315313
assertThat(logs.getLid(), not(empty()));
316314
final LogEntity logsStart = arangoDB.getLogs(new LogOptions().start(logs.getLid().get(0) + 1));
@@ -320,7 +318,6 @@ public void getLogsStart() {
320318

321319
@Test
322320
public void getLogsSize() {
323-
final ArangoDB arangoDB = new ArangoDB.Builder().build();
324321
final LogEntity logs = arangoDB.getLogs(null);
325322
assertThat(logs.getLid().size(), greaterThan(0));
326323
final LogEntity logsSize = arangoDB.getLogs(new LogOptions().size(logs.getLid().size() - 1));
@@ -330,7 +327,6 @@ public void getLogsSize() {
330327

331328
@Test
332329
public void getLogsOffset() {
333-
final ArangoDB arangoDB = new ArangoDB.Builder().build();
334330
final LogEntity logs = arangoDB.getLogs(null);
335331
assertThat(logs.getTotalAmount(), greaterThan(0L));
336332
final LogEntity logsOffset = arangoDB.getLogs(new LogOptions().offset(1));
@@ -340,7 +336,6 @@ public void getLogsOffset() {
340336

341337
@Test
342338
public void getLogsSearch() {
343-
final ArangoDB arangoDB = new ArangoDB.Builder().build();
344339
final LogEntity logs = arangoDB.getLogs(null);
345340
final LogEntity logsSearch = arangoDB.getLogs(new LogOptions().search(BaseTest.TEST_DB));
346341
assertThat(logsSearch, is(notNullValue()));
@@ -349,7 +344,6 @@ public void getLogsSearch() {
349344

350345
@Test
351346
public void getLogsSortAsc() {
352-
final ArangoDB arangoDB = new ArangoDB.Builder().build();
353347
final LogEntity logs = arangoDB.getLogs(new LogOptions().sort(SortOrder.asc));
354348
assertThat(logs, is(notNullValue()));
355349
long lastId = -1;
@@ -361,7 +355,6 @@ public void getLogsSortAsc() {
361355

362356
@Test
363357
public void getLogsSortDesc() {
364-
final ArangoDB arangoDB = new ArangoDB.Builder().build();
365358
final LogEntity logs = arangoDB.getLogs(new LogOptions().sort(SortOrder.desc));
366359
assertThat(logs, is(notNullValue()));
367360
long lastId = Long.MAX_VALUE;
@@ -373,15 +366,13 @@ public void getLogsSortDesc() {
373366

374367
@Test
375368
public void getLogLevel() {
376-
final ArangoDB arangoDB = new ArangoDB.Builder().build();
377369
final LogLevelEntity logLevel = arangoDB.getLogLevel();
378370
assertThat(logLevel, is(notNullValue()));
379371
assertThat(logLevel.getAgency(), is(LogLevelEntity.LogLevel.INFO));
380372
}
381373

382374
@Test
383375
public void setLogLevel() {
384-
final ArangoDB arangoDB = new ArangoDB.Builder().build();
385376
final LogLevelEntity entity = new LogLevelEntity();
386377
try {
387378
entity.setAgency(LogLevelEntity.LogLevel.ERROR);
@@ -396,7 +387,6 @@ public void setLogLevel() {
396387

397388
@Test
398389
public void arangoDBException() {
399-
final ArangoDB arangoDB = new ArangoDB.Builder().build();
400390
try {
401391
arangoDB.db("no").getInfo();
402392
fail();
@@ -421,7 +411,6 @@ public void loadproperties() {
421411

422412
@Test
423413
public void accessMultipleDatabases() {
424-
final ArangoDB arangoDB = new ArangoDB.Builder().build();
425414
try {
426415
arangoDB.createDatabase("db1");
427416
arangoDB.createDatabase("db2");

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,10 @@
4141

4242
import org.junit.Ignore;
4343
import org.junit.Test;
44+
import org.junit.runner.RunWith;
45+
import org.junit.runners.Parameterized;
4446

47+
import com.arangodb.ArangoDB.Builder;
4548
import com.arangodb.entity.AqlExecutionExplainEntity;
4649
import com.arangodb.entity.AqlExecutionExplainEntity.ExecutionNode;
4750
import com.arangodb.entity.AqlExecutionExplainEntity.ExecutionPlan;
@@ -80,11 +83,16 @@
8083
* @author Mark - mark at arangodb.com
8184
*
8285
*/
86+
@RunWith(Parameterized.class)
8387
public class ArangoDatabaseTest extends BaseTest {
8488

8589
private static final String COLLECTION_NAME = "db_test";
8690
private static final String GRAPH_NAME = "graph_test";
8791

92+
public ArangoDatabaseTest(final Builder builder) {
93+
super(builder);
94+
}
95+
8896
@Test
8997
public void getVersion() {
9098
final ArangoDBVersion version = db.getVersion();

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,10 @@
3434
import org.junit.After;
3535
import org.junit.Before;
3636
import org.junit.Test;
37+
import org.junit.runner.RunWith;
38+
import org.junit.runners.Parameterized;
3739

40+
import com.arangodb.ArangoDB.Builder;
3841
import com.arangodb.entity.BaseDocument;
3942
import com.arangodb.entity.BaseEdgeDocument;
4043
import com.arangodb.entity.CollectionType;
@@ -52,12 +55,17 @@
5255
* @author Mark - mark at arangodb.com
5356
*
5457
*/
58+
@RunWith(Parameterized.class)
5559
public class ArangoEdgeCollectionTest extends BaseTest {
5660

5761
private static final String GRAPH_NAME = "db_collection_test";
5862
private static final String EDGE_COLLECTION_NAME = "db_edge_collection_test";
5963
private static final String VERTEX_COLLECTION_NAME = "db_vertex_collection_test";
6064

65+
public ArangoEdgeCollectionTest(final Builder builder) {
66+
super(builder);
67+
}
68+
6169
@Before
6270
public void setup() {
6371
try {

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,10 @@
3434
import org.junit.After;
3535
import org.junit.Before;
3636
import org.junit.Test;
37+
import org.junit.runner.RunWith;
38+
import org.junit.runners.Parameterized;
3739

40+
import com.arangodb.ArangoDB.Builder;
3841
import com.arangodb.entity.CollectionType;
3942
import com.arangodb.entity.EdgeDefinition;
4043
import com.arangodb.entity.GraphEntity;
@@ -44,6 +47,7 @@
4447
* @author Mark - mark at arangodb.com
4548
*
4649
*/
50+
@RunWith(Parameterized.class)
4751
public class ArangoGraphTest extends BaseTest {
4852

4953
private static final String GRAPH_NAME = "db_collection_test";
@@ -55,6 +59,10 @@ public class ArangoGraphTest extends BaseTest {
5559
private static final String VERTEX_COL_3 = "db_vertex3_collection_test";
5660
private static final String VERTEX_COL_4 = "db_vertex4_collection_test";
5761

62+
public ArangoGraphTest(final Builder builder) {
63+
super(builder);
64+
}
65+
5866
@Before
5967
public void setup() {
6068
for (final String collection : new String[] { VERTEX_COL_1, VERTEX_COL_2, VERTEX_COL_2, VERTEX_COL_3,

0 commit comments

Comments
 (0)