Remove tests for sources and sinks

This is redundant given that we test for paths, and for a path
we need the source, step and sink methods to be modeled.

go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_IEmbedI1_subtypes_true.expected

@@ -1,33 +1,3 @@
 testFailures
 invalidModelRow
 failures
-sources
-| test.go:8:7:8:16 | call to Source |
-| test.go:14:7:14:16 | call to Source |
-| test.go:20:7:20:16 | call to Source |
-| test.go:26:7:26:16 | call to Source |
-| test.go:32:7:32:16 | call to Source |
-| test.go:38:7:38:16 | call to Source |
-| test.go:44:7:44:16 | call to Source |
-| test.go:50:7:50:16 | call to Source |
-| test.go:56:7:56:16 | call to Source |
-| test.go:62:7:62:16 | call to Source |
-| test.go:68:7:68:16 | call to Source |
-| test.go:74:7:74:16 | call to Source |
-| test.go:80:7:80:16 | call to Source |
-| test.go:86:7:86:16 | call to Source |
-sinks
-| test.go:10:9:10:9 | y |
-| test.go:16:9:16:9 | y |
-| test.go:22:9:22:9 | y |
-| test.go:28:9:28:9 | y |
-| test.go:34:9:34:9 | y |
-| test.go:40:9:40:9 | y |
-| test.go:46:9:46:9 | y |
-| test.go:52:9:52:9 | y |
-| test.go:58:9:58:9 | y |
-| test.go:64:9:64:9 | y |
-| test.go:70:9:70:9 | y |
-| test.go:76:9:76:9 | y |
-| test.go:82:9:82:9 | y |
-| test.go:88:9:88:9 | y |

go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_IEmbedI1_subtypes_true.ql

@@ -6,9 +6,9 @@ import TestUtilities.InlineExpectationsTest
 import MakeTest<FlowTest>
 
 module Config implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { sources(source) }
+  predicate isSource(DataFlow::Node source) { source instanceof RemoteFlowSource }
 
-  predicate isSink(DataFlow::Node sink) { sinks(sink) }
+  predicate isSink(DataFlow::Node sink) { sink = any(FileSystemAccess fsa).getAPathArgument() }
 }
 
 module Flow = TaintTracking::Global<Config>;
@@ -26,7 +26,3 @@ module FlowTest implements TestSig {
     )
   }
 }
-
-query predicate sources(DataFlow::Node source) { source instanceof RemoteFlowSource }
-
-query predicate sinks(DataFlow::Node sink) { sink = any(FileSystemAccess fsa).getAPathArgument() }

go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_IEmbedI2_subtypes_true.expected

@@ -1,19 +1,3 @@
 testFailures
 invalidModelRow
 failures
-sources
-| test.go:14:7:14:16 | call to Source |
-| test.go:26:7:26:16 | call to Source |
-| test.go:38:7:38:16 | call to Source |
-| test.go:50:7:50:16 | call to Source |
-| test.go:62:7:62:16 | call to Source |
-| test.go:74:7:74:16 | call to Source |
-| test.go:86:7:86:16 | call to Source |
-sinks
-| test.go:16:9:16:9 | y |
-| test.go:28:9:28:9 | y |
-| test.go:40:9:40:9 | y |
-| test.go:52:9:52:9 | y |
-| test.go:64:9:64:9 | y |
-| test.go:76:9:76:9 | y |
-| test.go:88:9:88:9 | y |

go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_IEmbedI2_subtypes_true.ql

@@ -6,9 +6,9 @@ import TestUtilities.InlineExpectationsTest
 import MakeTest<FlowTest>
 
 module Config implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { sources(source) }
+  predicate isSource(DataFlow::Node source) { source instanceof RemoteFlowSource }
 
-  predicate isSink(DataFlow::Node sink) { sinks(sink) }
+  predicate isSink(DataFlow::Node sink) { sink = any(FileSystemAccess fsa).getAPathArgument() }
 }
 
 module Flow = TaintTracking::Global<Config>;
@@ -26,7 +26,3 @@ module FlowTest implements TestSig {
     )
   }
 }
-
-query predicate sources(DataFlow::Node source) { source instanceof RemoteFlowSource }
-
-query predicate sinks(DataFlow::Node sink) { sink = any(FileSystemAccess fsa).getAPathArgument() }

