Mirroristas/CommunitySolidServer
2
0
Fork 0
mirror of https://github.com/CommunitySolidServer/CommunitySolidServer.git synced 2024-10-03 14:55:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: Rename internal activity vocabulary

Browse Source 
The original URL does not exist so should use an internal value for now.
Renamed to `activity` as predicates tend to be lower case.
This commit is contained in:
Joachim Van Herwegen 2023-02-07 13:25:13 +01:00
parent 40ad4a6170
commit 9e1e65cdb9
7 changed files with 57 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/http/ldp/PostOperationHandler.ts
View File

@ -44,7 +44,7 @@ export class PostOperationHandler extends OperationHandler {
} }
const changes = await this.store.addResource(operation.target, operation.body, operation.conditions); const changes = await this.store.addResource(operation.target, operation.body, operation.conditions);
const createdIdentifier = find(changes.keys(), (identifier): boolean => const createdIdentifier = find(changes.keys(), (identifier): boolean =>
Boolean(changes.get(identifier)?.has(SOLID_AS.terms.Activity, AS.terms.Create))); Boolean(changes.get(identifier)?.has(SOLID_AS.terms.activity, AS.terms.Create)));
if (!createdIdentifier) { if (!createdIdentifier) {
throw new InternalServerError('Operation was successful but no created identifier was returned.'); throw new InternalServerError('Operation was successful but no created identifier was returned.');
} }

2
src/storage/DataAccessorBasedStore.ts
View File

@ -708,6 +708,6 @@ export class DataAccessorBasedStore implements ResourceStore {
* @param activity - Which activity is taking place. * @param activity - Which activity is taking place.
*/ */
private addActivityMetadata(map: ChangeMap, id: ResourceIdentifier, activity: NamedNode): void { private addActivityMetadata(map: ChangeMap, id: ResourceIdentifier, activity: NamedNode): void {
map.set(id, new RepresentationMetadata(id, { [SOLID_AS.Activity]: activity })); map.set(id, new RepresentationMetadata(id, { [SOLID_AS.activity]: activity }));
} }
} }

2
src/storage/MonitoringStore.ts
View File

