CPP: Test fixes as a result of changes.

geoffw0 · geoffw0 · commit e74721e3a408 · 2018-10-05T15:32:36.000+01:00
diff --git a/cpp/ql/test/query-tests/Likely Bugs/Format/WrongNumberOfFormatArguments/TooManyFormatArguments.expected b/cpp/ql/test/query-tests/Likely Bugs/Format/WrongNumberOfFormatArguments/TooManyFormatArguments.expected
@@ -1,5 +1,4 @@
 | custom_printf.cpp:31:5:31:12 | call to myPrintf | Format expects 2 arguments but given 3 |
-| custom_printf.cpp:44:2:44:7 | call to printf | Format expects 0 arguments but given 2 |
 | macros.cpp:12:2:12:31 | call to printf | Format expects 2 arguments but given 3 |
 | macros.cpp:16:2:16:30 | call to printf | Format expects 2 arguments but given 3 |
 | test.c:7:2:7:7 | call to printf | Format expects 0 arguments but given 1 |
diff --git a/cpp/ql/test/query-tests/Likely Bugs/Format/WrongNumberOfFormatArguments/WrongNumberOfFormatArguments.expected b/cpp/ql/test/query-tests/Likely Bugs/Format/WrongNumberOfFormatArguments/WrongNumberOfFormatArguments.expected
@@ -1,5 +1,4 @@
 | custom_printf.cpp:29:5:29:12 | call to myPrintf | Format expects 2 arguments but given 1 |
-| custom_printf.cpp:45:2:45:7 | call to printf | Format expects 2 arguments but given 0 |
 | macros.cpp:14:2:14:37 | call to printf | Format expects 4 arguments but given 3 |
 | macros.cpp:21:2:21:36 | call to printf | Format expects 4 arguments but given 3 |
 | test.c:9:2:9:7 | call to printf | Format expects 1 arguments but given 0 |
diff --git a/cpp/ql/test/query-tests/Likely Bugs/Format/WrongNumberOfFormatArguments/custom_printf.cpp b/cpp/ql/test/query-tests/Likely Bugs/Format/WrongNumberOfFormatArguments/custom_printf.cpp
@@ -41,6 +41,6 @@ void test_custom_printf2()
 {
 	//     notTheFormat  format    ...
 	printf(0,            "%i %i",  100, 200); // GOOD
-	printf("",           "%i %i",  100, 200); // GOOD [FALSE POSITIVE]
-	printf("%i %i",      ""        );         // GOOD [FALSE POSITIVE]
+	printf("",           "%i %i",  100, 200); // GOOD
+	printf("%i %i",      ""        );         // GOOD
 }

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`\| custom_printf.cpp:31:5:31:12 \| call to myPrintf \| Format expects 2 arguments but given 3 \|`
`2`		`-\| custom_printf.cpp:44:2:44:7 \| call to printf \| Format expects 0 arguments but given 2 \|`
`3`	`2`	`\| macros.cpp:12:2:12:31 \| call to printf \| Format expects 2 arguments but given 3 \|`
`4`	`3`	`\| macros.cpp:16:2:16:30 \| call to printf \| Format expects 2 arguments but given 3 \|`
`5`	`4`	`\| test.c:7:2:7:7 \| call to printf \| Format expects 0 arguments but given 1 \|`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`\| custom_printf.cpp:29:5:29:12 \| call to myPrintf \| Format expects 2 arguments but given 1 \|`
`2`		`-\| custom_printf.cpp:45:2:45:7 \| call to printf \| Format expects 2 arguments but given 0 \|`
`3`	`2`	`\| macros.cpp:14:2:14:37 \| call to printf \| Format expects 4 arguments but given 3 \|`
`4`	`3`	`\| macros.cpp:21:2:21:36 \| call to printf \| Format expects 4 arguments but given 3 \|`
`5`	`4`	`\| test.c:9:2:9:7 \| call to printf \| Format expects 1 arguments but given 0 \|`
Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,6 @@ void test_custom_printf2()`
`41`	`41`	`{`
`42`	`42`	`// notTheFormat format ...`
`43`	`43`	`printf(0, "%i %i", 100, 200); // GOOD`
`44`		`- printf("", "%i %i", 100, 200); // GOOD [FALSE POSITIVE]`
`45`		`- printf("%i %i", "" ); // GOOD [FALSE POSITIVE]`
	`44`	`+ printf("", "%i %i", 100, 200); // GOOD`
	`45`	`+ printf("%i %i", "" ); // GOOD`
`46`	`46`	`}`