go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedI1_subtypes_true.expected

@@ -1,33 +1,3 @@
 testFailures
 invalidModelRow
 failures
-sources
-| test.go:8:7:8:16 | call to Source |
-| test.go:14:7:14:16 | call to Source |
-| test.go:20:7:20:16 | call to Source |
-| test.go:26:7:26:16 | call to Source |
-| test.go:32:7:32:16 | call to Source |
-| test.go:38:7:38:16 | call to Source |
-| test.go:44:7:44:16 | call to Source |
-| test.go:50:7:50:16 | call to Source |
-| test.go:56:7:56:16 | call to Source |
-| test.go:62:7:62:16 | call to Source |
-| test.go:68:7:68:16 | call to Source |
-| test.go:74:7:74:16 | call to Source |
-| test.go:80:7:80:16 | call to Source |
-| test.go:86:7:86:16 | call to Source |
-sinks
-| test.go:10:9:10:9 | y |
-| test.go:16:9:16:9 | y |
-| test.go:22:9:22:9 | y |
-| test.go:28:9:28:9 | y |
-| test.go:34:9:34:9 | y |
-| test.go:40:9:40:9 | y |
-| test.go:46:9:46:9 | y |
-| test.go:52:9:52:9 | y |
-| test.go:58:9:58:9 | y |
-| test.go:64:9:64:9 | y |
-| test.go:70:9:70:9 | y |
-| test.go:76:9:76:9 | y |
-| test.go:82:9:82:9 | y |
-| test.go:88:9:88:9 | y |

go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedI1_subtypes_true.ql

@@ -6,9 +6,9 @@ import TestUtilities.InlineExpectationsTest
 import MakeTest<FlowTest>
 
 module Config implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { sources(source) }
+  predicate isSource(DataFlow::Node source) { source instanceof RemoteFlowSource }
 
-  predicate isSink(DataFlow::Node sink) { sinks(sink) }
+  predicate isSink(DataFlow::Node sink) { sink = any(FileSystemAccess fsa).getAPathArgument() }
 }
 
 module Flow = TaintTracking::Global<Config>;
@@ -26,7 +26,3 @@ module FlowTest implements TestSig {
     )
   }
 }
-
-query predicate sources(DataFlow::Node source) { source instanceof RemoteFlowSource }
-
-query predicate sinks(DataFlow::Node sink) { sink = any(FileSystemAccess fsa).getAPathArgument() }

go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedI2_subtypes_true.expected

@@ -1,19 +1,3 @@
 testFailures
 invalidModelRow
 failures
-sources
-| test.go:14:7:14:16 | call to Source |
-| test.go:26:7:26:16 | call to Source |
-| test.go:38:7:38:16 | call to Source |
-| test.go:50:7:50:16 | call to Source |
-| test.go:62:7:62:16 | call to Source |
-| test.go:74:7:74:16 | call to Source |
-| test.go:86:7:86:16 | call to Source |
-sinks
-| test.go:16:9:16:9 | y |
-| test.go:28:9:28:9 | y |
-| test.go:40:9:40:9 | y |
-| test.go:52:9:52:9 | y |
-| test.go:64:9:64:9 | y |
-| test.go:76:9:76:9 | y |
-| test.go:88:9:88:9 | y |

go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedI2_subtypes_true.ql

@@ -6,9 +6,9 @@ import TestUtilities.InlineExpectationsTest
 import MakeTest<FlowTest>
 
 module Config implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { sources(source) }
+  predicate isSource(DataFlow::Node source) { source instanceof RemoteFlowSource }
 
-  predicate isSink(DataFlow::Node sink) { sinks(sink) }
+  predicate isSink(DataFlow::Node sink) { sink = any(FileSystemAccess fsa).getAPathArgument() }
 }
 
 module Flow = TaintTracking::Global<Config>;
@@ -26,7 +26,3 @@ module FlowTest implements TestSig {
     )
   }
 }
-
-query predicate sources(DataFlow::Node source) { source instanceof RemoteFlowSource }
-
-query predicate sinks(DataFlow::Node sink) { sink = any(FileSystemAccess fsa).getAPathArgument() }

