From 272596ac2a618172bc06af877d60f24c9198741b Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Tue, 17 Oct 2023 11:29:25 +0100
Subject: [PATCH 1/3] Revert "Update formatting of test queries for shared
 rules."

This reverts commit 1193b8d721b7ca8c05231b768f4394a544d864f8.
---
 .../CloseFileHandleWhenNoLongerNeededShared.ql               | 3 +--
 c/common/test/rules/commaoperatorused/CommaOperatorUsed.ql   | 3 +--
 .../ConstantUnsignedIntegerExpressionsWrapAround.ql          | 3 +--
 .../test/rules/constlikereturnvalue/ConstLikeReturnValue.ql  | 3 +--
 c/common/test/rules/deadcode/DeadCode.ql                     | 3 +--
 .../DeclaredAReservedIdentifier.ql                           | 3 +--
 .../dereferenceofnullpointer/DereferenceOfNullPointer.ql     | 3 +--
 .../rules/donotaccessaclosedfile/DoNotAccessAClosedFile.ql   | 3 +--
 .../DoNotAllowAMutexToGoOutOfScopeWhileLocked.ql             | 3 +--
 .../DoNotDestroyAMutexWhileItIsLocked.ql                     | 3 +--
 .../DoNotSubtractPointersAddressingDifferentArrays.ql        | 3 +--
 .../DoNotUseMoreThanTwoLevelsOfPointerIndirection.ql         | 3 +--
 .../DoNotUseRandForGeneratingPseudorandomNumbers.ql          | 3 +--
 .../DoNotUseRelationalOperatorsWithDifferingArrays.ql        | 3 +--
 .../FreeMemoryWhenNoLongerNeededShared.ql                    | 3 +--
 .../rules/gotostatementcondition/GotoStatementCondition.ql   | 3 +--
 .../rules/guardaccesstobitfields/GuardAccessToBitFields.ql   | 3 +--
 c/common/test/rules/hashoperatorsused/HashOperatorsUsed.ql   | 3 +--
 c/common/test/rules/identifierhidden/IdentifierHidden.ql     | 3 +--
 .../ifelseterminationconstruct/IfElseTerminationConstruct.ql | 3 +--
 .../test/rules/includeguardsnotused/IncludeGuardsNotUsed.ql  | 3 +--
 .../InformationLeakageAcrossBoundaries.ql                    | 3 +--
 .../InvalidatedEnvStringPointers.ql                          | 3 +--
 .../InvalidatedEnvStringPointersWarn.ql                      | 3 +--
 .../IOFstreamMissingPositioning.ql                           | 3 +--
 .../MacroParameterNotEnclosedInParentheses.ql                | 3 +--
 .../MemcmpUsedToComparePaddingData.ql                        | 3 +--
 .../test/rules/nestedlabelinswitch/NestedLabelInSwitch.ql    | 3 +--
 c/common/test/rules/nonconstantformat/NonConstantFormat.ql   | 3 +--
 .../NonVoidFunctionDoesNotReturn.ql                          | 3 +--
 .../rules/notdistinctidentifier/NotDistinctIdentifier.ql     | 3 +--
 .../OnlyFreeMemoryAllocatedDynamicallyShared.ql              | 3 +--
 .../PreprocessingDirectiveWithinMacroArgument.ql             | 3 +--
 .../PreprocessorIncludesForbiddenHeaderNames.ql              | 3 +--
 .../PreprocessorIncludesPreceded.ql                          | 3 +--
 .../PreserveSafetyWhenUsingConditionVariables.ql             | 3 +--
 .../PreventDeadlockByLockingInPredefinedOrder.ql             | 3 +--
 .../readofuninitializedmemory/ReadOfUninitializedMemory.ql   | 3 +--
 .../SectionsOfCodeShallNotBeCommentedOut.ql                  | 3 +--
 .../SwitchCasePositionCondition.ql                           | 3 +--
 .../test/rules/switchnotwellformed/SwitchNotWellFormed.ql    | 3 +--
 c/common/test/rules/typeomitted/TypeOmitted.ql               | 3 +--
 .../UncheckedRangeDomainPoleErrors.ql                        | 3 +--
 .../undefinedmacroidentifiers/UndefinedMacroIdentifiers.ql   | 3 +--
 .../UnnecessaryExposedIdentifierDeclarationShared.ql         | 3 +--
 c/common/test/rules/unreachablecode/UnreachableCode.ql       | 3 +--
 c/common/test/rules/unusedparameter/UnusedParameter.ql       | 3 +--
 .../rules/unusedtypedeclarations/UnusedTypeDeclarations.ql   | 3 +--
 .../UsageOfAssemblerNotDocumented.ql                         | 3 +--
 .../UseOnlyArrayIndexingForPointerArithmetic.ql              | 3 +--
 .../wrapspuriousfunctioninloop/WrapSpuriousFunctionInLoop.ql | 3 +--
 .../AccessOfUndefinedMemberThroughNullPointer.ql             | 3 +--
 ...cessOfUndefinedMemberThroughUninitializedStaticPointer.ql | 5 +++--
 .../BasicStringMayNotBeNullTerminated.ql                     | 3 +--
 .../test/rules/catchblockshadowing/CatchBlockShadowing.ql    | 3 +--
 .../CatchExceptionsByLvalueReference.ql                      | 3 +--
 cpp/common/test/rules/commaoperatorused/CommaOperatorUsed.ql | 3 +--
 .../ConditionVariablePostConditionFailed.ql                  | 3 +--
 .../ConstantUnsignedIntegerExpressionsWrapAround.ql          | 3 +--
 .../ContainerAccessWithoutRangeCheck.ql                      | 3 +--
 .../DanglingCaptureWhenMovingLambdaObject.ql                 | 3 +--
 .../DanglingCaptureWhenReturningLambdaObject.ql              | 3 +--
 cpp/common/test/rules/deadcode/DeadCode.ql                   | 3 +--
 .../DeleteOfPointerToIncompleteClass.ql                      | 3 +--
 .../dereferenceofnullpointer/DereferenceOfNullPointer.ql     | 3 +--
 .../DestroyedValueReferencedInDestructorCatchBlock.ql        | 3 +--
 .../DoNotAllowAMutexToGoOutOfScopeWhileLocked.ql             | 3 +--
 .../DoNotDestroyAMutexWhileItIsLocked.ql                     | 3 +--
 .../DoNotSubtractPointersAddressingDifferentArrays.ql        | 3 +--
 .../DoNotUseMoreThanTwoLevelsOfPointerIndirection.ql         | 3 +--
 .../DoNotUseRandForGeneratingPseudorandomNumbers.ql          | 3 +--
 .../DoNotUseRelationalOperatorsWithDifferingArrays.ql        | 3 +--
 .../DoNotUseSetjmpOrLongjmpShared.ql                         | 3 +--
 .../exceptionsafetyguarantees/ExceptionSafetyGuarantees.ql   | 3 +--
 .../exceptionsafetyvalidstate/ExceptionSafetyValidState.ql   | 3 +--
 .../exithandlerthrowsexception/ExitHandlerThrowsException.ql | 3 +--
 .../explicitabrupttermination/ExplicitAbruptTermination.ql   | 3 +--
 .../FunctionNoReturnAttributeCondition.ql                    | 3 +--
 .../rules/gotostatementcondition/GotoStatementCondition.ql   | 3 +--
 .../rules/guardaccesstobitfields/GuardAccessToBitFields.ql   | 3 +--
 .../HandleAllExceptionsDuringStartup.ql                      | 3 +--
 cpp/common/test/rules/hashoperatorsused/HashOperatorsUsed.ql | 3 +--
 cpp/common/test/rules/identifierhidden/IdentifierHidden.ql   | 3 +--
 .../ifelseterminationconstruct/IfElseTerminationConstruct.ql | 3 +--
 .../test/rules/includeguardsnotused/IncludeGuardsNotUsed.ql  | 3 +--
 .../InformationLeakageAcrossBoundaries.ql                    | 3 +--
 .../IOFstreamMissingPositioning.ql                           | 3 +--
 .../JoinableThreadCopiedOrDestroyed.ql                       | 3 +--
 .../MacroParameterNotEnclosedInParentheses.ql                | 3 +--
 .../MemcmpUsedToComparePaddingData.ql                        | 3 +--
 .../MovedFromObjectsUnspecifiedState.ql                      | 3 +--
 .../test/rules/nestedlabelinswitch/NestedLabelInSwitch.ql    | 3 +--
 cpp/common/test/rules/nonbooleanifstmt/NonBooleanIfStmt.ql   | 3 +--
 .../rules/nonbooleaniterationstmt/NonBooleanIterationStmt.ql | 3 +--
 cpp/common/test/rules/nonconstantformat/NonConstantFormat.ql | 3 +--
 .../NonStandardEntitiesInStandardNamespaces.ql               | 3 +--
 .../NonVoidFunctionDoesNotReturn.ql                          | 3 +--
 .../ObjectAccessedAfterLifetime.ql                           | 3 +--
 .../ObjectAccessedBeforeLifetime.ql                          | 3 +--
 .../onedefinitionruleviolation/OneDefinitionRuleViolation.ql | 3 +--
 .../OperationMayNotNullTerminateCStyleString.ql              | 3 +--
 .../OperatorDeleteMissingPartner.ql                          | 3 +--
 .../OrderingPredicateMustBeStrictlyWeak.ql                   | 3 +--
 .../OwnedPointerValueStoredInUnrelatedSmartPointer.ql        | 3 +--
 .../PlacementNewInsufficientStorage.ql                       | 3 +--
 .../PlacementNewNotProperlyAligned.ql                        | 3 +--
 .../PredicateFunctionObjectsShouldNotBeMutable.ql            | 3 +--
 .../PreprocessingDirectiveWithinMacroArgument.ql             | 3 +--
 .../PreprocessorIncludesForbiddenHeaderNames.ql              | 3 +--
 .../PreprocessorIncludesPreceded.ql                          | 3 +--
 .../PreserveSafetyWhenUsingConditionVariables.ql             | 3 +--
 .../PreventDeadlockByLockingInPredefinedOrder.ql             | 3 +--
 .../readofuninitializedmemory/ReadOfUninitializedMemory.ql   | 3 +--
 .../RemoveConstOrVolatileQualification.ql                    | 3 +--
 .../RethrowNestedWithoutCapture.ql                           | 3 +--
 .../SectionsOfCodeShallNotBeCommentedOut.ql                  | 3 +--
 .../StringNumberConversionMissingErrorCheck.ql               | 3 +--
 .../SwitchCasePositionCondition.ql                           | 3 +--
 .../test/rules/switchnotwellformed/SwitchNotWellFormed.ql    | 3 +--
 .../ThrowingNoThrowOperatorNewDelete.ql                      | 3 +--
 .../ThrowingOperatorNewReturnsNull.ql                        | 3 +--
 .../ThrowingOperatorNewThrowsInvalidException.ql             | 3 +--
 .../UncheckedRangeDomainPoleErrors.ql                        | 3 +--
 .../undefinedmacroidentifiers/UndefinedMacroIdentifiers.ql   | 3 +--
 .../UnnecessaryExposedIdentifierDeclarationShared.ql         | 3 +--
 cpp/common/test/rules/unreachablecode/UnreachableCode.ql     | 3 +--
 cpp/common/test/rules/unusedparameter/UnusedParameter.ql     | 3 +--
 .../rules/unusedtypedeclarations/UnusedTypeDeclarations.ql   | 3 +--
 .../UsageOfAssemblerNotDocumented.ql                         | 3 +--
 .../UseCanonicalOrderForMemberInit.ql                        | 3 +--
 .../UseOnlyArrayIndexingForPointerArithmetic.ql              | 3 +--
 .../ValidContainerElementAccess.ql                           | 3 +--
 .../wrapspuriousfunctioninloop/WrapSpuriousFunctionInLoop.ql | 3 +--
 scripts/generate_rules/generate_package_files.py             | 3 +--
 134 files changed, 136 insertions(+), 268 deletions(-)

diff --git a/c/common/test/rules/closefilehandlewhennolongerneededshared/CloseFileHandleWhenNoLongerNeededShared.ql b/c/common/test/rules/closefilehandlewhennolongerneededshared/CloseFileHandleWhenNoLongerNeededShared.ql
index a208410321..9e657b351a 100644
--- a/c/common/test/rules/closefilehandlewhennolongerneededshared/CloseFileHandleWhenNoLongerNeededShared.ql
+++ b/c/common/test/rules/closefilehandlewhennolongerneededshared/CloseFileHandleWhenNoLongerNeededShared.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.closefilehandlewhennolongerneededshared.CloseFileHandleWhenNoLongerNeededShared
 
-class TestFileQuery extends CloseFileHandleWhenNoLongerNeededSharedSharedQuery, TestQuery {
-}
+class TestFileQuery extends CloseFileHandleWhenNoLongerNeededSharedSharedQuery, TestQuery { }
diff --git a/c/common/test/rules/commaoperatorused/CommaOperatorUsed.ql b/c/common/test/rules/commaoperatorused/CommaOperatorUsed.ql
index b6c91e6eb2..2fe294762e 100644
--- a/c/common/test/rules/commaoperatorused/CommaOperatorUsed.ql
+++ b/c/common/test/rules/commaoperatorused/CommaOperatorUsed.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.commaoperatorused.CommaOperatorUsed
 
-class TestFileQuery extends CommaOperatorUsedSharedQuery, TestQuery {
-}
+class TestFileQuery extends CommaOperatorUsedSharedQuery, TestQuery { }
diff --git a/c/common/test/rules/constantunsignedintegerexpressionswraparound/ConstantUnsignedIntegerExpressionsWrapAround.ql b/c/common/test/rules/constantunsignedintegerexpressionswraparound/ConstantUnsignedIntegerExpressionsWrapAround.ql
index b12383aabb..c77ee1c66a 100644
--- a/c/common/test/rules/constantunsignedintegerexpressionswraparound/ConstantUnsignedIntegerExpressionsWrapAround.ql
+++ b/c/common/test/rules/constantunsignedintegerexpressionswraparound/ConstantUnsignedIntegerExpressionsWrapAround.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.constantunsignedintegerexpressionswraparound.ConstantUnsignedIntegerExpressionsWrapAround
 
-class TestFileQuery extends ConstantUnsignedIntegerExpressionsWrapAroundSharedQuery, TestQuery {
-}
+class TestFileQuery extends ConstantUnsignedIntegerExpressionsWrapAroundSharedQuery, TestQuery { }
diff --git a/c/common/test/rules/constlikereturnvalue/ConstLikeReturnValue.ql b/c/common/test/rules/constlikereturnvalue/ConstLikeReturnValue.ql
index c598883031..53c27eb3ce 100644
--- a/c/common/test/rules/constlikereturnvalue/ConstLikeReturnValue.ql
+++ b/c/common/test/rules/constlikereturnvalue/ConstLikeReturnValue.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.constlikereturnvalue.ConstLikeReturnValue
 
