github · lcartey · May 19, 2023 · May 18, 2023 · May 18, 2023 · May 18, 2023
diff --git a/.../rules/closefilehandlewhennolongerneededshared/CloseFileHandleWhenNoLongerNeededShared.ql b/.../rules/closefilehandlewhennolongerneededshared/CloseFileHandleWhenNoLongerNeededShared.ql
@@ -1,2 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.closefilehandlewhennolongerneededshared.CloseFileHandleWhenNoLongerNeededShared
+
+class TestFileQuery extends CloseFileHandleWhenNoLongerNeededSharedSharedQuery, TestQuery { }
diff --git a/c/common/test/rules/commaoperatorused/CommaOperatorUsed.ql b/c/common/test/rules/commaoperatorused/CommaOperatorUsed.ql
@@ -1,2 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.commaoperatorused.CommaOperatorUsed
+
+class TestFileQuery extends CommaOperatorUsedSharedQuery, TestQuery { }
diff --git a/...stantunsignedintegerexpressionswraparound/ConstantUnsignedIntegerExpressionsWrapAround.ql b/...stantunsignedintegerexpressionswraparound/ConstantUnsignedIntegerExpressionsWrapAround.ql
@@ -1,2 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.constantunsignedintegerexpressionswraparound.ConstantUnsignedIntegerExpressionsWrapAround
+
+class TestFileQuery extends ConstantUnsignedIntegerExpressionsWrapAroundSharedQuery, TestQuery { }
diff --git a/c/common/test/rules/constlikereturnvalue/ConstLikeReturnValue.ql b/c/common/test/rules/constlikereturnvalue/ConstLikeReturnValue.ql
@@ -1,2 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.constlikereturnvalue.ConstLikeReturnValue
+
+class TestFileQuery extends ConstLikeReturnValueSharedQuery, TestQuery { }
diff --git a/c/common/test/rules/deadcode/DeadCode.ql b/c/common/test/rules/deadcode/DeadCode.ql
@@ -1,2 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.deadcode.DeadCode
+
+class TestFileQuery extends DeadCodeSharedQuery, TestQuery { }
diff --git a/c/common/test/rules/declaredareservedidentifier/DeclaredAReservedIdentifier.expected b/c/common/test/rules/declaredareservedidentifier/DeclaredAReservedIdentifier.expected
@@ -1,4 +1,3 @@
-| file://:0:0:0:0 | __va_list_tag | Reserved identifier '__va_list_tag' is declared. |
 | test.c:2:1:2:23 | #define _RESERVED_MACRO | Reserved identifier '_RESERVED_MACRO' is declared. |
 | test.c:11:8:11:9 | _s | Reserved identifier '_s' is declared. |
 | test.c:15:6:15:7 | _f | Reserved identifier '_f' is declared. |