go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedS1_subtypes_true.expected

@@ -1,5 +1,3 @@
 testFailures
 invalidModelRow
 failures
-sources
-sinks

go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedS1_subtypes_true.ql

@@ -6,9 +6,9 @@ import TestUtilities.InlineExpectationsTest
 import MakeTest<FlowTest>
 
 module Config implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { sources(source) }
+  predicate isSource(DataFlow::Node source) { source instanceof RemoteFlowSource }
 
-  predicate isSink(DataFlow::Node sink) { sinks(sink) }
+  predicate isSink(DataFlow::Node sink) { sink = any(FileSystemAccess fsa).getAPathArgument() }
 }
 
 module Flow = TaintTracking::Global<Config>;
@@ -26,7 +26,3 @@ module FlowTest implements TestSig {
     )
   }
 }
-
-query predicate sources(DataFlow::Node source) { source instanceof RemoteFlowSource }
-
-query predicate sinks(DataFlow::Node sink) { sink = any(FileSystemAccess fsa).getAPathArgument() }

go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedS2_subtypes_true.expected

@@ -1,5 +1,3 @@
 testFailures
 invalidModelRow
 failures
-sources
-sinks

go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedS2_subtypes_true.ql

@@ -6,9 +6,9 @@ import TestUtilities.InlineExpectationsTest
 import MakeTest<FlowTest>
 
 module Config implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { sources(source) }
+  predicate isSource(DataFlow::Node source) { source instanceof RemoteFlowSource }
 
-  predicate isSink(DataFlow::Node sink) { sinks(sink) }
+  predicate isSink(DataFlow::Node sink) { sink = any(FileSystemAccess fsa).getAPathArgument() }
 }
 
 module Flow = TaintTracking::Global<Config>;
@@ -26,7 +26,3 @@ module FlowTest implements TestSig {
     )
   }
 }
-
-query predicate sources(DataFlow::Node source) { source instanceof RemoteFlowSource }
-
-query predicate sinks(DataFlow::Node sink) { sink = any(FileSystemAccess fsa).getAPathArgument() }

go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SImplEmbedI1_subtypes_true.expected

@@ -1,33 +1,3 @@
 testFailures
 invalidModelRow
 failures
-sources
-| test.go:8:7:8:16 | call to Source |
-| test.go:14:7:14:16 | call to Source |
-| test.go:20:7:20:16 | call to Source |
-| test.go:26:7:26:16 | call to Source |
-| test.go:32:7:32:16 | call to Source |
-| test.go:38:7:38:16 | call to Source |
-| test.go:44:7:44:16 | call to Source |
-| test.go:50:7:50:16 | call to Source |
-| test.go:56:7:56:16 | call to Source |
-| test.go:62:7:62:16 | call to Source |
-| test.go:68:7:68:16 | call to Source |
-| test.go:74:7:74:16 | call to Source |
-| test.go:80:7:80:16 | call to Source |
-| test.go:86:7:86:16 | call to Source |
-sinks
-| test.go:10:9:10:9 | y |
-| test.go:16:9:16:9 | y |
-| test.go:22:9:22:9 | y |
-| test.go:28:9:28:9 | y |
-| test.go:34:9:34:9 | y |
-| test.go:40:9:40:9 | y |
-| test.go:46:9:46:9 | y |
-| test.go:52:9:52:9 | y |
-| test.go:58:9:58:9 | y |
-| test.go:64:9:64:9 | y |
-| test.go:70:9:70:9 | y |
-| test.go:76:9:76:9 | y |
-| test.go:82:9:82:9 | y |
-| test.go:88:9:88:9 | y |

go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SImplEmbedI1_subtypes_true.ql

@@ -6,9 +6,9 @@ import TestUtilities.InlineExpectationsTest
 import MakeTest<FlowTest>
 
 module Config implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { sources(source) }
+  predicate isSource(DataFlow::Node source) { source instanceof RemoteFlowSource }
 
-  predicate isSink(DataFlow::Node sink) { sinks(sink) }
+  predicate isSink(DataFlow::Node sink) { sink = any(FileSystemAccess fsa).getAPathArgument() }
 }
 
 module Flow = TaintTracking::Global<Config>;
@@ -26,7 +26,3 @@ module FlowTest implements TestSig {
     )
   }
 }
