From 43d940aecfd1ef46f8901b563d437f53b46ec9fa Mon Sep 17 00:00:00 2001
From: Ron <45816308+rjaegers@users.noreply.github.com>
Date: Wed, 30 Oct 2024 12:50:42 +0000
Subject: [PATCH 01/12] refactor: move tests to top-level out of the
 devcontainer folder

---
 .devcontainer/cpp-test/devcontainer.json                    | 2 +-
 .devcontainer/rust-test/devcontainer.json                   | 4 ++++
 .github/workflows/acceptance-test.yml                       | 2 +-
 .github/workflows/ci.yml                                    | 2 +-
 .vscode/tasks.json                                          | 6 +++---
 .../cpp/e2e/features/compilation.feature                    | 0
 .../cpp/e2e/features/pages/authentication.pom.ts            | 0
 .../cpp/e2e/features/pages/codespace.pom.ts                 | 0
 .../cpp/e2e/features/static-dynamic-analysis.feature        | 0
 .../cpp/e2e/features/steps/codespace.steps.ts               | 0
 {.devcontainer => test}/cpp/e2e/features/steps/fixtures.ts  | 0
 {.devcontainer => test}/cpp/e2e/playwright.config.ts        | 0
 {.devcontainer => test}/cpp/e2e/workspace/CMakeLists.txt    | 0
 {.devcontainer => test}/cpp/e2e/workspace/CMakePresets.json | 0
 {.devcontainer => test}/cpp/e2e/workspace/formatted.cpp     | 0
 {.devcontainer => test}/cpp/e2e/workspace/main.cpp          | 0
 {.devcontainer => test}/cpp/e2e/workspace/unformatted.cpp   | 0
 .../test/testsuite.bats => test/cpp/integration-tests.bats  | 4 ++++
 .../cpp/test => test/cpp/workspace}/CMakeLists.txt          | 0
 .../cpp/test => test/cpp/workspace}/CMakePresets.json       | 0
 .../cpp/test => test/cpp/workspace}/clang-cl/CMakeLists.txt | 0
 .../cpp/test => test/cpp/workspace}/clang-cl/main.cpp       | 0
 .../test => test/cpp/workspace}/clang-cl/toolchain.cmake    | 0
 .../test => test/cpp/workspace}/clang-tools/CMakeLists.txt  | 0
 .../cpp/test => test/cpp/workspace}/clang-tools/main.cpp    | 0
 .../test => test/cpp/workspace}/clang-tools/unformatted.cpp | 0
 .../cpp/test => test/cpp/workspace}/fuzzing/CMakeLists.txt  | 0
 .../cpp/test => test/cpp/workspace}/fuzzing/main.cpp        | 0
 .../cpp/workspace}/gcc-arm-none-eabi/CMakeLists.txt         | 0
 .../test => test/cpp/workspace}/gcc-arm-none-eabi/main.cpp  | 0
 .../cpp/workspace}/gcc-arm-none-eabi/toolchain.cmake        | 0
 .../cpp/test => test/cpp/workspace}/gcc/CMakeLists.txt      | 0
 .../cpp/test => test/cpp/workspace}/gcc/main-fail.cpp       | 0
 {.devcontainer/cpp/test => test/cpp/workspace}/gcc/main.cpp | 0
 .../cpp/workspace}/package-managers/CMakeLists.txt          | 0
 .../cpp/workspace}/package-managers/conan/CMakeLists.txt    | 0
 .../cpp/workspace}/package-managers/conan/conanfile.txt     | 0
 .../cpp/workspace}/package-managers/conan/main.cpp          | 0
 .../cpp/workspace}/package-managers/cpm/CMakeLists.txt      | 0
 .../cpp/workspace}/package-managers/cpm/main.cpp            | 0
 .../test => test/cpp/workspace}/sanitizers/CMakeLists.txt   | 0
 .../cpp/test => test/cpp/workspace}/sanitizers/asan.cpp     | 0
 .../cpp/test => test/cpp/workspace}/sanitizers/memsan.cpp   | 0
 .../test => test/cpp/workspace}/sanitizers/threadsan.cpp    | 0
 .../cpp/test => test/cpp/workspace}/sanitizers/ubsan.cpp    | 0
 .../cpp/test => test/cpp/workspace}/test/CMakeLists.txt     | 0
 .../cpp/test => test/cpp/workspace}/test/test.cpp           | 0
 .../test/testsuite.bats => test/rust/integration-tests.bats | 0
 .../rust/test => test/rust/workspace}/cargo/Cargo.lock      | 0
 .../rust/test => test/rust/workspace}/cargo/Cargo.toml      | 0
 .../rust/test => test/rust/workspace}/cargo/src/main.rs     | 0
 .../rust/test => test/rust/workspace}/clippy/Cargo.lock     | 0
 .../rust/test => test/rust/workspace}/clippy/Cargo.toml     | 0
 .../rust/test => test/rust/workspace}/clippy/src/main.rs    | 0
 .../rust/workspace}/cortex-m/.cargo/config.toml             | 0
 .../rust/test => test/rust/workspace}/cortex-m/Cargo.lock   | 0
 .../rust/test => test/rust/workspace}/cortex-m/Cargo.toml   | 0
 .../rust/test => test/rust/workspace}/cortex-m/src/main.rs  | 0
 .../rust/test => test/rust/workspace}/rust/fail.rs          | 0
 .../rust/test => test/rust/workspace}/rust/hello.rs         | 0
 .../rust/test => test/rust/workspace}/rust/unformatted.rs   | 0
 .../rust/test => test/rust/workspace}/test/Cargo.lock       | 0
 .../rust/test => test/rust/workspace}/test/Cargo.toml       | 0
 .../rust/test => test/rust/workspace}/test/src/main.rs      | 0
 64 files changed, 14 insertions(+), 6 deletions(-)
 create mode 100644 .devcontainer/rust-test/devcontainer.json
 rename {.devcontainer => test}/cpp/e2e/features/compilation.feature (100%)
 rename {.devcontainer => test}/cpp/e2e/features/pages/authentication.pom.ts (100%)
 rename {.devcontainer => test}/cpp/e2e/features/pages/codespace.pom.ts (100%)
 rename {.devcontainer => test}/cpp/e2e/features/static-dynamic-analysis.feature (100%)
 rename {.devcontainer => test}/cpp/e2e/features/steps/codespace.steps.ts (100%)
 rename {.devcontainer => test}/cpp/e2e/features/steps/fixtures.ts (100%)
 rename {.devcontainer => test}/cpp/e2e/playwright.config.ts (100%)
 rename {.devcontainer => test}/cpp/e2e/workspace/CMakeLists.txt (100%)
 rename {.devcontainer => test}/cpp/e2e/workspace/CMakePresets.json (100%)
 rename {.devcontainer => test}/cpp/e2e/workspace/formatted.cpp (100%)
 rename {.devcontainer => test}/cpp/e2e/workspace/main.cpp (100%)
 rename {.devcontainer => test}/cpp/e2e/workspace/unformatted.cpp (100%)
 rename .devcontainer/cpp/test/testsuite.bats => test/cpp/integration-tests.bats (99%)
 rename {.devcontainer/cpp/test => test/cpp/workspace}/CMakeLists.txt (100%)
 rename {.devcontainer/cpp/test => test/cpp/workspace}/CMakePresets.json (100%)
 rename {.devcontainer/cpp/test => test/cpp/workspace}/clang-cl/CMakeLists.txt (100%)
 rename {.devcontainer/cpp/test => test/cpp/workspace}/clang-cl/main.cpp (100%)
 rename {.devcontainer/cpp/test => test/cpp/workspace}/clang-cl/toolchain.cmake (100%)
 rename {.devcontainer/cpp/test => test/cpp/workspace}/clang-tools/CMakeLists.txt (100%)
 rename {.devcontainer/cpp/test => test/cpp/workspace}/clang-tools/main.cpp (100%)
 rename {.devcontainer/cpp/test => test/cpp/workspace}/clang-tools/unformatted.cpp (100%)
 rename {.devcontainer/cpp/test => test/cpp/workspace}/fuzzing/CMakeLists.txt (100%)
 rename {.devcontainer/cpp/test => test/cpp/workspace}/fuzzing/main.cpp (100%)
 rename {.devcontainer/cpp/test => test/cpp/workspace}/gcc-arm-none-eabi/CMakeLists.txt (100%)
 rename {.devcontainer/cpp/test => test/cpp/workspace}/gcc-arm-none-eabi/main.cpp (100%)
 rename {.devcontainer/cpp/test => test/cpp/workspace}/gcc-arm-none-eabi/toolchain.cmake (100%)
 rename {.devcontainer/cpp/test => test/cpp/workspace}/gcc/CMakeLists.txt (100%)
 rename {.devcontainer/cpp/test => test/cpp/workspace}/gcc/main-fail.cpp (100%)
 rename {.devcontainer/cpp/test => test/cpp/workspace}/gcc/main.cpp (100%)
 rename {.devcontainer/cpp/test => test/cpp/workspace}/package-managers/CMakeLists.txt (100%)
 rename {.devcontainer/cpp/test => test/cpp/workspace}/package-managers/conan/CMakeLists.txt (100%)
 rename {.devcontainer/cpp/test => test/cpp/workspace}/package-managers/conan/conanfile.txt (100%)
 rename {.devcontainer/cpp/test => test/cpp/workspace}/package-managers/conan/main.cpp (100%)
 rename {.devcontainer/cpp/test => test/cpp/workspace}/package-managers/cpm/CMakeLists.txt (100%)
 rename {.devcontainer/cpp/test => test/cpp/workspace}/package-managers/cpm/main.cpp (100%)
 rename {.devcontainer/cpp/test => test/cpp/workspace}/sanitizers/CMakeLists.txt (100%)
 rename {.devcontainer/cpp/test => test/cpp/workspace}/sanitizers/asan.cpp (100%)
 rename {.devcontainer/cpp/test => test/cpp/workspace}/sanitizers/memsan.cpp (100%)
 rename {.devcontainer/cpp/test => test/cpp/workspace}/sanitizers/threadsan.cpp (100%)
 rename {.devcontainer/cpp/test => test/cpp/workspace}/sanitizers/ubsan.cpp (100%)
 rename {.devcontainer/cpp/test => test/cpp/workspace}/test/CMakeLists.txt (100%)
 rename {.devcontainer/cpp/test => test/cpp/workspace}/test/test.cpp (100%)
 rename .devcontainer/rust/test/testsuite.bats => test/rust/integration-tests.bats (100%)
 rename {.devcontainer/rust/test => test/rust/workspace}/cargo/Cargo.lock (100%)
 rename {.devcontainer/rust/test => test/rust/workspace}/cargo/Cargo.toml (100%)
 rename {.devcontainer/rust/test => test/rust/workspace}/cargo/src/main.rs (100%)
 rename {.devcontainer/rust/test => test/rust/workspace}/clippy/Cargo.lock (100%)
 rename {.devcontainer/rust/test => test/rust/workspace}/clippy/Cargo.toml (100%)
 rename {.devcontainer/rust/test => test/rust/workspace}/clippy/src/main.rs (100%)
 rename {.devcontainer/rust/test => test/rust/workspace}/cortex-m/.cargo/config.toml (100%)
 rename {.devcontainer/rust/test => test/rust/workspace}/cortex-m/Cargo.lock (100%)
 rename {.devcontainer/rust/test => test/rust/workspace}/cortex-m/Cargo.toml (100%)
 rename {.devcontainer/rust/test => test/rust/workspace}/cortex-m/src/main.rs (100%)
 rename {.devcontainer/rust/test => test/rust/workspace}/rust/fail.rs (100%)
 rename {.devcontainer/rust/test => test/rust/workspace}/rust/hello.rs (100%)
 rename {.devcontainer/rust/test => test/rust/workspace}/rust/unformatted.rs (100%)
 rename {.devcontainer/rust/test => test/rust/workspace}/test/Cargo.lock (100%)
 rename {.devcontainer/rust/test => test/rust/workspace}/test/Cargo.toml (100%)
 rename {.devcontainer/rust/test => test/rust/workspace}/test/src/main.rs (100%)