diff --git a/c/common/test/rules/declaredareservedidentifier/DeclaredAReservedIdentifier.ql b/c/common/test/rules/declaredareservedidentifier/DeclaredAReservedIdentifier.ql
@@ -1,2 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.declaredareservedidentifier.DeclaredAReservedIdentifier
+
+class TestFileQuery extends DeclaredAReservedIdentifierSharedQuery, TestQuery { }
diff --git a/c/common/test/rules/dereferenceofnullpointer/DereferenceOfNullPointer.ql b/c/common/test/rules/dereferenceofnullpointer/DereferenceOfNullPointer.ql
@@ -1,2 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.dereferenceofnullpointer.DereferenceOfNullPointer
+
+class TestFileQuery extends DereferenceOfNullPointerSharedQuery, TestQuery { }
diff --git a/...tifiersnottypographicallyunambiguous/DifferentIdentifiersNotTypographicallyUnambiguous.ql b/...tifiersnottypographicallyunambiguous/DifferentIdentifiersNotTypographicallyUnambiguous.ql
@@ -1,2 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.differentidentifiersnottypographicallyunambiguous.DifferentIdentifiersNotTypographicallyUnambiguous
+
+class TestFileQuery extends DifferentIdentifiersNotTypographicallyUnambiguousSharedQuery, TestQuery { }
diff --git a/c/common/test/rules/donotaccessaclosedfile/DoNotAccessAClosedFile.ql b/c/common/test/rules/donotaccessaclosedfile/DoNotAccessAClosedFile.ql
@@ -1,2 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.donotaccessaclosedfile.DoNotAccessAClosedFile
+
+class TestFileQuery extends DoNotAccessAClosedFileSharedQuery, TestQuery { }
diff --git a/...es/donotallowamutextogooutofscopewhilelocked/DoNotAllowAMutexToGoOutOfScopeWhileLocked.ql b/...es/donotallowamutextogooutofscopewhilelocked/DoNotAllowAMutexToGoOutOfScopeWhileLocked.ql
@@ -1,2 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.donotallowamutextogooutofscopewhilelocked.DoNotAllowAMutexToGoOutOfScopeWhileLocked
+
+class TestFileQuery extends DoNotAllowAMutexToGoOutOfScopeWhileLockedSharedQuery, TestQuery { }
diff --git a/...dressofautostorageobjecttootherobject/DoNotCopyAddressOfAutoStorageObjectToOtherObject.ql b/...dressofautostorageobjecttootherobject/DoNotCopyAddressOfAutoStorageObjectToOtherObject.ql
@@ -1,2 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.donotcopyaddressofautostorageobjecttootherobject.DoNotCopyAddressOfAutoStorageObjectToOtherObject
+
+class TestFileQuery extends DoNotCopyAddressOfAutoStorageObjectToOtherObjectSharedQuery, TestQuery { }
diff --git a/c/common/test/rules/donotdestroyamutexwhileitislocked/DoNotDestroyAMutexWhileItIsLocked.ql b/c/common/test/rules/donotdestroyamutexwhileitislocked/DoNotDestroyAMutexWhileItIsLocked.ql
@@ -1,2 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.donotdestroyamutexwhileitislocked.DoNotDestroyAMutexWhileItIsLocked
+
+class TestFileQuery extends DoNotDestroyAMutexWhileItIsLockedSharedQuery, TestQuery { }
diff --git a/...btractpointersaddressingdifferentarrays/DoNotSubtractPointersAddressingDifferentArrays.ql b/...btractpointersaddressingdifferentarrays/DoNotSubtractPointersAddressingDifferentArrays.ql
@@ -1,2 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.donotsubtractpointersaddressingdifferentarrays.DoNotSubtractPointersAddressingDifferentArrays
+
+class TestFileQuery extends DoNotSubtractPointersAddressingDifferentArraysSharedQuery, TestQuery { }
diff --git a/...usemorethantwolevelsofpointerindirection/DoNotUseMoreThanTwoLevelsOfPointerIndirection.ql b/...usemorethantwolevelsofpointerindirection/DoNotUseMoreThanTwoLevelsOfPointerIndirection.ql
@@ -1,2 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.donotusemorethantwolevelsofpointerindirection.DoNotUseMoreThanTwoLevelsOfPointerIndirection
+
+class TestFileQuery extends DoNotUseMoreThanTwoLevelsOfPointerIndirectionSharedQuery, TestQuery { }
diff --git a/...erarithmetictoaddressdifferentarrays/DoNotUsePointerArithmeticToAddressDifferentArrays.ql b/...erarithmetictoaddressdifferentarrays/DoNotUsePointerArithmeticToAddressDifferentArrays.ql
@@ -1,2 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.donotusepointerarithmetictoaddressdifferentarrays.DoNotUsePointerArithmeticToAddressDifferentArrays
+
+class TestFileQuery extends DoNotUsePointerArithmeticToAddressDifferentArraysSharedQuery, TestQuery { }
diff --git a/...otuserandforgeneratingpseudorandomnumbers/DoNotUseRandForGeneratingPseudorandomNumbers.ql b/...otuserandforgeneratingpseudorandomnumbers/DoNotUseRandForGeneratingPseudorandomNumbers.ql
@@ -1,2 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.donotuserandforgeneratingpseudorandomnumbers.DoNotUseRandForGeneratingPseudorandomNumbers
+
+class TestFileQuery extends DoNotUseRandForGeneratingPseudorandomNumbersSharedQuery, TestQuery { }
diff --git a/...erelationaloperatorswithdifferingarrays/DoNotUseRelationalOperatorsWithDifferingArrays.ql b/...erelationaloperatorswithdifferingarrays/DoNotUseRelationalOperatorsWithDifferingArrays.ql
@@ -1,2 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.donotuserelationaloperatorswithdifferingarrays.DoNotUseRelationalOperatorsWithDifferingArrays
+
+class TestFileQuery extends DoNotUseRelationalOperatorsWithDifferingArraysSharedQuery, TestQuery { }
diff --git a/c/common/test/rules/freememorywhennolongerneededshared/FreeMemoryWhenNoLongerNeededShared.ql b/c/common/test/rules/freememorywhennolongerneededshared/FreeMemoryWhenNoLongerNeededShared.ql
@@ -1,2 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.freememorywhennolongerneededshared.FreeMemoryWhenNoLongerNeededShared
+
+class TestFileQuery extends FreeMemoryWhenNoLongerNeededSharedSharedQuery, TestQuery { }
diff --git a/c/common/test/rules/gotostatementcondition/GotoStatementCondition.ql b/c/common/test/rules/gotostatementcondition/GotoStatementCondition.ql
@@ -1,2 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.gotostatementcondition.GotoStatementCondition
+
+class TestFileQuery extends GotoStatementConditionSharedQuery, TestQuery { }
diff --git a/c/common/test/rules/guardaccesstobitfields/GuardAccessToBitFields.ql b/c/common/test/rules/guardaccesstobitfields/GuardAccessToBitFields.ql
@@ -1,2 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.guardaccesstobitfields.GuardAccessToBitFields
+
+class TestFileQuery extends GuardAccessToBitFieldsSharedQuery, TestQuery { }
diff --git a/c/common/test/rules/hashoperatorsused/HashOperatorsUsed.ql b/c/common/test/rules/hashoperatorsused/HashOperatorsUsed.ql
@@ -1,2 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.hashoperatorsused.HashOperatorsUsed
+
+class TestFileQuery extends HashOperatorsUsedSharedQuery, TestQuery { }
diff --git a/c/common/test/rules/identifierhidden/IdentifierHidden.ql b/c/common/test/rules/identifierhidden/IdentifierHidden.ql
@@ -1,2 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.identifierhidden.IdentifierHidden
+
+class TestFileQuery extends IdentifierHiddenSharedQuery, TestQuery { }
diff --git a/...ithexternallinkageonedefinitionshared/IdentifierWithExternalLinkageOneDefinitionShared.ql b/...ithexternallinkageonedefinitionshared/IdentifierWithExternalLinkageOneDefinitionShared.ql
@@ -1,2 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.identifierwithexternallinkageonedefinitionshared.IdentifierWithExternalLinkageOneDefinitionShared
+
+class TestFileQuery extends IdentifierWithExternalLinkageOneDefinitionSharedSharedQuery, TestQuery { }
diff --git a/c/common/test/rules/ifelseterminationconstruct/IfElseTerminationConstruct.ql b/c/common/test/rules/ifelseterminationconstruct/IfElseTerminationConstruct.ql
@@ -1,2 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.ifelseterminationconstruct.IfElseTerminationConstruct
+
+class TestFileQuery extends IfElseTerminationConstructSharedQuery, TestQuery { }
diff --git a/c/common/test/rules/includeguardsnotused/IncludeGuardsNotUsed.ql b/c/common/test/rules/includeguardsnotused/IncludeGuardsNotUsed.ql
@@ -1,2 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.includeguardsnotused.IncludeGuardsNotUsed
+
+class TestFileQuery extends IncludeGuardsNotUsedSharedQuery, TestQuery { }
diff --git a/c/common/test/rules/informationleakageacrossboundaries/InformationLeakageAcrossBoundaries.ql b/c/common/test/rules/informationleakageacrossboundaries/InformationLeakageAcrossBoundaries.ql
@@ -1,2 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.informationleakageacrossboundaries.InformationLeakageAcrossBoundaries
+
+class TestFileQuery extends InformationLeakageAcrossBoundariesSharedQuery, TestQuery { }
diff --git a/c/common/test/rules/invalidatedenvstringpointers/InvalidatedEnvStringPointers.ql b/c/common/test/rules/invalidatedenvstringpointers/InvalidatedEnvStringPointers.ql
@@ -1,2 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.invalidatedenvstringpointers.InvalidatedEnvStringPointers
+
+class TestFileQuery extends InvalidatedEnvStringPointersSharedQuery, TestQuery { }
diff --git a/c/common/test/rules/invalidatedenvstringpointerswarn/InvalidatedEnvStringPointersWarn.ql b/c/common/test/rules/invalidatedenvstringpointerswarn/InvalidatedEnvStringPointersWarn.ql
@@ -1,2 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.invalidatedenvstringpointerswarn.InvalidatedEnvStringPointersWarn
+
+class TestFileQuery extends InvalidatedEnvStringPointersWarnSharedQuery, TestQuery { }
diff --git a/c/common/test/rules/iofstreammissingpositioning/IOFstreamMissingPositioning.ql b/c/common/test/rules/iofstreammissingpositioning/IOFstreamMissingPositioning.ql
@@ -1,2 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.iofstreammissingpositioning.IOFstreamMissingPositioning
+
+class TestFileQuery extends IOFstreamMissingPositioningSharedQuery, TestQuery { }
diff --git a/...st/rules/macroparameternotenclosedinparentheses/MacroParameterNotEnclosedInParentheses.ql b/...st/rules/macroparameternotenclosedinparentheses/MacroParameterNotEnclosedInParentheses.ql
@@ -1,2 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.macroparameternotenclosedinparentheses.MacroParameterNotEnclosedInParentheses
+
+class TestFileQuery extends MacroParameterNotEnclosedInParenthesesSharedQuery, TestQuery { }
diff --git a/c/common/test/rules/memcmpusedtocomparepaddingdata/MemcmpUsedToComparePaddingData.ql b/c/common/test/rules/memcmpusedtocomparepaddingdata/MemcmpUsedToComparePaddingData.ql
@@ -1,2 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.memcmpusedtocomparepaddingdata.MemcmpUsedToComparePaddingData
+
+class TestFileQuery extends MemcmpUsedToComparePaddingDataSharedQuery, TestQuery { }
diff --git a/...specifierfunctionredeclarationshared/MissingStaticSpecifierFunctionRedeclarationShared.ql b/...specifierfunctionredeclarationshared/MissingStaticSpecifierFunctionRedeclarationShared.ql
@@ -1,2 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.missingstaticspecifierfunctionredeclarationshared.MissingStaticSpecifierFunctionRedeclarationShared
+
+class TestFileQuery extends MissingStaticSpecifierFunctionRedeclarationSharedSharedQuery, TestQuery { }
diff --git a/c/common/test/rules/nestedlabelinswitch/NestedLabelInSwitch.ql b/c/common/test/rules/nestedlabelinswitch/NestedLabelInSwitch.ql
@@ -1,2 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.nestedlabelinswitch.NestedLabelInSwitch
+
+class TestFileQuery extends NestedLabelInSwitchSharedQuery, TestQuery { }
diff --git a/c/common/test/rules/nonconstantformat/NonConstantFormat.ql b/c/common/test/rules/nonconstantformat/NonConstantFormat.ql
@@ -1,2 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.nonconstantformat.NonConstantFormat
+
+class TestFileQuery extends NonConstantFormatSharedQuery, TestQuery { }
diff --git a/c/common/test/rules/nonvoidfunctiondoesnotreturn/NonVoidFunctionDoesNotReturn.ql b/c/common/test/rules/nonvoidfunctiondoesnotreturn/NonVoidFunctionDoesNotReturn.ql
@@ -1,2 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.nonvoidfunctiondoesnotreturn.NonVoidFunctionDoesNotReturn
+
+class TestFileQuery extends NonVoidFunctionDoesNotReturnSharedQuery, TestQuery { }
diff --git a/c/common/test/rules/notdistinctidentifier/NotDistinctIdentifier.ql b/c/common/test/rules/notdistinctidentifier/NotDistinctIdentifier.ql
@@ -1,2 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.notdistinctidentifier.NotDistinctIdentifier
+
+class TestFileQuery extends NotDistinctIdentifierSharedQuery, TestQuery { }
diff --git a/...ules/onlyfreememoryallocateddynamicallyshared/OnlyFreeMemoryAllocatedDynamicallyShared.ql b/...ules/onlyfreememoryallocateddynamicallyshared/OnlyFreeMemoryAllocatedDynamicallyShared.ql
@@ -1,2 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.onlyfreememoryallocateddynamicallyshared.OnlyFreeMemoryAllocatedDynamicallyShared
+
+class TestFileQuery extends OnlyFreeMemoryAllocatedDynamicallySharedSharedQuery, TestQuery { }
diff --git a/...es/preprocessingdirectivewithinmacroargument/PreprocessingDirectiveWithinMacroArgument.ql b/...es/preprocessingdirectivewithinmacroargument/PreprocessingDirectiveWithinMacroArgument.ql
@@ -1,2 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.preprocessingdirectivewithinmacroargument.PreprocessingDirectiveWithinMacroArgument
+
+class TestFileQuery extends PreprocessingDirectiveWithinMacroArgumentSharedQuery, TestQuery { }
diff --git a/...ules/preprocessorincludesforbiddenheadernames/PreprocessorIncludesForbiddenHeaderNames.ql b/...ules/preprocessorincludesforbiddenheadernames/PreprocessorIncludesForbiddenHeaderNames.ql
@@ -1,2 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.preprocessorincludesforbiddenheadernames.PreprocessorIncludesForbiddenHeaderNames
+
+class TestFileQuery extends PreprocessorIncludesForbiddenHeaderNamesSharedQuery, TestQuery { }
diff --git a/c/common/test/rules/preprocessorincludespreceded/PreprocessorIncludesPreceded.ql b/c/common/test/rules/preprocessorincludespreceded/PreprocessorIncludesPreceded.ql
@@ -1,2 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.preprocessorincludespreceded.PreprocessorIncludesPreceded
+
+class TestFileQuery extends PreprocessorIncludesPrecededSharedQuery, TestQuery { }
diff --git a/...es/preservesafetywhenusingconditionvariables/PreserveSafetyWhenUsingConditionVariables.ql b/...es/preservesafetywhenusingconditionvariables/PreserveSafetyWhenUsingConditionVariables.ql
@@ -1,2 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.preservesafetywhenusingconditionvariables.PreserveSafetyWhenUsingConditionVariables
+
+class TestFileQuery extends PreserveSafetyWhenUsingConditionVariablesSharedQuery, TestQuery { }
diff --git a/...es/preventdeadlockbylockinginpredefinedorder/PreventDeadlockByLockingInPredefinedOrder.ql b/...es/preventdeadlockbylockinginpredefinedorder/PreventDeadlockByLockingInPredefinedOrder.ql
@@ -1,2 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.preventdeadlockbylockinginpredefinedorder.PreventDeadlockByLockingInPredefinedOrder
+
+class TestFileQuery extends PreventDeadlockByLockingInPredefinedOrderSharedQuery, TestQuery { }
diff --git a/c/common/test/rules/readofuninitializedmemory/ReadOfUninitializedMemory.ql b/c/common/test/rules/readofuninitializedmemory/ReadOfUninitializedMemory.ql
@@ -1,2 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.readofuninitializedmemory.ReadOfUninitializedMemory
+
+class TestFileQuery extends ReadOfUninitializedMemorySharedQuery, TestQuery { }
diff --git a/...n/test/rules/sectionsofcodeshallnotbecommentedout/SectionsOfCodeShallNotBeCommentedOut.ql b/...n/test/rules/sectionsofcodeshallnotbecommentedout/SectionsOfCodeShallNotBeCommentedOut.ql
@@ -1,2 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.sectionsofcodeshallnotbecommentedout.SectionsOfCodeShallNotBeCommentedOut
+
+class TestFileQuery extends SectionsOfCodeShallNotBeCommentedOutSharedQuery, TestQuery { }
diff --git a/c/common/test/rules/switchcasepositioncondition/SwitchCasePositionCondition.ql b/c/common/test/rules/switchcasepositioncondition/SwitchCasePositionCondition.ql
@@ -1,2 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.switchcasepositioncondition.SwitchCasePositionCondition
+
+class TestFileQuery extends SwitchCasePositionConditionSharedQuery, TestQuery { }
diff --git a/c/common/test/rules/switchnotwellformed/SwitchNotWellFormed.ql b/c/common/test/rules/switchnotwellformed/SwitchNotWellFormed.ql
@@ -1,2 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.switchnotwellformed.SwitchNotWellFormed
+
+class TestFileQuery extends SwitchNotWellFormedSharedQuery, TestQuery { }
diff --git a/c/common/test/rules/typeomitted/TypeOmitted.ql b/c/common/test/rules/typeomitted/TypeOmitted.ql
@@ -1,2 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.typeomitted.TypeOmitted
+
+class TestFileQuery extends TypeOmittedSharedQuery, TestQuery { }
diff --git a/c/common/test/rules/uncheckedrangedomainpoleerrors/UncheckedRangeDomainPoleErrors.ql b/c/common/test/rules/uncheckedrangedomainpoleerrors/UncheckedRangeDomainPoleErrors.ql
@@ -1,2 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.uncheckedrangedomainpoleerrors.UncheckedRangeDomainPoleErrors
+
+class TestFileQuery extends UncheckedRangeDomainPoleErrorsSharedQuery, TestQuery { }
diff --git a/c/common/test/rules/undefinedmacroidentifiers/UndefinedMacroIdentifiers.ql b/c/common/test/rules/undefinedmacroidentifiers/UndefinedMacroIdentifiers.ql
@@ -1,2 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.undefinedmacroidentifiers.UndefinedMacroIdentifiers
+
+class TestFileQuery extends UndefinedMacroIdentifiersSharedQuery, TestQuery { }
diff --git a/...essaryexposedidentifierdeclarationshared/UnnecessaryExposedIdentifierDeclarationShared.ql b/...essaryexposedidentifierdeclarationshared/UnnecessaryExposedIdentifierDeclarationShared.ql
@@ -1,2 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.unnecessaryexposedidentifierdeclarationshared.UnnecessaryExposedIdentifierDeclarationShared
+
+class TestFileQuery extends UnnecessaryExposedIdentifierDeclarationSharedSharedQuery, TestQuery { }
diff --git a/c/common/test/rules/unreachablecode/UnreachableCode.ql b/c/common/test/rules/unreachablecode/UnreachableCode.ql
@@ -1,2 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.unreachablecode.UnreachableCode
+
+class TestFileQuery extends UnreachableCodeSharedQuery, TestQuery { }
diff --git a/c/common/test/rules/unusedparameter/UnusedParameter.ql b/c/common/test/rules/unusedparameter/UnusedParameter.ql
@@ -1,2 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.unusedparameter.UnusedParameter
+
+class TestFileQuery extends UnusedParameterSharedQuery, TestQuery { }
diff --git a/c/common/test/rules/unusedtypedeclarations/UnusedTypeDeclarations.expected b/c/common/test/rules/unusedtypedeclarations/UnusedTypeDeclarations.expected
@@ -1,4 +1,3 @@
-| file://:0:0:0:0 | __va_list_tag | Type declaration __va_list_tag is not used. |
 | test.c:4:8:4:8 | A | Type declaration A is not used. |
 | test.c:7:18:7:18 | D | Type declaration D is not used. |
 | test.c:28:11:28:11 | R | Type declaration R is not used. |

