Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixing up tests

Browse Source
This commit is contained in:
Deena Wang
2013-01-28 15:29:55 -05:00
parent 583505b95b
commit 7918c35414
3 changed files with 126 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
lms/djangoapps/courseware/tests/test_courses.py
View File

@@ -10,6 +10,7 @@ from student.models import CourseEnrollment
import courseware.courses as courses
from xmodule.modulestore.xml import XMLModuleStore
from xmodule.modulestore.django import modulestore
from xmodule.modulestore import Location
def xml_store_config(data_dir):
return {
@@ -28,34 +29,35 @@ TEST_DATA_XML_MODULESTORE = xml_store_config(TEST_DATA_DIR)
@override_settings(MODULESTORE=TEST_DATA_XML_MODULESTORE)
class CoursesTestCase(TestCase):
def setUp(self):
self.user = User.objects.create(username='dummy', password='123456',
email='test@mit.edu')
self.date = datetime.datetime(2013,1,22)
self.course_id = 'edx/toy/2012_Fall'
self.enrollment = CourseEnrollment.objects.get_or_create(user = self.user,
course_id = self.course_id,
created = self.date)[0]
## self.user = User.objects.create(username='dummy', password='123456',
## email='test@mit.edu')
## self.date = datetime.datetime(2013,1,22)
## self.enrollment = CourseEnrollment.objects.get_or_create(user = self.user,
## course_id = self.course_id,
## created = self.date)[0]
self._MODULESTORES = {}
#self.course_id = 'edx/toy/2012_Fall'
self.toy_course = modulestore().get_course('edX/toy/2012_Fall')
def test_get_course_by_id(self):
courses.get_course_by_id("edx/toy/2012_Fall")
courses.get_course_by_id("edX/toy/2012_Fall")
@override_settings(MODULESTORE=TEST_DATA_XML_MODULESTORE)
class CoursesTests(TestCase):
# runs
def setUp(self):
self._MODULESTORES = {}
self.course_name = 'edX/toy/2012_Fall'
#self.course_id = 'edX/toy/2012_Fall'
self.toy_course = modulestore().get_course('edX/toy/2012_Fall')
self.fake_user = User.objects.create(is_superuser=True)
## self.fake_user = User.objects.create(is_superuser=True)
'''
no test written for get_request_for_thread
'''
def test_get_course_by_id(self):
self.test_course_id = "edX/toy/2012_Fall"
#self.test_course_id = "edX/toy/2012_Fall"
courses.get_course_by_id("edX/toy/2012_Fall")
# print modulestore().get_instance(test_course_id, Location('i4x', 'edx', 'toy', 'course', '2012_Fall'))
self.assertEqual(courses.get_course_by_id(self.test_course_id),modulestore().get_instance(self.test_course_id, Location('i4x', 'edX', 'toy', 'course', '2012_Fall'), None))
#self.assertEqual(courses.get_course_by_id(self.test_course_id),modulestore().get_instance(self.test_course_id, Location('i4x', 'edX', 'toy', 'course', '2012_Fall'), None))

130
lms/djangoapps/courseware/tests/test_module_render.py
View File

@@ -2,7 +2,9 @@ import logging
from mock import MagicMock, patch
import json
import factory
import unittest
import unittest
from nose.tools import set_trace
from nose.plugins.skip import SkipTest
from django.http import Http404, HttpResponse, HttpRequest
from django.conf import settings
@@ -11,22 +13,50 @@ from django.test.client import Client
from django.conf import settings
from django.test import TestCase
from django.test.client import RequestFactory
from django.core.urlresolvers import reverse
from courseware.models import StudentModule
from courseware.models import StudentModule, StudentModuleCache
from xmodule.modulestore.exceptions import ItemNotFoundError
from xmodule.exceptions import NotFoundError
from xmodule.modulestore import Location
import courseware.module_render as render
from override_settings import override_settings
from xmodule.modulestore.django import modulestore, _MODULESTORES
from xmodule.seq_module import SequenceModule
from courseware.tests.tests import PageLoader
from student.models import Registration
class Stub:
def __init__(self):
pass
class ModuleRenderTestCase(TestCase):
def xml_store_config(data_dir):
return {
'default': {
'ENGINE': 'xmodule.modulestore.xml.XMLModuleStore',
'OPTIONS': {
'data_dir': data_dir,
'default_class': 'xmodule.hidden_module.HiddenDescriptor',
}
}
}
class UserFactory(factory.Factory):
first_name = 'Test'
last_name = 'Robot'
is_staff = True
is_active = True
TEST_DATA_DIR = settings.COMMON_TEST_DATA_ROOT
TEST_DATA_XML_MODULESTORE = xml_store_config(TEST_DATA_DIR)
@override_settings(MODULESTORE=TEST_DATA_XML_MODULESTORE)
class ModuleRenderTestCase(PageLoader):
def setUp(self):
self.location = ['tag', 'org', 'course', 'category', 'name']
self.location = ['i4x', 'edX', 'toy', 'chapter', 'Overview']
self._MODULESTORES = {}
self.course_id = 'edX/toy/2012_Fall'
self.toy_course = modulestore().get_course(self.course_id)
def test_toc_for_course(self):
mock_course = MagicMock()
@@ -37,19 +67,26 @@ class ModuleRenderTestCase(TestCase):
mock_user.is_authenticated.return_value = False
self.assertIsNone(render.toc_for_course(mock_user,'dummy',
mock_course, 'dummy', 'dummy'))
# rest of tests are in class TestTOC
def test_get_module(self):
self.assertIsNone(render.get_module('dummyuser',None,\
'invalid location',None,None))
#done
def test__get_module(self):
mock_user = MagicMock()
mock_user.is_authenticated.return_value = True
location = ['tag', 'org', 'course', 'category', 'name']
#render._get_module(mock_user,
mock_user.is_authenticated.return_value = False
location = Location('i4x', 'edX', 'toy', 'chapter', 'Overview')
mock_request = MagicMock()
s = render._get_module(mock_user, mock_request, location,
'dummy', 'edX/toy/2012_Fall')
self.assertIsInstance(s, SequenceModule)
# Don't know how to generate error in line 260 to test
# Can't tell if sequence module is an error?
def test_get_instance_module(self):
# done
mock_user = MagicMock()
mock_user.is_authenticated.return_value = False
self.assertIsNone(render.get_instance_module('dummy', mock_user, 'dummy',
@@ -62,16 +99,28 @@ class ModuleRenderTestCase(TestCase):
mock_module,'dummy'))
def test_get_shared_instance_module(self):
raise SkipTest
mock_user = MagicMock(User)
mock_user.is_authenticated.return_value = False
self.assertIsNone(render.get_shared_instance_module('dummy', mock_user, 'dummy',
'dummy'))
mock_user_2 = MagicMock(User)
mock_user_2.is_authenticated.return_value = True
mock_module = MagicMock()
mock_module.shared_state_key = 'key'
self.assertIsInstance(render.get_shared_instance_module('dummy', mock_user,
mock_module, 'dummy'), StudentModule)
mock_module.location = Location('i4x', 'edX', 'toy', 'chapter', 'Overview')
mock_module.get_shared_state.return_value = '{}'
mock_cache = MagicMock()
mock_cache.lookup.return_value = False
#mock_cache._state = 'dummy'
#set_trace()
print mock_module.get_shared_state()
s = render.get_shared_instance_module(self.course_id, mock_user_2,
mock_module, mock_cache)
self.assertIsInstance(s, StudentModule)
# Problem: can't get code to take branch that creates StudentModule?
# Can't finish testing modx_dispatch
def test_xqueue_callback(self):
mock_request = MagicMock()
@@ -90,9 +139,21 @@ class ModuleRenderTestCase(TestCase):
xpackage_2 = {'xqueue_header': json.dumps({'lms_key':'secretkey'}),
'xqueue_body' : 'Message from grader'}
mock_request_3.POST.copy.return_value = xpackage_2
## self.assertRaises(Http404, render.xqueue_callback, mock_request_3,
## 'dummy', 0, 'dummy', 'dummy')
# continue later
# Roadblock: how to get user registered in class?
raise SkipTest
#
# trying alternate way of creating account in hopes of getting valid id
# Problem: Can't activate user
self.student_name = '12'
self.password = 'foo'
self.email = 'test@mit.edu'
self.create_account(self.student_name, self.email, self.password)
self.activate_user(self.email)
request = RequestFactory().get('stuff')
# This doesn't work to install user
render.xqueue_callback(mock_request_3, self.course_id,
self.student_name, self.password, 'dummy')
def test_modx_dispatch(self):
self.assertRaises(Http404, render.modx_dispatch, 'dummy', 'dummy',
@@ -117,12 +178,23 @@ class ModuleRenderTestCase(TestCase):
(inputfile.name, settings.STUDENT_FILEUPLOAD_MAX_SIZE/(1000**2))}))
mock_request_3 = MagicMock()
mock_request_3.POST.copy.return_value = {}
mock_request_3.FILES = False
mock_request_3.user = UserFactory()
inputfile_2 = Stub()
inputfile_2.size = 1
inputfile_2.name = 'name'
self.assertRaises(ItemNotFoundError, render.modx_dispatch,
mock_request_3, 'dummy', self.location, 'toy')
# Deadend
self.assertRaises(Http404,render.modx_dispatch, mock_request_3, 'dummy',
self.location, self.course_id)
## student_module_cache = StudentModuleCache.cache_for_descriptor_descendents(self.course_id,
## mock_request_3.user, modulestore().get_instance(self.course_id, self.location))
## get_shared_instance_module(course_id, request.user, instance, student_module_cache)
# 'goto_position' is the only dispatch that will work
mock_request_3.POST.copy.return_value = {'position':1}
self.assertIsInstance(render.modx_dispatch(mock_request_3, 'goto_position',
self.location, self.course_id), HttpResponse)
# keep going
def test_preview_chemcalc(self):
mock_request = MagicMock()
@@ -159,33 +231,6 @@ class ModuleRenderTestCase(TestCase):
self.assertEquals(render.get_score_bucket(11, 10), 'incorrect')
self.assertEquals(render.get_score_bucket(-1, 10), 'incorrect')
class MagicMockFactory(factory.Factory):
FACTORY_FOR = MagicMock
v = factory.LazyAttribute(i for i in [True, False, False])
def xml_store_config(data_dir):
return {
'default': {
'ENGINE': 'xmodule.modulestore.xml.XMLModuleStore',
'OPTIONS': {
'data_dir': data_dir,
'default_class': 'xmodule.hidden_module.HiddenDescriptor',
}
}
}
TEST_DATA_DIR = settings.COMMON_TEST_DATA_ROOT
TEST_DATA_XML_MODULESTORE = xml_store_config(TEST_DATA_DIR)
class UserFactory(factory.Factory):
first_name = 'Test'
last_name = 'Robot'
is_staff = True
is_active = True
@override_settings(MODULESTORE=TEST_DATA_XML_MODULESTORE)
class TestTOC(TestCase):
"""Check the Table of Contents for a course"""
@@ -245,3 +290,4 @@ class TestTOC(TestCase):
actual = render.toc_for_course(self.portal_user, request, self.toy_course, chapter, section)
self.assertEqual(expected, actual)