@ -55,7 +55,7 @@ export class MonitoringStore<T extends ResourceStore = ResourceStore>
private emitChanged(changes: ChangeMap): ChangeMap { private emitChanged(changes: ChangeMap): ChangeMap {
for (const [ identifier, metadata ] of changes) { for (const [ identifier, metadata ] of changes) {
const activity = metadata.get(SOLID_AS.terms.Activity); const activity = metadata.get(SOLID_AS.terms.activity);
if (this.isKnownActivity(activity)) { if (this.isKnownActivity(activity)) {
this.emit('changed', identifier, activity); this.emit('changed', identifier, activity);
this.emit(activity.value, identifier); this.emit(activity.value, identifier);

4
src/util/Vocabularies.ts
View File

@ -243,8 +243,8 @@ export const SOLID = createVocabulary('http://www.w3.org/ns/solid/terms#',
'InsertDeletePatch', 'InsertDeletePatch',
); );
export const SOLID_AS = createVocabulary('http://www.w3.org/ns/solid/activitystreams#', export const SOLID_AS = createVocabulary('urn:npm:solid:community-server:activity:',
'Activity', 'activity',
); );
export const SOLID_ERROR = createVocabulary('urn:npm:solid:community-server:error:', export const SOLID_ERROR = createVocabulary('urn:npm:solid:community-server:error:',

6
test/unit/http/ldp/PostOperationHandler.test.ts
View File

@ -23,8 +23,8 @@ describe('A PostOperationHandler', (): void => {
operation = { method: 'POST', target: { path: 'http://test.com/foo' }, body, conditions, preferences: {}}; operation = { method: 'POST', target: { path: 'http://test.com/foo' }, body, conditions, preferences: {}};
store = { store = {
addResource: jest.fn().mockResolvedValue(new IdentifierMap([ addResource: jest.fn().mockResolvedValue(new IdentifierMap([
[{ path: 'https://example.com/parent/newPath' }, new RepresentationMetadata({ [SOLID_AS.Activity]: AS.terms.Create }) ], [{ path: 'https://example.com/parent/newPath' }, new RepresentationMetadata({ [SOLID_AS.activity]: AS.terms.Create }) ],
[{ path: 'https://example.com/parent/' }, new RepresentationMetadata({ [SOLID_AS.Activity]: AS.terms.Update }) ], [{ path: 'https://example.com/parent/' }, new RepresentationMetadata({ [SOLID_AS.activity]: AS.terms.Update }) ],
])), ])),
} as any; } as any;
handler = new PostOperationHandler(store); handler = new PostOperationHandler(store);
@ -64,7 +64,7 @@ describe('A PostOperationHandler', (): void => {
it('errors if the store returns no created identifier.', async(): Promise<void> => { it('errors if the store returns no created identifier.', async(): Promise<void> => {
store.addResource.mockResolvedValueOnce(new IdentifierMap([ store.addResource.mockResolvedValueOnce(new IdentifierMap([
[{ path: 'https://example.com/parent/' }, new RepresentationMetadata({ [SOLID_AS.Activity]: AS.terms.Update }) ], [{ path: 'https://example.com/parent/' }, new RepresentationMetadata({ [SOLID_AS.activity]: AS.terms.Update }) ],
])); ]));
await expect(handler.handle({ operation })).rejects.toThrow(InternalServerError); await expect(handler.handle({ operation })).rejects.toThrow(InternalServerError);
}); });

80
test/unit/storage/DataAccessorBasedStore.test.ts
View File

@ -265,7 +265,7 @@ describe('A DataAccessorBasedStore', (): void => {
representation.metadata.add(RDF.terms.type, LDP.terms.Container); representation.metadata.add(RDF.terms.type, LDP.terms.Container);
const result = await store.addResource(resourceID, representation); const result = await store.addResource(resourceID, representation);
expect(result.size).toBe(2); expect(result.size).toBe(2);
expect(result.get(resourceID)?.get(SOLID_AS.terms.Activity)).toEqual(AS.terms.Update); expect(result.get(resourceID)?.get(SOLID_AS.terms.activity)).toEqual(AS.terms.Update);
const generatedID = [ ...result.keys() ].find((id): boolean => id.path !== resourceID.path)!; const generatedID = [ ...result.keys() ].find((id): boolean => id.path !== resourceID.path)!;
expect(generatedID).toBeDefined(); expect(generatedID).toBeDefined();
@ -278,7 +278,7 @@ describe('A DataAccessorBasedStore', (): void => {
const result = await store.addResource(resourceID, representation); const result = await store.addResource(resourceID, representation);
expect(result.size).toBe(2); expect(result.size).toBe(2);
expect(result.get(resourceID)?.get(SOLID_AS.terms.Activity)).toEqual(AS.terms.Update); expect(result.get(resourceID)?.get(SOLID_AS.terms.activity)).toEqual(AS.terms.Update);
const generatedID = [ ...result.keys() ].find((id): boolean => id.path !== resourceID.path)!; const generatedID = [ ...result.keys() ].find((id): boolean => id.path !== resourceID.path)!;
expect(generatedID).toBeDefined(); expect(generatedID).toBeDefined();
@ -287,7 +287,7 @@ describe('A DataAccessorBasedStore', (): void => {
expect(accessor.data[generatedID.path]).toBeDefined(); expect(accessor.data[generatedID.path]).toBeDefined();
await expect(arrayifyStream(accessor.data[generatedID.path].data)).resolves.toEqual([ resourceData ]); await expect(arrayifyStream(accessor.data[generatedID.path].data)).resolves.toEqual([ resourceData ]);
expect(accessor.data[generatedID.path].metadata.get(DC.terms.modified)?.value).toBe(now.toISOString()); expect(accessor.data[generatedID.path].metadata.get(DC.terms.modified)?.value).toBe(now.toISOString());
expect(result.get(generatedID)?.get(SOLID_AS.terms.Activity)).toEqual(AS.terms.Create); expect(result.get(generatedID)?.get(SOLID_AS.terms.activity)).toEqual(AS.terms.Create);
}); });
it('can write containers.', async(): Promise<void> => { it('can write containers.', async(): Promise<void> => {
@ -296,7 +296,7 @@ describe('A DataAccessorBasedStore', (): void => {
const result = await store.addResource(resourceID, representation); const result = await store.addResource(resourceID, representation);
expect(result.size).toBe(2); expect(result.size).toBe(2);
expect(result.get(resourceID)?.get(SOLID_AS.terms.Activity)).toEqual(AS.terms.Update); expect(result.get(resourceID)?.get(SOLID_AS.terms.activity)).toEqual(AS.terms.Update);
const generatedID = [ ...result.keys() ].find((id): boolean => id.path !== resourceID.path)!; const generatedID = [ ...result.keys() ].find((id): boolean => id.path !== resourceID.path)!;
expect(generatedID).toBeDefined(); expect(generatedID).toBeDefined();
@ -304,7 +304,7 @@ describe('A DataAccessorBasedStore', (): void => {
expect(accessor.data[generatedID.path]).toBeDefined(); expect(accessor.data[generatedID.path]).toBeDefined();
expect(accessor.data[generatedID.path].metadata.contentType).toBeUndefined(); expect(accessor.data[generatedID.path].metadata.contentType).toBeUndefined();
expect(result.get(generatedID)?.get(SOLID_AS.terms.Activity)).toEqual(AS.terms.Create); expect(result.get(generatedID)?.get(SOLID_AS.terms.activity)).toEqual(AS.terms.Create);
const { metadata } = await store.getRepresentation(generatedID); const { metadata } = await store.getRepresentation(generatedID);
expect(metadata.get(DC.terms.modified)?.value).toBe(now.toISOString()); expect(metadata.get(DC.terms.modified)?.value).toBe(now.toISOString());
@ -317,8 +317,8 @@ describe('A DataAccessorBasedStore', (): void => {
const result = await store.addResource(resourceID, representation); const result = await store.addResource(resourceID, representation);
expect(result.size).toBe(2); expect(result.size).toBe(2);
expect(result.get(resourceID)?.get(SOLID_AS.terms.Activity)).toEqual(AS.terms.Update); expect(result.get(resourceID)?.get(SOLID_AS.terms.activity)).toEqual(AS.terms.Update);
expect(result.get({ path: `${root}newName` })?.get(SOLID_AS.terms.Activity)).toEqual(AS.terms.Create); expect(result.get({ path: `${root}newName` })?.get(SOLID_AS.terms.activity)).toEqual(AS.terms.Create);
}); });
it('errors on a slug ending on / without Link rel:type Container header.', async(): Promise<void> => { it('errors on a slug ending on / without Link rel:type Container header.', async(): Promise<void> => {
@ -342,8 +342,8 @@ describe('A DataAccessorBasedStore', (): void => {
const result = await store.addResource(resourceID, representation); const result = await store.addResource(resourceID, representation);
expect(result.size).toBe(2); expect(result.size).toBe(2);
expect(result.get(resourceID)?.get(SOLID_AS.terms.Activity)).toEqual(AS.terms.Update); expect(result.get(resourceID)?.get(SOLID_AS.terms.activity)).toEqual(AS.terms.Update);
expect(result.get({ path: `${root}newContainer/` })?.get(SOLID_AS.terms.Activity)).toEqual(AS.terms.Create); expect(result.get({ path: `${root}newContainer/` })?.get(SOLID_AS.terms.activity)).toEqual(AS.terms.Create);
}); });
it('generates a new URI if adding the slug would create an existing URI.', async(): Promise<void> => { it('generates a new URI if adding the slug would create an existing URI.', async(): Promise<void> => {
@ -366,8 +366,8 @@ describe('A DataAccessorBasedStore', (): void => {
const result = await store.addResource(resourceID, representation); const result = await store.addResource(resourceID, representation);
expect(result.size).toBe(2); expect(result.size).toBe(2);
expect(result.get(resourceID)?.get(SOLID_AS.terms.Activity)).toEqual(AS.terms.Update); expect(result.get(resourceID)?.get(SOLID_AS.terms.activity)).toEqual(AS.terms.Update);
expect(result.get({ path: `${root}%26%26` })?.get(SOLID_AS.terms.Activity)).toEqual(AS.terms.Create); expect(result.get({ path: `${root}%26%26` })?.get(SOLID_AS.terms.activity)).toEqual(AS.terms.Create);
}); });
it('errors if the slug contains a slash.', async(): Promise<void> => { it('errors if the slug contains a slash.', async(): Promise<void> => {
@ -434,7 +434,7 @@ describe('A DataAccessorBasedStore', (): void => {
const result = await store.setRepresentation(resourceID, representation); const result = await store.setRepresentation(resourceID, representation);
expect(result.size).toBe(1); expect(result.size).toBe(1);
expect(result.get(resourceID)?.get(SOLID_AS.terms.Activity)).toEqual(AS.terms.Create); expect(result.get(resourceID)?.get(SOLID_AS.terms.activity)).toEqual(AS.terms.Create);
expect(mock).toHaveBeenCalledTimes(1); expect(mock).toHaveBeenCalledTimes(1);
expect(mock).toHaveBeenLastCalledWith(resourceID); expect(mock).toHaveBeenLastCalledWith(resourceID);
@ -459,8 +459,8 @@ describe('A DataAccessorBasedStore', (): void => {
const resourceID = { path: `${root}resource` }; const resourceID = { path: `${root}resource` };
const result = await store.setRepresentation(resourceID, representation); const result = await store.setRepresentation(resourceID, representation);
expect(result.size).toBe(2); expect(result.size).toBe(2);
expect(result.get({ path: root })?.get(SOLID_AS.terms.Activity)).toEqual(AS.terms.Update); expect(result.get({ path: root })?.get(SOLID_AS.terms.activity)).toEqual(AS.terms.Update);
expect(result.get(resourceID)?.get(SOLID_AS.terms.Activity)).toEqual(AS.terms.Create); expect(result.get(resourceID)?.get(SOLID_AS.terms.activity)).toEqual(AS.terms.Create);
await expect(arrayifyStream(accessor.data[resourceID.path].data)).resolves.toEqual([ resourceData ]); await expect(arrayifyStream(accessor.data[resourceID.path].data)).resolves.toEqual([ resourceData ]);
expect(accessor.data[resourceID.path].metadata.get(DC.terms.modified)?.value).toBe(now.toISOString()); expect(accessor.data[resourceID.path].metadata.get(DC.terms.modified)?.value).toBe(now.toISOString());
expect(accessor.data[root].metadata.get(DC.terms.modified)?.value).toBe(now.toISOString()); expect(accessor.data[root].metadata.get(DC.terms.modified)?.value).toBe(now.toISOString());
@ -476,8 +476,8 @@ describe('A DataAccessorBasedStore', (): void => {
representation.data = guardedStreamFrom([ `<${root}resource/> a <coolContainer>.` ]); representation.data = guardedStreamFrom([ `<${root}resource/> a <coolContainer>.` ]);
const result = await store.setRepresentation(resourceID, representation); const result = await store.setRepresentation(resourceID, representation);
expect(result.size).toBe(2); expect(result.size).toBe(2);
expect(result.get({ path: root })?.get(SOLID_AS.terms.Activity)).toEqual(AS.terms.Update); expect(result.get({ path: root })?.get(SOLID_AS.terms.activity)).toEqual(AS.terms.Update);
expect(result.get(resourceID)?.get(SOLID_AS.terms.Activity)).toEqual(AS.terms.Create); expect(result.get(resourceID)?.get(SOLID_AS.terms.activity)).toEqual(AS.terms.Create);
expect(accessor.data[resourceID.path]).toBeTruthy(); expect(accessor.data[resourceID.path]).toBeTruthy();
expect(accessor.data[resourceID.path].metadata.contentType).toBeUndefined(); expect(accessor.data[resourceID.path].metadata.contentType).toBeUndefined();
expect(accessor.data[resourceID.path].metadata.get(DC.terms.modified)?.value).toBe(now.toISOString()); expect(accessor.data[resourceID.path].metadata.get(DC.terms.modified)?.value).toBe(now.toISOString());
@ -489,8 +489,8 @@ describe('A DataAccessorBasedStore', (): void => {
const resourceID = { path: `${root}resource` }; const resourceID = { path: `${root}resource` };
const result = await store.setRepresentation(resourceID, representation); const result = await store.setRepresentation(resourceID, representation);
expect(result.size).toBe(2); expect(result.size).toBe(2);
expect(result.get({ path: root })?.get(SOLID_AS.terms.Activity)).toEqual(AS.terms.Update); expect(result.get({ path: root })?.get(SOLID_AS.terms.activity)).toEqual(AS.terms.Update);
expect(result.get(resourceID)?.get(SOLID_AS.terms.Activity)).toEqual(AS.terms.Create); expect(result.get(resourceID)?.get(SOLID_AS.terms.activity)).toEqual(AS.terms.Create);
await expect(arrayifyStream(accessor.data[resourceID.path].data)).resolves.toEqual([ resourceData ]); await expect(arrayifyStream(accessor.data[resourceID.path].data)).resolves.toEqual([ resourceData ]);
expect(accessor.data[resourceID.path].metadata.get(DC.terms.modified)?.value).toBe(now.toISOString()); expect(accessor.data[resourceID.path].metadata.get(DC.terms.modified)?.value).toBe(now.toISOString());
expect(accessor.data[root].metadata.get(DC.terms.modified)?.value).toBe(now.toISOString()); expect(accessor.data[root].metadata.get(DC.terms.modified)?.value).toBe(now.toISOString());
@ -500,7 +500,7 @@ describe('A DataAccessorBasedStore', (): void => {
mockDate.mockReturnValue(later); mockDate.mockReturnValue(later);
const result2 = await store.setRepresentation(resourceID, representation); const result2 = await store.setRepresentation(resourceID, representation);
expect(result2.size).toBe(1); expect(result2.size).toBe(1);
expect(result2.get(resourceID)?.get(SOLID_AS.terms.Activity)).toEqual(AS.terms.Update); expect(result2.get(resourceID)?.get(SOLID_AS.terms.activity)).toEqual(AS.terms.Update);
await expect(arrayifyStream(accessor.data[resourceID.path].data)).resolves.toEqual([ 'updatedText' ]); await expect(arrayifyStream(accessor.data[resourceID.path].data)).resolves.toEqual([ 'updatedText' ]);
expect(accessor.data[resourceID.path].metadata.get(DC.terms.modified)?.value).toBe(later.toISOString()); expect(accessor.data[resourceID.path].metadata.get(DC.terms.modified)?.value).toBe(later.toISOString());
expect(accessor.data[root].metadata.get(DC.terms.modified)?.value).toBe(now.toISOString()); expect(accessor.data[root].metadata.get(DC.terms.modified)?.value).toBe(now.toISOString());
@ -513,8 +513,8 @@ describe('A DataAccessorBasedStore', (): void => {
representation.metadata.add(namedNode('gen'), 'value', SOLID_META.terms.ResponseMetadata); representation.metadata.add(namedNode('gen'), 'value', SOLID_META.terms.ResponseMetadata);
const result = await store.setRepresentation(resourceID, representation); const result = await store.setRepresentation(resourceID, representation);
expect(result.size).toBe(2); expect(result.size).toBe(2);
expect(result.get({ path: root })?.get(SOLID_AS.terms.Activity)).toEqual(AS.terms.Update); expect(result.get({ path: root })?.get(SOLID_AS.terms.activity)).toEqual(AS.terms.Update);
expect(result.get(resourceID)?.get(SOLID_AS.terms.Activity)).toEqual(AS.terms.Create); expect(result.get(resourceID)?.get(SOLID_AS.terms.activity)).toEqual(AS.terms.Create);
await expect(arrayifyStream(accessor.data[resourceID.path].data)).resolves.toEqual([ resourceData ]); await expect(arrayifyStream(accessor.data[resourceID.path].data)).resolves.toEqual([ resourceData ]);
expect(accessor.data[resourceID.path].metadata.get(namedNode('notGen'))?.value).toBe('value'); expect(accessor.data[resourceID.path].metadata.get(namedNode('notGen'))?.value).toBe('value');
expect(accessor.data[resourceID.path].metadata.get(namedNode('gen'))).toBeUndefined(); expect(accessor.data[resourceID.path].metadata.get(namedNode('gen'))).toBeUndefined();
@ -526,8 +526,8 @@ describe('A DataAccessorBasedStore', (): void => {
const resourceID = { path: `${root}resource` }; const resourceID = { path: `${root}resource` };
const result = await store.setRepresentation(resourceID, representation); const result = await store.setRepresentation(resourceID, representation);
expect(result.size).toBe(2); expect(result.size).toBe(2);
expect(result.get({ path: root })?.get(SOLID_AS.terms.Activity)).toEqual(AS.terms.Create); expect(result.get({ path: root })?.get(SOLID_AS.terms.activity)).toEqual(AS.terms.Create);
expect(result.get(resourceID)?.get(SOLID_AS.terms.Activity)).toEqual(AS.terms.Create); expect(result.get(resourceID)?.get(SOLID_AS.terms.activity)).toEqual(AS.terms.Create);
await expect(arrayifyStream(accessor.data[resourceID.path].data)).resolves.toEqual([ resourceData ]); await expect(arrayifyStream(accessor.data[resourceID.path].data)).resolves.toEqual([ resourceData ]);
}); });
@ -535,10 +535,10 @@ describe('A DataAccessorBasedStore', (): void => {
const resourceID = { path: `${root}a/b/resource` }; const resourceID = { path: `${root}a/b/resource` };
const result = await store.setRepresentation(resourceID, representation); const result = await store.setRepresentation(resourceID, representation);
expect(result.size).toBe(4); expect(result.size).toBe(4);
expect(result.get({ path: root })?.get(SOLID_AS.terms.Activity)).toEqual(AS.terms.Update); expect(result.get({ path: root })?.get(SOLID_AS.terms.activity)).toEqual(AS.terms.Update);
expect(result.get({ path: `${root}a/` })?.get(SOLID_AS.terms.Activity)).toEqual(AS.terms.Create); expect(result.get({ path: `${root}a/` })?.get(SOLID_AS.terms.activity)).toEqual(AS.terms.Create);
expect(result.get({ path: `${root}a/b/` })?.get(SOLID_AS.terms.Activity)).toEqual(AS.terms.Create); expect(result.get({ path: `${root}a/b/` })?.get(SOLID_AS.terms.activity)).toEqual(AS.terms.Create);
expect(result.get({ path: `${root}a/b/resource` })?.get(SOLID_AS.terms.Activity)).toEqual(AS.terms.Create); expect(result.get({ path: `${root}a/b/resource` })?.get(SOLID_AS.terms.activity)).toEqual(AS.terms.Create);
await expect(arrayifyStream(accessor.data[resourceID.path].data)).resolves.toEqual([ resourceData ]); await expect(arrayifyStream(accessor.data[resourceID.path].data)).resolves.toEqual([ resourceData ]);
expect(accessor.data[`${root}a/`].metadata.getAll(RDF.terms.type).map((type): string => type.value)) expect(accessor.data[`${root}a/`].metadata.getAll(RDF.terms.type).map((type): string => type.value))
.toContain(LDP.Container); .toContain(LDP.Container);
@ -565,7 +565,7 @@ describe('A DataAccessorBasedStore', (): void => {
representation.data = guardedStreamFrom([]); representation.data = guardedStreamFrom([]);
const result = await store.setRepresentation(resourceID, representation); const result = await store.setRepresentation(resourceID, representation);
expect(result.size).toBe(1); expect(result.size).toBe(1);
expect(result.get(resourceID)?.get(SOLID_AS.terms.Activity)).toEqual(AS.terms.Create); expect(result.get(resourceID)?.get(SOLID_AS.terms.activity)).toEqual(AS.terms.Create);
expect(accessor.data[resourceID.path]).toBeTruthy(); expect(accessor.data[resourceID.path]).toBeTruthy();
expect(Object.keys(accessor.data)).toHaveLength(1); expect(Object.keys(accessor.data)).toHaveLength(1);
expect(accessor.data[resourceID.path].metadata.contentType).toBeUndefined(); expect(accessor.data[resourceID.path].metadata.contentType).toBeUndefined();
@ -583,7 +583,7 @@ describe('A DataAccessorBasedStore', (): void => {
) ], resourceID); ) ], resourceID);
const result = await store.setRepresentation(metaResourceID, metaRepresentation); const result = await store.setRepresentation(metaResourceID, metaRepresentation);
expect(result.get(resourceID)?.get(SOLID_AS.terms.Activity)).toEqual(AS.terms.Update); expect(result.get(resourceID)?.get(SOLID_AS.terms.activity)).toEqual(AS.terms.Update);
expect(accessor.data[resourceID.path].metadata.quads()).toBeRdfIsomorphic([ expect(accessor.data[resourceID.path].metadata.quads()).toBeRdfIsomorphic([
quad( quad(
namedNode(resourceID.path), namedNode(resourceID.path),
@ -606,7 +606,7 @@ describe('A DataAccessorBasedStore', (): void => {
const metaRepresentation = new BasicRepresentation(guardedStreamFrom(quads), resourceID, INTERNAL_QUADS); const metaRepresentation = new BasicRepresentation(guardedStreamFrom(quads), resourceID, INTERNAL_QUADS);
const result = await store.setRepresentation(metaResourceID, metaRepresentation); const result = await store.setRepresentation(metaResourceID, metaRepresentation);
expect(result.get(resourceID)?.get(SOLID_AS.terms.Activity)).toEqual(AS.terms.Update); expect(result.get(resourceID)?.get(SOLID_AS.terms.activity)).toEqual(AS.terms.Update);
expect(accessor.data[resourceID.path].metadata.quads()).toBeRdfIsomorphic(quads); expect(accessor.data[resourceID.path].metadata.quads()).toBeRdfIsomorphic(quads);
}); });
@ -770,8 +770,8 @@ describe('A DataAccessorBasedStore', (): void => {
accessor.data[resourceID.path] = representation; accessor.data[resourceID.path] = representation;
const result = await store.deleteResource(resourceID); const result = await store.deleteResource(resourceID);
expect(result.size).toBe(2); expect(result.size).toBe(2);
expect(result.get({ path: root })?.get(SOLID_AS.terms.Activity)).toEqual(AS.terms.Update); expect(result.get({ path: root })?.get(SOLID_AS.terms.activity)).toEqual(AS.terms.Update);
expect(result.get(resourceID)?.get(SOLID_AS.terms.Activity)).toEqual(AS.terms.Delete); expect(result.get(resourceID)?.get(SOLID_AS.terms.activity)).toEqual(AS.terms.Delete);
expect(accessor.data[resourceID.path]).toBeUndefined(); expect(accessor.data[resourceID.path]).toBeUndefined();
expect(accessor.data[root].metadata.get(DC.terms.modified)?.value).toBe(now.toISOString()); expect(accessor.data[root].metadata.get(DC.terms.modified)?.value).toBe(now.toISOString());
expect(accessor.data[root].metadata.get(GENERATED_PREDICATE)).toBeUndefined(); expect(accessor.data[root].metadata.get(GENERATED_PREDICATE)).toBeUndefined();
@ -781,7 +781,7 @@ describe('A DataAccessorBasedStore', (): void => {
accessor.data[root] = new BasicRepresentation(representation.data, containerMetadata); accessor.data[root] = new BasicRepresentation(representation.data, containerMetadata);
const result = await store.deleteResource({ path: root }); const result = await store.deleteResource({ path: root });
expect(result.size).toBe(1); expect(result.size).toBe(1);
expect(result.get({ path: root })?.get(SOLID_AS.terms.Activity)).toEqual(AS.terms.Delete); expect(result.get({ path: root })?.get(SOLID_AS.terms.activity)).toEqual(AS.terms.Delete);
expect(accessor.data[root]).toBeUndefined(); expect(accessor.data[root]).toBeUndefined();
}); });
@ -794,8 +794,8 @@ describe('A DataAccessorBasedStore', (): void => {
auxiliaryStrategy.isRequiredInRoot = jest.fn().mockReturnValue(true); auxiliaryStrategy.isRequiredInRoot = jest.fn().mockReturnValue(true);
const result = await store.deleteResource(auxResourceID); const result = await store.deleteResource(auxResourceID);
expect(result.size).toBe(2); expect(result.size).toBe(2);
expect(result.get(resourceID)?.get(SOLID_AS.terms.Activity)).toEqual(AS.terms.Update); expect(result.get(resourceID)?.get(SOLID_AS.terms.activity)).toEqual(AS.terms.Update);
expect(result.get(auxResourceID)?.get(SOLID_AS.terms.Activity)).toEqual(AS.terms.Delete); expect(result.get(auxResourceID)?.get(SOLID_AS.terms.activity)).toEqual(AS.terms.Delete);
expect(accessor.data[auxResourceID.path]).toBeUndefined(); expect(accessor.data[auxResourceID.path]).toBeUndefined();
}); });
@ -807,9 +807,9 @@ describe('A DataAccessorBasedStore', (): void => {
const result = await store.deleteResource(resourceID); const result = await store.deleteResource(resourceID);
expect(result.size).toBe(3); expect(result.size).toBe(3);
expect(result.get({ path: root })?.get(SOLID_AS.terms.Activity)).toEqual(AS.terms.Update); expect(result.get({ path: root })?.get(SOLID_AS.terms.activity)).toEqual(AS.terms.Update);
expect(result.get(resourceID)?.get(SOLID_AS.terms.Activity)).toEqual(AS.terms.Delete); expect(result.get(resourceID)?.get(SOLID_AS.terms.activity)).toEqual(AS.terms.Delete);
expect(result.get(auxResourceID)?.get(SOLID_AS.terms.Activity)).toEqual(AS.terms.Delete); expect(result.get(auxResourceID)?.get(SOLID_AS.terms.activity)).toEqual(AS.terms.Delete);
expect(accessor.data[resourceID.path]).toBeUndefined(); expect(accessor.data[resourceID.path]).toBeUndefined();
expect(accessor.data[auxResourceID.path]).toBeUndefined(); expect(accessor.data[auxResourceID.path]).toBeUndefined();
}); });
@ -830,8 +830,8 @@ describe('A DataAccessorBasedStore', (): void => {
logger.error = jest.fn(); logger.error = jest.fn();
const result = await store.deleteResource(resourceID); const result = await store.deleteResource(resourceID);
expect(result.size).toBe(2); expect(result.size).toBe(2);
expect(result.get({ path: root })?.get(SOLID_AS.terms.Activity)).toEqual(AS.terms.Update); expect(result.get({ path: root })?.get(SOLID_AS.terms.activity)).toEqual(AS.terms.Update);
expect(result.get(resourceID)?.get(SOLID_AS.terms.Activity)).toEqual(AS.terms.Delete); expect(result.get(resourceID)?.get(SOLID_AS.terms.activity)).toEqual(AS.terms.Delete);
expect(accessor.data[resourceID.path]).toBeUndefined(); expect(accessor.data[resourceID.path]).toBeUndefined();
expect(accessor.data[auxResourceID.path]).toBeDefined(); expect(accessor.data[auxResourceID.path]).toBeDefined();
expect(logger.error).toHaveBeenCalledTimes(1); expect(logger.error).toHaveBeenCalledTimes(1);

18
test/unit/storage/MonitoringStore.test.ts
View File

@ -16,20 +16,20 @@ describe('A MonitoringStore', (): void => {
let deletedCallback: () => void; let deletedCallback: () => void;
const addResourceReturnMock: ChangeMap = new IdentifierMap([ const addResourceReturnMock: ChangeMap = new IdentifierMap([
[{ path: 'http://example.org/foo/bar/new' }, new RepresentationMetadata({ [SOLID_AS.Activity]: AS.terms.Create }) ], [{ path: 'http://example.org/foo/bar/new' }, new RepresentationMetadata({ [SOLID_AS.activity]: AS.terms.Create }) ],
[{ path: 'http://example.org/foo/bar/' }, new RepresentationMetadata({ [SOLID_AS.Activity]: AS.terms.Update }) ], [{ path: 'http://example.org/foo/bar/' }, new RepresentationMetadata({ [SOLID_AS.activity]: AS.terms.Update }) ],
]); ]);
const setRepresentationReturnMock: ChangeMap = new IdentifierMap([ const setRepresentationReturnMock: ChangeMap = new IdentifierMap([
[{ path: 'http://example.org/foo/bar/new' }, new RepresentationMetadata({ [SOLID_AS.Activity]: AS.terms.Update }) ], [{ path: 'http://example.org/foo/bar/new' }, new RepresentationMetadata({ [SOLID_AS.activity]: AS.terms.Update }) ],
]); ]);
const deleteResourceReturnMock: ChangeMap = new IdentifierMap([ const deleteResourceReturnMock: ChangeMap = new IdentifierMap([
[{ path: 'http://example.org/foo/bar/new' }, new RepresentationMetadata({ [SOLID_AS.Activity]: AS.terms.Delete }) ], [{ path: 'http://example.org/foo/bar/new' }, new RepresentationMetadata({ [SOLID_AS.activity]: AS.terms.Delete }) ],
[{ path: 'http://example.org/foo/bar/' }, new RepresentationMetadata({ [SOLID_AS.Activity]: AS.terms.Update }) ], [{ path: 'http://example.org/foo/bar/' }, new RepresentationMetadata({ [SOLID_AS.activity]: AS.terms.Update }) ],
]); ]);
const modifyResourceReturnMock: ChangeMap = new IdentifierMap([ const modifyResourceReturnMock: ChangeMap = new IdentifierMap([
[{ path: 'http://example.org/foo/bar/old' }, new RepresentationMetadata({ [SOLID_AS.Activity]: AS.terms.Delete }) ], [{ path: 'http://example.org/foo/bar/old' }, new RepresentationMetadata({ [SOLID_AS.activity]: AS.terms.Delete }) ],
[{ path: 'http://example.org/foo/bar/new' }, new RepresentationMetadata({ [SOLID_AS.Activity]: AS.terms.Create }) ], [{ path: 'http://example.org/foo/bar/new' }, new RepresentationMetadata({ [SOLID_AS.activity]: AS.terms.Create }) ],
[{ path: 'http://example.org/foo/bar/' }, new RepresentationMetadata({ [SOLID_AS.Activity]: AS.terms.Update }) ], [{ path: 'http://example.org/foo/bar/' }, new RepresentationMetadata({ [SOLID_AS.activity]: AS.terms.Update }) ],
]); ]);
beforeEach(async(): Promise<void> => { beforeEach(async(): Promise<void> => {
@ -157,7 +157,7 @@ describe('A MonitoringStore', (): void => {
it('should not emit an event when the Activity is not a valid AS value.', async(): Promise<void> => { it('should not emit an event when the Activity is not a valid AS value.', async(): Promise<void> => {
source.addResource = jest.fn().mockResolvedValue(new IdentifierMap([ source.addResource = jest.fn().mockResolvedValue(new IdentifierMap([
[{ path: 'http://example.org/path' }, new RepresentationMetadata({ [SOLID_AS.Activity]: 'SomethingRandom' }) ], [{ path: 'http://example.org/path' }, new RepresentationMetadata({ [SOLID_AS.activity]: 'SomethingRandom' }) ],
])); ]));
await store.addResource({ path: 'http://example.org/foo/bar' }, {} as Patch); await store.addResource({ path: 'http://example.org/foo/bar' }, {} as Patch);