Merge branch 'master' into fix_long_cpp_comments

.github/scripts/cpp_tests.sh

@@ -10,4 +10,5 @@ ${CAMCOPS_QT6_BASE_DIR}/qt_linux_x86_64_install/bin/qmake ../tablet_qt/tests
 make
 export QT_DEBUG_PLUGINS=1
 
-find . -path '*/bin/*' -type f -exec {} \;
+PYTHON=${HOME}/venv/bin/python
+${PYTHON} ${GITHUB_WORKSPACE}/tablet_qt/tools/run_cpp_tests.py --testroot .

.github/workflows/cpp-tests.yml

@@ -10,9 +10,11 @@ on:
  - .github/scripts/add_apt_sources.sh
  - .github/scripts/change_apt_mirror.sh
  - .github/scripts/cpp_tests.sh
+ - .github/scripts/python_setup.sh
  - .github/workflows/cpp-tests.yml
  - tablet_qt/qt_version.txt
  - tablet_qt/tools/build_qt.py
+ - tablet_qt/tools/run_cpp_tests.py
 
 jobs:
  cpp-tests:
@@ -26,7 +28,10 @@ jobs:
  file: qt.tgz
  token: ${{ secrets.GITHUB_TOKEN }}
  # The release ID is set by the build-qt.yml action
- version: 'tags/untagged-6d2cba07b921fd593071'
+ # but the tagging is broken somehow. This is brittle
+ # because editing the release on GitHub will change
+ # the tag (which isn't a proper tag)
+ version: 'tags/untagged-b8b360463f95f88e986f'
  - name: Install Qt
  run: |
  set -euxo pipefail
@@ -113,4 +118,5 @@ jobs:
  run: |
  set -eux -o pipefail
  export CAMCOPS_QT6_BASE_DIR=${HOME}/qt_local_build
+ ${GITHUB_WORKSPACE}/.github/scripts/python_setup.sh
  xvfb-run --auto-servernum ${GITHUB_WORKSPACE}/.github/scripts/cpp_tests.sh

.gitignore

@@ -3,11 +3,12 @@
 
 # Qt
 build-*/
-*.pro.user
+*.pro.user*
 *.stash
 tablet_qt/.qtc_clangd/
 tablet_qt/build/
 tablet_qt/Makefile
+tablet_qt/tests/build/
 
 # Temporary
 *~

docs/source/administrator/_camcops_server_allhelp.txt

@@ -2,7 +2,7 @@ USAGE: camcops_server [-h] [--allhelp] [--version] [-v] [--no_log]
  {docs,demo_camcops_config,demo_supervisor_config,demo_apache_config,upgrade_db,dev_upgrade_db,dev_downgrade_db,dev_add_dummy_data,show_db_title,show_db_schema,merge_db,create_db,ddl,reindex,check_index,make_superuser,reset_password,enable_user,export,show_export_queue,crate_dd,cris_dd,serve_cherrypy,serve_gunicorn,serve_pyramid,convert_athena_icd_snomed_to_xml,launch_workers,launch_scheduler,launch_monitor,housekeeping,purge_jobs,dev_cli,list_tasks}
  ...
 
-CamCOPS server, created by Rudolf Cardinal; version 2.4.19.
+CamCOPS server, created by Rudolf Cardinal; version 2.4.21.
 Use 'camcops_server <COMMAND> --help' for more detail on each command.
 
 OPTIONS:

docs/source/administrator/_demo_apache_config.conf

@@ -1,5 +1,5 @@
 # Demonstration Apache config file section for CamCOPS.
-# Created by CamCOPS version 2.4.19.
+# Created by CamCOPS version 2.4.21.
 #
 # Under Ubuntu, the Apache config will be somewhere in /etc/apache2/
 # Under CentOS, the Apache config will be somewhere in /etc/httpd/

docs/source/administrator/_demo_camcops_config.ini

@@ -1,6 +1,6 @@
 # Demonstration CamCOPS server configuration file.
 #
-# Created by CamCOPS server version 2.4.19.
+# Created by CamCOPS server version 2.4.21.
 # See help at https://camcops.readthedocs.io/.
 #
 # Using defaults for Docker environment: False

docs/source/administrator/_demo_supervisor_config.ini

@@ -1,6 +1,6 @@
 # =============================================================================
 # Demonstration 'supervisor' (supervisord) config file for CamCOPS.
-# Created by CamCOPS version 2.4.19.
+# Created by CamCOPS version 2.4.21.
 # =============================================================================
 # See https://camcops.readthedocs.io/en/latest/administrator/server_configuration.html#start-camcops
 

docs/source/autodoc/server/camcops_server/_index.rst

@@ -233,6 +233,7 @@ server/camcops_server
  cc_modules/tests/cc_sqla_coltypes_tests.py.rst
  cc_modules/tests/cc_task_collection_tests.py.rst
  cc_modules/tests/cc_task_tests.py.rst
+ cc_modules/tests/cc_taskreports_tests.py.rst
  cc_modules/tests/cc_taskschedule_tests.py.rst
  cc_modules/tests/cc_taskschedulereports_tests.py.rst
  cc_modules/tests/cc_text_tests.py.rst