-class TestFileQuery extends ConstLikeReturnValueSharedQuery, TestQuery {
-}
+class TestFileQuery extends ConstLikeReturnValueSharedQuery, TestQuery { }
diff --git a/c/common/test/rules/deadcode/DeadCode.ql b/c/common/test/rules/deadcode/DeadCode.ql
index b38dba26d7..dcd7fce840 100644
--- a/c/common/test/rules/deadcode/DeadCode.ql
+++ b/c/common/test/rules/deadcode/DeadCode.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.deadcode.DeadCode
 
-class TestFileQuery extends DeadCodeSharedQuery, TestQuery {
-}
+class TestFileQuery extends DeadCodeSharedQuery, TestQuery { }
diff --git a/c/common/test/rules/declaredareservedidentifier/DeclaredAReservedIdentifier.ql b/c/common/test/rules/declaredareservedidentifier/DeclaredAReservedIdentifier.ql
index 707ef3ccbe..f091b0aaaa 100644
--- a/c/common/test/rules/declaredareservedidentifier/DeclaredAReservedIdentifier.ql
+++ b/c/common/test/rules/declaredareservedidentifier/DeclaredAReservedIdentifier.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.declaredareservedidentifier.DeclaredAReservedIdentifier
 
-class TestFileQuery extends DeclaredAReservedIdentifierSharedQuery, TestQuery {
-}
+class TestFileQuery extends DeclaredAReservedIdentifierSharedQuery, TestQuery { }
diff --git a/c/common/test/rules/dereferenceofnullpointer/DereferenceOfNullPointer.ql b/c/common/test/rules/dereferenceofnullpointer/DereferenceOfNullPointer.ql
index cf9fdf6071..c8dc62e67c 100644
--- a/c/common/test/rules/dereferenceofnullpointer/DereferenceOfNullPointer.ql
+++ b/c/common/test/rules/dereferenceofnullpointer/DereferenceOfNullPointer.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.dereferenceofnullpointer.DereferenceOfNullPointer
 
-class TestFileQuery extends DereferenceOfNullPointerSharedQuery, TestQuery {
-}
+class TestFileQuery extends DereferenceOfNullPointerSharedQuery, TestQuery { }
diff --git a/c/common/test/rules/donotaccessaclosedfile/DoNotAccessAClosedFile.ql b/c/common/test/rules/donotaccessaclosedfile/DoNotAccessAClosedFile.ql
index 1087134c19..d3b8b9ea3a 100644
--- a/c/common/test/rules/donotaccessaclosedfile/DoNotAccessAClosedFile.ql
+++ b/c/common/test/rules/donotaccessaclosedfile/DoNotAccessAClosedFile.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.donotaccessaclosedfile.DoNotAccessAClosedFile
 
-class TestFileQuery extends DoNotAccessAClosedFileSharedQuery, TestQuery {
-}
+class TestFileQuery extends DoNotAccessAClosedFileSharedQuery, TestQuery { }
diff --git a/c/common/test/rules/donotallowamutextogooutofscopewhilelocked/DoNotAllowAMutexToGoOutOfScopeWhileLocked.ql b/c/common/test/rules/donotallowamutextogooutofscopewhilelocked/DoNotAllowAMutexToGoOutOfScopeWhileLocked.ql
index 9aac0f1c09..ceae7e6a9e 100644
--- a/c/common/test/rules/donotallowamutextogooutofscopewhilelocked/DoNotAllowAMutexToGoOutOfScopeWhileLocked.ql
+++ b/c/common/test/rules/donotallowamutextogooutofscopewhilelocked/DoNotAllowAMutexToGoOutOfScopeWhileLocked.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.donotallowamutextogooutofscopewhilelocked.DoNotAllowAMutexToGoOutOfScopeWhileLocked
 
-class TestFileQuery extends DoNotAllowAMutexToGoOutOfScopeWhileLockedSharedQuery, TestQuery {
-}
+class TestFileQuery extends DoNotAllowAMutexToGoOutOfScopeWhileLockedSharedQuery, TestQuery { }
diff --git a/c/common/test/rules/donotdestroyamutexwhileitislocked/DoNotDestroyAMutexWhileItIsLocked.ql b/c/common/test/rules/donotdestroyamutexwhileitislocked/DoNotDestroyAMutexWhileItIsLocked.ql
index b2fdab8eea..96ea58009e 100644
--- a/c/common/test/rules/donotdestroyamutexwhileitislocked/DoNotDestroyAMutexWhileItIsLocked.ql
+++ b/c/common/test/rules/donotdestroyamutexwhileitislocked/DoNotDestroyAMutexWhileItIsLocked.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.donotdestroyamutexwhileitislocked.DoNotDestroyAMutexWhileItIsLocked
 
-class TestFileQuery extends DoNotDestroyAMutexWhileItIsLockedSharedQuery, TestQuery {
-}
+class TestFileQuery extends DoNotDestroyAMutexWhileItIsLockedSharedQuery, TestQuery { }
diff --git a/c/common/test/rules/donotsubtractpointersaddressingdifferentarrays/DoNotSubtractPointersAddressingDifferentArrays.ql b/c/common/test/rules/donotsubtractpointersaddressingdifferentarrays/DoNotSubtractPointersAddressingDifferentArrays.ql
index cc9cb834e0..374a6fc52b 100644
--- a/c/common/test/rules/donotsubtractpointersaddressingdifferentarrays/DoNotSubtractPointersAddressingDifferentArrays.ql
+++ b/c/common/test/rules/donotsubtractpointersaddressingdifferentarrays/DoNotSubtractPointersAddressingDifferentArrays.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.donotsubtractpointersaddressingdifferentarrays.DoNotSubtractPointersAddressingDifferentArrays
 
-class TestFileQuery extends DoNotSubtractPointersAddressingDifferentArraysSharedQuery, TestQuery {
-}
+class TestFileQuery extends DoNotSubtractPointersAddressingDifferentArraysSharedQuery, TestQuery { }
diff --git a/c/common/test/rules/donotusemorethantwolevelsofpointerindirection/DoNotUseMoreThanTwoLevelsOfPointerIndirection.ql b/c/common/test/rules/donotusemorethantwolevelsofpointerindirection/DoNotUseMoreThanTwoLevelsOfPointerIndirection.ql
index ddaa0399b2..edef2c1127 100644
--- a/c/common/test/rules/donotusemorethantwolevelsofpointerindirection/DoNotUseMoreThanTwoLevelsOfPointerIndirection.ql
+++ b/c/common/test/rules/donotusemorethantwolevelsofpointerindirection/DoNotUseMoreThanTwoLevelsOfPointerIndirection.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.donotusemorethantwolevelsofpointerindirection.DoNotUseMoreThanTwoLevelsOfPointerIndirection
 
-class TestFileQuery extends DoNotUseMoreThanTwoLevelsOfPointerIndirectionSharedQuery, TestQuery {
-}
+class TestFileQuery extends DoNotUseMoreThanTwoLevelsOfPointerIndirectionSharedQuery, TestQuery { }
diff --git a/c/common/test/rules/donotuserandforgeneratingpseudorandomnumbers/DoNotUseRandForGeneratingPseudorandomNumbers.ql b/c/common/test/rules/donotuserandforgeneratingpseudorandomnumbers/DoNotUseRandForGeneratingPseudorandomNumbers.ql
index c6e0f0e58a..3ad5626256 100644
--- a/c/common/test/rules/donotuserandforgeneratingpseudorandomnumbers/DoNotUseRandForGeneratingPseudorandomNumbers.ql
+++ b/c/common/test/rules/donotuserandforgeneratingpseudorandomnumbers/DoNotUseRandForGeneratingPseudorandomNumbers.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.donotuserandforgeneratingpseudorandomnumbers.DoNotUseRandForGeneratingPseudorandomNumbers
 
-class TestFileQuery extends DoNotUseRandForGeneratingPseudorandomNumbersSharedQuery, TestQuery {
-}
+class TestFileQuery extends DoNotUseRandForGeneratingPseudorandomNumbersSharedQuery, TestQuery { }
diff --git a/c/common/test/rules/donotuserelationaloperatorswithdifferingarrays/DoNotUseRelationalOperatorsWithDifferingArrays.ql b/c/common/test/rules/donotuserelationaloperatorswithdifferingarrays/DoNotUseRelationalOperatorsWithDifferingArrays.ql
index 647ee40426..bceb46bf63 100644
--- a/c/common/test/rules/donotuserelationaloperatorswithdifferingarrays/DoNotUseRelationalOperatorsWithDifferingArrays.ql
+++ b/c/common/test/rules/donotuserelationaloperatorswithdifferingarrays/DoNotUseRelationalOperatorsWithDifferingArrays.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.donotuserelationaloperatorswithdifferingarrays.DoNotUseRelationalOperatorsWithDifferingArrays
 
-class TestFileQuery extends DoNotUseRelationalOperatorsWithDifferingArraysSharedQuery, TestQuery {
-}
+class TestFileQuery extends DoNotUseRelationalOperatorsWithDifferingArraysSharedQuery, TestQuery { }
diff --git a/c/common/test/rules/freememorywhennolongerneededshared/FreeMemoryWhenNoLongerNeededShared.ql b/c/common/test/rules/freememorywhennolongerneededshared/FreeMemoryWhenNoLongerNeededShared.ql
index 8b89cb900c..27683eddfb 100644
--- a/c/common/test/rules/freememorywhennolongerneededshared/FreeMemoryWhenNoLongerNeededShared.ql
+++ b/c/common/test/rules/freememorywhennolongerneededshared/FreeMemoryWhenNoLongerNeededShared.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.freememorywhennolongerneededshared.FreeMemoryWhenNoLongerNeededShared
 
-class TestFileQuery extends FreeMemoryWhenNoLongerNeededSharedSharedQuery, TestQuery {
-}
+class TestFileQuery extends FreeMemoryWhenNoLongerNeededSharedSharedQuery, TestQuery { }
diff --git a/c/common/test/rules/gotostatementcondition/GotoStatementCondition.ql b/c/common/test/rules/gotostatementcondition/GotoStatementCondition.ql
index 2317d5c7db..89768a3022 100644
--- a/c/common/test/rules/gotostatementcondition/GotoStatementCondition.ql
+++ b/c/common/test/rules/gotostatementcondition/GotoStatementCondition.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.gotostatementcondition.GotoStatementCondition
 
-class TestFileQuery extends GotoStatementConditionSharedQuery, TestQuery {
-}
+class TestFileQuery extends GotoStatementConditionSharedQuery, TestQuery { }
diff --git a/c/common/test/rules/guardaccesstobitfields/GuardAccessToBitFields.ql b/c/common/test/rules/guardaccesstobitfields/GuardAccessToBitFields.ql
index 4f7709c7dd..a0d83a59a6 100644
--- a/c/common/test/rules/guardaccesstobitfields/GuardAccessToBitFields.ql
+++ b/c/common/test/rules/guardaccesstobitfields/GuardAccessToBitFields.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.guardaccesstobitfields.GuardAccessToBitFields
 
-class TestFileQuery extends GuardAccessToBitFieldsSharedQuery, TestQuery {
-}
+class TestFileQuery extends GuardAccessToBitFieldsSharedQuery, TestQuery { }
diff --git a/c/common/test/rules/hashoperatorsused/HashOperatorsUsed.ql b/c/common/test/rules/hashoperatorsused/HashOperatorsUsed.ql
index f9f34ef6d9..a61dc7860a 100644
--- a/c/common/test/rules/hashoperatorsused/HashOperatorsUsed.ql
+++ b/c/common/test/rules/hashoperatorsused/HashOperatorsUsed.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.hashoperatorsused.HashOperatorsUsed
 
-class TestFileQuery extends HashOperatorsUsedSharedQuery, TestQuery {
-}
+class TestFileQuery extends HashOperatorsUsedSharedQuery, TestQuery { }
diff --git a/c/common/test/rules/identifierhidden/IdentifierHidden.ql b/c/common/test/rules/identifierhidden/IdentifierHidden.ql
index 27a35f8376..ba13b28bd4 100644
--- a/c/common/test/rules/identifierhidden/IdentifierHidden.ql
+++ b/c/common/test/rules/identifierhidden/IdentifierHidden.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.identifierhidden.IdentifierHidden
 
-class TestFileQuery extends IdentifierHiddenSharedQuery, TestQuery {
-}
+class TestFileQuery extends IdentifierHiddenSharedQuery, TestQuery { }
diff --git a/c/common/test/rules/ifelseterminationconstruct/IfElseTerminationConstruct.ql b/c/common/test/rules/ifelseterminationconstruct/IfElseTerminationConstruct.ql
index d0a494f270..acdd497be7 100644
--- a/c/common/test/rules/ifelseterminationconstruct/IfElseTerminationConstruct.ql
+++ b/c/common/test/rules/ifelseterminationconstruct/IfElseTerminationConstruct.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.ifelseterminationconstruct.IfElseTerminationConstruct
 
-class TestFileQuery extends IfElseTerminationConstructSharedQuery, TestQuery {
-}
+class TestFileQuery extends IfElseTerminationConstructSharedQuery, TestQuery { }
diff --git a/c/common/test/rules/includeguardsnotused/IncludeGuardsNotUsed.ql b/c/common/test/rules/includeguardsnotused/IncludeGuardsNotUsed.ql
index 8bec76dc05..13b07b4e90 100644
--- a/c/common/test/rules/includeguardsnotused/IncludeGuardsNotUsed.ql
+++ b/c/common/test/rules/includeguardsnotused/IncludeGuardsNotUsed.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.includeguardsnotused.IncludeGuardsNotUsed
 
-class TestFileQuery extends IncludeGuardsNotUsedSharedQuery, TestQuery {
-}
+class TestFileQuery extends IncludeGuardsNotUsedSharedQuery, TestQuery { }
diff --git a/c/common/test/rules/informationleakageacrossboundaries/InformationLeakageAcrossBoundaries.ql b/c/common/test/rules/informationleakageacrossboundaries/InformationLeakageAcrossBoundaries.ql
index f51683773f..3393d015c3 100644
--- a/c/common/test/rules/informationleakageacrossboundaries/InformationLeakageAcrossBoundaries.ql
+++ b/c/common/test/rules/informationleakageacrossboundaries/InformationLeakageAcrossBoundaries.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.informationleakageacrossboundaries.InformationLeakageAcrossBoundaries
 
-class TestFileQuery extends InformationLeakageAcrossBoundariesSharedQuery, TestQuery {
-}
+class TestFileQuery extends InformationLeakageAcrossBoundariesSharedQuery, TestQuery { }
diff --git a/c/common/test/rules/invalidatedenvstringpointers/InvalidatedEnvStringPointers.ql b/c/common/test/rules/invalidatedenvstringpointers/InvalidatedEnvStringPointers.ql
index 777e498dc1..b82c43333a 100644
--- a/c/common/test/rules/invalidatedenvstringpointers/InvalidatedEnvStringPointers.ql
+++ b/c/common/test/rules/invalidatedenvstringpointers/InvalidatedEnvStringPointers.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.invalidatedenvstringpointers.InvalidatedEnvStringPointers
 
