Skip to content

Commit 7f71f93

Browse files
UserUser
User
authored and
User
committed
optimize tests (too many open http connections) -step 2
1 parent 8e8fc1c commit 7f71f93

File tree

60 files changed

+2083
-2564
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+2083
-2564
lines changed

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

Lines changed: 51 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -17,60 +17,56 @@
1717
*/
1818
public class ArangoBaseParameterTest extends BaseTest {
1919

20-
public ArangoBaseParameterTest(ArangoConfigure configure, ArangoDriver driver) {
21-
super(configure, driver);
22-
}
23-
24-
final String collectionName = "unit_test_base_parameter";
25-
26-
@Before
27-
public void before() throws ArangoException {
28-
try {
29-
driver.deleteCollection(collectionName);
30-
} catch (ArangoException e) {
31-
32-
}
33-
try {
34-
driver.createCollection(collectionName);
35-
} catch (ArangoException e) {
36-
37-
}
38-
}
39-
40-
@After
41-
public void after() throws ArangoException {
42-
}
43-
44-
@Test
45-
public void test_base_parameters_1() {
46-
String errorMessage = "some message";
47-
TestBaseParameters testBaseParameters = new TestBaseParameters(true, 500, 4711, errorMessage, -1);
48-
49-
DocumentEntity<TestBaseParameters> documentEntity1 = null;
50-
DocumentEntity<TestBaseParameters> documentEntity2 = null;
51-
52-
try {
53-
documentEntity1 = driver.createDocument(collectionName, testBaseParameters);
54-
} catch (ArangoException e) {
55-
e.printStackTrace();
56-
}
57-
58-
try {
59-
documentEntity2 = driver.getDocument(documentEntity1.getDocumentHandle(), TestBaseParameters.class);
60-
} catch (ArangoException e) {
61-
e.printStackTrace();
62-
}
63-
64-
assertThat(documentEntity2.getEntity().isError(), is(true));
65-
assertThat(documentEntity2.getEntity().getCode(), is(500));
66-
assertThat(documentEntity2.getEntity().getErrorNum(), is(4711));
67-
assertThat(documentEntity2.getEntity().getErrorMessage(), is(errorMessage));
68-
69-
assertThat(documentEntity2.isError(), is(false));
70-
assertThat(documentEntity2.getCode(), is(200));
71-
assertThat(documentEntity2.getErrorNumber(), is(0));
72-
assertThat(documentEntity2.getErrorMessage(), is(nullValue()));
73-
74-
}
20+
final String collectionName = "unit_test_base_parameter";
21+
22+
@Before
23+
public void before() throws ArangoException {
24+
try {
25+
driver.deleteCollection(collectionName);
26+
} catch (final ArangoException e) {
27+
28+
}
29+
try {
30+
driver.createCollection(collectionName);
31+
} catch (final ArangoException e) {
32+
33+
}
34+
}
35+
36+
@After
37+
public void after() throws ArangoException {
38+
}
39+
40+
@Test
41+
public void test_base_parameters_1() {
42+
final String errorMessage = "some message";
43+
final TestBaseParameters testBaseParameters = new TestBaseParameters(true, 500, 4711, errorMessage, -1);
44+
45+
DocumentEntity<TestBaseParameters> documentEntity1 = null;
46+
DocumentEntity<TestBaseParameters> documentEntity2 = null;
47+
48+
try {
49+
documentEntity1 = driver.createDocument(collectionName, testBaseParameters);
50+
} catch (final ArangoException e) {
51+
e.printStackTrace();
52+
}
53+
54+
try {
55+
documentEntity2 = driver.getDocument(documentEntity1.getDocumentHandle(), TestBaseParameters.class);
56+
} catch (final ArangoException e) {
57+
e.printStackTrace();
58+
}
59+
60+
assertThat(documentEntity2.getEntity().isError(), is(true));
61+
assertThat(documentEntity2.getEntity().getCode(), is(500));
62+
assertThat(documentEntity2.getEntity().getErrorNum(), is(4711));
63+
assertThat(documentEntity2.getEntity().getErrorMessage(), is(errorMessage));
64+
65+
assertThat(documentEntity2.isError(), is(false));
66+
assertThat(documentEntity2.getCode(), is(200));
67+
assertThat(documentEntity2.getErrorNumber(), is(0));
68+
assertThat(documentEntity2.getErrorMessage(), is(nullValue()));
69+
70+
}
7571

7672
}

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

