diff --git a/djangoldp/tests/tests_auto_author.py b/djangoldp/tests/tests_auto_author.py
index 898b1c94a4ee200e02dc69909287777b4b7e2560..e32e4ab7b3176fe013cb168d4c7077e857677109 100644
--- a/djangoldp/tests/tests_auto_author.py
+++ b/djangoldp/tests/tests_auto_author.py
@@ -1,7 +1,8 @@
import json
from django.contrib.auth import get_user_model
-from rest_framework.test import APIRequestFactory, APIClient, APITestCase
+from rest_framework.test import APIClient, APIRequestFactory, APITestCase
+
from djangoldp.tests.models import UserProfile
@@ -22,4 +23,4 @@ class TestAutoAuthor(APITestCase):
response = self.client.post('/posts/', data=json.dumps(post), content_type='application/ld+json')
self.assertEqual(response.status_code, 201)
- self.assertEquals(response.data['content'], "post content")
\ No newline at end of file
+ self.assertEqual(response.data['content'], "post content")
\ No newline at end of file
diff --git a/djangoldp/tests/tests_backlinks_service.py b/djangoldp/tests/tests_backlinks_service.py
index df45641842737156c862e43af4f2174775760dd0..8b5a7c110b75a3b00a2fd6009309ac6cb041e5fc 100644
--- a/djangoldp/tests/tests_backlinks_service.py
+++ b/djangoldp/tests/tests_backlinks_service.py
@@ -1,12 +1,15 @@
-import uuid
-import time
import copy
+import time
+import uuid
+
from django.contrib.auth import get_user_model
from django.test import override_settings
from rest_framework.test import APIClient, APITestCase
-from djangoldp.tests.models import Circle, Project
+
+from djangoldp.activities.services import (BACKLINKS_ACTOR, ActivityPubService,
+ ActivityQueueService)
from djangoldp.models import Activity, ScheduledActivity
-from djangoldp.activities.services import BACKLINKS_ACTOR, ActivityPubService, ActivityQueueService
+from djangoldp.tests.models import Circle, Project
class TestsBacklinksService(APITestCase):
@@ -111,13 +114,13 @@ class TestsBacklinksService(APITestCase):
time.sleep(0.1)
# assert that all scheduled activities were cleaned up
- self.assertEquals(ScheduledActivity.objects.count(), 0)
+ self.assertEqual(ScheduledActivity.objects.count(), 0)
# assert that ONLY the newly scheduled activity was sent
activities = Activity.objects.all()
- self.assertEquals(Activity.objects.count(), 1)
+ self.assertEqual(Activity.objects.count(), 1)
astream = activities[0].to_activitystream()
- self.assertEquals(astream['summary'], new_activity['summary'])
+ self.assertEqual(astream['summary'], new_activity['summary'])
activities[0].delete()
# variation using expanded syntax
@@ -147,8 +150,8 @@ class TestsBacklinksService(APITestCase):
ActivityQueueService._activity_queue_worker('http://127.0.0.1:8001/idontexist/', scheduled_b)
# assert that both scheduled activities were sent, and the scheduled activities were cleaned up
- self.assertEquals(ScheduledActivity.objects.count(), 0)
- self.assertEquals(Activity.objects.count(), 2)
+ self.assertEqual(ScheduledActivity.objects.count(), 0)
+ self.assertEqual(Activity.objects.count(), 2)
# variation on the previous test where the two activities are working on different models (using the same object)
@override_settings(SEND_BACKLINKS=True, DISABLE_OUTBOX='DEBUG')
@@ -168,8 +171,8 @@ class TestsBacklinksService(APITestCase):
ActivityQueueService._activity_queue_worker('http://127.0.0.1:8001/idontexist/', scheduled_b)
# assert that both scheduled activities were sent, and the scheduled activities were cleaned up
- self.assertEquals(ScheduledActivity.objects.count(), 0)
- self.assertEquals(Activity.objects.count(), 2)
+ self.assertEqual(ScheduledActivity.objects.count(), 0)
+ self.assertEqual(Activity.objects.count(), 2)
# variation using an Add and a Remove (one defines target, the other origin)
# also tests that an unnecessary add is not sent
@@ -189,8 +192,8 @@ class TestsBacklinksService(APITestCase):
ActivityQueueService._activity_queue_worker('http://127.0.0.1:8001/idontexist/', scheduled_b)
# assert that both scheduled activities were sent, and the scheduled activities were cleaned up
- self.assertEquals(ScheduledActivity.objects.count(), 0)
- self.assertEquals(Activity.objects.count(), 1)
+ self.assertEqual(ScheduledActivity.objects.count(), 0)
+ self.assertEqual(Activity.objects.count(), 1)
@override_settings(SEND_BACKLINKS=True, DISABLE_OUTBOX='DEBUG')
def test_unnecessary_add_not_sent(self):
@@ -206,8 +209,8 @@ class TestsBacklinksService(APITestCase):
ActivityQueueService._activity_queue_worker('https://distant.com/inbox/', scheduled_b)
# assert that only the previous activity was sent, and the scheduled activites cleaned up
- self.assertEquals(ScheduledActivity.objects.count(), 0)
- self.assertEquals(Activity.objects.count(), 1)
+ self.assertEqual(ScheduledActivity.objects.count(), 0)
+ self.assertEqual(Activity.objects.count(), 1)
@override_settings(SEND_BACKLINKS=True, DISABLE_OUTBOX='DEBUG')
def test_unnecessary_remove_not_sent(self):
@@ -223,8 +226,8 @@ class TestsBacklinksService(APITestCase):
ActivityQueueService._activity_queue_worker('https://distant.com/inbox/', scheduled_b)
# assert that only the previous activity was sent, and the scheduled activites cleaned up
- self.assertEquals(ScheduledActivity.objects.count(), 0)
- self.assertEquals(Activity.objects.count(), 1)
+ self.assertEqual(ScheduledActivity.objects.count(), 0)
+ self.assertEqual(Activity.objects.count(), 1)
@override_settings(SEND_BACKLINKS=True, DISABLE_OUTBOX='DEBUG')
def test_necessary_add_sent(self):
@@ -240,8 +243,8 @@ class TestsBacklinksService(APITestCase):
ActivityQueueService._activity_queue_worker('https://distant.com/inbox/', scheduled_b)
# assert that both activities sent, and the scheduled activites cleaned up
- self.assertEquals(ScheduledActivity.objects.count(), 0)
- self.assertEquals(Activity.objects.count(), 2)
+ self.assertEqual(ScheduledActivity.objects.count(), 0)
+ self.assertEqual(Activity.objects.count(), 2)
@override_settings(SEND_BACKLINKS=True, DISABLE_OUTBOX='DEBUG')
def test_first_add_sent(self):
@@ -254,8 +257,8 @@ class TestsBacklinksService(APITestCase):
ActivityQueueService._activity_queue_worker('https://distant.com/inbox/', scheduled)
# assert that the activity was sent, and the scheduled activites cleaned up
- self.assertEquals(ScheduledActivity.objects.count(), 0)
- self.assertEquals(Activity.objects.count(), 1)
+ self.assertEqual(ScheduledActivity.objects.count(), 0)
+ self.assertEqual(Activity.objects.count(), 1)
# validate Update activity objects have new info before sending the notification
@override_settings(SEND_BACKLINKS=True, DISABLE_OUTBOX='DEBUG')
@@ -278,8 +281,8 @@ class TestsBacklinksService(APITestCase):
ActivityQueueService._activity_queue_worker('https://distant.com/inbox/', scheduled_b)
# assert that only the previous activity was sent, and the scheduled activites cleaned up
- self.assertEquals(ScheduledActivity.objects.count(), 0)
- self.assertEquals(Activity.objects.count(), 1)
+ self.assertEqual(ScheduledActivity.objects.count(), 0)
+ self.assertEqual(Activity.objects.count(), 1)
@override_settings(SEND_BACKLINKS=True, DISABLE_OUTBOX='DEBUG')
def test_necessary_update_is_sent(self):
@@ -302,8 +305,8 @@ class TestsBacklinksService(APITestCase):
ActivityQueueService._activity_queue_worker('https://distant.com/inbox/', scheduled_b)
# assert that both activities were sent
- self.assertEquals(ScheduledActivity.objects.count(), 0)
- self.assertEquals(Activity.objects.count(), 2)
+ self.assertEqual(ScheduledActivity.objects.count(), 0)
+ self.assertEqual(Activity.objects.count(), 2)
@override_settings(SEND_BACKLINKS=True, DISABLE_OUTBOX='DEBUG')
def test_first_update_is_sent(self):
@@ -318,5 +321,5 @@ class TestsBacklinksService(APITestCase):
scheduled = ActivityQueueService._save_sent_activity(activity, ScheduledActivity, type='update',
external_id='https://distant.com/inbox/')
ActivityQueueService._activity_queue_worker('https://distant.com/inbox/', scheduled)
- self.assertEquals(ScheduledActivity.objects.count(), 0)
- self.assertEquals(Activity.objects.count(), 1)
+ self.assertEqual(ScheduledActivity.objects.count(), 0)
+ self.assertEqual(Activity.objects.count(), 1)
diff --git a/djangoldp/tests/tests_cache.py b/djangoldp/tests/tests_cache.py
index cc3c9eec680095155bc5262e15ef697c9d59f479..82e3688e71532b0cc73e2bda29a8e48771e6fd92 100644
--- a/djangoldp/tests/tests_cache.py
+++ b/djangoldp/tests/tests_cache.py
@@ -1,9 +1,9 @@
from django.contrib.auth import get_user_model
from django.test import TestCase, override_settings
-from rest_framework.test import APIRequestFactory, APIClient
+from rest_framework.test import APIClient, APIRequestFactory
from rest_framework.utils import json
-from djangoldp.tests.models import Conversation, Project, Circle
+from djangoldp.tests.models import Circle, Conversation, Project
class TestCache(TestCase):
@@ -45,8 +45,8 @@ class TestCache(TestCase):
response = self.client.get('/batchs/', content_type='application/ld+json')
self.assertIn('ldp:contains', response.data)
- self.assertEquals(response.data['ldp:contains'][0]['title'], "title")
- self.assertEquals(response.data['ldp:contains'][0]['invoice']['title'], "title 2")
+ self.assertEqual(response.data['ldp:contains'][0]['title'], "title")
+ self.assertEqual(response.data['ldp:contains'][0]['invoice']['title'], "title 2")
# test resource cache after it is updated
@override_settings(SERIALIZER_CACHE=True)
@@ -68,7 +68,7 @@ class TestCache(TestCase):
response = self.client.get('/conversations/{}/'.format(conversation.pk), content_type='application/ld+json')
self.assertIn('peer_user', response.data)
- self.assertEquals('conversation update', response.data['description'])
+ self.assertEqual('conversation update', response.data['description'])
self.assertEqual(response.data['peer_user']['@id'], self.user.urlid)
self.assertIn('@type', response.data['peer_user'])
@@ -94,7 +94,7 @@ class TestCache(TestCase):
response = self.client.get('/conversations/{}/'.format(conversation.pk), content_type='application/ld+json')
self.assertIn('peer_user', response.data)
- self.assertEquals('conversation update', response.data['description'])
+ self.assertEqual('conversation update', response.data['description'])
self.assertIn('@id', response.data['peer_user'])
# serialize external id and only external id
self.assertEqual(response.data['peer_user']['@id'], external_user.urlid)
diff --git a/djangoldp/tests/tests_get.py b/djangoldp/tests/tests_get.py
index 1eb889c9ccd887422973da831de41e50a651e777..2dc0b22afc5e4862cc2e9089c5c7779db045e2e7 100644
--- a/djangoldp/tests/tests_get.py
+++ b/djangoldp/tests/tests_get.py
@@ -1,9 +1,13 @@
from datetime import datetime
+
from django.contrib.auth import get_user_model
-from rest_framework.test import APIRequestFactory, APIClient, APITestCase
+from rest_framework.test import APIClient, APIRequestFactory, APITestCase
-from djangoldp.tests.models import User, Post, Invoice, JobOffer, Skill, Batch, DateModel, Circle, UserProfile, Conversation, Message
from djangoldp.serializers import GLOBAL_SERIALIZER_CACHE
+from djangoldp.tests.models import (Batch, Circle, Conversation, DateModel,
+ Invoice, JobOffer, Message, Post, Skill,
+ User, UserProfile)
+
class TestGET(APITestCase):
@@ -21,7 +25,7 @@ class TestGET(APITestCase):
post = Post.objects.create(content="content")
response = self.client.get('/posts/{}/'.format(post.pk), content_type='application/ld+json', HTTP_ORIGIN='http://localhost:8080/test/')
self.assertEqual(response.status_code, 200)
- self.assertEquals(response.data['content'], "content")
+ self.assertEqual(response.data['content'], "content")
self.assertIn('author', response.data)
self.assertIn('@type', response.data)
@@ -39,7 +43,7 @@ class TestGET(APITestCase):
post = Post.objects.create(content="content", author=user)
response = self.client.get('/posts/{}/'.format(post.pk), content_type='application/ld+json')
self.assertEqual(response.status_code, 200)
- self.assertEquals(response.data['content'], "content")
+ self.assertEqual(response.data['content'], "content")
self.assertEqual(response.data['author']['@id'], user.urlid)
def test_get_container(self):
@@ -48,7 +52,7 @@ class TestGET(APITestCase):
Post.objects.create(content="federated", urlid="https://external.com/posts/1/")
response = self.client.get('/posts/', content_type='application/ld+json')
self.assertEqual(response.status_code, 200)
- self.assertEquals(1, len(response.data['ldp:contains']))
+ self.assertEqual(1, len(response.data['ldp:contains']))
self.assertIn('@type', response.data)
self.assertIn('@type', response.data['ldp:contains'][0])
self.assertNotIn('permissions', response.data['ldp:contains'][0])
@@ -57,12 +61,12 @@ class TestGET(APITestCase):
response = self.client.get('/invoices/', content_type='application/ld+json')
self.assertEqual(response.status_code, 200)
self.assertIn('permissions', response.data)
- self.assertEquals(1, len(response.data['permissions'])) # read only
+ self.assertEqual(1, len(response.data['permissions'])) # read only
def test_get_empty_container(self):
response = self.client.get('/posts/', content_type='application/ld+json')
self.assertEqual(response.status_code, 200)
- self.assertEquals(0, len(response.data['ldp:contains']))
+ self.assertEqual(0, len(response.data['ldp:contains']))
def test_get_filtered_fields(self):
skill = Skill.objects.create(title="Java", obligatoire="ok", slug="1")
@@ -114,14 +118,14 @@ class TestGET(APITestCase):
distant_batch = Batch.objects.create(invoice=invoice, title="distant", urlid="https://external.com/batch/1/")
response = self.client.get('/invoices/{}/batches/'.format(invoice.pk), content_type='application/ld+json')
self.assertEqual(response.status_code, 200)
- self.assertEquals(response.data['@id'], 'http://happy-dev.fr/invoices/{}/batches/'.format(invoice.pk))
+ self.assertEqual(response.data['@id'], 'http://happy-dev.fr/invoices/{}/batches/'.format(invoice.pk))
self.assertIn('permissions', response.data)
- self.assertEquals(len(response.data['ldp:contains']), 2)
+ self.assertEqual(len(response.data['ldp:contains']), 2)
self.assertIn('@type', response.data['ldp:contains'][0])
self.assertIn('@type', response.data['ldp:contains'][1])
self.assertNotIn('permissions', response.data['ldp:contains'][0])
self.assertNotIn('permissions', response.data['ldp:contains'][1])
- self.assertEquals(response.data['ldp:contains'][0]['invoice']['@id'], invoice.urlid)
+ self.assertEqual(response.data['ldp:contains'][0]['invoice']['@id'], invoice.urlid)
self.assertEqual(response.data['ldp:contains'][1]['@id'], distant_batch.urlid)
def test_get_nested_without_related_name(self):
@@ -130,8 +134,8 @@ class TestGET(APITestCase):
message = Message.objects.create(conversation=conversation, author_user=user)
response = self.client.get('/conversations/{}/message_set/'.format(conversation.pk), content_type='application/ld+json')
self.assertEqual(response.status_code, 200)
- self.assertEquals(response.data['@id'], 'http://happy-dev.fr/conversations/{}/message_set/'.format(conversation.pk))
- self.assertEquals(len(response.data['ldp:contains']), 1)
+ self.assertEqual(response.data['@id'], 'http://happy-dev.fr/conversations/{}/message_set/'.format(conversation.pk))
+ self.assertEqual(len(response.data['ldp:contains']), 1)
# TODO: https://git.startinblox.com/djangoldp-packages/djangoldp/issues/335
# test getting a route with multiple nested fields (/job-offers/X/skills/Y/)
@@ -232,4 +236,4 @@ class TestGET(APITestCase):
# for test_fields in fields_to_test:
# test_fields = list(test_fields)
# o_f = [field for field in self.ordered_fields if field in test_fields]
- # self.assertEquals(o_f, test_fields[:len(o_f)])
+ # self.assertEqual(o_f, test_fields[:len(o_f)])
diff --git a/djangoldp/tests/tests_inbox.py b/djangoldp/tests/tests_inbox.py
index b6aba595c082c20654ceed6e5e861b7c1fcb32a7..12b3bdf3391574bc59112c1eb1320cbd4492fa78 100644
--- a/djangoldp/tests/tests_inbox.py
+++ b/djangoldp/tests/tests_inbox.py
@@ -1,10 +1,12 @@
import json
-from django.contrib.auth import get_user_model
+
from django.conf import settings
+from django.contrib.auth import get_user_model
from django.test import override_settings
from rest_framework.test import APIClient, APITestCase
-from djangoldp.tests.models import Circle, Project, DateModel, DateChild
+
from djangoldp.models import Activity, Follower
+from djangoldp.tests.models import Circle, DateChild, DateModel, Project
class TestsInbox(APITestCase):
@@ -48,7 +50,7 @@ class TestsInbox(APITestCase):
def _assert_activity_created(self, response, activity_len=1):
'''Auxiliary function asserts that the activity was created and returned correctly'''
activities = Activity.objects.all()
- self.assertEquals(len(activities), activity_len)
+ self.assertEqual(len(activities), activity_len)
self.assertIn(response["Location"], activities.values_list('urlid', flat=True))
def _assert_follower_created(self, local_urlid, external_urlid):
@@ -76,13 +78,13 @@ class TestsInbox(APITestCase):
# assert that the circle was created and the user associated as owner
circles = Circle.objects.all()
- self.assertEquals(len(circles), 1)
+ self.assertEqual(len(circles), 1)
self.assertIn("https://distant.com/circles/1/", circles.values_list('urlid', flat=True))
self.assertEqual(circles[0].owner, self.user)
self._assert_activity_created(response)
# assert external circle member now following local user
- self.assertEquals(Follower.objects.count(), 1)
+ self.assertEqual(Follower.objects.count(), 1)
self._assert_follower_created(self.user.urlid, "https://distant.com/circles/1/")
# # tests creation, and tests that consequential creation also happens
@@ -108,7 +110,7 @@ class TestsInbox(APITestCase):
# # assert that the circle was created and the user associated as member
# circles = Circle.objects.all()
- # self.assertEquals(len(circles), 1)
+ # self.assertEqual(len(circles), 1)
# self.assertIn("https://distant.com/circles/1/", circles.values_list('urlid', flat=True))
# self.assertTrue(circles[0].members.filter(user=self.user).exists())
# self._assert_activity_created(response)
@@ -136,8 +138,8 @@ class TestsInbox(APITestCase):
self.assertEqual(response.status_code, 404)
# assert that the circle was not created neither a backlinked user
- self.assertEquals(Circle.objects.count(), 0)
- self.assertEquals(get_user_model().objects.count(), prior_users_length)
+ self.assertEqual(Circle.objects.count(), 0)
+ self.assertEqual(get_user_model().objects.count(), prior_users_length)
#
# ADD ACTIVITIES
@@ -158,14 +160,14 @@ class TestsInbox(APITestCase):
# assert that the project backlink(s) & activity were created
projects = Project.objects.all()
user_projects = self.user.projects.all()
- self.assertEquals(len(projects), 1)
- self.assertEquals(len(user_projects), 1)
+ self.assertEqual(len(projects), 1)
+ self.assertEqual(len(user_projects), 1)
self.assertIn("https://distant.com/projects/1/", projects.values_list('urlid', flat=True))
self.assertIn("https://distant.com/projects/1/", user_projects.values_list('urlid', flat=True))
self._assert_activity_created(response)
# assert external circle member now following local user
- self.assertEquals(Follower.objects.count(), 1)
+ self.assertEqual(Follower.objects.count(), 1)
self._assert_follower_created(self.user.urlid, "https://distant.com/projects/1/")
#TODO: write a new test for the new circle architecture
@@ -196,14 +198,14 @@ class TestsInbox(APITestCase):
# # assert that the circle backlink(s) & activity were created
# circles = Circle.objects.all()
# user_circles = self.user.circles.all()
- # self.assertEquals(len(circles), 1)
- # self.assertEquals(len(user_circles), 1)
+ # self.assertEqual(len(circles), 1)
+ # self.assertEqual(len(user_circles), 1)
# self.assertIn(ext_circle_urlid, circles.values_list('urlid', flat=True))
# self.assertIn(ext_circlemember_urlid, user_circles.values_list('urlid', flat=True))
# self._assert_activity_created(response)
# # assert external circle member now following local user
- # self.assertEquals(Follower.objects.count(), 1)
+ # self.assertEqual(Follower.objects.count(), 1)
# self._assert_follower_created(self.user.urlid, ext_circlemember_urlid)
# test sending an add activity when the backlink already exists
@@ -235,15 +237,15 @@ class TestsInbox(APITestCase):
# # assert that the circle backlink(s) & activity were created
# circles = Circle.objects.all()
# user_circles = self.user.circles.all()
- # self.assertEquals(len(circles), 1)
- # self.assertEquals(len(user_circles), 1)
+ # self.assertEqual(len(circles), 1)
+ # self.assertEqual(len(user_circles), 1)
# self.assertIn("https://distant.com/circles/1/", circles.values_list('urlid', flat=True))
# self.assertIn("https://distant.com/circle-members/1/", user_circles.values_list('urlid', flat=True))
# self._assert_activity_created(response)
# self.assertEqual(Activity.objects.count(), prior_count + 1)
# # assert that followers exist for the external urlids
- # self.assertEquals(Follower.objects.count(), 1)
+ # self.assertEqual(Follower.objects.count(), 1)
# self._assert_follower_created(self.user.urlid, '') #TODO: replace with an existing model
# TODO: https://git.startinblox.com/djangoldp-packages/djangoldp/issues/250
@@ -272,10 +274,10 @@ class TestsInbox(APITestCase):
self.assertEqual(response.status_code, 400)
# assert that nothing was created
- self.assertEquals(Circle.objects.count(), 0)
- self.assertEquals(self.user.owned_circles.count(), 0)
+ self.assertEqual(Circle.objects.count(), 0)
+ self.assertEqual(self.user.owned_circles.count(), 0)
self.assertEqual(Activity.objects.count(), 0)
- self.assertEquals(Follower.objects.count(), 0)
+ self.assertEqual(Follower.objects.count(), 0)
# # error behaviour - invalid url
# @override_settings(SEND_BACKLINKS=True, DISABLE_OUTBOX=True)
@@ -440,8 +442,8 @@ class TestsInbox(APITestCase):
# assert that the project backlink(s) & activity were created
projects = Project.objects.all()
user_projects = self.user.projects.all()
- self.assertEquals(len(projects), 1)
- self.assertEquals(len(user_projects), 1)
+ self.assertEqual(len(projects), 1)
+ self.assertEqual(len(user_projects), 1)
self.assertIn("https://distant.com/projects/1/", projects.values_list('urlid', flat=True))
self.assertIn("https://distant.com/projects/1/", user_projects.values_list('urlid', flat=True))
self._assert_activity_created(response)
@@ -494,8 +496,8 @@ class TestsInbox(APITestCase):
# assert that the circle backlink(s) were removed & activity were created
projects = Project.objects.all()
user_projects = self.user.projects.all()
- self.assertEquals(len(projects), 1)
- self.assertEquals(len(user_projects), 0)
+ self.assertEqual(len(projects), 1)
+ self.assertEqual(len(user_projects), 0)
self.assertIn("https://distant.com/projects/1/", projects.values_list('urlid', flat=True))
self._assert_activity_created(response, prior_activity_count + 1)
self.assertEqual(Follower.objects.count(), 0)
@@ -574,9 +576,9 @@ class TestsInbox(APITestCase):
# # assert that the Circle member was removed and activity was created
# circles = Circle.objects.all()
# user_circles = self.user.circles.all()
- # self.assertEquals(len(circles), 1)
- # self.assertEquals(circle.members.count(), 0)
- # self.assertEquals(len(user_circles), 0)
+ # self.assertEqual(len(circles), 1)
+ # self.assertEqual(circle.members.count(), 0)
+ # self.assertEqual(len(user_circles), 0)
# self.assertIn("https://distant.com/circles/1/", circles.values_list('urlid', flat=True))
# self._assert_activity_created(response)
# self.assertEqual(Follower.objects.count(), 0)
@@ -608,8 +610,8 @@ class TestsInbox(APITestCase):
# assert that the circle was created and the user associated as owner
circles = Circle.objects.all()
users = get_user_model().objects.all()
- self.assertEquals(len(circles), 1)
- self.assertEquals(len(users), prior_user_count + 1)
+ self.assertEqual(len(circles), 1)
+ self.assertEqual(len(users), prior_user_count + 1)
distant_user = get_user_model().objects.get(urlid="https://distant.com/users/1/")
self.assertIn("https://distant.com/circles/1/", circles.values_list('urlid', flat=True))
self.assertEqual(circles[0].owner, distant_user)
@@ -632,7 +634,7 @@ class TestsInbox(APITestCase):
# assert that Follower was created with correct values
followers = Follower.objects.all()
- self.assertEquals(len(followers), 1)
+ self.assertEqual(len(followers), 1)
self._assert_activity_created(response)
follower = followers[0]
self.assertEqual("http://127.0.0.1:8000/inbox/", follower.inbox)
@@ -643,10 +645,10 @@ class TestsInbox(APITestCase):
circle = Circle.objects.create(description='Test Description')
Follower.objects.create(object=circle.urlid, inbox="http://127.0.0.1:8000/inbox/")
followers = Follower.objects.all()
- self.assertEquals(len(followers), 1)
+ self.assertEqual(len(followers), 1)
circle.delete()
followers = Follower.objects.all()
- self.assertEquals(len(followers), 0)
+ self.assertEqual(len(followers), 0)
#
# GET Inbox
diff --git a/djangoldp/tests/tests_ldp_model.py b/djangoldp/tests/tests_ldp_model.py
index 0d76f6724c04124fe3bbb7ccd81c7bc4a1a84a0c..b75386ba4fb33aea5f3c4049ad23ed16c6e3a0f6 100644
--- a/djangoldp/tests/tests_ldp_model.py
+++ b/djangoldp/tests/tests_ldp_model.py
@@ -1,31 +1,32 @@
from django.test import TestCase
from djangoldp.models import Model
-from djangoldp.tests.models import Dummy, LDPDummy, NoSuperUsersAllowedModel, JobOffer
+from djangoldp.tests.models import (Dummy, JobOffer, LDPDummy,
+ NoSuperUsersAllowedModel)
class LDPModelTest(TestCase):
def test_class_not_inheriting_ldp_model(self):
dummy = Dummy.objects.create(some="text")
- self.assertEquals("/dummys/", Model.container_id(dummy))
- self.assertEquals("/dummys/{}/".format(dummy.slug), Model.resource_id(dummy))
+ self.assertEqual("/dummys/", Model.container_id(dummy))
+ self.assertEqual("/dummys/{}/".format(dummy.slug), Model.resource_id(dummy))
def test_class_inheriting_ldp_model(self):
dummy = LDPDummy.objects.create(some="text")
- self.assertEquals("/ldpdummys/", dummy.get_container_id())
- self.assertEquals("http://happy-dev.fr/ldpdummys/{}/".format(dummy.pk), dummy.get_absolute_url())
- self.assertEquals("/ldpdummys/", Model.container_id(dummy))
- self.assertEquals("/ldpdummys/{}/".format(dummy.pk), Model.resource_id(dummy))
+ self.assertEqual("/ldpdummys/", dummy.get_container_id())
+ self.assertEqual("http://happy-dev.fr/ldpdummys/{}/".format(dummy.pk), dummy.get_absolute_url())
+ self.assertEqual("/ldpdummys/", Model.container_id(dummy))
+ self.assertEqual("/ldpdummys/{}/".format(dummy.pk), Model.resource_id(dummy))
def test_from_resolve_id(self):
saved_instance = Dummy.objects.create(some="text", slug="someid")
result = Model.resolve_id("/dummys/{}/".format(saved_instance.slug))
- self.assertEquals(saved_instance, result)
+ self.assertEqual(saved_instance, result)
def test_resolve_container(self):
result = Model.resolve_container("/dummys/")
- self.assertEquals(Dummy, result)
+ self.assertEqual(Dummy, result)
def test_auto_url(self):
from django.urls import get_resolver
@@ -33,7 +34,7 @@ class LDPModelTest(TestCase):
view_name = '{}-list'.format(dummy._meta.object_name.lower())
path = 'http://happy-dev.fr/{}{}/'.format(get_resolver().reverse_dict[view_name][0][0][0], dummy.pk)
- self.assertEquals(path, dummy.get_absolute_url())
+ self.assertEqual(path, dummy.get_absolute_url())
def test_ldp_manager_local_objects(self):
local = LDPDummy.objects.create(some='text')
diff --git a/djangoldp/tests/tests_model_serializer.py b/djangoldp/tests/tests_model_serializer.py
index cc4204aaafc47c773dd66dfb353690fee322dfcd..ef3ffef6de9bb87d3077dd988bd65d87f695f0c5 100644
--- a/djangoldp/tests/tests_model_serializer.py
+++ b/djangoldp/tests/tests_model_serializer.py
@@ -1,11 +1,11 @@
from django.conf import settings
from django.contrib.auth import get_user_model
from django.test import TestCase, override_settings
-from rest_framework.test import APIRequestFactory, APIClient
+from rest_framework.test import APIClient, APIRequestFactory
from djangoldp.serializers import LDPSerializer
-from djangoldp.tests.models import Invoice, Batch, ModelTask
-from djangoldp.tests.models import Skill, JobOffer, Conversation, Message
+from djangoldp.tests.models import (Batch, Conversation, Invoice, JobOffer,
+ Message, ModelTask, Skill)
class LDPModelSerializerTestCase(TestCase):
@@ -42,13 +42,13 @@ class LDPModelSerializerTestCase(TestCase):
serializer.is_valid(raise_exception=True)
result = serializer.save()
- self.assertEquals(result.title, "job test updated")
+ self.assertEqual(result.title, "job test updated")
self.assertIs(result.skills.count(), 2)
skills = result.skills.all().order_by("title")
- self.assertEquals(skills[0].title, "new skill")
- self.assertEquals(skills[0].obligatoire, "okay")
- self.assertEquals(skills[1].title, "z") # updated
- self.assertEquals(skills[1].obligatoire, pre_existing_skill.obligatoire)
+ self.assertEqual(skills[0].title, "new skill")
+ self.assertEqual(skills[0].obligatoire, "okay")
+ self.assertEqual(skills[1].title, "z") # updated
+ self.assertEqual(skills[1].obligatoire, pre_existing_skill.obligatoire)
# TODO: https://git.startinblox.com/djangoldp-packages/djangoldp/issues/326
'''
@@ -72,13 +72,13 @@ class LDPModelSerializerTestCase(TestCase):
serializer.is_valid(raise_exception=True)
result = serializer.save(partial=True)
- self.assertEquals(result.title, job.title)
+ self.assertEqual(result.title, job.title)
self.assertIs(result.skills.count(), 3)
skills = result.skills.all().order_by('title')
- self.assertEquals(skills[0].title, "new skill") # new skill
- self.assertEquals(skills[1].title, pre_existing_skill_a.title) # old skill unchanged
- self.assertEquals(skills[2].title, "z") # updated
- self.assertEquals(skills[2].obligatoire, pre_existing_skill_b.obligatoire) # another field not updated
+ self.assertEqual(skills[0].title, "new skill") # new skill
+ self.assertEqual(skills[1].title, pre_existing_skill_a.title) # old skill unchanged
+ self.assertEqual(skills[2].title, "z") # updated
+ self.assertEqual(skills[2].obligatoire, pre_existing_skill_b.obligatoire) # another field not updated
'''
def test_update_container_edit_and_new_external_resources(self):
@@ -101,17 +101,17 @@ class LDPModelSerializerTestCase(TestCase):
result = serializer.save()
skills = result.skills.all().order_by('urlid')
- self.assertEquals(result.title, job.title)
+ self.assertEqual(result.title, job.title)
self.assertEqual(result.pk, job.pk)
self.assertEqual(result.urlid, job.urlid)
self.assertIs(result.skills.count(), 2)
- self.assertEquals(skills[0].title, "external skill") # new skill
- self.assertEquals(skills[0].urlid, "https://external.com/skills/1/") # new skill
- self.assertEquals(skills[0].obligatoire, "okay")
- self.assertEquals(skills[1].title, pre_existing_external.title) # old skill unchanged
- self.assertEquals(skills[1].urlid, pre_existing_external.urlid)
- self.assertEquals(skills[1].obligatoire, "okay")
- self.assertEquals(skills[1].pk, pre_existing_external.pk)
+ self.assertEqual(skills[0].title, "external skill") # new skill
+ self.assertEqual(skills[0].urlid, "https://external.com/skills/1/") # new skill
+ self.assertEqual(skills[0].obligatoire, "okay")
+ self.assertEqual(skills[1].title, pre_existing_external.title) # old skill unchanged
+ self.assertEqual(skills[1].urlid, pre_existing_external.urlid)
+ self.assertEqual(skills[1].obligatoire, "okay")
+ self.assertEqual(skills[1].pk, pre_existing_external.pk)
def test_update_container_attach_existing_resource(self):
job = JobOffer.objects.create(title="job test")
@@ -134,11 +134,11 @@ class LDPModelSerializerTestCase(TestCase):
result = serializer.save()
skills = result.skills.all().order_by('urlid')
- self.assertEquals(result.title, job.title)
+ self.assertEqual(result.title, job.title)
self.assertEqual(result.pk, job.pk)
self.assertEqual(result.urlid, job.urlid)
self.assertIs(result.skills.count(), 1)
- self.assertEquals(skills[0].urlid, pre_existing_skill.urlid)
+ self.assertEqual(skills[0].urlid, pre_existing_skill.urlid)
self.assertIs(another_job.skills.count(), 1)
self.assertIs(Skill.objects.count(), 1)
@@ -164,11 +164,11 @@ class LDPModelSerializerTestCase(TestCase):
result = serializer.save()
skills = result.skills.all().order_by('urlid')
- self.assertEquals(result.title, job.title)
+ self.assertEqual(result.title, job.title)
self.assertEqual(result.pk, job.pk)
self.assertEqual(result.urlid, job.urlid)
self.assertIs(result.skills.count(), 1)
- self.assertEquals(skills[0].urlid, pre_existing_external.urlid)
+ self.assertEqual(skills[0].urlid, pre_existing_external.urlid)
self.assertIs(another_job.skills.count(), 1)
self.assertIs(Skill.objects.count(), 1)
@@ -275,7 +275,7 @@ class LDPModelSerializerTestCase(TestCase):
serializer.is_valid(raise_exception=True)
result = serializer.save()
- self.assertEquals(result.name, circle.name)
+ self.assertEqual(result.name, circle.name)
self.assertEqual(result.pk, circle.pk)
self.assertEqual(result.urlid, circle.urlid)
self.assertIs(result.members.count(), 2)
@@ -328,21 +328,21 @@ class LDPModelSerializerTestCase(TestCase):
serializer.is_valid(raise_exception=True)
result = serializer.save()
- self.assertEquals(result.title, "new")
- self.assertEquals(result.urlid, invoice.urlid)
- self.assertEquals(result.pk, invoice.pk)
+ self.assertEqual(result.title, "new")
+ self.assertEqual(result.urlid, invoice.urlid)
+ self.assertEqual(result.pk, invoice.pk)
self.assertIs(result.batches.count(), 2)
batches = result.batches.all().order_by('title')
- self.assertEquals(batches[0].title, "new")
- self.assertEquals(batches[0].urlid, pre_existing_batch.urlid)
- self.assertEquals(batches[1].title, "z")
+ self.assertEqual(batches[0].title, "new")
+ self.assertEqual(batches[0].urlid, pre_existing_batch.urlid)
+ self.assertEqual(batches[1].title, "z")
self.assertIs(batches[0].tasks.count(), 2)
tasks = batches[0].tasks.all().order_by('title')
- self.assertEquals(tasks[0].title, "new")
- self.assertEquals(tasks[0].urlid, pre_existing_task.urlid)
- self.assertEquals(tasks[1].title, "tache 2")
+ self.assertEqual(tasks[0].title, "new")
+ self.assertEqual(tasks[0].urlid, pre_existing_task.urlid)
+ self.assertEqual(tasks[1].title, "tache 2")
# variation on the above test with external resources
def test_update_container_twice_nested_external_resources(self):
@@ -380,21 +380,21 @@ class LDPModelSerializerTestCase(TestCase):
serializer.is_valid(raise_exception=True)
result = serializer.save()
- self.assertEquals(result.title, "new")
- self.assertEquals(result.urlid, invoice.urlid)
- self.assertEquals(result.pk, invoice.pk)
+ self.assertEqual(result.title, "new")
+ self.assertEqual(result.urlid, invoice.urlid)
+ self.assertEqual(result.pk, invoice.pk)
self.assertIs(result.batches.count(), 2)
batches = result.batches.all().order_by('title')
- self.assertEquals(batches[0].title, "new")
- self.assertEquals(batches[0].urlid, pre_existing_batch.urlid)
- self.assertEquals(batches[1].title, "z")
+ self.assertEqual(batches[0].title, "new")
+ self.assertEqual(batches[0].urlid, pre_existing_batch.urlid)
+ self.assertEqual(batches[1].title, "z")
self.assertIs(batches[0].tasks.count(), 2)
tasks = batches[0].tasks.all().order_by('title')
- self.assertEquals(tasks[0].title, "new")
- self.assertEquals(tasks[0].urlid, pre_existing_task.urlid)
- self.assertEquals(tasks[1].title, "tache 2")'''
+ self.assertEqual(tasks[0].title, "new")
+ self.assertEqual(tasks[0].urlid, pre_existing_task.urlid)
+ self.assertEqual(tasks[1].title, "tache 2")'''
# variation on the test where a field is omitted on each level (no changes are made)
def test_update_container_twice_nested_no_changes_missing_fields(self):
@@ -421,18 +421,18 @@ class LDPModelSerializerTestCase(TestCase):
serializer.is_valid(raise_exception=True)
result = serializer.save(partial=True)
- self.assertEquals(result.title, invoice.title)
- self.assertEquals(result.urlid, invoice.urlid)
- self.assertEquals(result.pk, invoice.pk)
+ self.assertEqual(result.title, invoice.title)
+ self.assertEqual(result.urlid, invoice.urlid)
+ self.assertEqual(result.pk, invoice.pk)
self.assertIs(result.batches.count(), 1)
batches = result.batches.all()
- self.assertEquals(batches[0].title, pre_existing_batch.title)
- self.assertEquals(batches[0].urlid, pre_existing_batch.urlid)
+ self.assertEqual(batches[0].title, pre_existing_batch.title)
+ self.assertEqual(batches[0].urlid, pre_existing_batch.urlid)
self.assertIs(batches[0].tasks.count(), 1)
tasks = batches[0].tasks.all()
- self.assertEquals(tasks[0].title, pre_existing_task.title)
+ self.assertEqual(tasks[0].title, pre_existing_task.title)
def test_update_graph_edit_and_new_resource(self):
redundant_skill = Skill.objects.create(title="to drop", obligatoire="obligatoire", slug="slug1")
@@ -475,11 +475,11 @@ class LDPModelSerializerTestCase(TestCase):
skills = result.skills.all().order_by('title')
- self.assertEquals(result.title, "job test updated")
+ self.assertEqual(result.title, "job test updated")
self.assertIs(result.skills.count(), 3)
- self.assertEquals(skills[0].title, "new skill") # new skill
- self.assertEquals(skills[1].title, "skill1") # no change
- self.assertEquals(skills[2].title, "skill2 UP") # title updated
+ self.assertEqual(skills[0].title, "new skill") # new skill
+ self.assertEqual(skills[1].title, "skill1") # no change
+ self.assertEqual(skills[2].title, "skill2 UP") # title updated
def test_update_graph_2(self):
skill = Skill.objects.create(title="to drop", obligatoire="obligatoire", slug="slug")
@@ -530,12 +530,12 @@ class LDPModelSerializerTestCase(TestCase):
skills = result.skills.all().order_by('title')
- self.assertEquals(result.title, "job test updated")
+ self.assertEqual(result.title, "job test updated")
self.assertIs(result.skills.count(), 3)
- self.assertEquals(skills[0].title, "new skill") # new skill
- self.assertEquals(skills[1].title, "skill1") # no change
- self.assertEquals(skills[2].title, "skill2 UP") # title updated
- self.assertEquals(skill, skill._meta.model.objects.get(pk=skill.pk)) # title updated
+ self.assertEqual(skills[0].title, "new skill") # new skill
+ self.assertEqual(skills[1].title, "skill1") # no change
+ self.assertEqual(skills[2].title, "skill2 UP") # title updated
+ self.assertEqual(skill, skill._meta.model.objects.get(pk=skill.pk)) # title updated
def test_update_list_with_reverse_relation(self):
user1 = get_user_model().objects.create()
@@ -573,10 +573,10 @@ class LDPModelSerializerTestCase(TestCase):
messages = result.message_set.all().order_by('text')
- self.assertEquals(result.description, "Conversation 1 UP")
+ self.assertEqual(result.description, "Conversation 1 UP")
self.assertIs(result.message_set.count(), 2)
- self.assertEquals(messages[0].text, "Message 1 UP")
- self.assertEquals(messages[1].text, "Message 2 UP")
+ self.assertEqual(messages[0].text, "Message 1 UP")
+ self.assertEqual(messages[1].text, "Message 2 UP")
def test_add_new_element_with_foreign_key_id(self):
user1 = get_user_model().objects.create()
@@ -637,11 +637,11 @@ class LDPModelSerializerTestCase(TestCase):
messages = result.message_set.all().order_by('text')
- self.assertEquals(result.description, "Conversation 1 UP")
+ self.assertEqual(result.description, "Conversation 1 UP")
self.assertIs(result.message_set.count(), 3)
- self.assertEquals(messages[0].text, "Message 1 UP")
- self.assertEquals(messages[1].text, "Message 2 UP")
- self.assertEquals(messages[2].text, "Message 3 NEW")
+ self.assertEqual(messages[0].text, "Message 1 UP")
+ self.assertEqual(messages[1].text, "Message 2 UP")
+ self.assertEqual(messages[2].text, "Message 3 NEW")
# TODO: variation on https://git.startinblox.com/djangoldp-packages/djangoldp/issues/344
'''def test_update_container_invalid_fk_reference_given(self):
@@ -676,11 +676,11 @@ class LDPModelSerializerTestCase(TestCase):
serializer.is_valid()
result = serializer.save()
- self.assertEquals(result.title, "Nouvelle facture")
+ self.assertEqual(result.title, "Nouvelle facture")
self.assertIs(result.batches.count(), 1)
- self.assertEquals(result.batches.all()[0].title, "Batch 1")
+ self.assertEqual(result.batches.all()[0].title, "Batch 1")
self.assertIs(result.batches.all()[0].tasks.count(), 1)
- self.assertEquals(result.batches.all()[0].tasks.all()[0].title, "Tache 1")
+ self.assertEqual(result.batches.all()[0].tasks.all()[0].title, "Tache 1")
def test_save_m2m(self):
skill1 = Skill.objects.create(title="skill1", obligatoire="obligatoire", slug="slug1")
@@ -704,11 +704,11 @@ class LDPModelSerializerTestCase(TestCase):
serializer.is_valid()
result = serializer.save()
- self.assertEquals(result.title, "job test")
+ self.assertEqual(result.title, "job test")
self.assertIs(result.skills.count(), 3)
- self.assertEquals(result.skills.all()[0].title, "skill1") # no change
- self.assertEquals(result.skills.all()[1].title, "skill2 UP") # title updated
- self.assertEquals(result.skills.all()[2].title, "skill3") # creation on the fly
+ self.assertEqual(result.skills.all()[0].title, "skill1") # no change
+ self.assertEqual(result.skills.all()[1].title, "skill2 UP") # title updated
+ self.assertEqual(result.skills.all()[2].title, "skill3") # creation on the fly
# variation switching the http prefix of the BASE_URL in the request
@override_settings(BASE_URL='http://happy-dev.fr/')
@@ -731,9 +731,9 @@ class LDPModelSerializerTestCase(TestCase):
serializer.is_valid()
result = serializer.save()
- self.assertEquals(result.title, "job test")
+ self.assertEqual(result.title, "job test")
self.assertIs(result.skills.count(), 1)
- self.assertEquals(result.skills.all()[0].title, "skill1") # no change
+ self.assertEqual(result.skills.all()[0].title, "skill1") # no change
def test_save_m2m_graph_simple(self):
job = {"@graph": [
@@ -749,7 +749,7 @@ class LDPModelSerializerTestCase(TestCase):
serializer.is_valid()
result = serializer.save()
- self.assertEquals(result.title, "job test")
+ self.assertEqual(result.title, "job test")
self.assertIs(result.skills.count(), 0)
def test_save_m2m_graph_with_nested(self):
@@ -772,9 +772,9 @@ class LDPModelSerializerTestCase(TestCase):
serializer.is_valid()
result = serializer.save()
- self.assertEquals(result.title, "job test")
+ self.assertEqual(result.title, "job test")
self.assertIs(result.skills.count(), 1)
- self.assertEquals(result.skills.all()[0].title, "skill3 NEW") # creation on the fly
+ self.assertEqual(result.skills.all()[0].title, "skill3 NEW") # creation on the fly
def test_save_without_nested_fields(self):
skill1 = Skill.objects.create(title="skill1", obligatoire="obligatoire", slug="a")
@@ -789,7 +789,7 @@ class LDPModelSerializerTestCase(TestCase):
serializer.is_valid()
result = serializer.save()
- self.assertEquals(result.title, "job test")
+ self.assertEqual(result.title, "job test")
self.assertIs(result.skills.count(), 0)
def test_save_on_sub_iri(self):
@@ -809,7 +809,7 @@ class LDPModelSerializerTestCase(TestCase):
kwargs['joboffer'] = job
result = serializer.save(**kwargs)
- self.assertEquals(result.title, "new SKILL")
+ self.assertEqual(result.title, "new SKILL")
self.assertIs(result.joboffer_set.count(), 1)
- self.assertEquals(result.joboffer_set.get(), job)
+ self.assertEqual(result.joboffer_set.get(), job)
self.assertIs(result.joboffer_set.get().skills.count(), 1)
diff --git a/djangoldp/tests/tests_pagination.py b/djangoldp/tests/tests_pagination.py
index faa278bf932f864a0c7cb17d97b78ad4c00c3bce..e7fa19e001dbc72516cdcf3a06ff8cc2b1a9776c 100644
--- a/djangoldp/tests/tests_pagination.py
+++ b/djangoldp/tests/tests_pagination.py
@@ -1,4 +1,4 @@
-from rest_framework.test import APIRequestFactory, APIClient, APITestCase
+from rest_framework.test import APIClient, APIRequestFactory, APITestCase
from djangoldp.tests.models import Post
@@ -18,11 +18,11 @@ class TestPagination(APITestCase):
response = self.client.get('/posts/', content_type='application/ld+json')
self.assertEqual(response.status_code, 200)
self.assertIn('link', response.headers)
- self.assertEquals(response.headers['link'], '<http://testserver/posts/?p=2>; rel="next"')
+ self.assertEqual(response.headers['link'], '<http://testserver/posts/?p=2>; rel="next"')
def test_previous(self):
response = self.client.get('/posts/?p=2', content_type='application/ld+json')
self.assertEqual(response.status_code, 200)
self.assertIn('link', response.headers)
- self.assertEquals(response.headers['link'],
+ self.assertEqual(response.headers['link'],
'<http://testserver/posts/>; rel="prev", <http://testserver/posts/?p=3>; rel="next"')
diff --git a/djangoldp/tests/tests_post.py b/djangoldp/tests/tests_post.py
index 3594c3e87875a448b9c8ae150e768f0f1ef15816..69a13480a81db8942be586af8ed3a524abeebfac 100644
--- a/djangoldp/tests/tests_post.py
+++ b/djangoldp/tests/tests_post.py
@@ -1,10 +1,11 @@
from django.contrib.auth import get_user_model
from django.test import TestCase
-from rest_framework.test import APIRequestFactory, APIClient
+from rest_framework.test import APIClient, APIRequestFactory
from rest_framework.utils import json
from djangoldp.models import Model
-from djangoldp.tests.models import Invoice, LDPDummy, Resource, Post, Circle, Project, Space
+from djangoldp.tests.models import (Circle, Invoice, LDPDummy, Post, Project,
+ Resource, Space)
class PostTestCase(TestCase):
@@ -35,8 +36,8 @@ class PostTestCase(TestCase):
response = self.client.post('/batchs/', data=json.dumps(post), content_type='application/ld+json')
self.assertEqual(response.status_code, 201)
self.assertNotIn('author', response.data)
- self.assertEquals(response.data['title'], "title")
- self.assertEquals(response.data['invoice']['title'], "title 2")
+ self.assertEqual(response.data['title'], "title")
+ self.assertEqual(response.data['invoice']['title'], "title 2")
def test_save_fk_graph_with_existing_nested(self):
invoice = Invoice.objects.create(title="title 3")
@@ -54,8 +55,8 @@ class PostTestCase(TestCase):
response = self.client.post('/batchs/', data=json.dumps(post), content_type='application/ld+json')
self.assertEqual(response.status_code, 201)
self.assertNotIn('author', response.data)
- self.assertEquals(response.data['title'], "title")
- self.assertEquals(response.data['invoice']['title'], "title 3")
+ self.assertEqual(response.data['title'], "title")
+ self.assertEqual(response.data['invoice']['title'], "title 3")
def test_post_should_accept_missing_field_id_nullable(self):
body = [
@@ -236,7 +237,7 @@ class PostTestCase(TestCase):
}
response = self.client.post('/invoices/', data=json.dumps(post), content_type='application/ld+json')
self.assertEqual(response.status_code, 201)
- self.assertEquals(response.data['title'], "title")
+ self.assertEqual(response.data['title'], "title")
# from JSON-LD spec: "The value associated with the @value key MUST be either a string, a number, true, false or null"
def test_save_field_with_invalid_value_object(self):
diff --git a/djangoldp/tests/tests_update.py b/djangoldp/tests/tests_update.py
index 98524bf580060840772d3b43ef641a8cc3249998..18d75a2bab615f3b6262044b183ba1fe523bbfac 100644
--- a/djangoldp/tests/tests_update.py
+++ b/djangoldp/tests/tests_update.py
@@ -1,12 +1,14 @@
import uuid
+
from django.conf import settings
from django.contrib.auth import get_user_model
from django.test import TestCase
-from rest_framework.test import APIRequestFactory, APIClient
+from rest_framework.test import APIClient, APIRequestFactory
from rest_framework.utils import json
-from djangoldp.tests.models import UserProfile, Resource, Invoice, Batch, Task, Skill, JobOffer, Conversation, Project,\
- NotificationSetting
+from djangoldp.tests.models import (Batch, Conversation, Invoice, JobOffer,
+ NotificationSetting, Project, Resource,
+ Skill, Task, UserProfile)
class Update(TestCase):
@@ -38,15 +40,15 @@ class Update(TestCase):
response = self.client.patch('/job-offers/{}/'.format(job.slug),
data=json.dumps(post),
content_type='application/ld+json')
- self.assertEquals(response.status_code, 200)
+ self.assertEqual(response.status_code, 200)
- self.assertEquals(response.data['title'], job.title)
+ self.assertEqual(response.data['title'], job.title)
self.assertIs(job.skills.count(), 3)
skills = job.skills.all().order_by('title')
- self.assertEquals(skills[0].title, "new skill") # new skill
- self.assertEquals(skills[1].title, pre_existing_skill_a.title) # old skill unchanged
- self.assertEquals(skills[2].title, "z") # updated
- self.assertEquals(skills[2].obligatoire, pre_existing_skill_b.obligatoire) # another field not updated
+ self.assertEqual(skills[0].title, "new skill") # new skill
+ self.assertEqual(skills[1].title, pre_existing_skill_a.title) # old skill unchanged
+ self.assertEqual(skills[2].title, "z") # updated
+ self.assertEqual(skills[2].obligatoire, pre_existing_skill_b.obligatoire) # another field not updated
'''
def test_put_resource(self):
@@ -57,8 +59,8 @@ class Update(TestCase):
response = self.client.put('/skills/{}/'.format(skill.slug), data=json.dumps(body),
content_type='application/ld+json')
self.assertEqual(response.status_code, 200)
- self.assertEquals(response.data['title'], "new")
- self.assertEquals(response.data['obligatoire'], "new")
+ self.assertEqual(response.data['title'], "new")
+ self.assertEqual(response.data['obligatoire'], "new")
self.assertIn('location', response.headers)
def test_patch_resource(self):
@@ -70,8 +72,8 @@ class Update(TestCase):
response = self.client.patch('/skills/{}/'.format(skill.slug), data=json.dumps(body),
content_type='application/ld+json')
self.assertEqual(response.status_code, 200)
- self.assertEquals(response.data['title'], "new")
- self.assertEquals(response.data['obligatoire'], "original")
+ self.assertEqual(response.data['title'], "new")
+ self.assertEqual(response.data['obligatoire'], "original")
def test_create_sub_object_in_existing_object_with_existing_reverse_1to1_relation(self):
user = get_user_model().objects.create(username="alex", password="test")
@@ -526,21 +528,21 @@ class Update(TestCase):
content_type='application/ld+json')
self.assertEqual(response.status_code, 200)
- self.assertEquals(response.data['title'], "new")
- self.assertEquals(response.data['@id'], invoice.urlid)
+ self.assertEqual(response.data['title'], "new")
+ self.assertEqual(response.data['@id'], invoice.urlid)
invoice = Invoice.objects.get(pk=invoice.pk)
self.assertIs(invoice.batches.count(), 2)
batches = invoice.batches.all().order_by('title')
- self.assertEquals(batches[0].title, "new")
- self.assertEquals(batches[0].urlid, pre_existing_batch.urlid)
- self.assertEquals(batches[1].title, "z")
+ self.assertEqual(batches[0].title, "new")
+ self.assertEqual(batches[0].urlid, pre_existing_batch.urlid)
+ self.assertEqual(batches[1].title, "z")
self.assertIs(batches[0].tasks.count(), 2)
tasks = batches[0].tasks.all().order_by('title')
- self.assertEquals(tasks[0].title, "new")
- self.assertEquals(tasks[0].pk, pre_existing_task.pk)
- self.assertEquals(tasks[1].title, "tache 2")
+ self.assertEqual(tasks[0].title, "new")
+ self.assertEqual(tasks[0].pk, pre_existing_task.pk)
+ self.assertEqual(tasks[1].title, "tache 2")
# TODO: https://git.startinblox.com/djangoldp-packages/djangoldp/issues/333
'''def test_update_container_nested_view(self):
@@ -567,7 +569,7 @@ class Update(TestCase):
print(str(response.data))
self.assertEqual(response.status_code, 200)
- self.assertEquals(response.data['name'], circle.name)
+ self.assertEqual(response.data['name'], circle.name)
self.assertEqual(response.data['@id'], circle.urlid)
self.assertIs(CircleMember.objects.count(), 2)
self.assertIs(circle.members.count(), 2)