xuyue/OnlineJudge
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accept Merge Request #88 : (hohoTT-dev -> dev)

Browse Source 
Merge Request: 修改problem中的测试及views
Created By: @hohoTT
Accepted By: @virusdefender
URL: https://coding.net/u/virusdefender/p/qduoj/git/merge/88
This commit is contained in:
virusdefender
2015-08-16 18:34:39 +08:00
parent de25b6c218 30348f0c5d
commit 3f76df3079
4 changed files with 77 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
account/tests.py
View File

@@ -152,18 +152,16 @@ class UserAdminAPITest(APITestCase):
user = User.objects.create(username="testx", real_name="xx", admin_type=SUPER_ADMIN)
user.set_password("testxx")
user.save()
self.client.login(username="testx", password="testxx")
def test_success_get_data(self):
self.client.login(username="testx", password="testxx")
self.assertEqual(self.client.get(self.url).data["code"], 0)
def test_error_admin_type(self):
self.client.login(username="testx", password="testxx")
response = self.client.get(self.url + "?admin_type=error")
self.assertEqual(response.data, {"code": 1, "data": u"参数错误"})
def test_query_by_keyword(self):
self.client.login(username="testx", password="testxx")
user1 = User.objects.create(username="test1", real_name="aa")
user1.set_password("testaa")
user1.save()
@@ -180,27 +178,23 @@ class UserAdminAPITest(APITestCase):
self.assertEqual(response.data["code"], 0)
def test_put_invalid_data(self):
self.client.login(username="testx", password="testxx")
data = {"username": "test", "password": "testaa", "email": "60@qq.com", "admin_type": "2"}
response = self.client.put(self.url, data=data)
self.assertEqual(response.data["code"], 1)
def test_user_does_not_exist(self):
self.client.login(username="testx", password="testxx")
data = {"id": 2, "username": "test0", "real_name": "test00",
"password": "testaa","email": "60@qq.com", "admin_type": "2"}
response = self.client.put(self.url, data=data)
self.assertEqual(response.data, {"code": 1, "data": u"该用户不存在！"})
def test_success_user_edit_not_password(self):
self.client.login(username="testx", password="testxx")
data = {"id": 1, "username": "test0", "real_name": "test00",
"email": "60@qq.com", "admin_type": "2"}
response = self.client.put(self.url, data=data)
self.assertEqual(response.data["code"], 0)
def test_success_user_edit_change_password(self):
self.client.login(username="testx", password="testxx")
data = {"id": 1, "username": "test0", "real_name": "test00", "password": "111111",
"email": "60@qq.com", "admin_type": "2"}
response = self.client.put(self.url, data=data)

2
announcement/tests.py
View File

@@ -105,7 +105,7 @@ class AnnouncementPageTest(TestCase):
created_by=User.objects.get(username="test"),
visible=False)
def test_success_announcement(self):
def test_visit_announcement_successfully(self):
response = self.client.get('/announcement/1/')
self.assertEqual(response.status_code, 200)

70
problem/tests.py
View File

@@ -11,7 +11,33 @@ from problem.models import Problem, ProblemTag
class ProblemPageTest(TestCase):
pass
def setUp(self):
self.client = APIClient()
self.user = User.objects.create(username="test", admin_type=SUPER_ADMIN)
self.user.set_password("testaa")
self.user.save()
self.client.login(username="test", 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="test"))
def test_visit_problem_successfully(self):
response = self.client.get('/problem/1/')
self.assertEqual(response.status_code, 200)
def test_problem_does_not_exist(self):
response = self.client.get('/problem/3/')
self.assertTemplateUsed(response, "utils/error.html")
class ProblemAdminTest(APITestCase):
@@ -47,7 +73,7 @@ class ProblemAdminTest(APITestCase):
output_description="output1_description",
test_case_id="1",
source="source1",
samples=[{"input": "1 1", "output": "2"}],
samples=json.dumps([{"input": "1 1", "output": "2"}]),
time_limit=100,
memory_limit=1000,
difficulty=1,
@@ -98,3 +124,43 @@ class ProblemAdminTest(APITestCase):
problem.tags.add(*ProblemTag.objects.filter(id__in=data["tags"]))
response = self.client.put(self.url, data=json.dumps(data), content_type="application/json")
self.assertEqual(response.data["code"], 0)
# 以下是题目分页的测试
def test_success_get_data(self):
self.assertEqual(self.client.get(self.url).data["code"], 0)
def test_query_by_keyword(self):
response = self.client.get(self.url + "?keyword=title1")
self.assertEqual(response.data["code"], 0)
def test_query_by_visible(self):
response = self.client.get(self.url + "?visible=true")
self.assertEqual(response.data["code"], 0)
for item in response.data["data"]:
self.assertEqual(item["visible"], True)
def test_query_problem_does_not_exist(self):
data = {"problem_id": 2}
response = self.client.get(self.url, data=data)
self.assertEqual(response.data, {"code": 1, "data": u"题目不存在"})
def test_query_problem_exists(self):
data = {"problem_id": 1}
response = self.client.get(self.url, data=data)
self.assertEqual(response.data["code"], 0)
class ProblemTagAdminAPITest(APITestCase):
def setUp(self):
self.client = APIClient()
self.url = reverse('problem_tag_admin_api')
self.user = User.objects.create(username="testx", admin_type=SUPER_ADMIN)
self.user.set_password("testxx")
self.user.save()
self.client.login(username="testx", password="testxx")
ProblemTag.objects.create(name="tag1")
# 以下是返回所有的问题的标签
def test_get_all_problem_tag_successfully(self):
self.assertEqual(self.client.get(self.url).data["code"], 0)

30
problem/views.py
View File

@@ -20,27 +20,6 @@ from .serizalizers import (CreateProblemSerializer, EditProblemSerializer, Probl
from .models import Problem, ProblemTag
class ProblemTagAdminAPIView(APIView):
def post(self, request):
"""
创建标签的接口
---
request_serializer: CreateProblemTagSerializer
"""
serializer = CreateProblemTagSerializer(data=request.data)
if serializer.is_valid():
try:
tag = ProblemTag.objects.get(name=serializer.data["name"])
except ProblemTag.DoesNotExist:
tag = ProblemTag.objects.create(name=serializer.data["name"])
return success_response(ProblemTagSerializer(tag).data)
else:
return error_response(serializer)
def get(self, request):
return success_response(ProblemTagSerializer(ProblemTag.objects.all(), many=True).data)
def problem_page(request, problem_id):
try:
problem = Problem.objects.get(id=problem_id)
@@ -49,6 +28,11 @@ def problem_page(request, problem_id):
return render(request, "oj/problem/problem.html", {"problem": problem, "samples": json.loads(problem.samples)})
class ProblemTagAdminAPIView(APIView):
def get(self, request):
return success_response(ProblemTagSerializer(ProblemTag.objects.all(), many=True).data)
class ProblemAdminAPIView(APIView):
def post(self, request):
"""
@@ -60,7 +44,6 @@ class ProblemAdminAPIView(APIView):
serializer = CreateProblemSerializer(data=request.data)
if serializer.is_valid():
data = serializer.data
print data
problem = Problem.objects.create(title=data["title"],
description=data["description"],
input_description=data["input_description"],
@@ -145,7 +128,8 @@ class ProblemAdminAPIView(APIView):
problem = problem.filter(visible=(visible == "true"))
keyword = request.GET.get("keyword", None)
if keyword:
problem = problem.filter(Q(difficulty__contains=keyword))
problem = problem.filter(Q(title__contains=keyword) |
Q(description__contains=keyword))
return paginate(request, problem, ProblemSerializer)