Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
edx-platform
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
edx-platform
Commits
f3b36b8b
Commit
f3b36b8b
authored
May 31, 2013
by
Diana Huang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use from_descriptor instead of from_xml to make ErrorDescriptor
parent
c865641f
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
42 additions
and
15 deletions
+42
-15
common/lib/xmodule/xmodule/tests/test_error_module.py
+40
-12
lms/djangoapps/courseware/module_render.py
+2
-3
No files found.
common/lib/xmodule/xmodule/tests/test_error_module.py
View file @
f3b36b8b
...
...
@@ -4,6 +4,9 @@ Tests for ErrorModule and NonStaffErrorModule
import
unittest
from
xmodule.tests
import
test_system
import
xmodule.error_module
as
error_module
from
xmodule.modulestore
import
Location
from
xmodule.x_module
import
XModuleDescriptor
from
mock
import
MagicMock
class
TestErrorModule
(
unittest
.
TestCase
):
...
...
@@ -14,22 +17,33 @@ class TestErrorModule(unittest.TestCase):
self
.
system
=
test_system
()
self
.
org
=
"org"
self
.
course
=
"course"
self
.
fake_xml
=
"<problem />"
self
.
location
=
Location
([
'i4x'
,
self
.
org
,
self
.
course
,
None
,
None
])
self
.
valid_xml
=
"<problem />"
self
.
broken_xml
=
"<problem>"
self
.
error_msg
=
"Error"
def
test_error_module_
create
(
self
):
def
test_error_module_
xml_rendering
(
self
):
descriptor
=
error_module
.
ErrorDescriptor
.
from_xml
(
self
.
fake_xml
,
self
.
system
,
self
.
org
,
self
.
course
)
self
.
valid_xml
,
self
.
system
,
self
.
org
,
self
.
course
,
self
.
error_msg
)
self
.
assertTrue
(
isinstance
(
descriptor
,
error_module
.
ErrorDescriptor
))
def
test_error_module_rendering
(
self
):
descriptor
=
error_module
.
ErrorDescriptor
.
from_xml
(
self
.
fake_xml
,
self
.
system
,
self
.
org
,
self
.
course
,
self
.
error_msg
)
module
=
descriptor
.
xmodule
(
self
.
system
)
rendered_html
=
module
.
get_html
()
self
.
assertIn
(
self
.
error_msg
,
rendered_html
)
self
.
assertIn
(
self
.
fake_xml
,
rendered_html
)
self
.
assertIn
(
self
.
valid_xml
,
rendered_html
)
def
test_error_module_from_descriptor
(
self
):
descriptor
=
MagicMock
([
XModuleDescriptor
],
system
=
self
.
system
,
location
=
self
.
location
,
_model_data
=
self
.
valid_xml
)
error_descriptor
=
error_module
.
ErrorDescriptor
.
from_descriptor
(
descriptor
,
self
.
error_msg
)
self
.
assertTrue
(
isinstance
(
error_descriptor
,
error_module
.
ErrorDescriptor
))
module
=
error_descriptor
.
xmodule
(
self
.
system
)
rendered_html
=
module
.
get_html
()
self
.
assertIn
(
self
.
error_msg
,
rendered_html
)
self
.
assertIn
(
self
.
valid_xml
,
rendered_html
)
class
TestNonStaffErrorModule
(
TestErrorModule
):
...
...
@@ -39,13 +53,27 @@ class TestNonStaffErrorModule(TestErrorModule):
def
test_non_staff_error_module_create
(
self
):
descriptor
=
error_module
.
NonStaffErrorDescriptor
.
from_xml
(
self
.
fake
_xml
,
self
.
system
,
self
.
org
,
self
.
course
)
self
.
valid
_xml
,
self
.
system
,
self
.
org
,
self
.
course
)
self
.
assertTrue
(
isinstance
(
descriptor
,
error_module
.
NonStaffErrorDescriptor
))
def
test_
non_staff_error_module_rendering
(
self
):
def
test_
from_xml_render
(
self
):
descriptor
=
error_module
.
NonStaffErrorDescriptor
.
from_xml
(
self
.
fake
_xml
,
self
.
system
,
self
.
org
,
self
.
course
)
self
.
valid
_xml
,
self
.
system
,
self
.
org
,
self
.
course
)
module
=
descriptor
.
xmodule
(
self
.
system
)
rendered_html
=
module
.
get_html
()
self
.
assertNotIn
(
self
.
error_msg
,
rendered_html
)
self
.
assertNotIn
(
self
.
fake_xml
,
rendered_html
)
self
.
assertNotIn
(
self
.
valid_xml
,
rendered_html
)
def
test_error_module_from_descriptor
(
self
):
descriptor
=
MagicMock
([
XModuleDescriptor
],
system
=
self
.
system
,
location
=
self
.
location
,
_model_data
=
self
.
valid_xml
)
error_descriptor
=
error_module
.
NonStaffErrorDescriptor
.
from_descriptor
(
descriptor
,
self
.
error_msg
)
self
.
assertTrue
(
isinstance
(
error_descriptor
,
error_module
.
ErrorDescriptor
))
module
=
error_descriptor
.
xmodule
(
self
.
system
)
rendered_html
=
module
.
get_html
()
self
.
assertNotIn
(
self
.
error_msg
,
rendered_html
)
self
.
assertNotIn
(
self
.
valid_xml
,
rendered_html
)
lms/djangoapps/courseware/module_render.py
View file @
f3b36b8b
...
...
@@ -335,9 +335,8 @@ def get_module_for_descriptor(user, request, descriptor, model_data_cache, cours
else
:
err_descriptor_class
=
NonStaffErrorDescriptor
err_descriptor
=
err_descriptor_class
.
from_xml
(
str
(
descriptor
),
descriptor
.
system
,
org
=
descriptor
.
location
.
org
,
course
=
descriptor
.
location
.
course
,
err_descriptor
=
err_descriptor_class
.
from_descriptor
(
descriptor
,
error_msg
=
exc_info_to_str
(
sys
.
exc_info
())
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment