Commit 52928d16 by Chris Dodge

update SplitModuleStore tests to pull the course_id from the locator

parent e4eea6cc
...@@ -265,11 +265,11 @@ class SplitModuleItemTests(SplitModuleTest): ...@@ -265,11 +265,11 @@ class SplitModuleItemTests(SplitModuleTest):
locator = BlockUsageLocator(course_id='GreekHero', usage_id='head12345', branch='draft') locator = BlockUsageLocator(course_id='GreekHero', usage_id='head12345', branch='draft')
self.assertTrue( self.assertTrue(
modulestore().has_item(course_id, locator), modulestore().has_item(locator.course_id, locator),
"couldn't find in 12345" "couldn't find in 12345"
) )
self.assertTrue( self.assertTrue(
modulestore().has_item(course_id, BlockUsageLocator( modulestore().has_item(locator.course_id, BlockUsageLocator(
course_id=locator.course_id, course_id=locator.course_id,
branch='draft', branch='draft',
usage_id=locator.usage_id usage_id=locator.usage_id
...@@ -277,7 +277,7 @@ class SplitModuleItemTests(SplitModuleTest): ...@@ -277,7 +277,7 @@ class SplitModuleItemTests(SplitModuleTest):
"couldn't find in draft 12345" "couldn't find in draft 12345"
) )
self.assertFalse( self.assertFalse(
modulestore().has_item(course_id, BlockUsageLocator( modulestore().has_item(locator.course_id, BlockUsageLocator(
course_id=locator.course_id, course_id=locator.course_id,
branch='published', branch='published',
usage_id=locator.usage_id)), usage_id=locator.usage_id)),
...@@ -285,26 +285,27 @@ class SplitModuleItemTests(SplitModuleTest): ...@@ -285,26 +285,27 @@ class SplitModuleItemTests(SplitModuleTest):
) )
locator.branch = 'draft' locator.branch = 'draft'
self.assertTrue( self.assertTrue(
modulestore().has_item(course_id, locator), modulestore().has_item(locator.course_id, locator),
"not found in draft 12345" "not found in draft 12345"
) )
# not a course obj # not a course obj
locator = BlockUsageLocator(course_id='GreekHero', usage_id='chapter1', branch='draft') locator = BlockUsageLocator(course_id='GreekHero', usage_id='chapter1', branch='draft')
self.assertTrue( self.assertTrue(
modulestore().has_item(course_id, locator), modulestore().has_item(locator.course_id, locator),
"couldn't find chapter1" "couldn't find chapter1"
) )
# in published course # in published course
locator = BlockUsageLocator(course_id="wonderful", usage_id="head23456", revision='draft') locator = BlockUsageLocator(course_id="wonderful", usage_id="head23456", revision='draft')
self.assertTrue(modulestore().has_item(course_id, BlockUsageLocator(course_id=locator.course_id, self.assertTrue(modulestore().has_item(locator.course_id, BlockUsageLocator(course_id=locator.course_id,
usage_id=locator.usage_id, usage_id=locator.usage_id,
revision='published')), revision='published')),
"couldn't find in 23456") "couldn't find in 23456")
locator.branch = 'published' locator.branch = 'published'
self.assertTrue(modulestore().has_item(course_id, locator), "couldn't find in 23456") self.assertTrue(modulestore().has_item(course_id, locator), "couldn't find in 23456")
def test_negative_has_item(self): def test_negative_has_item(self):
# negative tests--not found # negative tests--not found
# no such course or block # no such course or block
......
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