@@ -477,11 +478,13 @@ server/camcops_server
  tasks/tests/apeq_cpft_perinatal_tests.py.rst
  tasks/tests/aq_tests.py.rst
  tasks/tests/basdai_tests.py.rst
+ tasks/tests/bmi_tests.py.rst
  tasks/tests/cia_tests.py.rst
  tasks/tests/core10_tests.py.rst
  tasks/tests/cpft_covid_medical_tests.py.rst
  tasks/tests/cpft_research_preferences_tests.py.rst
  tasks/tests/edeq_tests.py.rst
+ tasks/tests/factories.py.rst
  tasks/tests/maas_tests.py.rst
  tasks/tests/paradise24_tests.py.rst
  tasks/tests/perinatalpoem_tests.py.rst

docs/source/autodoc/server/camcops_server/cc_modules/tests/cc_taskreports_tests.py.rst

@@ -0,0 +1,29 @@
+.. docs/source/autodoc/server/camcops_server/cc_modules/tests/cc_taskreports_tests.py.rst
+
+.. THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
+
+
+.. Copyright (C) 2012, University of Cambridge, Department of Psychiatry.
+ Created by Rudolf Cardinal ([email protected]).
+ .
+ This file is part of CamCOPS.
+ .
+ CamCOPS is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+ .
+ CamCOPS is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with CamCOPS. If not, see <https://www.gnu.org/licenses/>.
+
+
+camcops_server.cc_modules.tests.cc_taskreports_tests
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+.. automodule:: camcops_server.cc_modules.tests.cc_taskreports_tests
+ :members:

docs/source/autodoc/server/camcops_server/tasks/tests/bmi_tests.py.rst

@@ -0,0 +1,29 @@
+.. docs/source/autodoc/server/camcops_server/tasks/tests/bmi_tests.py.rst
+
+.. THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
+
+
+.. Copyright (C) 2012, University of Cambridge, Department of Psychiatry.
+ Created by Rudolf Cardinal ([email protected]).
+ .
+ This file is part of CamCOPS.
+ .
+ CamCOPS is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+ .
+ CamCOPS is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with CamCOPS. If not, see <https://www.gnu.org/licenses/>.
+
+
+camcops_server.tasks.tests.bmi_tests
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+.. automodule:: camcops_server.tasks.tests.bmi_tests
+ :members:

docs/source/autodoc/server/camcops_server/tasks/tests/factories.py.rst

@@ -0,0 +1,29 @@
+.. docs/source/autodoc/server/camcops_server/tasks/tests/factories.py.rst
+
+.. THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
+
+
+.. Copyright (C) 2012, University of Cambridge, Department of Psychiatry.
+ Created by Rudolf Cardinal ([email protected]).
+ .
+ This file is part of CamCOPS.
+ .
+ CamCOPS is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+ .
+ CamCOPS is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with CamCOPS. If not, see <https://www.gnu.org/licenses/>.
+
+
+camcops_server.tasks.tests.factories
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+.. automodule:: camcops_server.tasks.tests.factories
+ :members:

docs/source/autodoc/tablet_qt/_index.rst

@@ -956,11 +956,17 @@ tablet_qt
  tests/auto/lib/lib.pro.rst
  tests/auto/lib/margins/margins.pro.rst
  tests/auto/lib/margins/testmargins.cpp.rst
+ tests/auto/lib/numericfunc/numericfunc.pro.rst
+ tests/auto/lib/numericfunc/testnumericfunc.cpp.rst
  tests/auto/lib/soundfunc/soundfunc.pro.rst
  tests/auto/lib/soundfunc/testsoundfunc.cpp.rst
  tests/auto/lib/stringfunc/stringfunc.pro.rst
  tests/auto/lib/stringfunc/teststringfunc.cpp.rst
  tests/auto/qobjects/qobjects.pro.rst
+ tests/auto/qobjects/strictdoublevalidator/strictdoublevalidator.pro.rst
+ tests/auto/qobjects/strictdoublevalidator/teststrictdoublevalidator.cpp.rst
+ tests/auto/qobjects/strictintvalidator/strictintvalidator.pro.rst
+ tests/auto/qobjects/strictintvalidator/teststrictintvalidator.cpp.rst
  tests/auto/qobjects/widgetpositioner/testwidgetpositioner.cpp.rst
  tests/auto/qobjects/widgetpositioner/widgetpositioner.pro.rst
  tests/auto/questionnairelib/namevalueoptions/namevalueoptions.pro.rst

docs/source/autodoc/tablet_qt/tests/auto/lib/numericfunc/numericfunc.pro.rst

@@ -0,0 +1,29 @@
+.. docs/source/autodoc/tablet_qt/tests/auto/lib/numericfunc/numericfunc.pro.rst
+
+.. THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
+
+
+.. Copyright (C) 2012, University of Cambridge, Department of Psychiatry.
+ Created by Rudolf Cardinal ([email protected]).
+ .
+ This file is part of CamCOPS.
+ .
+ CamCOPS is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+ .
+ CamCOPS is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with CamCOPS. If not, see <https://www.gnu.org/licenses/>.
+
+
+tablet_qt/tests/auto/lib/numericfunc/numericfunc.pro
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+.. literalinclude:: ../../../../../../../../tablet_qt/tests/auto/lib/numericfunc/numericfunc.pro
+ :language: none