44
lms/djangoapps/courseware/tests/test_views.py
View File

@@ -32,14 +32,6 @@ def skipped(func):
class Stub():
pass
##def render_to_response(template_name, dictionary, context_instance=None,
## namespace='main', **kwargs):
## # The original returns HttpResponse
## print dir()
## print template_name
## print dictionary
## return HttpResponse('foo')
class UserFactory(factory.Factory):
first_name = 'Test'
last_name = 'Robot'
@@ -100,7 +92,7 @@ class ViewsTestCase(TestCase):
self.user = User.objects.create(username='dummy', password='123456',
email='test@mit.edu')
self.date = datetime.datetime(2013,1,22)
self.course_id = 'edx/toy/2012_Fall'
self.course_id = 'edX/toy/2012_Fall'
self.enrollment = CourseEnrollment.objects.get_or_create(user = self.user,
course_id = self.course_id,
created = self.date)[0]
@@ -109,6 +101,9 @@ class ViewsTestCase(TestCase):
# This is a CourseDescriptor object
self.toy_course = modulestore().get_course('edX/toy/2012_Fall')
self.request_factory = RequestFactory()
chapter = 'Overview'
self.chapter_url = '%s/%s/%s' % ('/courses', self.course_id, chapter)
def test_user_groups(self):
# depreciated function
@@ -145,9 +140,19 @@ class ViewsTestCase(TestCase):
mock_module, True)
def test_index(self):
pass
#print modulestore()
#assert False
assert SkipTest
request = self.request_factory.get(self.chapter_url)
request.user = UserFactory()
response = views.index(request, self.course_id)
self.assertIsInstance(response, HttpResponse)
self.assertEqual(response.status_code, 302)
# views.index does not throw 404 if chapter, section, or position are
# not valid, which doesn't match index's comments
views.index(request, self.course_id, chapter='foo', section='bar',
position='baz')
request_2 = self.request_factory.get(self.chapter_url)
request_2.user = self.user
response = views.index(request_2, self.course_id)
def test_registered_for_course(self):
self.assertFalse(views.registered_for_course('Basketweaving', None))
@@ -159,9 +164,7 @@ class ViewsTestCase(TestCase):
self.assertTrue(views.registered_for_course(mock_course, self.user))
def test_jump_to(self):
chapter = 'Overview'
chapter_url = '%s/%s/%s' % ('/courses', self.course_id, chapter)
request = self.request_factory.get(chapter_url)
request = self.request_factory.get(self.chapter_url)
self.assertRaisesRegexp(Http404, 'Invalid location', views.jump_to,
request, 'bar', ())
self.assertRaisesRegexp(Http404, 'No data*', views.jump_to, request,
@@ -186,16 +189,14 @@ class ViewsTestCase(TestCase):
def test_static_university_profile(self):
# TODO
# Can't test unless have a valid template file
# Can't test unless havehttp://toastdriven.com/blog/2011/apr/10/guide-to-testing-in-django/ a valid template file
raise SkipTest
request = self.client.get('university_profile/edX')
self.assertIsInstance(views.static_university_profile(request, 'edX'), HttpResponse)
def test_university_profile(self):
raise SkipTest
chapter = 'Overview'
chapter_url = '%s/%s/%s' % ('/courses', self.course_id, chapter)
request = self.request_factory.get(chapter_url)
request = self.request_factory.get(self.chapter_url)
request.user = UserFactory()
self.assertRaisesRegexp(Http404, 'University Profile*',
views.university_profile, request, 'Harvard')
@@ -207,15 +208,14 @@ class ViewsTestCase(TestCase):
def test_syllabus(self):
raise SkipTest
chapter = 'Overview'
chapter_url = '%s/%s/%s' % ('/courses', self.course_id, chapter)
request = self.request_factory.get(chapter_url)
request = self.request_factory.get(self.chapter_url)
request.user = UserFactory()
# Can't find valid template
# TODO
views.syllabus(request, 'edX/toy/2012_Fall')
def test_render_notifications(self):
raise SkipTest
request = self.request_factory.get('foo')
#views.render_notifications(request, self.course_id, 'dummy')
# TODO