Project

General

Profile

« Previous | Next » 

Revision 6397

changes for schema update (d1_common)

View differences:

CNodeServiceTest.java
116 116
			Identifier guid = new Identifier();
117 117
			guid.setValue("testRegisterSystemMetadata." + System.currentTimeMillis());
118 118
			SystemMetadata sysmeta = createSystemMetadata(guid, session.getSubject(), null);
119
			boolean result = CNodeService.getInstance().registerSystemMetadata(session, guid, sysmeta);
120
			assertTrue(result);
119
			Identifier retGuid = CNodeService.getInstance().registerSystemMetadata(session, guid, sysmeta);
120
			assertEquals(guid.getValue(), retGuid.getValue());
121 121
        } catch(Exception e) {
122 122
            fail("Unexpected error: " + e.getMessage());
123 123
        }
......
134 134
			Identifier guid = new Identifier();
135 135
			guid.setValue("testGetSystemMetadata." + System.currentTimeMillis());
136 136
			SystemMetadata sysmeta = createSystemMetadata(guid, session.getSubject(), null);
137
			boolean result = CNodeService.getInstance().registerSystemMetadata(session, guid, sysmeta);
138
			assertTrue(result);
137
			Identifier retGuid = CNodeService.getInstance().registerSystemMetadata(session, guid, sysmeta);
138
			assertEquals(guid.getValue(), retGuid.getValue());
139 139
			// get it
140 140
			SystemMetadata retSysmeta = CNodeService.getInstance().getSystemMetadata(session, guid);
141 141
			// check it
......
196 196
			InputStream object = new ByteArrayInputStream("test".getBytes("UTF-8"));
197 197
			SystemMetadata sysmeta = createSystemMetadata(guid, session.getSubject(), object);
198 198
			Identifier pid = CNodeService.getInstance().create(session, guid, object, sysmeta);
199
			assertEquals(guid, pid);
199
			assertEquals(guid.getValue(), pid.getValue());
200 200
			// get it
201 201
			InputStream retObject = CNodeService.getInstance().get(session, pid);
202 202
			// check it
......
220 220
			describePid.setValue("describePid." + System.currentTimeMillis());
221 221
			//sysmeta.addDescribe(describePid);
222 222
			// save it
223
			boolean result = CNodeService.getInstance().registerSystemMetadata(session, guid, sysmeta);
224
			assertTrue(result);
223
			Identifier retGuid = CNodeService.getInstance().registerSystemMetadata(session, guid, sysmeta);
224
			assertEquals(guid.getValue(), retGuid.getValue());
225 225
			// save the other
226 226
			SystemMetadata describeSysmeta = createSystemMetadata(describePid, session.getSubject(), null);
227
			result = CNodeService.getInstance().registerSystemMetadata(session, describePid, describeSysmeta);
228
			assertTrue(result);
227
			Identifier retDescribePid = CNodeService.getInstance().registerSystemMetadata(session, describePid, describeSysmeta);
228
			assertEquals(describePid.getValue(), retDescribePid.getValue());
229 229
			// check it
230
			result = CNodeService.getInstance().assertRelation(session, guid, "describes", describePid);
230
			boolean result = CNodeService.getInstance().assertRelation(session, guid, "describes", describePid);
231 231
			assertTrue(result);
