From a96a23da2d3fc890b47af267c1119f19a446e680 Mon Sep 17 00:00:00 2001
From: zemal <rawidn@163.com>
Date: Mon, 1 May 2017 13:20:26 +0800
Subject: [PATCH] Fix tests.

---
 problem/tests.py      | 8 +++++---
 problem/urls/admin.py | 2 +-
 problem/views/oj.py   | 4 +---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/problem/tests.py b/problem/tests.py
index d80262ae..fc9fa44b 100644
--- a/problem/tests.py
+++ b/problem/tests.py
@@ -17,7 +17,9 @@ class ProblemTagListAPITest(APITestCase):
         ProblemTag.objects.create(name="name2")
         resp = self.client.get(self.reverse("problem_tag_list_api"))
         self.assertSuccess(resp)
-        self.assertEqual(resp.data["data"], ["name1", "name2"])
+        resp_data = resp.data['data']
+        self.assertEqual(resp_data[0]["name"], "name1")
+        self.assertEqual(resp_data[1]["name"], "name2")
 
 
 class TestCaseUploadAPITest(APITestCase):
@@ -76,9 +78,9 @@ class TestCaseUploadAPITest(APITestCase):
                     self.assertEqual(f.read(), name + "\n" + name + "\n" + "end")
 
 
-class ProblemAPITest(APITestCase):
+class ProblemAdminAPITest(APITestCase):
     def setUp(self):
-        self.url = self.reverse("problem_api")
+        self.url = self.reverse("problem_admin_api")
         self.create_super_admin()
         self.data = {"_id": "A-110", "title": "test", "description": "<p>test</p>", "input_description": "test",
                      "output_description": "test", "time_limit": 1000, "memory_limit": 256, "difficulty": "Low",
diff --git a/problem/urls/admin.py b/problem/urls/admin.py
index b4813c5b..d123f35b 100644
--- a/problem/urls/admin.py
+++ b/problem/urls/admin.py
@@ -4,6 +4,6 @@ from ..views.admin import ContestProblemAPI, ProblemAPI, TestCaseUploadAPI
 
 urlpatterns = [
     url(r"^test_case/upload/?$", TestCaseUploadAPI.as_view(), name="test_case_upload_api"),
-    url(r"^problem/?$", ProblemAPI.as_view(), name="problem_api"),
+    url(r"^problem/?$", ProblemAPI.as_view(), name="problem_admin_api"),
     url(r"^contest/problem/?$", ContestProblemAPI.as_view(), name="contest_problem_api")
 ]
diff --git a/problem/views/oj.py b/problem/views/oj.py
index c21c06a5..bed7ed85 100644
--- a/problem/views/oj.py
+++ b/problem/views/oj.py
@@ -7,9 +7,7 @@ from ..serializers import ProblemSerializer, TagSerializer
 
 class ProblemTagAPI(APIView):
     def get(self, request):
-        tags = ProblemTag.objects.annotate(problem_number=Count("problem"))\
-            .filter(problem_number__gt=0).order_by("-problem_number")
-        return self.success(TagSerializer(tags, many=True).data)
+        return self.success(TagSerializer(ProblemTag.objects.all(), many=True).data)
 
 
 class ProblemAPI(APIView):