Project

General

Profile

« Previous | Next » 

Revision 50413

Added assert failure messages

View differences:

modules/dnet-openaire-http-client/trunk/src/test/java/eu/dnetlib/api/client/OpenaireDatasetsApiClientTest.java
25 25
		Document doc = DocumentHelper.parseText(results);
26 26
		OpenAireDocumentPage page = new OpenAireDocumentPage(doc);
27 27
		ResponseHeader pageHeader = page.getResponseHeader();
28
		assertEquals(datasetsQuery, pageHeader.getQuery());
29
		assertEquals(1, pageHeader.getPage());
30
		assertEquals(defaultPageSize, pageHeader.getPageSize());
28
		assertEquals("unexpected query", datasetsQuery, pageHeader.getQuery());
29
		assertEquals("unexpected page size", defaultPageSize, pageHeader.getPageSize());
31 30
	}
32 31

  
33 32
	@Test
......
44 43
		results = getApiClient().doRequest(EntityType.publication, ApiModel.openaire, uri);
45 44
		checkNotException(results);
46 45

  
47
		assertTrue(MAX_NUM_RESULTS >= MAX_PAGE_SIZE);
46
		assertTrue("unexpected number of results",MAX_NUM_RESULTS >= MAX_PAGE_SIZE);
48 47
	}
49 48

  
50 49
	@Test
modules/dnet-openaire-http-client/trunk/src/test/java/eu/dnetlib/api/client/OpenaireProjectsApiClientTest.java
20 20
		URIBuilder builder = new URIBuilder(requestBaseURL).setPath(projectsPath);
21 21
		String results = getApiClient().doRequest(EntityType.project, ApiModel.none, builder.build());
22 22
		OpenAireDocumentPage page = new OpenAireDocumentPage(DocumentHelper.parseText(results));
23
		assertNotNull(page);
23
		assertNotNull("page is null", page);
24 24
	}
25 25

  
26 26
	@Test
modules/dnet-openaire-http-client/trunk/src/test/java/eu/dnetlib/api/client/OpenairePublicationsApiClientTest.java
38 38
		String results = getApiClient().doRequest(EntityType.publication, ApiModel.openaire, uri);
39 39
		OpenAireDocumentPage page = new OpenAireDocumentPage(DocumentHelper.parseText(results));
40 40
		ResponseHeader pageHeader = page.getResponseHeader();
41
		assertEquals(publicationsQuery, pageHeader.getQuery());
42
		assertEquals(1, pageHeader.getPage());
43
		assertEquals(defaultPageSize, pageHeader.getPageSize());
41
		assertEquals("unexpected query",publicationsQuery, pageHeader.getQuery());
42
		assertEquals("unexpected page number", 1, pageHeader.getPage());
43
		assertEquals("unexpected page size", defaultPageSize, pageHeader.getPageSize());
44 44
	}
45 45

  
46 46
	@Test
......
89 89
		String results = getApiClient().doRequest(EntityType.publication, ApiModel.openaire, uri);
90 90
		OpenAireDocumentPage page = new OpenAireDocumentPage(DocumentHelper.parseText(results));
91 91
		ResponseHeader pageHeader = page.getResponseHeader();
92
		assertEquals(4, pageHeader.getPage());
92
		assertEquals("unexpected page number", 4, pageHeader.getPage());
93 93
	}
94 94

  
95 95
	@Test
......
101 101
		String results = getApiClient().doRequest(EntityType.publication, ApiModel.openaire, uri);
102 102
		OpenAireDocumentPage page = new OpenAireDocumentPage(DocumentHelper.parseText(results));
103 103
		ResponseHeader pageHeader = page.getResponseHeader();
104
		assertEquals(publicationsQuery, pageHeader.getQuery());
105
		assertEquals(100, pageHeader.getPageSize());
104
		assertEquals("unexpected query",publicationsQuery, pageHeader.getQuery());
105
		assertEquals("unexpected page size", 100, pageHeader.getPageSize());
106 106
	}
107 107

  
108 108
	//Ignored just because it takes long time...
......
153 153
		System.out.println(uri);
154 154
		String results = getApiClient().doRequest(EntityType.publication, ApiModel.openaire, uri);
155 155
		OpenAireDocumentPage page = new OpenAireDocumentPage(DocumentHelper.parseText(results));
156
		assertTrue(page.allWithECFunding());
156
		assertTrue("not all entities with EC funding", page.allWithECFunding());
157 157
	}
158 158

  
159 159
	@Test
......
164 164
		System.out.println(uri);
