From 9417892d3172029b5fb46b05a34154750ec2db8f Mon Sep 17 00:00:00 2001 From: nulzo Date: Fri, 27 Oct 2023 21:08:01 -0500 Subject: [PATCH] failing tests --- .gitignore | 2 + backend/base/urls.py | 2 +- backend/makefile | 2 +- backend/poetry.lock | 36 ++++++- backend/pyproject.toml | 3 + backend/pytest.ini | 3 + backend/src/api/migrations/0001_initial.py | 58 +---------- .../migrations/0002_alter_section_modality.py | 17 ---- backend/src/api/models/course.py | 4 +- backend/src/api/tests.py | 3 - backend/tests/test_course.py | 97 +++++++++++++++++++ 11 files changed, 145 insertions(+), 82 deletions(-) create mode 100644 backend/pytest.ini delete mode 100644 backend/src/api/migrations/0002_alter_section_modality.py delete mode 100644 backend/src/api/tests.py create mode 100644 backend/tests/test_course.py diff --git a/.gitignore b/.gitignore index 804c458..ac3e387 100644 --- a/.gitignore +++ b/.gitignore @@ -127,3 +127,5 @@ lerna-debug.log .DS_Store Thumbs.db .ruff_cache/ + +poetry.toml diff --git a/backend/base/urls.py b/backend/base/urls.py index a778e0f..0d71ba3 100644 --- a/backend/base/urls.py +++ b/backend/base/urls.py @@ -18,7 +18,7 @@ from django.contrib import admin from django.urls import path -from backend.src.api import views as routing +from src.api import views as routing urlpatterns = [ # Admin URLS diff --git a/backend/makefile b/backend/makefile index ffcec77..f00a8c5 100644 --- a/backend/makefile +++ b/backend/makefile @@ -14,4 +14,4 @@ format: .PHONY test: test: - pytest . \ No newline at end of file + coverage run --source=src/. -m pytest tests/ --capture=no diff --git a/backend/poetry.lock b/backend/poetry.lock index 8cc14b3..192aa42 100644 --- a/backend/poetry.lock +++ b/backend/poetry.lock @@ -1,4 +1,4 @@ -# This file is automatically @generated by Poetry 1.5.1 and should not be changed by hand. +# This file is automatically @generated by Poetry 1.6.1 and should not be changed by hand. [[package]] name = "asgiref" @@ -1171,8 +1171,8 @@ files = [ [package.dependencies] numpy = [ - {version = ">=1.23.2", markers = "python_version == \"3.11\""}, {version = ">=1.26.0", markers = "python_version >= \"3.12\""}, + {version = ">=1.23.2", markers = "python_version == \"3.11\""}, ] python-dateutil = ">=2.8.2" pytz = ">=2020.1" @@ -1427,8 +1427,8 @@ files = [ astroid = ">=3.0.1,<=3.1.0-dev0" colorama = {version = ">=0.4.5", markers = "sys_platform == \"win32\""} dill = [ - {version = ">=0.3.6", markers = "python_version >= \"3.11\""}, {version = ">=0.3.7", markers = "python_version >= \"3.12\""}, + {version = ">=0.3.6", markers = "python_version >= \"3.11\" and python_version < \"3.12\""}, ] isort = ">=4.2.5,<6" mccabe = ">=0.6,<0.8" @@ -1491,6 +1491,24 @@ pluggy = ">=0.12,<2.0" [package.extras] testing = ["argcomplete", "attrs (>=19.2.0)", "hypothesis (>=3.56)", "mock", "nose", "pygments (>=2.7.2)", "requests", "setuptools", "xmlschema"] +[[package]] +name = "pytest-cov" +version = "4.1.0" +description = "Pytest plugin for measuring coverage." +optional = false +python-versions = ">=3.7" +files = [ + {file = "pytest-cov-4.1.0.tar.gz", hash = "sha256:3904b13dfbfec47f003b8e77fd5b589cd11904a21ddf1ab38a64f204d6a10ef6"}, + {file = "pytest_cov-4.1.0-py3-none-any.whl", hash = "sha256:6ba70b9e97e69fcc3fb45bfeab2d0a138fb65c4d0d6a41ef33983ad114be8c3a"}, +] + +[package.dependencies] +coverage = {version = ">=5.2.1", extras = ["toml"]} +pytest = ">=4.6" + +[package.extras] +testing = ["fields", "hunter", "process-tests", "pytest-xdist", "six", "virtualenv"] + [[package]] name = "pytest-django" version = "4.5.2" @@ -1560,6 +1578,7 @@ files = [ {file = "PyYAML-6.0.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:69b023b2b4daa7548bcfbd4aa3da05b3a74b772db9e23b982788168117739938"}, {file = "PyYAML-6.0.1-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:81e0b275a9ecc9c0c0c07b4b90ba548307583c125f54d5b6946cfee6360c733d"}, {file = "PyYAML-6.0.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ba336e390cd8e4d1739f42dfe9bb83a3cc2e80f567d8805e11b46f4a943f5515"}, + {file = "PyYAML-6.0.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:326c013efe8048858a6d312ddd31d56e468118ad4cdeda36c719bf5bb6192290"}, {file = "PyYAML-6.0.1-cp310-cp310-win32.whl", hash = "sha256:bd4af7373a854424dabd882decdc5579653d7868b8fb26dc7d0e99f823aa5924"}, {file = "PyYAML-6.0.1-cp310-cp310-win_amd64.whl", hash = "sha256:fd1592b3fdf65fff2ad0004b5e363300ef59ced41c2e6b3a99d4089fa8c5435d"}, {file = "PyYAML-6.0.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:6965a7bc3cf88e5a1c3bd2e0b5c22f8d677dc88a455344035f03399034eb3007"}, @@ -1567,8 +1586,15 @@ files = [ {file = "PyYAML-6.0.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:42f8152b8dbc4fe7d96729ec2b99c7097d656dc1213a3229ca5383f973a5ed6d"}, {file = "PyYAML-6.0.1-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:062582fca9fabdd2c8b54a3ef1c978d786e0f6b3a1510e0ac93ef59e0ddae2bc"}, {file = "PyYAML-6.0.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d2b04aac4d386b172d5b9692e2d2da8de7bfb6c387fa4f801fbf6fb2e6ba4673"}, + {file = "PyYAML-6.0.1-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:e7d73685e87afe9f3b36c799222440d6cf362062f78be1013661b00c5c6f678b"}, {file = "PyYAML-6.0.1-cp311-cp311-win32.whl", hash = "sha256:1635fd110e8d85d55237ab316b5b011de701ea0f29d07611174a1b42f1444741"}, {file = "PyYAML-6.0.1-cp311-cp311-win_amd64.whl", hash = "sha256:bf07ee2fef7014951eeb99f56f39c9bb4af143d8aa3c21b1677805985307da34"}, + {file = "PyYAML-6.0.1-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:855fb52b0dc35af121542a76b9a84f8d1cd886ea97c84703eaa6d88e37a2ad28"}, + {file = "PyYAML-6.0.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:40df9b996c2b73138957fe23a16a4f0ba614f4c0efce1e9406a184b6d07fa3a9"}, + {file = "PyYAML-6.0.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6c22bec3fbe2524cde73d7ada88f6566758a8f7227bfbf93a408a9d86bcc12a0"}, + {file = "PyYAML-6.0.1-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:8d4e9c88387b0f5c7d5f281e55304de64cf7f9c0021a3525bd3b1c542da3b0e4"}, + {file = "PyYAML-6.0.1-cp312-cp312-win32.whl", hash = "sha256:d483d2cdf104e7c9fa60c544d92981f12ad66a457afae824d146093b8c294c54"}, + {file = "PyYAML-6.0.1-cp312-cp312-win_amd64.whl", hash = "sha256:0d3304d8c0adc42be59c5f8a4d9e3d7379e6955ad754aa9d6ab7a398b59dd1df"}, {file = "PyYAML-6.0.1-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:50550eb667afee136e9a77d6dc71ae76a44df8b3e51e41b77f6de2932bfe0f47"}, {file = "PyYAML-6.0.1-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1fe35611261b29bd1de0070f0b2f47cb6ff71fa6595c077e42bd0c419fa27b98"}, {file = "PyYAML-6.0.1-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:704219a11b772aea0d8ecd7058d0082713c3562b4e271b849ad7dc4a5c90c13c"}, @@ -1585,6 +1611,7 @@ files = [ {file = "PyYAML-6.0.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a0cd17c15d3bb3fa06978b4e8958dcdc6e0174ccea823003a106c7d4d7899ac5"}, {file = "PyYAML-6.0.1-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:28c119d996beec18c05208a8bd78cbe4007878c6dd15091efb73a30e90539696"}, {file = "PyYAML-6.0.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7e07cbde391ba96ab58e532ff4803f79c4129397514e1413a7dc761ccd755735"}, + {file = "PyYAML-6.0.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:49a183be227561de579b4a36efbb21b3eab9651dd81b1858589f796549873dd6"}, {file = "PyYAML-6.0.1-cp38-cp38-win32.whl", hash = "sha256:184c5108a2aca3c5b3d3bf9395d50893a7ab82a38004c8f61c258d4428e80206"}, {file = "PyYAML-6.0.1-cp38-cp38-win_amd64.whl", hash = "sha256:1e2722cc9fbb45d9b87631ac70924c11d3a401b2d7f410cc0e3bbf249f2dca62"}, {file = "PyYAML-6.0.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:9eb6caa9a297fc2c2fb8862bc5370d0303ddba53ba97e71f08023b6cd73d16a8"}, @@ -1592,6 +1619,7 @@ files = [ {file = "PyYAML-6.0.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5773183b6446b2c99bb77e77595dd486303b4faab2b086e7b17bc6bef28865f6"}, {file = "PyYAML-6.0.1-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:b786eecbdf8499b9ca1d697215862083bd6d2a99965554781d0d8d1ad31e13a0"}, {file = "PyYAML-6.0.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:bc1bf2925a1ecd43da378f4db9e4f799775d6367bdb94671027b73b393a7c42c"}, + {file = "PyYAML-6.0.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:04ac92ad1925b2cff1db0cfebffb6ffc43457495c9b3c39d3fcae417d7125dc5"}, {file = "PyYAML-6.0.1-cp39-cp39-win32.whl", hash = "sha256:faca3bdcf85b2fc05d06ff3fbc1f83e1391b3e724afa3feba7d13eeab355484c"}, {file = "PyYAML-6.0.1-cp39-cp39-win_amd64.whl", hash = "sha256:510c9deebc5c0225e8c96813043e62b680ba2f9c50a08d3724c7f28a747d1486"}, {file = "PyYAML-6.0.1.tar.gz", hash = "sha256:bfdf460b1736c775f2ba9f6a92bca30bc2095067b8a9d77876d1fad6cc3b4a43"}, @@ -2119,4 +2147,4 @@ testing = ["coverage (>=5.0.3)", "zope.event", "zope.testing"] [metadata] lock-version = "2.0" python-versions = ">=3.11,<3.13" -content-hash = "2fe50eca92d35f73398fc2418225d3fcef2bec1b1d5f544d5e7b8c25d4128367" +content-hash = "4174cb57b03575674db9f1da560e8b9bfd8eda74a31c1cd192493b1f288d34f9" diff --git a/backend/pyproject.toml b/backend/pyproject.toml index 1b36a58..eebdef7 100644 --- a/backend/pyproject.toml +++ b/backend/pyproject.toml @@ -16,6 +16,9 @@ websockets = "^11.0.3" channels = {extras = ["daphne"], version = "^4.0.0"} pandas = "^2.1.1" django-extensions = "^3.2.3" +coverage = "^7.3.2" +pytest-cov = "^4.1.0" +pytest-django = "^4.5.2" [tool.poetry.group.dev.dependencies] bruhcolor = "^0.0.56" diff --git a/backend/pytest.ini b/backend/pytest.ini new file mode 100644 index 0000000..d2081b3 --- /dev/null +++ b/backend/pytest.ini @@ -0,0 +1,3 @@ +[pytest] +DJANGO_SETTINGS_MODULE = base.settings +# django_find_project = false \ No newline at end of file diff --git a/backend/src/api/migrations/0001_initial.py b/backend/src/api/migrations/0001_initial.py index 9f71132..c4eafd4 100644 --- a/backend/src/api/migrations/0001_initial.py +++ b/backend/src/api/migrations/0001_initial.py @@ -1,8 +1,8 @@ -# Generated by Django 4.2.6 on 2023-10-25 03:19 +# Generated by Django 4.2.6 on 2023-10-28 01:51 +from django.db import migrations, models import django.db.models.deletion import django.db.models.manager -from django.db import migrations, models class Migration(migrations.Migration): @@ -26,46 +26,7 @@ class Migration(migrations.Migration): ("course_department", models.CharField(default="CSCI", max_length=10)), ("course_name", models.CharField(max_length=100)), ("course_id", models.CharField(max_length=25)), - ("is_active", models.BooleanField(default=True)), - ], - ), - migrations.CreateModel( - name="CSLC_Hours", - fields=[ - ( - "id", - models.BigAutoField( - auto_created=True, - primary_key=True, - serialize=False, - verbose_name="ID", - ), - ), - ("mondayOpen", models.TimeField()), - ("mondayClose", models.TimeField()), - ("tuesdayOpen", models.TimeField()), - ("tuesdayClose", models.TimeField()), - ("wednesdayOpen", models.TimeField()), - ("wednesdayClose", models.TimeField()), - ("thursdayOpen", models.TimeField()), - ("thursdayClose", models.TimeField()), - ("fridayOpen", models.TimeField()), - ("fridayClose", models.TimeField()), - ("saturdayOpen", models.TimeField()), - ("saturdayClose", models.TimeField()), - ("sundayOpen", models.TimeField()), - ("sundayClose", models.TimeField()), - ("mondayIsOpen", models.BooleanField(default=True)), - ("tuesdayIsOpen", models.BooleanField(default=True)), - ("wednesdayIsOpen", models.BooleanField(default=True)), - ("thursdayIsOpen", models.BooleanField(default=True)), - ("fridayIsOpen", models.BooleanField(default=True)), - ("saturdayIsOpen", models.BooleanField(default=True)), - ("sundayIsOpen", models.BooleanField(default=False)), ], - options={ - "verbose_name_plural": "CSLC_Hours", - }, ), migrations.CreateModel( name="Issues", @@ -74,7 +35,7 @@ class Migration(migrations.Migration): "issue_id", models.AutoField(editable=False, primary_key=True, serialize=False), ), - ("problem_type", models.CharField(max_length=25)), + ("problem_type", models.CharField(default="Problem", max_length=25)), ( "severity", models.CharField( @@ -162,18 +123,7 @@ class Migration(migrations.Migration): verbose_name="ID", ), ), - ( - "modality", - models.CharField( - choices=[ - ("Online", "850"), - ("In-Person", "001"), - ("Hybrid", "002"), - ], - default="In-Person", - max_length=10, - ), - ), + ("modality", models.CharField(default="001", max_length=10)), ( "course", models.ForeignKey( diff --git a/backend/src/api/migrations/0002_alter_section_modality.py b/backend/src/api/migrations/0002_alter_section_modality.py deleted file mode 100644 index 235b911..0000000 --- a/backend/src/api/migrations/0002_alter_section_modality.py +++ /dev/null @@ -1,17 +0,0 @@ -# Generated by Django 4.2.6 on 2023-10-25 04:09 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - dependencies = [ - ("api", "0001_initial"), - ] - - operations = [ - migrations.AlterField( - model_name="section", - name="modality", - field=models.CharField(default="001", max_length=10), - ), - ] diff --git a/backend/src/api/models/course.py b/backend/src/api/models/course.py index e5bd71e..a7b7785 100644 --- a/backend/src/api/models/course.py +++ b/backend/src/api/models/course.py @@ -4,8 +4,8 @@ class Course(models.Model): course_department = models.CharField(max_length=10, blank=False, default="CSCI") course_name = models.CharField(max_length=100, blank=False) - course_id = models.CharField(max_length=25, blank=False) - is_active = models.BooleanField(default=True, null=False) + course_id = models.CharField(max_length=25, blank=False, null=False) + # is_active = models.BooleanField(default=True, null=False) def __str__(self): return str(self.course_name) diff --git a/backend/src/api/tests.py b/backend/src/api/tests.py deleted file mode 100644 index a79ca8b..0000000 --- a/backend/src/api/tests.py +++ /dev/null @@ -1,3 +0,0 @@ -# from django.test import TestCase - -# Create your tests here. diff --git a/backend/tests/test_course.py b/backend/tests/test_course.py new file mode 100644 index 0000000..2192b2d --- /dev/null +++ b/backend/tests/test_course.py @@ -0,0 +1,97 @@ +import pytest +from src.api.models.course import Course +from django.db.utils import IntegrityError +from pytest_django.asserts import assertFieldOutput + +@pytest.fixture +def course(): + return Course.objects.create( + course_name="Computer Science I", + course_id="1400", + course_department="CIST", + ) + +@pytest.mark.django_db +def test_course_exists(course): + assert Course.objects.filter(course_name="Computer Science I").exists() + +@pytest.mark.django_db +def test_course_str_method(course): + """ + Test the __str__ method of the Course model. + """ + assert str(course) == "Computer Science I" + +@pytest.mark.django_db +def test_default_values(): + """ + Test that default values are correctly set for course_department and is_active. + """ + course = Course.objects.create( + course_name="Random Name", + course_id="Random_ID" + ) + assert course.course_department == "CSCI" + +@pytest.mark.django_db +def test_blank_course_department(course): + """ + Test that the course_department field cannot be blank. + """ + assert assertFieldOutput(course) + # with pytest.raises(IntegrityError) as error: + +# @pytest.mark.django_db +# def test_blank_course_name(): +# """ +# Test that the course_name field cannot be blank. +# """ +# with pytest.raises(Exception): +# Course.objects.create( +# course_name="", +# course_id="INVALID" +# ) + +# @pytest.mark.django_db +# def test_blank_course_id(): +# """ +# Test that the course_id field cannot be blank. +# """ +# with pytest.raises(Exception): +# Course.objects.create( +# course_name="Invalid Course", +# course_id="" +# ) + +# @pytest.mark.django_db +# def test_max_length_course_name(): +# """ +# Test that the course_name field enforces its maximum length. +# """ +# with pytest.raises(Exception): +# Course.objects.create( +# course_name="A" * 101, # Exceeds max_length of 100 +# course_id="INVALID" +# ) + +# @pytest.mark.django_db +# def test_max_length_course_id(): +# """ +# Test that the course_id field enforces its maximum length. +# """ +# with pytest.raises(Exception): +# Course.objects.create( +# course_name="Invalid Course", +# course_id="A" * 26 # Exceeds max_length of 25 +# ) + +# @pytest.mark.django_db +# def test_is_active_default(): +# """ +# Test that the is_active field is set to True by default. +# """ +# course = Course.objects.create( +# course_name="Active Course", +# course_id="ACTIVE123" +# ) +# assert course.is_active is True \ No newline at end of file