Commit cb2422a3 by Don Mitchell

Unit test to demonstrate bug

parent 227205fb
...@@ -127,8 +127,7 @@ class MixedModuleStore(ModuleStoreWriteBase): ...@@ -127,8 +127,7 @@ class MixedModuleStore(ModuleStoreWriteBase):
def get_item(self, usage_key, depth=0, **kwargs): def get_item(self, usage_key, depth=0, **kwargs):
""" """
This method is explicitly not implemented as we need a course_id to disambiguate see parent doc
We should be able to fix this when the data-model rearchitecting is done
""" """
store = self._get_modulestore_for_courseid(usage_key.course_key) store = self._get_modulestore_for_courseid(usage_key.course_key)
return store.get_item(usage_key, depth, **kwargs) return store.get_item(usage_key, depth, **kwargs)
......
...@@ -17,6 +17,7 @@ from xmodule.modulestore.tests.test_location_mapper import LocMapperSetupSansDja ...@@ -17,6 +17,7 @@ from xmodule.modulestore.tests.test_location_mapper import LocMapperSetupSansDja
# before importing the module # before importing the module
from django.conf import settings from django.conf import settings
from opaque_keys.edx.locations import SlashSeparatedCourseKey from opaque_keys.edx.locations import SlashSeparatedCourseKey
from xmodule.modulestore.mongo.base import MongoRevisionKey
if not settings.configured: if not settings.configured:
settings.configure() settings.configure()
from xmodule.modulestore.mixed import MixedModuleStore from xmodule.modulestore.mixed import MixedModuleStore
...@@ -330,6 +331,32 @@ class TestMixedModuleStore(LocMapperSetupSansDjango): ...@@ -330,6 +331,32 @@ class TestMixedModuleStore(LocMapperSetupSansDjango):
with self.assertRaises(ItemNotFoundError): with self.assertRaises(ItemNotFoundError):
self.store.get_item(self.writable_chapter_location) self.store.get_item(self.writable_chapter_location)
# create and delete a private vertical with private children
private_vert_loc = self.course_locations[self.MONGO_COURSEID].course_key.make_usage_key('vertical', 'private')
private_vert = self.store.create_and_save_xmodule(private_vert_loc, self.user_id, runtime=self.course.runtime)
self.course.children.append(private_vert_loc)
self.store.update_item(self.course, self.user_id)
private_leaf_loc = self.course_locations[self.MONGO_COURSEID].course_key.make_usage_key('html', 'private_leaf')
self.store.create_and_save_xmodule(private_leaf_loc, self.user_id, runtime=self.course.runtime)
private_vert.children.append(private_leaf_loc)
self.store.update_item(private_vert, self.user_id)
# verify pre delete state (just to verify that the test is valid)
self.assertTrue(hasattr(private_vert, 'is_draft') or private_vert.location.branch == MongoRevisionKey.draft)
self.assertIsNotNone(self.store.get_item(private_vert_loc))
self.assertIsNotNone(self.store.get_item(private_leaf_loc))
course = self.store.get_course(self.course_locations[self.MONGO_COURSEID].course_key, 0)
self.assertIn(private_vert_loc, course.children)
# delete the vertical and ensure the course no longer points to it
self.store.delete_item(private_vert_loc, self.user_id)
with self.assertRaises(ItemNotFoundError):
self.store.get_item(private_vert_loc)
with self.assertRaises(ItemNotFoundError):
self.store.get_item(private_leaf_loc)
course = self.store.get_course(self.course_locations[self.MONGO_COURSEID].course_key, 0)
self.assertNotIn(private_vert_loc, course.children)
@ddt.data('draft', 'split') @ddt.data('draft', 'split')
def test_get_courses(self, default_ms): def test_get_courses(self, default_ms):
self.initdb(default_ms) self.initdb(default_ms)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment