增加及修改account与announcement的测试

account/tests.py

@@ -130,7 +130,7 @@ class UserChangePasswordAPITest(APITestCase):
         self.assertEqual(response.data, {"code": 1, "data": u"密码不正确，请重新修改！"})
 
     def test_invalid_data_format(self):
-        data = {"username": "test", "old_password": "aaa", "new_password": "aaaddd"}
+        data = {"old_password": "aaa", "new_password": "aaaddd"}
         response = self.client.post(self.url, data=data)
         self.assertEqual(response.data["code"], 1)
 
@@ -152,15 +152,50 @@ class UserAdminAPITest(APITestCase):
         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.client.login(username="testx", password="testxx")
 
+    # 以下是编辑用户的测试
     def test_success_get_data(self):
         self.assertEqual(self.client.get(self.url).data["code"], 0)
 
+    def test_put_invalid_data(self):
+        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):
+        data = {"id": 3, "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_username_exists(self):
+        data = {"id": 1, "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",
+                "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",
+                "email": "60@qq.com", "admin_type": "2"}
+        response = self.client.put(self.url, data=data)
+        self.assertEqual(response.data["code"], 0)
+        self.assertIsNotNone(auth.authenticate(username="test0", password="111111"))
+
     def test_error_admin_type(self):
         response = self.client.get(self.url + "?admin_type=error")
         self.assertEqual(response.data, {"code": 1, "data": u"参数错误"})
 
+    # 以下是用户分页的测试
     def test_query_by_keyword(self):
         user1 = User.objects.create(username="test1", real_name="aa")
         user1.set_password("testaa")
@@ -177,29 +212,18 @@ class UserAdminAPITest(APITestCase):
         response = self.client.get(self.url + "?keyword=test1")
         self.assertEqual(response.data["code"], 0)
 
-    def test_put_invalid_data(self):
-        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):
+class UserInfoAPITest(APITestCase):
-        data = {"id": 2, "username": "test0", "real_name": "test00",
+    def setUp(self):
-                "password": "testaa","email": "60@qq.com", "admin_type": "2"}
+        self.client = APIClient()
-        response = self.client.put(self.url, data=data)
+        self.url = reverse('user_info_api')
-        self.assertEqual(response.data, {"code": 1, "data": u"该用户不存在！"})
+        user = User.objects.create(username="test1", real_name="aa")
+        user.set_password("testaa")
+        user.save()
 
-    def test_success_user_edit_not_password(self):
+    def test_get_data_successfully(self):
-        data = {"id": 1, "username": "test0", "real_name": "test00",
+        self.client.login(username="test1", password="testaa")
-                "email": "60@qq.com", "admin_type": "2"}
+        self.assertEqual(self.client.get(self.url).data["code"], 0)
-        response = self.client.put(self.url, data=data)
-        self.assertEqual(response.data["code"], 0)
-
-    def test_success_user_edit_change_password(self):
-        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)
-        self.assertEqual(response.data["code"], 0)
-        self.assertIsNotNone(auth.authenticate(username="test0", password="111111"))
 
 
 @login_required

announcement/serializers.py

@@ -9,7 +9,7 @@ class CreateAnnouncementSerializer(serializers.Serializer):
     title = serializers.CharField(max_length=50)
     content = serializers.CharField(max_length=10000)
     is_global = serializers.BooleanField()
-    groups = serializers.ListField(child=serializers.IntegerField())
+    groups = serializers.ListField(child=serializers.IntegerField(), required=False, default=[])
 
 
 class AnnouncementSerializer(serializers.ModelSerializer):
@@ -31,4 +31,4 @@ class EditAnnouncementSerializer(serializers.Serializer):
     content = serializers.CharField(max_length=10000)
     visible = serializers.BooleanField()
     is_global = serializers.BooleanField()
-    groups = serializers.ListField(child=serializers.IntegerField())
+    groups = serializers.ListField(child=serializers.IntegerField(), required=False, default=[])

announcement/tests.py

@@ -5,6 +5,7 @@ from django.test import TestCase
 from rest_framework.test import APITestCase, APIClient
 
 from account.models import User
+from group.models import Group
 from announcement.models import Announcement
 from account.models import REGULAR_USER, ADMIN, SUPER_ADMIN
 