-class TestFileQuery extends InvalidatedEnvStringPointersSharedQuery, TestQuery {
-}
+class TestFileQuery extends InvalidatedEnvStringPointersSharedQuery, TestQuery { }
diff --git a/c/common/test/rules/invalidatedenvstringpointerswarn/InvalidatedEnvStringPointersWarn.ql b/c/common/test/rules/invalidatedenvstringpointerswarn/InvalidatedEnvStringPointersWarn.ql
index 9efdbbe048..7a56af210d 100644
--- a/c/common/test/rules/invalidatedenvstringpointerswarn/InvalidatedEnvStringPointersWarn.ql
+++ b/c/common/test/rules/invalidatedenvstringpointerswarn/InvalidatedEnvStringPointersWarn.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.invalidatedenvstringpointerswarn.InvalidatedEnvStringPointersWarn
 
-class TestFileQuery extends InvalidatedEnvStringPointersWarnSharedQuery, TestQuery {
-}
+class TestFileQuery extends InvalidatedEnvStringPointersWarnSharedQuery, TestQuery { }
diff --git a/c/common/test/rules/iofstreammissingpositioning/IOFstreamMissingPositioning.ql b/c/common/test/rules/iofstreammissingpositioning/IOFstreamMissingPositioning.ql
index ed1e85b531..c1f22c408a 100644
--- a/c/common/test/rules/iofstreammissingpositioning/IOFstreamMissingPositioning.ql
+++ b/c/common/test/rules/iofstreammissingpositioning/IOFstreamMissingPositioning.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.iofstreammissingpositioning.IOFstreamMissingPositioning
 
-class TestFileQuery extends IOFstreamMissingPositioningSharedQuery, TestQuery {
-}
+class TestFileQuery extends IOFstreamMissingPositioningSharedQuery, TestQuery { }
diff --git a/c/common/test/rules/macroparameternotenclosedinparentheses/MacroParameterNotEnclosedInParentheses.ql b/c/common/test/rules/macroparameternotenclosedinparentheses/MacroParameterNotEnclosedInParentheses.ql
index 8b3c25098c..2ff9477919 100644
--- a/c/common/test/rules/macroparameternotenclosedinparentheses/MacroParameterNotEnclosedInParentheses.ql
+++ b/c/common/test/rules/macroparameternotenclosedinparentheses/MacroParameterNotEnclosedInParentheses.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.macroparameternotenclosedinparentheses.MacroParameterNotEnclosedInParentheses
 
-class TestFileQuery extends MacroParameterNotEnclosedInParenthesesSharedQuery, TestQuery {
-}
+class TestFileQuery extends MacroParameterNotEnclosedInParenthesesSharedQuery, TestQuery { }
diff --git a/c/common/test/rules/memcmpusedtocomparepaddingdata/MemcmpUsedToComparePaddingData.ql b/c/common/test/rules/memcmpusedtocomparepaddingdata/MemcmpUsedToComparePaddingData.ql
index 108cf3b8a1..55290047a1 100644
--- a/c/common/test/rules/memcmpusedtocomparepaddingdata/MemcmpUsedToComparePaddingData.ql
+++ b/c/common/test/rules/memcmpusedtocomparepaddingdata/MemcmpUsedToComparePaddingData.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.memcmpusedtocomparepaddingdata.MemcmpUsedToComparePaddingData
 
-class TestFileQuery extends MemcmpUsedToComparePaddingDataSharedQuery, TestQuery {
-}
+class TestFileQuery extends MemcmpUsedToComparePaddingDataSharedQuery, TestQuery { }
diff --git a/c/common/test/rules/nestedlabelinswitch/NestedLabelInSwitch.ql b/c/common/test/rules/nestedlabelinswitch/NestedLabelInSwitch.ql
index d57bf78fad..3e0b1f7e8b 100644
--- a/c/common/test/rules/nestedlabelinswitch/NestedLabelInSwitch.ql
+++ b/c/common/test/rules/nestedlabelinswitch/NestedLabelInSwitch.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.nestedlabelinswitch.NestedLabelInSwitch
 
-class TestFileQuery extends NestedLabelInSwitchSharedQuery, TestQuery {
-}
+class TestFileQuery extends NestedLabelInSwitchSharedQuery, TestQuery { }
diff --git a/c/common/test/rules/nonconstantformat/NonConstantFormat.ql b/c/common/test/rules/nonconstantformat/NonConstantFormat.ql
index 71bff7e9c6..25750ae9e5 100644
--- a/c/common/test/rules/nonconstantformat/NonConstantFormat.ql
+++ b/c/common/test/rules/nonconstantformat/NonConstantFormat.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.nonconstantformat.NonConstantFormat
 
-class TestFileQuery extends NonConstantFormatSharedQuery, TestQuery {
-}
+class TestFileQuery extends NonConstantFormatSharedQuery, TestQuery { }
diff --git a/c/common/test/rules/nonvoidfunctiondoesnotreturn/NonVoidFunctionDoesNotReturn.ql b/c/common/test/rules/nonvoidfunctiondoesnotreturn/NonVoidFunctionDoesNotReturn.ql
index 775599e10e..bcf99b44e7 100644
--- a/c/common/test/rules/nonvoidfunctiondoesnotreturn/NonVoidFunctionDoesNotReturn.ql
+++ b/c/common/test/rules/nonvoidfunctiondoesnotreturn/NonVoidFunctionDoesNotReturn.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.nonvoidfunctiondoesnotreturn.NonVoidFunctionDoesNotReturn
 
-class TestFileQuery extends NonVoidFunctionDoesNotReturnSharedQuery, TestQuery {
-}
+class TestFileQuery extends NonVoidFunctionDoesNotReturnSharedQuery, TestQuery { }
diff --git a/c/common/test/rules/notdistinctidentifier/NotDistinctIdentifier.ql b/c/common/test/rules/notdistinctidentifier/NotDistinctIdentifier.ql
index ba74868838..3b7a8a5f9a 100644
--- a/c/common/test/rules/notdistinctidentifier/NotDistinctIdentifier.ql
+++ b/c/common/test/rules/notdistinctidentifier/NotDistinctIdentifier.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.notdistinctidentifier.NotDistinctIdentifier
 
-class TestFileQuery extends NotDistinctIdentifierSharedQuery, TestQuery {
-}
+class TestFileQuery extends NotDistinctIdentifierSharedQuery, TestQuery { }
diff --git a/c/common/test/rules/onlyfreememoryallocateddynamicallyshared/OnlyFreeMemoryAllocatedDynamicallyShared.ql b/c/common/test/rules/onlyfreememoryallocateddynamicallyshared/OnlyFreeMemoryAllocatedDynamicallyShared.ql
index f8c036c2d2..f7d315554e 100644
--- a/c/common/test/rules/onlyfreememoryallocateddynamicallyshared/OnlyFreeMemoryAllocatedDynamicallyShared.ql
+++ b/c/common/test/rules/onlyfreememoryallocateddynamicallyshared/OnlyFreeMemoryAllocatedDynamicallyShared.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.onlyfreememoryallocateddynamicallyshared.OnlyFreeMemoryAllocatedDynamicallyShared
 
-class TestFileQuery extends OnlyFreeMemoryAllocatedDynamicallySharedSharedQuery, TestQuery {
-}
+class TestFileQuery extends OnlyFreeMemoryAllocatedDynamicallySharedSharedQuery, TestQuery { }
diff --git a/c/common/test/rules/preprocessingdirectivewithinmacroargument/PreprocessingDirectiveWithinMacroArgument.ql b/c/common/test/rules/preprocessingdirectivewithinmacroargument/PreprocessingDirectiveWithinMacroArgument.ql
index 35bc1586b0..d66babdb6d 100644
--- a/c/common/test/rules/preprocessingdirectivewithinmacroargument/PreprocessingDirectiveWithinMacroArgument.ql
+++ b/c/common/test/rules/preprocessingdirectivewithinmacroargument/PreprocessingDirectiveWithinMacroArgument.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.preprocessingdirectivewithinmacroargument.PreprocessingDirectiveWithinMacroArgument
 
-class TestFileQuery extends PreprocessingDirectiveWithinMacroArgumentSharedQuery, TestQuery {
-}
+class TestFileQuery extends PreprocessingDirectiveWithinMacroArgumentSharedQuery, TestQuery { }
diff --git a/c/common/test/rules/preprocessorincludesforbiddenheadernames/PreprocessorIncludesForbiddenHeaderNames.ql b/c/common/test/rules/preprocessorincludesforbiddenheadernames/PreprocessorIncludesForbiddenHeaderNames.ql
index f12f9663b1..c7652ab4ae 100644
--- a/c/common/test/rules/preprocessorincludesforbiddenheadernames/PreprocessorIncludesForbiddenHeaderNames.ql
+++ b/c/common/test/rules/preprocessorincludesforbiddenheadernames/PreprocessorIncludesForbiddenHeaderNames.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.preprocessorincludesforbiddenheadernames.PreprocessorIncludesForbiddenHeaderNames
 
-class TestFileQuery extends PreprocessorIncludesForbiddenHeaderNamesSharedQuery, TestQuery {
-}
+class TestFileQuery extends PreprocessorIncludesForbiddenHeaderNamesSharedQuery, TestQuery { }
diff --git a/c/common/test/rules/preprocessorincludespreceded/PreprocessorIncludesPreceded.ql b/c/common/test/rules/preprocessorincludespreceded/PreprocessorIncludesPreceded.ql
index 44f700604a..43701dbbf9 100644
--- a/c/common/test/rules/preprocessorincludespreceded/PreprocessorIncludesPreceded.ql
+++ b/c/common/test/rules/preprocessorincludespreceded/PreprocessorIncludesPreceded.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.preprocessorincludespreceded.PreprocessorIncludesPreceded
 
-class TestFileQuery extends PreprocessorIncludesPrecededSharedQuery, TestQuery {
-}
+class TestFileQuery extends PreprocessorIncludesPrecededSharedQuery, TestQuery { }
diff --git a/c/common/test/rules/preservesafetywhenusingconditionvariables/PreserveSafetyWhenUsingConditionVariables.ql b/c/common/test/rules/preservesafetywhenusingconditionvariables/PreserveSafetyWhenUsingConditionVariables.ql
index 6fd33d601b..009c7f9e26 100644
--- a/c/common/test/rules/preservesafetywhenusingconditionvariables/PreserveSafetyWhenUsingConditionVariables.ql
+++ b/c/common/test/rules/preservesafetywhenusingconditionvariables/PreserveSafetyWhenUsingConditionVariables.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.preservesafetywhenusingconditionvariables.PreserveSafetyWhenUsingConditionVariables
 
-class TestFileQuery extends PreserveSafetyWhenUsingConditionVariablesSharedQuery, TestQuery {
-}
+class TestFileQuery extends PreserveSafetyWhenUsingConditionVariablesSharedQuery, TestQuery { }
diff --git a/c/common/test/rules/preventdeadlockbylockinginpredefinedorder/PreventDeadlockByLockingInPredefinedOrder.ql b/c/common/test/rules/preventdeadlockbylockinginpredefinedorder/PreventDeadlockByLockingInPredefinedOrder.ql
index 9968a80e75..4ca46f15ea 100644
--- a/c/common/test/rules/preventdeadlockbylockinginpredefinedorder/PreventDeadlockByLockingInPredefinedOrder.ql
+++ b/c/common/test/rules/preventdeadlockbylockinginpredefinedorder/PreventDeadlockByLockingInPredefinedOrder.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.preventdeadlockbylockinginpredefinedorder.PreventDeadlockByLockingInPredefinedOrder
 
-class TestFileQuery extends PreventDeadlockByLockingInPredefinedOrderSharedQuery, TestQuery {
-}
+class TestFileQuery extends PreventDeadlockByLockingInPredefinedOrderSharedQuery, TestQuery { }
diff --git a/c/common/test/rules/readofuninitializedmemory/ReadOfUninitializedMemory.ql b/c/common/test/rules/readofuninitializedmemory/ReadOfUninitializedMemory.ql
index cec14d6dac..9150d4459d 100644
--- a/c/common/test/rules/readofuninitializedmemory/ReadOfUninitializedMemory.ql
+++ b/c/common/test/rules/readofuninitializedmemory/ReadOfUninitializedMemory.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.readofuninitializedmemory.ReadOfUninitializedMemory
 
-class TestFileQuery extends ReadOfUninitializedMemorySharedQuery, TestQuery {
-}
+class TestFileQuery extends ReadOfUninitializedMemorySharedQuery, TestQuery { }
diff --git a/c/common/test/rules/sectionsofcodeshallnotbecommentedout/SectionsOfCodeShallNotBeCommentedOut.ql b/c/common/test/rules/sectionsofcodeshallnotbecommentedout/SectionsOfCodeShallNotBeCommentedOut.ql
index 00d24cc943..aacadf0253 100644
--- a/c/common/test/rules/sectionsofcodeshallnotbecommentedout/SectionsOfCodeShallNotBeCommentedOut.ql
+++ b/c/common/test/rules/sectionsofcodeshallnotbecommentedout/SectionsOfCodeShallNotBeCommentedOut.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.sectionsofcodeshallnotbecommentedout.SectionsOfCodeShallNotBeCommentedOut
 
-class TestFileQuery extends SectionsOfCodeShallNotBeCommentedOutSharedQuery, TestQuery {
-}
+class TestFileQuery extends SectionsOfCodeShallNotBeCommentedOutSharedQuery, TestQuery { }
diff --git a/c/common/test/rules/switchcasepositioncondition/SwitchCasePositionCondition.ql b/c/common/test/rules/switchcasepositioncondition/SwitchCasePositionCondition.ql
index de3d7c5c9c..1b323a652d 100644
--- a/c/common/test/rules/switchcasepositioncondition/SwitchCasePositionCondition.ql
+++ b/c/common/test/rules/switchcasepositioncondition/SwitchCasePositionCondition.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.switchcasepositioncondition.SwitchCasePositionCondition
 
-class TestFileQuery extends SwitchCasePositionConditionSharedQuery, TestQuery {
-}
+class TestFileQuery extends SwitchCasePositionConditionSharedQuery, TestQuery { }
diff --git a/c/common/test/rules/switchnotwellformed/SwitchNotWellFormed.ql b/c/common/test/rules/switchnotwellformed/SwitchNotWellFormed.ql
index 3669f8739e..75ce3cb1ec 100644
--- a/c/common/test/rules/switchnotwellformed/SwitchNotWellFormed.ql
+++ b/c/common/test/rules/switchnotwellformed/SwitchNotWellFormed.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.switchnotwellformed.SwitchNotWellFormed
 
