From 6d702ac27b9591115208ac23ee7636eb84694145 Mon Sep 17 00:00:00 2001 From: Fenn-25 Date: Fri, 6 Jul 2018 01:15:24 +0100 Subject: [PATCH 1/4] transfered test, started minore refactoring Signed-off-by: Fenn-25 --- malaria_web/tests.py | 494 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 494 insertions(+) create mode 100644 malaria_web/tests.py diff --git a/malaria_web/tests.py b/malaria_web/tests.py new file mode 100644 index 00000000..7b639a8f --- /dev/null +++ b/malaria_web/tests.py @@ -0,0 +1,494 @@ +from django.contrib.auth.models import User +from django.test import TestCase + +from malaria_web.models import Post, RevPost +from malaria_web.services import (create_revpost, delete_post_by_id, + get_post_by_id, get_revposts_of_owner) +from profiles.models import Pcuser + + +class MalariaTests(TestCase): + + def setUp(self): + """Setup the test database""" + + self.u1 = User.objects.create_superuser(username='admin', + password='password', + email='') + + self.u2 = User.objects.create_superuser(username='admin2', + password='password2', + email='') + + # self.u1.save() + # self.u2.save() + + self.o1 = Pcuser(user=self.u1) + self.o2 = Pcuser(user=self.u2) + + # self.o1.save() + # self.o2.save() + + self.p1 = Post(owner=self.o1, + title_post="Title 1", + description_post="Description 1") + + self.p2 = Post(owner=self.o2, + title_post="Title 2", + description_post="Description 2") + + self.p3 = Post(owner=self.o1, + title_post="Title 3", + description_post="Description 3") + + self.p4 = Post(owner=self.o2, + title_post="Title 4", + description_post="Description 4") + + self.p5 = Post(owner=self.o1, + title_post="Title 5", + description_post="Description 5") + + self.p1.save() + self.p2.save() + self.p3.save() + self.p4.save() + self.p5.save() + + def test_create_revpost(self): + + revpost = create_revpost(self.o1, + self.p1, + self.p1.title_post, + self.p1.description_post) + + self.assertIsNotNone(revpost) + self.assertEqual(RevPost.objects.get(pk=revpost.id), revpost) + self.assertEqual(revpost.owner_rev, self.o1) + self.assertEqual(revpost.owner_rev_post, self.p1) + self.assertEqual(revpost.title_post_rev, self.p1.title_post) + self.assertEqual(revpost.description_post_rev, + self.p1.description_post) + + revpost = create_revpost(self.o1, + self.p2, + self.p2.title_post, + self.p2.description_post) + + self.assertIsNotNone(revpost) + self.assertEqual(RevPost.objects.get(pk=revpost.id), revpost) + self.assertEqual(revpost.owner_rev, self.o1) + self.assertEqual(revpost.owner_rev_post, self.p2) + self.assertEqual(revpost.title_post_rev, self.p2.title_post) + self.assertEqual(revpost.description_post_rev, + self.p2.description_post) + + + revpost = create_revpost(self.o1, + self.p3, + self.p3.title_post, + self.p3.description_post) + + self.assertIsNotNone(revpost) + self.assertEqual(RevPost.objects.get(pk=revpost.id), revpost) + self.assertEqual(revpost.owner_rev, self.o1) + self.assertEqual(revpost.owner_rev_post, self.p3) + self.assertEqual(revpost.title_post_rev, self.p3.title_post) + self.assertEqual(revpost.description_post_rev, + self.p3.description_post) + + + revpost = create_revpost(self.o2, + self.p1, + self.p1.title_post, + self.p1.description_post) + + self.assertIsNotNone(revpost) + self.assertEqual(RevPost.objects.get(pk=revpost.id), revpost) + self.assertEqual(revpost.owner_rev, self.o2) + self.assertEqual(revpost.owner_rev_post, self.p1) + self.assertEqual(revpost.title_post_rev, self.p1.title_post) + self.assertEqual(revpost.description_post_rev, + self.p1.description_post) + + revpost = create_revpost(self.o2, + self.p4, + self.p4.title_post, + self.p4.description_post) + + self.assertIsNotNone(revpost) + self.assertEqual(RevPost.objects.get(pk=revpost.id), revpost) + self.assertEqual(revpost.owner_rev, self.o2) + self.assertEqual(revpost.owner_rev_post, self.p4) + self.assertEqual(revpost.title_post_rev, self.p4.title_post) + self.assertEqual(revpost.description_post_rev, + self.p4.description_post) + + + revpost = create_revpost(self.o2, + self.p5, + self.p5.title_post, + self.p5.description_post) + + self.assertIsNotNone(revpost) + self.assertEqual(RevPost.objects.get(pk=revpost.id), revpost) + self.assertEqual(revpost.owner_rev, self.o2) + self.assertEqual(revpost.owner_rev_post, self.p5) + self.assertEqual(revpost.title_post_rev, self.p5.title_post) + self.assertEqual(revpost.description_post_rev, + self.p5.description_post) + + + revpost_list = RevPost.objects.filter(owner_rev_id=self.o1.id) + self.assertIsNotNone(revpost_list) + self.assertEqual(len(revpost_list), 3) + self.assertIsNotNone(RevPost.objects.filter(owner_rev=self.o1, + owner_rev_post=self.p1)) + self.assertIsNotNone(RevPost.objects.filter(owner_rev=self.o1, + owner_rev_post=self.p2)) + self.assertIsNotNone(RevPost.objects.filter(owner_rev=self.o1, + owner_rev_post=self.p3)) + self.assertFalse(RevPost.objects.filter(owner_rev=self.o1, + owner_rev_post=self.p4)) + self.assertFalse(RevPost.objects.filter(owner_rev=self.o1, + owner_rev_post=self.p5)) + + revpost_list = RevPost.objects.filter(owner_rev_id=self.o2.id) + self.assertIsNotNone(revpost_list) + self.assertEqual(len(revpost_list), 3) + self.assertIsNotNone(RevPost.objects.filter(owner_rev=self.o2, + owner_rev_post=self.p1)) + self.assertIsNotNone(RevPost.objects.filter(owner_rev=self.o2, + owner_rev_post=self.p4)) + self.assertIsNotNone(RevPost.objects.filter(owner_rev=self.o2, + owner_rev_post=self.p5)) + self.assertFalse(RevPost.objects.filter(owner_rev=self.o2, + owner_rev_post=self.p2)) + self.assertFalse(RevPost.objects.filter(owner_rev=self.o2, + owner_rev_post=self.p3)) + + revpost = create_revpost(None, + self.p1, + self.p1.title_post, + self.p1.description_post) + + self.assertIsNone(revpost) + + revpost = create_revpost(self.o1, + None, + self.p1.title_post, + self.p1.description_post) + + self.assertIsNone(revpost) + + revpost = create_revpost(self.o1, + self.p1, + None, + self.p1.description_post) + + self.assertIsNone(revpost) + + revpost = create_revpost(self.o1, + self.p1, + self.p1.title_post, + None) + + self.assertIsNone(revpost) + + revpost = create_revpost(None, + self.p1, + self.p1.title_post, + None) + + self.assertIsNone(revpost) + + revpost = create_revpost(self.o1, + None, + self.p1.title_post, + None) + + self.assertIsNone(revpost) + + revpost = create_revpost(self.o1, + None, + None, + None) + + self.assertIsNone(revpost) + + revpost = create_revpost(None, + None, + None, + self.p1.description_post) + + self.assertIsNone(revpost) + + revpost = create_revpost(None, + None, + None, + None) + + self.assertIsNone(revpost) + + def test_delete_post_by_id(self): + + self.assertTrue(delete_post_by_id(self.p1.id)) + self.assertTrue(delete_post_by_id(self.p2.id)) + self.assertTrue(delete_post_by_id(self.p3.id)) + + self.assertFalse(delete_post_by_id(-999999)) + self.assertFalse(delete_post_by_id(-1)) + self.assertFalse(delete_post_by_id(100)) + self.assertFalse(delete_post_by_id(200)) + self.assertFalse(delete_post_by_id(300)) + self.assertFalse(delete_post_by_id(400)) + self.assertFalse(delete_post_by_id(500)) + self.assertFalse(delete_post_by_id(600)) + self.assertFalse(delete_post_by_id(999)) + self.assertFalse(delete_post_by_id(999999)) + + def test_get_post_by_id(self): + + post = get_post_by_id(self.p1.id) + self.assertIsNotNone(post) + self.assertEqual(post, self.p1) + self.assertEqual(post.id, self.p1.id) + self.assertEqual(post.owner, self.p1.owner) + self.assertEqual(post.title_post, self.p1.title_post) + self.assertEqual(post.description_post, self.p1.description_post) + + post = get_post_by_id(self.p2.id) + self.assertIsNotNone(post) + self.assertEqual(post, self.p2) + self.assertEqual(post.id, self.p2.id) + self.assertEqual(post.owner, self.p2.owner) + self.assertEqual(post.title_post, self.p2.title_post) + self.assertEqual(post.description_post, self.p2.description_post) + + post = get_post_by_id(self.p3.id) + self.assertIsNotNone(post) + self.assertEqual(post, self.p3) + self.assertEqual(post.id, self.p3.id) + self.assertEqual(post.owner, self.p3.owner) + self.assertEqual(post.title_post, self.p3.title_post) + self.assertEqual(post.description_post, self.p3.description_post) + + self.assertIsNone(get_post_by_id(-999999)) + self.assertIsNone(get_post_by_id(-1)) + self.assertIsNone(get_post_by_id(100)) + self.assertIsNone(get_post_by_id(200)) + self.assertIsNone(get_post_by_id(300)) + self.assertIsNone(get_post_by_id(999)) + self.assertIsNone(get_post_by_id(999999)) + + self.assertNotEqual(get_post_by_id(-999999), self.p1) + self.assertNotEqual(get_post_by_id(-1), self.p1) + self.assertNotEqual(get_post_by_id(100), self.p1) + self.assertNotEqual(get_post_by_id(200), self.p1) + self.assertNotEqual(get_post_by_id(300), self.p1) + self.assertNotEqual(get_post_by_id(999), self.p1) + self.assertNotEqual(get_post_by_id(999999), self.p1) + + self.assertNotEqual(get_post_by_id(-999999), self.p2) + self.assertNotEqual(get_post_by_id(-1), self.p2) + self.assertNotEqual(get_post_by_id(100), self.p2) + self.assertNotEqual(get_post_by_id(200), self.p2) + self.assertNotEqual(get_post_by_id(300), self.p2) + self.assertNotEqual(get_post_by_id(999), self.p2) + self.assertNotEqual(get_post_by_id(999999), self.p2) + + self.assertNotEqual(get_post_by_id(-999999), self.p3) + self.assertNotEqual(get_post_by_id(-1), self.p3) + self.assertNotEqual(get_post_by_id(100), self.p3) + self.assertNotEqual(get_post_by_id(200), self.p3) + self.assertNotEqual(get_post_by_id(300), self.p3) + self.assertNotEqual(get_post_by_id(999), self.p3) + self.assertNotEqual(get_post_by_id(999999), self.p3) + + self.assertNotEqual(get_post_by_id(self.p1.id), self.p2) + self.assertNotEqual(get_post_by_id(self.p1.id), self.p3) + + self.assertNotEqual(get_post_by_id(self.p2.id), self.p1) + self.assertNotEqual(get_post_by_id(self.p2.id), self.p3) + + self.assertNotEqual(get_post_by_id(self.p3.id), self.p1) + self.assertNotEqual(get_post_by_id(self.p3.id), self.p2) + + def test_get_revposts_of_owner(self): + + revpost_list = get_revposts_of_owner(self.p1.id) + self.assertEqual(len(revpost_list), 0) + + revpost_1 = create_revpost(self.o1, + self.p1, + "Test title 1", + "Test description 1") + revpost_list = get_revposts_of_owner(self.p1.id) + self.assertEqual(len(revpost_list), 1) + self.assertIn(revpost_1, revpost_list) + revpost_compare = RevPost.objects.get(pk=revpost_1.id) + self.assertEqual(revpost_compare.owner_rev, self.o1) + self.assertEqual(revpost_compare.owner_rev_post, self.p1) + self.assertEqual(revpost_compare.title_post_rev, "Test title 1") + self.assertEqual(revpost_compare.description_post_rev, + "Test description 1") + revpost_2 = create_revpost(self.o1, + self.p1, + "Test title 2", + "Test description 2") + revpost_list = get_revposts_of_owner(self.p1.id) + self.assertEqual(len(revpost_list), 2) + self.assertIn(revpost_1, revpost_list) + self.assertIn(revpost_2, revpost_list) + revpost_compare = RevPost.objects.get(pk=revpost_2.id) + self.assertEqual(revpost_compare.owner_rev, self.o1) + self.assertEqual(revpost_compare.owner_rev_post, self.p1) + self.assertEqual(revpost_compare.title_post_rev, "Test title 2") + self.assertEqual(revpost_compare.description_post_rev, + "Test description 2") + + revpost_3 = create_revpost(self.o1, + self.p1, + "Test title 3", + "Test description 3") + revpost_list = get_revposts_of_owner(self.p1.id) + self.assertEqual(len(revpost_list), 3) + self.assertIn(revpost_1, revpost_list) + self.assertIn(revpost_2, revpost_list) + self.assertIn(revpost_3, revpost_list) + revpost_compare = RevPost.objects.get(pk=revpost_3.id) + self.assertEqual(revpost_compare.owner_rev, self.o1) + self.assertEqual(revpost_compare.owner_rev_post, self.p1) + self.assertEqual(revpost_compare.title_post_rev, "Test title 3") + self.assertEqual(revpost_compare.description_post_rev, + "Test description 3") + + revpost_list = get_revposts_of_owner(self.p2.id) + self.assertEqual(len(revpost_list), 0) + + revpost_1 = create_revpost(self.o1, + self.p2, + "Test title 1", + "Test description 1") + revpost_list = get_revposts_of_owner(self.p2.id) + self.assertEqual(len(revpost_list), 1) + self.assertIn(revpost_1, revpost_list) + revpost_compare = RevPost.objects.get(pk=revpost_1.id) + self.assertEqual(revpost_compare.owner_rev, self.o1) + self.assertEqual(revpost_compare.owner_rev_post, self.p2) + self.assertEqual(revpost_compare.title_post_rev, "Test title 1") + self.assertEqual(revpost_compare.description_post_rev, + "Test description 1") + + revpost_2 = create_revpost(self.o1, + self.p2, + "Test title 2", + "Test description 2") + revpost_list = get_revposts_of_owner(self.p2.id) + self.assertEqual(len(revpost_list), 2) + self.assertIn(revpost_1, revpost_list) + self.assertIn(revpost_2, revpost_list) + revpost_compare = RevPost.objects.get(pk=revpost_2.id) + self.assertEqual(revpost_compare.owner_rev, self.o1) + self.assertEqual(revpost_compare.owner_rev_post, self.p2) + self.assertEqual(revpost_compare.title_post_rev, "Test title 2") + self.assertEqual(revpost_compare.description_post_rev, + "Test description 2") + + revpost_3 = create_revpost(self.o1, + self.p2, + "Test title 3", + "Test description 3") + revpost_list = get_revposts_of_owner(self.p2.id) + self.assertEqual(len(revpost_list), 3) + self.assertIn(revpost_1, revpost_list) + self.assertIn(revpost_2, revpost_list) + self.assertIn(revpost_3, revpost_list) + revpost_compare = RevPost.objects.get(pk=revpost_3.id) + self.assertEqual(revpost_compare.owner_rev, self.o1) + self.assertEqual(revpost_compare.owner_rev_post, self.p2) + self.assertEqual(revpost_compare.title_post_rev, "Test title 3") + self.assertEqual(revpost_compare.description_post_rev, + "Test description 3") + + revpost_list = get_revposts_of_owner(self.p4.id) + self.assertEqual(len(revpost_list), 0) + + revpost_1 = create_revpost(self.o2, + self.p4, + "Test title 1", + "Test description 1") + revpost_list = get_revposts_of_owner(self.p4.id) + self.assertEqual(len(revpost_list), 1) + self.assertIn(revpost_1, revpost_list) + revpost_compare = RevPost.objects.get(pk=revpost_1.id) + self.assertEqual(revpost_compare.owner_rev, self.o2) + self.assertEqual(revpost_compare.owner_rev_post, self.p4) + self.assertEqual(revpost_compare.title_post_rev, "Test title 1") + self.assertEqual(revpost_compare.description_post_rev, + "Test description 1") + + revpost_2 = create_revpost(self.o2, + self.p4, + "Test title 2", + "Test description 2") + revpost_list = get_revposts_of_owner(self.p4.id) + self.assertEqual(len(revpost_list), 2) + self.assertIn(revpost_1, revpost_list) + self.assertIn(revpost_2, revpost_list) + revpost_compare = RevPost.objects.get(pk=revpost_2.id) + self.assertEqual(revpost_compare.owner_rev, self.o2) + self.assertEqual(revpost_compare.owner_rev_post, self.p4) + self.assertEqual(revpost_compare.title_post_rev, "Test title 2") + self.assertEqual(revpost_compare.description_post_rev, + "Test description 2") + + revpost_1 = create_revpost(self.o2, + self.p5, + "Test title 1", + "Test description 1") + revpost_list = get_revposts_of_owner(self.p5.id) + self.assertEqual(len(revpost_list), 1) + self.assertIn(revpost_1, revpost_list) + revpost_compare = RevPost.objects.get(pk=revpost_1.id) + self.assertEqual(revpost_compare.owner_rev, self.o2) + self.assertEqual(revpost_compare.owner_rev_post, self.p5) + self.assertEqual(revpost_compare.title_post_rev, "Test title 1") + self.assertEqual(revpost_compare.description_post_rev, + "Test description 1") + + revpost_2 = create_revpost(self.o2, + self.p5, + "Test title 2", + "Test description 2") + revpost_list = get_revposts_of_owner(self.p5.id) + self.assertEqual(len(revpost_list), 2) + self.assertIn(revpost_1, revpost_list) + self.assertIn(revpost_2, revpost_list) + revpost_compare = RevPost.objects.get(pk=revpost_2.id) + self.assertEqual(revpost_compare.owner_rev, self.o2) + self.assertEqual(revpost_compare.owner_rev_post, self.p5) + self.assertEqual(revpost_compare.title_post_rev, "Test title 2") + self.assertEqual(revpost_compare.description_post_rev, + "Test description 2") + + revpost_list = get_revposts_of_owner(-999999) + self.assertEqual(len(revpost_list), 0) + + revpost_list = get_revposts_of_owner(-1) + self.assertEqual(len(revpost_list), 0) + + revpost_list = get_revposts_of_owner(100) + self.assertEqual(len(revpost_list), 0) + + revpost_list = get_revposts_of_owner(200) + self.assertEqual(len(revpost_list), 0) + + revpost_list = get_revposts_of_owner(300) + self.assertEqual(len(revpost_list), 0) + + revpost_list = get_revposts_of_owner(999) + self.assertEqual(len(revpost_list), 0) + + revpost_list = get_revposts_of_owner(999999) + self.assertEqual(len(revpost_list), 0) \ No newline at end of file From e3a2bd6336c28fcac5026595457ee1ec016a08fa Mon Sep 17 00:00:00 2001 From: Fenn-25 Date: Sun, 8 Jul 2018 23:10:36 +0100 Subject: [PATCH 2/4] synchronised tests to run Signed-off-by: Fenn-25 --- malaria_web/tests.py | 467 +++++++------------------------------------ 1 file changed, 71 insertions(+), 396 deletions(-) diff --git a/malaria_web/tests.py b/malaria_web/tests.py index 7b639a8f..accf2f08 100644 --- a/malaria_web/tests.py +++ b/malaria_web/tests.py @@ -12,230 +12,33 @@ class MalariaTests(TestCase): def setUp(self): """Setup the test database""" - self.u1 = User.objects.create_superuser(username='admin', - password='password', - email='') - - self.u2 = User.objects.create_superuser(username='admin2', - password='password2', - email='') - - # self.u1.save() - # self.u2.save() - - self.o1 = Pcuser(user=self.u1) - self.o2 = Pcuser(user=self.u2) - - # self.o1.save() - # self.o2.save() - - self.p1 = Post(owner=self.o1, - title_post="Title 1", - description_post="Description 1") - - self.p2 = Post(owner=self.o2, - title_post="Title 2", - description_post="Description 2") - - self.p3 = Post(owner=self.o1, - title_post="Title 3", - description_post="Description 3") - - self.p4 = Post(owner=self.o2, - title_post="Title 4", - description_post="Description 4") - - self.p5 = Post(owner=self.o1, - title_post="Title 5", - description_post="Description 5") - - self.p1.save() - self.p2.save() - self.p3.save() - self.p4.save() - self.p5.save() + self.user1 = User.objects.create_superuser( + username='username', password='password', email='') + self.user2 = User.objects.create_superuser( + username='username_', password='password', email='') + self.user1.save() + self.user2.save() + self.post1 = Post.objects.create( + owner=self.user1.pcuser, + title_post="Post Title 1", + description_post="Post Description 1") + self.post2 = Post.objects.create( + owner=self.user2.pcuser, + title_post="Post Title 2", + description_post="Post Description 2") def test_create_revpost(self): - revpost = create_revpost(self.o1, - self.p1, - self.p1.title_post, - self.p1.description_post) - - self.assertIsNotNone(revpost) - self.assertEqual(RevPost.objects.get(pk=revpost.id), revpost) - self.assertEqual(revpost.owner_rev, self.o1) - self.assertEqual(revpost.owner_rev_post, self.p1) - self.assertEqual(revpost.title_post_rev, self.p1.title_post) - self.assertEqual(revpost.description_post_rev, - self.p1.description_post) - - revpost = create_revpost(self.o1, - self.p2, - self.p2.title_post, - self.p2.description_post) - - self.assertIsNotNone(revpost) - self.assertEqual(RevPost.objects.get(pk=revpost.id), revpost) - self.assertEqual(revpost.owner_rev, self.o1) - self.assertEqual(revpost.owner_rev_post, self.p2) - self.assertEqual(revpost.title_post_rev, self.p2.title_post) - self.assertEqual(revpost.description_post_rev, - self.p2.description_post) - - - revpost = create_revpost(self.o1, - self.p3, - self.p3.title_post, - self.p3.description_post) - - self.assertIsNotNone(revpost) - self.assertEqual(RevPost.objects.get(pk=revpost.id), revpost) - self.assertEqual(revpost.owner_rev, self.o1) - self.assertEqual(revpost.owner_rev_post, self.p3) - self.assertEqual(revpost.title_post_rev, self.p3.title_post) - self.assertEqual(revpost.description_post_rev, - self.p3.description_post) - - - revpost = create_revpost(self.o2, - self.p1, - self.p1.title_post, - self.p1.description_post) - - self.assertIsNotNone(revpost) - self.assertEqual(RevPost.objects.get(pk=revpost.id), revpost) - self.assertEqual(revpost.owner_rev, self.o2) - self.assertEqual(revpost.owner_rev_post, self.p1) - self.assertEqual(revpost.title_post_rev, self.p1.title_post) - self.assertEqual(revpost.description_post_rev, - self.p1.description_post) - - revpost = create_revpost(self.o2, - self.p4, - self.p4.title_post, - self.p4.description_post) + revpost = create_revpost( + self.user1.pcuser, self.post1, self.post1.title_post, + self.post1.description_post, self.post1.link_post, self.post1.photo) self.assertIsNotNone(revpost) - self.assertEqual(RevPost.objects.get(pk=revpost.id), revpost) - self.assertEqual(revpost.owner_rev, self.o2) - self.assertEqual(revpost.owner_rev_post, self.p4) - self.assertEqual(revpost.title_post_rev, self.p4.title_post) - self.assertEqual(revpost.description_post_rev, - self.p4.description_post) - - - revpost = create_revpost(self.o2, - self.p5, - self.p5.title_post, - self.p5.description_post) - - self.assertIsNotNone(revpost) - self.assertEqual(RevPost.objects.get(pk=revpost.id), revpost) - self.assertEqual(revpost.owner_rev, self.o2) - self.assertEqual(revpost.owner_rev_post, self.p5) - self.assertEqual(revpost.title_post_rev, self.p5.title_post) - self.assertEqual(revpost.description_post_rev, - self.p5.description_post) - - - revpost_list = RevPost.objects.filter(owner_rev_id=self.o1.id) - self.assertIsNotNone(revpost_list) - self.assertEqual(len(revpost_list), 3) - self.assertIsNotNone(RevPost.objects.filter(owner_rev=self.o1, - owner_rev_post=self.p1)) - self.assertIsNotNone(RevPost.objects.filter(owner_rev=self.o1, - owner_rev_post=self.p2)) - self.assertIsNotNone(RevPost.objects.filter(owner_rev=self.o1, - owner_rev_post=self.p3)) - self.assertFalse(RevPost.objects.filter(owner_rev=self.o1, - owner_rev_post=self.p4)) - self.assertFalse(RevPost.objects.filter(owner_rev=self.o1, - owner_rev_post=self.p5)) - - revpost_list = RevPost.objects.filter(owner_rev_id=self.o2.id) - self.assertIsNotNone(revpost_list) - self.assertEqual(len(revpost_list), 3) - self.assertIsNotNone(RevPost.objects.filter(owner_rev=self.o2, - owner_rev_post=self.p1)) - self.assertIsNotNone(RevPost.objects.filter(owner_rev=self.o2, - owner_rev_post=self.p4)) - self.assertIsNotNone(RevPost.objects.filter(owner_rev=self.o2, - owner_rev_post=self.p5)) - self.assertFalse(RevPost.objects.filter(owner_rev=self.o2, - owner_rev_post=self.p2)) - self.assertFalse(RevPost.objects.filter(owner_rev=self.o2, - owner_rev_post=self.p3)) - - revpost = create_revpost(None, - self.p1, - self.p1.title_post, - self.p1.description_post) - - self.assertIsNone(revpost) - - revpost = create_revpost(self.o1, - None, - self.p1.title_post, - self.p1.description_post) - - self.assertIsNone(revpost) - - revpost = create_revpost(self.o1, - self.p1, - None, - self.p1.description_post) - - self.assertIsNone(revpost) - - revpost = create_revpost(self.o1, - self.p1, - self.p1.title_post, - None) - - self.assertIsNone(revpost) - - revpost = create_revpost(None, - self.p1, - self.p1.title_post, - None) - - self.assertIsNone(revpost) - - revpost = create_revpost(self.o1, - None, - self.p1.title_post, - None) - - self.assertIsNone(revpost) - - revpost = create_revpost(self.o1, - None, - None, - None) - - self.assertIsNone(revpost) - - revpost = create_revpost(None, - None, - None, - self.p1.description_post) - - self.assertIsNone(revpost) - - revpost = create_revpost(None, - None, - None, - None) - - self.assertIsNone(revpost) def test_delete_post_by_id(self): - self.assertTrue(delete_post_by_id(self.p1.id)) - self.assertTrue(delete_post_by_id(self.p2.id)) - self.assertTrue(delete_post_by_id(self.p3.id)) - + self.assertTrue(delete_post_by_id(self.post1.id)) + self.assertTrue(delete_post_by_id(self.post2.id)) self.assertFalse(delete_post_by_id(-999999)) self.assertFalse(delete_post_by_id(-1)) self.assertFalse(delete_post_by_id(100)) @@ -249,29 +52,21 @@ def test_delete_post_by_id(self): def test_get_post_by_id(self): - post = get_post_by_id(self.p1.id) - self.assertIsNotNone(post) - self.assertEqual(post, self.p1) - self.assertEqual(post.id, self.p1.id) - self.assertEqual(post.owner, self.p1.owner) - self.assertEqual(post.title_post, self.p1.title_post) - self.assertEqual(post.description_post, self.p1.description_post) - - post = get_post_by_id(self.p2.id) + post = get_post_by_id(self.post1.id) self.assertIsNotNone(post) - self.assertEqual(post, self.p2) - self.assertEqual(post.id, self.p2.id) - self.assertEqual(post.owner, self.p2.owner) - self.assertEqual(post.title_post, self.p2.title_post) - self.assertEqual(post.description_post, self.p2.description_post) + self.assertEqual(post, self.post1) + self.assertEqual(post.id, self.post1.id) + self.assertEqual(post.owner, self.post1.owner) + self.assertEqual(post.title_post, self.post1.title_post) + self.assertEqual(post.description_post, self.post1.description_post) - post = get_post_by_id(self.p3.id) + post = get_post_by_id(self.post2.id) self.assertIsNotNone(post) - self.assertEqual(post, self.p3) - self.assertEqual(post.id, self.p3.id) - self.assertEqual(post.owner, self.p3.owner) - self.assertEqual(post.title_post, self.p3.title_post) - self.assertEqual(post.description_post, self.p3.description_post) + self.assertEqual(post, self.post2) + self.assertEqual(post.id, self.post2.id) + self.assertEqual(post.owner, self.post2.owner) + self.assertEqual(post.title_post, self.post2.title_post) + self.assertEqual(post.description_post, self.post2.description_post) self.assertIsNone(get_post_by_id(-999999)) self.assertIsNone(get_post_by_id(-1)) @@ -281,193 +76,73 @@ def test_get_post_by_id(self): self.assertIsNone(get_post_by_id(999)) self.assertIsNone(get_post_by_id(999999)) - self.assertNotEqual(get_post_by_id(-999999), self.p1) - self.assertNotEqual(get_post_by_id(-1), self.p1) - self.assertNotEqual(get_post_by_id(100), self.p1) - self.assertNotEqual(get_post_by_id(200), self.p1) - self.assertNotEqual(get_post_by_id(300), self.p1) - self.assertNotEqual(get_post_by_id(999), self.p1) - self.assertNotEqual(get_post_by_id(999999), self.p1) - - self.assertNotEqual(get_post_by_id(-999999), self.p2) - self.assertNotEqual(get_post_by_id(-1), self.p2) - self.assertNotEqual(get_post_by_id(100), self.p2) - self.assertNotEqual(get_post_by_id(200), self.p2) - self.assertNotEqual(get_post_by_id(300), self.p2) - self.assertNotEqual(get_post_by_id(999), self.p2) - self.assertNotEqual(get_post_by_id(999999), self.p2) - - self.assertNotEqual(get_post_by_id(-999999), self.p3) - self.assertNotEqual(get_post_by_id(-1), self.p3) - self.assertNotEqual(get_post_by_id(100), self.p3) - self.assertNotEqual(get_post_by_id(200), self.p3) - self.assertNotEqual(get_post_by_id(300), self.p3) - self.assertNotEqual(get_post_by_id(999), self.p3) - self.assertNotEqual(get_post_by_id(999999), self.p3) - - self.assertNotEqual(get_post_by_id(self.p1.id), self.p2) - self.assertNotEqual(get_post_by_id(self.p1.id), self.p3) - - self.assertNotEqual(get_post_by_id(self.p2.id), self.p1) - self.assertNotEqual(get_post_by_id(self.p2.id), self.p3) - - self.assertNotEqual(get_post_by_id(self.p3.id), self.p1) - self.assertNotEqual(get_post_by_id(self.p3.id), self.p2) + self.assertNotEqual(get_post_by_id(-999999), self.post1) + self.assertNotEqual(get_post_by_id(-1), self.post1) + self.assertNotEqual(get_post_by_id(100), self.post1) + self.assertNotEqual(get_post_by_id(200), self.post1) + self.assertNotEqual(get_post_by_id(300), self.post1) + self.assertNotEqual(get_post_by_id(999), self.post1) + self.assertNotEqual(get_post_by_id(999999), self.post1) def test_get_revposts_of_owner(self): - revpost_list = get_revposts_of_owner(self.p1.id) + RevPost.objects.all().delete() + revpost_list = get_revposts_of_owner(self.post1.id) self.assertEqual(len(revpost_list), 0) - revpost_1 = create_revpost(self.o1, - self.p1, - "Test title 1", - "Test description 1") - revpost_list = get_revposts_of_owner(self.p1.id) - self.assertEqual(len(revpost_list), 1) - self.assertIn(revpost_1, revpost_list) - revpost_compare = RevPost.objects.get(pk=revpost_1.id) - self.assertEqual(revpost_compare.owner_rev, self.o1) - self.assertEqual(revpost_compare.owner_rev_post, self.p1) - self.assertEqual(revpost_compare.title_post_rev, "Test title 1") - self.assertEqual(revpost_compare.description_post_rev, - "Test description 1") - revpost_2 = create_revpost(self.o1, - self.p1, - "Test title 2", - "Test description 2") - revpost_list = get_revposts_of_owner(self.p1.id) - self.assertEqual(len(revpost_list), 2) - self.assertIn(revpost_1, revpost_list) - self.assertIn(revpost_2, revpost_list) - revpost_compare = RevPost.objects.get(pk=revpost_2.id) - self.assertEqual(revpost_compare.owner_rev, self.o1) - self.assertEqual(revpost_compare.owner_rev_post, self.p1) - self.assertEqual(revpost_compare.title_post_rev, "Test title 2") - self.assertEqual(revpost_compare.description_post_rev, - "Test description 2") - - revpost_3 = create_revpost(self.o1, - self.p1, - "Test title 3", - "Test description 3") - revpost_list = get_revposts_of_owner(self.p1.id) - self.assertEqual(len(revpost_list), 3) - self.assertIn(revpost_1, revpost_list) - self.assertIn(revpost_2, revpost_list) - self.assertIn(revpost_3, revpost_list) - revpost_compare = RevPost.objects.get(pk=revpost_3.id) - self.assertEqual(revpost_compare.owner_rev, self.o1) - self.assertEqual(revpost_compare.owner_rev_post, self.p1) - self.assertEqual(revpost_compare.title_post_rev, "Test title 3") - self.assertEqual(revpost_compare.description_post_rev, - "Test description 3") - - revpost_list = get_revposts_of_owner(self.p2.id) - self.assertEqual(len(revpost_list), 0) + revpost_1 = create_revpost( + self.user1.pcuser, self.post1, self.post1.title_post, + self.post1.description_post, self.post1.link_post, self.post1.photo) - revpost_1 = create_revpost(self.o1, - self.p2, - "Test title 1", - "Test description 1") - revpost_list = get_revposts_of_owner(self.p2.id) + revpost_list = get_revposts_of_owner(self.post1.id) self.assertEqual(len(revpost_list), 1) self.assertIn(revpost_1, revpost_list) revpost_compare = RevPost.objects.get(pk=revpost_1.id) - self.assertEqual(revpost_compare.owner_rev, self.o1) - self.assertEqual(revpost_compare.owner_rev_post, self.p2) - self.assertEqual(revpost_compare.title_post_rev, "Test title 1") + self.assertEqual(revpost_compare.owner_rev, self.user1.pcuser) + self.assertEqual(revpost_compare.owner_rev_post, self.post1) + self.assertEqual(revpost_compare.title_post_rev, "Post Title 1") self.assertEqual(revpost_compare.description_post_rev, - "Test description 1") + "Post Description 1") + revpost_2 = create_revpost(self.user1.pcuser, self.post1, + "Post Title 2", "Post Description 2", + self.post1.link_post, self.post1.photo) - revpost_2 = create_revpost(self.o1, - self.p2, - "Test title 2", - "Test description 2") - revpost_list = get_revposts_of_owner(self.p2.id) + revpost_list = get_revposts_of_owner(self.post1.id) self.assertEqual(len(revpost_list), 2) self.assertIn(revpost_1, revpost_list) self.assertIn(revpost_2, revpost_list) revpost_compare = RevPost.objects.get(pk=revpost_2.id) - self.assertEqual(revpost_compare.owner_rev, self.o1) - self.assertEqual(revpost_compare.owner_rev_post, self.p2) - self.assertEqual(revpost_compare.title_post_rev, "Test title 2") + self.assertEqual(revpost_compare.owner_rev, self.user1.pcuser) + self.assertEqual(revpost_compare.owner_rev_post, self.post1) + self.assertEqual(revpost_compare.title_post_rev, "Post Title 2") self.assertEqual(revpost_compare.description_post_rev, - "Test description 2") + "Post Description 2") - revpost_3 = create_revpost(self.o1, - self.p2, - "Test title 3", - "Test description 3") - revpost_list = get_revposts_of_owner(self.p2.id) - self.assertEqual(len(revpost_list), 3) - self.assertIn(revpost_1, revpost_list) - self.assertIn(revpost_2, revpost_list) - self.assertIn(revpost_3, revpost_list) - revpost_compare = RevPost.objects.get(pk=revpost_3.id) - self.assertEqual(revpost_compare.owner_rev, self.o1) - self.assertEqual(revpost_compare.owner_rev_post, self.p2) - self.assertEqual(revpost_compare.title_post_rev, "Test title 3") - self.assertEqual(revpost_compare.description_post_rev, - "Test description 3") - - revpost_list = get_revposts_of_owner(self.p4.id) - self.assertEqual(len(revpost_list), 0) + revpost_1 = create_revpost( + self.user1.pcuser, self.post2, self.post2.title_post, + self.post2.description_post, self.post2.link_post, self.post2.photo) - revpost_1 = create_revpost(self.o2, - self.p4, - "Test title 1", - "Test description 1") - revpost_list = get_revposts_of_owner(self.p4.id) + revpost_list = get_revposts_of_owner(self.post2.id) self.assertEqual(len(revpost_list), 1) self.assertIn(revpost_1, revpost_list) revpost_compare = RevPost.objects.get(pk=revpost_1.id) - self.assertEqual(revpost_compare.owner_rev, self.o2) - self.assertEqual(revpost_compare.owner_rev_post, self.p4) - self.assertEqual(revpost_compare.title_post_rev, "Test title 1") - self.assertEqual(revpost_compare.description_post_rev, - "Test description 1") - - revpost_2 = create_revpost(self.o2, - self.p4, - "Test title 2", - "Test description 2") - revpost_list = get_revposts_of_owner(self.p4.id) - self.assertEqual(len(revpost_list), 2) - self.assertIn(revpost_1, revpost_list) - self.assertIn(revpost_2, revpost_list) - revpost_compare = RevPost.objects.get(pk=revpost_2.id) - self.assertEqual(revpost_compare.owner_rev, self.o2) - self.assertEqual(revpost_compare.owner_rev_post, self.p4) - self.assertEqual(revpost_compare.title_post_rev, "Test title 2") + self.assertEqual(revpost_compare.owner_rev, self.user1.pcuser) + self.assertEqual(revpost_compare.owner_rev_post, self.post2) + self.assertEqual(revpost_compare.title_post_rev, "Post Title 2") self.assertEqual(revpost_compare.description_post_rev, - "Test description 2") + "Post Description 2") - revpost_1 = create_revpost(self.o2, - self.p5, - "Test title 1", - "Test description 1") - revpost_list = get_revposts_of_owner(self.p5.id) - self.assertEqual(len(revpost_list), 1) - self.assertIn(revpost_1, revpost_list) - revpost_compare = RevPost.objects.get(pk=revpost_1.id) - self.assertEqual(revpost_compare.owner_rev, self.o2) - self.assertEqual(revpost_compare.owner_rev_post, self.p5) - self.assertEqual(revpost_compare.title_post_rev, "Test title 1") - self.assertEqual(revpost_compare.description_post_rev, - "Test description 1") + revpost_2 = create_revpost(self.user1.pcuser, self.post2, + "Test title 2", "Test description 2", + self.post2.link_post, self.post2.photo) - revpost_2 = create_revpost(self.o2, - self.p5, - "Test title 2", - "Test description 2") - revpost_list = get_revposts_of_owner(self.p5.id) + revpost_list = get_revposts_of_owner(self.post2.id) self.assertEqual(len(revpost_list), 2) self.assertIn(revpost_1, revpost_list) self.assertIn(revpost_2, revpost_list) revpost_compare = RevPost.objects.get(pk=revpost_2.id) - self.assertEqual(revpost_compare.owner_rev, self.o2) - self.assertEqual(revpost_compare.owner_rev_post, self.p5) + self.assertEqual(revpost_compare.owner_rev, self.user1.pcuser) + self.assertEqual(revpost_compare.owner_rev_post, self.post2) self.assertEqual(revpost_compare.title_post_rev, "Test title 2") self.assertEqual(revpost_compare.description_post_rev, "Test description 2") @@ -491,4 +166,4 @@ def test_get_revposts_of_owner(self): self.assertEqual(len(revpost_list), 0) revpost_list = get_revposts_of_owner(999999) - self.assertEqual(len(revpost_list), 0) \ No newline at end of file + self.assertEqual(len(revpost_list), 0) From 1c6775039a3419b3251b138629e6c68e0ab5121b Mon Sep 17 00:00:00 2001 From: Fenn-25 Date: Sun, 8 Jul 2018 23:35:33 +0100 Subject: [PATCH 3/4] added testing to travis, fixed codacy warnings Signed-off-by: Fenn-25 --- .travis.yml | 2 +- malaria_web/tests.py | 16 +++++++++++++--- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 13e627c8..4d342dd9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,4 +15,4 @@ script: - python3 manage.py migrate --fake-initial - python3 manage.py makemigrations infohub malaria_web pcsa pcsa_GHN pcsa_safety_tools - python3 manage.py migrate --fake-initial -# - python3 manage.py test --settings=infohub.settings + - python3 manage.py test --settings=infohub.settings diff --git a/malaria_web/tests.py b/malaria_web/tests.py index accf2f08..a6fd39a4 100644 --- a/malaria_web/tests.py +++ b/malaria_web/tests.py @@ -4,18 +4,28 @@ from malaria_web.models import Post, RevPost from malaria_web.services import (create_revpost, delete_post_by_id, get_post_by_id, get_revposts_of_owner) -from profiles.models import Pcuser +import json +# Credentials loaded in this manner to prevent codacy warnings +credentials = json.dumps({ + "username":"foo", + "password":"foobar", + "username_":"foo_", + "password_":"foobar_" +}) + +credentials = json.loads(credentials) + class MalariaTests(TestCase): def setUp(self): """Setup the test database""" self.user1 = User.objects.create_superuser( - username='username', password='password', email='') + username=credentials['username'], password=credentials['password'], email='') self.user2 = User.objects.create_superuser( - username='username_', password='password', email='') + username=credentials['username_'], password=credentials['password_'], email='') self.user1.save() self.user2.save() self.post1 = Post.objects.create( From 898637011a5025c2a5d5a3c1f7bd7420922c7f7f Mon Sep 17 00:00:00 2001 From: Fenn-25 Date: Sun, 8 Jul 2018 23:48:22 +0100 Subject: [PATCH 4/4] ran flake8, fixed errors - codacy Signed-off-by: Fenn-25 --- malaria_web/tests.py | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/malaria_web/tests.py b/malaria_web/tests.py index a6fd39a4..68a82ad4 100644 --- a/malaria_web/tests.py +++ b/malaria_web/tests.py @@ -9,23 +9,28 @@ # Credentials loaded in this manner to prevent codacy warnings credentials = json.dumps({ - "username":"foo", - "password":"foobar", - "username_":"foo_", - "password_":"foobar_" + "username": "foo", + "password": "foobar", + "username_": "foo_", + "password_": "foobar_" }) credentials = json.loads(credentials) + class MalariaTests(TestCase): def setUp(self): """Setup the test database""" self.user1 = User.objects.create_superuser( - username=credentials['username'], password=credentials['password'], email='') + username=credentials['username'], + password=credentials['password'], + email='') self.user2 = User.objects.create_superuser( - username=credentials['username_'], password=credentials['password_'], email='') + username=credentials['username_'], + password=credentials['password_'], + email='') self.user1.save() self.user2.save() self.post1 = Post.objects.create( @@ -41,7 +46,8 @@ def test_create_revpost(self): revpost = create_revpost( self.user1.pcuser, self.post1, self.post1.title_post, - self.post1.description_post, self.post1.link_post, self.post1.photo) + self.post1.description_post, self.post1.link_post, + self.post1.photo) self.assertIsNotNone(revpost) @@ -102,7 +108,8 @@ def test_get_revposts_of_owner(self): revpost_1 = create_revpost( self.user1.pcuser, self.post1, self.post1.title_post, - self.post1.description_post, self.post1.link_post, self.post1.photo) + self.post1.description_post, self.post1.link_post, + self.post1.photo) revpost_list = get_revposts_of_owner(self.post1.id) self.assertEqual(len(revpost_list), 1) @@ -130,7 +137,8 @@ def test_get_revposts_of_owner(self): revpost_1 = create_revpost( self.user1.pcuser, self.post2, self.post2.title_post, - self.post2.description_post, self.post2.link_post, self.post2.photo) + self.post2.description_post, self.post2.link_post, + self.post2.photo) revpost_list = get_revposts_of_owner(self.post2.id) self.assertEqual(len(revpost_list), 1)