Revision 6542
Added by ben leinfelder over 12 years ago
| MNodeServiceTest.java | ||
|---|---|---|
| 165 | 165 |
guid.setValue("testGet." + System.currentTimeMillis());
|
| 166 | 166 |
InputStream object = new ByteArrayInputStream("test".getBytes("UTF-8"));
|
| 167 | 167 |
SystemMetadata sysmeta = createSystemMetadata(guid, session.getSubject(), object); |
| 168 |
Identifier pid = MNodeService.getInstance().create(session, guid, object, sysmeta); |
|
| 169 |
InputStream result = MNodeService.getInstance().get(session, guid); |
|
| 168 |
Identifier pid = MNodeService.getInstance(request).create(session, guid, object, sysmeta);
|
|
| 169 |
InputStream result = MNodeService.getInstance(request).get(session, guid);
|
|
| 170 | 170 |
// go back to beginning of original stream |
| 171 | 171 |
object.reset(); |
| 172 | 172 |
// check |
| ... | ... | |
| 238 | 238 |
guid.setValue("testGetSystemMetadata." + System.currentTimeMillis());
|
| 239 | 239 |
InputStream object = new ByteArrayInputStream("test".getBytes("UTF-8"));
|
| 240 | 240 |
SystemMetadata sysmeta = createSystemMetadata(guid, session.getSubject(), object); |
| 241 |
Identifier pid = MNodeService.getInstance().create(session, guid, object, sysmeta); |
|
| 242 |
SystemMetadata newsysmeta = MNodeService.getInstance().getSystemMetadata(session, pid); |
|
| 241 |
Identifier pid = MNodeService.getInstance(request).create(session, guid, object, sysmeta);
|
|
| 242 |
SystemMetadata newsysmeta = MNodeService.getInstance(request).getSystemMetadata(session, pid);
|
|
| 243 | 243 |
assertEquals(newsysmeta.getIdentifier().getValue(), sysmeta.getIdentifier().getValue()); |
| 244 | 244 |
|
| 245 | 245 |
} catch (UnsupportedEncodingException e) {
|
| ... | ... | |
| 306 | 306 |
guid.setValue("testCreate." + System.currentTimeMillis());
|
| 307 | 307 |
InputStream object = new ByteArrayInputStream("test".getBytes("UTF-8"));
|
| 308 | 308 |
SystemMetadata sysmeta = createSystemMetadata(guid, session.getSubject(), object); |
| 309 |
Identifier pid = MNodeService.getInstance().create(session, guid, object, sysmeta); |
|
| 309 |
Identifier pid = MNodeService.getInstance(request).create(session, guid, object, sysmeta);
|
|
| 310 | 310 |
assertEquals(guid.getValue(), pid.getValue()); |
| 311 | 311 |
} catch (UnsupportedEncodingException e) {
|
| 312 | 312 |
e.printStackTrace(); |
| ... | ... | |
| 368 | 368 |
guid.setValue("testDelete." + System.currentTimeMillis());
|
| 369 | 369 |
InputStream object = new ByteArrayInputStream("test".getBytes("UTF-8"));
|
| 370 | 370 |
SystemMetadata sysmeta = createSystemMetadata(guid, session.getSubject(), object); |
| 371 |
Identifier pid = MNodeService.getInstance().create(session, guid, object, sysmeta); |
|
| 372 |
Identifier deletedPid = MNodeService.getInstance().delete(session, pid); |
|
| 371 |
Identifier pid = MNodeService.getInstance(request).create(session, guid, object, sysmeta);
|
|
| 372 |
Identifier deletedPid = MNodeService.getInstance(request).delete(session, pid);
|
|
| 373 | 373 |
assertEquals(pid.getValue(), deletedPid.getValue()); |
| 374 | 374 |
|
| 375 | 375 |
} catch (UnsupportedEncodingException e) {
|
| ... | ... | |
| 398 | 398 |
Identifier newPid = new Identifier(); |
| 399 | 399 |
newPid.setValue("testUpdate." + System.currentTimeMillis());
|
| 400 | 400 |
Identifier pid = |
| 401 |
MNodeService.getInstance().create(session, guid, object, sysmeta); |
|
| 401 |
MNodeService.getInstance(request).create(session, guid, object, sysmeta);
|
|
| 402 | 402 |
|
| 403 | 403 |
SystemMetadata newSysMeta = createSystemMetadata(newPid, session.getSubject(), object); |
| 404 | 404 |
|
| 405 | 405 |
// do the update |
| 406 | 406 |
Identifier updatedPid = |
| 407 |
MNodeService.getInstance().update(session, pid, object, newPid, newSysMeta); |
|
| 407 |
MNodeService.getInstance(request).update(session, pid, object, newPid, newSysMeta);
|
|
| 408 | 408 |
|
| 409 | 409 |
// get the updated system metadata |
| 410 | 410 |
SystemMetadata updatedSysMeta = |
| 411 |
MNodeService.getInstance().getSystemMetadata(session, updatedPid); |
|
| 411 |
MNodeService.getInstance(request).getSystemMetadata(session, updatedPid);
|
|
| 412 | 412 |
|
| 413 | 413 |
assertEquals(updatedPid.getValue(), newPid.getValue()); |
| 414 | 414 |
// assertTrue(updatedSysMeta.getObsolete(0).getValue().equals(pid.getValue())); |
| ... | ... | |
| 476 | 476 |
InputStream object = new ByteArrayInputStream("test".getBytes("UTF-8"));
|
| 477 | 477 |
SystemMetadata sysmeta = createSystemMetadata(guid, session.getSubject(), object); |
| 478 | 478 |
// save locally |
| 479 |
Identifier pid = MNodeService.getInstance().create(session, guid, object, sysmeta); |
|
| 479 |
Identifier pid = MNodeService.getInstance(request).create(session, guid, object, sysmeta);
|
|
| 480 | 480 |
// get our node reference (attempting to replicate with self) |
| 481 |
NodeReference sourceNode = MNodeService.getInstance().getCapabilities().getIdentifier(); |
|
| 481 |
NodeReference sourceNode = MNodeService.getInstance(request).getCapabilities().getIdentifier();
|
|
| 482 | 482 |
// attempt to replicate with ourselves -- this should fail! |
| 483 | 483 |
boolean result = false; |
| 484 | 484 |
try {
|
| 485 |
result = MNodeService.getInstance().replicate(session, sysmeta, sourceNode); |
|
| 485 |
result = MNodeService.getInstance(request).replicate(session, sysmeta, sourceNode);
|
|
| 486 | 486 |
} catch (Exception inu) {
|
| 487 | 487 |
// we are expecting this to fail since we already have the doc |
| 488 | 488 |
result = true; |
| ... | ... | |
| 506 | 506 |
guid.setValue("testGetSystemMetadata." + System.currentTimeMillis());
|
| 507 | 507 |
InputStream object = new ByteArrayInputStream("test".getBytes("UTF-8"));
|
| 508 | 508 |
SystemMetadata sysmeta = createSystemMetadata(guid, session.getSubject(), object); |
| 509 |
Identifier pid = MNodeService.getInstance().create(session, guid, object, sysmeta); |
|
| 510 |
DescribeResponse describeResponse = MNodeService.getInstance().describe(session, pid); |
|
| 509 |
Identifier pid = MNodeService.getInstance(request).create(session, guid, object, sysmeta);
|
|
| 510 |
DescribeResponse describeResponse = MNodeService.getInstance(request).describe(session, pid);
|
|
| 511 | 511 |
assertEquals(describeResponse.getDataONE_Checksum().getValue(), sysmeta.getChecksum().getValue()); |
| 512 | 512 |
assertEquals(describeResponse.getDataONE_ObjectFormatIdentifier(), sysmeta.getFmtid()); |
| 513 | 513 |
|
| ... | ... | |
| 574 | 574 |
guid.setValue("testGetChecksum." + System.currentTimeMillis());
|
| 575 | 575 |
InputStream object = new ByteArrayInputStream("test".getBytes("UTF-8"));
|
| 576 | 576 |
SystemMetadata sysmeta = createSystemMetadata(guid, session.getSubject(), object); |
| 577 |
Identifier pid = MNodeService.getInstance().create(session, guid, object, sysmeta); |
|
| 578 |
Checksum checksum = MNodeService.getInstance().getChecksum(session, pid, "MD5"); |
|
| 577 |
Identifier pid = MNodeService.getInstance(request).create(session, guid, object, sysmeta);
|
|
| 578 |
Checksum checksum = MNodeService.getInstance(request).getChecksum(session, pid, "MD5");
|
|
| 579 | 579 |
assertEquals(checksum.getValue(), sysmeta.getChecksum().getValue()); |
| 580 | 580 |
|
| 581 | 581 |
} catch (UnsupportedEncodingException e) {
|
| ... | ... | |
| 651 | 651 |
testCreate(); |
| 652 | 652 |
// now check that we have at least one |
| 653 | 653 |
ObjectList objectList = |
| 654 |
MNodeService.getInstance().listObjects(session, startTime, endTime, |
|
| 654 |
MNodeService.getInstance(request).listObjects(session, startTime, endTime,
|
|
| 655 | 655 |
objectFormatId, replicaStatus, start, count); |
| 656 | 656 |
assertNotNull(objectList); |
| 657 | 657 |
assertTrue(objectList.getCount() == count); |
| ... | ... | |
| 668 | 668 |
public void testGetCapabilities() {
|
| 669 | 669 |
printTestHeader("testGetCapabilities");
|
| 670 | 670 |
try {
|
| 671 |
Node node = MNodeService.getInstance().getCapabilities(); |
|
| 671 |
Node node = MNodeService.getInstance(request).getCapabilities();
|
|
| 672 | 672 |
assertNotNull(node); |
| 673 | 673 |
// TODO: should probably test other parts of the node information |
| 674 | 674 |
} catch (Exception e) {
|
| ... | ... | |
| 686 | 686 |
Date startTime = sdf.parse("2010-01-01");
|
| 687 | 687 |
Date endTime = new Date(); |
| 688 | 688 |
MonitorList monitorList = |
| 689 |
MNodeService.getInstance().getOperationStatistics( |
|
| 689 |
MNodeService.getInstance(request).getOperationStatistics(
|
|
| 690 | 690 |
session, |
| 691 | 691 |
startTime, |
| 692 | 692 |
endTime, |
| ... | ... | |
| 706 | 706 |
public void testPing() {
|
| 707 | 707 |
|
| 708 | 708 |
try {
|
| 709 |
boolean pingable = MNodeService.getInstance().ping(); |
|
| 709 |
boolean pingable = MNodeService.getInstance(request).ping();
|
|
| 710 | 710 |
assertTrue(pingable); |
| 711 | 711 |
|
| 712 | 712 |
} catch (NotImplemented e) {
|
| ... | ... | |
| 747 | 747 |
pid.setValue("testSynchronizationFailed." + System.currentTimeMillis());
|
| 748 | 748 |
InputStream object = new ByteArrayInputStream("test".getBytes("UTF-8"));
|
| 749 | 749 |
SystemMetadata sysmeta = createSystemMetadata(pid, session.getSubject(), object); |
| 750 |
Identifier retPid = MNodeService.getInstance().create(session, pid, object, sysmeta); |
|
| 750 |
Identifier retPid = MNodeService.getInstance(request).create(session, pid, object, sysmeta);
|
|
| 751 | 751 |
assertEquals(retPid.getValue(), pid.getValue()); |
| 752 | 752 |
|
| 753 | 753 |
// pretend the sync failed |
| 754 | 754 |
SynchronizationFailed syncFailed = |
| 755 | 755 |
new SynchronizationFailed("0000", "Testing Synch Failure");
|
| 756 | 756 |
syncFailed.setPid(pid.getValue()); |
| 757 |
MNodeService.getInstance().synchronizationFailed(session, syncFailed ); |
|
| 757 |
MNodeService.getInstance(request).synchronizationFailed(session, syncFailed );
|
|
| 758 | 758 |
} catch (Exception e) {
|
| 759 | 759 |
e.printStackTrace(); |
| 760 | 760 |
fail("Unexpected error: " + e.getMessage());
|
| ... | ... | |
| 778 | 778 |
int count = 1; |
| 779 | 779 |
|
| 780 | 780 |
try {
|
| 781 |
log = MNodeService.getInstance().getLogRecords(session, fromDate, toDate, |
|
| 781 |
log = MNodeService.getInstance(request).getLogRecords(session, fromDate, toDate,
|
|
| 782 | 782 |
event, start, count); |
| 783 | 783 |
|
| 784 | 784 |
assertNotNull(log); |
| ... | ... | |
| 825 | 825 |
InputStream object = new ByteArrayInputStream("test".getBytes("UTF-8"));
|
| 826 | 826 |
SystemMetadata sysmeta = createSystemMetadata(guid, session.getSubject(), object); |
| 827 | 827 |
Identifier pid = |
| 828 |
MNodeService.getInstance().create(session, guid, object, sysmeta); |
|
| 828 |
MNodeService.getInstance(request).create(session, guid, object, sysmeta);
|
|
| 829 | 829 |
// set the access |
| 830 | 830 |
AccessPolicy accessPolicy = new AccessPolicy(); |
| 831 | 831 |
AccessRule allow = new AccessRule(); |
| ... | ... | |
| 836 | 836 |
accessPolicy.addAllow(allow); |
| 837 | 837 |
|
| 838 | 838 |
accessWasSet = |
| 839 |
MNodeService.getInstance().setAccessPolicy(session, pid, accessPolicy); |
|
| 839 |
MNodeService.getInstance(request).setAccessPolicy(session, pid, accessPolicy);
|
|
| 840 | 840 |
assertTrue(accessWasSet); |
| 841 | 841 |
// test that it is enforced |
| 842 | 842 |
session.setSubject(publicSubject); |
| 843 |
boolean isAuthorized = MNodeService.getInstance().isAuthorized(session, pid, Permission.WRITE); |
|
| 843 |
boolean isAuthorized = MNodeService.getInstance(request).isAuthorized(session, pid, Permission.WRITE);
|
|
| 844 | 844 |
assertTrue(isAuthorized); |
| 845 | 845 |
|
| 846 | 846 |
} catch (UnsupportedEncodingException e) {
|
| ... | ... | |
| 907 | 907 |
InputStream object = new ByteArrayInputStream("test".getBytes("UTF-8"));
|
| 908 | 908 |
SystemMetadata sysmeta = createSystemMetadata(guid, session.getSubject(), object); |
| 909 | 909 |
Identifier pid = |
| 910 |
MNodeService.getInstance().create(session, guid, object, sysmeta); |
|
| 910 |
MNodeService.getInstance(request).create(session, guid, object, sysmeta);
|
|
| 911 | 911 |
boolean isAuthorized = |
| 912 |
MNodeService.getInstance().isAuthorized(session, pid, Permission.READ); |
|
| 912 |
MNodeService.getInstance(request).isAuthorized(session, pid, Permission.READ);
|
|
| 913 | 913 |
assertEquals(isAuthorized, true); |
| 914 | 914 |
|
| 915 | 915 |
} catch (UnsupportedEncodingException e) {
|
Also available in: Unified diff
add User-Agent logging to support D1 requirements