tests: Format code using clang-format

10 files changed, 133 insertions, 102 deletions

diff --git a/tests/mock_factory.cpp b/tests/mock_factory.cpp
index 60ccfc0..4bc1576 100644
--- a/tests/mock_factory.cpp
+++ b/tests/mock_factory.cpp
@@ -1,10 +1,10 @@
 class MockFactory : public ResourceFactory {
 
-public:
+  public:
     MockFactory(std::unique_ptr<IDXGIFactory1> dxgiFactory1Mock, std::unique_ptr<Vulkan> vulkanMock,
-                std::unique_ptr<Nvml> nvmlMock, std::unique_ptr<Lfx> lfxMock)
-            : m_dxgiFactoryMock(std::move(dxgiFactory1Mock)), m_vulkanMock(std::move(vulkanMock)),
-              m_nvmlMock(std::move(nvmlMock)), m_lfxMock(std::move(lfxMock)) {};
+        std::unique_ptr<Nvml> nvmlMock, std::unique_ptr<Lfx> lfxMock)
+        : m_dxgiFactoryMock(std::move(dxgiFactory1Mock)), m_vulkanMock(std::move(vulkanMock)),
+          m_nvmlMock(std::move(nvmlMock)), m_lfxMock(std::move(lfxMock)){};
 
     Com<IDXGIFactory1> CreateDXGIFactory1() override {
         Com<IDXGIFactory1> dxgiFactory = m_dxgiFactoryMock.get();
@@ -23,7 +23,7 @@ public:
         return std::move(m_lfxMock);
     }
 
-private:
+  private:
     std::unique_ptr<IDXGIFactory1> m_dxgiFactoryMock;
     std::unique_ptr<Vulkan> m_vulkanMock;
     std::unique_ptr<Nvml> m_nvmlMock;
diff --git a/tests/nvapi_d3d.cpp b/tests/nvapi_d3d.cpp
index fae538a..3dc023a 100644
--- a/tests/nvapi_d3d.cpp
+++ b/tests/nvapi_d3d.cpp
@@ -106,7 +106,7 @@ TEST_CASE("D3D methods succeed", "[.d3d]") {
     }
 }
 
