Skip to content

Commit

Permalink
fix(case): s/datacube/dataCube/
Browse files Browse the repository at this point in the history
  • Loading branch information
@vhf
vhf committed Sep 24, 2019
1 parent 2140e57 commit e756bde
Show file tree
Hide file tree
Showing 13 changed files with 107 additions and 105 deletions.
2 changes: 1 addition & 1 deletion __tests__/__snapshots__/serialization.test.ts.snap
View file

Large diffs are not rendered by default.

22 changes: 11 additions & 11 deletions __tests__/datacubeentrypoint.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,19 +59,19 @@ describe(".dataCubeByIri()", () => {
it("takes an IRI", async () => {
const cube = newCube("https://ld.stadt-zuerich.ch/query");
const dataCubes = await cube.dataCubes();
for (const datacube of dataCubes) {
const iri = datacube.iri;
expect(await cube.dataCubeByIri(iri)).toMatchObject(datacube);
for (const dataCube of dataCubes) {
const iri = dataCube.iri;
expect(await cube.dataCubeByIri(iri)).toMatchObject(dataCube);
}
});
it("caches the dataCubes", async () => {
const cube = newCube("https://ld.stadt-zuerich.ch/query");
const dataCubes = await cube.dataCubes();
const cube2 = newCube("https://ld.stadt-zuerich.ch/query");
for (const datacube of dataCubes.slice(0, 2)) {
const dataCubeIri = datacube.iri;
const datacubeFound = await cube2.dataCubeByIri(dataCubeIri);
expect(datacubeFound.toJSON()).toBe(datacube.toJSON());
for (const dataCube of dataCubes.slice(0, 2)) {
const dataCubeIri = dataCube.iri;
const dataCubeFound = await cube2.dataCubeByIri(dataCubeIri);
expect(dataCubeFound.toJSON()).toBe(dataCube.toJSON());
}
});
});
Expand All @@ -81,8 +81,8 @@ describe(".dataCubesByGraphIri()", () => {
const cube = newCube("https://ld.stadt-zuerich.ch/query");
const dataCubes = await cube.dataCubes();
const cube2 = newCube("https://ld.stadt-zuerich.ch/query");
for (const datacube of dataCubes.slice(0, 3)) {
const graphIri = datacube.graphIri;
for (const dataCube of dataCubes.slice(0, 3)) {
const graphIri = dataCube.graphIri;
const expecting = (await cube2.dataCubesByGraphIri(graphIri)).map((ds) =>
ds.toJSON(),
);
Expand All @@ -97,8 +97,8 @@ describe(".dataCubesByGraphIri()", () => {
const graphs = await cube.graphs();
for (const graphIri of graphs.slice(0, 2)) {
const dataCubes = await cube.dataCubesByGraphIri(graphIri.value);
const datacube = dataCubes[0];
expect(datacube.graphIri).toBe(graphIri.value);
const dataCube = dataCubes[0];
expect(dataCube.graphIri).toBe(graphIri.value);
}
});
});
50 changes: 26 additions & 24 deletions __tests__/datasetquery.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ const korrekturAttribute = new Attribute({
iri: "https://ld.stadt-zuerich.ch/statistics/attribute/KORREKTUR",
});

const datacube: DataCube = new DataCube("https://ld.stadt-zuerich.ch/query", {
const dataCube: DataCube = new DataCube("https://ld.stadt-zuerich.ch/query", {
iri: namedNode(
"https://ld.stadt-zuerich.ch/statistics/dataset/BES-RAUM-ZEIT-BTA-SEX",
),
Expand All @@ -67,7 +67,7 @@ const datacube: DataCube = new DataCube("https://ld.stadt-zuerich.ch/query", {
});

test("basic", async () => {
const query = datacube.query().select({
const query = dataCube.query().select({
betriebsart: betriebsartDimension,
geschlecht: geschlechtDimension,
raum: raumDimension,
Expand All @@ -88,7 +88,7 @@ test("basic", async () => {

describe("select", () => {
test("throws helpful message on falsy components", async () => {
const query = datacube.query();
const query = dataCube.query();
expect(() =>
query.select({
betriebsart: betriebsartDimension,
Expand All @@ -105,22 +105,24 @@ describe("select", () => {
});

test("distinct", async () => {
const query = datacube.query().select({
raum: raumDimension.distinct(),
});
const query = dataCube.query()
.select({
raum: raumDimension,
})
.distinct();
const sparql = await query.toSparql();
expect(sparql).toMatchSnapshot();
});

test("empty select", async () => {
const query = datacube.query();
const query = dataCube.query();
const sparql = await query.toSparql();
expect(sparql).toMatchSnapshot();
});

describe("avg", () => {
test("avg", async () => {
const query = datacube.query().select({
const query = dataCube.query().select({
raum: raumDimension,
bep: beschaeftigteMeasure.avg(),
});
Expand All @@ -129,7 +131,7 @@ describe("avg", () => {
});

test("avg and filter", async () => {
const query = datacube
const query = dataCube
.query()
.select({
raum: raumDimension,
Expand All @@ -143,15 +145,15 @@ describe("avg", () => {
});

test("avg has auto groupBy", async () => {
const sparqlA = await datacube
const sparqlA = await dataCube
.query()
.select({
raum: raumDimension,
bep: beschaeftigteMeasure.avg(),
})
.groupBy("raum")
.toSparql();
const sparqlB = await datacube
const sparqlB = await dataCube
.query()
.select({
raum: raumDimension,
Expand All @@ -162,7 +164,7 @@ describe("avg", () => {
});

test("avg distinct", async () => {
const query = datacube.query().select({
const query = dataCube.query().select({
betriebsart: betriebsartDimension,
geschlecht: geschlechtDimension,
raum: raumDimension,
Expand All @@ -184,7 +186,7 @@ describe("avg", () => {

describe("groupBy", () => {
test("with avg doesn't duplicate groupby vars", async () => {
const query = datacube
const query = dataCube
.query()
.select({
raum: raumDimension,
Expand All @@ -200,7 +202,7 @@ describe("groupBy", () => {
});

test("groups with a function", async () => {
const query = datacube
const query = dataCube
.query()
.select({
betriebsart: betriebsartDimension,
Expand All @@ -222,7 +224,7 @@ describe("groupBy", () => {
});

test("groups with strings", async () => {
const base = datacube.query().select({
const base = dataCube.query().select({
betriebsart: betriebsartDimension,
geschlecht: geschlechtDimension,
raum: raumDimension,
Expand All @@ -242,7 +244,7 @@ describe("groupBy", () => {
});

test("reports error when grouping on unknown component", async () => {
const base = datacube.query().select({
const base = dataCube.query().select({
betriebsart: betriebsartDimension,
});
const query = base.groupBy("foobarbaz");
Expand All @@ -252,7 +254,7 @@ describe("groupBy", () => {
});

test("doesn't duplicate", async () => {
const query = datacube
const query = dataCube
.query()
.select({
betriebsart: betriebsartDimension,
Expand All @@ -278,7 +280,7 @@ describe("groupBy", () => {
});

test("group and filter", async () => {
const base = datacube.query().select({
const base = dataCube.query().select({
betriebsart: betriebsartDimension,
geschlecht: geschlechtDimension,
raum: raumDimension,
Expand All @@ -301,7 +303,7 @@ test("group and filter", async () => {

describe("ordering", () => {
test("group and filter", async () => {
const base = datacube.query().select({
const base = dataCube.query().select({
betriebsart: betriebsartDimension,
geschlecht: geschlechtDimension,
raum: raumDimension,
Expand All @@ -325,7 +327,7 @@ describe("ordering", () => {
});

test("one or many give same sparql", async () => {
const base = datacube.query().select({
const base = dataCube.query().select({
raum: raumDimension,
zeit: zeitDimension,
});
Expand All @@ -343,7 +345,7 @@ describe("ordering", () => {
});

test("are ordered", async () => {
const base = datacube.query().select({
const base = dataCube.query().select({
raum: raumDimension,
zeit: zeitDimension,
});
Expand All @@ -360,7 +362,7 @@ describe("ordering", () => {

describe("handles languages", () => {
test("one language", async () => {
const query = datacube.query({ languages: ["en"] }).select({
const query = dataCube.query({ languages: ["en"] }).select({
zeit: zeitDimension,

bep: beschaeftigteMeasure,
Expand All @@ -372,7 +374,7 @@ describe("handles languages", () => {
});

test("two languages", async () => {
const query = datacube.query({ languages: ["en", "de"] }).select({
const query = dataCube.query({ languages: ["en", "de"] }).select({
zeit: zeitDimension,

bep: beschaeftigteMeasure,
Expand All @@ -384,7 +386,7 @@ describe("handles languages", () => {
});

test("three languages", async () => {
const query = datacube.query({ languages: ["fr", "de", "it"] }).select({
const query = dataCube.query({ languages: ["fr", "de", "it"] }).select({
zeit: zeitDimension,

bep: beschaeftigteMeasure,
Expand Down
Loading

0 comments on commit e756bde

Please sign in to comment.