First set of fixes from the pull request This does not include some of the testing files. The textannotation and videoannotation test files are not ready. waiting for an answer on the issue. Deleted token line in api.py and added test for token generator Added notes_spec.coffee remove spec file fixed minor error with the test fixes some quality errors fixed unit test fixed unit test added advanced module Added notes_spec.coffee remove spec file Quality and Testing Coverage 1. in test_textannotation.py I already check for line 75 as it states in the diff in line 43, same with test_videoanntotation 2. Like you said, exceptions cannot be checked for firebase_token_generator.py. The version of python that is active on the edx server is 2.7 or higher, but the code is there for correctness. Error checking works the same way. 3. I added a test for student/views/.py within tests and deleted the unused secret assignment. 4. test_token_generator.py is now its own file Added Secret Token data input fixed token generator Annotation Tools in Place The purpose of this pull request is to install two major modules: (1) a module to annotate text and (2) a module to annotate video. In either case an instructor can declare them in advanced settings under advanced_modules and input content (HTML in text, mp4 or YouTube videos for video). Students will be able to highlight portions and add their comments as well as reply to each other. There needs to be a storage server set up per course as well as a secret token to talk with said storage. Changes: 1. Added test to check for the creation of a token in tests.py (along with the rest of the tests for student/view.py) 2. Removed items in cms pertaining to annotation as this will only be possible in the lms 3. Added more comments to firebase_token_generator.py, the test files, students/views.py 4. Added some internationalization stuff to textannotation.html and videoannotation.html. I need some help with doing it in javascript, but the html is covered. incorporated lib for traslate fixed quality errors fixed my notes with catch token Text and Video Annotation Modules - First Iteration The following code-change is the first iteration of the modules for text and video annotation. Installing Modules: 1. Under “Advanced Settings”, add “textannotation” and “videoannotation” to the list of advanced_modules. 2. Add link to an external storage for annotations under “annotation_storage_url” 3. Add the secret token for talking with said storage under “annotation_token_secret” Using Modules 1. When creating new unit, you can find Text and Video annotation modules under “Advanced” component 2. Make sure you have either Text or Video in one unit, but not both. 3. Annotations are only allowed on Live/Public version and not Studio. Added missing templates and fixed more of the quality errors Fixed annotator not existing issue in cmd and tried to find the get_html() from the annotation module class to the descriptor Added a space after # in comments Fixed issue with an empty Module and token links Added licenses and fixed vis naming scheme and location.
166 lines
6.9 KiB
Python
166 lines
6.9 KiB
Python
# -*- coding: utf-8 -*-
|
|
"Test for Annotation Xmodule functional logic."
|
|
|
|
import unittest
|
|
from mock import Mock
|
|
from lxml import etree
|
|
|
|
from xblock.field_data import DictFieldData
|
|
from xblock.fields import ScopeIds
|
|
|
|
from xmodule.videoannotation_module import VideoAnnotationModule
|
|
|
|
from . import get_test_system
|
|
|
|
|
|
class VideoAnnotationModuleTestCase(unittest.TestCase):
|
|
''' Video Annotation Module Test Case '''
|
|
sample_xml = '''
|
|
<annotatable>
|
|
<instructions><p>Video Test Instructions.</p></instructions>
|
|
</annotatable>
|
|
'''
|
|
sample_sourceurl = "http://video-js.zencoder.com/oceans-clip.mp4"
|
|
sample_youtubeurl = "http://www.youtube.com/watch?v=yxLIu-scR9Y"
|
|
|
|
def setUp(self):
|
|
"""
|
|
Makes sure that the Video Annotation Module is created.
|
|
"""
|
|
self.mod = VideoAnnotationModule(
|
|
Mock(),
|
|
get_test_system(),
|
|
DictFieldData({'data': self.sample_xml, 'sourceUrl': self.sample_sourceurl}),
|
|
ScopeIds(None, None, None, None)
|
|
)
|
|
|
|
def test_annotation_class_attr_default(self):
|
|
"""
|
|
Makes sure that it can detect annotation values in text-form if user
|
|
decides to add text to the area below video, video functionality is completely
|
|
found in javascript.
|
|
"""
|
|
xml = '<annotation title="x" body="y" problem="0">test</annotation>'
|
|
element = etree.fromstring(xml)
|
|
|
|
expected_attr = {'class': {'value': 'annotatable-span highlight'}}
|
|
actual_attr = self.mod._get_annotation_class_attr(element) # pylint: disable=W0212
|
|
|
|
self.assertIsInstance(actual_attr, dict)
|
|
self.assertDictEqual(expected_attr, actual_attr)
|
|
|
|
def test_annotation_class_attr_with_valid_highlight(self):
|
|
"""
|
|
Same as above but more specific to an area that is highlightable in the appropriate
|
|
color designated.
|
|
"""
|
|
xml = '<annotation title="x" body="y" problem="0" highlight="{highlight}">test</annotation>'
|
|
|
|
for color in self.mod.highlight_colors:
|
|
element = etree.fromstring(xml.format(highlight=color))
|
|
value = 'annotatable-span highlight highlight-{highlight}'.format(highlight=color)
|
|
|
|
expected_attr = {'class': {
|
|
'value': value,
|
|
'_delete': 'highlight'}
|
|
}
|
|
actual_attr = self.mod._get_annotation_class_attr(element) # pylint: disable=W0212
|
|
|
|
self.assertIsInstance(actual_attr, dict)
|
|
self.assertDictEqual(expected_attr, actual_attr)
|
|
|
|
def test_annotation_class_attr_with_invalid_highlight(self):
|
|
"""
|
|
Same as above, but checked with invalid colors.
|
|
"""
|
|
xml = '<annotation title="x" body="y" problem="0" highlight="{highlight}">test</annotation>'
|
|
|
|
for invalid_color in ['rainbow', 'blink', 'invisible', '', None]:
|
|
element = etree.fromstring(xml.format(highlight=invalid_color))
|
|
expected_attr = {'class': {
|
|
'value': 'annotatable-span highlight',
|
|
'_delete': 'highlight'}
|
|
}
|
|
actual_attr = self.mod._get_annotation_class_attr(element) # pylint: disable=W0212
|
|
|
|
self.assertIsInstance(actual_attr, dict)
|
|
self.assertDictEqual(expected_attr, actual_attr)
|
|
|
|
def test_annotation_data_attr(self):
|
|
"""
|
|
Test that each highlight contains the data information from the annotation itself.
|
|
"""
|
|
element = etree.fromstring('<annotation title="bar" body="foo" problem="0">test</annotation>')
|
|
|
|
expected_attr = {
|
|
'data-comment-body': {'value': 'foo', '_delete': 'body'},
|
|
'data-comment-title': {'value': 'bar', '_delete': 'title'},
|
|
'data-problem-id': {'value': '0', '_delete': 'problem'}
|
|
}
|
|
|
|
actual_attr = self.mod._get_annotation_data_attr(element) # pylint: disable=W0212
|
|
|
|
self.assertIsInstance(actual_attr, dict)
|
|
self.assertDictEqual(expected_attr, actual_attr)
|
|
|
|
def test_render_annotation(self):
|
|
"""
|
|
Tests to make sure that the spans designating annotations acutally visually render as annotations.
|
|
"""
|
|
expected_html = '<span class="annotatable-span highlight highlight-yellow" data-comment-title="x" data-comment-body="y" data-problem-id="0">z</span>'
|
|
expected_el = etree.fromstring(expected_html)
|
|
|
|
actual_el = etree.fromstring('<annotation title="x" body="y" problem="0" highlight="yellow">z</annotation>')
|
|
self.mod._render_annotation(actual_el) # pylint: disable=W0212
|
|
|
|
self.assertEqual(expected_el.tag, actual_el.tag)
|
|
self.assertEqual(expected_el.text, actual_el.text)
|
|
self.assertDictEqual(dict(expected_el.attrib), dict(actual_el.attrib))
|
|
|
|
def test_render_content(self):
|
|
"""
|
|
Like above, but using the entire text, it makes sure that display_name is removed and that there is only one
|
|
div encompassing the annotatable area.
|
|
"""
|
|
content = self.mod._render_content() # pylint: disable=W0212
|
|
element = etree.fromstring(content)
|
|
self.assertIsNotNone(element)
|
|
self.assertEqual('div', element.tag, 'root tag is a div')
|
|
self.assertFalse('display_name' in element.attrib, "Display Name should have been deleted from Content")
|
|
|
|
def test_extract_instructions(self):
|
|
"""
|
|
This test ensures that if an instruction exists it is pulled and
|
|
formatted from the <instructions> tags. Otherwise, it should return nothing.
|
|
"""
|
|
xmltree = etree.fromstring(self.sample_xml)
|
|
|
|
expected_xml = u"<div><p>Video Test Instructions.</p></div>"
|
|
actual_xml = self.mod._extract_instructions(xmltree) # pylint: disable=W0212
|
|
self.assertIsNotNone(actual_xml)
|
|
self.assertEqual(expected_xml.strip(), actual_xml.strip())
|
|
|
|
xmltree = etree.fromstring('<annotatable>foo</annotatable>')
|
|
actual = self.mod._extract_instructions(xmltree) # pylint: disable=W0212
|
|
self.assertIsNone(actual)
|
|
|
|
def test_get_extension(self):
|
|
"""
|
|
Tests the function that returns the appropriate extension depending on whether it is
|
|
a video from youtube, or one uploaded to the EdX server.
|
|
"""
|
|
expectedyoutube = 'video/youtube'
|
|
expectednotyoutube = 'video/mp4'
|
|
result1 = self.mod._get_extension(self.sample_sourceurl) # pylint: disable=W0212
|
|
result2 = self.mod._get_extension(self.sample_youtubeurl) # pylint: disable=W0212
|
|
self.assertEqual(expectedyoutube, result2)
|
|
self.assertEqual(expectednotyoutube, result1)
|
|
|
|
def test_get_html(self):
|
|
"""
|
|
Tests to make sure variables passed in truly exist within the html once it is all rendered.
|
|
"""
|
|
context = self.mod.get_html()
|
|
for key in ['display_name', 'content_html', 'instructions_html', 'sourceUrl', 'typeSource', 'poster', 'alert', 'annotation_storage']:
|
|
self.assertIn(key, context)
|