all integration tests passing

Author: JulienChampagnol

internal_stores/mesh/index.js

@@ -59,7 +59,6 @@ export default function useMeshStyle() {
         throw new Error("Unknown mesh key: " + key)
       }
     }
-    console.log(0, { promise_array })
     return Promise.all(promise_array)
   }
 

internal_stores/model/corners.js

@@ -26,9 +26,7 @@ export function useModelCornersStyle() {
     modelCornerStyle(id, corner_id).visibility = visibility
   }
   function setModelCornersVisibility(id, corner_ids, visibility) {
-    console.log("setModelCornersVisibility", id, corner_ids, visibility)
     const corner_flat_indexes = dataBaseStore.getFlatIndexes(id, corner_ids)
-    console.log("corner_flat_indexes", corner_flat_indexes)
     return viewer_call(
       {
         schema: model_corners_schemas.visibility,
@@ -59,7 +57,6 @@ export function useModelCornersStyle() {
   }
 
   function setModelCornersColor(id, corner_ids, color) {
-    console.log("setModelCornersColor", id, corner_ids, color)
     const corner_flat_indexes = dataBaseStore.getFlatIndexes(id, corner_ids)
     return viewer_call(
       {
@@ -83,9 +80,7 @@ export function useModelCornersStyle() {
   }
 
   function applyModelCornersStyle(id) {
-    console.log("applyModelCornersStyle", id)
     const corners_style = modelCornersStyle(id)
-    console.log("corners_style", corners_style)
     const corner_ids = dataBaseStore.getCornersUuids(id)
     return Promise.all([
       setModelCornersVisibility(id, corner_ids, corners_style.visibility),

internal_stores/model/edges.js

@@ -15,7 +15,6 @@ export function useModelEdgesStyle() {
   }
 
   function setModelEdgesVisibility(id, visibility) {
-    console.log("setModelEdgesVisibility", id, visibility)
     return viewer_call(
       {
         schema: model_edges_schemas.visibility,
@@ -35,9 +34,7 @@ export function useModelEdgesStyle() {
   }
 
   function applyModelEdgesStyle(id) {
-    console.log("applyModelEdgesStyle", id)
     const edges_style = modelEdgesStyle(id)
-    console.log("edges_style", edges_style)
     return Promise.all([setModelEdgesVisibility(id, edges_style.visibility)])
   }
 

internal_stores/model/index.js

@@ -27,7 +27,6 @@ export default function useModelStyle() {
     return dataStyleStore.getStyle(id).visibility
   }
   function setModelVisibility(id, visibility) {
-    console.log("setModelVisibility", id, visibility)
     return viewer_call(
       {
         schema: model_schemas.visibility,
@@ -36,7 +35,7 @@ export default function useModelStyle() {
       {
         response_function: () => {
           dataStyleStore.getStyle(id).visibility = visibility
-          // hybridViewerStore.setVisibility(id, visibility)
+          hybridViewerStore.setVisibility(id, visibility)
           console.log(setModelVisibility.name, { id }, modelVisibility(id))
         },
       },
@@ -84,7 +83,6 @@ export default function useModelStyle() {
     return dataStyleStore.getStyle(id).color
   }
   function setModelColor(id, color) {
-    console.log("setModelColor", id, color)
     return viewer_call(
       {
         schema: model_schemas.color,
@@ -136,7 +134,6 @@ export default function useModelStyle() {
 
   function applyModelDefaultStyle(id) {
     const style = dataStyleStore.getStyle(id)
-    console.log("applyModelDefaultStyle", id, style)
     const promise_array = []
     for (const [key, value] of Object.entries(style)) {
       if (key === "visibility") {
@@ -157,7 +154,6 @@ export default function useModelStyle() {
         throw new Error("Unknown model key: " + key)
       }
     }
-    console.log("applyModelDefaultStyle", { promise_array })
     return Promise.all(promise_array)
   }
 

internal_stores/model/lines.js

@@ -26,7 +26,6 @@ export function useModelLinesStyle() {
     modelLineStyle(id, line_id).visibility = visibility
   }
   function setModelLinesVisibility(id, line_ids, visibility) {
-    console.log("setModelLinesVisibility", id, line_ids, visibility)
     const line_flat_indexes = dataBaseStore.getFlatIndexes(id, line_ids)
     return viewer_call(
       {
@@ -56,7 +55,6 @@ export function useModelLinesStyle() {
     modelLineStyle(id, line_id).color = color
   }
   function setModelLinesColor(id, line_ids, color) {
-    console.log("setModelLinesColor", id, line_ids, color)
     const line_flat_indexes = dataBaseStore.getFlatIndexes(id, line_ids)
     return viewer_call(
       {

internal_stores/model/points.js

@@ -14,7 +14,6 @@ export function useModelPointsStyle() {
     return modelPointsStyle(id).visibility
   }
   function setModelPointsVisibility(id, visibility) {
-    console.log("setModelPointsVisibility", id, visibility)
     return viewer_call(
       {
         schema: model_points_schemas.visibility,
@@ -37,7 +36,6 @@ export function useModelPointsStyle() {
     return modelPointsStyle(id).size
   }
   function setModelPointsSize(id, size) {
-    console.log("setModelPointsSize", id, size)
     return viewer_call(
       {
         schema: model_points_schemas.size,

internal_stores/model/surfaces.js

@@ -22,7 +22,6 @@ export function useModelSurfacesStyle() {
     modelSurfaceStyle(id, surface_id).visibility = visibility
   }
   function setModelSurfacesVisibility(id, surface_ids, visibility) {
-    console.log("setModelSurfacesVisibility", id, surface_ids, visibility)
     const surface_flat_indexes = dataBaseStore.getFlatIndexes(id, surface_ids)
     return viewer_call(
       {
@@ -52,7 +51,6 @@ export function useModelSurfacesStyle() {
   }
 
   function setModelSurfacesColor(id, surface_ids, color) {
-    console.log("setModelSurfacesColor", id, surface_ids, color)
     const surface_flat_indexes = dataBaseStore.getFlatIndexes(id, surface_ids)
     return viewer_call(
       {
@@ -76,9 +74,7 @@ export function useModelSurfacesStyle() {
   }
 
   function applyModelSurfacesStyle(id) {
-    console.log("applyModelSurfacesStyle", id)
     const surfaces_style = dataStyleStore.getStyle(id).surfaces
-    console.log("surfaces_style", surfaces_style)
     const surface_ids = dataBaseStore.getSurfacesUuids(id)
     return Promise.all([
       setModelSurfacesVisibility(id, surface_ids, surfaces_style.visibility),

tests/integration/setup.js

@@ -47,7 +47,7 @@ async function setupIntegrationTests(file_name, geode_object) {
   infraStore.app_mode = appMode.BROWSER
 
   const microservices_path = path.join("tests", "integration", "microservices")
-  const project_folder_path = path.join(__dirname, "data", uuidv4())
+  const project_folder_path = path.join(data_folder, uuidv4())
   const upload_folder_path = path.join(__dirname, "data", "uploads")
   const back_path = path.join(
     executable_path(path.join(microservices_path, "back")),
@@ -132,7 +132,7 @@ async function setupIntegrationTests(file_name, geode_object) {
   expect(viewerStore.status).toBe(Status.CONNECTED)
   console.log("END OF SETUP")
 
-  return { id, back_port, viewer_port }
+  return { id, back_port, viewer_port, project_folder_path }
 }
 
 const mockLockRequest = vi.fn().mockImplementation(async (name, callback) => {
@@ -146,16 +146,12 @@ vi.stubGlobal("navigator", {
   },
 })
 
-let foldersBeforeTests = new Set()
-
 beforeAll(() => {
   global.WebSocket = WebSocket
-  foldersBeforeTests = getCurrentFolders(data_folder)
 })
 
 afterAll(() => {
   delete global.WebSocket
-  cleanupCreatedFolders(data_folder, foldersBeforeTests)
 })
 
 export { setupIntegrationTests }

tests/integration/stores/data_style/mesh/edges.nuxt.test.js

@@ -7,26 +7,30 @@ import Status from "~/utils/status"
 import * as composables from "~/composables/viewer_call"
 import { useDataStyleStore } from "~/stores/data_style"
 import { useViewerStore } from "~/stores/viewer"
-import { kill_back, kill_viewer } from "~/utils/local"
+import { delete_folder_recursive, kill_back, kill_viewer } from "~/utils/local"
 import { setupIntegrationTests } from "../../../setup.js"
 
 // Local constants
 const mesh_edges_schemas = viewer_schemas.opengeodeweb_viewer.mesh.edges
 const file_name = "test.og_edc2d"
 const geode_object = "EdgedCurve2D"
 
-let id, back_port, viewer_port
+let id, back_port, viewer_port, project_folder_path
 
 beforeEach(async () => {
-  ;({ id, back_port, viewer_port } = await setupIntegrationTests(
-    file_name,
-    geode_object,
-  ))
+  ;({ id, back_port, viewer_port, project_folder_path } =
+    await setupIntegrationTests(file_name, geode_object))
 }, 25000)
 
 afterEach(async () => {
-  console.log("afterEach mesh edges kill", back_port, viewer_port)
+  console.log(
+    "afterEach mesh edges kill",
+    back_port,
+    viewer_port,
+    project_folder_path,
+  )
   await Promise.all([kill_back(back_port), kill_viewer(viewer_port)])
+  delete_folder_recursive(project_folder_path)
 })
 
 describe("Mesh edges", () => {

tests/integration/stores/data_style/mesh/index.nuxt.test.js

@@ -7,26 +7,30 @@ import Status from "~/utils/status"
 import * as composables from "~/composables/viewer_call"
 import { useDataStyleStore } from "~/stores/data_style"
 import { useViewerStore } from "~/stores/viewer"
-import { kill_back, kill_viewer } from "~/utils/local"
+import { delete_folder_recursive, kill_back, kill_viewer } from "~/utils/local"
 import { setupIntegrationTests } from "../../../setup.js"
 
 // Local constants
 const mesh_schemas = viewer_schemas.opengeodeweb_viewer.mesh
 const file_name = "test.og_rgd3d"
 const geode_object = "RegularGrid3D"
 
-let id, back_port, viewer_port
+let id, back_port, viewer_port, project_folder_path
 
 beforeEach(async () => {
-  ;({ id, back_port, viewer_port } = await setupIntegrationTests(
-    file_name,
-    geode_object,
-  ))
+  ;({ id, back_port, viewer_port, project_folder_path } =
+    await setupIntegrationTests(file_name, geode_object))
 }, 20000)
 
 afterEach(async () => {
-  console.log("afterEach mesh index kill", back_port, viewer_port)
+  console.log(
+    "afterEach mesh index kill",
+    back_port,
+    viewer_port,
+    project_folder_path,
+  )
   await Promise.all([kill_back(back_port), kill_viewer(viewer_port)])
+  delete_folder_recursive(project_folder_path)
 })
 
 describe("Mesh", () => {
@@ -35,8 +39,8 @@ describe("Mesh", () => {
       const dataStyleStore = useDataStyleStore()
       const viewerStore = useViewerStore()
       const visibility = true
-      await dataStyleStore.setMeshVisibility(id, visibility)
       const spy = vi.spyOn(composables, "viewer_call")
+      await dataStyleStore.setMeshVisibility(id, visibility)
       expect(spy).toHaveBeenCalledWith(
         {
           schema: mesh_schemas.visibility,