From 91cfb30513151bb9e6246dd4095acfbb91a9615f Mon Sep 17 00:00:00 2001 From: Michael Nebel Date: Tue, 12 Nov 2024 16:34:59 +0100 Subject: [PATCH 01/24] Java: Move test utilities to the java query pack. --- .../TestUtilities => src/utils/test}/InlineExpectationsTest.qll | 0 .../utils/test}/InlineExpectationsTestQuery.ql | 0 java/ql/{test/TestUtilities => src/utils/test}/InlineFlowTest.qll | 0 java/ql/{test/TestUtilities => src/utils/test}/InlineMadTest.qll | 0 .../{test/TestUtilities => src/utils/test}/PrettyPrintModels.ql | 0 .../utils/test}/internal/InlineExpectationsTestImpl.qll | 0 6 files changed, 0 insertions(+), 0 deletions(-) rename java/ql/{test/TestUtilities => src/utils/test}/InlineExpectationsTest.qll (100%) rename java/ql/{test/TestUtilities => src/utils/test}/InlineExpectationsTestQuery.ql (100%) rename java/ql/{test/TestUtilities => src/utils/test}/InlineFlowTest.qll (100%) rename java/ql/{test/TestUtilities => src/utils/test}/InlineMadTest.qll (100%) rename java/ql/{test/TestUtilities => src/utils/test}/PrettyPrintModels.ql (100%) rename java/ql/{test/TestUtilities => src/utils/test}/internal/InlineExpectationsTestImpl.qll (100%) diff --git a/java/ql/test/TestUtilities/InlineExpectationsTest.qll b/java/ql/src/utils/test/InlineExpectationsTest.qll similarity index 100% rename from java/ql/test/TestUtilities/InlineExpectationsTest.qll rename to java/ql/src/utils/test/InlineExpectationsTest.qll diff --git a/java/ql/test/TestUtilities/InlineExpectationsTestQuery.ql b/java/ql/src/utils/test/InlineExpectationsTestQuery.ql similarity index 100% rename from java/ql/test/TestUtilities/InlineExpectationsTestQuery.ql rename to java/ql/src/utils/test/InlineExpectationsTestQuery.ql diff --git a/java/ql/test/TestUtilities/InlineFlowTest.qll b/java/ql/src/utils/test/InlineFlowTest.qll similarity index 100% rename from java/ql/test/TestUtilities/InlineFlowTest.qll rename to java/ql/src/utils/test/InlineFlowTest.qll diff --git a/java/ql/test/TestUtilities/InlineMadTest.qll b/java/ql/src/utils/test/InlineMadTest.qll similarity index 100% rename from java/ql/test/TestUtilities/InlineMadTest.qll rename to java/ql/src/utils/test/InlineMadTest.qll diff --git a/java/ql/test/TestUtilities/PrettyPrintModels.ql b/java/ql/src/utils/test/PrettyPrintModels.ql similarity index 100% rename from java/ql/test/TestUtilities/PrettyPrintModels.ql rename to java/ql/src/utils/test/PrettyPrintModels.ql diff --git a/java/ql/test/TestUtilities/internal/InlineExpectationsTestImpl.qll b/java/ql/src/utils/test/internal/InlineExpectationsTestImpl.qll similarity index 100% rename from java/ql/test/TestUtilities/internal/InlineExpectationsTestImpl.qll rename to java/ql/src/utils/test/internal/InlineExpectationsTestImpl.qll From 0a1d2d0bbb533e02ffb0b17251e4924a8f496752 Mon Sep 17 00:00:00 2001 From: Michael Nebel Date: Tue, 12 Nov 2024 16:38:21 +0100 Subject: [PATCH 02/24] Java: Update all test util paths to point to the new location. --- .../kotlin/all-platforms/default-parameter-mad-flow/test.ql | 2 +- java/ql/src/utils/flowtestcasegenerator/testHeader.qlfrag | 2 +- java/ql/test-kotlin1/library-tests/dataflow/summaries/test.ql | 2 +- java/ql/test-kotlin2/library-tests/dataflow/summaries/test.ql | 2 +- .../query-tests/security/CWE-020/Log4jInjectionTest.qlref | 2 +- .../experimental/query-tests/security/CWE-022/TaintedPath.ql | 2 +- .../query-tests/security/CWE-073/FilePathInjection.qlref | 2 +- .../security/CWE-078/CommandInjectionRuntimeExecLocal.qlref | 2 +- .../experimental/query-tests/security/CWE-078/ExecTainted.qlref | 2 +- .../CWE-089/src/main/MyBatisAnnotationSqlInjection.qlref | 2 +- .../CWE-089/src/main/MyBatisMapperXmlSqlInjection.qlref | 2 +- .../query-tests/security/CWE-094/BeanShellInjection.qlref | 2 +- .../query-tests/security/CWE-094/JShellInjection.qlref | 2 +- .../security/CWE-094/JakartaExpressionInjection.qlref | 2 +- .../query-tests/security/CWE-094/JythonInjection.qlref | 2 +- .../query-tests/security/CWE-094/ScriptInjection.qlref | 2 +- .../security/CWE-1004/SensitiveCookieNotHttpOnly.qlref | 2 +- .../security/CWE-200/InsecureWebResourceResponse.qlref | 2 +- .../query-tests/security/CWE-200/SensitiveAndroidFileLeak.qlref | 2 +- .../security/CWE-208/NotConstantTimeCheckOnSignature/Test.qlref | 2 +- .../security/CWE-208/TimingAttackAgainstSignagure/Test.qlref | 2 +- .../security/CWE-299/DisabledRevocationChecking.qlref | 2 +- .../query-tests/security/CWE-327/UnsafeTlsVersion.qlref | 2 +- .../query-tests/security/CWE-346/UnvalidatedCors.qlref | 2 +- .../query-tests/security/CWE-347/Auth0NoVerifier.qlref | 2 +- .../security/CWE-348/ClientSuppliedIpUsedInSecurityCheck.qlref | 2 +- .../query-tests/security/CWE-352/JsonpInjection.qlref | 2 +- .../query-tests/security/CWE-400/LocalThreadResourceAbuse.qlref | 2 +- .../query-tests/security/CWE-400/ThreadResourceAbuse.qlref | 2 +- .../security/CWE-470/LoadClassNoSignatureCheck.qlref | 2 +- .../query-tests/security/CWE-470/UnsafeReflection.qlref | 2 +- .../query-tests/security/CWE-502/UnsafeDeserializationRmi.qlref | 2 +- .../query-tests/security/CWE-522-DecompressionBombs/test.ql | 2 +- .../query-tests/security/CWE-598/SensitiveGetQuery.qlref | 2 +- .../query-tests/security/CWE-600/UncaughtServletException.qlref | 2 +- .../query-tests/security/CWE-601/SpringUrlRedirect.qlref | 2 +- .../query-tests/security/CWE-625/PermissiveDotRegex.qlref | 2 +- .../query-tests/security/CWE-652/XQueryInjection.qlref | 2 +- .../query-tests/security/CWE-755/NFEAndroidDoS.qlref | 2 +- .../query-tests/security/CWE-759/HashWithoutSalt.qlref | 2 +- java/ql/test/ext/TestModels/test.ql | 2 +- java/ql/test/library-tests/dataflow/callback-dispatch/test.ql | 2 +- java/ql/test/library-tests/dataflow/callctx/test.ql | 2 +- java/ql/test/library-tests/dataflow/capture/inlinetest.ql | 2 +- .../ql/test/library-tests/dataflow/collections/containerflow.ql | 2 +- .../dataflow/entrypoint-types/EntryPointTypesTest.ql | 2 +- java/ql/test/library-tests/dataflow/field-value/test.ql | 2 +- java/ql/test/library-tests/dataflow/flowfeature/flow.ql | 2 +- java/ql/test/library-tests/dataflow/fluent-methods/flow.ql | 2 +- java/ql/test/library-tests/dataflow/implicit-read/test.ql | 2 +- .../test/library-tests/dataflow/range-analysis-inline/range.ql | 2 +- java/ql/test/library-tests/dataflow/state/test.ql | 2 +- java/ql/test/library-tests/dataflow/stream-collect/test.ql | 2 +- java/ql/test/library-tests/dataflow/stream-read/test.ql | 2 +- java/ql/test/library-tests/dataflow/subpaths/flow.ql | 2 +- java/ql/test/library-tests/dataflow/synth-global/test.ql | 2 +- java/ql/test/library-tests/dataflow/taint-format/test.ql | 2 +- java/ql/test/library-tests/dataflow/taint-gson/dataFlow.ql | 2 +- java/ql/test/library-tests/dataflow/taint-jackson/dataFlow.ql | 2 +- java/ql/test/library-tests/dataflow/taintsources/local.ql | 2 +- java/ql/test/library-tests/dataflow/taintsources/remote.ql | 2 +- java/ql/test/library-tests/dataflow/taintsources/reversedns.ql | 2 +- java/ql/test/library-tests/dataflow/typeflow-dispatch/test.ql | 2 +- java/ql/test/library-tests/frameworks/JaxWs/JaxRs.ql | 2 +- java/ql/test/library-tests/frameworks/JaxWs/JaxRsFlow.ql | 2 +- java/ql/test/library-tests/frameworks/JaxWs/JaxWsEndpoint.ql | 2 +- java/ql/test/library-tests/frameworks/JaxWs/UrlRedirect.qlref | 2 +- java/ql/test/library-tests/frameworks/android/asynctask/test.ql | 2 +- .../frameworks/android/content-provider-summaries/test.ql | 2 +- .../library-tests/frameworks/android/content-provider/test.ql | 2 +- .../library-tests/frameworks/android/external-storage/test.ql | 2 +- .../ql/test/library-tests/frameworks/android/flow-steps/test.ql | 2 +- java/ql/test/library-tests/frameworks/android/intent/test.ql | 2 +- .../test/library-tests/frameworks/android/notification/test.ql | 2 +- java/ql/test/library-tests/frameworks/android/slice/test.ql | 2 +- .../frameworks/android/sources/OnActivityResultSourceTest.ql | 2 +- .../frameworks/android/taint-database/flowSteps.ql | 2 +- .../library-tests/frameworks/android/taint-database/sinks.ql | 2 +- java/ql/test/library-tests/frameworks/android/uri/test.ql | 2 +- java/ql/test/library-tests/frameworks/android/widget/test.ql | 2 +- java/ql/test/library-tests/frameworks/apache-ant/test.ql | 2 +- .../ql/test/library-tests/frameworks/apache-collections/test.ql | 2 +- .../library-tests/frameworks/apache-commons-compress/test.ql | 2 +- .../test/library-tests/frameworks/apache-commons-lang3/flow.ql | 2 +- java/ql/test/library-tests/frameworks/apache-http/flow.ql | 2 +- java/ql/test/library-tests/frameworks/gson/test.ql | 2 +- .../test/library-tests/frameworks/guava/generated/cache/test.ql | 2 +- .../library-tests/frameworks/guava/generated/collect/test.ql | 2 +- java/ql/test/library-tests/frameworks/guava/handwritten/flow.ql | 2 +- java/ql/test/library-tests/frameworks/hudson/test.ql | 2 +- java/ql/test/library-tests/frameworks/jackson/test.ql | 2 +- java/ql/test/library-tests/frameworks/javax-json/test.ql | 2 +- java/ql/test/library-tests/frameworks/jdk/java.io/test.ql | 2 +- java/ql/test/library-tests/frameworks/jdk/java.net/test.ql | 2 +- java/ql/test/library-tests/frameworks/jdk/java.nio.file/test.ql | 2 +- java/ql/test/library-tests/frameworks/jms/FlowTest.ql | 2 +- java/ql/test/library-tests/frameworks/jms/RemoteSourcesTest.ql | 2 +- java/ql/test/library-tests/frameworks/json-java/test.ql | 2 +- java/ql/test/library-tests/frameworks/lastaflute/test.ql | 2 +- java/ql/test/library-tests/frameworks/netty/generated/test.ql | 2 +- java/ql/test/library-tests/frameworks/netty/manual/test.ql | 2 +- java/ql/test/library-tests/frameworks/okhttp/test.ql | 2 +- java/ql/test/library-tests/frameworks/play/test.ql | 2 +- java/ql/test/library-tests/frameworks/rabbitmq/FlowTest.ql | 2 +- java/ql/test/library-tests/frameworks/rabbitmq/SourceTest.ql | 2 +- java/ql/test/library-tests/frameworks/ratpack/flow.ql | 2 +- java/ql/test/library-tests/frameworks/retrofit/test.ql | 2 +- java/ql/test/library-tests/frameworks/spring/beans/test.ql | 2 +- java/ql/test/library-tests/frameworks/spring/cache/test.ql | 2 +- java/ql/test/library-tests/frameworks/spring/context/flow.ql | 2 +- java/ql/test/library-tests/frameworks/spring/controller/test.ql | 2 +- java/ql/test/library-tests/frameworks/spring/data/test.ql | 2 +- java/ql/test/library-tests/frameworks/spring/http/flow.ql | 2 +- java/ql/test/library-tests/frameworks/spring/ui/test.ql | 2 +- java/ql/test/library-tests/frameworks/spring/util/test.ql | 2 +- java/ql/test/library-tests/frameworks/spring/validation/test.ql | 2 +- .../test/library-tests/frameworks/spring/webmultipart/test.ql | 2 +- java/ql/test/library-tests/frameworks/spring/webutil/test.ql | 2 +- java/ql/test/library-tests/frameworks/stapler/test.ql | 2 +- java/ql/test/library-tests/frameworks/stream/test.ql | 2 +- java/ql/test/library-tests/frameworks/thymeleaf/test.ql | 2 +- java/ql/test/library-tests/logging/test.ql | 2 +- .../library-tests/neutrals/neutralsinks/NeutralSinksTest.ql | 2 +- java/ql/test/library-tests/optional/test.ql | 2 +- java/ql/test/library-tests/paths/test.ql | 2 +- java/ql/test/library-tests/pathsanitizer/test.ql | 2 +- java/ql/test/library-tests/regex/test.ql | 2 +- java/ql/test/library-tests/scanner/test.ql | 2 +- java/ql/test/library-tests/xml/XMLTest.ql | 2 +- .../query-tests/security/CWE-022/semmle/tests/TaintedPath.ql | 2 +- .../query-tests/security/CWE-022/semmle/tests/ZipSlip.qlref | 2 +- .../CWE-023/semmle/tests/PartialPathTraversalFromRemoteTest.ql | 2 +- java/ql/test/query-tests/security/CWE-074/JndiInjectionTest.ql | 2 +- java/ql/test/query-tests/security/CWE-074/XsltInjectionTest.ql | 2 +- java/ql/test/query-tests/security/CWE-078/ExecTainted.qlref | 2 +- .../test/query-tests/security/CWE-078/ExecTaintedEnvironment.ql | 2 +- java/ql/test/query-tests/security/CWE-079/semmle/tests/XSS.ql | 2 +- .../security/CWE-089/semmle/examples/SqlTainted.qlref | 2 +- .../query-tests/security/CWE-089/semmle/examples/springjdbc.ql | 2 +- java/ql/test/query-tests/security/CWE-090/LdapInjection.qlref | 2 +- .../ql/test/query-tests/security/CWE-094/ApkInstallationTest.ql | 2 +- .../ql/test/query-tests/security/CWE-094/GroovyInjectionTest.ql | 2 +- .../query-tests/security/CWE-094/InsecureBeanValidation.qlref | 2 +- java/ql/test/query-tests/security/CWE-094/JexlInjectionTest.ql | 2 +- java/ql/test/query-tests/security/CWE-094/MvelInjectionTest.ql | 2 +- java/ql/test/query-tests/security/CWE-094/SpelInjectionTest.ql | 2 +- .../test/query-tests/security/CWE-094/TemplateInjectionTest.ql | 2 +- .../security/CWE-113/semmle/tests/ResponseSplitting.qlref | 2 +- java/ql/test/query-tests/security/CWE-117/LogInjectionTest.ql | 2 +- .../security/CWE-1204/StaticInitializationVectorTest.ql | 2 +- .../semmle/tests/ImproperValidationOfArrayConstruction.qlref | 2 +- .../ImproperValidationOfArrayConstructionCodeSpecified.qlref | 2 +- .../CWE-129/semmle/tests/ImproperValidationOfArrayIndex.qlref | 2 +- .../tests/ImproperValidationOfArrayIndexCodeSpecified.qlref | 2 +- .../CWE-134/semmle/tests/ExternallyControlledFormatString.qlref | 2 +- .../security/CWE-190/semmle/tests/ArithmeticTainted.qlref | 2 +- .../security/CWE-190/semmle/tests/ArithmeticUncontrolled.qlref | 2 +- .../CWE-190/semmle/tests/ArithmeticWithExtremeValues.qlref | 2 +- .../security/CWE-200/semmle/tests/SensitiveNotification/test.ql | 2 +- .../security/CWE-200/semmle/tests/SensitiveTextView/test.ql | 2 +- .../TempDirLocalInformationDisclosure.qlref | 2 +- .../security/CWE-266/IntentUriPermissionManipulationTest.ql | 2 +- .../ql/test/query-tests/security/CWE-273/UnsafeCertTrustTest.ql | 2 +- .../security/CWE-287/InsecureKeys/Test1/InsecureKeys.ql | 2 +- .../security/CWE-287/InsecureKeys/Test2/InsecureKeys.ql | 2 +- .../security/CWE-287/InsecureLocalAuth/InsecureLocalAuth.ql | 2 +- .../CWE-295/AndroidMissingCertificatePinning/Test1/test.ql | 2 +- .../CWE-295/AndroidMissingCertificatePinning/Test2/test.ql | 2 +- .../CWE-295/AndroidMissingCertificatePinning/Test3/test.ql | 2 +- .../CWE-295/AndroidMissingCertificatePinning/Test4/test.ql | 2 +- .../CWE-295/AndroidMissingCertificatePinning/Test5/test.ql | 2 +- .../CWE-295/ImproperWebVeiwCertificateValidation/test.ql | 2 +- .../CWE-295/InsecureTrustManager/InsecureTrustManagerTest.ql | 2 +- .../test/query-tests/security/CWE-297/InsecureJavaMailTest.ql | 2 +- .../security/CWE-297/UnsafeHostnameVerification.qlref | 2 +- .../test/query-tests/security/CWE-311/CWE-319/HttpsUrls.qlref | 2 +- .../CleartextStorage/CleartextStorageAndroidDatabaseTest.ql | 2 +- .../CleartextStorage/CleartextStorageAndroidFilesystemTest.ql | 2 +- .../android/CleartextStorage/CleartextStorageSharedPrefsTest.ql | 2 +- .../query-tests/security/CWE-326/InsufficientKeySizeTest.ql | 2 +- .../security/CWE-327/semmle/tests/BrokenCryptoAlgorithm.qlref | 2 +- .../test/query-tests/security/CWE-330/InsecureRandomnessTest.ql | 2 +- .../security/CWE-347/MissingJWTSignatureCheckTest.ql | 2 +- .../query-tests/security/CWE-352/SpringCsrfProtectionTest.ql | 2 +- .../security/CWE-441/UnsafeContentUriResolutionTest.ql | 2 +- .../CWE-470/FragmentInjectionInPreferenceActivityTest.ql | 2 +- .../test/query-tests/security/CWE-470/FragmentInjectionTest.ql | 2 +- .../debuggable-attribute/DebuggableAttributeEnabledTest.ql | 2 +- .../CWE-489/webview-debugging/WebviewDebuggingEnabled.ql | 2 +- .../query-tests/security/CWE-501/TrustBoundaryViolations.ql | 2 +- .../test/query-tests/security/CWE-502/UnsafeDeserialization.ql | 2 +- .../test/query-tests/security/CWE-522/InsecureBasicAuthTest.ql | 2 +- .../test/query-tests/security/CWE-522/InsecureLdapAuthTest.ql | 2 +- .../test/query-tests/security/CWE-524/SensitiveKeyboardCache.ql | 2 +- java/ql/test/query-tests/security/CWE-532/SensitiveLogInfo.ql | 2 +- java/ql/test/query-tests/security/CWE-552/UrlForwardTest.ql | 2 +- .../query-tests/security/CWE-601/semmle/tests/UrlRedirect.qlref | 2 +- java/ql/test/query-tests/security/CWE-611/XXE.ql | 2 +- java/ql/test/query-tests/security/CWE-643/XPathInjectionTest.ql | 2 +- .../security/CWE-681/semmle/tests/NumericCastTainted.qlref | 2 +- java/ql/test/query-tests/security/CWE-730/PolynomialReDoS.ql | 2 +- java/ql/test/query-tests/security/CWE-730/ReDoS.ql | 2 +- java/ql/test/query-tests/security/CWE-730/RegexInjectionTest.ql | 2 +- .../query-tests/security/CWE-749/UnsafeAndroidAccessTest.ql | 2 +- java/ql/test/query-tests/security/CWE-780/RsaWithoutOaepTest.ql | 2 +- .../CWE-798/semmle/tests/HardcodedCredentialsApiCall.ql | 2 +- .../CWE-798/semmle/tests/HardcodedCredentialsComparison.ql | 2 +- .../CWE-798/semmle/tests/HardcodedCredentialsSourceCall.ql | 2 +- .../security/CWE-798/semmle/tests/HardcodedPasswordField.ql | 2 +- .../security/CWE-807/semmle/tests/ConditionalBypassTest.ql | 2 +- .../security/CWE-807/semmle/tests/TaintedPermissionsCheck.qlref | 2 +- java/ql/test/query-tests/security/CWE-917/OgnlInjectionTest.ql | 2 +- java/ql/test/query-tests/security/CWE-918/RequestForgery.ql | 2 +- .../query-tests/security/CWE-925/ImproperIntentVerification.ql | 2 +- .../security/CWE-926/ImplicitlyExportedAndroidComponentTest.ql | 2 +- .../ContentProviderIncompletePermissionsTest.ql | 2 +- .../query-tests/security/CWE-927/ImplicitPendingIntentsTest.ql | 2 +- .../test/query-tests/security/CWE-927/SensitiveCommunication.ql | 2 +- .../query-tests/security/CWE-927/SensitiveResultReceiver.ql | 2 +- .../security/CWE-940/AndroidIntentRedirectionTest.qlref | 2 +- .../modelgenerator/dataflow/CaptureContentSummaryModels.ql | 2 +- .../test/utils/modelgenerator/dataflow/CaptureNeutralModels.ql | 2 +- java/ql/test/utils/modelgenerator/dataflow/CaptureSinkModels.ql | 2 +- .../test/utils/modelgenerator/dataflow/CaptureSourceModels.ql | 2 +- .../test/utils/modelgenerator/dataflow/CaptureSummaryModels.ql | 2 +- .../typebasedflow/CaptureTypeBasedSummaryModels.ql | 2 +- 226 files changed, 226 insertions(+), 226 deletions(-) diff --git a/java/ql/integration-tests/kotlin/all-platforms/default-parameter-mad-flow/test.ql b/java/ql/integration-tests/kotlin/all-platforms/default-parameter-mad-flow/test.ql index fe412adce903..d6f9212b0317 100644 --- a/java/ql/integration-tests/kotlin/all-platforms/default-parameter-mad-flow/test.ql +++ b/java/ql/integration-tests/kotlin/all-platforms/default-parameter-mad-flow/test.ql @@ -1,6 +1,6 @@ import java import semmle.code.java.dataflow.TaintTracking -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest private import semmle.code.java.dataflow.ExternalFlow module Config implements DataFlow::ConfigSig { diff --git a/java/ql/src/utils/flowtestcasegenerator/testHeader.qlfrag b/java/ql/src/utils/flowtestcasegenerator/testHeader.qlfrag index aca87429a3ac..d9dafb0e7846 100644 --- a/java/ql/src/utils/flowtestcasegenerator/testHeader.qlfrag +++ b/java/ql/src/utils/flowtestcasegenerator/testHeader.qlfrag @@ -1,3 +1,3 @@ import java -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest import DefaultFlowTest diff --git a/java/ql/test-kotlin1/library-tests/dataflow/summaries/test.ql b/java/ql/test-kotlin1/library-tests/dataflow/summaries/test.ql index a8287d6c5f1a..de0d4722737b 100644 --- a/java/ql/test-kotlin1/library-tests/dataflow/summaries/test.ql +++ b/java/ql/test-kotlin1/library-tests/dataflow/summaries/test.ql @@ -1,4 +1,4 @@ import java -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest import DefaultFlowTest import TaintFlow::PathGraph diff --git a/java/ql/test-kotlin2/library-tests/dataflow/summaries/test.ql b/java/ql/test-kotlin2/library-tests/dataflow/summaries/test.ql index a8287d6c5f1a..de0d4722737b 100644 --- a/java/ql/test-kotlin2/library-tests/dataflow/summaries/test.ql +++ b/java/ql/test-kotlin2/library-tests/dataflow/summaries/test.ql @@ -1,4 +1,4 @@ import java -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest import DefaultFlowTest import TaintFlow::PathGraph diff --git a/java/ql/test/experimental/query-tests/security/CWE-020/Log4jInjectionTest.qlref b/java/ql/test/experimental/query-tests/security/CWE-020/Log4jInjectionTest.qlref index 3ba0d235fc67..ea158af1e3ab 100644 --- a/java/ql/test/experimental/query-tests/security/CWE-020/Log4jInjectionTest.qlref +++ b/java/ql/test/experimental/query-tests/security/CWE-020/Log4jInjectionTest.qlref @@ -1,2 +1,2 @@ query: experimental/Security/CWE/CWE-020/Log4jJndiInjection.ql -postprocess: TestUtilities/PrettyPrintModels.ql +postprocess: utils/test/PrettyPrintModels.ql diff --git a/java/ql/test/experimental/query-tests/security/CWE-022/TaintedPath.ql b/java/ql/test/experimental/query-tests/security/CWE-022/TaintedPath.ql index 36efd8724cc4..b9bd00cab97d 100644 --- a/java/ql/test/experimental/query-tests/security/CWE-022/TaintedPath.ql +++ b/java/ql/test/experimental/query-tests/security/CWE-022/TaintedPath.ql @@ -1,5 +1,5 @@ import java -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest import semmle.code.java.security.TaintedPathQuery import TaintFlowTestArgString diff --git a/java/ql/test/experimental/query-tests/security/CWE-073/FilePathInjection.qlref b/java/ql/test/experimental/query-tests/security/CWE-073/FilePathInjection.qlref index cf88c001c7e1..e0dc75098eb2 100644 --- a/java/ql/test/experimental/query-tests/security/CWE-073/FilePathInjection.qlref +++ b/java/ql/test/experimental/query-tests/security/CWE-073/FilePathInjection.qlref @@ -1,2 +1,2 @@ query: experimental/Security/CWE/CWE-073/FilePathInjection.ql -postprocess: TestUtilities/PrettyPrintModels.ql +postprocess: utils/test/PrettyPrintModels.ql diff --git a/java/ql/test/experimental/query-tests/security/CWE-078/CommandInjectionRuntimeExecLocal.qlref b/java/ql/test/experimental/query-tests/security/CWE-078/CommandInjectionRuntimeExecLocal.qlref index cfeb215d626e..24bd62c5a2e6 100644 --- a/java/ql/test/experimental/query-tests/security/CWE-078/CommandInjectionRuntimeExecLocal.qlref +++ b/java/ql/test/experimental/query-tests/security/CWE-078/CommandInjectionRuntimeExecLocal.qlref @@ -1,2 +1,2 @@ query: experimental/Security/CWE/CWE-078/CommandInjectionRuntimeExecLocal.ql -postprocess: TestUtilities/PrettyPrintModels.ql +postprocess: utils/test/PrettyPrintModels.ql diff --git a/java/ql/test/experimental/query-tests/security/CWE-078/ExecTainted.qlref b/java/ql/test/experimental/query-tests/security/CWE-078/ExecTainted.qlref index 8451f6226fc5..ddd01d295395 100644 --- a/java/ql/test/experimental/query-tests/security/CWE-078/ExecTainted.qlref +++ b/java/ql/test/experimental/query-tests/security/CWE-078/ExecTainted.qlref @@ -1,2 +1,2 @@ query: experimental/Security/CWE/CWE-078/ExecTainted.ql -postprocess: TestUtilities/PrettyPrintModels.ql +postprocess: utils/test/PrettyPrintModels.ql diff --git a/java/ql/test/experimental/query-tests/security/CWE-089/src/main/MyBatisAnnotationSqlInjection.qlref b/java/ql/test/experimental/query-tests/security/CWE-089/src/main/MyBatisAnnotationSqlInjection.qlref index d41f3c1efde0..44302277a796 100644 --- a/java/ql/test/experimental/query-tests/security/CWE-089/src/main/MyBatisAnnotationSqlInjection.qlref +++ b/java/ql/test/experimental/query-tests/security/CWE-089/src/main/MyBatisAnnotationSqlInjection.qlref @@ -1,2 +1,2 @@ query: experimental/Security/CWE/CWE-089/MyBatisAnnotationSqlInjection.ql -postprocess: TestUtilities/PrettyPrintModels.ql +postprocess: utils/test/PrettyPrintModels.ql diff --git a/java/ql/test/experimental/query-tests/security/CWE-089/src/main/MyBatisMapperXmlSqlInjection.qlref b/java/ql/test/experimental/query-tests/security/CWE-089/src/main/MyBatisMapperXmlSqlInjection.qlref index c1c43afdfcff..19e95a85de4c 100644 --- a/java/ql/test/experimental/query-tests/security/CWE-089/src/main/MyBatisMapperXmlSqlInjection.qlref +++ b/java/ql/test/experimental/query-tests/security/CWE-089/src/main/MyBatisMapperXmlSqlInjection.qlref @@ -1,2 +1,2 @@ query: experimental/Security/CWE/CWE-089/MyBatisMapperXmlSqlInjection.ql -postprocess: TestUtilities/PrettyPrintModels.ql +postprocess: utils/test/PrettyPrintModels.ql diff --git a/java/ql/test/experimental/query-tests/security/CWE-094/BeanShellInjection.qlref b/java/ql/test/experimental/query-tests/security/CWE-094/BeanShellInjection.qlref index 52a4e4c6bea9..00de86522031 100644 --- a/java/ql/test/experimental/query-tests/security/CWE-094/BeanShellInjection.qlref +++ b/java/ql/test/experimental/query-tests/security/CWE-094/BeanShellInjection.qlref @@ -1,2 +1,2 @@ query: experimental/Security/CWE/CWE-094/BeanShellInjection.ql -postprocess: TestUtilities/PrettyPrintModels.ql +postprocess: utils/test/PrettyPrintModels.ql diff --git a/java/ql/test/experimental/query-tests/security/CWE-094/JShellInjection.qlref b/java/ql/test/experimental/query-tests/security/CWE-094/JShellInjection.qlref index dd4bb6704a3a..d5b2db58b53a 100644 --- a/java/ql/test/experimental/query-tests/security/CWE-094/JShellInjection.qlref +++ b/java/ql/test/experimental/query-tests/security/CWE-094/JShellInjection.qlref @@ -1,2 +1,2 @@ query: experimental/Security/CWE/CWE-094/JShellInjection.ql -postprocess: TestUtilities/PrettyPrintModels.ql +postprocess: utils/test/PrettyPrintModels.ql diff --git a/java/ql/test/experimental/query-tests/security/CWE-094/JakartaExpressionInjection.qlref b/java/ql/test/experimental/query-tests/security/CWE-094/JakartaExpressionInjection.qlref index f7d16eb709b3..e00d8a116585 100644 --- a/java/ql/test/experimental/query-tests/security/CWE-094/JakartaExpressionInjection.qlref +++ b/java/ql/test/experimental/query-tests/security/CWE-094/JakartaExpressionInjection.qlref @@ -1,2 +1,2 @@ query: experimental/Security/CWE/CWE-094/JakartaExpressionInjection.ql -postprocess: TestUtilities/PrettyPrintModels.ql +postprocess: utils/test/PrettyPrintModels.ql diff --git a/java/ql/test/experimental/query-tests/security/CWE-094/JythonInjection.qlref b/java/ql/test/experimental/query-tests/security/CWE-094/JythonInjection.qlref index 90ec9f034f18..7448a79394ec 100644 --- a/java/ql/test/experimental/query-tests/security/CWE-094/JythonInjection.qlref +++ b/java/ql/test/experimental/query-tests/security/CWE-094/JythonInjection.qlref @@ -1,2 +1,2 @@ query: experimental/Security/CWE/CWE-094/JythonInjection.ql -postprocess: TestUtilities/PrettyPrintModels.ql +postprocess: utils/test/PrettyPrintModels.ql diff --git a/java/ql/test/experimental/query-tests/security/CWE-094/ScriptInjection.qlref b/java/ql/test/experimental/query-tests/security/CWE-094/ScriptInjection.qlref index c4905e1422e4..8bd566cf4fda 100644 --- a/java/ql/test/experimental/query-tests/security/CWE-094/ScriptInjection.qlref +++ b/java/ql/test/experimental/query-tests/security/CWE-094/ScriptInjection.qlref @@ -1,2 +1,2 @@ query: experimental/Security/CWE/CWE-094/ScriptInjection.ql -postprocess: TestUtilities/PrettyPrintModels.ql +postprocess: utils/test/PrettyPrintModels.ql diff --git a/java/ql/test/experimental/query-tests/security/CWE-1004/SensitiveCookieNotHttpOnly.qlref b/java/ql/test/experimental/query-tests/security/CWE-1004/SensitiveCookieNotHttpOnly.qlref index d4b20a8f0cda..9c7ce3d63299 100644 --- a/java/ql/test/experimental/query-tests/security/CWE-1004/SensitiveCookieNotHttpOnly.qlref +++ b/java/ql/test/experimental/query-tests/security/CWE-1004/SensitiveCookieNotHttpOnly.qlref @@ -1,2 +1,2 @@ query: experimental/Security/CWE/CWE-1004/SensitiveCookieNotHttpOnly.ql -postprocess: TestUtilities/PrettyPrintModels.ql +postprocess: utils/test/PrettyPrintModels.ql diff --git a/java/ql/test/experimental/query-tests/security/CWE-200/InsecureWebResourceResponse.qlref b/java/ql/test/experimental/query-tests/security/CWE-200/InsecureWebResourceResponse.qlref index 29bde4fa4162..09049772ede7 100644 --- a/java/ql/test/experimental/query-tests/security/CWE-200/InsecureWebResourceResponse.qlref +++ b/java/ql/test/experimental/query-tests/security/CWE-200/InsecureWebResourceResponse.qlref @@ -1,2 +1,2 @@ query: experimental/Security/CWE/CWE-200/InsecureWebResourceResponse.ql -postprocess: TestUtilities/PrettyPrintModels.ql +postprocess: utils/test/PrettyPrintModels.ql diff --git a/java/ql/test/experimental/query-tests/security/CWE-200/SensitiveAndroidFileLeak.qlref b/java/ql/test/experimental/query-tests/security/CWE-200/SensitiveAndroidFileLeak.qlref index b10404345cb5..a98eeb219143 100644 --- a/java/ql/test/experimental/query-tests/security/CWE-200/SensitiveAndroidFileLeak.qlref +++ b/java/ql/test/experimental/query-tests/security/CWE-200/SensitiveAndroidFileLeak.qlref @@ -1,2 +1,2 @@ query: experimental/Security/CWE/CWE-200/SensitiveAndroidFileLeak.ql -postprocess: TestUtilities/PrettyPrintModels.ql +postprocess: utils/test/PrettyPrintModels.ql diff --git a/java/ql/test/experimental/query-tests/security/CWE-208/NotConstantTimeCheckOnSignature/Test.qlref b/java/ql/test/experimental/query-tests/security/CWE-208/NotConstantTimeCheckOnSignature/Test.qlref index d2863ce22d56..7a83f56cbd6c 100644 --- a/java/ql/test/experimental/query-tests/security/CWE-208/NotConstantTimeCheckOnSignature/Test.qlref +++ b/java/ql/test/experimental/query-tests/security/CWE-208/NotConstantTimeCheckOnSignature/Test.qlref @@ -1,2 +1,2 @@ query: experimental/Security/CWE/CWE-208/PossibleTimingAttackAgainstSignature.ql -postprocess: TestUtilities/PrettyPrintModels.ql +postprocess: utils/test/PrettyPrintModels.ql diff --git a/java/ql/test/experimental/query-tests/security/CWE-208/TimingAttackAgainstSignagure/Test.qlref b/java/ql/test/experimental/query-tests/security/CWE-208/TimingAttackAgainstSignagure/Test.qlref index b436a54c5502..f8275271b6bb 100644 --- a/java/ql/test/experimental/query-tests/security/CWE-208/TimingAttackAgainstSignagure/Test.qlref +++ b/java/ql/test/experimental/query-tests/security/CWE-208/TimingAttackAgainstSignagure/Test.qlref @@ -1,2 +1,2 @@ query: experimental/Security/CWE/CWE-208/TimingAttackAgainstSignature.ql -postprocess: TestUtilities/PrettyPrintModels.ql +postprocess: utils/test/PrettyPrintModels.ql diff --git a/java/ql/test/experimental/query-tests/security/CWE-299/DisabledRevocationChecking.qlref b/java/ql/test/experimental/query-tests/security/CWE-299/DisabledRevocationChecking.qlref index 4c454db5f7f3..cc9089b49519 100644 --- a/java/ql/test/experimental/query-tests/security/CWE-299/DisabledRevocationChecking.qlref +++ b/java/ql/test/experimental/query-tests/security/CWE-299/DisabledRevocationChecking.qlref @@ -1,2 +1,2 @@ query: experimental/Security/CWE/CWE-299/DisabledRevocationChecking.ql -postprocess: TestUtilities/PrettyPrintModels.ql +postprocess: utils/test/PrettyPrintModels.ql diff --git a/java/ql/test/experimental/query-tests/security/CWE-327/UnsafeTlsVersion.qlref b/java/ql/test/experimental/query-tests/security/CWE-327/UnsafeTlsVersion.qlref index b00ac77d17e8..f29bf9a7836a 100644 --- a/java/ql/test/experimental/query-tests/security/CWE-327/UnsafeTlsVersion.qlref +++ b/java/ql/test/experimental/query-tests/security/CWE-327/UnsafeTlsVersion.qlref @@ -1,2 +1,2 @@ query: experimental/Security/CWE/CWE-327/UnsafeTlsVersion.ql -postprocess: TestUtilities/PrettyPrintModels.ql +postprocess: utils/test/PrettyPrintModels.ql diff --git a/java/ql/test/experimental/query-tests/security/CWE-346/UnvalidatedCors.qlref b/java/ql/test/experimental/query-tests/security/CWE-346/UnvalidatedCors.qlref index 1a5ca2ac8acd..90fde66959b1 100644 --- a/java/ql/test/experimental/query-tests/security/CWE-346/UnvalidatedCors.qlref +++ b/java/ql/test/experimental/query-tests/security/CWE-346/UnvalidatedCors.qlref @@ -1,2 +1,2 @@ query: experimental/Security/CWE/CWE-346/UnvalidatedCors.ql -postprocess: TestUtilities/PrettyPrintModels.ql +postprocess: utils/test/PrettyPrintModels.ql diff --git a/java/ql/test/experimental/query-tests/security/CWE-347/Auth0NoVerifier.qlref b/java/ql/test/experimental/query-tests/security/CWE-347/Auth0NoVerifier.qlref index 14b020f24cd3..0cd8baf6d341 100644 --- a/java/ql/test/experimental/query-tests/security/CWE-347/Auth0NoVerifier.qlref +++ b/java/ql/test/experimental/query-tests/security/CWE-347/Auth0NoVerifier.qlref @@ -1,2 +1,2 @@ query: experimental/Security/CWE/CWE-347/Auth0NoVerifier.ql -postprocess: TestUtilities/PrettyPrintModels.ql \ No newline at end of file +postprocess: utils/test/PrettyPrintModels.ql \ No newline at end of file diff --git a/java/ql/test/experimental/query-tests/security/CWE-348/ClientSuppliedIpUsedInSecurityCheck.qlref b/java/ql/test/experimental/query-tests/security/CWE-348/ClientSuppliedIpUsedInSecurityCheck.qlref index 1876787a65e2..8ca6ac71c9a6 100644 --- a/java/ql/test/experimental/query-tests/security/CWE-348/ClientSuppliedIpUsedInSecurityCheck.qlref +++ b/java/ql/test/experimental/query-tests/security/CWE-348/ClientSuppliedIpUsedInSecurityCheck.qlref @@ -1,2 +1,2 @@ query: experimental/Security/CWE/CWE-348/ClientSuppliedIpUsedInSecurityCheck.ql -postprocess: TestUtilities/PrettyPrintModels.ql +postprocess: utils/test/PrettyPrintModels.ql diff --git a/java/ql/test/experimental/query-tests/security/CWE-352/JsonpInjection.qlref b/java/ql/test/experimental/query-tests/security/CWE-352/JsonpInjection.qlref index 9f74a8f854e5..15b579b57eab 100644 --- a/java/ql/test/experimental/query-tests/security/CWE-352/JsonpInjection.qlref +++ b/java/ql/test/experimental/query-tests/security/CWE-352/JsonpInjection.qlref @@ -1,2 +1,2 @@ query: experimental/Security/CWE/CWE-352/JsonpInjection.ql -postprocess: TestUtilities/PrettyPrintModels.ql +postprocess: utils/test/PrettyPrintModels.ql diff --git a/java/ql/test/experimental/query-tests/security/CWE-400/LocalThreadResourceAbuse.qlref b/java/ql/test/experimental/query-tests/security/CWE-400/LocalThreadResourceAbuse.qlref index 7d8f79b538bf..12c247f1f3ba 100644 --- a/java/ql/test/experimental/query-tests/security/CWE-400/LocalThreadResourceAbuse.qlref +++ b/java/ql/test/experimental/query-tests/security/CWE-400/LocalThreadResourceAbuse.qlref @@ -1,2 +1,2 @@ query: experimental/Security/CWE/CWE-400/LocalThreadResourceAbuse.ql -postprocess: TestUtilities/PrettyPrintModels.ql +postprocess: utils/test/PrettyPrintModels.ql diff --git a/java/ql/test/experimental/query-tests/security/CWE-400/ThreadResourceAbuse.qlref b/java/ql/test/experimental/query-tests/security/CWE-400/ThreadResourceAbuse.qlref index 391f2358ea0e..caf6f8da85ba 100644 --- a/java/ql/test/experimental/query-tests/security/CWE-400/ThreadResourceAbuse.qlref +++ b/java/ql/test/experimental/query-tests/security/CWE-400/ThreadResourceAbuse.qlref @@ -1,2 +1,2 @@ query: experimental/Security/CWE/CWE-400/ThreadResourceAbuse.ql -postprocess: TestUtilities/PrettyPrintModels.ql +postprocess: utils/test/PrettyPrintModels.ql diff --git a/java/ql/test/experimental/query-tests/security/CWE-470/LoadClassNoSignatureCheck.qlref b/java/ql/test/experimental/query-tests/security/CWE-470/LoadClassNoSignatureCheck.qlref index f12675808ba2..5feabdb8becd 100644 --- a/java/ql/test/experimental/query-tests/security/CWE-470/LoadClassNoSignatureCheck.qlref +++ b/java/ql/test/experimental/query-tests/security/CWE-470/LoadClassNoSignatureCheck.qlref @@ -1,2 +1,2 @@ query: experimental/Security/CWE/CWE-470/LoadClassNoSignatureCheck.ql -postprocess: TestUtilities/PrettyPrintModels.ql +postprocess: utils/test/PrettyPrintModels.ql diff --git a/java/ql/test/experimental/query-tests/security/CWE-470/UnsafeReflection.qlref b/java/ql/test/experimental/query-tests/security/CWE-470/UnsafeReflection.qlref index 7d018a21278c..28822316a908 100644 --- a/java/ql/test/experimental/query-tests/security/CWE-470/UnsafeReflection.qlref +++ b/java/ql/test/experimental/query-tests/security/CWE-470/UnsafeReflection.qlref @@ -1,2 +1,2 @@ query: experimental/Security/CWE/CWE-470/UnsafeReflection.ql -postprocess: TestUtilities/PrettyPrintModels.ql +postprocess: utils/test/PrettyPrintModels.ql diff --git a/java/ql/test/experimental/query-tests/security/CWE-502/UnsafeDeserializationRmi.qlref b/java/ql/test/experimental/query-tests/security/CWE-502/UnsafeDeserializationRmi.qlref index 554ae928f15d..f9691113cfaa 100644 --- a/java/ql/test/experimental/query-tests/security/CWE-502/UnsafeDeserializationRmi.qlref +++ b/java/ql/test/experimental/query-tests/security/CWE-502/UnsafeDeserializationRmi.qlref @@ -1,2 +1,2 @@ query: experimental/Security/CWE/CWE-502/UnsafeDeserializationRmi.ql -postprocess: TestUtilities/PrettyPrintModels.ql +postprocess: utils/test/PrettyPrintModels.ql diff --git a/java/ql/test/experimental/query-tests/security/CWE-522-DecompressionBombs/test.ql b/java/ql/test/experimental/query-tests/security/CWE-522-DecompressionBombs/test.ql index 77b1ced45132..388546202c83 100644 --- a/java/ql/test/experimental/query-tests/security/CWE-522-DecompressionBombs/test.ql +++ b/java/ql/test/experimental/query-tests/security/CWE-522-DecompressionBombs/test.ql @@ -1,6 +1,6 @@ import java import experimental.semmle.code.java.security.DecompressionBombQuery -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest import TaintFlowTestArgString string getArgString(DataFlow::Node src, DataFlow::Node sink) { diff --git a/java/ql/test/experimental/query-tests/security/CWE-598/SensitiveGetQuery.qlref b/java/ql/test/experimental/query-tests/security/CWE-598/SensitiveGetQuery.qlref index 792fe5d5d03d..53c2523e0411 100644 --- a/java/ql/test/experimental/query-tests/security/CWE-598/SensitiveGetQuery.qlref +++ b/java/ql/test/experimental/query-tests/security/CWE-598/SensitiveGetQuery.qlref @@ -1,2 +1,2 @@ query: experimental/Security/CWE/CWE-598/SensitiveGetQuery.ql -postprocess: TestUtilities/PrettyPrintModels.ql +postprocess: utils/test/PrettyPrintModels.ql diff --git a/java/ql/test/experimental/query-tests/security/CWE-600/UncaughtServletException.qlref b/java/ql/test/experimental/query-tests/security/CWE-600/UncaughtServletException.qlref index f1fd52acf7d1..14466d983a7e 100644 --- a/java/ql/test/experimental/query-tests/security/CWE-600/UncaughtServletException.qlref +++ b/java/ql/test/experimental/query-tests/security/CWE-600/UncaughtServletException.qlref @@ -1,2 +1,2 @@ query: experimental/Security/CWE/CWE-600/UncaughtServletException.ql -postprocess: TestUtilities/PrettyPrintModels.ql +postprocess: utils/test/PrettyPrintModels.ql diff --git a/java/ql/test/experimental/query-tests/security/CWE-601/SpringUrlRedirect.qlref b/java/ql/test/experimental/query-tests/security/CWE-601/SpringUrlRedirect.qlref index 3042754d472f..3c1c8a42a95b 100644 --- a/java/ql/test/experimental/query-tests/security/CWE-601/SpringUrlRedirect.qlref +++ b/java/ql/test/experimental/query-tests/security/CWE-601/SpringUrlRedirect.qlref @@ -1,2 +1,2 @@ query: experimental/Security/CWE/CWE-601/SpringUrlRedirect.ql -postprocess: TestUtilities/PrettyPrintModels.ql +postprocess: utils/test/PrettyPrintModels.ql diff --git a/java/ql/test/experimental/query-tests/security/CWE-625/PermissiveDotRegex.qlref b/java/ql/test/experimental/query-tests/security/CWE-625/PermissiveDotRegex.qlref index 3c2e294d0fe1..67382a5e297e 100644 --- a/java/ql/test/experimental/query-tests/security/CWE-625/PermissiveDotRegex.qlref +++ b/java/ql/test/experimental/query-tests/security/CWE-625/PermissiveDotRegex.qlref @@ -1,2 +1,2 @@ query: experimental/Security/CWE/CWE-625/PermissiveDotRegex.ql -postprocess: TestUtilities/PrettyPrintModels.ql +postprocess: utils/test/PrettyPrintModels.ql diff --git a/java/ql/test/experimental/query-tests/security/CWE-652/XQueryInjection.qlref b/java/ql/test/experimental/query-tests/security/CWE-652/XQueryInjection.qlref index 144ddadbc85e..df94ae95807d 100644 --- a/java/ql/test/experimental/query-tests/security/CWE-652/XQueryInjection.qlref +++ b/java/ql/test/experimental/query-tests/security/CWE-652/XQueryInjection.qlref @@ -1,2 +1,2 @@ query: experimental/Security/CWE/CWE-652/XQueryInjection.ql -postprocess: TestUtilities/PrettyPrintModels.ql +postprocess: utils/test/PrettyPrintModels.ql diff --git a/java/ql/test/experimental/query-tests/security/CWE-755/NFEAndroidDoS.qlref b/java/ql/test/experimental/query-tests/security/CWE-755/NFEAndroidDoS.qlref index 98cebb7e10f7..17bd71ea68af 100644 --- a/java/ql/test/experimental/query-tests/security/CWE-755/NFEAndroidDoS.qlref +++ b/java/ql/test/experimental/query-tests/security/CWE-755/NFEAndroidDoS.qlref @@ -1,2 +1,2 @@ query: experimental/Security/CWE/CWE-755/NFEAndroidDoS.ql -postprocess: TestUtilities/PrettyPrintModels.ql +postprocess: utils/test/PrettyPrintModels.ql diff --git a/java/ql/test/experimental/query-tests/security/CWE-759/HashWithoutSalt.qlref b/java/ql/test/experimental/query-tests/security/CWE-759/HashWithoutSalt.qlref index 7e6fc4567369..b2f767ca66ac 100644 --- a/java/ql/test/experimental/query-tests/security/CWE-759/HashWithoutSalt.qlref +++ b/java/ql/test/experimental/query-tests/security/CWE-759/HashWithoutSalt.qlref @@ -1,2 +1,2 @@ query: experimental/Security/CWE/CWE-759/HashWithoutSalt.ql -postprocess: TestUtilities/PrettyPrintModels.ql +postprocess: utils/test/PrettyPrintModels.ql diff --git a/java/ql/test/ext/TestModels/test.ql b/java/ql/test/ext/TestModels/test.ql index a8287d6c5f1a..de0d4722737b 100644 --- a/java/ql/test/ext/TestModels/test.ql +++ b/java/ql/test/ext/TestModels/test.ql @@ -1,4 +1,4 @@ import java -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest import DefaultFlowTest import TaintFlow::PathGraph diff --git a/java/ql/test/library-tests/dataflow/callback-dispatch/test.ql b/java/ql/test/library-tests/dataflow/callback-dispatch/test.ql index a95352f7f722..c8b66590f019 100644 --- a/java/ql/test/library-tests/dataflow/callback-dispatch/test.ql +++ b/java/ql/test/library-tests/dataflow/callback-dispatch/test.ql @@ -1,6 +1,6 @@ import java import semmle.code.java.dataflow.DataFlow -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest module Config implements DataFlow::ConfigSig { predicate isSource(DataFlow::Node n) { n.asExpr().(MethodCall).getMethod().hasName("source") } diff --git a/java/ql/test/library-tests/dataflow/callctx/test.ql b/java/ql/test/library-tests/dataflow/callctx/test.ql index a8287d6c5f1a..de0d4722737b 100644 --- a/java/ql/test/library-tests/dataflow/callctx/test.ql +++ b/java/ql/test/library-tests/dataflow/callctx/test.ql @@ -1,4 +1,4 @@ import java -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest import DefaultFlowTest import TaintFlow::PathGraph diff --git a/java/ql/test/library-tests/dataflow/capture/inlinetest.ql b/java/ql/test/library-tests/dataflow/capture/inlinetest.ql index 8a82c0c18009..e64b8bfececb 100644 --- a/java/ql/test/library-tests/dataflow/capture/inlinetest.ql +++ b/java/ql/test/library-tests/dataflow/capture/inlinetest.ql @@ -1,3 +1,3 @@ -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest import DefaultFlowTest import TaintFlow::PathGraph diff --git a/java/ql/test/library-tests/dataflow/collections/containerflow.ql b/java/ql/test/library-tests/dataflow/collections/containerflow.ql index de5ff146faef..029108b6257c 100644 --- a/java/ql/test/library-tests/dataflow/collections/containerflow.ql +++ b/java/ql/test/library-tests/dataflow/collections/containerflow.ql @@ -1,5 +1,5 @@ import java import semmle.code.java.dataflow.DataFlow -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest import DefaultFlowTest import TaintFlow::PathGraph diff --git a/java/ql/test/library-tests/dataflow/entrypoint-types/EntryPointTypesTest.ql b/java/ql/test/library-tests/dataflow/entrypoint-types/EntryPointTypesTest.ql index 9ef1e3867d2d..65d97cae7994 100644 --- a/java/ql/test/library-tests/dataflow/entrypoint-types/EntryPointTypesTest.ql +++ b/java/ql/test/library-tests/dataflow/entrypoint-types/EntryPointTypesTest.ql @@ -1,6 +1,6 @@ import java import semmle.code.java.dataflow.FlowSources -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest class TestRemoteFlowSource extends RemoteFlowSource { TestRemoteFlowSource() { this.asParameter().hasName("source") } diff --git a/java/ql/test/library-tests/dataflow/field-value/test.ql b/java/ql/test/library-tests/dataflow/field-value/test.ql index 4c364e8df700..848974224060 100644 --- a/java/ql/test/library-tests/dataflow/field-value/test.ql +++ b/java/ql/test/library-tests/dataflow/field-value/test.ql @@ -1,5 +1,5 @@ import java -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest module FieldValueConfig implements DataFlow::ConfigSig { predicate isSource(DataFlow::Node source) { source instanceof DataFlow::FieldValueNode } diff --git a/java/ql/test/library-tests/dataflow/flowfeature/flow.ql b/java/ql/test/library-tests/dataflow/flowfeature/flow.ql index 9b2fc4ed36b0..7c41d610141c 100644 --- a/java/ql/test/library-tests/dataflow/flowfeature/flow.ql +++ b/java/ql/test/library-tests/dataflow/flowfeature/flow.ql @@ -1,6 +1,6 @@ import java import semmle.code.java.dataflow.DataFlow -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest module Base { predicate isSource(DataFlow::Node n) { n.asExpr().(MethodCall).getMethod().hasName("source") } diff --git a/java/ql/test/library-tests/dataflow/fluent-methods/flow.ql b/java/ql/test/library-tests/dataflow/fluent-methods/flow.ql index cb5151e62426..3b6e9062581f 100644 --- a/java/ql/test/library-tests/dataflow/fluent-methods/flow.ql +++ b/java/ql/test/library-tests/dataflow/fluent-methods/flow.ql @@ -1,7 +1,7 @@ import java import semmle.code.java.dataflow.DataFlow import semmle.code.java.dataflow.FlowSteps -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest import DefaultFlowTest import TaintFlow::PathGraph diff --git a/java/ql/test/library-tests/dataflow/implicit-read/test.ql b/java/ql/test/library-tests/dataflow/implicit-read/test.ql index 4b07984456ba..78cc3b5c7f25 100644 --- a/java/ql/test/library-tests/dataflow/implicit-read/test.ql +++ b/java/ql/test/library-tests/dataflow/implicit-read/test.ql @@ -1,5 +1,5 @@ import java -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest module TestConfig implements DataFlow::ConfigSig { predicate isSource(DataFlow::Node source) { DefaultFlowConfig::isSource(source) } diff --git a/java/ql/test/library-tests/dataflow/range-analysis-inline/range.ql b/java/ql/test/library-tests/dataflow/range-analysis-inline/range.ql index b0fcc1710d44..735bbe525706 100644 --- a/java/ql/test/library-tests/dataflow/range-analysis-inline/range.ql +++ b/java/ql/test/library-tests/dataflow/range-analysis-inline/range.ql @@ -5,7 +5,7 @@ import java import semmle.code.java.dataflow.RangeAnalysis -private import TestUtilities.InlineExpectationsTest as IET +private import utils.test.InlineExpectationsTest as IET module RangeTest implements IET::TestSig { string getARelevantTag() { result = "bound" } diff --git a/java/ql/test/library-tests/dataflow/state/test.ql b/java/ql/test/library-tests/dataflow/state/test.ql index 4107c2392a38..9a3b21af8cb0 100644 --- a/java/ql/test/library-tests/dataflow/state/test.ql +++ b/java/ql/test/library-tests/dataflow/state/test.ql @@ -1,6 +1,6 @@ import java import semmle.code.java.dataflow.TaintTracking -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest import DataFlow predicate src(Node n, string s) { diff --git a/java/ql/test/library-tests/dataflow/stream-collect/test.ql b/java/ql/test/library-tests/dataflow/stream-collect/test.ql index 8a82c0c18009..e64b8bfececb 100644 --- a/java/ql/test/library-tests/dataflow/stream-collect/test.ql +++ b/java/ql/test/library-tests/dataflow/stream-collect/test.ql @@ -1,3 +1,3 @@ -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest import DefaultFlowTest import TaintFlow::PathGraph diff --git a/java/ql/test/library-tests/dataflow/stream-read/test.ql b/java/ql/test/library-tests/dataflow/stream-read/test.ql index 8a82c0c18009..e64b8bfececb 100644 --- a/java/ql/test/library-tests/dataflow/stream-read/test.ql +++ b/java/ql/test/library-tests/dataflow/stream-read/test.ql @@ -1,3 +1,3 @@ -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest import DefaultFlowTest import TaintFlow::PathGraph diff --git a/java/ql/test/library-tests/dataflow/subpaths/flow.ql b/java/ql/test/library-tests/dataflow/subpaths/flow.ql index 8a82c0c18009..e64b8bfececb 100644 --- a/java/ql/test/library-tests/dataflow/subpaths/flow.ql +++ b/java/ql/test/library-tests/dataflow/subpaths/flow.ql @@ -1,3 +1,3 @@ -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest import DefaultFlowTest import TaintFlow::PathGraph diff --git a/java/ql/test/library-tests/dataflow/synth-global/test.ql b/java/ql/test/library-tests/dataflow/synth-global/test.ql index 50f1a17a4f9f..841eee98e319 100644 --- a/java/ql/test/library-tests/dataflow/synth-global/test.ql +++ b/java/ql/test/library-tests/dataflow/synth-global/test.ql @@ -1,6 +1,6 @@ import java import semmle.code.java.dataflow.ExternalFlow -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest import DefaultFlowTest import ModelValidation import TaintFlow::PathGraph diff --git a/java/ql/test/library-tests/dataflow/taint-format/test.ql b/java/ql/test/library-tests/dataflow/taint-format/test.ql index a8287d6c5f1a..de0d4722737b 100644 --- a/java/ql/test/library-tests/dataflow/taint-format/test.ql +++ b/java/ql/test/library-tests/dataflow/taint-format/test.ql @@ -1,4 +1,4 @@ import java -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest import DefaultFlowTest import TaintFlow::PathGraph diff --git a/java/ql/test/library-tests/dataflow/taint-gson/dataFlow.ql b/java/ql/test/library-tests/dataflow/taint-gson/dataFlow.ql index a8287d6c5f1a..de0d4722737b 100644 --- a/java/ql/test/library-tests/dataflow/taint-gson/dataFlow.ql +++ b/java/ql/test/library-tests/dataflow/taint-gson/dataFlow.ql @@ -1,4 +1,4 @@ import java -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest import DefaultFlowTest import TaintFlow::PathGraph diff --git a/java/ql/test/library-tests/dataflow/taint-jackson/dataFlow.ql b/java/ql/test/library-tests/dataflow/taint-jackson/dataFlow.ql index a8287d6c5f1a..de0d4722737b 100644 --- a/java/ql/test/library-tests/dataflow/taint-jackson/dataFlow.ql +++ b/java/ql/test/library-tests/dataflow/taint-jackson/dataFlow.ql @@ -1,4 +1,4 @@ import java -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest import DefaultFlowTest import TaintFlow::PathGraph diff --git a/java/ql/test/library-tests/dataflow/taintsources/local.ql b/java/ql/test/library-tests/dataflow/taintsources/local.ql index d4a08d836bb6..bcbdcc56e1a0 100644 --- a/java/ql/test/library-tests/dataflow/taintsources/local.ql +++ b/java/ql/test/library-tests/dataflow/taintsources/local.ql @@ -1,6 +1,6 @@ import java import semmle.code.java.dataflow.FlowSources -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest predicate isTestSink(DataFlow::Node n) { exists(MethodCall ma | ma.getMethod().hasName("sink") | n.asExpr() = ma.getAnArgument()) diff --git a/java/ql/test/library-tests/dataflow/taintsources/remote.ql b/java/ql/test/library-tests/dataflow/taintsources/remote.ql index ce466f6c6474..7382236b48b0 100644 --- a/java/ql/test/library-tests/dataflow/taintsources/remote.ql +++ b/java/ql/test/library-tests/dataflow/taintsources/remote.ql @@ -1,6 +1,6 @@ import java import semmle.code.java.dataflow.FlowSources -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest predicate isTestSink(DataFlow::Node n) { exists(MethodCall ma | ma.getMethod().hasName("sink") | n.asExpr() = ma.getAnArgument()) diff --git a/java/ql/test/library-tests/dataflow/taintsources/reversedns.ql b/java/ql/test/library-tests/dataflow/taintsources/reversedns.ql index 8ec5acab5e54..b1868b9ea69f 100644 --- a/java/ql/test/library-tests/dataflow/taintsources/reversedns.ql +++ b/java/ql/test/library-tests/dataflow/taintsources/reversedns.ql @@ -1,6 +1,6 @@ import java import semmle.code.java.dataflow.FlowSources -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest predicate isTestSink(DataFlow::Node n) { exists(MethodCall ma | ma.getMethod().hasName("sink") | n.asExpr() = ma.getAnArgument()) diff --git a/java/ql/test/library-tests/dataflow/typeflow-dispatch/test.ql b/java/ql/test/library-tests/dataflow/typeflow-dispatch/test.ql index 8a82c0c18009..e64b8bfececb 100644 --- a/java/ql/test/library-tests/dataflow/typeflow-dispatch/test.ql +++ b/java/ql/test/library-tests/dataflow/typeflow-dispatch/test.ql @@ -1,3 +1,3 @@ -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest import DefaultFlowTest import TaintFlow::PathGraph diff --git a/java/ql/test/library-tests/frameworks/JaxWs/JaxRs.ql b/java/ql/test/library-tests/frameworks/JaxWs/JaxRs.ql index f94cd30df047..9ab5b6c67402 100644 --- a/java/ql/test/library-tests/frameworks/JaxWs/JaxRs.ql +++ b/java/ql/test/library-tests/frameworks/JaxWs/JaxRs.ql @@ -1,7 +1,7 @@ import java import semmle.code.java.frameworks.JaxWS import semmle.code.java.security.XSS -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest module JaxRsTest implements TestSig { string getARelevantTag() { diff --git a/java/ql/test/library-tests/frameworks/JaxWs/JaxRsFlow.ql b/java/ql/test/library-tests/frameworks/JaxWs/JaxRsFlow.ql index 348956f24982..7deea8dbb4ec 100644 --- a/java/ql/test/library-tests/frameworks/JaxWs/JaxRsFlow.ql +++ b/java/ql/test/library-tests/frameworks/JaxWs/JaxRsFlow.ql @@ -1,7 +1,7 @@ import java import semmle.code.java.dataflow.TaintTracking import semmle.code.java.dataflow.FlowSources -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest module Config implements DataFlow::ConfigSig { predicate isSource(DataFlow::Node node) { diff --git a/java/ql/test/library-tests/frameworks/JaxWs/JaxWsEndpoint.ql b/java/ql/test/library-tests/frameworks/JaxWs/JaxWsEndpoint.ql index 8ccc69dc8c20..75eb4aae926c 100644 --- a/java/ql/test/library-tests/frameworks/JaxWs/JaxWsEndpoint.ql +++ b/java/ql/test/library-tests/frameworks/JaxWs/JaxWsEndpoint.ql @@ -1,6 +1,6 @@ import java import semmle.code.java.frameworks.JaxWS -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest module JaxWsEndpointTest implements TestSig { string getARelevantTag() { result = ["JaxWsEndpoint", "JaxWsEndpointRemoteMethod"] } diff --git a/java/ql/test/library-tests/frameworks/JaxWs/UrlRedirect.qlref b/java/ql/test/library-tests/frameworks/JaxWs/UrlRedirect.qlref index 7a16f869e57b..933c3569eed8 100644 --- a/java/ql/test/library-tests/frameworks/JaxWs/UrlRedirect.qlref +++ b/java/ql/test/library-tests/frameworks/JaxWs/UrlRedirect.qlref @@ -1,2 +1,2 @@ query: Security/CWE/CWE-601/UrlRedirect.ql -postprocess: TestUtilities/PrettyPrintModels.ql +postprocess: utils/test/PrettyPrintModels.ql diff --git a/java/ql/test/library-tests/frameworks/android/asynctask/test.ql b/java/ql/test/library-tests/frameworks/android/asynctask/test.ql index a8287d6c5f1a..de0d4722737b 100644 --- a/java/ql/test/library-tests/frameworks/android/asynctask/test.ql +++ b/java/ql/test/library-tests/frameworks/android/asynctask/test.ql @@ -1,4 +1,4 @@ import java -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest import DefaultFlowTest import TaintFlow::PathGraph diff --git a/java/ql/test/library-tests/frameworks/android/content-provider-summaries/test.ql b/java/ql/test/library-tests/frameworks/android/content-provider-summaries/test.ql index a8287d6c5f1a..de0d4722737b 100644 --- a/java/ql/test/library-tests/frameworks/android/content-provider-summaries/test.ql +++ b/java/ql/test/library-tests/frameworks/android/content-provider-summaries/test.ql @@ -1,4 +1,4 @@ import java -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest import DefaultFlowTest import TaintFlow::PathGraph diff --git a/java/ql/test/library-tests/frameworks/android/content-provider/test.ql b/java/ql/test/library-tests/frameworks/android/content-provider/test.ql index b83f43911bd3..f298a35b2de0 100644 --- a/java/ql/test/library-tests/frameworks/android/content-provider/test.ql +++ b/java/ql/test/library-tests/frameworks/android/content-provider/test.ql @@ -1,6 +1,6 @@ import java import semmle.code.java.dataflow.FlowSources -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest module ProviderTaintFlowConfig implements DataFlow::ConfigSig { predicate isSource(DataFlow::Node n) { n instanceof ActiveThreatModelSource } diff --git a/java/ql/test/library-tests/frameworks/android/external-storage/test.ql b/java/ql/test/library-tests/frameworks/android/external-storage/test.ql index 042f7b303900..92c32658c8d3 100644 --- a/java/ql/test/library-tests/frameworks/android/external-storage/test.ql +++ b/java/ql/test/library-tests/frameworks/android/external-storage/test.ql @@ -1,7 +1,7 @@ import java import semmle.code.java.dataflow.DataFlow import semmle.code.java.dataflow.FlowSources -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest module Config implements DataFlow::ConfigSig { predicate isSource(DataFlow::Node src) { src instanceof ActiveThreatModelSource } diff --git a/java/ql/test/library-tests/frameworks/android/flow-steps/test.ql b/java/ql/test/library-tests/frameworks/android/flow-steps/test.ql index a8287d6c5f1a..de0d4722737b 100644 --- a/java/ql/test/library-tests/frameworks/android/flow-steps/test.ql +++ b/java/ql/test/library-tests/frameworks/android/flow-steps/test.ql @@ -1,4 +1,4 @@ import java -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest import DefaultFlowTest import TaintFlow::PathGraph diff --git a/java/ql/test/library-tests/frameworks/android/intent/test.ql b/java/ql/test/library-tests/frameworks/android/intent/test.ql index a8287d6c5f1a..de0d4722737b 100644 --- a/java/ql/test/library-tests/frameworks/android/intent/test.ql +++ b/java/ql/test/library-tests/frameworks/android/intent/test.ql @@ -1,4 +1,4 @@ import java -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest import DefaultFlowTest import TaintFlow::PathGraph diff --git a/java/ql/test/library-tests/frameworks/android/notification/test.ql b/java/ql/test/library-tests/frameworks/android/notification/test.ql index b99687c21e2c..ebb2ade6fc11 100644 --- a/java/ql/test/library-tests/frameworks/android/notification/test.ql +++ b/java/ql/test/library-tests/frameworks/android/notification/test.ql @@ -1,5 +1,5 @@ import java import semmle.code.java.frameworks.android.Intent -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest import DefaultFlowTest import TaintFlow::PathGraph diff --git a/java/ql/test/library-tests/frameworks/android/slice/test.ql b/java/ql/test/library-tests/frameworks/android/slice/test.ql index a8b467d1ba0b..56f500a9cd2e 100644 --- a/java/ql/test/library-tests/frameworks/android/slice/test.ql +++ b/java/ql/test/library-tests/frameworks/android/slice/test.ql @@ -1,6 +1,6 @@ import java import semmle.code.java.dataflow.TaintTracking -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest import semmle.code.java.dataflow.FlowSources module SliceValueFlowConfig implements DataFlow::ConfigSig { diff --git a/java/ql/test/library-tests/frameworks/android/sources/OnActivityResultSourceTest.ql b/java/ql/test/library-tests/frameworks/android/sources/OnActivityResultSourceTest.ql index 96d9523b2a5c..d9534c1d64a1 100644 --- a/java/ql/test/library-tests/frameworks/android/sources/OnActivityResultSourceTest.ql +++ b/java/ql/test/library-tests/frameworks/android/sources/OnActivityResultSourceTest.ql @@ -1,6 +1,6 @@ import java import semmle.code.java.dataflow.FlowSources -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest module SourceValueFlowConfig implements DataFlow::ConfigSig { predicate isSource(DataFlow::Node src) { src instanceof ActiveThreatModelSource } diff --git a/java/ql/test/library-tests/frameworks/android/taint-database/flowSteps.ql b/java/ql/test/library-tests/frameworks/android/taint-database/flowSteps.ql index 0bb9282809f5..5ca38c7e29b1 100644 --- a/java/ql/test/library-tests/frameworks/android/taint-database/flowSteps.ql +++ b/java/ql/test/library-tests/frameworks/android/taint-database/flowSteps.ql @@ -2,7 +2,7 @@ import semmle.code.java.dataflow.DataFlow import semmle.code.java.dataflow.TaintTracking import semmle.code.java.dataflow.FlowSources import semmle.code.java.security.QueryInjection -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest module Config implements DataFlow::ConfigSig { predicate isSource(DataFlow::Node source) { diff --git a/java/ql/test/library-tests/frameworks/android/taint-database/sinks.ql b/java/ql/test/library-tests/frameworks/android/taint-database/sinks.ql index 8c295c6f00cd..ccdb96980092 100644 --- a/java/ql/test/library-tests/frameworks/android/taint-database/sinks.ql +++ b/java/ql/test/library-tests/frameworks/android/taint-database/sinks.ql @@ -2,7 +2,7 @@ import semmle.code.java.dataflow.DataFlow import semmle.code.java.dataflow.TaintTracking import semmle.code.java.dataflow.FlowSources import semmle.code.java.security.QueryInjection -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest module Config implements DataFlow::ConfigSig { predicate isSource(DataFlow::Node source) { diff --git a/java/ql/test/library-tests/frameworks/android/uri/test.ql b/java/ql/test/library-tests/frameworks/android/uri/test.ql index a8287d6c5f1a..de0d4722737b 100644 --- a/java/ql/test/library-tests/frameworks/android/uri/test.ql +++ b/java/ql/test/library-tests/frameworks/android/uri/test.ql @@ -1,4 +1,4 @@ import java -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest import DefaultFlowTest import TaintFlow::PathGraph diff --git a/java/ql/test/library-tests/frameworks/android/widget/test.ql b/java/ql/test/library-tests/frameworks/android/widget/test.ql index d3c2cda98c5c..14c2dad2ac50 100644 --- a/java/ql/test/library-tests/frameworks/android/widget/test.ql +++ b/java/ql/test/library-tests/frameworks/android/widget/test.ql @@ -1,6 +1,6 @@ import java import semmle.code.java.dataflow.FlowSources -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest import DefaultFlowTest import TaintFlow::PathGraph diff --git a/java/ql/test/library-tests/frameworks/apache-ant/test.ql b/java/ql/test/library-tests/frameworks/apache-ant/test.ql index a8287d6c5f1a..de0d4722737b 100644 --- a/java/ql/test/library-tests/frameworks/apache-ant/test.ql +++ b/java/ql/test/library-tests/frameworks/apache-ant/test.ql @@ -1,4 +1,4 @@ import java -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest import DefaultFlowTest import TaintFlow::PathGraph diff --git a/java/ql/test/library-tests/frameworks/apache-collections/test.ql b/java/ql/test/library-tests/frameworks/apache-collections/test.ql index a8287d6c5f1a..de0d4722737b 100644 --- a/java/ql/test/library-tests/frameworks/apache-collections/test.ql +++ b/java/ql/test/library-tests/frameworks/apache-collections/test.ql @@ -1,4 +1,4 @@ import java -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest import DefaultFlowTest import TaintFlow::PathGraph diff --git a/java/ql/test/library-tests/frameworks/apache-commons-compress/test.ql b/java/ql/test/library-tests/frameworks/apache-commons-compress/test.ql index a8287d6c5f1a..de0d4722737b 100644 --- a/java/ql/test/library-tests/frameworks/apache-commons-compress/test.ql +++ b/java/ql/test/library-tests/frameworks/apache-commons-compress/test.ql @@ -1,4 +1,4 @@ import java -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest import DefaultFlowTest import TaintFlow::PathGraph diff --git a/java/ql/test/library-tests/frameworks/apache-commons-lang3/flow.ql b/java/ql/test/library-tests/frameworks/apache-commons-lang3/flow.ql index a8287d6c5f1a..de0d4722737b 100644 --- a/java/ql/test/library-tests/frameworks/apache-commons-lang3/flow.ql +++ b/java/ql/test/library-tests/frameworks/apache-commons-lang3/flow.ql @@ -1,4 +1,4 @@ import java -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest import DefaultFlowTest import TaintFlow::PathGraph diff --git a/java/ql/test/library-tests/frameworks/apache-http/flow.ql b/java/ql/test/library-tests/frameworks/apache-http/flow.ql index b2f5b2d023b2..e8f2911a4732 100644 --- a/java/ql/test/library-tests/frameworks/apache-http/flow.ql +++ b/java/ql/test/library-tests/frameworks/apache-http/flow.ql @@ -3,7 +3,7 @@ import semmle.code.java.dataflow.TaintTracking import semmle.code.java.dataflow.FlowSources import semmle.code.java.security.XSS import semmle.code.java.security.UrlRedirect -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest module Config implements DataFlow::ConfigSig { predicate isSource(DataFlow::Node n) { diff --git a/java/ql/test/library-tests/frameworks/gson/test.ql b/java/ql/test/library-tests/frameworks/gson/test.ql index a8287d6c5f1a..de0d4722737b 100644 --- a/java/ql/test/library-tests/frameworks/gson/test.ql +++ b/java/ql/test/library-tests/frameworks/gson/test.ql @@ -1,4 +1,4 @@ import java -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest import DefaultFlowTest import TaintFlow::PathGraph diff --git a/java/ql/test/library-tests/frameworks/guava/generated/cache/test.ql b/java/ql/test/library-tests/frameworks/guava/generated/cache/test.ql index a8287d6c5f1a..de0d4722737b 100644 --- a/java/ql/test/library-tests/frameworks/guava/generated/cache/test.ql +++ b/java/ql/test/library-tests/frameworks/guava/generated/cache/test.ql @@ -1,4 +1,4 @@ import java -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest import DefaultFlowTest import TaintFlow::PathGraph diff --git a/java/ql/test/library-tests/frameworks/guava/generated/collect/test.ql b/java/ql/test/library-tests/frameworks/guava/generated/collect/test.ql index a8287d6c5f1a..de0d4722737b 100644 --- a/java/ql/test/library-tests/frameworks/guava/generated/collect/test.ql +++ b/java/ql/test/library-tests/frameworks/guava/generated/collect/test.ql @@ -1,4 +1,4 @@ import java -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest import DefaultFlowTest import TaintFlow::PathGraph diff --git a/java/ql/test/library-tests/frameworks/guava/handwritten/flow.ql b/java/ql/test/library-tests/frameworks/guava/handwritten/flow.ql index bb4592b0dba0..da4d7cea0cb3 100644 --- a/java/ql/test/library-tests/frameworks/guava/handwritten/flow.ql +++ b/java/ql/test/library-tests/frameworks/guava/handwritten/flow.ql @@ -1,6 +1,6 @@ import java import semmle.code.java.dataflow.TaintTracking -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest module TaintFlowConfig implements DataFlow::ConfigSig { predicate isSource(DataFlow::Node n) { n.asExpr().(MethodCall).getMethod().hasName("taint") } diff --git a/java/ql/test/library-tests/frameworks/hudson/test.ql b/java/ql/test/library-tests/frameworks/hudson/test.ql index a8287d6c5f1a..de0d4722737b 100644 --- a/java/ql/test/library-tests/frameworks/hudson/test.ql +++ b/java/ql/test/library-tests/frameworks/hudson/test.ql @@ -1,4 +1,4 @@ import java -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest import DefaultFlowTest import TaintFlow::PathGraph diff --git a/java/ql/test/library-tests/frameworks/jackson/test.ql b/java/ql/test/library-tests/frameworks/jackson/test.ql index a8287d6c5f1a..de0d4722737b 100644 --- a/java/ql/test/library-tests/frameworks/jackson/test.ql +++ b/java/ql/test/library-tests/frameworks/jackson/test.ql @@ -1,4 +1,4 @@ import java -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest import DefaultFlowTest import TaintFlow::PathGraph diff --git a/java/ql/test/library-tests/frameworks/javax-json/test.ql b/java/ql/test/library-tests/frameworks/javax-json/test.ql index a8287d6c5f1a..de0d4722737b 100644 --- a/java/ql/test/library-tests/frameworks/javax-json/test.ql +++ b/java/ql/test/library-tests/frameworks/javax-json/test.ql @@ -1,4 +1,4 @@ import java -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest import DefaultFlowTest import TaintFlow::PathGraph diff --git a/java/ql/test/library-tests/frameworks/jdk/java.io/test.ql b/java/ql/test/library-tests/frameworks/jdk/java.io/test.ql index a8287d6c5f1a..de0d4722737b 100644 --- a/java/ql/test/library-tests/frameworks/jdk/java.io/test.ql +++ b/java/ql/test/library-tests/frameworks/jdk/java.io/test.ql @@ -1,4 +1,4 @@ import java -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest import DefaultFlowTest import TaintFlow::PathGraph diff --git a/java/ql/test/library-tests/frameworks/jdk/java.net/test.ql b/java/ql/test/library-tests/frameworks/jdk/java.net/test.ql index a8287d6c5f1a..de0d4722737b 100644 --- a/java/ql/test/library-tests/frameworks/jdk/java.net/test.ql +++ b/java/ql/test/library-tests/frameworks/jdk/java.net/test.ql @@ -1,4 +1,4 @@ import java -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest import DefaultFlowTest import TaintFlow::PathGraph diff --git a/java/ql/test/library-tests/frameworks/jdk/java.nio.file/test.ql b/java/ql/test/library-tests/frameworks/jdk/java.nio.file/test.ql index a8287d6c5f1a..de0d4722737b 100644 --- a/java/ql/test/library-tests/frameworks/jdk/java.nio.file/test.ql +++ b/java/ql/test/library-tests/frameworks/jdk/java.nio.file/test.ql @@ -1,4 +1,4 @@ import java -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest import DefaultFlowTest import TaintFlow::PathGraph diff --git a/java/ql/test/library-tests/frameworks/jms/FlowTest.ql b/java/ql/test/library-tests/frameworks/jms/FlowTest.ql index b63aedbf9845..a85ee5f4eb40 100644 --- a/java/ql/test/library-tests/frameworks/jms/FlowTest.ql +++ b/java/ql/test/library-tests/frameworks/jms/FlowTest.ql @@ -1,6 +1,6 @@ import java import semmle.code.java.dataflow.FlowSources -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest module TestConfig implements DataFlow::ConfigSig { predicate isSource(DataFlow::Node source) { source instanceof ActiveThreatModelSource } diff --git a/java/ql/test/library-tests/frameworks/jms/RemoteSourcesTest.ql b/java/ql/test/library-tests/frameworks/jms/RemoteSourcesTest.ql index 78b1dda532ef..4d5ebef78e3f 100644 --- a/java/ql/test/library-tests/frameworks/jms/RemoteSourcesTest.ql +++ b/java/ql/test/library-tests/frameworks/jms/RemoteSourcesTest.ql @@ -1,6 +1,6 @@ import java import semmle.code.java.dataflow.FlowSources -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest module JmsRemoteSourcesTest implements TestSig { string getARelevantTag() { result = "source" } diff --git a/java/ql/test/library-tests/frameworks/json-java/test.ql b/java/ql/test/library-tests/frameworks/json-java/test.ql index a8287d6c5f1a..de0d4722737b 100644 --- a/java/ql/test/library-tests/frameworks/json-java/test.ql +++ b/java/ql/test/library-tests/frameworks/json-java/test.ql @@ -1,4 +1,4 @@ import java -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest import DefaultFlowTest import TaintFlow::PathGraph diff --git a/java/ql/test/library-tests/frameworks/lastaflute/test.ql b/java/ql/test/library-tests/frameworks/lastaflute/test.ql index a62fdf67dfcf..2115fe3aa923 100644 --- a/java/ql/test/library-tests/frameworks/lastaflute/test.ql +++ b/java/ql/test/library-tests/frameworks/lastaflute/test.ql @@ -1,6 +1,6 @@ import java import semmle.code.java.dataflow.FlowSources -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest module Config implements DataFlow::ConfigSig { predicate isSource(DataFlow::Node n) { n instanceof RemoteFlowSource } diff --git a/java/ql/test/library-tests/frameworks/netty/generated/test.ql b/java/ql/test/library-tests/frameworks/netty/generated/test.ql index a8287d6c5f1a..de0d4722737b 100644 --- a/java/ql/test/library-tests/frameworks/netty/generated/test.ql +++ b/java/ql/test/library-tests/frameworks/netty/generated/test.ql @@ -1,4 +1,4 @@ import java -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest import DefaultFlowTest import TaintFlow::PathGraph diff --git a/java/ql/test/library-tests/frameworks/netty/manual/test.ql b/java/ql/test/library-tests/frameworks/netty/manual/test.ql index a4142390e85a..cc3a19db38fe 100644 --- a/java/ql/test/library-tests/frameworks/netty/manual/test.ql +++ b/java/ql/test/library-tests/frameworks/netty/manual/test.ql @@ -1,7 +1,7 @@ import java import semmle.code.java.dataflow.DataFlow import semmle.code.java.dataflow.FlowSources -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest module Config implements DataFlow::ConfigSig { predicate isSource(DataFlow::Node node) { diff --git a/java/ql/test/library-tests/frameworks/okhttp/test.ql b/java/ql/test/library-tests/frameworks/okhttp/test.ql index 8c988c1f0da6..6ed0d6205753 100644 --- a/java/ql/test/library-tests/frameworks/okhttp/test.ql +++ b/java/ql/test/library-tests/frameworks/okhttp/test.ql @@ -1,7 +1,7 @@ import java import semmle.code.java.dataflow.DataFlow import semmle.code.java.dataflow.ExternalFlow -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest module OkHttpFlowConfig implements DataFlow::ConfigSig { predicate isSource = DefaultFlowConfig::isSource/1; diff --git a/java/ql/test/library-tests/frameworks/play/test.ql b/java/ql/test/library-tests/frameworks/play/test.ql index a8287d6c5f1a..de0d4722737b 100644 --- a/java/ql/test/library-tests/frameworks/play/test.ql +++ b/java/ql/test/library-tests/frameworks/play/test.ql @@ -1,4 +1,4 @@ import java -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest import DefaultFlowTest import TaintFlow::PathGraph diff --git a/java/ql/test/library-tests/frameworks/rabbitmq/FlowTest.ql b/java/ql/test/library-tests/frameworks/rabbitmq/FlowTest.ql index 0fdb21094387..412973f8b9f3 100644 --- a/java/ql/test/library-tests/frameworks/rabbitmq/FlowTest.ql +++ b/java/ql/test/library-tests/frameworks/rabbitmq/FlowTest.ql @@ -1,7 +1,7 @@ import java import semmle.code.java.dataflow.TaintTracking import semmle.code.java.dataflow.FlowSources -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest module Config implements DataFlow::ConfigSig { predicate isSource(DataFlow::Node node) { node instanceof ActiveThreatModelSource } diff --git a/java/ql/test/library-tests/frameworks/rabbitmq/SourceTest.ql b/java/ql/test/library-tests/frameworks/rabbitmq/SourceTest.ql index bc46ba9518b0..b1ef4b264a2c 100644 --- a/java/ql/test/library-tests/frameworks/rabbitmq/SourceTest.ql +++ b/java/ql/test/library-tests/frameworks/rabbitmq/SourceTest.ql @@ -1,6 +1,6 @@ import java import semmle.code.java.dataflow.FlowSources -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest module SourceTest implements TestSig { string getARelevantTag() { result = "source" } diff --git a/java/ql/test/library-tests/frameworks/ratpack/flow.ql b/java/ql/test/library-tests/frameworks/ratpack/flow.ql index 2d5b5b2e4716..948332b33da9 100644 --- a/java/ql/test/library-tests/frameworks/ratpack/flow.ql +++ b/java/ql/test/library-tests/frameworks/ratpack/flow.ql @@ -1,7 +1,7 @@ import java import semmle.code.java.dataflow.TaintTracking import semmle.code.java.dataflow.FlowSources -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest module Config implements DataFlow::ConfigSig { predicate isSource(DataFlow::Node n) { diff --git a/java/ql/test/library-tests/frameworks/retrofit/test.ql b/java/ql/test/library-tests/frameworks/retrofit/test.ql index e7f90fc2c0b6..a1ae00a06a7a 100644 --- a/java/ql/test/library-tests/frameworks/retrofit/test.ql +++ b/java/ql/test/library-tests/frameworks/retrofit/test.ql @@ -1,7 +1,7 @@ import java import semmle.code.java.dataflow.DataFlow import semmle.code.java.dataflow.ExternalFlow -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest module FlowConfig implements DataFlow::ConfigSig { predicate isSource = DefaultFlowConfig::isSource/1; diff --git a/java/ql/test/library-tests/frameworks/spring/beans/test.ql b/java/ql/test/library-tests/frameworks/spring/beans/test.ql index a8287d6c5f1a..de0d4722737b 100644 --- a/java/ql/test/library-tests/frameworks/spring/beans/test.ql +++ b/java/ql/test/library-tests/frameworks/spring/beans/test.ql @@ -1,4 +1,4 @@ import java -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest import DefaultFlowTest import TaintFlow::PathGraph diff --git a/java/ql/test/library-tests/frameworks/spring/cache/test.ql b/java/ql/test/library-tests/frameworks/spring/cache/test.ql index a8287d6c5f1a..de0d4722737b 100644 --- a/java/ql/test/library-tests/frameworks/spring/cache/test.ql +++ b/java/ql/test/library-tests/frameworks/spring/cache/test.ql @@ -1,4 +1,4 @@ import java -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest import DefaultFlowTest import TaintFlow::PathGraph diff --git a/java/ql/test/library-tests/frameworks/spring/context/flow.ql b/java/ql/test/library-tests/frameworks/spring/context/flow.ql index a8287d6c5f1a..de0d4722737b 100644 --- a/java/ql/test/library-tests/frameworks/spring/context/flow.ql +++ b/java/ql/test/library-tests/frameworks/spring/context/flow.ql @@ -1,4 +1,4 @@ import java -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest import DefaultFlowTest import TaintFlow::PathGraph diff --git a/java/ql/test/library-tests/frameworks/spring/controller/test.ql b/java/ql/test/library-tests/frameworks/spring/controller/test.ql index e85137dcd57a..f48d9f51b4f5 100644 --- a/java/ql/test/library-tests/frameworks/spring/controller/test.ql +++ b/java/ql/test/library-tests/frameworks/spring/controller/test.ql @@ -1,6 +1,6 @@ import java import semmle.code.java.dataflow.FlowSources -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest module ValueFlowConfig implements DataFlow::ConfigSig { predicate isSource(DataFlow::Node source) { source instanceof ActiveThreatModelSource } diff --git a/java/ql/test/library-tests/frameworks/spring/data/test.ql b/java/ql/test/library-tests/frameworks/spring/data/test.ql index a8287d6c5f1a..de0d4722737b 100644 --- a/java/ql/test/library-tests/frameworks/spring/data/test.ql +++ b/java/ql/test/library-tests/frameworks/spring/data/test.ql @@ -1,4 +1,4 @@ import java -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest import DefaultFlowTest import TaintFlow::PathGraph diff --git a/java/ql/test/library-tests/frameworks/spring/http/flow.ql b/java/ql/test/library-tests/frameworks/spring/http/flow.ql index a8287d6c5f1a..de0d4722737b 100644 --- a/java/ql/test/library-tests/frameworks/spring/http/flow.ql +++ b/java/ql/test/library-tests/frameworks/spring/http/flow.ql @@ -1,4 +1,4 @@ import java -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest import DefaultFlowTest import TaintFlow::PathGraph diff --git a/java/ql/test/library-tests/frameworks/spring/ui/test.ql b/java/ql/test/library-tests/frameworks/spring/ui/test.ql index a8287d6c5f1a..de0d4722737b 100644 --- a/java/ql/test/library-tests/frameworks/spring/ui/test.ql +++ b/java/ql/test/library-tests/frameworks/spring/ui/test.ql @@ -1,4 +1,4 @@ import java -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest import DefaultFlowTest import TaintFlow::PathGraph diff --git a/java/ql/test/library-tests/frameworks/spring/util/test.ql b/java/ql/test/library-tests/frameworks/spring/util/test.ql index a8287d6c5f1a..de0d4722737b 100644 --- a/java/ql/test/library-tests/frameworks/spring/util/test.ql +++ b/java/ql/test/library-tests/frameworks/spring/util/test.ql @@ -1,4 +1,4 @@ import java -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest import DefaultFlowTest import TaintFlow::PathGraph diff --git a/java/ql/test/library-tests/frameworks/spring/validation/test.ql b/java/ql/test/library-tests/frameworks/spring/validation/test.ql index a8287d6c5f1a..de0d4722737b 100644 --- a/java/ql/test/library-tests/frameworks/spring/validation/test.ql +++ b/java/ql/test/library-tests/frameworks/spring/validation/test.ql @@ -1,4 +1,4 @@ import java -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest import DefaultFlowTest import TaintFlow::PathGraph diff --git a/java/ql/test/library-tests/frameworks/spring/webmultipart/test.ql b/java/ql/test/library-tests/frameworks/spring/webmultipart/test.ql index a8287d6c5f1a..de0d4722737b 100644 --- a/java/ql/test/library-tests/frameworks/spring/webmultipart/test.ql +++ b/java/ql/test/library-tests/frameworks/spring/webmultipart/test.ql @@ -1,4 +1,4 @@ import java -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest import DefaultFlowTest import TaintFlow::PathGraph diff --git a/java/ql/test/library-tests/frameworks/spring/webutil/test.ql b/java/ql/test/library-tests/frameworks/spring/webutil/test.ql index a8287d6c5f1a..de0d4722737b 100644 --- a/java/ql/test/library-tests/frameworks/spring/webutil/test.ql +++ b/java/ql/test/library-tests/frameworks/spring/webutil/test.ql @@ -1,4 +1,4 @@ import java -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest import DefaultFlowTest import TaintFlow::PathGraph diff --git a/java/ql/test/library-tests/frameworks/stapler/test.ql b/java/ql/test/library-tests/frameworks/stapler/test.ql index a8287d6c5f1a..de0d4722737b 100644 --- a/java/ql/test/library-tests/frameworks/stapler/test.ql +++ b/java/ql/test/library-tests/frameworks/stapler/test.ql @@ -1,4 +1,4 @@ import java -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest import DefaultFlowTest import TaintFlow::PathGraph diff --git a/java/ql/test/library-tests/frameworks/stream/test.ql b/java/ql/test/library-tests/frameworks/stream/test.ql index a8287d6c5f1a..de0d4722737b 100644 --- a/java/ql/test/library-tests/frameworks/stream/test.ql +++ b/java/ql/test/library-tests/frameworks/stream/test.ql @@ -1,4 +1,4 @@ import java -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest import DefaultFlowTest import TaintFlow::PathGraph diff --git a/java/ql/test/library-tests/frameworks/thymeleaf/test.ql b/java/ql/test/library-tests/frameworks/thymeleaf/test.ql index a8287d6c5f1a..de0d4722737b 100644 --- a/java/ql/test/library-tests/frameworks/thymeleaf/test.ql +++ b/java/ql/test/library-tests/frameworks/thymeleaf/test.ql @@ -1,4 +1,4 @@ import java -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest import DefaultFlowTest import TaintFlow::PathGraph diff --git a/java/ql/test/library-tests/logging/test.ql b/java/ql/test/library-tests/logging/test.ql index a8287d6c5f1a..de0d4722737b 100644 --- a/java/ql/test/library-tests/logging/test.ql +++ b/java/ql/test/library-tests/logging/test.ql @@ -1,4 +1,4 @@ import java -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest import DefaultFlowTest import TaintFlow::PathGraph diff --git a/java/ql/test/library-tests/neutrals/neutralsinks/NeutralSinksTest.ql b/java/ql/test/library-tests/neutrals/neutralsinks/NeutralSinksTest.ql index ac56b93e642d..20ccf9e731ad 100644 --- a/java/ql/test/library-tests/neutrals/neutralsinks/NeutralSinksTest.ql +++ b/java/ql/test/library-tests/neutrals/neutralsinks/NeutralSinksTest.ql @@ -1,5 +1,5 @@ import java -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest import semmle.code.java.dataflow.DataFlow import semmle.code.java.dataflow.ExternalFlow import semmle.code.java.dataflow.internal.FlowSummaryImpl as FlowSummaryImpl diff --git a/java/ql/test/library-tests/optional/test.ql b/java/ql/test/library-tests/optional/test.ql index a8287d6c5f1a..de0d4722737b 100644 --- a/java/ql/test/library-tests/optional/test.ql +++ b/java/ql/test/library-tests/optional/test.ql @@ -1,4 +1,4 @@ import java -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest import DefaultFlowTest import TaintFlow::PathGraph diff --git a/java/ql/test/library-tests/paths/test.ql b/java/ql/test/library-tests/paths/test.ql index a8287d6c5f1a..de0d4722737b 100644 --- a/java/ql/test/library-tests/paths/test.ql +++ b/java/ql/test/library-tests/paths/test.ql @@ -1,4 +1,4 @@ import java -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest import DefaultFlowTest import TaintFlow::PathGraph diff --git a/java/ql/test/library-tests/pathsanitizer/test.ql b/java/ql/test/library-tests/pathsanitizer/test.ql index 0a20ad012b90..4ee3fb421687 100644 --- a/java/ql/test/library-tests/pathsanitizer/test.ql +++ b/java/ql/test/library-tests/pathsanitizer/test.ql @@ -1,6 +1,6 @@ import java import semmle.code.java.security.PathSanitizer -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest module PathSanitizerConfig implements DataFlow::ConfigSig { predicate isSource(DataFlow::Node source) { DefaultFlowConfig::isSource(source) } diff --git a/java/ql/test/library-tests/regex/test.ql b/java/ql/test/library-tests/regex/test.ql index a8287d6c5f1a..de0d4722737b 100644 --- a/java/ql/test/library-tests/regex/test.ql +++ b/java/ql/test/library-tests/regex/test.ql @@ -1,4 +1,4 @@ import java -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest import DefaultFlowTest import TaintFlow::PathGraph diff --git a/java/ql/test/library-tests/scanner/test.ql b/java/ql/test/library-tests/scanner/test.ql index a8287d6c5f1a..de0d4722737b 100644 --- a/java/ql/test/library-tests/scanner/test.ql +++ b/java/ql/test/library-tests/scanner/test.ql @@ -1,4 +1,4 @@ import java -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest import DefaultFlowTest import TaintFlow::PathGraph diff --git a/java/ql/test/library-tests/xml/XMLTest.ql b/java/ql/test/library-tests/xml/XMLTest.ql index 40c5481e3e38..70a29de94ab5 100644 --- a/java/ql/test/library-tests/xml/XMLTest.ql +++ b/java/ql/test/library-tests/xml/XMLTest.ql @@ -1,5 +1,5 @@ import semmle.code.xml.XML -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest module XmlTest implements TestSig { string getARelevantTag() { result = "hasXmlResult" } diff --git a/java/ql/test/query-tests/security/CWE-022/semmle/tests/TaintedPath.ql b/java/ql/test/query-tests/security/CWE-022/semmle/tests/TaintedPath.ql index 25e5bf1df875..3e7fbdb31312 100644 --- a/java/ql/test/query-tests/security/CWE-022/semmle/tests/TaintedPath.ql +++ b/java/ql/test/query-tests/security/CWE-022/semmle/tests/TaintedPath.ql @@ -1,4 +1,4 @@ import java -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest import semmle.code.java.security.TaintedPathQuery import TaintFlowTest diff --git a/java/ql/test/query-tests/security/CWE-022/semmle/tests/ZipSlip.qlref b/java/ql/test/query-tests/security/CWE-022/semmle/tests/ZipSlip.qlref index 0e8a785d2ff6..eee3728e935a 100644 --- a/java/ql/test/query-tests/security/CWE-022/semmle/tests/ZipSlip.qlref +++ b/java/ql/test/query-tests/security/CWE-022/semmle/tests/ZipSlip.qlref @@ -1,2 +1,2 @@ query: Security/CWE/CWE-022/ZipSlip.ql -postprocess: TestUtilities/PrettyPrintModels.ql +postprocess: utils/test/PrettyPrintModels.ql diff --git a/java/ql/test/query-tests/security/CWE-023/semmle/tests/PartialPathTraversalFromRemoteTest.ql b/java/ql/test/query-tests/security/CWE-023/semmle/tests/PartialPathTraversalFromRemoteTest.ql index 26a6012d7fb0..45dab6606fa1 100644 --- a/java/ql/test/query-tests/security/CWE-023/semmle/tests/PartialPathTraversalFromRemoteTest.ql +++ b/java/ql/test/query-tests/security/CWE-023/semmle/tests/PartialPathTraversalFromRemoteTest.ql @@ -1,5 +1,5 @@ import java -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest import semmle.code.java.security.PartialPathTraversalQuery class TestRemoteSource extends RemoteFlowSource { diff --git a/java/ql/test/query-tests/security/CWE-074/JndiInjectionTest.ql b/java/ql/test/query-tests/security/CWE-074/JndiInjectionTest.ql index 242bf9c3f54f..03b588555b56 100644 --- a/java/ql/test/query-tests/security/CWE-074/JndiInjectionTest.ql +++ b/java/ql/test/query-tests/security/CWE-074/JndiInjectionTest.ql @@ -1,6 +1,6 @@ import java import semmle.code.java.security.JndiInjectionQuery -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest module HasJndiInjectionTest implements TestSig { string getARelevantTag() { result = "hasJndiInjection" } diff --git a/java/ql/test/query-tests/security/CWE-074/XsltInjectionTest.ql b/java/ql/test/query-tests/security/CWE-074/XsltInjectionTest.ql index 4d5200477d84..72c003246bc2 100644 --- a/java/ql/test/query-tests/security/CWE-074/XsltInjectionTest.ql +++ b/java/ql/test/query-tests/security/CWE-074/XsltInjectionTest.ql @@ -2,7 +2,7 @@ import java import semmle.code.java.dataflow.TaintTracking import semmle.code.java.dataflow.FlowSources import semmle.code.java.security.XsltInjectionQuery -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest module HasXsltInjectionTest implements TestSig { string getARelevantTag() { result = "hasXsltInjection" } diff --git a/java/ql/test/query-tests/security/CWE-078/ExecTainted.qlref b/java/ql/test/query-tests/security/CWE-078/ExecTainted.qlref index 2ab35baf1bdf..856b97bf0fed 100644 --- a/java/ql/test/query-tests/security/CWE-078/ExecTainted.qlref +++ b/java/ql/test/query-tests/security/CWE-078/ExecTainted.qlref @@ -1,2 +1,2 @@ query: Security/CWE/CWE-078/ExecTainted.ql -postprocess: TestUtilities/PrettyPrintModels.ql +postprocess: utils/test/PrettyPrintModels.ql diff --git a/java/ql/test/query-tests/security/CWE-078/ExecTaintedEnvironment.ql b/java/ql/test/query-tests/security/CWE-078/ExecTaintedEnvironment.ql index cdce227670a3..c9a4a630c603 100644 --- a/java/ql/test/query-tests/security/CWE-078/ExecTaintedEnvironment.ql +++ b/java/ql/test/query-tests/security/CWE-078/ExecTaintedEnvironment.ql @@ -1,7 +1,7 @@ import java import semmle.code.java.dataflow.FlowSources import semmle.code.java.security.TaintedEnvironmentVariableQuery -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest private class TestSource extends RemoteFlowSource { TestSource() { this.asExpr().(MethodCall).getMethod().hasName("source") } diff --git a/java/ql/test/query-tests/security/CWE-079/semmle/tests/XSS.ql b/java/ql/test/query-tests/security/CWE-079/semmle/tests/XSS.ql index 5e901c83498a..271488ffb1f0 100644 --- a/java/ql/test/query-tests/security/CWE-079/semmle/tests/XSS.ql +++ b/java/ql/test/query-tests/security/CWE-079/semmle/tests/XSS.ql @@ -1,6 +1,6 @@ import java import semmle.code.java.security.XssQuery -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest module XssTest implements TestSig { string getARelevantTag() { result = "xss" } diff --git a/java/ql/test/query-tests/security/CWE-089/semmle/examples/SqlTainted.qlref b/java/ql/test/query-tests/security/CWE-089/semmle/examples/SqlTainted.qlref index 0f5da65438c2..dc9ae162efbc 100644 --- a/java/ql/test/query-tests/security/CWE-089/semmle/examples/SqlTainted.qlref +++ b/java/ql/test/query-tests/security/CWE-089/semmle/examples/SqlTainted.qlref @@ -1,2 +1,2 @@ query: Security/CWE/CWE-089/SqlTainted.ql -postprocess: TestUtilities/PrettyPrintModels.ql +postprocess: utils/test/PrettyPrintModels.ql diff --git a/java/ql/test/query-tests/security/CWE-089/semmle/examples/springjdbc.ql b/java/ql/test/query-tests/security/CWE-089/semmle/examples/springjdbc.ql index 28c359d9f6ad..09745c9e8576 100644 --- a/java/ql/test/query-tests/security/CWE-089/semmle/examples/springjdbc.ql +++ b/java/ql/test/query-tests/security/CWE-089/semmle/examples/springjdbc.ql @@ -1,7 +1,7 @@ import java import semmle.code.java.dataflow.FlowSources import semmle.code.java.security.SqlInjectionQuery -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest private class SourceMethodSource extends RemoteFlowSource { SourceMethodSource() { this.asExpr().(MethodCall).getMethod().hasName("source") } diff --git a/java/ql/test/query-tests/security/CWE-090/LdapInjection.qlref b/java/ql/test/query-tests/security/CWE-090/LdapInjection.qlref index 9a19b8357831..53b04e4c00fa 100644 --- a/java/ql/test/query-tests/security/CWE-090/LdapInjection.qlref +++ b/java/ql/test/query-tests/security/CWE-090/LdapInjection.qlref @@ -1,2 +1,2 @@ query: Security/CWE/CWE-090/LdapInjection.ql -postprocess: TestUtilities/PrettyPrintModels.ql +postprocess: utils/test/PrettyPrintModels.ql diff --git a/java/ql/test/query-tests/security/CWE-094/ApkInstallationTest.ql b/java/ql/test/query-tests/security/CWE-094/ApkInstallationTest.ql index b10e291d376e..a4efceebc189 100644 --- a/java/ql/test/query-tests/security/CWE-094/ApkInstallationTest.ql +++ b/java/ql/test/query-tests/security/CWE-094/ApkInstallationTest.ql @@ -1,7 +1,7 @@ import java import semmle.code.java.dataflow.DataFlow import semmle.code.java.security.ArbitraryApkInstallationQuery -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest module HasApkInstallationTest implements TestSig { string getARelevantTag() { result = "hasApkInstallation" } diff --git a/java/ql/test/query-tests/security/CWE-094/GroovyInjectionTest.ql b/java/ql/test/query-tests/security/CWE-094/GroovyInjectionTest.ql index bc39280407eb..26f32638d918 100644 --- a/java/ql/test/query-tests/security/CWE-094/GroovyInjectionTest.ql +++ b/java/ql/test/query-tests/security/CWE-094/GroovyInjectionTest.ql @@ -2,7 +2,7 @@ import java import semmle.code.java.dataflow.TaintTracking import semmle.code.java.dataflow.FlowSources import semmle.code.java.security.GroovyInjectionQuery -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest module HasGroovyInjectionTest implements TestSig { string getARelevantTag() { result = "hasGroovyInjection" } diff --git a/java/ql/test/query-tests/security/CWE-094/InsecureBeanValidation.qlref b/java/ql/test/query-tests/security/CWE-094/InsecureBeanValidation.qlref index c7dca883295d..73254e55f938 100644 --- a/java/ql/test/query-tests/security/CWE-094/InsecureBeanValidation.qlref +++ b/java/ql/test/query-tests/security/CWE-094/InsecureBeanValidation.qlref @@ -1,2 +1,2 @@ query: Security/CWE/CWE-094/InsecureBeanValidation.ql -postprocess: TestUtilities/PrettyPrintModels.ql +postprocess: utils/test/PrettyPrintModels.ql diff --git a/java/ql/test/query-tests/security/CWE-094/JexlInjectionTest.ql b/java/ql/test/query-tests/security/CWE-094/JexlInjectionTest.ql index 07f1573b0398..0515c0fc75da 100644 --- a/java/ql/test/query-tests/security/CWE-094/JexlInjectionTest.ql +++ b/java/ql/test/query-tests/security/CWE-094/JexlInjectionTest.ql @@ -1,6 +1,6 @@ import java import semmle.code.java.security.JexlInjectionQuery -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest module JexlInjectionTest implements TestSig { string getARelevantTag() { result = "hasJexlInjection" } diff --git a/java/ql/test/query-tests/security/CWE-094/MvelInjectionTest.ql b/java/ql/test/query-tests/security/CWE-094/MvelInjectionTest.ql index f75992500772..08dc091898c8 100644 --- a/java/ql/test/query-tests/security/CWE-094/MvelInjectionTest.ql +++ b/java/ql/test/query-tests/security/CWE-094/MvelInjectionTest.ql @@ -2,7 +2,7 @@ import java import semmle.code.java.dataflow.TaintTracking import semmle.code.java.dataflow.FlowSources import semmle.code.java.security.MvelInjectionQuery -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest module HasMvelInjectionTest implements TestSig { string getARelevantTag() { result = "hasMvelInjection" } diff --git a/java/ql/test/query-tests/security/CWE-094/SpelInjectionTest.ql b/java/ql/test/query-tests/security/CWE-094/SpelInjectionTest.ql index a017c96f60b3..727229e989d3 100644 --- a/java/ql/test/query-tests/security/CWE-094/SpelInjectionTest.ql +++ b/java/ql/test/query-tests/security/CWE-094/SpelInjectionTest.ql @@ -2,7 +2,7 @@ import java import semmle.code.java.dataflow.TaintTracking import semmle.code.java.dataflow.FlowSources import semmle.code.java.security.SpelInjectionQuery -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest module HasSpelInjectionTest implements TestSig { string getARelevantTag() { result = "hasSpelInjection" } diff --git a/java/ql/test/query-tests/security/CWE-094/TemplateInjectionTest.ql b/java/ql/test/query-tests/security/CWE-094/TemplateInjectionTest.ql index 4c37e8a5f011..809175bcd376 100644 --- a/java/ql/test/query-tests/security/CWE-094/TemplateInjectionTest.ql +++ b/java/ql/test/query-tests/security/CWE-094/TemplateInjectionTest.ql @@ -1,6 +1,6 @@ import java import semmle.code.java.security.TemplateInjectionQuery -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest module TemplateInjectionTest implements TestSig { string getARelevantTag() { result = "hasTemplateInjection" } diff --git a/java/ql/test/query-tests/security/CWE-113/semmle/tests/ResponseSplitting.qlref b/java/ql/test/query-tests/security/CWE-113/semmle/tests/ResponseSplitting.qlref index 9526ebd9e6f8..897d985e9d45 100644 --- a/java/ql/test/query-tests/security/CWE-113/semmle/tests/ResponseSplitting.qlref +++ b/java/ql/test/query-tests/security/CWE-113/semmle/tests/ResponseSplitting.qlref @@ -1,2 +1,2 @@ query: Security/CWE/CWE-113/ResponseSplitting.ql -postprocess: TestUtilities/PrettyPrintModels.ql +postprocess: utils/test/PrettyPrintModels.ql diff --git a/java/ql/test/query-tests/security/CWE-117/LogInjectionTest.ql b/java/ql/test/query-tests/security/CWE-117/LogInjectionTest.ql index 0ad00b64d239..4a295d8e8fac 100644 --- a/java/ql/test/query-tests/security/CWE-117/LogInjectionTest.ql +++ b/java/ql/test/query-tests/security/CWE-117/LogInjectionTest.ql @@ -1,6 +1,6 @@ import java import semmle.code.java.security.LogInjectionQuery -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest private class TestSource extends RemoteFlowSource { TestSource() { this.asExpr().(MethodCall).getMethod().hasName("source") } diff --git a/java/ql/test/query-tests/security/CWE-1204/StaticInitializationVectorTest.ql b/java/ql/test/query-tests/security/CWE-1204/StaticInitializationVectorTest.ql index 2ccb8fa7c527..5996cccdd4f4 100644 --- a/java/ql/test/query-tests/security/CWE-1204/StaticInitializationVectorTest.ql +++ b/java/ql/test/query-tests/security/CWE-1204/StaticInitializationVectorTest.ql @@ -1,6 +1,6 @@ import java import semmle.code.java.security.StaticInitializationVectorQuery -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest module StaticInitializationVectorTest implements TestSig { string getARelevantTag() { result = "staticInitializationVector" } diff --git a/java/ql/test/query-tests/security/CWE-129/semmle/tests/ImproperValidationOfArrayConstruction.qlref b/java/ql/test/query-tests/security/CWE-129/semmle/tests/ImproperValidationOfArrayConstruction.qlref index 0eb110eba0b7..fc09d33596a9 100644 --- a/java/ql/test/query-tests/security/CWE-129/semmle/tests/ImproperValidationOfArrayConstruction.qlref +++ b/java/ql/test/query-tests/security/CWE-129/semmle/tests/ImproperValidationOfArrayConstruction.qlref @@ -1,2 +1,2 @@ query: Security/CWE/CWE-129/ImproperValidationOfArrayConstruction.ql -postprocess: TestUtilities/PrettyPrintModels.ql +postprocess: utils/test/PrettyPrintModels.ql diff --git a/java/ql/test/query-tests/security/CWE-129/semmle/tests/ImproperValidationOfArrayConstructionCodeSpecified.qlref b/java/ql/test/query-tests/security/CWE-129/semmle/tests/ImproperValidationOfArrayConstructionCodeSpecified.qlref index 2c8eaeec8f9f..4cff7c39aa64 100644 --- a/java/ql/test/query-tests/security/CWE-129/semmle/tests/ImproperValidationOfArrayConstructionCodeSpecified.qlref +++ b/java/ql/test/query-tests/security/CWE-129/semmle/tests/ImproperValidationOfArrayConstructionCodeSpecified.qlref @@ -1,2 +1,2 @@ query: Security/CWE/CWE-129/ImproperValidationOfArrayConstructionCodeSpecified.ql -postprocess: TestUtilities/PrettyPrintModels.ql +postprocess: utils/test/PrettyPrintModels.ql diff --git a/java/ql/test/query-tests/security/CWE-129/semmle/tests/ImproperValidationOfArrayIndex.qlref b/java/ql/test/query-tests/security/CWE-129/semmle/tests/ImproperValidationOfArrayIndex.qlref index f9b9d57f750a..4dd969c54763 100644 --- a/java/ql/test/query-tests/security/CWE-129/semmle/tests/ImproperValidationOfArrayIndex.qlref +++ b/java/ql/test/query-tests/security/CWE-129/semmle/tests/ImproperValidationOfArrayIndex.qlref @@ -1,2 +1,2 @@ query: Security/CWE/CWE-129/ImproperValidationOfArrayIndex.ql -postprocess: TestUtilities/PrettyPrintModels.ql +postprocess: utils/test/PrettyPrintModels.ql diff --git a/java/ql/test/query-tests/security/CWE-129/semmle/tests/ImproperValidationOfArrayIndexCodeSpecified.qlref b/java/ql/test/query-tests/security/CWE-129/semmle/tests/ImproperValidationOfArrayIndexCodeSpecified.qlref index 347983ccc5fc..b267f488b341 100644 --- a/java/ql/test/query-tests/security/CWE-129/semmle/tests/ImproperValidationOfArrayIndexCodeSpecified.qlref +++ b/java/ql/test/query-tests/security/CWE-129/semmle/tests/ImproperValidationOfArrayIndexCodeSpecified.qlref @@ -1,2 +1,2 @@ query: Security/CWE/CWE-129/ImproperValidationOfArrayIndexCodeSpecified.ql -postprocess: TestUtilities/PrettyPrintModels.ql +postprocess: utils/test/PrettyPrintModels.ql diff --git a/java/ql/test/query-tests/security/CWE-134/semmle/tests/ExternallyControlledFormatString.qlref b/java/ql/test/query-tests/security/CWE-134/semmle/tests/ExternallyControlledFormatString.qlref index 99111d31f08e..6309a7eb502b 100644 --- a/java/ql/test/query-tests/security/CWE-134/semmle/tests/ExternallyControlledFormatString.qlref +++ b/java/ql/test/query-tests/security/CWE-134/semmle/tests/ExternallyControlledFormatString.qlref @@ -1,2 +1,2 @@ query: Security/CWE/CWE-134/ExternallyControlledFormatString.ql -postprocess: TestUtilities/PrettyPrintModels.ql +postprocess: utils/test/PrettyPrintModels.ql diff --git a/java/ql/test/query-tests/security/CWE-190/semmle/tests/ArithmeticTainted.qlref b/java/ql/test/query-tests/security/CWE-190/semmle/tests/ArithmeticTainted.qlref index 4504b714143c..938a60cfc017 100644 --- a/java/ql/test/query-tests/security/CWE-190/semmle/tests/ArithmeticTainted.qlref +++ b/java/ql/test/query-tests/security/CWE-190/semmle/tests/ArithmeticTainted.qlref @@ -1,2 +1,2 @@ query: Security/CWE/CWE-190/ArithmeticTainted.ql -postprocess: TestUtilities/PrettyPrintModels.ql +postprocess: utils/test/PrettyPrintModels.ql diff --git a/java/ql/test/query-tests/security/CWE-190/semmle/tests/ArithmeticUncontrolled.qlref b/java/ql/test/query-tests/security/CWE-190/semmle/tests/ArithmeticUncontrolled.qlref index cac4d514447f..c6d57c735107 100644 --- a/java/ql/test/query-tests/security/CWE-190/semmle/tests/ArithmeticUncontrolled.qlref +++ b/java/ql/test/query-tests/security/CWE-190/semmle/tests/ArithmeticUncontrolled.qlref @@ -1,2 +1,2 @@ query: Security/CWE/CWE-190/ArithmeticUncontrolled.ql -postprocess: TestUtilities/PrettyPrintModels.ql +postprocess: utils/test/PrettyPrintModels.ql diff --git a/java/ql/test/query-tests/security/CWE-190/semmle/tests/ArithmeticWithExtremeValues.qlref b/java/ql/test/query-tests/security/CWE-190/semmle/tests/ArithmeticWithExtremeValues.qlref index c0b9d91f242b..0eaecb369412 100644 --- a/java/ql/test/query-tests/security/CWE-190/semmle/tests/ArithmeticWithExtremeValues.qlref +++ b/java/ql/test/query-tests/security/CWE-190/semmle/tests/ArithmeticWithExtremeValues.qlref @@ -1,2 +1,2 @@ query: Security/CWE/CWE-190/ArithmeticWithExtremeValues.ql -postprocess: TestUtilities/PrettyPrintModels.ql +postprocess: utils/test/PrettyPrintModels.ql diff --git a/java/ql/test/query-tests/security/CWE-200/semmle/tests/SensitiveNotification/test.ql b/java/ql/test/query-tests/security/CWE-200/semmle/tests/SensitiveNotification/test.ql index 919298a56b81..e6a433b62420 100644 --- a/java/ql/test/query-tests/security/CWE-200/semmle/tests/SensitiveNotification/test.ql +++ b/java/ql/test/query-tests/security/CWE-200/semmle/tests/SensitiveNotification/test.ql @@ -1,5 +1,5 @@ import java -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest import semmle.code.java.dataflow.DataFlow import semmle.code.java.security.SensitiveUiQuery diff --git a/java/ql/test/query-tests/security/CWE-200/semmle/tests/SensitiveTextView/test.ql b/java/ql/test/query-tests/security/CWE-200/semmle/tests/SensitiveTextView/test.ql index 49ccd889b858..da2a5bea823b 100644 --- a/java/ql/test/query-tests/security/CWE-200/semmle/tests/SensitiveTextView/test.ql +++ b/java/ql/test/query-tests/security/CWE-200/semmle/tests/SensitiveTextView/test.ql @@ -1,5 +1,5 @@ import java -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest import semmle.code.java.dataflow.DataFlow import semmle.code.java.security.SensitiveUiQuery diff --git a/java/ql/test/query-tests/security/CWE-200/semmle/tests/TempDirLocalInformationDisclosure/TempDirLocalInformationDisclosure.qlref b/java/ql/test/query-tests/security/CWE-200/semmle/tests/TempDirLocalInformationDisclosure/TempDirLocalInformationDisclosure.qlref index 2464f01c5039..b7836c96d600 100644 --- a/java/ql/test/query-tests/security/CWE-200/semmle/tests/TempDirLocalInformationDisclosure/TempDirLocalInformationDisclosure.qlref +++ b/java/ql/test/query-tests/security/CWE-200/semmle/tests/TempDirLocalInformationDisclosure/TempDirLocalInformationDisclosure.qlref @@ -1,2 +1,2 @@ query: Security/CWE/CWE-200/TempDirLocalInformationDisclosure.ql -postprocess: TestUtilities/PrettyPrintModels.ql +postprocess: utils/test/PrettyPrintModels.ql diff --git a/java/ql/test/query-tests/security/CWE-266/IntentUriPermissionManipulationTest.ql b/java/ql/test/query-tests/security/CWE-266/IntentUriPermissionManipulationTest.ql index 86feb7843ce1..f2f820743d1c 100644 --- a/java/ql/test/query-tests/security/CWE-266/IntentUriPermissionManipulationTest.ql +++ b/java/ql/test/query-tests/security/CWE-266/IntentUriPermissionManipulationTest.ql @@ -1,4 +1,4 @@ import java -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest import semmle.code.java.security.IntentUriPermissionManipulationQuery import TaintFlowTest diff --git a/java/ql/test/query-tests/security/CWE-273/UnsafeCertTrustTest.ql b/java/ql/test/query-tests/security/CWE-273/UnsafeCertTrustTest.ql index e896e272aa40..7e620b8d3dae 100644 --- a/java/ql/test/query-tests/security/CWE-273/UnsafeCertTrustTest.ql +++ b/java/ql/test/query-tests/security/CWE-273/UnsafeCertTrustTest.ql @@ -1,6 +1,6 @@ import java import semmle.code.java.security.UnsafeCertTrustQuery -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest module UnsafeCertTrustTest implements TestSig { string getARelevantTag() { result = "hasUnsafeCertTrust" } diff --git a/java/ql/test/query-tests/security/CWE-287/InsecureKeys/Test1/InsecureKeys.ql b/java/ql/test/query-tests/security/CWE-287/InsecureKeys/Test1/InsecureKeys.ql index eec3b62dfc2a..928e15a4af41 100644 --- a/java/ql/test/query-tests/security/CWE-287/InsecureKeys/Test1/InsecureKeys.ql +++ b/java/ql/test/query-tests/security/CWE-287/InsecureKeys/Test1/InsecureKeys.ql @@ -1,5 +1,5 @@ import java -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest import semmle.code.java.dataflow.DataFlow import semmle.code.java.security.AndroidLocalAuthQuery diff --git a/java/ql/test/query-tests/security/CWE-287/InsecureKeys/Test2/InsecureKeys.ql b/java/ql/test/query-tests/security/CWE-287/InsecureKeys/Test2/InsecureKeys.ql index eec3b62dfc2a..928e15a4af41 100644 --- a/java/ql/test/query-tests/security/CWE-287/InsecureKeys/Test2/InsecureKeys.ql +++ b/java/ql/test/query-tests/security/CWE-287/InsecureKeys/Test2/InsecureKeys.ql @@ -1,5 +1,5 @@ import java -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest import semmle.code.java.dataflow.DataFlow import semmle.code.java.security.AndroidLocalAuthQuery diff --git a/java/ql/test/query-tests/security/CWE-287/InsecureLocalAuth/InsecureLocalAuth.ql b/java/ql/test/query-tests/security/CWE-287/InsecureLocalAuth/InsecureLocalAuth.ql index 36becaff7553..3849a6f150f9 100644 --- a/java/ql/test/query-tests/security/CWE-287/InsecureLocalAuth/InsecureLocalAuth.ql +++ b/java/ql/test/query-tests/security/CWE-287/InsecureLocalAuth/InsecureLocalAuth.ql @@ -1,5 +1,5 @@ import java -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest import semmle.code.java.dataflow.DataFlow import semmle.code.java.security.AndroidLocalAuthQuery diff --git a/java/ql/test/query-tests/security/CWE-295/AndroidMissingCertificatePinning/Test1/test.ql b/java/ql/test/query-tests/security/CWE-295/AndroidMissingCertificatePinning/Test1/test.ql index 1a6c3a9d0c08..3eb3c1abd19b 100644 --- a/java/ql/test/query-tests/security/CWE-295/AndroidMissingCertificatePinning/Test1/test.ql +++ b/java/ql/test/query-tests/security/CWE-295/AndroidMissingCertificatePinning/Test1/test.ql @@ -1,5 +1,5 @@ import java -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest import semmle.code.java.security.AndroidCertificatePinningQuery module Test implements TestSig { diff --git a/java/ql/test/query-tests/security/CWE-295/AndroidMissingCertificatePinning/Test2/test.ql b/java/ql/test/query-tests/security/CWE-295/AndroidMissingCertificatePinning/Test2/test.ql index 1a6c3a9d0c08..3eb3c1abd19b 100644 --- a/java/ql/test/query-tests/security/CWE-295/AndroidMissingCertificatePinning/Test2/test.ql +++ b/java/ql/test/query-tests/security/CWE-295/AndroidMissingCertificatePinning/Test2/test.ql @@ -1,5 +1,5 @@ import java -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest import semmle.code.java.security.AndroidCertificatePinningQuery module Test implements TestSig { diff --git a/java/ql/test/query-tests/security/CWE-295/AndroidMissingCertificatePinning/Test3/test.ql b/java/ql/test/query-tests/security/CWE-295/AndroidMissingCertificatePinning/Test3/test.ql index 1a6c3a9d0c08..3eb3c1abd19b 100644 --- a/java/ql/test/query-tests/security/CWE-295/AndroidMissingCertificatePinning/Test3/test.ql +++ b/java/ql/test/query-tests/security/CWE-295/AndroidMissingCertificatePinning/Test3/test.ql @@ -1,5 +1,5 @@ import java -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest import semmle.code.java.security.AndroidCertificatePinningQuery module Test implements TestSig { diff --git a/java/ql/test/query-tests/security/CWE-295/AndroidMissingCertificatePinning/Test4/test.ql b/java/ql/test/query-tests/security/CWE-295/AndroidMissingCertificatePinning/Test4/test.ql index 1a6c3a9d0c08..3eb3c1abd19b 100644 --- a/java/ql/test/query-tests/security/CWE-295/AndroidMissingCertificatePinning/Test4/test.ql +++ b/java/ql/test/query-tests/security/CWE-295/AndroidMissingCertificatePinning/Test4/test.ql @@ -1,5 +1,5 @@ import java -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest import semmle.code.java.security.AndroidCertificatePinningQuery module Test implements TestSig { diff --git a/java/ql/test/query-tests/security/CWE-295/AndroidMissingCertificatePinning/Test5/test.ql b/java/ql/test/query-tests/security/CWE-295/AndroidMissingCertificatePinning/Test5/test.ql index 1a6c3a9d0c08..3eb3c1abd19b 100644 --- a/java/ql/test/query-tests/security/CWE-295/AndroidMissingCertificatePinning/Test5/test.ql +++ b/java/ql/test/query-tests/security/CWE-295/AndroidMissingCertificatePinning/Test5/test.ql @@ -1,5 +1,5 @@ import java -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest import semmle.code.java.security.AndroidCertificatePinningQuery module Test implements TestSig { diff --git a/java/ql/test/query-tests/security/CWE-295/ImproperWebVeiwCertificateValidation/test.ql b/java/ql/test/query-tests/security/CWE-295/ImproperWebVeiwCertificateValidation/test.ql index 70d242e7ebb8..ceb39ffcbc14 100644 --- a/java/ql/test/query-tests/security/CWE-295/ImproperWebVeiwCertificateValidation/test.ql +++ b/java/ql/test/query-tests/security/CWE-295/ImproperWebVeiwCertificateValidation/test.ql @@ -1,6 +1,6 @@ import java import semmle.code.java.security.AndroidWebViewCertificateValidationQuery -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest module WebViewTest implements TestSig { string getARelevantTag() { result = "hasResult" } diff --git a/java/ql/test/query-tests/security/CWE-295/InsecureTrustManager/InsecureTrustManagerTest.ql b/java/ql/test/query-tests/security/CWE-295/InsecureTrustManager/InsecureTrustManagerTest.ql index 11a59f51feb8..1c0ffc49eba4 100644 --- a/java/ql/test/query-tests/security/CWE-295/InsecureTrustManager/InsecureTrustManagerTest.ql +++ b/java/ql/test/query-tests/security/CWE-295/InsecureTrustManager/InsecureTrustManagerTest.ql @@ -1,6 +1,6 @@ import java import semmle.code.java.security.InsecureTrustManagerQuery -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest module InsecureTrustManagerTest implements TestSig { string getARelevantTag() { result = "hasValueFlow" } diff --git a/java/ql/test/query-tests/security/CWE-297/InsecureJavaMailTest.ql b/java/ql/test/query-tests/security/CWE-297/InsecureJavaMailTest.ql index 9dc1dbe121af..be4a8d5d7738 100644 --- a/java/ql/test/query-tests/security/CWE-297/InsecureJavaMailTest.ql +++ b/java/ql/test/query-tests/security/CWE-297/InsecureJavaMailTest.ql @@ -1,6 +1,6 @@ import java import semmle.code.java.security.Mail -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest module InsecureJavaMailTest implements TestSig { string getARelevantTag() { result = "hasInsecureJavaMail" } diff --git a/java/ql/test/query-tests/security/CWE-297/UnsafeHostnameVerification.qlref b/java/ql/test/query-tests/security/CWE-297/UnsafeHostnameVerification.qlref index b4e013c8de7d..5c82af8f3f7c 100644 --- a/java/ql/test/query-tests/security/CWE-297/UnsafeHostnameVerification.qlref +++ b/java/ql/test/query-tests/security/CWE-297/UnsafeHostnameVerification.qlref @@ -1,2 +1,2 @@ query: Security/CWE/CWE-297/UnsafeHostnameVerification.ql -postprocess: TestUtilities/PrettyPrintModels.ql +postprocess: utils/test/PrettyPrintModels.ql diff --git a/java/ql/test/query-tests/security/CWE-311/CWE-319/HttpsUrls.qlref b/java/ql/test/query-tests/security/CWE-311/CWE-319/HttpsUrls.qlref index b05c8153ebe6..ee69b6e12ca9 100644 --- a/java/ql/test/query-tests/security/CWE-311/CWE-319/HttpsUrls.qlref +++ b/java/ql/test/query-tests/security/CWE-311/CWE-319/HttpsUrls.qlref @@ -1,2 +1,2 @@ query: Security/CWE/CWE-319/HttpsUrls.ql -postprocess: TestUtilities/PrettyPrintModels.ql +postprocess: utils/test/PrettyPrintModels.ql diff --git a/java/ql/test/query-tests/security/CWE-312/android/CleartextStorage/CleartextStorageAndroidDatabaseTest.ql b/java/ql/test/query-tests/security/CWE-312/android/CleartextStorage/CleartextStorageAndroidDatabaseTest.ql index 60df4bd39ab7..2c43ab78202d 100644 --- a/java/ql/test/query-tests/security/CWE-312/android/CleartextStorage/CleartextStorageAndroidDatabaseTest.ql +++ b/java/ql/test/query-tests/security/CWE-312/android/CleartextStorage/CleartextStorageAndroidDatabaseTest.ql @@ -1,6 +1,6 @@ import java import semmle.code.java.security.CleartextStorageAndroidDatabaseQuery -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest module CleartextStorageAndroidDatabaseTest implements TestSig { string getARelevantTag() { result = "hasCleartextStorageAndroidDatabase" } diff --git a/java/ql/test/query-tests/security/CWE-312/android/CleartextStorage/CleartextStorageAndroidFilesystemTest.ql b/java/ql/test/query-tests/security/CWE-312/android/CleartextStorage/CleartextStorageAndroidFilesystemTest.ql index 7b7380ccedfc..56dc7d7893a4 100644 --- a/java/ql/test/query-tests/security/CWE-312/android/CleartextStorage/CleartextStorageAndroidFilesystemTest.ql +++ b/java/ql/test/query-tests/security/CWE-312/android/CleartextStorage/CleartextStorageAndroidFilesystemTest.ql @@ -1,6 +1,6 @@ import java import semmle.code.java.security.CleartextStorageAndroidFilesystemQuery -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest module CleartextStorageAndroidFilesystemTest implements TestSig { string getARelevantTag() { result = "hasCleartextStorageAndroidFilesystem" } diff --git a/java/ql/test/query-tests/security/CWE-312/android/CleartextStorage/CleartextStorageSharedPrefsTest.ql b/java/ql/test/query-tests/security/CWE-312/android/CleartextStorage/CleartextStorageSharedPrefsTest.ql index d7a714bc7f26..e383270c256c 100644 --- a/java/ql/test/query-tests/security/CWE-312/android/CleartextStorage/CleartextStorageSharedPrefsTest.ql +++ b/java/ql/test/query-tests/security/CWE-312/android/CleartextStorage/CleartextStorageSharedPrefsTest.ql @@ -1,6 +1,6 @@ import java import semmle.code.java.security.CleartextStorageSharedPrefsQuery -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest module CleartextStorageSharedPrefsTest implements TestSig { string getARelevantTag() { result = "hasCleartextStorageSharedPrefs" } diff --git a/java/ql/test/query-tests/security/CWE-326/InsufficientKeySizeTest.ql b/java/ql/test/query-tests/security/CWE-326/InsufficientKeySizeTest.ql index 642495eebaa3..441faa888e34 100644 --- a/java/ql/test/query-tests/security/CWE-326/InsufficientKeySizeTest.ql +++ b/java/ql/test/query-tests/security/CWE-326/InsufficientKeySizeTest.ql @@ -1,5 +1,5 @@ import java -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest import semmle.code.java.security.InsufficientKeySizeQuery module InsufficientKeySizeTest implements TestSig { diff --git a/java/ql/test/query-tests/security/CWE-327/semmle/tests/BrokenCryptoAlgorithm.qlref b/java/ql/test/query-tests/security/CWE-327/semmle/tests/BrokenCryptoAlgorithm.qlref index 8b22820e0911..32cbef3d0fbb 100644 --- a/java/ql/test/query-tests/security/CWE-327/semmle/tests/BrokenCryptoAlgorithm.qlref +++ b/java/ql/test/query-tests/security/CWE-327/semmle/tests/BrokenCryptoAlgorithm.qlref @@ -1,2 +1,2 @@ query: Security/CWE/CWE-327/BrokenCryptoAlgorithm.ql -postprocess: TestUtilities/PrettyPrintModels.ql +postprocess: utils/test/PrettyPrintModels.ql diff --git a/java/ql/test/query-tests/security/CWE-330/InsecureRandomnessTest.ql b/java/ql/test/query-tests/security/CWE-330/InsecureRandomnessTest.ql index a2b6f329ae80..a9e8cbb2dc4d 100644 --- a/java/ql/test/query-tests/security/CWE-330/InsecureRandomnessTest.ql +++ b/java/ql/test/query-tests/security/CWE-330/InsecureRandomnessTest.ql @@ -1,7 +1,7 @@ import java import semmle.code.java.dataflow.DataFlow import semmle.code.java.security.InsecureRandomnessQuery -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest module WeakRandomTest implements TestSig { string getARelevantTag() { result = "hasWeakRandomFlow" } diff --git a/java/ql/test/query-tests/security/CWE-347/MissingJWTSignatureCheckTest.ql b/java/ql/test/query-tests/security/CWE-347/MissingJWTSignatureCheckTest.ql index 3d9a18fc1a89..4ce6116e27f2 100644 --- a/java/ql/test/query-tests/security/CWE-347/MissingJWTSignatureCheckTest.ql +++ b/java/ql/test/query-tests/security/CWE-347/MissingJWTSignatureCheckTest.ql @@ -1,6 +1,6 @@ import java import semmle.code.java.security.MissingJWTSignatureCheckQuery -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest module HasMissingJwtSignatureCheckTest implements TestSig { string getARelevantTag() { result = "hasMissingJwtSignatureCheck" } diff --git a/java/ql/test/query-tests/security/CWE-352/SpringCsrfProtectionTest.ql b/java/ql/test/query-tests/security/CWE-352/SpringCsrfProtectionTest.ql index adf7bfb9862a..067ce1cc952f 100644 --- a/java/ql/test/query-tests/security/CWE-352/SpringCsrfProtectionTest.ql +++ b/java/ql/test/query-tests/security/CWE-352/SpringCsrfProtectionTest.ql @@ -1,6 +1,6 @@ import java import semmle.code.java.security.SpringCsrfProtection -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest module SpringCsrfProtectionTest implements TestSig { string getARelevantTag() { result = "hasSpringCsrfProtectionDisabled" } diff --git a/java/ql/test/query-tests/security/CWE-441/UnsafeContentUriResolutionTest.ql b/java/ql/test/query-tests/security/CWE-441/UnsafeContentUriResolutionTest.ql index ae1258a66c5f..ded8a8d69798 100644 --- a/java/ql/test/query-tests/security/CWE-441/UnsafeContentUriResolutionTest.ql +++ b/java/ql/test/query-tests/security/CWE-441/UnsafeContentUriResolutionTest.ql @@ -1,4 +1,4 @@ import java -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest import semmle.code.java.security.UnsafeContentUriResolutionQuery import TaintFlowTest diff --git a/java/ql/test/query-tests/security/CWE-470/FragmentInjectionInPreferenceActivityTest.ql b/java/ql/test/query-tests/security/CWE-470/FragmentInjectionInPreferenceActivityTest.ql index c1878d4976d3..0deb6934ea30 100644 --- a/java/ql/test/query-tests/security/CWE-470/FragmentInjectionInPreferenceActivityTest.ql +++ b/java/ql/test/query-tests/security/CWE-470/FragmentInjectionInPreferenceActivityTest.ql @@ -1,6 +1,6 @@ import java import semmle.code.java.security.FragmentInjection -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest module FragmentInjectionInPreferenceActivityTest implements TestSig { string getARelevantTag() { result = "hasPreferenceFragmentInjection" } diff --git a/java/ql/test/query-tests/security/CWE-470/FragmentInjectionTest.ql b/java/ql/test/query-tests/security/CWE-470/FragmentInjectionTest.ql index a1cff04f4c63..665d750ee204 100644 --- a/java/ql/test/query-tests/security/CWE-470/FragmentInjectionTest.ql +++ b/java/ql/test/query-tests/security/CWE-470/FragmentInjectionTest.ql @@ -1,4 +1,4 @@ import java import semmle.code.java.security.FragmentInjectionQuery -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest import TaintFlowTest diff --git a/java/ql/test/query-tests/security/CWE-489/debuggable-attribute/DebuggableAttributeEnabledTest.ql b/java/ql/test/query-tests/security/CWE-489/debuggable-attribute/DebuggableAttributeEnabledTest.ql index 79a762ea2094..de2a5feb7229 100644 --- a/java/ql/test/query-tests/security/CWE-489/debuggable-attribute/DebuggableAttributeEnabledTest.ql +++ b/java/ql/test/query-tests/security/CWE-489/debuggable-attribute/DebuggableAttributeEnabledTest.ql @@ -1,6 +1,6 @@ import java import semmle.code.xml.AndroidManifest -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest module DebuggableAttributeEnabledTest implements TestSig { string getARelevantTag() { result = "hasDebuggableAttributeEnabled" } diff --git a/java/ql/test/query-tests/security/CWE-489/webview-debugging/WebviewDebuggingEnabled.ql b/java/ql/test/query-tests/security/CWE-489/webview-debugging/WebviewDebuggingEnabled.ql index 99ac3d4e03cf..f0b9cf08f820 100644 --- a/java/ql/test/query-tests/security/CWE-489/webview-debugging/WebviewDebuggingEnabled.ql +++ b/java/ql/test/query-tests/security/CWE-489/webview-debugging/WebviewDebuggingEnabled.ql @@ -1,4 +1,4 @@ import java -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest import semmle.code.java.security.WebviewDebuggingEnabledQuery import ValueFlowTest diff --git a/java/ql/test/query-tests/security/CWE-501/TrustBoundaryViolations.ql b/java/ql/test/query-tests/security/CWE-501/TrustBoundaryViolations.ql index 26a9b4a73085..79099f674f47 100644 --- a/java/ql/test/query-tests/security/CWE-501/TrustBoundaryViolations.ql +++ b/java/ql/test/query-tests/security/CWE-501/TrustBoundaryViolations.ql @@ -1,4 +1,4 @@ import java import semmle.code.java.security.TrustBoundaryViolationQuery -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest import TaintFlowTest diff --git a/java/ql/test/query-tests/security/CWE-502/UnsafeDeserialization.ql b/java/ql/test/query-tests/security/CWE-502/UnsafeDeserialization.ql index 686238259855..f4570b64ef81 100644 --- a/java/ql/test/query-tests/security/CWE-502/UnsafeDeserialization.ql +++ b/java/ql/test/query-tests/security/CWE-502/UnsafeDeserialization.ql @@ -1,6 +1,6 @@ import java import semmle.code.java.security.UnsafeDeserializationQuery -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest module UnsafeDeserializationTest implements TestSig { string getARelevantTag() { result = "unsafeDeserialization" } diff --git a/java/ql/test/query-tests/security/CWE-522/InsecureBasicAuthTest.ql b/java/ql/test/query-tests/security/CWE-522/InsecureBasicAuthTest.ql index c0384899d569..d3e99009eeec 100644 --- a/java/ql/test/query-tests/security/CWE-522/InsecureBasicAuthTest.ql +++ b/java/ql/test/query-tests/security/CWE-522/InsecureBasicAuthTest.ql @@ -1,6 +1,6 @@ import java import semmle.code.java.security.InsecureBasicAuthQuery -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest module HasInsecureBasicAuthTest implements TestSig { string getARelevantTag() { result = "hasInsecureBasicAuth" } diff --git a/java/ql/test/query-tests/security/CWE-522/InsecureLdapAuthTest.ql b/java/ql/test/query-tests/security/CWE-522/InsecureLdapAuthTest.ql index f75550f51127..7c75f5192ed3 100644 --- a/java/ql/test/query-tests/security/CWE-522/InsecureLdapAuthTest.ql +++ b/java/ql/test/query-tests/security/CWE-522/InsecureLdapAuthTest.ql @@ -1,6 +1,6 @@ import java import semmle.code.java.security.InsecureLdapAuthQuery -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest module InsecureLdapAuthenticationTest implements TestSig { string getARelevantTag() { result = "hasInsecureLdapAuth" } diff --git a/java/ql/test/query-tests/security/CWE-524/SensitiveKeyboardCache.ql b/java/ql/test/query-tests/security/CWE-524/SensitiveKeyboardCache.ql index caa50f9fa755..5c7eda42196d 100644 --- a/java/ql/test/query-tests/security/CWE-524/SensitiveKeyboardCache.ql +++ b/java/ql/test/query-tests/security/CWE-524/SensitiveKeyboardCache.ql @@ -1,6 +1,6 @@ import java import semmle.code.java.security.SensitiveKeyboardCacheQuery -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest module SensitiveKeyboardCacheTest implements TestSig { string getARelevantTag() { result = "hasResult" } diff --git a/java/ql/test/query-tests/security/CWE-532/SensitiveLogInfo.ql b/java/ql/test/query-tests/security/CWE-532/SensitiveLogInfo.ql index 389cff934a91..659d7e6c77e4 100644 --- a/java/ql/test/query-tests/security/CWE-532/SensitiveLogInfo.ql +++ b/java/ql/test/query-tests/security/CWE-532/SensitiveLogInfo.ql @@ -1,4 +1,4 @@ import java -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest import semmle.code.java.security.SensitiveLoggingQuery import TaintFlowTest diff --git a/java/ql/test/query-tests/security/CWE-552/UrlForwardTest.ql b/java/ql/test/query-tests/security/CWE-552/UrlForwardTest.ql index 34841885bc34..f7240bf0c303 100644 --- a/java/ql/test/query-tests/security/CWE-552/UrlForwardTest.ql +++ b/java/ql/test/query-tests/security/CWE-552/UrlForwardTest.ql @@ -1,4 +1,4 @@ import java -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest import semmle.code.java.security.UrlForwardQuery import TaintFlowTest diff --git a/java/ql/test/query-tests/security/CWE-601/semmle/tests/UrlRedirect.qlref b/java/ql/test/query-tests/security/CWE-601/semmle/tests/UrlRedirect.qlref index 7a16f869e57b..933c3569eed8 100644 --- a/java/ql/test/query-tests/security/CWE-601/semmle/tests/UrlRedirect.qlref +++ b/java/ql/test/query-tests/security/CWE-601/semmle/tests/UrlRedirect.qlref @@ -1,2 +1,2 @@ query: Security/CWE/CWE-601/UrlRedirect.ql -postprocess: TestUtilities/PrettyPrintModels.ql +postprocess: utils/test/PrettyPrintModels.ql diff --git a/java/ql/test/query-tests/security/CWE-611/XXE.ql b/java/ql/test/query-tests/security/CWE-611/XXE.ql index ed12823a6bba..21483d8f658d 100644 --- a/java/ql/test/query-tests/security/CWE-611/XXE.ql +++ b/java/ql/test/query-tests/security/CWE-611/XXE.ql @@ -1,4 +1,4 @@ import java -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest import semmle.code.java.security.XxeRemoteQuery import TaintFlowTest diff --git a/java/ql/test/query-tests/security/CWE-643/XPathInjectionTest.ql b/java/ql/test/query-tests/security/CWE-643/XPathInjectionTest.ql index 3f39a4752bb9..3c7110d8011f 100644 --- a/java/ql/test/query-tests/security/CWE-643/XPathInjectionTest.ql +++ b/java/ql/test/query-tests/security/CWE-643/XPathInjectionTest.ql @@ -1,7 +1,7 @@ import java import semmle.code.java.dataflow.DataFlow import semmle.code.java.security.XPathInjectionQuery -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest module HasXPathInjectionTest implements TestSig { string getARelevantTag() { result = "hasXPathInjection" } diff --git a/java/ql/test/query-tests/security/CWE-681/semmle/tests/NumericCastTainted.qlref b/java/ql/test/query-tests/security/CWE-681/semmle/tests/NumericCastTainted.qlref index f272248e402c..f06664e19d4b 100644 --- a/java/ql/test/query-tests/security/CWE-681/semmle/tests/NumericCastTainted.qlref +++ b/java/ql/test/query-tests/security/CWE-681/semmle/tests/NumericCastTainted.qlref @@ -1,2 +1,2 @@ query: Security/CWE/CWE-681/NumericCastTainted.ql -postprocess: TestUtilities/PrettyPrintModels.ql +postprocess: utils/test/PrettyPrintModels.ql diff --git a/java/ql/test/query-tests/security/CWE-730/PolynomialReDoS.ql b/java/ql/test/query-tests/security/CWE-730/PolynomialReDoS.ql index 45dea80e72b5..d8c1a790e70a 100644 --- a/java/ql/test/query-tests/security/CWE-730/PolynomialReDoS.ql +++ b/java/ql/test/query-tests/security/CWE-730/PolynomialReDoS.ql @@ -1,4 +1,4 @@ -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest import semmle.code.java.security.regexp.PolynomialReDoSQuery module HasPolyRedos implements TestSig { diff --git a/java/ql/test/query-tests/security/CWE-730/ReDoS.ql b/java/ql/test/query-tests/security/CWE-730/ReDoS.ql index 4011946318e1..98674d09df5e 100644 --- a/java/ql/test/query-tests/security/CWE-730/ReDoS.ql +++ b/java/ql/test/query-tests/security/CWE-730/ReDoS.ql @@ -1,5 +1,5 @@ import java -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest private import semmle.code.java.regex.RegexTreeView::RegexTreeView as TreeView import codeql.regex.nfa.ExponentialBackTracking::Make as ExponentialBackTracking import semmle.code.java.regex.regex diff --git a/java/ql/test/query-tests/security/CWE-730/RegexInjectionTest.ql b/java/ql/test/query-tests/security/CWE-730/RegexInjectionTest.ql index afc621e0767c..cba14c212e98 100644 --- a/java/ql/test/query-tests/security/CWE-730/RegexInjectionTest.ql +++ b/java/ql/test/query-tests/security/CWE-730/RegexInjectionTest.ql @@ -1,5 +1,5 @@ import java -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest import semmle.code.java.security.regexp.RegexInjectionQuery module RegexInjectionTest implements TestSig { diff --git a/java/ql/test/query-tests/security/CWE-749/UnsafeAndroidAccessTest.ql b/java/ql/test/query-tests/security/CWE-749/UnsafeAndroidAccessTest.ql index 99fba4e91722..19770b172e44 100644 --- a/java/ql/test/query-tests/security/CWE-749/UnsafeAndroidAccessTest.ql +++ b/java/ql/test/query-tests/security/CWE-749/UnsafeAndroidAccessTest.ql @@ -1,6 +1,6 @@ import java import semmle.code.java.security.UnsafeAndroidAccessQuery -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest module UnsafeAndroidAccessTest implements TestSig { string getARelevantTag() { result = "hasUnsafeAndroidAccess" } diff --git a/java/ql/test/query-tests/security/CWE-780/RsaWithoutOaepTest.ql b/java/ql/test/query-tests/security/CWE-780/RsaWithoutOaepTest.ql index 16e5c219aa9e..b91765e6b7cc 100644 --- a/java/ql/test/query-tests/security/CWE-780/RsaWithoutOaepTest.ql +++ b/java/ql/test/query-tests/security/CWE-780/RsaWithoutOaepTest.ql @@ -1,4 +1,4 @@ import java -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest import semmle.code.java.security.RsaWithoutOaepQuery import TaintFlowTest diff --git a/java/ql/test/query-tests/security/CWE-798/semmle/tests/HardcodedCredentialsApiCall.ql b/java/ql/test/query-tests/security/CWE-798/semmle/tests/HardcodedCredentialsApiCall.ql index 2b2290fad106..7ba8c42115d8 100644 --- a/java/ql/test/query-tests/security/CWE-798/semmle/tests/HardcodedCredentialsApiCall.ql +++ b/java/ql/test/query-tests/security/CWE-798/semmle/tests/HardcodedCredentialsApiCall.ql @@ -1,6 +1,6 @@ import java import semmle.code.java.security.HardcodedCredentialsApiCallQuery -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest module HardcodedCredentialsApiCallTest implements TestSig { string getARelevantTag() { result = "HardcodedCredentialsApiCall" } diff --git a/java/ql/test/query-tests/security/CWE-798/semmle/tests/HardcodedCredentialsComparison.ql b/java/ql/test/query-tests/security/CWE-798/semmle/tests/HardcodedCredentialsComparison.ql index 106989848283..e03660c1e134 100644 --- a/java/ql/test/query-tests/security/CWE-798/semmle/tests/HardcodedCredentialsComparison.ql +++ b/java/ql/test/query-tests/security/CWE-798/semmle/tests/HardcodedCredentialsComparison.ql @@ -1,6 +1,6 @@ import java import semmle.code.java.security.HardcodedCredentialsComparison -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest module HardcodedCredentialsComparisonTest implements TestSig { string getARelevantTag() { result = "HardcodedCredentialsComparison" } diff --git a/java/ql/test/query-tests/security/CWE-798/semmle/tests/HardcodedCredentialsSourceCall.ql b/java/ql/test/query-tests/security/CWE-798/semmle/tests/HardcodedCredentialsSourceCall.ql index ab941d80a4ed..dd2350f3fca5 100644 --- a/java/ql/test/query-tests/security/CWE-798/semmle/tests/HardcodedCredentialsSourceCall.ql +++ b/java/ql/test/query-tests/security/CWE-798/semmle/tests/HardcodedCredentialsSourceCall.ql @@ -1,6 +1,6 @@ import java import semmle.code.java.security.HardcodedCredentialsSourceCallQuery -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest module HardcodedCredentialsSourceCallTest implements TestSig { string getARelevantTag() { result = "HardcodedCredentialsSourceCall" } diff --git a/java/ql/test/query-tests/security/CWE-798/semmle/tests/HardcodedPasswordField.ql b/java/ql/test/query-tests/security/CWE-798/semmle/tests/HardcodedPasswordField.ql index f734ca356aca..59a78e5301ff 100644 --- a/java/ql/test/query-tests/security/CWE-798/semmle/tests/HardcodedPasswordField.ql +++ b/java/ql/test/query-tests/security/CWE-798/semmle/tests/HardcodedPasswordField.ql @@ -1,6 +1,6 @@ import java import semmle.code.java.security.HardcodedPasswordField -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest module HardcodedPasswordFieldTest implements TestSig { string getARelevantTag() { result = "HardcodedPasswordField" } diff --git a/java/ql/test/query-tests/security/CWE-807/semmle/tests/ConditionalBypassTest.ql b/java/ql/test/query-tests/security/CWE-807/semmle/tests/ConditionalBypassTest.ql index e77ea5ad228e..15f42216679a 100644 --- a/java/ql/test/query-tests/security/CWE-807/semmle/tests/ConditionalBypassTest.ql +++ b/java/ql/test/query-tests/security/CWE-807/semmle/tests/ConditionalBypassTest.ql @@ -1,6 +1,6 @@ import java import semmle.code.java.security.ConditionalBypassQuery -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest module ConditionalBypassTest implements TestSig { string getARelevantTag() { result = "hasConditionalBypassTest" } diff --git a/java/ql/test/query-tests/security/CWE-807/semmle/tests/TaintedPermissionsCheck.qlref b/java/ql/test/query-tests/security/CWE-807/semmle/tests/TaintedPermissionsCheck.qlref index d12490a40e1f..8c69ea7e9942 100644 --- a/java/ql/test/query-tests/security/CWE-807/semmle/tests/TaintedPermissionsCheck.qlref +++ b/java/ql/test/query-tests/security/CWE-807/semmle/tests/TaintedPermissionsCheck.qlref @@ -1,2 +1,2 @@ query: Security/CWE/CWE-807/TaintedPermissionsCheck.ql -postprocess: TestUtilities/PrettyPrintModels.ql +postprocess: utils/test/PrettyPrintModels.ql diff --git a/java/ql/test/query-tests/security/CWE-917/OgnlInjectionTest.ql b/java/ql/test/query-tests/security/CWE-917/OgnlInjectionTest.ql index 52dd8ad34175..5957bdf5fa28 100644 --- a/java/ql/test/query-tests/security/CWE-917/OgnlInjectionTest.ql +++ b/java/ql/test/query-tests/security/CWE-917/OgnlInjectionTest.ql @@ -1,6 +1,6 @@ import java import semmle.code.java.security.OgnlInjectionQuery -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest module OgnlInjectionTest implements TestSig { string getARelevantTag() { result = "hasOgnlInjection" } diff --git a/java/ql/test/query-tests/security/CWE-918/RequestForgery.ql b/java/ql/test/query-tests/security/CWE-918/RequestForgery.ql index 41dbaad7d05e..971a9532bd6f 100644 --- a/java/ql/test/query-tests/security/CWE-918/RequestForgery.ql +++ b/java/ql/test/query-tests/security/CWE-918/RequestForgery.ql @@ -1,6 +1,6 @@ import java import semmle.code.java.security.RequestForgeryConfig -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest module HasFlowTest implements TestSig { string getARelevantTag() { result = "SSRF" } diff --git a/java/ql/test/query-tests/security/CWE-925/ImproperIntentVerification.ql b/java/ql/test/query-tests/security/CWE-925/ImproperIntentVerification.ql index baba5cac1035..67da4ee9b297 100644 --- a/java/ql/test/query-tests/security/CWE-925/ImproperIntentVerification.ql +++ b/java/ql/test/query-tests/security/CWE-925/ImproperIntentVerification.ql @@ -1,6 +1,6 @@ import java import semmle.code.java.security.ImproperIntentVerificationQuery -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest module HasFlowTest implements TestSig { string getARelevantTag() { result = "hasResult" } diff --git a/java/ql/test/query-tests/security/CWE-926/ImplicitlyExportedAndroidComponentTest.ql b/java/ql/test/query-tests/security/CWE-926/ImplicitlyExportedAndroidComponentTest.ql index 934fc5c899b0..aefddf1e7f6e 100644 --- a/java/ql/test/query-tests/security/CWE-926/ImplicitlyExportedAndroidComponentTest.ql +++ b/java/ql/test/query-tests/security/CWE-926/ImplicitlyExportedAndroidComponentTest.ql @@ -1,6 +1,6 @@ import java import semmle.code.java.security.ImplicitlyExportedAndroidComponent -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest module ImplicitlyExportedAndroidComponentTest implements TestSig { string getARelevantTag() { result = "hasImplicitExport" } diff --git a/java/ql/test/query-tests/security/CWE-926/incomplete_provider_permissions/ContentProviderIncompletePermissionsTest.ql b/java/ql/test/query-tests/security/CWE-926/incomplete_provider_permissions/ContentProviderIncompletePermissionsTest.ql index c7ce16660e11..37bbd60a3ba3 100644 --- a/java/ql/test/query-tests/security/CWE-926/incomplete_provider_permissions/ContentProviderIncompletePermissionsTest.ql +++ b/java/ql/test/query-tests/security/CWE-926/incomplete_provider_permissions/ContentProviderIncompletePermissionsTest.ql @@ -1,6 +1,6 @@ import java import semmle.code.xml.AndroidManifest -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest module ContentProviderIncompletePermissionsTest implements TestSig { string getARelevantTag() { result = "hasIncompletePermissions" } diff --git a/java/ql/test/query-tests/security/CWE-927/ImplicitPendingIntentsTest.ql b/java/ql/test/query-tests/security/CWE-927/ImplicitPendingIntentsTest.ql index e43b90f8ee86..b474a32b52c7 100644 --- a/java/ql/test/query-tests/security/CWE-927/ImplicitPendingIntentsTest.ql +++ b/java/ql/test/query-tests/security/CWE-927/ImplicitPendingIntentsTest.ql @@ -1,6 +1,6 @@ import java import semmle.code.java.security.ImplicitPendingIntentsQuery -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest module ImplicitPendingIntentsTest implements TestSig { string getARelevantTag() { result = "hasImplicitPendingIntent" } diff --git a/java/ql/test/query-tests/security/CWE-927/SensitiveCommunication.ql b/java/ql/test/query-tests/security/CWE-927/SensitiveCommunication.ql index 87d685d1da9e..ce523ad4170a 100644 --- a/java/ql/test/query-tests/security/CWE-927/SensitiveCommunication.ql +++ b/java/ql/test/query-tests/security/CWE-927/SensitiveCommunication.ql @@ -1,4 +1,4 @@ import java import semmle.code.java.security.AndroidSensitiveCommunicationQuery -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest import TaintFlowTest diff --git a/java/ql/test/query-tests/security/CWE-927/SensitiveResultReceiver.ql b/java/ql/test/query-tests/security/CWE-927/SensitiveResultReceiver.ql index 70ce64ff97c7..0f7b6ed0554b 100644 --- a/java/ql/test/query-tests/security/CWE-927/SensitiveResultReceiver.ql +++ b/java/ql/test/query-tests/security/CWE-927/SensitiveResultReceiver.ql @@ -1,5 +1,5 @@ import java -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest import semmle.code.java.security.SensitiveResultReceiverQuery class TestSource extends RemoteFlowSource { diff --git a/java/ql/test/query-tests/security/CWE-940/AndroidIntentRedirectionTest.qlref b/java/ql/test/query-tests/security/CWE-940/AndroidIntentRedirectionTest.qlref index e6061ac902a2..26dc9ea016ec 100644 --- a/java/ql/test/query-tests/security/CWE-940/AndroidIntentRedirectionTest.qlref +++ b/java/ql/test/query-tests/security/CWE-940/AndroidIntentRedirectionTest.qlref @@ -1,2 +1,2 @@ query: Security/CWE/CWE-940/AndroidIntentRedirection.ql -postprocess: TestUtilities/InlineExpectationsTestQuery.ql \ No newline at end of file +postprocess: utils/test/InlineExpectationsTestQuery.ql \ No newline at end of file diff --git a/java/ql/test/utils/modelgenerator/dataflow/CaptureContentSummaryModels.ql b/java/ql/test/utils/modelgenerator/dataflow/CaptureContentSummaryModels.ql index d1ff7a20edd9..8dd23714fb79 100644 --- a/java/ql/test/utils/modelgenerator/dataflow/CaptureContentSummaryModels.ql +++ b/java/ql/test/utils/modelgenerator/dataflow/CaptureContentSummaryModels.ql @@ -1,6 +1,6 @@ import java import utils.modelgenerator.internal.CaptureModels -import TestUtilities.InlineMadTest +import utils.test.InlineMadTest module InlineMadTestConfig implements InlineMadTestConfigSig { string getCapturedModel(Callable c) { result = ContentSensitive::captureFlow(c, _) } diff --git a/java/ql/test/utils/modelgenerator/dataflow/CaptureNeutralModels.ql b/java/ql/test/utils/modelgenerator/dataflow/CaptureNeutralModels.ql index cdc2dfcaa459..f9ac9d8da366 100644 --- a/java/ql/test/utils/modelgenerator/dataflow/CaptureNeutralModels.ql +++ b/java/ql/test/utils/modelgenerator/dataflow/CaptureNeutralModels.ql @@ -1,6 +1,6 @@ import java import utils.modelgenerator.internal.CaptureModels -import TestUtilities.InlineMadTest +import utils.test.InlineMadTest module InlineMadTestConfig implements InlineMadTestConfigSig { string getCapturedModel(Callable c) { result = captureNoFlow(c) } diff --git a/java/ql/test/utils/modelgenerator/dataflow/CaptureSinkModels.ql b/java/ql/test/utils/modelgenerator/dataflow/CaptureSinkModels.ql index 1acde2ade49d..a7d3126df570 100644 --- a/java/ql/test/utils/modelgenerator/dataflow/CaptureSinkModels.ql +++ b/java/ql/test/utils/modelgenerator/dataflow/CaptureSinkModels.ql @@ -1,6 +1,6 @@ import java import utils.modelgenerator.internal.CaptureModels -import TestUtilities.InlineMadTest +import utils.test.InlineMadTest module InlineMadTestConfig implements InlineMadTestConfigSig { string getCapturedModel(Callable c) { result = captureSink(c) } diff --git a/java/ql/test/utils/modelgenerator/dataflow/CaptureSourceModels.ql b/java/ql/test/utils/modelgenerator/dataflow/CaptureSourceModels.ql index 7596f4f8cc14..d8ac4d9d6034 100644 --- a/java/ql/test/utils/modelgenerator/dataflow/CaptureSourceModels.ql +++ b/java/ql/test/utils/modelgenerator/dataflow/CaptureSourceModels.ql @@ -1,6 +1,6 @@ import java import utils.modelgenerator.internal.CaptureModels -import TestUtilities.InlineMadTest +import utils.test.InlineMadTest module InlineMadTestConfig implements InlineMadTestConfigSig { string getCapturedModel(Callable c) { result = captureSource(c) } diff --git a/java/ql/test/utils/modelgenerator/dataflow/CaptureSummaryModels.ql b/java/ql/test/utils/modelgenerator/dataflow/CaptureSummaryModels.ql index c9e5050fc1fc..482dce0ab28e 100644 --- a/java/ql/test/utils/modelgenerator/dataflow/CaptureSummaryModels.ql +++ b/java/ql/test/utils/modelgenerator/dataflow/CaptureSummaryModels.ql @@ -1,6 +1,6 @@ import java import utils.modelgenerator.internal.CaptureModels -import TestUtilities.InlineMadTest +import utils.test.InlineMadTest module InlineMadTestConfig implements InlineMadTestConfigSig { string getCapturedModel(Callable c) { result = captureFlow(c) } diff --git a/java/ql/test/utils/modelgenerator/typebasedflow/CaptureTypeBasedSummaryModels.ql b/java/ql/test/utils/modelgenerator/typebasedflow/CaptureTypeBasedSummaryModels.ql index 2bf4e08d2c17..5bf71e7e3ecf 100644 --- a/java/ql/test/utils/modelgenerator/typebasedflow/CaptureTypeBasedSummaryModels.ql +++ b/java/ql/test/utils/modelgenerator/typebasedflow/CaptureTypeBasedSummaryModels.ql @@ -1,5 +1,5 @@ import java -import TestUtilities.InlineMadTest +import utils.test.InlineMadTest import utils.modelgenerator.internal.CaptureTypeBasedSummaryModels module InlineMadTestConfig implements InlineMadTestConfigSig { From 8fbd4a2cd545f35b4eb9cad1381d45758c67273d Mon Sep 17 00:00:00 2001 From: Michael Nebel Date: Wed, 13 Nov 2024 09:18:50 +0100 Subject: [PATCH 03/24] C#: Move inline-tests into the utils test folder. --- .../ql/test/{TestUtilities => utils}/inline-tests/InlineTests.cs | 0 .../inline-tests/PathProblemQuery.expected | 0 .../{TestUtilities => utils}/inline-tests/PathProblemQuery.qlref | 0 .../{TestUtilities => utils}/inline-tests/ProblemQuery.expected | 0 .../test/{TestUtilities => utils}/inline-tests/ProblemQuery.qlref | 0 .../inline-tests/queries/PathProblemQuery.expected | 0 .../inline-tests/queries/PathProblemQuery.ql | 0 .../inline-tests/queries/ProblemQuery.expected | 0 .../{TestUtilities => utils}/inline-tests/queries/ProblemQuery.ql | 0 9 files changed, 0 insertions(+), 0 deletions(-) rename csharp/ql/test/{TestUtilities => utils}/inline-tests/InlineTests.cs (100%) rename csharp/ql/test/{TestUtilities => utils}/inline-tests/PathProblemQuery.expected (100%) rename csharp/ql/test/{TestUtilities => utils}/inline-tests/PathProblemQuery.qlref (100%) rename csharp/ql/test/{TestUtilities => utils}/inline-tests/ProblemQuery.expected (100%) rename csharp/ql/test/{TestUtilities => utils}/inline-tests/ProblemQuery.qlref (100%) rename csharp/ql/test/{TestUtilities => utils}/inline-tests/queries/PathProblemQuery.expected (100%) rename csharp/ql/test/{TestUtilities => utils}/inline-tests/queries/PathProblemQuery.ql (100%) rename csharp/ql/test/{TestUtilities => utils}/inline-tests/queries/ProblemQuery.expected (100%) rename csharp/ql/test/{TestUtilities => utils}/inline-tests/queries/ProblemQuery.ql (100%) diff --git a/csharp/ql/test/TestUtilities/inline-tests/InlineTests.cs b/csharp/ql/test/utils/inline-tests/InlineTests.cs similarity index 100% rename from csharp/ql/test/TestUtilities/inline-tests/InlineTests.cs rename to csharp/ql/test/utils/inline-tests/InlineTests.cs diff --git a/csharp/ql/test/TestUtilities/inline-tests/PathProblemQuery.expected b/csharp/ql/test/utils/inline-tests/PathProblemQuery.expected similarity index 100% rename from csharp/ql/test/TestUtilities/inline-tests/PathProblemQuery.expected rename to csharp/ql/test/utils/inline-tests/PathProblemQuery.expected diff --git a/csharp/ql/test/TestUtilities/inline-tests/PathProblemQuery.qlref b/csharp/ql/test/utils/inline-tests/PathProblemQuery.qlref similarity index 100% rename from csharp/ql/test/TestUtilities/inline-tests/PathProblemQuery.qlref rename to csharp/ql/test/utils/inline-tests/PathProblemQuery.qlref diff --git a/csharp/ql/test/TestUtilities/inline-tests/ProblemQuery.expected b/csharp/ql/test/utils/inline-tests/ProblemQuery.expected similarity index 100% rename from csharp/ql/test/TestUtilities/inline-tests/ProblemQuery.expected rename to csharp/ql/test/utils/inline-tests/ProblemQuery.expected diff --git a/csharp/ql/test/TestUtilities/inline-tests/ProblemQuery.qlref b/csharp/ql/test/utils/inline-tests/ProblemQuery.qlref similarity index 100% rename from csharp/ql/test/TestUtilities/inline-tests/ProblemQuery.qlref rename to csharp/ql/test/utils/inline-tests/ProblemQuery.qlref diff --git a/csharp/ql/test/TestUtilities/inline-tests/queries/PathProblemQuery.expected b/csharp/ql/test/utils/inline-tests/queries/PathProblemQuery.expected similarity index 100% rename from csharp/ql/test/TestUtilities/inline-tests/queries/PathProblemQuery.expected rename to csharp/ql/test/utils/inline-tests/queries/PathProblemQuery.expected diff --git a/csharp/ql/test/TestUtilities/inline-tests/queries/PathProblemQuery.ql b/csharp/ql/test/utils/inline-tests/queries/PathProblemQuery.ql similarity index 100% rename from csharp/ql/test/TestUtilities/inline-tests/queries/PathProblemQuery.ql rename to csharp/ql/test/utils/inline-tests/queries/PathProblemQuery.ql diff --git a/csharp/ql/test/TestUtilities/inline-tests/queries/ProblemQuery.expected b/csharp/ql/test/utils/inline-tests/queries/ProblemQuery.expected similarity index 100% rename from csharp/ql/test/TestUtilities/inline-tests/queries/ProblemQuery.expected rename to csharp/ql/test/utils/inline-tests/queries/ProblemQuery.expected diff --git a/csharp/ql/test/TestUtilities/inline-tests/queries/ProblemQuery.ql b/csharp/ql/test/utils/inline-tests/queries/ProblemQuery.ql similarity index 100% rename from csharp/ql/test/TestUtilities/inline-tests/queries/ProblemQuery.ql rename to csharp/ql/test/utils/inline-tests/queries/ProblemQuery.ql From c7c3f6bd808a356f75a80f4a4cda0ed74458ec5e Mon Sep 17 00:00:00 2001 From: Michael Nebel Date: Wed, 13 Nov 2024 09:20:35 +0100 Subject: [PATCH 04/24] C#: Update inline-tests query paths. --- csharp/ql/test/utils/inline-tests/PathProblemQuery.qlref | 2 +- csharp/ql/test/utils/inline-tests/ProblemQuery.qlref | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/csharp/ql/test/utils/inline-tests/PathProblemQuery.qlref b/csharp/ql/test/utils/inline-tests/PathProblemQuery.qlref index cbc554598f33..41e5adc69bb5 100644 --- a/csharp/ql/test/utils/inline-tests/PathProblemQuery.qlref +++ b/csharp/ql/test/utils/inline-tests/PathProblemQuery.qlref @@ -1,2 +1,2 @@ -query: TestUtilities/inline-tests/queries/PathProblemQuery.ql +query: utils/inline-tests/queries/PathProblemQuery.ql postprocess: TestUtilities/InlineExpectationsTestQuery.ql \ No newline at end of file diff --git a/csharp/ql/test/utils/inline-tests/ProblemQuery.qlref b/csharp/ql/test/utils/inline-tests/ProblemQuery.qlref index d5afc6a690f2..ee7242b6c6c8 100644 --- a/csharp/ql/test/utils/inline-tests/ProblemQuery.qlref +++ b/csharp/ql/test/utils/inline-tests/ProblemQuery.qlref @@ -1,2 +1,2 @@ -query: TestUtilities/inline-tests/queries/ProblemQuery.ql +query: utils/inline-tests/queries/ProblemQuery.ql postprocess: TestUtilities/InlineExpectationsTestQuery.ql \ No newline at end of file From c4b4be93727667c291b32df411c784ecf5c78eeb Mon Sep 17 00:00:00 2001 From: Michael Nebel Date: Wed, 13 Nov 2024 09:21:39 +0100 Subject: [PATCH 05/24] C#: Move test utilities into the query pack. --- .../TestUtilities => src/utils/test}/InlineExpectationsTest.qll | 0 .../utils/test}/InlineExpectationsTestQuery.ql | 0 .../ql/{test/TestUtilities => src/utils/test}/InlineFlowTest.qll | 0 .../ql/{test/TestUtilities => src/utils/test}/InlineMadTest.qll | 0 .../{test/TestUtilities => src/utils/test}/PrettyPrintModels.ql | 0 .../TestUtilities => src/utils/test}/ProvenancePathGraph.qll | 0 .../utils/test}/internal/InlineExpectationsTestImpl.qll | 0 7 files changed, 0 insertions(+), 0 deletions(-) rename csharp/ql/{test/TestUtilities => src/utils/test}/InlineExpectationsTest.qll (100%) rename csharp/ql/{test/TestUtilities => src/utils/test}/InlineExpectationsTestQuery.ql (100%) rename csharp/ql/{test/TestUtilities => src/utils/test}/InlineFlowTest.qll (100%) rename csharp/ql/{test/TestUtilities => src/utils/test}/InlineMadTest.qll (100%) rename csharp/ql/{test/TestUtilities => src/utils/test}/PrettyPrintModels.ql (100%) rename csharp/ql/{test/TestUtilities => src/utils/test}/ProvenancePathGraph.qll (100%) rename csharp/ql/{test/TestUtilities => src/utils/test}/internal/InlineExpectationsTestImpl.qll (100%) diff --git a/csharp/ql/test/TestUtilities/InlineExpectationsTest.qll b/csharp/ql/src/utils/test/InlineExpectationsTest.qll similarity index 100% rename from csharp/ql/test/TestUtilities/InlineExpectationsTest.qll rename to csharp/ql/src/utils/test/InlineExpectationsTest.qll diff --git a/csharp/ql/test/TestUtilities/InlineExpectationsTestQuery.ql b/csharp/ql/src/utils/test/InlineExpectationsTestQuery.ql similarity index 100% rename from csharp/ql/test/TestUtilities/InlineExpectationsTestQuery.ql rename to csharp/ql/src/utils/test/InlineExpectationsTestQuery.ql diff --git a/csharp/ql/test/TestUtilities/InlineFlowTest.qll b/csharp/ql/src/utils/test/InlineFlowTest.qll similarity index 100% rename from csharp/ql/test/TestUtilities/InlineFlowTest.qll rename to csharp/ql/src/utils/test/InlineFlowTest.qll diff --git a/csharp/ql/test/TestUtilities/InlineMadTest.qll b/csharp/ql/src/utils/test/InlineMadTest.qll similarity index 100% rename from csharp/ql/test/TestUtilities/InlineMadTest.qll rename to csharp/ql/src/utils/test/InlineMadTest.qll diff --git a/csharp/ql/test/TestUtilities/PrettyPrintModels.ql b/csharp/ql/src/utils/test/PrettyPrintModels.ql similarity index 100% rename from csharp/ql/test/TestUtilities/PrettyPrintModels.ql rename to csharp/ql/src/utils/test/PrettyPrintModels.ql diff --git a/csharp/ql/test/TestUtilities/ProvenancePathGraph.qll b/csharp/ql/src/utils/test/ProvenancePathGraph.qll similarity index 100% rename from csharp/ql/test/TestUtilities/ProvenancePathGraph.qll rename to csharp/ql/src/utils/test/ProvenancePathGraph.qll diff --git a/csharp/ql/test/TestUtilities/internal/InlineExpectationsTestImpl.qll b/csharp/ql/src/utils/test/internal/InlineExpectationsTestImpl.qll similarity index 100% rename from csharp/ql/test/TestUtilities/internal/InlineExpectationsTestImpl.qll rename to csharp/ql/src/utils/test/internal/InlineExpectationsTestImpl.qll From 82f8a796e1bc15806928a773da72ee0b861d723f Mon Sep 17 00:00:00 2001 From: Michael Nebel Date: Wed, 13 Nov 2024 09:27:45 +0100 Subject: [PATCH 06/24] C#: Update all test util paths to point to the new location. --- .../Security Features/CWE-759/HashWithoutSalt.qlref | 2 +- csharp/ql/test/library-tests/dataflow/async/Async.ql | 2 +- .../library-tests/dataflow/barrier-guards/barrier-flow.ql | 2 +- .../test/library-tests/dataflow/collections/CollectionFlow.ql | 2 +- .../library-tests/dataflow/constructors/ConstructorFlow.ql | 2 +- .../library-tests/dataflow/external-models/ExternalFlow.ql | 2 +- csharp/ql/test/library-tests/dataflow/fields/FieldFlow.ql | 2 +- .../flowsources/stored/database/dapper/DatabaseSources.ql | 2 +- .../library-tests/dataflow/flowsources/stored/file/Files.ql | 2 +- csharp/ql/test/library-tests/dataflow/global/DataFlowPath.ql | 2 +- .../test/library-tests/dataflow/global/TaintTrackingPath.ql | 2 +- .../ql/test/library-tests/dataflow/operators/operatorFlow.ql | 2 +- csharp/ql/test/library-tests/dataflow/patterns/PatternFlow.ql | 2 +- .../dataflow/threat-models/threat-models-flowtest1.ql | 2 +- .../dataflow/threat-models/threat-models-flowtest2.ql | 2 +- .../dataflow/threat-models/threat-models-flowtest3.ql | 2 +- .../dataflow/threat-models/threat-models-flowtest4.ql | 2 +- .../dataflow/threat-models/threat-models-flowtest5.ql | 2 +- .../dataflow/threat-models/threat-models-flowtest6.ql | 2 +- csharp/ql/test/library-tests/dataflow/tuples/Tuples.ql | 2 +- .../dataflow/typeflow-dispatch/TypeFlowDispatch.ql | 2 +- csharp/ql/test/library-tests/dataflow/types/Types.ql | 2 +- .../test/library-tests/frameworks/EntityFramework/Dataflow.ql | 2 +- .../CWE-020/UntrustedDataToExternalAPI.qlref | 2 +- .../Security Features/CWE-022/TaintedPath/TaintedPath.qlref | 2 +- .../Security Features/CWE-022/ZipSlip/ZipSlip.qlref | 2 +- .../Security Features/CWE-078/CommandInjection.qlref | 2 +- .../Security Features/CWE-079/StoredXSS/StoredXSS.qlref | 2 +- .../test/query-tests/Security Features/CWE-079/XSS/XSS.qlref | 4 ++-- .../query-tests/Security Features/CWE-079/XSSAsp/XSS.qlref | 2 +- .../query-tests/Security Features/CWE-089/SqlInjection.qlref | 2 +- .../query-tests/Security Features/CWE-090/LDAPInjection.qlref | 2 +- .../Security Features/CWE-091/XMLInjection/XMLInjection.qlref | 2 +- .../query-tests/Security Features/CWE-094/CodeInjection.qlref | 2 +- .../Security Features/CWE-099/ResourceInjection.qlref | 2 +- .../Security Features/CWE-112/MissingXMLValidation.qlref | 2 +- .../CWE-114/AssemblyPathInjection/AssemblyPathInjection.qlref | 2 +- .../query-tests/Security Features/CWE-117/LogForging.qlref | 2 +- .../Security Features/CWE-134/UncontrolledFormatString.qlref | 2 +- .../ExposureInTransmittedData/ExposureInTransmittedData.qlref | 2 +- .../CWE-209/ExceptionInformationExposure.qlref | 2 +- .../HardcodedSymmetricEncryptionKey.qlref | 2 +- .../Security Features/CWE-338/InsecureRandomness.qlref | 2 +- .../UnsafeDeserializationUntrustedInput.qlref | 2 +- .../UnsafeDeserializationUntrustedInput.qlref | 2 +- .../Security Features/CWE-601/UrlRedirect/UrlRedirect.qlref | 2 +- .../Security Features/CWE-611/UntrustedDataInsecureXml.qlref | 2 +- .../Security Features/CWE-611/UseXmlSecureResolver.qlref | 2 +- .../Security Features/CWE-643/XPathInjection.qlref | 2 +- .../query-tests/Security Features/CWE-730/ReDoS/ReDoS.qlref | 2 +- .../Security Features/CWE-730/ReDoSGlobalTimeout/ReDoS.qlref | 2 +- .../CWE-730/RegexInjection/RegexInjection.qlref | 2 +- .../Security Features/CWE-807/ConditionalBypass.qlref | 2 +- .../Security Features/CWE-838/InappropriateEncoding.qlref | 2 +- .../query-tests/Useless Code/UnusedLabel/UnusedLabel.qlref | 2 +- csharp/ql/test/utils/inline-tests/PathProblemQuery.qlref | 2 +- csharp/ql/test/utils/inline-tests/ProblemQuery.qlref | 2 +- .../modelgenerator/dataflow/CaptureContentSummaryModels.ql | 2 +- .../utils/modelgenerator/dataflow/CaptureNeutralModels.ql | 2 +- .../test/utils/modelgenerator/dataflow/CaptureSinkModels.ql | 2 +- .../test/utils/modelgenerator/dataflow/CaptureSourceModels.ql | 2 +- .../utils/modelgenerator/dataflow/CaptureSummaryModels.ql | 2 +- .../typebasedflow/CaptureTypeBasedSummaryModels.ql | 2 +- 63 files changed, 64 insertions(+), 64 deletions(-) diff --git a/csharp/ql/test/experimental/Security Features/CWE-759/HashWithoutSalt.qlref b/csharp/ql/test/experimental/Security Features/CWE-759/HashWithoutSalt.qlref index 6489a3400571..4816eabeacbc 100644 --- a/csharp/ql/test/experimental/Security Features/CWE-759/HashWithoutSalt.qlref +++ b/csharp/ql/test/experimental/Security Features/CWE-759/HashWithoutSalt.qlref @@ -1,2 +1,2 @@ query: experimental/Security Features/CWE-759/HashWithoutSalt.ql -postprocess: TestUtilities/PrettyPrintModels.ql +postprocess: utils/test/PrettyPrintModels.ql diff --git a/csharp/ql/test/library-tests/dataflow/async/Async.ql b/csharp/ql/test/library-tests/dataflow/async/Async.ql index 127a889778c6..fb546d2b4337 100644 --- a/csharp/ql/test/library-tests/dataflow/async/Async.ql +++ b/csharp/ql/test/library-tests/dataflow/async/Async.ql @@ -1,5 +1,5 @@ import csharp -import TestUtilities.ProvenancePathGraph::ShowProvenance +import utils.test.ProvenancePathGraph::ShowProvenance class MySink extends DataFlow::ExprNode { MySink() { diff --git a/csharp/ql/test/library-tests/dataflow/barrier-guards/barrier-flow.ql b/csharp/ql/test/library-tests/dataflow/barrier-guards/barrier-flow.ql index 89bd8ff456e8..5d63ff124caa 100644 --- a/csharp/ql/test/library-tests/dataflow/barrier-guards/barrier-flow.ql +++ b/csharp/ql/test/library-tests/dataflow/barrier-guards/barrier-flow.ql @@ -17,7 +17,7 @@ class StringConstCompareBarrier extends DataFlow::Node { } } -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest import PathGraph module FlowConfig implements DataFlow::ConfigSig { diff --git a/csharp/ql/test/library-tests/dataflow/collections/CollectionFlow.ql b/csharp/ql/test/library-tests/dataflow/collections/CollectionFlow.ql index 944f3888cea0..67553b5cbc9f 100644 --- a/csharp/ql/test/library-tests/dataflow/collections/CollectionFlow.ql +++ b/csharp/ql/test/library-tests/dataflow/collections/CollectionFlow.ql @@ -3,7 +3,7 @@ */ import csharp -import TestUtilities.ProvenancePathGraph::ShowProvenance +import utils.test.ProvenancePathGraph::ShowProvenance module ArrayFlowConfig implements DataFlow::ConfigSig { predicate isSource(DataFlow::Node src) { src.asExpr() instanceof ObjectCreation } diff --git a/csharp/ql/test/library-tests/dataflow/constructors/ConstructorFlow.ql b/csharp/ql/test/library-tests/dataflow/constructors/ConstructorFlow.ql index f47c9f4e9a40..f5ad52b8daaa 100644 --- a/csharp/ql/test/library-tests/dataflow/constructors/ConstructorFlow.ql +++ b/csharp/ql/test/library-tests/dataflow/constructors/ConstructorFlow.ql @@ -3,7 +3,7 @@ */ import csharp -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest import ValueFlowTest import PathGraph diff --git a/csharp/ql/test/library-tests/dataflow/external-models/ExternalFlow.ql b/csharp/ql/test/library-tests/dataflow/external-models/ExternalFlow.ql index faba0fc8d002..4a60c2be1cf8 100644 --- a/csharp/ql/test/library-tests/dataflow/external-models/ExternalFlow.ql +++ b/csharp/ql/test/library-tests/dataflow/external-models/ExternalFlow.ql @@ -4,7 +4,7 @@ import csharp import semmle.code.csharp.dataflow.internal.ExternalFlow -import TestUtilities.ProvenancePathGraph::ShowProvenance +import utils.test.ProvenancePathGraph::ShowProvenance import ModelValidation module TaintConfig implements DataFlow::ConfigSig { diff --git a/csharp/ql/test/library-tests/dataflow/fields/FieldFlow.ql b/csharp/ql/test/library-tests/dataflow/fields/FieldFlow.ql index 9336e1b28be0..9ab95f59caf3 100644 --- a/csharp/ql/test/library-tests/dataflow/fields/FieldFlow.ql +++ b/csharp/ql/test/library-tests/dataflow/fields/FieldFlow.ql @@ -3,7 +3,7 @@ */ import csharp -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest import DefaultFlowTest import PathGraph diff --git a/csharp/ql/test/library-tests/dataflow/flowsources/stored/database/dapper/DatabaseSources.ql b/csharp/ql/test/library-tests/dataflow/flowsources/stored/database/dapper/DatabaseSources.ql index aff922884ff5..380de97d8b34 100644 --- a/csharp/ql/test/library-tests/dataflow/flowsources/stored/database/dapper/DatabaseSources.ql +++ b/csharp/ql/test/library-tests/dataflow/flowsources/stored/database/dapper/DatabaseSources.ql @@ -1,6 +1,6 @@ import csharp import semmle.code.csharp.security.dataflow.flowsources.FlowSources -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest import TaintFlowTest module DatabaseConfig implements DataFlow::ConfigSig { diff --git a/csharp/ql/test/library-tests/dataflow/flowsources/stored/file/Files.ql b/csharp/ql/test/library-tests/dataflow/flowsources/stored/file/Files.ql index ad8a40fa0741..032b51da5f6a 100644 --- a/csharp/ql/test/library-tests/dataflow/flowsources/stored/file/Files.ql +++ b/csharp/ql/test/library-tests/dataflow/flowsources/stored/file/Files.ql @@ -1,6 +1,6 @@ import csharp import semmle.code.csharp.security.dataflow.flowsources.FlowSources -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest import TaintFlowTest module FilesConfig implements DataFlow::ConfigSig { diff --git a/csharp/ql/test/library-tests/dataflow/global/DataFlowPath.ql b/csharp/ql/test/library-tests/dataflow/global/DataFlowPath.ql index ae9da166ec1a..ef61d97718ef 100644 --- a/csharp/ql/test/library-tests/dataflow/global/DataFlowPath.ql +++ b/csharp/ql/test/library-tests/dataflow/global/DataFlowPath.ql @@ -4,7 +4,7 @@ import csharp import Common -import TestUtilities.ProvenancePathGraph::ShowProvenance +import utils.test.ProvenancePathGraph::ShowProvenance from Flow::PathNode source, Flow::PathNode sink, string s where diff --git a/csharp/ql/test/library-tests/dataflow/global/TaintTrackingPath.ql b/csharp/ql/test/library-tests/dataflow/global/TaintTrackingPath.ql index 3ac00ad6b71c..2380a2c8d55b 100644 --- a/csharp/ql/test/library-tests/dataflow/global/TaintTrackingPath.ql +++ b/csharp/ql/test/library-tests/dataflow/global/TaintTrackingPath.ql @@ -4,7 +4,7 @@ import csharp import Common -import TestUtilities.ProvenancePathGraph::ShowProvenance +import utils.test.ProvenancePathGraph::ShowProvenance module Taint = TaintTracking::Global; diff --git a/csharp/ql/test/library-tests/dataflow/operators/operatorFlow.ql b/csharp/ql/test/library-tests/dataflow/operators/operatorFlow.ql index 9336e1b28be0..9ab95f59caf3 100644 --- a/csharp/ql/test/library-tests/dataflow/operators/operatorFlow.ql +++ b/csharp/ql/test/library-tests/dataflow/operators/operatorFlow.ql @@ -3,7 +3,7 @@ */ import csharp -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest import DefaultFlowTest import PathGraph diff --git a/csharp/ql/test/library-tests/dataflow/patterns/PatternFlow.ql b/csharp/ql/test/library-tests/dataflow/patterns/PatternFlow.ql index 9336e1b28be0..9ab95f59caf3 100644 --- a/csharp/ql/test/library-tests/dataflow/patterns/PatternFlow.ql +++ b/csharp/ql/test/library-tests/dataflow/patterns/PatternFlow.ql @@ -3,7 +3,7 @@ */ import csharp -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest import DefaultFlowTest import PathGraph diff --git a/csharp/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest1.ql b/csharp/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest1.ql index 6ab5dd571c5e..20ab589fd032 100644 --- a/csharp/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest1.ql +++ b/csharp/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest1.ql @@ -3,7 +3,7 @@ */ import Test -import TestUtilities.ProvenancePathGraph::ShowProvenance +import utils.test.ProvenancePathGraph::ShowProvenance from ThreatModel::PathNode source, ThreatModel::PathNode sink where ThreatModel::flowPath(source, sink) diff --git a/csharp/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest2.ql b/csharp/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest2.ql index 6cf8420b7faa..a81df801fe10 100644 --- a/csharp/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest2.ql +++ b/csharp/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest2.ql @@ -4,7 +4,7 @@ */ import Test -import TestUtilities.ProvenancePathGraph::ShowProvenance +import utils.test.ProvenancePathGraph::ShowProvenance from ThreatModel::PathNode source, ThreatModel::PathNode sink where ThreatModel::flowPath(source, sink) diff --git a/csharp/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest3.ql b/csharp/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest3.ql index e5f4bf043ec9..e849ce86ef1c 100644 --- a/csharp/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest3.ql +++ b/csharp/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest3.ql @@ -4,7 +4,7 @@ */ import Test -import TestUtilities.ProvenancePathGraph::ShowProvenance +import utils.test.ProvenancePathGraph::ShowProvenance from ThreatModel::PathNode source, ThreatModel::PathNode sink where ThreatModel::flowPath(source, sink) diff --git a/csharp/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest4.ql b/csharp/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest4.ql index 5111ef4b12bd..2af01bef7c09 100644 --- a/csharp/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest4.ql +++ b/csharp/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest4.ql @@ -3,7 +3,7 @@ */ import Test -import TestUtilities.ProvenancePathGraph::ShowProvenance +import utils.test.ProvenancePathGraph::ShowProvenance from ThreatModel::PathNode source, ThreatModel::PathNode sink where ThreatModel::flowPath(source, sink) diff --git a/csharp/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest5.ql b/csharp/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest5.ql index 9db0ca27bbcd..7bf450232d55 100644 --- a/csharp/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest5.ql +++ b/csharp/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest5.ql @@ -4,7 +4,7 @@ */ import Test -import TestUtilities.ProvenancePathGraph::ShowProvenance +import utils.test.ProvenancePathGraph::ShowProvenance from ThreatModel::PathNode source, ThreatModel::PathNode sink where ThreatModel::flowPath(source, sink) diff --git a/csharp/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest6.ql b/csharp/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest6.ql index 142e8d9c6462..9a081d385fe2 100644 --- a/csharp/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest6.ql +++ b/csharp/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest6.ql @@ -5,7 +5,7 @@ */ import Test -import TestUtilities.ProvenancePathGraph::ShowProvenance +import utils.test.ProvenancePathGraph::ShowProvenance from ThreatModel::PathNode source, ThreatModel::PathNode sink where ThreatModel::flowPath(source, sink) diff --git a/csharp/ql/test/library-tests/dataflow/tuples/Tuples.ql b/csharp/ql/test/library-tests/dataflow/tuples/Tuples.ql index 9336e1b28be0..9ab95f59caf3 100644 --- a/csharp/ql/test/library-tests/dataflow/tuples/Tuples.ql +++ b/csharp/ql/test/library-tests/dataflow/tuples/Tuples.ql @@ -3,7 +3,7 @@ */ import csharp -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest import DefaultFlowTest import PathGraph diff --git a/csharp/ql/test/library-tests/dataflow/typeflow-dispatch/TypeFlowDispatch.ql b/csharp/ql/test/library-tests/dataflow/typeflow-dispatch/TypeFlowDispatch.ql index 9336e1b28be0..9ab95f59caf3 100644 --- a/csharp/ql/test/library-tests/dataflow/typeflow-dispatch/TypeFlowDispatch.ql +++ b/csharp/ql/test/library-tests/dataflow/typeflow-dispatch/TypeFlowDispatch.ql @@ -3,7 +3,7 @@ */ import csharp -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest import DefaultFlowTest import PathGraph diff --git a/csharp/ql/test/library-tests/dataflow/types/Types.ql b/csharp/ql/test/library-tests/dataflow/types/Types.ql index be631788642d..92066d19c32b 100644 --- a/csharp/ql/test/library-tests/dataflow/types/Types.ql +++ b/csharp/ql/test/library-tests/dataflow/types/Types.ql @@ -3,7 +3,7 @@ */ import csharp -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest import PathGraph module TypesConfig implements DataFlow::ConfigSig { diff --git a/csharp/ql/test/library-tests/frameworks/EntityFramework/Dataflow.ql b/csharp/ql/test/library-tests/frameworks/EntityFramework/Dataflow.ql index 10b423d41dcd..297a2dd54c26 100644 --- a/csharp/ql/test/library-tests/frameworks/EntityFramework/Dataflow.ql +++ b/csharp/ql/test/library-tests/frameworks/EntityFramework/Dataflow.ql @@ -3,7 +3,7 @@ */ import csharp -import TestUtilities.ProvenancePathGraph::ShowProvenance +import utils.test.ProvenancePathGraph::ShowProvenance module TaintConfig implements DataFlow::ConfigSig { predicate isSource(DataFlow::Node node) { node.asExpr().getValue() = "tainted" } diff --git a/csharp/ql/test/query-tests/Security Features/CWE-020/UntrustedDataToExternalAPI.qlref b/csharp/ql/test/query-tests/Security Features/CWE-020/UntrustedDataToExternalAPI.qlref index 1629c8650f81..22d3fe2ef63c 100644 --- a/csharp/ql/test/query-tests/Security Features/CWE-020/UntrustedDataToExternalAPI.qlref +++ b/csharp/ql/test/query-tests/Security Features/CWE-020/UntrustedDataToExternalAPI.qlref @@ -1,2 +1,2 @@ query: Security Features/CWE-020/UntrustedDataToExternalAPI.ql -postprocess: TestUtilities/PrettyPrintModels.ql +postprocess: utils/test/PrettyPrintModels.ql diff --git a/csharp/ql/test/query-tests/Security Features/CWE-022/TaintedPath/TaintedPath.qlref b/csharp/ql/test/query-tests/Security Features/CWE-022/TaintedPath/TaintedPath.qlref index 4e15db2d2d08..10abc41286cf 100644 --- a/csharp/ql/test/query-tests/Security Features/CWE-022/TaintedPath/TaintedPath.qlref +++ b/csharp/ql/test/query-tests/Security Features/CWE-022/TaintedPath/TaintedPath.qlref @@ -1,3 +1,3 @@ query: Security Features/CWE-022/TaintedPath.ql -postprocess: TestUtilities/PrettyPrintModels.ql +postprocess: utils/test/PrettyPrintModels.ql diff --git a/csharp/ql/test/query-tests/Security Features/CWE-022/ZipSlip/ZipSlip.qlref b/csharp/ql/test/query-tests/Security Features/CWE-022/ZipSlip/ZipSlip.qlref index 7f7fff94e7a9..f8a7ab34e883 100644 --- a/csharp/ql/test/query-tests/Security Features/CWE-022/ZipSlip/ZipSlip.qlref +++ b/csharp/ql/test/query-tests/Security Features/CWE-022/ZipSlip/ZipSlip.qlref @@ -1,2 +1,2 @@ query: Security Features/CWE-022/ZipSlip.ql -postprocess: TestUtilities/PrettyPrintModels.ql +postprocess: utils/test/PrettyPrintModels.ql diff --git a/csharp/ql/test/query-tests/Security Features/CWE-078/CommandInjection.qlref b/csharp/ql/test/query-tests/Security Features/CWE-078/CommandInjection.qlref index c876a6691386..366f5105393f 100644 --- a/csharp/ql/test/query-tests/Security Features/CWE-078/CommandInjection.qlref +++ b/csharp/ql/test/query-tests/Security Features/CWE-078/CommandInjection.qlref @@ -1,2 +1,2 @@ query: Security Features/CWE-078/CommandInjection.ql -postprocess: TestUtilities/PrettyPrintModels.ql +postprocess: utils/test/PrettyPrintModels.ql diff --git a/csharp/ql/test/query-tests/Security Features/CWE-079/StoredXSS/StoredXSS.qlref b/csharp/ql/test/query-tests/Security Features/CWE-079/StoredXSS/StoredXSS.qlref index 15face9de9c1..89b5b951bdb6 100644 --- a/csharp/ql/test/query-tests/Security Features/CWE-079/StoredXSS/StoredXSS.qlref +++ b/csharp/ql/test/query-tests/Security Features/CWE-079/StoredXSS/StoredXSS.qlref @@ -1,2 +1,2 @@ query: Security Features/CWE-079/XSS.ql -postprocess: TestUtilities/PrettyPrintModels.ql +postprocess: utils/test/PrettyPrintModels.ql diff --git a/csharp/ql/test/query-tests/Security Features/CWE-079/XSS/XSS.qlref b/csharp/ql/test/query-tests/Security Features/CWE-079/XSS/XSS.qlref index df73539b55cd..493a5fb796e0 100644 --- a/csharp/ql/test/query-tests/Security Features/CWE-079/XSS/XSS.qlref +++ b/csharp/ql/test/query-tests/Security Features/CWE-079/XSS/XSS.qlref @@ -1,4 +1,4 @@ query: Security Features/CWE-079/XSS.ql postprocess: - - TestUtilities/PrettyPrintModels.ql - - TestUtilities/InlineExpectationsTestQuery.ql \ No newline at end of file + - utils/test/PrettyPrintModels.ql + - utils/test/InlineExpectationsTestQuery.ql \ No newline at end of file diff --git a/csharp/ql/test/query-tests/Security Features/CWE-079/XSSAsp/XSS.qlref b/csharp/ql/test/query-tests/Security Features/CWE-079/XSSAsp/XSS.qlref index 15face9de9c1..89b5b951bdb6 100644 --- a/csharp/ql/test/query-tests/Security Features/CWE-079/XSSAsp/XSS.qlref +++ b/csharp/ql/test/query-tests/Security Features/CWE-079/XSSAsp/XSS.qlref @@ -1,2 +1,2 @@ query: Security Features/CWE-079/XSS.ql -postprocess: TestUtilities/PrettyPrintModels.ql +postprocess: utils/test/PrettyPrintModels.ql diff --git a/csharp/ql/test/query-tests/Security Features/CWE-089/SqlInjection.qlref b/csharp/ql/test/query-tests/Security Features/CWE-089/SqlInjection.qlref index 8608b7dc3e81..56829ee8e8fc 100644 --- a/csharp/ql/test/query-tests/Security Features/CWE-089/SqlInjection.qlref +++ b/csharp/ql/test/query-tests/Security Features/CWE-089/SqlInjection.qlref @@ -1,2 +1,2 @@ query: Security Features/CWE-089/SqlInjection.ql -postprocess: TestUtilities/PrettyPrintModels.ql +postprocess: utils/test/PrettyPrintModels.ql diff --git a/csharp/ql/test/query-tests/Security Features/CWE-090/LDAPInjection.qlref b/csharp/ql/test/query-tests/Security Features/CWE-090/LDAPInjection.qlref index ef040a2867f8..06bd1eedc4f4 100644 --- a/csharp/ql/test/query-tests/Security Features/CWE-090/LDAPInjection.qlref +++ b/csharp/ql/test/query-tests/Security Features/CWE-090/LDAPInjection.qlref @@ -1,2 +1,2 @@ query: Security Features/CWE-090/LDAPInjection.ql -postprocess: TestUtilities/PrettyPrintModels.ql +postprocess: utils/test/PrettyPrintModels.ql diff --git a/csharp/ql/test/query-tests/Security Features/CWE-091/XMLInjection/XMLInjection.qlref b/csharp/ql/test/query-tests/Security Features/CWE-091/XMLInjection/XMLInjection.qlref index a35c7cfa2df5..e39297fce167 100644 --- a/csharp/ql/test/query-tests/Security Features/CWE-091/XMLInjection/XMLInjection.qlref +++ b/csharp/ql/test/query-tests/Security Features/CWE-091/XMLInjection/XMLInjection.qlref @@ -1,2 +1,2 @@ query: Security Features/CWE-091/XMLInjection.ql -postprocess: TestUtilities/PrettyPrintModels.ql +postprocess: utils/test/PrettyPrintModels.ql diff --git a/csharp/ql/test/query-tests/Security Features/CWE-094/CodeInjection.qlref b/csharp/ql/test/query-tests/Security Features/CWE-094/CodeInjection.qlref index 0a90486d1c95..80eedc1b4c7c 100644 --- a/csharp/ql/test/query-tests/Security Features/CWE-094/CodeInjection.qlref +++ b/csharp/ql/test/query-tests/Security Features/CWE-094/CodeInjection.qlref @@ -1,2 +1,2 @@ query: Security Features/CWE-094/CodeInjection.ql -postprocess: TestUtilities/PrettyPrintModels.ql +postprocess: utils/test/PrettyPrintModels.ql diff --git a/csharp/ql/test/query-tests/Security Features/CWE-099/ResourceInjection.qlref b/csharp/ql/test/query-tests/Security Features/CWE-099/ResourceInjection.qlref index 2c7103f64d8d..5292de5ee84f 100644 --- a/csharp/ql/test/query-tests/Security Features/CWE-099/ResourceInjection.qlref +++ b/csharp/ql/test/query-tests/Security Features/CWE-099/ResourceInjection.qlref @@ -1,2 +1,2 @@ query: Security Features/CWE-099/ResourceInjection.ql -postprocess: TestUtilities/PrettyPrintModels.ql +postprocess: utils/test/PrettyPrintModels.ql diff --git a/csharp/ql/test/query-tests/Security Features/CWE-112/MissingXMLValidation.qlref b/csharp/ql/test/query-tests/Security Features/CWE-112/MissingXMLValidation.qlref index 5eef94968aa3..6f71112a01c1 100644 --- a/csharp/ql/test/query-tests/Security Features/CWE-112/MissingXMLValidation.qlref +++ b/csharp/ql/test/query-tests/Security Features/CWE-112/MissingXMLValidation.qlref @@ -1,2 +1,2 @@ query: Security Features/CWE-112/MissingXMLValidation.ql -postprocess: TestUtilities/PrettyPrintModels.ql +postprocess: utils/test/PrettyPrintModels.ql diff --git a/csharp/ql/test/query-tests/Security Features/CWE-114/AssemblyPathInjection/AssemblyPathInjection.qlref b/csharp/ql/test/query-tests/Security Features/CWE-114/AssemblyPathInjection/AssemblyPathInjection.qlref index ff4df6499c8d..5979609654f9 100644 --- a/csharp/ql/test/query-tests/Security Features/CWE-114/AssemblyPathInjection/AssemblyPathInjection.qlref +++ b/csharp/ql/test/query-tests/Security Features/CWE-114/AssemblyPathInjection/AssemblyPathInjection.qlref @@ -1,2 +1,2 @@ query: Security Features/CWE-114/AssemblyPathInjection.ql -postprocess: TestUtilities/PrettyPrintModels.ql +postprocess: utils/test/PrettyPrintModels.ql diff --git a/csharp/ql/test/query-tests/Security Features/CWE-117/LogForging.qlref b/csharp/ql/test/query-tests/Security Features/CWE-117/LogForging.qlref index d4d8a972c11d..a41529bfeb1c 100644 --- a/csharp/ql/test/query-tests/Security Features/CWE-117/LogForging.qlref +++ b/csharp/ql/test/query-tests/Security Features/CWE-117/LogForging.qlref @@ -1,2 +1,2 @@ query: Security Features/CWE-117/LogForging.ql -postprocess: TestUtilities/PrettyPrintModels.ql +postprocess: utils/test/PrettyPrintModels.ql diff --git a/csharp/ql/test/query-tests/Security Features/CWE-134/UncontrolledFormatString.qlref b/csharp/ql/test/query-tests/Security Features/CWE-134/UncontrolledFormatString.qlref index 61d6f67e3a0c..88de17860f9c 100644 --- a/csharp/ql/test/query-tests/Security Features/CWE-134/UncontrolledFormatString.qlref +++ b/csharp/ql/test/query-tests/Security Features/CWE-134/UncontrolledFormatString.qlref @@ -1,2 +1,2 @@ query: Security Features/CWE-134/UncontrolledFormatString.ql -postprocess: TestUtilities/PrettyPrintModels.ql +postprocess: utils/test/PrettyPrintModels.ql diff --git a/csharp/ql/test/query-tests/Security Features/CWE-201/ExposureInTransmittedData/ExposureInTransmittedData.qlref b/csharp/ql/test/query-tests/Security Features/CWE-201/ExposureInTransmittedData/ExposureInTransmittedData.qlref index 5564a9e8e949..9ce9ee5643ef 100644 --- a/csharp/ql/test/query-tests/Security Features/CWE-201/ExposureInTransmittedData/ExposureInTransmittedData.qlref +++ b/csharp/ql/test/query-tests/Security Features/CWE-201/ExposureInTransmittedData/ExposureInTransmittedData.qlref @@ -1,2 +1,2 @@ query: Security Features/CWE-201/ExposureInTransmittedData.ql -postprocess: TestUtilities/PrettyPrintModels.ql +postprocess: utils/test/PrettyPrintModels.ql diff --git a/csharp/ql/test/query-tests/Security Features/CWE-209/ExceptionInformationExposure.qlref b/csharp/ql/test/query-tests/Security Features/CWE-209/ExceptionInformationExposure.qlref index 175f84767e45..e8813fef7a81 100644 --- a/csharp/ql/test/query-tests/Security Features/CWE-209/ExceptionInformationExposure.qlref +++ b/csharp/ql/test/query-tests/Security Features/CWE-209/ExceptionInformationExposure.qlref @@ -1,2 +1,2 @@ query: Security Features/CWE-209/ExceptionInformationExposure.ql -postprocess: TestUtilities/PrettyPrintModels.ql +postprocess: utils/test/PrettyPrintModels.ql diff --git a/csharp/ql/test/query-tests/Security Features/CWE-321/HardcodedSymmetricEncryptionKey/HardcodedSymmetricEncryptionKey.qlref b/csharp/ql/test/query-tests/Security Features/CWE-321/HardcodedSymmetricEncryptionKey/HardcodedSymmetricEncryptionKey.qlref index 9b2ed1c95a16..5ec9c0d849c1 100644 --- a/csharp/ql/test/query-tests/Security Features/CWE-321/HardcodedSymmetricEncryptionKey/HardcodedSymmetricEncryptionKey.qlref +++ b/csharp/ql/test/query-tests/Security Features/CWE-321/HardcodedSymmetricEncryptionKey/HardcodedSymmetricEncryptionKey.qlref @@ -1,2 +1,2 @@ query: Security Features/CWE-321/HardcodedEncryptionKey.ql -postprocess: TestUtilities/PrettyPrintModels.ql +postprocess: utils/test/PrettyPrintModels.ql diff --git a/csharp/ql/test/query-tests/Security Features/CWE-338/InsecureRandomness.qlref b/csharp/ql/test/query-tests/Security Features/CWE-338/InsecureRandomness.qlref index c21167a0d4a9..b2198beb2b45 100644 --- a/csharp/ql/test/query-tests/Security Features/CWE-338/InsecureRandomness.qlref +++ b/csharp/ql/test/query-tests/Security Features/CWE-338/InsecureRandomness.qlref @@ -1,2 +1,2 @@ query: Security Features/InsecureRandomness.ql -postprocess: TestUtilities/PrettyPrintModels.ql +postprocess: utils/test/PrettyPrintModels.ql diff --git a/csharp/ql/test/query-tests/Security Features/CWE-502/UnsafeDeserializationUntrustedInput/UnsafeDeserializationUntrustedInput.qlref b/csharp/ql/test/query-tests/Security Features/CWE-502/UnsafeDeserializationUntrustedInput/UnsafeDeserializationUntrustedInput.qlref index eacae70c36be..a1ffb72bf108 100644 --- a/csharp/ql/test/query-tests/Security Features/CWE-502/UnsafeDeserializationUntrustedInput/UnsafeDeserializationUntrustedInput.qlref +++ b/csharp/ql/test/query-tests/Security Features/CWE-502/UnsafeDeserializationUntrustedInput/UnsafeDeserializationUntrustedInput.qlref @@ -1,2 +1,2 @@ query: Security Features/CWE-502/UnsafeDeserializationUntrustedInput.ql -postprocess: TestUtilities/PrettyPrintModels.ql +postprocess: utils/test/PrettyPrintModels.ql diff --git a/csharp/ql/test/query-tests/Security Features/CWE-502/UnsafeDeserializationUntrustedInputNewtonsoftJson/UnsafeDeserializationUntrustedInput.qlref b/csharp/ql/test/query-tests/Security Features/CWE-502/UnsafeDeserializationUntrustedInputNewtonsoftJson/UnsafeDeserializationUntrustedInput.qlref index eacae70c36be..a1ffb72bf108 100644 --- a/csharp/ql/test/query-tests/Security Features/CWE-502/UnsafeDeserializationUntrustedInputNewtonsoftJson/UnsafeDeserializationUntrustedInput.qlref +++ b/csharp/ql/test/query-tests/Security Features/CWE-502/UnsafeDeserializationUntrustedInputNewtonsoftJson/UnsafeDeserializationUntrustedInput.qlref @@ -1,2 +1,2 @@ query: Security Features/CWE-502/UnsafeDeserializationUntrustedInput.ql -postprocess: TestUtilities/PrettyPrintModels.ql +postprocess: utils/test/PrettyPrintModels.ql diff --git a/csharp/ql/test/query-tests/Security Features/CWE-601/UrlRedirect/UrlRedirect.qlref b/csharp/ql/test/query-tests/Security Features/CWE-601/UrlRedirect/UrlRedirect.qlref index a8908c241def..fdb38b9ffc00 100644 --- a/csharp/ql/test/query-tests/Security Features/CWE-601/UrlRedirect/UrlRedirect.qlref +++ b/csharp/ql/test/query-tests/Security Features/CWE-601/UrlRedirect/UrlRedirect.qlref @@ -1,2 +1,2 @@ query: Security Features/CWE-601/UrlRedirect.ql -postprocess: TestUtilities/PrettyPrintModels.ql +postprocess: utils/test/PrettyPrintModels.ql diff --git a/csharp/ql/test/query-tests/Security Features/CWE-611/UntrustedDataInsecureXml.qlref b/csharp/ql/test/query-tests/Security Features/CWE-611/UntrustedDataInsecureXml.qlref index 967c6ca922e2..7f685106e250 100644 --- a/csharp/ql/test/query-tests/Security Features/CWE-611/UntrustedDataInsecureXml.qlref +++ b/csharp/ql/test/query-tests/Security Features/CWE-611/UntrustedDataInsecureXml.qlref @@ -1,2 +1,2 @@ query: Security Features/CWE-611/UntrustedDataInsecureXml.ql -postprocess: TestUtilities/PrettyPrintModels.ql +postprocess: utils/test/PrettyPrintModels.ql diff --git a/csharp/ql/test/query-tests/Security Features/CWE-611/UseXmlSecureResolver.qlref b/csharp/ql/test/query-tests/Security Features/CWE-611/UseXmlSecureResolver.qlref index 244e05d7e27c..b11f53079246 100644 --- a/csharp/ql/test/query-tests/Security Features/CWE-611/UseXmlSecureResolver.qlref +++ b/csharp/ql/test/query-tests/Security Features/CWE-611/UseXmlSecureResolver.qlref @@ -1,2 +1,2 @@ query: Security Features/CWE-611/UseXmlSecureResolver.ql -postprocess: TestUtilities/PrettyPrintModels.ql +postprocess: utils/test/PrettyPrintModels.ql diff --git a/csharp/ql/test/query-tests/Security Features/CWE-643/XPathInjection.qlref b/csharp/ql/test/query-tests/Security Features/CWE-643/XPathInjection.qlref index 94967d34da39..a0cdca4727ae 100644 --- a/csharp/ql/test/query-tests/Security Features/CWE-643/XPathInjection.qlref +++ b/csharp/ql/test/query-tests/Security Features/CWE-643/XPathInjection.qlref @@ -1,2 +1,2 @@ query: Security Features/CWE-643/XPathInjection.ql -postprocess: TestUtilities/PrettyPrintModels.ql +postprocess: utils/test/PrettyPrintModels.ql diff --git a/csharp/ql/test/query-tests/Security Features/CWE-730/ReDoS/ReDoS.qlref b/csharp/ql/test/query-tests/Security Features/CWE-730/ReDoS/ReDoS.qlref index ffa0c552ba64..de8c70102e05 100644 --- a/csharp/ql/test/query-tests/Security Features/CWE-730/ReDoS/ReDoS.qlref +++ b/csharp/ql/test/query-tests/Security Features/CWE-730/ReDoS/ReDoS.qlref @@ -1,2 +1,2 @@ query: Security Features/CWE-730/ReDoS.ql -postprocess: TestUtilities/PrettyPrintModels.ql +postprocess: utils/test/PrettyPrintModels.ql diff --git a/csharp/ql/test/query-tests/Security Features/CWE-730/ReDoSGlobalTimeout/ReDoS.qlref b/csharp/ql/test/query-tests/Security Features/CWE-730/ReDoSGlobalTimeout/ReDoS.qlref index ffa0c552ba64..de8c70102e05 100644 --- a/csharp/ql/test/query-tests/Security Features/CWE-730/ReDoSGlobalTimeout/ReDoS.qlref +++ b/csharp/ql/test/query-tests/Security Features/CWE-730/ReDoSGlobalTimeout/ReDoS.qlref @@ -1,2 +1,2 @@ query: Security Features/CWE-730/ReDoS.ql -postprocess: TestUtilities/PrettyPrintModels.ql +postprocess: utils/test/PrettyPrintModels.ql diff --git a/csharp/ql/test/query-tests/Security Features/CWE-730/RegexInjection/RegexInjection.qlref b/csharp/ql/test/query-tests/Security Features/CWE-730/RegexInjection/RegexInjection.qlref index 2dff84f920fd..bec7fbac79a5 100644 --- a/csharp/ql/test/query-tests/Security Features/CWE-730/RegexInjection/RegexInjection.qlref +++ b/csharp/ql/test/query-tests/Security Features/CWE-730/RegexInjection/RegexInjection.qlref @@ -1,2 +1,2 @@ query: Security Features/CWE-730/RegexInjection.ql -postprocess: TestUtilities/PrettyPrintModels.ql +postprocess: utils/test/PrettyPrintModels.ql diff --git a/csharp/ql/test/query-tests/Security Features/CWE-807/ConditionalBypass.qlref b/csharp/ql/test/query-tests/Security Features/CWE-807/ConditionalBypass.qlref index bb429faf450f..b0c208da3481 100644 --- a/csharp/ql/test/query-tests/Security Features/CWE-807/ConditionalBypass.qlref +++ b/csharp/ql/test/query-tests/Security Features/CWE-807/ConditionalBypass.qlref @@ -1,2 +1,2 @@ query: Security Features/CWE-807/ConditionalBypass.ql -postprocess: TestUtilities/PrettyPrintModels.ql +postprocess: utils/test/PrettyPrintModels.ql diff --git a/csharp/ql/test/query-tests/Security Features/CWE-838/InappropriateEncoding.qlref b/csharp/ql/test/query-tests/Security Features/CWE-838/InappropriateEncoding.qlref index 453e706f9422..d70d82f47195 100644 --- a/csharp/ql/test/query-tests/Security Features/CWE-838/InappropriateEncoding.qlref +++ b/csharp/ql/test/query-tests/Security Features/CWE-838/InappropriateEncoding.qlref @@ -1,2 +1,2 @@ query: Security Features/CWE-838/InappropriateEncoding.ql -postprocess: TestUtilities/PrettyPrintModels.ql +postprocess: utils/test/PrettyPrintModels.ql diff --git a/csharp/ql/test/query-tests/Useless Code/UnusedLabel/UnusedLabel.qlref b/csharp/ql/test/query-tests/Useless Code/UnusedLabel/UnusedLabel.qlref index bbf7012c6eea..ae852d3ce4de 100644 --- a/csharp/ql/test/query-tests/Useless Code/UnusedLabel/UnusedLabel.qlref +++ b/csharp/ql/test/query-tests/Useless Code/UnusedLabel/UnusedLabel.qlref @@ -1,2 +1,2 @@ query: Useless code/UnusedLabel.ql -postprocess: TestUtilities/InlineExpectationsTestQuery.ql \ No newline at end of file +postprocess: utils/test/InlineExpectationsTestQuery.ql \ No newline at end of file diff --git a/csharp/ql/test/utils/inline-tests/PathProblemQuery.qlref b/csharp/ql/test/utils/inline-tests/PathProblemQuery.qlref index 41e5adc69bb5..b40ac3723a21 100644 --- a/csharp/ql/test/utils/inline-tests/PathProblemQuery.qlref +++ b/csharp/ql/test/utils/inline-tests/PathProblemQuery.qlref @@ -1,2 +1,2 @@ query: utils/inline-tests/queries/PathProblemQuery.ql -postprocess: TestUtilities/InlineExpectationsTestQuery.ql \ No newline at end of file +postprocess: utils/test/InlineExpectationsTestQuery.ql \ No newline at end of file diff --git a/csharp/ql/test/utils/inline-tests/ProblemQuery.qlref b/csharp/ql/test/utils/inline-tests/ProblemQuery.qlref index ee7242b6c6c8..658cd07e57a9 100644 --- a/csharp/ql/test/utils/inline-tests/ProblemQuery.qlref +++ b/csharp/ql/test/utils/inline-tests/ProblemQuery.qlref @@ -1,2 +1,2 @@ query: utils/inline-tests/queries/ProblemQuery.ql -postprocess: TestUtilities/InlineExpectationsTestQuery.ql \ No newline at end of file +postprocess: utils/test/InlineExpectationsTestQuery.ql \ No newline at end of file diff --git a/csharp/ql/test/utils/modelgenerator/dataflow/CaptureContentSummaryModels.ql b/csharp/ql/test/utils/modelgenerator/dataflow/CaptureContentSummaryModels.ql index bed1f3ec0944..0d9e4cd52d9f 100644 --- a/csharp/ql/test/utils/modelgenerator/dataflow/CaptureContentSummaryModels.ql +++ b/csharp/ql/test/utils/modelgenerator/dataflow/CaptureContentSummaryModels.ql @@ -1,6 +1,6 @@ import csharp import utils.modelgenerator.internal.CaptureModels -import TestUtilities.InlineMadTest +import utils.test.InlineMadTest module InlineMadTestConfig implements InlineMadTestConfigSig { string getCapturedModel(Callable c) { result = ContentSensitive::captureFlow(c, _) } diff --git a/csharp/ql/test/utils/modelgenerator/dataflow/CaptureNeutralModels.ql b/csharp/ql/test/utils/modelgenerator/dataflow/CaptureNeutralModels.ql index 922588049d26..719eca840f46 100644 --- a/csharp/ql/test/utils/modelgenerator/dataflow/CaptureNeutralModels.ql +++ b/csharp/ql/test/utils/modelgenerator/dataflow/CaptureNeutralModels.ql @@ -1,6 +1,6 @@ import csharp import utils.modelgenerator.internal.CaptureModels -import TestUtilities.InlineMadTest +import utils.test.InlineMadTest module InlineMadTestConfig implements InlineMadTestConfigSig { string getCapturedModel(Callable c) { result = captureNoFlow(c) } diff --git a/csharp/ql/test/utils/modelgenerator/dataflow/CaptureSinkModels.ql b/csharp/ql/test/utils/modelgenerator/dataflow/CaptureSinkModels.ql index 55aa379ddb5d..ecd5a8e9e323 100644 --- a/csharp/ql/test/utils/modelgenerator/dataflow/CaptureSinkModels.ql +++ b/csharp/ql/test/utils/modelgenerator/dataflow/CaptureSinkModels.ql @@ -1,6 +1,6 @@ import csharp import utils.modelgenerator.internal.CaptureModels -import TestUtilities.InlineMadTest +import utils.test.InlineMadTest module InlineMadTestConfig implements InlineMadTestConfigSig { string getCapturedModel(Callable c) { result = captureSink(c) } diff --git a/csharp/ql/test/utils/modelgenerator/dataflow/CaptureSourceModels.ql b/csharp/ql/test/utils/modelgenerator/dataflow/CaptureSourceModels.ql index 790e0754789e..f5f09b153f82 100644 --- a/csharp/ql/test/utils/modelgenerator/dataflow/CaptureSourceModels.ql +++ b/csharp/ql/test/utils/modelgenerator/dataflow/CaptureSourceModels.ql @@ -1,6 +1,6 @@ import csharp import utils.modelgenerator.internal.CaptureModels -import TestUtilities.InlineMadTest +import utils.test.InlineMadTest module InlineMadTestConfig implements InlineMadTestConfigSig { string getCapturedModel(Callable c) { result = captureSource(c) } diff --git a/csharp/ql/test/utils/modelgenerator/dataflow/CaptureSummaryModels.ql b/csharp/ql/test/utils/modelgenerator/dataflow/CaptureSummaryModels.ql index 29cb8f7fb874..93c8520caa1b 100644 --- a/csharp/ql/test/utils/modelgenerator/dataflow/CaptureSummaryModels.ql +++ b/csharp/ql/test/utils/modelgenerator/dataflow/CaptureSummaryModels.ql @@ -1,6 +1,6 @@ import csharp import utils.modelgenerator.internal.CaptureModels -import TestUtilities.InlineMadTest +import utils.test.InlineMadTest module InlineMadTestConfig implements InlineMadTestConfigSig { string getCapturedModel(Callable c) { result = captureFlow(c) } diff --git a/csharp/ql/test/utils/modelgenerator/typebasedflow/CaptureTypeBasedSummaryModels.ql b/csharp/ql/test/utils/modelgenerator/typebasedflow/CaptureTypeBasedSummaryModels.ql index b82afaf71c0a..782262728794 100644 --- a/csharp/ql/test/utils/modelgenerator/typebasedflow/CaptureTypeBasedSummaryModels.ql +++ b/csharp/ql/test/utils/modelgenerator/typebasedflow/CaptureTypeBasedSummaryModels.ql @@ -1,5 +1,5 @@ import csharp -import TestUtilities.InlineMadTest +import utils.test.InlineMadTest import utils.modelgenerator.internal.CaptureTypeBasedSummaryModels module InlineMadTestConfig implements InlineMadTestConfigSig { From 47813e17c96d0de9660e9493e9a9fdac6667f48d Mon Sep 17 00:00:00 2001 From: Michael Nebel Date: Wed, 11 Dec 2024 11:49:26 +0100 Subject: [PATCH 07/24] C++: Move test utilities into the query pack. --- .../TestUtilities => src/utils/test}/InlineExpectationsTest.qll | 0 .../utils/test}/InlineExpectationsTestQuery.ql | 0 .../TestUtilities => src/utils/test}/dataflow/FlowTestCommon.qll | 0 .../utils/test}/internal/InlineExpectationsTestImpl.qll | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename cpp/ql/{test/TestUtilities => src/utils/test}/InlineExpectationsTest.qll (100%) rename cpp/ql/{test/TestUtilities => src/utils/test}/InlineExpectationsTestQuery.ql (100%) rename cpp/ql/{test/TestUtilities => src/utils/test}/dataflow/FlowTestCommon.qll (100%) rename cpp/ql/{test/TestUtilities => src/utils/test}/internal/InlineExpectationsTestImpl.qll (100%) diff --git a/cpp/ql/test/TestUtilities/InlineExpectationsTest.qll b/cpp/ql/src/utils/test/InlineExpectationsTest.qll similarity index 100% rename from cpp/ql/test/TestUtilities/InlineExpectationsTest.qll rename to cpp/ql/src/utils/test/InlineExpectationsTest.qll diff --git a/cpp/ql/test/TestUtilities/InlineExpectationsTestQuery.ql b/cpp/ql/src/utils/test/InlineExpectationsTestQuery.ql similarity index 100% rename from cpp/ql/test/TestUtilities/InlineExpectationsTestQuery.ql rename to cpp/ql/src/utils/test/InlineExpectationsTestQuery.ql diff --git a/cpp/ql/test/TestUtilities/dataflow/FlowTestCommon.qll b/cpp/ql/src/utils/test/dataflow/FlowTestCommon.qll similarity index 100% rename from cpp/ql/test/TestUtilities/dataflow/FlowTestCommon.qll rename to cpp/ql/src/utils/test/dataflow/FlowTestCommon.qll diff --git a/cpp/ql/test/TestUtilities/internal/InlineExpectationsTestImpl.qll b/cpp/ql/src/utils/test/internal/InlineExpectationsTestImpl.qll similarity index 100% rename from cpp/ql/test/TestUtilities/internal/InlineExpectationsTestImpl.qll rename to cpp/ql/src/utils/test/internal/InlineExpectationsTestImpl.qll From 12008b4b4e0a58fee986fe81b8c22a42f0f69608 Mon Sep 17 00:00:00 2001 From: Michael Nebel Date: Wed, 11 Dec 2024 12:49:19 +0100 Subject: [PATCH 08/24] C++: Update all test util paths to point to the new location. --- cpp/ql/src/utils/test/dataflow/FlowTestCommon.qll | 2 +- cpp/ql/test/library-tests/dataflow/asExpr/test-indirect.ql | 2 +- cpp/ql/test/library-tests/dataflow/asExpr/test.ql | 2 +- .../dataflow/dataflow-tests/guard-condition-regression-test.ql | 2 +- .../dataflow/dataflow-tests/has-parameter-flow-out.ql | 2 +- .../dataflow/dataflow-tests/test-number-of-outnodes.ql | 2 +- cpp/ql/test/library-tests/dataflow/dataflow-tests/test.ql | 2 +- .../dataflow/dataflow-tests/test_self_argument_flow.ql | 2 +- .../dataflow/dataflow-tests/test_self_parameter_flow.ql | 2 +- cpp/ql/test/library-tests/dataflow/dataflow-tests/type-bugs.ql | 2 +- cpp/ql/test/library-tests/dataflow/external-models/flow.ql | 2 +- cpp/ql/test/library-tests/dataflow/fields/flow.ql | 2 +- .../library-tests/dataflow/models-as-data/interpretElement.ql | 2 +- cpp/ql/test/library-tests/dataflow/models-as-data/taint.ql | 2 +- .../test/library-tests/dataflow/parameters-without-defs/test.ql | 2 +- .../test/library-tests/dataflow/smart-pointers-taint/taint.ql | 2 +- .../test/library-tests/dataflow/source-sink-tests/local-flow.ql | 2 +- .../library-tests/dataflow/source-sink-tests/remote-flow.ql | 2 +- cpp/ql/test/library-tests/dataflow/taint-tests/taint.ql | 2 +- .../test/library-tests/ir/modulus-analysis/ModulusAnalysis.ql | 2 +- cpp/ql/test/library-tests/ir/points_to/points_to.ql | 2 +- cpp/ql/test/library-tests/ir/range-analysis/Overflow.ql | 2 +- cpp/ql/test/library-tests/ir/range-analysis/RangeAnalysis.ql | 2 +- cpp/ql/test/library-tests/ir/sign-analysis/SignAnalysis.ql | 2 +- cpp/ql/test/library-tests/ir/types/irtypes.ql | 2 +- cpp/ql/test/query-tests/Critical/SizeCheck/SizeCheck.qlref | 2 +- .../Security/CWE/CWE-022/semmle/tests/TaintedPath.qlref | 2 +- .../Security/CWE/CWE-193/AllocationToInvalidPointer.ql | 2 +- .../Security/CWE/CWE-193/InvalidPointerToDereference.ql | 2 +- 29 files changed, 29 insertions(+), 29 deletions(-) diff --git a/cpp/ql/src/utils/test/dataflow/FlowTestCommon.qll b/cpp/ql/src/utils/test/dataflow/FlowTestCommon.qll index 8f393cccde5b..0effb698f419 100644 --- a/cpp/ql/src/utils/test/dataflow/FlowTestCommon.qll +++ b/cpp/ql/src/utils/test/dataflow/FlowTestCommon.qll @@ -14,7 +14,7 @@ import cpp private import semmle.code.cpp.ir.dataflow.DataFlow::DataFlow as IRDataFlow private import semmle.code.cpp.dataflow.DataFlow::DataFlow as AstDataFlow -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest module IRFlowTest implements TestSig { string getARelevantTag() { result = "ir" } diff --git a/cpp/ql/test/library-tests/dataflow/asExpr/test-indirect.ql b/cpp/ql/test/library-tests/dataflow/asExpr/test-indirect.ql index b7d6761f02ff..dc71a92ee228 100644 --- a/cpp/ql/test/library-tests/dataflow/asExpr/test-indirect.ql +++ b/cpp/ql/test/library-tests/dataflow/asExpr/test-indirect.ql @@ -1,5 +1,5 @@ import cpp -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest import semmle.code.cpp.dataflow.new.DataFlow::DataFlow bindingset[s] diff --git a/cpp/ql/test/library-tests/dataflow/asExpr/test.ql b/cpp/ql/test/library-tests/dataflow/asExpr/test.ql index d686aad80613..e17962ce5a94 100644 --- a/cpp/ql/test/library-tests/dataflow/asExpr/test.ql +++ b/cpp/ql/test/library-tests/dataflow/asExpr/test.ql @@ -1,5 +1,5 @@ import cpp -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest import semmle.code.cpp.dataflow.new.DataFlow::DataFlow bindingset[s] diff --git a/cpp/ql/test/library-tests/dataflow/dataflow-tests/guard-condition-regression-test.ql b/cpp/ql/test/library-tests/dataflow/dataflow-tests/guard-condition-regression-test.ql index 49b650a07937..a21cd910a2ae 100644 --- a/cpp/ql/test/library-tests/dataflow/dataflow-tests/guard-condition-regression-test.ql +++ b/cpp/ql/test/library-tests/dataflow/dataflow-tests/guard-condition-regression-test.ql @@ -1,4 +1,4 @@ -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest private import cpp private import semmle.code.cpp.ir.dataflow.DataFlow private import semmle.code.cpp.controlflow.IRGuards diff --git a/cpp/ql/test/library-tests/dataflow/dataflow-tests/has-parameter-flow-out.ql b/cpp/ql/test/library-tests/dataflow/dataflow-tests/has-parameter-flow-out.ql index 4b637fda7144..34afffd8e589 100644 --- a/cpp/ql/test/library-tests/dataflow/dataflow-tests/has-parameter-flow-out.ql +++ b/cpp/ql/test/library-tests/dataflow/dataflow-tests/has-parameter-flow-out.ql @@ -1,4 +1,4 @@ -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest import cpp module AstTest { diff --git a/cpp/ql/test/library-tests/dataflow/dataflow-tests/test-number-of-outnodes.ql b/cpp/ql/test/library-tests/dataflow/dataflow-tests/test-number-of-outnodes.ql index 95423a1ec7d7..0877b73a12e4 100644 --- a/cpp/ql/test/library-tests/dataflow/dataflow-tests/test-number-of-outnodes.ql +++ b/cpp/ql/test/library-tests/dataflow/dataflow-tests/test-number-of-outnodes.ql @@ -1,4 +1,4 @@ -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest import cpp module AstTest { diff --git a/cpp/ql/test/library-tests/dataflow/dataflow-tests/test.ql b/cpp/ql/test/library-tests/dataflow/dataflow-tests/test.ql index 05e1112d5f3a..da05019829fa 100644 --- a/cpp/ql/test/library-tests/dataflow/dataflow-tests/test.ql +++ b/cpp/ql/test/library-tests/dataflow/dataflow-tests/test.ql @@ -1,3 +1,3 @@ import TestBase -import TestUtilities.dataflow.FlowTestCommon +import utils.test.dataflow.FlowTestCommon import MakeTest, IRFlowTest>> diff --git a/cpp/ql/test/library-tests/dataflow/dataflow-tests/test_self_argument_flow.ql b/cpp/ql/test/library-tests/dataflow/dataflow-tests/test_self_argument_flow.ql index 95f992f39f5a..ef1488d2adcf 100644 --- a/cpp/ql/test/library-tests/dataflow/dataflow-tests/test_self_argument_flow.ql +++ b/cpp/ql/test/library-tests/dataflow/dataflow-tests/test_self_argument_flow.ql @@ -1,6 +1,6 @@ import cpp import semmle.code.cpp.dataflow.new.DataFlow -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest module TestConfig implements DataFlow::ConfigSig { predicate isSource(DataFlow::Node source) { diff --git a/cpp/ql/test/library-tests/dataflow/dataflow-tests/test_self_parameter_flow.ql b/cpp/ql/test/library-tests/dataflow/dataflow-tests/test_self_parameter_flow.ql index c6ea9c5c96f3..b078c4bff9cf 100644 --- a/cpp/ql/test/library-tests/dataflow/dataflow-tests/test_self_parameter_flow.ql +++ b/cpp/ql/test/library-tests/dataflow/dataflow-tests/test_self_parameter_flow.ql @@ -1,6 +1,6 @@ import cpp import semmle.code.cpp.dataflow.new.DataFlow -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest module TestConfig implements DataFlow::ConfigSig { predicate isSource(DataFlow::Node source) { diff --git a/cpp/ql/test/library-tests/dataflow/dataflow-tests/type-bugs.ql b/cpp/ql/test/library-tests/dataflow/dataflow-tests/type-bugs.ql index b246f392a8d3..3e5f9165ef81 100644 --- a/cpp/ql/test/library-tests/dataflow/dataflow-tests/type-bugs.ql +++ b/cpp/ql/test/library-tests/dataflow/dataflow-tests/type-bugs.ql @@ -1,4 +1,4 @@ -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest import cpp module AstTest { diff --git a/cpp/ql/test/library-tests/dataflow/external-models/flow.ql b/cpp/ql/test/library-tests/dataflow/external-models/flow.ql index 8ca0df3fa561..7d41597c3b8e 100644 --- a/cpp/ql/test/library-tests/dataflow/external-models/flow.ql +++ b/cpp/ql/test/library-tests/dataflow/external-models/flow.ql @@ -1,4 +1,4 @@ -import TestUtilities.dataflow.FlowTestCommon +import utils.test.dataflow.FlowTestCommon import cpp import semmle.code.cpp.security.FlowSources import IRTest::IRFlow::PathGraph diff --git a/cpp/ql/test/library-tests/dataflow/fields/flow.ql b/cpp/ql/test/library-tests/dataflow/fields/flow.ql index 433aa0ad68fb..5bf8302310bc 100644 --- a/cpp/ql/test/library-tests/dataflow/fields/flow.ql +++ b/cpp/ql/test/library-tests/dataflow/fields/flow.ql @@ -1,4 +1,4 @@ -import TestUtilities.dataflow.FlowTestCommon +import utils.test.dataflow.FlowTestCommon module AstTest { import ASTConfiguration diff --git a/cpp/ql/test/library-tests/dataflow/models-as-data/interpretElement.ql b/cpp/ql/test/library-tests/dataflow/models-as-data/interpretElement.ql index d8d4d2d282e6..ccf0c3f886dc 100644 --- a/cpp/ql/test/library-tests/dataflow/models-as-data/interpretElement.ql +++ b/cpp/ql/test/library-tests/dataflow/models-as-data/interpretElement.ql @@ -1,4 +1,4 @@ -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest import testModels module InterpretElementTest implements TestSig { diff --git a/cpp/ql/test/library-tests/dataflow/models-as-data/taint.ql b/cpp/ql/test/library-tests/dataflow/models-as-data/taint.ql index 3b924dbb7226..8c362d78e3e7 100644 --- a/cpp/ql/test/library-tests/dataflow/models-as-data/taint.ql +++ b/cpp/ql/test/library-tests/dataflow/models-as-data/taint.ql @@ -1,4 +1,4 @@ -import TestUtilities.dataflow.FlowTestCommon +import utils.test.dataflow.FlowTestCommon import testModels module IRTest { diff --git a/cpp/ql/test/library-tests/dataflow/parameters-without-defs/test.ql b/cpp/ql/test/library-tests/dataflow/parameters-without-defs/test.ql index 13a818d50b2e..d8cce8623ad3 100644 --- a/cpp/ql/test/library-tests/dataflow/parameters-without-defs/test.ql +++ b/cpp/ql/test/library-tests/dataflow/parameters-without-defs/test.ql @@ -1,4 +1,4 @@ -import TestUtilities.dataflow.FlowTestCommon +import utils.test.dataflow.FlowTestCommon import semmle.code.cpp.dataflow.new.DataFlow module ParamConfig implements DataFlow::ConfigSig { diff --git a/cpp/ql/test/library-tests/dataflow/smart-pointers-taint/taint.ql b/cpp/ql/test/library-tests/dataflow/smart-pointers-taint/taint.ql index b887539d5888..f8d8a3594884 100644 --- a/cpp/ql/test/library-tests/dataflow/smart-pointers-taint/taint.ql +++ b/cpp/ql/test/library-tests/dataflow/smart-pointers-taint/taint.ql @@ -1,4 +1,4 @@ -import TestUtilities.dataflow.FlowTestCommon +import utils.test.dataflow.FlowTestCommon module AstTest { private import semmle.code.cpp.dataflow.TaintTracking diff --git a/cpp/ql/test/library-tests/dataflow/source-sink-tests/local-flow.ql b/cpp/ql/test/library-tests/dataflow/source-sink-tests/local-flow.ql index 15f5f43576a3..6c8d3ca060a2 100644 --- a/cpp/ql/test/library-tests/dataflow/source-sink-tests/local-flow.ql +++ b/cpp/ql/test/library-tests/dataflow/source-sink-tests/local-flow.ql @@ -1,7 +1,7 @@ /** This tests that we are able to detect local flow sources. */ import cpp -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest import semmle.code.cpp.security.FlowSources module LocalFlowSourceTest implements TestSig { diff --git a/cpp/ql/test/library-tests/dataflow/source-sink-tests/remote-flow.ql b/cpp/ql/test/library-tests/dataflow/source-sink-tests/remote-flow.ql index 45427141fe0f..ff137d8ba964 100644 --- a/cpp/ql/test/library-tests/dataflow/source-sink-tests/remote-flow.ql +++ b/cpp/ql/test/library-tests/dataflow/source-sink-tests/remote-flow.ql @@ -1,7 +1,7 @@ /** This tests that we are able to detect remote flow sources and sinks. */ import cpp -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest import semmle.code.cpp.security.FlowSources module RemoteFlowSourceTest implements TestSig { diff --git a/cpp/ql/test/library-tests/dataflow/taint-tests/taint.ql b/cpp/ql/test/library-tests/dataflow/taint-tests/taint.ql index 147730278176..f5f483cdf1b6 100644 --- a/cpp/ql/test/library-tests/dataflow/taint-tests/taint.ql +++ b/cpp/ql/test/library-tests/dataflow/taint-tests/taint.ql @@ -1,4 +1,4 @@ -import TestUtilities.dataflow.FlowTestCommon +import utils.test.dataflow.FlowTestCommon module TaintModels { class SetMemberFunction extends TaintFunction { diff --git a/cpp/ql/test/library-tests/ir/modulus-analysis/ModulusAnalysis.ql b/cpp/ql/test/library-tests/ir/modulus-analysis/ModulusAnalysis.ql index 229cc240c9ed..5c822ff964d4 100644 --- a/cpp/ql/test/library-tests/ir/modulus-analysis/ModulusAnalysis.ql +++ b/cpp/ql/test/library-tests/ir/modulus-analysis/ModulusAnalysis.ql @@ -7,7 +7,7 @@ import semmle.code.cpp.rangeanalysis.new.internal.semantic.analysis.RangeAnalysi import semmle.code.cpp.rangeanalysis.new.internal.semantic.analysis.RangeAnalysisImpl import semmle.code.cpp.rangeanalysis.new.internal.semantic.SemanticExprSpecific import semmle.code.cpp.ir.IR as IR -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest module ModulusAnalysisInstantiated = ModulusAnalysis; diff --git a/cpp/ql/test/library-tests/ir/points_to/points_to.ql b/cpp/ql/test/library-tests/ir/points_to/points_to.ql index e05e4ce8f0ca..5f17d489dc81 100644 --- a/cpp/ql/test/library-tests/ir/points_to/points_to.ql +++ b/cpp/ql/test/library-tests/ir/points_to/points_to.ql @@ -1,5 +1,5 @@ import cpp -private import TestUtilities.InlineExpectationsTest +private import utils.test.InlineExpectationsTest private import semmle.code.cpp.ir.internal.IntegerConstant as Ints private predicate ignoreAllocation(string name) { diff --git a/cpp/ql/test/library-tests/ir/range-analysis/Overflow.ql b/cpp/ql/test/library-tests/ir/range-analysis/Overflow.ql index 40d80f3d7b00..94b94fea7617 100644 --- a/cpp/ql/test/library-tests/ir/range-analysis/Overflow.ql +++ b/cpp/ql/test/library-tests/ir/range-analysis/Overflow.ql @@ -1,6 +1,6 @@ import cpp import semmle.code.cpp.rangeanalysis.new.SimpleRangeAnalysis -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest module RangeAnalysisTest implements TestSig { string getARelevantTag() { result = "overflow" } diff --git a/cpp/ql/test/library-tests/ir/range-analysis/RangeAnalysis.ql b/cpp/ql/test/library-tests/ir/range-analysis/RangeAnalysis.ql index b5a86c23d97c..b7413b1d6df6 100644 --- a/cpp/ql/test/library-tests/ir/range-analysis/RangeAnalysis.ql +++ b/cpp/ql/test/library-tests/ir/range-analysis/RangeAnalysis.ql @@ -3,7 +3,7 @@ import semmle.code.cpp.rangeanalysis.new.internal.semantic.analysis.RangeAnalysi import semmle.code.cpp.rangeanalysis.new.internal.semantic.Semantic import semmle.code.cpp.rangeanalysis.new.internal.semantic.SemanticExprSpecific import semmle.code.cpp.ir.IR as IR -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest module RangeAnalysisTest implements TestSig { string getARelevantTag() { result = "range" } diff --git a/cpp/ql/test/library-tests/ir/sign-analysis/SignAnalysis.ql b/cpp/ql/test/library-tests/ir/sign-analysis/SignAnalysis.ql index cba373a60a12..584fd62c6d90 100644 --- a/cpp/ql/test/library-tests/ir/sign-analysis/SignAnalysis.ql +++ b/cpp/ql/test/library-tests/ir/sign-analysis/SignAnalysis.ql @@ -5,7 +5,7 @@ import semmle.code.cpp.rangeanalysis.new.internal.semantic.analysis.FloatDelta import semmle.code.cpp.rangeanalysis.new.internal.semantic.analysis.RangeAnalysisRelativeSpecific import semmle.code.cpp.rangeanalysis.new.internal.semantic.SemanticExprSpecific import semmle.code.cpp.ir.IR as IR -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest module SignAnalysisInstantiated = SignAnalysis; diff --git a/cpp/ql/test/library-tests/ir/types/irtypes.ql b/cpp/ql/test/library-tests/ir/types/irtypes.ql index eb69111465b6..6766f037dde9 100644 --- a/cpp/ql/test/library-tests/ir/types/irtypes.ql +++ b/cpp/ql/test/library-tests/ir/types/irtypes.ql @@ -1,6 +1,6 @@ private import cpp private import semmle.code.cpp.ir.implementation.raw.IR -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest module IRTypesTest implements TestSig { string getARelevantTag() { result = "irtype" } diff --git a/cpp/ql/test/query-tests/Critical/SizeCheck/SizeCheck.qlref b/cpp/ql/test/query-tests/Critical/SizeCheck/SizeCheck.qlref index a1ab57f2b750..cfeba67e8360 100644 --- a/cpp/ql/test/query-tests/Critical/SizeCheck/SizeCheck.qlref +++ b/cpp/ql/test/query-tests/Critical/SizeCheck/SizeCheck.qlref @@ -1,2 +1,2 @@ query: Critical/SizeCheck.ql -postprocess: TestUtilities/InlineExpectationsTestQuery.ql \ No newline at end of file +postprocess: utils/test/InlineExpectationsTestQuery.ql diff --git a/cpp/ql/test/query-tests/Security/CWE/CWE-022/semmle/tests/TaintedPath.qlref b/cpp/ql/test/query-tests/Security/CWE/CWE-022/semmle/tests/TaintedPath.qlref index db270a97f3e2..399ff4f1909f 100644 --- a/cpp/ql/test/query-tests/Security/CWE/CWE-022/semmle/tests/TaintedPath.qlref +++ b/cpp/ql/test/query-tests/Security/CWE/CWE-022/semmle/tests/TaintedPath.qlref @@ -1,2 +1,2 @@ query: Security/CWE/CWE-022/TaintedPath.ql -postprocess: TestUtilities/InlineExpectationsTestQuery.ql \ No newline at end of file +postprocess: utils/test/InlineExpectationsTestQuery.ql diff --git a/cpp/ql/test/query-tests/Security/CWE/CWE-193/AllocationToInvalidPointer.ql b/cpp/ql/test/query-tests/Security/CWE/CWE-193/AllocationToInvalidPointer.ql index 50baab4bfa7a..e342074efe9d 100644 --- a/cpp/ql/test/query-tests/Security/CWE/CWE-193/AllocationToInvalidPointer.ql +++ b/cpp/ql/test/query-tests/Security/CWE/CWE-193/AllocationToInvalidPointer.ql @@ -1,6 +1,6 @@ import cpp import semmle.code.cpp.security.InvalidPointerDereference.AllocationToInvalidPointer -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest import semmle.code.cpp.ir.IR import semmle.code.cpp.dataflow.new.DataFlow diff --git a/cpp/ql/test/query-tests/Security/CWE/CWE-193/InvalidPointerToDereference.ql b/cpp/ql/test/query-tests/Security/CWE/CWE-193/InvalidPointerToDereference.ql index c4d9be5cb8bd..314a914e1f60 100644 --- a/cpp/ql/test/query-tests/Security/CWE/CWE-193/InvalidPointerToDereference.ql +++ b/cpp/ql/test/query-tests/Security/CWE/CWE-193/InvalidPointerToDereference.ql @@ -1,6 +1,6 @@ import cpp import semmle.code.cpp.security.InvalidPointerDereference.InvalidPointerToDereference -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest import semmle.code.cpp.ir.IR import semmle.code.cpp.dataflow.new.DataFlow From f8e0c4799d0389cdaa777d0ac111b8c23ea3d7a4 Mon Sep 17 00:00:00 2001 From: Michael Nebel Date: Wed, 11 Dec 2024 13:10:56 +0100 Subject: [PATCH 09/24] Go: Move test utilities into the query pack. --- .../TestUtilities => src/utils/test}/InlineExpectationsTest.qll | 0 .../utils/test}/InlineExpectationsTestQuery.ql | 0 go/ql/{test/TestUtilities => src/utils/test}/InlineFlowTest.qll | 0 go/ql/{test/TestUtilities => src/utils/test}/PrettyPrintModels.ql | 0 .../utils/test}/internal/InlineExpectationsTestImpl.qll | 0 5 files changed, 0 insertions(+), 0 deletions(-) rename go/ql/{test/TestUtilities => src/utils/test}/InlineExpectationsTest.qll (100%) rename go/ql/{test/TestUtilities => src/utils/test}/InlineExpectationsTestQuery.ql (100%) rename go/ql/{test/TestUtilities => src/utils/test}/InlineFlowTest.qll (100%) rename go/ql/{test/TestUtilities => src/utils/test}/PrettyPrintModels.ql (100%) rename go/ql/{test/TestUtilities => src/utils/test}/internal/InlineExpectationsTestImpl.qll (100%) diff --git a/go/ql/test/TestUtilities/InlineExpectationsTest.qll b/go/ql/src/utils/test/InlineExpectationsTest.qll similarity index 100% rename from go/ql/test/TestUtilities/InlineExpectationsTest.qll rename to go/ql/src/utils/test/InlineExpectationsTest.qll diff --git a/go/ql/test/TestUtilities/InlineExpectationsTestQuery.ql b/go/ql/src/utils/test/InlineExpectationsTestQuery.ql similarity index 100% rename from go/ql/test/TestUtilities/InlineExpectationsTestQuery.ql rename to go/ql/src/utils/test/InlineExpectationsTestQuery.ql diff --git a/go/ql/test/TestUtilities/InlineFlowTest.qll b/go/ql/src/utils/test/InlineFlowTest.qll similarity index 100% rename from go/ql/test/TestUtilities/InlineFlowTest.qll rename to go/ql/src/utils/test/InlineFlowTest.qll diff --git a/go/ql/test/TestUtilities/PrettyPrintModels.ql b/go/ql/src/utils/test/PrettyPrintModels.ql similarity index 100% rename from go/ql/test/TestUtilities/PrettyPrintModels.ql rename to go/ql/src/utils/test/PrettyPrintModels.ql diff --git a/go/ql/test/TestUtilities/internal/InlineExpectationsTestImpl.qll b/go/ql/src/utils/test/internal/InlineExpectationsTestImpl.qll similarity index 100% rename from go/ql/test/TestUtilities/internal/InlineExpectationsTestImpl.qll rename to go/ql/src/utils/test/internal/InlineExpectationsTestImpl.qll From 96fe1449f8dfc1b4e227542ad4abfe6f03d736db Mon Sep 17 00:00:00 2001 From: Michael Nebel Date: Wed, 11 Dec 2024 13:11:43 +0100 Subject: [PATCH 10/24] Go: Update all test util paths to point to the new location. --- go/ql/test/experimental/CWE-090/LDAPInjection.qlref | 2 +- go/ql/test/experimental/CWE-203/Timing.qlref | 2 +- go/ql/test/experimental/CWE-287/ImproperLdapAuth.qlref | 2 +- go/ql/test/experimental/CWE-369/DivideByZero.qlref | 2 +- .../CWE-522-DecompressionBombs/DecompressionBombTest.ql | 2 +- .../CWE-522-DecompressionBombs/DecompressionBombs.qlref | 2 +- go/ql/test/experimental/CWE-74/DsnInjection.qlref | 2 +- go/ql/test/experimental/CWE-74/DsnInjectionLocal.qlref | 2 +- .../experimental/CWE-79/HTMLTemplateEscapingPassthrough.qlref | 2 +- go/ql/test/experimental/CWE-918/SSRF.qlref | 2 +- go/ql/test/experimental/frameworks/CleverGo/HeaderWrite.ql | 2 +- go/ql/test/experimental/frameworks/CleverGo/HttpRedirect.ql | 2 +- .../test/experimental/frameworks/CleverGo/HttpResponseBody.ql | 2 +- go/ql/test/experimental/frameworks/CleverGo/RemoteSources.ql | 2 +- go/ql/test/experimental/frameworks/CleverGo/TaintTracking.ql | 2 +- go/ql/test/experimental/frameworks/Fiber/HeaderWrite.ql | 2 +- go/ql/test/experimental/frameworks/Fiber/Redirect.ql | 2 +- go/ql/test/experimental/frameworks/Fiber/RemoteFlowSources.ql | 2 +- go/ql/test/experimental/frameworks/Fiber/ResponseBody.ql | 2 +- go/ql/test/experimental/frameworks/Fiber/TaintTracking.ql | 2 +- go/ql/test/library-tests/semmle/go/Function/isVariadic.ql | 2 +- .../library-tests/semmle/go/Types/ImplementsComparable.ql | 2 +- .../library-tests/semmle/go/Types/SignatureType_isVariadic.ql | 2 +- .../library-tests/semmle/go/aliases/DataflowFields/test.ql | 2 +- .../library-tests/semmle/go/aliases/InterfaceImpls/flow.ql | 2 +- go/ql/test/library-tests/semmle/go/concepts/HTTP/Handler.ql | 2 +- .../library-tests/semmle/go/concepts/LoggerCall/LoggerCall.ql | 2 +- .../library-tests/semmle/go/dataflow/ArrayConversion/Flows.ql | 2 +- .../library-tests/semmle/go/dataflow/ChannelField/test.ql | 2 +- .../dataflow/ExternalFlowInheritance/mad_I1_subtypes_false.ql | 2 +- .../dataflow/ExternalFlowInheritance/mad_I1_subtypes_true.ql | 2 +- .../dataflow/ExternalFlowInheritance/mad_I2_subtypes_false.ql | 2 +- .../dataflow/ExternalFlowInheritance/mad_I2_subtypes_true.ql | 2 +- .../ExternalFlowInheritance/mad_IEmbedI1_subtypes_true.ql | 2 +- .../ExternalFlowInheritance/mad_IEmbedI2_subtypes_true.ql | 2 +- .../ExternalFlowInheritance/mad_PImplEmbedI1_subtypes_true.ql | 2 +- .../ExternalFlowInheritance/mad_PImplEmbedI2_subtypes_true.ql | 2 +- .../dataflow/ExternalFlowInheritance/mad_S1_subtypes_false.ql | 2 +- .../dataflow/ExternalFlowInheritance/mad_S1_subtypes_true.ql | 2 +- .../ExternalFlowInheritance/mad_SEmbedI1_subtypes_true.ql | 2 +- .../ExternalFlowInheritance/mad_SEmbedI2_subtypes_true.ql | 2 +- .../ExternalFlowInheritance/mad_SEmbedP1_subtypes_true.ql | 2 +- .../ExternalFlowInheritance/mad_SEmbedP2_subtypes_true.ql | 2 +- .../ExternalFlowInheritance/mad_SEmbedPtrP1_subtypes_true.ql | 2 +- .../ExternalFlowInheritance/mad_SEmbedPtrP2_subtypes_true.ql | 2 +- .../ExternalFlowInheritance/mad_SEmbedPtrS1_subtypes_true.ql | 2 +- .../ExternalFlowInheritance/mad_SEmbedPtrS2_subtypes_true.ql | 2 +- .../ExternalFlowInheritance/mad_SEmbedS1_subtypes_true.ql | 2 +- .../ExternalFlowInheritance/mad_SEmbedS2_subtypes_true.ql | 2 +- .../ExternalFlowInheritance/mad_SImplEmbedI1_subtypes_true.ql | 2 +- .../ExternalFlowInheritance/mad_SImplEmbedI2_subtypes_true.ql | 2 +- .../ExternalFlowInheritance/mad_SImplEmbedS1_subtypes_true.ql | 2 +- .../ExternalFlowInheritance/mad_SImplEmbedS2_subtypes_true.ql | 2 +- .../semmle/go/dataflow/ExternalFlowInheritance/ql_I1.ql | 2 +- .../semmle/go/dataflow/ExternalFlowInheritance/ql_P1.ql | 2 +- .../semmle/go/dataflow/ExternalFlowInheritance/ql_S1.ql | 2 +- .../semmle/go/dataflow/ExternalFlowVarArgs/Flows.ql | 2 +- .../semmle/go/dataflow/ExternalTaintFlow/completetest.ql | 2 +- .../semmle/go/dataflow/ExternalValueFlow/completetest.ql | 2 +- .../semmle/go/dataflow/GenericFunctionsAndTypes/Flows.ql | 2 +- .../semmle/go/dataflow/GlobalVariableSideEffects/Flows.ql | 2 +- .../semmle/go/dataflow/GuardingFunctions/test.ql | 2 +- .../test/library-tests/semmle/go/dataflow/HiddenNodes/test.ql | 2 +- .../semmle/go/dataflow/ListOfConstantsSanitizerGuards/test.ql | 2 +- .../semmle/go/dataflow/MapReadsAndStores/Flows.ql | 2 +- .../semmle/go/dataflow/PromotedFields/DataFlowConfig.ql | 2 +- .../semmle/go/dataflow/PromotedMethods/DataFlowConfig.ql | 4 ++-- .../semmle/go/dataflow/SliceExpressions/Flows.ql | 2 +- .../test/library-tests/semmle/go/dataflow/Switch/DataFlow.ql | 2 +- .../semmle/go/dataflow/TypeAssertions/DataFlow.ql | 2 +- go/ql/test/library-tests/semmle/go/dataflow/VarArgs/Flows.ql | 2 +- .../semmle/go/dataflow/VarArgsWithExternalFlow/Flows.ql | 2 +- .../semmle/go/dataflow/VarArgsWithFunctionModels/Flows.ql | 2 +- .../semmle/go/dataflow/flowsources/local/environment/test.ql | 2 +- .../semmle/go/dataflow/flowsources/local/file/test.ql | 2 +- .../semmle/go/dataflow/flowsources/local/stdin/source.ql | 2 +- .../semmle/go/dataflow/flowsources/local/stdin/test.ql | 2 +- go/ql/test/library-tests/semmle/go/frameworks/Afero/Query.ql | 2 +- .../test/library-tests/semmle/go/frameworks/AwsLambda/test.ql | 2 +- .../semmle/go/frameworks/Beego/ReflectedXss.qlref | 2 +- .../semmle/go/frameworks/Beego/TaintedPath.qlref | 2 +- .../semmle/go/frameworks/BeegoOrm/QueryString.ql | 2 +- .../semmle/go/frameworks/BeegoOrm/SqlInjection.qlref | 2 +- .../library-tests/semmle/go/frameworks/Chi/ReflectedXss.qlref | 2 +- .../library-tests/semmle/go/frameworks/CouchbaseV1/test.ql | 2 +- .../semmle/go/frameworks/Echo/OpenRedirect.qlref | 2 +- .../semmle/go/frameworks/Echo/ReflectedXss.qlref | 2 +- .../library-tests/semmle/go/frameworks/Echo/TaintedPath.qlref | 2 +- .../library-tests/semmle/go/frameworks/ElazarlGoproxy/test.ql | 2 +- .../semmle/go/frameworks/EvanphxJsonPatch/TaintFlows.ql | 2 +- .../semmle/go/frameworks/Fasthttp/AdditionalTaintSteps.ql | 2 +- .../semmle/go/frameworks/Fasthttp/EscapeFunction.ql | 2 +- .../semmle/go/frameworks/Fasthttp/FileSystemAccess.ql | 2 +- .../semmle/go/frameworks/Fasthttp/OpenRedirect.ql | 2 +- .../semmle/go/frameworks/Fasthttp/RemoteFlowSources.ql | 2 +- .../test/library-tests/semmle/go/frameworks/Fasthttp/SSRF.ql | 2 +- go/ql/test/library-tests/semmle/go/frameworks/Fasthttp/Xss.ql | 2 +- go/ql/test/library-tests/semmle/go/frameworks/Fiber/Query.ql | 2 +- .../library-tests/semmle/go/frameworks/Gin/TaintedPath.qlref | 4 ++-- .../semmle/go/frameworks/GoKit/RemoteFlowSources.ql | 2 +- .../library-tests/semmle/go/frameworks/GoMicro/gomicro.ql | 2 +- go/ql/test/library-tests/semmle/go/frameworks/Iris/Query.ql | 2 +- .../semmle/go/frameworks/K8sIoApiCoreV1/TaintFlowsInline.ql | 2 +- .../K8sIoApimachineryPkgRuntime/TaintFlowsInline.ql | 2 +- .../go/frameworks/K8sIoClientGo/SecretInterfaceSource.ql | 2 +- .../library-tests/semmle/go/frameworks/Macaron/Sources.ql | 2 +- go/ql/test/library-tests/semmle/go/frameworks/NoSQL/Query.ql | 2 +- .../library-tests/semmle/go/frameworks/Protobuf/TaintFlows.ql | 2 +- .../semmle/go/frameworks/Revel/OpenRedirect.qlref | 2 +- .../semmle/go/frameworks/Revel/ReflectedXss.qlref | 2 +- .../semmle/go/frameworks/Revel/TaintedPath.qlref | 2 +- go/ql/test/library-tests/semmle/go/frameworks/Revel/test.ql | 2 +- .../semmle/go/frameworks/SQL/Gorm/QueryString.ql | 2 +- .../library-tests/semmle/go/frameworks/SQL/QueryString.ql | 2 +- .../semmle/go/frameworks/SQL/Sqlx/QueryString.ql | 2 +- .../library-tests/semmle/go/frameworks/SQL/bun/QueryString.ql | 2 +- .../semmle/go/frameworks/SQL/gogf/QueryString.ql | 2 +- .../semmle/go/frameworks/SQL/gorqlite/QueryString.ql | 2 +- .../library-tests/semmle/go/frameworks/Spew/TaintFlows.ql | 2 +- .../semmle/go/frameworks/StdlibTaintFlow/test.ql | 2 +- .../semmle/go/frameworks/Twirp/RequestForgery.qlref | 2 +- .../semmle/go/frameworks/XNetHtml/ReflectedXss.qlref | 2 +- .../semmle/go/frameworks/XNetHtml/SqlInjection.qlref | 2 +- go/ql/test/library-tests/semmle/go/frameworks/Yaml/tests.ql | 2 +- .../test/library-tests/semmle/go/frameworks/Zap/TaintFlows.ql | 2 +- .../test/library-tests/semmle/go/frameworks/gqlgen/gqlgen.ql | 2 +- .../UnhandledCloseWritableHandle.qlref | 2 +- .../IncompleteHostnameRegexp/IncompleteHostnameRegexp.qlref | 2 +- go/ql/test/query-tests/Security/CWE-022/TaintedPath.qlref | 2 +- .../query-tests/Security/CWE-022/UnsafeUnzipSymlink.qlref | 2 +- go/ql/test/query-tests/Security/CWE-022/ZipSlip.qlref | 2 +- .../test/query-tests/Security/CWE-078/CommandInjection.qlref | 2 +- go/ql/test/query-tests/Security/CWE-078/StoredCommand.qlref | 2 +- go/ql/test/query-tests/Security/CWE-079/ReflectedXss.qlref | 2 +- go/ql/test/query-tests/Security/CWE-089/SqlInjection.qlref | 2 +- go/ql/test/query-tests/Security/CWE-089/StringBreak.qlref | 2 +- go/ql/test/query-tests/Security/CWE-117/LogInjectionTest.ql | 2 +- .../query-tests/Security/CWE-190/AllocationSizeOverflow.qlref | 2 +- .../test/query-tests/Security/CWE-312/CleartextLogging.qlref | 2 +- go/ql/test/query-tests/Security/CWE-327/UnsafeTLS.qlref | 2 +- .../CWE-338/InsecureRandomness/InsecureRandomness.qlref | 2 +- .../Security/CWE-347/MissingJwtSignatureCheck.qlref | 2 +- .../Security/CWE-601/BadRedirectCheck/BadRedirectCheck.qlref | 2 +- .../Security/CWE-601/OpenUrlRedirect/OpenUrlRedirect.qlref | 2 +- go/ql/test/query-tests/Security/CWE-640/EmailInjection.qlref | 2 +- go/ql/test/query-tests/Security/CWE-643/XPathInjection.qlref | 2 +- .../Security/CWE-681/IncorrectIntegerConversion.ql | 2 +- .../Security/CWE-770/UncontrolledAllocationSize.ql | 2 +- go/ql/test/query-tests/Security/CWE-918/RequestForgery.qlref | 2 +- 149 files changed, 151 insertions(+), 151 deletions(-) diff --git a/go/ql/test/experimental/CWE-090/LDAPInjection.qlref b/go/ql/test/experimental/CWE-090/LDAPInjection.qlref index 29b7e84b3e53..7049e09a7265 100644 --- a/go/ql/test/experimental/CWE-090/LDAPInjection.qlref +++ b/go/ql/test/experimental/CWE-090/LDAPInjection.qlref @@ -1,2 +1,2 @@ query: experimental/CWE-090/LDAPInjection.ql -postprocess: TestUtilities/PrettyPrintModels.ql +postprocess: utils/test/PrettyPrintModels.ql diff --git a/go/ql/test/experimental/CWE-203/Timing.qlref b/go/ql/test/experimental/CWE-203/Timing.qlref index 56320c60159a..7306096e724e 100644 --- a/go/ql/test/experimental/CWE-203/Timing.qlref +++ b/go/ql/test/experimental/CWE-203/Timing.qlref @@ -1,2 +1,2 @@ query: experimental/CWE-203/Timing.ql -postprocess: TestUtilities/PrettyPrintModels.ql +postprocess: utils/test/PrettyPrintModels.ql diff --git a/go/ql/test/experimental/CWE-287/ImproperLdapAuth.qlref b/go/ql/test/experimental/CWE-287/ImproperLdapAuth.qlref index f1df35af25ac..35ca7800cc8a 100644 --- a/go/ql/test/experimental/CWE-287/ImproperLdapAuth.qlref +++ b/go/ql/test/experimental/CWE-287/ImproperLdapAuth.qlref @@ -1,2 +1,2 @@ query: experimental/CWE-287/ImproperLdapAuth.ql -postprocess: TestUtilities/PrettyPrintModels.ql +postprocess: utils/test/PrettyPrintModels.ql diff --git a/go/ql/test/experimental/CWE-369/DivideByZero.qlref b/go/ql/test/experimental/CWE-369/DivideByZero.qlref index 2b80b2b07927..80eca2d32193 100644 --- a/go/ql/test/experimental/CWE-369/DivideByZero.qlref +++ b/go/ql/test/experimental/CWE-369/DivideByZero.qlref @@ -1,2 +1,2 @@ query: experimental/CWE-369/DivideByZero.ql -postprocess: TestUtilities/PrettyPrintModels.ql +postprocess: utils/test/PrettyPrintModels.ql diff --git a/go/ql/test/experimental/CWE-522-DecompressionBombs/DecompressionBombTest.ql b/go/ql/test/experimental/CWE-522-DecompressionBombs/DecompressionBombTest.ql index 9c34f9ff8bd9..ec22f6579513 100644 --- a/go/ql/test/experimental/CWE-522-DecompressionBombs/DecompressionBombTest.ql +++ b/go/ql/test/experimental/CWE-522-DecompressionBombs/DecompressionBombTest.ql @@ -1,7 +1,7 @@ import go import semmle.go.dataflow.ExternalFlow import ModelValidation -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest import experimental.frameworks.DecompressionBombs::DecompressionBomb module TestDecompressionBombs implements TestSig { diff --git a/go/ql/test/experimental/CWE-522-DecompressionBombs/DecompressionBombs.qlref b/go/ql/test/experimental/CWE-522-DecompressionBombs/DecompressionBombs.qlref index 14dd362265e9..93d41075d5f3 100644 --- a/go/ql/test/experimental/CWE-522-DecompressionBombs/DecompressionBombs.qlref +++ b/go/ql/test/experimental/CWE-522-DecompressionBombs/DecompressionBombs.qlref @@ -1,2 +1,2 @@ query: experimental/CWE-522-DecompressionBombs/DecompressionBombs.ql -postprocess: TestUtilities/PrettyPrintModels.ql +postprocess: utils/test/PrettyPrintModels.ql diff --git a/go/ql/test/experimental/CWE-74/DsnInjection.qlref b/go/ql/test/experimental/CWE-74/DsnInjection.qlref index cda315f86b6b..f8e0117d7351 100644 --- a/go/ql/test/experimental/CWE-74/DsnInjection.qlref +++ b/go/ql/test/experimental/CWE-74/DsnInjection.qlref @@ -1,2 +1,2 @@ query: experimental/CWE-74/DsnInjection.ql -postprocess: TestUtilities/PrettyPrintModels.ql +postprocess: utils/test/PrettyPrintModels.ql diff --git a/go/ql/test/experimental/CWE-74/DsnInjectionLocal.qlref b/go/ql/test/experimental/CWE-74/DsnInjectionLocal.qlref index 6c8e953e642b..f2d6116c7f1e 100644 --- a/go/ql/test/experimental/CWE-74/DsnInjectionLocal.qlref +++ b/go/ql/test/experimental/CWE-74/DsnInjectionLocal.qlref @@ -1,2 +1,2 @@ query: experimental/CWE-74/DsnInjectionLocal.ql -postprocess: TestUtilities/PrettyPrintModels.ql +postprocess: utils/test/PrettyPrintModels.ql diff --git a/go/ql/test/experimental/CWE-79/HTMLTemplateEscapingPassthrough.qlref b/go/ql/test/experimental/CWE-79/HTMLTemplateEscapingPassthrough.qlref index dbc0b4b5d00d..c425b9a445b7 100644 --- a/go/ql/test/experimental/CWE-79/HTMLTemplateEscapingPassthrough.qlref +++ b/go/ql/test/experimental/CWE-79/HTMLTemplateEscapingPassthrough.qlref @@ -1,2 +1,2 @@ query: experimental/CWE-79/HTMLTemplateEscapingPassthrough.ql -postprocess: TestUtilities/PrettyPrintModels.ql +postprocess: utils/test/PrettyPrintModels.ql diff --git a/go/ql/test/experimental/CWE-918/SSRF.qlref b/go/ql/test/experimental/CWE-918/SSRF.qlref index 44a7b5a2cc29..7cba541836f7 100644 --- a/go/ql/test/experimental/CWE-918/SSRF.qlref +++ b/go/ql/test/experimental/CWE-918/SSRF.qlref @@ -1,2 +1,2 @@ query: experimental/CWE-918/SSRF.ql -postprocess: TestUtilities/PrettyPrintModels.ql +postprocess: utils/test/PrettyPrintModels.ql diff --git a/go/ql/test/experimental/frameworks/CleverGo/HeaderWrite.ql b/go/ql/test/experimental/frameworks/CleverGo/HeaderWrite.ql index 6a1420db6d6e..b34343008b50 100644 --- a/go/ql/test/experimental/frameworks/CleverGo/HeaderWrite.ql +++ b/go/ql/test/experimental/frameworks/CleverGo/HeaderWrite.ql @@ -1,5 +1,5 @@ import go -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest import experimental.frameworks.CleverGo module HttpHeaderWriteTest implements TestSig { diff --git a/go/ql/test/experimental/frameworks/CleverGo/HttpRedirect.ql b/go/ql/test/experimental/frameworks/CleverGo/HttpRedirect.ql index a0a8ce0a2427..20062ad73586 100644 --- a/go/ql/test/experimental/frameworks/CleverGo/HttpRedirect.ql +++ b/go/ql/test/experimental/frameworks/CleverGo/HttpRedirect.ql @@ -1,5 +1,5 @@ import go -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest import experimental.frameworks.CleverGo module HttpRedirectTest implements TestSig { diff --git a/go/ql/test/experimental/frameworks/CleverGo/HttpResponseBody.ql b/go/ql/test/experimental/frameworks/CleverGo/HttpResponseBody.ql index b34f1ec23be0..8842edcada11 100644 --- a/go/ql/test/experimental/frameworks/CleverGo/HttpResponseBody.ql +++ b/go/ql/test/experimental/frameworks/CleverGo/HttpResponseBody.ql @@ -1,5 +1,5 @@ import go -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest import experimental.frameworks.CleverGo module HttpResponseBodyTest implements TestSig { diff --git a/go/ql/test/experimental/frameworks/CleverGo/RemoteSources.ql b/go/ql/test/experimental/frameworks/CleverGo/RemoteSources.ql index f99fc2b280dc..3c7cb4f7f106 100644 --- a/go/ql/test/experimental/frameworks/CleverGo/RemoteSources.ql +++ b/go/ql/test/experimental/frameworks/CleverGo/RemoteSources.ql @@ -1,5 +1,5 @@ import go -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest import experimental.frameworks.CleverGo module RemoteFlowSourceTest implements TestSig { diff --git a/go/ql/test/experimental/frameworks/CleverGo/TaintTracking.ql b/go/ql/test/experimental/frameworks/CleverGo/TaintTracking.ql index e45dfbb2ecf9..a45162fa6c99 100644 --- a/go/ql/test/experimental/frameworks/CleverGo/TaintTracking.ql +++ b/go/ql/test/experimental/frameworks/CleverGo/TaintTracking.ql @@ -2,5 +2,5 @@ import go import semmle.go.dataflow.ExternalFlow import ModelValidation import experimental.frameworks.CleverGo -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest import DefaultFlowTest diff --git a/go/ql/test/experimental/frameworks/Fiber/HeaderWrite.ql b/go/ql/test/experimental/frameworks/Fiber/HeaderWrite.ql index 70494910554e..8ea18121f0ae 100644 --- a/go/ql/test/experimental/frameworks/Fiber/HeaderWrite.ql +++ b/go/ql/test/experimental/frameworks/Fiber/HeaderWrite.ql @@ -1,5 +1,5 @@ import go -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest import experimental.frameworks.Fiber module HttpHeaderWriteTest implements TestSig { diff --git a/go/ql/test/experimental/frameworks/Fiber/Redirect.ql b/go/ql/test/experimental/frameworks/Fiber/Redirect.ql index 1f609ea3959d..ace56e3e0c8e 100644 --- a/go/ql/test/experimental/frameworks/Fiber/Redirect.ql +++ b/go/ql/test/experimental/frameworks/Fiber/Redirect.ql @@ -1,5 +1,5 @@ import go -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest import experimental.frameworks.Fiber module HttpRedirectTest implements TestSig { diff --git a/go/ql/test/experimental/frameworks/Fiber/RemoteFlowSources.ql b/go/ql/test/experimental/frameworks/Fiber/RemoteFlowSources.ql index b537c7292367..e6d40fdd2cfe 100644 --- a/go/ql/test/experimental/frameworks/Fiber/RemoteFlowSources.ql +++ b/go/ql/test/experimental/frameworks/Fiber/RemoteFlowSources.ql @@ -1,5 +1,5 @@ import go -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest import experimental.frameworks.Fiber module RemoteFlowSourceTest implements TestSig { diff --git a/go/ql/test/experimental/frameworks/Fiber/ResponseBody.ql b/go/ql/test/experimental/frameworks/Fiber/ResponseBody.ql index 574f514b343d..8ef63f48f64b 100644 --- a/go/ql/test/experimental/frameworks/Fiber/ResponseBody.ql +++ b/go/ql/test/experimental/frameworks/Fiber/ResponseBody.ql @@ -1,5 +1,5 @@ import go -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest import experimental.frameworks.Fiber module HttpResponseBodyTest implements TestSig { diff --git a/go/ql/test/experimental/frameworks/Fiber/TaintTracking.ql b/go/ql/test/experimental/frameworks/Fiber/TaintTracking.ql index ad23bf13e92a..356b2ea87558 100644 --- a/go/ql/test/experimental/frameworks/Fiber/TaintTracking.ql +++ b/go/ql/test/experimental/frameworks/Fiber/TaintTracking.ql @@ -2,5 +2,5 @@ import go import semmle.go.dataflow.ExternalFlow import ModelValidation import experimental.frameworks.Fiber -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest import DefaultFlowTest diff --git a/go/ql/test/library-tests/semmle/go/Function/isVariadic.ql b/go/ql/test/library-tests/semmle/go/Function/isVariadic.ql index 9a75a5f01362..711f535c7931 100644 --- a/go/ql/test/library-tests/semmle/go/Function/isVariadic.ql +++ b/go/ql/test/library-tests/semmle/go/Function/isVariadic.ql @@ -1,5 +1,5 @@ import go -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest module FunctionIsVariadicTest implements TestSig { string getARelevantTag() { result = "isVariadic" } diff --git a/go/ql/test/library-tests/semmle/go/Types/ImplementsComparable.ql b/go/ql/test/library-tests/semmle/go/Types/ImplementsComparable.ql index 048352a3ee0e..9afa5505801e 100644 --- a/go/ql/test/library-tests/semmle/go/Types/ImplementsComparable.ql +++ b/go/ql/test/library-tests/semmle/go/Types/ImplementsComparable.ql @@ -1,5 +1,5 @@ import go -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest module ImplementsComparableTest implements TestSig { string getARelevantTag() { result = "implementsComparable" } diff --git a/go/ql/test/library-tests/semmle/go/Types/SignatureType_isVariadic.ql b/go/ql/test/library-tests/semmle/go/Types/SignatureType_isVariadic.ql index e6b96ce608e1..6a4b42700232 100644 --- a/go/ql/test/library-tests/semmle/go/Types/SignatureType_isVariadic.ql +++ b/go/ql/test/library-tests/semmle/go/Types/SignatureType_isVariadic.ql @@ -1,5 +1,5 @@ import go -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest module SignatureTypeIsVariadicTest implements TestSig { string getARelevantTag() { result = "isVariadic" } diff --git a/go/ql/test/library-tests/semmle/go/aliases/DataflowFields/test.ql b/go/ql/test/library-tests/semmle/go/aliases/DataflowFields/test.ql index 1b27b27d6dc2..946f7d3ab85c 100644 --- a/go/ql/test/library-tests/semmle/go/aliases/DataflowFields/test.ql +++ b/go/ql/test/library-tests/semmle/go/aliases/DataflowFields/test.ql @@ -1,3 +1,3 @@ import go -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest import DefaultFlowTest diff --git a/go/ql/test/library-tests/semmle/go/aliases/InterfaceImpls/flow.ql b/go/ql/test/library-tests/semmle/go/aliases/InterfaceImpls/flow.ql index 1b27b27d6dc2..946f7d3ab85c 100644 --- a/go/ql/test/library-tests/semmle/go/aliases/InterfaceImpls/flow.ql +++ b/go/ql/test/library-tests/semmle/go/aliases/InterfaceImpls/flow.ql @@ -1,3 +1,3 @@ import go -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest import DefaultFlowTest diff --git a/go/ql/test/library-tests/semmle/go/concepts/HTTP/Handler.ql b/go/ql/test/library-tests/semmle/go/concepts/HTTP/Handler.ql index 6b9822714045..6695162b954a 100644 --- a/go/ql/test/library-tests/semmle/go/concepts/HTTP/Handler.ql +++ b/go/ql/test/library-tests/semmle/go/concepts/HTTP/Handler.ql @@ -1,5 +1,5 @@ import go -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest module HttpHandler implements TestSig { string getARelevantTag() { result = "handler" } diff --git a/go/ql/test/library-tests/semmle/go/concepts/LoggerCall/LoggerCall.ql b/go/ql/test/library-tests/semmle/go/concepts/LoggerCall/LoggerCall.ql index a231fe6795f1..b15d129039eb 100644 --- a/go/ql/test/library-tests/semmle/go/concepts/LoggerCall/LoggerCall.ql +++ b/go/ql/test/library-tests/semmle/go/concepts/LoggerCall/LoggerCall.ql @@ -1,7 +1,7 @@ import go import semmle.go.dataflow.ExternalFlow import ModelValidation -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest module LoggerTest implements TestSig { string getARelevantTag() { result = "logger" } diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ArrayConversion/Flows.ql b/go/ql/test/library-tests/semmle/go/dataflow/ArrayConversion/Flows.ql index 1b64b928c3ff..31483a02004a 100644 --- a/go/ql/test/library-tests/semmle/go/dataflow/ArrayConversion/Flows.ql +++ b/go/ql/test/library-tests/semmle/go/dataflow/ArrayConversion/Flows.ql @@ -1,5 +1,5 @@ import go import semmle.go.dataflow.ExternalFlow import ModelValidation -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest import DefaultFlowTest diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ChannelField/test.ql b/go/ql/test/library-tests/semmle/go/dataflow/ChannelField/test.ql index c0e29f8b086e..1ca662a6e2ae 100644 --- a/go/ql/test/library-tests/semmle/go/dataflow/ChannelField/test.ql +++ b/go/ql/test/library-tests/semmle/go/dataflow/ChannelField/test.ql @@ -1,7 +1,7 @@ import go import semmle.go.dataflow.ExternalFlow import ModelValidation -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest module Flow = DataFlow::Global; diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_I1_subtypes_false.ql b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_I1_subtypes_false.ql index 3915c20b92bc..24ad16a00675 100644 --- a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_I1_subtypes_false.ql +++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_I1_subtypes_false.ql @@ -1,6 +1,6 @@ import go import ModelValidation -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest import MakeTest module Config implements DataFlow::ConfigSig { diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_I1_subtypes_true.ql b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_I1_subtypes_true.ql index 2db01e3a76f5..20702a237ceb 100644 --- a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_I1_subtypes_true.ql +++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_I1_subtypes_true.ql @@ -1,6 +1,6 @@ import go import ModelValidation -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest import MakeTest module Config implements DataFlow::ConfigSig { diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_I2_subtypes_false.ql b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_I2_subtypes_false.ql index 9cff9e92009f..90a277cb944d 100644 --- a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_I2_subtypes_false.ql +++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_I2_subtypes_false.ql @@ -1,6 +1,6 @@ import go import ModelValidation -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest import MakeTest module Config implements DataFlow::ConfigSig { diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_I2_subtypes_true.ql b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_I2_subtypes_true.ql index 79220e979c08..f9e5566438f7 100644 --- a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_I2_subtypes_true.ql +++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_I2_subtypes_true.ql @@ -1,6 +1,6 @@ import go import ModelValidation -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest import MakeTest module Config implements DataFlow::ConfigSig { diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_IEmbedI1_subtypes_true.ql b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_IEmbedI1_subtypes_true.ql index e4d35a2d1830..c98607c88f51 100644 --- a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_IEmbedI1_subtypes_true.ql +++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_IEmbedI1_subtypes_true.ql @@ -1,6 +1,6 @@ import go import ModelValidation -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest import MakeTest module Config implements DataFlow::ConfigSig { diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_IEmbedI2_subtypes_true.ql b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_IEmbedI2_subtypes_true.ql index 18e461357890..0fa7372c504c 100644 --- a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_IEmbedI2_subtypes_true.ql +++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_IEmbedI2_subtypes_true.ql @@ -1,6 +1,6 @@ import go import ModelValidation -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest import MakeTest module Config implements DataFlow::ConfigSig { diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_PImplEmbedI1_subtypes_true.ql b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_PImplEmbedI1_subtypes_true.ql index 6e84bbe2ffbf..4b34a2e99ab2 100644 --- a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_PImplEmbedI1_subtypes_true.ql +++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_PImplEmbedI1_subtypes_true.ql @@ -1,6 +1,6 @@ import go import ModelValidation -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest import MakeTest module Config implements DataFlow::ConfigSig { diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_PImplEmbedI2_subtypes_true.ql b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_PImplEmbedI2_subtypes_true.ql index 63a829d1ac4e..2eb869023409 100644 --- a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_PImplEmbedI2_subtypes_true.ql +++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_PImplEmbedI2_subtypes_true.ql @@ -1,6 +1,6 @@ import go import ModelValidation -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest import MakeTest module Config implements DataFlow::ConfigSig { diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_S1_subtypes_false.ql b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_S1_subtypes_false.ql index c5754d1ded77..a154ca95a3db 100644 --- a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_S1_subtypes_false.ql +++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_S1_subtypes_false.ql @@ -1,6 +1,6 @@ import go import ModelValidation -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest import MakeTest module Config implements DataFlow::ConfigSig { diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_S1_subtypes_true.ql b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_S1_subtypes_true.ql index 92c895b61a33..45740e13afe2 100644 --- a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_S1_subtypes_true.ql +++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_S1_subtypes_true.ql @@ -1,6 +1,6 @@ import go import ModelValidation -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest import MakeTest module Config implements DataFlow::ConfigSig { diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedI1_subtypes_true.ql b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedI1_subtypes_true.ql index f401e958315d..3536fed2a259 100644 --- a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedI1_subtypes_true.ql +++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedI1_subtypes_true.ql @@ -1,6 +1,6 @@ import go import ModelValidation -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest import MakeTest module Config implements DataFlow::ConfigSig { diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedI2_subtypes_true.ql b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedI2_subtypes_true.ql index 0d7169c93cf7..6daadc65db48 100644 --- a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedI2_subtypes_true.ql +++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedI2_subtypes_true.ql @@ -1,6 +1,6 @@ import go import ModelValidation -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest import MakeTest module Config implements DataFlow::ConfigSig { diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedP1_subtypes_true.ql b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedP1_subtypes_true.ql index 35c780f603d0..b9d4b72c7268 100644 --- a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedP1_subtypes_true.ql +++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedP1_subtypes_true.ql @@ -1,6 +1,6 @@ import go import ModelValidation -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest import MakeTest module Config implements DataFlow::ConfigSig { diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedP2_subtypes_true.ql b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedP2_subtypes_true.ql index 6b5cad78d8bc..dfbe91185342 100644 --- a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedP2_subtypes_true.ql +++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedP2_subtypes_true.ql @@ -1,6 +1,6 @@ import go import ModelValidation -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest import MakeTest module Config implements DataFlow::ConfigSig { diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedPtrP1_subtypes_true.ql b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedPtrP1_subtypes_true.ql index 344dc37e41a4..edc94546a06a 100644 --- a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedPtrP1_subtypes_true.ql +++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedPtrP1_subtypes_true.ql @@ -1,6 +1,6 @@ import go import ModelValidation -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest import MakeTest module Config implements DataFlow::ConfigSig { diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedPtrP2_subtypes_true.ql b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedPtrP2_subtypes_true.ql index a7c2e497f556..7370b73839ea 100644 --- a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedPtrP2_subtypes_true.ql +++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedPtrP2_subtypes_true.ql @@ -1,6 +1,6 @@ import go import ModelValidation -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest import MakeTest module Config implements DataFlow::ConfigSig { diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedPtrS1_subtypes_true.ql b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedPtrS1_subtypes_true.ql index cf847c781bcc..39a5759f248b 100644 --- a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedPtrS1_subtypes_true.ql +++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedPtrS1_subtypes_true.ql @@ -1,6 +1,6 @@ import go import ModelValidation -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest import MakeTest module Config implements DataFlow::ConfigSig { diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedPtrS2_subtypes_true.ql b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedPtrS2_subtypes_true.ql index 0c7b05dd3ff8..d40fe60ff112 100644 --- a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedPtrS2_subtypes_true.ql +++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedPtrS2_subtypes_true.ql @@ -1,6 +1,6 @@ import go import ModelValidation -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest import MakeTest module Config implements DataFlow::ConfigSig { diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedS1_subtypes_true.ql b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedS1_subtypes_true.ql index f58fd32770a9..e103f7f631a7 100644 --- a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedS1_subtypes_true.ql +++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedS1_subtypes_true.ql @@ -1,6 +1,6 @@ import go import ModelValidation -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest import MakeTest module Config implements DataFlow::ConfigSig { diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedS2_subtypes_true.ql b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedS2_subtypes_true.ql index db9d98e06d28..a461b2da08dd 100644 --- a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedS2_subtypes_true.ql +++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedS2_subtypes_true.ql @@ -1,6 +1,6 @@ import go import ModelValidation -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest import MakeTest module Config implements DataFlow::ConfigSig { diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SImplEmbedI1_subtypes_true.ql b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SImplEmbedI1_subtypes_true.ql index c4e8afd1fbf4..aac7a180ae87 100644 --- a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SImplEmbedI1_subtypes_true.ql +++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SImplEmbedI1_subtypes_true.ql @@ -1,6 +1,6 @@ import go import ModelValidation -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest import MakeTest module Config implements DataFlow::ConfigSig { diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SImplEmbedI2_subtypes_true.ql b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SImplEmbedI2_subtypes_true.ql index b8ebb68ecdb8..25c3b7959dcd 100644 --- a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SImplEmbedI2_subtypes_true.ql +++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SImplEmbedI2_subtypes_true.ql @@ -1,6 +1,6 @@ import go import ModelValidation -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest import MakeTest module Config implements DataFlow::ConfigSig { diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SImplEmbedS1_subtypes_true.ql b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SImplEmbedS1_subtypes_true.ql index 10e9fb96d4c8..429d3a527d59 100644 --- a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SImplEmbedS1_subtypes_true.ql +++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SImplEmbedS1_subtypes_true.ql @@ -1,6 +1,6 @@ import go import ModelValidation -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest import MakeTest module Config implements DataFlow::ConfigSig { diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SImplEmbedS2_subtypes_true.ql b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SImplEmbedS2_subtypes_true.ql index 403b6238b4f3..e55fdf59a222 100644 --- a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SImplEmbedS2_subtypes_true.ql +++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SImplEmbedS2_subtypes_true.ql @@ -1,6 +1,6 @@ import go import ModelValidation -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest import MakeTest module Config implements DataFlow::ConfigSig { diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/ql_I1.ql b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/ql_I1.ql index f4beb7ea28df..e5d80402faa1 100644 --- a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/ql_I1.ql +++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/ql_I1.ql @@ -1,6 +1,6 @@ import go import ModelValidation -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest import MakeTest module Config implements DataFlow::ConfigSig { diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/ql_P1.ql b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/ql_P1.ql index 3022e13ff749..cdabb83a7362 100644 --- a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/ql_P1.ql +++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/ql_P1.ql @@ -1,6 +1,6 @@ import go import ModelValidation -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest import MakeTest module Config implements DataFlow::ConfigSig { diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/ql_S1.ql b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/ql_S1.ql index 49113c53ed7a..a159d1ae5ed1 100644 --- a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/ql_S1.ql +++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/ql_S1.ql @@ -1,6 +1,6 @@ import go import ModelValidation -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest import MakeTest module Config implements DataFlow::ConfigSig { diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowVarArgs/Flows.ql b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowVarArgs/Flows.ql index 1b64b928c3ff..31483a02004a 100644 --- a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowVarArgs/Flows.ql +++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowVarArgs/Flows.ql @@ -1,5 +1,5 @@ import go import semmle.go.dataflow.ExternalFlow import ModelValidation -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest import DefaultFlowTest diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalTaintFlow/completetest.ql b/go/ql/test/library-tests/semmle/go/dataflow/ExternalTaintFlow/completetest.ql index 2b719551ae0c..6cada9dda631 100644 --- a/go/ql/test/library-tests/semmle/go/dataflow/ExternalTaintFlow/completetest.ql +++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalTaintFlow/completetest.ql @@ -6,7 +6,7 @@ import go import semmle.go.dataflow.ExternalFlow import ModelValidation import semmle.go.dataflow.internal.FlowSummaryImpl as FlowSummaryImpl -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest module Config implements DataFlow::ConfigSig { predicate isSource(DataFlow::Node src) { sourceNode(src, "qltest") } diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalValueFlow/completetest.ql b/go/ql/test/library-tests/semmle/go/dataflow/ExternalValueFlow/completetest.ql index efd5f0d5bb38..a5dedbeacf47 100644 --- a/go/ql/test/library-tests/semmle/go/dataflow/ExternalValueFlow/completetest.ql +++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalValueFlow/completetest.ql @@ -6,7 +6,7 @@ import go import semmle.go.dataflow.ExternalFlow import ModelValidation import semmle.go.dataflow.internal.FlowSummaryImpl as FlowSummaryImpl -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest module Config implements DataFlow::ConfigSig { predicate isSource(DataFlow::Node source) { sourceNode(source, "qltest") } diff --git a/go/ql/test/library-tests/semmle/go/dataflow/GenericFunctionsAndTypes/Flows.ql b/go/ql/test/library-tests/semmle/go/dataflow/GenericFunctionsAndTypes/Flows.ql index 1b64b928c3ff..31483a02004a 100644 --- a/go/ql/test/library-tests/semmle/go/dataflow/GenericFunctionsAndTypes/Flows.ql +++ b/go/ql/test/library-tests/semmle/go/dataflow/GenericFunctionsAndTypes/Flows.ql @@ -1,5 +1,5 @@ import go import semmle.go.dataflow.ExternalFlow import ModelValidation -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest import DefaultFlowTest diff --git a/go/ql/test/library-tests/semmle/go/dataflow/GlobalVariableSideEffects/Flows.ql b/go/ql/test/library-tests/semmle/go/dataflow/GlobalVariableSideEffects/Flows.ql index 47c4d85bea95..171aee868248 100644 --- a/go/ql/test/library-tests/semmle/go/dataflow/GlobalVariableSideEffects/Flows.ql +++ b/go/ql/test/library-tests/semmle/go/dataflow/GlobalVariableSideEffects/Flows.ql @@ -1,5 +1,5 @@ import go -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest string getArgString(DataFlow::Node src, DataFlow::Node sink) { exists(src) and diff --git a/go/ql/test/library-tests/semmle/go/dataflow/GuardingFunctions/test.ql b/go/ql/test/library-tests/semmle/go/dataflow/GuardingFunctions/test.ql index 8d8d8c130062..64055d7a3489 100644 --- a/go/ql/test/library-tests/semmle/go/dataflow/GuardingFunctions/test.ql +++ b/go/ql/test/library-tests/semmle/go/dataflow/GuardingFunctions/test.ql @@ -1,7 +1,7 @@ import go import semmle.go.dataflow.ExternalFlow import ModelValidation -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest predicate isBad(DataFlow::Node g, Expr e, boolean branch) { g.(DataFlow::CallNode).getTarget().getName() = "isBad" and diff --git a/go/ql/test/library-tests/semmle/go/dataflow/HiddenNodes/test.ql b/go/ql/test/library-tests/semmle/go/dataflow/HiddenNodes/test.ql index c723327e0b1f..e67e1a5644ae 100644 --- a/go/ql/test/library-tests/semmle/go/dataflow/HiddenNodes/test.ql +++ b/go/ql/test/library-tests/semmle/go/dataflow/HiddenNodes/test.ql @@ -1,7 +1,7 @@ import go import semmle.go.dataflow.ExternalFlow import ModelValidation -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest import codeql.dataflow.test.ProvenancePathGraph module Flow = TaintTracking::Global; diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ListOfConstantsSanitizerGuards/test.ql b/go/ql/test/library-tests/semmle/go/dataflow/ListOfConstantsSanitizerGuards/test.ql index 3169b9e35c07..6e08be9ca917 100644 --- a/go/ql/test/library-tests/semmle/go/dataflow/ListOfConstantsSanitizerGuards/test.ql +++ b/go/ql/test/library-tests/semmle/go/dataflow/ListOfConstantsSanitizerGuards/test.ql @@ -1,5 +1,5 @@ import go import semmle.go.dataflow.ExternalFlow import ModelValidation -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest import TaintFlowTest diff --git a/go/ql/test/library-tests/semmle/go/dataflow/MapReadsAndStores/Flows.ql b/go/ql/test/library-tests/semmle/go/dataflow/MapReadsAndStores/Flows.ql index 1b64b928c3ff..31483a02004a 100644 --- a/go/ql/test/library-tests/semmle/go/dataflow/MapReadsAndStores/Flows.ql +++ b/go/ql/test/library-tests/semmle/go/dataflow/MapReadsAndStores/Flows.ql @@ -1,5 +1,5 @@ import go import semmle.go.dataflow.ExternalFlow import ModelValidation -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest import DefaultFlowTest diff --git a/go/ql/test/library-tests/semmle/go/dataflow/PromotedFields/DataFlowConfig.ql b/go/ql/test/library-tests/semmle/go/dataflow/PromotedFields/DataFlowConfig.ql index 2ccd28c3b60b..978b8a8a98f2 100644 --- a/go/ql/test/library-tests/semmle/go/dataflow/PromotedFields/DataFlowConfig.ql +++ b/go/ql/test/library-tests/semmle/go/dataflow/PromotedFields/DataFlowConfig.ql @@ -1,5 +1,5 @@ import go import semmle.go.dataflow.ExternalFlow import ModelValidation -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest import ValueFlowTest diff --git a/go/ql/test/library-tests/semmle/go/dataflow/PromotedMethods/DataFlowConfig.ql b/go/ql/test/library-tests/semmle/go/dataflow/PromotedMethods/DataFlowConfig.ql index c331ccf530d1..fa8367236db3 100644 --- a/go/ql/test/library-tests/semmle/go/dataflow/PromotedMethods/DataFlowConfig.ql +++ b/go/ql/test/library-tests/semmle/go/dataflow/PromotedMethods/DataFlowConfig.ql @@ -1,8 +1,8 @@ import go import semmle.go.dataflow.ExternalFlow import ModelValidation -import TestUtilities.InlineExpectationsTest -import TestUtilities.InlineFlowTest +import utils.test.InlineExpectationsTest +import utils.test.InlineFlowTest module ValueFlow = DataFlow::Global; diff --git a/go/ql/test/library-tests/semmle/go/dataflow/SliceExpressions/Flows.ql b/go/ql/test/library-tests/semmle/go/dataflow/SliceExpressions/Flows.ql index 1b64b928c3ff..31483a02004a 100644 --- a/go/ql/test/library-tests/semmle/go/dataflow/SliceExpressions/Flows.ql +++ b/go/ql/test/library-tests/semmle/go/dataflow/SliceExpressions/Flows.ql @@ -1,5 +1,5 @@ import go import semmle.go.dataflow.ExternalFlow import ModelValidation -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest import DefaultFlowTest diff --git a/go/ql/test/library-tests/semmle/go/dataflow/Switch/DataFlow.ql b/go/ql/test/library-tests/semmle/go/dataflow/Switch/DataFlow.ql index 1b64b928c3ff..31483a02004a 100644 --- a/go/ql/test/library-tests/semmle/go/dataflow/Switch/DataFlow.ql +++ b/go/ql/test/library-tests/semmle/go/dataflow/Switch/DataFlow.ql @@ -1,5 +1,5 @@ import go import semmle.go.dataflow.ExternalFlow import ModelValidation -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest import DefaultFlowTest diff --git a/go/ql/test/library-tests/semmle/go/dataflow/TypeAssertions/DataFlow.ql b/go/ql/test/library-tests/semmle/go/dataflow/TypeAssertions/DataFlow.ql index 1b64b928c3ff..31483a02004a 100644 --- a/go/ql/test/library-tests/semmle/go/dataflow/TypeAssertions/DataFlow.ql +++ b/go/ql/test/library-tests/semmle/go/dataflow/TypeAssertions/DataFlow.ql @@ -1,5 +1,5 @@ import go import semmle.go.dataflow.ExternalFlow import ModelValidation -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest import DefaultFlowTest diff --git a/go/ql/test/library-tests/semmle/go/dataflow/VarArgs/Flows.ql b/go/ql/test/library-tests/semmle/go/dataflow/VarArgs/Flows.ql index 1b64b928c3ff..31483a02004a 100644 --- a/go/ql/test/library-tests/semmle/go/dataflow/VarArgs/Flows.ql +++ b/go/ql/test/library-tests/semmle/go/dataflow/VarArgs/Flows.ql @@ -1,5 +1,5 @@ import go import semmle.go.dataflow.ExternalFlow import ModelValidation -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest import DefaultFlowTest diff --git a/go/ql/test/library-tests/semmle/go/dataflow/VarArgsWithExternalFlow/Flows.ql b/go/ql/test/library-tests/semmle/go/dataflow/VarArgsWithExternalFlow/Flows.ql index 0f0b9dbe22de..873143a6f81c 100644 --- a/go/ql/test/library-tests/semmle/go/dataflow/VarArgsWithExternalFlow/Flows.ql +++ b/go/ql/test/library-tests/semmle/go/dataflow/VarArgsWithExternalFlow/Flows.ql @@ -1,7 +1,7 @@ import go import semmle.go.dataflow.ExternalFlow import ModelValidation -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest module Config implements DataFlow::ConfigSig { predicate isSource(DataFlow::Node source) { diff --git a/go/ql/test/library-tests/semmle/go/dataflow/VarArgsWithFunctionModels/Flows.ql b/go/ql/test/library-tests/semmle/go/dataflow/VarArgsWithFunctionModels/Flows.ql index 22da81845c0e..884e67cfb063 100644 --- a/go/ql/test/library-tests/semmle/go/dataflow/VarArgsWithFunctionModels/Flows.ql +++ b/go/ql/test/library-tests/semmle/go/dataflow/VarArgsWithFunctionModels/Flows.ql @@ -1,7 +1,7 @@ import go import semmle.go.dataflow.ExternalFlow import ModelValidation -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest import DefaultFlowTest class SummaryModelTest extends DataFlow::FunctionModel { diff --git a/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/environment/test.ql b/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/environment/test.ql index eb7ba46508e7..924c655bf655 100644 --- a/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/environment/test.ql +++ b/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/environment/test.ql @@ -1,6 +1,6 @@ import go import ModelValidation -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest module SourceTest implements TestSig { string getARelevantTag() { result = "source" } diff --git a/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/file/test.ql b/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/file/test.ql index eb7ba46508e7..924c655bf655 100644 --- a/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/file/test.ql +++ b/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/file/test.ql @@ -1,6 +1,6 @@ import go import ModelValidation -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest module SourceTest implements TestSig { string getARelevantTag() { result = "source" } diff --git a/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/stdin/source.ql b/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/stdin/source.ql index eb7ba46508e7..924c655bf655 100644 --- a/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/stdin/source.ql +++ b/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/stdin/source.ql @@ -1,6 +1,6 @@ import go import ModelValidation -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest module SourceTest implements TestSig { string getARelevantTag() { result = "source" } diff --git a/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/stdin/test.ql b/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/stdin/test.ql index 5cdebdbc6c93..21c6011abf73 100644 --- a/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/stdin/test.ql +++ b/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/stdin/test.ql @@ -2,7 +2,7 @@ import go import semmle.go.dataflow.ExternalFlow import ModelValidation import experimental.frameworks.CleverGo -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest module Config implements DataFlow::ConfigSig { predicate isSource(DataFlow::Node source) { source instanceof ActiveThreatModelSource } diff --git a/go/ql/test/library-tests/semmle/go/frameworks/Afero/Query.ql b/go/ql/test/library-tests/semmle/go/frameworks/Afero/Query.ql index 9dc570773f54..87ac0330e994 100644 --- a/go/ql/test/library-tests/semmle/go/frameworks/Afero/Query.ql +++ b/go/ql/test/library-tests/semmle/go/frameworks/Afero/Query.ql @@ -1,7 +1,7 @@ import go import semmle.go.dataflow.ExternalFlow import ModelValidation -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest module FileSystemAccessTest implements TestSig { string getARelevantTag() { result = ["FileSystemAccess", "succ", "pred"] } diff --git a/go/ql/test/library-tests/semmle/go/frameworks/AwsLambda/test.ql b/go/ql/test/library-tests/semmle/go/frameworks/AwsLambda/test.ql index 7f1f4dd507b3..6dc2ec686f57 100644 --- a/go/ql/test/library-tests/semmle/go/frameworks/AwsLambda/test.ql +++ b/go/ql/test/library-tests/semmle/go/frameworks/AwsLambda/test.ql @@ -1,7 +1,7 @@ import go import semmle.go.dataflow.ExternalFlow import ModelValidation -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest module Config implements DataFlow::ConfigSig { predicate isSource(DataFlow::Node source) { source instanceof RemoteFlowSource } diff --git a/go/ql/test/library-tests/semmle/go/frameworks/Beego/ReflectedXss.qlref b/go/ql/test/library-tests/semmle/go/frameworks/Beego/ReflectedXss.qlref index 4757f25a8a60..754513d72bb3 100644 --- a/go/ql/test/library-tests/semmle/go/frameworks/Beego/ReflectedXss.qlref +++ b/go/ql/test/library-tests/semmle/go/frameworks/Beego/ReflectedXss.qlref @@ -1,2 +1,2 @@ query: Security/CWE-079/ReflectedXss.ql -postprocess: TestUtilities/PrettyPrintModels.ql +postprocess: utils/test/PrettyPrintModels.ql diff --git a/go/ql/test/library-tests/semmle/go/frameworks/Beego/TaintedPath.qlref b/go/ql/test/library-tests/semmle/go/frameworks/Beego/TaintedPath.qlref index a90879489725..78ce25b1921f 100644 --- a/go/ql/test/library-tests/semmle/go/frameworks/Beego/TaintedPath.qlref +++ b/go/ql/test/library-tests/semmle/go/frameworks/Beego/TaintedPath.qlref @@ -1,2 +1,2 @@ query: Security/CWE-022/TaintedPath.ql -postprocess: TestUtilities/PrettyPrintModels.ql +postprocess: utils/test/PrettyPrintModels.ql diff --git a/go/ql/test/library-tests/semmle/go/frameworks/BeegoOrm/QueryString.ql b/go/ql/test/library-tests/semmle/go/frameworks/BeegoOrm/QueryString.ql index eeb43a82fadd..0d56af8659c4 100644 --- a/go/ql/test/library-tests/semmle/go/frameworks/BeegoOrm/QueryString.ql +++ b/go/ql/test/library-tests/semmle/go/frameworks/BeegoOrm/QueryString.ql @@ -1,7 +1,7 @@ import go import semmle.go.dataflow.ExternalFlow import ModelValidation -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest module SqlTest implements TestSig { string getARelevantTag() { result = "query" } diff --git a/go/ql/test/library-tests/semmle/go/frameworks/BeegoOrm/SqlInjection.qlref b/go/ql/test/library-tests/semmle/go/frameworks/BeegoOrm/SqlInjection.qlref index a971ca30ce5c..b6916bd2cd46 100644 --- a/go/ql/test/library-tests/semmle/go/frameworks/BeegoOrm/SqlInjection.qlref +++ b/go/ql/test/library-tests/semmle/go/frameworks/BeegoOrm/SqlInjection.qlref @@ -1,2 +1,2 @@ query: Security/CWE-089/SqlInjection.ql -postprocess: TestUtilities/PrettyPrintModels.ql +postprocess: utils/test/PrettyPrintModels.ql diff --git a/go/ql/test/library-tests/semmle/go/frameworks/Chi/ReflectedXss.qlref b/go/ql/test/library-tests/semmle/go/frameworks/Chi/ReflectedXss.qlref index 4757f25a8a60..754513d72bb3 100644 --- a/go/ql/test/library-tests/semmle/go/frameworks/Chi/ReflectedXss.qlref +++ b/go/ql/test/library-tests/semmle/go/frameworks/Chi/ReflectedXss.qlref @@ -1,2 +1,2 @@ query: Security/CWE-079/ReflectedXss.ql -postprocess: TestUtilities/PrettyPrintModels.ql +postprocess: utils/test/PrettyPrintModels.ql diff --git a/go/ql/test/library-tests/semmle/go/frameworks/CouchbaseV1/test.ql b/go/ql/test/library-tests/semmle/go/frameworks/CouchbaseV1/test.ql index 2c07f1919a68..da91c22b2dd4 100644 --- a/go/ql/test/library-tests/semmle/go/frameworks/CouchbaseV1/test.ql +++ b/go/ql/test/library-tests/semmle/go/frameworks/CouchbaseV1/test.ql @@ -1,7 +1,7 @@ import go import semmle.go.dataflow.ExternalFlow import ModelValidation -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest import semmle.go.security.SqlInjection module SqlInjectionTest implements TestSig { diff --git a/go/ql/test/library-tests/semmle/go/frameworks/Echo/OpenRedirect.qlref b/go/ql/test/library-tests/semmle/go/frameworks/Echo/OpenRedirect.qlref index 9e216d2b698c..867dd7665618 100644 --- a/go/ql/test/library-tests/semmle/go/frameworks/Echo/OpenRedirect.qlref +++ b/go/ql/test/library-tests/semmle/go/frameworks/Echo/OpenRedirect.qlref @@ -1,2 +1,2 @@ query: Security/CWE-601/OpenUrlRedirect.ql -postprocess: TestUtilities/PrettyPrintModels.ql +postprocess: utils/test/PrettyPrintModels.ql diff --git a/go/ql/test/library-tests/semmle/go/frameworks/Echo/ReflectedXss.qlref b/go/ql/test/library-tests/semmle/go/frameworks/Echo/ReflectedXss.qlref index 4757f25a8a60..754513d72bb3 100644 --- a/go/ql/test/library-tests/semmle/go/frameworks/Echo/ReflectedXss.qlref +++ b/go/ql/test/library-tests/semmle/go/frameworks/Echo/ReflectedXss.qlref @@ -1,2 +1,2 @@ query: Security/CWE-079/ReflectedXss.ql -postprocess: TestUtilities/PrettyPrintModels.ql +postprocess: utils/test/PrettyPrintModels.ql diff --git a/go/ql/test/library-tests/semmle/go/frameworks/Echo/TaintedPath.qlref b/go/ql/test/library-tests/semmle/go/frameworks/Echo/TaintedPath.qlref index a90879489725..78ce25b1921f 100644 --- a/go/ql/test/library-tests/semmle/go/frameworks/Echo/TaintedPath.qlref +++ b/go/ql/test/library-tests/semmle/go/frameworks/Echo/TaintedPath.qlref @@ -1,2 +1,2 @@ query: Security/CWE-022/TaintedPath.ql -postprocess: TestUtilities/PrettyPrintModels.ql +postprocess: utils/test/PrettyPrintModels.ql diff --git a/go/ql/test/library-tests/semmle/go/frameworks/ElazarlGoproxy/test.ql b/go/ql/test/library-tests/semmle/go/frameworks/ElazarlGoproxy/test.ql index 3a07461319ca..a2713304a5d1 100644 --- a/go/ql/test/library-tests/semmle/go/frameworks/ElazarlGoproxy/test.ql +++ b/go/ql/test/library-tests/semmle/go/frameworks/ElazarlGoproxy/test.ql @@ -1,7 +1,7 @@ import go import semmle.go.dataflow.ExternalFlow import ModelValidation -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest module RemoteFlowSourceTest implements TestSig { string getARelevantTag() { result = "remoteflowsource" } diff --git a/go/ql/test/library-tests/semmle/go/frameworks/EvanphxJsonPatch/TaintFlows.ql b/go/ql/test/library-tests/semmle/go/frameworks/EvanphxJsonPatch/TaintFlows.ql index d812e814e3a8..05b36ee6ff6e 100644 --- a/go/ql/test/library-tests/semmle/go/frameworks/EvanphxJsonPatch/TaintFlows.ql +++ b/go/ql/test/library-tests/semmle/go/frameworks/EvanphxJsonPatch/TaintFlows.ql @@ -1,7 +1,7 @@ import go import semmle.go.dataflow.ExternalFlow import ModelValidation -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest module Config implements DataFlow::ConfigSig { predicate isSource(DataFlow::Node source) { diff --git a/go/ql/test/library-tests/semmle/go/frameworks/Fasthttp/AdditionalTaintSteps.ql b/go/ql/test/library-tests/semmle/go/frameworks/Fasthttp/AdditionalTaintSteps.ql index 1b64b928c3ff..31483a02004a 100644 --- a/go/ql/test/library-tests/semmle/go/frameworks/Fasthttp/AdditionalTaintSteps.ql +++ b/go/ql/test/library-tests/semmle/go/frameworks/Fasthttp/AdditionalTaintSteps.ql @@ -1,5 +1,5 @@ import go import semmle.go.dataflow.ExternalFlow import ModelValidation -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest import DefaultFlowTest diff --git a/go/ql/test/library-tests/semmle/go/frameworks/Fasthttp/EscapeFunction.ql b/go/ql/test/library-tests/semmle/go/frameworks/Fasthttp/EscapeFunction.ql index 58dc162eeb89..5c623417dd44 100644 --- a/go/ql/test/library-tests/semmle/go/frameworks/Fasthttp/EscapeFunction.ql +++ b/go/ql/test/library-tests/semmle/go/frameworks/Fasthttp/EscapeFunction.ql @@ -1,5 +1,5 @@ import go -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest module FasthttpTest implements TestSig { string getARelevantTag() { result = "Sanitizer" } diff --git a/go/ql/test/library-tests/semmle/go/frameworks/Fasthttp/FileSystemAccess.ql b/go/ql/test/library-tests/semmle/go/frameworks/Fasthttp/FileSystemAccess.ql index 294d180da966..bce6d70999f0 100644 --- a/go/ql/test/library-tests/semmle/go/frameworks/Fasthttp/FileSystemAccess.ql +++ b/go/ql/test/library-tests/semmle/go/frameworks/Fasthttp/FileSystemAccess.ql @@ -1,5 +1,5 @@ import go -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest module FasthttpFileSystemAccessTest implements TestSig { string getARelevantTag() { result = "FileSystemAccess" } diff --git a/go/ql/test/library-tests/semmle/go/frameworks/Fasthttp/OpenRedirect.ql b/go/ql/test/library-tests/semmle/go/frameworks/Fasthttp/OpenRedirect.ql index 96420b12236d..397ceb5c9f85 100644 --- a/go/ql/test/library-tests/semmle/go/frameworks/Fasthttp/OpenRedirect.ql +++ b/go/ql/test/library-tests/semmle/go/frameworks/Fasthttp/OpenRedirect.ql @@ -1,6 +1,6 @@ import go import semmle.go.security.OpenUrlRedirectCustomizations -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest module FasthttpTest implements TestSig { string getARelevantTag() { result = "OpenRedirect" } diff --git a/go/ql/test/library-tests/semmle/go/frameworks/Fasthttp/RemoteFlowSources.ql b/go/ql/test/library-tests/semmle/go/frameworks/Fasthttp/RemoteFlowSources.ql index 60b62f2bbf48..1adbb0d2f64c 100644 --- a/go/ql/test/library-tests/semmle/go/frameworks/Fasthttp/RemoteFlowSources.ql +++ b/go/ql/test/library-tests/semmle/go/frameworks/Fasthttp/RemoteFlowSources.ql @@ -1,5 +1,5 @@ import go -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest module FasthttpTest implements TestSig { string getARelevantTag() { result = "RemoteFlowSource" } diff --git a/go/ql/test/library-tests/semmle/go/frameworks/Fasthttp/SSRF.ql b/go/ql/test/library-tests/semmle/go/frameworks/Fasthttp/SSRF.ql index 04d7162d77fa..2b43216d6dd0 100644 --- a/go/ql/test/library-tests/semmle/go/frameworks/Fasthttp/SSRF.ql +++ b/go/ql/test/library-tests/semmle/go/frameworks/Fasthttp/SSRF.ql @@ -1,6 +1,6 @@ import go import semmle.go.security.RequestForgery -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest module FasthttpTest implements TestSig { string getARelevantTag() { result = "SsrfSink" } diff --git a/go/ql/test/library-tests/semmle/go/frameworks/Fasthttp/Xss.ql b/go/ql/test/library-tests/semmle/go/frameworks/Fasthttp/Xss.ql index 3040f32036b5..b7ea0ebd8f72 100644 --- a/go/ql/test/library-tests/semmle/go/frameworks/Fasthttp/Xss.ql +++ b/go/ql/test/library-tests/semmle/go/frameworks/Fasthttp/Xss.ql @@ -1,5 +1,5 @@ import go -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest module FasthttpTest implements TestSig { string getARelevantTag() { result = "XssSink" } diff --git a/go/ql/test/library-tests/semmle/go/frameworks/Fiber/Query.ql b/go/ql/test/library-tests/semmle/go/frameworks/Fiber/Query.ql index 5a6ba8d33687..bd11df4db16f 100644 --- a/go/ql/test/library-tests/semmle/go/frameworks/Fiber/Query.ql +++ b/go/ql/test/library-tests/semmle/go/frameworks/Fiber/Query.ql @@ -1,7 +1,7 @@ import go import semmle.go.dataflow.ExternalFlow import ModelValidation -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest module FileSystemAccessTest implements TestSig { string getARelevantTag() { result = "FileSystemAccess" } diff --git a/go/ql/test/library-tests/semmle/go/frameworks/Gin/TaintedPath.qlref b/go/ql/test/library-tests/semmle/go/frameworks/Gin/TaintedPath.qlref index fffd4b2e8bf5..6eb2e94892f2 100644 --- a/go/ql/test/library-tests/semmle/go/frameworks/Gin/TaintedPath.qlref +++ b/go/ql/test/library-tests/semmle/go/frameworks/Gin/TaintedPath.qlref @@ -1,4 +1,4 @@ query: Security/CWE-022/TaintedPath.ql postprocess: - - TestUtilities/PrettyPrintModels.ql - - TestUtilities/InlineExpectationsTestQuery.ql + - utils/test/PrettyPrintModels.ql + - utils/test/InlineExpectationsTestQuery.ql diff --git a/go/ql/test/library-tests/semmle/go/frameworks/GoKit/RemoteFlowSources.ql b/go/ql/test/library-tests/semmle/go/frameworks/GoKit/RemoteFlowSources.ql index bafda6822cae..cc77baf9be3a 100644 --- a/go/ql/test/library-tests/semmle/go/frameworks/GoKit/RemoteFlowSources.ql +++ b/go/ql/test/library-tests/semmle/go/frameworks/GoKit/RemoteFlowSources.ql @@ -1,7 +1,7 @@ import go import semmle.go.dataflow.ExternalFlow import ModelValidation -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest module RemoteFlowSourceTest implements TestSig { string getARelevantTag() { result = "source" } diff --git a/go/ql/test/library-tests/semmle/go/frameworks/GoMicro/gomicro.ql b/go/ql/test/library-tests/semmle/go/frameworks/GoMicro/gomicro.ql index 5275d86e1239..954aff43ad34 100644 --- a/go/ql/test/library-tests/semmle/go/frameworks/GoMicro/gomicro.ql +++ b/go/ql/test/library-tests/semmle/go/frameworks/GoMicro/gomicro.ql @@ -1,7 +1,7 @@ import go import semmle.go.dataflow.ExternalFlow import ModelValidation -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest module GoMicroTest implements TestSig { string getARelevantTag() { result = ["serverRequest", "clientRequest"] } diff --git a/go/ql/test/library-tests/semmle/go/frameworks/Iris/Query.ql b/go/ql/test/library-tests/semmle/go/frameworks/Iris/Query.ql index 5a6ba8d33687..bd11df4db16f 100644 --- a/go/ql/test/library-tests/semmle/go/frameworks/Iris/Query.ql +++ b/go/ql/test/library-tests/semmle/go/frameworks/Iris/Query.ql @@ -1,7 +1,7 @@ import go import semmle.go.dataflow.ExternalFlow import ModelValidation -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest module FileSystemAccessTest implements TestSig { string getARelevantTag() { result = "FileSystemAccess" } diff --git a/go/ql/test/library-tests/semmle/go/frameworks/K8sIoApiCoreV1/TaintFlowsInline.ql b/go/ql/test/library-tests/semmle/go/frameworks/K8sIoApiCoreV1/TaintFlowsInline.ql index 1b64b928c3ff..31483a02004a 100644 --- a/go/ql/test/library-tests/semmle/go/frameworks/K8sIoApiCoreV1/TaintFlowsInline.ql +++ b/go/ql/test/library-tests/semmle/go/frameworks/K8sIoApiCoreV1/TaintFlowsInline.ql @@ -1,5 +1,5 @@ import go import semmle.go.dataflow.ExternalFlow import ModelValidation -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest import DefaultFlowTest diff --git a/go/ql/test/library-tests/semmle/go/frameworks/K8sIoApimachineryPkgRuntime/TaintFlowsInline.ql b/go/ql/test/library-tests/semmle/go/frameworks/K8sIoApimachineryPkgRuntime/TaintFlowsInline.ql index 1b64b928c3ff..31483a02004a 100644 --- a/go/ql/test/library-tests/semmle/go/frameworks/K8sIoApimachineryPkgRuntime/TaintFlowsInline.ql +++ b/go/ql/test/library-tests/semmle/go/frameworks/K8sIoApimachineryPkgRuntime/TaintFlowsInline.ql @@ -1,5 +1,5 @@ import go import semmle.go.dataflow.ExternalFlow import ModelValidation -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest import DefaultFlowTest diff --git a/go/ql/test/library-tests/semmle/go/frameworks/K8sIoClientGo/SecretInterfaceSource.ql b/go/ql/test/library-tests/semmle/go/frameworks/K8sIoClientGo/SecretInterfaceSource.ql index 7455675a5bc4..786b01d6a462 100644 --- a/go/ql/test/library-tests/semmle/go/frameworks/K8sIoClientGo/SecretInterfaceSource.ql +++ b/go/ql/test/library-tests/semmle/go/frameworks/K8sIoClientGo/SecretInterfaceSource.ql @@ -1,7 +1,7 @@ import go import semmle.go.dataflow.ExternalFlow import ModelValidation -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest module K8sIoApimachineryPkgRuntimeTest implements TestSig { string getARelevantTag() { result = "KsIoClientGo" } diff --git a/go/ql/test/library-tests/semmle/go/frameworks/Macaron/Sources.ql b/go/ql/test/library-tests/semmle/go/frameworks/Macaron/Sources.ql index bca82f92fdb8..cde8cc6ea2d6 100644 --- a/go/ql/test/library-tests/semmle/go/frameworks/Macaron/Sources.ql +++ b/go/ql/test/library-tests/semmle/go/frameworks/Macaron/Sources.ql @@ -1,7 +1,7 @@ import go import semmle.go.dataflow.ExternalFlow import ModelValidation -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest module RemoteFlowSourceTest implements TestSig { string getARelevantTag() { result = "RemoteFlowSource" } diff --git a/go/ql/test/library-tests/semmle/go/frameworks/NoSQL/Query.ql b/go/ql/test/library-tests/semmle/go/frameworks/NoSQL/Query.ql index 782c59d96ecd..db8f145d70c4 100644 --- a/go/ql/test/library-tests/semmle/go/frameworks/NoSQL/Query.ql +++ b/go/ql/test/library-tests/semmle/go/frameworks/NoSQL/Query.ql @@ -1,7 +1,7 @@ import go import semmle.go.dataflow.ExternalFlow import ModelValidation -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest module NoSqlQueryTest implements TestSig { string getARelevantTag() { result = "nosqlquery" } diff --git a/go/ql/test/library-tests/semmle/go/frameworks/Protobuf/TaintFlows.ql b/go/ql/test/library-tests/semmle/go/frameworks/Protobuf/TaintFlows.ql index 49d2678fd426..b74bb088291a 100644 --- a/go/ql/test/library-tests/semmle/go/frameworks/Protobuf/TaintFlows.ql +++ b/go/ql/test/library-tests/semmle/go/frameworks/Protobuf/TaintFlows.ql @@ -1,7 +1,7 @@ import go import semmle.go.dataflow.ExternalFlow import ModelValidation -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest module Config implements DataFlow::ConfigSig { predicate isSource(DataFlow::Node source) { diff --git a/go/ql/test/library-tests/semmle/go/frameworks/Revel/OpenRedirect.qlref b/go/ql/test/library-tests/semmle/go/frameworks/Revel/OpenRedirect.qlref index 9e216d2b698c..867dd7665618 100644 --- a/go/ql/test/library-tests/semmle/go/frameworks/Revel/OpenRedirect.qlref +++ b/go/ql/test/library-tests/semmle/go/frameworks/Revel/OpenRedirect.qlref @@ -1,2 +1,2 @@ query: Security/CWE-601/OpenUrlRedirect.ql -postprocess: TestUtilities/PrettyPrintModels.ql +postprocess: utils/test/PrettyPrintModels.ql diff --git a/go/ql/test/library-tests/semmle/go/frameworks/Revel/ReflectedXss.qlref b/go/ql/test/library-tests/semmle/go/frameworks/Revel/ReflectedXss.qlref index 4757f25a8a60..754513d72bb3 100644 --- a/go/ql/test/library-tests/semmle/go/frameworks/Revel/ReflectedXss.qlref +++ b/go/ql/test/library-tests/semmle/go/frameworks/Revel/ReflectedXss.qlref @@ -1,2 +1,2 @@ query: Security/CWE-079/ReflectedXss.ql -postprocess: TestUtilities/PrettyPrintModels.ql +postprocess: utils/test/PrettyPrintModels.ql diff --git a/go/ql/test/library-tests/semmle/go/frameworks/Revel/TaintedPath.qlref b/go/ql/test/library-tests/semmle/go/frameworks/Revel/TaintedPath.qlref index a90879489725..78ce25b1921f 100644 --- a/go/ql/test/library-tests/semmle/go/frameworks/Revel/TaintedPath.qlref +++ b/go/ql/test/library-tests/semmle/go/frameworks/Revel/TaintedPath.qlref @@ -1,2 +1,2 @@ query: Security/CWE-022/TaintedPath.ql -postprocess: TestUtilities/PrettyPrintModels.ql +postprocess: utils/test/PrettyPrintModels.ql diff --git a/go/ql/test/library-tests/semmle/go/frameworks/Revel/test.ql b/go/ql/test/library-tests/semmle/go/frameworks/Revel/test.ql index 6a12f0ebe7cd..2ac3c51c93d1 100644 --- a/go/ql/test/library-tests/semmle/go/frameworks/Revel/test.ql +++ b/go/ql/test/library-tests/semmle/go/frameworks/Revel/test.ql @@ -1,5 +1,5 @@ import go -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest class Sink extends DataFlow::Node { Sink() { diff --git a/go/ql/test/library-tests/semmle/go/frameworks/SQL/Gorm/QueryString.ql b/go/ql/test/library-tests/semmle/go/frameworks/SQL/Gorm/QueryString.ql index eeb43a82fadd..0d56af8659c4 100644 --- a/go/ql/test/library-tests/semmle/go/frameworks/SQL/Gorm/QueryString.ql +++ b/go/ql/test/library-tests/semmle/go/frameworks/SQL/Gorm/QueryString.ql @@ -1,7 +1,7 @@ import go import semmle.go.dataflow.ExternalFlow import ModelValidation -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest module SqlTest implements TestSig { string getARelevantTag() { result = "query" } diff --git a/go/ql/test/library-tests/semmle/go/frameworks/SQL/QueryString.ql b/go/ql/test/library-tests/semmle/go/frameworks/SQL/QueryString.ql index eeb43a82fadd..0d56af8659c4 100644 --- a/go/ql/test/library-tests/semmle/go/frameworks/SQL/QueryString.ql +++ b/go/ql/test/library-tests/semmle/go/frameworks/SQL/QueryString.ql @@ -1,7 +1,7 @@ import go import semmle.go.dataflow.ExternalFlow import ModelValidation -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest module SqlTest implements TestSig { string getARelevantTag() { result = "query" } diff --git a/go/ql/test/library-tests/semmle/go/frameworks/SQL/Sqlx/QueryString.ql b/go/ql/test/library-tests/semmle/go/frameworks/SQL/Sqlx/QueryString.ql index eeb43a82fadd..0d56af8659c4 100644 --- a/go/ql/test/library-tests/semmle/go/frameworks/SQL/Sqlx/QueryString.ql +++ b/go/ql/test/library-tests/semmle/go/frameworks/SQL/Sqlx/QueryString.ql @@ -1,7 +1,7 @@ import go import semmle.go.dataflow.ExternalFlow import ModelValidation -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest module SqlTest implements TestSig { string getARelevantTag() { result = "query" } diff --git a/go/ql/test/library-tests/semmle/go/frameworks/SQL/bun/QueryString.ql b/go/ql/test/library-tests/semmle/go/frameworks/SQL/bun/QueryString.ql index eeb43a82fadd..0d56af8659c4 100644 --- a/go/ql/test/library-tests/semmle/go/frameworks/SQL/bun/QueryString.ql +++ b/go/ql/test/library-tests/semmle/go/frameworks/SQL/bun/QueryString.ql @@ -1,7 +1,7 @@ import go import semmle.go.dataflow.ExternalFlow import ModelValidation -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest module SqlTest implements TestSig { string getARelevantTag() { result = "query" } diff --git a/go/ql/test/library-tests/semmle/go/frameworks/SQL/gogf/QueryString.ql b/go/ql/test/library-tests/semmle/go/frameworks/SQL/gogf/QueryString.ql index eeb43a82fadd..0d56af8659c4 100644 --- a/go/ql/test/library-tests/semmle/go/frameworks/SQL/gogf/QueryString.ql +++ b/go/ql/test/library-tests/semmle/go/frameworks/SQL/gogf/QueryString.ql @@ -1,7 +1,7 @@ import go import semmle.go.dataflow.ExternalFlow import ModelValidation -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest module SqlTest implements TestSig { string getARelevantTag() { result = "query" } diff --git a/go/ql/test/library-tests/semmle/go/frameworks/SQL/gorqlite/QueryString.ql b/go/ql/test/library-tests/semmle/go/frameworks/SQL/gorqlite/QueryString.ql index eeb43a82fadd..0d56af8659c4 100644 --- a/go/ql/test/library-tests/semmle/go/frameworks/SQL/gorqlite/QueryString.ql +++ b/go/ql/test/library-tests/semmle/go/frameworks/SQL/gorqlite/QueryString.ql @@ -1,7 +1,7 @@ import go import semmle.go.dataflow.ExternalFlow import ModelValidation -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest module SqlTest implements TestSig { string getARelevantTag() { result = "query" } diff --git a/go/ql/test/library-tests/semmle/go/frameworks/Spew/TaintFlows.ql b/go/ql/test/library-tests/semmle/go/frameworks/Spew/TaintFlows.ql index a663c7a70f49..d507cfaab1b9 100644 --- a/go/ql/test/library-tests/semmle/go/frameworks/Spew/TaintFlows.ql +++ b/go/ql/test/library-tests/semmle/go/frameworks/Spew/TaintFlows.ql @@ -1,7 +1,7 @@ import go import semmle.go.dataflow.ExternalFlow import ModelValidation -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest module TestConfig implements DataFlow::ConfigSig { predicate isSource(DataFlow::Node source) { diff --git a/go/ql/test/library-tests/semmle/go/frameworks/StdlibTaintFlow/test.ql b/go/ql/test/library-tests/semmle/go/frameworks/StdlibTaintFlow/test.ql index 880b74c09531..3c939a9ccefd 100644 --- a/go/ql/test/library-tests/semmle/go/frameworks/StdlibTaintFlow/test.ql +++ b/go/ql/test/library-tests/semmle/go/frameworks/StdlibTaintFlow/test.ql @@ -1,7 +1,7 @@ import go import semmle.go.dataflow.ExternalFlow import ModelValidation -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest module FileSystemAccessTest implements TestSig { string getARelevantTag() { result = "fsaccess" } diff --git a/go/ql/test/library-tests/semmle/go/frameworks/Twirp/RequestForgery.qlref b/go/ql/test/library-tests/semmle/go/frameworks/Twirp/RequestForgery.qlref index dc5864844ccf..061679da228d 100644 --- a/go/ql/test/library-tests/semmle/go/frameworks/Twirp/RequestForgery.qlref +++ b/go/ql/test/library-tests/semmle/go/frameworks/Twirp/RequestForgery.qlref @@ -1,2 +1,2 @@ query: Security/CWE-918/RequestForgery.ql -postprocess: TestUtilities/PrettyPrintModels.ql +postprocess: utils/test/PrettyPrintModels.ql diff --git a/go/ql/test/library-tests/semmle/go/frameworks/XNetHtml/ReflectedXss.qlref b/go/ql/test/library-tests/semmle/go/frameworks/XNetHtml/ReflectedXss.qlref index 4757f25a8a60..754513d72bb3 100644 --- a/go/ql/test/library-tests/semmle/go/frameworks/XNetHtml/ReflectedXss.qlref +++ b/go/ql/test/library-tests/semmle/go/frameworks/XNetHtml/ReflectedXss.qlref @@ -1,2 +1,2 @@ query: Security/CWE-079/ReflectedXss.ql -postprocess: TestUtilities/PrettyPrintModels.ql +postprocess: utils/test/PrettyPrintModels.ql diff --git a/go/ql/test/library-tests/semmle/go/frameworks/XNetHtml/SqlInjection.qlref b/go/ql/test/library-tests/semmle/go/frameworks/XNetHtml/SqlInjection.qlref index a971ca30ce5c..b6916bd2cd46 100644 --- a/go/ql/test/library-tests/semmle/go/frameworks/XNetHtml/SqlInjection.qlref +++ b/go/ql/test/library-tests/semmle/go/frameworks/XNetHtml/SqlInjection.qlref @@ -1,2 +1,2 @@ query: Security/CWE-089/SqlInjection.ql -postprocess: TestUtilities/PrettyPrintModels.ql +postprocess: utils/test/PrettyPrintModels.ql diff --git a/go/ql/test/library-tests/semmle/go/frameworks/Yaml/tests.ql b/go/ql/test/library-tests/semmle/go/frameworks/Yaml/tests.ql index 82087630b33a..c47d1fee2fa8 100644 --- a/go/ql/test/library-tests/semmle/go/frameworks/Yaml/tests.ql +++ b/go/ql/test/library-tests/semmle/go/frameworks/Yaml/tests.ql @@ -1,7 +1,7 @@ import go import semmle.go.dataflow.ExternalFlow import ModelValidation -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest predicate isYamlFunction(Function f) { f.hasQualifiedName(package("gopkg.in/yaml", ""), _) diff --git a/go/ql/test/library-tests/semmle/go/frameworks/Zap/TaintFlows.ql b/go/ql/test/library-tests/semmle/go/frameworks/Zap/TaintFlows.ql index a1d71b1134f1..91b543f041c8 100644 --- a/go/ql/test/library-tests/semmle/go/frameworks/Zap/TaintFlows.ql +++ b/go/ql/test/library-tests/semmle/go/frameworks/Zap/TaintFlows.ql @@ -1,7 +1,7 @@ import go import semmle.go.dataflow.ExternalFlow import ModelValidation -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest module Config implements DataFlow::ConfigSig { predicate isSource(DataFlow::Node source) { diff --git a/go/ql/test/library-tests/semmle/go/frameworks/gqlgen/gqlgen.ql b/go/ql/test/library-tests/semmle/go/frameworks/gqlgen/gqlgen.ql index 91a53fae3350..c18b117edc4d 100644 --- a/go/ql/test/library-tests/semmle/go/frameworks/gqlgen/gqlgen.ql +++ b/go/ql/test/library-tests/semmle/go/frameworks/gqlgen/gqlgen.ql @@ -1,7 +1,7 @@ import go import semmle.go.dataflow.ExternalFlow import ModelValidation -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest module ResolveParameterTest implements TestSig { string getARelevantTag() { result = "resolverParameter" } diff --git a/go/ql/test/query-tests/InconsistentCode/UnhandledCloseWritableHandle/UnhandledCloseWritableHandle.qlref b/go/ql/test/query-tests/InconsistentCode/UnhandledCloseWritableHandle/UnhandledCloseWritableHandle.qlref index 579e4344e89f..82300c2182c8 100644 --- a/go/ql/test/query-tests/InconsistentCode/UnhandledCloseWritableHandle/UnhandledCloseWritableHandle.qlref +++ b/go/ql/test/query-tests/InconsistentCode/UnhandledCloseWritableHandle/UnhandledCloseWritableHandle.qlref @@ -1,2 +1,2 @@ query: InconsistentCode/UnhandledCloseWritableHandle.ql -postprocess: TestUtilities/PrettyPrintModels.ql +postprocess: utils/test/PrettyPrintModels.ql diff --git a/go/ql/test/query-tests/Security/CWE-020/IncompleteHostnameRegexp/IncompleteHostnameRegexp.qlref b/go/ql/test/query-tests/Security/CWE-020/IncompleteHostnameRegexp/IncompleteHostnameRegexp.qlref index fdf18ea380ad..88d20f52eeed 100644 --- a/go/ql/test/query-tests/Security/CWE-020/IncompleteHostnameRegexp/IncompleteHostnameRegexp.qlref +++ b/go/ql/test/query-tests/Security/CWE-020/IncompleteHostnameRegexp/IncompleteHostnameRegexp.qlref @@ -1,2 +1,2 @@ query: Security/CWE-020/IncompleteHostnameRegexp.ql -postprocess: TestUtilities/PrettyPrintModels.ql +postprocess: utils/test/PrettyPrintModels.ql diff --git a/go/ql/test/query-tests/Security/CWE-022/TaintedPath.qlref b/go/ql/test/query-tests/Security/CWE-022/TaintedPath.qlref index a90879489725..78ce25b1921f 100644 --- a/go/ql/test/query-tests/Security/CWE-022/TaintedPath.qlref +++ b/go/ql/test/query-tests/Security/CWE-022/TaintedPath.qlref @@ -1,2 +1,2 @@ query: Security/CWE-022/TaintedPath.ql -postprocess: TestUtilities/PrettyPrintModels.ql +postprocess: utils/test/PrettyPrintModels.ql diff --git a/go/ql/test/query-tests/Security/CWE-022/UnsafeUnzipSymlink.qlref b/go/ql/test/query-tests/Security/CWE-022/UnsafeUnzipSymlink.qlref index 01c3e4f968ab..a40aa6194e10 100644 --- a/go/ql/test/query-tests/Security/CWE-022/UnsafeUnzipSymlink.qlref +++ b/go/ql/test/query-tests/Security/CWE-022/UnsafeUnzipSymlink.qlref @@ -1,2 +1,2 @@ query: Security/CWE-022/UnsafeUnzipSymlink.ql -postprocess: TestUtilities/PrettyPrintModels.ql +postprocess: utils/test/PrettyPrintModels.ql diff --git a/go/ql/test/query-tests/Security/CWE-022/ZipSlip.qlref b/go/ql/test/query-tests/Security/CWE-022/ZipSlip.qlref index 5601b5782c2e..da30bbaf10df 100644 --- a/go/ql/test/query-tests/Security/CWE-022/ZipSlip.qlref +++ b/go/ql/test/query-tests/Security/CWE-022/ZipSlip.qlref @@ -1,2 +1,2 @@ query: Security/CWE-022/ZipSlip.ql -postprocess: TestUtilities/PrettyPrintModels.ql +postprocess: utils/test/PrettyPrintModels.ql diff --git a/go/ql/test/query-tests/Security/CWE-078/CommandInjection.qlref b/go/ql/test/query-tests/Security/CWE-078/CommandInjection.qlref index 1b0ce561de7e..2b07372975ff 100644 --- a/go/ql/test/query-tests/Security/CWE-078/CommandInjection.qlref +++ b/go/ql/test/query-tests/Security/CWE-078/CommandInjection.qlref @@ -1,2 +1,2 @@ query: Security/CWE-078/CommandInjection.ql -postprocess: TestUtilities/PrettyPrintModels.ql +postprocess: utils/test/PrettyPrintModels.ql diff --git a/go/ql/test/query-tests/Security/CWE-078/StoredCommand.qlref b/go/ql/test/query-tests/Security/CWE-078/StoredCommand.qlref index 16b314cb23b5..92c41892880b 100644 --- a/go/ql/test/query-tests/Security/CWE-078/StoredCommand.qlref +++ b/go/ql/test/query-tests/Security/CWE-078/StoredCommand.qlref @@ -1,2 +1,2 @@ query: Security/CWE-078/StoredCommand.ql -postprocess: TestUtilities/PrettyPrintModels.ql +postprocess: utils/test/PrettyPrintModels.ql diff --git a/go/ql/test/query-tests/Security/CWE-079/ReflectedXss.qlref b/go/ql/test/query-tests/Security/CWE-079/ReflectedXss.qlref index 4757f25a8a60..754513d72bb3 100644 --- a/go/ql/test/query-tests/Security/CWE-079/ReflectedXss.qlref +++ b/go/ql/test/query-tests/Security/CWE-079/ReflectedXss.qlref @@ -1,2 +1,2 @@ query: Security/CWE-079/ReflectedXss.ql -postprocess: TestUtilities/PrettyPrintModels.ql +postprocess: utils/test/PrettyPrintModels.ql diff --git a/go/ql/test/query-tests/Security/CWE-089/SqlInjection.qlref b/go/ql/test/query-tests/Security/CWE-089/SqlInjection.qlref index a971ca30ce5c..b6916bd2cd46 100644 --- a/go/ql/test/query-tests/Security/CWE-089/SqlInjection.qlref +++ b/go/ql/test/query-tests/Security/CWE-089/SqlInjection.qlref @@ -1,2 +1,2 @@ query: Security/CWE-089/SqlInjection.ql -postprocess: TestUtilities/PrettyPrintModels.ql +postprocess: utils/test/PrettyPrintModels.ql diff --git a/go/ql/test/query-tests/Security/CWE-089/StringBreak.qlref b/go/ql/test/query-tests/Security/CWE-089/StringBreak.qlref index 3bfb34269848..45a8c4191347 100644 --- a/go/ql/test/query-tests/Security/CWE-089/StringBreak.qlref +++ b/go/ql/test/query-tests/Security/CWE-089/StringBreak.qlref @@ -1,2 +1,2 @@ query: Security/CWE-089/StringBreak.ql -postprocess: TestUtilities/PrettyPrintModels.ql +postprocess: utils/test/PrettyPrintModels.ql diff --git a/go/ql/test/query-tests/Security/CWE-117/LogInjectionTest.ql b/go/ql/test/query-tests/Security/CWE-117/LogInjectionTest.ql index 07c183d20f57..7c5ac3864b95 100644 --- a/go/ql/test/query-tests/Security/CWE-117/LogInjectionTest.ql +++ b/go/ql/test/query-tests/Security/CWE-117/LogInjectionTest.ql @@ -1,6 +1,6 @@ import go import semmle.go.dataflow.ExternalFlow import ModelValidation -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest import semmle.go.security.LogInjection import TaintFlowTest diff --git a/go/ql/test/query-tests/Security/CWE-190/AllocationSizeOverflow.qlref b/go/ql/test/query-tests/Security/CWE-190/AllocationSizeOverflow.qlref index 35320510b628..f6da9bc1c36d 100644 --- a/go/ql/test/query-tests/Security/CWE-190/AllocationSizeOverflow.qlref +++ b/go/ql/test/query-tests/Security/CWE-190/AllocationSizeOverflow.qlref @@ -1,2 +1,2 @@ query: Security/CWE-190/AllocationSizeOverflow.ql -postprocess: TestUtilities/PrettyPrintModels.ql +postprocess: utils/test/PrettyPrintModels.ql diff --git a/go/ql/test/query-tests/Security/CWE-312/CleartextLogging.qlref b/go/ql/test/query-tests/Security/CWE-312/CleartextLogging.qlref index 6319a0708c48..b540e0ddc002 100644 --- a/go/ql/test/query-tests/Security/CWE-312/CleartextLogging.qlref +++ b/go/ql/test/query-tests/Security/CWE-312/CleartextLogging.qlref @@ -1,2 +1,2 @@ query: Security/CWE-312/CleartextLogging.ql -postprocess: TestUtilities/PrettyPrintModels.ql +postprocess: utils/test/PrettyPrintModels.ql diff --git a/go/ql/test/query-tests/Security/CWE-327/UnsafeTLS.qlref b/go/ql/test/query-tests/Security/CWE-327/UnsafeTLS.qlref index 12fc777377dd..0349f62f26fa 100644 --- a/go/ql/test/query-tests/Security/CWE-327/UnsafeTLS.qlref +++ b/go/ql/test/query-tests/Security/CWE-327/UnsafeTLS.qlref @@ -1,2 +1,2 @@ query: Security/CWE-327/InsecureTLS.ql -postprocess: TestUtilities/PrettyPrintModels.ql +postprocess: utils/test/PrettyPrintModels.ql diff --git a/go/ql/test/query-tests/Security/CWE-338/InsecureRandomness/InsecureRandomness.qlref b/go/ql/test/query-tests/Security/CWE-338/InsecureRandomness/InsecureRandomness.qlref index af948f98da4b..b30e6ede8ceb 100644 --- a/go/ql/test/query-tests/Security/CWE-338/InsecureRandomness/InsecureRandomness.qlref +++ b/go/ql/test/query-tests/Security/CWE-338/InsecureRandomness/InsecureRandomness.qlref @@ -1,2 +1,2 @@ query: Security/CWE-338/InsecureRandomness.ql -postprocess: TestUtilities/PrettyPrintModels.ql +postprocess: utils/test/PrettyPrintModels.ql diff --git a/go/ql/test/query-tests/Security/CWE-347/MissingJwtSignatureCheck.qlref b/go/ql/test/query-tests/Security/CWE-347/MissingJwtSignatureCheck.qlref index 28df7a8b2011..404fe618edc8 100644 --- a/go/ql/test/query-tests/Security/CWE-347/MissingJwtSignatureCheck.qlref +++ b/go/ql/test/query-tests/Security/CWE-347/MissingJwtSignatureCheck.qlref @@ -1,2 +1,2 @@ query: Security/CWE-347/MissingJwtSignatureCheck.ql -postprocess: TestUtilities/PrettyPrintModels.ql +postprocess: utils/test/PrettyPrintModels.ql diff --git a/go/ql/test/query-tests/Security/CWE-601/BadRedirectCheck/BadRedirectCheck.qlref b/go/ql/test/query-tests/Security/CWE-601/BadRedirectCheck/BadRedirectCheck.qlref index fc0e3cc7ccd2..fddee377510d 100644 --- a/go/ql/test/query-tests/Security/CWE-601/BadRedirectCheck/BadRedirectCheck.qlref +++ b/go/ql/test/query-tests/Security/CWE-601/BadRedirectCheck/BadRedirectCheck.qlref @@ -1,2 +1,2 @@ query: Security/CWE-601/BadRedirectCheck.ql -postprocess: TestUtilities/PrettyPrintModels.ql +postprocess: utils/test/PrettyPrintModels.ql diff --git a/go/ql/test/query-tests/Security/CWE-601/OpenUrlRedirect/OpenUrlRedirect.qlref b/go/ql/test/query-tests/Security/CWE-601/OpenUrlRedirect/OpenUrlRedirect.qlref index 9e216d2b698c..867dd7665618 100644 --- a/go/ql/test/query-tests/Security/CWE-601/OpenUrlRedirect/OpenUrlRedirect.qlref +++ b/go/ql/test/query-tests/Security/CWE-601/OpenUrlRedirect/OpenUrlRedirect.qlref @@ -1,2 +1,2 @@ query: Security/CWE-601/OpenUrlRedirect.ql -postprocess: TestUtilities/PrettyPrintModels.ql +postprocess: utils/test/PrettyPrintModels.ql diff --git a/go/ql/test/query-tests/Security/CWE-640/EmailInjection.qlref b/go/ql/test/query-tests/Security/CWE-640/EmailInjection.qlref index 9edc26ac25a0..c3b6cac31133 100644 --- a/go/ql/test/query-tests/Security/CWE-640/EmailInjection.qlref +++ b/go/ql/test/query-tests/Security/CWE-640/EmailInjection.qlref @@ -1,2 +1,2 @@ query: Security/CWE-640/EmailInjection.ql -postprocess: TestUtilities/PrettyPrintModels.ql +postprocess: utils/test/PrettyPrintModels.ql diff --git a/go/ql/test/query-tests/Security/CWE-643/XPathInjection.qlref b/go/ql/test/query-tests/Security/CWE-643/XPathInjection.qlref index 578c6c53e9e7..e6a07d4a6886 100644 --- a/go/ql/test/query-tests/Security/CWE-643/XPathInjection.qlref +++ b/go/ql/test/query-tests/Security/CWE-643/XPathInjection.qlref @@ -1,2 +1,2 @@ query: Security/CWE-643/XPathInjection.ql -postprocess: TestUtilities/PrettyPrintModels.ql +postprocess: utils/test/PrettyPrintModels.ql diff --git a/go/ql/test/query-tests/Security/CWE-681/IncorrectIntegerConversion.ql b/go/ql/test/query-tests/Security/CWE-681/IncorrectIntegerConversion.ql index b99b51702a2e..9c9a00e825a6 100644 --- a/go/ql/test/query-tests/Security/CWE-681/IncorrectIntegerConversion.ql +++ b/go/ql/test/query-tests/Security/CWE-681/IncorrectIntegerConversion.ql @@ -1,7 +1,7 @@ import go import semmle.go.dataflow.ExternalFlow import ModelValidation -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest import semmle.go.security.IncorrectIntegerConversionLib module TestIncorrectIntegerConversion implements TestSig { diff --git a/go/ql/test/query-tests/Security/CWE-770/UncontrolledAllocationSize.ql b/go/ql/test/query-tests/Security/CWE-770/UncontrolledAllocationSize.ql index 60b3f945e07a..de10220d7e35 100644 --- a/go/ql/test/query-tests/Security/CWE-770/UncontrolledAllocationSize.ql +++ b/go/ql/test/query-tests/Security/CWE-770/UncontrolledAllocationSize.ql @@ -2,5 +2,5 @@ import go import semmle.go.dataflow.ExternalFlow import ModelValidation import semmle.go.security.UncontrolledAllocationSize -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest import FlowTest diff --git a/go/ql/test/query-tests/Security/CWE-918/RequestForgery.qlref b/go/ql/test/query-tests/Security/CWE-918/RequestForgery.qlref index dc5864844ccf..061679da228d 100644 --- a/go/ql/test/query-tests/Security/CWE-918/RequestForgery.qlref +++ b/go/ql/test/query-tests/Security/CWE-918/RequestForgery.qlref @@ -1,2 +1,2 @@ query: Security/CWE-918/RequestForgery.ql -postprocess: TestUtilities/PrettyPrintModels.ql +postprocess: utils/test/PrettyPrintModels.ql From 0f146f1486da9b6cfdaf724bbeb65f13f742a817 Mon Sep 17 00:00:00 2001 From: Michael Nebel Date: Wed, 11 Dec 2024 13:13:44 +0100 Subject: [PATCH 11/24] Javascript: Move test utilities into the query pack. --- .../testUtilities => src/utils/test}/ConsistencyChecking.qll | 0 .../testUtilities => src/utils/test}/InlineExpectationsTest.qll | 0 .../utils/test}/InlineExpectationsTestQuery.ql | 0 .../utils/test}/internal/InlineExpectationsTestImpl.qll | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename javascript/ql/{test/testUtilities => src/utils/test}/ConsistencyChecking.qll (100%) rename javascript/ql/{test/testUtilities => src/utils/test}/InlineExpectationsTest.qll (100%) rename javascript/ql/{test/testUtilities => src/utils/test}/InlineExpectationsTestQuery.ql (100%) rename javascript/ql/{test/testUtilities => src/utils/test}/internal/InlineExpectationsTestImpl.qll (100%) diff --git a/javascript/ql/test/testUtilities/ConsistencyChecking.qll b/javascript/ql/src/utils/test/ConsistencyChecking.qll similarity index 100% rename from javascript/ql/test/testUtilities/ConsistencyChecking.qll rename to javascript/ql/src/utils/test/ConsistencyChecking.qll diff --git a/javascript/ql/test/testUtilities/InlineExpectationsTest.qll b/javascript/ql/src/utils/test/InlineExpectationsTest.qll similarity index 100% rename from javascript/ql/test/testUtilities/InlineExpectationsTest.qll rename to javascript/ql/src/utils/test/InlineExpectationsTest.qll diff --git a/javascript/ql/test/testUtilities/InlineExpectationsTestQuery.ql b/javascript/ql/src/utils/test/InlineExpectationsTestQuery.ql similarity index 100% rename from javascript/ql/test/testUtilities/InlineExpectationsTestQuery.ql rename to javascript/ql/src/utils/test/InlineExpectationsTestQuery.ql diff --git a/javascript/ql/test/testUtilities/internal/InlineExpectationsTestImpl.qll b/javascript/ql/src/utils/test/internal/InlineExpectationsTestImpl.qll similarity index 100% rename from javascript/ql/test/testUtilities/internal/InlineExpectationsTestImpl.qll rename to javascript/ql/src/utils/test/internal/InlineExpectationsTestImpl.qll From c3fe3e468c0b2d522284bb2eceda66a04d8914af Mon Sep 17 00:00:00 2001 From: Michael Nebel Date: Wed, 11 Dec 2024 13:19:21 +0100 Subject: [PATCH 12/24] Javascript: Update all test util paths to point to the new location. --- .../ql/test/library-tests/EndpointNaming/EndpointNaming.ql | 2 +- javascript/ql/test/library-tests/Generators/DataFlow.ql | 2 +- javascript/ql/test/library-tests/Routing/test.ql | 2 +- .../test/library-tests/Security/heuristics/HeuristicSource.ql | 2 +- javascript/ql/test/library-tests/frameworks/Nest/Consistency.ql | 2 +- javascript/ql/test/library-tests/frameworks/Vuex/test.ql | 2 +- javascript/ql/test/library-tests/frameworks/data/test.ql | 2 +- .../ql/test/library-tests/threat-models/sources/TestSources.ql | 2 +- .../query-tests/Security/CWE-022/TaintedPath/Consistency.ql | 2 +- javascript/ql/test/query-tests/Security/CWE-073/Consistency.ql | 2 +- javascript/ql/test/query-tests/Security/CWE-078/Consistency.ql | 2 +- .../Security/CWE-079/DomBasedXss/ConsistencyDomBasedXss.ql | 2 +- .../Security/CWE-079/ExceptionXss/ConsistencyExceptionXss.ql | 2 +- .../Security/CWE-079/ReflectedXss/ConsistencyReflectedXss.ql | 2 +- .../Security/CWE-079/StoredXss/ConsistencyStoredXss.ql | 2 +- .../UnsafeHtmlConstruction/ConsistencyUnsafeHtmlConstruction.ql | 2 +- .../CWE-079/UnsafeJQueryPlugin/ConsistencyUnsafeJQueryPlugin.ql | 2 +- .../Security/CWE-079/XssThroughDom/ConsistencyXssThroughDom.ql | 2 +- .../ql/test/query-tests/Security/CWE-089/untyped/Consistency.ql | 2 +- javascript/ql/test/query-tests/Security/CWE-502/Consistency.ql | 2 +- javascript/ql/test/query-tests/Security/CWE-611/Xxe.qlref | 2 +- .../Security/CWE-770/ResourceExhaustion/Consistency.ql | 2 +- .../CWE-915/PrototypePollutingAssignment/Consistency.ql | 2 +- javascript/ql/test/query-tests/Security/CWE-918/Consistency.ql | 2 +- 24 files changed, 24 insertions(+), 24 deletions(-) diff --git a/javascript/ql/test/library-tests/EndpointNaming/EndpointNaming.ql b/javascript/ql/test/library-tests/EndpointNaming/EndpointNaming.ql index 631fdf4b0b13..1a18d7888608 100644 --- a/javascript/ql/test/library-tests/EndpointNaming/EndpointNaming.ql +++ b/javascript/ql/test/library-tests/EndpointNaming/EndpointNaming.ql @@ -2,7 +2,7 @@ import javascript import semmle.javascript.RestrictedLocations import semmle.javascript.Lines import semmle.javascript.endpoints.EndpointNaming as EndpointNaming -import testUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest import EndpointNaming::Debug private predicate isIgnored(DataFlow::FunctionNode function) { diff --git a/javascript/ql/test/library-tests/Generators/DataFlow.ql b/javascript/ql/test/library-tests/Generators/DataFlow.ql index 023c60ff8533..8097cf6063a8 100644 --- a/javascript/ql/test/library-tests/Generators/DataFlow.ql +++ b/javascript/ql/test/library-tests/Generators/DataFlow.ql @@ -1,5 +1,5 @@ import javascript -import testUtilities.ConsistencyChecking +import utils.test.ConsistencyChecking class GeneratorFlowConfig extends DataFlow::Configuration { GeneratorFlowConfig() { this = "GeneratorFlowConfig" } diff --git a/javascript/ql/test/library-tests/Routing/test.ql b/javascript/ql/test/library-tests/Routing/test.ql index b427f710894a..f28456a86ead 100644 --- a/javascript/ql/test/library-tests/Routing/test.ql +++ b/javascript/ql/test/library-tests/Routing/test.ql @@ -1,5 +1,5 @@ import javascript -import testUtilities.ConsistencyChecking +import utils.test.ConsistencyChecking API::Node testInstance() { result = API::moduleImport("@example/test").getInstance() } diff --git a/javascript/ql/test/library-tests/Security/heuristics/HeuristicSource.ql b/javascript/ql/test/library-tests/Security/heuristics/HeuristicSource.ql index 72d94707e6bf..af68a747833d 100644 --- a/javascript/ql/test/library-tests/Security/heuristics/HeuristicSource.ql +++ b/javascript/ql/test/library-tests/Security/heuristics/HeuristicSource.ql @@ -1,6 +1,6 @@ import javascript private import semmle.javascript.heuristics.AdditionalSources -import testUtilities.ConsistencyChecking +import utils.test.ConsistencyChecking class Taint extends TaintTracking::Configuration { Taint() { this = "Taint" } diff --git a/javascript/ql/test/library-tests/frameworks/Nest/Consistency.ql b/javascript/ql/test/library-tests/frameworks/Nest/Consistency.ql index e96cbc4b70f7..45180e70a5f5 100644 --- a/javascript/ql/test/library-tests/frameworks/Nest/Consistency.ql +++ b/javascript/ql/test/library-tests/frameworks/Nest/Consistency.ql @@ -1,3 +1,3 @@ -import testUtilities.ConsistencyChecking +import utils.test.ConsistencyChecking import semmle.javascript.security.dataflow.ReflectedXssQuery as ReflectedXss import semmle.javascript.security.dataflow.ServerSideUrlRedirectQuery as ServerSideUrlRedirect diff --git a/javascript/ql/test/library-tests/frameworks/Vuex/test.ql b/javascript/ql/test/library-tests/frameworks/Vuex/test.ql index 55464dcf72cf..2a3b4d4270b4 100644 --- a/javascript/ql/test/library-tests/frameworks/Vuex/test.ql +++ b/javascript/ql/test/library-tests/frameworks/Vuex/test.ql @@ -1,5 +1,5 @@ import javascript -import testUtilities.ConsistencyChecking +import utils.test.ConsistencyChecking class BasicTaint extends TaintTracking::Configuration { BasicTaint() { this = "BasicTaint" } diff --git a/javascript/ql/test/library-tests/frameworks/data/test.ql b/javascript/ql/test/library-tests/frameworks/data/test.ql index cca38c286429..c26e59cd5fee 100644 --- a/javascript/ql/test/library-tests/frameworks/data/test.ql +++ b/javascript/ql/test/library-tests/frameworks/data/test.ql @@ -1,5 +1,5 @@ import javascript -import testUtilities.ConsistencyChecking +import utils.test.ConsistencyChecking import semmle.javascript.frameworks.data.internal.ApiGraphModels as ApiGraphModels class TypeModelFromCodeQL extends ModelInput::TypeModel { diff --git a/javascript/ql/test/library-tests/threat-models/sources/TestSources.ql b/javascript/ql/test/library-tests/threat-models/sources/TestSources.ql index 3dc112c487ec..38a2d20696f8 100644 --- a/javascript/ql/test/library-tests/threat-models/sources/TestSources.ql +++ b/javascript/ql/test/library-tests/threat-models/sources/TestSources.ql @@ -1,5 +1,5 @@ import javascript -import testUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest class TestSourcesConfiguration extends TaintTracking::Configuration { TestSourcesConfiguration() { this = "TestSources" } diff --git a/javascript/ql/test/query-tests/Security/CWE-022/TaintedPath/Consistency.ql b/javascript/ql/test/query-tests/Security/CWE-022/TaintedPath/Consistency.ql index d5230981801c..e73494a1cd2b 100644 --- a/javascript/ql/test/query-tests/Security/CWE-022/TaintedPath/Consistency.ql +++ b/javascript/ql/test/query-tests/Security/CWE-022/TaintedPath/Consistency.ql @@ -1,3 +1,3 @@ import javascript import semmle.javascript.security.dataflow.TaintedPathQuery -import testUtilities.ConsistencyChecking +import utils.test.ConsistencyChecking diff --git a/javascript/ql/test/query-tests/Security/CWE-073/Consistency.ql b/javascript/ql/test/query-tests/Security/CWE-073/Consistency.ql index 17260e5daa08..b873bdf9d3e8 100644 --- a/javascript/ql/test/query-tests/Security/CWE-073/Consistency.ql +++ b/javascript/ql/test/query-tests/Security/CWE-073/Consistency.ql @@ -1,3 +1,3 @@ import javascript import semmle.javascript.security.dataflow.TemplateObjectInjectionQuery -import testUtilities.ConsistencyChecking +import utils.test.ConsistencyChecking diff --git a/javascript/ql/test/query-tests/Security/CWE-078/Consistency.ql b/javascript/ql/test/query-tests/Security/CWE-078/Consistency.ql index c48af1a7971d..809ac986edc5 100644 --- a/javascript/ql/test/query-tests/Security/CWE-078/Consistency.ql +++ b/javascript/ql/test/query-tests/Security/CWE-078/Consistency.ql @@ -1,5 +1,5 @@ import javascript -import testUtilities.ConsistencyChecking +import utils.test.ConsistencyChecking import semmle.javascript.security.dataflow.CommandInjectionQuery as CommandInjection import semmle.javascript.security.dataflow.IndirectCommandInjectionQuery as IndirectCommandInjection import semmle.javascript.security.dataflow.ShellCommandInjectionFromEnvironmentQuery as ShellCommandInjectionFromEnvironment diff --git a/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/ConsistencyDomBasedXss.ql b/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/ConsistencyDomBasedXss.ql index 639a895263a0..f2ed63384947 100644 --- a/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/ConsistencyDomBasedXss.ql +++ b/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/ConsistencyDomBasedXss.ql @@ -1,3 +1,3 @@ import javascript -import testUtilities.ConsistencyChecking +import utils.test.ConsistencyChecking import semmle.javascript.security.dataflow.DomBasedXssQuery as DomXss diff --git a/javascript/ql/test/query-tests/Security/CWE-079/ExceptionXss/ConsistencyExceptionXss.ql b/javascript/ql/test/query-tests/Security/CWE-079/ExceptionXss/ConsistencyExceptionXss.ql index 5b40a626e4ab..f70cc2b0a767 100644 --- a/javascript/ql/test/query-tests/Security/CWE-079/ExceptionXss/ConsistencyExceptionXss.ql +++ b/javascript/ql/test/query-tests/Security/CWE-079/ExceptionXss/ConsistencyExceptionXss.ql @@ -1,3 +1,3 @@ import javascript -import testUtilities.ConsistencyChecking +import utils.test.ConsistencyChecking import semmle.javascript.security.dataflow.ExceptionXssQuery as ExceptionXss diff --git a/javascript/ql/test/query-tests/Security/CWE-079/ReflectedXss/ConsistencyReflectedXss.ql b/javascript/ql/test/query-tests/Security/CWE-079/ReflectedXss/ConsistencyReflectedXss.ql index 3200271daa60..f79f85c593d7 100644 --- a/javascript/ql/test/query-tests/Security/CWE-079/ReflectedXss/ConsistencyReflectedXss.ql +++ b/javascript/ql/test/query-tests/Security/CWE-079/ReflectedXss/ConsistencyReflectedXss.ql @@ -1,3 +1,3 @@ import javascript -import testUtilities.ConsistencyChecking +import utils.test.ConsistencyChecking import semmle.javascript.security.dataflow.ReflectedXssQuery as ReflectedXss diff --git a/javascript/ql/test/query-tests/Security/CWE-079/StoredXss/ConsistencyStoredXss.ql b/javascript/ql/test/query-tests/Security/CWE-079/StoredXss/ConsistencyStoredXss.ql index c75dbb17b71c..9fe83ca3c4c7 100644 --- a/javascript/ql/test/query-tests/Security/CWE-079/StoredXss/ConsistencyStoredXss.ql +++ b/javascript/ql/test/query-tests/Security/CWE-079/StoredXss/ConsistencyStoredXss.ql @@ -1,3 +1,3 @@ import javascript -import testUtilities.ConsistencyChecking +import utils.test.ConsistencyChecking import semmle.javascript.security.dataflow.StoredXssQuery as StoredXss diff --git a/javascript/ql/test/query-tests/Security/CWE-079/UnsafeHtmlConstruction/ConsistencyUnsafeHtmlConstruction.ql b/javascript/ql/test/query-tests/Security/CWE-079/UnsafeHtmlConstruction/ConsistencyUnsafeHtmlConstruction.ql index f09744a4d6ca..5270467483c0 100644 --- a/javascript/ql/test/query-tests/Security/CWE-079/UnsafeHtmlConstruction/ConsistencyUnsafeHtmlConstruction.ql +++ b/javascript/ql/test/query-tests/Security/CWE-079/UnsafeHtmlConstruction/ConsistencyUnsafeHtmlConstruction.ql @@ -1,3 +1,3 @@ import javascript -import testUtilities.ConsistencyChecking +import utils.test.ConsistencyChecking import semmle.javascript.security.dataflow.UnsafeHtmlConstructionQuery as UnsafeHtmlConstruction diff --git a/javascript/ql/test/query-tests/Security/CWE-079/UnsafeJQueryPlugin/ConsistencyUnsafeJQueryPlugin.ql b/javascript/ql/test/query-tests/Security/CWE-079/UnsafeJQueryPlugin/ConsistencyUnsafeJQueryPlugin.ql index b77df2a8d670..9fcb24877418 100644 --- a/javascript/ql/test/query-tests/Security/CWE-079/UnsafeJQueryPlugin/ConsistencyUnsafeJQueryPlugin.ql +++ b/javascript/ql/test/query-tests/Security/CWE-079/UnsafeJQueryPlugin/ConsistencyUnsafeJQueryPlugin.ql @@ -1,3 +1,3 @@ import javascript -import testUtilities.ConsistencyChecking +import utils.test.ConsistencyChecking import semmle.javascript.security.dataflow.UnsafeJQueryPluginQuery as UnsafeJqueryPlugin diff --git a/javascript/ql/test/query-tests/Security/CWE-079/XssThroughDom/ConsistencyXssThroughDom.ql b/javascript/ql/test/query-tests/Security/CWE-079/XssThroughDom/ConsistencyXssThroughDom.ql index 75416d5a0dc2..c2d1847ae9f1 100644 --- a/javascript/ql/test/query-tests/Security/CWE-079/XssThroughDom/ConsistencyXssThroughDom.ql +++ b/javascript/ql/test/query-tests/Security/CWE-079/XssThroughDom/ConsistencyXssThroughDom.ql @@ -1,3 +1,3 @@ import javascript -import testUtilities.ConsistencyChecking +import utils.test.ConsistencyChecking import semmle.javascript.security.dataflow.XssThroughDomQuery as ThroughDomXss diff --git a/javascript/ql/test/query-tests/Security/CWE-089/untyped/Consistency.ql b/javascript/ql/test/query-tests/Security/CWE-089/untyped/Consistency.ql index bd24059f31c3..c34ac544920a 100644 --- a/javascript/ql/test/query-tests/Security/CWE-089/untyped/Consistency.ql +++ b/javascript/ql/test/query-tests/Security/CWE-089/untyped/Consistency.ql @@ -1,4 +1,4 @@ import javascript -import testUtilities.ConsistencyChecking +import utils.test.ConsistencyChecking import semmle.javascript.security.dataflow.SqlInjectionQuery as SqlInjection import semmle.javascript.security.dataflow.NosqlInjectionQuery as NosqlInjection diff --git a/javascript/ql/test/query-tests/Security/CWE-502/Consistency.ql b/javascript/ql/test/query-tests/Security/CWE-502/Consistency.ql index 410d56326ef7..8658a31e95b1 100644 --- a/javascript/ql/test/query-tests/Security/CWE-502/Consistency.ql +++ b/javascript/ql/test/query-tests/Security/CWE-502/Consistency.ql @@ -1,3 +1,3 @@ import javascript import semmle.javascript.security.dataflow.UnsafeDeserializationQuery -import testUtilities.ConsistencyChecking +import utils.test.ConsistencyChecking diff --git a/javascript/ql/test/query-tests/Security/CWE-611/Xxe.qlref b/javascript/ql/test/query-tests/Security/CWE-611/Xxe.qlref index 38e346c1a8b2..9473e8620152 100644 --- a/javascript/ql/test/query-tests/Security/CWE-611/Xxe.qlref +++ b/javascript/ql/test/query-tests/Security/CWE-611/Xxe.qlref @@ -1,2 +1,2 @@ query: Security/CWE-611/Xxe.ql -postprocess: testUtilities/InlineExpectationsTestQuery.ql \ No newline at end of file +postprocess: utils/test/InlineExpectationsTestQuery.ql diff --git a/javascript/ql/test/query-tests/Security/CWE-770/ResourceExhaustion/Consistency.ql b/javascript/ql/test/query-tests/Security/CWE-770/ResourceExhaustion/Consistency.ql index 5742c3e1fea7..db615e52d1e6 100644 --- a/javascript/ql/test/query-tests/Security/CWE-770/ResourceExhaustion/Consistency.ql +++ b/javascript/ql/test/query-tests/Security/CWE-770/ResourceExhaustion/Consistency.ql @@ -1,3 +1,3 @@ import javascript import semmle.javascript.security.dataflow.ResourceExhaustionQuery -import testUtilities.ConsistencyChecking +import utils.test.ConsistencyChecking diff --git a/javascript/ql/test/query-tests/Security/CWE-915/PrototypePollutingAssignment/Consistency.ql b/javascript/ql/test/query-tests/Security/CWE-915/PrototypePollutingAssignment/Consistency.ql index 7a440ac58bba..f4aa73f75d91 100644 --- a/javascript/ql/test/query-tests/Security/CWE-915/PrototypePollutingAssignment/Consistency.ql +++ b/javascript/ql/test/query-tests/Security/CWE-915/PrototypePollutingAssignment/Consistency.ql @@ -1,5 +1,5 @@ import javascript -import testUtilities.ConsistencyChecking +import utils.test.ConsistencyChecking import semmle.javascript.security.dataflow.PrototypePollutingAssignmentQuery class Config extends ConsistencyConfiguration, Configuration { diff --git a/javascript/ql/test/query-tests/Security/CWE-918/Consistency.ql b/javascript/ql/test/query-tests/Security/CWE-918/Consistency.ql index 7950d897e8fa..3856890bc630 100644 --- a/javascript/ql/test/query-tests/Security/CWE-918/Consistency.ql +++ b/javascript/ql/test/query-tests/Security/CWE-918/Consistency.ql @@ -1,7 +1,7 @@ import javascript import semmle.javascript.security.dataflow.RequestForgeryQuery as RequestForgery import semmle.javascript.security.dataflow.ClientSideRequestForgeryQuery as ClientSideRequestForgery -import testUtilities.ConsistencyChecking +import utils.test.ConsistencyChecking query predicate resultInWrongFile(DataFlow::Node node) { exists(DataFlow::Configuration cfg, string filePattern | From 1490400ab01a944e2862d6dc3aef989f0179e53a Mon Sep 17 00:00:00 2001 From: Michael Nebel Date: Wed, 11 Dec 2024 13:20:41 +0100 Subject: [PATCH 13/24] Python: Move test utilities into the query pack. --- .../TestUtilities => src/utils/test}/InlineExpectationsTest.qll | 0 .../utils/test}/InlineExpectationsTestQuery.ql | 0 .../ql/{test/TestUtilities => src/utils/test}/VerifyApiGraphs.qll | 0 .../utils/test}/dataflow/DataflowQueryTest.qll | 0 .../{test/TestUtilities => src/utils/test}/dataflow/FlowTest.qll | 0 .../utils/test}/dataflow/LocalFlowStepTest.qll | 0 .../TestUtilities => src/utils/test}/dataflow/MaximalFlowTest.qll | 0 .../utils/test}/dataflow/NormalDataflowTest.qll | 0 .../utils/test}/dataflow/NormalTaintTrackingTest.qll | 0 .../TestUtilities => src/utils/test}/dataflow/RoutingTest.qll | 0 .../TestUtilities => src/utils/test}/dataflow/UnresolvedCalls.qll | 0 .../TestUtilities => src/utils/test}/dataflow/callGraphConfig.qll | 0 .../TestUtilities => src/utils/test}/dataflow/testConfig.qll | 0 .../TestUtilities => src/utils/test}/dataflow/testTaintConfig.qll | 0 .../utils/test}/internal/InlineExpectationsTestImpl.qll | 0 15 files changed, 0 insertions(+), 0 deletions(-) rename python/ql/{test/TestUtilities => src/utils/test}/InlineExpectationsTest.qll (100%) rename python/ql/{test/TestUtilities => src/utils/test}/InlineExpectationsTestQuery.ql (100%) rename python/ql/{test/TestUtilities => src/utils/test}/VerifyApiGraphs.qll (100%) rename python/ql/{test/TestUtilities => src/utils/test}/dataflow/DataflowQueryTest.qll (100%) rename python/ql/{test/TestUtilities => src/utils/test}/dataflow/FlowTest.qll (100%) rename python/ql/{test/TestUtilities => src/utils/test}/dataflow/LocalFlowStepTest.qll (100%) rename python/ql/{test/TestUtilities => src/utils/test}/dataflow/MaximalFlowTest.qll (100%) rename python/ql/{test/TestUtilities => src/utils/test}/dataflow/NormalDataflowTest.qll (100%) rename python/ql/{test/TestUtilities => src/utils/test}/dataflow/NormalTaintTrackingTest.qll (100%) rename python/ql/{test/TestUtilities => src/utils/test}/dataflow/RoutingTest.qll (100%) rename python/ql/{test/TestUtilities => src/utils/test}/dataflow/UnresolvedCalls.qll (100%) rename python/ql/{test/TestUtilities => src/utils/test}/dataflow/callGraphConfig.qll (100%) rename python/ql/{test/TestUtilities => src/utils/test}/dataflow/testConfig.qll (100%) rename python/ql/{test/TestUtilities => src/utils/test}/dataflow/testTaintConfig.qll (100%) rename python/ql/{test/TestUtilities => src/utils/test}/internal/InlineExpectationsTestImpl.qll (100%) diff --git a/python/ql/test/TestUtilities/InlineExpectationsTest.qll b/python/ql/src/utils/test/InlineExpectationsTest.qll similarity index 100% rename from python/ql/test/TestUtilities/InlineExpectationsTest.qll rename to python/ql/src/utils/test/InlineExpectationsTest.qll diff --git a/python/ql/test/TestUtilities/InlineExpectationsTestQuery.ql b/python/ql/src/utils/test/InlineExpectationsTestQuery.ql similarity index 100% rename from python/ql/test/TestUtilities/InlineExpectationsTestQuery.ql rename to python/ql/src/utils/test/InlineExpectationsTestQuery.ql diff --git a/python/ql/test/TestUtilities/VerifyApiGraphs.qll b/python/ql/src/utils/test/VerifyApiGraphs.qll similarity index 100% rename from python/ql/test/TestUtilities/VerifyApiGraphs.qll rename to python/ql/src/utils/test/VerifyApiGraphs.qll diff --git a/python/ql/test/TestUtilities/dataflow/DataflowQueryTest.qll b/python/ql/src/utils/test/dataflow/DataflowQueryTest.qll similarity index 100% rename from python/ql/test/TestUtilities/dataflow/DataflowQueryTest.qll rename to python/ql/src/utils/test/dataflow/DataflowQueryTest.qll diff --git a/python/ql/test/TestUtilities/dataflow/FlowTest.qll b/python/ql/src/utils/test/dataflow/FlowTest.qll similarity index 100% rename from python/ql/test/TestUtilities/dataflow/FlowTest.qll rename to python/ql/src/utils/test/dataflow/FlowTest.qll diff --git a/python/ql/test/TestUtilities/dataflow/LocalFlowStepTest.qll b/python/ql/src/utils/test/dataflow/LocalFlowStepTest.qll similarity index 100% rename from python/ql/test/TestUtilities/dataflow/LocalFlowStepTest.qll rename to python/ql/src/utils/test/dataflow/LocalFlowStepTest.qll diff --git a/python/ql/test/TestUtilities/dataflow/MaximalFlowTest.qll b/python/ql/src/utils/test/dataflow/MaximalFlowTest.qll similarity index 100% rename from python/ql/test/TestUtilities/dataflow/MaximalFlowTest.qll rename to python/ql/src/utils/test/dataflow/MaximalFlowTest.qll diff --git a/python/ql/test/TestUtilities/dataflow/NormalDataflowTest.qll b/python/ql/src/utils/test/dataflow/NormalDataflowTest.qll similarity index 100% rename from python/ql/test/TestUtilities/dataflow/NormalDataflowTest.qll rename to python/ql/src/utils/test/dataflow/NormalDataflowTest.qll diff --git a/python/ql/test/TestUtilities/dataflow/NormalTaintTrackingTest.qll b/python/ql/src/utils/test/dataflow/NormalTaintTrackingTest.qll similarity index 100% rename from python/ql/test/TestUtilities/dataflow/NormalTaintTrackingTest.qll rename to python/ql/src/utils/test/dataflow/NormalTaintTrackingTest.qll diff --git a/python/ql/test/TestUtilities/dataflow/RoutingTest.qll b/python/ql/src/utils/test/dataflow/RoutingTest.qll similarity index 100% rename from python/ql/test/TestUtilities/dataflow/RoutingTest.qll rename to python/ql/src/utils/test/dataflow/RoutingTest.qll diff --git a/python/ql/test/TestUtilities/dataflow/UnresolvedCalls.qll b/python/ql/src/utils/test/dataflow/UnresolvedCalls.qll similarity index 100% rename from python/ql/test/TestUtilities/dataflow/UnresolvedCalls.qll rename to python/ql/src/utils/test/dataflow/UnresolvedCalls.qll diff --git a/python/ql/test/TestUtilities/dataflow/callGraphConfig.qll b/python/ql/src/utils/test/dataflow/callGraphConfig.qll similarity index 100% rename from python/ql/test/TestUtilities/dataflow/callGraphConfig.qll rename to python/ql/src/utils/test/dataflow/callGraphConfig.qll diff --git a/python/ql/test/TestUtilities/dataflow/testConfig.qll b/python/ql/src/utils/test/dataflow/testConfig.qll similarity index 100% rename from python/ql/test/TestUtilities/dataflow/testConfig.qll rename to python/ql/src/utils/test/dataflow/testConfig.qll diff --git a/python/ql/test/TestUtilities/dataflow/testTaintConfig.qll b/python/ql/src/utils/test/dataflow/testTaintConfig.qll similarity index 100% rename from python/ql/test/TestUtilities/dataflow/testTaintConfig.qll rename to python/ql/src/utils/test/dataflow/testTaintConfig.qll diff --git a/python/ql/test/TestUtilities/internal/InlineExpectationsTestImpl.qll b/python/ql/src/utils/test/internal/InlineExpectationsTestImpl.qll similarity index 100% rename from python/ql/test/TestUtilities/internal/InlineExpectationsTestImpl.qll rename to python/ql/src/utils/test/internal/InlineExpectationsTestImpl.qll From 2321ca59f6d64ba0e8e88131bc1d28ceb86249e9 Mon Sep 17 00:00:00 2001 From: Michael Nebel Date: Wed, 11 Dec 2024 13:29:16 +0100 Subject: [PATCH 14/24] Python: Update all test util paths to point to the new location. --- .../ql/lib/semmle/python/dataflow/new/internal/PrintNode.qll | 2 +- python/ql/src/utils/test/dataflow/DataflowQueryTest.qll | 2 +- python/ql/src/utils/test/dataflow/FlowTest.qll | 2 +- python/ql/src/utils/test/dataflow/NormalDataflowTest.qll | 4 ++-- python/ql/src/utils/test/dataflow/NormalTaintTrackingTest.qll | 4 ++-- python/ql/src/utils/test/dataflow/RoutingTest.qll | 2 +- python/ql/src/utils/test/dataflow/UnresolvedCalls.qll | 2 +- python/ql/test/experimental/import-resolution/importflow.ql | 2 +- python/ql/test/experimental/import-resolution/imports.ql | 2 +- .../library-tests/CallGraph/InlineCallGraphTest.ql | 2 +- python/ql/test/experimental/meta/ConceptsTest.qll | 2 +- python/ql/test/experimental/meta/InlineTaintTest.qll | 2 +- python/ql/test/experimental/meta/MaDTest.qll | 2 +- python/ql/test/experimental/meta/RemoteFlowSourceTest.qll | 2 +- python/ql/test/experimental/meta/debug/dataflowTestPaths.ql | 2 +- .../Security/CWE-022-UnsafeUnpacking/DataflowQueryTest.ql | 2 +- .../Security/CWE-074-RemoteCommandExecution/ConceptsTest.ql | 2 +- .../CWE-074-RemoteCommandExecution/DataflowQueryTest.ql | 2 +- .../query-tests/Security/CWE-409/DataflowQueryTest.ql | 2 +- python/ql/test/library-tests/ApiGraphs/py2/use.ql | 2 +- python/ql/test/library-tests/ApiGraphs/py2/verifyApiGraphs.ql | 2 +- python/ql/test/library-tests/ApiGraphs/py3/verifyApiGraphs.ql | 2 +- .../InlineExpectationsTest/missing-relevant-tag/Test.ql | 2 +- python/ql/test/library-tests/dataflow/basic/callGraph.ql | 2 +- python/ql/test/library-tests/dataflow/basic/callGraphSinks.ql | 2 +- .../ql/test/library-tests/dataflow/basic/callGraphSources.ql | 2 +- .../ql/test/library-tests/dataflow/basic/localFlowStepTest.ql | 2 +- .../ql/test/library-tests/dataflow/basic/maximalFlowTest.ql | 2 +- .../ql/test/library-tests/dataflow/calls/DataFlowCallTest.ql | 2 +- .../library-tests/dataflow/coverage/NormalDataflowTest.ql | 2 +- .../library-tests/dataflow/coverage/argumentRoutingTest.ql | 2 +- .../library-tests/dataflow/exceptions/NormalDataflowTest.ql | 2 +- .../library-tests/dataflow/fieldflow/NormalDataflowTest.ql | 2 +- .../test/library-tests/dataflow/fieldflow/UnresolvedCalls.ql | 2 +- python/ql/test/library-tests/dataflow/global-flow/accesses.ql | 2 +- .../test/library-tests/dataflow/match/NormalDataflowTest.ql | 2 +- .../dataflow/model-summaries/NormalDataflowTest.ql | 2 +- .../library-tests/dataflow/module-initialization/localFlow.ql | 2 +- python/ql/test/library-tests/dataflow/path-graph/PathNodes.ql | 4 ++-- python/ql/test/library-tests/dataflow/regression/dataflow.ql | 2 +- .../dataflow/sensitive-data/TestSensitiveDataSources.ql | 2 +- .../dataflow/summaries/NormalTaintTrackingTest.ql | 2 +- python/ql/test/library-tests/dataflow/summaries/summaries.ql | 2 +- .../tainttracking/generator-flow/NormalDataflowTest.ql | 2 +- .../library-tests/dataflow/typetracking-summaries/tracked.ql | 2 +- python/ql/test/library-tests/dataflow/typetracking/tracked.ql | 2 +- .../library-tests/dataflow/variable-capture/CaptureTest.ql | 4 ++-- python/ql/test/library-tests/essa/ssa-compute/UseUse.ql | 2 +- .../library-tests/frameworks/django-orm/NormalDataflowTest.ql | 2 +- .../internal-ql-helpers/PoorMansFunctionResolutionTest.ql | 2 +- python/ql/test/library-tests/regex/SubstructureTests.ql | 2 +- python/ql/test/library-tests/regexparser/Locations.ql | 2 +- .../Functions/ModificationOfParameterWithDefault/test.ql | 2 +- python/ql/test/query-tests/Numerics/Pythagorean.qlref | 2 +- .../Security/CWE-022-PathInjection/DataflowQueryTest.ql | 2 +- .../Security/CWE-078-CommandInjection/DataflowQueryTest.ql | 2 +- .../DataflowQueryTest.ql | 2 +- .../Security/CWE-094-CodeInjection/CodeInjection.qlref | 2 +- .../Security/CWE-209-StackTraceExposure/ExceptionInfo.ql | 2 +- .../Security/CWE-943-NoSqlInjection/DataflowQueryTest.ql | 2 +- 60 files changed, 64 insertions(+), 64 deletions(-) diff --git a/python/ql/lib/semmle/python/dataflow/new/internal/PrintNode.qll b/python/ql/lib/semmle/python/dataflow/new/internal/PrintNode.qll index 76cd0a378229..787aaaeee8ca 100644 --- a/python/ql/lib/semmle/python/dataflow/new/internal/PrintNode.qll +++ b/python/ql/lib/semmle/python/dataflow/new/internal/PrintNode.qll @@ -55,7 +55,7 @@ string prettyNode(DataFlow::Node node) { * INTERNAL: Do not use. * * Gets the pretty-printed version of the DataFlow::Node `node`, that is suitable for use - * with `TestUtilities.InlineExpectationsTest` (that is, no spaces unless required). + * with `utils.test.InlineExpectationsTest` (that is, no spaces unless required). */ bindingset[node] string prettyNodeForInlineTest(DataFlow::Node node) { diff --git a/python/ql/src/utils/test/dataflow/DataflowQueryTest.qll b/python/ql/src/utils/test/dataflow/DataflowQueryTest.qll index e9f13aaaa475..bc3969310b42 100644 --- a/python/ql/src/utils/test/dataflow/DataflowQueryTest.qll +++ b/python/ql/src/utils/test/dataflow/DataflowQueryTest.qll @@ -1,7 +1,7 @@ import python import semmle.python.dataflow.new.DataFlow import semmle.python.dataflow.new.TaintTracking -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest private import semmle.python.dataflow.new.internal.PrintNode signature module QueryTestSig { diff --git a/python/ql/src/utils/test/dataflow/FlowTest.qll b/python/ql/src/utils/test/dataflow/FlowTest.qll index f2068ebe7237..17bbe9e0cff4 100644 --- a/python/ql/src/utils/test/dataflow/FlowTest.qll +++ b/python/ql/src/utils/test/dataflow/FlowTest.qll @@ -1,6 +1,6 @@ import python import semmle.python.dataflow.new.DataFlow -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest private import semmle.python.dataflow.new.internal.PrintNode signature module FlowTestSig { diff --git a/python/ql/src/utils/test/dataflow/NormalDataflowTest.qll b/python/ql/src/utils/test/dataflow/NormalDataflowTest.qll index b89738b100ed..696b43d5f038 100644 --- a/python/ql/src/utils/test/dataflow/NormalDataflowTest.qll +++ b/python/ql/src/utils/test/dataflow/NormalDataflowTest.qll @@ -1,6 +1,6 @@ import python -import TestUtilities.dataflow.FlowTest -import TestUtilities.dataflow.testConfig +import utils.test.dataflow.FlowTest +import utils.test.dataflow.testConfig private import semmle.python.dataflow.new.internal.PrintNode module DataFlowTest implements FlowTestSig { diff --git a/python/ql/src/utils/test/dataflow/NormalTaintTrackingTest.qll b/python/ql/src/utils/test/dataflow/NormalTaintTrackingTest.qll index e63e962df4d5..753f8f61e137 100644 --- a/python/ql/src/utils/test/dataflow/NormalTaintTrackingTest.qll +++ b/python/ql/src/utils/test/dataflow/NormalTaintTrackingTest.qll @@ -1,6 +1,6 @@ import python -import TestUtilities.dataflow.FlowTest -import TestUtilities.dataflow.testTaintConfig +import utils.test.dataflow.FlowTest +import utils.test.dataflow.testTaintConfig private import semmle.python.dataflow.new.internal.PrintNode module DataFlowTest implements FlowTestSig { diff --git a/python/ql/src/utils/test/dataflow/RoutingTest.qll b/python/ql/src/utils/test/dataflow/RoutingTest.qll index 6c2df0e43484..e7ac4e872470 100644 --- a/python/ql/src/utils/test/dataflow/RoutingTest.qll +++ b/python/ql/src/utils/test/dataflow/RoutingTest.qll @@ -1,6 +1,6 @@ import python import semmle.python.dataflow.new.DataFlow -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest private import semmle.python.dataflow.new.internal.PrintNode private import semmle.python.dataflow.new.internal.DataFlowPrivate as DataFlowPrivate diff --git a/python/ql/src/utils/test/dataflow/UnresolvedCalls.qll b/python/ql/src/utils/test/dataflow/UnresolvedCalls.qll index 9b26d8c91758..a4dfb07ee90f 100644 --- a/python/ql/src/utils/test/dataflow/UnresolvedCalls.qll +++ b/python/ql/src/utils/test/dataflow/UnresolvedCalls.qll @@ -2,7 +2,7 @@ import python private import semmle.python.dataflow.new.internal.PrintNode private import semmle.python.dataflow.new.internal.DataFlowPrivate as DataFlowPrivate private import semmle.python.ApiGraphs -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest signature module UnresolvedCallExpectationsSig { predicate unresolvedCall(CallNode call); diff --git a/python/ql/test/experimental/import-resolution/importflow.ql b/python/ql/test/experimental/import-resolution/importflow.ql index 0398f1a7a699..a3e20123fc7c 100644 --- a/python/ql/test/experimental/import-resolution/importflow.ql +++ b/python/ql/test/experimental/import-resolution/importflow.ql @@ -1,7 +1,7 @@ import python import semmle.python.dataflow.new.DataFlow import semmle.python.ApiGraphs -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest import semmle.python.dataflow.new.internal.ImportResolution /** A string that appears on the right hand side of an assignment. */ diff --git a/python/ql/test/experimental/import-resolution/imports.ql b/python/ql/test/experimental/import-resolution/imports.ql index 48a8a4116657..d2b436b560be 100644 --- a/python/ql/test/experimental/import-resolution/imports.ql +++ b/python/ql/test/experimental/import-resolution/imports.ql @@ -1,5 +1,5 @@ import python -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest import semmle.python.dataflow.new.DataFlow import semmle.python.dataflow.new.internal.ImportResolution diff --git a/python/ql/test/experimental/library-tests/CallGraph/InlineCallGraphTest.ql b/python/ql/test/experimental/library-tests/CallGraph/InlineCallGraphTest.ql index 8c47bacfb883..1771727dbbca 100644 --- a/python/ql/test/experimental/library-tests/CallGraph/InlineCallGraphTest.ql +++ b/python/ql/test/experimental/library-tests/CallGraph/InlineCallGraphTest.ql @@ -1,5 +1,5 @@ import python -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest private import semmle.python.dataflow.new.internal.DataFlowDispatch as TT /** Holds when `call` is resolved to `callable` using points-to based call-graph. */ diff --git a/python/ql/test/experimental/meta/ConceptsTest.qll b/python/ql/test/experimental/meta/ConceptsTest.qll index 40aa9c951b0d..658d11f7e856 100644 --- a/python/ql/test/experimental/meta/ConceptsTest.qll +++ b/python/ql/test/experimental/meta/ConceptsTest.qll @@ -1,7 +1,7 @@ import python import semmle.python.dataflow.new.DataFlow import semmle.python.Concepts -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest private import semmle.python.dataflow.new.internal.PrintNode private import codeql.threatmodels.ThreatModels diff --git a/python/ql/test/experimental/meta/InlineTaintTest.qll b/python/ql/test/experimental/meta/InlineTaintTest.qll index a09cc9aabc19..525775d5106c 100644 --- a/python/ql/test/experimental/meta/InlineTaintTest.qll +++ b/python/ql/test/experimental/meta/InlineTaintTest.qll @@ -13,7 +13,7 @@ import python import semmle.python.dataflow.new.DataFlow import semmle.python.dataflow.new.TaintTracking import semmle.python.dataflow.new.RemoteFlowSources -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest private import semmle.python.dataflow.new.internal.PrintNode private import semmle.python.Concepts diff --git a/python/ql/test/experimental/meta/MaDTest.qll b/python/ql/test/experimental/meta/MaDTest.qll index 9b6bd59287a6..705785d796c7 100644 --- a/python/ql/test/experimental/meta/MaDTest.qll +++ b/python/ql/test/experimental/meta/MaDTest.qll @@ -5,7 +5,7 @@ private import semmle.python.frameworks.data.ModelsAsData // need to import Frameworks to get the actual modeling imported private import semmle.python.Frameworks // this import needs to be public to get the query predicates propagated to the actual test files -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest module MadSinkTest implements TestSig { string getARelevantTag() { diff --git a/python/ql/test/experimental/meta/RemoteFlowSourceTest.qll b/python/ql/test/experimental/meta/RemoteFlowSourceTest.qll index 65015afe4dba..98697fa838c0 100644 --- a/python/ql/test/experimental/meta/RemoteFlowSourceTest.qll +++ b/python/ql/test/experimental/meta/RemoteFlowSourceTest.qll @@ -1,6 +1,6 @@ import python import semmle.python.dataflow.new.RemoteFlowSources -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest private import semmle.python.dataflow.new.internal.PrintNode module SourceTest implements TestSig { diff --git a/python/ql/test/experimental/meta/debug/dataflowTestPaths.ql b/python/ql/test/experimental/meta/debug/dataflowTestPaths.ql index 4c0ab8986868..963a6a1c1ac2 100644 --- a/python/ql/test/experimental/meta/debug/dataflowTestPaths.ql +++ b/python/ql/test/experimental/meta/debug/dataflowTestPaths.ql @@ -9,7 +9,7 @@ // 3. if necessary, look at partial paths by (un)commenting appropriate lines import python import semmle.python.dataflow.new.DataFlow -import TestUtilities.dataflow.testConfig +import utils.test.dataflow.testConfig module Config implements DataFlow::ConfigSig { predicate isSource(DataFlow::Node source) { TestConfig::isSource(source) } diff --git a/python/ql/test/experimental/query-tests/Security/CWE-022-UnsafeUnpacking/DataflowQueryTest.ql b/python/ql/test/experimental/query-tests/Security/CWE-022-UnsafeUnpacking/DataflowQueryTest.ql index 9cbf6dd6ad8a..7bb635891f56 100644 --- a/python/ql/test/experimental/query-tests/Security/CWE-022-UnsafeUnpacking/DataflowQueryTest.ql +++ b/python/ql/test/experimental/query-tests/Security/CWE-022-UnsafeUnpacking/DataflowQueryTest.ql @@ -1,4 +1,4 @@ import python -import TestUtilities.dataflow.DataflowQueryTest +import utils.test.dataflow.DataflowQueryTest import experimental.Security.UnsafeUnpackQuery import FromTaintTrackingConfig diff --git a/python/ql/test/experimental/query-tests/Security/CWE-074-RemoteCommandExecution/ConceptsTest.ql b/python/ql/test/experimental/query-tests/Security/CWE-074-RemoteCommandExecution/ConceptsTest.ql index 939a81f73f70..d70552d1a8dd 100644 --- a/python/ql/test/experimental/query-tests/Security/CWE-074-RemoteCommandExecution/ConceptsTest.ql +++ b/python/ql/test/experimental/query-tests/Security/CWE-074-RemoteCommandExecution/ConceptsTest.ql @@ -1,7 +1,7 @@ import python import semmle.python.dataflow.new.DataFlow import semmle.python.dataflow.new.internal.DataFlowDispatch as DataFlowDispatch -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest private import semmle.python.dataflow.new.internal.PrintNode import experimental.semmle.python.Concepts diff --git a/python/ql/test/experimental/query-tests/Security/CWE-074-RemoteCommandExecution/DataflowQueryTest.ql b/python/ql/test/experimental/query-tests/Security/CWE-074-RemoteCommandExecution/DataflowQueryTest.ql index 580c5fcc5f4c..b4bcc3a30ab1 100644 --- a/python/ql/test/experimental/query-tests/Security/CWE-074-RemoteCommandExecution/DataflowQueryTest.ql +++ b/python/ql/test/experimental/query-tests/Security/CWE-074-RemoteCommandExecution/DataflowQueryTest.ql @@ -1,4 +1,4 @@ import python -import TestUtilities.dataflow.DataflowQueryTest +import utils.test.dataflow.DataflowQueryTest import experimental.semmle.python.security.RemoteCommandExecution import FromTaintTrackingConfig diff --git a/python/ql/test/experimental/query-tests/Security/CWE-409/DataflowQueryTest.ql b/python/ql/test/experimental/query-tests/Security/CWE-409/DataflowQueryTest.ql index c1724c29d2cf..c28fbe94eec8 100644 --- a/python/ql/test/experimental/query-tests/Security/CWE-409/DataflowQueryTest.ql +++ b/python/ql/test/experimental/query-tests/Security/CWE-409/DataflowQueryTest.ql @@ -1,4 +1,4 @@ import python -import TestUtilities.dataflow.DataflowQueryTest +import utils.test.dataflow.DataflowQueryTest import experimental.semmle.python.security.DecompressionBomb import FromTaintTrackingConfig diff --git a/python/ql/test/library-tests/ApiGraphs/py2/use.ql b/python/ql/test/library-tests/ApiGraphs/py2/use.ql index c89ad1c5196b..d689d2e27a8d 100644 --- a/python/ql/test/library-tests/ApiGraphs/py2/use.ql +++ b/python/ql/test/library-tests/ApiGraphs/py2/use.ql @@ -1,6 +1,6 @@ import python import semmle.python.dataflow.new.DataFlow -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest import semmle.python.ApiGraphs module ApiUseTest implements TestSig { diff --git a/python/ql/test/library-tests/ApiGraphs/py2/verifyApiGraphs.ql b/python/ql/test/library-tests/ApiGraphs/py2/verifyApiGraphs.ql index 520f507ca9f8..3d3df4a18b81 100644 --- a/python/ql/test/library-tests/ApiGraphs/py2/verifyApiGraphs.ql +++ b/python/ql/test/library-tests/ApiGraphs/py2/verifyApiGraphs.ql @@ -1 +1 @@ -import TestUtilities.VerifyApiGraphs +import utils.test.VerifyApiGraphs diff --git a/python/ql/test/library-tests/ApiGraphs/py3/verifyApiGraphs.ql b/python/ql/test/library-tests/ApiGraphs/py3/verifyApiGraphs.ql index e3308914a57a..882941fc9b4c 100644 --- a/python/ql/test/library-tests/ApiGraphs/py3/verifyApiGraphs.ql +++ b/python/ql/test/library-tests/ApiGraphs/py3/verifyApiGraphs.ql @@ -1,6 +1,6 @@ // Note: This is not using standard inline-expectation tests, so will not alert if you // have not manually added an annotation to a line! -import TestUtilities.VerifyApiGraphs +import utils.test.VerifyApiGraphs class CustomEntryPoint extends API::EntryPoint { CustomEntryPoint() { this = "CustomEntryPoint" } diff --git a/python/ql/test/library-tests/InlineExpectationsTest/missing-relevant-tag/Test.ql b/python/ql/test/library-tests/InlineExpectationsTest/missing-relevant-tag/Test.ql index e4694ffc10dd..d6253ab6af54 100644 --- a/python/ql/test/library-tests/InlineExpectationsTest/missing-relevant-tag/Test.ql +++ b/python/ql/test/library-tests/InlineExpectationsTest/missing-relevant-tag/Test.ql @@ -2,7 +2,7 @@ // right values for `getARelevantTag`. We want to alert on this, // so it gets fixed! import python -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest module MissingRelevantTag implements TestSig { string getARelevantTag() { none() } diff --git a/python/ql/test/library-tests/dataflow/basic/callGraph.ql b/python/ql/test/library-tests/dataflow/basic/callGraph.ql index f0e28c33dc6a..16c859f89ece 100644 --- a/python/ql/test/library-tests/dataflow/basic/callGraph.ql +++ b/python/ql/test/library-tests/dataflow/basic/callGraph.ql @@ -1,4 +1,4 @@ -import TestUtilities.dataflow.callGraphConfig +import utils.test.dataflow.callGraphConfig from DataFlow::Node source, DataFlow::Node sink where diff --git a/python/ql/test/library-tests/dataflow/basic/callGraphSinks.ql b/python/ql/test/library-tests/dataflow/basic/callGraphSinks.ql index 472d6ccaa374..e7598e471e14 100644 --- a/python/ql/test/library-tests/dataflow/basic/callGraphSinks.ql +++ b/python/ql/test/library-tests/dataflow/basic/callGraphSinks.ql @@ -1,4 +1,4 @@ -import TestUtilities.dataflow.callGraphConfig +import utils.test.dataflow.callGraphConfig from DataFlow::Node sink where diff --git a/python/ql/test/library-tests/dataflow/basic/callGraphSources.ql b/python/ql/test/library-tests/dataflow/basic/callGraphSources.ql index 05b26caf3c07..a74bfa8afe1d 100644 --- a/python/ql/test/library-tests/dataflow/basic/callGraphSources.ql +++ b/python/ql/test/library-tests/dataflow/basic/callGraphSources.ql @@ -1,4 +1,4 @@ -import TestUtilities.dataflow.callGraphConfig +import utils.test.dataflow.callGraphConfig from DataFlow::Node source where diff --git a/python/ql/test/library-tests/dataflow/basic/localFlowStepTest.ql b/python/ql/test/library-tests/dataflow/basic/localFlowStepTest.ql index 881592eeaeb9..34c8894a974f 100644 --- a/python/ql/test/library-tests/dataflow/basic/localFlowStepTest.ql +++ b/python/ql/test/library-tests/dataflow/basic/localFlowStepTest.ql @@ -1 +1 @@ -import TestUtilities.dataflow.LocalFlowStepTest +import utils.test.dataflow.LocalFlowStepTest diff --git a/python/ql/test/library-tests/dataflow/basic/maximalFlowTest.ql b/python/ql/test/library-tests/dataflow/basic/maximalFlowTest.ql index 64867eb89da5..ba374bc5ad70 100644 --- a/python/ql/test/library-tests/dataflow/basic/maximalFlowTest.ql +++ b/python/ql/test/library-tests/dataflow/basic/maximalFlowTest.ql @@ -1 +1 @@ -import TestUtilities.dataflow.MaximalFlowTest +import utils.test.dataflow.MaximalFlowTest diff --git a/python/ql/test/library-tests/dataflow/calls/DataFlowCallTest.ql b/python/ql/test/library-tests/dataflow/calls/DataFlowCallTest.ql index c49511d9cdd1..eb29ace49b3d 100644 --- a/python/ql/test/library-tests/dataflow/calls/DataFlowCallTest.ql +++ b/python/ql/test/library-tests/dataflow/calls/DataFlowCallTest.ql @@ -1,7 +1,7 @@ import python import semmle.python.dataflow.new.DataFlow import semmle.python.dataflow.new.internal.DataFlowDispatch as DataFlowDispatch -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest private import semmle.python.dataflow.new.internal.PrintNode module DataFlowCallTest implements TestSig { diff --git a/python/ql/test/library-tests/dataflow/coverage/NormalDataflowTest.ql b/python/ql/test/library-tests/dataflow/coverage/NormalDataflowTest.ql index f7e55d12ded6..1e0627bfcca1 100644 --- a/python/ql/test/library-tests/dataflow/coverage/NormalDataflowTest.ql +++ b/python/ql/test/library-tests/dataflow/coverage/NormalDataflowTest.ql @@ -1,2 +1,2 @@ import python -import TestUtilities.dataflow.NormalDataflowTest +import utils.test.dataflow.NormalDataflowTest diff --git a/python/ql/test/library-tests/dataflow/coverage/argumentRoutingTest.ql b/python/ql/test/library-tests/dataflow/coverage/argumentRoutingTest.ql index 02b503824d48..7851dc4dda80 100644 --- a/python/ql/test/library-tests/dataflow/coverage/argumentRoutingTest.ql +++ b/python/ql/test/library-tests/dataflow/coverage/argumentRoutingTest.ql @@ -1,7 +1,7 @@ import python import semmle.python.dataflow.new.DataFlow private import semmle.python.dataflow.new.internal.DataFlowPrivate as DataFlowPrivate -import TestUtilities.dataflow.RoutingTest +import utils.test.dataflow.RoutingTest module Argument1RoutingTest implements RoutingTestSig { class Argument = Unit; diff --git a/python/ql/test/library-tests/dataflow/exceptions/NormalDataflowTest.ql b/python/ql/test/library-tests/dataflow/exceptions/NormalDataflowTest.ql index f7e55d12ded6..1e0627bfcca1 100644 --- a/python/ql/test/library-tests/dataflow/exceptions/NormalDataflowTest.ql +++ b/python/ql/test/library-tests/dataflow/exceptions/NormalDataflowTest.ql @@ -1,2 +1,2 @@ import python -import TestUtilities.dataflow.NormalDataflowTest +import utils.test.dataflow.NormalDataflowTest diff --git a/python/ql/test/library-tests/dataflow/fieldflow/NormalDataflowTest.ql b/python/ql/test/library-tests/dataflow/fieldflow/NormalDataflowTest.ql index f7e55d12ded6..1e0627bfcca1 100644 --- a/python/ql/test/library-tests/dataflow/fieldflow/NormalDataflowTest.ql +++ b/python/ql/test/library-tests/dataflow/fieldflow/NormalDataflowTest.ql @@ -1,2 +1,2 @@ import python -import TestUtilities.dataflow.NormalDataflowTest +import utils.test.dataflow.NormalDataflowTest diff --git a/python/ql/test/library-tests/dataflow/fieldflow/UnresolvedCalls.ql b/python/ql/test/library-tests/dataflow/fieldflow/UnresolvedCalls.ql index 299339dacf80..57e8e7f880fd 100644 --- a/python/ql/test/library-tests/dataflow/fieldflow/UnresolvedCalls.ql +++ b/python/ql/test/library-tests/dataflow/fieldflow/UnresolvedCalls.ql @@ -1,5 +1,5 @@ import python -import TestUtilities.dataflow.UnresolvedCalls +import utils.test.dataflow.UnresolvedCalls private import semmle.python.dataflow.new.DataFlow module IgnoreDictMethod implements UnresolvedCallExpectationsSig { diff --git a/python/ql/test/library-tests/dataflow/global-flow/accesses.ql b/python/ql/test/library-tests/dataflow/global-flow/accesses.ql index 5d65758ec14a..e6721918e60d 100644 --- a/python/ql/test/library-tests/dataflow/global-flow/accesses.ql +++ b/python/ql/test/library-tests/dataflow/global-flow/accesses.ql @@ -1,6 +1,6 @@ import python import semmle.python.dataflow.new.DataFlow -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest module GlobalReadTest implements TestSig { string getARelevantTag() { result = "reads" } diff --git a/python/ql/test/library-tests/dataflow/match/NormalDataflowTest.ql b/python/ql/test/library-tests/dataflow/match/NormalDataflowTest.ql index f7e55d12ded6..1e0627bfcca1 100644 --- a/python/ql/test/library-tests/dataflow/match/NormalDataflowTest.ql +++ b/python/ql/test/library-tests/dataflow/match/NormalDataflowTest.ql @@ -1,2 +1,2 @@ import python -import TestUtilities.dataflow.NormalDataflowTest +import utils.test.dataflow.NormalDataflowTest diff --git a/python/ql/test/library-tests/dataflow/model-summaries/NormalDataflowTest.ql b/python/ql/test/library-tests/dataflow/model-summaries/NormalDataflowTest.ql index f7e55d12ded6..1e0627bfcca1 100644 --- a/python/ql/test/library-tests/dataflow/model-summaries/NormalDataflowTest.ql +++ b/python/ql/test/library-tests/dataflow/model-summaries/NormalDataflowTest.ql @@ -1,2 +1,2 @@ import python -import TestUtilities.dataflow.NormalDataflowTest +import utils.test.dataflow.NormalDataflowTest diff --git a/python/ql/test/library-tests/dataflow/module-initialization/localFlow.ql b/python/ql/test/library-tests/dataflow/module-initialization/localFlow.ql index 36aa6e007a75..e3ca2484e529 100644 --- a/python/ql/test/library-tests/dataflow/module-initialization/localFlow.ql +++ b/python/ql/test/library-tests/dataflow/module-initialization/localFlow.ql @@ -1,6 +1,6 @@ // This query should be more focused yet. import python -import TestUtilities.dataflow.FlowTest +import utils.test.dataflow.FlowTest private import semmle.python.dataflow.new.internal.PrintNode private import semmle.python.dataflow.new.internal.DataFlowPrivate as DP diff --git a/python/ql/test/library-tests/dataflow/path-graph/PathNodes.ql b/python/ql/test/library-tests/dataflow/path-graph/PathNodes.ql index 8100e999491c..67321c45c105 100644 --- a/python/ql/test/library-tests/dataflow/path-graph/PathNodes.ql +++ b/python/ql/test/library-tests/dataflow/path-graph/PathNodes.ql @@ -5,8 +5,8 @@ import python import semmle.python.dataflow.new.DataFlow import semmle.python.dataflow.new.TaintTracking -import TestUtilities.dataflow.testConfig -import TestUtilities.InlineExpectationsTest +import utils.test.dataflow.testConfig +import utils.test.InlineExpectationsTest module TestTaintFlow = TaintTracking::Global; diff --git a/python/ql/test/library-tests/dataflow/regression/dataflow.ql b/python/ql/test/library-tests/dataflow/regression/dataflow.ql index 27645d084b87..f5632dc99591 100644 --- a/python/ql/test/library-tests/dataflow/regression/dataflow.ql +++ b/python/ql/test/library-tests/dataflow/regression/dataflow.ql @@ -6,7 +6,7 @@ */ import python -import TestUtilities.dataflow.testConfig +import utils.test.dataflow.testConfig from DataFlow::Node source, DataFlow::Node sink where TestFlow::flow(source, sink) diff --git a/python/ql/test/library-tests/dataflow/sensitive-data/TestSensitiveDataSources.ql b/python/ql/test/library-tests/dataflow/sensitive-data/TestSensitiveDataSources.ql index 67c375366c5b..058cf1fcf4a3 100644 --- a/python/ql/test/library-tests/dataflow/sensitive-data/TestSensitiveDataSources.ql +++ b/python/ql/test/library-tests/dataflow/sensitive-data/TestSensitiveDataSources.ql @@ -4,7 +4,7 @@ import python import semmle.python.dataflow.new.DataFlow import semmle.python.dataflow.new.TaintTracking -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest import semmle.python.dataflow.new.SensitiveDataSources private import semmle.python.ApiGraphs diff --git a/python/ql/test/library-tests/dataflow/summaries/NormalTaintTrackingTest.ql b/python/ql/test/library-tests/dataflow/summaries/NormalTaintTrackingTest.ql index 59376d7a53c1..98528085b8bc 100644 --- a/python/ql/test/library-tests/dataflow/summaries/NormalTaintTrackingTest.ql +++ b/python/ql/test/library-tests/dataflow/summaries/NormalTaintTrackingTest.ql @@ -1,3 +1,3 @@ import python private import TestSummaries -import TestUtilities.dataflow.NormalTaintTrackingTest +import utils.test.dataflow.NormalTaintTrackingTest diff --git a/python/ql/test/library-tests/dataflow/summaries/summaries.ql b/python/ql/test/library-tests/dataflow/summaries/summaries.ql index 4b5e79d28869..fdb225aa8080 100644 --- a/python/ql/test/library-tests/dataflow/summaries/summaries.ql +++ b/python/ql/test/library-tests/dataflow/summaries/summaries.ql @@ -8,7 +8,7 @@ import TestFlow::PathGraph import semmle.python.dataflow.new.TaintTracking import semmle.python.dataflow.new.internal.FlowSummaryImpl import semmle.python.ApiGraphs -import TestUtilities.dataflow.testTaintConfig +import utils.test.dataflow.testTaintConfig private import TestSummaries query predicate invalidSpecComponent(SummarizedCallable sc, string s, string c) { diff --git a/python/ql/test/library-tests/dataflow/tainttracking/generator-flow/NormalDataflowTest.ql b/python/ql/test/library-tests/dataflow/tainttracking/generator-flow/NormalDataflowTest.ql index f7e55d12ded6..1e0627bfcca1 100644 --- a/python/ql/test/library-tests/dataflow/tainttracking/generator-flow/NormalDataflowTest.ql +++ b/python/ql/test/library-tests/dataflow/tainttracking/generator-flow/NormalDataflowTest.ql @@ -1,2 +1,2 @@ import python -import TestUtilities.dataflow.NormalDataflowTest +import utils.test.dataflow.NormalDataflowTest diff --git a/python/ql/test/library-tests/dataflow/typetracking-summaries/tracked.ql b/python/ql/test/library-tests/dataflow/typetracking-summaries/tracked.ql index b4b626ff97eb..c4ed2522092f 100644 --- a/python/ql/test/library-tests/dataflow/typetracking-summaries/tracked.ql +++ b/python/ql/test/library-tests/dataflow/typetracking-summaries/tracked.ql @@ -1,7 +1,7 @@ import python import semmle.python.dataflow.new.DataFlow import semmle.python.dataflow.new.TypeTracking -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest import semmle.python.ApiGraphs import TestSummaries diff --git a/python/ql/test/library-tests/dataflow/typetracking/tracked.ql b/python/ql/test/library-tests/dataflow/typetracking/tracked.ql index 8bad0e33ead8..e720fd3c451b 100644 --- a/python/ql/test/library-tests/dataflow/typetracking/tracked.ql +++ b/python/ql/test/library-tests/dataflow/typetracking/tracked.ql @@ -1,7 +1,7 @@ import python import semmle.python.dataflow.new.DataFlow import semmle.python.dataflow.new.TypeTracking -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest import semmle.python.ApiGraphs private import semmle.python.dataflow.new.internal.DataFlowPrivate as DP diff --git a/python/ql/test/library-tests/dataflow/variable-capture/CaptureTest.ql b/python/ql/test/library-tests/dataflow/variable-capture/CaptureTest.ql index f81101741517..1f07106fa676 100644 --- a/python/ql/test/library-tests/dataflow/variable-capture/CaptureTest.ql +++ b/python/ql/test/library-tests/dataflow/variable-capture/CaptureTest.ql @@ -1,7 +1,7 @@ import python import semmle.python.dataflow.new.DataFlow -import TestUtilities.InlineExpectationsTest -import TestUtilities.dataflow.testConfig +import utils.test.InlineExpectationsTest +import utils.test.dataflow.testConfig module CaptureTest implements TestSig { string getARelevantTag() { result = "captured" } diff --git a/python/ql/test/library-tests/essa/ssa-compute/UseUse.ql b/python/ql/test/library-tests/essa/ssa-compute/UseUse.ql index 4635dda09f87..19152e49d30d 100644 --- a/python/ql/test/library-tests/essa/ssa-compute/UseUse.ql +++ b/python/ql/test/library-tests/essa/ssa-compute/UseUse.ql @@ -1,6 +1,6 @@ import python import semmle.python.essa.SsaCompute -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest module UseTest implements TestSig { string getARelevantTag() { result in ["use-use", "def-use", "def"] } diff --git a/python/ql/test/library-tests/frameworks/django-orm/NormalDataflowTest.ql b/python/ql/test/library-tests/frameworks/django-orm/NormalDataflowTest.ql index f7e55d12ded6..1e0627bfcca1 100644 --- a/python/ql/test/library-tests/frameworks/django-orm/NormalDataflowTest.ql +++ b/python/ql/test/library-tests/frameworks/django-orm/NormalDataflowTest.ql @@ -1,2 +1,2 @@ import python -import TestUtilities.dataflow.NormalDataflowTest +import utils.test.dataflow.NormalDataflowTest diff --git a/python/ql/test/library-tests/frameworks/internal-ql-helpers/PoorMansFunctionResolutionTest.ql b/python/ql/test/library-tests/frameworks/internal-ql-helpers/PoorMansFunctionResolutionTest.ql index 499743869b0f..b0325b027c3a 100644 --- a/python/ql/test/library-tests/frameworks/internal-ql-helpers/PoorMansFunctionResolutionTest.ql +++ b/python/ql/test/library-tests/frameworks/internal-ql-helpers/PoorMansFunctionResolutionTest.ql @@ -1,7 +1,7 @@ private import python private import semmle.python.dataflow.new.DataFlow private import semmle.python.frameworks.internal.PoorMansFunctionResolution -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest module InlinePoorMansFunctionResolutionTest implements TestSig { string getARelevantTag() { result = "resolved" } diff --git a/python/ql/test/library-tests/regex/SubstructureTests.ql b/python/ql/test/library-tests/regex/SubstructureTests.ql index f575670e16a8..34167d899ab2 100644 --- a/python/ql/test/library-tests/regex/SubstructureTests.ql +++ b/python/ql/test/library-tests/regex/SubstructureTests.ql @@ -1,5 +1,5 @@ import python -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest private import semmle.python.regex module CharacterSetTest implements TestSig { diff --git a/python/ql/test/library-tests/regexparser/Locations.ql b/python/ql/test/library-tests/regexparser/Locations.ql index bef14918dc6d..75cef3f3c8ab 100644 --- a/python/ql/test/library-tests/regexparser/Locations.ql +++ b/python/ql/test/library-tests/regexparser/Locations.ql @@ -1,6 +1,6 @@ import python import semmle.python.regexp.RegexTreeView::RegexTreeView -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest private import semmle.python.dataflow.new.internal.PrintNode module RegexLocationTest implements TestSig { diff --git a/python/ql/test/query-tests/Functions/ModificationOfParameterWithDefault/test.ql b/python/ql/test/query-tests/Functions/ModificationOfParameterWithDefault/test.ql index eaf935d573be..2371d8c00080 100644 --- a/python/ql/test/query-tests/Functions/ModificationOfParameterWithDefault/test.ql +++ b/python/ql/test/query-tests/Functions/ModificationOfParameterWithDefault/test.ql @@ -1,6 +1,6 @@ import python import semmle.python.dataflow.new.DataFlow -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest import semmle.python.functions.ModificationOfParameterWithDefault private import semmle.python.dataflow.new.internal.PrintNode diff --git a/python/ql/test/query-tests/Numerics/Pythagorean.qlref b/python/ql/test/query-tests/Numerics/Pythagorean.qlref index 541bd35ac626..ed76bdfeb7b6 100644 --- a/python/ql/test/query-tests/Numerics/Pythagorean.qlref +++ b/python/ql/test/query-tests/Numerics/Pythagorean.qlref @@ -1,2 +1,2 @@ query: Numerics/Pythagorean.ql -postprocess: TestUtilities/InlineExpectationsTestQuery.ql \ No newline at end of file +postprocess: utils/test/InlineExpectationsTestQuery.ql diff --git a/python/ql/test/query-tests/Security/CWE-022-PathInjection/DataflowQueryTest.ql b/python/ql/test/query-tests/Security/CWE-022-PathInjection/DataflowQueryTest.ql index a0cdc79b17d7..e4720596a37c 100644 --- a/python/ql/test/query-tests/Security/CWE-022-PathInjection/DataflowQueryTest.ql +++ b/python/ql/test/query-tests/Security/CWE-022-PathInjection/DataflowQueryTest.ql @@ -1,4 +1,4 @@ import python -import TestUtilities.dataflow.DataflowQueryTest +import utils.test.dataflow.DataflowQueryTest import semmle.python.security.dataflow.PathInjectionQuery import FromTaintTrackingStateConfig diff --git a/python/ql/test/query-tests/Security/CWE-078-CommandInjection/DataflowQueryTest.ql b/python/ql/test/query-tests/Security/CWE-078-CommandInjection/DataflowQueryTest.ql index 26350c3db65b..dd521acc77d2 100644 --- a/python/ql/test/query-tests/Security/CWE-078-CommandInjection/DataflowQueryTest.ql +++ b/python/ql/test/query-tests/Security/CWE-078-CommandInjection/DataflowQueryTest.ql @@ -1,4 +1,4 @@ import python -import TestUtilities.dataflow.DataflowQueryTest +import utils.test.dataflow.DataflowQueryTest import semmle.python.security.dataflow.CommandInjectionQuery import FromTaintTrackingConfig diff --git a/python/ql/test/query-tests/Security/CWE-078-UnsafeShellCommandConstruction/DataflowQueryTest.ql b/python/ql/test/query-tests/Security/CWE-078-UnsafeShellCommandConstruction/DataflowQueryTest.ql index 521527e7e4f0..51255358ec71 100644 --- a/python/ql/test/query-tests/Security/CWE-078-UnsafeShellCommandConstruction/DataflowQueryTest.ql +++ b/python/ql/test/query-tests/Security/CWE-078-UnsafeShellCommandConstruction/DataflowQueryTest.ql @@ -1,4 +1,4 @@ import python -import TestUtilities.dataflow.DataflowQueryTest +import utils.test.dataflow.DataflowQueryTest import semmle.python.security.dataflow.UnsafeShellCommandConstructionQuery import FromTaintTrackingConfig diff --git a/python/ql/test/query-tests/Security/CWE-094-CodeInjection/CodeInjection.qlref b/python/ql/test/query-tests/Security/CWE-094-CodeInjection/CodeInjection.qlref index 0135c6787d4b..bfeec8aec393 100644 --- a/python/ql/test/query-tests/Security/CWE-094-CodeInjection/CodeInjection.qlref +++ b/python/ql/test/query-tests/Security/CWE-094-CodeInjection/CodeInjection.qlref @@ -1,2 +1,2 @@ query: Security/CWE-094/CodeInjection.ql -postprocess: TestUtilities/InlineExpectationsTestQuery.ql +postprocess: utils/test/InlineExpectationsTestQuery.ql diff --git a/python/ql/test/query-tests/Security/CWE-209-StackTraceExposure/ExceptionInfo.ql b/python/ql/test/query-tests/Security/CWE-209-StackTraceExposure/ExceptionInfo.ql index eb8375593867..1a0e4052103e 100644 --- a/python/ql/test/query-tests/Security/CWE-209-StackTraceExposure/ExceptionInfo.ql +++ b/python/ql/test/query-tests/Security/CWE-209-StackTraceExposure/ExceptionInfo.ql @@ -1,6 +1,6 @@ import python import semmle.python.dataflow.new.DataFlow -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest import semmle.python.security.dataflow.ExceptionInfo module ExceptionInfoTest implements TestSig { diff --git a/python/ql/test/query-tests/Security/CWE-943-NoSqlInjection/DataflowQueryTest.ql b/python/ql/test/query-tests/Security/CWE-943-NoSqlInjection/DataflowQueryTest.ql index 5123e883d9cf..d67ff632ce3a 100644 --- a/python/ql/test/query-tests/Security/CWE-943-NoSqlInjection/DataflowQueryTest.ql +++ b/python/ql/test/query-tests/Security/CWE-943-NoSqlInjection/DataflowQueryTest.ql @@ -1,4 +1,4 @@ import python -import TestUtilities.dataflow.DataflowQueryTest +import utils.test.dataflow.DataflowQueryTest import semmle.python.security.dataflow.NoSqlInjectionQuery import FromTaintTrackingStateConfig From dd06d50b7f6ce3b9e8793c1ba9733ee339319ec4 Mon Sep 17 00:00:00 2001 From: Michael Nebel Date: Wed, 11 Dec 2024 13:44:17 +0100 Subject: [PATCH 15/24] QL: Move test utilities into the src folder. --- .../TestUtilities => src/utils/test}/InlineExpectationsTest.qll | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename ql/ql/{test/TestUtilities => src/utils/test}/InlineExpectationsTest.qll (100%) diff --git a/ql/ql/test/TestUtilities/InlineExpectationsTest.qll b/ql/ql/src/utils/test/InlineExpectationsTest.qll similarity index 100% rename from ql/ql/test/TestUtilities/InlineExpectationsTest.qll rename to ql/ql/src/utils/test/InlineExpectationsTest.qll From 2ca614793234632417567ded0df2d888912688d6 Mon Sep 17 00:00:00 2001 From: Michael Nebel Date: Wed, 11 Dec 2024 13:47:09 +0100 Subject: [PATCH 16/24] QL: Update all test util paths to point to the new location. --- ql/ql/test/dataflow/getAStringValue/getAStringValue.ql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ql/ql/test/dataflow/getAStringValue/getAStringValue.ql b/ql/ql/test/dataflow/getAStringValue/getAStringValue.ql index fbd8bf0477f7..43f4c3639ba6 100644 --- a/ql/ql/test/dataflow/getAStringValue/getAStringValue.ql +++ b/ql/ql/test/dataflow/getAStringValue/getAStringValue.ql @@ -1,6 +1,6 @@ import ql import codeql_ql.dataflow.DataFlow -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest module GetAStringValueTest implements TestSig { string getARelevantTag() { result = "getAStringValue" } From 157afff135e978b0a24804682b63b3c31dff986e Mon Sep 17 00:00:00 2001 From: Michael Nebel Date: Wed, 11 Dec 2024 13:48:43 +0100 Subject: [PATCH 17/24] Ruby: Move test utilities into the query pack. --- .../TestUtilities => src/utils/test}/InlineExpectationsTest.qll | 0 .../utils/test}/InlineExpectationsTestQuery.ql | 0 ruby/ql/{test/TestUtilities => src/utils/test}/InlineFlowTest.qll | 0 .../{test/TestUtilities => src/utils/test}/InlineFlowTestUtil.qll | 0 .../utils/test}/InlineTypeTrackingFlowTest.qll | 0 .../utils/test}/internal/InlineExpectationsTestImpl.qll | 0 6 files changed, 0 insertions(+), 0 deletions(-) rename ruby/ql/{test/TestUtilities => src/utils/test}/InlineExpectationsTest.qll (100%) rename ruby/ql/{test/TestUtilities => src/utils/test}/InlineExpectationsTestQuery.ql (100%) rename ruby/ql/{test/TestUtilities => src/utils/test}/InlineFlowTest.qll (100%) rename ruby/ql/{test/TestUtilities => src/utils/test}/InlineFlowTestUtil.qll (100%) rename ruby/ql/{test/TestUtilities => src/utils/test}/InlineTypeTrackingFlowTest.qll (100%) rename ruby/ql/{test/TestUtilities => src/utils/test}/internal/InlineExpectationsTestImpl.qll (100%) diff --git a/ruby/ql/test/TestUtilities/InlineExpectationsTest.qll b/ruby/ql/src/utils/test/InlineExpectationsTest.qll similarity index 100% rename from ruby/ql/test/TestUtilities/InlineExpectationsTest.qll rename to ruby/ql/src/utils/test/InlineExpectationsTest.qll diff --git a/ruby/ql/test/TestUtilities/InlineExpectationsTestQuery.ql b/ruby/ql/src/utils/test/InlineExpectationsTestQuery.ql similarity index 100% rename from ruby/ql/test/TestUtilities/InlineExpectationsTestQuery.ql rename to ruby/ql/src/utils/test/InlineExpectationsTestQuery.ql diff --git a/ruby/ql/test/TestUtilities/InlineFlowTest.qll b/ruby/ql/src/utils/test/InlineFlowTest.qll similarity index 100% rename from ruby/ql/test/TestUtilities/InlineFlowTest.qll rename to ruby/ql/src/utils/test/InlineFlowTest.qll diff --git a/ruby/ql/test/TestUtilities/InlineFlowTestUtil.qll b/ruby/ql/src/utils/test/InlineFlowTestUtil.qll similarity index 100% rename from ruby/ql/test/TestUtilities/InlineFlowTestUtil.qll rename to ruby/ql/src/utils/test/InlineFlowTestUtil.qll diff --git a/ruby/ql/test/TestUtilities/InlineTypeTrackingFlowTest.qll b/ruby/ql/src/utils/test/InlineTypeTrackingFlowTest.qll similarity index 100% rename from ruby/ql/test/TestUtilities/InlineTypeTrackingFlowTest.qll rename to ruby/ql/src/utils/test/InlineTypeTrackingFlowTest.qll diff --git a/ruby/ql/test/TestUtilities/internal/InlineExpectationsTestImpl.qll b/ruby/ql/src/utils/test/internal/InlineExpectationsTestImpl.qll similarity index 100% rename from ruby/ql/test/TestUtilities/internal/InlineExpectationsTestImpl.qll rename to ruby/ql/src/utils/test/internal/InlineExpectationsTestImpl.qll From 138e294dae7ad3dd66c36cd9ce71428ab893d324 Mon Sep 17 00:00:00 2001 From: Michael Nebel Date: Wed, 11 Dec 2024 13:54:44 +0100 Subject: [PATCH 18/24] Ruby: Update all test util paths to point to the new location. --- ruby/ql/src/utils/test/InlineFlowTest.qll | 2 +- ruby/ql/src/utils/test/InlineTypeTrackingFlowTest.qll | 4 ++-- ruby/ql/test/library-tests/concepts/CryptographicOperation.ql | 2 +- .../dataflow/api-graphs/VerifyApiGraphExpectations.ql | 2 +- ruby/ql/test/library-tests/dataflow/array-flow/array-flow.ql | 2 +- .../dataflow/array-flow/type-tracking-array-flow.ql | 2 +- .../library-tests/dataflow/barrier-guards/barrier-flow.ql | 2 +- .../library-tests/dataflow/barrier-guards/barrier-guards.ql | 2 +- .../dataflow/call-sensitivity/call-sensitivity.ql | 2 +- ruby/ql/test/library-tests/dataflow/erb/erb.ql | 2 +- .../test/library-tests/dataflow/flow-summaries/semantics.ql | 2 +- ruby/ql/test/library-tests/dataflow/global/Flow.ql | 2 +- .../library-tests/dataflow/global/TypeTrackingInlineTest.ql | 2 +- ruby/ql/test/library-tests/dataflow/hash-flow/hash-flow.ql | 2 +- .../dataflow/hash-flow/type-tracking-hash-flow.ql | 2 +- ruby/ql/test/library-tests/dataflow/local/InlineFlowTest.ql | 2 +- ruby/ql/test/library-tests/dataflow/params/params-flow.ql | 2 +- .../test/library-tests/dataflow/pathname-flow/pathame-flow.ql | 2 +- ruby/ql/test/library-tests/dataflow/ssa-flow/ssa-flow.ql | 2 +- .../ql/test/library-tests/dataflow/string-flow/string-flow.ql | 2 +- ruby/ql/test/library-tests/dataflow/summaries/Summaries.ql | 2 +- .../library-tests/frameworks/action_controller/params-flow.ql | 2 +- .../library-tests/frameworks/action_mailer/params-flow.ql | 2 +- .../frameworks/active_support/ActiveSupportDataFlow.ql | 2 +- ruby/ql/test/library-tests/frameworks/arel/Arel.ql | 2 +- ruby/ql/test/library-tests/frameworks/json/JsonDataFlow.ql | 2 +- ruby/ql/test/library-tests/frameworks/sinatra/Flow.ql | 2 +- .../experimental/improper-memoization/ImproperMemoization.ql | 2 +- ruby/ql/test/query-tests/security/cwe-022/PathInjection.qlref | 2 +- .../IncompleteMultiCharacterSanitization.ql | 2 +- .../test/query-tests/security/cwe-300/InsecureDependency.ql | 2 +- ruby/ql/test/query-tests/security/cwe-829/InsecureDownload.ql | 4 ++-- 32 files changed, 34 insertions(+), 34 deletions(-) diff --git a/ruby/ql/src/utils/test/InlineFlowTest.qll b/ruby/ql/src/utils/test/InlineFlowTest.qll index 1446d37d67d4..2444b04fb13e 100644 --- a/ruby/ql/src/utils/test/InlineFlowTest.qll +++ b/ruby/ql/src/utils/test/InlineFlowTest.qll @@ -12,7 +12,7 @@ private import codeql.ruby.frameworks.data.internal.ApiGraphModelsExtensions as private import internal.InlineExpectationsTestImpl private module FlowTestImpl implements InputSig { - import TestUtilities.InlineFlowTestUtil + import utils.test.InlineFlowTestUtil bindingset[src, sink] string getArgString(DataFlow::Node src, DataFlow::Node sink) { diff --git a/ruby/ql/src/utils/test/InlineTypeTrackingFlowTest.qll b/ruby/ql/src/utils/test/InlineTypeTrackingFlowTest.qll index fdbd40968de6..9d37ef804810 100644 --- a/ruby/ql/src/utils/test/InlineTypeTrackingFlowTest.qll +++ b/ruby/ql/src/utils/test/InlineTypeTrackingFlowTest.qll @@ -1,6 +1,6 @@ import ruby -import TestUtilities.InlineExpectationsTest -import TestUtilities.InlineFlowTestUtil +import utils.test.InlineExpectationsTest +import utils.test.InlineFlowTestUtil private import codeql.ruby.typetracking.TypeTracking private DataFlow::LocalSourceNode track(TypeTracker t, DataFlow::CallNode source) { diff --git a/ruby/ql/test/library-tests/concepts/CryptographicOperation.ql b/ruby/ql/test/library-tests/concepts/CryptographicOperation.ql index 602ee166fcee..18505a8ea3ab 100644 --- a/ruby/ql/test/library-tests/concepts/CryptographicOperation.ql +++ b/ruby/ql/test/library-tests/concepts/CryptographicOperation.ql @@ -1,6 +1,6 @@ import codeql.ruby.AST import codeql.ruby.Concepts -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest module CryptographicOperationTest implements TestSig { string getARelevantTag() { diff --git a/ruby/ql/test/library-tests/dataflow/api-graphs/VerifyApiGraphExpectations.ql b/ruby/ql/test/library-tests/dataflow/api-graphs/VerifyApiGraphExpectations.ql index 1fd815c260b7..555b45ecbf8f 100644 --- a/ruby/ql/test/library-tests/dataflow/api-graphs/VerifyApiGraphExpectations.ql +++ b/ruby/ql/test/library-tests/dataflow/api-graphs/VerifyApiGraphExpectations.ql @@ -3,7 +3,7 @@ import codeql.dataflow.internal.AccessPathSyntax import codeql.ruby.ast.internal.TreeSitter import codeql.ruby.frameworks.data.internal.ApiGraphModels as ApiGraphModels import codeql.ruby.ApiGraphs -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest private predicate accessPathRange(string s) { hasExpectationWithValue(_, s) } diff --git a/ruby/ql/test/library-tests/dataflow/array-flow/array-flow.ql b/ruby/ql/test/library-tests/dataflow/array-flow/array-flow.ql index 756833e8b35d..755b87ffceda 100644 --- a/ruby/ql/test/library-tests/dataflow/array-flow/array-flow.ql +++ b/ruby/ql/test/library-tests/dataflow/array-flow/array-flow.ql @@ -4,7 +4,7 @@ import codeql.ruby.AST import codeql.ruby.CFG -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest import DefaultFlowTest import ValueFlow::PathGraph diff --git a/ruby/ql/test/library-tests/dataflow/array-flow/type-tracking-array-flow.ql b/ruby/ql/test/library-tests/dataflow/array-flow/type-tracking-array-flow.ql index 81c306b7b007..dce9f8922244 100644 --- a/ruby/ql/test/library-tests/dataflow/array-flow/type-tracking-array-flow.ql +++ b/ruby/ql/test/library-tests/dataflow/array-flow/type-tracking-array-flow.ql @@ -3,4 +3,4 @@ // only that type-tracking cannot follow the flow in your test. If the dataflow // test (`array-flow.ql`) shows no failures, then that may be sufficient // (depending on your use case). -import TestUtilities.InlineTypeTrackingFlowTest +import utils.test.InlineTypeTrackingFlowTest diff --git a/ruby/ql/test/library-tests/dataflow/barrier-guards/barrier-flow.ql b/ruby/ql/test/library-tests/dataflow/barrier-guards/barrier-flow.ql index 55bc8c9e529f..e485d98d361d 100644 --- a/ruby/ql/test/library-tests/dataflow/barrier-guards/barrier-flow.ql +++ b/ruby/ql/test/library-tests/dataflow/barrier-guards/barrier-flow.ql @@ -4,7 +4,7 @@ import codeql.ruby.AST import codeql.ruby.CFG -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest import codeql.ruby.dataflow.BarrierGuards import PathGraph diff --git a/ruby/ql/test/library-tests/dataflow/barrier-guards/barrier-guards.ql b/ruby/ql/test/library-tests/dataflow/barrier-guards/barrier-guards.ql index 4bcb358acfdd..ee9b9df140c9 100644 --- a/ruby/ql/test/library-tests/dataflow/barrier-guards/barrier-guards.ql +++ b/ruby/ql/test/library-tests/dataflow/barrier-guards/barrier-guards.ql @@ -5,7 +5,7 @@ import codeql.ruby.controlflow.CfgNodes import codeql.ruby.controlflow.ControlFlowGraph import codeql.ruby.controlflow.BasicBlocks import codeql.ruby.DataFlow -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest query predicate newStyleBarrierGuards(DataFlow::Node n) { n instanceof StringConstCompareBarrier or diff --git a/ruby/ql/test/library-tests/dataflow/call-sensitivity/call-sensitivity.ql b/ruby/ql/test/library-tests/dataflow/call-sensitivity/call-sensitivity.ql index 62498bda1794..998bd78430c0 100644 --- a/ruby/ql/test/library-tests/dataflow/call-sensitivity/call-sensitivity.ql +++ b/ruby/ql/test/library-tests/dataflow/call-sensitivity/call-sensitivity.ql @@ -4,7 +4,7 @@ import codeql.ruby.AST import codeql.ruby.DataFlow -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest import DefaultFlowTest import TaintFlow::PathGraph import codeql.ruby.dataflow.internal.DataFlowDispatch as DataFlowDispatch diff --git a/ruby/ql/test/library-tests/dataflow/erb/erb.ql b/ruby/ql/test/library-tests/dataflow/erb/erb.ql index a3d91150945b..1ea08645b886 100644 --- a/ruby/ql/test/library-tests/dataflow/erb/erb.ql +++ b/ruby/ql/test/library-tests/dataflow/erb/erb.ql @@ -4,7 +4,7 @@ import codeql.ruby.AST import codeql.ruby.CFG -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest import ValueFlowTest import ValueFlow::PathGraph diff --git a/ruby/ql/test/library-tests/dataflow/flow-summaries/semantics.ql b/ruby/ql/test/library-tests/dataflow/flow-summaries/semantics.ql index 455ed9705389..07a804beba57 100644 --- a/ruby/ql/test/library-tests/dataflow/flow-summaries/semantics.ql +++ b/ruby/ql/test/library-tests/dataflow/flow-summaries/semantics.ql @@ -4,7 +4,7 @@ */ import codeql.ruby.AST -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest import DefaultFlowTest import PathGraph private import codeql.ruby.dataflow.FlowSummary diff --git a/ruby/ql/test/library-tests/dataflow/global/Flow.ql b/ruby/ql/test/library-tests/dataflow/global/Flow.ql index 51f0816cbba5..e0683efb39bf 100644 --- a/ruby/ql/test/library-tests/dataflow/global/Flow.ql +++ b/ruby/ql/test/library-tests/dataflow/global/Flow.ql @@ -4,7 +4,7 @@ import codeql.ruby.AST import codeql.ruby.DataFlow -private import TestUtilities.InlineFlowTest +private import utils.test.InlineFlowTest import DefaultFlowTest import TaintFlow::PathGraph diff --git a/ruby/ql/test/library-tests/dataflow/global/TypeTrackingInlineTest.ql b/ruby/ql/test/library-tests/dataflow/global/TypeTrackingInlineTest.ql index 97df46829d99..ca5f717c578f 100644 --- a/ruby/ql/test/library-tests/dataflow/global/TypeTrackingInlineTest.ql +++ b/ruby/ql/test/library-tests/dataflow/global/TypeTrackingInlineTest.ql @@ -1 +1 @@ -import TestUtilities.InlineTypeTrackingFlowTest +import utils.test.InlineTypeTrackingFlowTest diff --git a/ruby/ql/test/library-tests/dataflow/hash-flow/hash-flow.ql b/ruby/ql/test/library-tests/dataflow/hash-flow/hash-flow.ql index 5ec8ec0a0d66..f810e6ccc163 100644 --- a/ruby/ql/test/library-tests/dataflow/hash-flow/hash-flow.ql +++ b/ruby/ql/test/library-tests/dataflow/hash-flow/hash-flow.ql @@ -4,7 +4,7 @@ import codeql.ruby.AST import codeql.ruby.CFG -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest import DefaultFlowTest import ValueFlow::PathGraph diff --git a/ruby/ql/test/library-tests/dataflow/hash-flow/type-tracking-hash-flow.ql b/ruby/ql/test/library-tests/dataflow/hash-flow/type-tracking-hash-flow.ql index edcee16d6a58..3b16ee5ff4ea 100644 --- a/ruby/ql/test/library-tests/dataflow/hash-flow/type-tracking-hash-flow.ql +++ b/ruby/ql/test/library-tests/dataflow/hash-flow/type-tracking-hash-flow.ql @@ -3,4 +3,4 @@ // only that type-tracking cannot follow the flow in your test. If the dataflow // test (`hash-flow.ql`) shows no failures, then that may be sufficient // (depending on your use case). -import TestUtilities.InlineTypeTrackingFlowTest +import utils.test.InlineTypeTrackingFlowTest diff --git a/ruby/ql/test/library-tests/dataflow/local/InlineFlowTest.ql b/ruby/ql/test/library-tests/dataflow/local/InlineFlowTest.ql index e30fe4c131b9..d9640ffd8ffd 100644 --- a/ruby/ql/test/library-tests/dataflow/local/InlineFlowTest.ql +++ b/ruby/ql/test/library-tests/dataflow/local/InlineFlowTest.ql @@ -3,7 +3,7 @@ */ import codeql.ruby.AST -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest import DefaultFlowTest import TaintFlow::PathGraph diff --git a/ruby/ql/test/library-tests/dataflow/params/params-flow.ql b/ruby/ql/test/library-tests/dataflow/params/params-flow.ql index 6f8978fe8194..88a79ab82619 100644 --- a/ruby/ql/test/library-tests/dataflow/params/params-flow.ql +++ b/ruby/ql/test/library-tests/dataflow/params/params-flow.ql @@ -3,7 +3,7 @@ */ import codeql.ruby.AST -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest import ValueFlowTest import ValueFlow::PathGraph diff --git a/ruby/ql/test/library-tests/dataflow/pathname-flow/pathame-flow.ql b/ruby/ql/test/library-tests/dataflow/pathname-flow/pathame-flow.ql index e02827eaf8d0..fae4b68cda0e 100644 --- a/ruby/ql/test/library-tests/dataflow/pathname-flow/pathame-flow.ql +++ b/ruby/ql/test/library-tests/dataflow/pathname-flow/pathame-flow.ql @@ -3,7 +3,7 @@ */ import codeql.ruby.AST -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest import DefaultFlowTest import ValueFlow::PathGraph diff --git a/ruby/ql/test/library-tests/dataflow/ssa-flow/ssa-flow.ql b/ruby/ql/test/library-tests/dataflow/ssa-flow/ssa-flow.ql index e02827eaf8d0..fae4b68cda0e 100644 --- a/ruby/ql/test/library-tests/dataflow/ssa-flow/ssa-flow.ql +++ b/ruby/ql/test/library-tests/dataflow/ssa-flow/ssa-flow.ql @@ -3,7 +3,7 @@ */ import codeql.ruby.AST -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest import DefaultFlowTest import ValueFlow::PathGraph diff --git a/ruby/ql/test/library-tests/dataflow/string-flow/string-flow.ql b/ruby/ql/test/library-tests/dataflow/string-flow/string-flow.ql index e02827eaf8d0..fae4b68cda0e 100644 --- a/ruby/ql/test/library-tests/dataflow/string-flow/string-flow.ql +++ b/ruby/ql/test/library-tests/dataflow/string-flow/string-flow.ql @@ -3,7 +3,7 @@ */ import codeql.ruby.AST -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest import DefaultFlowTest import ValueFlow::PathGraph diff --git a/ruby/ql/test/library-tests/dataflow/summaries/Summaries.ql b/ruby/ql/test/library-tests/dataflow/summaries/Summaries.ql index 7542228ce5f9..7b370496f0a6 100644 --- a/ruby/ql/test/library-tests/dataflow/summaries/Summaries.ql +++ b/ruby/ql/test/library-tests/dataflow/summaries/Summaries.ql @@ -8,7 +8,7 @@ import codeql.ruby.dataflow.FlowSummary import codeql.ruby.TaintTracking import codeql.ruby.dataflow.internal.FlowSummaryImpl import codeql.ruby.frameworks.data.ModelsAsData -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest import PathGraph query predicate invalidSpecComponent(SummarizedCallable sc, string s, string c) { diff --git a/ruby/ql/test/library-tests/frameworks/action_controller/params-flow.ql b/ruby/ql/test/library-tests/frameworks/action_controller/params-flow.ql index d6e9c9e6f538..4bbbcebcab25 100644 --- a/ruby/ql/test/library-tests/frameworks/action_controller/params-flow.ql +++ b/ruby/ql/test/library-tests/frameworks/action_controller/params-flow.ql @@ -3,7 +3,7 @@ */ import ruby -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest import TaintFlow::PathGraph import codeql.ruby.frameworks.Rails diff --git a/ruby/ql/test/library-tests/frameworks/action_mailer/params-flow.ql b/ruby/ql/test/library-tests/frameworks/action_mailer/params-flow.ql index d6e9c9e6f538..4bbbcebcab25 100644 --- a/ruby/ql/test/library-tests/frameworks/action_mailer/params-flow.ql +++ b/ruby/ql/test/library-tests/frameworks/action_mailer/params-flow.ql @@ -3,7 +3,7 @@ */ import ruby -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest import TaintFlow::PathGraph import codeql.ruby.frameworks.Rails diff --git a/ruby/ql/test/library-tests/frameworks/active_support/ActiveSupportDataFlow.ql b/ruby/ql/test/library-tests/frameworks/active_support/ActiveSupportDataFlow.ql index 5cb6cd3208fa..a22d5179d8be 100644 --- a/ruby/ql/test/library-tests/frameworks/active_support/ActiveSupportDataFlow.ql +++ b/ruby/ql/test/library-tests/frameworks/active_support/ActiveSupportDataFlow.ql @@ -3,7 +3,7 @@ */ import codeql.ruby.AST -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest import codeql.ruby.Frameworks import DefaultFlowTest import ValueFlow::PathGraph diff --git a/ruby/ql/test/library-tests/frameworks/arel/Arel.ql b/ruby/ql/test/library-tests/frameworks/arel/Arel.ql index f992ef694e82..090abd60c72b 100644 --- a/ruby/ql/test/library-tests/frameworks/arel/Arel.ql +++ b/ruby/ql/test/library-tests/frameworks/arel/Arel.ql @@ -4,7 +4,7 @@ import codeql.ruby.frameworks.Arel import codeql.ruby.AST -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest import DefaultFlowTest import TaintFlow::PathGraph diff --git a/ruby/ql/test/library-tests/frameworks/json/JsonDataFlow.ql b/ruby/ql/test/library-tests/frameworks/json/JsonDataFlow.ql index 6fe0aeda9b1b..1281d8bc2886 100644 --- a/ruby/ql/test/library-tests/frameworks/json/JsonDataFlow.ql +++ b/ruby/ql/test/library-tests/frameworks/json/JsonDataFlow.ql @@ -2,7 +2,7 @@ * @kind path-problem */ -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest import codeql.ruby.Frameworks import DefaultFlowTest import PathGraph diff --git a/ruby/ql/test/library-tests/frameworks/sinatra/Flow.ql b/ruby/ql/test/library-tests/frameworks/sinatra/Flow.ql index d1e708c214b1..7ddf98f6d162 100644 --- a/ruby/ql/test/library-tests/frameworks/sinatra/Flow.ql +++ b/ruby/ql/test/library-tests/frameworks/sinatra/Flow.ql @@ -3,7 +3,7 @@ */ import ruby -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest import PathGraph import codeql.ruby.frameworks.Sinatra import codeql.ruby.Concepts diff --git a/ruby/ql/test/query-tests/experimental/improper-memoization/ImproperMemoization.ql b/ruby/ql/test/query-tests/experimental/improper-memoization/ImproperMemoization.ql index d1056f7cd12d..745fae3c1614 100644 --- a/ruby/ql/test/query-tests/experimental/improper-memoization/ImproperMemoization.ql +++ b/ruby/ql/test/query-tests/experimental/improper-memoization/ImproperMemoization.ql @@ -1,5 +1,5 @@ import codeql.ruby.AST -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest import codeql.ruby.security.ImproperMemoizationQuery module ImproperMemoizationTest implements TestSig { diff --git a/ruby/ql/test/query-tests/security/cwe-022/PathInjection.qlref b/ruby/ql/test/query-tests/security/cwe-022/PathInjection.qlref index 07015c904352..bb8df5f2c6fd 100644 --- a/ruby/ql/test/query-tests/security/cwe-022/PathInjection.qlref +++ b/ruby/ql/test/query-tests/security/cwe-022/PathInjection.qlref @@ -1,2 +1,2 @@ query: queries/security/cwe-022/PathInjection.ql -postprocess: TestUtilities/InlineExpectationsTestQuery.ql +postprocess: utils/test/InlineExpectationsTestQuery.ql diff --git a/ruby/ql/test/query-tests/security/cwe-116/IncompleteMultiCharacterSanitization/IncompleteMultiCharacterSanitization.ql b/ruby/ql/test/query-tests/security/cwe-116/IncompleteMultiCharacterSanitization/IncompleteMultiCharacterSanitization.ql index b9b447f00ee7..aa55bfcc7d9d 100644 --- a/ruby/ql/test/query-tests/security/cwe-116/IncompleteMultiCharacterSanitization/IncompleteMultiCharacterSanitization.ql +++ b/ruby/ql/test/query-tests/security/cwe-116/IncompleteMultiCharacterSanitization/IncompleteMultiCharacterSanitization.ql @@ -6,7 +6,7 @@ import codeql.ruby.AST import codeql.ruby.regexp.RegExpTreeView as RETV import codeql.ruby.DataFlow import codeql.ruby.security.IncompleteMultiCharacterSanitizationQuery as Query -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest module Test implements TestSig { string getARelevantTag() { result = "hasResult" } diff --git a/ruby/ql/test/query-tests/security/cwe-300/InsecureDependency.ql b/ruby/ql/test/query-tests/security/cwe-300/InsecureDependency.ql index 75bf5dce16d0..56cc02170bd3 100644 --- a/ruby/ql/test/query-tests/security/cwe-300/InsecureDependency.ql +++ b/ruby/ql/test/query-tests/security/cwe-300/InsecureDependency.ql @@ -1,5 +1,5 @@ import codeql.ruby.AST -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest import codeql.ruby.security.InsecureDependencyQuery module InsecureDependencyTest implements TestSig { diff --git a/ruby/ql/test/query-tests/security/cwe-829/InsecureDownload.ql b/ruby/ql/test/query-tests/security/cwe-829/InsecureDownload.ql index 4e1550bd9526..a8480b23a2df 100644 --- a/ruby/ql/test/query-tests/security/cwe-829/InsecureDownload.ql +++ b/ruby/ql/test/query-tests/security/cwe-829/InsecureDownload.ql @@ -1,7 +1,7 @@ import codeql.ruby.security.InsecureDownloadQuery import InsecureDownloadFlow::PathGraph -import TestUtilities.InlineExpectationsTest -import TestUtilities.InlineFlowTestUtil +import utils.test.InlineExpectationsTest +import utils.test.InlineFlowTestUtil module FlowTest implements TestSig { string getARelevantTag() { result = "BAD" } From ca66153a3b97aa96b35350c6eb1e700f9d259149 Mon Sep 17 00:00:00 2001 From: Michael Nebel Date: Wed, 11 Dec 2024 13:56:28 +0100 Subject: [PATCH 19/24] Swift: Move test utilities into the query pack. --- .../TestUtilities => src/utils/test}/InlineExpectationsTest.qll | 0 .../utils/test}/InlineExpectationsTestQuery.ql | 0 .../ql/{test/TestUtilities => src/utils/test}/InlineFlowTest.qll | 0 .../utils/test}/internal/InlineExpectationsTestImpl.qll | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename swift/ql/{test/TestUtilities => src/utils/test}/InlineExpectationsTest.qll (100%) rename swift/ql/{test/TestUtilities => src/utils/test}/InlineExpectationsTestQuery.ql (100%) rename swift/ql/{test/TestUtilities => src/utils/test}/InlineFlowTest.qll (100%) rename swift/ql/{test/TestUtilities => src/utils/test}/internal/InlineExpectationsTestImpl.qll (100%) diff --git a/swift/ql/test/TestUtilities/InlineExpectationsTest.qll b/swift/ql/src/utils/test/InlineExpectationsTest.qll similarity index 100% rename from swift/ql/test/TestUtilities/InlineExpectationsTest.qll rename to swift/ql/src/utils/test/InlineExpectationsTest.qll diff --git a/swift/ql/test/TestUtilities/InlineExpectationsTestQuery.ql b/swift/ql/src/utils/test/InlineExpectationsTestQuery.ql similarity index 100% rename from swift/ql/test/TestUtilities/InlineExpectationsTestQuery.ql rename to swift/ql/src/utils/test/InlineExpectationsTestQuery.ql diff --git a/swift/ql/test/TestUtilities/InlineFlowTest.qll b/swift/ql/src/utils/test/InlineFlowTest.qll similarity index 100% rename from swift/ql/test/TestUtilities/InlineFlowTest.qll rename to swift/ql/src/utils/test/InlineFlowTest.qll diff --git a/swift/ql/test/TestUtilities/internal/InlineExpectationsTestImpl.qll b/swift/ql/src/utils/test/internal/InlineExpectationsTestImpl.qll similarity index 100% rename from swift/ql/test/TestUtilities/internal/InlineExpectationsTestImpl.qll rename to swift/ql/src/utils/test/internal/InlineExpectationsTestImpl.qll From 9ecacddf79306018cffc751b5f4670e23e8c658e Mon Sep 17 00:00:00 2001 From: Michael Nebel Date: Wed, 11 Dec 2024 14:01:30 +0100 Subject: [PATCH 20/24] Swift: Update all test util paths to point to the new location. --- swift/ql/src/utils/test/InlineFlowTest.qll | 4 ++-- swift/ql/test/library-tests/dataflow/capture/FlowInline.ql | 2 +- .../ql/test/library-tests/dataflow/dataflow/DataFlowInline.ql | 2 +- .../library-tests/dataflow/flowsources/FlowSourcesInline.ql | 2 +- .../ql/test/library-tests/dataflow/taint/core/TaintInline.ql | 2 +- .../library-tests/dataflow/taint/libraries/TaintInline.ql | 2 +- swift/ql/test/library-tests/regex/regex.ql | 2 +- .../Security/CWE-022/PathInjection/PathInjectionTest.ql | 2 +- swift/ql/test/query-tests/Security/CWE-094/UnsafeJsEval.qlref | 2 +- .../test/query-tests/Security/CWE-312/CleartextLoggingTest.ql | 2 +- swift/ql/test/query-tests/Security/CWE-611/XXETest.ql | 2 +- .../query-tests/Security/CWE-946/PredicateInjectionTest.ql | 2 +- 12 files changed, 13 insertions(+), 13 deletions(-) diff --git a/swift/ql/src/utils/test/InlineFlowTest.qll b/swift/ql/src/utils/test/InlineFlowTest.qll index 214d28cac042..f50930924ebf 100644 --- a/swift/ql/src/utils/test/InlineFlowTest.qll +++ b/swift/ql/src/utils/test/InlineFlowTest.qll @@ -4,7 +4,7 @@ * Example for a test.ql: * ```ql * import swift - * import TestUtilities.InlineFlowTest + * import utils.test.InlineFlowTest * import DefaultFlowTest * import PathGraph * @@ -39,7 +39,7 @@ import codeql.swift.dataflow.DataFlow import codeql.swift.dataflow.ExternalFlow import codeql.swift.dataflow.TaintTracking -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest private predicate defaultSource(DataFlow::Node source) { source diff --git a/swift/ql/test/library-tests/dataflow/capture/FlowInline.ql b/swift/ql/test/library-tests/dataflow/capture/FlowInline.ql index 50e3f8d2f7de..3fba19d6cdca 100644 --- a/swift/ql/test/library-tests/dataflow/capture/FlowInline.ql +++ b/swift/ql/test/library-tests/dataflow/capture/FlowInline.ql @@ -1,2 +1,2 @@ -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest import DefaultFlowTest diff --git a/swift/ql/test/library-tests/dataflow/dataflow/DataFlowInline.ql b/swift/ql/test/library-tests/dataflow/dataflow/DataFlowInline.ql index dce3fe902ca5..26400f87729b 100644 --- a/swift/ql/test/library-tests/dataflow/dataflow/DataFlowInline.ql +++ b/swift/ql/test/library-tests/dataflow/dataflow/DataFlowInline.ql @@ -1,4 +1,4 @@ -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest import FlowConfig string customTaintFlowTag() { result = "flow" } diff --git a/swift/ql/test/library-tests/dataflow/flowsources/FlowSourcesInline.ql b/swift/ql/test/library-tests/dataflow/flowsources/FlowSourcesInline.ql index e4ea2e0e56e2..193a5a748bb0 100644 --- a/swift/ql/test/library-tests/dataflow/flowsources/FlowSourcesInline.ql +++ b/swift/ql/test/library-tests/dataflow/flowsources/FlowSourcesInline.ql @@ -1,5 +1,5 @@ import swift -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest import FlowConfig import codeql.swift.dataflow.TaintTracking import codeql.swift.dataflow.DataFlow diff --git a/swift/ql/test/library-tests/dataflow/taint/core/TaintInline.ql b/swift/ql/test/library-tests/dataflow/taint/core/TaintInline.ql index 971896d835cf..05197e4d58be 100644 --- a/swift/ql/test/library-tests/dataflow/taint/core/TaintInline.ql +++ b/swift/ql/test/library-tests/dataflow/taint/core/TaintInline.ql @@ -1,4 +1,4 @@ -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest import Taint string customTaintFlowTag() { result = "tainted" } diff --git a/swift/ql/test/library-tests/dataflow/taint/libraries/TaintInline.ql b/swift/ql/test/library-tests/dataflow/taint/libraries/TaintInline.ql index 0608a134e6cd..6f550be74097 100644 --- a/swift/ql/test/library-tests/dataflow/taint/libraries/TaintInline.ql +++ b/swift/ql/test/library-tests/dataflow/taint/libraries/TaintInline.ql @@ -1,4 +1,4 @@ -import TestUtilities.InlineFlowTest +import utils.test.InlineFlowTest string customTaintFlowTag() { result = "tainted" } diff --git a/swift/ql/test/library-tests/regex/regex.ql b/swift/ql/test/library-tests/regex/regex.ql index 208909ba6524..c1be7a605729 100644 --- a/swift/ql/test/library-tests/regex/regex.ql +++ b/swift/ql/test/library-tests/regex/regex.ql @@ -3,7 +3,7 @@ import codeql.swift.regex.Regex private import codeql.swift.regex.internal.ParseRegex private import codeql.swift.regex.RegexTreeView::RegexTreeView as TreeView import codeql.regex.nfa.ExponentialBackTracking::Make -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest bindingset[s] string quote(string s) { if s.matches("% %") then result = "\"" + s + "\"" else result = s } diff --git a/swift/ql/test/query-tests/Security/CWE-022/PathInjection/PathInjectionTest.ql b/swift/ql/test/query-tests/Security/CWE-022/PathInjection/PathInjectionTest.ql index 0e21c40886ec..a32f9c56ee90 100644 --- a/swift/ql/test/query-tests/Security/CWE-022/PathInjection/PathInjectionTest.ql +++ b/swift/ql/test/query-tests/Security/CWE-022/PathInjection/PathInjectionTest.ql @@ -2,7 +2,7 @@ import swift import codeql.swift.dataflow.DataFlow import codeql.swift.dataflow.FlowSources import codeql.swift.security.PathInjectionQuery -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest module PathInjectionTest implements TestSig { string getARelevantTag() { result = "hasPathInjection" } diff --git a/swift/ql/test/query-tests/Security/CWE-094/UnsafeJsEval.qlref b/swift/ql/test/query-tests/Security/CWE-094/UnsafeJsEval.qlref index 51ad8bf6ed37..55cc812d7365 100644 --- a/swift/ql/test/query-tests/Security/CWE-094/UnsafeJsEval.qlref +++ b/swift/ql/test/query-tests/Security/CWE-094/UnsafeJsEval.qlref @@ -1,2 +1,2 @@ query: queries/Security/CWE-094/UnsafeJsEval.ql -postprocess: TestUtilities/InlineExpectationsTestQuery.ql +postprocess: utils/test/InlineExpectationsTestQuery.ql diff --git a/swift/ql/test/query-tests/Security/CWE-312/CleartextLoggingTest.ql b/swift/ql/test/query-tests/Security/CWE-312/CleartextLoggingTest.ql index 5ad644f6a6dc..e7371e9d7435 100644 --- a/swift/ql/test/query-tests/Security/CWE-312/CleartextLoggingTest.ql +++ b/swift/ql/test/query-tests/Security/CWE-312/CleartextLoggingTest.ql @@ -1,7 +1,7 @@ import swift import codeql.swift.dataflow.DataFlow import codeql.swift.security.CleartextLoggingQuery -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest module CleartextLogging implements TestSig { string getARelevantTag() { result = "hasCleartextLogging" } diff --git a/swift/ql/test/query-tests/Security/CWE-611/XXETest.ql b/swift/ql/test/query-tests/Security/CWE-611/XXETest.ql index 684cef766d66..64001151b442 100644 --- a/swift/ql/test/query-tests/Security/CWE-611/XXETest.ql +++ b/swift/ql/test/query-tests/Security/CWE-611/XXETest.ql @@ -1,7 +1,7 @@ import swift import codeql.swift.dataflow.FlowSources import codeql.swift.security.XXEQuery -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest class TestRemoteSource extends RemoteFlowSource { TestRemoteSource() { this.asExpr().(ApplyExpr).getStaticTarget().getName().matches("source%") } diff --git a/swift/ql/test/query-tests/Security/CWE-946/PredicateInjectionTest.ql b/swift/ql/test/query-tests/Security/CWE-946/PredicateInjectionTest.ql index 2c1eafa0b71c..202ca05ad43b 100644 --- a/swift/ql/test/query-tests/Security/CWE-946/PredicateInjectionTest.ql +++ b/swift/ql/test/query-tests/Security/CWE-946/PredicateInjectionTest.ql @@ -1,7 +1,7 @@ import swift import codeql.swift.dataflow.DataFlow import codeql.swift.security.PredicateInjectionQuery -import TestUtilities.InlineExpectationsTest +import utils.test.InlineExpectationsTest module PredicateInjectionTest implements TestSig { string getARelevantTag() { result = "hasPredicateInjection" } From cbae2cf7faba4eafdd52fbd38bf0167af03f26f0 Mon Sep 17 00:00:00 2001 From: Michael Nebel Date: Thu, 12 Dec 2024 13:05:10 +0100 Subject: [PATCH 21/24] Rust: Move test utilities into the query pack. --- rust/ql/{test/utils => src/utils/test}/InlineExpectationsTest.qll | 0 .../{test/utils => src/utils/test}/InlineExpectationsTestQuery.ql | 0 rust/ql/{test/utils => src/utils/test}/InlineFlowTest.qll | 0 rust/ql/{test/utils => src/utils/test}/PrettyPrintModels.ql | 0 rust/ql/{test/utils => src/utils/test}/ProvenancePathGraph.qll | 0 .../utils/test}/internal/InlineExpectationsTestImpl.qll | 0 6 files changed, 0 insertions(+), 0 deletions(-) rename rust/ql/{test/utils => src/utils/test}/InlineExpectationsTest.qll (100%) rename rust/ql/{test/utils => src/utils/test}/InlineExpectationsTestQuery.ql (100%) rename rust/ql/{test/utils => src/utils/test}/InlineFlowTest.qll (100%) rename rust/ql/{test/utils => src/utils/test}/PrettyPrintModels.ql (100%) rename rust/ql/{test/utils => src/utils/test}/ProvenancePathGraph.qll (100%) rename rust/ql/{test/utils => src/utils/test}/internal/InlineExpectationsTestImpl.qll (100%) diff --git a/rust/ql/test/utils/InlineExpectationsTest.qll b/rust/ql/src/utils/test/InlineExpectationsTest.qll similarity index 100% rename from rust/ql/test/utils/InlineExpectationsTest.qll rename to rust/ql/src/utils/test/InlineExpectationsTest.qll diff --git a/rust/ql/test/utils/InlineExpectationsTestQuery.ql b/rust/ql/src/utils/test/InlineExpectationsTestQuery.ql similarity index 100% rename from rust/ql/test/utils/InlineExpectationsTestQuery.ql rename to rust/ql/src/utils/test/InlineExpectationsTestQuery.ql diff --git a/rust/ql/test/utils/InlineFlowTest.qll b/rust/ql/src/utils/test/InlineFlowTest.qll similarity index 100% rename from rust/ql/test/utils/InlineFlowTest.qll rename to rust/ql/src/utils/test/InlineFlowTest.qll diff --git a/rust/ql/test/utils/PrettyPrintModels.ql b/rust/ql/src/utils/test/PrettyPrintModels.ql similarity index 100% rename from rust/ql/test/utils/PrettyPrintModels.ql rename to rust/ql/src/utils/test/PrettyPrintModels.ql diff --git a/rust/ql/test/utils/ProvenancePathGraph.qll b/rust/ql/src/utils/test/ProvenancePathGraph.qll similarity index 100% rename from rust/ql/test/utils/ProvenancePathGraph.qll rename to rust/ql/src/utils/test/ProvenancePathGraph.qll diff --git a/rust/ql/test/utils/internal/InlineExpectationsTestImpl.qll b/rust/ql/src/utils/test/internal/InlineExpectationsTestImpl.qll similarity index 100% rename from rust/ql/test/utils/internal/InlineExpectationsTestImpl.qll rename to rust/ql/src/utils/test/internal/InlineExpectationsTestImpl.qll From 864c34fc03b208598f0ded4a5eb20529a62b8268 Mon Sep 17 00:00:00 2001 From: Michael Nebel Date: Thu, 12 Dec 2024 13:18:00 +0100 Subject: [PATCH 22/24] Rust: Update all test util paths to point to the new location. --- rust/ql/test/library-tests/dataflow/barrier/inline-flow.ql | 2 +- rust/ql/test/library-tests/dataflow/global/inline-flow.ql | 2 +- rust/ql/test/library-tests/dataflow/local/inline-flow.ql | 2 +- rust/ql/test/library-tests/dataflow/models/models.ql | 2 +- rust/ql/test/library-tests/dataflow/sources/InlineFlow.ql | 2 +- .../ql/test/library-tests/dataflow/sources/TaintSources.qlref | 2 +- .../ql/test/library-tests/dataflow/taint/inline-taint-flow.ql | 2 +- rust/ql/test/library-tests/variables/variables.ql | 2 +- rust/ql/test/query-tests/security/CWE-089/SqlInjection.qlref | 4 ++-- rust/ql/test/query-tests/security/CWE-089/SqlSinks.ql | 2 +- .../query-tests/security/CWE-696/BadCTorInitialization.qlref | 2 +- rust/ql/test/query-tests/unusedentities/UnreachableCode.qlref | 2 +- rust/ql/test/query-tests/unusedentities/UnusedValue.qlref | 2 +- rust/ql/test/query-tests/unusedentities/UnusedVariable.qlref | 2 +- 14 files changed, 15 insertions(+), 15 deletions(-) diff --git a/rust/ql/test/library-tests/dataflow/barrier/inline-flow.ql b/rust/ql/test/library-tests/dataflow/barrier/inline-flow.ql index ad553fe548dc..e399ea0e5d71 100644 --- a/rust/ql/test/library-tests/dataflow/barrier/inline-flow.ql +++ b/rust/ql/test/library-tests/dataflow/barrier/inline-flow.ql @@ -3,7 +3,7 @@ */ import rust -import utils.InlineFlowTest +import utils.test.InlineFlowTest import DefaultFlowTest import ValueFlow::PathGraph diff --git a/rust/ql/test/library-tests/dataflow/global/inline-flow.ql b/rust/ql/test/library-tests/dataflow/global/inline-flow.ql index ad553fe548dc..e399ea0e5d71 100644 --- a/rust/ql/test/library-tests/dataflow/global/inline-flow.ql +++ b/rust/ql/test/library-tests/dataflow/global/inline-flow.ql @@ -3,7 +3,7 @@ */ import rust -import utils.InlineFlowTest +import utils.test.InlineFlowTest import DefaultFlowTest import ValueFlow::PathGraph diff --git a/rust/ql/test/library-tests/dataflow/local/inline-flow.ql b/rust/ql/test/library-tests/dataflow/local/inline-flow.ql index ad553fe548dc..e399ea0e5d71 100644 --- a/rust/ql/test/library-tests/dataflow/local/inline-flow.ql +++ b/rust/ql/test/library-tests/dataflow/local/inline-flow.ql @@ -3,7 +3,7 @@ */ import rust -import utils.InlineFlowTest +import utils.test.InlineFlowTest import DefaultFlowTest import ValueFlow::PathGraph diff --git a/rust/ql/test/library-tests/dataflow/models/models.ql b/rust/ql/test/library-tests/dataflow/models/models.ql index e456d6d1c1c1..f419c266862e 100644 --- a/rust/ql/test/library-tests/dataflow/models/models.ql +++ b/rust/ql/test/library-tests/dataflow/models/models.ql @@ -3,7 +3,7 @@ */ import rust -import utils.InlineFlowTest +import utils.test.InlineFlowTest import codeql.rust.dataflow.DataFlow import codeql.rust.dataflow.FlowSummary import codeql.rust.dataflow.TaintTracking diff --git a/rust/ql/test/library-tests/dataflow/sources/InlineFlow.ql b/rust/ql/test/library-tests/dataflow/sources/InlineFlow.ql index 5bcbe05229bb..92a41dc46811 100644 --- a/rust/ql/test/library-tests/dataflow/sources/InlineFlow.ql +++ b/rust/ql/test/library-tests/dataflow/sources/InlineFlow.ql @@ -1,7 +1,7 @@ import rust import codeql.rust.dataflow.DataFlow import codeql.rust.Concepts -import utils.InlineFlowTest +import utils.test.InlineFlowTest /** * Configuration for flow from any threat model source to an argument of the function `sink`. diff --git a/rust/ql/test/library-tests/dataflow/sources/TaintSources.qlref b/rust/ql/test/library-tests/dataflow/sources/TaintSources.qlref index 3f6de4d0e4e3..7aa95121af3e 100644 --- a/rust/ql/test/library-tests/dataflow/sources/TaintSources.qlref +++ b/rust/ql/test/library-tests/dataflow/sources/TaintSources.qlref @@ -1,2 +1,2 @@ query: queries/summary/TaintSources.ql -postprocess: utils/InlineExpectationsTestQuery.ql +postprocess: utils/test/InlineExpectationsTestQuery.ql diff --git a/rust/ql/test/library-tests/dataflow/taint/inline-taint-flow.ql b/rust/ql/test/library-tests/dataflow/taint/inline-taint-flow.ql index 2929ae90964f..5dcb7ee70a9d 100644 --- a/rust/ql/test/library-tests/dataflow/taint/inline-taint-flow.ql +++ b/rust/ql/test/library-tests/dataflow/taint/inline-taint-flow.ql @@ -3,7 +3,7 @@ */ import rust -import utils.InlineFlowTest +import utils.test.InlineFlowTest import DefaultFlowTest import TaintFlow::PathGraph diff --git a/rust/ql/test/library-tests/variables/variables.ql b/rust/ql/test/library-tests/variables/variables.ql index 23eab9774457..cbadfe53d346 100644 --- a/rust/ql/test/library-tests/variables/variables.ql +++ b/rust/ql/test/library-tests/variables/variables.ql @@ -1,5 +1,5 @@ import rust -import utils.InlineExpectationsTest +import utils.test.InlineExpectationsTest query predicate variable(Variable v) { any() } diff --git a/rust/ql/test/query-tests/security/CWE-089/SqlInjection.qlref b/rust/ql/test/query-tests/security/CWE-089/SqlInjection.qlref index 7aee10fcc4a5..269ef42b0d40 100644 --- a/rust/ql/test/query-tests/security/CWE-089/SqlInjection.qlref +++ b/rust/ql/test/query-tests/security/CWE-089/SqlInjection.qlref @@ -1,4 +1,4 @@ query: queries/security/CWE-089/SqlInjection.ql postprocess: - - utils/PrettyPrintModels.ql - - utils/InlineExpectationsTestQuery.ql + - utils/test/PrettyPrintModels.ql + - utils/test/InlineExpectationsTestQuery.ql diff --git a/rust/ql/test/query-tests/security/CWE-089/SqlSinks.ql b/rust/ql/test/query-tests/security/CWE-089/SqlSinks.ql index ac5efd72db91..5e992146c2af 100644 --- a/rust/ql/test/query-tests/security/CWE-089/SqlSinks.ql +++ b/rust/ql/test/query-tests/security/CWE-089/SqlSinks.ql @@ -1,6 +1,6 @@ import rust import codeql.rust.security.SqlInjectionExtensions -import utils.InlineExpectationsTest +import utils.test.InlineExpectationsTest module SqlSinksTest implements TestSig { string getARelevantTag() { result = "sql-sink" } diff --git a/rust/ql/test/query-tests/security/CWE-696/BadCTorInitialization.qlref b/rust/ql/test/query-tests/security/CWE-696/BadCTorInitialization.qlref index 2b71705c98b8..2a850f7d0979 100644 --- a/rust/ql/test/query-tests/security/CWE-696/BadCTorInitialization.qlref +++ b/rust/ql/test/query-tests/security/CWE-696/BadCTorInitialization.qlref @@ -1,2 +1,2 @@ query: queries/security/CWE-696/BadCtorInitialization.ql -postprocess: utils/InlineExpectationsTestQuery.ql +postprocess: utils/test/InlineExpectationsTestQuery.ql diff --git a/rust/ql/test/query-tests/unusedentities/UnreachableCode.qlref b/rust/ql/test/query-tests/unusedentities/UnreachableCode.qlref index 23ca9359181e..e5d2530725ad 100644 --- a/rust/ql/test/query-tests/unusedentities/UnreachableCode.qlref +++ b/rust/ql/test/query-tests/unusedentities/UnreachableCode.qlref @@ -1,2 +1,2 @@ query: queries/unusedentities/UnreachableCode.ql -postprocess: utils/InlineExpectationsTestQuery.ql \ No newline at end of file +postprocess: utils/test/InlineExpectationsTestQuery.ql diff --git a/rust/ql/test/query-tests/unusedentities/UnusedValue.qlref b/rust/ql/test/query-tests/unusedentities/UnusedValue.qlref index d08b310e2d04..f32a0d6b7ea2 100644 --- a/rust/ql/test/query-tests/unusedentities/UnusedValue.qlref +++ b/rust/ql/test/query-tests/unusedentities/UnusedValue.qlref @@ -1,2 +1,2 @@ query: queries/unusedentities/UnusedValue.ql -postprocess: utils/InlineExpectationsTestQuery.ql \ No newline at end of file +postprocess: utils/test/InlineExpectationsTestQuery.ql diff --git a/rust/ql/test/query-tests/unusedentities/UnusedVariable.qlref b/rust/ql/test/query-tests/unusedentities/UnusedVariable.qlref index 709d2b61d550..67f81cd140b8 100644 --- a/rust/ql/test/query-tests/unusedentities/UnusedVariable.qlref +++ b/rust/ql/test/query-tests/unusedentities/UnusedVariable.qlref @@ -1,2 +1,2 @@ query: queries/unusedentities/UnusedVariable.ql -postprocess: utils/InlineExpectationsTestQuery.ql \ No newline at end of file +postprocess: utils/test/InlineExpectationsTestQuery.ql From 941b0abbf605520a7299e53eeed678e4253eba4b Mon Sep 17 00:00:00 2001 From: Michael Nebel Date: Thu, 12 Dec 2024 09:54:10 +0100 Subject: [PATCH 23/24] Move modules to the library packs. --- cpp/ql/{src => lib}/utils/test/InlineExpectationsTest.qll | 0 cpp/ql/{src => lib}/utils/test/dataflow/FlowTestCommon.qll | 0 .../utils/test/internal/InlineExpectationsTestImpl.qll | 0 cpp/ql/src/utils/test/InlineExpectationsTestQuery.ql | 2 +- csharp/ql/{src => lib}/utils/test/InlineExpectationsTest.qll | 0 csharp/ql/{src => lib}/utils/test/InlineFlowTest.qll | 0 csharp/ql/{src => lib}/utils/test/InlineMadTest.qll | 0 csharp/ql/{src => lib}/utils/test/ProvenancePathGraph.qll | 0 .../utils/test/internal/InlineExpectationsTestImpl.qll | 0 csharp/ql/src/utils/test/InlineExpectationsTestQuery.ql | 2 +- go/ql/{src => lib}/utils/test/InlineExpectationsTest.qll | 0 go/ql/{src => lib}/utils/test/InlineFlowTest.qll | 0 .../utils/test/internal/InlineExpectationsTestImpl.qll | 0 go/ql/src/utils/test/InlineExpectationsTestQuery.ql | 2 +- java/ql/{src => lib}/utils/test/InlineExpectationsTest.qll | 0 java/ql/{src => lib}/utils/test/InlineFlowTest.qll | 0 java/ql/{src => lib}/utils/test/InlineMadTest.qll | 0 .../utils/test/internal/InlineExpectationsTestImpl.qll | 0 java/ql/src/utils/test/InlineExpectationsTestQuery.ql | 2 +- javascript/ql/{src => lib}/utils/test/ConsistencyChecking.qll | 0 .../ql/{src => lib}/utils/test/InlineExpectationsTest.qll | 0 .../utils/test/internal/InlineExpectationsTestImpl.qll | 0 javascript/ql/src/utils/test/InlineExpectationsTestQuery.ql | 2 +- python/ql/{src => lib}/utils/test/InlineExpectationsTest.qll | 0 python/ql/{src => lib}/utils/test/VerifyApiGraphs.qll | 0 .../ql/{src => lib}/utils/test/dataflow/DataflowQueryTest.qll | 0 python/ql/{src => lib}/utils/test/dataflow/FlowTest.qll | 0 .../ql/{src => lib}/utils/test/dataflow/LocalFlowStepTest.qll | 0 python/ql/{src => lib}/utils/test/dataflow/MaximalFlowTest.qll | 0 .../ql/{src => lib}/utils/test/dataflow/NormalDataflowTest.qll | 0 .../utils/test/dataflow/NormalTaintTrackingTest.qll | 0 python/ql/{src => lib}/utils/test/dataflow/RoutingTest.qll | 0 python/ql/{src => lib}/utils/test/dataflow/UnresolvedCalls.qll | 0 python/ql/{src => lib}/utils/test/dataflow/callGraphConfig.qll | 0 python/ql/{src => lib}/utils/test/dataflow/testConfig.qll | 0 python/ql/{src => lib}/utils/test/dataflow/testTaintConfig.qll | 0 .../utils/test/internal/InlineExpectationsTestImpl.qll | 0 python/ql/src/utils/test/InlineExpectationsTestQuery.ql | 2 +- ruby/ql/{src => lib}/utils/test/InlineExpectationsTest.qll | 0 ruby/ql/{src => lib}/utils/test/InlineFlowTest.qll | 0 ruby/ql/{src => lib}/utils/test/InlineFlowTestUtil.qll | 0 ruby/ql/{src => lib}/utils/test/InlineTypeTrackingFlowTest.qll | 0 .../utils/test/internal/InlineExpectationsTestImpl.qll | 0 ruby/ql/src/utils/test/InlineExpectationsTestQuery.ql | 2 +- rust/ql/{src => lib}/utils/test/InlineExpectationsTest.qll | 0 rust/ql/{src => lib}/utils/test/InlineFlowTest.qll | 0 rust/ql/{src => lib}/utils/test/ProvenancePathGraph.qll | 0 .../utils/test/internal/InlineExpectationsTestImpl.qll | 0 rust/ql/src/utils/test/InlineExpectationsTestQuery.ql | 2 +- swift/ql/{src => lib}/utils/test/InlineExpectationsTest.qll | 0 swift/ql/{src => lib}/utils/test/InlineFlowTest.qll | 0 .../utils/test/internal/InlineExpectationsTestImpl.qll | 0 swift/ql/src/utils/test/InlineExpectationsTestQuery.ql | 2 +- 53 files changed, 9 insertions(+), 9 deletions(-) rename cpp/ql/{src => lib}/utils/test/InlineExpectationsTest.qll (100%) rename cpp/ql/{src => lib}/utils/test/dataflow/FlowTestCommon.qll (100%) rename cpp/ql/{src => lib}/utils/test/internal/InlineExpectationsTestImpl.qll (100%) rename csharp/ql/{src => lib}/utils/test/InlineExpectationsTest.qll (100%) rename csharp/ql/{src => lib}/utils/test/InlineFlowTest.qll (100%) rename csharp/ql/{src => lib}/utils/test/InlineMadTest.qll (100%) rename csharp/ql/{src => lib}/utils/test/ProvenancePathGraph.qll (100%) rename csharp/ql/{src => lib}/utils/test/internal/InlineExpectationsTestImpl.qll (100%) rename go/ql/{src => lib}/utils/test/InlineExpectationsTest.qll (100%) rename go/ql/{src => lib}/utils/test/InlineFlowTest.qll (100%) rename go/ql/{src => lib}/utils/test/internal/InlineExpectationsTestImpl.qll (100%) rename java/ql/{src => lib}/utils/test/InlineExpectationsTest.qll (100%) rename java/ql/{src => lib}/utils/test/InlineFlowTest.qll (100%) rename java/ql/{src => lib}/utils/test/InlineMadTest.qll (100%) rename java/ql/{src => lib}/utils/test/internal/InlineExpectationsTestImpl.qll (100%) rename javascript/ql/{src => lib}/utils/test/ConsistencyChecking.qll (100%) rename javascript/ql/{src => lib}/utils/test/InlineExpectationsTest.qll (100%) rename javascript/ql/{src => lib}/utils/test/internal/InlineExpectationsTestImpl.qll (100%) rename python/ql/{src => lib}/utils/test/InlineExpectationsTest.qll (100%) rename python/ql/{src => lib}/utils/test/VerifyApiGraphs.qll (100%) rename python/ql/{src => lib}/utils/test/dataflow/DataflowQueryTest.qll (100%) rename python/ql/{src => lib}/utils/test/dataflow/FlowTest.qll (100%) rename python/ql/{src => lib}/utils/test/dataflow/LocalFlowStepTest.qll (100%) rename python/ql/{src => lib}/utils/test/dataflow/MaximalFlowTest.qll (100%) rename python/ql/{src => lib}/utils/test/dataflow/NormalDataflowTest.qll (100%) rename python/ql/{src => lib}/utils/test/dataflow/NormalTaintTrackingTest.qll (100%) rename python/ql/{src => lib}/utils/test/dataflow/RoutingTest.qll (100%) rename python/ql/{src => lib}/utils/test/dataflow/UnresolvedCalls.qll (100%) rename python/ql/{src => lib}/utils/test/dataflow/callGraphConfig.qll (100%) rename python/ql/{src => lib}/utils/test/dataflow/testConfig.qll (100%) rename python/ql/{src => lib}/utils/test/dataflow/testTaintConfig.qll (100%) rename python/ql/{src => lib}/utils/test/internal/InlineExpectationsTestImpl.qll (100%) rename ruby/ql/{src => lib}/utils/test/InlineExpectationsTest.qll (100%) rename ruby/ql/{src => lib}/utils/test/InlineFlowTest.qll (100%) rename ruby/ql/{src => lib}/utils/test/InlineFlowTestUtil.qll (100%) rename ruby/ql/{src => lib}/utils/test/InlineTypeTrackingFlowTest.qll (100%) rename ruby/ql/{src => lib}/utils/test/internal/InlineExpectationsTestImpl.qll (100%) rename rust/ql/{src => lib}/utils/test/InlineExpectationsTest.qll (100%) rename rust/ql/{src => lib}/utils/test/InlineFlowTest.qll (100%) rename rust/ql/{src => lib}/utils/test/ProvenancePathGraph.qll (100%) rename rust/ql/{src => lib}/utils/test/internal/InlineExpectationsTestImpl.qll (100%) rename swift/ql/{src => lib}/utils/test/InlineExpectationsTest.qll (100%) rename swift/ql/{src => lib}/utils/test/InlineFlowTest.qll (100%) rename swift/ql/{src => lib}/utils/test/internal/InlineExpectationsTestImpl.qll (100%) diff --git a/cpp/ql/src/utils/test/InlineExpectationsTest.qll b/cpp/ql/lib/utils/test/InlineExpectationsTest.qll similarity index 100% rename from cpp/ql/src/utils/test/InlineExpectationsTest.qll rename to cpp/ql/lib/utils/test/InlineExpectationsTest.qll diff --git a/cpp/ql/src/utils/test/dataflow/FlowTestCommon.qll b/cpp/ql/lib/utils/test/dataflow/FlowTestCommon.qll similarity index 100% rename from cpp/ql/src/utils/test/dataflow/FlowTestCommon.qll rename to cpp/ql/lib/utils/test/dataflow/FlowTestCommon.qll diff --git a/cpp/ql/src/utils/test/internal/InlineExpectationsTestImpl.qll b/cpp/ql/lib/utils/test/internal/InlineExpectationsTestImpl.qll similarity index 100% rename from cpp/ql/src/utils/test/internal/InlineExpectationsTestImpl.qll rename to cpp/ql/lib/utils/test/internal/InlineExpectationsTestImpl.qll diff --git a/cpp/ql/src/utils/test/InlineExpectationsTestQuery.ql b/cpp/ql/src/utils/test/InlineExpectationsTestQuery.ql index 8e6977ba5321..489fa53affb2 100644 --- a/cpp/ql/src/utils/test/InlineExpectationsTestQuery.ql +++ b/cpp/ql/src/utils/test/InlineExpectationsTestQuery.ql @@ -4,7 +4,7 @@ private import cpp private import codeql.util.test.InlineExpectationsTest as T -private import internal.InlineExpectationsTestImpl +private import utils.test.internal.InlineExpectationsTestImpl import T::TestPostProcessing import T::TestPostProcessing::Make diff --git a/csharp/ql/src/utils/test/InlineExpectationsTest.qll b/csharp/ql/lib/utils/test/InlineExpectationsTest.qll similarity index 100% rename from csharp/ql/src/utils/test/InlineExpectationsTest.qll rename to csharp/ql/lib/utils/test/InlineExpectationsTest.qll diff --git a/csharp/ql/src/utils/test/InlineFlowTest.qll b/csharp/ql/lib/utils/test/InlineFlowTest.qll similarity index 100% rename from csharp/ql/src/utils/test/InlineFlowTest.qll rename to csharp/ql/lib/utils/test/InlineFlowTest.qll diff --git a/csharp/ql/src/utils/test/InlineMadTest.qll b/csharp/ql/lib/utils/test/InlineMadTest.qll similarity index 100% rename from csharp/ql/src/utils/test/InlineMadTest.qll rename to csharp/ql/lib/utils/test/InlineMadTest.qll diff --git a/csharp/ql/src/utils/test/ProvenancePathGraph.qll b/csharp/ql/lib/utils/test/ProvenancePathGraph.qll similarity index 100% rename from csharp/ql/src/utils/test/ProvenancePathGraph.qll rename to csharp/ql/lib/utils/test/ProvenancePathGraph.qll diff --git a/csharp/ql/src/utils/test/internal/InlineExpectationsTestImpl.qll b/csharp/ql/lib/utils/test/internal/InlineExpectationsTestImpl.qll similarity index 100% rename from csharp/ql/src/utils/test/internal/InlineExpectationsTestImpl.qll rename to csharp/ql/lib/utils/test/internal/InlineExpectationsTestImpl.qll diff --git a/csharp/ql/src/utils/test/InlineExpectationsTestQuery.ql b/csharp/ql/src/utils/test/InlineExpectationsTestQuery.ql index 35901ee64012..17f16f9506ef 100644 --- a/csharp/ql/src/utils/test/InlineExpectationsTestQuery.ql +++ b/csharp/ql/src/utils/test/InlineExpectationsTestQuery.ql @@ -4,7 +4,7 @@ private import csharp private import codeql.util.test.InlineExpectationsTest as T -private import internal.InlineExpectationsTestImpl +private import utils.test.internal.InlineExpectationsTestImpl import T::TestPostProcessing import T::TestPostProcessing::Make diff --git a/go/ql/src/utils/test/InlineExpectationsTest.qll b/go/ql/lib/utils/test/InlineExpectationsTest.qll similarity index 100% rename from go/ql/src/utils/test/InlineExpectationsTest.qll rename to go/ql/lib/utils/test/InlineExpectationsTest.qll diff --git a/go/ql/src/utils/test/InlineFlowTest.qll b/go/ql/lib/utils/test/InlineFlowTest.qll similarity index 100% rename from go/ql/src/utils/test/InlineFlowTest.qll rename to go/ql/lib/utils/test/InlineFlowTest.qll diff --git a/go/ql/src/utils/test/internal/InlineExpectationsTestImpl.qll b/go/ql/lib/utils/test/internal/InlineExpectationsTestImpl.qll similarity index 100% rename from go/ql/src/utils/test/internal/InlineExpectationsTestImpl.qll rename to go/ql/lib/utils/test/internal/InlineExpectationsTestImpl.qll diff --git a/go/ql/src/utils/test/InlineExpectationsTestQuery.ql b/go/ql/src/utils/test/InlineExpectationsTestQuery.ql index 1cf2f5ea1d9b..491849fa509f 100644 --- a/go/ql/src/utils/test/InlineExpectationsTestQuery.ql +++ b/go/ql/src/utils/test/InlineExpectationsTestQuery.ql @@ -4,7 +4,7 @@ private import go private import codeql.util.test.InlineExpectationsTest as T -private import internal.InlineExpectationsTestImpl +private import utils.test.internal.InlineExpectationsTestImpl import T::TestPostProcessing import T::TestPostProcessing::Make diff --git a/java/ql/src/utils/test/InlineExpectationsTest.qll b/java/ql/lib/utils/test/InlineExpectationsTest.qll similarity index 100% rename from java/ql/src/utils/test/InlineExpectationsTest.qll rename to java/ql/lib/utils/test/InlineExpectationsTest.qll diff --git a/java/ql/src/utils/test/InlineFlowTest.qll b/java/ql/lib/utils/test/InlineFlowTest.qll similarity index 100% rename from java/ql/src/utils/test/InlineFlowTest.qll rename to java/ql/lib/utils/test/InlineFlowTest.qll diff --git a/java/ql/src/utils/test/InlineMadTest.qll b/java/ql/lib/utils/test/InlineMadTest.qll similarity index 100% rename from java/ql/src/utils/test/InlineMadTest.qll rename to java/ql/lib/utils/test/InlineMadTest.qll diff --git a/java/ql/src/utils/test/internal/InlineExpectationsTestImpl.qll b/java/ql/lib/utils/test/internal/InlineExpectationsTestImpl.qll similarity index 100% rename from java/ql/src/utils/test/internal/InlineExpectationsTestImpl.qll rename to java/ql/lib/utils/test/internal/InlineExpectationsTestImpl.qll diff --git a/java/ql/src/utils/test/InlineExpectationsTestQuery.ql b/java/ql/src/utils/test/InlineExpectationsTestQuery.ql index b0360dfecd8d..597c3f460a14 100644 --- a/java/ql/src/utils/test/InlineExpectationsTestQuery.ql +++ b/java/ql/src/utils/test/InlineExpectationsTestQuery.ql @@ -4,7 +4,7 @@ private import java private import codeql.util.test.InlineExpectationsTest as T -private import internal.InlineExpectationsTestImpl +private import utils.test.internal.InlineExpectationsTestImpl import T::TestPostProcessing import T::TestPostProcessing::Make diff --git a/javascript/ql/src/utils/test/ConsistencyChecking.qll b/javascript/ql/lib/utils/test/ConsistencyChecking.qll similarity index 100% rename from javascript/ql/src/utils/test/ConsistencyChecking.qll rename to javascript/ql/lib/utils/test/ConsistencyChecking.qll diff --git a/javascript/ql/src/utils/test/InlineExpectationsTest.qll b/javascript/ql/lib/utils/test/InlineExpectationsTest.qll similarity index 100% rename from javascript/ql/src/utils/test/InlineExpectationsTest.qll rename to javascript/ql/lib/utils/test/InlineExpectationsTest.qll diff --git a/javascript/ql/src/utils/test/internal/InlineExpectationsTestImpl.qll b/javascript/ql/lib/utils/test/internal/InlineExpectationsTestImpl.qll similarity index 100% rename from javascript/ql/src/utils/test/internal/InlineExpectationsTestImpl.qll rename to javascript/ql/lib/utils/test/internal/InlineExpectationsTestImpl.qll diff --git a/javascript/ql/src/utils/test/InlineExpectationsTestQuery.ql b/javascript/ql/src/utils/test/InlineExpectationsTestQuery.ql index 55892be75d79..9edac1c29a4f 100644 --- a/javascript/ql/src/utils/test/InlineExpectationsTestQuery.ql +++ b/javascript/ql/src/utils/test/InlineExpectationsTestQuery.ql @@ -4,7 +4,7 @@ private import javascript private import codeql.util.test.InlineExpectationsTest as T -private import internal.InlineExpectationsTestImpl +private import utils.test.internal.InlineExpectationsTestImpl import T::TestPostProcessing import T::TestPostProcessing::Make diff --git a/python/ql/src/utils/test/InlineExpectationsTest.qll b/python/ql/lib/utils/test/InlineExpectationsTest.qll similarity index 100% rename from python/ql/src/utils/test/InlineExpectationsTest.qll rename to python/ql/lib/utils/test/InlineExpectationsTest.qll diff --git a/python/ql/src/utils/test/VerifyApiGraphs.qll b/python/ql/lib/utils/test/VerifyApiGraphs.qll similarity index 100% rename from python/ql/src/utils/test/VerifyApiGraphs.qll rename to python/ql/lib/utils/test/VerifyApiGraphs.qll diff --git a/python/ql/src/utils/test/dataflow/DataflowQueryTest.qll b/python/ql/lib/utils/test/dataflow/DataflowQueryTest.qll similarity index 100% rename from python/ql/src/utils/test/dataflow/DataflowQueryTest.qll rename to python/ql/lib/utils/test/dataflow/DataflowQueryTest.qll diff --git a/python/ql/src/utils/test/dataflow/FlowTest.qll b/python/ql/lib/utils/test/dataflow/FlowTest.qll similarity index 100% rename from python/ql/src/utils/test/dataflow/FlowTest.qll rename to python/ql/lib/utils/test/dataflow/FlowTest.qll diff --git a/python/ql/src/utils/test/dataflow/LocalFlowStepTest.qll b/python/ql/lib/utils/test/dataflow/LocalFlowStepTest.qll similarity index 100% rename from python/ql/src/utils/test/dataflow/LocalFlowStepTest.qll rename to python/ql/lib/utils/test/dataflow/LocalFlowStepTest.qll diff --git a/python/ql/src/utils/test/dataflow/MaximalFlowTest.qll b/python/ql/lib/utils/test/dataflow/MaximalFlowTest.qll similarity index 100% rename from python/ql/src/utils/test/dataflow/MaximalFlowTest.qll rename to python/ql/lib/utils/test/dataflow/MaximalFlowTest.qll diff --git a/python/ql/src/utils/test/dataflow/NormalDataflowTest.qll b/python/ql/lib/utils/test/dataflow/NormalDataflowTest.qll similarity index 100% rename from python/ql/src/utils/test/dataflow/NormalDataflowTest.qll rename to python/ql/lib/utils/test/dataflow/NormalDataflowTest.qll diff --git a/python/ql/src/utils/test/dataflow/NormalTaintTrackingTest.qll b/python/ql/lib/utils/test/dataflow/NormalTaintTrackingTest.qll similarity index 100% rename from python/ql/src/utils/test/dataflow/NormalTaintTrackingTest.qll rename to python/ql/lib/utils/test/dataflow/NormalTaintTrackingTest.qll diff --git a/python/ql/src/utils/test/dataflow/RoutingTest.qll b/python/ql/lib/utils/test/dataflow/RoutingTest.qll similarity index 100% rename from python/ql/src/utils/test/dataflow/RoutingTest.qll rename to python/ql/lib/utils/test/dataflow/RoutingTest.qll diff --git a/python/ql/src/utils/test/dataflow/UnresolvedCalls.qll b/python/ql/lib/utils/test/dataflow/UnresolvedCalls.qll similarity index 100% rename from python/ql/src/utils/test/dataflow/UnresolvedCalls.qll rename to python/ql/lib/utils/test/dataflow/UnresolvedCalls.qll diff --git a/python/ql/src/utils/test/dataflow/callGraphConfig.qll b/python/ql/lib/utils/test/dataflow/callGraphConfig.qll similarity index 100% rename from python/ql/src/utils/test/dataflow/callGraphConfig.qll rename to python/ql/lib/utils/test/dataflow/callGraphConfig.qll diff --git a/python/ql/src/utils/test/dataflow/testConfig.qll b/python/ql/lib/utils/test/dataflow/testConfig.qll similarity index 100% rename from python/ql/src/utils/test/dataflow/testConfig.qll rename to python/ql/lib/utils/test/dataflow/testConfig.qll diff --git a/python/ql/src/utils/test/dataflow/testTaintConfig.qll b/python/ql/lib/utils/test/dataflow/testTaintConfig.qll similarity index 100% rename from python/ql/src/utils/test/dataflow/testTaintConfig.qll rename to python/ql/lib/utils/test/dataflow/testTaintConfig.qll diff --git a/python/ql/src/utils/test/internal/InlineExpectationsTestImpl.qll b/python/ql/lib/utils/test/internal/InlineExpectationsTestImpl.qll similarity index 100% rename from python/ql/src/utils/test/internal/InlineExpectationsTestImpl.qll rename to python/ql/lib/utils/test/internal/InlineExpectationsTestImpl.qll diff --git a/python/ql/src/utils/test/InlineExpectationsTestQuery.ql b/python/ql/src/utils/test/InlineExpectationsTestQuery.ql index 9ce5fdf326ca..5b2a8a961a75 100644 --- a/python/ql/src/utils/test/InlineExpectationsTestQuery.ql +++ b/python/ql/src/utils/test/InlineExpectationsTestQuery.ql @@ -4,7 +4,7 @@ private import python private import codeql.util.test.InlineExpectationsTest as T -private import internal.InlineExpectationsTestImpl +private import utils.test.internal.InlineExpectationsTestImpl import T::TestPostProcessing import T::TestPostProcessing::Make diff --git a/ruby/ql/src/utils/test/InlineExpectationsTest.qll b/ruby/ql/lib/utils/test/InlineExpectationsTest.qll similarity index 100% rename from ruby/ql/src/utils/test/InlineExpectationsTest.qll rename to ruby/ql/lib/utils/test/InlineExpectationsTest.qll diff --git a/ruby/ql/src/utils/test/InlineFlowTest.qll b/ruby/ql/lib/utils/test/InlineFlowTest.qll similarity index 100% rename from ruby/ql/src/utils/test/InlineFlowTest.qll rename to ruby/ql/lib/utils/test/InlineFlowTest.qll diff --git a/ruby/ql/src/utils/test/InlineFlowTestUtil.qll b/ruby/ql/lib/utils/test/InlineFlowTestUtil.qll similarity index 100% rename from ruby/ql/src/utils/test/InlineFlowTestUtil.qll rename to ruby/ql/lib/utils/test/InlineFlowTestUtil.qll diff --git a/ruby/ql/src/utils/test/InlineTypeTrackingFlowTest.qll b/ruby/ql/lib/utils/test/InlineTypeTrackingFlowTest.qll similarity index 100% rename from ruby/ql/src/utils/test/InlineTypeTrackingFlowTest.qll rename to ruby/ql/lib/utils/test/InlineTypeTrackingFlowTest.qll diff --git a/ruby/ql/src/utils/test/internal/InlineExpectationsTestImpl.qll b/ruby/ql/lib/utils/test/internal/InlineExpectationsTestImpl.qll similarity index 100% rename from ruby/ql/src/utils/test/internal/InlineExpectationsTestImpl.qll rename to ruby/ql/lib/utils/test/internal/InlineExpectationsTestImpl.qll diff --git a/ruby/ql/src/utils/test/InlineExpectationsTestQuery.ql b/ruby/ql/src/utils/test/InlineExpectationsTestQuery.ql index 1cbc37a7fe85..ab7ddd25b242 100644 --- a/ruby/ql/src/utils/test/InlineExpectationsTestQuery.ql +++ b/ruby/ql/src/utils/test/InlineExpectationsTestQuery.ql @@ -4,7 +4,7 @@ private import ruby private import codeql.util.test.InlineExpectationsTest as T -private import internal.InlineExpectationsTestImpl +private import utils.test.internal.InlineExpectationsTestImpl import T::TestPostProcessing import T::TestPostProcessing::Make diff --git a/rust/ql/src/utils/test/InlineExpectationsTest.qll b/rust/ql/lib/utils/test/InlineExpectationsTest.qll similarity index 100% rename from rust/ql/src/utils/test/InlineExpectationsTest.qll rename to rust/ql/lib/utils/test/InlineExpectationsTest.qll diff --git a/rust/ql/src/utils/test/InlineFlowTest.qll b/rust/ql/lib/utils/test/InlineFlowTest.qll similarity index 100% rename from rust/ql/src/utils/test/InlineFlowTest.qll rename to rust/ql/lib/utils/test/InlineFlowTest.qll diff --git a/rust/ql/src/utils/test/ProvenancePathGraph.qll b/rust/ql/lib/utils/test/ProvenancePathGraph.qll similarity index 100% rename from rust/ql/src/utils/test/ProvenancePathGraph.qll rename to rust/ql/lib/utils/test/ProvenancePathGraph.qll diff --git a/rust/ql/src/utils/test/internal/InlineExpectationsTestImpl.qll b/rust/ql/lib/utils/test/internal/InlineExpectationsTestImpl.qll similarity index 100% rename from rust/ql/src/utils/test/internal/InlineExpectationsTestImpl.qll rename to rust/ql/lib/utils/test/internal/InlineExpectationsTestImpl.qll diff --git a/rust/ql/src/utils/test/InlineExpectationsTestQuery.ql b/rust/ql/src/utils/test/InlineExpectationsTestQuery.ql index e5821ba4f50c..ce102b166f56 100644 --- a/rust/ql/src/utils/test/InlineExpectationsTestQuery.ql +++ b/rust/ql/src/utils/test/InlineExpectationsTestQuery.ql @@ -4,7 +4,7 @@ private import rust private import codeql.util.test.InlineExpectationsTest as T -private import internal.InlineExpectationsTestImpl +private import utils.test.internal.InlineExpectationsTestImpl import T::TestPostProcessing import T::TestPostProcessing::Make diff --git a/swift/ql/src/utils/test/InlineExpectationsTest.qll b/swift/ql/lib/utils/test/InlineExpectationsTest.qll similarity index 100% rename from swift/ql/src/utils/test/InlineExpectationsTest.qll rename to swift/ql/lib/utils/test/InlineExpectationsTest.qll diff --git a/swift/ql/src/utils/test/InlineFlowTest.qll b/swift/ql/lib/utils/test/InlineFlowTest.qll similarity index 100% rename from swift/ql/src/utils/test/InlineFlowTest.qll rename to swift/ql/lib/utils/test/InlineFlowTest.qll diff --git a/swift/ql/src/utils/test/internal/InlineExpectationsTestImpl.qll b/swift/ql/lib/utils/test/internal/InlineExpectationsTestImpl.qll similarity index 100% rename from swift/ql/src/utils/test/internal/InlineExpectationsTestImpl.qll rename to swift/ql/lib/utils/test/internal/InlineExpectationsTestImpl.qll diff --git a/swift/ql/src/utils/test/InlineExpectationsTestQuery.ql b/swift/ql/src/utils/test/InlineExpectationsTestQuery.ql index a7c112bc00e0..77f89b597e2b 100644 --- a/swift/ql/src/utils/test/InlineExpectationsTestQuery.ql +++ b/swift/ql/src/utils/test/InlineExpectationsTestQuery.ql @@ -4,7 +4,7 @@ private import swift private import codeql.util.test.InlineExpectationsTest as T -private import internal.InlineExpectationsTestImpl +private import utils.test.internal.InlineExpectationsTestImpl import T::TestPostProcessing import T::TestPostProcessing::Make From 0bfc1b6ea85cc08c1703170553ed4d150abe462f Mon Sep 17 00:00:00 2001 From: Michael Nebel Date: Thu, 12 Dec 2024 12:07:34 +0100 Subject: [PATCH 24/24] Also move the postprocessing queries to the library pack. --- cpp/ql/{src => lib}/utils/test/InlineExpectationsTestQuery.ql | 2 +- .../ql/{src => lib}/utils/test/InlineExpectationsTestQuery.ql | 2 +- csharp/ql/{src => lib}/utils/test/PrettyPrintModels.ql | 0 go/ql/{src => lib}/utils/test/InlineExpectationsTestQuery.ql | 2 +- go/ql/{src => lib}/utils/test/PrettyPrintModels.ql | 0 java/ql/{src => lib}/utils/test/InlineExpectationsTestQuery.ql | 2 +- java/ql/{src => lib}/utils/test/PrettyPrintModels.ql | 0 .../ql/{src => lib}/utils/test/InlineExpectationsTestQuery.ql | 2 +- .../ql/{src => lib}/utils/test/InlineExpectationsTestQuery.ql | 2 +- ruby/ql/{src => lib}/utils/test/InlineExpectationsTestQuery.ql | 2 +- rust/ql/{src => lib}/utils/test/InlineExpectationsTestQuery.ql | 2 +- rust/ql/{src => lib}/utils/test/PrettyPrintModels.ql | 0 swift/ql/{src => lib}/utils/test/InlineExpectationsTestQuery.ql | 2 +- 13 files changed, 9 insertions(+), 9 deletions(-) rename cpp/ql/{src => lib}/utils/test/InlineExpectationsTestQuery.ql (91%) rename csharp/ql/{src => lib}/utils/test/InlineExpectationsTestQuery.ql (91%) rename csharp/ql/{src => lib}/utils/test/PrettyPrintModels.ql (100%) rename go/ql/{src => lib}/utils/test/InlineExpectationsTestQuery.ql (91%) rename go/ql/{src => lib}/utils/test/PrettyPrintModels.ql (100%) rename java/ql/{src => lib}/utils/test/InlineExpectationsTestQuery.ql (91%) rename java/ql/{src => lib}/utils/test/PrettyPrintModels.ql (100%) rename javascript/ql/{src => lib}/utils/test/InlineExpectationsTestQuery.ql (91%) rename python/ql/{src => lib}/utils/test/InlineExpectationsTestQuery.ql (91%) rename ruby/ql/{src => lib}/utils/test/InlineExpectationsTestQuery.ql (91%) rename rust/ql/{src => lib}/utils/test/InlineExpectationsTestQuery.ql (91%) rename rust/ql/{src => lib}/utils/test/PrettyPrintModels.ql (100%) rename swift/ql/{src => lib}/utils/test/InlineExpectationsTestQuery.ql (91%) diff --git a/cpp/ql/src/utils/test/InlineExpectationsTestQuery.ql b/cpp/ql/lib/utils/test/InlineExpectationsTestQuery.ql similarity index 91% rename from cpp/ql/src/utils/test/InlineExpectationsTestQuery.ql rename to cpp/ql/lib/utils/test/InlineExpectationsTestQuery.ql index 489fa53affb2..8e6977ba5321 100644 --- a/cpp/ql/src/utils/test/InlineExpectationsTestQuery.ql +++ b/cpp/ql/lib/utils/test/InlineExpectationsTestQuery.ql @@ -4,7 +4,7 @@ private import cpp private import codeql.util.test.InlineExpectationsTest as T -private import utils.test.internal.InlineExpectationsTestImpl +private import internal.InlineExpectationsTestImpl import T::TestPostProcessing import T::TestPostProcessing::Make diff --git a/csharp/ql/src/utils/test/InlineExpectationsTestQuery.ql b/csharp/ql/lib/utils/test/InlineExpectationsTestQuery.ql similarity index 91% rename from csharp/ql/src/utils/test/InlineExpectationsTestQuery.ql rename to csharp/ql/lib/utils/test/InlineExpectationsTestQuery.ql index 17f16f9506ef..35901ee64012 100644 --- a/csharp/ql/src/utils/test/InlineExpectationsTestQuery.ql +++ b/csharp/ql/lib/utils/test/InlineExpectationsTestQuery.ql @@ -4,7 +4,7 @@ private import csharp private import codeql.util.test.InlineExpectationsTest as T -private import utils.test.internal.InlineExpectationsTestImpl +private import internal.InlineExpectationsTestImpl import T::TestPostProcessing import T::TestPostProcessing::Make diff --git a/csharp/ql/src/utils/test/PrettyPrintModels.ql b/csharp/ql/lib/utils/test/PrettyPrintModels.ql similarity index 100% rename from csharp/ql/src/utils/test/PrettyPrintModels.ql rename to csharp/ql/lib/utils/test/PrettyPrintModels.ql diff --git a/go/ql/src/utils/test/InlineExpectationsTestQuery.ql b/go/ql/lib/utils/test/InlineExpectationsTestQuery.ql similarity index 91% rename from go/ql/src/utils/test/InlineExpectationsTestQuery.ql rename to go/ql/lib/utils/test/InlineExpectationsTestQuery.ql index 491849fa509f..1cf2f5ea1d9b 100644 --- a/go/ql/src/utils/test/InlineExpectationsTestQuery.ql +++ b/go/ql/lib/utils/test/InlineExpectationsTestQuery.ql @@ -4,7 +4,7 @@ private import go private import codeql.util.test.InlineExpectationsTest as T -private import utils.test.internal.InlineExpectationsTestImpl +private import internal.InlineExpectationsTestImpl import T::TestPostProcessing import T::TestPostProcessing::Make diff --git a/go/ql/src/utils/test/PrettyPrintModels.ql b/go/ql/lib/utils/test/PrettyPrintModels.ql similarity index 100% rename from go/ql/src/utils/test/PrettyPrintModels.ql rename to go/ql/lib/utils/test/PrettyPrintModels.ql diff --git a/java/ql/src/utils/test/InlineExpectationsTestQuery.ql b/java/ql/lib/utils/test/InlineExpectationsTestQuery.ql similarity index 91% rename from java/ql/src/utils/test/InlineExpectationsTestQuery.ql rename to java/ql/lib/utils/test/InlineExpectationsTestQuery.ql index 597c3f460a14..b0360dfecd8d 100644 --- a/java/ql/src/utils/test/InlineExpectationsTestQuery.ql +++ b/java/ql/lib/utils/test/InlineExpectationsTestQuery.ql @@ -4,7 +4,7 @@ private import java private import codeql.util.test.InlineExpectationsTest as T -private import utils.test.internal.InlineExpectationsTestImpl +private import internal.InlineExpectationsTestImpl import T::TestPostProcessing import T::TestPostProcessing::Make diff --git a/java/ql/src/utils/test/PrettyPrintModels.ql b/java/ql/lib/utils/test/PrettyPrintModels.ql similarity index 100% rename from java/ql/src/utils/test/PrettyPrintModels.ql rename to java/ql/lib/utils/test/PrettyPrintModels.ql diff --git a/javascript/ql/src/utils/test/InlineExpectationsTestQuery.ql b/javascript/ql/lib/utils/test/InlineExpectationsTestQuery.ql similarity index 91% rename from javascript/ql/src/utils/test/InlineExpectationsTestQuery.ql rename to javascript/ql/lib/utils/test/InlineExpectationsTestQuery.ql index 9edac1c29a4f..55892be75d79 100644 --- a/javascript/ql/src/utils/test/InlineExpectationsTestQuery.ql +++ b/javascript/ql/lib/utils/test/InlineExpectationsTestQuery.ql @@ -4,7 +4,7 @@ private import javascript private import codeql.util.test.InlineExpectationsTest as T -private import utils.test.internal.InlineExpectationsTestImpl +private import internal.InlineExpectationsTestImpl import T::TestPostProcessing import T::TestPostProcessing::Make diff --git a/python/ql/src/utils/test/InlineExpectationsTestQuery.ql b/python/ql/lib/utils/test/InlineExpectationsTestQuery.ql similarity index 91% rename from python/ql/src/utils/test/InlineExpectationsTestQuery.ql rename to python/ql/lib/utils/test/InlineExpectationsTestQuery.ql index 5b2a8a961a75..9ce5fdf326ca 100644 --- a/python/ql/src/utils/test/InlineExpectationsTestQuery.ql +++ b/python/ql/lib/utils/test/InlineExpectationsTestQuery.ql @@ -4,7 +4,7 @@ private import python private import codeql.util.test.InlineExpectationsTest as T -private import utils.test.internal.InlineExpectationsTestImpl +private import internal.InlineExpectationsTestImpl import T::TestPostProcessing import T::TestPostProcessing::Make diff --git a/ruby/ql/src/utils/test/InlineExpectationsTestQuery.ql b/ruby/ql/lib/utils/test/InlineExpectationsTestQuery.ql similarity index 91% rename from ruby/ql/src/utils/test/InlineExpectationsTestQuery.ql rename to ruby/ql/lib/utils/test/InlineExpectationsTestQuery.ql index ab7ddd25b242..1cbc37a7fe85 100644 --- a/ruby/ql/src/utils/test/InlineExpectationsTestQuery.ql +++ b/ruby/ql/lib/utils/test/InlineExpectationsTestQuery.ql @@ -4,7 +4,7 @@ private import ruby private import codeql.util.test.InlineExpectationsTest as T -private import utils.test.internal.InlineExpectationsTestImpl +private import internal.InlineExpectationsTestImpl import T::TestPostProcessing import T::TestPostProcessing::Make diff --git a/rust/ql/src/utils/test/InlineExpectationsTestQuery.ql b/rust/ql/lib/utils/test/InlineExpectationsTestQuery.ql similarity index 91% rename from rust/ql/src/utils/test/InlineExpectationsTestQuery.ql rename to rust/ql/lib/utils/test/InlineExpectationsTestQuery.ql index ce102b166f56..e5821ba4f50c 100644 --- a/rust/ql/src/utils/test/InlineExpectationsTestQuery.ql +++ b/rust/ql/lib/utils/test/InlineExpectationsTestQuery.ql @@ -4,7 +4,7 @@ private import rust private import codeql.util.test.InlineExpectationsTest as T -private import utils.test.internal.InlineExpectationsTestImpl +private import internal.InlineExpectationsTestImpl import T::TestPostProcessing import T::TestPostProcessing::Make diff --git a/rust/ql/src/utils/test/PrettyPrintModels.ql b/rust/ql/lib/utils/test/PrettyPrintModels.ql similarity index 100% rename from rust/ql/src/utils/test/PrettyPrintModels.ql rename to rust/ql/lib/utils/test/PrettyPrintModels.ql diff --git a/swift/ql/src/utils/test/InlineExpectationsTestQuery.ql b/swift/ql/lib/utils/test/InlineExpectationsTestQuery.ql similarity index 91% rename from swift/ql/src/utils/test/InlineExpectationsTestQuery.ql rename to swift/ql/lib/utils/test/InlineExpectationsTestQuery.ql index 77f89b597e2b..a7c112bc00e0 100644 --- a/swift/ql/src/utils/test/InlineExpectationsTestQuery.ql +++ b/swift/ql/lib/utils/test/InlineExpectationsTestQuery.ql @@ -4,7 +4,7 @@ private import swift private import codeql.util.test.InlineExpectationsTest as T -private import utils.test.internal.InlineExpectationsTestImpl +private import internal.InlineExpectationsTestImpl import T::TestPostProcessing import T::TestPostProcessing::Make