From fa11260fdbe76f377909483d9c482ecf72ab3364 Mon Sep 17 00:00:00 2001 From: adityacp Date: Thu, 21 Apr 2016 18:57:28 +0530 Subject: changes in add teachers as per comments --- yaksh/tests.py | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) (limited to 'yaksh/tests.py') diff --git a/yaksh/tests.py b/yaksh/tests.py index d6d1d91..d69882d 100644 --- a/yaksh/tests.py +++ b/yaksh/tests.py @@ -3,7 +3,7 @@ from yaksh.models import User, Profile, Question, Quiz, QuestionPaper,\ QuestionSet, AnswerPaper, Answer, TestCase, Course import json from datetime import datetime, timedelta - +from django.contrib.auth.models import Group def setUpModule(): # create user profile @@ -21,6 +21,11 @@ def setUpModule(): Profile.objects.create(user=student, roll_number=3, institute='IIT', department='Chemical', position='Student') + # create group + group = Group(name="moderator") + group.save() + student.groups.add(group) + # create a course course = Course.objects.create(name="Python Course", enrollment="Enroll Request", creator=user) @@ -57,6 +62,7 @@ class ProfileTestCases(unittest.TestCase): def setUp(self): self.user = User.objects.get(pk=1) self.profile = Profile.objects.get(pk=1) + self.user1 = User.objects.get(pk=3) def test_user_profile(self): """ Test user profile""" @@ -67,6 +73,11 @@ class ProfileTestCases(unittest.TestCase): self.assertEqual(self.profile.department, 'Chemical') self.assertEqual(self.profile.position, 'Student') + def test_is_moderator(self): + result = self.user1.profile.is_moderator(self.user1) + self.assertTrue(result) + result = self.user.profile.is_moderator(self.user) + self.assertFalse(result) ############################################################################### class QuestionTestCases(unittest.TestCase): @@ -437,3 +448,9 @@ class CourseTestCases(unittest.TestCase): def test_get_quizzes(self): """ Test get_quizzes method of Courses""" self.assertSequenceEqual(self.course.get_quizzes(), [self.quiz1, self.quiz2]) + + def test_add_teachers(self): + """ Test to add teachers to a course""" + added_list, rejected_list = self.course.add_teachers(self.student1, self.student2) + self.assertSequenceEqual(added_list, [self.student2]) + self.assertSequenceEqual(rejected_list, [self.student1]) -- cgit From 6b09383890b8367628124a854810326d7bbac7c4 Mon Sep 17 00:00:00 2001 From: adityacp Date: Wed, 27 Apr 2016 16:42:32 +0530 Subject: changes after comments --- yaksh/tests.py | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'yaksh/tests.py') diff --git a/yaksh/tests.py b/yaksh/tests.py index d69882d..bd733c3 100644 --- a/yaksh/tests.py +++ b/yaksh/tests.py @@ -60,13 +60,13 @@ def tearDownModule(): ############################################################################### class ProfileTestCases(unittest.TestCase): def setUp(self): - self.user = User.objects.get(pk=1) + self.user1 = User.objects.get(pk=1) self.profile = Profile.objects.get(pk=1) - self.user1 = User.objects.get(pk=3) + self.user2 = User.objects.get(pk=3) def test_user_profile(self): """ Test user profile""" - self.assertEqual(self.user.username, 'demo_user') + self.assertEqual(self.user1.username, 'demo_user') self.assertEqual(self.profile.user.username, 'demo_user') self.assertEqual(int(self.profile.roll_number), 1) self.assertEqual(self.profile.institute, 'IIT') @@ -74,9 +74,9 @@ class ProfileTestCases(unittest.TestCase): self.assertEqual(self.profile.position, 'Student') def test_is_moderator(self): - result = self.user1.profile.is_moderator(self.user1) + result = self.user2.profile.is_moderator(self.user2) self.assertTrue(result) - result = self.user.profile.is_moderator(self.user) + result = self.user1.profile.is_moderator(self.user1) self.assertFalse(result) ############################################################################### @@ -454,3 +454,9 @@ class CourseTestCases(unittest.TestCase): added_list, rejected_list = self.course.add_teachers(self.student1, self.student2) self.assertSequenceEqual(added_list, [self.student2]) self.assertSequenceEqual(rejected_list, [self.student1]) + + def test_remove_teachers(self): + """ Test to remove teachers from a course""" + self.course.add_teachers(self.student1, self.student2) + self.course.remove_teachers(self.student1) + self.assertSequenceEqual(self.course.get_teachers(), [self.student2]) -- cgit From 3438ca95172897b594c216967d51cf5771d75f73 Mon Sep 17 00:00:00 2001 From: adityacp Date: Thu, 28 Apr 2016 12:22:30 +0530 Subject: further commented changes --- yaksh/tests.py | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) (limited to 'yaksh/tests.py') diff --git a/yaksh/tests.py b/yaksh/tests.py index bd733c3..831a0fb 100644 --- a/yaksh/tests.py +++ b/yaksh/tests.py @@ -21,6 +21,12 @@ def setUpModule(): Profile.objects.create(user=student, roll_number=3, institute='IIT', department='Chemical', position='Student') + student1 = User.objects.create_user(username='demo_user4', + password='demo', + email='demo@test.com') + Profile.objects.create(user=student1, roll_number=4, institute='IIT', + department='Chemical', position='Student') + # create group group = Group(name="moderator") group.save() @@ -393,6 +399,7 @@ class CourseTestCases(unittest.TestCase): self.creator = User.objects.get(pk=1) self.student1 = User.objects.get(pk=2) self.student2 = User.objects.get(pk=3) + self.student3 = User.objects.get(pk=4) self.quiz1 = Quiz.objects.get(pk=1) self.quiz2 = Quiz.objects.get(pk=2) @@ -457,6 +464,12 @@ class CourseTestCases(unittest.TestCase): def test_remove_teachers(self): """ Test to remove teachers from a course""" - self.course.add_teachers(self.student1, self.student2) - self.course.remove_teachers(self.student1) - self.assertSequenceEqual(self.course.get_teachers(), [self.student2]) + self.course.add_teachers(self.student2, self.student3) + self.course.remove_teachers(self.student2) + self.assertSequenceEqual(self.course.get_teachers(), [self.student3]) + + def test_is_teacher(self): + """ Test to check if user is teacher""" + self.course.add_teachers(self.student2) + result = self.course.is_teacher(self.student2) + self.assertTrue(result) -- cgit From d2affe68e84da54dc99d9876ab359ad448aa6828 Mon Sep 17 00:00:00 2001 From: adityacp Date: Fri, 29 Apr 2016 14:40:50 +0530 Subject: changes for adding teachers --- yaksh/tests.py | 29 +++++------------------------ 1 file changed, 5 insertions(+), 24 deletions(-) (limited to 'yaksh/tests.py') diff --git a/yaksh/tests.py b/yaksh/tests.py index 831a0fb..cc3100e 100644 --- a/yaksh/tests.py +++ b/yaksh/tests.py @@ -21,17 +21,6 @@ def setUpModule(): Profile.objects.create(user=student, roll_number=3, institute='IIT', department='Chemical', position='Student') - student1 = User.objects.create_user(username='demo_user4', - password='demo', - email='demo@test.com') - Profile.objects.create(user=student1, roll_number=4, institute='IIT', - department='Chemical', position='Student') - - # create group - group = Group(name="moderator") - group.save() - student.groups.add(group) - # create a course course = Course.objects.create(name="Python Course", enrollment="Enroll Request", creator=user) @@ -79,12 +68,6 @@ class ProfileTestCases(unittest.TestCase): self.assertEqual(self.profile.department, 'Chemical') self.assertEqual(self.profile.position, 'Student') - def test_is_moderator(self): - result = self.user2.profile.is_moderator(self.user2) - self.assertTrue(result) - result = self.user1.profile.is_moderator(self.user1) - self.assertFalse(result) - ############################################################################### class QuestionTestCases(unittest.TestCase): def setUp(self): @@ -399,7 +382,6 @@ class CourseTestCases(unittest.TestCase): self.creator = User.objects.get(pk=1) self.student1 = User.objects.get(pk=2) self.student2 = User.objects.get(pk=3) - self.student3 = User.objects.get(pk=4) self.quiz1 = Quiz.objects.get(pk=1) self.quiz2 = Quiz.objects.get(pk=2) @@ -458,15 +440,14 @@ class CourseTestCases(unittest.TestCase): def test_add_teachers(self): """ Test to add teachers to a course""" - added_list, rejected_list = self.course.add_teachers(self.student1, self.student2) - self.assertSequenceEqual(added_list, [self.student2]) - self.assertSequenceEqual(rejected_list, [self.student1]) + self.course.add_teachers(self.student1, self.student2) + self.assertSequenceEqual(self.course.get_teachers(), [self.student1, self.student2]) def test_remove_teachers(self): """ Test to remove teachers from a course""" - self.course.add_teachers(self.student2, self.student3) - self.course.remove_teachers(self.student2) - self.assertSequenceEqual(self.course.get_teachers(), [self.student3]) + self.course.add_teachers(self.student1, self.student2) + self.course.remove_teachers(self.student1) + self.assertSequenceEqual(self.course.get_teachers(), [self.student2]) def test_is_teacher(self): """ Test to check if user is teacher""" -- cgit