232 232
        } catch(Exception e) {
233 233
        	e.printStackTrace();
......
244 244
			guid.setValue("testChecksum." + System.currentTimeMillis());
245 245
			SystemMetadata sysmeta = createSystemMetadata(guid, session.getSubject(), null);
246 246
			// save it
247
			boolean result = CNodeService.getInstance().registerSystemMetadata(session, guid, sysmeta);
248
			assertTrue(result);
247
			Identifier retGuid = CNodeService.getInstance().registerSystemMetadata(session, guid, sysmeta);
248
			assertEquals(guid.getValue(), retGuid.getValue());
249 249
			// check it
250 250
			Checksum checksum = CNodeService.getInstance().getChecksum(session, guid);
251 251
			assertEquals(sysmeta.getChecksum().getValue(), checksum.getValue());
......
296 296
			SystemMetadata sysmeta = createSystemMetadata(guid, session.getSubject(), null);
297 297
			
298 298
			// save it
299
			boolean result = CNodeService.getInstance().registerSystemMetadata(session, guid, sysmeta);
300
			assertTrue(result);
299
			Identifier retGuid = CNodeService.getInstance().registerSystemMetadata(session, guid, sysmeta);
300
			assertEquals(guid.getValue(), retGuid.getValue());
301 301
			// search for it
302 302
			ObjectList objectList = CNodeService.getInstance().search(session, null, null);
303 303
			// check it
304 304
			assertNotNull(objectList);
305
			result = false;
305
			boolean result = false;
306 306
			for (ObjectInfo objectInfo: objectList.getObjectInfoList()) {
307 307
				Identifier pid = objectInfo.getIdentifier();
308 308
				if (pid.getValue().equals(guid.getValue())) {
......
325 325
			guid.setValue("testSetOwner." + System.currentTimeMillis());
326 326
			SystemMetadata sysmeta = createSystemMetadata(guid, session.getSubject(), null);
327 327
			// save it
328
			boolean result = CNodeService.getInstance().registerSystemMetadata(session, guid, sysmeta);
329
			assertTrue(result);
328
			Identifier retGuid = CNodeService.getInstance().registerSystemMetadata(session, guid, sysmeta);
329
			assertEquals(guid.getValue(), retGuid.getValue());
330 330
			Subject rightsHolder = new Subject();
331 331
			rightsHolder.setValue("newUser");
332 332
			// set it
......
352 352
			guid.setValue("testSetAccessPolicy." + System.currentTimeMillis());
353 353
			SystemMetadata sysmeta = createSystemMetadata(guid, session.getSubject(), null);
354 354
			// save it
355
			boolean result = CNodeService.getInstance().registerSystemMetadata(session, guid, sysmeta);
356
			assertTrue(result);
355
			Identifier retGuid = CNodeService.getInstance().registerSystemMetadata(session, guid, sysmeta);
356
			assertEquals(guid.getValue(), retGuid.getValue());
357 357
			AccessPolicy accessPolicy = new AccessPolicy();
358 358
			AccessRule accessRule = new AccessRule();
359 359
			accessRule.addPermission(Permission.WRITE);
......
362 362
			accessRule.addSubject(publicSubject);
363 363
			accessPolicy.addAllow(accessRule);
364 364
			// set it
365
			result = CNodeService.getInstance().setAccessPolicy(session, guid, accessPolicy );
365
			boolean result = CNodeService.getInstance().setAccessPolicy(session, guid, accessPolicy );
366 366
			assertTrue(result);
367 367
			// check it
368 368
			result = CNodeService.getInstance().isAuthorized(session, guid, Permission.WRITE);
......
381 381
			guid.setValue("testIsAuthorized." + System.currentTimeMillis());
382 382
			SystemMetadata sysmeta = createSystemMetadata(guid, session.getSubject(), null);
383 383
			// save it
384
			boolean result = CNodeService.getInstance().registerSystemMetadata(session, guid, sysmeta);
385
			assertTrue(result);
384
			Identifier retGuid = CNodeService.getInstance().registerSystemMetadata(session, guid, sysmeta);
385
			assertEquals(guid.getValue(), retGuid.getValue());
386 386
			// check it
387 387
			Subject publicSubject = new Subject();
388 388
			publicSubject.setValue(Constants.PUBLIC_SUBJECT);
389 389
			session.setSubject(publicSubject);
390 390
			// public read
391
			result = CNodeService.getInstance().isAuthorized(session, guid, Permission.READ);
391
			boolean result = CNodeService.getInstance().isAuthorized(session, guid, Permission.READ);
392 392
			assertTrue(result);
393 393
			// not public write
394 394
			try {
......
413 413
			guid.setValue("testReplicationPolicy." + System.currentTimeMillis());
414 414
			SystemMetadata sysmeta = createSystemMetadata(guid, session.getSubject(), null);
415 415
			// save it
416
			boolean result = CNodeService.getInstance().registerSystemMetadata(session, guid, sysmeta);
417
			assertTrue(result);
416
			Identifier retGuid = CNodeService.getInstance().registerSystemMetadata(session, guid, sysmeta);
417
			assertEquals(guid.getValue(), retGuid.getValue());
418 418
			
419 419
			ReplicationPolicy policy = new ReplicationPolicy();
420 420
			NodeReference node = new NodeReference();
421 421
			node.setValue("testNode");
422 422
			policy.addPreferredMemberNode(node );
423 423
			// set it
424
			result = CNodeService.getInstance().setReplicationPolicy(session, guid, policy);
424
			boolean result = CNodeService.getInstance().setReplicationPolicy(session, guid, policy);
425 425
			assertTrue(result);
426 426
			// get it
427 427
			sysmeta = CNodeService.getInstance().getSystemMetadata(session, guid);
......
450 450
			replica.setReplicaVerified(new Date());
451 451
			sysmeta.addReplica(replica );
452 452
			// save it
453
			boolean result = CNodeService.getInstance().registerSystemMetadata(session, guid, sysmeta);
454
			assertTrue(result);
453
			Identifier retGuid = CNodeService.getInstance().registerSystemMetadata(session, guid, sysmeta);
454
			assertEquals(guid.getValue(), retGuid.getValue());
455 455
			// set it
456 456
			ReplicationStatus status = ReplicationStatus.COMPLETED;
457
			result = CNodeService.getInstance().setReplicationStatus(session, guid, status);
457
			boolean result = CNodeService.getInstance().setReplicationStatus(session, guid, status);
458 458
			assertTrue(result);
459 459
			// get it
460 460
			sysmeta = CNodeService.getInstance().getSystemMetadata(session, guid);

Also available in: Unified diff