Changed collection_* decorators to list_*

1 files changed, 12 insertions, 12 deletions

diff --git a/rest_framework/tests/test_routers.py b/rest_framework/tests/test_routers.py
index e0a7e292..39310176 100644
--- a/rest_framework/tests/test_routers.py
+++ b/rest_framework/tests/test_routers.py
@@ -4,7 +4,7 @@ from django.test import TestCase
 from django.core.exceptions import ImproperlyConfigured
 from rest_framework import serializers, viewsets, permissions
 from rest_framework.compat import include, patterns, url
-from rest_framework.decorators import link, action, collection_link, collection_action
+from rest_framework.decorators import link, action, list_link, list_action
 from rest_framework.response import Response
 from rest_framework.routers import SimpleRouter, DefaultRouter
 from rest_framework.test import APIRequestFactory
@@ -216,39 +216,39 @@ class TestActionAppliedToExistingRoute(TestCase):
             self.router.urls
 
 
-class CollectionAndDynamicViewSet(viewsets.ViewSet):
+class DynamicListAndDetailViewSet(viewsets.ViewSet):
     def list(self, request, *args, **kwargs):
         return Response({'method': 'list'})
 
-    @collection_action()
-    def collection_action(self, request, *args, **kwargs):
+    @list_action()
+    def list_action(self, request, *args, **kwargs):
         return Response({'method': 'action1'})
 
     @action()
-    def dynamic_action(self, request, *args, **kwargs):
+    def detail_action(self, request, *args, **kwargs):
         return Response({'method': 'action2'})
 
-    @collection_link()
-    def collection_link(self, request, *args, **kwargs):
+    @list_link()
+    def list_link(self, request, *args, **kwargs):
         return Response({'method': 'link1'})
 
     @link()
-    def dynamic_link(self, request, *args, **kwargs):
+    def detail_link(self, request, *args, **kwargs):
         return Response({'method': 'link2'})
 
 
-class TestCollectionAndDynamicRouter(TestCase):
+class TestDynamicListAndDetailRouter(TestCase):
     def setUp(self):
         self.router = SimpleRouter()
 
     def test_link_and_action_decorator(self):
-        routes = self.router.get_routes(CollectionAndDynamicViewSet)
+        routes = self.router.get_routes(DynamicListAndDetailViewSet)
         decorator_routes = [r for r in routes if not (r.name.endswith('-list') or r.name.endswith('-detail'))]
         # Make sure all these endpoints exist and none have been clobbered
-        for i, endpoint in enumerate(['collection_action', 'collection_link', 'dynamic_action', 'dynamic_link']):
+        for i, endpoint in enumerate(['list_action', 'list_link', 'detail_action', 'detail_link']):
             route = decorator_routes[i]
             # check url listing
-            if endpoint.startswith('collection_'):
+            if endpoint.startswith('list_'):
                 self.assertEqual(route.url,
                                  '^{{prefix}}/{0}{{trailing_slash}}$'.format(endpoint))
             else: