From d764be892b7ba7d43410ea7133412e9ad740f599 Mon Sep 17 00:00:00 2001
From: Ruben Young On <r.d.youngon@student.tudelft.nl>
Date: Wed, 22 May 2019 15:49:01 +0200
Subject: [PATCH] Changed fixture location
---
tests/api/test_exams.py | 52 ---------------------------
tests/api/test_mult_choice.py | 66 +++--------------------------------
tests/conftest.py | 55 +++++++++++++++++++++++++++++
3 files changed, 59 insertions(+), 114 deletions(-)
diff --git a/tests/api/test_exams.py b/tests/api/test_exams.py
index a6c259e4..66eaf767 100644
--- a/tests/api/test_exams.py
+++ b/tests/api/test_exams.py
@@ -1,36 +1,4 @@
-import pytest
-
from flask import json
-from flask import Flask
-
-from zesje.api import api_bp
-from zesje.database import db, Exam, Problem, ProblemWidget
-
-
-@pytest.fixture(scope="module")
-def app():
- app = Flask(__name__, static_folder=None)
-
- app.config.update(
- SQLALCHEMY_DATABASE_URI='sqlite:///:memory:',
- SQLALCHEMY_TRACK_MODIFICATIONS=False # Suppress future deprecation warning
- )
- db.init_app(app)
-
- with app.app_context():
- db.create_all()
- add_test_data()
-
- app.register_blueprint(api_bp, url_prefix='/api')
-
- return app
-
-
-@pytest.fixture()
-def test_client(app):
- client = app.test_client()
-
- yield client
def mco_json():
@@ -44,26 +12,6 @@ def mco_json():
}
-def add_test_data():
- exam1 = Exam(id=3, name='exam 1', finalized=False)
-
- db.session.add(exam1)
- db.session.commit()
-
- problem1 = Problem(id=3, name='Problem 1', exam_id=3)
- db.session.add(problem1)
- db.session.commit()
-
- problem_widget_1 = ProblemWidget(id=3, name='problem widget', problem_id=3, page=2,
- width=100, height=150, x=40, y=200, type='problem_widget')
- db.session.add(problem_widget_1)
- db.session.commit()
-
-
-#####################
-# Actual test #
-#####################
-
def test_get_exams(test_client):
mc_option_1 = {
'x': 100,
diff --git a/tests/api/test_mult_choice.py b/tests/api/test_mult_choice.py
index d62242ad..7b4cba1d 100644
--- a/tests/api/test_mult_choice.py
+++ b/tests/api/test_mult_choice.py
@@ -1,51 +1,4 @@
-import pytest
-
from flask import json
-from flask import Flask
-
-from zesje.api import api_bp
-from zesje.database import db, Exam, Problem
-
-
-@pytest.fixture(scope="module")
-def app():
- app = Flask(__name__, static_folder=None)
-
- app.config.update(
- SQLALCHEMY_DATABASE_URI='sqlite:///:memory:',
- SQLALCHEMY_TRACK_MODIFICATIONS=False # Suppress future deprecation warning
- )
- db.init_app(app)
-
- with app.app_context():
- db.create_all()
- add_test_data()
-
- app.register_blueprint(api_bp, url_prefix='/api')
-
- return app
-
-
-@pytest.fixture()
-def test_client(app):
- client = app.test_client()
-
- yield client
-
-
-def add_test_data():
- exam1 = Exam(id=1, name='exam 1', finalized=False)
- exam2 = Exam(id=2, name='exam 2', finalized=True)
-
- db.session.add(exam1)
- db.session.add(exam2)
- db.session.commit()
-
- problem1 = Problem(id=1, name='Problem 1', exam_id=1)
- problem2 = Problem(id=2, name='Problem 2', exam_id=2)
- db.session.add(problem1)
- db.session.add(problem2)
- db.session.commit()
def mco_json():
@@ -59,17 +12,6 @@ def mco_json():
}
-@pytest.fixture
-def mock_exam_finalized(monkeypatch):
- monkeypatch.setattr(db.exam, 'finalized', True)
- monkeypatch.setattr(db.mult_choice.feedback.problem, 'exam', None)
-
-
-###################
-# Actual tests #
-###################
-
-
def test_get_no_exam(test_client):
result = test_client.get('/api/mult-choice/1')
data = json.loads(result.data)
@@ -83,10 +25,10 @@ def test_add_exam(test_client):
data = json.loads(response.data)
- assert data['message'] == 'New multiple choice question with id 1 inserted. ' \
+ assert data['message'] == 'New multiple choice question with id 4 inserted. ' \
+ 'New feedback option with id 1 inserted.'
- assert data['mult_choice_id'] == 1
+ assert data['mult_choice_id'] == 4
assert data['status'] == 200
@@ -102,7 +44,7 @@ def test_add_get(test_client):
data = json.loads(result.data)
exp_resp = {
- 'id': 2,
+ 'id': 5,
'name': 'test',
'x': 100,
'y': 40,
@@ -150,7 +92,7 @@ def test_delete(test_client):
def test_delete_not_present(test_client):
- id = 5
+ id = 100
response = test_client.delete(f'/api/mult-choice/{id}')
data = json.loads(response.data)
diff --git a/tests/conftest.py b/tests/conftest.py
index 0c373c16..e09388a9 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -2,8 +2,63 @@ import os
import pytest
+from zesje.api import api_bp
+from zesje.database import db, Exam, Problem, ProblemWidget
+from flask import Flask
+
# Adapted from https://stackoverflow.com/a/46062148/1062698
@pytest.fixture
def datadir():
return os.path.join(os.path.dirname(os.path.abspath(__file__)), 'data')
+
+
+def add_test_data():
+ exam1 = Exam(id=1, name='exam 1', finalized=False)
+ exam2 = Exam(id=2, name='exam 2', finalized=True)
+ exam3 = Exam(id=3, name='exam 1', finalized=False)
+
+ db.session.add(exam1)
+ db.session.add(exam2)
+ db.session.add(exam3)
+ db.session.commit()
+
+ problem1 = Problem(id=1, name='Problem 1', exam_id=1)
+ problem2 = Problem(id=2, name='Problem 2', exam_id=2)
+ problem3 = Problem(id=3, name='Problem 1', exam_id=3)
+
+ db.session.add(problem1)
+ db.session.add(problem2)
+ db.session.add(problem3)
+ db.session.commit()
+
+ problem_widget_1 = ProblemWidget(id=3, name='problem widget', problem_id=3, page=2,
+ width=100, height=150, x=40, y=200, type='problem_widget')
+ db.session.add(problem_widget_1)
+ db.session.commit()
+
+
+@pytest.fixture(scope="module")
+def app():
+ app = Flask(__name__, static_folder=None)
+
+ app.config.update(
+ SQLALCHEMY_DATABASE_URI='sqlite:///:memory:',
+ SQLALCHEMY_TRACK_MODIFICATIONS=False # Suppress future deprecation warning
+ )
+ db.init_app(app)
+
+ with app.app_context():
+ db.create_all()
+ add_test_data()
+
+ app.register_blueprint(api_bp, url_prefix='/api')
+
+ return app
+
+
+@pytest.fixture()
+def test_client(app):
+ client = app.test_client()
+
+ yield client
--
GitLab