@@ -13,76 +14,127 @@ class AnnouncementAdminAPITest(APITestCase):
         def setUp(self):
             self.client = APIClient()
             self.url = reverse("announcement_admin_api")
-            user = User.objects.create(username="test", admin_type=SUPER_ADMIN)
+            user1 = User.objects.create(username="test1", admin_type=SUPER_ADMIN)
-            user.set_password("testaa")
+            user1.set_password("testaa")
-            user.save()
+            user1.save()
+            user2 = User.objects.create(username="test2", admin_type=ADMIN)
+            user2.set_password("testbb")
+            user2.save()
+            self.group = Group.objects.create(name="group1", description="des0",
+                                              join_group_setting=0, visible=True,
+                                              admin=user2)
+            self.announcement = Announcement.objects.create(title="bb",
+                                                            content="BB",
+                                                            created_by=User.objects.get(username="test2"),
+                                                            is_global=False)
 
         # 以下是发布公告的测试
         def test_invalid_format(self):
-            self.client.login(username="test", password="testaa")
+            self.client.login(username="test1", password="testaa")
             data = {"title": "test1"}
             response = self.client.post(self.url, data=data)
             self.assertEqual(response.data["code"], 1)
 
-        def test_success_announcement(self):
+        def test_group_at_least_one(self):
-            self.client.login(username="test", password="testaa")
+            self.client.login(username="test1", password="testaa")
-            data = {"title": "title0", "content": "content0"}
+            data = {"title": "title0", "content": "content0", "is_global": False}
+            response = self.client.post(self.url, data=data)
+            self.assertEqual(response.data, {"code": 1, "data": u"至少选择一个小组"})
+
+        def test_global_announcement_successfully(self):
+            self.client.login(username="test1", password="testaa")
+            data = {"title": "title0", "content": "content0", "is_global": True}
             response = self.client.post(self.url, data=data)
             self.assertEqual(response.data, {"code": 0, "data": u"公告发布成功！"})
 
-        def test_post_invalid_data(self):
+        def test_group_announcement_successfully(self):
-            self.client.login(username="test", password="testaa")
+            self.client.login(username="test2", password="testbb")
-            data = {"title": "test"}
+            data = {"title": "title0", "content": "content0", "is_global": False, "groups": [self.group.id]}
             response = self.client.post(self.url, data=data)
-            self.assertEqual(response.data["code"], 1)
+            self.assertEqual(response.data, {"code": 0, "data": u"公告发布成功！"})
+
+        def test_global_announcement_does_not_has_privileges(self):
+            self.client.login(username="test2", password="testbb")
+            data = {"title": "title0", "content": "content0", "is_global": True}
+            response = self.client.post(self.url, data=data)
+            self.assertEqual(response.data, {"code": 1, "data": u"只有超级管理员可以创建全局公告"})
 
         # 以下是编辑公告的测试
         def test_put_invalid_data(self):
-            self.client.login(username="test", password="testaa")
+            self.client.login(username="test1", password="testaa")
             data = {"title": "test0", "content": "test0", "visible": "True"}
             response = self.client.put(self.url, data=data)
             self.assertEqual(response.data["code"], 1)
 
         def test_announcement_does_not_exist(self):
-            self.client.login(username="test", password="testaa")
+            self.client.login(username="test1", password="testaa")
             announcement = Announcement.objects.create(title="aa",
                                                        content="AA",
-                                                       created_by=User.objects.get(username="test"))
+                                                       created_by=User.objects.get(username="test1"),
-            data = {"id": announcement.id + 1, "title": "11", "content": "22", "visible": True}
+                                                       is_global=True)
+            data = {"id": announcement.id + 1, "title": "11", "content": "22",
+                    "visible": True, "is_global": True}
             response = self.client.put(self.url, data=data)
-            self.assertEqual(response.data, {"code": 1, "data": u"该公告不存在！"})
+            self.assertEqual(response.data, {"code": 1, "data": u"公告不存在"})
 