-class TestFileQuery extends SwitchNotWellFormedSharedQuery, TestQuery {
-}
+class TestFileQuery extends SwitchNotWellFormedSharedQuery, TestQuery { }
diff --git a/c/common/test/rules/typeomitted/TypeOmitted.ql b/c/common/test/rules/typeomitted/TypeOmitted.ql
index eaade7faf6..a9cd81118c 100644
--- a/c/common/test/rules/typeomitted/TypeOmitted.ql
+++ b/c/common/test/rules/typeomitted/TypeOmitted.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.typeomitted.TypeOmitted
 
-class TestFileQuery extends TypeOmittedSharedQuery, TestQuery {
-}
+class TestFileQuery extends TypeOmittedSharedQuery, TestQuery { }
diff --git a/c/common/test/rules/uncheckedrangedomainpoleerrors/UncheckedRangeDomainPoleErrors.ql b/c/common/test/rules/uncheckedrangedomainpoleerrors/UncheckedRangeDomainPoleErrors.ql
index 6ae007bd39..11720fb8da 100644
--- a/c/common/test/rules/uncheckedrangedomainpoleerrors/UncheckedRangeDomainPoleErrors.ql
+++ b/c/common/test/rules/uncheckedrangedomainpoleerrors/UncheckedRangeDomainPoleErrors.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.uncheckedrangedomainpoleerrors.UncheckedRangeDomainPoleErrors
 
-class TestFileQuery extends UncheckedRangeDomainPoleErrorsSharedQuery, TestQuery {
-}
+class TestFileQuery extends UncheckedRangeDomainPoleErrorsSharedQuery, TestQuery { }
diff --git a/c/common/test/rules/undefinedmacroidentifiers/UndefinedMacroIdentifiers.ql b/c/common/test/rules/undefinedmacroidentifiers/UndefinedMacroIdentifiers.ql
index 168b3a0b2e..316565cab7 100644
--- a/c/common/test/rules/undefinedmacroidentifiers/UndefinedMacroIdentifiers.ql
+++ b/c/common/test/rules/undefinedmacroidentifiers/UndefinedMacroIdentifiers.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.undefinedmacroidentifiers.UndefinedMacroIdentifiers
 
-class TestFileQuery extends UndefinedMacroIdentifiersSharedQuery, TestQuery {
-}
+class TestFileQuery extends UndefinedMacroIdentifiersSharedQuery, TestQuery { }
diff --git a/c/common/test/rules/unnecessaryexposedidentifierdeclarationshared/UnnecessaryExposedIdentifierDeclarationShared.ql b/c/common/test/rules/unnecessaryexposedidentifierdeclarationshared/UnnecessaryExposedIdentifierDeclarationShared.ql
index 3b1e4b7c56..3baad901da 100644
--- a/c/common/test/rules/unnecessaryexposedidentifierdeclarationshared/UnnecessaryExposedIdentifierDeclarationShared.ql
+++ b/c/common/test/rules/unnecessaryexposedidentifierdeclarationshared/UnnecessaryExposedIdentifierDeclarationShared.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.unnecessaryexposedidentifierdeclarationshared.UnnecessaryExposedIdentifierDeclarationShared
 
-class TestFileQuery extends UnnecessaryExposedIdentifierDeclarationSharedSharedQuery, TestQuery {
-}
+class TestFileQuery extends UnnecessaryExposedIdentifierDeclarationSharedSharedQuery, TestQuery { }
diff --git a/c/common/test/rules/unreachablecode/UnreachableCode.ql b/c/common/test/rules/unreachablecode/UnreachableCode.ql
index 61554593fd..c394bfba3e 100644
--- a/c/common/test/rules/unreachablecode/UnreachableCode.ql
+++ b/c/common/test/rules/unreachablecode/UnreachableCode.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.unreachablecode.UnreachableCode
 
-class TestFileQuery extends UnreachableCodeSharedQuery, TestQuery {
-}
+class TestFileQuery extends UnreachableCodeSharedQuery, TestQuery { }
diff --git a/c/common/test/rules/unusedparameter/UnusedParameter.ql b/c/common/test/rules/unusedparameter/UnusedParameter.ql
index 4dc2000dbb..e990a7dcf3 100644
--- a/c/common/test/rules/unusedparameter/UnusedParameter.ql
+++ b/c/common/test/rules/unusedparameter/UnusedParameter.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.unusedparameter.UnusedParameter
 
-class TestFileQuery extends UnusedParameterSharedQuery, TestQuery {
-}
+class TestFileQuery extends UnusedParameterSharedQuery, TestQuery { }
diff --git a/c/common/test/rules/unusedtypedeclarations/UnusedTypeDeclarations.ql b/c/common/test/rules/unusedtypedeclarations/UnusedTypeDeclarations.ql
index 76ccfec0f2..f1c09524d5 100644
--- a/c/common/test/rules/unusedtypedeclarations/UnusedTypeDeclarations.ql
+++ b/c/common/test/rules/unusedtypedeclarations/UnusedTypeDeclarations.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.unusedtypedeclarations.UnusedTypeDeclarations
 
-class TestFileQuery extends UnusedTypeDeclarationsSharedQuery, TestQuery {
-}
+class TestFileQuery extends UnusedTypeDeclarationsSharedQuery, TestQuery { }
diff --git a/c/common/test/rules/usageofassemblernotdocumented/UsageOfAssemblerNotDocumented.ql b/c/common/test/rules/usageofassemblernotdocumented/UsageOfAssemblerNotDocumented.ql
index c8b9f229f4..f9997627b4 100644
--- a/c/common/test/rules/usageofassemblernotdocumented/UsageOfAssemblerNotDocumented.ql
+++ b/c/common/test/rules/usageofassemblernotdocumented/UsageOfAssemblerNotDocumented.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.usageofassemblernotdocumented.UsageOfAssemblerNotDocumented
 
-class TestFileQuery extends UsageOfAssemblerNotDocumentedSharedQuery, TestQuery {
-}
+class TestFileQuery extends UsageOfAssemblerNotDocumentedSharedQuery, TestQuery { }
diff --git a/c/common/test/rules/useonlyarrayindexingforpointerarithmetic/UseOnlyArrayIndexingForPointerArithmetic.ql b/c/common/test/rules/useonlyarrayindexingforpointerarithmetic/UseOnlyArrayIndexingForPointerArithmetic.ql
index 7edd86ecab..55554bee07 100644
--- a/c/common/test/rules/useonlyarrayindexingforpointerarithmetic/UseOnlyArrayIndexingForPointerArithmetic.ql
+++ b/c/common/test/rules/useonlyarrayindexingforpointerarithmetic/UseOnlyArrayIndexingForPointerArithmetic.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.useonlyarrayindexingforpointerarithmetic.UseOnlyArrayIndexingForPointerArithmetic
 
-class TestFileQuery extends UseOnlyArrayIndexingForPointerArithmeticSharedQuery, TestQuery {
-}
+class TestFileQuery extends UseOnlyArrayIndexingForPointerArithmeticSharedQuery, TestQuery { }
diff --git a/c/common/test/rules/wrapspuriousfunctioninloop/WrapSpuriousFunctionInLoop.ql b/c/common/test/rules/wrapspuriousfunctioninloop/WrapSpuriousFunctionInLoop.ql
index af84dd07c1..44947bf85a 100644
--- a/c/common/test/rules/wrapspuriousfunctioninloop/WrapSpuriousFunctionInLoop.ql
+++ b/c/common/test/rules/wrapspuriousfunctioninloop/WrapSpuriousFunctionInLoop.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.wrapspuriousfunctioninloop.WrapSpuriousFunctionInLoop
 
-class TestFileQuery extends WrapSpuriousFunctionInLoopSharedQuery, TestQuery {
-}
+class TestFileQuery extends WrapSpuriousFunctionInLoopSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/accessofundefinedmemberthroughnullpointer/AccessOfUndefinedMemberThroughNullPointer.ql b/cpp/common/test/rules/accessofundefinedmemberthroughnullpointer/AccessOfUndefinedMemberThroughNullPointer.ql
index 4607c4f48c..a94e11dbf6 100644
--- a/cpp/common/test/rules/accessofundefinedmemberthroughnullpointer/AccessOfUndefinedMemberThroughNullPointer.ql
+++ b/cpp/common/test/rules/accessofundefinedmemberthroughnullpointer/AccessOfUndefinedMemberThroughNullPointer.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.accessofundefinedmemberthroughnullpointer.AccessOfUndefinedMemberThroughNullPointer
 
-class TestFileQuery extends AccessOfUndefinedMemberThroughNullPointerSharedQuery, TestQuery {
-}
+class TestFileQuery extends AccessOfUndefinedMemberThroughNullPointerSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/accessofundefinedmemberthroughuninitializedstaticpointer/AccessOfUndefinedMemberThroughUninitializedStaticPointer.ql b/cpp/common/test/rules/accessofundefinedmemberthroughuninitializedstaticpointer/AccessOfUndefinedMemberThroughUninitializedStaticPointer.ql
index 489c4a23f4..90d192e3d8 100644
--- a/cpp/common/test/rules/accessofundefinedmemberthroughuninitializedstaticpointer/AccessOfUndefinedMemberThroughUninitializedStaticPointer.ql
+++ b/cpp/common/test/rules/accessofundefinedmemberthroughuninitializedstaticpointer/AccessOfUndefinedMemberThroughUninitializedStaticPointer.ql
@@ -1,5 +1,6 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.accessofundefinedmemberthroughuninitializedstaticpointer.AccessOfUndefinedMemberThroughUninitializedStaticPointer
 
-class TestFileQuery extends AccessOfUndefinedMemberThroughUninitializedStaticPointerSharedQuery, TestQuery {
-}
+class TestFileQuery extends AccessOfUndefinedMemberThroughUninitializedStaticPointerSharedQuery,
+  TestQuery
+{ }
diff --git a/cpp/common/test/rules/basicstringmaynotbenullterminated/BasicStringMayNotBeNullTerminated.ql b/cpp/common/test/rules/basicstringmaynotbenullterminated/BasicStringMayNotBeNullTerminated.ql
index 21f00547fc..c2c4fe7906 100644
--- a/cpp/common/test/rules/basicstringmaynotbenullterminated/BasicStringMayNotBeNullTerminated.ql
+++ b/cpp/common/test/rules/basicstringmaynotbenullterminated/BasicStringMayNotBeNullTerminated.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.basicstringmaynotbenullterminated.BasicStringMayNotBeNullTerminated
 
-class TestFileQuery extends BasicStringMayNotBeNullTerminatedSharedQuery, TestQuery {
-}
+class TestFileQuery extends BasicStringMayNotBeNullTerminatedSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/catchblockshadowing/CatchBlockShadowing.ql b/cpp/common/test/rules/catchblockshadowing/CatchBlockShadowing.ql
index 81b37d3aa5..76b7123d99 100644
--- a/cpp/common/test/rules/catchblockshadowing/CatchBlockShadowing.ql
+++ b/cpp/common/test/rules/catchblockshadowing/CatchBlockShadowing.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.catchblockshadowing.CatchBlockShadowing
 
-class TestFileQuery extends CatchBlockShadowingSharedQuery, TestQuery {
-}
+class TestFileQuery extends CatchBlockShadowingSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/catchexceptionsbylvaluereference/CatchExceptionsByLvalueReference.ql b/cpp/common/test/rules/catchexceptionsbylvaluereference/CatchExceptionsByLvalueReference.ql
index 0931cc9ca8..30d6d30c47 100644
--- a/cpp/common/test/rules/catchexceptionsbylvaluereference/CatchExceptionsByLvalueReference.ql
+++ b/cpp/common/test/rules/catchexceptionsbylvaluereference/CatchExceptionsByLvalueReference.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.catchexceptionsbylvaluereference.CatchExceptionsByLvalueReference
 
-class TestFileQuery extends CatchExceptionsByLvalueReferenceSharedQuery, TestQuery {
-}
+class TestFileQuery extends CatchExceptionsByLvalueReferenceSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/commaoperatorused/CommaOperatorUsed.ql b/cpp/common/test/rules/commaoperatorused/CommaOperatorUsed.ql
index b6c91e6eb2..2fe294762e 100644
--- a/cpp/common/test/rules/commaoperatorused/CommaOperatorUsed.ql
+++ b/cpp/common/test/rules/commaoperatorused/CommaOperatorUsed.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.commaoperatorused.CommaOperatorUsed
 
-class TestFileQuery extends CommaOperatorUsedSharedQuery, TestQuery {
-}
+class TestFileQuery extends CommaOperatorUsedSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/conditionvariablepostconditionfailed/ConditionVariablePostConditionFailed.ql b/cpp/common/test/rules/conditionvariablepostconditionfailed/ConditionVariablePostConditionFailed.ql
index 9192ea6c24..e990e23e2e 100644
--- a/cpp/common/test/rules/conditionvariablepostconditionfailed/ConditionVariablePostConditionFailed.ql
+++ b/cpp/common/test/rules/conditionvariablepostconditionfailed/ConditionVariablePostConditionFailed.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.conditionvariablepostconditionfailed.ConditionVariablePostConditionFailed
 
-class TestFileQuery extends ConditionVariablePostConditionFailedSharedQuery, TestQuery {
-}
+class TestFileQuery extends ConditionVariablePostConditionFailedSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/constantunsignedintegerexpressionswraparound/ConstantUnsignedIntegerExpressionsWrapAround.ql b/cpp/common/test/rules/constantunsignedintegerexpressionswraparound/ConstantUnsignedIntegerExpressionsWrapAround.ql
index b12383aabb..c77ee1c66a 100644
--- a/cpp/common/test/rules/constantunsignedintegerexpressionswraparound/ConstantUnsignedIntegerExpressionsWrapAround.ql
+++ b/cpp/common/test/rules/constantunsignedintegerexpressionswraparound/ConstantUnsignedIntegerExpressionsWrapAround.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.constantunsignedintegerexpressionswraparound.ConstantUnsignedIntegerExpressionsWrapAround
 
-class TestFileQuery extends ConstantUnsignedIntegerExpressionsWrapAroundSharedQuery, TestQuery {
-}
+class TestFileQuery extends ConstantUnsignedIntegerExpressionsWrapAroundSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/containeraccesswithoutrangecheck/ContainerAccessWithoutRangeCheck.ql b/cpp/common/test/rules/containeraccesswithoutrangecheck/ContainerAccessWithoutRangeCheck.ql
index 90f2624e6b..be54f5a31c 100644
--- a/cpp/common/test/rules/containeraccesswithoutrangecheck/ContainerAccessWithoutRangeCheck.ql
+++ b/cpp/common/test/rules/containeraccesswithoutrangecheck/ContainerAccessWithoutRangeCheck.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.containeraccesswithoutrangecheck.ContainerAccessWithoutRangeCheck
 