diff --git a/c/common/test/rules/unusedtypedeclarations/UnusedTypeDeclarations.ql b/c/common/test/rules/unusedtypedeclarations/UnusedTypeDeclarations.ql
@@ -1,2 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.unusedtypedeclarations.UnusedTypeDeclarations
+
+class TestFileQuery extends UnusedTypeDeclarationsSharedQuery, TestQuery { }
diff --git a/c/common/test/rules/usageofassemblernotdocumented/UsageOfAssemblerNotDocumented.ql b/c/common/test/rules/usageofassemblernotdocumented/UsageOfAssemblerNotDocumented.ql
@@ -1,2 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.usageofassemblernotdocumented.UsageOfAssemblerNotDocumented
+
+class TestFileQuery extends UsageOfAssemblerNotDocumentedSharedQuery, TestQuery { }
diff --git a/...rbracestomatchaggregatetypestructure/UseInitializerBracesToMatchAggregateTypeStructure.ql b/...rbracestomatchaggregatetypestructure/UseInitializerBracesToMatchAggregateTypeStructure.ql
@@ -1,2 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.useinitializerbracestomatchaggregatetypestructure.UseInitializerBracesToMatchAggregateTypeStructure
+
+class TestFileQuery extends UseInitializerBracesToMatchAggregateTypeStructureSharedQuery, TestQuery { }
diff --git a/...ules/useonlyarrayindexingforpointerarithmetic/UseOnlyArrayIndexingForPointerArithmetic.ql b/...ules/useonlyarrayindexingforpointerarithmetic/UseOnlyArrayIndexingForPointerArithmetic.ql
@@ -1,2 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.useonlyarrayindexingforpointerarithmetic.UseOnlyArrayIndexingForPointerArithmetic
+
+class TestFileQuery extends UseOnlyArrayIndexingForPointerArithmeticSharedQuery, TestQuery { }
diff --git a/c/common/test/rules/wrapspuriousfunctioninloop/WrapSpuriousFunctionInLoop.ql b/c/common/test/rules/wrapspuriousfunctioninloop/WrapSpuriousFunctionInLoop.ql
@@ -1,2 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.wrapspuriousfunctioninloop.WrapSpuriousFunctionInLoop
+
+class TestFileQuery extends WrapSpuriousFunctionInLoopSharedQuery, TestQuery { }
diff --git a/c/misra/src/rules/RULE-20-10/PreprocessorHashOperatorsShouldNotBeUsed.ql b/c/misra/src/rules/RULE-20-10/PreprocessorHashOperatorsShouldNotBeUsed.ql
@@ -15,7 +15,7 @@ import cpp
 import codingstandards.c.misra
 import codingstandards.cpp.rules.hashoperatorsused.HashOperatorsUsed
 
