add tests

6 files changed, 52 insertions, 10 deletions

diff --git a/.project b/.project
new file mode 100644
index 00000000..cb2356cf
--- /dev/null
+++ b/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>xcosblocks</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.python.pydev.PyDevBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.python.pydev.pythonNature</nature>
+	</natures>
+</projectDescription>
diff --git a/.pydevproject b/.pydevproject
new file mode 100644
index 00000000..3f3174e2
--- /dev/null
+++ b/.pydevproject
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?eclipse-pydev version="1.0"?><pydev_project>
+        
+    <pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Default</pydev_property>
+        
+    <pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python interpreter</pydev_property>
+    
+    <pydev_pathproperty name="org.python.pydev.PROJECT_SOURCE_PATH">
+        <path>/${PROJECT_DIR_NAME}/blocks/env/lib/python3.6/site-packages</path>
+    </pydev_pathproperty>
+</pydev_project>
diff --git a/blocks/blocks/xcosblocks/serializers.py b/blocks/blocks/xcosblocks/serializers.py
index cdd14658..e1cf8229 100644
--- a/blocks/blocks/xcosblocks/serializers.py
+++ b/blocks/blocks/xcosblocks/serializers.py
@@ -1,4 +1,5 @@
 from rest_framework import serializers
+
 from . import models
 
 
diff --git a/blocks/blocks/xcosblocks/tests.py b/blocks/blocks/xcosblocks/tests.py
index 7ce503c2..5697a0e8 100644
--- a/blocks/blocks/xcosblocks/tests.py
+++ b/blocks/blocks/xcosblocks/tests.py
@@ -1,3 +1,13 @@
 from django.test import TestCase
 
-# Create your tests here.
+from . import models
+
+
+class CategoryTestCase(TestCase):
+    def setUp(self):
+        models.Category.objects.create(name='ANDLOG', sort_order=30)
+
+    def test_categories(self):
+        category = models.Category.objects.get(name='ANDLOG')
+        print(category)
+        self.assertEqual(category.name, 'ANDLOG')
diff --git a/blocks/blocks/xcosblocks/urls.py b/blocks/blocks/xcosblocks/urls.py
index 856a122f..9f7af9de 100644
--- a/blocks/blocks/xcosblocks/urls.py
+++ b/blocks/blocks/xcosblocks/urls.py
@@ -1,4 +1,5 @@
 from rest_framework.routers import DefaultRouter
+
 from . import views
 
 router = DefaultRouter()
diff --git a/blocks/blocks/xcosblocks/views.py b/blocks/blocks/xcosblocks/views.py
index 0f8e33ee..d5f435d1 100644
--- a/blocks/blocks/xcosblocks/views.py
+++ b/blocks/blocks/xcosblocks/views.py
@@ -1,10 +1,12 @@
-import django_filters
-from rest_framework import viewsets
+from django_filters import FilterSet
+from django_filters.rest_framework import DjangoFilterBackend
+from rest_framework.viewsets import ReadOnlyModelViewSet
+
 from . import models
 from . import serializers
 
 
-class CategoryFilterSet(django_filters.FilterSet):
+class CategoryFilterSet(FilterSet):
     class Meta:
         model = models.Category
         fields = {
@@ -12,19 +14,19 @@ class CategoryFilterSet(django_filters.FilterSet):
         }
 
 
-class CategoryViewSet(viewsets.ReadOnlyModelViewSet):
+class CategoryViewSet(ReadOnlyModelViewSet):
     """
      Listing All Category Details
     """
-    queryset = models.Category.objects.all()
+    queryset = models.Category.objects.all().order_by('sort_order')
     serializer_class = serializers.CategorySerializer
     filter_backends = [
-        django_filters.rest_framework.DjangoFilterBackend
+        DjangoFilterBackend
     ]
     filterset_class = CategoryFilterSet
 
 
-class BlockFilterSet(django_filters.FilterSet):
+class BlockFilterSet(FilterSet):
     class Meta:
         model = models.Block
         fields = {
@@ -32,13 +34,13 @@ class BlockFilterSet(django_filters.FilterSet):
         }
 
 
-class BlockViewSet(viewsets.ReadOnlyModelViewSet):
+class BlockViewSet(ReadOnlyModelViewSet):
     """
      Listing All Block Details
     """
     queryset = models.Block.objects.all()
     serializer_class = serializers.BlockSerializer
     filter_backends = [
-        django_filters.rest_framework.DjangoFilterBackend
+        DjangoFilterBackend
     ]
     filterset_class = BlockFilterSet