-class TestFileQuery extends ContainerAccessWithoutRangeCheckSharedQuery, TestQuery {
-}
+class TestFileQuery extends ContainerAccessWithoutRangeCheckSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/danglingcapturewhenmovinglambdaobject/DanglingCaptureWhenMovingLambdaObject.ql b/cpp/common/test/rules/danglingcapturewhenmovinglambdaobject/DanglingCaptureWhenMovingLambdaObject.ql
index 3e1929e5c3..ba1f1efc2f 100644
--- a/cpp/common/test/rules/danglingcapturewhenmovinglambdaobject/DanglingCaptureWhenMovingLambdaObject.ql
+++ b/cpp/common/test/rules/danglingcapturewhenmovinglambdaobject/DanglingCaptureWhenMovingLambdaObject.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.danglingcapturewhenmovinglambdaobject.DanglingCaptureWhenMovingLambdaObject
 
-class TestFileQuery extends DanglingCaptureWhenMovingLambdaObjectSharedQuery, TestQuery {
-}
+class TestFileQuery extends DanglingCaptureWhenMovingLambdaObjectSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/danglingcapturewhenreturninglambdaobject/DanglingCaptureWhenReturningLambdaObject.ql b/cpp/common/test/rules/danglingcapturewhenreturninglambdaobject/DanglingCaptureWhenReturningLambdaObject.ql
index 6880b797fc..d95ba912fd 100644
--- a/cpp/common/test/rules/danglingcapturewhenreturninglambdaobject/DanglingCaptureWhenReturningLambdaObject.ql
+++ b/cpp/common/test/rules/danglingcapturewhenreturninglambdaobject/DanglingCaptureWhenReturningLambdaObject.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.danglingcapturewhenreturninglambdaobject.DanglingCaptureWhenReturningLambdaObject
 
-class TestFileQuery extends DanglingCaptureWhenReturningLambdaObjectSharedQuery, TestQuery {
-}
+class TestFileQuery extends DanglingCaptureWhenReturningLambdaObjectSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/deadcode/DeadCode.ql b/cpp/common/test/rules/deadcode/DeadCode.ql
index b38dba26d7..dcd7fce840 100644
--- a/cpp/common/test/rules/deadcode/DeadCode.ql
+++ b/cpp/common/test/rules/deadcode/DeadCode.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.deadcode.DeadCode
 
-class TestFileQuery extends DeadCodeSharedQuery, TestQuery {
-}
+class TestFileQuery extends DeadCodeSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/deleteofpointertoincompleteclass/DeleteOfPointerToIncompleteClass.ql b/cpp/common/test/rules/deleteofpointertoincompleteclass/DeleteOfPointerToIncompleteClass.ql
index 54ae2a773b..a589ae988e 100644
--- a/cpp/common/test/rules/deleteofpointertoincompleteclass/DeleteOfPointerToIncompleteClass.ql
+++ b/cpp/common/test/rules/deleteofpointertoincompleteclass/DeleteOfPointerToIncompleteClass.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.deleteofpointertoincompleteclass.DeleteOfPointerToIncompleteClass
 
-class TestFileQuery extends DeleteOfPointerToIncompleteClassSharedQuery, TestQuery {
-}
+class TestFileQuery extends DeleteOfPointerToIncompleteClassSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/dereferenceofnullpointer/DereferenceOfNullPointer.ql b/cpp/common/test/rules/dereferenceofnullpointer/DereferenceOfNullPointer.ql
index cf9fdf6071..c8dc62e67c 100644
--- a/cpp/common/test/rules/dereferenceofnullpointer/DereferenceOfNullPointer.ql
+++ b/cpp/common/test/rules/dereferenceofnullpointer/DereferenceOfNullPointer.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.dereferenceofnullpointer.DereferenceOfNullPointer
 
-class TestFileQuery extends DereferenceOfNullPointerSharedQuery, TestQuery {
-}
+class TestFileQuery extends DereferenceOfNullPointerSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/destroyedvaluereferencedindestructorcatchblock/DestroyedValueReferencedInDestructorCatchBlock.ql b/cpp/common/test/rules/destroyedvaluereferencedindestructorcatchblock/DestroyedValueReferencedInDestructorCatchBlock.ql
index a2418fe0e6..90c4ed602a 100644
--- a/cpp/common/test/rules/destroyedvaluereferencedindestructorcatchblock/DestroyedValueReferencedInDestructorCatchBlock.ql
+++ b/cpp/common/test/rules/destroyedvaluereferencedindestructorcatchblock/DestroyedValueReferencedInDestructorCatchBlock.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.destroyedvaluereferencedindestructorcatchblock.DestroyedValueReferencedInDestructorCatchBlock
 
-class TestFileQuery extends DestroyedValueReferencedInDestructorCatchBlockSharedQuery, TestQuery {
-}
+class TestFileQuery extends DestroyedValueReferencedInDestructorCatchBlockSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/donotallowamutextogooutofscopewhilelocked/DoNotAllowAMutexToGoOutOfScopeWhileLocked.ql b/cpp/common/test/rules/donotallowamutextogooutofscopewhilelocked/DoNotAllowAMutexToGoOutOfScopeWhileLocked.ql
index 9aac0f1c09..ceae7e6a9e 100644
--- a/cpp/common/test/rules/donotallowamutextogooutofscopewhilelocked/DoNotAllowAMutexToGoOutOfScopeWhileLocked.ql
+++ b/cpp/common/test/rules/donotallowamutextogooutofscopewhilelocked/DoNotAllowAMutexToGoOutOfScopeWhileLocked.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.donotallowamutextogooutofscopewhilelocked.DoNotAllowAMutexToGoOutOfScopeWhileLocked
 
-class TestFileQuery extends DoNotAllowAMutexToGoOutOfScopeWhileLockedSharedQuery, TestQuery {
-}
+class TestFileQuery extends DoNotAllowAMutexToGoOutOfScopeWhileLockedSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/donotdestroyamutexwhileitislocked/DoNotDestroyAMutexWhileItIsLocked.ql b/cpp/common/test/rules/donotdestroyamutexwhileitislocked/DoNotDestroyAMutexWhileItIsLocked.ql
index b2fdab8eea..96ea58009e 100644
--- a/cpp/common/test/rules/donotdestroyamutexwhileitislocked/DoNotDestroyAMutexWhileItIsLocked.ql
+++ b/cpp/common/test/rules/donotdestroyamutexwhileitislocked/DoNotDestroyAMutexWhileItIsLocked.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.donotdestroyamutexwhileitislocked.DoNotDestroyAMutexWhileItIsLocked
 
-class TestFileQuery extends DoNotDestroyAMutexWhileItIsLockedSharedQuery, TestQuery {
-}
+class TestFileQuery extends DoNotDestroyAMutexWhileItIsLockedSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/donotsubtractpointersaddressingdifferentarrays/DoNotSubtractPointersAddressingDifferentArrays.ql b/cpp/common/test/rules/donotsubtractpointersaddressingdifferentarrays/DoNotSubtractPointersAddressingDifferentArrays.ql
index cc9cb834e0..374a6fc52b 100644
--- a/cpp/common/test/rules/donotsubtractpointersaddressingdifferentarrays/DoNotSubtractPointersAddressingDifferentArrays.ql
+++ b/cpp/common/test/rules/donotsubtractpointersaddressingdifferentarrays/DoNotSubtractPointersAddressingDifferentArrays.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.donotsubtractpointersaddressingdifferentarrays.DoNotSubtractPointersAddressingDifferentArrays
 
-class TestFileQuery extends DoNotSubtractPointersAddressingDifferentArraysSharedQuery, TestQuery {
-}
+class TestFileQuery extends DoNotSubtractPointersAddressingDifferentArraysSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/donotusemorethantwolevelsofpointerindirection/DoNotUseMoreThanTwoLevelsOfPointerIndirection.ql b/cpp/common/test/rules/donotusemorethantwolevelsofpointerindirection/DoNotUseMoreThanTwoLevelsOfPointerIndirection.ql
index ddaa0399b2..edef2c1127 100644
--- a/cpp/common/test/rules/donotusemorethantwolevelsofpointerindirection/DoNotUseMoreThanTwoLevelsOfPointerIndirection.ql
+++ b/cpp/common/test/rules/donotusemorethantwolevelsofpointerindirection/DoNotUseMoreThanTwoLevelsOfPointerIndirection.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.donotusemorethantwolevelsofpointerindirection.DoNotUseMoreThanTwoLevelsOfPointerIndirection
 
-class TestFileQuery extends DoNotUseMoreThanTwoLevelsOfPointerIndirectionSharedQuery, TestQuery {
-}
+class TestFileQuery extends DoNotUseMoreThanTwoLevelsOfPointerIndirectionSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/donotuserandforgeneratingpseudorandomnumbers/DoNotUseRandForGeneratingPseudorandomNumbers.ql b/cpp/common/test/rules/donotuserandforgeneratingpseudorandomnumbers/DoNotUseRandForGeneratingPseudorandomNumbers.ql
index c6e0f0e58a..3ad5626256 100644
--- a/cpp/common/test/rules/donotuserandforgeneratingpseudorandomnumbers/DoNotUseRandForGeneratingPseudorandomNumbers.ql
+++ b/cpp/common/test/rules/donotuserandforgeneratingpseudorandomnumbers/DoNotUseRandForGeneratingPseudorandomNumbers.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.donotuserandforgeneratingpseudorandomnumbers.DoNotUseRandForGeneratingPseudorandomNumbers
 
-class TestFileQuery extends DoNotUseRandForGeneratingPseudorandomNumbersSharedQuery, TestQuery {
-}
+class TestFileQuery extends DoNotUseRandForGeneratingPseudorandomNumbersSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/donotuserelationaloperatorswithdifferingarrays/DoNotUseRelationalOperatorsWithDifferingArrays.ql b/cpp/common/test/rules/donotuserelationaloperatorswithdifferingarrays/DoNotUseRelationalOperatorsWithDifferingArrays.ql
index 647ee40426..bceb46bf63 100644
--- a/cpp/common/test/rules/donotuserelationaloperatorswithdifferingarrays/DoNotUseRelationalOperatorsWithDifferingArrays.ql
+++ b/cpp/common/test/rules/donotuserelationaloperatorswithdifferingarrays/DoNotUseRelationalOperatorsWithDifferingArrays.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.donotuserelationaloperatorswithdifferingarrays.DoNotUseRelationalOperatorsWithDifferingArrays
 
-class TestFileQuery extends DoNotUseRelationalOperatorsWithDifferingArraysSharedQuery, TestQuery {
-}
+class TestFileQuery extends DoNotUseRelationalOperatorsWithDifferingArraysSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/donotusesetjmporlongjmpshared/DoNotUseSetjmpOrLongjmpShared.ql b/cpp/common/test/rules/donotusesetjmporlongjmpshared/DoNotUseSetjmpOrLongjmpShared.ql
index bb9245942d..e0026467ff 100644
--- a/cpp/common/test/rules/donotusesetjmporlongjmpshared/DoNotUseSetjmpOrLongjmpShared.ql
+++ b/cpp/common/test/rules/donotusesetjmporlongjmpshared/DoNotUseSetjmpOrLongjmpShared.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.donotusesetjmporlongjmpshared.DoNotUseSetjmpOrLongjmpShared
 
-class TestFileQuery extends DoNotUseSetjmpOrLongjmpSharedSharedQuery, TestQuery {
-}
+class TestFileQuery extends DoNotUseSetjmpOrLongjmpSharedSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/exceptionsafetyguarantees/ExceptionSafetyGuarantees.ql b/cpp/common/test/rules/exceptionsafetyguarantees/ExceptionSafetyGuarantees.ql
index 2d09d10250..bfa4a88318 100644
--- a/cpp/common/test/rules/exceptionsafetyguarantees/ExceptionSafetyGuarantees.ql
+++ b/cpp/common/test/rules/exceptionsafetyguarantees/ExceptionSafetyGuarantees.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.exceptionsafetyguarantees.ExceptionSafetyGuarantees
 
-class TestFileQuery extends ExceptionSafetyGuaranteesSharedQuery, TestQuery {
-}
+class TestFileQuery extends ExceptionSafetyGuaranteesSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/exceptionsafetyvalidstate/ExceptionSafetyValidState.ql b/cpp/common/test/rules/exceptionsafetyvalidstate/ExceptionSafetyValidState.ql
index e2d2107580..aa18543c36 100644
--- a/cpp/common/test/rules/exceptionsafetyvalidstate/ExceptionSafetyValidState.ql
+++ b/cpp/common/test/rules/exceptionsafetyvalidstate/ExceptionSafetyValidState.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.exceptionsafetyvalidstate.ExceptionSafetyValidState
 
-class TestFileQuery extends ExceptionSafetyValidStateSharedQuery, TestQuery {
-}
+class TestFileQuery extends ExceptionSafetyValidStateSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/exithandlerthrowsexception/ExitHandlerThrowsException.ql b/cpp/common/test/rules/exithandlerthrowsexception/ExitHandlerThrowsException.ql
index 4552e1d6e5..c61992b8b0 100644
--- a/cpp/common/test/rules/exithandlerthrowsexception/ExitHandlerThrowsException.ql
+++ b/cpp/common/test/rules/exithandlerthrowsexception/ExitHandlerThrowsException.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.exithandlerthrowsexception.ExitHandlerThrowsException
 
-class TestFileQuery extends ExitHandlerThrowsExceptionSharedQuery, TestQuery {
-}
+class TestFileQuery extends ExitHandlerThrowsExceptionSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/explicitabrupttermination/ExplicitAbruptTermination.ql b/cpp/common/test/rules/explicitabrupttermination/ExplicitAbruptTermination.ql
index cd11b45494..d7df643551 100644
--- a/cpp/common/test/rules/explicitabrupttermination/ExplicitAbruptTermination.ql
+++ b/cpp/common/test/rules/explicitabrupttermination/ExplicitAbruptTermination.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.explicitabrupttermination.ExplicitAbruptTermination
 
-class TestFileQuery extends ExplicitAbruptTerminationSharedQuery, TestQuery {
-}
+class TestFileQuery extends ExplicitAbruptTerminationSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/functionnoreturnattributecondition/FunctionNoReturnAttributeCondition.ql b/cpp/common/test/rules/functionnoreturnattributecondition/FunctionNoReturnAttributeCondition.ql
index 6526233b4c..4af4aeceaf 100644
--- a/cpp/common/test/rules/functionnoreturnattributecondition/FunctionNoReturnAttributeCondition.ql
+++ b/cpp/common/test/rules/functionnoreturnattributecondition/FunctionNoReturnAttributeCondition.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.functionnoreturnattributecondition.FunctionNoReturnAttributeCondition
 
