more complete file / datalocation comparison tests

test/catalog.spec.js

@@ -25,10 +25,8 @@ const file = chaiFiles.file;
 
 const fs = require('fs-extra');
 
-
 const catalog = require('../lib/catalog.js');
 
-
 const ORG = { 
 	'id': 'https://www.uts.edu.au',
 	'name': 'University of Technology Sydney'
@@ -39,15 +37,30 @@ const APPROVER = 'data.librarian@uts.edu.au';
 
 const DATASET_ID = 'DATASET_ID';
 
-function graph_get(graph, id) {
-	const match = graph.filter((item) => item['@id'] === id);
+// get catalog item by id: returns null if the item isn't unique, because
+// this should always make the test fail
+
+function get_id(c, id) {
+	const match = c['@graph'].filter((item) => item['@id'] === id);
 	if( match.length ) {
-		return match[0];
+		if( match.length > 1 ) {
+			console.error(`Warning: catalog has ${match.length} items with ID ${id}`);
+			return null;
+		} else {
+			return match[0];
+		}
 	} else {
 		return null;
 	}
 }
 
+// this one returns an array of items with the requested type
+
+function get_type(c, t) {
+	return c['@graph'].filter((item) => item['@type'] === t);
+}
+
+
 var dp, cj;
 
 
@@ -61,24 +74,48 @@ describe("DataPub to DataCrate: core metadata", () => {
 			'organisation': ORG,
 			'owner': OWNER,
 			'approver': APPROVER
-		}); 		
+		});
 	});
 
 
-	it("puts a dataset item with correct metadata in the catalog", async () => {
+	it("has a dataset item with correct metadata in the catalog", () => {
 		assert(cj, "Got an object");
 		assert(cj['@graph'], "Catalog has a @graph");
-		const dataset = graph_get(cj['@graph'], DATASET_ID);
+		const dataset = get_id(cj, DATASET_ID);
 		assert(dataset, "Graph has an item with id " + DATASET_ID);
 		expect(dataset['name']).to.equal(dp['title']);
 		expect(dataset['description']).to.equal(dp['description']);
 		expect(dataset['publisher']['@id']).to.equal(ORG['id']);
 	});
 
-	it("has a history section with the owner and approver", async () => {
-		assert(true);
+	it("has a create action with the owner", () => {
+		const cas = get_type(cj, 'CreateAction');
+		expect(cas).to.have.length(1);
+		const ca = cas[0];
+		expect(ca['agent']['@id']).to.equal(OWNER);
 	});
 
+	it("has an update action with the approver", () => {
+		const uas = get_type(cj, 'UpdateAction');
+		expect(uas).to.have.length(1);
+		const ua = uas[0];
+		expect(ua['agent']['@id']).to.equal(APPROVER);
+	});
+
+	it("has the payload files", () => {
+		const files = get_type(cj, "File");
+		const datalocs = dp['dataLocations'];
+		expect(files).to.have.length(datalocs.length);
+		const fids = files.map((f) => f['@id']).sort();
+		const dlids = datalocs.map((dl) => dl['name']).sort();
+		expect(fids).to.eql(dlids);
+	});
+
+	it("", () => {
+
+	});
+
+
 });