C#: Re-arange the import order, such that CsvValidation follows ExternalFlow directly.

michaelnebel · michaelnebel · commit 2e273f2273a6 · 2022-08-24T09:58:54.000+02:00
diff --git a/csharp/ql/test/library-tests/dataflow/external-models/negativesummaries.ql b/csharp/ql/test/library-tests/dataflow/external-models/negativesummaries.ql
@@ -4,5 +4,5 @@
 
 import csharp
 import semmle.code.csharp.dataflow.ExternalFlow
-import semmle.code.csharp.dataflow.internal.NegativeSummary
 import CsvValidation
+import semmle.code.csharp.dataflow.internal.NegativeSummary
diff --git a/csharp/ql/test/library-tests/dataflow/external-models/sinks.ql b/csharp/ql/test/library-tests/dataflow/external-models/sinks.ql
@@ -1,8 +1,8 @@
 import csharp
 import DataFlow
 import semmle.code.csharp.dataflow.ExternalFlow
-import semmle.code.csharp.dataflow.internal.FlowSummaryImpl as FlowSummaryImpl
 import CsvValidation
+import semmle.code.csharp.dataflow.internal.FlowSummaryImpl as FlowSummaryImpl
 
 class SinkModelTest extends SinkModelCsv {
   override predicate row(string row) {
diff --git a/csharp/ql/test/library-tests/dataflow/external-models/srcs.ql b/csharp/ql/test/library-tests/dataflow/external-models/srcs.ql
@@ -1,8 +1,8 @@
 import csharp
 import DataFlow
 import semmle.code.csharp.dataflow.ExternalFlow
-import semmle.code.csharp.dataflow.internal.FlowSummaryImpl as FlowSummaryImpl
 import CsvValidation
+import semmle.code.csharp.dataflow.internal.FlowSummaryImpl as FlowSummaryImpl
 
 class SourceModelTest extends SourceModelCsv {
   override predicate row(string row) {
diff --git a/csharp/ql/test/library-tests/dataflow/external-models/steps.ql b/csharp/ql/test/library-tests/dataflow/external-models/steps.ql
@@ -1,10 +1,10 @@
 import csharp
 import DataFlow
 import semmle.code.csharp.dataflow.ExternalFlow
+import CsvValidation
 import semmle.code.csharp.dataflow.FlowSummary
 import semmle.code.csharp.dataflow.internal.DataFlowDispatch as DataFlowDispatch
 import semmle.code.csharp.dataflow.internal.FlowSummaryImpl as FlowSummaryImpl
-import CsvValidation
 
 private class SummaryModelTest extends SummaryModelCsv {
   override predicate row(string row) {
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlow/completetest.ql b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlow/completetest.ql
@@ -4,9 +4,9 @@
 
 import go
 import semmle.go.dataflow.ExternalFlow
+import CsvValidation
 import semmle.go.dataflow.internal.FlowSummaryImpl as FlowSummaryImpl
 import TestUtilities.InlineFlowTest
-import CsvValidation
 
 class SummaryModelTest extends SummaryModelCsv {
   override predicate row(string row) {
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlow/steps.ql b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlow/steps.ql
@@ -1,7 +1,7 @@
 import go
 import semmle.go.dataflow.ExternalFlow
-import semmle.go.dataflow.internal.FlowSummaryImpl as FlowSummaryImpl
 import CsvValidation
+import semmle.go.dataflow.internal.FlowSummaryImpl as FlowSummaryImpl
 
 class SummaryModelTest extends SummaryModelCsv {
   override predicate row(string row) {
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
@@ -1,7 +1,7 @@
 import go
 import semmle.go.dataflow.ExternalFlow
-import TestUtilities.InlineExpectationsTest
 import CsvValidation
+import TestUtilities.InlineExpectationsTest
 
 class SummaryModelTest extends SummaryModelCsv {
   override predicate row(string row) {
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
@@ -1,8 +1,8 @@
 import go
 import semmle.go.dataflow.ExternalFlow
+import CsvValidation
 // import DataFlow::PartialPathGraph
 import TestUtilities.InlineExpectationsTest
-import CsvValidation
 
 class SummaryModelTest extends DataFlow::FunctionModel {
   FunctionInput inp;
diff --git a/java/ql/test/library-tests/dataflow/external-models/steps.ql b/java/ql/test/library-tests/dataflow/external-models/steps.ql
@@ -1,8 +1,8 @@
 import java
 import semmle.code.java.dataflow.DataFlow
 import semmle.code.java.dataflow.ExternalFlow
-import semmle.code.java.dataflow.internal.FlowSummaryImpl as FlowSummaryImpl
 import CsvValidation
+import semmle.code.java.dataflow.internal.FlowSummaryImpl as FlowSummaryImpl
 
 class SummaryModelTest extends SummaryModelCsv {
   override predicate row(string row) {
