CPP: Merge the Todo/FixmeComments tests.

cpp/ql/test/library-tests/queries/todo_fixme/.gitattributes

@@ -1 +0,0 @@
-todo_fixme.cpp text eol=lf

cpp/ql/test/library-tests/queries/todo_fixme/todo.expected

@@ -1,3 +0,0 @@
-| todo_fixme.cpp:1:1:1:17 | // TODO: Thing 1. | TODO comment: Thing 1. |
-| todo_fixme.cpp:2:1:2:20 | /* TODO: Thing 2. */ | TODO comment: Thing 2. |
-| todo_fixme.cpp:3:1:5:3 | /**\n * TODO: Thing 3.\n */ | TODO comment: Thing 3. |

cpp/ql/test/library-tests/queries/todo_fixme/todo.qlref

@@ -1 +0,0 @@
-Documentation/TodoComments.ql

cpp/ql/test/query-tests/Documentation/TodoComments/.gitattributes

@@ -1 +1,2 @@
 todo.c text eol=lf
+todo_fixme.cpp text eol=lf

cpp/ql/test/query-tests/Documentation/TodoComments/TodoComments.expected

@@ -6,3 +6,6 @@
 | todo.c:17:1:21:15 | /* Some comment\n * TODO This is a mid-comment\n * multi-line comment with two\n * TODO comments\n * inside it */ | TODO comment: comments [...] |
 | todo.c:23:1:23:53 | /* TODO This comment mentions TODO in its body too */ | TODO comment: This comment mentions TODO in its body too |
 | todo.c:25:1:25:40 | // TODO: Can have C++-style comments too | TODO comment: Can have C++-style comments too |
+| todo_fixme.cpp:1:1:1:17 | // TODO: Thing 1. | TODO comment: Thing 1. |
+| todo_fixme.cpp:2:1:2:20 | /* TODO: Thing 2. */ | TODO comment: Thing 2. |
+| todo_fixme.cpp:3:1:5:3 | /**\n * TODO: Thing 3.\n */ | TODO comment: Thing 3. |