Merge 8ac7b8f into 36ecf65

zazuko · Sep 9, 2019 · 04a76cb · 04a76cb
2 parents 36ecf65 + 8ac7b8f
commit 04a76cb
Show file tree

Hide file tree

Showing 14 changed files with 1,237 additions and 459 deletions.
diff --git a/src/__tests__/__snapshots__/component.test.ts.snap b/src/__tests__/__snapshots__/component.test.ts.snap
@@ -3,21 +3,7 @@
 exports[`filters bound 1`] = `
 Operator {
   "args": Array [
-    Dimension {
-      "componentType": "dimension",
-      "descending": false,
-      "iri": NamedNode {
-        "value": "http://example.com/d",
-      },
-      "isDistinct": false,
-      "label": Literal {
-        "datatype": NamedNode {
-          "value": "http://www.w3.org/2001/XMLSchema#string",
-        },
-        "language": "",
-        "value": "d",
-      },
-    },
+    "{\\"componentType\\":\\"dimension\\",\\"iri\\":\\"http://example.com/d\\",\\"labels\\":[{\\"value\\":\\"d\\",\\"language\\":\\"\\"}]}",
   ],
   "operator": "bound",
 }
@@ -28,21 +14,7 @@ Operator {
   "args": Array [
     Operator {
       "args": Array [
-        Dimension {
-          "componentType": "dimension",
-          "descending": false,
-          "iri": NamedNode {
-            "value": "http://example.com/d",
-          },
-          "isDistinct": false,
-          "label": Literal {
-            "datatype": NamedNode {
-              "value": "http://www.w3.org/2001/XMLSchema#string",
-            },
-            "language": "",
-            "value": "d",
-          },
-        },
+        "{\\"componentType\\":\\"dimension\\",\\"iri\\":\\"http://example.com/d\\",\\"labels\\":[{\\"value\\":\\"d\\",\\"language\\":\\"\\"}]}",
       ],
       "operator": "bound",
     },
@@ -54,21 +26,7 @@ Operator {
 exports[`filters not in 1`] = `
 Operator {
   "args": Array [
-    Dimension {
-      "componentType": "dimension",
-      "descending": false,
-      "iri": NamedNode {
-        "value": "http://example.com/d",
-      },
-      "isDistinct": false,
-      "label": Literal {
-        "datatype": NamedNode {
-          "value": "http://www.w3.org/2001/XMLSchema#string",
-        },
-        "language": "",
-        "value": "d",
-      },
-    },
+    "{\\"componentType\\":\\"dimension\\",\\"iri\\":\\"http://example.com/d\\",\\"labels\\":[{\\"value\\":\\"d\\",\\"language\\":\\"\\"}]}",
     ArrayExpr {
       "xs": Array [
         NamedNode {

diff --git a/src/__tests__/__snapshots__/datasetquery.test.ts.snap b/src/__tests__/__snapshots__/datasetquery.test.ts.snap
diff --git a/src/__tests__/__snapshots__/serialization.test.ts.snap b/src/__tests__/__snapshots__/serialization.test.ts.snap
diff --git a/src/__tests__/component.test.ts b/src/__tests__/component.test.ts
@@ -5,7 +5,7 @@ let d = null;
 
 describe("filters", () => {
   beforeAll(() => {
-    d = new Dimension({ label: "d", iri: "http://example.com/d" });
+    d = new Dimension({ labels: [{value: "d", language: ""}], iri: "http://example.com/d" });
   });
 
   test("bound", () => {

diff --git a/src/__tests__/datacube.test.ts b/src/__tests__/datacube.test.ts
@@ -0,0 +1,26 @@
+import { DataCube } from "../datacube";
+
+describe(".datasetByIri()", () => {
+  it("takes an IRI", async () => {
+    const cube = new DataCube("https://ld.stadt-zuerich.ch/query");
+    const datasets = await cube.datasets();
+    for (const dataset of datasets) {
+      const iri = dataset.iri;
+      expect(await cube.datasetByIri(iri)).toBe(dataset);
+    }
+  });
+});
+
+describe(".datasetsByGraph()", () => {
+  it("takes a graph IRI", async () => {
+    const cube = new DataCube("https://ld.stadt-zuerich.ch/query");
+    const datasets = await cube.datasets();
+    const cube2 = new DataCube("https://ld.stadt-zuerich.ch/query");
+    for (const dataset of datasets.slice(0, 3)) {
+      const graphIri = dataset.graphIri;
+      const expecting = (await cube2.datasetsByGraphIri(graphIri)).map((ds) => ds.toJSON());
+      const expected = datasets.filter((ds) => ds.graphIri === graphIri).map((ds) => ds.toJSON());
+      expect(expecting).toMatchObject(expected);
+    }
+  });
+});