tests: Move Test Class name to source file

tests/unit/amd_best_practices.cpp

@@ -18,6 +18,7 @@
 // Tests for AMD-specific best practices
 const char *kEnableAMDValidation = "VALIDATION_CHECK_ENABLE_VENDOR_SPECIFIC_AMD";
 
+class VkAmdBestPracticesLayerTest : public VkBestPracticesLayerTest {};
 
 // this is a very long test (~10 minutes)
 // disabled for now

tests/unit/android_external_resolve.cpp

@@ -17,6 +17,8 @@
 
 #if defined(VK_USE_PLATFORM_ANDROID_KHR)
 
+class NegativeAndroidExternalResolve : public AndroidExternalResolveTest {};
+
 TEST_F(NegativeAndroidExternalResolve, SubpassDescriptionSample) {
     TEST_DESCRIPTION("invalid samples for VkSubpassDescription");
     RETURN_IF_SKIP(InitBasicAndroidExternalResolve());

tests/unit/android_external_resolve_positive.cpp

@@ -29,6 +29,8 @@ void AndroidExternalResolveTest::InitBasicAndroidExternalResolve() {
     nullColorAttachmentWithExternalFormatResolve = external_format_resolve_props.nullColorAttachmentWithExternalFormatResolve;
 }
 
+class PositiveAndroidExternalResolve : public AndroidExternalResolveTest {};
+
 TEST_F(PositiveAndroidExternalResolve, NoResolve) {
     TEST_DESCRIPTION("Make sure enabling the feature doesn't break normal usage of API.");
     RETURN_IF_SKIP(InitBasicAndroidExternalResolve());

tests/unit/android_hardware_buffer.cpp

@@ -17,6 +17,8 @@
 
 #if defined(VK_USE_PLATFORM_ANDROID_KHR)
 
+class NegativeAndroidHardwareBuffer : public VkLayerTest {};
+
 TEST_F(NegativeAndroidHardwareBuffer, ImageCreate) {
     TEST_DESCRIPTION("Verify AndroidHardwareBuffer image create info.");
 

tests/unit/android_hardware_buffer_positive.cpp

@@ -17,6 +17,8 @@
 
 #if defined(VK_USE_PLATFORM_ANDROID_KHR)
 
+class PositiveAndroidHardwareBuffer : public VkLayerTest {};
+
 TEST_F(PositiveAndroidHardwareBuffer, MemoryRequirements) {
     TEST_DESCRIPTION("Verify AndroidHardwareBuffer doesn't conflict with memory requirements.");
 

tests/unit/arm_best_practices.cpp

@@ -18,6 +18,15 @@
 
 const char* kEnableArmValidation = "VALIDATION_CHECK_ENABLE_VENDOR_SPECIFIC_ARM";
 
+class VkArmBestPracticesLayerTest : public VkBestPracticesLayerTest {
+  public:
+    std::unique_ptr<vkt::Image> CreateImage(VkFormat format, const uint32_t width, const uint32_t height,
+                                            VkImageUsageFlags attachment_usage = VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT);
+    VkRenderPass CreateRenderPass(VkFormat format, VkAttachmentLoadOp load_op = VK_ATTACHMENT_LOAD_OP_CLEAR,
+                                  VkAttachmentStoreOp store_op = VK_ATTACHMENT_STORE_OP_STORE);
+    VkFramebuffer CreateFramebuffer(const uint32_t width, const uint32_t height, VkImageView image_view, VkRenderPass renderpass);
+};
+
 class VkConstantBufferObj : public vkt::Buffer {
   public:
     VkConstantBufferObj(vkt::Device* device, VkDeviceSize size, const void* data,

tests/unit/atomics.cpp

@@ -16,6 +16,8 @@
 #include "../framework/layer_validation_tests.h"
 #include "../framework/pipeline_helper.h"
 
+class NegativeAtomic : public VkLayerTest {};
+
 TEST_F(NegativeAtomic, VertexStoresAndAtomicsFeatureDisable) {
     TEST_DESCRIPTION("Run shader with StoreOp or AtomicOp to verify if vertexPipelineStoresAndAtomics disable.");
     SetTargetApiVersion(VK_API_VERSION_1_1);

tests/unit/atomics_positive.cpp

@@ -15,6 +15,8 @@
 #include "../framework/pipeline_helper.h"
 #include "generated/vk_extension_helper.h"
 
+class PositiveAtomic : public VkLayerTest {};
+
 TEST_F(PositiveAtomic, ImageInt64) {
     TEST_DESCRIPTION("Test VK_EXT_shader_image_atomic_int64.");
     SetTargetApiVersion(VK_API_VERSION_1_1);

tests/unit/buffer.cpp

@@ -19,6 +19,8 @@
 #include "../framework/descriptor_helper.h"
 #include "utils/vk_layer_utils.h"
 
+class NegativeBuffer : public VkLayerTest {};
+
 TEST_F(NegativeBuffer, UpdateBufferAlignment) {
     TEST_DESCRIPTION("Check alignment parameters for vkCmdUpdateBuffer");
     uint32_t updateData[] = {1, 2, 3, 4, 5, 6, 7, 8};

tests/unit/buffer_positive.cpp

@@ -16,6 +16,8 @@
 #include "../framework/pipeline_helper.h"
 #include "generated/vk_extension_helper.h"
 
+class PositiveBuffer : public VkLayerTest {};
+
 TEST_F(PositiveBuffer, OwnershipTranfers) {
     TEST_DESCRIPTION("Valid buffer ownership transfers that shouldn't create errors");
     RETURN_IF_SKIP(Init());

tests/unit/command.cpp

@@ -18,6 +18,8 @@
 #include "../framework/descriptor_helper.h"
 #include "../framework/render_pass_helper.h"
 
+class NegativeCommand : public VkLayerTest {};
+
 TEST_F(NegativeCommand, CommandPoolConsistency) {
     TEST_DESCRIPTION("Allocate command buffers from one command pool and attempt to delete them from another.");
 

tests/unit/command_positive.cpp

@@ -17,6 +17,8 @@
 #include "../framework/thread_helper.h"
 #include "generated/vk_extension_helper.h"
 
+class PositiveCommand : public VkLayerTest {};
+
 TEST_F(PositiveCommand, DrawIndirectCountWithoutFeature) {
     TEST_DESCRIPTION("Use VK_KHR_draw_indirect_count in 1.1 before drawIndirectCount feature was added");
 

tests/unit/copy_buffer_image.cpp

@@ -14,6 +14,8 @@
 
 #include "../framework/layer_validation_tests.h"
 
+class NegativeCopyBufferImage : public VkLayerTest {};
+
 TEST_F(NegativeCopyBufferImage, ImageBufferCopy) {
     TEST_DESCRIPTION("Image to buffer and buffer to image tests");
 

tests/unit/copy_buffer_image_positive.cpp

@@ -14,6 +14,8 @@
 
 #include "../framework/layer_validation_tests.h"
 
+class PositiveCopyBufferImage : public VkLayerTest {};
+
 TEST_F(PositiveCopyBufferImage, ImageRemainingLayersMaintenance5) {
     TEST_DESCRIPTION(
         "Test copying an image with VkImageSubresourceLayers.layerCount = VK_REMAINING_ARRAY_LAYERS using VK_KHR_maintenance5");

tests/unit/debug_extensions.cpp

@@ -14,6 +14,8 @@
 
 #include "../framework/layer_validation_tests.h"
 
+class NegativeDebugExtensions : public VkLayerTest {};
+
 TEST_F(NegativeDebugExtensions, DebugMarkerName) {
     TEST_DESCRIPTION("Ensure debug marker object names are printed in debug report output");
     AddRequiredExtensions(VK_EXT_DEBUG_REPORT_EXTENSION_NAME);

tests/unit/debug_extensions_positive.cpp

@@ -11,6 +11,8 @@
 
 #include "../framework/layer_validation_tests.h"
 
+class PositiveDebugExtensions : public VkLayerTest {};
+
 TEST_F(PositiveDebugExtensions, SetDebugUtilsObjectBuffer) {
     TEST_DESCRIPTION("call vkSetDebugUtilsObjectNameEXT on a VkBuffer");
     AddRequiredExtensions(VK_EXT_DEBUG_UTILS_EXTENSION_NAME);

tests/unit/debug_printf.cpp

@@ -16,7 +16,7 @@
 #include "../framework/descriptor_helper.h"
 #include "../framework/gpu_av_helper.h"
 
-void NegativeDebugPrintf::InitDebugPrintfFramework(void *p_next) {
+void DebugPrintfTests::InitDebugPrintfFramework(void *p_next) {
     VkValidationFeatureEnableEXT enables[] = {VK_VALIDATION_FEATURE_ENABLE_DEBUG_PRINTF_EXT};
     VkValidationFeatureDisableEXT disables[] = {
         VK_VALIDATION_FEATURE_DISABLE_THREAD_SAFETY_EXT, VK_VALIDATION_FEATURE_DISABLE_API_PARAMETERS_EXT,
@@ -39,6 +39,8 @@ void NegativeDebugPrintf::InitDebugPrintfFramework(void *p_next) {
     }
 }
 
+class NegativeDebugPrintf : public DebugPrintfTests {};
+
 TEST_F(NegativeDebugPrintf, BasicCompute) {
     RETURN_IF_SKIP(InitDebugPrintfFramework());
     RETURN_IF_SKIP(InitState());

tests/unit/debug_printf_shader_debug_info.cpp

@@ -15,6 +15,8 @@
 #include "../framework/descriptor_helper.h"
 #include "../framework/gpu_av_helper.h"
 
+class NegativeDebugPrintfShaderDebugInfo : public DebugPrintfTests {};
+
 // These tests print out the verbose info to make sure that info is correct
 static const VkBool32 verbose_value = true;
 static const VkLayerSettingEXT layer_setting = {OBJECT_LAYER_NAME, "printf_verbose", VK_LAYER_SETTING_TYPE_BOOL32_EXT, 1,

tests/unit/descriptor_buffer.cpp

@@ -18,6 +18,8 @@
 #include "../framework/pipeline_helper.h"
 #include "../framework/ray_tracing_objects.h"
 
+class NegativeDescriptorBuffer : public DescriptorBufferTest {};
+
 TEST_F(NegativeDescriptorBuffer, SetLayout) {
     TEST_DESCRIPTION("Descriptor buffer set layout tests.");
     RETURN_IF_SKIP(InitBasicDescriptorBuffer());

tests/unit/descriptor_buffer_positive.cpp

@@ -26,6 +26,8 @@ void DescriptorBufferTest::InitBasicDescriptorBuffer(void* pNextFeatures) {
     RETURN_IF_SKIP(InitState(nullptr, &descriptor_buffer_features));
 }
 
+class PositiveDescriptorBuffer : public DescriptorBufferTest {};
+
 TEST_F(PositiveDescriptorBuffer, BasicUsage) {
     TEST_DESCRIPTION("Create VkBuffer with extension.");
     RETURN_IF_SKIP(InitBasicDescriptorBuffer());

tests/unit/descriptor_indexing.cpp

@@ -16,6 +16,8 @@
 #include "../framework/layer_validation_tests.h"
 #include "../framework/pipeline_helper.h"
 
+class NegativeDescriptorIndexing : public DescriptorIndexingTest {};
+
 TEST_F(NegativeDescriptorIndexing, UpdateAfterBind) {
     TEST_DESCRIPTION("Exercise errors for updating a descriptor set after it is bound.");
 

tests/unit/descriptor_indexing_positive.cpp

@@ -27,6 +27,8 @@ void DescriptorIndexingTest::ComputePipelineShaderTest(const char *shader, std::
     pipe.CreateComputePipeline();
 }
 
+class PositiveDescriptorIndexing : public DescriptorIndexingTest {};
+
 TEST_F(PositiveDescriptorIndexing, BindingPartiallyBound) {
     TEST_DESCRIPTION("Ensure that no validation errors for invalid descriptors if binding is PARTIALLY_BOUND");
     SetTargetApiVersion(VK_API_VERSION_1_1);

tests/unit/descriptors.cpp

@@ -19,6 +19,8 @@
 #include "../framework/descriptor_helper.h"
 #include "../framework/render_pass_helper.h"
 
+class NegativeDescriptors : public VkLayerTest {};
+
 TEST_F(NegativeDescriptors, DescriptorPoolConsistency) {
     TEST_DESCRIPTION("Allocate descriptor sets from one DS pool and attempt to delete them from another.");
 

tests/unit/descriptors_positive.cpp

@@ -19,6 +19,8 @@
 #include "generated/vk_extension_helper.h"
 #include "../framework/ray_tracing_objects.h"
 
+class PositiveDescriptors : public VkLayerTest {};
+
 TEST_F(PositiveDescriptors, CopyNonupdatedDescriptors) {
     TEST_DESCRIPTION("Copy non-updated descriptors");
     unsigned int i;

tests/unit/device_queue.cpp

@@ -13,6 +13,8 @@
 #include "../framework/layer_validation_tests.h"
 #include "../framework/pipeline_helper.h"
 
+class NegativeDeviceQueue : public VkLayerTest {};
+
 TEST_F(NegativeDeviceQueue, FamilyIndex) {
     TEST_DESCRIPTION("Create device queue with invalid queue family index.");
 

tests/unit/dynamic_rendering.cpp

@@ -18,6 +18,8 @@
 #include "../framework/layer_validation_tests.h"
 #include "../framework/pipeline_helper.h"
 
+class NegativeDynamicRendering : public DynamicRenderingTest {};
+
 TEST_F(NegativeDynamicRendering, CommandBufferInheritanceRenderingInfo) {
     TEST_DESCRIPTION("VkCommandBufferInheritanceRenderingInfoKHR Dynamic Rendering Tests.");
     SetTargetApiVersion(VK_API_VERSION_1_2);

tests/unit/dynamic_rendering_local_read.cpp

@@ -18,6 +18,8 @@
 #include "../framework/layer_validation_tests.h"
 #include "../framework/pipeline_helper.h"
 
+class NegativeDynamicRenderingLocalRead : public DynamicRenderingTest {};
+
 TEST_F(NegativeDynamicRenderingLocalRead, AttachmentLayout) {
     TEST_DESCRIPTION("Feature is disabled, but attachment descriptor and/or reference uses VK_IMAGE_LAYOUT_RENDERING_LOCAL_READ_KHR");
 

tests/unit/dynamic_rendering_local_read_positive.cpp

@@ -25,6 +25,8 @@ void DynamicRenderingTest::InitBasicDynamicRenderingLocalRead() {
     RETURN_IF_SKIP(Init());
 }
 
+class PositiveDynamicRenderingLocalRead : public DynamicRenderingTest {};
+
 TEST_F(PositiveDynamicRenderingLocalRead, BasicUsage) {
     TEST_DESCRIPTION("Most simple way to use dynamic rendering local read");
     AddRequiredExtensions(VK_KHR_SYNCHRONIZATION_2_EXTENSION_NAME);

tests/unit/dynamic_rendering_positive.cpp

@@ -23,6 +23,8 @@ void DynamicRenderingTest::InitBasicDynamicRendering() {
     RETURN_IF_SKIP(Init());
 }
 
+class PositiveDynamicRendering : public DynamicRenderingTest {};
+
 TEST_F(PositiveDynamicRendering, BasicUsage) {
     TEST_DESCRIPTION("Most simple way to use dynamic rendering");
     RETURN_IF_SKIP(InitBasicDynamicRendering());

tests/unit/dynamic_state.cpp

@@ -17,6 +17,17 @@
 #include "../framework/pipeline_helper.h"
 #include "../framework/render_pass_helper.h"
 
+class NegativeDynamicState : public DynamicStateTest {
+    // helper functions for tests in this file
+  public:
+    // VK_EXT_extended_dynamic_state - not calling vkCmdSet before draw
+    void ExtendedDynamicStateDrawNotSet(VkDynamicState dynamic_state, const char *vuid);
+    // VK_EXT_extended_dynamic_state3 - Create a pipeline with dynamic state, but the feature disabled
+    void ExtendedDynamicState3PipelineFeatureDisabled(VkDynamicState dynamic_state, const char *vuid);
+    // VK_EXT_line_rasterization - Init with LineRasterization features off
+    void InitLineRasterizationFeatureDisabled();
+};
+
 TEST_F(NegativeDynamicState, DepthBiasNotBound) {
     TEST_DESCRIPTION(
         "Run a simple draw calls to validate failure when Depth Bias dynamic state is required but not correctly bound.");

tests/unit/dynamic_state_positive.cpp

@@ -22,6 +22,8 @@ void DynamicStateTest::InitBasicExtendedDynamicState() {
     RETURN_IF_SKIP(Init());
 }
 
+class PositiveDynamicState : public DynamicStateTest {};
+
 TEST_F(PositiveDynamicState, DiscardRectanglesVersion) {
     TEST_DESCRIPTION("check version of VK_EXT_discard_rectangles");
 

tests/unit/external_memory_sync.cpp

@@ -18,6 +18,8 @@
 #include "../framework/external_memory_sync.h"
 #include "utils/vk_layer_utils.h"
 
+class NegativeExternalMemorySync : public ExternalMemorySyncTest {};
+
 TEST_F(NegativeExternalMemorySync, CreateBufferIncompatibleHandleTypes) {
     TEST_DESCRIPTION("Creating buffer with incompatible external memory handle types");
 

tests/unit/external_memory_sync_positive.cpp

@@ -16,6 +16,8 @@
 #include "utils/vk_layer_utils.h"
 #include "generated/enum_flag_bits.h"
 
+class PositiveExternalMemorySync : public ExternalMemorySyncTest {};
+
 TEST_F(PositiveExternalMemorySync, GetMemoryFdHandle) {
     TEST_DESCRIPTION("Get POXIS handle for memory allocation");
     SetTargetApiVersion(VK_API_VERSION_1_1);

tests/unit/fragment_shading_rate.cpp

@@ -17,6 +17,8 @@
 #include "../framework/pipeline_helper.h"
 #include "../framework/render_pass_helper.h"
 
+class NegativeFragmentShadingRate : public VkLayerTest {};
+
 TEST_F(NegativeFragmentShadingRate, Values) {
     TEST_DESCRIPTION("Specify invalid fragment shading rate values");
     SetTargetApiVersion(VK_API_VERSION_1_2);

tests/unit/fragment_shading_rate_positive.cpp

@@ -12,6 +12,8 @@
 #include "../framework/layer_validation_tests.h"
 #include "../framework/render_pass_helper.h"
 
+class PositiveFragmentShadingRate : public VkLayerTest {};
+
 TEST_F(PositiveFragmentShadingRate, StageInVariousAPIs) {
     TEST_DESCRIPTION("Specify shading rate pipeline stage with attachmentFragmentShadingRate feature enabled");
     AddRequiredExtensions(VK_KHR_FRAGMENT_SHADING_RATE_EXTENSION_NAME);

tests/unit/geometry_tessellation.cpp

@@ -16,6 +16,8 @@
 #include "../framework/layer_validation_tests.h"
 #include "../framework/pipeline_helper.h"
 
+class NegativeGeometryTessellation : public VkLayerTest {};
+
 TEST_F(NegativeGeometryTessellation, StageMaskGsTsEnabled) {
     TEST_DESCRIPTION(
         "Attempt to use a stageMask w/ geometry shader and tesselation shader bits enabled when those features are disabled on the "

tests/unit/geometry_tessellation_positive.cpp

@@ -16,6 +16,8 @@
 #include "../framework/layer_validation_tests.h"
 #include "../framework/pipeline_helper.h"
 
+class PositiveGeometryTessellation : public VkLayerTest {};
+
 TEST_F(PositiveGeometryTessellation, PointSizeGeomShaderDontWriteMaintenance5) {
     TEST_DESCRIPTION(
         "Create a pipeline using TOPOLOGY_POINT_LIST, set PointSize vertex shader, but not in the final geometry stage, but have maintenance5.");

tests/unit/gpu_av.cpp

@@ -16,6 +16,8 @@
 #include "../framework/descriptor_helper.h"
 #include "../framework/gpu_av_helper.h"
 
+class NegativeGpuAV : public GpuAVTest {};
+
 TEST_F(NegativeGpuAV, DestroyedPipelineLayout) {
     TEST_DESCRIPTION("Check if can catch pipeline layout not being bound");
     RETURN_IF_SKIP(InitGpuAvFramework());

tests/unit/gpu_av_buffer_device_address.cpp

@@ -17,6 +17,8 @@
 #include "../framework/gpu_av_helper.h"
 #include "../layers/containers/range_vector.h"
 
+class NegativeGpuAVBufferDeviceAddress : public GpuAVBufferDeviceAddressTest {};
+
 TEST_F(NegativeGpuAVBufferDeviceAddress, ReadBeforePointerPushConstant) {
     TEST_DESCRIPTION("Read before the valid pointer - use Push Constants to set the value");
     RETURN_IF_SKIP(InitGpuVUBufferDeviceAddress());

tests/unit/gpu_av_buffer_device_address_positive.cpp

@@ -26,6 +26,8 @@ void GpuAVBufferDeviceAddressTest::InitGpuVUBufferDeviceAddress(void *p_next) {
     RETURN_IF_SKIP(InitState());
 }
 
+class PositiveGpuAVBufferDeviceAddress : public GpuAVBufferDeviceAddressTest {};
+
 TEST_F(PositiveGpuAVBufferDeviceAddress, StoreStd140) {
     TEST_DESCRIPTION("Makes sure that writing to a buffer that was created after command buffer record doesn't get OOB error");
     RETURN_IF_SKIP(InitGpuVUBufferDeviceAddress());

tests/unit/gpu_av_descriptor_indexing.cpp

@@ -18,6 +18,8 @@
 
 #include "../layers/gpu/shaders/gpu_shaders_constants.h"
 
+class NegativeGpuAVDescriptorIndexing : public GpuAVDescriptorIndexingTest {};
+
 TEST_F(NegativeGpuAVDescriptorIndexing, DISABLED_ArrayOOBBuffer) {
     TEST_DESCRIPTION(
         "GPU validation: Verify detection of out-of-bounds descriptor array indexing and use of uninitialized descriptors.");