Skip to content

Commit 19abf30

Browse files
author
Achim Brandt
committed
fixed tests
1 parent 1446d28 commit 19abf30

11 files changed

+2088
-2093
lines changed

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

+139-139
Original file line numberDiff line numberDiff line change
@@ -40,202 +40,202 @@
4040
*/
4141
public class ArangoDriverAsyncTest extends BaseTest {
4242

43-
public ArangoDriverAsyncTest(ArangoConfigure configure, ArangoDriver driver) {
44-
super(configure, driver);
45-
}
43+
public ArangoDriverAsyncTest(ArangoConfigure configure, ArangoDriver driver) {
44+
super(configure, driver);
45+
}
4646

47-
@Before
48-
public void before() throws ArangoException {
49-
for (String col : new String[] { "blub" }) {
50-
try {
51-
driver.deleteCollection(col);
52-
} catch (ArangoException e) {
53-
}
54-
try {
55-
driver.stopAsyncMode();
56-
} catch (ArangoException e) {
47+
@Before
48+
public void before() throws ArangoException {
49+
for (String col : new String[] { "blub" }) {
50+
try {
51+
driver.deleteCollection(col);
52+
} catch (ArangoException e) {
53+
}
54+
try {
55+
driver.stopAsyncMode();
56+
} catch (ArangoException e) {
5757

58-
}
59-
AqlFunctionsEntity res = driver.getAqlFunctions(null);
60-
Iterator<String> it = res.getAqlFunctions().keySet().iterator();
61-
while (it.hasNext()) {
62-
driver.deleteAqlFunction(it.next(), false);
63-
}
64-
}
65-
}
58+
}
59+
AqlFunctionsEntity res = driver.getAqlFunctions(null);
60+
Iterator<String> it = res.getAqlFunctions().keySet().iterator();
61+
while (it.hasNext()) {
62+
driver.deleteAqlFunction(it.next(), false);
63+
}
64+
}
65+
}
6666

67-
@After
68-
public void after() {
69-
}
67+
@After
68+
public void after() {
69+
}
7070

71-
@Test
72-
public void test_StartCancelExecuteAsyncMode() throws ArangoException {
71+
@Test
72+
public void test_StartCancelExecuteAsyncMode() throws ArangoException {
7373

74-
driver.startAsyncMode(false);
75-
String msg = "";
76-
try {
77-
driver.startAsyncMode(false);
78-
} catch (ArangoException e) {
79-
msg = e.getErrorMessage();
80-
}
81-
assertThat(msg, is("Arango driver already set to asynchronous mode."));
74+
driver.startAsyncMode(false);
75+
String msg = "";
76+
try {
77+
driver.startAsyncMode(false);
78+
} catch (ArangoException e) {
79+
msg = e.getErrorMessage();
80+
}
81+
assertThat(msg, is("Arango driver already set to asynchronous mode."));
8282

83-
driver.stopAsyncMode();
84-
msg = "";
85-
try {
86-
driver.stopAsyncMode();
87-
} catch (ArangoException e) {
88-
msg = e.getErrorMessage();
89-
}
90-
assertThat(msg, is("Arango driver already set to synchronous mode."));
83+
driver.stopAsyncMode();
84+
msg = "";
85+
try {
86+
driver.stopAsyncMode();
87+
} catch (ArangoException e) {
88+
msg = e.getErrorMessage();
89+
}
90+
assertThat(msg, is("Arango driver already set to synchronous mode."));
9191

92-
}
92+
}
9393

94-
@Test
95-
public void test_execAsyncMode() throws ArangoException {
94+
@Test
95+
public void test_execAsyncMode() throws ArangoException {
9696

97-
driver.startAsyncMode(false);
97+
driver.startAsyncMode(false);
9898

99-
driver.createAqlFunction("someNamespace::testCode", "function (celsius) { return celsius * 2.8 + 32; }");
99+
driver.createAqlFunction("someNamespace::testCode", "function (celsius) { return celsius * 2.8 + 32; }");
100100

101-
assertNotNull(driver.getLastJobId());
101+
assertNotNull(driver.getLastJobId());
102102

103-
driver.createAqlFunction("someNamespace::testC&&&&&&&&&&de",
104-
"function (celsius) { return celsius * 2.8 + 32; }");
103+
driver.createAqlFunction("someNamespace::testC&&&&&&&&&&de",
104+
"function (celsius) { return celsius * 2.8 + 32; }");
105105

106-
assertThat(driver.getJobIds().size(), is(2));
106+
assertThat(driver.getJobIds().size(), is(2));
107107

108-
driver.getAqlFunctions(null);
108+
driver.getAqlFunctions(null);
109109

110-
assertThat(driver.getJobIds().size(), is(3));
110+
assertThat(driver.getJobIds().size(), is(3));
111111

112-
for (int i = 0; i < 10; i++) {
113-
TestComplexEntity01 value = new TestComplexEntity01("user-" + i, "data:" + i, i);
114-
driver.createDocument("blub", value, true, false);
115-
assertThat(driver.getJobIds().size(), is(4 + i));
116-
}
112+
for (int i = 0; i < 10; i++) {
113+
TestComplexEntity01 value = new TestComplexEntity01("user-" + i, "data:" + i, i);
114+
driver.createDocument("blub", value, true, false);
115+
assertThat(driver.getJobIds().size(), is(4 + i));
116+
}
117117

118-
driver.stopAsyncMode();
118+
driver.stopAsyncMode();
119119

120-
assertThat(driver.getJobIds().size(), is(13));
120+
assertThat(driver.getJobIds().size(), is(13));
121121

122-
}
122+
}
123123

124-
@Test
125-
public void test_execFireAndForgetMode() throws ArangoException {
124+
@Test
125+
public void test_execFireAndForgetMode() throws ArangoException {
126126

127-
driver.startAsyncMode(true);
127+
driver.startAsyncMode(true);
128128

129-
assertThat(driver.getJobIds().size(), is(0));
129+
assertThat(driver.getJobIds().size(), is(0));
130130

131-
driver.createAqlFunction("someNamespace::testCode", "function (celsius) { return celsius * 2.8 + 32; }");
131+
driver.createAqlFunction("someNamespace::testCode", "function (celsius) { return celsius * 2.8 + 32; }");
132132

133-
assertThat(driver.getJobIds().size(), is(0));
133+
assertThat(driver.getJobIds().size(), is(0));
134134

135-
driver.createAqlFunction("someNamespace::testC&&&&&&&&&&de",
136-
"function (celsius) { return celsius * 2.8 + 32; }");
135+
driver.createAqlFunction("someNamespace::testC&&&&&&&&&&de",
136+
"function (celsius) { return celsius * 2.8 + 32; }");
137137

138-
assertThat(driver.getJobIds().size(), is(0));
138+
assertThat(driver.getJobIds().size(), is(0));
139139

140-
driver.stopAsyncMode();
140+
driver.stopAsyncMode();
141141

142-
}
142+
}
143143

144-
@Test
145-
public void test_GetJobsMode() throws ArangoException {
144+
@Test
145+
public void test_GetJobsMode() throws ArangoException {
146146

147-
driver.deleteAllJobs();
147+
driver.deleteAllJobs();
148148

149-
driver.startAsyncMode(false);
149+
driver.startAsyncMode(false);
150150

151-
driver.createAqlFunction("someNamespace::testCode", "function (celsius) { return celsius * 2.8 + 32; }");
151+
driver.createAqlFunction("someNamespace::testCode", "function (celsius) { return celsius * 2.8 + 32; }");
152152

153-
assertNotNull(driver.getLastJobId());
153+
assertNotNull(driver.getLastJobId());
154154

155-
driver.createAqlFunction("someNamespace::testC&&&&&&&&&&de",
156-
"function (celsius) { return celsius * 2.8 + 32; }");
155+
driver.createAqlFunction("someNamespace::testC&&&&&&&&&&de",
156+
"function (celsius) { return celsius * 2.8 + 32; }");
157157

158-
assertThat(driver.getJobIds().size(), is(2));
158+
assertThat(driver.getJobIds().size(), is(2));
159159

160-
driver.getAqlFunctions(null);
160+
driver.getAqlFunctions(null);
161161

162-
assertThat(driver.getJobIds().size(), is(3));
162+
assertThat(driver.getJobIds().size(), is(3));
163163

164-
for (int i = 0; i < 10; i++) {
165-
TestComplexEntity01 value = new TestComplexEntity01("user-" + i, "data:" + i, i);
166-
driver.createDocument("blub", value, true, false);
167-
assertThat(driver.getJobIds().size(), is(4 + i));
168-
}
164+
for (int i = 0; i < 10; i++) {
165+
TestComplexEntity01 value = new TestComplexEntity01("user-" + i, "data:" + i, i);
166+
driver.createDocument("blub", value, true, false);
167+
assertThat(driver.getJobIds().size(), is(4 + i));
168+
}
169169

170-
driver.stopAsyncMode();
171-
driver.getJobs(JobsEntity.JobState.DONE, 10);
172-
driver.getJobs(JobsEntity.JobState.PENDING, 10);
170+
driver.stopAsyncMode();
171+
driver.getJobs(JobsEntity.JobState.DONE, 10);
172+
driver.getJobs(JobsEntity.JobState.PENDING, 10);
173173

174-
driver.getJobs(JobsEntity.JobState.DONE);
174+
driver.getJobs(JobsEntity.JobState.DONE);
175175

176-
driver.startAsyncMode(false);
177-
for (int i = 0; i < 100; i++) {
178-
TestComplexEntity01 value = new TestComplexEntity01("user-" + i, "data:" + i, i);
179-
driver.createDocument("blub", value, true, false);
180-
}
181-
driver.stopAsyncMode();
182-
driver.deleteExpiredJobs((int) (System.currentTimeMillis() / 2000L));
183-
driver.getJobs(JobsEntity.JobState.PENDING);
176+
driver.startAsyncMode(false);
177+
for (int i = 0; i < 100; i++) {
178+
TestComplexEntity01 value = new TestComplexEntity01("user-" + i, "data:" + i, i);
179+
driver.createDocument("blub", value, true, false);
180+
}
181+
driver.stopAsyncMode();
182+
driver.deleteExpiredJobs((int) (System.currentTimeMillis() / 2000L));
183+
driver.getJobs(JobsEntity.JobState.PENDING);
184184

185-
}
185+
}
186186

187-
@Test
188-
public void test_GetJobsResult() throws ArangoException {
187+
@Test
188+
public void test_GetJobsResult() throws ArangoException {
189189

190-
driver.deleteAllJobs();
190+
driver.deleteAllJobs();
191191

192-
driver.startAsyncMode(false);
192+
driver.startAsyncMode(false);
193193

194-
driver.createAqlFunction("someNamespace::testCode", "function (celsius) { return celsius * 2.8 + 32; }");
194+
driver.createAqlFunction("someNamespace::testCode", "function (celsius) { return celsius * 2.8 + 32; }");
195195

196-
String id1 = driver.getLastJobId();
196+
String id1 = driver.getLastJobId();
197197

198-
driver.createAqlFunction("someNamespace::testC&&&&&&&&&&de",
199-
"function (celsius) { return celsius * 2.8 + 32; }");
198+
driver.createAqlFunction("someNamespace::testC&&&&&&&&&&de",
199+
"function (celsius) { return celsius * 2.8 + 32; }");
200200

201-
String id2 = driver.getLastJobId();
201+
String id2 = driver.getLastJobId();
202202

203-
driver.getAqlFunctions(null);
203+
driver.getAqlFunctions(null);
204204

205-
String id3 = driver.getLastJobId();
205+
String id3 = driver.getLastJobId();
206206

207-
List<String> ids = new ArrayList<String>();
208-
for (int i = 0; i < 10; i++) {
209-
TestComplexEntity01 value = new TestComplexEntity01("user-" + i, "data:" + i, i);
210-
driver.createDocument("blub", value, true, false);
211-
ids.add(driver.getLastJobId());
212-
}
207+
List<String> ids = new ArrayList<String>();
208+
for (int i = 0; i < 10; i++) {
209+
TestComplexEntity01 value = new TestComplexEntity01("user-" + i, "data:" + i, i);
210+
driver.createDocument("blub", value, true, false);
211+
ids.add(driver.getLastJobId());
212+
}
213213

214-
driver.stopAsyncMode();
215-
try {
216-
Thread.sleep(2000);
217-
} catch (InterruptedException e) {
218-
e.printStackTrace();
219-
}
220-
DefaultEntity de = driver.getJobResult(id1);
221-
assertThat(de.getStatusCode(), is(201));
214+
driver.stopAsyncMode();
215+
try {
216+
Thread.sleep(2000);
217+
} catch (InterruptedException e) {
218+
e.printStackTrace();
219+
}
220+
DefaultEntity de = driver.getJobResult(id1);
221+
assertThat(de.getStatusCode(), is(201));
222222

223-
try {
224-
driver.getJobResult(id2);
225-
} catch (ArangoException e) {
226-
assertTrue(e.getErrorMessage().equals("java.lang.reflect.InvocationTargetException"));
227-
}
223+
try {
224+
driver.getJobResult(id2);
225+
} catch (ArangoException e) {
226+
assertTrue(e.getErrorMessage().equals("java.lang.reflect.InvocationTargetException"));
227+
}
228228

229-
AqlFunctionsEntity functions = driver.getJobResult(id3);
230-
assertThat(functions.getStatusCode(), is(200));
229+
AqlFunctionsEntity functions = driver.getJobResult(id3);
230+
assertThat(functions.getStatusCode(), is(200));
231231

232-
DocumentEntity<TestComplexEntity01> resultComplex;
232+
DocumentEntity<TestComplexEntity01> resultComplex;
233233

234-
for (String id : ids) {
235-
resultComplex = driver.getJobResult(id);
236-
assertThat(resultComplex.getStatusCode(), is(202));
237-
}
234+
for (String id : ids) {
235+
resultComplex = driver.getJobResult(id);
236+
assertThat(resultComplex.getStatusCode(), is(202));
237+
}
238238

239-
}
239+
}
240240

241241
}

0 commit comments

Comments
 (0)