From 3e7dfa9dc8c343bd589c0db7a47dc16c29e86d51 Mon Sep 17 00:00:00 2001 From: hohoTT <609029365@qq.com> Date: Wed, 26 Aug 2015 16:59:00 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9B=AE=E5=89=8D=E6=B5=8B=E8=AF=95=E8=BF=98?= =?UTF-8?q?=E6=9C=89=E8=A6=81=E5=AE=8C=E5=96=84=E7=9A=84=E5=9C=B0=E6=96=B9?= =?UTF-8?q?,=20=20contest=E3=80=81=E8=BF=98=E6=9C=89=E7=B1=BB=E4=BC=BC?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=B8=8D=E5=AD=98=E5=9C=A8=E7=9A=84=E6=83=85?= =?UTF-8?q?=E5=86=B5=E7=AD=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- contest/test_urls.py | 9 + contest/tests.py | 176 +++++++++++++++++- contest/views.py | 16 +- contest_submission/tests.py | 89 ++++++++- contest_submission/views.py | 9 +- static/src/js/app/oj/problem/problem.js | 2 +- submission/tests.py | 91 +++++++-- .../oj/submission/my_submissions_list.html | 2 +- 8 files changed, 353 insertions(+), 41 deletions(-) create mode 100644 contest/test_urls.py diff --git a/contest/test_urls.py b/contest/test_urls.py new file mode 100644 index 00000000..234c600f --- /dev/null +++ b/contest/test_urls.py @@ -0,0 +1,9 @@ +# coding=utf-8 +from django.conf.urls import include, url +from django.views.generic import TemplateView + + +urlpatterns = [ + + url(r'^login/$', TemplateView.as_view(template_name="oj/account/login.html"), name="user_login_page"), +] diff --git a/contest/tests.py b/contest/tests.py index 58c9127a..2063c4e2 100644 --- a/contest/tests.py +++ b/contest/tests.py @@ -1,15 +1,18 @@ # coding=utf-8 import json from django.core.urlresolvers import reverse -from django.test import TestCase +from django.test import TestCase, Client +from django.http import HttpResponse from rest_framework.test import APITestCase, APIClient from account.models import User from group.models import Group from contest.models import Contest, ContestProblem +from .models import ContestSubmission from announcement.models import Announcement from account.models import REGULAR_USER, ADMIN, SUPER_ADMIN +from decorators import check_user_contest_permission class ContestAdminAPITest(APITestCase): @@ -398,3 +401,174 @@ class ContestProblemAdminAPItEST(APITestCase): response = self.client.put(self.url, data=data) self.assertEqual(response.data["code"], 1) + +class ContestPasswordVerifyAPITest(APITestCase): + def setUp(self): + self.client = APIClient() + self.url = reverse('contest_password_verify_api') + self.user = User.objects.create(username="test1", admin_type=SUPER_ADMIN) + self.user.set_password("testaa") + self.user.save() + self.user2 = User.objects.create(username="test2", admin_type=ADMIN) + self.user2.set_password("testbb") + self.user2.save() + self.client.login(username="test1", password="testaa") + self.global_contest = Contest.objects.create(title="titlex", description="descriptionx", mode=1, + contest_type=2, show_rank=True, show_user_submission=True, + start_time="2015-08-15T10:00:00.000Z", + end_time="2015-08-15T12:00:00.000Z", + password="aacc", created_by=User.objects.get(username="test1")) + + def test_invalid_format(self): + self.client.login(username="test2", password="testbb") + data = {"contest_id": self.global_contest.id} + response = self.client.post(self.url, data=data) + self.assertEqual(response.data["code"], 1) + + def test_contest_does_not_exist(self): + self.client.login(username="test2", password="testbb") + data = {"contest_id": self.global_contest.id + 1, "password": "aacc"} + response = self.client.post(self.url, data=data) + self.assertEqual(response.data, {"code": 1, "data": u"比赛不存在"}) + + def test_contest_password_verify_unsuccessfully(self): + self.client.login(username="test2", password="testbb") + data = {"contest_id": self.global_contest.id, "password": "aabb"} + response = self.client.post(self.url, data=data) + self.assertEqual(response.data, {"code": 1, "data": u"密码错误"}) + + def test_contest_password_verify_successfully(self): + self.client.login(username="test2", password="testbb") + data = {"contest_id": self.global_contest.id, "password": "aacc"} + response = self.client.post(self.url, data=data) + self.assertEqual(response.data["code"], 0) + + +class ContestPageTest(TestCase): + # 单个比赛详情页的测试 + def setUp(self): + self.client = Client() + self.user1 = User.objects.create(username="test1", admin_type=SUPER_ADMIN) + self.user1.set_password("testaa") + self.user1.save() + self.client.login(username="test1", password="testaa") + self.global_contest = Contest.objects.create(title="titlex", description="descriptionx", mode=1, + contest_type=2, show_rank=True, show_user_submission=True, + start_time="2015-08-15T10:00:00.000Z", + end_time="2015-08-15T12:00:00.000Z", + password="aacc", created_by=User.objects.get(username="test1")) + + def test_visit_contest_page_successfully(self): + response = self.client.get('/contest/1/') + self.assertEqual(response.status_code, 200) + + def test_visit_contest_page_unsuccessfully(self): + response = self.client.get('/contest/10/') + self.assertTemplateUsed(response, "utils/error.html") + + +class ContestProblemPageTest(TestCase): + # 单个比赛题目详情页的测试 + def setUp(self): + self.client = Client() + self.user1 = User.objects.create(username="test1", admin_type=SUPER_ADMIN) + self.user1.set_password("testaa") + self.user1.save() + self.client.login(username="test1", password="testaa") + self.global_contest = Contest.objects.create(title="titlex", description="descriptionx", mode=1, + contest_type=2, show_rank=True, show_user_submission=True, + start_time="2015-08-15T10:00:00.000Z", + end_time="2015-08-15T12:00:00.000Z", + password="aacc", created_by=User.objects.get(username="test1")) + self.contest_problem = ContestProblem.objects.create(title="titlex", + description="descriptionx", + input_description="input1_description", + output_description="output1_description", + test_case_id="1", + samples=json.dumps([{"input": "1 1", "output": "2"}]), + time_limit=100, + memory_limit=1000, + hint="hint1", + created_by=User.objects.get(username="test1"), + contest=Contest.objects.get(title="titlex"), + sort_index="a") + + def test_visit_contest_problem_page_successfully(self): + response = self.client.get('/contest/1/problem/1/') + self.assertEqual(response.status_code, 200) + + def test_visit_contest_page_unsuccessfully(self): + response = self.client.get('/contest/10/') + self.assertTemplateUsed(response, "utils/error.html") + + def test_visit_contest_submissions_page_successfully(self): + ContestSubmission.objects.create(user=self.user1, + contest=self.global_contest, + problem=self.contest_problem, + ac=True) + response = self.client.get('/contest/1/problem/1/submissions/') + self.assertEqual(response.status_code, 200) + + +class ContestProblemListPageTest(TestCase): + # 比赛题目列表的测试 + def setUp(self): + self.client = Client() + self.user1 = User.objects.create(username="test1", admin_type=SUPER_ADMIN) + self.user1.set_password("testaa") + self.user1.save() + self.client.login(username="test1", password="testaa") + self.global_contest = Contest.objects.create(title="titlex", description="descriptionx", mode=1, + contest_type=2, show_rank=True, show_user_submission=True, + start_time="2015-08-15T10:00:00.000Z", + end_time="2015-08-15T12:00:00.000Z", + password="aacc", created_by=User.objects.get(username="test1")) + self.contest_problem = ContestProblem.objects.create(title="titlex", + description="descriptionx", + input_description="input1_description", + output_description="output1_description", + test_case_id="1", + samples=json.dumps([{"input": "1 1", "output": "2"}]), + time_limit=100, + memory_limit=1000, + hint="hint1", + created_by=User.objects.get(username="test1"), + contest=Contest.objects.get(title="titlex"), + sort_index="a") + + def test_visit_contest_problem_list_page_successfully(self): + response = self.client.get('/contest/1/problems/') + self.assertEqual(response.status_code, 200) + + def test_visit_contest_problem_page_unsuccessfully(self): + response = self.client.get('/contest/1/problem/100/') + self.assertTemplateUsed(response, "utils/error.html") + + +class ContestListPageTest(TestCase): + # 以下是所有比赛列表页的测试 + def setUp(self): + self.client = Client() + self.user1 = User.objects.create(username="test1", admin_type=SUPER_ADMIN) + self.user1.set_password("testaa") + self.user1.save() + self.url = reverse('contest_list_page') + self.client.login(username="test1", password="testaa") + self.global_contest = Contest.objects.create(title="titlex", description="descriptionx", mode=1, + contest_type=2, show_rank=True, show_user_submission=True, + start_time="2015-08-15T10:00:00.000Z", + end_time="2015-08-15T12:00:00.000Z", + password="aacc", created_by=User.objects.get(username="test1")) + + def test_visit_contest_list_page_successfully(self): + response = self.client.get('/contests/') + self.assertEqual(response.status_code, 200) + + def test_visit_contest_list_page_unsuccessfully(self): + response = self.client.get('/contests/2/') + self.assertTemplateUsed(response, "utils/error.html") + + + + + diff --git a/contest/views.py b/contest/views.py index 8c2e29f9..72dffbe1 100644 --- a/contest/views.py +++ b/contest/views.py @@ -258,10 +258,10 @@ class ContestPasswordVerifyAPIView(APIView): try: contest = Contest.objects.get(id=data["contest_id"], contest_type=2) except Contest.DoesNotExist: - return error_response(u"密码错误") + return error_response(u"比赛不存在") if data["password"] != contest.password: - return error_response(u" 密码错误") + return error_response(u"密码错误") else: if "contests" not in request.session: request.session["contests"] = [] @@ -279,10 +279,7 @@ def contest_page(request, contest_id): """ 单个比赛的详情页 """ - try: - contest = Contest.objects.get(id=contest_id) - except Contest.DoesNotExist: - return error_page(request, u"比赛不存在") + contest = Contest.objects.get(id=contest_id) return render(request, "oj/contest/contest_index.html", {"contest": contest}) @@ -292,10 +289,7 @@ def contest_problem_page(request, contest_id, contest_problem_id): """ 单个比赛题目的详情页 """ - try: - contest = Contest.objects.get(id=contest_id) - except Contest.DoesNotExist: - return error_page(request, u"比赛不存在") + contest = Contest.objects.get(id=contest_id) try: contest_problem = ContestProblem.objects.get(id=contest_problem_id, visible=True) except ContestProblem.DoesNotExist: @@ -324,7 +318,7 @@ def contest_problems_list_page(request, contest_id): """ try: contest_problems = ContestProblem.objects.filter(contest=Contest.objects.get(id=contest_id)).order_by("sort_index") - except Contest.DoesNotExist: + except ContestProblem.DoesNotExist: return error_page(request, u"比赛题目不存在") # 右侧的公告列表 announcements = Announcement.objects.filter(is_global=True, visible=True).order_by("-create_time") diff --git a/contest_submission/tests.py b/contest_submission/tests.py index 7ce503c2..836df099 100644 --- a/contest_submission/tests.py +++ b/contest_submission/tests.py @@ -1,3 +1,88 @@ -from django.test import TestCase +# coding=utf-8 +import json +from django.test import TestCase, Client +from django.core.urlresolvers import reverse +from account.models import User, REGULAR_USER, ADMIN, SUPER_ADMIN +from problem.models import Problem +from contest.models import Contest, ContestProblem +from submission.models import Submission +from rest_framework.test import APITestCase, APIClient -# Create your tests here. + +class ContestSubmissionAPITest(APITestCase): + def setUp(self): + self.client = APIClient() + self.url = reverse('contest_submission_api') + self.user1 = User.objects.create(username="test1", admin_type=SUPER_ADMIN) + self.user1.set_password("testaa") + self.user1.save() + self.user2 = User.objects.create(username="test2", admin_type=REGULAR_USER) + self.user2.set_password("testbb") + self.user2.save() + self.global_contest = Contest.objects.create(title="titlex", description="descriptionx", mode=1, + contest_type=1, show_rank=True, show_user_submission=True, + start_time="2015-08-15T10:00:00.000Z", + end_time="2015-08-30T12:00:00.000Z", + created_by=User.objects.get(username="test1")) + self.contest_problem = ContestProblem.objects.create(title="titlex", + description="descriptionx", + input_description="input1_description", + output_description="output1_description", + test_case_id="1", + samples=json.dumps([{"input": "1 1", "output": "2"}]), + time_limit=100, + memory_limit=1000, + hint="hint1", + created_by=User.objects.get(username="test1"), + contest=Contest.objects.get(title="titlex"), + sort_index="a") + + # 以下是创建比赛的提交 + def test_invalid_format(self): + self.client.login(username="test1", password="testaa") + data = {"contest_id": self.global_contest.id, "language": 1} + response = self.client.post(self.url, data=data) + self.assertEqual(response.data["code"], 1) + + def test_contest_submission_successfully(self): + self.client.login(username="test1", password="testaa") + data = {"contest_id": self.global_contest.id, "problem_id": self.contest_problem.id, + "language": 1, "code": '#include "stdio.h"\nint main(){\n\treturn 0;\n}'} + response = self.client.post(self.url, data=data) + self.assertEqual(response.data["code"], 0) + + def test_contest_problem_does_not_exist(self): + self.client.login(username="test1", password="testaa") + data = {"contest_id": self.global_contest.id, "problem_id": self.contest_problem.id + 10, + "language": 1, "code": '#include "stdio.h"\nint main(){\n\treturn 0;\n}'} + response = self.client.post(self.url, data=data) + self.assertEqual(response.data, {"code": 1, "data": u"题目不存在"}) + + +class ContestProblemMySubmissionListTest(TestCase): + # 以下是我比赛单个题目的提交列表的测试 + def setUp(self): + self.client = Client() + self.user1 = User.objects.create(username="test1", admin_type=SUPER_ADMIN) + self.user1.set_password("testaa") + self.user1.save() + self.user2 = User.objects.create(username="test2", admin_type=REGULAR_USER) + self.user2.set_password("testbb") + self.user2.save() + self.global_contest = Contest.objects.create(title="titlex", description="descriptionx", mode=1, + contest_type=1, show_rank=True, show_user_submission=True, + start_time="2015-08-15T10:00:00.000Z", + end_time="2015-08-30T12:00:00.000Z", + created_by=User.objects.get(username="test1")) + self.contest_problem = ContestProblem.objects.create(title="titlex", + description="descriptionx", + input_description="input1_description", + output_description="output1_description", + test_case_id="1", + samples=json.dumps([{"input": "1 1", "output": "2"}]), + time_limit=100, + memory_limit=1000, + hint="hint1", + created_by=self.user1, + contest=self.global_contest, + sort_index="a") diff --git a/contest_submission/views.py b/contest_submission/views.py index 0dba7cb4..efab6ad0 100644 --- a/contest_submission/views.py +++ b/contest_submission/views.py @@ -34,16 +34,13 @@ class ContestSubmissionAPIView(APIView): serializer = CreateContestSubmissionSerializer(data=request.data) if serializer.is_valid(): data = serializer.data - try: - contest = Contest.objects.get(id=data["contest_id"]) - except Contest.DoesNotExist: - return error_response(u"比赛不存在") + contest = Contest.objects.get(id=data["contest_id"]) try: problem = ContestProblem.objects.get(contest=contest, id=data["problem_id"]) # 更新题目提交计数器 problem.total_submit_number += 1 problem.save() - except Problem.DoesNotExist: + except ContestProblem.DoesNotExist: return error_response(u"题目不存在") submission = Submission.objects.create(user_id=request.user.id, language=int(data["language"]), @@ -74,7 +71,7 @@ def contest_problem_my_submissions_list_page(request, contest_id, contest_proble return error_page(request, u"比赛不存在") try: contest_problem = ContestProblem.objects.get(id=contest_problem_id, visible=True) - except Problem.DoesNotExist: + except ContestProblem.DoesNotExist: return error_page(request, u"比赛问题不存在") submissions = Submission.objects.filter(user_id=request.user.id, problem_id=contest_problem.id).order_by("-create_time"). \ values("id", "result", "create_time", "accepted_answer_time", "language") diff --git a/static/src/js/app/oj/problem/problem.js b/static/src/js/app/oj/problem/problem.js index d936e0fd..1faeb6d2 100644 --- a/static/src/js/app/oj/problem/problem.js +++ b/static/src/js/app/oj/problem/problem.js @@ -48,7 +48,7 @@ require(["jquery", "codeMirror", "csrfToken", "bsAlert"], function ($, codeMirro if (!data.result) { html += "CPU time: " + data.accepted_answer_time + "ms   "; } - html += ('查看详情 '); + html += ('查看详情 '); return html; } diff --git a/submission/tests.py b/submission/tests.py index e745bdea..99bfee9e 100644 --- a/submission/tests.py +++ b/submission/tests.py @@ -1,6 +1,6 @@ # coding=utf-8 import json -from django.test import TestCase +from django.test import TestCase, Client from django.core.urlresolvers import reverse from account.models import User, REGULAR_USER, ADMIN, SUPER_ADMIN from problem.models import Problem @@ -11,7 +11,7 @@ from rest_framework.test import APITestCase, APIClient class SubmissionsListPageTest(TestCase): def setUp(self): - self.client = APIClient() + self.client = Client() self.user = User.objects.create(username="gogoing", admin_type=REGULAR_USER) self.user2 = User.objects.create(username="cool", admin_type=REGULAR_USER) self.user2.set_password("666666") @@ -115,32 +115,85 @@ class SubmissionAPITest(APITestCase): response = self.client.get(self.url, data=data) self.assertEqual(response.data["code"], 0) + def test_parameter_error(self): + self.client.login(username="test1", password="testaa") + response = self.client.get(self.url) + self.assertEqual(response.data, {"code": 1, "data": u"参数错误"}) -class ContestSubmissionAPITest(APITestCase): + +class SubmissionAdminAPITest(APITestCase): def setUp(self): self.client = APIClient() - self.url = reverse('contest_submission_api') - self.user1 = User.objects.create(username="test1", admin_type=REGULAR_USER) - self.user1.set_password("testaa") - self.user1.save() - self.user2 = User.objects.create(username="test2", admin_type=SUPER_ADMIN) - self.user2.set_password("testbb") - self.user2.save() + self.url = reverse('submission_admin_api_view') + self.user = User.objects.create(username="test1", admin_type=SUPER_ADMIN) + self.user.set_password("testaa") + self.user.save() + self.client.login(username="test1", password="testaa") + self.problem = Problem.objects.create(title="title1", + description="description1", + input_description="input1_description", + output_description="output1_description", + test_case_id="1", + source="source1", + samples=json.dumps([{"input": "1 1", "output": "2"}]), + time_limit=100, + memory_limit=1000, + difficulty=1, + hint="hint1", + created_by=User.objects.get(username="test1")) self.global_contest = Contest.objects.create(title="titlex", description="descriptionx", mode=1, contest_type=2, show_rank=True, show_user_submission=True, start_time="2015-08-15T10:00:00.000Z", end_time="2015-08-15T12:00:00.000Z", - password="aacc", created_by=User.objects.get(username="test2")) + password="aacc", created_by=User.objects.get(username="test1")) + + self.submission = Submission.objects.create(user_id=self.user.id, + language=1, + code='#include "stdio.h"\nint main(){\n\treturn 0;\n}', + problem_id=self.problem.id) def test_invalid_format(self): + response = self.client.get(self.url) + self.assertEqual(response.data, {"code": 1, "data": u"参数错误"}) + + def test_problem_does_not_exist(self): + data = {"problem_id": self.problem.id} + response = self.client.get(self.url, data=data) + self.assertEqual(response.data["code"], 0) + + +class SubmissionPageTest(TestCase): + # 单个题目的提交详情页 + def setUp(self): + self.client = Client() + self.user1 = User.objects.create(username="test1", admin_type=SUPER_ADMIN) + self.user1.set_password("testaa") + self.user1.save() + self.user2 = User.objects.create(username="test2", admin_type=ADMIN) + self.user2.set_password("testbb") + self.user2.save() self.client.login(username="test1", password="testaa") - data = {"language": 1} - response = self.client.post(self.url, data=data) - pass - - - - - + self.problem = Problem.objects.create(title="title1", + description="description1", + input_description="input1_description", + output_description="output1_description", + test_case_id="1", + source="source1", + samples=json.dumps([{"input": "1 1", "output": "2"}]), + time_limit=100, + memory_limit=1000, + difficulty=1, + hint="hint1", + created_by=User.objects.get(username="test1")) + self.global_contest = Contest.objects.create(title="titlex", description="descriptionx", mode=1, + contest_type=2, show_rank=True, show_user_submission=True, + start_time="2015-08-15T10:00:00.000Z", + end_time="2015-08-15T12:00:00.000Z", + password="aacc", created_by=User.objects.get(username="test1")) + + self.submission = Submission.objects.create(user_id=self.user1.id, + language=1, + code='#include "stdio.h"\nint main(){\n\treturn 0;\n}', + problem_id=self.problem.id) diff --git a/template/oj/submission/my_submissions_list.html b/template/oj/submission/my_submissions_list.html index 279bee67..ce9f0639 100644 --- a/template/oj/submission/my_submissions_list.html +++ b/template/oj/submission/my_submissions_list.html @@ -18,7 +18,7 @@ {% for item in submissions %} - + {{ forloop.counter |add:start_id }} {{ item.create_time }} {{ item.result|translate_result }}