-class HashOperatorsUsedInQuery extends HashOperatorsUsedQuery {
+class HashOperatorsUsedInQuery extends HashOperatorsUsedSharedQuery {
   HashOperatorsUsedInQuery() {
     this = Preprocessor1Package::preprocessorHashOperatorsShouldNotBeUsedQuery()
   }

diff --git a/c/misra/src/rules/RULE-20-2/ForbiddenCharactersInHeaderFileName.ql b/c/misra/src/rules/RULE-20-2/ForbiddenCharactersInHeaderFileName.ql
@@ -15,7 +15,7 @@ import cpp
 import codingstandards.c.misra
 import codingstandards.cpp.rules.preprocessorincludesforbiddenheadernames.PreprocessorIncludesForbiddenHeaderNames
 
-class PreprocessorIncludesForbiddenHeaderNames extends PreprocessorIncludesForbiddenHeaderNamesQuery {
+class PreprocessorIncludesForbiddenHeaderNames extends PreprocessorIncludesForbiddenHeaderNamesSharedQuery {
   PreprocessorIncludesForbiddenHeaderNames() {
     this = Preprocessor1Package::forbiddenCharactersInHeaderFileNameQuery()
   }

diff --git a/c/misra/src/rules/RULE-20-9/IdentifiersUsedInPreprocessorExpression.ql b/c/misra/src/rules/RULE-20-9/IdentifiersUsedInPreprocessorExpression.ql
@@ -17,7 +17,7 @@ import cpp
 import codingstandards.c.misra
 import codingstandards.cpp.rules.undefinedmacroidentifiers.UndefinedMacroIdentifiers
 
-class UndefinedMacroIdentifiersUsedInQuery extends UndefinedMacroIdentifiersQuery {
+class UndefinedMacroIdentifiersUsedInQuery extends UndefinedMacroIdentifiersSharedQuery {
   UndefinedMacroIdentifiersUsedInQuery() {
     this = Preprocessor1Package::identifiersUsedInPreprocessorExpressionQuery()
   }

diff --git a/cpp/autosar/src/rules/A15-3-5/ClassTypeExceptionNotCaughtByReference.ql b/cpp/autosar/src/rules/A15-3-5/ClassTypeExceptionNotCaughtByReference.ql
@@ -17,7 +17,7 @@ import cpp
 import codingstandards.cpp.autosar
 import codingstandards.cpp.rules.catchexceptionsbylvaluereference.CatchExceptionsByLvalueReference
 
-class ClassTypeExceptionNotCaughtByReference extends CatchExceptionsByLValueReferenceSharedQuery {
+class ClassTypeExceptionNotCaughtByReference extends CatchExceptionsByLvalueReferenceSharedQuery {
   ClassTypeExceptionNotCaughtByReference() {
     this = Exceptions2Package::classTypeExceptionNotCaughtByReferenceQuery()
   }

diff --git a/cpp/autosar/src/rules/A16-2-1/CharactersOccurInHeaderFileNameOrInIncludeDirective.ql b/cpp/autosar/src/rules/A16-2-1/CharactersOccurInHeaderFileNameOrInIncludeDirective.ql
@@ -17,7 +17,7 @@ import cpp
 import codingstandards.cpp.autosar
 import codingstandards.cpp.rules.preprocessorincludesforbiddenheadernames.PreprocessorIncludesForbiddenHeaderNames
 
-class CharactersOccurInHeaderFileNameOrInIncludeDirectiveQuery extends PreprocessorIncludesForbiddenHeaderNamesQuery {
+class CharactersOccurInHeaderFileNameOrInIncludeDirectiveQuery extends PreprocessorIncludesForbiddenHeaderNamesSharedQuery {
   CharactersOccurInHeaderFileNameOrInIncludeDirectiveQuery() {
     this = MacrosPackage::charactersOccurInHeaderFileNameOrInIncludeDirectiveQuery()
   }

diff --git a/cpp/autosar/src/rules/M16-0-7/UndefinedMacroIdentifiersUsedIn.ql b/cpp/autosar/src/rules/M16-0-7/UndefinedMacroIdentifiersUsedIn.ql
@@ -19,7 +19,7 @@ import cpp
 import codingstandards.cpp.autosar
 import codingstandards.cpp.rules.undefinedmacroidentifiers.UndefinedMacroIdentifiers
 
-class UndefinedMacroIdentifiersUsedInQuery extends UndefinedMacroIdentifiersQuery {
+class UndefinedMacroIdentifiersUsedInQuery extends UndefinedMacroIdentifiersSharedQuery {
   UndefinedMacroIdentifiersUsedInQuery() {
     this = MacrosPackage::charactersOccurInHeaderFileNameOrInIncludeDirectiveQuery()
   }

diff --git a/cpp/autosar/src/rules/M16-3-2/HashOperatorsShouldNotBeUsed.ql b/cpp/autosar/src/rules/M16-3-2/HashOperatorsShouldNotBeUsed.ql
@@ -17,6 +17,6 @@ import cpp
 import codingstandards.cpp.autosar
 import codingstandards.cpp.rules.hashoperatorsused.HashOperatorsUsed
 
-class HashOperatorsShallNotBeUsedInQuery extends HashOperatorsUsedQuery {
+class HashOperatorsShallNotBeUsedInQuery extends HashOperatorsUsedSharedQuery {
   HashOperatorsShallNotBeUsedInQuery() { this = MacrosPackage::hashOperatorsShouldNotBeUsedQuery() }
 }
diff --git a/cpp/cert/src/rules/ERR61-CPP/CatchExceptionsByLvalueReference.ql b/cpp/cert/src/rules/ERR61-CPP/CatchExceptionsByLvalueReference.ql
@@ -15,7 +15,7 @@ import cpp
 import codingstandards.cpp.cert
 import codingstandards.cpp.rules.catchexceptionsbylvaluereference.CatchExceptionsByLvalueReference
 
-class CatchExceptionsByLvalueReferenceQuery extends CatchExceptionsByLValueReferenceSharedQuery {
+class CatchExceptionsByLvalueReferenceQuery extends CatchExceptionsByLvalueReferenceSharedQuery {
   CatchExceptionsByLvalueReferenceQuery() {
     this = Exceptions1Package::catchExceptionsByLvalueReferenceQuery()
   }