C++: Adjust the tests with thresholds so as to test the extremes, not the tuning of the threshold.

Author: geoffw0

cpp/ql/test/query-tests/Best Practices/BlockWithTooManyStatements/BlockWithTooManyStatements.cpp

@@ -1,4 +1,4 @@
-void complex_block_one() {
+void complex_block() {
   while (true) {
     int a = 1;
     int b = 2;
@@ -7,6 +7,9 @@ void complex_block_one() {
     int e = 5;
     int f = 6;
     int g = 7;
+    int h = 8;
+    int i = 9;
+    int j = 10;
   }
   while (true) {
     int a = 1;
@@ -16,6 +19,9 @@ void complex_block_one() {
     int e = 5;
     int f = 6;
     int g = 7;
+    int h = 8;
+    int i = 9;
+    int j = 10;
   }
   while (true) {
     int a = 1;
@@ -25,6 +31,9 @@ void complex_block_one() {
     int e = 5;
     int f = 6;
     int g = 7;
+    int h = 8;
+    int i = 9;
+    int j = 10;
   }
   while (true) {
     int a = 1;
@@ -34,74 +43,44 @@ void complex_block_one() {
     int e = 5;
     int f = 6;
     int g = 7;
+    int h = 8;
+    int i = 9;
+    int j = 10;
   }
-} // $ Alert
-
-void complex_block_two() {
-  for (;;) {
-    int a = 1;
-    int b = 2;
-    int c = 3;
-    int d = 4;
-    int e = 5;
-    int f = 6;
-    int g = 7;
-  }
-  for (;;) {
-    int a = 1;
-    int b = 2;
-    int c = 3;
-    int d = 4;
-    int e = 5;
-    int f = 6;
-    int g = 7;
-  }
-  for (;;) {
-    int a = 1;
-    int b = 2;
-    int c = 3;
-    int d = 4;
-    int e = 5;
-    int f = 6;
-    int g = 7;
-  }
-  for (;;) {
+  while (true) {
     int a = 1;
     int b = 2;
     int c = 3;
     int d = 4;
     int e = 5;
     int f = 6;
     int g = 7;
+    int h = 8;
+    int i = 9;
+    int j = 10;
   }
 } // $ Alert
 
-void three_complex_statements_is_not_enough() {
+void not_complex_block() {
   while (true) {
     int a = 1;
     int b = 2;
     int c = 3;
     int d = 4;
     int e = 5;
-    int f = 6;
-    int g = 7;
   }
   while (true) {
     int a = 1;
     int b = 2;
     int c = 3;
     int d = 4;
     int e = 5;
-    int f = 6;
-    int g = 7;
   }
   while (true) {
     int a = 1;
     int b = 2;
     int c = 3;
     int d = 4;
     int e = 5;
-    int f = 6;
-    int g = 7;
   }
 }

cpp/ql/test/query-tests/Best Practices/BlockWithTooManyStatements/BlockWithTooManyStatements.expected

@@ -1,2 +1 @@
-| BlockWithTooManyStatements.cpp:1:26:38:1 | { ... } | Block with too many statements (4 complex statements in the block). |
-| BlockWithTooManyStatements.cpp:40:26:77:1 | { ... } | Block with too many statements (4 complex statements in the block). |
+| BlockWithTooManyStatements.cpp:1:22:62:1 | { ... } | Block with too many statements (5 complex statements in the block). |

cpp/ql/test/query-tests/Best Practices/ComplexCondition/ComplexCondition.cpp

@@ -1,16 +1,10 @@
-void complex_condition_one(bool a, bool b, bool c, bool d, bool e, bool f, bool g, bool h, bool i, bool j,
-    bool k, bool l) {
-  if (a && b || c && d || e && f || g && h || i && j || k && l) { // $ Alert
+void complex_condition(bool a, bool b, bool c, bool d, bool e, bool f, bool g, bool h, bool i, bool j,
+    bool k, bool l, bool m, bool n, bool o) {
+  if (a || b && c || d && e || f && g || h && i || j && k || l && m || n && o) { // $ Alert
   }
 }
 
-void complex_condition_two(bool a, bool b, bool c, bool d, bool e, bool f, bool g, bool h, bool i, bool j,
-    bool k, bool l, bool m) {
-  if (a || b && c || d && e || f && g || h && i || j && k || l && m) { // $ Alert
-  }
-}
-
-void five_logical_operations_is_not_enough(bool a, bool b, bool c, bool d, bool e, bool f) {
+void not_complex_condition(bool a, bool b, bool c, bool d, bool e, bool f) {
   if (a && b || c && d || e && f) {
   }
 }

cpp/ql/test/query-tests/Best Practices/ComplexCondition/ComplexCondition.expected

@@ -1,2 +1 @@
-| ComplexCondition.cpp:3:7:3:62 | ... \|\| ... | Complex condition: too many logical operations in this expression. |
-| ComplexCondition.cpp:9:7:9:67 | ... \|\| ... | Complex condition: too many logical operations in this expression. |
+| ComplexCondition.cpp:3:7:3:77 | ... \|\| ... | Complex condition: too many logical operations in this expression. |

cpp/ql/test/query-tests/Best Practices/UseOfGoto/UseOfGoto.cpp

@@ -1,41 +1,25 @@
-void multiple_forward_and_backward_targets_one() { // $ Alert
-  goto forward_one;
-  goto forward_two;
-forward_one:
-  ;
-forward_two:
-  ;
+bool cond();
+
+void multiple_forward_and_backward_goto() { // $ Alert
 backward_one:
-  ;
+  if (cond()) goto forward_one;
 backward_two:
-  ;
-  goto backward_one;
-  goto backward_two;
+  if (cond()) goto forward_two;
+forward_one:
+  if (cond()) goto backward_one;
+forward_two:
+  if (cond()) goto backward_two;
 }
 
-void multiple_forward_and_backward_targets_two() { // $ Alert
-  goto next_one;
-  goto next_two;
-next_one:
-  ;
-next_two:
-  ;
-earlier_one:
-  ;
-earlier_two:
-  ;
-  goto earlier_one;
-  goto earlier_two;
-}
+void only_forward_goto() {
+  if (cond()) goto end;
 
-void one_forward_target_is_not_enough() {
-  goto forward;
-forward:
-  ;
-backward_one:
-  ;
-backward_two:
-  ;
-  goto backward_one;
-  goto backward_two;
+  // ...
+
+  if (cond()) goto end;
+
+  // ...
+
+end:
+  // ...
 }

cpp/ql/test/query-tests/Best Practices/UseOfGoto/UseOfGoto.expected

@@ -1,2 +1 @@
-| UseOfGoto.cpp:1:6:1:46 | definition of multiple_forward_and_backward_targets_one | Multiple forward and backward goto statements may make function multiple_forward_and_backward_targets_one hard to understand. |
-| UseOfGoto.cpp:16:6:16:46 | definition of multiple_forward_and_backward_targets_two | Multiple forward and backward goto statements may make function multiple_forward_and_backward_targets_two hard to understand. |
+| UseOfGoto.cpp:3:6:3:39 | definition of multiple_forward_and_backward_goto | Multiple forward and backward goto statements may make function multiple_forward_and_backward_goto hard to understand. |