diff --git a/.devcontainer/cpp-test/devcontainer.json b/.devcontainer/cpp-test/devcontainer.json
index 02940f28..3005e440 100644
--- a/.devcontainer/cpp-test/devcontainer.json
+++ b/.devcontainer/cpp-test/devcontainer.json
@@ -1,6 +1,6 @@
 {
   "image": "ghcr.io/philips-software/amp-devcontainer-cpp:${localEnv:IMAGE_VERSION}",
-  "workspaceFolder": "/workspaces/amp-devcontainer/.devcontainer/cpp/e2e/workspace",
+  "workspaceFolder": "/workspaces/amp-devcontainer/test/cpp/workspace",
   "customizations": {
     "vscode": {
       "settings": {
diff --git a/.devcontainer/rust-test/devcontainer.json b/.devcontainer/rust-test/devcontainer.json
new file mode 100644
index 00000000..153307fb
--- /dev/null
+++ b/.devcontainer/rust-test/devcontainer.json
@@ -0,0 +1,4 @@
+{
+  "image": "ghcr.io/philips-software/amp-devcontainer-rust:${localEnv:IMAGE_VERSION}",
+  "workspaceFolder": "/workspaces/amp-devcontainer/test/rust/workspace"
+}
diff --git a/.github/workflows/acceptance-test.yml b/.github/workflows/acceptance-test.yml
index 96c116ec..cfc319f3 100644
--- a/.github/workflows/acceptance-test.yml
+++ b/.github/workflows/acceptance-test.yml
@@ -39,7 +39,7 @@ jobs:
         env:
           GH_TOKEN: ${{ secrets.TEST_GITHUB_TOKEN }}
           HEAD_REF: ${{ github.head_ref }}
-      - run: cd .devcontainer/${{ inputs.flavor }}/e2e && npm test
+      - run: cd test/${{ inputs.flavor }}/e2e && npm test
         env:
           GITHUB_USER: ${{ secrets.TEST_GITHUB_USER }}
           GITHUB_PASSWORD: ${{ secrets.TEST_GITHUB_PASSWORD }}
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 5272201e..c06cd94b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -42,7 +42,7 @@ jobs:
       - name: Run Tests
         run: |
           set -Eeuo pipefail
-          docker run --rm --mount type=bind,src=/var/run/docker.sock,dst=/var/run/docker.sock --mount type=bind,src="${{ github.workspace }}/.devcontainer/${{ matrix.flavor }}/test",dst=/ws -w /ws ${{ github.repository }}-${{ matrix.flavor }}:test bats --formatter junit testsuite.bats | tee test-report-${{ matrix.flavor }}.xml
+          docker run --rm --mount type=bind,src=/var/run/docker.sock,dst=/var/run/docker.sock --mount type=bind,src="${{ github.workspace }}/test/${{ matrix.flavor }}",dst=/ws -w /ws ${{ github.repository }}-${{ matrix.flavor }}:test bats --formatter junit integration-tests.bats | tee test-report-${{ matrix.flavor }}.xml
       - uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
         if: always()
         with:
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index 955891ec..033caf40 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -2,16 +2,16 @@
   "version": "2.0.0",
   "tasks": [
     {
-      "label": "Run Tests",
+      "label": "Run Integration Tests",
       "type": "shell",
       "group": {
         "kind": "test",
         "isDefault": true
       },
       "command": "bats",
-      "args": ["testsuite.bats"],
+      "args": ["integration-tests.bats"],
       "options": {
-        "cwd": "${workspaceFolder}/.devcontainer/${env:CONTAINER_FLAVOR}/test"
+        "cwd": "${workspaceFolder}/test/${env:CONTAINER_FLAVOR}"
       },
       "presentation": {
         "reveal": "always",
diff --git a/.devcontainer/cpp/e2e/features/compilation.feature b/test/cpp/e2e/features/compilation.feature
similarity index 100%
rename from .devcontainer/cpp/e2e/features/compilation.feature
rename to test/cpp/e2e/features/compilation.feature
diff --git a/.devcontainer/cpp/e2e/features/pages/authentication.pom.ts b/test/cpp/e2e/features/pages/authentication.pom.ts
similarity index 100%
rename from .devcontainer/cpp/e2e/features/pages/authentication.pom.ts
rename to test/cpp/e2e/features/pages/authentication.pom.ts
diff --git a/.devcontainer/cpp/e2e/features/pages/codespace.pom.ts b/test/cpp/e2e/features/pages/codespace.pom.ts
similarity index 100%
rename from .devcontainer/cpp/e2e/features/pages/codespace.pom.ts
rename to test/cpp/e2e/features/pages/codespace.pom.ts
diff --git a/.devcontainer/cpp/e2e/features/static-dynamic-analysis.feature b/test/cpp/e2e/features/static-dynamic-analysis.feature
similarity index 100%
rename from .devcontainer/cpp/e2e/features/static-dynamic-analysis.feature
rename to test/cpp/e2e/features/static-dynamic-analysis.feature
diff --git a/.devcontainer/cpp/e2e/features/steps/codespace.steps.ts b/test/cpp/e2e/features/steps/codespace.steps.ts
similarity index 100%
rename from .devcontainer/cpp/e2e/features/steps/codespace.steps.ts
rename to test/cpp/e2e/features/steps/codespace.steps.ts
diff --git a/.devcontainer/cpp/e2e/features/steps/fixtures.ts b/test/cpp/e2e/features/steps/fixtures.ts
similarity index 100%
rename from .devcontainer/cpp/e2e/features/steps/fixtures.ts
rename to test/cpp/e2e/features/steps/fixtures.ts
diff --git a/.devcontainer/cpp/e2e/playwright.config.ts b/test/cpp/e2e/playwright.config.ts
similarity index 100%
rename from .devcontainer/cpp/e2e/playwright.config.ts
rename to test/cpp/e2e/playwright.config.ts
diff --git a/.devcontainer/cpp/e2e/workspace/CMakeLists.txt b/test/cpp/e2e/workspace/CMakeLists.txt
similarity index 100%
rename from .devcontainer/cpp/e2e/workspace/CMakeLists.txt
rename to test/cpp/e2e/workspace/CMakeLists.txt
diff --git a/.devcontainer/cpp/e2e/workspace/CMakePresets.json b/test/cpp/e2e/workspace/CMakePresets.json
similarity index 100%
rename from .devcontainer/cpp/e2e/workspace/CMakePresets.json
rename to test/cpp/e2e/workspace/CMakePresets.json
diff --git a/.devcontainer/cpp/e2e/workspace/formatted.cpp b/test/cpp/e2e/workspace/formatted.cpp
similarity index 100%
rename from .devcontainer/cpp/e2e/workspace/formatted.cpp
rename to test/cpp/e2e/workspace/formatted.cpp
diff --git a/.devcontainer/cpp/e2e/workspace/main.cpp b/test/cpp/e2e/workspace/main.cpp
similarity index 100%
rename from .devcontainer/cpp/e2e/workspace/main.cpp
rename to test/cpp/e2e/workspace/main.cpp
diff --git a/.devcontainer/cpp/e2e/workspace/unformatted.cpp b/test/cpp/e2e/workspace/unformatted.cpp
similarity index 100%
rename from .devcontainer/cpp/e2e/workspace/unformatted.cpp
rename to test/cpp/e2e/workspace/unformatted.cpp
diff --git a/.devcontainer/cpp/test/testsuite.bats b/test/cpp/integration-tests.bats
similarity index 99%
rename from .devcontainer/cpp/test/testsuite.bats
rename to test/cpp/integration-tests.bats
index a6e178f3..7d0edae7 100644
--- a/.devcontainer/cpp/test/testsuite.bats
+++ b/test/cpp/integration-tests.bats
@@ -28,10 +28,14 @@ teardown_file() {
 setup() {
   load '/usr/local/bats-support/load'
   load '/usr/local/bats-assert/load'
+
+  pushd workspace
 }
 
 teardown() {
   rm -rf build crash-* $(conan config home)/p
+
+  popd
 }
 
 @test "valid code input should result in working executable using host compiler" {
diff --git a/.devcontainer/cpp/test/CMakeLists.txt b/test/cpp/workspace/CMakeLists.txt
similarity index 100%
rename from .devcontainer/cpp/test/CMakeLists.txt
rename to test/cpp/workspace/CMakeLists.txt
diff --git a/.devcontainer/cpp/test/CMakePresets.json b/test/cpp/workspace/CMakePresets.json
similarity index 100%
rename from .devcontainer/cpp/test/CMakePresets.json
rename to test/cpp/workspace/CMakePresets.json
diff --git a/.devcontainer/cpp/test/clang-cl/CMakeLists.txt b/test/cpp/workspace/clang-cl/CMakeLists.txt
similarity index 100%
rename from .devcontainer/cpp/test/clang-cl/CMakeLists.txt
rename to test/cpp/workspace/clang-cl/CMakeLists.txt
diff --git a/.devcontainer/cpp/test/clang-cl/main.cpp b/test/cpp/workspace/clang-cl/main.cpp
similarity index 100%
rename from .devcontainer/cpp/test/clang-cl/main.cpp
rename to test/cpp/workspace/clang-cl/main.cpp
diff --git a/.devcontainer/cpp/test/clang-cl/toolchain.cmake b/test/cpp/workspace/clang-cl/toolchain.cmake
similarity index 100%
rename from .devcontainer/cpp/test/clang-cl/toolchain.cmake
rename to test/cpp/workspace/clang-cl/toolchain.cmake
diff --git a/.devcontainer/cpp/test/clang-tools/CMakeLists.txt b/test/cpp/workspace/clang-tools/CMakeLists.txt
similarity index 100%
rename from .devcontainer/cpp/test/clang-tools/CMakeLists.txt
rename to test/cpp/workspace/clang-tools/CMakeLists.txt
diff --git a/.devcontainer/cpp/test/clang-tools/main.cpp b/test/cpp/workspace/clang-tools/main.cpp
similarity index 100%
rename from .devcontainer/cpp/test/clang-tools/main.cpp
rename to test/cpp/workspace/clang-tools/main.cpp
diff --git a/.devcontainer/cpp/test/clang-tools/unformatted.cpp b/test/cpp/workspace/clang-tools/unformatted.cpp
similarity index 100%
rename from .devcontainer/cpp/test/clang-tools/unformatted.cpp
rename to test/cpp/workspace/clang-tools/unformatted.cpp
diff --git a/.devcontainer/cpp/test/fuzzing/CMakeLists.txt b/test/cpp/workspace/fuzzing/CMakeLists.txt
similarity index 100%
rename from .devcontainer/cpp/test/fuzzing/CMakeLists.txt
rename to test/cpp/workspace/fuzzing/CMakeLists.txt
diff --git a/.devcontainer/cpp/test/fuzzing/main.cpp b/test/cpp/workspace/fuzzing/main.cpp
similarity index 100%
rename from .devcontainer/cpp/test/fuzzing/main.cpp
rename to test/cpp/workspace/fuzzing/main.cpp
diff --git a/.devcontainer/cpp/test/gcc-arm-none-eabi/CMakeLists.txt b/test/cpp/workspace/gcc-arm-none-eabi/CMakeLists.txt
similarity index 100%
rename from .devcontainer/cpp/test/gcc-arm-none-eabi/CMakeLists.txt
rename to test/cpp/workspace/gcc-arm-none-eabi/CMakeLists.txt
diff --git a/.devcontainer/cpp/test/gcc-arm-none-eabi/main.cpp b/test/cpp/workspace/gcc-arm-none-eabi/main.cpp
similarity index 100%
rename from .devcontainer/cpp/test/gcc-arm-none-eabi/main.cpp
rename to test/cpp/workspace/gcc-arm-none-eabi/main.cpp
diff --git a/.devcontainer/cpp/test/gcc-arm-none-eabi/toolchain.cmake b/test/cpp/workspace/gcc-arm-none-eabi/toolchain.cmake
similarity index 100%
rename from .devcontainer/cpp/test/gcc-arm-none-eabi/toolchain.cmake
rename to test/cpp/workspace/gcc-arm-none-eabi/toolchain.cmake
diff --git a/.devcontainer/cpp/test/gcc/CMakeLists.txt b/test/cpp/workspace/gcc/CMakeLists.txt
similarity index 100%
rename from .devcontainer/cpp/test/gcc/CMakeLists.txt
rename to test/cpp/workspace/gcc/CMakeLists.txt
diff --git a/.devcontainer/cpp/test/gcc/main-fail.cpp b/test/cpp/workspace/gcc/main-fail.cpp
similarity index 100%
rename from .devcontainer/cpp/test/gcc/main-fail.cpp
rename to test/cpp/workspace/gcc/main-fail.cpp
diff --git a/.devcontainer/cpp/test/gcc/main.cpp b/test/cpp/workspace/gcc/main.cpp
similarity index 100%
rename from .devcontainer/cpp/test/gcc/main.cpp
rename to test/cpp/workspace/gcc/main.cpp
diff --git a/.devcontainer/cpp/test/package-managers/CMakeLists.txt b/test/cpp/workspace/package-managers/CMakeLists.txt
similarity index 100%
rename from .devcontainer/cpp/test/package-managers/CMakeLists.txt
rename to test/cpp/workspace/package-managers/CMakeLists.txt
diff --git a/.devcontainer/cpp/test/package-managers/conan/CMakeLists.txt b/test/cpp/workspace/package-managers/conan/CMakeLists.txt
similarity index 100%
rename from .devcontainer/cpp/test/package-managers/conan/CMakeLists.txt
rename to test/cpp/workspace/package-managers/conan/CMakeLists.txt
diff --git a/.devcontainer/cpp/test/package-managers/conan/conanfile.txt b/test/cpp/workspace/package-managers/conan/conanfile.txt
similarity index 100%
rename from .devcontainer/cpp/test/package-managers/conan/conanfile.txt
rename to test/cpp/workspace/package-managers/conan/conanfile.txt
diff --git a/.devcontainer/cpp/test/package-managers/conan/main.cpp b/test/cpp/workspace/package-managers/conan/main.cpp
similarity index 100%
rename from .devcontainer/cpp/test/package-managers/conan/main.cpp
rename to test/cpp/workspace/package-managers/conan/main.cpp
diff --git a/.devcontainer/cpp/test/package-managers/cpm/CMakeLists.txt b/test/cpp/workspace/package-managers/cpm/CMakeLists.txt
similarity index 100%
rename from .devcontainer/cpp/test/package-managers/cpm/CMakeLists.txt
rename to test/cpp/workspace/package-managers/cpm/CMakeLists.txt
diff --git a/.devcontainer/cpp/test/package-managers/cpm/main.cpp b/test/cpp/workspace/package-managers/cpm/main.cpp
similarity index 100%
rename from .devcontainer/cpp/test/package-managers/cpm/main.cpp
rename to test/cpp/workspace/package-managers/cpm/main.cpp
diff --git a/.devcontainer/cpp/test/sanitizers/CMakeLists.txt b/test/cpp/workspace/sanitizers/CMakeLists.txt
similarity index 100%
rename from .devcontainer/cpp/test/sanitizers/CMakeLists.txt
rename to test/cpp/workspace/sanitizers/CMakeLists.txt
diff --git a/.devcontainer/cpp/test/sanitizers/asan.cpp b/test/cpp/workspace/sanitizers/asan.cpp
similarity index 100%
rename from .devcontainer/cpp/test/sanitizers/asan.cpp
rename to test/cpp/workspace/sanitizers/asan.cpp
diff --git a/.devcontainer/cpp/test/sanitizers/memsan.cpp b/test/cpp/workspace/sanitizers/memsan.cpp
similarity index 100%
rename from .devcontainer/cpp/test/sanitizers/memsan.cpp
rename to test/cpp/workspace/sanitizers/memsan.cpp
diff --git a/.devcontainer/cpp/test/sanitizers/threadsan.cpp b/test/cpp/workspace/sanitizers/threadsan.cpp
similarity index 100%
rename from .devcontainer/cpp/test/sanitizers/threadsan.cpp
rename to test/cpp/workspace/sanitizers/threadsan.cpp
diff --git a/.devcontainer/cpp/test/sanitizers/ubsan.cpp b/test/cpp/workspace/sanitizers/ubsan.cpp
similarity index 100%
rename from .devcontainer/cpp/test/sanitizers/ubsan.cpp
rename to test/cpp/workspace/sanitizers/ubsan.cpp
diff --git a/.devcontainer/cpp/test/test/CMakeLists.txt b/test/cpp/workspace/test/CMakeLists.txt
similarity index 100%
rename from .devcontainer/cpp/test/test/CMakeLists.txt
rename to test/cpp/workspace/test/CMakeLists.txt
diff --git a/.devcontainer/cpp/test/test/test.cpp b/test/cpp/workspace/test/test.cpp
similarity index 100%
rename from .devcontainer/cpp/test/test/test.cpp
rename to test/cpp/workspace/test/test.cpp
diff --git a/.devcontainer/rust/test/testsuite.bats b/test/rust/integration-tests.bats
similarity index 100%
rename from .devcontainer/rust/test/testsuite.bats
rename to test/rust/integration-tests.bats
diff --git a/.devcontainer/rust/test/cargo/Cargo.lock b/test/rust/workspace/cargo/Cargo.lock
similarity index 100%
rename from .devcontainer/rust/test/cargo/Cargo.lock
rename to test/rust/workspace/cargo/Cargo.lock
diff --git a/.devcontainer/rust/test/cargo/Cargo.toml b/test/rust/workspace/cargo/Cargo.toml
similarity index 100%
rename from .devcontainer/rust/test/cargo/Cargo.toml
rename to test/rust/workspace/cargo/Cargo.toml
diff --git a/.devcontainer/rust/test/cargo/src/main.rs b/test/rust/workspace/cargo/src/main.rs
similarity index 100%
rename from .devcontainer/rust/test/cargo/src/main.rs
rename to test/rust/workspace/cargo/src/main.rs
diff --git a/.devcontainer/rust/test/clippy/Cargo.lock b/test/rust/workspace/clippy/Cargo.lock
similarity index 100%
rename from .devcontainer/rust/test/clippy/Cargo.lock
rename to test/rust/workspace/clippy/Cargo.lock
diff --git a/.devcontainer/rust/test/clippy/Cargo.toml b/test/rust/workspace/clippy/Cargo.toml
similarity index 100%
rename from .devcontainer/rust/test/clippy/Cargo.toml
rename to test/rust/workspace/clippy/Cargo.toml
diff --git a/.devcontainer/rust/test/clippy/src/main.rs b/test/rust/workspace/clippy/src/main.rs
similarity index 100%
rename from .devcontainer/rust/test/clippy/src/main.rs
rename to test/rust/workspace/clippy/src/main.rs
diff --git a/.devcontainer/rust/test/cortex-m/.cargo/config.toml b/test/rust/workspace/cortex-m/.cargo/config.toml
similarity index 100%
rename from .devcontainer/rust/test/cortex-m/.cargo/config.toml
rename to test/rust/workspace/cortex-m/.cargo/config.toml
diff --git a/.devcontainer/rust/test/cortex-m/Cargo.lock b/test/rust/workspace/cortex-m/Cargo.lock
similarity index 100%
rename from .devcontainer/rust/test/cortex-m/Cargo.lock
rename to test/rust/workspace/cortex-m/Cargo.lock
diff --git a/.devcontainer/rust/test/cortex-m/Cargo.toml b/test/rust/workspace/cortex-m/Cargo.toml
similarity index 100%
rename from .devcontainer/rust/test/cortex-m/Cargo.toml
rename to test/rust/workspace/cortex-m/Cargo.toml
diff --git a/.devcontainer/rust/test/cortex-m/src/main.rs b/test/rust/workspace/cortex-m/src/main.rs
similarity index 100%
rename from .devcontainer/rust/test/cortex-m/src/main.rs
rename to test/rust/workspace/cortex-m/src/main.rs
diff --git a/.devcontainer/rust/test/rust/fail.rs b/test/rust/workspace/rust/fail.rs
similarity index 100%
rename from .devcontainer/rust/test/rust/fail.rs
rename to test/rust/workspace/rust/fail.rs
diff --git a/.devcontainer/rust/test/rust/hello.rs b/test/rust/workspace/rust/hello.rs
similarity index 100%
rename from .devcontainer/rust/test/rust/hello.rs
rename to test/rust/workspace/rust/hello.rs
diff --git a/.devcontainer/rust/test/rust/unformatted.rs b/test/rust/workspace/rust/unformatted.rs
similarity index 100%
rename from .devcontainer/rust/test/rust/unformatted.rs
rename to test/rust/workspace/rust/unformatted.rs
diff --git a/.devcontainer/rust/test/test/Cargo.lock b/test/rust/workspace/test/Cargo.lock
similarity index 100%
rename from .devcontainer/rust/test/test/Cargo.lock
rename to test/rust/workspace/test/Cargo.lock
diff --git a/.devcontainer/rust/test/test/Cargo.toml b/test/rust/workspace/test/Cargo.toml
similarity index 100%
rename from .devcontainer/rust/test/test/Cargo.toml
rename to test/rust/workspace/test/Cargo.toml
diff --git a/.devcontainer/rust/test/test/src/main.rs b/test/rust/workspace/test/src/main.rs
similarity index 100%
rename from .devcontainer/rust/test/test/src/main.rs
rename to test/rust/workspace/test/src/main.rs

From 68311d8544c2547ac227b2969b974e0c5ca1a105 Mon Sep 17 00:00:00 2001
From: Ron <45816308+rjaegers@users.noreply.github.com>
Date: Wed, 30 Oct 2024 14:31:12 +0000
Subject: [PATCH 02/12] chore: fix rust tests

---
 test/rust/integration-tests.bats | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/test/rust/integration-tests.bats b/test/rust/integration-tests.bats
index d6edb1c1..08a00c60 100644
--- a/test/rust/integration-tests.bats
+++ b/test/rust/integration-tests.bats
@@ -5,10 +5,14 @@ bats_require_minimum_version 1.5.0
 setup() {
   load '/usr/local/bats-support/load'
   load '/usr/local/bats-assert/load'
+
+  pushd workspace
 }
 
 teardown() {
   rm -rf build ./**/target ./**/default*.prof* ./**/mutants.out
+
+  popd
 }
 
 @test "valid code input should result in working executable targeting the host architecture" {

From b4ec6b4ad694b3da5531c55356499fdf573efec8 Mon Sep 17 00:00:00 2001
From: Ron <45816308+rjaegers@users.noreply.github.com>
Date: Wed, 30 Oct 2024 14:31:26 +0000
Subject: [PATCH 03/12] chore: fix Sonar findings

---
 test/cpp/e2e/features/steps/codespace.steps.ts | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/test/cpp/e2e/features/steps/codespace.steps.ts b/test/cpp/e2e/features/steps/codespace.steps.ts
index 110b8f80..8c8ea15d 100644
--- a/test/cpp/e2e/features/steps/codespace.steps.ts
+++ b/test/cpp/e2e/features/steps/codespace.steps.ts
@@ -9,12 +9,10 @@ Given("the default build configuration is selected", async () => {
 Given("the file {string} is opened in the editor", async ({ codespacePage }, file: string) => {
   const fileExtension = path.extname(file).slice(1);
 
-  switch (fileExtension) {
-    case 'cpp':
-      await codespacePage.openCppFileInEditor(file);
-      break;
-    default:
-      await codespacePage.openFileInEditor(file);
+  if (fileExtension === 'cpp') {
+    await codespacePage.openCppFileInEditor(file);
+  } else {
+    await codespacePage.openFileInEditor(file);
   }
 });
 

From f0d7caa81d697d43b6afd912ed70f70e1bdc4dce Mon Sep 17 00:00:00 2001
From: Ron <45816308+rjaegers@users.noreply.github.com>
Date: Sat, 2 Nov 2024 13:40:00 +0000
Subject: [PATCH 04/12] refactor: share workspace between integration and e2e
 tests

---
 .devcontainer/cpp-test/devcontainer.json      |  4 +-
 .devcontainer/cpp/devcontainer.json           |  2 +-
 test/cpp/e2e/workspace/CMakeLists.txt         |  5 ---
 test/cpp/e2e/workspace/CMakePresets.json      | 40 -------------------
 test/cpp/e2e/workspace/formatted.cpp          |  7 ----
 test/cpp/e2e/workspace/main.cpp               | 12 ------
 test/cpp/e2e/workspace/unformatted.cpp        |  8 ----
 .../{e2e => }/features/compilation.feature    |  7 ++--
 .../features/pages/authentication.pom.ts      |  2 +-
 .../{e2e => }/features/pages/codespace.pom.ts | 32 +++++++++++++--
 .../{e2e => features}/playwright.config.ts    |  4 +-
 .../features/static-dynamic-analysis.feature  |  4 +-
 .../features/steps/codespace.steps.ts         | 22 +++++-----
 test/cpp/{e2e => }/features/steps/fixtures.ts |  2 +
 test/cpp/workspace/clang-tools/formatted.cpp  |  1 +
 15 files changed, 53 insertions(+), 99 deletions(-)
 delete mode 100644 test/cpp/e2e/workspace/CMakeLists.txt
 delete mode 100644 test/cpp/e2e/workspace/CMakePresets.json
 delete mode 100644 test/cpp/e2e/workspace/formatted.cpp
 delete mode 100644 test/cpp/e2e/workspace/main.cpp
 delete mode 100644 test/cpp/e2e/workspace/unformatted.cpp
 rename test/cpp/{e2e => }/features/compilation.feature (79%)
 rename test/cpp/{e2e => }/features/pages/authentication.pom.ts (95%)
 rename test/cpp/{e2e => }/features/pages/codespace.pom.ts (81%)
 rename test/cpp/{e2e => features}/playwright.config.ts (91%)
 rename test/cpp/{e2e => }/features/static-dynamic-analysis.feature (65%)
 rename test/cpp/{e2e => }/features/steps/codespace.steps.ts (63%)
 rename test/cpp/{e2e => }/features/steps/fixtures.ts (85%)
 create mode 100644 test/cpp/workspace/clang-tools/formatted.cpp

diff --git a/.devcontainer/cpp-test/devcontainer.json b/.devcontainer/cpp-test/devcontainer.json
index 3005e440..47664b0f 100644
--- a/.devcontainer/cpp-test/devcontainer.json
+++ b/.devcontainer/cpp-test/devcontainer.json
@@ -4,7 +4,9 @@
   "customizations": {
     "vscode": {
       "settings": {
-        "cmake.automaticReconfigure": false
+        "cmake.automaticReconfigure": false,
+        "cmake.configureOnOpen": false,
+        "cmake.ctest.testExplorerIntegrationEnabled": false
       }
     }
   }
diff --git a/.devcontainer/cpp/devcontainer.json b/.devcontainer/cpp/devcontainer.json
index ec41c60e..ad326b26 100644
--- a/.devcontainer/cpp/devcontainer.json
+++ b/.devcontainer/cpp/devcontainer.json
@@ -20,7 +20,7 @@
   "customizations": {
     "vscode": {
       "settings": {
-        "cucumberautocomplete.steps": [".devcontainer/cpp/e2e/features/steps/*.steps.ts"],
+        "cucumberautocomplete.steps": ["test/cpp/features/steps/*.steps.ts"],
         "cucumberautocomplete.strictGherkinCompletion": false,
         "cucumberautocomplete.strictGherkinValidation": false,
         "cucumberautocomplete.smartSnippets": true,
diff --git a/test/cpp/e2e/workspace/CMakeLists.txt b/test/cpp/e2e/workspace/CMakeLists.txt
deleted file mode 100644
index b67fe424..00000000
--- a/test/cpp/e2e/workspace/CMakeLists.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-cmake_minimum_required(VERSION 3.24)
-
-project(e2e-test VERSION 1.0.0)
-
-add_executable(e2e-test main.cpp)
diff --git a/test/cpp/e2e/workspace/CMakePresets.json b/test/cpp/e2e/workspace/CMakePresets.json
deleted file mode 100644
index 1a0a9aad..00000000
--- a/test/cpp/e2e/workspace/CMakePresets.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-  "version": 3,
-  "configurePresets": [
-    {
-      "name": "defaults",
-      "hidden": true,
-      "binaryDir": "${sourceDir}/build/${presetName}",
-      "generator": "Ninja Multi-Config",
-      "cacheVariables": {
-        "CMAKE_CONFIGURATION_TYPES": "Debug;Release;RelWithDebInfo;MinSizeRel"
-      }
-    },
-    {
-      "name": "host",
-      "inherits": "defaults"
-    }
-  ],
-  "buildPresets": [
-    {
-      "name": "host-Debug",
-      "configuration": "Debug",
-      "configurePreset": "host"
-    },
-    {
-      "name": "host-Release",
-      "configuration": "Release",
-      "configurePreset": "host"
-    },
-    {
-      "name": "host-RelWithDebInfo",
-      "configuration": "RelWithDebInfo",
-      "configurePreset": "host"
-    },
-    {
-      "name": "host-MinSizeRel",
-      "configuration": "MinSizeRel",
-      "configurePreset": "host"
-    }
-  ]
-}
diff --git a/test/cpp/e2e/workspace/formatted.cpp b/test/cpp/e2e/workspace/formatted.cpp
deleted file mode 100644
index c2266d56..00000000
--- a/test/cpp/e2e/workspace/formatted.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-#include <algorithm>
-#include <iostream>
-
-int main() {
-  std::cout << "Hello World!" << std::endl;
-  return 0;
-}
diff --git a/test/cpp/e2e/workspace/main.cpp b/test/cpp/e2e/workspace/main.cpp
deleted file mode 100644
index 37a56944..00000000
--- a/test/cpp/e2e/workspace/main.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-#include <iostream>
-
-void SmellyFunction()
-{
-    auto array = new int[10];
-}
-
-int main()
-{
-    std::cout << "Hello World!" << std::endl;
-    return 0;
-}
diff --git a/test/cpp/e2e/workspace/unformatted.cpp b/test/cpp/e2e/workspace/unformatted.cpp
deleted file mode 100644
index faa6721a..00000000
--- a/test/cpp/e2e/workspace/unformatted.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-#include <iostream>
-#include <algorithm>
-
-int main()
-{
-    std::cout << "Hello World!" << std::endl;
-    return 0;
-}
diff --git a/test/cpp/e2e/features/compilation.feature b/test/cpp/features/compilation.feature
similarity index 79%
rename from test/cpp/e2e/features/compilation.feature
rename to test/cpp/features/compilation.feature
index f06d58b2..b2128ef8 100644
--- a/test/cpp/e2e/features/compilation.feature
+++ b/test/cpp/features/compilation.feature
@@ -1,7 +1,7 @@
 Feature: Compile source code into working software
 
   As a developer
-  In order to generate working software
+  To generate working software
   Source code needs to be compiled successfully
 
   Scenario: Compile valid source code into working software targeting the host architecture
@@ -13,6 +13,7 @@ Feature: Compile source code into working software
     - running tests on the host
     - building plug-ins, extensions, code generators, or other additional tools that need to run on the host
 
-    Given the default build configuration is selected
-    When the configuration "host" is built
+    Given build configuration "gcc" is selected
+    And build preset "gcc" is selected
+    When the selected target is built
     Then the output should contain "Build finished with exit code 0"
diff --git a/test/cpp/e2e/features/pages/authentication.pom.ts b/test/cpp/features/pages/authentication.pom.ts
similarity index 95%
rename from test/cpp/e2e/features/pages/authentication.pom.ts
rename to test/cpp/features/pages/authentication.pom.ts
index 289642a0..8f4512ef 100644
--- a/test/cpp/e2e/features/pages/authentication.pom.ts
+++ b/test/cpp/features/pages/authentication.pom.ts
@@ -1,6 +1,6 @@
 import { type Page } from '@playwright/test';
 import * as OTPAuth from 'otpauth';
-import { STORAGE_STATE } from '../../playwright.config';
+import { STORAGE_STATE } from '../playwright.config';
 
 export class AuthenticationPage {
   readonly page: Page;
diff --git a/test/cpp/e2e/features/pages/codespace.pom.ts b/test/cpp/features/pages/codespace.pom.ts
similarity index 81%
rename from test/cpp/e2e/features/pages/codespace.pom.ts
rename to test/cpp/features/pages/codespace.pom.ts
index b1061cd3..fdf117c2 100644
--- a/test/cpp/e2e/features/pages/codespace.pom.ts
+++ b/test/cpp/features/pages/codespace.pom.ts
@@ -1,4 +1,5 @@
 import { test, expect, type Page, type Locator } from '@playwright/test';
+import path from 'path';
 
 type CommandAndPrompt = {
   command: string,
@@ -97,8 +98,11 @@ export class CodespacePage {
   }
 
   async openFileInEditor(name: string) {
-    await this.page.getByRole('treeitem', { name: name }).locator('a').click();
-    await expect(this.page.locator('[id="workbench.parts.editor"]')).toContainText(name);
+    await this.page.keyboard.press('Control+P');
+    const searchBox = this.page.getByPlaceholder('Search files by name');
+    await expect(searchBox).toBeVisible();
+    await searchBox.fill(name);
+    await expect(this.page.locator('[id="workbench.parts.editor"]')).toContainText(path.basename(name));
   }
 
   async openCppFileInEditor(name: string) {
@@ -106,14 +110,34 @@ export class CodespacePage {
     await expect(this.page.locator('[id="llvm-vs-code-extensions.vscode-clangd"]')).toContainText('clangd: idle', { timeout: 1 * 60 * 1000 });
   }
 
-  async formatDocument() {
-    await this.executeFromCommandPalette({ command: 'Format Document' });
+  async openDocument(name: string) {
+    const fileExtension = path.extname(name).slice(1);
+
+    if (fileExtension === 'cpp') {
+      await this.openCppFileInEditor(name);
+    } else {
+      await this.openFileInEditor(name);
+    }
   }
 
   async saveDocument() {
     await this.page.keyboard.press('Control+S');
   }
 
+  async formatDocument() {
+    await this.executeFromCommandPalette({ command: 'Format Document' });
+  }
+
+  async selectBuildConfiguration(configuration: string) {
+    await this.executeFromCommandPalette({ command: 'CMake: Select Configure Preset' });
+    await this.page.getByRole('option', { name: configuration, exact: true }).locator('a').click();
+  }
+
+  async selectBuildPreset(preset: string) {
+    await this.executeFromCommandPalette({ command: 'CMake: Select Build Preset' });
+    await this.page.getByRole('option', { name: preset, exact: true }).locator('a').click();
+  }
+
   async buildSelectedTarget() {
     await this.page.getByRole('button', { name: 'Build the selected target' }).click();
   }
diff --git a/test/cpp/e2e/playwright.config.ts b/test/cpp/features/playwright.config.ts
similarity index 91%
rename from test/cpp/e2e/playwright.config.ts
rename to test/cpp/features/playwright.config.ts
index a561dfd7..f0a57ca5 100644
--- a/test/cpp/e2e/playwright.config.ts
+++ b/test/cpp/features/playwright.config.ts
@@ -7,8 +7,8 @@ require('dotenv').config({ path: path.join(__dirname, '..', '..', '..', '.env')
 export const STORAGE_STATE = path.join(__dirname, 'playwright/.auth/user.json');
 
 const testDir = defineBddConfig({
-  features: "features/*.feature",
-  steps: ["features/steps/*.ts"],
+  features: "*.feature",
+  steps: ["steps/*.ts"],
 });
 
 export default defineConfig({
diff --git a/test/cpp/e2e/features/static-dynamic-analysis.feature b/test/cpp/features/static-dynamic-analysis.feature
similarity index 65%
rename from test/cpp/e2e/features/static-dynamic-analysis.feature
rename to test/cpp/features/static-dynamic-analysis.feature
index 9e3de367..765bfb67 100644
--- a/test/cpp/e2e/features/static-dynamic-analysis.feature
+++ b/test/cpp/features/static-dynamic-analysis.feature
@@ -6,7 +6,7 @@ Feature: Analyze source code using static and dynamic analysis
 
   Scenario: Format source code according to a formatting style
 
-    Given the file "unformatted.cpp" is opened in the editor
+    Given the file "clang-tools/unformatted.cpp" is opened in the editor
     When the active document is formatted
     And the active document is saved
-    Then the contents of "unformatted.cpp" should match the contents of "formatted.cpp"
+    Then the contents of "clang-tools/unformatted.cpp" should match the contents of "clang-tools/formatted.cpp"
diff --git a/test/cpp/e2e/features/steps/codespace.steps.ts b/test/cpp/features/steps/codespace.steps.ts
similarity index 63%
rename from test/cpp/e2e/features/steps/codespace.steps.ts
rename to test/cpp/features/steps/codespace.steps.ts
index 8c8ea15d..52726326 100644
--- a/test/cpp/e2e/features/steps/codespace.steps.ts
+++ b/test/cpp/features/steps/codespace.steps.ts
@@ -1,24 +1,20 @@
 import { expect } from "@playwright/test";
 import { Given, When, Then } from "./fixtures";
-import * as path from 'path';
 
-Given("the default build configuration is selected", async () => {
-  // No-op
+Given("build configuration {string} is selected", async ({ codespacePage }, configuration: string) => {
+  await codespacePage.selectBuildConfiguration(configuration);
 });
 
-Given("the file {string} is opened in the editor", async ({ codespacePage }, file: string) => {
-  const fileExtension = path.extname(file).slice(1);
+Given("build preset {string} is selected", async ({ codespacePage }, preset: string) => {
+  await codespacePage.selectBuildPreset(preset);
+});
 
-  if (fileExtension === 'cpp') {
-    await codespacePage.openCppFileInEditor(file);
-  } else {
-    await codespacePage.openFileInEditor(file);
-  }
+Given("the file {string} is opened in the editor", async ({ codespacePage }, file: string) => {
+  await codespacePage.openDocument(file);
 });
 
-When("the configuration {string} is built", async ({ codespacePage }, configuration: string) => {
-  await codespacePage.page.getByRole('button', { name: 'Build the selected target' }).click();
-  await codespacePage.page.getByLabel(configuration).locator('a').click();
+When("the selected target is built", async ({ codespacePage }) => {
+  await codespacePage.buildSelectedTarget();
 });
 
 When("the active document is formatted", async ({ codespacePage }) => {
diff --git a/test/cpp/e2e/features/steps/fixtures.ts b/test/cpp/features/steps/fixtures.ts
similarity index 85%
rename from test/cpp/e2e/features/steps/fixtures.ts
rename to test/cpp/features/steps/fixtures.ts
index c8c98b97..9b3f4b74 100644
--- a/test/cpp/e2e/features/steps/fixtures.ts
+++ b/test/cpp/features/steps/fixtures.ts
@@ -14,10 +14,12 @@ export const test = base.extend<{ codespacePage: CodespacePage }, { authenticati
         const codespacePage = new CodespacePage(page);
         await codespacePage.goto();
         await codespacePage.areExtensionsActive(['Testing', 'SonarLint', 'CMake', 'Live Share', 'GitHub Pull Requests']);
+        await codespacePage.executeFromCommandPalette({ command: 'Terminal: Kill All Terminals' });
 
         await use(codespacePage);
 
         await codespacePage.executeInTerminal('git clean -fdx');
+        await codespacePage.executeInTerminal('git reset --hard');
     },
 });
 
diff --git a/test/cpp/workspace/clang-tools/formatted.cpp b/test/cpp/workspace/clang-tools/formatted.cpp
new file mode 100644
index 00000000..237c8ce1
--- /dev/null
+++ b/test/cpp/workspace/clang-tools/formatted.cpp
@@ -0,0 +1 @@
+int main() {}

From 2dbb53d9708cdbbeaa6bbefdd53c2e3d50785896 Mon Sep 17 00:00:00 2001
From: Ron <45816308+rjaegers@users.noreply.github.com>
Date: Sat, 2 Nov 2024 13:44:07 +0000
Subject: [PATCH 05/12] chore: move tests after merge

---
 .../test => test/rust/workspace}/cortex-mf/.cargo/config.toml     | 0
 .../rust/test => test/rust/workspace}/cortex-mf/Cargo.lock        | 0
 .../rust/test => test/rust/workspace}/cortex-mf/Cargo.toml        | 0
 .../rust/test => test/rust/workspace}/cortex-mf/src/main.rs       | 0
 4 files changed, 0 insertions(+), 0 deletions(-)
 rename {.devcontainer/rust/test => test/rust/workspace}/cortex-mf/.cargo/config.toml (100%)
 rename {.devcontainer/rust/test => test/rust/workspace}/cortex-mf/Cargo.lock (100%)
 rename {.devcontainer/rust/test => test/rust/workspace}/cortex-mf/Cargo.toml (100%)
 rename {.devcontainer/rust/test => test/rust/workspace}/cortex-mf/src/main.rs (100%)

diff --git a/.devcontainer/rust/test/cortex-mf/.cargo/config.toml b/test/rust/workspace/cortex-mf/.cargo/config.toml
similarity index 100%
rename from .devcontainer/rust/test/cortex-mf/.cargo/config.toml
rename to test/rust/workspace/cortex-mf/.cargo/config.toml
diff --git a/.devcontainer/rust/test/cortex-mf/Cargo.lock b/test/rust/workspace/cortex-mf/Cargo.lock
similarity index 100%
rename from .devcontainer/rust/test/cortex-mf/Cargo.lock
rename to test/rust/workspace/cortex-mf/Cargo.lock
diff --git a/.devcontainer/rust/test/cortex-mf/Cargo.toml b/test/rust/workspace/cortex-mf/Cargo.toml
similarity index 100%
rename from .devcontainer/rust/test/cortex-mf/Cargo.toml
rename to test/rust/workspace/cortex-mf/Cargo.toml
diff --git a/.devcontainer/rust/test/cortex-mf/src/main.rs b/test/rust/workspace/cortex-mf/src/main.rs
similarity index 100%
rename from .devcontainer/rust/test/cortex-mf/src/main.rs
rename to test/rust/workspace/cortex-mf/src/main.rs

From 80161edff7984b8de658f0db301a784f5d286149 Mon Sep 17 00:00:00 2001
From: Ron <45816308+rjaegers@users.noreply.github.com>
Date: Sat, 2 Nov 2024 13:53:50 +0000
Subject: [PATCH 06/12] fix: correct path to end-to-end tests

---
 .github/workflows/acceptance-test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/acceptance-test.yml b/.github/workflows/acceptance-test.yml
index cfc319f3..6bfb24d0 100644
--- a/.github/workflows/acceptance-test.yml
+++ b/.github/workflows/acceptance-test.yml
@@ -39,7 +39,7 @@ jobs:
         env:
           GH_TOKEN: ${{ secrets.TEST_GITHUB_TOKEN }}
           HEAD_REF: ${{ github.head_ref }}
-      - run: cd test/${{ inputs.flavor }}/e2e && npm test
+      - run: cd test/${{ inputs.flavor }}/features && npm test
         env:
           GITHUB_USER: ${{ secrets.TEST_GITHUB_USER }}
           GITHUB_PASSWORD: ${{ secrets.TEST_GITHUB_PASSWORD }}

From b2ce2fdaad870eb0663a6a616f482f09672e988b Mon Sep 17 00:00:00 2001
From: Ron <45816308+rjaegers@users.noreply.github.com>
Date: Sat, 2 Nov 2024 17:56:53 +0000
Subject: [PATCH 07/12] test: store playwright artifacts

---
 .github/workflows/acceptance-test.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.github/workflows/acceptance-test.yml b/.github/workflows/acceptance-test.yml
index 6bfb24d0..c3f40b3d 100644
--- a/.github/workflows/acceptance-test.yml
+++ b/.github/workflows/acceptance-test.yml
@@ -44,6 +44,13 @@ jobs:
           GITHUB_USER: ${{ secrets.TEST_GITHUB_USER }}
           GITHUB_PASSWORD: ${{ secrets.TEST_GITHUB_PASSWORD }}
           GITHUB_TOTP_SECRET: ${{ secrets.TEST_GITHUB_TOTP_SECRET }}
+      - uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
+        if: always()
+        with:
+          name: playwright-artifacts
+          path: |
+            test-results/
+          retention-days: 10
       - run: |
           set -Eeuo pipefail
           gh codespace delete --force --codespace "$CODESPACE_NAME"

From 41fb9f9c5e2810b1643c1a5ea35c8775d03ec6bd Mon Sep 17 00:00:00 2001
From: Ron <45816308+rjaegers@users.noreply.github.com>
Date: Sat, 2 Nov 2024 18:21:17 +0000
Subject: [PATCH 08/12] test: press enter on searchbox

---
 test/cpp/features/pages/codespace.pom.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/test/cpp/features/pages/codespace.pom.ts b/test/cpp/features/pages/codespace.pom.ts
index fdf117c2..6301e83e 100644
--- a/test/cpp/features/pages/codespace.pom.ts
+++ b/test/cpp/features/pages/codespace.pom.ts
@@ -1,5 +1,6 @@
 import { test, expect, type Page, type Locator } from '@playwright/test';
 import path from 'path';
+import { serialize } from 'v8';
 
 type CommandAndPrompt = {
   command: string,
@@ -101,7 +102,9 @@ export class CodespacePage {
     await this.page.keyboard.press('Control+P');
     const searchBox = this.page.getByPlaceholder('Search files by name');
     await expect(searchBox).toBeVisible();
+
     await searchBox.fill(name);
+    await searchBox.press('Enter');
     await expect(this.page.locator('[id="workbench.parts.editor"]')).toContainText(path.basename(name));
   }
 

From a3024b7f2defdd07dbaa6801aa411e80b37c8f7e Mon Sep 17 00:00:00 2001
From: Ron <45816308+rjaegers@users.noreply.github.com>
Date: Sat, 2 Nov 2024 18:55:17 +0000
Subject: [PATCH 09/12] test: press enter on page

---
 test/cpp/features/pages/codespace.pom.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/cpp/features/pages/codespace.pom.ts b/test/cpp/features/pages/codespace.pom.ts
index 6301e83e..644d5959 100644
--- a/test/cpp/features/pages/codespace.pom.ts
+++ b/test/cpp/features/pages/codespace.pom.ts
@@ -104,7 +104,7 @@ export class CodespacePage {
     await expect(searchBox).toBeVisible();
 
     await searchBox.fill(name);
-    await searchBox.press('Enter');
+    await this.page.keyboard.press('Enter');
     await expect(this.page.locator('[id="workbench.parts.editor"]')).toContainText(path.basename(name));
   }
 

From 95849fe1d15e05ca8df92de910f710d9a74cf049 Mon Sep 17 00:00:00 2001
From: Ron <45816308+rjaegers@users.noreply.github.com>
Date: Wed, 6 Nov 2024 09:39:01 +0000
Subject: [PATCH 10/12] test: reduce changes to test code

---
 .devcontainer/cpp-test/devcontainer.json | 4 +++-
 test/cpp/features/pages/codespace.pom.ts | 1 -
 test/cpp/features/steps/fixtures.ts      | 2 --
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/.devcontainer/cpp-test/devcontainer.json b/.devcontainer/cpp-test/devcontainer.json
index 47664b0f..8d65dc01 100644
--- a/.devcontainer/cpp-test/devcontainer.json
+++ b/.devcontainer/cpp-test/devcontainer.json
@@ -6,7 +6,9 @@
       "settings": {
         "cmake.automaticReconfigure": false,
         "cmake.configureOnOpen": false,
-        "cmake.ctest.testExplorerIntegrationEnabled": false
+        "cmake.ctest.testExplorerIntegrationEnabled": false,
+        "cmake.enableAutomaticKitScan": false,
+        "cmake.showOptionsMovedNotification": false
       }
     }
   }
diff --git a/test/cpp/features/pages/codespace.pom.ts b/test/cpp/features/pages/codespace.pom.ts
index 644d5959..4bcce96a 100644
--- a/test/cpp/features/pages/codespace.pom.ts
+++ b/test/cpp/features/pages/codespace.pom.ts
@@ -1,6 +1,5 @@
 import { test, expect, type Page, type Locator } from '@playwright/test';
 import path from 'path';
-import { serialize } from 'v8';
 
 type CommandAndPrompt = {
   command: string,
diff --git a/test/cpp/features/steps/fixtures.ts b/test/cpp/features/steps/fixtures.ts
index 9b3f4b74..c8c98b97 100644
--- a/test/cpp/features/steps/fixtures.ts
+++ b/test/cpp/features/steps/fixtures.ts
@@ -14,12 +14,10 @@ export const test = base.extend<{ codespacePage: CodespacePage }, { authenticati
         const codespacePage = new CodespacePage(page);
         await codespacePage.goto();
         await codespacePage.areExtensionsActive(['Testing', 'SonarLint', 'CMake', 'Live Share', 'GitHub Pull Requests']);
-        await codespacePage.executeFromCommandPalette({ command: 'Terminal: Kill All Terminals' });
 
         await use(codespacePage);
 
         await codespacePage.executeInTerminal('git clean -fdx');
-        await codespacePage.executeInTerminal('git reset --hard');
     },
 });
 

From e4ab3c9d637fa525b3a184962c57d697cfe4ace4 Mon Sep 17 00:00:00 2001
From: Ron <45816308+rjaegers@users.noreply.github.com>
Date: Wed, 6 Nov 2024 10:16:44 +0000
Subject: [PATCH 11/12] chore: fix Sonar findings

---
 test/cpp/integration-tests.bats               |  4 ++++
 test/cpp/workspace/CMakeLists.txt             |  2 ++
 test/cpp/workspace/gcc-arm-none-eabi/main.cpp |  4 ++--
 test/cpp/workspace/sanitizers/threadsan.cpp   | 15 ++++++++++-----
 4 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/test/cpp/integration-tests.bats b/test/cpp/integration-tests.bats
index 7d0edae7..ffbaffb8 100644
--- a/test/cpp/integration-tests.bats
+++ b/test/cpp/integration-tests.bats
@@ -224,4 +224,8 @@ function build_and_run_with_sanitizers() {
   run build/${PRESET}/sanitizers/test-ubsan
   assert_failure
   assert_output --partial "runtime error: load of null pointer"
+
+  run build/${PRESET}/sanitizers/test-threadsan
+  assert_failure
+  assert_output --partial "ThreadSanitizer: data race"
 }
diff --git a/test/cpp/workspace/CMakeLists.txt b/test/cpp/workspace/CMakeLists.txt
index 2c22f7aa..c58475f5 100644
--- a/test/cpp/workspace/CMakeLists.txt
+++ b/test/cpp/workspace/CMakeLists.txt
@@ -1,6 +1,8 @@
 cmake_minimum_required(VERSION 3.30)
 project(devcontainer-test LANGUAGES ASM C CXX)
 
+set(CMAKE_CXX_STANDARD 20)
+
 include(CTest)
 include(GoogleTest)
 
diff --git a/test/cpp/workspace/gcc-arm-none-eabi/main.cpp b/test/cpp/workspace/gcc-arm-none-eabi/main.cpp
index ca3e2918..029d56a5 100644
--- a/test/cpp/workspace/gcc-arm-none-eabi/main.cpp
+++ b/test/cpp/workspace/gcc-arm-none-eabi/main.cpp
@@ -1,6 +1,6 @@
-void _exit(int status)
+[[noreturn]] void _exit(int)
 {
-    while (1) {}
+    while (true);
 }
 
 int main() {}
diff --git a/test/cpp/workspace/sanitizers/threadsan.cpp b/test/cpp/workspace/sanitizers/threadsan.cpp
index 50d8a377..823bd8a8 100644
--- a/test/cpp/workspace/sanitizers/threadsan.cpp
+++ b/test/cpp/workspace/sanitizers/threadsan.cpp
@@ -1,12 +1,17 @@
+#include <ranges>
 #include <thread>
+#include <vector>
 
 int main()
 {
-    int i = 0;
+    std::vector<std::jthread> threads;
+    int counter = 0;
 
-    std::thread t([&] { i = 10; });
-    i = 20;
-    t.join();
+    for (auto i : std::ranges::iota_view(0, 10))
+        threads.emplace_back(std::jthread([&counter] {
+            for (auto j : std::ranges::iota_view(0, 1000))
+                ++counter;
+        }));
 
-    return i;
+    return counter;
 }

From 322215f71be4fa4b3f85a348ac5d9a219bd8fcbc Mon Sep 17 00:00:00 2001
From: Ron <45816308+rjaegers@users.noreply.github.com>
Date: Wed, 6 Nov 2024 10:35:28 +0000
Subject: [PATCH 12/12] chore: temporarily disable test

---
 test/cpp/features/static-dynamic-analysis.feature | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/cpp/features/static-dynamic-analysis.feature b/test/cpp/features/static-dynamic-analysis.feature
index 765bfb67..313f49c4 100644
--- a/test/cpp/features/static-dynamic-analysis.feature
+++ b/test/cpp/features/static-dynamic-analysis.feature
@@ -4,6 +4,7 @@ Feature: Analyze source code using static and dynamic analysis
   To maintain consistent, high-quality and bug-free code
   Source code needs to be statically and dynamically analyzed
 
+  @fixme
   Scenario: Format source code according to a formatting style
 
     Given the file "clang-tools/unformatted.cpp" is opened in the editor