-
-query predicate sources(DataFlow::Node source) { source instanceof RemoteFlowSource }
-
-query predicate sinks(DataFlow::Node sink) { sink = any(FileSystemAccess fsa).getAPathArgument() }

go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SImplEmbedI2_subtypes_true.expected

@@ -1,19 +1,3 @@
 testFailures
 invalidModelRow
 failures
-sources
-| test.go:14:7:14:16 | call to Source |
-| test.go:26:7:26:16 | call to Source |
-| test.go:38:7:38:16 | call to Source |
-| test.go:50:7:50:16 | call to Source |
-| test.go:62:7:62:16 | call to Source |
-| test.go:74:7:74:16 | call to Source |
-| test.go:86:7:86:16 | call to Source |
-sinks
-| test.go:16:9:16:9 | y |
-| test.go:28:9:28:9 | y |
-| test.go:40:9:40:9 | y |
-| test.go:52:9:52:9 | y |
-| test.go:64:9:64:9 | y |
-| test.go:76:9:76:9 | y |
-| test.go:88:9:88:9 | y |

go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SImplEmbedI2_subtypes_true.ql

@@ -6,9 +6,9 @@ import TestUtilities.InlineExpectationsTest
 import MakeTest<FlowTest>
 
 module Config implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { sources(source) }
+  predicate isSource(DataFlow::Node source) { source instanceof RemoteFlowSource }
 
-  predicate isSink(DataFlow::Node sink) { sinks(sink) }
+  predicate isSink(DataFlow::Node sink) { sink = any(FileSystemAccess fsa).getAPathArgument() }
 }
 
 module Flow = TaintTracking::Global<Config>;
@@ -26,7 +26,3 @@ module FlowTest implements TestSig {
     )
   }
 }
-
-query predicate sources(DataFlow::Node source) { source instanceof RemoteFlowSource }
-
-query predicate sinks(DataFlow::Node sink) { sink = any(FileSystemAccess fsa).getAPathArgument() }

go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SImplEmbedS1_subtypes_true.expected

@@ -1,7 +1,3 @@
 testFailures
 invalidModelRow
 failures
-sources
-| test.go:80:7:80:16 | call to Source |
-sinks
-| test.go:82:9:82:9 | y |

go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SImplEmbedS1_subtypes_true.ql

@@ -6,9 +6,9 @@ import TestUtilities.InlineExpectationsTest
 import MakeTest<FlowTest>
 
 module Config implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { sources(source) }
+  predicate isSource(DataFlow::Node source) { source instanceof RemoteFlowSource }
 
-  predicate isSink(DataFlow::Node sink) { sinks(sink) }
+  predicate isSink(DataFlow::Node sink) { sink = any(FileSystemAccess fsa).getAPathArgument() }
 }
 
 module Flow = TaintTracking::Global<Config>;
@@ -26,7 +26,3 @@ module FlowTest implements TestSig {
     )
   }
 }
-
-query predicate sources(DataFlow::Node source) { source instanceof RemoteFlowSource }
-
-query predicate sinks(DataFlow::Node sink) { sink = any(FileSystemAccess fsa).getAPathArgument() }

go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SImplEmbedS2_subtypes_true.expected

@@ -1,7 +1,3 @@
 testFailures
 invalidModelRow
 failures
-sources
-| test.go:86:7:86:16 | call to Source |
-sinks
-| test.go:88:9:88:9 | y |

go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SImplEmbedS2_subtypes_true.ql

@@ -6,9 +6,9 @@ import TestUtilities.InlineExpectationsTest
 import MakeTest<FlowTest>
 
 module Config implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { sources(source) }
+  predicate isSource(DataFlow::Node source) { source instanceof RemoteFlowSource }
 
-  predicate isSink(DataFlow::Node sink) { sinks(sink) }
+  predicate isSink(DataFlow::Node sink) { sink = any(FileSystemAccess fsa).getAPathArgument() }
 }
 
 module Flow = TaintTracking::Global<Config>;
@@ -26,7 +26,3 @@ module FlowTest implements TestSig {
     )
   }
 }