Lines changed: 18 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -46,14 +46,10 @@ public class ArangoDriverAdminTest extends BaseTest {
4646

4747
private static Logger logger = LoggerFactory.getLogger(ArangoDriverAdminTest.class);
4848

49-
public ArangoDriverAdminTest(ArangoConfigure configure, ArangoDriver driver) {
50-
super(configure, driver);
51-
}
52-
5349
@Test
5450
public void test_version() throws ArangoException {
5551

56-
ArangoVersion version = driver.getVersion();
52+
final ArangoVersion version = driver.getVersion();
5753
assertEquals("arango", version.getServer());
5854
assertNotNull(version.getVersion());
5955
assertTrue(version.getVersion().startsWith("2.") || version.getVersion().startsWith("3."));
@@ -62,7 +58,7 @@ public void test_version() throws ArangoException {
6258
@Test
6359
public void test_time() throws ArangoException {
6460

65-
ArangoUnixTime time = driver.getTime();
61+
final ArangoUnixTime time = driver.getTime();
6662
assertThat(time.getSecond(), is(not(0)));
6763
assertThat(time.getMicrosecond(), is(not(0)));
6864

@@ -75,14 +71,14 @@ public void test_time() throws ArangoException {
7571
@Test
7672
public void test_log_all() throws ArangoException {
7773

78-
AdminLogEntity entity = driver.getServerLog(null, null, null, null, null, null, null);
74+
final AdminLogEntity entity = driver.getServerLog(null, null, null, null, null, null, null);
7975

8076
assertThat(entity, is(notNullValue()));
8177
assertThat(entity.getTotalAmount(), is(not(0)));
8278
assertThat(entity.getLogs().size(), is(entity.getTotalAmount()));
8379

8480
// debug
85-
for (AdminLogEntity.LogEntry log : entity.getLogs()) {
81+
for (final AdminLogEntity.LogEntry log : entity.getLogs()) {
8682
logger.debug("%d\t%d\t%tF %<tT\t%s%n", log.getLid(), log.getLevel(), log.getTimestamp(), log.getText());
8783
}
8884

@@ -91,11 +87,11 @@ public void test_log_all() throws ArangoException {
9187
@Test
9288
public void test_log_text() throws ArangoException {
9389

94-
AdminLogEntity entity = driver.getServerLog(null, null, null, null, null, null, "Fun");
90+
final AdminLogEntity entity = driver.getServerLog(null, null, null, null, null, null, "Fun");
9591

9692
assertThat(entity, is(notNullValue()));
9793
// debug
98-
for (AdminLogEntity.LogEntry log : entity.getLogs()) {
94+
for (final AdminLogEntity.LogEntry log : entity.getLogs()) {
9995
logger.debug("%d\t%d\t%tF %<tT\t%s%n", log.getLid(), log.getLevel(), log.getTimestamp(), log.getText());
10096
}
10197

@@ -106,10 +102,10 @@ public void test_log_text() throws ArangoException {
106102
@Test
107103
public void test_statistics() throws ArangoException {
108104

109-
StatisticsEntity stat = driver.getStatistics();
105+
final StatisticsEntity stat = driver.getStatistics();
110106

111107
// debug
112-
Gson gson = new Gson();
108+
final Gson gson = new Gson();
113109
assertNotNull(gson.toJson(stat));
114110
assertNotNull(gson.toJson(stat.getSystem()));
115111
assertNotNull(gson.toJson(stat.getClient()));
@@ -120,10 +116,10 @@ public void test_statistics() throws ArangoException {
120116
@Test
121117
public void test_statistics_description() throws ArangoException {
122118

123-
StatisticsDescriptionEntity desc = driver.getStatisticsDescription();
119+
final StatisticsDescriptionEntity desc = driver.getStatisticsDescription();
124120

125121
// debug
126-
Gson gson = new Gson();
122+
final Gson gson = new Gson();
127123
assertNotNull(gson.toJson(desc));
128124
assertNotNull(gson.toJson(desc.getGroups()));
129125
assertNotNull(gson.toJson(desc.getFigures()));
@@ -132,7 +128,7 @@ public void test_statistics_description() throws ArangoException {
132128
@Test
133129
public void test_reload_routing() throws ArangoException {
134130

135-
DefaultEntity entity = driver.reloadRouting();
131+
final DefaultEntity entity = driver.reloadRouting();
136132
assertThat(entity.getStatusCode(), is(200));
137133
assertThat(entity.isError(), is(false));
138134

@@ -141,7 +137,7 @@ public void test_reload_routing() throws ArangoException {
141137
@Test
142138
public void test_execute_do_nothing() throws ArangoException {
143139

144-
DefaultEntity entity = driver.executeScript("");
140+
final DefaultEntity entity = driver.executeScript("");
145141
assertThat(entity.isError(), is(false));
146142
assertThat(entity.getCode(), is(200));
147143
assertThat(entity.getStatusCode(), is(200));
@@ -151,7 +147,7 @@ public void test_execute_do_nothing() throws ArangoException {
151147
@Test
152148
public void test_execute() throws ArangoException {
153149

154-
DefaultEntity entity = driver.executeScript(
150+
final DefaultEntity entity = driver.executeScript(
155151
"var db = require(\"internal\").db; cols = db._collections();\n" + "len = cols.length;\n");
156152
assertThat(entity.isError(), is(false));
157153
assertThat(entity.getCode(), is(200));
@@ -162,7 +158,7 @@ public void test_execute() throws ArangoException {
162158
@Test
163159
public void test_execute_delete_collection() throws ArangoException {
164160

165-
DefaultEntity entity1 = driver
161+
final DefaultEntity entity1 = driver
166162
.executeScript("var db = require(\"internal\").db; db._drop(\"" + "col-execute-delete-test" + "\")");
167163
assertThat(entity1.isError(), is(false));
168164
assertThat(entity1.getCode(), is(200));
@@ -171,7 +167,7 @@ public void test_execute_delete_collection() throws ArangoException {
171167
driver.createCollection("col-execute-delete-test");
172168
driver.getCollection("col-execute-delete-test");
173169

174-
DefaultEntity entity2 = driver
170+
final DefaultEntity entity2 = driver
175171
.executeScript("var db = require(\"internal\").db; db._drop(\"" + "col-execute-delete-test" + "\")");
176172
assertThat(entity2.isError(), is(false));
177173
assertThat(entity2.getCode(), is(200));
@@ -180,7 +176,7 @@ public void test_execute_delete_collection() throws ArangoException {
180176
try {
181177
driver.getCollection("col-execute-delete-test");
182178
fail();
183-
} catch (ArangoException e) {
179+
} catch (final ArangoException e) {
184180
assertThat(e.getCode(), is(404));
185181
assertThat(e.getErrorNumber(), is(1203));
186182
}
@@ -191,8 +187,8 @@ public void test_execute_error() throws ArangoException {
191187
try {
192188
driver.executeScript("xxx");
193189
fail();
194-
} catch (ArangoException e) {
195-
String t = "Internal Server Error: JavaScript exception in file 'undefined' at 1,14: ReferenceError: xxx is not defined\n"
190+
} catch (final ArangoException e) {
191+
final String t = "Internal Server Error: JavaScript exception in file 'undefined' at 1,14: ReferenceError: xxx is not defined\n"
196192
+ "!(function() {xxx}());\n" + "! ^\n"
197193
+ "stacktrace: ReferenceError: xxx is not defined\n";
198194
assertThat(e.getErrorMessage(), startsWith(t));

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

Lines changed: 59 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -36,73 +36,64 @@
3636
*/
3737
public class ArangoDriverAqlfunctionsTest extends BaseTest {
3838

39-
public ArangoDriverAqlfunctionsTest(ArangoConfigure configure, ArangoDriver driver) {
40-
super(configure, driver);
41-
}
42-
43-
44-
@Before
45-
public void before() throws ArangoException {
46-
AqlFunctionsEntity res = driver.getAqlFunctions(null);
47-
Iterator<String> it = res.getAqlFunctions().keySet().iterator();
48-
while(it.hasNext()) {
49-
driver.deleteAqlFunction(it.next(), false);
50-
}
51-
}
52-
53-
@After
54-
public void after() {
55-
}
56-
57-
@Test
58-
public void test_AqlFunctions() throws ArangoException {
59-
60-
DefaultEntity res = driver.createAqlFunction(
61-
"someNamespace::testCode", "function (celsius) { return celsius * 2.8 + 32; }"
62-
);
63-
assertThat(res.getCode(), is(201));
64-
assertThat(res.getErrorMessage(), is((String) null));
65-
66-
try {
67-
res = driver.createAqlFunction(
68-
"someNamespace::testC&&&&&&&&&&de", "function (celsius) { return celsius * 2.8 + 32; }"
69-
);
70-
} catch (ArangoException e) {
71-
assertThat(e.getCode(), is(400));
72-
assertThat(e.getErrorMessage(), is("invalid user function name"));
73-
}
74-
75-
res = driver.createAqlFunction(
76-
"anotherNamespace::testCode", "function (celsius) { return celsius * 2.8 + 32; }"
77-
);
78-
assertThat(res.getCode(), is(201));
79-
assertThat(res.getErrorMessage(), is((String) null));
80-
res = driver.createAqlFunction(
81-
"anotherNamespace::testCode2", "function (celsius) { return celsius * 2.8 + 32; }"
82-
);
83-
assertThat(res.getCode(), is(201));
84-
assertThat(res.getErrorMessage(), is((String) null));
85-
86-
AqlFunctionsEntity r = driver.getAqlFunctions(null);
87-
assertThat(r.size() , is(3));
88-
assertTrue(r.getAqlFunctions().keySet().contains("anotherNamespace::testCode"));
89-
assertTrue(r.getAqlFunctions().keySet().contains("someNamespace::testCode"));
90-
91-
r = driver.getAqlFunctions("someNamespace");
92-
assertThat(r.size() , is(1));
93-
assertFalse(r.getAqlFunctions().keySet().contains("anotherNamespace::testCode"));
94-
assertTrue(r.getAqlFunctions().keySet().contains("someNamespace::testCode"));
95-
96-
res = driver.deleteAqlFunction("someNamespace::testCode", false);
97-
assertThat(res.getCode(), is(200));
98-
assertThat(res.getErrorMessage(), is((String) null));
99-
100-
res = driver.deleteAqlFunction("anotherNamespace", true);
101-
assertThat(res.getCode(), is(200));
102-
assertThat(res.getErrorMessage(), is((String) null));
103-
104-
AqlFunctionsEntity c = driver.getAqlFunctions("someNamespace");
105-
assertThat(c.size() , is(0));
106-
}
39+
@Before
40+
public void before() throws ArangoException {
41+
final AqlFunctionsEntity res = driver.getAqlFunctions(null);
42+
final Iterator<String> it = res.getAqlFunctions().keySet().iterator();
43+
while (it.hasNext()) {
44+
driver.deleteAqlFunction(it.next(), false);
45+
}
46+
}
47+
48+
@After
49+
public void after() {
50+
}
51+
52+
@Test
53+
public void test_AqlFunctions() throws ArangoException {
54+
55+
DefaultEntity res = driver.createAqlFunction("someNamespace::testCode",
56+
"function (celsius) { return celsius * 2.8 + 32; }");
57+
assertThat(res.getCode(), is(201));
58+
assertThat(res.getErrorMessage(), is((String) null));
59+
60+
try {
61+
res = driver.createAqlFunction("someNamespace::testC&&&&&&&&&&de",
62+
"function (celsius) { return celsius * 2.8 + 32; }");
63+
} catch (final ArangoException e) {
64+
assertThat(e.getCode(), is(400));
65+
assertThat(e.getErrorMessage(), is("invalid user function name"));
66+
}
67+
68+
res = driver.createAqlFunction("anotherNamespace::testCode",
69+
"function (celsius) { return celsius * 2.8 + 32; }");
70+
assertThat(res.getCode(), is(201));
71+
assertThat(res.getErrorMessage(), is((String) null));
72+
res = driver.createAqlFunction("anotherNamespace::testCode2",
73+
"function (celsius) { return celsius * 2.8 + 32; }");
74+
assertThat(res.getCode(), is(201));
75+
assertThat(res.getErrorMessage(), is((String) null));
76+
77+
AqlFunctionsEntity r = driver.getAqlFunctions(null);
78+
assertThat(r.size(), is(3));
79+
assertTrue(r.getAqlFunctions().keySet().contains("anotherNamespace::testCode"));
80+
assertTrue(r.getAqlFunctions().keySet().contains("someNamespace::testCode"));
81+
82+
r = driver.getAqlFunctions("someNamespace");
83+
assertThat(r.size(), is(1));
84+
assertFalse(r.getAqlFunctions().keySet().contains("anotherNamespace::testCode"));
85+
assertTrue(r.getAqlFunctions().keySet().contains("someNamespace::testCode"));
86+
87+
res = driver.deleteAqlFunction("someNamespace::testCode", false);
88+
assertThat(res.getCode(), is(200));
89+
assertThat(res.getErrorMessage(), is((String) null));
90+
91+
res = driver.deleteAqlFunction("anotherNamespace", true);
92+
assertThat(res.getCode(), is(200));
93+
assertThat(res.getErrorMessage(), is((String) null));
94+
95+
final AqlFunctionsEntity c = driver.getAqlFunctions("someNamespace");
96+
assertThat(c.size(), is(0));
97+
}
10798

10899
}

0 commit comments

Comments
 (0)