-class TestFileQuery extends FunctionNoReturnAttributeConditionSharedQuery, TestQuery {
-}
+class TestFileQuery extends FunctionNoReturnAttributeConditionSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/gotostatementcondition/GotoStatementCondition.ql b/cpp/common/test/rules/gotostatementcondition/GotoStatementCondition.ql
index 2317d5c7db..89768a3022 100644
--- a/cpp/common/test/rules/gotostatementcondition/GotoStatementCondition.ql
+++ b/cpp/common/test/rules/gotostatementcondition/GotoStatementCondition.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.gotostatementcondition.GotoStatementCondition
 
-class TestFileQuery extends GotoStatementConditionSharedQuery, TestQuery {
-}
+class TestFileQuery extends GotoStatementConditionSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/guardaccesstobitfields/GuardAccessToBitFields.ql b/cpp/common/test/rules/guardaccesstobitfields/GuardAccessToBitFields.ql
index 4f7709c7dd..a0d83a59a6 100644
--- a/cpp/common/test/rules/guardaccesstobitfields/GuardAccessToBitFields.ql
+++ b/cpp/common/test/rules/guardaccesstobitfields/GuardAccessToBitFields.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.guardaccesstobitfields.GuardAccessToBitFields
 
-class TestFileQuery extends GuardAccessToBitFieldsSharedQuery, TestQuery {
-}
+class TestFileQuery extends GuardAccessToBitFieldsSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/handleallexceptionsduringstartup/HandleAllExceptionsDuringStartup.ql b/cpp/common/test/rules/handleallexceptionsduringstartup/HandleAllExceptionsDuringStartup.ql
index 4a4ae60b84..d366b0eb79 100644
--- a/cpp/common/test/rules/handleallexceptionsduringstartup/HandleAllExceptionsDuringStartup.ql
+++ b/cpp/common/test/rules/handleallexceptionsduringstartup/HandleAllExceptionsDuringStartup.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.handleallexceptionsduringstartup.HandleAllExceptionsDuringStartup
 
-class TestFileQuery extends HandleAllExceptionsDuringStartupSharedQuery, TestQuery {
-}
+class TestFileQuery extends HandleAllExceptionsDuringStartupSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/hashoperatorsused/HashOperatorsUsed.ql b/cpp/common/test/rules/hashoperatorsused/HashOperatorsUsed.ql
index f9f34ef6d9..a61dc7860a 100644
--- a/cpp/common/test/rules/hashoperatorsused/HashOperatorsUsed.ql
+++ b/cpp/common/test/rules/hashoperatorsused/HashOperatorsUsed.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.hashoperatorsused.HashOperatorsUsed
 
-class TestFileQuery extends HashOperatorsUsedSharedQuery, TestQuery {
-}
+class TestFileQuery extends HashOperatorsUsedSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/identifierhidden/IdentifierHidden.ql b/cpp/common/test/rules/identifierhidden/IdentifierHidden.ql
index 27a35f8376..ba13b28bd4 100644
--- a/cpp/common/test/rules/identifierhidden/IdentifierHidden.ql
+++ b/cpp/common/test/rules/identifierhidden/IdentifierHidden.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.identifierhidden.IdentifierHidden
 
-class TestFileQuery extends IdentifierHiddenSharedQuery, TestQuery {
-}
+class TestFileQuery extends IdentifierHiddenSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/ifelseterminationconstruct/IfElseTerminationConstruct.ql b/cpp/common/test/rules/ifelseterminationconstruct/IfElseTerminationConstruct.ql
index d0a494f270..acdd497be7 100644
--- a/cpp/common/test/rules/ifelseterminationconstruct/IfElseTerminationConstruct.ql
+++ b/cpp/common/test/rules/ifelseterminationconstruct/IfElseTerminationConstruct.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.ifelseterminationconstruct.IfElseTerminationConstruct
 
-class TestFileQuery extends IfElseTerminationConstructSharedQuery, TestQuery {
-}
+class TestFileQuery extends IfElseTerminationConstructSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/includeguardsnotused/IncludeGuardsNotUsed.ql b/cpp/common/test/rules/includeguardsnotused/IncludeGuardsNotUsed.ql
index 8bec76dc05..13b07b4e90 100644
--- a/cpp/common/test/rules/includeguardsnotused/IncludeGuardsNotUsed.ql
+++ b/cpp/common/test/rules/includeguardsnotused/IncludeGuardsNotUsed.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.includeguardsnotused.IncludeGuardsNotUsed
 
-class TestFileQuery extends IncludeGuardsNotUsedSharedQuery, TestQuery {
-}
+class TestFileQuery extends IncludeGuardsNotUsedSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/informationleakageacrossboundaries/InformationLeakageAcrossBoundaries.ql b/cpp/common/test/rules/informationleakageacrossboundaries/InformationLeakageAcrossBoundaries.ql
index f51683773f..3393d015c3 100644
--- a/cpp/common/test/rules/informationleakageacrossboundaries/InformationLeakageAcrossBoundaries.ql
+++ b/cpp/common/test/rules/informationleakageacrossboundaries/InformationLeakageAcrossBoundaries.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.informationleakageacrossboundaries.InformationLeakageAcrossBoundaries
 
-class TestFileQuery extends InformationLeakageAcrossBoundariesSharedQuery, TestQuery {
-}
+class TestFileQuery extends InformationLeakageAcrossBoundariesSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/iofstreammissingpositioning/IOFstreamMissingPositioning.ql b/cpp/common/test/rules/iofstreammissingpositioning/IOFstreamMissingPositioning.ql
index ed1e85b531..c1f22c408a 100644
--- a/cpp/common/test/rules/iofstreammissingpositioning/IOFstreamMissingPositioning.ql
+++ b/cpp/common/test/rules/iofstreammissingpositioning/IOFstreamMissingPositioning.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.iofstreammissingpositioning.IOFstreamMissingPositioning
 
-class TestFileQuery extends IOFstreamMissingPositioningSharedQuery, TestQuery {
-}
+class TestFileQuery extends IOFstreamMissingPositioningSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/joinablethreadcopiedordestroyed/JoinableThreadCopiedOrDestroyed.ql b/cpp/common/test/rules/joinablethreadcopiedordestroyed/JoinableThreadCopiedOrDestroyed.ql
index 394425a83b..affaeef13d 100644
--- a/cpp/common/test/rules/joinablethreadcopiedordestroyed/JoinableThreadCopiedOrDestroyed.ql
+++ b/cpp/common/test/rules/joinablethreadcopiedordestroyed/JoinableThreadCopiedOrDestroyed.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.joinablethreadcopiedordestroyed.JoinableThreadCopiedOrDestroyed
 
-class TestFileQuery extends JoinableThreadCopiedOrDestroyedSharedQuery, TestQuery {
-}
+class TestFileQuery extends JoinableThreadCopiedOrDestroyedSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/macroparameternotenclosedinparentheses/MacroParameterNotEnclosedInParentheses.ql b/cpp/common/test/rules/macroparameternotenclosedinparentheses/MacroParameterNotEnclosedInParentheses.ql
index 8b3c25098c..2ff9477919 100644
--- a/cpp/common/test/rules/macroparameternotenclosedinparentheses/MacroParameterNotEnclosedInParentheses.ql
+++ b/cpp/common/test/rules/macroparameternotenclosedinparentheses/MacroParameterNotEnclosedInParentheses.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.macroparameternotenclosedinparentheses.MacroParameterNotEnclosedInParentheses
 
-class TestFileQuery extends MacroParameterNotEnclosedInParenthesesSharedQuery, TestQuery {
-}
+class TestFileQuery extends MacroParameterNotEnclosedInParenthesesSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/memcmpusedtocomparepaddingdata/MemcmpUsedToComparePaddingData.ql b/cpp/common/test/rules/memcmpusedtocomparepaddingdata/MemcmpUsedToComparePaddingData.ql
index 108cf3b8a1..55290047a1 100644
--- a/cpp/common/test/rules/memcmpusedtocomparepaddingdata/MemcmpUsedToComparePaddingData.ql
+++ b/cpp/common/test/rules/memcmpusedtocomparepaddingdata/MemcmpUsedToComparePaddingData.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.memcmpusedtocomparepaddingdata.MemcmpUsedToComparePaddingData
 
-class TestFileQuery extends MemcmpUsedToComparePaddingDataSharedQuery, TestQuery {
-}
+class TestFileQuery extends MemcmpUsedToComparePaddingDataSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/movedfromobjectsunspecifiedstate/MovedFromObjectsUnspecifiedState.ql b/cpp/common/test/rules/movedfromobjectsunspecifiedstate/MovedFromObjectsUnspecifiedState.ql
index f7510b8b24..3f818cc3e2 100644
--- a/cpp/common/test/rules/movedfromobjectsunspecifiedstate/MovedFromObjectsUnspecifiedState.ql
+++ b/cpp/common/test/rules/movedfromobjectsunspecifiedstate/MovedFromObjectsUnspecifiedState.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.movedfromobjectsunspecifiedstate.MovedFromObjectsUnspecifiedState
 
-class TestFileQuery extends MovedFromObjectsUnspecifiedStateSharedQuery, TestQuery {
-}
+class TestFileQuery extends MovedFromObjectsUnspecifiedStateSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/nestedlabelinswitch/NestedLabelInSwitch.ql b/cpp/common/test/rules/nestedlabelinswitch/NestedLabelInSwitch.ql
index d57bf78fad..3e0b1f7e8b 100644
--- a/cpp/common/test/rules/nestedlabelinswitch/NestedLabelInSwitch.ql
+++ b/cpp/common/test/rules/nestedlabelinswitch/NestedLabelInSwitch.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.nestedlabelinswitch.NestedLabelInSwitch
 
-class TestFileQuery extends NestedLabelInSwitchSharedQuery, TestQuery {
-}
+class TestFileQuery extends NestedLabelInSwitchSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/nonbooleanifstmt/NonBooleanIfStmt.ql b/cpp/common/test/rules/nonbooleanifstmt/NonBooleanIfStmt.ql
index d1956d4b71..2e27365953 100644
--- a/cpp/common/test/rules/nonbooleanifstmt/NonBooleanIfStmt.ql
+++ b/cpp/common/test/rules/nonbooleanifstmt/NonBooleanIfStmt.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.nonbooleanifstmt.NonBooleanIfStmt
 
-class TestFileQuery extends NonBooleanIfStmtSharedQuery, TestQuery {
-}
+class TestFileQuery extends NonBooleanIfStmtSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/nonbooleaniterationstmt/NonBooleanIterationStmt.ql b/cpp/common/test/rules/nonbooleaniterationstmt/NonBooleanIterationStmt.ql
index 3cd92aa294..46c2d4c3bb 100644
--- a/cpp/common/test/rules/nonbooleaniterationstmt/NonBooleanIterationStmt.ql
+++ b/cpp/common/test/rules/nonbooleaniterationstmt/NonBooleanIterationStmt.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.nonbooleaniterationstmt.NonBooleanIterationStmt
 
-class TestFileQuery extends NonBooleanIterationStmtSharedQuery, TestQuery {
-}
+class TestFileQuery extends NonBooleanIterationStmtSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/nonconstantformat/NonConstantFormat.ql b/cpp/common/test/rules/nonconstantformat/NonConstantFormat.ql
index 71bff7e9c6..25750ae9e5 100644
--- a/cpp/common/test/rules/nonconstantformat/NonConstantFormat.ql
+++ b/cpp/common/test/rules/nonconstantformat/NonConstantFormat.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.nonconstantformat.NonConstantFormat
 
-class TestFileQuery extends NonConstantFormatSharedQuery, TestQuery {
-}
+class TestFileQuery extends NonConstantFormatSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/nonstandardentitiesinstandardnamespaces/NonStandardEntitiesInStandardNamespaces.ql b/cpp/common/test/rules/nonstandardentitiesinstandardnamespaces/NonStandardEntitiesInStandardNamespaces.ql
index 19990c3d2f..3b10c31026 100644
--- a/cpp/common/test/rules/nonstandardentitiesinstandardnamespaces/NonStandardEntitiesInStandardNamespaces.ql
+++ b/cpp/common/test/rules/nonstandardentitiesinstandardnamespaces/NonStandardEntitiesInStandardNamespaces.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.nonstandardentitiesinstandardnamespaces.NonStandardEntitiesInStandardNamespaces
 
-class TestFileQuery extends NonStandardEntitiesInStandardNamespacesSharedQuery, TestQuery {
-}
+class TestFileQuery extends NonStandardEntitiesInStandardNamespacesSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/nonvoidfunctiondoesnotreturn/NonVoidFunctionDoesNotReturn.ql b/cpp/common/test/rules/nonvoidfunctiondoesnotreturn/NonVoidFunctionDoesNotReturn.ql
index 775599e10e..bcf99b44e7 100644
--- a/cpp/common/test/rules/nonvoidfunctiondoesnotreturn/NonVoidFunctionDoesNotReturn.ql
+++ b/cpp/common/test/rules/nonvoidfunctiondoesnotreturn/NonVoidFunctionDoesNotReturn.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.nonvoidfunctiondoesnotreturn.NonVoidFunctionDoesNotReturn
 
-class TestFileQuery extends NonVoidFunctionDoesNotReturnSharedQuery, TestQuery {
-}
+class TestFileQuery extends NonVoidFunctionDoesNotReturnSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/objectaccessedafterlifetime/ObjectAccessedAfterLifetime.ql b/cpp/common/test/rules/objectaccessedafterlifetime/ObjectAccessedAfterLifetime.ql
index a6dd5f0ddb..fbf2270fb9 100644
--- a/cpp/common/test/rules/objectaccessedafterlifetime/ObjectAccessedAfterLifetime.ql
+++ b/cpp/common/test/rules/objectaccessedafterlifetime/ObjectAccessedAfterLifetime.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.objectaccessedafterlifetime.ObjectAccessedAfterLifetime
 
-class TestFileQuery extends ObjectAccessedAfterLifetimeSharedQuery, TestQuery {
-}
+class TestFileQuery extends ObjectAccessedAfterLifetimeSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/objectaccessedbeforelifetime/ObjectAccessedBeforeLifetime.ql b/cpp/common/test/rules/objectaccessedbeforelifetime/ObjectAccessedBeforeLifetime.ql
index c7e11a4489..aa88f954dc 100644
--- a/cpp/common/test/rules/objectaccessedbeforelifetime/ObjectAccessedBeforeLifetime.ql
+++ b/cpp/common/test/rules/objectaccessedbeforelifetime/ObjectAccessedBeforeLifetime.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.objectaccessedbeforelifetime.ObjectAccessedBeforeLifetime
 
-class TestFileQuery extends ObjectAccessedBeforeLifetimeSharedQuery, TestQuery {
-}
+class TestFileQuery extends ObjectAccessedBeforeLifetimeSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/onedefinitionruleviolation/OneDefinitionRuleViolation.ql b/cpp/common/test/rules/onedefinitionruleviolation/OneDefinitionRuleViolation.ql
index 8b818c9f65..0f01e0b871 100644
--- a/cpp/common/test/rules/onedefinitionruleviolation/OneDefinitionRuleViolation.ql
+++ b/cpp/common/test/rules/onedefinitionruleviolation/OneDefinitionRuleViolation.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.onedefinitionruleviolation.OneDefinitionRuleViolation
 