-
-query predicate sources(DataFlow::Node source) { source instanceof RemoteFlowSource }
-
-query predicate sinks(DataFlow::Node sink) { sink = any(FileSystemAccess fsa).getAPathArgument() }

go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_i1_subtypes_false.expected

@@ -1,11 +1,3 @@
 testFailures
 invalidModelRow
 failures
-sources
-| test.go:8:7:8:16 | call to Source |
-| test.go:32:7:32:16 | call to Source |
-| test.go:44:7:44:16 | call to Source |
-sinks
-| test.go:10:9:10:9 | y |
-| test.go:34:9:34:9 | y |
-| test.go:46:9:46:9 | y |

go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_i1_subtypes_false.ql

@@ -6,9 +6,9 @@ import TestUtilities.InlineExpectationsTest
 import MakeTest<FlowTest>
 
 module Config implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { sources(source) }
+  predicate isSource(DataFlow::Node source) { source instanceof RemoteFlowSource }
 
-  predicate isSink(DataFlow::Node sink) { sinks(sink) }
+  predicate isSink(DataFlow::Node sink) { sink = any(FileSystemAccess fsa).getAPathArgument() }
 }
 
 module Flow = TaintTracking::Global<Config>;
@@ -26,7 +26,3 @@ module FlowTest implements TestSig {
     )
   }
 }
-
-query predicate sources(DataFlow::Node source) { source instanceof RemoteFlowSource }
-
-query predicate sinks(DataFlow::Node sink) { sink = any(FileSystemAccess fsa).getAPathArgument() }

go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_i1_subtypes_true.expected

@@ -1,33 +1,3 @@
 testFailures
 invalidModelRow
 failures
-sources
-| test.go:8:7:8:16 | call to Source |
-| test.go:14:7:14:16 | call to Source |
-| test.go:20:7:20:16 | call to Source |
-| test.go:26:7:26:16 | call to Source |
-| test.go:32:7:32:16 | call to Source |
-| test.go:38:7:38:16 | call to Source |
-| test.go:44:7:44:16 | call to Source |
-| test.go:50:7:50:16 | call to Source |
-| test.go:56:7:56:16 | call to Source |
-| test.go:62:7:62:16 | call to Source |
-| test.go:68:7:68:16 | call to Source |
-| test.go:74:7:74:16 | call to Source |
-| test.go:80:7:80:16 | call to Source |
-| test.go:86:7:86:16 | call to Source |
-sinks
-| test.go:10:9:10:9 | y |
-| test.go:16:9:16:9 | y |
-| test.go:22:9:22:9 | y |
-| test.go:28:9:28:9 | y |
-| test.go:34:9:34:9 | y |
-| test.go:40:9:40:9 | y |
-| test.go:46:9:46:9 | y |
-| test.go:52:9:52:9 | y |
-| test.go:58:9:58:9 | y |
-| test.go:64:9:64:9 | y |
-| test.go:70:9:70:9 | y |
-| test.go:76:9:76:9 | y |
-| test.go:82:9:82:9 | y |
-| test.go:88:9:88:9 | y |

go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_i1_subtypes_true.ql

@@ -6,9 +6,9 @@ import TestUtilities.InlineExpectationsTest
 import MakeTest<FlowTest>
 
 module Config implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { sources(source) }
+  predicate isSource(DataFlow::Node source) { source instanceof RemoteFlowSource }
 
-  predicate isSink(DataFlow::Node sink) { sinks(sink) }
+  predicate isSink(DataFlow::Node sink) { sink = any(FileSystemAccess fsa).getAPathArgument() }
 }
 
 module Flow = TaintTracking::Global<Config>;
@@ -26,7 +26,3 @@ module FlowTest implements TestSig {
     )
   }
 }
-
-query predicate sources(DataFlow::Node source) { source instanceof RemoteFlowSource }
-
-query predicate sinks(DataFlow::Node sink) { sink = any(FileSystemAccess fsa).getAPathArgument() }

go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_i2_subtypes_false.expected

@@ -1,11 +1,3 @@
 testFailures
 invalidModelRow
 failures
-sources
-| test.go:14:7:14:16 | call to Source |
-| test.go:38:7:38:16 | call to Source |
-| test.go:50:7:50:16 | call to Source |
-sinks
-| test.go:16:9:16:9 | y |
-| test.go:40:9:40:9 | y |
-| test.go:52:9:52:9 | y |

