C++: Update the (synthetic) test.

geoffw0 · geoffw0 · commit 833165f86c8a · 2024-01-18T13:24:57.000Z
diff --git a/cpp/ql/test/library-tests/dataflow/models-as-data/taint.expected b/cpp/ql/test/library-tests/dataflow/models-as-data/taint.expected
@@ -1,4 +1,2 @@
-WARNING: This QLDoc comment is not attached to any QL element (taint.ql:5,1-7,4)
-WARNING: This QLDoc comment is not attached to any QL element (taint.ql:29,1-31,4)
 testFailures
 failures
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
@@ -5,7 +5,7 @@ import semmle.code.cpp.security.FlowSources
 /**
  * Models-as-data source models for this test.
  */
-/*private class TestSources extends SourceModelCsv {
+private class TestSources extends SourceModelCsv {
   override predicate row(string row) {
     row =
       [
@@ -24,12 +24,12 @@ import semmle.code.cpp.security.FlowSources
         ";MyDerivedClass;false;subtypeRemoteMadSource2;;;ReturnValue;remote",
       ]
   }
-}*/
+}
 
 /**
  * Models-as-data sink models for this test.
  */
-/*private class TestSinks extends SinkModelCsv {
+private class TestSinks extends SinkModelCsv {
   override predicate row(string row) {
     row =
       [
@@ -43,12 +43,12 @@ import semmle.code.cpp.security.FlowSources
         ";MyClass;true;memberMadSinkVar;;;;test-sink",
       ]
   }
-}*/
+}
 
 /**
  * Models-as-data summary models for this test.
  */
-/*private class TestSummaries extends SummaryModelCsv {
+private class TestSummaries extends SummaryModelCsv {
   override predicate row(string row) {
     row =
       [
@@ -66,7 +66,7 @@ import semmle.code.cpp.security.FlowSources
         ";MyClass;true;madFieldToReturn;;;Argument[-1].val;ReturnValue;taint",
       ]
   }
-}*/
+}
 
 module IRTest {
   private import semmle.code.cpp.ir.IR
@@ -81,8 +81,8 @@ module IRTest {
     }
 
     predicate isSink(DataFlow::Node sink) {
-      //sinkNode(sink, "test-sink")
-      //or
+      sinkNode(sink, "test-sink")
+      or
       exists(FunctionCall call |
         call.getTarget().getName() = "sink" and
         [sink.asExpr(), sink.asIndirectExpr()] = call.getAnArgument()
diff --git a/cpp/ql/test/library-tests/dataflow/models-as-data/tests.cpp b/cpp/ql/test/library-tests/dataflow/models-as-data/tests.cpp
@@ -21,10 +21,10 @@ void test_sources() {
 
 	// test sources
 
-	sink(localMadSource()); // $ MISSING: ir
-	sink(remoteMadSource()); // $ MISSING: ir
+	sink(localMadSource()); // $ ir
+	sink(remoteMadSource()); // $ ir
 	sink(notASource());
-	sink(localMadSourceHasBody()); // $ MISSING: ir
+	sink(localMadSourceHasBody()); // $ ir
 	sink(*remoteMadSourceIndirect()); // $ MISSING: ir
 
 	int a, b, c, d;
@@ -41,7 +41,7 @@ void test_sources() {
 
 void remoteMadSourceParam0(int x)
 {
-	sink(x); // $ MISSING: ir
+	sink(x); // $ ir
 }
 
 // --- global MAD sinks ---
@@ -180,20 +180,20 @@ void test_class_members() {
 
 	// test class member sources
 
-	sink(mc.memberRemoteMadSource()); // $ MISSING: ir
+	sink(mc.memberRemoteMadSource()); // $ ir
 
 	int a;
 	mc.memberRemoteMadSourceArg0(&a);
 	sink(a); // $ MISSING: ir
 
-	sink(mc.memberRemoteMadSourceVar); // $ MISSING: ir
+	sink(mc.memberRemoteMadSourceVar); // $ ir
 
 	// test subtype sources
 
-	sink(mdc.memberRemoteMadSource()); // $ MISSING: ir
-	sink(mdc.subtypeRemoteMadSource1()); // $ MISSING: ir
+	sink(mdc.memberRemoteMadSource()); // $ ir
+	sink(mdc.subtypeRemoteMadSource1()); // $ ir
 	sink(mdc.subtypeNonSource());
-	sink(mdc.subtypeRemoteMadSource2()); // $ MISSING: ir
+	sink(mdc.subtypeRemoteMadSource2()); // $ ir
 
 	// test class member sinks
 

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ import semmle.code.cpp.security.FlowSources`
`5`	`5`	`/**`
`6`	`6`	`* Models-as-data source models for this test.`
`7`	`7`	`*/`
`8`		`-/*private class TestSources extends SourceModelCsv {`
	`8`	`+private class TestSources extends SourceModelCsv {`
`9`	`9`	`override predicate row(string row) {`
`10`	`10`	`row =`
`11`	`11`	`[`
`@@ -24,12 +24,12 @@ import semmle.code.cpp.security.FlowSources`
`24`	`24`	`";MyDerivedClass;false;subtypeRemoteMadSource2;;;ReturnValue;remote",`
`25`	`25`	`]`
`26`	`26`	`}`
`27`		`-}*/`
	`27`	`+}`
`28`	`28`
`29`	`29`	`/**`
`30`	`30`	`* Models-as-data sink models for this test.`
`31`	`31`	`*/`
`32`		`-/*private class TestSinks extends SinkModelCsv {`
	`32`	`+private class TestSinks extends SinkModelCsv {`
`33`	`33`	`override predicate row(string row) {`
`34`	`34`	`row =`
`35`	`35`	`[`
`@@ -43,12 +43,12 @@ import semmle.code.cpp.security.FlowSources`
`43`	`43`	`";MyClass;true;memberMadSinkVar;;;;test-sink",`
`44`	`44`	`]`
`45`	`45`	`}`
`46`		`-}*/`
	`46`	`+}`
`47`	`47`
`48`	`48`	`/**`
`49`	`49`	`* Models-as-data summary models for this test.`
`50`	`50`	`*/`
`51`		`-/*private class TestSummaries extends SummaryModelCsv {`
	`51`	`+private class TestSummaries extends SummaryModelCsv {`
`52`	`52`	`override predicate row(string row) {`
`53`	`53`	`row =`
`54`	`54`	`[`
`@@ -66,7 +66,7 @@ import semmle.code.cpp.security.FlowSources`
`66`	`66`	`";MyClass;true;madFieldToReturn;;;Argument[-1].val;ReturnValue;taint",`
`67`	`67`	`]`
`68`	`68`	`}`
`69`		`-}*/`
	`69`	`+}`
`70`	`70`
`71`	`71`	`module IRTest {`
`72`	`72`	`private import semmle.code.cpp.ir.IR`
`@@ -81,8 +81,8 @@ module IRTest {`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`predicate isSink(DataFlow::Node sink) {`
`84`		`- //sinkNode(sink, "test-sink")`
`85`		`- //or`
	`84`	`+ sinkNode(sink, "test-sink")`
	`85`	`+ or`
`86`	`86`	`exists(FunctionCall call \|`
`87`	`87`	`call.getTarget().getName() = "sink" and`
`88`	`88`	`[sink.asExpr(), sink.asIndirectExpr()] = call.getAnArgument()`