-class TestFileQuery extends OneDefinitionRuleViolationSharedQuery, TestQuery {
-}
+class TestFileQuery extends OneDefinitionRuleViolationSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/operationmaynotnullterminatecstylestring/OperationMayNotNullTerminateCStyleString.ql b/cpp/common/test/rules/operationmaynotnullterminatecstylestring/OperationMayNotNullTerminateCStyleString.ql
index 191a71c62d..88637e5fb8 100644
--- a/cpp/common/test/rules/operationmaynotnullterminatecstylestring/OperationMayNotNullTerminateCStyleString.ql
+++ b/cpp/common/test/rules/operationmaynotnullterminatecstylestring/OperationMayNotNullTerminateCStyleString.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.operationmaynotnullterminatecstylestring.OperationMayNotNullTerminateCStyleString
 
-class TestFileQuery extends OperationMayNotNullTerminateCStyleStringSharedQuery, TestQuery {
-}
+class TestFileQuery extends OperationMayNotNullTerminateCStyleStringSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/operatordeletemissingpartner/OperatorDeleteMissingPartner.ql b/cpp/common/test/rules/operatordeletemissingpartner/OperatorDeleteMissingPartner.ql
index 2239471465..df5ed195c3 100644
--- a/cpp/common/test/rules/operatordeletemissingpartner/OperatorDeleteMissingPartner.ql
+++ b/cpp/common/test/rules/operatordeletemissingpartner/OperatorDeleteMissingPartner.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.operatordeletemissingpartner.OperatorDeleteMissingPartner
 
-class TestFileQuery extends OperatorDeleteMissingPartnerSharedQuery, TestQuery {
-}
+class TestFileQuery extends OperatorDeleteMissingPartnerSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/orderingpredicatemustbestrictlyweak/OrderingPredicateMustBeStrictlyWeak.ql b/cpp/common/test/rules/orderingpredicatemustbestrictlyweak/OrderingPredicateMustBeStrictlyWeak.ql
index a546ac7dee..765e11c79e 100644
--- a/cpp/common/test/rules/orderingpredicatemustbestrictlyweak/OrderingPredicateMustBeStrictlyWeak.ql
+++ b/cpp/common/test/rules/orderingpredicatemustbestrictlyweak/OrderingPredicateMustBeStrictlyWeak.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.orderingpredicatemustbestrictlyweak.OrderingPredicateMustBeStrictlyWeak
 
-class TestFileQuery extends OrderingPredicateMustBeStrictlyWeakSharedQuery, TestQuery {
-}
+class TestFileQuery extends OrderingPredicateMustBeStrictlyWeakSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/ownedpointervaluestoredinunrelatedsmartpointer/OwnedPointerValueStoredInUnrelatedSmartPointer.ql b/cpp/common/test/rules/ownedpointervaluestoredinunrelatedsmartpointer/OwnedPointerValueStoredInUnrelatedSmartPointer.ql
index 06ce668f27..efdcb47a16 100644
--- a/cpp/common/test/rules/ownedpointervaluestoredinunrelatedsmartpointer/OwnedPointerValueStoredInUnrelatedSmartPointer.ql
+++ b/cpp/common/test/rules/ownedpointervaluestoredinunrelatedsmartpointer/OwnedPointerValueStoredInUnrelatedSmartPointer.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.ownedpointervaluestoredinunrelatedsmartpointer.OwnedPointerValueStoredInUnrelatedSmartPointer
 
-class TestFileQuery extends OwnedPointerValueStoredInUnrelatedSmartPointerSharedQuery, TestQuery {
-}
+class TestFileQuery extends OwnedPointerValueStoredInUnrelatedSmartPointerSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/placementnewinsufficientstorage/PlacementNewInsufficientStorage.ql b/cpp/common/test/rules/placementnewinsufficientstorage/PlacementNewInsufficientStorage.ql
index 7b30c736d3..d63da2dc8d 100644
--- a/cpp/common/test/rules/placementnewinsufficientstorage/PlacementNewInsufficientStorage.ql
+++ b/cpp/common/test/rules/placementnewinsufficientstorage/PlacementNewInsufficientStorage.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.placementnewinsufficientstorage.PlacementNewInsufficientStorage
 
-class TestFileQuery extends PlacementNewInsufficientStorageSharedQuery, TestQuery {
-}
+class TestFileQuery extends PlacementNewInsufficientStorageSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/placementnewnotproperlyaligned/PlacementNewNotProperlyAligned.ql b/cpp/common/test/rules/placementnewnotproperlyaligned/PlacementNewNotProperlyAligned.ql
index 5f4fd81927..913b1c9c66 100644
--- a/cpp/common/test/rules/placementnewnotproperlyaligned/PlacementNewNotProperlyAligned.ql
+++ b/cpp/common/test/rules/placementnewnotproperlyaligned/PlacementNewNotProperlyAligned.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.placementnewnotproperlyaligned.PlacementNewNotProperlyAligned
 
-class TestFileQuery extends PlacementNewNotProperlyAlignedSharedQuery, TestQuery {
-}
+class TestFileQuery extends PlacementNewNotProperlyAlignedSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/predicatefunctionobjectsshouldnotbemutable/PredicateFunctionObjectsShouldNotBeMutable.ql b/cpp/common/test/rules/predicatefunctionobjectsshouldnotbemutable/PredicateFunctionObjectsShouldNotBeMutable.ql
index 0d4dec003f..1c9c73fb3d 100644
--- a/cpp/common/test/rules/predicatefunctionobjectsshouldnotbemutable/PredicateFunctionObjectsShouldNotBeMutable.ql
+++ b/cpp/common/test/rules/predicatefunctionobjectsshouldnotbemutable/PredicateFunctionObjectsShouldNotBeMutable.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.predicatefunctionobjectsshouldnotbemutable.PredicateFunctionObjectsShouldNotBeMutable
 
-class TestFileQuery extends PredicateFunctionObjectsShouldNotBeMutableSharedQuery, TestQuery {
-}
+class TestFileQuery extends PredicateFunctionObjectsShouldNotBeMutableSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/preprocessingdirectivewithinmacroargument/PreprocessingDirectiveWithinMacroArgument.ql b/cpp/common/test/rules/preprocessingdirectivewithinmacroargument/PreprocessingDirectiveWithinMacroArgument.ql
index 35bc1586b0..d66babdb6d 100644
--- a/cpp/common/test/rules/preprocessingdirectivewithinmacroargument/PreprocessingDirectiveWithinMacroArgument.ql
+++ b/cpp/common/test/rules/preprocessingdirectivewithinmacroargument/PreprocessingDirectiveWithinMacroArgument.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.preprocessingdirectivewithinmacroargument.PreprocessingDirectiveWithinMacroArgument
 
-class TestFileQuery extends PreprocessingDirectiveWithinMacroArgumentSharedQuery, TestQuery {
-}
+class TestFileQuery extends PreprocessingDirectiveWithinMacroArgumentSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/preprocessorincludesforbiddenheadernames/PreprocessorIncludesForbiddenHeaderNames.ql b/cpp/common/test/rules/preprocessorincludesforbiddenheadernames/PreprocessorIncludesForbiddenHeaderNames.ql
index f12f9663b1..c7652ab4ae 100644
--- a/cpp/common/test/rules/preprocessorincludesforbiddenheadernames/PreprocessorIncludesForbiddenHeaderNames.ql
+++ b/cpp/common/test/rules/preprocessorincludesforbiddenheadernames/PreprocessorIncludesForbiddenHeaderNames.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.preprocessorincludesforbiddenheadernames.PreprocessorIncludesForbiddenHeaderNames
 
-class TestFileQuery extends PreprocessorIncludesForbiddenHeaderNamesSharedQuery, TestQuery {
-}
+class TestFileQuery extends PreprocessorIncludesForbiddenHeaderNamesSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/preprocessorincludespreceded/PreprocessorIncludesPreceded.ql b/cpp/common/test/rules/preprocessorincludespreceded/PreprocessorIncludesPreceded.ql
index 44f700604a..43701dbbf9 100644
--- a/cpp/common/test/rules/preprocessorincludespreceded/PreprocessorIncludesPreceded.ql
+++ b/cpp/common/test/rules/preprocessorincludespreceded/PreprocessorIncludesPreceded.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.preprocessorincludespreceded.PreprocessorIncludesPreceded
 
-class TestFileQuery extends PreprocessorIncludesPrecededSharedQuery, TestQuery {
-}
+class TestFileQuery extends PreprocessorIncludesPrecededSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/preservesafetywhenusingconditionvariables/PreserveSafetyWhenUsingConditionVariables.ql b/cpp/common/test/rules/preservesafetywhenusingconditionvariables/PreserveSafetyWhenUsingConditionVariables.ql
index 6fd33d601b..009c7f9e26 100644
--- a/cpp/common/test/rules/preservesafetywhenusingconditionvariables/PreserveSafetyWhenUsingConditionVariables.ql
+++ b/cpp/common/test/rules/preservesafetywhenusingconditionvariables/PreserveSafetyWhenUsingConditionVariables.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.preservesafetywhenusingconditionvariables.PreserveSafetyWhenUsingConditionVariables
 
-class TestFileQuery extends PreserveSafetyWhenUsingConditionVariablesSharedQuery, TestQuery {
-}
+class TestFileQuery extends PreserveSafetyWhenUsingConditionVariablesSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/preventdeadlockbylockinginpredefinedorder/PreventDeadlockByLockingInPredefinedOrder.ql b/cpp/common/test/rules/preventdeadlockbylockinginpredefinedorder/PreventDeadlockByLockingInPredefinedOrder.ql
index 9968a80e75..4ca46f15ea 100644
--- a/cpp/common/test/rules/preventdeadlockbylockinginpredefinedorder/PreventDeadlockByLockingInPredefinedOrder.ql
+++ b/cpp/common/test/rules/preventdeadlockbylockinginpredefinedorder/PreventDeadlockByLockingInPredefinedOrder.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.preventdeadlockbylockinginpredefinedorder.PreventDeadlockByLockingInPredefinedOrder
 
-class TestFileQuery extends PreventDeadlockByLockingInPredefinedOrderSharedQuery, TestQuery {
-}
+class TestFileQuery extends PreventDeadlockByLockingInPredefinedOrderSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/readofuninitializedmemory/ReadOfUninitializedMemory.ql b/cpp/common/test/rules/readofuninitializedmemory/ReadOfUninitializedMemory.ql
index cec14d6dac..9150d4459d 100644
--- a/cpp/common/test/rules/readofuninitializedmemory/ReadOfUninitializedMemory.ql
+++ b/cpp/common/test/rules/readofuninitializedmemory/ReadOfUninitializedMemory.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.readofuninitializedmemory.ReadOfUninitializedMemory
 
-class TestFileQuery extends ReadOfUninitializedMemorySharedQuery, TestQuery {
-}
+class TestFileQuery extends ReadOfUninitializedMemorySharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/removeconstorvolatilequalification/RemoveConstOrVolatileQualification.ql b/cpp/common/test/rules/removeconstorvolatilequalification/RemoveConstOrVolatileQualification.ql
index 137fc2edf1..61865cccab 100644
--- a/cpp/common/test/rules/removeconstorvolatilequalification/RemoveConstOrVolatileQualification.ql
+++ b/cpp/common/test/rules/removeconstorvolatilequalification/RemoveConstOrVolatileQualification.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.removeconstorvolatilequalification.RemoveConstOrVolatileQualification
 
-class TestFileQuery extends RemoveConstOrVolatileQualificationSharedQuery, TestQuery {
-}
+class TestFileQuery extends RemoveConstOrVolatileQualificationSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/rethrownestedwithoutcapture/RethrowNestedWithoutCapture.ql b/cpp/common/test/rules/rethrownestedwithoutcapture/RethrowNestedWithoutCapture.ql
index e3cc2a62fb..ab45ada710 100644
--- a/cpp/common/test/rules/rethrownestedwithoutcapture/RethrowNestedWithoutCapture.ql
+++ b/cpp/common/test/rules/rethrownestedwithoutcapture/RethrowNestedWithoutCapture.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.rethrownestedwithoutcapture.RethrowNestedWithoutCapture
 
-class TestFileQuery extends RethrowNestedWithoutCaptureSharedQuery, TestQuery {
-}
+class TestFileQuery extends RethrowNestedWithoutCaptureSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/sectionsofcodeshallnotbecommentedout/SectionsOfCodeShallNotBeCommentedOut.ql b/cpp/common/test/rules/sectionsofcodeshallnotbecommentedout/SectionsOfCodeShallNotBeCommentedOut.ql
index 00d24cc943..aacadf0253 100644
--- a/cpp/common/test/rules/sectionsofcodeshallnotbecommentedout/SectionsOfCodeShallNotBeCommentedOut.ql
+++ b/cpp/common/test/rules/sectionsofcodeshallnotbecommentedout/SectionsOfCodeShallNotBeCommentedOut.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.sectionsofcodeshallnotbecommentedout.SectionsOfCodeShallNotBeCommentedOut
 
-class TestFileQuery extends SectionsOfCodeShallNotBeCommentedOutSharedQuery, TestQuery {
-}
+class TestFileQuery extends SectionsOfCodeShallNotBeCommentedOutSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/stringnumberconversionmissingerrorcheck/StringNumberConversionMissingErrorCheck.ql b/cpp/common/test/rules/stringnumberconversionmissingerrorcheck/StringNumberConversionMissingErrorCheck.ql
index 9e35a26b6d..7fae4b8b9a 100644
--- a/cpp/common/test/rules/stringnumberconversionmissingerrorcheck/StringNumberConversionMissingErrorCheck.ql
+++ b/cpp/common/test/rules/stringnumberconversionmissingerrorcheck/StringNumberConversionMissingErrorCheck.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.stringnumberconversionmissingerrorcheck.StringNumberConversionMissingErrorCheck
 
-class TestFileQuery extends StringNumberConversionMissingErrorCheckSharedQuery, TestQuery {
-}
+class TestFileQuery extends StringNumberConversionMissingErrorCheckSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/switchcasepositioncondition/SwitchCasePositionCondition.ql b/cpp/common/test/rules/switchcasepositioncondition/SwitchCasePositionCondition.ql
index de3d7c5c9c..1b323a652d 100644
--- a/cpp/common/test/rules/switchcasepositioncondition/SwitchCasePositionCondition.ql
+++ b/cpp/common/test/rules/switchcasepositioncondition/SwitchCasePositionCondition.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.switchcasepositioncondition.SwitchCasePositionCondition
 
