From 75b1bf749e8c42891a29fa1cbf79c60d5c5a2580 Mon Sep 17 00:00:00 2001 From: "sxw@401" Date: Sat, 5 Sep 2015 16:25:05 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E4=B8=AD=E4=BD=BF=E7=94=A8=E7=9B=B8=E5=AF=B9id=E7=9A=84?= =?UTF-8?q?=E5=9C=B0=E6=96=B9,=E5=8E=9F=E6=9D=A5=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E9=87=8C=E7=94=A8=E4=BA=86=E5=BE=88=E5=A4=9Aid=E6=98=AF?= =?UTF-8?q?=E8=87=AA=E5=B7=B1=E8=AE=BE=E7=BD=AE=E7=9A=84=E5=B8=B8=E9=87=8F?= =?UTF-8?q?,=E5=8F=AF=E8=83=BD=E5=BC=95=E5=8F=91=E4=BA=86=E9=94=99?= =?UTF-8?q?=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- account/tests.py | 18 +++++++++--------- contest/tests.py | 2 +- problem/tests.py | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/account/tests.py b/account/tests.py index bbdf1e92..b1f14d08 100644 --- a/account/tests.py +++ b/account/tests.py @@ -140,12 +140,12 @@ class UserAdminAPITest(APITestCase): def setUp(self): self.client = APIClient() self.url = reverse("user_admin_api") - user = User.objects.create(username="testx", real_name="xx", admin_type=SUPER_ADMIN) - user.set_password("testxx") - user.save() - user = User.objects.create(username="testy", real_name="yy", admin_type=SUPER_ADMIN) - user.set_password("testyy") - user.save() + self.user = User.objects.create(username="testx", real_name="xx", admin_type=SUPER_ADMIN) + self.user.set_password("testxx") + self.user.save() + self.user = User.objects.create(username="testy", real_name="yy", admin_type=SUPER_ADMIN) + self.user.set_password("testyy") + self.user.save() self.client.login(username="testx", password="testxx") # 以下是编辑用户的测试 @@ -164,19 +164,19 @@ class UserAdminAPITest(APITestCase): self.assertEqual(response.data, {"code": 1, "data": u"该用户不存在！"}) def test_username_exists(self): - data = {"id": 1, "username": "testy", "real_name": "test00", + data = {"id": self.user.id, "username": "testy", "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_user_edit_not_password_successfully(self): - data = {"id": 1, "username": "test0", "real_name": "test00", + data = {"id": self.user.id, "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_user_edit_change_password_successfully(self): - data = {"id": 1, "username": "test0", "real_name": "test00", "password": "111111", + data = {"id": self.user.id, "username": "test0", "real_name": "test00", "password": "111111", "email": "60@qq.com", "admin_type": "2"} response = self.client.put(self.url, data=data) self.assertEqual(response.data["code"], 0) diff --git a/contest/tests.py b/contest/tests.py index 052829f3..adbf00b6 100644 --- a/contest/tests.py +++ b/contest/tests.py @@ -370,7 +370,7 @@ class ContestProblemAdminAPItEST(APITestCase): def test_query_contest_problem_exists_by_contest_id(self): self.client.login(username="test3", password="testaa") - response = self.client.get(self.url + "?contest_id=1") + response = self.client.get(self.url + "?contest_id="+ str(self.global_contest.id)) self.assertEqual(response.data["code"], 0) self.assertEqual(len(response.data["data"]), 0) diff --git a/problem/tests.py b/problem/tests.py index ab6d8985..2a7aecc3 100644 --- a/problem/tests.py +++ b/problem/tests.py @@ -144,7 +144,7 @@ class ProblemAdminTest(APITestCase): self.assertEqual(response.data, {"code": 1, "data": u"题目不存在"}) def test_query_problem_exists(self): - data = {"problem_id": 1} + data = {"problem_id": self.problem.id} response = self.client.get(self.url, data=data) self.assertEqual(response.data["code"], 0) From 2b48822dba9dc229f9f2c318426e6bc5877c210f Mon Sep 17 00:00:00 2001 From: "sxw@401" Date: Sat, 5 Sep 2015 16:44:16 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9account=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- account/tests.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/account/tests.py b/account/tests.py index b1f14d08..e868f62b 100644 --- a/account/tests.py +++ b/account/tests.py @@ -140,9 +140,9 @@ class UserAdminAPITest(APITestCase): def setUp(self): self.client = APIClient() self.url = reverse("user_admin_api") - self.user = User.objects.create(username="testx", real_name="xx", admin_type=SUPER_ADMIN) - self.user.set_password("testxx") - self.user.save() + self.user1 = User.objects.create(username="testx", real_name="xx", admin_type=SUPER_ADMIN) + self.user1.set_password("testxx") + self.user1.save() self.user = User.objects.create(username="testy", real_name="yy", admin_type=SUPER_ADMIN) self.user.set_password("testyy") self.user.save() @@ -164,7 +164,7 @@ class UserAdminAPITest(APITestCase): self.assertEqual(response.data, {"code": 1, "data": u"该用户不存在！"}) def test_username_exists(self): - data = {"id": self.user.id, "username": "testy", "real_name": "test00", + data = {"id": self.user.id, "username": "testx", "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"昵称已经存在"})