docs/source/autodoc/tablet_qt/tests/auto/lib/numericfunc/testnumericfunc.cpp.rst

@@ -0,0 +1,29 @@
+.. docs/source/autodoc/tablet_qt/tests/auto/lib/numericfunc/testnumericfunc.cpp.rst
+
+.. THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
+
+
+.. Copyright (C) 2012, University of Cambridge, Department of Psychiatry.
+ Created by Rudolf Cardinal ([email protected]).
+ .
+ This file is part of CamCOPS.
+ .
+ CamCOPS is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+ .
+ CamCOPS is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with CamCOPS. If not, see <https://www.gnu.org/licenses/>.
+
+
+tablet_qt/tests/auto/lib/numericfunc/testnumericfunc.cpp
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+.. literalinclude:: ../../../../../../../../tablet_qt/tests/auto/lib/numericfunc/testnumericfunc.cpp
+ :language: C++

docs/source/autodoc/tablet_qt/tests/auto/qobjects/strictdoublevalidator/strictdoublevalidator.pro.rst

@@ -0,0 +1,29 @@
+.. docs/source/autodoc/tablet_qt/tests/auto/qobjects/strictdoublevalidator/strictdoublevalidator.pro.rst
+
+.. THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
+
+
+.. Copyright (C) 2012, University of Cambridge, Department of Psychiatry.
+ Created by Rudolf Cardinal ([email protected]).
+ .
+ This file is part of CamCOPS.
+ .
+ CamCOPS is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+ .
+ CamCOPS is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with CamCOPS. If not, see <https://www.gnu.org/licenses/>.
+
+
+tablet_qt/tests/auto/qobjects/strictdoublevalidator/strictdoublevalidator.pro
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+.. literalinclude:: ../../../../../../../../tablet_qt/tests/auto/qobjects/strictdoublevalidator/strictdoublevalidator.pro
+ :language: none

docs/source/autodoc/tablet_qt/tests/auto/qobjects/strictdoublevalidator/teststrictdoublevalidator.cpp.rst

@@ -0,0 +1,29 @@
+.. docs/source/autodoc/tablet_qt/tests/auto/qobjects/strictdoublevalidator/teststrictdoublevalidator.cpp.rst
+
+.. THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
+
+
+.. Copyright (C) 2012, University of Cambridge, Department of Psychiatry.
+ Created by Rudolf Cardinal ([email protected]).
+ .
+ This file is part of CamCOPS.
+ .
+ CamCOPS is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+ .
+ CamCOPS is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with CamCOPS. If not, see <https://www.gnu.org/licenses/>.
+
+
+tablet_qt/tests/auto/qobjects/strictdoublevalidator/teststrictdoublevalidator.cpp
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+.. literalinclude:: ../../../../../../../../tablet_qt/tests/auto/qobjects/strictdoublevalidator/teststrictdoublevalidator.cpp
+ :language: C++

docs/source/autodoc/tablet_qt/tests/auto/qobjects/strictintvalidator/strictintvalidator.pro.rst

@@ -0,0 +1,29 @@
+.. docs/source/autodoc/tablet_qt/tests/auto/qobjects/strictintvalidator/strictintvalidator.pro.rst
+
+.. THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
+
+
+.. Copyright (C) 2012, University of Cambridge, Department of Psychiatry.
+ Created by Rudolf Cardinal ([email protected]).
+ .
+ This file is part of CamCOPS.
+ .
+ CamCOPS is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+ .
+ CamCOPS is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with CamCOPS. If not, see <https://www.gnu.org/licenses/>.
+
+
+tablet_qt/tests/auto/qobjects/strictintvalidator/strictintvalidator.pro
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+.. literalinclude:: ../../../../../../../../tablet_qt/tests/auto/qobjects/strictintvalidator/strictintvalidator.pro
+ :language: none

docs/source/autodoc/tablet_qt/tests/auto/qobjects/strictintvalidator/teststrictintvalidator.cpp.rst

@@ -0,0 +1,29 @@
+.. docs/source/autodoc/tablet_qt/tests/auto/qobjects/strictintvalidator/teststrictintvalidator.cpp.rst
+
+.. THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
+
+
+.. Copyright (C) 2012, University of Cambridge, Department of Psychiatry.
+ Created by Rudolf Cardinal ([email protected]).
+ .
+ This file is part of CamCOPS.
+ .
+ CamCOPS is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+ .
+ CamCOPS is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with CamCOPS. If not, see <https://www.gnu.org/licenses/>.
+
+
+tablet_qt/tests/auto/qobjects/strictintvalidator/teststrictintvalidator.cpp
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+.. literalinclude:: ../../../../../../../../tablet_qt/tests/auto/qobjects/strictintvalidator/teststrictintvalidator.cpp
+ :language: C++