-class TestFileQuery extends SwitchCasePositionConditionSharedQuery, TestQuery {
-}
+class TestFileQuery extends SwitchCasePositionConditionSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/switchnotwellformed/SwitchNotWellFormed.ql b/cpp/common/test/rules/switchnotwellformed/SwitchNotWellFormed.ql
index 3669f8739e..75ce3cb1ec 100644
--- a/cpp/common/test/rules/switchnotwellformed/SwitchNotWellFormed.ql
+++ b/cpp/common/test/rules/switchnotwellformed/SwitchNotWellFormed.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.switchnotwellformed.SwitchNotWellFormed
 
-class TestFileQuery extends SwitchNotWellFormedSharedQuery, TestQuery {
-}
+class TestFileQuery extends SwitchNotWellFormedSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/throwingnothrowoperatornewdelete/ThrowingNoThrowOperatorNewDelete.ql b/cpp/common/test/rules/throwingnothrowoperatornewdelete/ThrowingNoThrowOperatorNewDelete.ql
index 039db1c5c3..0135c410f4 100644
--- a/cpp/common/test/rules/throwingnothrowoperatornewdelete/ThrowingNoThrowOperatorNewDelete.ql
+++ b/cpp/common/test/rules/throwingnothrowoperatornewdelete/ThrowingNoThrowOperatorNewDelete.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.throwingnothrowoperatornewdelete.ThrowingNoThrowOperatorNewDelete
 
-class TestFileQuery extends ThrowingNoThrowOperatorNewDeleteSharedQuery, TestQuery {
-}
+class TestFileQuery extends ThrowingNoThrowOperatorNewDeleteSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/throwingoperatornewreturnsnull/ThrowingOperatorNewReturnsNull.ql b/cpp/common/test/rules/throwingoperatornewreturnsnull/ThrowingOperatorNewReturnsNull.ql
index b034de0a67..c0fc6c8619 100644
--- a/cpp/common/test/rules/throwingoperatornewreturnsnull/ThrowingOperatorNewReturnsNull.ql
+++ b/cpp/common/test/rules/throwingoperatornewreturnsnull/ThrowingOperatorNewReturnsNull.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.throwingoperatornewreturnsnull.ThrowingOperatorNewReturnsNull
 
-class TestFileQuery extends ThrowingOperatorNewReturnsNullSharedQuery, TestQuery {
-}
+class TestFileQuery extends ThrowingOperatorNewReturnsNullSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/throwingoperatornewthrowsinvalidexception/ThrowingOperatorNewThrowsInvalidException.ql b/cpp/common/test/rules/throwingoperatornewthrowsinvalidexception/ThrowingOperatorNewThrowsInvalidException.ql
index e4917831e5..072a5c7027 100644
--- a/cpp/common/test/rules/throwingoperatornewthrowsinvalidexception/ThrowingOperatorNewThrowsInvalidException.ql
+++ b/cpp/common/test/rules/throwingoperatornewthrowsinvalidexception/ThrowingOperatorNewThrowsInvalidException.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.throwingoperatornewthrowsinvalidexception.ThrowingOperatorNewThrowsInvalidException
 
-class TestFileQuery extends ThrowingOperatorNewThrowsInvalidExceptionSharedQuery, TestQuery {
-}
+class TestFileQuery extends ThrowingOperatorNewThrowsInvalidExceptionSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/uncheckedrangedomainpoleerrors/UncheckedRangeDomainPoleErrors.ql b/cpp/common/test/rules/uncheckedrangedomainpoleerrors/UncheckedRangeDomainPoleErrors.ql
index 6ae007bd39..11720fb8da 100644
--- a/cpp/common/test/rules/uncheckedrangedomainpoleerrors/UncheckedRangeDomainPoleErrors.ql
+++ b/cpp/common/test/rules/uncheckedrangedomainpoleerrors/UncheckedRangeDomainPoleErrors.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.uncheckedrangedomainpoleerrors.UncheckedRangeDomainPoleErrors
 
-class TestFileQuery extends UncheckedRangeDomainPoleErrorsSharedQuery, TestQuery {
-}
+class TestFileQuery extends UncheckedRangeDomainPoleErrorsSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/undefinedmacroidentifiers/UndefinedMacroIdentifiers.ql b/cpp/common/test/rules/undefinedmacroidentifiers/UndefinedMacroIdentifiers.ql
index 168b3a0b2e..316565cab7 100644
--- a/cpp/common/test/rules/undefinedmacroidentifiers/UndefinedMacroIdentifiers.ql
+++ b/cpp/common/test/rules/undefinedmacroidentifiers/UndefinedMacroIdentifiers.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.undefinedmacroidentifiers.UndefinedMacroIdentifiers
 
-class TestFileQuery extends UndefinedMacroIdentifiersSharedQuery, TestQuery {
-}
+class TestFileQuery extends UndefinedMacroIdentifiersSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/unnecessaryexposedidentifierdeclarationshared/UnnecessaryExposedIdentifierDeclarationShared.ql b/cpp/common/test/rules/unnecessaryexposedidentifierdeclarationshared/UnnecessaryExposedIdentifierDeclarationShared.ql
index 3b1e4b7c56..3baad901da 100644
--- a/cpp/common/test/rules/unnecessaryexposedidentifierdeclarationshared/UnnecessaryExposedIdentifierDeclarationShared.ql
+++ b/cpp/common/test/rules/unnecessaryexposedidentifierdeclarationshared/UnnecessaryExposedIdentifierDeclarationShared.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.unnecessaryexposedidentifierdeclarationshared.UnnecessaryExposedIdentifierDeclarationShared
 
-class TestFileQuery extends UnnecessaryExposedIdentifierDeclarationSharedSharedQuery, TestQuery {
-}
+class TestFileQuery extends UnnecessaryExposedIdentifierDeclarationSharedSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/unreachablecode/UnreachableCode.ql b/cpp/common/test/rules/unreachablecode/UnreachableCode.ql
index 61554593fd..c394bfba3e 100644
--- a/cpp/common/test/rules/unreachablecode/UnreachableCode.ql
+++ b/cpp/common/test/rules/unreachablecode/UnreachableCode.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.unreachablecode.UnreachableCode
 
-class TestFileQuery extends UnreachableCodeSharedQuery, TestQuery {
-}
+class TestFileQuery extends UnreachableCodeSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/unusedparameter/UnusedParameter.ql b/cpp/common/test/rules/unusedparameter/UnusedParameter.ql
index 4dc2000dbb..e990a7dcf3 100644
--- a/cpp/common/test/rules/unusedparameter/UnusedParameter.ql
+++ b/cpp/common/test/rules/unusedparameter/UnusedParameter.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.unusedparameter.UnusedParameter
 
-class TestFileQuery extends UnusedParameterSharedQuery, TestQuery {
-}
+class TestFileQuery extends UnusedParameterSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/unusedtypedeclarations/UnusedTypeDeclarations.ql b/cpp/common/test/rules/unusedtypedeclarations/UnusedTypeDeclarations.ql
index 76ccfec0f2..f1c09524d5 100644
--- a/cpp/common/test/rules/unusedtypedeclarations/UnusedTypeDeclarations.ql
+++ b/cpp/common/test/rules/unusedtypedeclarations/UnusedTypeDeclarations.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.unusedtypedeclarations.UnusedTypeDeclarations
 
-class TestFileQuery extends UnusedTypeDeclarationsSharedQuery, TestQuery {
-}
+class TestFileQuery extends UnusedTypeDeclarationsSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/usageofassemblernotdocumented/UsageOfAssemblerNotDocumented.ql b/cpp/common/test/rules/usageofassemblernotdocumented/UsageOfAssemblerNotDocumented.ql
index c8b9f229f4..f9997627b4 100644
--- a/cpp/common/test/rules/usageofassemblernotdocumented/UsageOfAssemblerNotDocumented.ql
+++ b/cpp/common/test/rules/usageofassemblernotdocumented/UsageOfAssemblerNotDocumented.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.usageofassemblernotdocumented.UsageOfAssemblerNotDocumented
 
-class TestFileQuery extends UsageOfAssemblerNotDocumentedSharedQuery, TestQuery {
-}
+class TestFileQuery extends UsageOfAssemblerNotDocumentedSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/usecanonicalorderformemberinit/UseCanonicalOrderForMemberInit.ql b/cpp/common/test/rules/usecanonicalorderformemberinit/UseCanonicalOrderForMemberInit.ql
index 6cee3d153d..c703151f75 100644
--- a/cpp/common/test/rules/usecanonicalorderformemberinit/UseCanonicalOrderForMemberInit.ql
+++ b/cpp/common/test/rules/usecanonicalorderformemberinit/UseCanonicalOrderForMemberInit.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.usecanonicalorderformemberinit.UseCanonicalOrderForMemberInit
 
-class TestFileQuery extends UseCanonicalOrderForMemberInitSharedQuery, TestQuery {
-}
+class TestFileQuery extends UseCanonicalOrderForMemberInitSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/useonlyarrayindexingforpointerarithmetic/UseOnlyArrayIndexingForPointerArithmetic.ql b/cpp/common/test/rules/useonlyarrayindexingforpointerarithmetic/UseOnlyArrayIndexingForPointerArithmetic.ql
index 7edd86ecab..55554bee07 100644
--- a/cpp/common/test/rules/useonlyarrayindexingforpointerarithmetic/UseOnlyArrayIndexingForPointerArithmetic.ql
+++ b/cpp/common/test/rules/useonlyarrayindexingforpointerarithmetic/UseOnlyArrayIndexingForPointerArithmetic.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.useonlyarrayindexingforpointerarithmetic.UseOnlyArrayIndexingForPointerArithmetic
 
-class TestFileQuery extends UseOnlyArrayIndexingForPointerArithmeticSharedQuery, TestQuery {
-}
+class TestFileQuery extends UseOnlyArrayIndexingForPointerArithmeticSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/validcontainerelementaccess/ValidContainerElementAccess.ql b/cpp/common/test/rules/validcontainerelementaccess/ValidContainerElementAccess.ql
index 64e86b2ba5..5f61b8a2a9 100644
--- a/cpp/common/test/rules/validcontainerelementaccess/ValidContainerElementAccess.ql
+++ b/cpp/common/test/rules/validcontainerelementaccess/ValidContainerElementAccess.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.validcontainerelementaccess.ValidContainerElementAccess
 
-class TestFileQuery extends ValidContainerElementAccessSharedQuery, TestQuery {
-}
+class TestFileQuery extends ValidContainerElementAccessSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/wrapspuriousfunctioninloop/WrapSpuriousFunctionInLoop.ql b/cpp/common/test/rules/wrapspuriousfunctioninloop/WrapSpuriousFunctionInLoop.ql
index af84dd07c1..44947bf85a 100644
--- a/cpp/common/test/rules/wrapspuriousfunctioninloop/WrapSpuriousFunctionInLoop.ql
+++ b/cpp/common/test/rules/wrapspuriousfunctioninloop/WrapSpuriousFunctionInLoop.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.wrapspuriousfunctioninloop.WrapSpuriousFunctionInLoop
 
-class TestFileQuery extends WrapSpuriousFunctionInLoopSharedQuery, TestQuery {
-}
+class TestFileQuery extends WrapSpuriousFunctionInLoopSharedQuery, TestQuery { }
diff --git a/scripts/generate_rules/generate_package_files.py b/scripts/generate_rules/generate_package_files.py
index 98bc1b5595..7f9a63ef8d 100644
--- a/scripts/generate_rules/generate_package_files.py
+++ b/scripts/generate_rules/generate_package_files.py
@@ -182,8 +182,7 @@ def write_shared_implementation(package_name, rule_id, query, language_name, ql_
                 + "\n"
             )
             f.write("\n");
-            f.write("class TestFileQuery extends " + str(query["shared_implementation_short_name"]) + "SharedQuery, TestQuery {\n")
-            f.write("}\n")
+            f.write("class TestFileQuery extends " + str(query["shared_implementation_short_name"]) + "SharedQuery, TestQuery { }\n")
 
         # Create an empty test file, if one doesn't already exist
         shared_impl_test_dir.joinpath(

From c12fb48a41b9295e7a9b9c6fbdfcff0244172d22 Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Tue, 17 Oct 2023 12:59:08 +0100
Subject: [PATCH 2/3] Produce qlformat compliant shared query test files

---
 scripts/generate_rules/generate_package_files.py | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/scripts/generate_rules/generate_package_files.py b/scripts/generate_rules/generate_package_files.py
index 7f9a63ef8d..6dabec0a92 100644
--- a/scripts/generate_rules/generate_package_files.py
+++ b/scripts/generate_rules/generate_package_files.py
@@ -181,8 +181,19 @@ def write_shared_implementation(package_name, rule_id, query, language_name, ql_
                 .replace("/", ".")
                 + "\n"
             )
-            f.write("\n");
-            f.write("class TestFileQuery extends " + str(query["shared_implementation_short_name"]) + "SharedQuery, TestQuery { }\n")
+            f.write("\n")
+            class_name = str(query["shared_implementation_short_name"]) + "SharedQuery"
+            f.write("class TestFileQuery extends " + class_name + ",")
+            # ql formatting of this line depends on the line length
+            if len(class_name) > 61:
+                # Line break required after comma
+                f.write("\n  TestQuery\n{ }\n")
+            elif len(class_name) > 57:
+                # Line break required after `{`
+                f.write(" TestQuery {\n}\n")
+            else:
+                # Under 100 characters, can be formatted on the same line
+                f.write(" TestQuery { }\n")
 
         # Create an empty test file, if one doesn't already exist
         shared_impl_test_dir.joinpath(

From 59413ff7a5a5bc89ef6412eb1300163d6c7caa12 Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Tue, 17 Oct 2023 14:22:58 +0100
Subject: [PATCH 3/3] Fix formatting checks in PRs

---
 .github/workflows/validate-coding-standards.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/validate-coding-standards.yml b/.github/workflows/validate-coding-standards.yml
index aad7a435b1..84b91f5280 100644
--- a/.github/workflows/validate-coding-standards.yml
+++ b/.github/workflows/validate-coding-standards.yml
@@ -89,7 +89,7 @@ jobs:
 
       - name: Validate CodeQL Format (CPP)
         run: |
-          find cpp -name \*.ql -or -name \*.qll -print0 | xargs -0 --max-procs "$XARGS_MAX_PROCS" codeql query format --in-place
+          find cpp \( -name \*.ql -or -name \*.qll \) -print0 | xargs -0 --max-procs "$XARGS_MAX_PROCS" codeql query format --in-place
 
           git diff
           git diff --compact-summary
@@ -97,7 +97,7 @@ jobs:
 
       - name: Validate CodeQL Format (C)
         run: |
-          find c -name \*.ql -or -name \*.qll -print0 | xargs -0 --max-procs "$XARGS_MAX_PROCS" codeql query format --in-place
+          find c \( -name \*.ql -or -name \*.qll \) -print0 | xargs -0 --max-procs "$XARGS_MAX_PROCS" codeql query format --in-place
 
           git diff
           git diff --compact-summary