-TEST_CASE("D3D Reflex/LatencyFleX depending methods succeed", "[.d3d]"){
+TEST_CASE("D3D Reflex/LatencyFleX depending methods succeed", "[.d3d]") {
     UnknownMock unknown;
     auto dxgiFactory = std::make_unique<DXGIFactory1Mock>();
     auto vulkan = std::make_unique<VulkanMock>();
diff --git a/tests/nvapi_d3d11.cpp b/tests/nvapi_d3d11.cpp
index c6a6f44..824f6d3 100644
--- a/tests/nvapi_d3d11.cpp
+++ b/tests/nvapi_d3d11.cpp
@@ -123,7 +123,7 @@ TEST_CASE("D3D11 methods succeed", "[.d3d11]") {
             .RETURN(false);
         FORBID_CALL(context, LaunchCubinShaderNVX(_, _, _, _, _, _, _, _, _, _));
 
-        REQUIRE(NvAPI_D3D11_LaunchCubinShader(static_cast<ID3D11DeviceContext*>(&context), NVDX_ObjectHandle(), 0,0,0, nullptr, 0, nullptr, 0, nullptr, 0) == NVAPI_ERROR);
+        REQUIRE(NvAPI_D3D11_LaunchCubinShader(static_cast<ID3D11DeviceContext*>(&context), NVDX_ObjectHandle(), 0, 0, 0, nullptr, 0, nullptr, 0, nullptr, 0) == NVAPI_ERROR);
         REQUIRE(deviceRefCount == 0);
         REQUIRE(contextRefCount == 0);
     }
@@ -147,9 +147,9 @@ TEST_CASE("D3D11 methods succeed", "[.d3d11]") {
         FORBID_CALL(context, LaunchCubinShaderNVX(_, _, _, _, _, _, _, _, _, _));
 
         NVDX_ObjectHandle objhandle;
-        REQUIRE(NvAPI_D3D11_CreateCubinComputeShaderWithName(static_cast<ID3D11Device *>(&device), "X", 1U, 0U,0U,0U, "foo", &objhandle) == NVAPI_ERROR);
-        REQUIRE(NvAPI_D3D11_CreateCubinComputeShader(static_cast<ID3D11Device*>(&device), "X", 1U, 0U,0U,0U, &objhandle) == NVAPI_ERROR);
-        REQUIRE(NvAPI_D3D11_LaunchCubinShader(static_cast<ID3D11DeviceContext*>(&context), NVDX_ObjectHandle(), 0,0,0, nullptr, 0, nullptr, 0, nullptr, 0) == NVAPI_ERROR);
+        REQUIRE(NvAPI_D3D11_CreateCubinComputeShaderWithName(static_cast<ID3D11Device*>(&device), "X", 1U, 0U, 0U, 0U, "foo", &objhandle) == NVAPI_ERROR);
+        REQUIRE(NvAPI_D3D11_CreateCubinComputeShader(static_cast<ID3D11Device*>(&device), "X", 1U, 0U, 0U, 0U, &objhandle) == NVAPI_ERROR);
+        REQUIRE(NvAPI_D3D11_LaunchCubinShader(static_cast<ID3D11DeviceContext*>(&context), NVDX_ObjectHandle(), 0, 0, 0, nullptr, 0, nullptr, 0, nullptr, 0) == NVAPI_ERROR);
         REQUIRE(deviceRefCount == 0);
         REQUIRE(contextRefCount == 0);
     }
@@ -161,7 +161,7 @@ TEST_CASE("D3D11 methods succeed", "[.d3d11]") {
             .RETURN(E_NOINTERFACE);
 
         bool supported = true;
-        REQUIRE(NvAPI_D3D11_IsFatbinPTXSupported(static_cast<ID3D11Device *>(&device), &supported) == NVAPI_OK);
+        REQUIRE(NvAPI_D3D11_IsFatbinPTXSupported(static_cast<ID3D11Device*>(&device), &supported) == NVAPI_OK);
         REQUIRE(supported == false);
         REQUIRE(deviceRefCount == 0);
     }
@@ -277,9 +277,9 @@ TEST_CASE("D3D11 methods succeed", "[.d3d11]") {
             .TIMES(1)
             .RETURN(true);
 
-        REQUIRE(NvAPI_D3D11_CreateCubinComputeShader(static_cast<ID3D11Device*>(&device), reinterpret_cast<void*>(&shader), 1U, 2U,3U,4U, &objhandle) == NVAPI_OK);
-        REQUIRE(NvAPI_D3D11_CreateCubinComputeShaderWithName(static_cast<ID3D11Device *>(&device), reinterpret_cast<void*>(&shader), 1U, 2U,3U,4U, "foo", &objhandle) == NVAPI_OK);
-        REQUIRE(NvAPI_D3D11_LaunchCubinShader(static_cast<ID3D11DeviceContext*>(&context), objhandle, 1U,2U,3U, nullptr, 0U, nullptr, 0U, nullptr, 0U) == NVAPI_OK);
+        REQUIRE(NvAPI_D3D11_CreateCubinComputeShader(static_cast<ID3D11Device*>(&device), reinterpret_cast<void*>(&shader), 1U, 2U, 3U, 4U, &objhandle) == NVAPI_OK);
+        REQUIRE(NvAPI_D3D11_CreateCubinComputeShaderWithName(static_cast<ID3D11Device*>(&device), reinterpret_cast<void*>(&shader), 1U, 2U, 3U, 4U, "foo", &objhandle) == NVAPI_OK);
+        REQUIRE(NvAPI_D3D11_LaunchCubinShader(static_cast<ID3D11DeviceContext*>(&context), objhandle, 1U, 2U, 3U, nullptr, 0U, nullptr, 0U, nullptr, 0U) == NVAPI_OK);
         REQUIRE(deviceRefCount == 0);
         REQUIRE(contextRefCount == 0);
     }
@@ -289,8 +289,8 @@ TEST_CASE("D3D11 methods succeed", "[.d3d11]") {
             .RETURN(false);
 
         NVDX_ObjectHandle objhandle;
-        REQUIRE(NvAPI_D3D11_CreateCubinComputeShaderWithName(static_cast<ID3D11Device*>(&device), "X", 1U, 0U,0U,0U, "foo", &objhandle) == NVAPI_ERROR);
-        REQUIRE(NvAPI_D3D11_CreateCubinComputeShader(static_cast<ID3D11Device*>(&device), "X", 1U, 0U,0U,0U, &objhandle) == NVAPI_ERROR);
+        REQUIRE(NvAPI_D3D11_CreateCubinComputeShaderWithName(static_cast<ID3D11Device*>(&device), "X", 1U, 0U, 0U, 0U, "foo", &objhandle) == NVAPI_ERROR);
+        REQUIRE(NvAPI_D3D11_CreateCubinComputeShader(static_cast<ID3D11Device*>(&device), "X", 1U, 0U, 0U, 0U, &objhandle) == NVAPI_ERROR);
         REQUIRE(deviceRefCount == 0);
         REQUIRE(contextRefCount == 0);
     }
@@ -332,10 +332,10 @@ TEST_CASE("D3D11 methods succeed", "[.d3d11]") {
         D3D11_SHADER_RESOURCE_VIEW_DESC srvDesc;
         ID3D11ShaderResourceView* srv;
         NvU32 handle;
-        REQUIRE_CALL(device, CreateUnorderedAccessViewAndGetDriverHandleNVX(&resource, &uavDesc, &pUAV, reinterpret_cast<uint32_t *>(&handle)))
+        REQUIRE_CALL(device, CreateUnorderedAccessViewAndGetDriverHandleNVX(&resource, &uavDesc, &pUAV, reinterpret_cast<uint32_t*>(&handle)))
             .TIMES(1)
             .RETURN(true);
-        REQUIRE_CALL(device, CreateShaderResourceViewAndGetDriverHandleNVX(&resource, &srvDesc, &srv, reinterpret_cast<uint32_t *>(&handle)))
+        REQUIRE_CALL(device, CreateShaderResourceViewAndGetDriverHandleNVX(&resource, &srvDesc, &srv, reinterpret_cast<uint32_t*>(&handle)))
             .TIMES(1)
             .RETURN(true);
 
diff --git a/tests/nvapi_d3d12.cpp b/tests/nvapi_d3d12.cpp
index abc3d9c..fa969bf 100644
--- a/tests/nvapi_d3d12.cpp
+++ b/tests/nvapi_d3d12.cpp
@@ -18,7 +18,7 @@ TEST_CASE("D3D12 methods succeed", "[.d3d12]") {
         .RETURN(deviceRefCount);
 
     ALLOW_CALL(device, GetExtensionSupport(_))
-            .RETURN(true);
+        .RETURN(true);
 
     ALLOW_CALL(commandList, QueryInterface(__uuidof(ID3D12GraphicsCommandList1), _))
         .LR_SIDE_EFFECT(*_2 = static_cast<ID3D12GraphicsCommandList1*>(&commandList))
@@ -44,7 +44,7 @@ TEST_CASE("D3D12 methods succeed", "[.d3d12]") {
         extensionDesc.baseVersion = NV_PSO_EXTENSION_DESC_VER;
         extensionDesc.psoExtension = NV_PSO_SET_SHADER_EXTNENSION_SLOT_AND_SPACE;
         extensionDesc.version = NV_SET_SHADER_EXTENSION_SLOT_DESC_VER;
-        const NVAPI_D3D12_PSO_EXTENSION_DESC* extensions[] = { &extensionDesc };
+        const NVAPI_D3D12_PSO_EXTENSION_DESC* extensions[] = {&extensionDesc};
         ID3D12PipelineState* pipelineState = nullptr;
         REQUIRE(NvAPI_D3D12_CreateGraphicsPipelineState(&device, &desc, 1, extensions, &pipelineState) == NVAPI_NOT_SUPPORTED);
     }
@@ -67,8 +67,8 @@ TEST_CASE("D3D12 methods succeed", "[.d3d12]") {
         REQUIRE(NvAPI_D3D12_DestroyCubinComputeShader(static_cast<ID3D12Device*>(&device), nullptr) == NVAPI_ERROR);
 
         D3D12_CPU_DESCRIPTOR_HANDLE srvHandle;
-        REQUIRE(NvAPI_D3D12_GetCudaTextureObject(static_cast<ID3D12Device*>(&device), srvHandle, srvHandle, nullptr)  == NVAPI_ERROR);
-        REQUIRE(NvAPI_D3D12_GetCudaSurfaceObject(static_cast<ID3D12Device*>(&device), srvHandle, nullptr)  == NVAPI_ERROR);
+        REQUIRE(NvAPI_D3D12_GetCudaTextureObject(static_cast<ID3D12Device*>(&device), srvHandle, srvHandle, nullptr) == NVAPI_ERROR);
+        REQUIRE(NvAPI_D3D12_GetCudaSurfaceObject(static_cast<ID3D12Device*>(&device), srvHandle, nullptr) == NVAPI_ERROR);
 
         REQUIRE(NvAPI_D3D12_CaptureUAVInfo(static_cast<ID3D12Device*>(&device), nullptr) == NVAPI_ERROR);
         bool isPTXSupported;
@@ -94,8 +94,8 @@ TEST_CASE("D3D12 methods succeed", "[.d3d12]") {
         REQUIRE(NvAPI_D3D12_DestroyCubinComputeShader(static_cast<ID3D12Device*>(&device), nullptr) == NVAPI_ERROR);
 
         D3D12_CPU_DESCRIPTOR_HANDLE srvHandle;
-        REQUIRE(NvAPI_D3D12_GetCudaTextureObject(static_cast<ID3D12Device*>(&device), srvHandle, srvHandle, nullptr)  == NVAPI_ERROR);
-        REQUIRE(NvAPI_D3D12_GetCudaSurfaceObject(static_cast<ID3D12Device*>(&device), srvHandle, nullptr)  == NVAPI_ERROR);
+        REQUIRE(NvAPI_D3D12_GetCudaTextureObject(static_cast<ID3D12Device*>(&device), srvHandle, srvHandle, nullptr) == NVAPI_ERROR);
+        REQUIRE(NvAPI_D3D12_GetCudaSurfaceObject(static_cast<ID3D12Device*>(&device), srvHandle, nullptr) == NVAPI_ERROR);
 
         REQUIRE(NvAPI_D3D12_CaptureUAVInfo(static_cast<ID3D12Device*>(&device), nullptr) == NVAPI_ERROR);
         bool isPTXSupported;
@@ -150,7 +150,12 @@ TEST_CASE("D3D12 methods succeed", "[.d3d12]") {
         }
 
         SECTION("GetGraphicsCapabilities returns OK with valid SM") {
-            struct Data {VkDriverId driverId; std::string extensionName; uint16_t expectedMajorSMVersion; uint16_t expectedMinorSMVersion;};
+            struct Data {
+                VkDriverId driverId;
+                std::string extensionName;
+                uint16_t expectedMajorSMVersion;
+                uint16_t expectedMinorSMVersion;
+            };
             auto args = GENERATE(
                 Data{VK_DRIVER_ID_NVIDIA_PROPRIETARY, VK_KHR_FRAGMENT_SHADING_RATE_EXTENSION_NAME, 8, 6},
                 Data{VK_DRIVER_ID_NVIDIA_PROPRIETARY, VK_NV_SHADING_RATE_IMAGE_EXTENSION_NAME, 7, 5},
@@ -171,7 +176,7 @@ TEST_CASE("D3D12 methods succeed", "[.d3d12]") {
                 .SIDE_EFFECT(
                     ConfigureGetPhysicalDeviceProperties2(_3,
                         [&args](auto props, auto idProps, auto pciBusInfoProps, auto driverProps, auto fragmentShadingRateProps) {
-                            auto luid = LUID{0x00000001,0x00000002};
+                            auto luid = LUID{0x00000001, 0x00000002};
                             memcpy(&idProps->deviceLUID, &luid, sizeof(luid));
                             idProps->deviceLUIDValid = VK_TRUE;
                             driverProps->driverID = args.driverId;
@@ -221,7 +226,7 @@ TEST_CASE("D3D12 methods succeed", "[.d3d12]") {
             extensionDesc.psoExtension = NV_PSO_ENABLE_DEPTH_BOUND_TEST_EXTENSION;
             extensionDesc.version = NV_ENABLE_DEPTH_BOUND_TEST_PSO_EXTENSION_DESC_VER;
             extensionDesc.EnableDBT = true;
-            const NVAPI_D3D12_PSO_EXTENSION_DESC* extensions[] = { &extensionDesc };
+            const NVAPI_D3D12_PSO_EXTENSION_DESC* extensions[] = {&extensionDesc};
             ID3D12PipelineState* pipelineState = nullptr;
             REQUIRE_CALL(device, CreateGraphicsPipelineState(&desc, __uuidof(ID3D12PipelineState), reinterpret_cast<void**>(&pipelineState)))
                 .RETURN(S_OK);
@@ -235,7 +240,7 @@ TEST_CASE("D3D12 methods succeed", "[.d3d12]") {
             auto desc = D3D12_GRAPHICS_PIPELINE_STATE_DESC{};
             NVAPI_D3D12_PSO_ENABLE_DEPTH_BOUND_TEST_DESC extensionDesc;
             extensionDesc.baseVersion = NV_PSO_EXTENSION_DESC_VER_1 + 1;
-            const NVAPI_D3D12_PSO_EXTENSION_DESC* extensions[] = { &extensionDesc };
+            const NVAPI_D3D12_PSO_EXTENSION_DESC* extensions[] = {&extensionDesc};
             ID3D12PipelineState* pipelineState = nullptr;
             REQUIRE(NvAPI_D3D12_CreateGraphicsPipelineState(&device, &desc, 1, extensions, &pipelineState) == NVAPI_INCOMPATIBLE_STRUCT_VERSION);
         }
@@ -248,7 +253,7 @@ TEST_CASE("D3D12 methods succeed", "[.d3d12]") {
             auto desc = D3D12_GRAPHICS_PIPELINE_STATE_DESC{};
             NVAPI_D3D12_PSO_ENABLE_DEPTH_BOUND_TEST_DESC extensionDesc;
             extensionDesc.baseVersion = NV_PSO_EXTENSION_DESC_VER;
-            const NVAPI_D3D12_PSO_EXTENSION_DESC* extensions[] = { &extensionDesc };
+            const NVAPI_D3D12_PSO_EXTENSION_DESC* extensions[] = {&extensionDesc};
             ID3D12PipelineState* pipelineState = nullptr;
             REQUIRE(NvAPI_D3D12_CreateGraphicsPipelineState(&device, &desc, 1, extensions, &pipelineState) != NVAPI_INCOMPATIBLE_STRUCT_VERSION);
         }
@@ -306,8 +311,8 @@ TEST_CASE("D3D12 methods succeed", "[.d3d12]") {
             .RETURN(S_OK)
             .TIMES(1);
 
-        REQUIRE(NvAPI_D3D12_GetCudaTextureObject(static_cast<ID3D12Device*>(&device), srvHandle, samplerHandle, nullptr)  == NVAPI_OK);
-        REQUIRE(NvAPI_D3D12_GetCudaSurfaceObject(static_cast<ID3D12Device*>(&device), srvHandle, nullptr)  == NVAPI_OK);
+        REQUIRE(NvAPI_D3D12_GetCudaTextureObject(static_cast<ID3D12Device*>(&device), srvHandle, samplerHandle, nullptr) == NVAPI_OK);
+        REQUIRE(NvAPI_D3D12_GetCudaSurfaceObject(static_cast<ID3D12Device*>(&device), srvHandle, nullptr) == NVAPI_OK);
         REQUIRE(deviceRefCount == 0);
         REQUIRE(commandListRefCount == 0);
     }
diff --git a/tests/nvapi_d3d12_mocks.cpp b/tests/nvapi_d3d12_mocks.cpp
index ab11af6..feb884b 100644
--- a/tests/nvapi_d3d12_mocks.cpp
+++ b/tests/nvapi_d3d12_mocks.cpp
@@ -3,7 +3,7 @@ using namespace trompeloeil;
 class ID3D12Vkd3dDevice : public ID3D12Device, public ID3D12DeviceExt {};
 
 class D3D12Vkd3dDeviceMock : public mock_interface<ID3D12Vkd3dDevice> {
-    MAKE_MOCK2(QueryInterface, HRESULT(REFIID, void **), override);
+    MAKE_MOCK2(QueryInterface, HRESULT(REFIID, void**), override);
     MAKE_MOCK0(AddRef, ULONG(), override);
     MAKE_MOCK0(Release, ULONG(), override);
     IMPLEMENT_MOCK3(GetPrivateData);
@@ -59,7 +59,7 @@ class D3D12Vkd3dDeviceMock : public mock_interface<ID3D12Vkd3dDevice> {
 class ID3D12Vkd3dGraphicsCommandList : public ID3D12GraphicsCommandList1, public ID3D12GraphicsCommandListExt {};
 
 class D3D12Vkd3dGraphicsCommandListMock : public mock_interface<ID3D12Vkd3dGraphicsCommandList> {
-    MAKE_MOCK2(QueryInterface, HRESULT(REFIID, void **), override);
+    MAKE_MOCK2(QueryInterface, HRESULT(REFIID, void**), override);
     MAKE_MOCK0(AddRef, ULONG(), override);
     MAKE_MOCK0(Release, ULONG(), override);
     IMPLEMENT_MOCK3(GetPrivateData);
diff --git a/tests/nvapi_d3d_mocks.cpp b/tests/nvapi_d3d_mocks.cpp
index cbb4ffa..e645907 100644
--- a/tests/nvapi_d3d_mocks.cpp
+++ b/tests/nvapi_d3d_mocks.cpp
@@ -1,13 +1,13 @@
 using namespace trompeloeil;
 
 class UnknownMock : public mock_interface<IUnknown> {
-    MAKE_MOCK2 (QueryInterface, HRESULT(REFIID, void**), override);
-    MAKE_MOCK0 (AddRef, ULONG(), override);
-    MAKE_MOCK0 (Release, ULONG(), override);
+    MAKE_MOCK2(QueryInterface, HRESULT(REFIID, void**), override);
+    MAKE_MOCK0(AddRef, ULONG(), override);
+    MAKE_MOCK0(Release, ULONG(), override);
 };
 
 class LfxMock : public mock_interface<Lfx> {
-    IMPLEMENT_CONST_MOCK0 (IsAvailable);
-    IMPLEMENT_MOCK0 (WaitAndBeginFrame);
-    IMPLEMENT_MOCK1 (SetTargetFrameTime);
+    IMPLEMENT_CONST_MOCK0(IsAvailable);
+    IMPLEMENT_MOCK0(WaitAndBeginFrame);
+    IMPLEMENT_MOCK1(SetTargetFrameTime);
 };
\ No newline at end of file
diff --git a/tests/nvapi_drs.cpp b/tests/nvapi_drs.cpp
index 13d30da..6dabd43 100644
--- a/tests/nvapi_drs.cpp
+++ b/tests/nvapi_drs.cpp
@@ -35,7 +35,9 @@ TEST_CASE("DRS methods succeed", "[.drs]") {
     }
 
     SECTION("GetSetting returns setting-not-found") {
-        struct Data {int32_t settingId;};
+        struct Data {
+            int32_t settingId;
+        };
         auto args = GENERATE(
             Data{FXAA_ALLOW_ID},
             Data{CUDA_EXCLUDED_GPUS_ID},
diff --git a/tests/nvapi_sysinfo.cpp b/tests/nvapi_sysinfo.cpp
index 44856bb..04690d1 100644
--- a/tests/nvapi_sysinfo.cpp
+++ b/tests/nvapi_sysinfo.cpp
@@ -285,7 +285,13 @@ TEST_CASE("Sysinfo methods succeed", "[.sysinfo]") {
     }
 
     SECTION("GetDisplayDriverVersion returns OK") {
-        struct Data {VkDriverId driverId; uint16_t major; uint16_t minor; uint16_t patch; uint32_t expectedVersion;};
+        struct Data {
+            VkDriverId driverId;
+            uint16_t major;
+            uint16_t minor;
+            uint16_t patch;
+            uint32_t expectedVersion;
+        };
         auto args = GENERATE(
             Data{VK_DRIVER_ID_NVIDIA_PROPRIETARY, 470, 45, 1, 47045},
             Data{VK_DRIVER_ID_NVIDIA_PROPRIETARY, 470, 101, 1, 47099},
@@ -322,7 +328,10 @@ TEST_CASE("Sysinfo methods succeed", "[.sysinfo]") {
     }
 
     SECTION("GetDisplayDriverVersion with version override returns OK") {
-        struct Data {std::string override; uint32_t expectedVersion;};
+        struct Data {
+            std::string override;
+            uint32_t expectedVersion;
+        };
         auto args = GENERATE(
             Data{"", 47045},
             Data{"0", 47045},
@@ -366,8 +375,7 @@ TEST_CASE("Sysinfo methods succeed", "[.sysinfo]") {
                         pciBusInfoProps->pciDomain = 0x01;
                         pciBusInfoProps->pciBus = 0x02;
                         pciBusInfoProps->pciDevice = 0x03;
-                    })
-            );
+                    }));
 
         SetupResourceFactory(std::move(dxgiFactory), std::move(vulkan), std::move(nvml), std::move(lfx));
         REQUIRE(NvAPI_Initialize() == NVAPI_OK);
@@ -389,7 +397,11 @@ TEST_CASE("Sysinfo methods succeed", "[.sysinfo]") {
     }
 
     SECTION("CudaEnumComputeCapableGpus returns OK") {
-        struct Data {VkDriverId driverId; std::string extensionName; uint32_t gpuCount;};
+        struct Data {
+            VkDriverId driverId;
+            std::string extensionName;
+            uint32_t gpuCount;
+        };
         auto args = GENERATE(
             Data{VK_DRIVER_ID_NVIDIA_PROPRIETARY, VK_NV_VIEWPORT_ARRAY2_EXTENSION_NAME, 1},
             Data{VK_DRIVER_ID_MESA_RADV, VK_KHR_FRAGMENT_SHADING_RATE_EXTENSION_NAME, 0},
@@ -550,7 +562,10 @@ TEST_CASE("Sysinfo methods succeed", "[.sysinfo]") {
     }
 
     SECTION("GetBusType returns OK") {
-        struct Data {std::string extensionName; NV_GPU_BUS_TYPE expectedBusType;};
+        struct Data {
+            std::string extensionName;
+            NV_GPU_BUS_TYPE expectedBusType;
+        };
         auto args = GENERATE(
             Data{VK_NV_VIEWPORT_ARRAY2_EXTENSION_NAME, NVAPI_GPU_BUS_TYPE_PCI_EXPRESS},
             Data{"ext", NVAPI_GPU_BUS_TYPE_UNDEFINED});
@@ -599,13 +614,13 @@ TEST_CASE("Sysinfo methods succeed", "[.sysinfo]") {
     SECTION("GetAdapterIdFromPhysicalGpu returns OK") {
         ALLOW_CALL(*vulkan, GetPhysicalDeviceProperties2(_, _, _)) // NOLINT(bugprone-use-after-move)
             .SIDE_EFFECT(
-                 ConfigureGetPhysicalDeviceProperties2(_3,
-                     [](auto props, auto idProps, auto pciBusInfoProps, auto driverProps, auto fragmentShadingRateProps) {
-                         auto luid = LUID{0x04030211, 0x08070655};
-                         memcpy(&idProps->deviceLUID, &luid, sizeof(luid));
-                         idProps->deviceLUIDValid = VK_TRUE;
-                         driverProps->driverID = VK_DRIVER_ID_NVIDIA_PROPRIETARY;
-                     }));
+                ConfigureGetPhysicalDeviceProperties2(_3,
+                    [](auto props, auto idProps, auto pciBusInfoProps, auto driverProps, auto fragmentShadingRateProps) {
+                        auto luid = LUID{0x04030211, 0x08070655};
+                        memcpy(&idProps->deviceLUID, &luid, sizeof(luid));
+                        idProps->deviceLUIDValid = VK_TRUE;
+                        driverProps->driverID = VK_DRIVER_ID_NVIDIA_PROPRIETARY;
+                    }));
 
         SetupResourceFactory(std::move(dxgiFactory), std::move(vulkan), std::move(nvml), std::move(lfx));
         REQUIRE(NvAPI_Initialize() == NVAPI_OK);
@@ -616,11 +631,15 @@ TEST_CASE("Sysinfo methods succeed", "[.sysinfo]") {
         LUID luid;
         REQUIRE(NvAPI_GPU_GetAdapterIdFromPhysicalGpu(handle, static_cast<void*>(&luid)) == NVAPI_OK);
         REQUIRE(luid.HighPart == 0x08070655);
-        REQUIRE(luid.LowPart  == 0x04030211);
+        REQUIRE(luid.LowPart == 0x04030211);
     }
 
     SECTION("GetArchInfo returns OK") {
-        struct Data {std::string extensionName; NV_GPU_ARCHITECTURE_ID expectedArchId; NV_GPU_ARCH_IMPLEMENTATION_ID expectedImplId;};
+        struct Data {
+            std::string extensionName;
+            NV_GPU_ARCHITECTURE_ID expectedArchId;
+            NV_GPU_ARCH_IMPLEMENTATION_ID expectedImplId;
+        };
         auto args = GENERATE(
             Data{VK_KHR_FRAGMENT_SHADING_RATE_EXTENSION_NAME, NV_GPU_ARCHITECTURE_GA100, NV_GPU_ARCH_IMPLEMENTATION_GA102},
             Data{VK_NV_SHADING_RATE_IMAGE_EXTENSION_NAME, NV_GPU_ARCHITECTURE_TU100, NV_GPU_ARCH_IMPLEMENTATION_TU102},
@@ -651,7 +670,7 @@ TEST_CASE("Sysinfo methods succeed", "[.sysinfo]") {
         SECTION("GetArchInfo (V1) returns OK") {
             NV_GPU_ARCH_INFO_V1 archInfo;
             archInfo.version = NV_GPU_ARCH_INFO_VER_1;
-            REQUIRE(NvAPI_GPU_GetArchInfo(handle, reinterpret_cast<NV_GPU_ARCH_INFO *>(&archInfo)) == NVAPI_OK);
+            REQUIRE(NvAPI_GPU_GetArchInfo(handle, reinterpret_cast<NV_GPU_ARCH_INFO*>(&archInfo)) == NVAPI_OK);
             REQUIRE(archInfo.architecture == args.expectedArchId);
             REQUIRE(archInfo.implementation == args.expectedImplId);
             REQUIRE(archInfo.revision == NV_GPU_CHIP_REV_A01);
@@ -935,7 +954,9 @@ TEST_CASE("Sysinfo methods succeed", "[.sysinfo]") {
         }
 
         SECTION("GetAllClockFrequencies returns not-supported for base/boost clock types") {
-            struct Data {NV_GPU_CLOCK_FREQUENCIES_CLOCK_TYPE clockType;};
+            struct Data {
+                NV_GPU_CLOCK_FREQUENCIES_CLOCK_TYPE clockType;
+            };
             auto args = GENERATE(
                 Data{NV_GPU_CLOCK_FREQUENCIES_BASE_CLOCK},
                 Data{NV_GPU_CLOCK_FREQUENCIES_BOOST_CLOCK});
@@ -1032,7 +1053,7 @@ TEST_CASE("GetHdrCapabilities succeeds", "[.sysinfo]") {
     SECTION("GetHdrCapabilities (V1) returns OK") {
         NV_HDR_CAPABILITIES_V1 capabilities;
         capabilities.version = NV_HDR_CAPABILITIES_VER1;
-        REQUIRE(NvAPI_Disp_GetHdrCapabilities(0, reinterpret_cast<NV_HDR_CAPABILITIES *>(&capabilities)) == NVAPI_OK);
+        REQUIRE(NvAPI_Disp_GetHdrCapabilities(0, reinterpret_cast<NV_HDR_CAPABILITIES*>(&capabilities)) == NVAPI_OK);
         REQUIRE(capabilities.isST2084EotfSupported == false);
         REQUIRE(capabilities.isTraditionalHdrGammaSupported == false);
         REQUIRE(capabilities.isEdrSupported == false);
diff --git a/tests/nvapi_system.cpp b/tests/nvapi_system.cpp
index b7c789f..1cb53d9 100644
--- a/tests/nvapi_system.cpp
+++ b/tests/nvapi_system.cpp
@@ -27,7 +27,7 @@ typedef decltype(&NvAPI_GPU_GetThermalSettings) PFN_NvAPI_GPU_GetThermalSettings
 typedef decltype(&NvAPI_GPU_GetCurrentPstate) PFN_NvAPI_GPU_GetCurrentPstate;
 typedef decltype(&NvAPI_GPU_GetAllClockFrequencies) PFN_NvAPI_GPU_GetAllClockFrequencies;
 
-template<typename T>
+template <typename T>
 T GetNvAPIProcAddress(PFN_NvAPI_QueryInterface nvAPI_QueryInterface, const char* name) {
     auto it = std::find_if(std::begin(nvapi_interface_table), std::end(nvapi_interface_table),
         [&name](const auto& item) {
@@ -81,7 +81,8 @@ static std::string ToFormattedLuid(LUID& luid) {
     std::stringstream ss;
     ss << std::hex << std::setfill('0');
     for (auto i = 0U; i < sizeof(luid); i++) {
-        if (i == 4) ss << '-';
+        if (i == 4)
+            ss << '-';
         ss << std::setw(2) << static_cast<unsigned>(uid[i]);
     }
     return ss.str();
@@ -180,9 +181,9 @@ TEST_CASE("Sysinfo methods succeed against local system", "[system]") {
         result = nvAPI_GPU_GetAdapterIdFromPhysicalGpu(handle, static_cast<void*>(&luid));
         std::cout << "    Adapter ID/LUID:            ";
         result == NVAPI_OK
-            ? std::cout << ToFormattedLuid(luid) <<
-                " (" << "0x" << std::setfill('0') << std::setw(8) << std::hex << luid.HighPart <<
-                "/" << "0x" << std::setfill('0') << std::setw(8) << std::hex << luid.LowPart << ")" << std::endl
+            ? std::cout << ToFormattedLuid(luid) << " ("
+                        << "0x" << std::setfill('0') << std::setw(8) << std::hex << luid.HighPart << "/"
+                        << "0x" << std::setfill('0') << std::setw(8) << std::hex << luid.LowPart << ")" << std::endl
             : std::cout << "N/A" << std::endl;
 
         NV_GPU_ARCH_INFO archInfo;
@@ -190,7 +191,7 @@ TEST_CASE("Sysinfo methods succeed against local system", "[system]") {
         result = nvAPI_GPU_GetArchInfo(handle, &archInfo);
         std::cout << "    Architecture ID:            ";
         result == NVAPI_OK
-            ? std::cout << "0x" << std::setfill('0') << std::setw(8) << std::hex << archInfo.architecture_id << " (" << ToGpuArchitecture(archInfo.architecture_id) << ")" <<  std::endl
+            ? std::cout << "0x" << std::setfill('0') << std::setw(8) << std::hex << archInfo.architecture_id << " (" << ToGpuArchitecture(archInfo.architecture_id) << ")" << std::endl
             : std::cout << "N/A" << std::endl;
         std::cout << "    Implementation ID:          ";
         result == NVAPI_OK
@@ -242,15 +243,15 @@ TEST_CASE("Sysinfo methods succeed against local system", "[system]") {
         frequencies.ClockType = NV_GPU_CLOCK_FREQUENCIES_CURRENT_FREQ;
         result = nvAPI_GPU_GetAllClockFrequencies(handle, &frequencies);
         std::cout << "    Current graphics clock:     ";
-        result == NVAPI_OK && frequencies.domain[NVAPI_GPU_PUBLIC_CLOCK_GRAPHICS].bIsPresent
+        result == NVAPI_OK&& frequencies.domain[NVAPI_GPU_PUBLIC_CLOCK_GRAPHICS].bIsPresent
             ? std::cout << std::dec << frequencies.domain[NVAPI_GPU_PUBLIC_CLOCK_GRAPHICS].frequency / 1000 << "MHz" << std::endl
             : std::cout << "N/A" << std::endl;
         std::cout << "    Current memory clock:       ";
-        result == NVAPI_OK && frequencies.domain[NVAPI_GPU_PUBLIC_CLOCK_MEMORY].bIsPresent
+        result == NVAPI_OK&& frequencies.domain[NVAPI_GPU_PUBLIC_CLOCK_MEMORY].bIsPresent
             ? std::cout << std::dec << frequencies.domain[NVAPI_GPU_PUBLIC_CLOCK_MEMORY].frequency / 1000 << "MHz" << std::endl
             : std::cout << "N/A" << std::endl;
         std::cout << "    Current video clock:        ";
-        result == NVAPI_OK && frequencies.domain[NVAPI_GPU_PUBLIC_CLOCK_VIDEO].bIsPresent
+        result == NVAPI_OK&& frequencies.domain[NVAPI_GPU_PUBLIC_CLOCK_VIDEO].bIsPresent
             ? std::cout << std::dec << frequencies.domain[NVAPI_GPU_PUBLIC_CLOCK_VIDEO].frequency / 1000 << "MHz" << std::endl
             : std::cout << "N/A" << std::endl;
     }
diff --git a/tests/resource_factory_util.cpp b/tests/resource_factory_util.cpp
index ebcc358..a50d8f4 100644
--- a/tests/resource_factory_util.cpp
+++ b/tests/resource_factory_util.cpp
@@ -7,22 +7,22 @@ void ResetResourceFactory() {
 }
 
 void SetupResourceFactory(
-        std::unique_ptr<DXGIFactory1Mock> dxgiFactory,
-        std::unique_ptr<Vulkan> vulkan,
-        std::unique_ptr<Nvml> nvml,
-        std::unique_ptr<Lfx> lfx) {
+    std::unique_ptr<DXGIFactory1Mock> dxgiFactory,
+    std::unique_ptr<Vulkan> vulkan,
+    std::unique_ptr<Nvml> nvml,
+    std::unique_ptr<Lfx> lfx) {
     resourceFactory = std::make_unique<MockFactory>(std::move(dxgiFactory), std::move(vulkan), std::move(nvml), std::move(lfx));
     nvapiAdapterRegistry.reset();
     initializationCount = 0ULL;
 }
 
 [[nodiscard]] std::array<std::unique_ptr<expectation>, 17> ConfigureDefaultTestEnvironment(
-        DXGIFactory1Mock& dxgiFactory,
-        VulkanMock& vulkan,
-        NvmlMock& nvml,
-        LfxMock& lfx,
-        DXGIDxvkAdapterMock& adapter,
-        DXGIOutputMock& output) {
+    DXGIFactory1Mock& dxgiFactory,
+    VulkanMock& vulkan,
+    NvmlMock& nvml,
+    LfxMock& lfx,
+    DXGIDxvkAdapterMock& adapter,
+    DXGIOutputMock& output) {
     return {
         NAMED_ALLOW_CALL(dxgiFactory, AddRef())
             .RETURN(1),
@@ -49,7 +49,7 @@ void SetupResourceFactory(
         NAMED_ALLOW_CALL(output, Release())
             .RETURN(0),
         NAMED_ALLOW_CALL(output, GetDesc(_))
-            .SIDE_EFFECT(*_1 = DXGI_OUTPUT_DESC{L"Output1", {0,0,0,0}, 1, DXGI_MODE_ROTATION_UNSPECIFIED, nullptr})
+            .SIDE_EFFECT(*_1 = DXGI_OUTPUT_DESC{L"Output1", {0, 0, 0, 0}, 1, DXGI_MODE_ROTATION_UNSPECIFIED, nullptr})
             .RETURN(S_OK),
 
         NAMED_ALLOW_CALL(vulkan, IsAvailable())
@@ -68,20 +68,19 @@ void SetupResourceFactory(
         NAMED_ALLOW_CALL(nvml, IsAvailable())
             .RETURN(false),
         NAMED_ALLOW_CALL(lfx, IsAvailable())
-            .RETURN(false)
-    };
+            .RETURN(false)};
 }
 
 [[nodiscard]] std::array<std::unique_ptr<expectation>, 29> ConfigureExtendedTestEnvironment(
-        DXGIFactory1Mock& dxgiFactory,
-        VulkanMock& vulkan,
-        NvmlMock& nvml,
-        LfxMock& lfx,
-        DXGIDxvkAdapterMock& adapter1,
-        DXGIDxvkAdapterMock& adapter2,
-        DXGIOutputMock& output1,
-        DXGIOutputMock& output2,
-        DXGIOutputMock& output3) {
+    DXGIFactory1Mock& dxgiFactory,
+    VulkanMock& vulkan,
+    NvmlMock& nvml,
+    LfxMock& lfx,
+    DXGIDxvkAdapterMock& adapter1,
+    DXGIDxvkAdapterMock& adapter2,
+    DXGIOutputMock& output1,
+    DXGIOutputMock& output2,
+    DXGIOutputMock& output3) {
     return {
         NAMED_ALLOW_CALL(dxgiFactory, AddRef())
             .RETURN(1),
@@ -128,19 +127,19 @@ void SetupResourceFactory(
         NAMED_ALLOW_CALL(output1, Release())
             .RETURN(0),
         NAMED_ALLOW_CALL(output1, GetDesc(_))
-            .SIDE_EFFECT(*_1 = DXGI_OUTPUT_DESC{L"Output1", {0,0,0,0}, 1, DXGI_MODE_ROTATION_UNSPECIFIED, nullptr})
+            .SIDE_EFFECT(*_1 = DXGI_OUTPUT_DESC{L"Output1", {0, 0, 0, 0}, 1, DXGI_MODE_ROTATION_UNSPECIFIED, nullptr})
             .RETURN(S_OK),
 
         NAMED_ALLOW_CALL(output2, Release())
             .RETURN(0),
         NAMED_ALLOW_CALL(output2, GetDesc(_))
-            .SIDE_EFFECT(*_1 = DXGI_OUTPUT_DESC{L"Output2", {0,0,0,0}, 1, DXGI_MODE_ROTATION_UNSPECIFIED, nullptr})
+            .SIDE_EFFECT(*_1 = DXGI_OUTPUT_DESC{L"Output2", {0, 0, 0, 0}, 1, DXGI_MODE_ROTATION_UNSPECIFIED, nullptr})
             .RETURN(S_OK),
 
         NAMED_ALLOW_CALL(output3, Release())
             .RETURN(0),
         NAMED_ALLOW_CALL(output3, GetDesc(_))
-            .SIDE_EFFECT(*_1 = DXGI_OUTPUT_DESC{L"Output3", {0,0,0,0}, 1, DXGI_MODE_ROTATION_UNSPECIFIED, nullptr})
+            .SIDE_EFFECT(*_1 = DXGI_OUTPUT_DESC{L"Output3", {0, 0, 0, 0}, 1, DXGI_MODE_ROTATION_UNSPECIFIED, nullptr})
             .RETURN(S_OK),
 
         NAMED_ALLOW_CALL(vulkan, IsAvailable())
@@ -166,24 +165,27 @@ void SetupResourceFactory(
         NAMED_ALLOW_CALL(nvml, IsAvailable())
             .RETURN(false),
         NAMED_ALLOW_CALL(lfx, IsAvailable())
-            .RETURN(false)
-    };
+            .RETURN(false)};
 }
 
 void ConfigureGetPhysicalDeviceProperties2(
-        VkPhysicalDeviceProperties2* props,
-        std::function<void(
-            VkPhysicalDeviceProperties*,
-            VkPhysicalDeviceIDProperties*,
-            VkPhysicalDevicePCIBusInfoPropertiesEXT*,
-            VkPhysicalDeviceDriverPropertiesKHR*,
-            VkPhysicalDeviceFragmentShadingRatePropertiesKHR*)> configure) { // NOLINT(performance-unnecessary-value-param)
+    VkPhysicalDeviceProperties2* props,
+    std::function<void(
+        VkPhysicalDeviceProperties*,
+        VkPhysicalDeviceIDProperties*,
+        VkPhysicalDevicePCIBusInfoPropertiesEXT*,
+        VkPhysicalDeviceDriverPropertiesKHR*,
+        VkPhysicalDeviceFragmentShadingRatePropertiesKHR*)>
+        configure) { // NOLINT(performance-unnecessary-value-param)
     VkPhysicalDeviceIDProperties* idProps = nullptr;
     VkPhysicalDevicePCIBusInfoPropertiesEXT* pciBusInfoProps = nullptr;
     VkPhysicalDeviceDriverPropertiesKHR* driverProps = nullptr;
     VkPhysicalDeviceFragmentShadingRatePropertiesKHR* fragmentShadingRateProps = nullptr;
 
-    struct VkStructure {VkStructureType sType;void* pNext;};
+    struct VkStructure {
+        VkStructureType sType;
+        void* pNext;
+    };
     auto next = reinterpret_cast<VkStructure*>(props);
     while (next != nullptr) {
         switch (next->sType) {