165 165
		String results = getApiClient().doRequest(EntityType.publication, ApiModel.openaire, uri);
166 166
		OpenAireDocumentPage page = new OpenAireDocumentPage(DocumentHelper.parseText(results));
167
		assertTrue(page.allWithWTFunding());
167
		assertTrue("not all entities with WT funding", page.allWithWTFunding());
168 168
	}
169 169

  
170 170
	@Test
......
175 175
		System.out.println(uri1);
176 176
		String results = getApiClient().doRequest(EntityType.publication, ApiModel.openaire, uri1);
177 177
		OpenAireDocumentPage pageWT = new OpenAireDocumentPage(DocumentHelper.parseText(results));
178
		assertTrue(pageWT.allWithWTFunding());
179

  
180
		URIBuilder builderUK = new URIBuilder(requestBaseURL).setPath(publicationsPath);
181
		builderUK.addParameter("hasWTFunding", "true");
182
		URI uri2 = builderUK.build();
183
		System.out.println(uri2);
184
		String resultsUK = getApiClient().doRequest(EntityType.publication, ApiModel.openaire, uri2);
185
		OpenAireDocumentPage pageUK = new OpenAireDocumentPage(DocumentHelper.parseText(resultsUK));
186

  
187
		assertTrue(pageUK.getResponseHeader().getTotal() >= pageWT.getResponseHeader().getTotal());
178
		assertTrue("not all entities with WT funding",pageWT.allWithWTFunding());
188 179
	}
189 180

  
190 181
	@Test
......
196 187
		System.out.println(uri);
197 188
		String results = getApiClient().doRequest(EntityType.publication, ApiModel.openaire, uri);
198 189
		OpenAireDocumentPage page = new OpenAireDocumentPage(DocumentHelper.parseText(results));
199
		assertEquals(1, page.getResponseHeader().getTotal());
190
		assertEquals("unexpected number of results",1, page.getResponseHeader().getTotal());
200 191
		List<String> objIds = page.getObjIdentifiers();
201
		assertEquals(1, objIds.size());
202
		assertTrue(objIds.contains(testRecordId));
192
		assertTrue("unexpected objidentifier", objIds.contains(testRecordId));
203 193
	}
204 194

  
205 195
	@Test
......
212 202
		System.out.println(uri);
213 203
		String results = getApiClient().doRequest(EntityType.publication, ApiModel.openaire, uri);
214 204
		OpenAireDocumentPage page = new OpenAireDocumentPage(DocumentHelper.parseText(results));
215
		assertEquals(2, page.getResponseHeader().getTotal());
205
		assertEquals("unexpected number of results",2, page.getResponseHeader().getTotal());
216 206
		List<String> objIds = page.getObjIdentifiers();
217
		assertEquals(2, objIds.size());
218
		assertTrue(objIds.contains(testRecordId1));
219
		assertTrue(objIds.contains(testRecordId2));
207
		assertEquals("unexpected number of objidentifiers",2, objIds.size());
208
		assertTrue("objidentifier missing",objIds.contains(testRecordId1));
209
		assertTrue("objidentifier missing",objIds.contains(testRecordId2));
220 210
	}
221 211

  
222 212
	@Test
......
230 220
		System.out.println(uri);
231 221
		String results = getApiClient().doRequest(EntityType.publication, ApiModel.openaire, uri);
232 222
		OpenAireDocumentPage page = new OpenAireDocumentPage(DocumentHelper.parseText(results));
233
		assertEquals(2, page.getResponseHeader().getTotal());
223
		assertEquals("unexpected number of results",2, page.getResponseHeader().getTotal());
234 224
		List<String> objIds = page.getObjIdentifiers();
235
		assertEquals(2, objIds.size());
236
		assertTrue(objIds.contains(testRecordId1));
237
		assertTrue(objIds.contains(testRecordId2));
225
		assertEquals("unexpected number of objidentifiers",2, objIds.size());
226
		assertTrue("objidentifier missing",objIds.contains(testRecordId1));
227
		assertTrue("objidentifier missing",objIds.contains(testRecordId2));
238 228
	}
239 229

  
240 230
	@Test
......
246 236
		System.out.println(uri);
247 237
		String results = getApiClient().doRequest(EntityType.publication, ApiModel.openaire, uri);
248 238
		OpenAireDocumentPage page = new OpenAireDocumentPage(DocumentHelper.parseText(results));
249
		assertEquals(0, page.getResponseHeader().getTotal());
239
		assertEquals("unexpected number of results", 0, page.getResponseHeader().getTotal());
250 240
	}
