Merge pull request #7 from erik-sn/master

StrategySerializer tests, package versions

Author: meatballs

.gitignore

@@ -57,8 +57,7 @@ target/
 .venv
 .vagrant/
 
-# Sublime Text Settings
+# Code editors
 *.sublime-*
-
-# pycharm settings
 .idea
+.vscode

README.rst

@@ -36,7 +36,7 @@ If successful, you should see the following messages at the end of the installat
 
 .. code::
 
-  web_1  | Django version 1.10.6, using settings 'api.config.settings'
+  web_1  | Django version 1.11, using settings 'api.config.settings'
   web_1  | Starting development server at http://0.0.0.0:8000/
   web_1  | Quit the server with CONTROL-C.
 
@@ -61,3 +61,10 @@ Make sure you have created a .env file as above. To run all tests:
 
   python manage.py test --settings=api.config.test_settings
 
+With coverage:
+
+.. code:
+
+  coverage run --source='api' manage.py test --settings=api.config.test_settings
+  coverage html --omit="*/test*"
+

api/core/tests/test_serializers.py

@@ -0,0 +1,55 @@
+from unittest import TestCase
+from rest_framework.test import APIRequestFactory
+
+from api.core.serializers import StrategySerializer
+
+
+class TestStrategy(object):
+    name = 'Test Strategy'
+    description = 'test object for serializer testing'
+    classifier = {
+        "memory_depth": 1,
+        "stochastic": False,
+        "makes_use_of": [],
+        "long_run_time": False,
+        "inspects_source": False,
+        "manipulates_source": False,
+        "manipulates_state": False,
+    }
+    params = {'rate': 0.5}
+
+    def __init__(self):
+        pass
+
+    def init_params(self):
+        return self.params
+
+
+class TestSerializers(TestCase):
+
+    @classmethod
+    def setUpClass(cls):
+        cls.factory = APIRequestFactory()
+        cls.request = cls.factory.get('/articles/')
+
+    def setUp(self):
+        self.strategy = TestStrategy()
+
+    def test_has_correct_fields(self):
+        serializer = StrategySerializer(self.strategy, context={'request': self.request})
+        for key in ['url', 'id', 'name', 'description', 'classifier', 'params']:
+            self.assertIn(key, serializer.data)
+
+    def test_generates_correct_url(self):
+        serializer = StrategySerializer(self.strategy, context={'request': self.request})
+        self.assertEqual('http://testserver/strategies/teststrategy/', serializer.data['url'])
+
+    def test_generates_correct_params(self):
+        serializer = StrategySerializer(self.strategy, context={'request': self.request})
+        self.assertEqual({'rate': 0.5}, serializer.data['params'])
+
+    def test_handles_infinite_memory_depth(self):
+        self.strategy.classifier['memory_depth'] = float('inf')
+        serializer = StrategySerializer(self.strategy, context={'request': self.request})
+        self.assertEqual(-1, serializer.data['classifier']['memory_depth'])
+

api/core/tests/test_views.py

@@ -0,0 +1,47 @@
+from unittest import TestCase, mock
+from rest_framework.test import APIClient
+
+from api.core.serializers import strategy_id
+
+class TestStrategy(object):
+
+    def __init__(self, name, classifier):
+        self.name = name
+        self.classifier = classifier
+    def init_params(self):
+        return {}
+
+
+class TestStrategyView(TestCase):
+    strategies = [
+        TestStrategy('Test One', {'stochastic': True, 'memory_depth': 1}),
+        TestStrategy('Test Two', {'stochastic': True, 'memory_depth': 1}),
+        TestStrategy('Test Three', {'stochastic': True, 'memory_depth': 2}),
+        TestStrategy('Test Four', {'stochastic': False, 'memory_depth': 2}),
+        TestStrategy('Test Five', {'stochastic': False, 'memory_depth': 1}),
+    ]
+    strategies_index = {strategy_id(s): s for s in strategies}
+
+    def setUp(self):
+        self.client = APIClient()
+
+    @mock.patch('api.core.views.axl.filtered_strategies')
+    def test_lists_all_strategies(self, filtered_strategies):
+        filtered_strategies.return_value = self.strategies
+        response = self.client.get('/strategies/')
+        self.assertEqual(200, response.status_code)
+        self.assertEqual(5, len(response.data))
+
+    @mock.patch('api.core.views.StrategyViewSet.strategies_index', strategies_index)
+    def test_retrieves_one_strategy(self):
+        response = self.client.get('/strategies/testone/')
+        self.assertEqual(200, response.status_code)
+        self.assertEqual('Test One', response.data['name'])
+
+    @mock.patch('api.core.views.StrategyViewSet.strategies_index', strategies_index)
+    def test_strategy_does_not_exist(self):
+        response = self.client.get('/strategies/notfound/')
+        self.assertEqual(404, response.status_code)
+
+
+

api/core/views.py

@@ -1,4 +1,5 @@
 from distutils.util import strtobool
+from django.http import Http404
 from rest_framework import viewsets
 from rest_framework.response import Response
 import axelrod as axl
@@ -51,6 +52,9 @@ def list(self, request):
         return Response(serializer.data)
 
     def retrieve(self, request, pk=None):
-        strategy = self.strategies_index[pk]
+        try:
+            strategy = self.strategies_index[pk]
+        except KeyError:
+            raise Http404
         serializer = StrategySerializer(strategy, context={'request': request})
         return Response(serializer.data)

requirements.txt

@@ -1,13 +1,17 @@
 appdirs==1.4.3
-Axelrod==2.8.0
+astroid==1.5.2
+Axelrod==2.10.0
 cycler==0.10.0
 dj-database-url==0.4.1
-Django==1.10.6
+Django==1.11
 django-cors-headers==2.0.2
 django-debug-toolbar==1.7
 djangorestframework==3.6.2
 hypothesis==3.7.0
+isort==4.2.5
+lazy-object-proxy==1.2.2
 matplotlib==2.0.0
+mccabe==0.6.1
 numpy==1.12.1
 packaging==16.8
 prompt-toolkit==1.0.14
@@ -20,3 +24,4 @@ sqlparse==0.2.3
 tqdm==3.4.0
 wcwidth==0.1.7
 whitenoise==3.3.0
+wrapt==1.10.10