go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_i2_subtypes_false.ql

@@ -6,9 +6,9 @@ import TestUtilities.InlineExpectationsTest
 import MakeTest<FlowTest>
 
 module Config implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { sources(source) }
+  predicate isSource(DataFlow::Node source) { source instanceof RemoteFlowSource }
 
-  predicate isSink(DataFlow::Node sink) { sinks(sink) }
+  predicate isSink(DataFlow::Node sink) { sink = any(FileSystemAccess fsa).getAPathArgument() }
 }
 
 module Flow = TaintTracking::Global<Config>;
@@ -26,7 +26,3 @@ module FlowTest implements TestSig {
     )
   }
 }
-
-query predicate sources(DataFlow::Node source) { source instanceof RemoteFlowSource }
-
-query predicate sinks(DataFlow::Node sink) { sink = any(FileSystemAccess fsa).getAPathArgument() }

go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_i2_subtypes_true.expected

@@ -1,19 +1,3 @@
 testFailures
 invalidModelRow
 failures
-sources
-| test.go:14:7:14:16 | call to Source |
-| test.go:26:7:26:16 | call to Source |
-| test.go:38:7:38:16 | call to Source |
-| test.go:50:7:50:16 | call to Source |
-| test.go:62:7:62:16 | call to Source |
-| test.go:74:7:74:16 | call to Source |
-| test.go:86:7:86:16 | call to Source |
-sinks
-| test.go:16:9:16:9 | y |
-| test.go:28:9:28:9 | y |
-| test.go:40:9:40:9 | y |
-| test.go:52:9:52:9 | y |
-| test.go:64:9:64:9 | y |
-| test.go:76:9:76:9 | y |
-| test.go:88:9:88:9 | y |

go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_i2_subtypes_true.ql

@@ -6,9 +6,9 @@ import TestUtilities.InlineExpectationsTest
 import MakeTest<FlowTest>
 
 module Config implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { sources(source) }
+  predicate isSource(DataFlow::Node source) { source instanceof RemoteFlowSource }
 
-  predicate isSink(DataFlow::Node sink) { sinks(sink) }
+  predicate isSink(DataFlow::Node sink) { sink = any(FileSystemAccess fsa).getAPathArgument() }
 }
 
 module Flow = TaintTracking::Global<Config>;
@@ -26,7 +26,3 @@ module FlowTest implements TestSig {
     )
   }
 }
-
-query predicate sources(DataFlow::Node source) { source instanceof RemoteFlowSource }
-
-query predicate sinks(DataFlow::Node sink) { sink = any(FileSystemAccess fsa).getAPathArgument() }

go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_s1_subtypes_false.expected

@@ -1,9 +1,3 @@
 testFailures
 invalidModelRow
 failures
-sources
-| test.go:20:7:20:16 | call to Source |
-| test.go:68:7:68:16 | call to Source |
-sinks
-| test.go:22:9:22:9 | y |
-| test.go:70:9:70:9 | y |

go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_s1_subtypes_false.ql

@@ -6,9 +6,9 @@ import TestUtilities.InlineExpectationsTest
 import MakeTest<FlowTest>
 
 module Config implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { sources(source) }
+  predicate isSource(DataFlow::Node source) { source instanceof RemoteFlowSource }
 
-  predicate isSink(DataFlow::Node sink) { sinks(sink) }
+  predicate isSink(DataFlow::Node sink) { sink = any(FileSystemAccess fsa).getAPathArgument() }
 }
 
 module Flow = TaintTracking::Global<Config>;
@@ -26,7 +26,3 @@ module FlowTest implements TestSig {
     )
   }
 }
-
-query predicate sources(DataFlow::Node source) { source instanceof RemoteFlowSource }
-
-query predicate sinks(DataFlow::Node sink) { sink = any(FileSystemAccess fsa).getAPathArgument() }

go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_s1_subtypes_true.expected

@@ -1,9 +1,3 @@
 testFailures
 invalidModelRow
 failures
-sources
-| test.go:20:7:20:16 | call to Source |
-| test.go:68:7:68:16 | call to Source |
-sinks
-| test.go:22:9:22:9 | y |
-| test.go:70:9:70:9 | y |