251 241

  
252 242
	//TODO: Unignore the test when the path to the pid is fixed on the index side
......
261 251
		System.out.println(uri);
262 252
		String results = getApiClient().doRequest(EntityType.publication, ApiModel.openaire, uri);
263 253
		OpenAireDocumentPage page = new OpenAireDocumentPage(DocumentHelper.parseText(results));
264
		assertEquals(1, page.getResponseHeader().getTotal());
254
		assertEquals("unexpected number of results",1, page.getResponseHeader().getTotal());
265 255
		List<String> objIds = page.getObjIdentifiers();
266
		assertEquals(1, objIds.size());
267
		assertTrue(objIds.contains(testRecordId));
256
		assertEquals("unexpected number of objidentifiers",1, objIds.size());
257
		assertTrue("missing expected objidentifier", objIds.contains(testRecordId));
268 258
	}
269 259

  
270 260
	@Test
......
279 269
		System.out.println(uri);
280 270
		String results = getApiClient().doRequest(EntityType.publication, ApiModel.openaire, uri);
281 271
		OpenAireDocumentPage page = new OpenAireDocumentPage(DocumentHelper.parseText(results));
282
		assertTrue(page.getResponseHeader().getTotal() >= 2);
272
		assertTrue("unexpected number of results",page.getResponseHeader().getTotal() >= 2);
283 273
		List<String> objIds = page.getObjIdentifiers();
284
		assertEquals(page.getResponseHeader().getTotal(), objIds.size());
285
		assertTrue(objIds.contains(testRecordId1));
286
		assertTrue(objIds.contains(testRecordId2));
274
		assertEquals("unexpected number of objidentifiers",page.getResponseHeader().getTotal(), objIds.size());
275
		assertTrue("missing expected objidentifier",objIds.contains(testRecordId1));
276
		assertTrue("missing expected objidentifier",objIds.contains(testRecordId2));
287 277
	}
288 278

  
289 279
	@Test
......
296 286
		System.out.println(uri);
297 287
		String results = getApiClient().doRequest(EntityType.publication, ApiModel.openaire, uri);
298 288
		OpenAireDocumentPage page = new OpenAireDocumentPage(DocumentHelper.parseText(results));
299
		assertNotNull(page);
300
		assertEquals(expectedQuery, page.getResponseHeader().getQuery());
289
		assertNotNull("null page",page);
290
		assertEquals("unexpected query", expectedQuery, page.getResponseHeader().getQuery());
301 291
	}
302 292

  
303 293
	@Test
......
311 301
		String results = getApiClient().doRequest(EntityType.publication, ApiModel.openaire, uri);
312 302
		System.out.println(results.substring(0, 500));
313 303
		OpenAireDocumentPage page = new OpenAireDocumentPage(DocumentHelper.parseText(results));
314
		assertNotNull(page);
315
		assertEquals(expectedQuery, page.getResponseHeader().getQuery());
304
		assertNotNull("null page",page);
305
		assertEquals("unexpected query", expectedQuery, page.getResponseHeader().getQuery());
316 306
	}
317 307

  
318 308
	@Test
......
324 314
		System.out.println(uri);
325 315
		String results = getApiClient().doRequest(EntityType.publication, ApiModel.openaire, uri);
326 316
		OpenAireDocumentPage page = new OpenAireDocumentPage(DocumentHelper.parseText(results));
327
		assertNotNull(page);
328
		assertEquals(expectedQuery, page.getResponseHeader().getQuery());
317
		assertNotNull("null page",page);
318
		assertEquals("unexpected query", expectedQuery, page.getResponseHeader().getQuery());
329 319
	}
330 320

  
331 321
	@Test
......
337 327
		System.out.println(uri);
338 328
		String results = getApiClient().doRequest(EntityType.publication, ApiModel.openaire, uri);
339 329
		OpenAireDocumentPage page = new OpenAireDocumentPage(DocumentHelper.parseText(results));
340
		assertNotNull(page);
341
		assertEquals(expectedQuery, page.getResponseHeader().getQuery());
330
		assertNotNull("null page",page);
331
		assertEquals("unexpected query", expectedQuery, page.getResponseHeader().getQuery());
342 332
	}
343 333

  
344 334

  
345
	// Expect exception because the openaireAuthorID field must not be accepted
346
	@Test(expected=IllegalArgumentException.class)
335
	@Test
