aa7370c773
This makes a couple of changes to the xblock handler in the CMS. These changes add a handful of utility functions and modify the existing ones to make reuse of existing blocks easier. With these changes, it is possible to copy an entire section from one course to another, and then later refresh that section, and all of its children, without destroying the blocks next to it. The existing _duplicate_block function was modified to have a shallow keyword to avoid copying children, and the update_from_source function was added to make it easy to copy attributes over from one block to another. These functions can be used alongside copy_from_template in the modulestore to copy over blocks and their children without requiring them to be within any particular container (other than a library or course root)-- thus allowing library-like inclusion without the library content block. This is especially useful for cases like copying sections rather than unit content.
129 lines
3.3 KiB
Python
129 lines
3.3 KiB
Python
"""
|
|
Tests for store_utilities.py
|
|
"""
|
|
|
|
|
|
import unittest
|
|
from unittest import TestCase
|
|
from unittest.mock import Mock
|
|
|
|
import ddt
|
|
|
|
from opaque_keys.edx.keys import CourseKey
|
|
|
|
from xmodule.modulestore.split_mongo import BlockKey
|
|
from xmodule.modulestore.store_utilities import draft_node_constructor, get_draft_subtree_roots, derived_key
|
|
|
|
|
|
@ddt.ddt
|
|
class TestUtils(unittest.TestCase):
|
|
"""
|
|
Tests for store_utilities
|
|
|
|
ASCII trees for ONLY_ROOTS and SOME_TREES:
|
|
|
|
ONLY_ROOTS:
|
|
1)
|
|
vertical (not draft)
|
|
|
|
|
url1
|
|
|
|
2)
|
|
sequential (not draft)
|
|
|
|
|
url2
|
|
|
|
SOME_TREES:
|
|
|
|
1)
|
|
sequential_1 (not draft)
|
|
|
|
|
vertical_1
|
|
/ \
|
|
/ \
|
|
child_1 child_2
|
|
|
|
|
|
2)
|
|
great_grandparent_vertical (not draft)
|
|
|
|
|
grandparent_vertical
|
|
|
|
|
vertical_2
|
|
/ \
|
|
/ \
|
|
child_3 child_4
|
|
"""
|
|
|
|
ONLY_ROOTS = [
|
|
('url1', 'vertical'),
|
|
('url2', 'sequential'),
|
|
]
|
|
ONLY_ROOTS_URLS = ['url1', 'url2']
|
|
|
|
SOME_TREES = [
|
|
('child_1', 'vertical_1'),
|
|
('child_2', 'vertical_1'),
|
|
('vertical_1', 'sequential_1'),
|
|
|
|
('child_3', 'vertical_2'),
|
|
('child_4', 'vertical_2'),
|
|
('vertical_2', 'grandparent_vertical'),
|
|
('grandparent_vertical', 'great_grandparent_vertical'),
|
|
]
|
|
SOME_TREES_ROOTS_URLS = ['vertical_1', 'grandparent_vertical']
|
|
|
|
@ddt.data(
|
|
(ONLY_ROOTS, ONLY_ROOTS_URLS),
|
|
(SOME_TREES, SOME_TREES_ROOTS_URLS),
|
|
)
|
|
@ddt.unpack
|
|
def test_get_draft_subtree_roots(self, node_arguments_list, expected_roots_urls):
|
|
"""tests for get_draft_subtree_roots"""
|
|
block_nodes = []
|
|
for node_args in node_arguments_list:
|
|
block_nodes.append(draft_node_constructor(Mock(), node_args[0], node_args[1]))
|
|
subtree_roots_urls = [root.url for root in get_draft_subtree_roots(block_nodes)]
|
|
# check that we return the expected urls
|
|
assert set(subtree_roots_urls) == set(expected_roots_urls)
|
|
|
|
|
|
mock_block = Mock()
|
|
mock_block.id = CourseKey.from_string('course-v1:Beeper+B33P+BOOP')
|
|
|
|
|
|
derived_key_scenarios = [
|
|
{
|
|
'courselike_source_key': CourseKey.from_string('course-v1:edX+DemoX+Demo_Course'),
|
|
'block_key': BlockKey('chapter', 'interactive_demonstrations'),
|
|
'parent': mock_block,
|
|
'expected': BlockKey(
|
|
'chapter', '5793ec64e25ed870a7dd',
|
|
),
|
|
},
|
|
{
|
|
'courselike_source_key': CourseKey.from_string('course-v1:edX+DemoX+Demo_Course'),
|
|
'block_key': BlockKey('chapter', 'interactive_demonstrations'),
|
|
'parent': BlockKey(
|
|
'chapter', 'thingy',
|
|
),
|
|
'expected': BlockKey(
|
|
'chapter', '599792a5622d85aa41e6',
|
|
),
|
|
}
|
|
]
|
|
|
|
|
|
@ddt.ddt
|
|
class TestDerivedKey(TestCase):
|
|
"""
|
|
Test reproducible block ID generation.
|
|
"""
|
|
@ddt.data(*derived_key_scenarios)
|
|
@ddt.unpack
|
|
def test_derived_key(self, courselike_source_key, block_key, parent, expected):
|
|
"""
|
|
Test that derived_key returns the expected value.
|
|
"""
|
|
self.assertEqual(derived_key(courselike_source_key, block_key, parent), expected)
|