go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_s1_subtypes_true.ql

@@ -6,9 +6,9 @@ import TestUtilities.InlineExpectationsTest
 import MakeTest<FlowTest>
 
 module Config implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { sources(source) }
+  predicate isSource(DataFlow::Node source) { source instanceof RemoteFlowSource }
 
-  predicate isSink(DataFlow::Node sink) { sinks(sink) }
+  predicate isSink(DataFlow::Node sink) { sink = any(FileSystemAccess fsa).getAPathArgument() }
 }
 
 module Flow = TaintTracking::Global<Config>;
@@ -26,7 +26,3 @@ module FlowTest implements TestSig {
     )
   }
 }
-
-query predicate sources(DataFlow::Node source) { source instanceof RemoteFlowSource }
-
-query predicate sinks(DataFlow::Node sink) { sink = any(FileSystemAccess fsa).getAPathArgument() }

go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/ql_i1.expected

@@ -3,11 +3,3 @@ paths
 | test.go:8:7:8:16 | call to Source | test.go:10:9:10:9 | y |
 | test.go:32:7:32:16 | call to Source | test.go:34:9:34:9 | y |
 | test.go:44:7:44:16 | call to Source | test.go:46:9:46:9 | y |
-sources
-| test.go:8:7:8:16 | call to Source |
-| test.go:32:7:32:16 | call to Source |
-| test.go:44:7:44:16 | call to Source |
-sinks
-| test.go:10:9:10:9 | y |
-| test.go:34:9:34:9 | y |
-| test.go:46:9:46:9 | y |

go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/ql_i1.ql

@@ -32,15 +32,11 @@ class MySink extends FileSystemAccess::Range, DataFlow::CallNode {
 }
 
 module Config implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { sources(source) }
+  predicate isSource(DataFlow::Node source) { source instanceof RemoteFlowSource }
 
-  predicate isSink(DataFlow::Node sink) { sinks(sink) }
+  predicate isSink(DataFlow::Node sink) { sink = any(FileSystemAccess fsa).getAPathArgument() }
 }
 
 module Flow = DataFlow::Global<Config>;
 
 query predicate paths(DataFlow::Node source, DataFlow::Node sink) { Flow::flow(source, sink) }
-
-query predicate sources(DataFlow::Node source) { source instanceof RemoteFlowSource }
-
-query predicate sinks(DataFlow::Node sink) { sink = any(FileSystemAccess fsa).getAPathArgument() }

go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/ql_s1.expected

@@ -5,15 +5,3 @@ paths
 | test.go:32:7:32:16 | call to Source | test.go:34:9:34:9 | y |
 | test.go:44:7:44:16 | call to Source | test.go:46:9:46:9 | y |
 | test.go:68:7:68:16 | call to Source | test.go:70:9:70:9 | y |
-sources
-| test.go:8:7:8:16 | call to Source |
-| test.go:20:7:20:16 | call to Source |
-| test.go:32:7:32:16 | call to Source |
-| test.go:44:7:44:16 | call to Source |
-| test.go:68:7:68:16 | call to Source |
-sinks
-| test.go:10:9:10:9 | y |
-| test.go:22:9:22:9 | y |
-| test.go:34:9:34:9 | y |
-| test.go:46:9:46:9 | y |
-| test.go:70:9:70:9 | y |

go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/ql_s1.ql

@@ -32,15 +32,11 @@ class MySink extends FileSystemAccess::Range, DataFlow::CallNode {
 }
 
 module Config implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { sources(source) }
+  predicate isSource(DataFlow::Node source) { source instanceof RemoteFlowSource }
 
-  predicate isSink(DataFlow::Node sink) { sinks(sink) }
+  predicate isSink(DataFlow::Node sink) { sink = any(FileSystemAccess fsa).getAPathArgument() }
 }
 
 module Flow = DataFlow::Global<Config>;
 
 query predicate paths(DataFlow::Node source, DataFlow::Node sink) { Flow::flow(source, sink) }
-
-query predicate sources(DataFlow::Node source) { source instanceof RemoteFlowSource }
-
-query predicate sinks(DataFlow::Node sink) { sink = any(FileSystemAccess fsa).getAPathArgument() }