-        def test_success_edit_announcement(self):
+        def test_edit_global_announcement_successfully(self):
-            self.client.login(username="test", password="testaa")
+            self.client.login(username="test1", password="testaa")
-            announcement = Announcement.objects.create(title="bb",
+            data = {"id": self.announcement.id, "title": "11", "content": "22",
-                                                       content="BB",
+                    "visible": True, "is_global": True}
-                                                       created_by=User.objects.get(username="test"))
-            data = {"id": announcement.id, "title": "11", "content": "22", "visible": True}
             response = self.client.put(self.url, data=data)
             self.assertEqual(response.data["code"], 0)
 
+        def test_edit_group_announcement_successfully(self):
+            self.client.login(username="test2", password="testbb")
+            data = {"id": self.announcement.id, "title": "11", "content": "22",
+                    "visible": True, "is_global": False, "groups": [self.group.id]}
+            response = self.client.put(self.url, data=data)
+            self.assertEqual(response.data["code"], 0)
 
-class AnnouncementAPITest(APITestCase):
+        def test_edit_group_at_least_one(self):
-        def setUp(self):
+            self.client.login(username="test1", password="testaa")
-            self.client = APIClient()
+            data = {"id": self.announcement.id, "title": "title0", "content": "content0",
-            self.url = reverse("announcement_list_api")
+                    "visible": True, "is_global": False}
-            user = User.objects.create(username="test")
+            response = self.client.put(self.url, data=data)
-            user.set_password("testaa")
+            self.assertEqual(response.data, {"code": 1, "data": u"至少选择一个小组"})
-            user.save()
 
-        def test_success_get_data(self):
+        # 以下是公告分页的测试
+        def test_get_data_successfully(self):
+            self.client.login(username="test1", password="testaa")
             self.assertEqual(self.client.get(self.url).data["code"], 0)
 
-        def test_keyword_announcement(self):
+        def test_keyword_global_announcement(self):
+            self.client.login(username="test1", password="testaa")
             Announcement.objects.create(title="aa",
                                         content="AA",
-                                        created_by=User.objects.get(username="test"),
+                                        created_by=User.objects.get(username="test1"),
-                                        visible=True)
+                                        visible=True,
+                                        is_global=True)
 
             Announcement.objects.create(title="bb",
                                         content="BB",
-                                        created_by=User.objects.get(username="test"),
+                                        created_by=User.objects.get(username="test1"),
-                                        visible=False)
+                                        visible=False,
+                                        is_global=True)
+
+            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_keyword_group_announcement(self):
+            self.client.login(username="test2", password="testbb")
+            Announcement.objects.create(title="aa",
+                                        content="AA",
+                                        created_by=User.objects.get(username="test2"),
+                                        visible=True,
+                                        is_global=False)
+
+            Announcement.objects.create(title="cc",
+                                        content="CC",
+                                        created_by=User.objects.get(username="test2"),
+                                        visible=False,
+                                        is_global=False)
 
             response = self.client.get(self.url + "?visible=true")
             self.assertEqual(response.data["code"], 0)
@@ -98,12 +150,14 @@ class AnnouncementPageTest(TestCase):
         Announcement.objects.create(title="aa",
                                     content="AA",
                                     created_by=User.objects.get(username="test"),
-                                    visible=True)
+                                    visible=True,
+                                    is_global=True)
 
         Announcement.objects.create(title="bb",
                                     content="BB",
                                     created_by=User.objects.get(username="test"),
-                                    visible=False)
+                                    visible=False,
+                                    is_global=True)
 
     def test_visit_announcement_successfully(self):
         response = self.client.get('/announcement/1/')
@@ -112,3 +166,4 @@ class AnnouncementPageTest(TestCase):
     def test_announcement_does_not_exist(self):
         response = self.client.get('/announcement/3/')
         self.assertTemplateUsed(response, "utils/error.html")
+

announcement/views.py

@@ -49,7 +49,6 @@ class AnnouncementAdminAPIView(APIView):
                                                        is_global=data["is_global"])
 
             announcement.groups.add(*groups)
-
             return success_response(u"公告发布成功！")
         else:
             return serializer_invalid_response(serializer)

oj/settings.py

@@ -156,3 +156,8 @@ LOGGING = {
         }
     },
 }
+
+
+REST_FRAMEWORK = {
+    'TEST_REQUEST_DEFAULT_FORMAT': 'json'
+}