Combine and clean up the test files

python/ql/test/2/query-tests/Expressions/TruncatedDivision.expected

@@ -1,3 +1,2 @@
-| TruncatedDivision.py:36:9:36:13 | BinaryExpr | Result of division may be truncated as its $@ and $@ arguments may both be integers. | TruncatedDivision.py:36:9:36:9 | TruncatedDivision.py:36 | left | TruncatedDivision.py:36:13:36:13 | TruncatedDivision.py:36 | right |
-| TruncatedDivision_test.py:8:12:8:16 | BinaryExpr | Result of division may be truncated as its $@ and $@ arguments may both be integers. | TruncatedDivision_test.py:8:12:8:12 | TruncatedDivision_test.py:8 | left | TruncatedDivision_test.py:8:16:8:16 | TruncatedDivision_test.py:8 | right |
-| TruncatedDivision_test.py:11:12:11:40 | BinaryExpr | Result of division may be truncated as its $@ and $@ arguments may both be integers. | TruncatedDivision_test.py:2:12:2:12 | TruncatedDivision_test.py:2 | left | TruncatedDivision_test.py:5:12:5:12 | TruncatedDivision_test.py:5 | right |
+| TruncatedDivision_test.py:65:7:65:11 | BinaryExpr | Result of division may be truncated as its $@ and $@ arguments may both be integers. | TruncatedDivision_test.py:65:7:65:7 | TruncatedDivision_test.py:65 | left | TruncatedDivision_test.py:65:11:65:11 | TruncatedDivision_test.py:65 | right |
+| TruncatedDivision_test.py:72:7:72:35 | BinaryExpr | Result of division may be truncated as its $@ and $@ arguments may both be integers. | TruncatedDivision_test.py:25:12:25:12 | TruncatedDivision_test.py:25 | left | TruncatedDivision_test.py:28:12:28:12 | TruncatedDivision_test.py:28 | right |

python/ql/test/2/query-tests/Expressions/TruncatedDivision.py

@@ -1,46 +0,0 @@
-#### TruncatedDivision.ql
-
-# NOTE: The following test case will only work under Python 2.
-
-# NOTE: While there are other files that have the same matching examples, this
-# example file tries to explain the motivation of each example. Hopefully it's
-# fine to have multiple such files.
-
-# Truncated division occurs when two integers are divided. This causes the
-# fractional part, if there is one, to be discared. So for example, `2 / 3` will
-# evaluate to `0` instead of `0.666...`.
-
-def truncated_division():
-
-  def average(l):
-    return sum(l) / len(l)
-
-
-
-  ## Negative Cases
-
-  # This case is good, and is a minimal obvious case that should be good. It
-  # SHOULD NOT be found by the query.
-  print(3.0 / 2.0)
-
-  # This case is good, because the sum is `3.0`, which is a float, and will not
-  # truncate. This case SHOULD NOT be found by the query.
-  print(average([1.0, 2.0]))
-
-
-
-  ## Positive Cases
-
-  # This case is bad, and is a minimal obvious case that should be bad. It
-  # SHOULD be found by the query.
-  print(3 / 2)
-
-  # This case is bad, because the sum is `3`, which is an integer, and will
-  # truncate when divided by the length `2`. This case SHOULD be found by the
-  # query.
-  #
-  # NOTE (2020-02-20):
-  # The current version of the Value/pointsTo API doesn't permit this detection,
-  # unfortunately, but we preserve this example in the hopes that future
-  # versions will catch it. That will necessitate changing the expected results.
-  print(average([1,2]))

python/ql/test/2/query-tests/Expressions/TruncatedDivision_test.py

@@ -1,24 +1,88 @@
+#### TruncatedDivision.ql
+
+# NOTE: The following test case will only work under Python 2.
+
+# Truncated division occurs when two integers are divided. This causes the
+# fractional part, if there is one, to be discared. So for example, `2 / 3` will
+# evaluate to `0` instead of `0.666...`.
+
+
+
+
+
+## Negative Cases
+
+
+
+# This case is good, and is a minimal obvious case that should be good. It
+# SHOULD NOT be found by the query.
+print(3.0 / 2.0)
+
+# This case is good, because it explicitly converts the possibly-truncated
+# value to an integer. It SHOULD NOT be found by the query.
+
 def return_three():
     return 3
 
 def return_two():
     return 2
 
-def f1():
-    return 3 / 2
+print(int(return_three() / return_two()))
 
-def f2():
-    return return_three() / return_two()
 
-def f3(x):
+
+# These cases are good, because `halve` checks the type, and if the type would
+# truncate, it explicitly converts to a float first before doing the division.
+# These SHOULD NOT be found by the query.
+
+def halve(x):
     if isinstance(x, float):
         return x / 2
     else:
         return (1.0 * x) / 2
 
-def f4():
-    do_stuff(f3(1))
-    do_stuff(f3(1.0))
+print(halve(1))
+print(halve(1.0))
 
-def f5():
-    return int(return_three() / return_two())
+
+
+# This case is good, because the sum is `3.0`, which is a float, and will not
+# truncate. This case SHOULD NOT be found by the query.
+
+print(average([1.0, 2.0]))
+
+
+
+
+
+## Positive Cases
+
+
+
+# This case is bad, and is a minimal obvious case that should be bad. It
+# SHOULD be found by the query.
+
+print(3 / 2)
+
+
+
+# This case is bad. It uses indirect returns of integers through function calls
+# to produce the problem. I
+
+print(return_three() / return_two())
+
+
+
+# This case is bad, because the sum is `3`, which is an integer, and will
+# truncate when divided by the length `2`. This case SHOULD be found by the
+# query.
+
+# NOTE (2020-02-20):
+# The current version of the Value/pointsTo API doesn't permit this detection,
+# unfortunately, but we preserve this example in the hopes that future
+# versions will catch it. That will necessitate changing the expected results.
+
+def average(l):
+    return sum(l) / len(l)
+
+print(average([1,2]))