diff --git a/src/core/engine.spec.ts b/src/core/engine.spec.ts index 958120557030c6ee2b957943fbf43f1561fae026..05367a2c90f42ed8b6be77e1aada50f56e1b15fc 100644 --- a/src/core/engine.spec.ts +++ b/src/core/engine.spec.ts @@ -30,21 +30,9 @@ import { engineScenario } from "../../test/scenario"; describe("engine class", () => { const engine = new Engine(); - const met = engineScenario.metrics.sort((a, b) => { - const aValue = parseInt(a.name.split(":")[1], 10); - const bValue = parseInt(b.name.split(":")[1], 10); - return aValue - bValue; - }); - const dim = engineScenario.dimensions.sort((a, b) => { - const aValue = parseInt(a.name.split(":")[1], 10); - const bValue = parseInt(b.name.split(":")[1], 10); - return aValue - bValue; - }); - const subdim = engineScenario.subDimensions.sort((a, b) => { - const aValue = parseInt(a.name.split(":")[1], 10); - const bValue = parseInt(b.name.split(":")[1], 10); - return aValue - bValue; - }); + const met = engineScenario.metrics; + const dim = engineScenario.dimensions; + const subdim = engineScenario.subDimensions; const views = engineScenario.views; met.forEach((item) => engine.addMetric(item)); diff --git a/test/scenario.ts b/test/scenario.ts index 0a48d94e1483750d4585619c662c4e8d817a2f44..af10dd2e26bead3160d9b4cd9a7a64c8194ae64c 100644 --- a/test/scenario.ts +++ b/test/scenario.ts @@ -63,9 +63,21 @@ interface DataCtrlScenario { const config = ConfigParser.parse("config/test.yaml"); -const mets = config.metrics; -const dims = config.dimensions; -const views = config.views; +const mets = config.metrics.sort((a, b) => { + const aValue = parseInt(a.name.split(":")[1], 10); + const bValue = parseInt(b.name.split(":")[1], 10); + return aValue - bValue; +}); +const dims = config.dimensions.sort((a, b) => { + const aValue = parseInt(a.name.split(":")[1], 10); + const bValue = parseInt(b.name.split(":")[1], 10); + return aValue - bValue; +}); +const views = config.buildViews.sort((a, b) => { + const aValue = parseInt(a.alias.split(" ")[1], 10); + const bValue = parseInt(b.alias.split(" ")[1], 10); + return aValue - bValue; +}).map((item) => item.view); const filters: { [key: string]: Filter } = { "dim:0:0" : new Filter({ @@ -166,7 +178,11 @@ const subdims = [ parent: dims[1], relation: RelationType.DAY }) -]; +].sort((a, b) => { + const aValue = parseInt(a.name.split(":")[1], 10); + const bValue = parseInt(b.name.split(":")[1], 10); + return aValue - bValue; +}); const dateSubDim = [ new Dimension ({