347 336
	public void testPublicationsByAuthorId() throws URISyntaxException, DocumentException{
348 337
		String authorId = "od______2367::3fbd0b3533bd0e6089c1fe68b115f772";
349 338
		URIBuilder builder = new URIBuilder(requestBaseURL).setPath(publicationsPath).addParameter("openaireAuthorID", authorId);
......
351 340
		System.out.println(uri);
352 341
		String results = getApiClient().doRequest(EntityType.publication, ApiModel.openaire, uri);
353 342
		OpenAireDocumentPage page = new OpenAireDocumentPage(DocumentHelper.parseText(results));
354
		assertNotNull(page);
343
		assertNotNull("null page",page);
344
		checkException(results, "java.lang.IllegalArgumentException");
355 345
	}
356 346

  
357 347
	@Test
......
364 354
		System.out.println(uri);
365 355
		String results = getApiClient().doRequest(EntityType.publication, ApiModel.openaire, uri);
366 356
		OpenAireDocumentPage page = new OpenAireDocumentPage(DocumentHelper.parseText(results));
367
		assertNotNull(page);
368
		assertEquals(expectedQuery, page.getResponseHeader().getQuery());
357
		assertNotNull("null page",page);
358
		assertEquals("unexpected query", expectedQuery, page.getResponseHeader().getQuery());
369 359
	}
370 360

  
371 361
	@Test
......
379 369
		System.out.println(uri);
380 370
		String results = getApiClient().doRequest(EntityType.publication, ApiModel.openaire, uri);
381 371
		OpenAireDocumentPage page = new OpenAireDocumentPage(DocumentHelper.parseText(results));
382
		assertNotNull(page);
383
		assertEquals(expectedQuery, page.getResponseHeader().getQuery());
372
		assertNotNull("null page",page);
373
		assertEquals("unexpected query", expectedQuery, page.getResponseHeader().getQuery());
384 374
	}
385 375

  
386 376
	@Test
......
396 386
		System.out.println(uri);
397 387
		String results = getApiClient().doRequest(EntityType.publication, ApiModel.openaire, uri);
398 388
		OpenAireDocumentPage page = new OpenAireDocumentPage(DocumentHelper.parseText(results));
399
		assertNotNull(page);
400
		assertEquals(expectedQuery, page.getResponseHeader().getQuery());
389
		assertNotNull("null page",page);
390
		assertEquals("unexpected query", expectedQuery, page.getResponseHeader().getQuery());
401 391
	}
402 392

  
403 393
	@Test
......
430 420
		System.out.println(uri);
431 421
		String results = getApiClient().doRequest(EntityType.publication, ApiModel.openaire, uri);
432 422
		OpenAireDocumentPage page = new OpenAireDocumentPage(DocumentHelper.parseText(results));
433
		assertNotNull(page);
434
		assertEquals(expectedQuery, page.getResponseHeader().getQuery());
423
		assertNotNull("null page",page);
424
		assertEquals("unexpected query", expectedQuery, page.getResponseHeader().getQuery());
435 425
	}
436 426

  
437 427
	@Test
......
442 432
		System.out.println(uri);
443 433
		String results = getApiClient().doRequest(EntityType.publication, ApiModel.openaire, uri);
444 434
		OpenAireDocumentPage page = new OpenAireDocumentPage(DocumentHelper.parseText(results));
445
		assertNotNull(page);
446
		assertEquals(expectedQuery, page.getResponseHeader().getQuery());
435
		assertNotNull("null page",page);
436
		assertEquals("unexpected query", expectedQuery, page.getResponseHeader().getQuery());
447 437
	}
448 438

  
449 439
	@Test
......
454 444
		System.out.println(uri);
455 445
		String results = getApiClient().doRequest(EntityType.publication, ApiModel.openaire, uri);
456 446
		OpenAireDocumentPage page = new OpenAireDocumentPage(DocumentHelper.parseText(results));
457
		assertNotNull(page);
458
		assertEquals(expectedQuery, page.getResponseHeader().getQuery());
447
		assertNotNull("null page",page);
448
		assertEquals("unexpected query", expectedQuery, page.getResponseHeader().getQuery());
459 449
	}
460 450

  
461 451
	@Test
......
466 456
		System.out.println(uri);
467 457
		String results = getApiClient().doRequest(EntityType.publication, ApiModel.openaire, uri);
468 458
		OpenAireDocumentPage page = new OpenAireDocumentPage(DocumentHelper.parseText(results));
469
		assertNotNull(page);
470
		assertEquals(expectedQuery, page.getResponseHeader().getQuery());
459
		assertNotNull("null page",page);
460
		assertEquals("unexpected query", expectedQuery, page.getResponseHeader().getQuery());
471 461
	}
472 462
}

Also available in: Unified diff