Skip to content

Commit 2217f1b

Browse files
JulienChampagnolJulienChampagnol
committed
tests models passing
1 parent aa892cf commit 2217f1b

File tree

5 files changed

+51
-59
lines changed

5 files changed

+51
-59
lines changed

‎internal_stores/model/index.js‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ export default function useModelStyle() {
3535
},
3636
{
3737
response_function: () => {
38-
dataStyleStore.styles[id].visibility = visibility
39-
hybridViewerStore.setVisibility(id, visibility)
38+
dataStyleStore.getStyle(id).visibility = visibility
39+
// hybridViewerStore.setVisibility(id, visibility)
4040
console.log(setModelVisibility.name, { id }, modelVisibility(id))
4141
},
4242
},
@@ -139,22 +139,22 @@ export default function useModelStyle() {
139139
console.log("applyModelDefaultStyle", id, style)
140140
const promise_array = []
141141
for (const [key, value] of Object.entries(style)) {
142-
// if (key === "visibility") {
143-
// promise_array.push(setModelVisibility(id, value))
144-
// if (key === "corners") {
145-
// promise_array.push(modelCornersStyleStore.applyModelCornersStyle(id))
146-
if (key === "lines") {
142+
if (key === "visibility") {
143+
promise_array.push(setModelVisibility(id, value))
144+
} else if (key === "corners") {
145+
promise_array.push(modelCornersStyleStore.applyModelCornersStyle(id))
146+
} else if (key === "lines") {
147147
promise_array.push(modelLinesStyleStore.applyModelLinesStyle(id))
148-
// if (key === "surfaces") {
149-
// promise_array.push(modelSurfacesStyleStore.applyModelSurfacesStyle(id))
150-
// } else if (key === "blocks") {
151-
// promise_array.push(modelBlocksStyleStore.applyModelBlocksStyle(id))
152-
// } else if (key === "points") {
153-
// promise_array.push(modelPointsStyleStore.applyModelPointsStyle(id))
154-
// } else if (key === "edges") {
155-
// promise_array.push(modelEdgesStyleStore.applyModelEdgesStyle(id))
156-
// } else {
157-
// throw new Error("Unknown model key: " + key)
148+
} else if (key === "surfaces") {
149+
promise_array.push(modelSurfacesStyleStore.applyModelSurfacesStyle(id))
150+
} else if (key === "blocks") {
151+
promise_array.push(modelBlocksStyleStore.applyModelBlocksStyle(id))
152+
} else if (key === "points") {
153+
promise_array.push(modelPointsStyleStore.applyModelPointsStyle(id))
154+
} else if (key === "edges") {
155+
promise_array.push(modelEdgesStyleStore.applyModelEdgesStyle(id))
156+
} else {
157+
throw new Error("Unknown model key: " + key)
158158
}
159159
}
160160
console.log("applyModelDefaultStyle", { promise_array })

‎internal_stores/model/lines.js‎

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,13 @@ export function useModelLinesStyle() {
4848
},
4949
)
5050
}
51-
function modelLineColor(id) {
51+
52+
function modelLineColor(id, line_id) {
5253
return modelLineStyle(id, line_id).color
5354
}
5455
function saveModelLineColor(id, line_id, color) {
5556
modelLineStyle(id, line_id).color = color
5657
}
57-
5858
function setModelLinesColor(id, line_ids, color) {
5959
console.log("setModelLinesColor", id, line_ids, color)
6060
const line_flat_indexes = dataBaseStore.getFlatIndexes(id, line_ids)
@@ -65,11 +65,9 @@ export function useModelLinesStyle() {
6565
},
6666
{
6767
response_function: () => {
68-
console.log("response setModelLinesColor")
6968
for (const line_id of line_ids) {
7069
saveModelLineColor(id, line_id, color)
7170
}
72-
console.log("end response setModelLinesColor")
7371
console.log(
7472
setModelLinesColor.name,
7573
{ id },
@@ -82,16 +80,12 @@ export function useModelLinesStyle() {
8280
}
8381

8482
function applyModelLinesStyle(id) {
85-
console.log("applyModelLinesStyle", id)
8683
const lines_style = modelLinesStyle(id)
87-
console.log("lines_style", lines_style)
88-
const lines_ids = dataBaseStore.getLinesUuids(id)
89-
const promise_array = [
90-
setModelLinesVisibility(id, lines_ids, lines_style.visibility),
91-
setModelLinesColor(id, lines_ids, lines_style.color),
92-
]
93-
console.log("applyModelLinesStyle", { promise_array })
94-
return Promise.all(promise_array)
84+
const line_ids = dataBaseStore.getLinesUuids(id)
85+
return Promise.all([
86+
setModelLinesVisibility(id, line_ids, lines_style.visibility),
87+
setModelLinesColor(id, line_ids, lines_style.color),
88+
])
9589
}
9690

9791
return {

‎tests/integration/stores/data_style/model/index.nuxt.test.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ describe("Model", () => {
3535
const dataStyleStore = useDataStyleStore()
3636
const viewerStore = useViewerStore()
3737
const visibility = true
38-
await dataStyleStore.setModelVisibility(id, visibility)
3938
const spy = vi.spyOn(composables, "viewer_call")
39+
await dataStyleStore.setModelVisibility(id, visibility)
4040
expect(spy).toHaveBeenCalledWith(
4141
{
4242
schema: model_schemas.visibility,

‎tests/integration/stores/data_style/model/lines.nuxt.test.js‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -56,29 +56,29 @@ describe("Model lines", () => {
5656
})
5757
})
5858

59-
// describe("Lines color", () => {
60-
// test("Color red", async () => {
61-
// const dataStyleStore = useDataStyleStore()
62-
// const viewerStore = useViewerStore()
63-
// const dataBaseStore = useDataBaseStore()
64-
// const line_ids = dataBaseStore.getLinesUuids(id)
65-
// const lines_flat_indexes = dataBaseStore.getFlatIndexes(id, line_ids)
66-
// const color = { r: 255, g: 0, b: 0 }
67-
// const spy = vi.spyOn(composables, "viewer_call")
68-
// await dataStyleStore.setModelLinesColor(id, line_ids, color)
69-
// expect(spy).toHaveBeenCalledWith(
70-
// {
71-
// schema: model_lines_schemas.color,
72-
// params: { id, block_ids: lines_flat_indexes, color },
73-
// },
74-
// {
75-
// response_function: expect.any(Function),
76-
// },
77-
// )
78-
// for (const line_id of line_ids) {
79-
// expect(dataStyleStore.modelLineColor(id, line_id)).toStrictEqual(color)
80-
// }
81-
// expect(viewerStore.status).toBe(Status.CONNECTED)
82-
// })
83-
// })
59+
describe("Lines color", () => {
60+
test("Color red", async () => {
61+
const dataStyleStore = useDataStyleStore()
62+
const viewerStore = useViewerStore()
63+
const dataBaseStore = useDataBaseStore()
64+
const line_ids = dataBaseStore.getLinesUuids(id)
65+
const lines_flat_indexes = dataBaseStore.getFlatIndexes(id, line_ids)
66+
const color = { r: 255, g: 0, b: 0 }
67+
const spy = vi.spyOn(composables, "viewer_call")
68+
await dataStyleStore.setModelLinesColor(id, line_ids, color)
69+
expect(spy).toHaveBeenCalledWith(
70+
{
71+
schema: model_lines_schemas.color,
72+
params: { id, block_ids: lines_flat_indexes, color },
73+
},
74+
{
75+
response_function: expect.any(Function),
76+
},
77+
)
78+
for (const line_id of line_ids) {
79+
expect(dataStyleStore.modelLineColor(id, line_id)).toStrictEqual(color)
80+
}
81+
expect(viewerStore.status).toBe(Status.CONNECTED)
82+
})
83+
})
8484
})

‎tests/vitest.config.js‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,7 @@ export default defineConfig({
1919
await defineVitestProject({
2020
test: {
2121
name: "integration",
22-
include: [
23-
"tests/integration/stores/data_style/model/lines.nuxt.test.js",
24-
],
22+
include: ["tests/integration/stores/data_style/model/**/*.test.js"],
2523
environment: "nuxt",
2624
fileParallelism: false,
2725
setupFiles: ["tests/integration/setup.js"],

0 commit comments

Comments
 (0)