From cce5c9ef1aa648fd7ec455b79792a2fee0c76073 Mon Sep 17 00:00:00 2001 From: Aarif Date: Fri, 19 Feb 2021 12:25:51 +0500 Subject: [PATCH] replaced unittest assertions pytest assertions (#26530) --- .../capa/capa/safe_exec/tests/test_lazymod.py | 4 +- .../capa/safe_exec/tests/test_safe_exec.py | 58 +- .../lib/capa/capa/tests/test_answer_pool.py | 32 +- .../lib/capa/capa/tests/test_capa_problem.py | 211 +---- common/lib/capa/capa/tests/test_correctmap.py | 96 +- .../lib/capa/capa/tests/test_customrender.py | 8 +- .../capa/tests/test_hint_functionality.py | 28 +- .../lib/capa/capa/tests/test_html_render.py | 48 +- .../capa/capa/tests/test_input_templates.py | 21 +- common/lib/capa/capa/tests/test_inputtypes.py | 163 ++-- .../lib/capa/capa/tests/test_responsetypes.py | 342 ++++--- common/lib/capa/capa/tests/test_shuffle.py | 34 +- .../capa/capa/tests/test_targeted_feedback.py | 6 +- common/lib/capa/capa/tests/test_util.py | 90 +- .../verifiers/tests_draganddrop.py | 132 ++- common/lib/symmath/symmath/test_formula.py | 8 +- .../lib/symmath/symmath/test_symmath_check.py | 14 +- .../assetstore/tests/test_asset_xml.py | 7 +- .../modulestore/tests/test_abstraction.py | 6 +- .../xmodule/modulestore/tests/test_asides.py | 8 +- .../modulestore/tests/test_assetstore.py | 170 ++-- .../modulestore/tests/test_contentstore.py | 41 +- .../test_cross_modulestore_import_export.py | 6 +- .../modulestore/tests/test_inheritance.py | 2 +- .../modulestore/tests/test_libraries.py | 42 +- .../tests/test_mixed_modulestore.py | 730 +++++++------- .../tests/test_modulestore_settings.py | 34 +- .../xmodule/modulestore/tests/test_mongo.py | 36 +- .../xmodule/modulestore/tests/test_publish.py | 52 +- .../modulestore/tests/test_semantics.py | 35 +- .../tests/test_split_copy_from_template.py | 42 +- .../modulestore/tests/test_split_migrator.py | 18 +- .../tests/test_split_modulestore.py | 714 +++++++------- .../test_split_modulestore_bulk_operations.py | 113 +-- .../test_split_mongo_mongo_connection.py | 4 +- .../modulestore/tests/test_store_utilities.py | 2 +- .../xmodule/modulestore/tests/test_xml.py | 30 +- .../modulestore/tests/test_xml_importer.py | 56 +- .../partitions/tests/test_partitions.py | 133 ++- common/lib/xmodule/xmodule/tests/__init__.py | 70 +- .../xmodule/tests/test_annotatable_module.py | 24 +- .../xmodule/tests/test_annotator_mixin.py | 12 +- .../xmodule/xmodule/tests/test_capa_module.py | 890 ++++++++---------- .../xmodule/xmodule/tests/test_conditional.py | 55 +- .../lib/xmodule/xmodule/tests/test_content.py | 46 +- .../tests/test_course_metadata_utils.py | 6 +- .../xmodule/tests/test_course_module.py | 116 +-- .../tests/test_delay_between_attempts.py | 33 +- .../xmodule/tests/test_editing_module.py | 4 +- .../xmodule/tests/test_error_module.py | 31 +- .../lib/xmodule/xmodule/tests/test_export.py | 54 +- .../lib/xmodule/xmodule/tests/test_fields.py | 173 +--- .../lib/xmodule/xmodule/tests/test_graders.py | 157 ++- .../xmodule/xmodule/tests/test_html_module.py | 55 +- .../lib/xmodule/xmodule/tests/test_import.py | 163 ++-- .../xmodule/tests/test_import_static.py | 14 +- .../xmodule/tests/test_library_content.py | 198 ++-- .../xmodule/tests/test_library_root.py | 4 +- .../tests/test_library_sourced_block.py | 8 +- .../xmodule/tests/test_library_tools.py | 28 +- .../xmodule/xmodule/tests/test_lti20_unit.py | 87 +- .../xmodule/xmodule/tests/test_lti_unit.py | 57 +- .../xmodule/xmodule/tests/test_mako_module.py | 6 +- .../xmodule/xmodule/tests/test_mongo_utils.py | 4 +- common/lib/xmodule/xmodule/tests/test_poll.py | 6 +- .../xmodule/xmodule/tests/test_progress.py | 72 +- .../xmodule/tests/test_randomize_module.py | 20 +- .../xmodule/tests/test_resource_templates.py | 8 +- .../xmodule/xmodule/tests/test_sequence.py | 122 ++- .../xmodule/xmodule/tests/test_services.py | 37 +- .../xmodule/tests/test_split_test_module.py | 153 ++- .../xmodule/tests/test_studio_editable.py | 4 +- .../xmodule/xmodule/tests/test_unit_block.py | 4 +- .../xmodule/tests/test_util_duedate.py | 12 +- .../test_utils_escape_html_characters.py | 6 +- .../xmodule/xmodule/tests/test_validation.py | 96 +- .../xmodule/xmodule/tests/test_vertical.py | 49 +- .../lib/xmodule/xmodule/tests/test_video.py | 135 +-- .../xmodule/xmodule/tests/test_word_cloud.py | 34 +- .../xmodule/tests/test_xblock_wrappers.py | 29 +- .../xmodule/xmodule/tests/test_xml_module.py | 48 +- 81 files changed, 3006 insertions(+), 3700 deletions(-) diff --git a/common/lib/capa/capa/safe_exec/tests/test_lazymod.py b/common/lib/capa/capa/safe_exec/tests/test_lazymod.py index dff45620c9..fb7bdda28d 100644 --- a/common/lib/capa/capa/safe_exec/tests/test_lazymod.py +++ b/common/lib/capa/capa/safe_exec/tests/test_lazymod.py @@ -42,7 +42,7 @@ class TestLazyMod(unittest.TestCase): # lint-amnesty, pylint: disable=missing-c assert module_name not in sys.modules colorsys = LazyModule(module_name) hsv = colorsys.rgb_to_hsv(.3, .4, .2) - self.assertEqual(hsv[0], 0.25) + assert hsv[0] == 0.25 def test_dotted(self): # wsgiref is a module with submodules that is not already imported. @@ -54,4 +54,4 @@ class TestLazyMod(unittest.TestCase): # lint-amnesty, pylint: disable=missing-c del sys.modules[module_name] assert module_name not in sys.modules wsgiref_util = LazyModule(module_name) - self.assertEqual(wsgiref_util.guess_scheme({}), "http") + assert wsgiref_util.guess_scheme({}) == 'http' diff --git a/common/lib/capa/capa/safe_exec/tests/test_safe_exec.py b/common/lib/capa/capa/safe_exec/tests/test_safe_exec.py index faaf87853f..e8f6215995 100644 --- a/common/lib/capa/capa/safe_exec/tests/test_safe_exec.py +++ b/common/lib/capa/capa/safe_exec/tests/test_safe_exec.py @@ -26,19 +26,19 @@ class TestSafeExec(unittest.TestCase): # lint-amnesty, pylint: disable=missing- def test_set_values(self): g = {} safe_exec("a = 17", g) - self.assertEqual(g['a'], 17) + assert g['a'] == 17 def test_division(self): g = {} # Future division: 1/2 is 0.5. safe_exec("a = 1/2", g) - self.assertEqual(g['a'], 0.5) + assert g['a'] == 0.5 def test_assumed_imports(self): g = {} # Math is always available. safe_exec("a = int(math.pi)", g) - self.assertEqual(g['a'], 3) + assert g['a'] == 3 def test_random_seeding(self): g = {} @@ -47,11 +47,11 @@ class TestSafeExec(unittest.TestCase): # lint-amnesty, pylint: disable=missing- # Without a seed, the results are unpredictable safe_exec("rnums = [random.randint(0, 999) for _ in xrange(100)]", g) - self.assertNotEqual(g['rnums'], rnums) + assert g['rnums'] != rnums # With a seed, the results are predictable safe_exec("rnums = [random.randint(0, 999) for _ in xrange(100)]", g, random_seed=17) - self.assertEqual(g['rnums'], rnums) + assert g['rnums'] == rnums def test_random_is_still_importable(self): g = {} @@ -63,7 +63,7 @@ class TestSafeExec(unittest.TestCase): # lint-amnesty, pylint: disable=missing- "import random\n" "rnums = [random.randint(0, 999) for _ in xrange(100)]\n", g, random_seed=17) - self.assertEqual(g['rnums'], rnums) + assert g['rnums'] == rnums def test_python_lib(self): pylib = os.path.dirname(__file__) + "/test_files/pylib" @@ -75,9 +75,9 @@ class TestSafeExec(unittest.TestCase): # lint-amnesty, pylint: disable=missing- def test_raising_exceptions(self): g = {} - with self.assertRaises(SafeExecException) as cm: + with pytest.raises(SafeExecException) as cm: safe_exec("1/0", g) - self.assertIn("ZeroDivisionError", text_type(cm.exception)) + assert 'ZeroDivisionError' in text_type(cm.exception) class TestSafeOrNot(unittest.TestCase): # lint-amnesty, pylint: disable=missing-class-docstring @@ -87,7 +87,7 @@ class TestSafeOrNot(unittest.TestCase): # lint-amnesty, pylint: disable=missing pytest.skip() g = {} - with self.assertRaises(SafeExecException) as cm: + with pytest.raises(SafeExecException) as cm: safe_exec("import os; files = os.listdir('/')", g) assert "OSError" in text_type(cm.exception) assert "Permission denied" in text_type(cm.exception) @@ -95,7 +95,7 @@ class TestSafeOrNot(unittest.TestCase): # lint-amnesty, pylint: disable=missing def test_can_do_something_forbidden_if_run_unsafely(self): g = {} safe_exec("import os; files = os.listdir('/')", g, unsafely=True) - self.assertEqual(g['files'], os.listdir('/')) + assert g['files'] == os.listdir('/') class TestLimitConfiguration(unittest.TestCase): @@ -199,16 +199,16 @@ class TestSafeExecCaching(unittest.TestCase): # Cache miss safe_exec("a = int(math.pi)", g, cache=DictCache(cache)) - self.assertEqual(g['a'], 3) + assert g['a'] == 3 # A result has been cached - self.assertEqual(list(cache.values())[0], (None, {'a': 3})) + assert list(cache.values())[0] == (None, {'a': 3}) # Fiddle with the cache, then try it again. cache[list(cache.keys())[0]] = (None, {'a': 17}) g = {} safe_exec("a = int(math.pi)", g, cache=DictCache(cache)) - self.assertEqual(g['a'], 17) + assert g['a'] == 17 def test_cache_large_code_chunk(self): # Caching used to die on memcache with more than 250 bytes of code. @@ -218,7 +218,7 @@ class TestSafeExecCaching(unittest.TestCase): g = {} cache = {} safe_exec(code, g, cache=DictCache(cache)) - self.assertEqual(g['a'], 12345) + assert g['a'] == 12345 def test_cache_exceptions(self): # Used to be that running code that raised an exception didn't cache @@ -226,28 +226,28 @@ class TestSafeExecCaching(unittest.TestCase): code = "1/0" g = {} cache = {} - with self.assertRaises(SafeExecException): + with pytest.raises(SafeExecException): safe_exec(code, g, cache=DictCache(cache)) # The exception should be in the cache now. - self.assertEqual(len(cache), 1) + assert len(cache) == 1 cache_exc_msg, cache_globals = list(cache.values())[0] # lint-amnesty, pylint: disable=unused-variable - self.assertIn("ZeroDivisionError", cache_exc_msg) + assert 'ZeroDivisionError' in cache_exc_msg # Change the value stored in the cache, the result should change. cache[list(cache.keys())[0]] = ("Hey there!", {}) - with self.assertRaises(SafeExecException): + with pytest.raises(SafeExecException): safe_exec(code, g, cache=DictCache(cache)) - self.assertEqual(len(cache), 1) + assert len(cache) == 1 cache_exc_msg, cache_globals = list(cache.values())[0] - self.assertEqual("Hey there!", cache_exc_msg) + assert 'Hey there!' == cache_exc_msg # Change it again, now no exception! cache[list(cache.keys())[0]] = (None, {'a': 17}) safe_exec(code, g, cache=DictCache(cache)) - self.assertEqual(g['a'], 17) + assert g['a'] == 17 def test_unicode_submission(self): # Check that using non-ASCII unicode does not raise an encoding error. @@ -288,8 +288,8 @@ class TestUpdateHash(unittest.TestCase): del d2[i] # Check that our dicts are equal, but with different key order. - self.assertEqual(d1, d2) - self.assertNotEqual(list(d1.keys()), list(d2.keys())) + assert d1 == d2 + assert list(d1.keys()) != list(d2.keys()) return d1, d2 @@ -298,19 +298,19 @@ class TestUpdateHash(unittest.TestCase): h10 = self.hash_obj(10) hs1 = self.hash_obj("1") - self.assertNotEqual(h1, h10) - self.assertNotEqual(h1, hs1) + assert h1 != h10 + assert h1 != hs1 def test_list_ordering(self): h1 = self.hash_obj({'a': [1, 2, 3]}) h2 = self.hash_obj({'a': [3, 2, 1]}) - self.assertNotEqual(h1, h2) + assert h1 != h2 def test_dict_ordering(self): d1, d2 = self.equal_but_different_dicts() h1 = self.hash_obj(d1) h2 = self.hash_obj(d2) - self.assertEqual(h1, h2) + assert h1 == h2 def test_deep_ordering(self): d1, d2 = self.equal_but_different_dicts() @@ -318,7 +318,7 @@ class TestUpdateHash(unittest.TestCase): o2 = {'a': [1, 2, [d2], 3, 4]} h1 = self.hash_obj(o1) h2 = self.hash_obj(o2) - self.assertEqual(h1, h2) + assert h1 == h2 class TestRealProblems(unittest.TestCase): # lint-amnesty, pylint: disable=missing-class-docstring @@ -386,4 +386,4 @@ class TestRealProblems(unittest.TestCase): # lint-amnesty, pylint: disable=miss """) g = {} safe_exec(code, g) - self.assertIn("aVAP", g) + assert 'aVAP' in g diff --git a/common/lib/capa/capa/tests/test_answer_pool.py b/common/lib/capa/capa/tests/test_answer_pool.py index 934e460f4e..d2a87869aa 100644 --- a/common/lib/capa/capa/tests/test_answer_pool.py +++ b/common/lib/capa/capa/tests/test_answer_pool.py @@ -58,12 +58,12 @@ class CapaAnswerPoolTest(unittest.TestCase): # [('choice_3', u'wrong-3'), ('choice_5', u'correct-2'), ('choice_1', u'wrong-2'), ('choice_4', u'wrong-4')] self.assertRegex(the_html, r"
.*\[.*'wrong-3'.*'correct-2'.*'wrong-2'.*'wrong-4'.*\].*
") self.assertRegex(the_html, r"
\{.*'1_solution_2'.*\}
") - self.assertEqual(the_html, problem.get_html(), 'should be able to call get_html() twice') + assert the_html == problem.get_html(), 'should be able to call get_html() twice' # Check about masking response = list(problem.responders.values())[0] - self.assertFalse(response.has_mask()) - self.assertTrue(response.has_answerpool()) - self.assertEqual(response.unmask_order(), ['choice_3', 'choice_5', 'choice_1', 'choice_4']) + assert not response.has_mask() + assert response.has_answerpool() + assert response.unmask_order() == ['choice_3', 'choice_5', 'choice_1', 'choice_4'] def test_answer_pool_4_choices_1_multiplechoiceresponse_seed2(self): problem = new_loncapa_problem(self.common_question_xml, seed=9) @@ -73,9 +73,9 @@ class CapaAnswerPoolTest(unittest.TestCase): self.assertRegex(the_html, r"
\{.*'1_solution_1'.*\}
") # Check about masking response = list(problem.responders.values())[0] - self.assertFalse(response.has_mask()) - self.assertTrue(hasattr(response, 'has_answerpool')) - self.assertEqual(response.unmask_order(), ['choice_0', 'choice_4', 'choice_3', 'choice_2']) + assert not response.has_mask() + assert hasattr(response, 'has_answerpool') + assert response.unmask_order() == ['choice_0', 'choice_4', 'choice_3', 'choice_2'] def test_no_answer_pool_4_choices_1_multiplechoiceresponse(self): xml_str = textwrap.dedent(""" @@ -117,11 +117,11 @@ class CapaAnswerPoolTest(unittest.TestCase): the_html = problem.get_html() self.assertRegex(the_html, r"
.*\[.*'wrong-1'.*'wrong-2'.*'correct-1'.*'wrong-3'.*'wrong-4'.*'correct-2'.*\].*
") # lint-amnesty, pylint: disable=line-too-long self.assertRegex(the_html, r"
\{.*'1_solution_1'.*'1_solution_2'.*\}
") - self.assertEqual(the_html, problem.get_html(), 'should be able to call get_html() twice') + assert the_html == problem.get_html(), 'should be able to call get_html() twice' # Check about masking response = list(problem.responders.values())[0] - self.assertFalse(response.has_mask()) - self.assertFalse(response.has_answerpool()) + assert not response.has_mask() + assert not response.has_answerpool() def test_0_answer_pool_4_choices_1_multiplechoiceresponse(self): xml_str = textwrap.dedent(""" @@ -164,8 +164,8 @@ class CapaAnswerPoolTest(unittest.TestCase): self.assertRegex(the_html, r"
.*\[.*'wrong-1'.*'wrong-2'.*'correct-1'.*'wrong-3'.*'wrong-4'.*'correct-2'.*\].*
") # lint-amnesty, pylint: disable=line-too-long self.assertRegex(the_html, r"
\{.*'1_solution_1'.*'1_solution_2'.*\}
") response = list(problem.responders.values())[0] - self.assertFalse(response.has_mask()) - self.assertFalse(response.has_answerpool()) + assert not response.has_mask() + assert not response.has_answerpool() def test_invalid_answer_pool_value(self): xml_str = textwrap.dedent(""" @@ -282,8 +282,8 @@ class CapaAnswerPoolTest(unittest.TestCase): self.assertRegex(the_html, r"
.*\[.*'correct-2'.*'wrong-1'.*'wrong-2'.*.*'wrong-3'.*'wrong-4'.*\].*
") self.assertRegex(the_html, r"
\{.*'1_solution_2'.*\}
") response = list(problem.responders.values())[0] - self.assertFalse(response.has_mask()) - self.assertEqual(response.unmask_order(), ['choice_5', 'choice_0', 'choice_1', 'choice_3', 'choice_4']) + assert not response.has_mask() + assert response.unmask_order() == ['choice_5', 'choice_0', 'choice_1', 'choice_3', 'choice_4'] def test_answer_pool_2_multiplechoiceresponses_seed1(self): xml_str = textwrap.dedent(""" @@ -543,8 +543,8 @@ class CapaAnswerPoolTest(unittest.TestCase): self.assertRegex(the_html, str1) # attributes *not* present response = list(problem.responders.values())[0] - self.assertFalse(response.has_mask()) - self.assertFalse(response.has_answerpool()) + assert not response.has_mask() + assert not response.has_answerpool() def test_answer_pool_and_no_answer_pool(self): xml_str = textwrap.dedent(""" diff --git a/common/lib/capa/capa/tests/test_capa_problem.py b/common/lib/capa/capa/tests/test_capa_problem.py index 4c3beea499..6b2cc02fc4 100644 --- a/common/lib/capa/capa/tests/test_capa_problem.py +++ b/common/lib/capa/capa/tests/test_capa_problem.py @@ -5,7 +5,7 @@ Test capa problem. import textwrap import unittest - +import pytest import ddt import six from lxml import etree @@ -48,17 +48,9 @@ class CAPAProblemTest(unittest.TestCase): """.format(question=question) problem = new_loncapa_problem(xml) - self.assertEqual( - problem.problem_data, - { - '1_2_1': - { - 'label': question, - 'descriptions': {'description_1_1_1': 'Only the paranoid survive.'} - } - } - ) - self.assertEqual(len(problem.tree.xpath('//label')), 0) + assert problem.problem_data ==\ + {'1_2_1': {'label': question, 'descriptions': {'description_1_1_1': 'Only the paranoid survive.'}}} + assert len(problem.tree.xpath('//label')) == 0 @ddt.unpack @ddt.data( @@ -85,20 +77,8 @@ class CAPAProblemTest(unittest.TestCase): """.format(question, label_attr) problem = new_loncapa_problem(xml) - self.assertEqual( - problem.problem_data, - { - '1_2_1': - { - 'label': question, - 'descriptions': {} - } - } - ) - self.assertEqual( - len(problem.tree.xpath("//*[normalize-space(text())='{}']".format(question))), - 0 - ) + assert problem.problem_data == {'1_2_1': {'label': question, 'descriptions': {}}} + assert len(problem.tree.xpath("//*[normalize-space(text())='{}']".format(question))) == 0 @ddt.unpack @ddt.data( @@ -137,26 +117,10 @@ class CAPAProblemTest(unittest.TestCase): """.format(question1, question2) problem = new_loncapa_problem(xml) - self.assertEqual( - problem.problem_data, - { - '1_2_1': - { - 'label': question1, - 'descriptions': {} - }, - '1_3_1': - { - 'label': question2, - 'descriptions': {} - } - } - ) + assert problem.problem_data ==\ + {'1_2_1': {'label': question1, 'descriptions': {}}, '1_3_1': {'label': question2, 'descriptions': {}}} for question in (question1, question2): - self.assertEqual( - len(problem.tree.xpath('//label[text()="{}"]'.format(question))), - 0 - ) + assert len(problem.tree.xpath('//label[text()="{}"]'.format(question))) == 0 def test_multiple_descriptions(self): """ @@ -176,19 +140,9 @@ class CAPAProblemTest(unittest.TestCase): """.format(desc1, desc2) problem = new_loncapa_problem(xml) - self.assertEqual( - problem.problem_data, - { - '1_2_1': - { - 'label': '___ requires sacrifices.', - 'descriptions': { - 'description_1_1_1': desc1, - 'description_1_1_2': desc2 - } - } - } - ) + assert problem.problem_data ==\ + {'1_2_1': {'label': '___ requires sacrifices.', + 'descriptions': {'description_1_1_1': desc1, 'description_1_1_2': desc2}}} def test_additional_answer_is_skipped_from_resulting_html(self): """Tests that additional_answer element is not present in transformed HTML""" @@ -204,8 +158,8 @@ class CAPAProblemTest(unittest.TestCase): """ problem = new_loncapa_problem(xml) - self.assertEqual(len(problem.extracted_tree.xpath('//additional_answer')), 0) - self.assertNotIn('additional_answer', problem.get_html()) + assert len(problem.extracted_tree.xpath('//additional_answer')) == 0 + assert 'additional_answer' not in problem.get_html() def test_non_accessible_inputtype(self): """ @@ -223,18 +177,9 @@ class CAPAProblemTest(unittest.TestCase): """.format(question, question) problem = new_loncapa_problem(xml) - self.assertEqual( - problem.problem_data, - { - '1_2_1': - { - 'label': question, - 'descriptions': {} - } - } - ) + assert problem.problem_data == {'1_2_1': {'label': question, 'descriptions': {}}} #

tag with question text should not be deleted - self.assertEqual(problem.tree.xpath("string(p[text()='{}'])".format(question)), question) + assert problem.tree.xpath("string(p[text()='{}'])".format(question)) == question def test_label_is_empty_if_no_label_attribute(self): """ @@ -252,16 +197,7 @@ class CAPAProblemTest(unittest.TestCase): """.format(question) problem = new_loncapa_problem(xml) - self.assertEqual( - problem.problem_data, - { - '1_2_1': - { - 'label': '', - 'descriptions': {} - } - } - ) + assert problem.problem_data == {'1_2_1': {'label': '', 'descriptions': {}}} def test_multiple_questions_problem(self): """ @@ -294,22 +230,12 @@ class CAPAProblemTest(unittest.TestCase): """ problem = new_loncapa_problem(xml) - self.assertEqual( - problem.problem_data, - { - '1_2_1': - { - 'label': 'Select the correct synonym of paranoid?', - 'descriptions': {'description_1_1_1': 'Only the paranoid survive.'} - }, - '1_3_1': - { - 'label': 'What Apple device competed with the portable CD player?', - 'descriptions': {'description_1_2_1': 'Device looks like an egg plant.'} - } - } - ) - self.assertEqual(len(problem.tree.xpath('//label')), 0) + assert problem.problem_data ==\ + {'1_2_1': {'label': 'Select the correct synonym of paranoid?', + 'descriptions': {'description_1_1_1': 'Only the paranoid survive.'}}, + '1_3_1': {'label': 'What Apple device competed with the portable CD player?', + 'descriptions': {'description_1_2_1': 'Device looks like an egg plant.'}}} + assert len(problem.tree.xpath('//label')) == 0 def test_question_title_not_removed_got_children(self): """ @@ -334,20 +260,8 @@ class CAPAProblemTest(unittest.TestCase): """.format(question) problem = new_loncapa_problem(xml) - self.assertEqual( - problem.problem_data, - { - '1_2_1': - { - 'label': '', - 'descriptions': {} - } - } - ) - self.assertEqual( - len(problem.tree.xpath('//p/img')), - 1 - ) + assert problem.problem_data == {'1_2_1': {'label': '', 'descriptions': {}}} + assert len(problem.tree.xpath('//p/img')) == 1 @ddt.unpack @ddt.data( @@ -371,23 +285,9 @@ class CAPAProblemTest(unittest.TestCase): """.format(group_label, input1_label, input2_label) problem = new_loncapa_problem(xml) - self.assertEqual( - problem.problem_data, - { - '1_2_1': - { - 'group_label': group_label, - 'label': input1_label, - 'descriptions': {} - }, - '1_2_2': - { - 'group_label': group_label, - 'label': input2_label, - 'descriptions': {} - } - } - ) + assert problem.problem_data ==\ + {'1_2_1': {'group_label': group_label, 'label': input1_label, 'descriptions': {}}, + '1_2_2': {'group_label': group_label, 'label': input2_label, 'descriptions': {}}} def test_single_inputtypes(self): """ @@ -411,11 +311,11 @@ class CAPAProblemTest(unittest.TestCase): # verify that only no multi input group div is present multi_inputs_group = problem_html.xpath('//div[@class="multi-inputs-group"]') - self.assertEqual(len(multi_inputs_group), 0) + assert len(multi_inputs_group) == 0 # verify that question is rendered only once question = problem_html.xpath("//*[normalize-space(text())='{}']".format(question)) - self.assertEqual(len(question), 1) + assert len(question) == 1 def assert_question_tag(self, question1, question2, tag, label_attr=False): """ @@ -449,22 +349,9 @@ class CAPAProblemTest(unittest.TestCase): question2_label_attr=question2_label_attr, ) problem = new_loncapa_problem(xml) - self.assertEqual( - problem.problem_data, - { - '1_2_1': - { - 'label': question1, - 'descriptions': {} - }, - '1_3_1': - { - 'label': question2, - 'descriptions': {} - } - } - ) - self.assertEqual(len(problem.tree.xpath('//{}'.format(tag))), 0) + assert problem.problem_data ==\ + {'1_2_1': {'label': question1, 'descriptions': {}}, '1_3_1': {'label': question2, 'descriptions': {}}} + assert len(problem.tree.xpath('//{}'.format(tag))) == 0 @ddt.unpack @ddt.data( @@ -505,10 +392,10 @@ class CAPAProblemTest(unittest.TestCase): """ - with self.assertRaises(LoncapaProblemError): + with pytest.raises(LoncapaProblemError): new_loncapa_problem(xml.format(correctness=True)) problem = new_loncapa_problem(xml.format(correctness=False)) - self.assertIsNotNone(problem) + assert problem is not None @ddt.ddt @@ -524,7 +411,7 @@ class CAPAMultiInputProblemTest(unittest.TestCase): def assert_problem_data(self, problem_data): """Verify problem data is in expected state""" for problem_value in six.viewvalues(problem_data): - self.assertIsInstance(problem_value['label'], Markup) + assert isinstance(problem_value['label'], Markup) def assert_problem_html(self, problem_html, group_label, *input_labels): """ @@ -541,24 +428,24 @@ class CAPAMultiInputProblemTest(unittest.TestCase): multi_inputs_group = html.xpath( '//div[@class="wrapper-problem-response"]/div[@class="multi-inputs-group"]' ) - self.assertEqual(len(multi_inputs_group), 1) + assert len(multi_inputs_group) == 1 if group_label is None: # if multi inputs group label is not present then there shouldn't be `aria-labelledby` attribute - self.assertEqual(multi_inputs_group[0].attrib.get('aria-labelledby'), None) + assert multi_inputs_group[0].attrib.get('aria-labelledby') is None else: # verify that multi input group label

tag exists and its # id matches with correct multi input group aria-labelledby multi_inputs_group_label_id = multi_inputs_group[0].attrib.get('aria-labelledby') multi_inputs_group_label = html.xpath('//p[@id="{}"]'.format(multi_inputs_group_label_id)) - self.assertEqual(len(multi_inputs_group_label), 1) - self.assertEqual(multi_inputs_group_label[0].text, group_label) + assert len(multi_inputs_group_label) == 1 + assert multi_inputs_group_label[0].text == group_label # verify that label for each input comes only once for input_label in input_labels: # normalize-space is used to remove whitespace around the text input_label_element = multi_inputs_group[0].xpath('//*[normalize-space(text())="{}"]'.format(input_label)) - self.assertEqual(len(input_label_element), 1) + assert len(input_label_element) == 1 @ddt.unpack @ddt.data( @@ -646,13 +533,13 @@ class CAPAMultiInputProblemTest(unittest.TestCase): description_ids = multi_inputs_group.attrib.get('aria-describedby', '').split() # Verify that number of descriptions matches description_ids - self.assertEqual(len(description_ids), len(descriptions)) + assert len(description_ids) == len(descriptions) # For each description, check its order and text is correct for index, description_id in enumerate(description_ids): description_element = multi_inputs_group.xpath('//p[@id="{}"]'.format(description_id)) - self.assertEqual(len(description_element), 1) - self.assertEqual(description_element[0].text, descriptions[index]) + assert len(description_element) == 1 + assert description_element[0].text == descriptions[index] @ddt.ddt @@ -678,7 +565,7 @@ class CAPAProblemReportHelpersTest(unittest.TestCase): } } with patch.object(problem, 'problem_data', mock_problem_data): - self.assertEqual(problem.find_question_label(answer_id), stripped_label) + assert problem.find_question_label(answer_id) == stripped_label @ddt.data(None, dict(), [None]) def test_find_answer_test_not_implemented(self, current_answer): @@ -718,7 +605,7 @@ class CAPAProblemReportHelpersTest(unittest.TestCase): """ ) - self.assertEqual(problem.find_answer_text(answer_id, choice_id), answer_text) + assert problem.find_answer_text(answer_id, choice_id) == answer_text @ddt.data( # Test for ChoiceResponse @@ -756,7 +643,7 @@ class CAPAProblemReportHelpersTest(unittest.TestCase): """ ) - self.assertEqual(problem.find_correct_answer_text(answer_id), answer_text) + assert problem.find_correct_answer_text(answer_id) == answer_text def test_find_answer_text_textinput(self): problem = new_loncapa_problem( @@ -768,7 +655,7 @@ class CAPAProblemReportHelpersTest(unittest.TestCase): """ ) - self.assertEqual(problem.find_answer_text('1_2_1', 'hide'), 'hide') + assert problem.find_answer_text('1_2_1', 'hide') == 'hide' def test_get_question_answer(self): problem = new_loncapa_problem( @@ -789,4 +676,4 @@ class CAPAProblemReportHelpersTest(unittest.TestCase): # Ensure that the answer is a string so that the dict returned from this # function can eventualy be serialized to json without issues. - self.assertIsInstance(problem.get_question_answers()['1_solution_1'], six.text_type) + assert isinstance(problem.get_question_answers()['1_solution_1'], six.text_type) diff --git a/common/lib/capa/capa/tests/test_correctmap.py b/common/lib/capa/capa/tests/test_correctmap.py index c82fb9b553..e58b3deadd 100644 --- a/common/lib/capa/capa/tests/test_correctmap.py +++ b/common/lib/capa/capa/tests/test_correctmap.py @@ -5,7 +5,7 @@ Tests to verify that CorrectMap behaves correctly import datetime import unittest - +import pytest from capa.correctmap import CorrectMap @@ -54,48 +54,48 @@ class CorrectMapTest(unittest.TestCase): ) # Assert that each input has the expected properties - self.assertTrue(self.cmap.is_correct('1_2_1')) - self.assertFalse(self.cmap.is_correct('2_2_1')) - self.assertTrue(self.cmap.is_correct('3_2_1')) + assert self.cmap.is_correct('1_2_1') + assert not self.cmap.is_correct('2_2_1') + assert self.cmap.is_correct('3_2_1') - self.assertTrue(self.cmap.is_partially_correct('3_2_1')) - self.assertFalse(self.cmap.is_partially_correct('2_2_1')) + assert self.cmap.is_partially_correct('3_2_1') + assert not self.cmap.is_partially_correct('2_2_1') # Intentionally testing an item that's not in cmap. - self.assertFalse(self.cmap.is_partially_correct('9_2_1')) + assert not self.cmap.is_partially_correct('9_2_1') - self.assertEqual(self.cmap.get_correctness('1_2_1'), 'correct') - self.assertEqual(self.cmap.get_correctness('2_2_1'), 'incorrect') - self.assertEqual(self.cmap.get_correctness('3_2_1'), 'partially-correct') + assert self.cmap.get_correctness('1_2_1') == 'correct' + assert self.cmap.get_correctness('2_2_1') == 'incorrect' + assert self.cmap.get_correctness('3_2_1') == 'partially-correct' - self.assertEqual(self.cmap.get_npoints('1_2_1'), 5) - self.assertEqual(self.cmap.get_npoints('2_2_1'), 0) - self.assertEqual(self.cmap.get_npoints('3_2_1'), 3) + assert self.cmap.get_npoints('1_2_1') == 5 + assert self.cmap.get_npoints('2_2_1') == 0 + assert self.cmap.get_npoints('3_2_1') == 3 - self.assertEqual(self.cmap.get_msg('1_2_1'), 'Test message') - self.assertEqual(self.cmap.get_msg('2_2_1'), None) + assert self.cmap.get_msg('1_2_1') == 'Test message' + assert self.cmap.get_msg('2_2_1') is None - self.assertEqual(self.cmap.get_hint('1_2_1'), 'Test hint') - self.assertEqual(self.cmap.get_hint('2_2_1'), None) + assert self.cmap.get_hint('1_2_1') == 'Test hint' + assert self.cmap.get_hint('2_2_1') is None - self.assertEqual(self.cmap.get_hintmode('1_2_1'), 'always') - self.assertEqual(self.cmap.get_hintmode('2_2_1'), None) + assert self.cmap.get_hintmode('1_2_1') == 'always' + assert self.cmap.get_hintmode('2_2_1') is None - self.assertTrue(self.cmap.is_queued('1_2_1')) - self.assertFalse(self.cmap.is_queued('2_2_1')) + assert self.cmap.is_queued('1_2_1') + assert not self.cmap.is_queued('2_2_1') - self.assertEqual(self.cmap.get_queuetime_str('1_2_1'), '20130228100026') - self.assertEqual(self.cmap.get_queuetime_str('2_2_1'), None) + assert self.cmap.get_queuetime_str('1_2_1') == '20130228100026' + assert self.cmap.get_queuetime_str('2_2_1') is None - self.assertTrue(self.cmap.is_right_queuekey('1_2_1', 'secretstring')) - self.assertFalse(self.cmap.is_right_queuekey('1_2_1', 'invalidstr')) - self.assertFalse(self.cmap.is_right_queuekey('1_2_1', '')) - self.assertFalse(self.cmap.is_right_queuekey('1_2_1', None)) + assert self.cmap.is_right_queuekey('1_2_1', 'secretstring') + assert not self.cmap.is_right_queuekey('1_2_1', 'invalidstr') + assert not self.cmap.is_right_queuekey('1_2_1', '') + assert not self.cmap.is_right_queuekey('1_2_1', None) - self.assertFalse(self.cmap.is_right_queuekey('2_2_1', 'secretstring')) - self.assertFalse(self.cmap.is_right_queuekey('2_2_1', 'invalidstr')) - self.assertFalse(self.cmap.is_right_queuekey('2_2_1', '')) - self.assertFalse(self.cmap.is_right_queuekey('2_2_1', None)) + assert not self.cmap.is_right_queuekey('2_2_1', 'secretstring') + assert not self.cmap.is_right_queuekey('2_2_1', 'invalidstr') + assert not self.cmap.is_right_queuekey('2_2_1', '') + assert not self.cmap.is_right_queuekey('2_2_1', None) def test_get_npoints(self): # Set the correctmap properties for 4 inputs @@ -153,28 +153,28 @@ class CorrectMapTest(unittest.TestCase): # If no points assigned and correct --> 1 point # If no points assigned and partially correct --> 1 point # If no points assigned and incorrect --> 0 points - self.assertEqual(self.cmap.get_npoints('1_2_1'), 5.3) - self.assertEqual(self.cmap.get_npoints('2_2_1'), 1) - self.assertEqual(self.cmap.get_npoints('3_2_1'), 5) - self.assertEqual(self.cmap.get_npoints('4_2_1'), 0) - self.assertEqual(self.cmap.get_npoints('5_2_1'), 0) - self.assertEqual(self.cmap.get_npoints('6_2_1'), 2.5) - self.assertEqual(self.cmap.get_npoints('7_2_1'), 1) + assert self.cmap.get_npoints('1_2_1') == 5.3 + assert self.cmap.get_npoints('2_2_1') == 1 + assert self.cmap.get_npoints('3_2_1') == 5 + assert self.cmap.get_npoints('4_2_1') == 0 + assert self.cmap.get_npoints('5_2_1') == 0 + assert self.cmap.get_npoints('6_2_1') == 2.5 + assert self.cmap.get_npoints('7_2_1') == 1 def test_set_overall_message(self): # Default is an empty string string - self.assertEqual(self.cmap.get_overall_message(), "") + assert self.cmap.get_overall_message() == '' # Set a message that applies to the whole question self.cmap.set_overall_message("Test message") # Retrieve the message - self.assertEqual(self.cmap.get_overall_message(), "Test message") + assert self.cmap.get_overall_message() == 'Test message' # Setting the message to None --> empty string self.cmap.set_overall_message(None) - self.assertEqual(self.cmap.get_overall_message(), "") + assert self.cmap.get_overall_message() == '' def test_update_from_correctmap(self): # Initialize a CorrectMap with some properties @@ -199,15 +199,9 @@ class CorrectMapTest(unittest.TestCase): other_cmap.update(self.cmap) # Assert that it has all the same properties - self.assertEqual( - other_cmap.get_overall_message(), - self.cmap.get_overall_message() - ) + assert other_cmap.get_overall_message() == self.cmap.get_overall_message() - self.assertEqual( - other_cmap.get_dict(), - self.cmap.get_dict() - ) + assert other_cmap.get_dict() == self.cmap.get_dict() def test_update_from_invalid(self): # Should get an exception if we try to update() a CorrectMap @@ -215,7 +209,7 @@ class CorrectMapTest(unittest.TestCase): invalid_list = [None, "string", 5, datetime.datetime.today()] for invalid in invalid_list: - with self.assertRaises(Exception): + with pytest.raises(Exception): self.cmap.update(invalid) def test_set_none_state(self): @@ -226,4 +220,4 @@ class CorrectMapTest(unittest.TestCase): invalid_list = [None, "", False, 0] for invalid in invalid_list: self.cmap.set_dict(invalid) - self.assertEqual(self.cmap.get_dict(), {}) + assert self.cmap.get_dict() == {} diff --git a/common/lib/capa/capa/tests/test_customrender.py b/common/lib/capa/capa/tests/test_customrender.py index b0c89a68eb..8afc50e82c 100644 --- a/common/lib/capa/capa/tests/test_customrender.py +++ b/common/lib/capa/capa/tests/test_customrender.py @@ -30,7 +30,7 @@ class HelperTest(unittest.TestCase): ''' def check(self, d): xml = etree.XML(test_capa_system().render_template('blah', d)) - self.assertEqual(d, extract_context(xml)) + assert d == extract_context(xml) def test_extract_context(self): self.check({}) @@ -51,12 +51,12 @@ class SolutionRenderTest(unittest.TestCase): renderer = lookup_tag('solution')(test_capa_system(), element) - self.assertEqual(renderer.id, 'solution_12') + assert renderer.id == 'solution_12' # Our test_capa_system "renders" templates to a div with the repr of the context. xml = renderer.get_html() context = extract_context(xml) - self.assertEqual(context, {'id': 'solution_12'}) + assert context == {'id': 'solution_12'} class MathRenderTest(unittest.TestCase): @@ -70,7 +70,7 @@ class MathRenderTest(unittest.TestCase): renderer = lookup_tag('math')(test_capa_system(), element) - self.assertEqual(renderer.mathstr, mathjax_out) + assert renderer.mathstr == mathjax_out def test_parsing(self): self.check_parse('$abc$', '[mathjaxinline]abc[/mathjaxinline]') diff --git a/common/lib/capa/capa/tests/test_hint_functionality.py b/common/lib/capa/capa/tests/test_hint_functionality.py index c2d89eea79..cfa2a8b147 100644 --- a/common/lib/capa/capa/tests/test_hint_functionality.py +++ b/common/lib/capa/capa/tests/test_hint_functionality.py @@ -5,7 +5,7 @@ Tests of extended hints import unittest - +import pytest from ddt import data, ddt, unpack from capa.tests.helpers import load_fixture, new_loncapa_problem @@ -89,7 +89,7 @@ class TextInputHintsTest(HintTest): @unpack def test_text_input_hints(self, problem_id, choice, expected_string): hint = self.get_hint(problem_id, choice) - self.assertEqual(hint, expected_string) + assert hint == expected_string @ddt @@ -121,7 +121,7 @@ class TextInputExtendedHintsCaseInsensitive(HintTest): @unpack def test_text_input_hints(self, problem_id, choice, expected_string): hint = self.get_hint(problem_id, choice) - self.assertEqual(hint, expected_string) + assert hint == expected_string @ddt @@ -149,7 +149,7 @@ class TextInputExtendedHintsCaseSensitive(HintTest): @unpack def test_text_input_hints(self, problem_id, choice, expected_string): message_text = self.get_hint(problem_id, choice) - self.assertEqual(message_text, expected_string) + assert message_text == expected_string @ddt @@ -173,8 +173,8 @@ class TextInputExtendedHintsCompatible(HintTest): @unpack def test_text_input_hints(self, problem_id, choice, correct, expected_string): message_text = self.get_hint(problem_id, choice) - self.assertEqual(message_text, expected_string) - self.assertEqual(self.correctness(problem_id, choice), correct) + assert message_text == expected_string + assert self.correctness(problem_id, choice) == correct @ddt @@ -209,8 +209,8 @@ class TextInputExtendedHintsRegex(HintTest): @unpack def test_text_input_hints(self, problem_id, choice, correct, expected_string): message_text = self.get_hint(problem_id, choice) - self.assertEqual(message_text, expected_string) - self.assertEqual(self.correctness(problem_id, choice), correct) + assert message_text == expected_string + assert self.correctness(problem_id, choice) == correct @ddt @@ -250,7 +250,7 @@ class NumericInputHintsTest(HintTest): @unpack def test_numeric_input_hints(self, problem_id, choice, expected_string): hint = self.get_hint(problem_id, choice) - self.assertEqual(hint, expected_string) + assert hint == expected_string @ddt @@ -329,7 +329,7 @@ class CheckboxHintsTest(HintTest): def test_checkbox_hints(self, problem_id, choice, expected_string): self.maxDiff = None # pylint: disable=invalid-name hint = self.get_hint(problem_id, choice) - self.assertEqual(hint, expected_string) + assert hint == expected_string class CheckboxHintsTestTracking(HintTest): @@ -449,7 +449,7 @@ class MultpleChoiceHintsTest(HintTest): @unpack def test_multiplechoice_hints(self, problem_id, choice, expected_string): hint = self.get_hint(problem_id, choice) - self.assertEqual(hint, expected_string) + assert hint == expected_string @ddt @@ -483,7 +483,7 @@ class MultpleChoiceHintsWithHtmlTest(HintTest): @unpack def test_multiplechoice_hints(self, problem_id, choice, expected_string): hint = self.get_hint(problem_id, choice) - self.assertEqual(hint, expected_string) + assert hint == expected_string @ddt @@ -530,7 +530,7 @@ class DropdownHintsTest(HintTest): @unpack def test_dropdown_hints(self, problem_id, choice, expected_string): hint = self.get_hint(problem_id, choice) - self.assertEqual(hint, expected_string) + assert hint == expected_string class ErrorConditionsTest(HintTest): @@ -539,5 +539,5 @@ class ErrorConditionsTest(HintTest): """ def test_error_conditions_illegal_element(self): xml_with_errors = load_fixture('extended_hints_with_errors.xml') - with self.assertRaises(Exception): + with pytest.raises(Exception): new_loncapa_problem(xml_with_errors) # this problem is improperly constructed diff --git a/common/lib/capa/capa/tests/test_html_render.py b/common/lib/capa/capa/tests/test_html_render.py index 17bc9878dd..4bfe49ccae 100644 --- a/common/lib/capa/capa/tests/test_html_render.py +++ b/common/lib/capa/capa/tests/test_html_render.py @@ -65,8 +65,8 @@ class CapaHtmlRenderTest(unittest.TestCase): # Expect that the include file was embedded in the problem test_element = rendered_html.find("test") - self.assertEqual(test_element.tag, "test") - self.assertEqual(test_element.text, "Test include") + assert test_element.tag == 'test' + assert test_element.text == 'Test include' def test_process_outtext(self): # Generate some XML with and @@ -85,7 +85,7 @@ class CapaHtmlRenderTest(unittest.TestCase): # Expect that the and # were converted to tags span_element = rendered_html.find('span') - self.assertEqual(span_element.text, 'Test text') + assert span_element.text == 'Test text' def test_anonymous_student_id(self): # make sure anonymous_student_id is rendered properly as a context variable @@ -103,7 +103,7 @@ class CapaHtmlRenderTest(unittest.TestCase): # Expect that the anonymous_student_id was converted to "student" span_element = rendered_html.find('span') - self.assertEqual(span_element.text, 'Welcome student') + assert span_element.text == 'Welcome student' def test_render_script(self): # Generate some XML with a ", - etree.tostring(rendered_html).decode('utf-8') - ) + assert '' in etree.tostring(rendered_html).decode('utf-8') def test_render_response_xml(self): # Generate some XML for a string response @@ -162,23 +159,23 @@ class CapaHtmlRenderTest(unittest.TestCase): problem = new_loncapa_problem(xml_str, capa_system=the_system) rendered_html = etree.XML(problem.get_html()) # Expect problem has been turned into a

- self.assertEqual(rendered_html.tag, "div") + assert rendered_html.tag == 'div' # Expect that the response has been turned into a
with correct attributes response_element = rendered_html.find('div') - self.assertEqual(response_element.tag, "div") - self.assertEqual(response_element.attrib["aria-label"], "Question 1") + assert response_element.tag == 'div' + assert response_element.attrib['aria-label'] == 'Question 1' # Expect that the response div.wrapper-problem-response # that contains a
for the textline textline_element = response_element.find('div') - self.assertEqual(textline_element.text, 'Input Template Render') + assert textline_element.text == 'Input Template Render' # Expect a child
for the solution # with the rendered template solution_element = rendered_html.xpath('//div[@class="input-template-render"]')[0] - self.assertEqual(solution_element.text, 'Input Template Render') + assert solution_element.text == 'Input Template Render' # Expect that the template renderer was called with the correct # arguments, once for the textline input and once for @@ -208,10 +205,7 @@ class CapaHtmlRenderTest(unittest.TestCase): mock.call('solutionspan.html', expected_solution_context) ] - self.assertEqual( - the_system.render_template.call_args_list, - expected_calls - ) + assert the_system.render_template.call_args_list == expected_calls def test_correct_aria_label(self): xml = """ @@ -233,8 +227,8 @@ class CapaHtmlRenderTest(unittest.TestCase): problem = new_loncapa_problem(xml) rendered_html = etree.XML(problem.get_html()) response_elements = rendered_html.findall('div') - self.assertEqual(response_elements[0].attrib['aria-label'], 'Question 1') - self.assertEqual(response_elements[1].attrib['aria-label'], 'Question 2') + assert response_elements[0].attrib['aria-label'] == 'Question 1' + assert response_elements[1].attrib['aria-label'] == 'Question 2' def test_render_response_with_overall_msg(self): # CustomResponse script that sets an overall_message @@ -261,16 +255,16 @@ class CapaHtmlRenderTest(unittest.TestCase): # Expect that there is a
within the response
# with css class response_message msg_div_element = rendered_html.find(".//div[@class='response_message']") - self.assertEqual(msg_div_element.tag, "div") - self.assertEqual(msg_div_element.get('class'), "response_message") + assert msg_div_element.tag == 'div' + assert msg_div_element.get('class') == 'response_message' # Expect that the
contains our message (as part of the XML tree) msg_p_elements = msg_div_element.findall('p') - self.assertEqual(msg_p_elements[0].tag, "p") - self.assertEqual(msg_p_elements[0].text, "Test message 1") + assert msg_p_elements[0].tag == 'p' + assert msg_p_elements[0].text == 'Test message 1' - self.assertEqual(msg_p_elements[1].tag, "p") - self.assertEqual(msg_p_elements[1].text, "Test message 2") + assert msg_p_elements[1].tag == 'p' + assert msg_p_elements[1].text == 'Test message 2' def test_substitute_python_vars(self): # Generate some XML with Python variables defined in a script @@ -288,7 +282,7 @@ class CapaHtmlRenderTest(unittest.TestCase): # Expect that the variable $test has been replaced with its value span_element = rendered_html.find('span') - self.assertEqual(span_element.get('attr'), "TEST") + assert span_element.get('attr') == 'TEST' def test_xml_comments_and_other_odd_things(self): # Comments and processing instructions should be skipped. diff --git a/common/lib/capa/capa/tests/test_input_templates.py b/common/lib/capa/capa/tests/test_input_templates.py index 5d3d0ae1f2..3425c623d0 100644 --- a/common/lib/capa/capa/tests/test_input_templates.py +++ b/common/lib/capa/capa/tests/test_input_templates.py @@ -91,7 +91,7 @@ class TemplateTestCase(unittest.TestCase): message = ("XML does not have %d match(es) for xpath '%s'\nXML: %s\nContext: %s" % (exact_num, str(xpath), etree.tostring(xml_root), str(context_dict))) - self.assertEqual(len(xml_root.xpath(xpath)), exact_num, msg=message) + assert len(xml_root.xpath(xpath)) == exact_num, message def assert_no_xpath(self, xml_root, xpath, context_dict): """ @@ -117,12 +117,11 @@ class TemplateTestCase(unittest.TestCase): If no elements are found, the assertion fails. """ element_list = xml_root.xpath(xpath) - self.assertGreater(len(element_list), 0, "Could not find element at '%s'\n%s" % - (str(xpath), etree.tostring(xml_root))) + assert len(element_list) > 0, ("Could not find element at '%s'\n%s" % (str(xpath), etree.tostring(xml_root))) if exact: - self.assertEqual(text, element_list[0].text.strip()) + assert text == element_list[0].text.strip() else: - self.assertIn(text, element_list[0].text.strip()) + assert text in element_list[0].text.strip() def assert_description(self, describedby_xpaths): """ @@ -137,17 +136,17 @@ class TemplateTestCase(unittest.TestCase): descriptions = OrderedDict( (tag.get('id'), stringify_children(tag)) for tag in xml.xpath('//p[@class="question-description"]') ) - self.assertEqual(self.DESCRIPTIONS, descriptions) + assert self.DESCRIPTIONS == descriptions # for each xpath verify that description_ids are set correctly for describedby_xpath in describedby_xpaths: describedbys = xml.xpath(describedby_xpath) # aria-describedby attributes must have ids - self.assertTrue(describedbys) + assert describedbys for describedby in describedbys: - self.assertEqual(describedby, self.DESCRIPTION_IDS) + assert describedby == self.DESCRIPTION_IDS def assert_describedby_attribute(self, describedby_xpaths): """ @@ -162,7 +161,7 @@ class TemplateTestCase(unittest.TestCase): # for each xpath verify that description_ids are set correctly for describedby_xpath in describedby_xpaths: describedbys = xml.xpath(describedby_xpath) - self.assertFalse(describedbys) + assert not describedbys def assert_status(self, status_div=False, status_class=False): """ @@ -234,8 +233,8 @@ class TemplateTestCase(unittest.TestCase): self.assert_has_xpath(xml, "//*[@aria-label='%s']" % label['expected'], self.context) else: element_list = xml.xpath(xpath) - self.assertEqual(len(element_list), 1) - self.assertEqual(stringify_children(element_list[0]), label['actual']) + assert len(element_list) == 1 + assert stringify_children(element_list[0]) == label['actual'] class ChoiceGroupTemplateTest(TemplateTestCase): diff --git a/common/lib/capa/capa/tests/test_inputtypes.py b/common/lib/capa/capa/tests/test_inputtypes.py index b3df59bf5c..8c7e3be93d 100644 --- a/common/lib/capa/capa/tests/test_inputtypes.py +++ b/common/lib/capa/capa/tests/test_inputtypes.py @@ -24,6 +24,7 @@ import unittest import xml.sax.saxutils as saxutils from collections import OrderedDict +import pytest import six from lxml import etree from lxml.html import fromstring @@ -88,7 +89,7 @@ class OptionInputTest(unittest.TestCase): 'describedby_html': DESCRIBEDBY.format(status_id='sky_input') } - self.assertEqual(context, expected) + assert context == expected def test_option_parsing(self): f = inputtypes.OptionInput.parse_options @@ -98,7 +99,7 @@ class OptionInputTest(unittest.TestCase): Take list of options, confirm that output is in the silly doubled format """ expected = [(o, o) for o in options] - self.assertEqual(f(input), expected) + assert f(input) == expected check("('a','b')", ['a', 'b']) check("('a', 'b')", ['a', 'b']) @@ -159,7 +160,7 @@ class ChoiceGroupTest(unittest.TestCase): 'describedby_html': DESCRIBEDBY.format(status_id='sky_input') } - self.assertEqual(context, expected) + assert context == expected def test_choicegroup(self): self.check_group('choicegroup', 'radio', '') @@ -251,7 +252,7 @@ class JSInputTest(unittest.TestCase): } full_expected_context.update(expected_context) - self.assertEqual(full_expected_context, context) + assert full_expected_context == context class TextLineTest(unittest.TestCase): @@ -288,7 +289,7 @@ class TextLineTest(unittest.TestCase): 'response_data': RESPONSE_DATA, 'describedby_html': DESCRIBEDBY.format(status_id=prob_id) } - self.assertEqual(context, expected) + assert context == expected def test_math_rendering(self): size = "42" @@ -327,7 +328,7 @@ class TextLineTest(unittest.TestCase): 'response_data': RESPONSE_DATA, 'describedby_html': DESCRIBEDBY.format(status_id=prob_id) } - self.assertEqual(context, expected) + assert context == expected def test_trailing_text_rendering(self): size = "42" @@ -372,7 +373,7 @@ class TextLineTest(unittest.TestCase): 'response_data': RESPONSE_DATA, 'describedby_html': TRAILING_TEXT_DESCRIBEDBY.format(trailing_text_id=prob_id, status_id=prob_id) } - self.assertEqual(context, expected) + assert context == expected class FileSubmissionTest(unittest.TestCase): @@ -416,7 +417,7 @@ class FileSubmissionTest(unittest.TestCase): 'describedby_html': DESCRIBEDBY.format(status_id=prob_id) } - self.assertEqual(context, expected) + assert context == expected class CodeInputTest(unittest.TestCase): @@ -472,7 +473,7 @@ class CodeInputTest(unittest.TestCase): 'describedby_html': DESCRIBEDBY.format(status_id=prob_id) } - self.assertEqual(context, expected) + assert context == expected class MatlabTest(unittest.TestCase): @@ -534,7 +535,7 @@ class MatlabTest(unittest.TestCase): 'describedby_html': HTML('aria-describedby="status_prob_1_2"') } - self.assertEqual(context, expected) + assert context == expected def test_rendering_with_state(self): state = { @@ -569,7 +570,7 @@ class MatlabTest(unittest.TestCase): 'describedby_html': DESCRIBEDBY.format(status_id=prob_id) } - self.assertEqual(context, expected) + assert context == expected def test_rendering_when_completed(self): for status in ['correct', 'incorrect']: @@ -603,7 +604,7 @@ class MatlabTest(unittest.TestCase): 'describedby_html': DESCRIBEDBY.format(status_id=prob_id) } - self.assertEqual(context, expected) + assert context == expected @patch('capa.inputtypes.time.time', return_value=10) def test_rendering_while_queued(self, time): # lint-amnesty, pylint: disable=unused-argument @@ -637,7 +638,7 @@ class MatlabTest(unittest.TestCase): 'describedby_html': DESCRIBEDBY.format(status_id=prob_id) } - self.assertEqual(context, expected) + assert context == expected def test_plot_data(self): data = {'submission': 'x = 1234;'} @@ -645,19 +646,19 @@ class MatlabTest(unittest.TestCase): test_capa_system().xqueue['interface'].send_to_queue.assert_called_with(header=ANY, body=ANY) - self.assertTrue(response['success']) - self.assertIsNotNone(self.the_input.input_state['queuekey']) - self.assertEqual(self.the_input.input_state['queuestate'], 'queued') + assert response['success'] + assert self.the_input.input_state['queuekey'] is not None + assert self.the_input.input_state['queuestate'] == 'queued' def test_plot_data_failure(self): data = {'submission': 'x = 1234;'} error_message = 'Error message!' test_capa_system().xqueue['interface'].send_to_queue.return_value = (1, error_message) response = self.the_input.handle_ajax("plot", data) - self.assertFalse(response['success']) - self.assertEqual(response['message'], error_message) - self.assertNotIn('queuekey', self.the_input.input_state) - self.assertNotIn('queuestate', self.the_input.input_state) + assert not response['success'] + assert response['message'] == error_message + assert 'queuekey' not in self.the_input.input_state + assert 'queuestate' not in self.the_input.input_state @patch('capa.inputtypes.time.time', return_value=10) def test_ungraded_response_success(self, time): # lint-amnesty, pylint: disable=unused-argument @@ -674,9 +675,9 @@ class MatlabTest(unittest.TestCase): queue_msg = json.dumps({'msg': inner_msg}) the_input.ungraded_response(queue_msg, queuekey) - self.assertIsNone(input_state['queuekey']) - self.assertIsNone(input_state['queuestate']) - self.assertEqual(input_state['queue_msg'], inner_msg) + assert input_state['queuekey'] is None + assert input_state['queuestate'] is None + assert input_state['queue_msg'] == inner_msg @patch('capa.inputtypes.time.time', return_value=10) def test_ungraded_response_key_mismatch(self, time): # lint-amnesty, pylint: disable=unused-argument @@ -693,9 +694,9 @@ class MatlabTest(unittest.TestCase): queue_msg = json.dumps({'msg': inner_msg}) the_input.ungraded_response(queue_msg, 'abc') - self.assertEqual(input_state['queuekey'], queuekey) - self.assertEqual(input_state['queuestate'], 'queued') - self.assertNotIn('queue_msg', input_state) + assert input_state['queuekey'] == queuekey + assert input_state['queuestate'] == 'queued' + assert 'queue_msg' not in input_state @patch('capa.inputtypes.time.time', return_value=20) def test_matlab_response_timeout_not_exceeded(self, time): # lint-amnesty, pylint: disable=unused-argument @@ -704,7 +705,7 @@ class MatlabTest(unittest.TestCase): elt = etree.fromstring(self.xml) the_input = self.input_class(test_capa_system(), elt, state) - self.assertEqual(the_input.status, 'queued') + assert the_input.status == 'queued' @patch('capa.inputtypes.time.time', return_value=45) def test_matlab_response_timeout_exceeded(self, time): # lint-amnesty, pylint: disable=unused-argument @@ -713,8 +714,8 @@ class MatlabTest(unittest.TestCase): elt = etree.fromstring(self.xml) the_input = self.input_class(test_capa_system(), elt, state) - self.assertEqual(the_input.status, 'unsubmitted') - self.assertEqual(the_input.msg, 'No response from Xqueue within {} seconds. Aborted.'.format(XQUEUE_TIMEOUT)) + assert the_input.status == 'unsubmitted' + assert the_input.msg == 'No response from Xqueue within {} seconds. Aborted.'.format(XQUEUE_TIMEOUT) @patch('capa.inputtypes.time.time', return_value=20) def test_matlab_response_migration_of_queuetime(self, time): # lint-amnesty, pylint: disable=unused-argument @@ -725,7 +726,7 @@ class MatlabTest(unittest.TestCase): elt = etree.fromstring(self.xml) the_input = self.input_class(test_capa_system(), elt, state) - self.assertEqual(the_input.status, 'unsubmitted') + assert the_input.status == 'unsubmitted' def test_matlab_api_key(self): """ @@ -741,8 +742,8 @@ class MatlabTest(unittest.TestCase): body = system.xqueue['interface'].send_to_queue.call_args[1]['body'] payload = json.loads(body) - self.assertEqual('test_api_key', payload['token']) - self.assertEqual('2', payload['endpoint_version']) + assert 'test_api_key' == payload['token'] + assert '2' == payload['endpoint_version'] def test_get_html(self): # usual output @@ -791,17 +792,17 @@ class MatlabTest(unittest.TestCase): audio_index = element_tags.index('audio') six.assertCountEqual(self, element_keys[audio_index], ['autobuffer', 'controls', 'autoplay', 'src']) - self.assertEqual(elements[audio_index].get('src'), 'data:audio/wav;base64=') - self.assertEqual(elements[audio_index].text, 'Audio is not supported on this browser.') + assert elements[audio_index].get('src') == 'data:audio/wav;base64=' + assert elements[audio_index].text == 'Audio is not supported on this browser.' href_index = element_keys.index(['href']) - self.assertEqual(elements[href_index].get('href'), 'https://endpoint.mss-mathworks.com/media/filename.wav') + assert elements[href_index].get('href') == 'https://endpoint.mss-mathworks.com/media/filename.wav' id_index = element_keys.index(['id']) - self.assertEqual(elements[id_index].get('id'), 'mwAudioPlaceHolder') + assert elements[id_index].get('id') == 'mwAudioPlaceHolder' output_string = etree.tostring(output).decode('utf-8') # check that exception is raised during parsing for html. self.the_input.capa_system.render_template = lambda *args: "= 0 correct_map = problem.grade_answers({'1_2_1': 'choice_1'}) - self.assertAlmostEqual(correct_map.get_npoints('1_2_1'), 0.6) + assert round(correct_map.get_npoints('1_2_1') - 0.6, 7) >= 0 correct_map = problem.grade_answers({'1_2_1': 'choice_2'}) - self.assertAlmostEqual(correct_map.get_npoints('1_2_1'), 0) + assert round(correct_map.get_npoints('1_2_1') - 0, 7) >= 0 def test_contextualized_choices(self): script = textwrap.dedent(""" @@ -350,7 +351,7 @@ class SymbolicResponseTest(ResponseTest): # pylint: disable=missing-class-docst # Should not allow multiple inputs, since we specify # only one "expect" value - with self.assertRaises(Exception): + with pytest.raises(Exception): self.build_problem(math_display=True, expect="2*x+3*y", num_inputs=3) def _assert_symbolic_grade( @@ -375,9 +376,7 @@ class SymbolicResponseTest(ResponseTest): # pylint: disable=missing-class-docst correct_map = problem.grade_answers(input_dict) - self.assertEqual( - correct_map.get_correctness('1_2_1'), expected_correctness - ) + assert correct_map.get_correctness('1_2_1') == expected_correctness class OptionResponseTest(ResponseTest): # pylint: disable=missing-class-docstring @@ -423,8 +422,8 @@ class OptionResponseTest(ResponseTest): # pylint: disable=missing-class-docstri input_dict = {'1_2_1': '1000'} correct_map = problem.grade_answers(input_dict) - self.assertEqual(correct_map.get_correctness('1_2_1'), 'correct') - self.assertEqual(correct_map.get_property('1_2_1', 'answervariable'), '$a') + assert correct_map.get_correctness('1_2_1') == 'correct' + assert correct_map.get_property('1_2_1', 'answervariable') == '$a' class FormulaResponseTest(ResponseTest): @@ -480,14 +479,12 @@ class FormulaResponseTest(ResponseTest): # Expect to receive a hint if we add an extra y input_dict = {'1_2_1': "x + 2*y + y"} correct_map = problem.grade_answers(input_dict) - self.assertEqual(correct_map.get_hint('1_2_1'), - 'Check the coefficient of y') + assert correct_map.get_hint('1_2_1') == 'Check the coefficient of y' # Expect to receive a hint if we leave out x input_dict = {'1_2_1': "2*y"} correct_map = problem.grade_answers(input_dict) - self.assertEqual(correct_map.get_hint('1_2_1'), - 'Try including the variable x') + assert correct_map.get_hint('1_2_1') == 'Try including the variable x' def test_script(self): """ @@ -574,8 +571,8 @@ class FormulaResponseTest(ResponseTest): tolerance="1%", answer="x" ) - self.assertTrue(list(problem.responders.values())[0].validate_answer('14*x')) - self.assertFalse(list(problem.responders.values())[0].validate_answer('3*y+2*x')) + assert list(problem.responders.values())[0].validate_answer('14*x') + assert not list(problem.responders.values())[0].validate_answer('3*y+2*x') class StringResponseTest(ResponseTest): # pylint: disable=missing-class-docstring @@ -799,10 +796,10 @@ class StringResponseTest(ResponseTest): # pylint: disable=missing-class-docstri def test_exception(self): problem = self.build_problem(answer="a2", case_sensitive=False, regexp=True, additional_answers=['?\\d?']) - with self.assertRaises(Exception) as cm: + with pytest.raises(Exception) as cm: self.assert_grade(problem, "a3", "correct") exception_message = text_type(cm.exception) - self.assertIn("nothing to repeat", exception_message) + assert 'nothing to repeat' in exception_message def test_hints(self): @@ -818,24 +815,22 @@ class StringResponseTest(ResponseTest): # pylint: disable=missing-class-docstri # We should get a hint for Wisconsin input_dict = {'1_2_1': 'Wisconsin'} correct_map = problem.grade_answers(input_dict) - self.assertEqual(correct_map.get_hint('1_2_1'), - "The state capital of Wisconsin is Madison") + assert correct_map.get_hint('1_2_1') == 'The state capital of Wisconsin is Madison' # We should get a hint for Minnesota input_dict = {'1_2_1': 'Minnesota'} correct_map = problem.grade_answers(input_dict) - self.assertEqual(correct_map.get_hint('1_2_1'), - "The state capital of Minnesota is St. Paul") + assert correct_map.get_hint('1_2_1') == 'The state capital of Minnesota is St. Paul' # We should NOT get a hint for Michigan (the correct answer) input_dict = {'1_2_1': 'Michigan'} correct_map = problem.grade_answers(input_dict) - self.assertEqual(correct_map.get_hint('1_2_1'), "") + assert correct_map.get_hint('1_2_1') == '' # We should NOT get a hint for any other string input_dict = {'1_2_1': 'California'} correct_map = problem.grade_answers(input_dict) - self.assertEqual(correct_map.get_hint('1_2_1'), "") + assert correct_map.get_hint('1_2_1') == '' def test_hints_regexp_and_answer_regexp(self): different_student_answers = [ @@ -867,38 +862,36 @@ class StringResponseTest(ResponseTest): # pylint: disable=missing-class-docstri # We should get a hint for Wisconsin input_dict = {'1_2_1': 'Wisconsin'} correct_map = problem.grade_answers(input_dict) - self.assertEqual(correct_map.get_hint('1_2_1'), - "The state capital of Wisconsin is Madison") + assert correct_map.get_hint('1_2_1') == 'The state capital of Wisconsin is Madison' # We should get a hint for Minnesota input_dict = {'1_2_1': 'Minnesota'} correct_map = problem.grade_answers(input_dict) - self.assertEqual(correct_map.get_hint('1_2_1'), - "The state capital of Minnesota is St. Paul") + assert correct_map.get_hint('1_2_1') == 'The state capital of Minnesota is St. Paul' # We should NOT get a hint for Michigan (the correct answer) input_dict = {'1_2_1': 'Michigan'} correct_map = problem.grade_answers(input_dict) - self.assertEqual(correct_map.get_hint('1_2_1'), "") + assert correct_map.get_hint('1_2_1') == '' # We should NOT get a hint for any other string input_dict = {'1_2_1': 'California'} correct_map = problem.grade_answers(input_dict) - self.assertEqual(correct_map.get_hint('1_2_1'), "") + assert correct_map.get_hint('1_2_1') == '' # We should get the same hint for each answer for answer in different_student_answers: input_dict = {'1_2_1': answer} correct_map = problem.grade_answers(input_dict) - self.assertEqual(correct_map.get_hint('1_2_1'), "First letter of correct answer is M.") + assert correct_map.get_hint('1_2_1') == 'First letter of correct answer is M.' input_dict = {'1_2_1': '59'} correct_map = problem.grade_answers(input_dict) - self.assertEqual(correct_map.get_hint('1_2_1'), "Should not end with 9.") + assert correct_map.get_hint('1_2_1') == 'Should not end with 9.' input_dict = {'1_2_1': '57'} correct_map = problem.grade_answers(input_dict) - self.assertEqual(correct_map.get_hint('1_2_1'), "") + assert correct_map.get_hint('1_2_1') == '' def test_computed_hints(self): problem = self.build_problem( @@ -914,7 +907,7 @@ class StringResponseTest(ResponseTest): # pylint: disable=missing-class-docstri input_dict = {'1_2_1': 'Hello'} correct_map = problem.grade_answers(input_dict) - self.assertEqual(correct_map.get_hint('1_2_1'), "Hello??") + assert correct_map.get_hint('1_2_1') == 'Hello??' def test_hint_function_randomization(self): # The hint function should get the seed from the problem. @@ -930,7 +923,7 @@ class StringResponseTest(ResponseTest): # pylint: disable=missing-class-docstri ) correct_map = problem.grade_answers({'1_2_1': '2'}) hint = correct_map.get_hint('1_2_1') - self.assertEqual(hint, self._get_random_number_result(problem.seed)) + assert hint == self._get_random_number_result(problem.seed) def test_empty_answer_graded_as_incorrect(self): """ @@ -971,7 +964,7 @@ class CodeResponseTest(ResponseTest): # pylint: disable=missing-class-docstring cmap.update(CorrectMap(answer_id=answer_id, queuestate=None)) self.problem.correct_map.update(cmap) - self.assertEqual(self.problem.is_queued(), False) + assert self.problem.is_queued() is False # Now we queue the LCP cmap = CorrectMap() @@ -980,7 +973,7 @@ class CodeResponseTest(ResponseTest): # pylint: disable=missing-class-docstring cmap.update(CorrectMap(answer_id=answer_ids[i], queuestate=queuestate)) self.problem.correct_map.update(cmap) - self.assertEqual(self.problem.is_queued(), True) + assert self.problem.is_queued() is True def test_update_score(self): ''' @@ -1009,10 +1002,12 @@ class CodeResponseTest(ResponseTest): # pylint: disable=missing-class-docstring self.problem.correct_map.update(old_cmap) # Deep copy self.problem.update_score(xserver_msgs[correctness], queuekey=0) - self.assertEqual(self.problem.correct_map.get_dict(), old_cmap.get_dict()) # Deep comparison + assert self.problem.correct_map.get_dict() == old_cmap.get_dict() + # Deep comparison for answer_id in answer_ids: - self.assertTrue(self.problem.correct_map.is_queued(answer_id)) # Should be still queued, since message undelivered # lint-amnesty, pylint: disable=line-too-long + assert self.problem.correct_map.is_queued(answer_id) + # Should be still queued, since message undelivered # lint-amnesty, pylint: disable=line-too-long # Correct queuekey, state should be updated for correctness in ['correct', 'incorrect']: @@ -1026,13 +1021,15 @@ class CodeResponseTest(ResponseTest): # pylint: disable=missing-class-docstring new_cmap.set(answer_id=answer_id, npoints=npoints, correctness=correctness, msg=grader_msg, queuestate=None) # lint-amnesty, pylint: disable=line-too-long self.problem.update_score(xserver_msgs[correctness], queuekey=1000 + i) - self.assertEqual(self.problem.correct_map.get_dict(), new_cmap.get_dict()) + assert self.problem.correct_map.get_dict() == new_cmap.get_dict() for j, test_id in enumerate(answer_ids): if j == i: - self.assertFalse(self.problem.correct_map.is_queued(test_id)) # Should be dequeued, message delivered # lint-amnesty, pylint: disable=line-too-long + assert not self.problem.correct_map.is_queued(test_id) + # Should be dequeued, message delivered # lint-amnesty, pylint: disable=line-too-long else: - self.assertTrue(self.problem.correct_map.is_queued(test_id)) # Should be queued, message undelivered # lint-amnesty, pylint: disable=line-too-long + assert self.problem.correct_map.is_queued(test_id) + # Should be queued, message undelivered # lint-amnesty, pylint: disable=line-too-long def test_recentmost_queuetime(self): ''' @@ -1046,7 +1043,7 @@ class CodeResponseTest(ResponseTest): # pylint: disable=missing-class-docstring cmap.update(CorrectMap(answer_id=answer_id, queuestate=None)) self.problem.correct_map.update(cmap) - self.assertEqual(self.problem.get_recentmost_queuetime(), None) + assert self.problem.get_recentmost_queuetime() is None # CodeResponse requires internal CorrectMap state. Build it now in the queued state cmap = CorrectMap() @@ -1062,7 +1059,7 @@ class CodeResponseTest(ResponseTest): # pylint: disable=missing-class-docstring datetime.strftime(latest_timestamp, dateformat), dateformat ).replace(tzinfo=UTC) - self.assertEqual(self.problem.get_recentmost_queuetime(), latest_timestamp) + assert self.problem.get_recentmost_queuetime() == latest_timestamp def test_convert_files_to_filenames(self): ''' @@ -1074,9 +1071,9 @@ class CodeResponseTest(ResponseTest): # pylint: disable=missing-class-docstring '1_3_1': ['answer1', 'answer2', 'answer3'], '1_4_1': [fp, fp]} answers_converted = convert_files_to_filenames(answers_with_file) - self.assertEqual(answers_converted['1_2_1'], 'String-based answer') - self.assertEqual(answers_converted['1_3_1'], ['answer1', 'answer2', 'answer3']) - self.assertEqual(answers_converted['1_4_1'], [fp.name, fp.name]) + assert answers_converted['1_2_1'] == 'String-based answer' + assert answers_converted['1_3_1'] == ['answer1', 'answer2', 'answer3'] + assert answers_converted['1_4_1'] == [fp.name, fp.name] def test_parse_score_msg_of_responder(self): """ @@ -1116,7 +1113,7 @@ class CodeResponseTest(ResponseTest): # pylint: disable=missing-class-docstring self.problem.correct_map = CorrectMap() self.problem.correct_map.update(old_cmap) output = self.problem.update_score(xserver_msgs['correct'], queuekey=1000 + i) - self.assertEqual(output[answer_id]['msg'], grader_msg) + assert output[answer_id]['msg'] == grader_msg for grader_msg in invalid_grader_msgs: correct_score_msg = json.dumps({'correct': True, 'score': 1, 'msg': grader_msg}) @@ -1128,7 +1125,7 @@ class CodeResponseTest(ResponseTest): # pylint: disable=missing-class-docstring self.problem.correct_map.update(old_cmap) output = self.problem.update_score(xserver_msgs['correct'], queuekey=1000 + i) - self.assertEqual(output[answer_id]['msg'], u'Invalid grader reply. Please contact the course staff.') + assert output[answer_id]['msg'] == u'Invalid grader reply. Please contact the course staff.' class ChoiceResponseTest(ResponseTest): # pylint: disable=missing-class-docstring @@ -1169,7 +1166,7 @@ class ChoiceResponseTest(ResponseTest): # pylint: disable=missing-class-docstri choices=[False, False, True, True], credit_type='edc,halves,bongo' ) - with self.assertRaises(LoncapaProblemError): + with pytest.raises(LoncapaProblemError): input_dict = {'1_2_1': 'choice_1'} problem.grade_answers(input_dict) @@ -1179,7 +1176,7 @@ class ChoiceResponseTest(ResponseTest): # pylint: disable=missing-class-docstri choices=[False, False, True, True], credit_type='bongo' ) - with self.assertRaises(LoncapaProblemError): + with pytest.raises(LoncapaProblemError): input_dict = {'1_2_1': 'choice_1'} problem.grade_answers(input_dict) @@ -1245,7 +1242,7 @@ class ChoiceResponseTest(ResponseTest): # pylint: disable=missing-class-docstri ) correct_map = problem.grade_answers({'1_2_1': 'choice_2'}) - self.assertAlmostEqual(correct_map.get_npoints('1_2_1'), 0.75) + assert round(correct_map.get_npoints('1_2_1') - 0.75, 7) >= 0 # Second: Halves grading style problem = self.build_problem( @@ -1255,7 +1252,7 @@ class ChoiceResponseTest(ResponseTest): # pylint: disable=missing-class-docstri ) correct_map = problem.grade_answers({'1_2_1': 'choice_2'}) - self.assertAlmostEqual(correct_map.get_npoints('1_2_1'), 0.5) + assert round(correct_map.get_npoints('1_2_1') - 0.5, 7) >= 0 # Third: Halves grading style with more options problem = self.build_problem( @@ -1265,7 +1262,7 @@ class ChoiceResponseTest(ResponseTest): # pylint: disable=missing-class-docstri ) correct_map = problem.grade_answers({'1_2_1': 'choice_2,choice4'}) - self.assertAlmostEqual(correct_map.get_npoints('1_2_1'), 0.25) + assert round(correct_map.get_npoints('1_2_1') - 0.25, 7) >= 0 def test_grade_with_no_checkbox_selected(self): """ @@ -1276,7 +1273,7 @@ class ChoiceResponseTest(ResponseTest): # pylint: disable=missing-class-docstri ) correct_map = problem.grade_answers({}) - self.assertEqual(correct_map.get_correctness('1_2_1'), 'incorrect') + assert correct_map.get_correctness('1_2_1') == 'incorrect' def test_contextualized_choices(self): script = textwrap.dedent(""" @@ -1337,14 +1334,14 @@ class NumericalResponseTest(ResponseTest): # pylint: disable=missing-class-docs # Assert primary answer is graded correctly. correct_map = problem.grade_answers({'1_2_1': primary_answer}) - self.assertEqual(correct_map.get_correctness('1_2_1'), 'correct') - self.assertIn(primary_correcthint, correct_map.get_msg('1_2_1')) + assert correct_map.get_correctness('1_2_1') == 'correct' + assert primary_correcthint in correct_map.get_msg('1_2_1') # Assert additional answers are graded correct for answer, correcthint in additional_answers.items(): correct_map = problem.grade_answers({'1_2_1': answer}) - self.assertEqual(correct_map.get_correctness('1_2_1'), 'correct') - self.assertIn(correcthint, correct_map.get_msg('1_2_1')) + assert correct_map.get_correctness('1_2_1') == 'correct' + assert correcthint in correct_map.get_msg('1_2_1') def test_additional_answer_get_score(self): """ @@ -1355,15 +1352,15 @@ class NumericalResponseTest(ResponseTest): # pylint: disable=missing-class-docs # Check primary answer. new_cmap = responder.get_score({'1_2_1': '100'}) - self.assertEqual(new_cmap.get_correctness('1_2_1'), 'correct') + assert new_cmap.get_correctness('1_2_1') == 'correct' # Check additional answer. new_cmap = responder.get_score({'1_2_1': '1'}) - self.assertEqual(new_cmap.get_correctness('1_2_1'), 'correct') + assert new_cmap.get_correctness('1_2_1') == 'correct' # Check any wrong answer. new_cmap = responder.get_score({'1_2_1': '2'}) - self.assertEqual(new_cmap.get_correctness('1_2_1'), 'incorrect') + assert new_cmap.get_correctness('1_2_1') == 'incorrect' def test_grade_range_tolerance_partial_credit(self): problem_setup = [ @@ -1404,13 +1401,13 @@ class NumericalResponseTest(ResponseTest): # pylint: disable=missing-class-docs # no complex number in range tolerance staff answer problem = self.build_problem(answer='[1j, 5]') input_dict = {'1_2_1': '3'} - with self.assertRaises(StudentInputError): + with pytest.raises(StudentInputError): problem.grade_answers(input_dict) # no complex numbers in student ansers to range tolerance problems problem = self.build_problem(answer='(1, 5)') input_dict = {'1_2_1': '1*J'} - with self.assertRaises(StudentInputError): + with pytest.raises(StudentInputError): problem.grade_answers(input_dict) # test isnan student input: no exception, @@ -1419,16 +1416,16 @@ class NumericalResponseTest(ResponseTest): # pylint: disable=missing-class-docs input_dict = {'1_2_1': ''} correct_map = problem.grade_answers(input_dict) correctness = correct_map.get_correctness('1_2_1') - self.assertEqual(correctness, 'incorrect') + assert correctness == 'incorrect' # test invalid range tolerance answer - with self.assertRaises(StudentInputError): + with pytest.raises(StudentInputError): problem = self.build_problem(answer='(1 5)') # test empty boundaries problem = self.build_problem(answer='(1, ]') input_dict = {'1_2_1': '3'} - with self.assertRaises(StudentInputError): + with pytest.raises(StudentInputError): problem.grade_answers(input_dict) def test_grade_exact(self): @@ -1489,7 +1486,7 @@ class NumericalResponseTest(ResponseTest): # pylint: disable=missing-class-docs # 'bongo' is not a valid grading scheme. problem = self.build_problem(answer=4, tolerance=0.1, credit_type='bongo') input_dict = {'1_2_1': '4'} - with self.assertRaises(LoncapaProblemError): + with pytest.raises(LoncapaProblemError): problem.grade_answers(input_dict) def test_grade_decimal_tolerance(self): @@ -1556,7 +1553,7 @@ class NumericalResponseTest(ResponseTest): # pylint: disable=missing-class-docs """See if division by zero is handled correctly.""" problem = self.build_problem(answer="1") # Answer doesn't matter input_dict = {'1_2_1': '1/0'} - with self.assertRaises(StudentInputError): + with pytest.raises(StudentInputError): problem.grade_answers(input_dict) def test_staff_inputs_expressions(self): @@ -1662,15 +1659,15 @@ class NumericalResponseTest(ResponseTest): # pylint: disable=missing-class-docs """Tests the answer compare function.""" problem = self.build_problem(answer="42") responder = list(problem.responders.values())[0] - self.assertTrue(responder.compare_answer('48', '8*6')) - self.assertFalse(responder.compare_answer('48', '9*5')) + assert responder.compare_answer('48', '8*6') + assert not responder.compare_answer('48', '9*5') def test_validate_answer(self): """Tests the answer validation function.""" problem = self.build_problem(answer="42") responder = list(problem.responders.values())[0] - self.assertTrue(responder.validate_answer('23.5')) - self.assertFalse(responder.validate_answer('fish')) + assert responder.validate_answer('23.5') + assert not responder.validate_answer('fish') class CustomResponseTest(ResponseTest): # pylint: disable=missing-class-docstring @@ -1704,11 +1701,11 @@ class CustomResponseTest(ResponseTest): # pylint: disable=missing-class-docstri # Check that the message for the particular input was received input_msg = correctmap.get_msg('1_2_1') - self.assertEqual(input_msg, "Test Message") + assert input_msg == 'Test Message' # Check that the overall message (for the whole response) was received overall_msg = correctmap.get_overall_message() - self.assertEqual(overall_msg, "Overall message") + assert overall_msg == 'Overall message' def test_inline_randomization(self): # Make sure the seed from the problem gets fed into the script execution. @@ -1719,7 +1716,7 @@ class CustomResponseTest(ResponseTest): # pylint: disable=missing-class-docstri correctmap = problem.grade_answers(input_dict) input_msg = correctmap.get_msg('1_2_1') - self.assertEqual(input_msg, self._get_random_number_result(problem.seed)) + assert input_msg == self._get_random_number_result(problem.seed) def test_function_code_single_input(self): # For function code, we pass in these arguments: @@ -1754,9 +1751,9 @@ class CustomResponseTest(ResponseTest): # pylint: disable=missing-class-docstri msg = correct_map.get_msg('1_2_1') npoints = correct_map.get_npoints('1_2_1') - self.assertEqual(correctness, 'correct') - self.assertEqual(msg, "Message text") - self.assertEqual(npoints, 1) + assert correctness == 'correct' + assert msg == 'Message text' + assert npoints == 1 # Partially Credit answer input_dict = {'1_2_1': '21'} @@ -1766,9 +1763,9 @@ class CustomResponseTest(ResponseTest): # pylint: disable=missing-class-docstri msg = correct_map.get_msg('1_2_1') npoints = correct_map.get_npoints('1_2_1') - self.assertEqual(correctness, 'partially-correct') - self.assertEqual(msg, "Message text") - self.assertTrue(0 <= npoints <= 1) + assert correctness == 'partially-correct' + assert msg == 'Message text' + assert 0 <= npoints <= 1 # Incorrect answer input_dict = {'1_2_1': '0'} @@ -1778,9 +1775,9 @@ class CustomResponseTest(ResponseTest): # pylint: disable=missing-class-docstri msg = correct_map.get_msg('1_2_1') npoints = correct_map.get_npoints('1_2_1') - self.assertEqual(correctness, 'incorrect') - self.assertEqual(msg, "Message text") - self.assertEqual(npoints, 0) + assert correctness == 'incorrect' + assert msg == 'Message text' + assert npoints == 0 def test_function_code_single_input_decimal_score(self): # For function code, we pass in these arguments: @@ -1817,20 +1814,20 @@ class CustomResponseTest(ResponseTest): # pylint: disable=missing-class-docstri # Correct answer input_dict = {'1_2_1': '42'} correct_map = problem.grade_answers(input_dict) - self.assertEqual(correct_map.get_npoints('1_2_1'), 0.9) - self.assertEqual(correct_map.get_correctness('1_2_1'), 'correct') + assert correct_map.get_npoints('1_2_1') == 0.9 + assert correct_map.get_correctness('1_2_1') == 'correct' # Incorrect answer input_dict = {'1_2_1': '43'} correct_map = problem.grade_answers(input_dict) - self.assertEqual(correct_map.get_npoints('1_2_1'), 0.1) - self.assertEqual(correct_map.get_correctness('1_2_1'), 'incorrect') + assert correct_map.get_npoints('1_2_1') == 0.1 + assert correct_map.get_correctness('1_2_1') == 'incorrect' # Partially Correct answer input_dict = {'1_2_1': '21'} correct_map = problem.grade_answers(input_dict) - self.assertEqual(correct_map.get_npoints('1_2_1'), 0.5) - self.assertEqual(correct_map.get_correctness('1_2_1'), 'partially-correct') + assert correct_map.get_npoints('1_2_1') == 0.5 + assert correct_map.get_correctness('1_2_1') == 'partially-correct' def test_script_context(self): # Ensure that python script variables can be used in the "expect" and "answer" fields, @@ -1853,11 +1850,11 @@ class CustomResponseTest(ResponseTest): # pylint: disable=missing-class-docstri correctmap = problem.grade_answers(input_dict) # CustomResponse also adds 'expect' to the problem context; check that directly first: - self.assertEqual(problem.context['expect'], '42') + assert problem.context['expect'] == '42' # Also make sure the problem was graded correctly: correctness = correctmap.get_correctness('1_2_1') - self.assertEqual(correctness, 'correct') + assert correctness == 'correct' def test_function_code_multiple_input_no_msg(self): @@ -1885,32 +1882,32 @@ class CustomResponseTest(ResponseTest): # pylint: disable=missing-class-docstri correct_map = problem.grade_answers(input_dict) correctness = correct_map.get_correctness('1_2_1') - self.assertEqual(correctness, 'correct') + assert correctness == 'correct' correctness = correct_map.get_correctness('1_2_2') - self.assertEqual(correctness, 'correct') + assert correctness == 'correct' # One answer incorrect -- expect both inputs marked partially correct input_dict = {'1_2_1': '0', '1_2_2': '42'} correct_map = problem.grade_answers(input_dict) correctness = correct_map.get_correctness('1_2_1') - self.assertEqual(correctness, 'partially-correct') - self.assertTrue(0 <= correct_map.get_npoints('1_2_1') <= 1) + assert correctness == 'partially-correct' + assert 0 <= correct_map.get_npoints('1_2_1') <= 1 correctness = correct_map.get_correctness('1_2_2') - self.assertEqual(correctness, 'partially-correct') - self.assertTrue(0 <= correct_map.get_npoints('1_2_2') <= 1) + assert correctness == 'partially-correct' + assert 0 <= correct_map.get_npoints('1_2_2') <= 1 # Both answers incorrect -- expect both inputs marked incorrect input_dict = {'1_2_1': '0', '1_2_2': '0'} correct_map = problem.grade_answers(input_dict) correctness = correct_map.get_correctness('1_2_1') - self.assertEqual(correctness, 'incorrect') + assert correctness == 'incorrect' correctness = correct_map.get_correctness('1_2_2') - self.assertEqual(correctness, 'incorrect') + assert correctness == 'incorrect' def test_function_code_multiple_inputs(self): @@ -1950,25 +1947,25 @@ class CustomResponseTest(ResponseTest): # pylint: disable=missing-class-docstri correct_map = problem.grade_answers(input_dict) # Expect that we receive the overall message (for the whole response) - self.assertEqual(correct_map.get_overall_message(), "Overall message") + assert correct_map.get_overall_message() == 'Overall message' # Expect that the inputs were graded individually - self.assertEqual(correct_map.get_correctness('1_2_1'), 'incorrect') - self.assertEqual(correct_map.get_correctness('1_2_2'), 'correct') - self.assertEqual(correct_map.get_correctness('1_2_3'), 'correct') - self.assertEqual(correct_map.get_correctness('1_2_4'), 'partially-correct') + assert correct_map.get_correctness('1_2_1') == 'incorrect' + assert correct_map.get_correctness('1_2_2') == 'correct' + assert correct_map.get_correctness('1_2_3') == 'correct' + assert correct_map.get_correctness('1_2_4') == 'partially-correct' # Expect that the inputs were given correct npoints - self.assertEqual(correct_map.get_npoints('1_2_1'), 0) - self.assertEqual(correct_map.get_npoints('1_2_2'), 1) - self.assertEqual(correct_map.get_npoints('1_2_3'), 1) - self.assertTrue(0 <= correct_map.get_npoints('1_2_4') <= 1) + assert correct_map.get_npoints('1_2_1') == 0 + assert correct_map.get_npoints('1_2_2') == 1 + assert correct_map.get_npoints('1_2_3') == 1 + assert 0 <= correct_map.get_npoints('1_2_4') <= 1 # Expect that we received messages for each individual input - self.assertEqual(correct_map.get_msg('1_2_1'), 'Feedback 1') - self.assertEqual(correct_map.get_msg('1_2_2'), 'Feedback 2') - self.assertEqual(correct_map.get_msg('1_2_3'), 'Feedback 3') - self.assertEqual(correct_map.get_msg('1_2_4'), 'Feedback 4') + assert correct_map.get_msg('1_2_1') == 'Feedback 1' + assert correct_map.get_msg('1_2_2') == 'Feedback 2' + assert correct_map.get_msg('1_2_3') == 'Feedback 3' + assert correct_map.get_msg('1_2_4') == 'Feedback 4' def test_function_code_multiple_inputs_decimal_score(self): @@ -2008,16 +2005,16 @@ class CustomResponseTest(ResponseTest): # pylint: disable=missing-class-docstri correct_map = problem.grade_answers(input_dict) # Expect that the inputs were graded individually - self.assertEqual(correct_map.get_correctness('1_2_1'), 'incorrect') - self.assertEqual(correct_map.get_correctness('1_2_2'), 'correct') - self.assertEqual(correct_map.get_correctness('1_2_3'), 'correct') - self.assertEqual(correct_map.get_correctness('1_2_4'), 'partially-correct') + assert correct_map.get_correctness('1_2_1') == 'incorrect' + assert correct_map.get_correctness('1_2_2') == 'correct' + assert correct_map.get_correctness('1_2_3') == 'correct' + assert correct_map.get_correctness('1_2_4') == 'partially-correct' # Expect that the inputs were given correct npoints - self.assertEqual(correct_map.get_npoints('1_2_1'), 0.1) - self.assertEqual(correct_map.get_npoints('1_2_2'), 0.9) - self.assertEqual(correct_map.get_npoints('1_2_3'), 0.9) - self.assertEqual(correct_map.get_npoints('1_2_4'), 0.7) + assert correct_map.get_npoints('1_2_1') == 0.1 + assert correct_map.get_npoints('1_2_2') == 0.9 + assert correct_map.get_npoints('1_2_3') == 0.9 + assert correct_map.get_npoints('1_2_4') == 0.7 def test_function_code_with_extra_args(self): script = textwrap.dedent("""\ @@ -2048,8 +2045,8 @@ class CustomResponseTest(ResponseTest): # pylint: disable=missing-class-docstri correctness = correct_map.get_correctness('1_2_1') msg = correct_map.get_msg('1_2_1') - self.assertEqual(correctness, 'correct') - self.assertEqual(msg, "Message text") + assert correctness == 'correct' + assert msg == 'Message text' # Partially Correct answer input_dict = {'1_2_1': '21'} @@ -2058,8 +2055,8 @@ class CustomResponseTest(ResponseTest): # pylint: disable=missing-class-docstri correctness = correct_map.get_correctness('1_2_1') msg = correct_map.get_msg('1_2_1') - self.assertEqual(correctness, 'partially-correct') - self.assertEqual(msg, "Message text") + assert correctness == 'partially-correct' + assert msg == 'Message text' # Incorrect answer input_dict = {'1_2_1': '0'} @@ -2068,8 +2065,8 @@ class CustomResponseTest(ResponseTest): # pylint: disable=missing-class-docstri correctness = correct_map.get_correctness('1_2_1') msg = correct_map.get_msg('1_2_1') - self.assertEqual(correctness, 'incorrect') - self.assertEqual(msg, "Message text") + assert correctness == 'incorrect' + assert msg == 'Message text' def test_function_code_with_attempt_number(self): script = textwrap.dedent("""\ @@ -2098,8 +2095,8 @@ class CustomResponseTest(ResponseTest): # pylint: disable=missing-class-docstri correctness = correct_map.get_correctness('1_2_1') msg = correct_map.get_msg('1_2_1') - self.assertEqual(correctness, 'correct') - self.assertEqual(msg, "This is attempt number 1") + assert correctness == 'correct' + assert msg == 'This is attempt number 1' # second attempt problem.context['attempt'] = 2 @@ -2108,8 +2105,8 @@ class CustomResponseTest(ResponseTest): # pylint: disable=missing-class-docstri correctness = correct_map.get_correctness('1_2_1') msg = correct_map.get_msg('1_2_1') - self.assertEqual(correctness, 'correct') - self.assertEqual(msg, "This is attempt number 2") + assert correctness == 'correct' + assert msg == 'This is attempt number 2' def test_multiple_inputs_return_one_status(self): # When given multiple inputs, the 'answer_given' argument @@ -2143,30 +2140,30 @@ class CustomResponseTest(ResponseTest): # pylint: disable=missing-class-docstri correct_map = problem.grade_answers(input_dict) # Everything marked incorrect - self.assertEqual(correct_map.get_correctness('1_2_1'), 'incorrect') - self.assertEqual(correct_map.get_correctness('1_2_2'), 'incorrect') - self.assertEqual(correct_map.get_correctness('1_2_3'), 'incorrect') + assert correct_map.get_correctness('1_2_1') == 'incorrect' + assert correct_map.get_correctness('1_2_2') == 'incorrect' + assert correct_map.get_correctness('1_2_3') == 'incorrect' # Grade the inputs (one input partially correct) input_dict = {'1_2_1': '-1', '1_2_2': '2', '1_2_3': '3'} correct_map = problem.grade_answers(input_dict) # Everything marked partially correct - self.assertEqual(correct_map.get_correctness('1_2_1'), 'partially-correct') - self.assertEqual(correct_map.get_correctness('1_2_2'), 'partially-correct') - self.assertEqual(correct_map.get_correctness('1_2_3'), 'partially-correct') + assert correct_map.get_correctness('1_2_1') == 'partially-correct' + assert correct_map.get_correctness('1_2_2') == 'partially-correct' + assert correct_map.get_correctness('1_2_3') == 'partially-correct' # Grade the inputs (everything correct) input_dict = {'1_2_1': '1', '1_2_2': '2', '1_2_3': '3'} correct_map = problem.grade_answers(input_dict) # Everything marked incorrect - self.assertEqual(correct_map.get_correctness('1_2_1'), 'correct') - self.assertEqual(correct_map.get_correctness('1_2_2'), 'correct') - self.assertEqual(correct_map.get_correctness('1_2_3'), 'correct') + assert correct_map.get_correctness('1_2_1') == 'correct' + assert correct_map.get_correctness('1_2_2') == 'correct' + assert correct_map.get_correctness('1_2_3') == 'correct' # Message is interpreted as an "overall message" - self.assertEqual(correct_map.get_overall_message(), 'Message text') + assert correct_map.get_overall_message() == 'Message text' def test_script_exception_function(self): @@ -2179,7 +2176,7 @@ class CustomResponseTest(ResponseTest): # pylint: disable=missing-class-docstri problem = self.build_problem(script=script, cfn="check_func") # Expect that an exception gets raised when we check the answer - with self.assertRaises(ResponseError): + with pytest.raises(ResponseError): problem.grade_answers({'1_2_1': '42'}) def test_script_exception_inline(self): @@ -2189,7 +2186,7 @@ class CustomResponseTest(ResponseTest): # pylint: disable=missing-class-docstri problem = self.build_problem(answer=script) # Expect that an exception gets raised when we check the answer - with self.assertRaises(ResponseError): + with pytest.raises(ResponseError): problem.grade_answers({'1_2_1': '42'}) def test_invalid_dict_exception(self): @@ -2203,7 +2200,7 @@ class CustomResponseTest(ResponseTest): # pylint: disable=missing-class-docstri problem = self.build_problem(script=script, cfn="check_func") # Expect that an exception gets raised when we check the answer - with self.assertRaises(ResponseError): + with pytest.raises(ResponseError): problem.grade_answers({'1_2_1': '42'}) def test_setup_randomization(self): @@ -2212,7 +2209,7 @@ class CustomResponseTest(ResponseTest): # pylint: disable=missing-class-docstri num = {code} """.format(code=self._get_random_number_code())) problem = self.build_problem(script=script) - self.assertEqual(problem.context['num'], self._get_random_number_result(problem.seed)) + assert problem.context['num'] == self._get_random_number_result(problem.seed) def test_check_function_randomization(self): # The check function should get random-seeded from the problem. @@ -2225,7 +2222,7 @@ class CustomResponseTest(ResponseTest): # pylint: disable=missing-class-docstri input_dict = {'1_2_1': '42'} correct_map = problem.grade_answers(input_dict) msg = correct_map.get_msg('1_2_1') - self.assertEqual(msg, self._get_random_number_result(problem.seed)) + assert msg == self._get_random_number_result(problem.seed) def test_random_isnt_none(self): # Bug LMS-500 says random.seed(10) fails with: @@ -2243,7 +2240,7 @@ class CustomResponseTest(ResponseTest): # pylint: disable=missing-class-docstri num = random.randint(0, 1e9) """) problem = self.build_problem(script=script) - self.assertEqual(problem.context['num'], num) + assert problem.context['num'] == num def test_module_imports_inline(self): ''' @@ -2322,7 +2319,7 @@ class CustomResponseTest(ResponseTest): # pylint: disable=missing-class-docstri capa_system = test_capa_system() capa_system.get_python_lib_zip = lambda: zipstring.getvalue() # lint-amnesty, pylint: disable=unnecessary-lambda problem = self.build_problem(script=script, capa_system=capa_system) - self.assertEqual(problem.context['num'], 17) + assert problem.context['num'] == 17 def test_function_code_multiple_inputs_order(self): # Ensure that order must be correct according to sub-problem position @@ -2378,18 +2375,18 @@ class CustomResponseTest(ResponseTest): # pylint: disable=missing-class-docstri correct_map = problem.grade_answers(input_dict) - self.assertNotEqual(list(problem.student_answers.keys()), correct_order) + assert list(problem.student_answers.keys()) != correct_order # euqal to correct order after sorting at get_score self.assertListEqual(list(problem.responders.values())[0].context['idset'], correct_order) - self.assertEqual(correct_map.get_correctness('1_2_1'), 'correct') - self.assertEqual(correct_map.get_correctness('1_2_9'), 'correct') - self.assertEqual(correct_map.get_correctness('1_2_11'), 'incorrect') + assert correct_map.get_correctness('1_2_1') == 'correct' + assert correct_map.get_correctness('1_2_9') == 'correct' + assert correct_map.get_correctness('1_2_11') == 'incorrect' - self.assertEqual(correct_map.get_msg('1_2_1'), '1') - self.assertEqual(correct_map.get_msg('1_2_9'), '9') - self.assertEqual(correct_map.get_msg('1_2_11'), '11') + assert correct_map.get_msg('1_2_1') == '1' + assert correct_map.get_msg('1_2_9') == '9' + assert correct_map.get_msg('1_2_11') == '11' class SchematicResponseTest(ResponseTest): @@ -2420,7 +2417,7 @@ class SchematicResponseTest(ResponseTest): # Expect that the problem is graded as true # (That is, our script verifies that the context # is what we expect) - self.assertEqual(correct_map.get_correctness('1_2_1'), 'correct') + assert correct_map.get_correctness('1_2_1') == 'correct' def test_check_function_randomization(self): # The check function should get a random seed from the problem. @@ -2431,7 +2428,7 @@ class SchematicResponseTest(ResponseTest): input_dict = {'1_2_1': json.dumps(submission_dict)} correct_map = problem.grade_answers(input_dict) - self.assertEqual(correct_map.get_correctness('1_2_1'), 'correct') + assert correct_map.get_correctness('1_2_1') == 'correct' def test_script_exception(self): # Construct a script that will raise an exception @@ -2439,7 +2436,7 @@ class SchematicResponseTest(ResponseTest): problem = self.build_problem(answer=script) # Expect that an exception gets raised when we check the answer - with self.assertRaises(ResponseError): + with pytest.raises(ResponseError): submission_dict = {'test': 'test'} input_dict = {'1_2_1': json.dumps(submission_dict)} problem.grade_answers(input_dict) @@ -2476,10 +2473,9 @@ class AnnotationResponseTest(ResponseTest): # lint-amnesty, pylint: disable=mis actual_correctness = correct_map.get_correctness(answer_id) actual_points = correct_map.get_npoints(answer_id) - self.assertEqual(expected_correctness, actual_correctness, - msg="%s should be marked %s" % (answer_id, expected_correctness)) - self.assertEqual(expected_points, actual_points, - msg="%s should have %d points" % (answer_id, expected_points)) + assert expected_correctness == actual_correctness,\ + ('%s should be marked %s' % (answer_id, expected_correctness)) + assert expected_points == actual_points, ('%s should have %d points' % (answer_id, expected_points)) class ChoiceTextResponseTest(ResponseTest): @@ -2654,7 +2650,7 @@ class ChoiceTextResponseTest(ResponseTest): """ Test that build problem raises errors for invalid options """ - with self.assertRaises(Exception): + with pytest.raises(Exception): self.build_problem(type="invalidtextgroup") def test_unchecked_input_not_validated(self): diff --git a/common/lib/capa/capa/tests/test_shuffle.py b/common/lib/capa/capa/tests/test_shuffle.py index 0a87c2edf2..38b22173f4 100644 --- a/common/lib/capa/capa/tests/test_shuffle.py +++ b/common/lib/capa/capa/tests/test_shuffle.py @@ -35,9 +35,9 @@ class CapaShuffleTest(unittest.TestCase): self.assertRegex(the_html, r"
.*\[.*'Banana'.*'Apple'.*'Chocolate'.*'Donut'.*\].*
") # Check that choice name masking is enabled and that unmasking works response = list(problem.responders.values())[0] - self.assertFalse(response.has_mask()) - self.assertEqual(response.unmask_order(), ['choice_1', 'choice_0', 'choice_2', 'choice_3']) - self.assertEqual(the_html, problem.get_html(), 'should be able to call get_html() twice') + assert not response.has_mask() + assert response.unmask_order() == ['choice_1', 'choice_0', 'choice_2', 'choice_3'] + assert the_html == problem.get_html(), 'should be able to call get_html() twice' def test_shuffle_custom_names(self): xml_str = textwrap.dedent(""" @@ -56,9 +56,9 @@ class CapaShuffleTest(unittest.TestCase): # B A C D # Check that the custom name= names come through response = list(problem.responders.values())[0] - self.assertFalse(response.has_mask()) - self.assertTrue(response.has_shuffle()) - self.assertEqual(response.unmask_order(), ['choice_0', 'choice_aaa', 'choice_1', 'choice_ddd']) + assert not response.has_mask() + assert response.has_shuffle() + assert response.unmask_order() == ['choice_0', 'choice_aaa', 'choice_1', 'choice_ddd'] def test_shuffle_different_seed(self): xml_str = textwrap.dedent(""" @@ -91,9 +91,9 @@ class CapaShuffleTest(unittest.TestCase): the_html = problem.get_html() self.assertRegex(the_html, r"
.*\[.*'Apple'.*\].*
") response = list(problem.responders.values())[0] - self.assertFalse(response.has_mask()) - self.assertTrue(response.has_shuffle()) - self.assertEqual(response.unmask_order(), ['choice_0']) + assert not response.has_mask() + assert response.has_shuffle() + assert response.unmask_order() == ['choice_0'] def test_shuffle_6_choices(self): xml_str = textwrap.dedent(""" @@ -132,8 +132,8 @@ class CapaShuffleTest(unittest.TestCase): the_html = problem.get_html() self.assertRegex(the_html, r"
.*\[.*'Apple'.*'Banana'.*'Chocolate'.*'Donut'.*\].*
") response = list(problem.responders.values())[0] - self.assertFalse(response.has_mask()) - self.assertFalse(response.has_shuffle()) + assert not response.has_mask() + assert not response.has_shuffle() def test_shuffle_fixed_head_end(self): xml_str = textwrap.dedent(""" @@ -275,18 +275,18 @@ class CapaShuffleTest(unittest.TestCase): """) problem = new_loncapa_problem(xml_str, seed=0) orig_html = problem.get_html() - self.assertEqual(orig_html, problem.get_html(), 'should be able to call get_html() twice') + assert orig_html == problem.get_html(), 'should be able to call get_html() twice' html = orig_html.replace('\n', ' ') # avoid headaches with .* matching print(html) self.assertRegex(html, r"
.*\[.*'Banana'.*'Apple'.*'Chocolate'.*'Donut'.*\].*
.*" + r"
.*\[.*'C'.*'A'.*'D'.*'B'.*\].*
") # Look at the responses in their authored order responses = sorted(list(problem.responders.values()), key=lambda resp: int(resp.id[resp.id.rindex('_') + 1:])) - self.assertFalse(responses[0].has_mask()) - self.assertTrue(responses[0].has_shuffle()) - self.assertTrue(responses[1].has_shuffle()) - self.assertEqual(responses[0].unmask_order(), ['choice_1', 'choice_0', 'choice_2', 'choice_3']) - self.assertEqual(responses[1].unmask_order(), ['choice_2', 'choice_0', 'choice_3', 'choice_1']) + assert not responses[0].has_mask() + assert responses[0].has_shuffle() + assert responses[1].has_shuffle() + assert responses[0].unmask_order() == ['choice_1', 'choice_0', 'choice_2', 'choice_3'] + assert responses[1].unmask_order() == ['choice_2', 'choice_0', 'choice_3', 'choice_1'] def test_shuffle_not_with_answerpool(self): """Raise error if shuffle and answer-pool are both used.""" diff --git a/common/lib/capa/capa/tests/test_targeted_feedback.py b/common/lib/capa/capa/tests/test_targeted_feedback.py index 09df597b65..628279df9a 100644 --- a/common/lib/capa/capa/tests/test_targeted_feedback.py +++ b/common/lib/capa/capa/tests/test_targeted_feedback.py @@ -91,7 +91,7 @@ class CapaTargetedFeedbackTest(unittest.TestCase): self.assertRegex(without_new_lines, r"
.*'wrong-1'.*'wrong-2'.*'correct-1'.*'wrong-3'.*
") self.assertNotRegex(without_new_lines, r"feedback1|feedback2|feedback3|feedbackC") - self.assertEqual(the_html, problem.get_html(), "Should be able to call get_html() twice") + assert the_html == problem.get_html(), 'Should be able to call get_html() twice' def test_targeted_feedback_student_answer1(self): problem = new_loncapa_problem(load_fixture('targeted_feedback.xml')) @@ -105,7 +105,7 @@ class CapaTargetedFeedbackTest(unittest.TestCase): self.assertNotRegex(without_new_lines, r"feedback1|feedback2|feedbackC") # Check that calling it multiple times yields the same thing the_html2 = problem.get_html() - self.assertEqual(the_html, the_html2) + assert the_html == the_html2 def test_targeted_feedback_student_answer2(self): problem = new_loncapa_problem(load_fixture('targeted_feedback.xml')) @@ -304,7 +304,7 @@ class CapaTargetedFeedbackTest(unittest.TestCase): self.assertNotRegex(without_new_lines, r"feedback2|feedback3") # Check that calling it multiple times yields the same thing the_html2 = problem.get_html() - self.assertEqual(the_html, the_html2) + assert the_html == the_html2 def test_targeted_feedback_no_show_solution_explanation(self): xml_str = textwrap.dedent(""" diff --git a/common/lib/capa/capa/tests/test_util.py b/common/lib/capa/capa/tests/test_util.py index 8c6a380678..57533ff0c9 100644 --- a/common/lib/capa/capa/tests/test_util.py +++ b/common/lib/capa/capa/tests/test_util.py @@ -30,94 +30,94 @@ class UtilTest(unittest.TestCase): def test_compare_with_tolerance(self): # lint-amnesty, pylint: disable=too-many-statements # Test default tolerance '0.001%' (it is relative) result = compare_with_tolerance(100.0, 100.0) - self.assertTrue(result) + assert result result = compare_with_tolerance(100.001, 100.0) - self.assertTrue(result) + assert result result = compare_with_tolerance(101.0, 100.0) - self.assertFalse(result) + assert not result # Test absolute percentage tolerance result = compare_with_tolerance(109.9, 100.0, '10%', False) - self.assertTrue(result) + assert result result = compare_with_tolerance(110.1, 100.0, '10%', False) - self.assertFalse(result) + assert not result # Test relative percentage tolerance result = compare_with_tolerance(111.0, 100.0, '10%', True) - self.assertTrue(result) + assert result result = compare_with_tolerance(112.0, 100.0, '10%', True) - self.assertFalse(result) + assert not result # Test absolute tolerance (string) result = compare_with_tolerance(109.9, 100.0, '10.0', False) - self.assertTrue(result) + assert result result = compare_with_tolerance(110.1, 100.0, '10.0', False) - self.assertFalse(result) + assert not result # Test relative tolerance (string) result = compare_with_tolerance(111.0, 100.0, '0.1', True) - self.assertTrue(result) + assert result result = compare_with_tolerance(112.0, 100.0, '0.1', True) - self.assertFalse(result) + assert not result # Test absolute tolerance (float) result = compare_with_tolerance(109.9, 100.0, 10.0, False) - self.assertTrue(result) + assert result result = compare_with_tolerance(110.1, 100.0, 10.0, False) - self.assertFalse(result) + assert not result # Test relative tolerance (float) result = compare_with_tolerance(111.0, 100.0, 0.1, True) - self.assertTrue(result) + assert result result = compare_with_tolerance(112.0, 100.0, 0.1, True) - self.assertFalse(result) + assert not result ##### Infinite values ##### infinity = float('Inf') # Test relative tolerance (float) result = compare_with_tolerance(infinity, 100.0, 1.0, True) - self.assertFalse(result) + assert not result result = compare_with_tolerance(100.0, infinity, 1.0, True) - self.assertFalse(result) + assert not result result = compare_with_tolerance(infinity, infinity, 1.0, True) - self.assertTrue(result) + assert result # Test absolute tolerance (float) result = compare_with_tolerance(infinity, 100.0, 1.0, False) - self.assertFalse(result) + assert not result result = compare_with_tolerance(100.0, infinity, 1.0, False) - self.assertFalse(result) + assert not result result = compare_with_tolerance(infinity, infinity, 1.0, False) - self.assertTrue(result) + assert result # Test relative tolerance (string) result = compare_with_tolerance(infinity, 100.0, '1.0', True) - self.assertFalse(result) + assert not result result = compare_with_tolerance(100.0, infinity, '1.0', True) - self.assertFalse(result) + assert not result result = compare_with_tolerance(infinity, infinity, '1.0', True) - self.assertTrue(result) + assert result # Test absolute tolerance (string) result = compare_with_tolerance(infinity, 100.0, '1.0', False) - self.assertFalse(result) + assert not result result = compare_with_tolerance(100.0, infinity, '1.0', False) - self.assertFalse(result) + assert not result result = compare_with_tolerance(infinity, infinity, '1.0', False) - self.assertTrue(result) + assert result # Test absolute tolerance for smaller values result = compare_with_tolerance(100.01, 100.0, 0.01, False) - self.assertTrue(result) + assert result result = compare_with_tolerance(100.001, 100.0, 0.001, False) - self.assertTrue(result) + assert result result = compare_with_tolerance(100.01, 100.0, '0.01%', False) - self.assertTrue(result) + assert result result = compare_with_tolerance(100.002, 100.0, 0.001, False) - self.assertFalse(result) + assert not result result = compare_with_tolerance(0.4, 0.44, 0.01, False) - self.assertFalse(result) + assert not result result = compare_with_tolerance(100.01, 100.0, 0.010, False) - self.assertTrue(result) + assert result # Test complex_number instructor_complex result = compare_with_tolerance(0.4, complex(0.44, 0), 0.01, False) - self.assertFalse(result) + assert not result result = compare_with_tolerance(100.01, complex(100.0, 0), 0.010, False) - self.assertTrue(result) + assert result result = compare_with_tolerance(110.1, complex(100.0, 0), '10.0', False) - self.assertFalse(result) + assert not result result = compare_with_tolerance(111.0, complex(100.0, 0), '10%', True) - self.assertTrue(result) + assert result def test_sanitize_html(self): """ @@ -126,28 +126,26 @@ class UtilTest(unittest.TestCase): allowed_tags = ['div', 'p', 'audio', 'pre', 'span'] for tag in allowed_tags: queue_msg = "<{0}>Test message".format(tag) - self.assertEqual(sanitize_html(queue_msg), queue_msg) + assert sanitize_html(queue_msg) == queue_msg not_allowed_tag = 'script' queue_msg = "<{0}>Test message".format(not_allowed_tag) expected = "<script>Test message</script>" - self.assertEqual(sanitize_html(queue_msg), expected) + assert sanitize_html(queue_msg) == expected def test_get_inner_html_from_xpath(self): """ Test for getting inner html as string from xpath node. """ xpath_node = etree.XML('aabbcc') - self.assertEqual(get_inner_html_from_xpath(xpath_node), 'aabbcc') + assert get_inner_html_from_xpath(xpath_node) == 'aabbcc' def test_remove_markup(self): """ Test for markup removal with bleach. """ - self.assertEqual( - remove_markup("The Truth is Out There & you need to find it"), - "The Truth is Out There & you need to find it" - ) + assert remove_markup('The Truth is Out There & you need to find it') ==\ + 'The Truth is Out There & you need to find it' @ddt.data( 'When the root level failš the whole hierarchy won’t work anymore.', @@ -159,7 +157,7 @@ class UtilTest(unittest.TestCase): text = '$answer0' context = {key: context_value} contextual_text = contextualize_text(text, context) - self.assertEqual(context_value, contextual_text) + assert context_value == contextual_text def test_contextualize_text_with_non_ascii_context(self): """Verify that variable substitution works as intended with non-ascii characters.""" @@ -168,4 +166,4 @@ class UtilTest(unittest.TestCase): context = {'a': u'あなたあなたあなた', 'b': u'あなたhi'} expected_text = '$あなたあなたあなたあなた あなたhi' contextual_text = contextualize_text(text, context) - self.assertEqual(expected_text, contextual_text) + assert expected_text == contextual_text diff --git a/common/lib/sandbox-packages/verifiers/tests_draganddrop.py b/common/lib/sandbox-packages/verifiers/tests_draganddrop.py index 9c5e544e28..03bea08587 100644 --- a/common/lib/sandbox-packages/verifiers/tests_draganddrop.py +++ b/common/lib/sandbox-packages/verifiers/tests_draganddrop.py @@ -12,34 +12,34 @@ class Test_PositionsCompare(unittest.TestCase): """ describe""" def test_nested_list_and_list1(self): - self.assertEqual(PositionsCompare([[1, 2], 40]), PositionsCompare([1, 3])) + assert PositionsCompare([[1, 2], 40]) == PositionsCompare([1, 3]) def test_nested_list_and_list2(self): - self.assertNotEqual(PositionsCompare([1, 12]), PositionsCompare([1, 1])) + assert PositionsCompare([1, 12]) != PositionsCompare([1, 1]) def test_list_and_list1(self): - self.assertNotEqual(PositionsCompare([[1, 2], 12]), PositionsCompare([1, 15])) + assert PositionsCompare([[1, 2], 12]) != PositionsCompare([1, 15]) def test_list_and_list2(self): - self.assertEqual(PositionsCompare([1, 11]), PositionsCompare([1, 1])) + assert PositionsCompare([1, 11]) == PositionsCompare([1, 1]) def test_numerical_list_and_string_list(self): - self.assertNotEqual(PositionsCompare([1, 2]), PositionsCompare(["1"])) + assert PositionsCompare([1, 2]) != PositionsCompare(['1']) def test_string_and_string_list1(self): - self.assertEqual(PositionsCompare("1"), PositionsCompare(["1"])) + assert PositionsCompare('1') == PositionsCompare(['1']) def test_string_and_string_list2(self): - self.assertEqual(PositionsCompare("abc"), PositionsCompare("abc")) + assert PositionsCompare('abc') == PositionsCompare('abc') def test_string_and_string_list3(self): - self.assertNotEqual(PositionsCompare("abd"), PositionsCompare("abe")) + assert PositionsCompare('abd') != PositionsCompare('abe') def test_float_and_string(self): - self.assertNotEqual(PositionsCompare([3.5, 5.7]), PositionsCompare(["1"])) + assert PositionsCompare([3.5, 5.7]) != PositionsCompare(['1']) def test_floats_and_ints(self): - self.assertEqual(PositionsCompare([3.5, 4.5]), PositionsCompare([5, 7])) + assert PositionsCompare([3.5, 4.5]) == PositionsCompare([5, 7]) class Test_DragAndDrop_Grade(unittest.TestCase): # lint-amnesty, pylint: disable=missing-class-docstring @@ -64,7 +64,7 @@ class Test_DragAndDrop_Grade(unittest.TestCase): # lint-amnesty, pylint: disabl 'rule': 'anyof' } ] - self.assertTrue(draganddrop.grade(user_input, correct_answer)) + assert draganddrop.grade(user_input, correct_answer) def test_targets_are_draggable_2(self): user_input = json.dumps([ @@ -107,7 +107,7 @@ class Test_DragAndDrop_Grade(unittest.TestCase): # lint-amnesty, pylint: disabl 'rule': 'unordered_equal' } ] - self.assertTrue(draganddrop.grade(user_input, correct_answer)) + assert draganddrop.grade(user_input, correct_answer) def test_targets_are_draggable_2_manual_parsing(self): user_input = json.dumps([ @@ -150,7 +150,7 @@ class Test_DragAndDrop_Grade(unittest.TestCase): # lint-amnesty, pylint: disabl 'rule': 'unordered_equal' } ] - self.assertTrue(draganddrop.grade(user_input, correct_answer)) + assert draganddrop.grade(user_input, correct_answer) def test_targets_are_draggable_3_nested(self): user_input = json.dumps([ @@ -209,7 +209,7 @@ class Test_DragAndDrop_Grade(unittest.TestCase): # lint-amnesty, pylint: disabl 'rule': 'unordered_equal' } ] - self.assertTrue(draganddrop.grade(user_input, correct_answer)) + assert draganddrop.grade(user_input, correct_answer) def test_targets_are_draggable_4_real_example(self): user_input = json.dumps([ @@ -283,83 +283,83 @@ class Test_DragAndDrop_Grade(unittest.TestCase): # lint-amnesty, pylint: disabl }, ] - self.assertTrue(draganddrop.grade(user_input, correct_answer)) + assert draganddrop.grade(user_input, correct_answer) def test_targets_true(self): user_input = '[{"1": "t1"}, \ {"name_with_icon": "t2"}]' correct_answer = {'1': 't1', 'name_with_icon': 't2'} - self.assertTrue(draganddrop.grade(user_input, correct_answer)) + assert draganddrop.grade(user_input, correct_answer) def test_expect_no_actions_wrong(self): user_input = '[{"1": "t1"}, \ {"name_with_icon": "t2"}]' correct_answer = [] - self.assertFalse(draganddrop.grade(user_input, correct_answer)) + assert not draganddrop.grade(user_input, correct_answer) def test_expect_no_actions_right(self): user_input = '[]' correct_answer = [] - self.assertTrue(draganddrop.grade(user_input, correct_answer)) + assert draganddrop.grade(user_input, correct_answer) def test_targets_false(self): user_input = '[{"1": "t1"}, \ {"name_with_icon": "t2"}]' correct_answer = {'1': 't3', 'name_with_icon': 't2'} - self.assertFalse(draganddrop.grade(user_input, correct_answer)) + assert not draganddrop.grade(user_input, correct_answer) def test_multiple_images_per_target_true(self): user_input = '[{"1": "t1"}, {"name_with_icon": "t2"}, \ {"2": "t1"}]' correct_answer = {'1': 't1', 'name_with_icon': 't2', '2': 't1'} - self.assertTrue(draganddrop.grade(user_input, correct_answer)) + assert draganddrop.grade(user_input, correct_answer) def test_multiple_images_per_target_false(self): user_input = '[{"1": "t1"}, {"name_with_icon": "t2"}, \ {"2": "t1"}]' correct_answer = {'1': 't2', 'name_with_icon': 't2', '2': 't1'} - self.assertFalse(draganddrop.grade(user_input, correct_answer)) + assert not draganddrop.grade(user_input, correct_answer) def test_targets_and_positions(self): user_input = '[{"1": [10,10]}, \ {"name_with_icon": [[10,10],4]}]' correct_answer = {'1': [10, 10], 'name_with_icon': [[10, 10], 4]} - self.assertTrue(draganddrop.grade(user_input, correct_answer)) + assert draganddrop.grade(user_input, correct_answer) def test_position_and_targets(self): user_input = '[{"1": "t1"}, {"name_with_icon": "t2"}]' correct_answer = {'1': 't1', 'name_with_icon': 't2'} - self.assertTrue(draganddrop.grade(user_input, correct_answer)) + assert draganddrop.grade(user_input, correct_answer) def test_positions_exact(self): user_input = '[{"1": [10, 10]}, {"name_with_icon": [20, 20]}]' correct_answer = {'1': [10, 10], 'name_with_icon': [20, 20]} - self.assertTrue(draganddrop.grade(user_input, correct_answer)) + assert draganddrop.grade(user_input, correct_answer) def test_positions_false(self): user_input = '[{"1": [10, 10]}, {"name_with_icon": [20, 20]}]' correct_answer = {'1': [25, 25], 'name_with_icon': [20, 20]} - self.assertFalse(draganddrop.grade(user_input, correct_answer)) + assert not draganddrop.grade(user_input, correct_answer) def test_positions_true_in_radius(self): user_input = '[{"1": [10, 10]}, {"name_with_icon": [20, 20]}]' correct_answer = {'1': [14, 14], 'name_with_icon': [20, 20]} - self.assertTrue(draganddrop.grade(user_input, correct_answer)) + assert draganddrop.grade(user_input, correct_answer) def test_positions_true_in_manual_radius(self): user_input = '[{"1": [10, 10]}, {"name_with_icon": [20, 20]}]' correct_answer = {'1': [[40, 10], 30], 'name_with_icon': [20, 20]} - self.assertTrue(draganddrop.grade(user_input, correct_answer)) + assert draganddrop.grade(user_input, correct_answer) def test_positions_false_in_manual_radius(self): user_input = '[{"1": [10, 10]}, {"name_with_icon": [20, 20]}]' correct_answer = {'1': [[40, 10], 29], 'name_with_icon': [20, 20]} - self.assertFalse(draganddrop.grade(user_input, correct_answer)) + assert not draganddrop.grade(user_input, correct_answer) def test_correct_answer_not_has_key_from_user_answer(self): user_input = '[{"1": "t1"}, {"name_with_icon": "t2"}]' correct_answer = {'3': 't3', 'name_with_icon': 't2'} - self.assertFalse(draganddrop.grade(user_input, correct_answer)) + assert not draganddrop.grade(user_input, correct_answer) def test_anywhere(self): """Draggables can be places anywhere on base image. @@ -369,7 +369,7 @@ class Test_DragAndDrop_Grade(unittest.TestCase): # lint-amnesty, pylint: disabl {"grass":[322.5,199.449951171875]}]' correct_answer = {'grass': [[300, 200], 200], 'ant': [[500, 0], 200]} - self.assertTrue(draganddrop.grade(user_input, correct_answer)) + assert draganddrop.grade(user_input, correct_answer) def test_lcao_correct(self): """Describe carbon molecule in LCAO-MO""" @@ -408,7 +408,7 @@ class Test_DragAndDrop_Grade(unittest.TestCase): # lint-amnesty, pylint: disabl 'rule': 'anyof' }] - self.assertTrue(draganddrop.grade(user_input, correct_answer)) + assert draganddrop.grade(user_input, correct_answer) def test_lcao_extra_element_incorrect(self): """Describe carbon molecule in LCAO-MO""" @@ -447,7 +447,7 @@ class Test_DragAndDrop_Grade(unittest.TestCase): # lint-amnesty, pylint: disabl 'rule': 'anyof' }] - self.assertFalse(draganddrop.grade(user_input, correct_answer)) + assert not draganddrop.grade(user_input, correct_answer) def test_reuse_draggable_no_mupliples(self): """Test reusable draggables (no mupltiple draggables per target)""" @@ -471,7 +471,7 @@ class Test_DragAndDrop_Grade(unittest.TestCase): # lint-amnesty, pylint: disabl 'rule': 'anyof' } ] - self.assertTrue(draganddrop.grade(user_input, correct_answer)) + assert draganddrop.grade(user_input, correct_answer) def test_reuse_draggable_with_mupliples(self): """Test reusable draggables with mupltiple draggables per target""" @@ -495,7 +495,7 @@ class Test_DragAndDrop_Grade(unittest.TestCase): # lint-amnesty, pylint: disabl 'rule': 'anyof' } ] - self.assertTrue(draganddrop.grade(user_input, correct_answer)) + assert draganddrop.grade(user_input, correct_answer) def test_reuse_many_draggable_with_mupliples(self): """Test reusable draggables with mupltiple draggables per target""" @@ -525,7 +525,7 @@ class Test_DragAndDrop_Grade(unittest.TestCase): # lint-amnesty, pylint: disabl 'rule': 'anyof' } ] - self.assertTrue(draganddrop.grade(user_input, correct_answer)) + assert draganddrop.grade(user_input, correct_answer) def test_reuse_many_draggable_with_mupliples_wrong(self): """Test reusable draggables with mupltiple draggables per target""" @@ -556,7 +556,7 @@ class Test_DragAndDrop_Grade(unittest.TestCase): # lint-amnesty, pylint: disabl 'targets': ['target6'], 'rule': 'anyof' }] - self.assertFalse(draganddrop.grade(user_input, correct_answer)) + assert not draganddrop.grade(user_input, correct_answer) def test_label_10_targets_with_a_b_c_false(self): """Test reusable draggables (no mupltiple draggables per target)""" @@ -581,7 +581,7 @@ class Test_DragAndDrop_Grade(unittest.TestCase): # lint-amnesty, pylint: disabl 'rule': 'unordered_equal' } ] - self.assertFalse(draganddrop.grade(user_input, correct_answer)) + assert not draganddrop.grade(user_input, correct_answer) def test_label_10_targets_with_a_b_c_(self): """Test reusable draggables (no mupltiple draggables per target)""" @@ -606,7 +606,7 @@ class Test_DragAndDrop_Grade(unittest.TestCase): # lint-amnesty, pylint: disabl 'rule': 'unordered_equal' } ] - self.assertTrue(draganddrop.grade(user_input, correct_answer)) + assert draganddrop.grade(user_input, correct_answer) def test_label_10_targets_with_a_b_c_multiple(self): """Test reusable draggables (mupltiple draggables per target)""" @@ -631,7 +631,7 @@ class Test_DragAndDrop_Grade(unittest.TestCase): # lint-amnesty, pylint: disabl 'rule': 'anyof+number' } ] - self.assertTrue(draganddrop.grade(user_input, correct_answer)) + assert draganddrop.grade(user_input, correct_answer) def test_label_10_targets_with_a_b_c_multiple_false(self): """Test reusable draggables (mupltiple draggables per target)""" @@ -656,7 +656,7 @@ class Test_DragAndDrop_Grade(unittest.TestCase): # lint-amnesty, pylint: disabl 'rule': 'anyof+number' } ] - self.assertFalse(draganddrop.grade(user_input, correct_answer)) + assert not draganddrop.grade(user_input, correct_answer) def test_label_10_targets_with_a_b_c_reused(self): """Test a b c in 10 labels reused""" @@ -681,7 +681,7 @@ class Test_DragAndDrop_Grade(unittest.TestCase): # lint-amnesty, pylint: disabl 'rule': 'unordered_equal+number' } ] - self.assertTrue(draganddrop.grade(user_input, correct_answer)) + assert draganddrop.grade(user_input, correct_answer) def test_label_10_targets_with_a_b_c_reused_false(self): """Test a b c in 10 labels reused false""" @@ -706,7 +706,7 @@ class Test_DragAndDrop_Grade(unittest.TestCase): # lint-amnesty, pylint: disabl 'rule': 'unordered_equal+number' } ] - self.assertFalse(draganddrop.grade(user_input, correct_answer)) + assert not draganddrop.grade(user_input, correct_answer) def test_mixed_reuse_and_not_reuse(self): """Test reusable draggables """ @@ -725,7 +725,7 @@ class Test_DragAndDrop_Grade(unittest.TestCase): # lint-amnesty, pylint: disabl 'rule': 'exact' } ] - self.assertTrue(draganddrop.grade(user_input, correct_answer)) + assert draganddrop.grade(user_input, correct_answer) def test_mixed_reuse_and_not_reuse_number(self): """Test reusable draggables with number """ @@ -743,7 +743,7 @@ class Test_DragAndDrop_Grade(unittest.TestCase): # lint-amnesty, pylint: disabl 'rule': 'exact' } ] - self.assertTrue(draganddrop.grade(user_input, correct_answer)) + assert draganddrop.grade(user_input, correct_answer) def test_mixed_reuse_and_not_reuse_number_false(self): """Test reusable draggables with numbers, but wrong""" @@ -761,7 +761,7 @@ class Test_DragAndDrop_Grade(unittest.TestCase): # lint-amnesty, pylint: disabl 'rule': 'exact' } ] - self.assertFalse(draganddrop.grade(user_input, correct_answer)) + assert not draganddrop.grade(user_input, correct_answer) def test_alternative_correct_answer(self): user_input = '[{"name_with_icon":"t1"},\ @@ -772,7 +772,7 @@ class Test_DragAndDrop_Grade(unittest.TestCase): # lint-amnesty, pylint: disabl {'draggables': ['name_with_icon'], 'targets': ['t1', 't1', 't1'], 'rule': 'exact'} ] - self.assertTrue(draganddrop.grade(user_input, correct_answer)) + assert draganddrop.grade(user_input, correct_answer) class Test_DragAndDrop_Populate(unittest.TestCase): # lint-amnesty, pylint: disable=missing-class-docstring @@ -787,61 +787,45 @@ class Test_DragAndDrop_Populate(unittest.TestCase): # lint-amnesty, pylint: dis user_groups = [['1'], ['name_with_icon']] user_positions = [{'user': [[10, 10]]}, {'user': [[20, 20]]}] - self.assertEqual(correct_groups, dnd.correct_groups) - self.assertEqual(correct_positions, dnd.correct_positions) - self.assertEqual(user_groups, dnd.user_groups) - self.assertEqual(user_positions, dnd.user_positions) + assert correct_groups == dnd.correct_groups + assert correct_positions == dnd.correct_positions + assert user_groups == dnd.user_groups + assert user_positions == dnd.user_positions class Test_DraAndDrop_Compare_Positions(unittest.TestCase): # lint-amnesty, pylint: disable=missing-class-docstring def test_1(self): dnd = draganddrop.DragAndDrop({'1': 't1'}, '[{"1": "t1"}]') - self.assertTrue(dnd.compare_positions(correct=[[1, 1], [2, 3]], - user=[[2, 3], [1, 1]], - flag='anyof')) + assert dnd.compare_positions(correct=[[1, 1], [2, 3]], user=[[2, 3], [1, 1]], flag='anyof') def test_2a(self): dnd = draganddrop.DragAndDrop({'1': 't1'}, '[{"1": "t1"}]') - self.assertTrue(dnd.compare_positions(correct=[[1, 1], [2, 3]], - user=[[2, 3], [1, 1]], - flag='exact')) + assert dnd.compare_positions(correct=[[1, 1], [2, 3]], user=[[2, 3], [1, 1]], flag='exact') def test_2b(self): dnd = draganddrop.DragAndDrop({'1': 't1'}, '[{"1": "t1"}]') - self.assertFalse(dnd.compare_positions(correct=[[1, 1], [2, 3]], - user=[[2, 13], [1, 1]], - flag='exact')) + assert not dnd.compare_positions(correct=[[1, 1], [2, 3]], user=[[2, 13], [1, 1]], flag='exact') def test_3(self): dnd = draganddrop.DragAndDrop({'1': 't1'}, '[{"1": "t1"}]') - self.assertFalse(dnd.compare_positions(correct=["a", "b"], - user=["a", "b", "c"], - flag='anyof')) + assert not dnd.compare_positions(correct=['a', 'b'], user=['a', 'b', 'c'], flag='anyof') def test_4(self): dnd = draganddrop.DragAndDrop({'1': 't1'}, '[{"1": "t1"}]') - self.assertTrue(dnd.compare_positions(correct=["a", "b", "c"], - user=["a", "b"], - flag='anyof')) + assert dnd.compare_positions(correct=['a', 'b', 'c'], user=['a', 'b'], flag='anyof') def test_5(self): dnd = draganddrop.DragAndDrop({'1': 't1'}, '[{"1": "t1"}]') - self.assertFalse(dnd.compare_positions(correct=["a", "b", "c"], - user=["a", "c", "b"], - flag='exact')) + assert not dnd.compare_positions(correct=['a', 'b', 'c'], user=['a', 'c', 'b'], flag='exact') def test_6(self): dnd = draganddrop.DragAndDrop({'1': 't1'}, '[{"1": "t1"}]') - self.assertTrue(dnd.compare_positions(correct=["a", "b", "c"], - user=["a", "c", "b"], - flag='anyof')) + assert dnd.compare_positions(correct=['a', 'b', 'c'], user=['a', 'c', 'b'], flag='anyof') def test_7(self): dnd = draganddrop.DragAndDrop({'1': 't1'}, '[{"1": "t1"}]') - self.assertFalse(dnd.compare_positions(correct=["a", "b", "b"], - user=["a", "c", "b"], - flag='anyof')) + assert not dnd.compare_positions(correct=['a', 'b', 'b'], user=['a', 'c', 'b'], flag='anyof') def suite(): # lint-amnesty, pylint: disable=missing-function-docstring diff --git a/common/lib/symmath/symmath/test_formula.py b/common/lib/symmath/symmath/test_formula.py index 25d163f059..1235f7b771 100644 --- a/common/lib/symmath/symmath/test_formula.py +++ b/common/lib/symmath/symmath/test_formula.py @@ -43,7 +43,7 @@ class FormulaTest(unittest.TestCase): # lint-amnesty, pylint: disable=missing-c test = etree.tostring(xml) # success? - self.assertEqual(test.decode('utf-8'), expected) + assert test.decode('utf-8') == expected def test_fix_simple_superscripts(self): expr = ''' @@ -67,7 +67,7 @@ class FormulaTest(unittest.TestCase): # lint-amnesty, pylint: disable=missing-c test = etree.tostring(xml) # success? - self.assertEqual(test.decode('utf-8'), expected) + assert test.decode('utf-8') == expected def test_fix_complex_superscripts(self): expr = ''' @@ -92,7 +92,7 @@ class FormulaTest(unittest.TestCase): # lint-amnesty, pylint: disable=missing-c test = etree.tostring(xml) # success? - self.assertEqual(test.decode('utf-8'), expected) + assert test.decode('utf-8') == expected def test_fix_msubsup(self): expr = ''' @@ -114,4 +114,4 @@ class FormulaTest(unittest.TestCase): # lint-amnesty, pylint: disable=missing-c test = etree.tostring(xml) # success? - self.assertEqual(test.decode('utf-8'), expected) + assert test.decode('utf-8') == expected diff --git a/common/lib/symmath/symmath/test_symmath_check.py b/common/lib/symmath/symmath/test_symmath_check.py index 0271f42ecc..b611cfe36f 100644 --- a/common/lib/symmath/symmath/test_symmath_check.py +++ b/common/lib/symmath/symmath/test_symmath_check.py @@ -32,7 +32,7 @@ class SymmathCheckTest(TestCase): # lint-amnesty, pylint: disable=missing-class # Expect that the exact same symbolic string is marked correct result = symmath_check(expected_str, expected_str, dynamath=[dynamath]) - self.assertTrue('ok' in result and result['ok']) + assert (('ok' in result) and result['ok']) def test_symmath_check_equivalent_symbols(self): expected_str = "x+2*y" @@ -52,7 +52,7 @@ class SymmathCheckTest(TestCase): # lint-amnesty, pylint: disable=missing-class # Expect that equivalent symbolic strings are marked correct result = symmath_check(expected_str, input_str, dynamath=[dynamath]) - self.assertTrue('ok' in result and result['ok']) + assert (('ok' in result) and result['ok']) def test_symmath_check_different_symbols(self): expected_str = "0" @@ -70,8 +70,8 @@ class SymmathCheckTest(TestCase): # lint-amnesty, pylint: disable=missing-class # Expect that an incorrect response is marked incorrect result = symmath_check(expected_str, input_str, dynamath=[dynamath]) - self.assertTrue('ok' in result and not result['ok']) - self.assertNotIn('fail', result['msg']) + assert (('ok' in result) and (not result['ok'])) + assert 'fail' not in result['msg'] def _symmath_check_numbers(self, number_list): # lint-amnesty, pylint: disable=missing-function-docstring @@ -81,11 +81,9 @@ class SymmathCheckTest(TestCase): # lint-amnesty, pylint: disable=missing-class expect = n ans = n result = symmath_check(str(expect), str(ans)) - self.assertTrue('ok' in result and result['ok'], - "%f should == %f" % (expect, ans)) + assert (('ok' in result) and result['ok']), ('%f should == %f' % (expect, ans)) # Change expect so that it != ans expect += 0.1 result = symmath_check(str(expect), str(ans)) - self.assertTrue('ok' in result and not result['ok'], - "%f should != %f" % (expect, ans)) + assert (('ok' in result) and (not result['ok'])), ('%f should != %f' % (expect, ans)) diff --git a/common/lib/xmodule/xmodule/assetstore/tests/test_asset_xml.py b/common/lib/xmodule/xmodule/assetstore/tests/test_asset_xml.py index a795a70cfc..c647e952af 100644 --- a/common/lib/xmodule/xmodule/assetstore/tests/test_asset_xml.py +++ b/common/lib/xmodule/xmodule/assetstore/tests/test_asset_xml.py @@ -4,6 +4,7 @@ Test for asset XML generation / parsing. import unittest +import pytest from contracts import ContractNotRespected from lxml import etree @@ -59,7 +60,7 @@ class TestAssetXml(unittest.TestCase): continue orig_value = getattr(asset_md, attr) new_value = getattr(new_asset_md, attr) - self.assertEqual(orig_value, new_value) + assert orig_value == new_value def test_export_with_None_value(self): """ @@ -87,7 +88,7 @@ class TestAssetXml(unittest.TestCase): Ensure full asset sections with the wrong tag are detected. """ root = etree.Element("glassets") - with self.assertRaises(ContractNotRespected): + with pytest.raises(ContractNotRespected): AssetMetadata.add_all_assets_as_xml(root, self.course_assets) def test_wrong_node_type_single(self): @@ -97,5 +98,5 @@ class TestAssetXml(unittest.TestCase): asset_md = self.course_assets[0] root = etree.Element("assets") asset = etree.SubElement(root, "smashset") - with self.assertRaises(ContractNotRespected): + with pytest.raises(ContractNotRespected): asset_md.to_xml(asset) diff --git a/common/lib/xmodule/xmodule/modulestore/tests/test_abstraction.py b/common/lib/xmodule/xmodule/modulestore/tests/test_abstraction.py index 85940cb969..d8dfbceeea 100644 --- a/common/lib/xmodule/xmodule/modulestore/tests/test_abstraction.py +++ b/common/lib/xmodule/xmodule/modulestore/tests/test_abstraction.py @@ -4,6 +4,7 @@ Simple test to ensure that modulestore base classes remain abstract from unittest import TestCase +import pytest from xmodule.modulestore import ModuleStoreRead, ModuleStoreWrite @@ -14,5 +15,6 @@ class AbstractionTest(TestCase): """ def test_cant_instantiate_abstract_class(self): - self.assertRaises(TypeError, ModuleStoreRead) # Cannot be instantiated due to explicit abstraction - self.assertRaises(TypeError, ModuleStoreWrite) + pytest.raises(TypeError, ModuleStoreRead) + # Cannot be instantiated due to explicit abstraction + pytest.raises(TypeError, ModuleStoreWrite) diff --git a/common/lib/xmodule/xmodule/modulestore/tests/test_asides.py b/common/lib/xmodule/xmodule/modulestore/tests/test_asides.py index afe2b7ab10..e336621c2e 100644 --- a/common/lib/xmodule/xmodule/modulestore/tests/test_asides.py +++ b/common/lib/xmodule/xmodule/modulestore/tests/test_asides.py @@ -45,11 +45,11 @@ class TestAsidesXmlStore(TestCase): Check whether block has the expected aside w/ its fields and then recurse to the block's children """ asides = block.runtime.get_asides(block) - self.assertEqual(len(asides), 1, "Found {} asides but expected only test_aside".format(asides)) - self.assertIsInstance(asides[0], AsideTestType) + assert len(asides) == 1, 'Found {} asides but expected only test_aside'.format(asides) + assert isinstance(asides[0], AsideTestType) category = block.scope_ids.block_type - self.assertEqual(asides[0].data_field, "{} aside data".format(category)) - self.assertEqual(asides[0].content, "{} Aside".format(category.capitalize())) + assert asides[0].data_field == '{} aside data'.format(category) + assert asides[0].content == '{} Aside'.format(category.capitalize()) for child in block.get_children(): check_block(child) diff --git a/common/lib/xmodule/xmodule/modulestore/tests/test_assetstore.py b/common/lib/xmodule/xmodule/modulestore/tests/test_assetstore.py index 41123dd241..905705491f 100644 --- a/common/lib/xmodule/xmodule/modulestore/tests/test_assetstore.py +++ b/common/lib/xmodule/xmodule/modulestore/tests/test_assetstore.py @@ -6,7 +6,7 @@ too. import unittest from datetime import datetime, timedelta - +import pytest import ddt import pytz import six @@ -83,16 +83,14 @@ class TestSortedAssetList(unittest.TestCase): def test_exception_on_bad_sort(self): asset_key = self.course_key.make_asset_key('asset', 'pic1.jpg') - with self.assertRaises(IncorrectlySortedList): + with pytest.raises(IncorrectlySortedList): __ = self.sorted_asset_list_by_last_edit.find(asset_key) def test_find(self): asset_key = self.course_key.make_asset_key('asset', 'asset.txt') - self.assertEqual(self.sorted_asset_list_by_filename.find(asset_key), 0) + assert self.sorted_asset_list_by_filename.find(asset_key) == 0 asset_key_last = self.course_key.make_asset_key('asset', 'weather_patterns.bmp') - self.assertEqual( - self.sorted_asset_list_by_filename.find(asset_key_last), len(AssetStoreTestData.all_asset_data) - 1 - ) + assert self.sorted_asset_list_by_filename.find(asset_key_last) == (len(AssetStoreTestData.all_asset_data) - 1) @attr('mongo') @@ -126,7 +124,7 @@ class TestMongoAssetMetadataStorage(TestCase): if type(mdata1) != type(mdata2): # lint-amnesty, pylint: disable=unidiomatic-typecheck self.fail(self._formatMessage(msg, u"{} is not same type as {}".format(mdata1, mdata2))) for attr in mdata1.ATTRS_ALLOWED_TO_UPDATE: # lint-amnesty, pylint: disable=redefined-outer-name - self.assertEqual(getattr(mdata1, attr), getattr(mdata2, attr), msg) + assert getattr(mdata1, attr) == getattr(mdata2, attr), msg def _compare_datetimes(self, datetime1, datetime2, msg=None): """ @@ -188,9 +186,9 @@ class TestMongoAssetMetadataStorage(TestCase): store.save_asset_metadata(new_asset_md, ModuleStoreEnum.UserID.test) # Find the asset's metadata and confirm it's the same. found_asset_md = store.find_asset_metadata(new_asset_loc) - self.assertIsNotNone(found_asset_md) - self.assertEqual(new_asset_md, found_asset_md) - self.assertEqual(len(store.get_all_asset_metadata(course.id, 'asset')), 1) + assert found_asset_md is not None + assert new_asset_md == found_asset_md + assert len(store.get_all_asset_metadata(course.id, 'asset')) == 1 @ddt.data(*MODULESTORE_SETUPS) def test_delete(self, storebuilder): @@ -201,13 +199,13 @@ class TestMongoAssetMetadataStorage(TestCase): course = CourseFactory.create(modulestore=store) new_asset_loc = course.id.make_asset_key('asset', 'burnside.jpg') # Attempt to delete an asset that doesn't exist. - self.assertEqual(store.delete_asset_metadata(new_asset_loc, ModuleStoreEnum.UserID.test), 0) - self.assertEqual(len(store.get_all_asset_metadata(course.id, 'asset')), 0) + assert store.delete_asset_metadata(new_asset_loc, ModuleStoreEnum.UserID.test) == 0 + assert len(store.get_all_asset_metadata(course.id, 'asset')) == 0 new_asset_md = self._make_asset_metadata(new_asset_loc) store.save_asset_metadata(new_asset_md, ModuleStoreEnum.UserID.test) - self.assertEqual(store.delete_asset_metadata(new_asset_loc, ModuleStoreEnum.UserID.test), 1) - self.assertEqual(len(store.get_all_asset_metadata(course.id, 'asset')), 0) + assert store.delete_asset_metadata(new_asset_loc, ModuleStoreEnum.UserID.test) == 1 + assert len(store.get_all_asset_metadata(course.id, 'asset')) == 0 @ddt.data(*MODULESTORE_SETUPS) def test_find_non_existing_assets(self, storebuilder): @@ -219,7 +217,7 @@ class TestMongoAssetMetadataStorage(TestCase): new_asset_loc = course.id.make_asset_key('asset', 'burnside.jpg') # Find existing asset metadata. asset_md = store.find_asset_metadata(new_asset_loc) - self.assertIsNone(asset_md) + assert asset_md is None @ddt.data(*MODULESTORE_SETUPS) def test_get_all_non_existing_assets(self, storebuilder): @@ -230,7 +228,7 @@ class TestMongoAssetMetadataStorage(TestCase): course = CourseFactory.create(modulestore=store) # Find existing asset metadata. asset_md = store.get_all_asset_metadata(course.id, 'asset') - self.assertEqual(asset_md, []) + assert asset_md == [] @ddt.data(*MODULESTORE_SETUPS) def test_find_assets_in_non_existent_course(self, storebuilder): @@ -244,9 +242,9 @@ class TestMongoAssetMetadataStorage(TestCase): )) new_asset_loc = fake_course_id.make_asset_key('asset', 'burnside.jpg') # Find asset metadata from non-existent course. - with self.assertRaises(ItemNotFoundError): + with pytest.raises(ItemNotFoundError): store.find_asset_metadata(new_asset_loc) - with self.assertRaises(ItemNotFoundError): + with pytest.raises(ItemNotFoundError): store.get_all_asset_metadata(fake_course_id, 'asset') @ddt.data(*MODULESTORE_SETUPS) @@ -260,11 +258,11 @@ class TestMongoAssetMetadataStorage(TestCase): new_asset_md = self._make_asset_metadata(new_asset_loc) # Add asset metadata. store.save_asset_metadata(new_asset_md, ModuleStoreEnum.UserID.test) - self.assertEqual(len(store.get_all_asset_metadata(course.id, 'asset')), 1) + assert len(store.get_all_asset_metadata(course.id, 'asset')) == 1 # Add *the same* asset metadata. store.save_asset_metadata(new_asset_md, ModuleStoreEnum.UserID.test) # Still one here? - self.assertEqual(len(store.get_all_asset_metadata(course.id, 'asset')), 1) + assert len(store.get_all_asset_metadata(course.id, 'asset')) == 1 @ddt.data(*MODULESTORE_SETUPS) def test_different_asset_types(self, storebuilder): @@ -277,8 +275,8 @@ class TestMongoAssetMetadataStorage(TestCase): new_asset_md = self._make_asset_metadata(new_asset_loc) # Add asset metadata. store.save_asset_metadata(new_asset_md, ModuleStoreEnum.UserID.test) - self.assertEqual(len(store.get_all_asset_metadata(course.id, 'vrml')), 1) - self.assertEqual(len(store.get_all_asset_metadata(course.id, 'asset')), 0) + assert len(store.get_all_asset_metadata(course.id, 'vrml')) == 1 + assert len(store.get_all_asset_metadata(course.id, 'asset')) == 0 @ddt.data(*MODULESTORE_SETUPS) def test_asset_types_with_other_field_names(self, storebuilder): @@ -291,10 +289,10 @@ class TestMongoAssetMetadataStorage(TestCase): new_asset_md = self._make_asset_metadata(new_asset_loc) # Add asset metadata. store.save_asset_metadata(new_asset_md, ModuleStoreEnum.UserID.test) - self.assertEqual(len(store.get_all_asset_metadata(course.id, 'course_id')), 1) - self.assertEqual(len(store.get_all_asset_metadata(course.id, 'asset')), 0) + assert len(store.get_all_asset_metadata(course.id, 'course_id')) == 1 + assert len(store.get_all_asset_metadata(course.id, 'asset')) == 0 all_assets = store.get_all_asset_metadata(course.id, 'course_id') - self.assertEqual(all_assets[0].asset_id.path, new_asset_loc.path) + assert all_assets[0].asset_id.path == new_asset_loc.path @ddt.data(*MODULESTORE_SETUPS) def test_lock_unlock_assets(self, storebuilder): @@ -312,13 +310,13 @@ class TestMongoAssetMetadataStorage(TestCase): store.set_asset_metadata_attr(new_asset_loc, "locked", not locked_state, ModuleStoreEnum.UserID.test) # Find the same course and check its locked status. updated_asset_md = store.find_asset_metadata(new_asset_loc) - self.assertIsNotNone(updated_asset_md) - self.assertEqual(updated_asset_md.locked, not locked_state) + assert updated_asset_md is not None + assert updated_asset_md.locked == (not locked_state) # Now flip it back. store.set_asset_metadata_attr(new_asset_loc, "locked", locked_state, ModuleStoreEnum.UserID.test) reupdated_asset_md = store.find_asset_metadata(new_asset_loc) - self.assertIsNotNone(reupdated_asset_md) - self.assertEqual(reupdated_asset_md.locked, locked_state) + assert reupdated_asset_md is not None + assert reupdated_asset_md.locked == locked_state ALLOWED_ATTRS = ( ('pathname', '/new/path'), @@ -359,9 +357,9 @@ class TestMongoAssetMetadataStorage(TestCase): store.set_asset_metadata_attr(new_asset_loc, attribute, value, ModuleStoreEnum.UserID.test) # Find the same course asset and check its changed attribute. updated_asset_md = store.find_asset_metadata(new_asset_loc) - self.assertIsNotNone(updated_asset_md) - self.assertIsNotNone(getattr(updated_asset_md, attribute, None)) - self.assertEqual(getattr(updated_asset_md, attribute, None), value) + assert updated_asset_md is not None + assert getattr(updated_asset_md, attribute, None) is not None + assert getattr(updated_asset_md, attribute, None) == value @ddt.data(*MODULESTORE_SETUPS) def test_set_disallowed_attrs(self, storebuilder): @@ -379,10 +377,10 @@ class TestMongoAssetMetadataStorage(TestCase): store.set_asset_metadata_attr(new_asset_loc, attribute, value, ModuleStoreEnum.UserID.test) # Find the same course and check its changed attribute. updated_asset_md = store.find_asset_metadata(new_asset_loc) - self.assertIsNotNone(updated_asset_md) - self.assertIsNotNone(getattr(updated_asset_md, attribute, None)) + assert updated_asset_md is not None + assert getattr(updated_asset_md, attribute, None) is not None # Make sure that the attribute is unchanged from its original value. - self.assertEqual(getattr(updated_asset_md, attribute, None), original_attr_val) + assert getattr(updated_asset_md, attribute, None) == original_attr_val @ddt.data(*MODULESTORE_SETUPS) def test_set_unknown_attrs(self, storebuilder): @@ -399,10 +397,10 @@ class TestMongoAssetMetadataStorage(TestCase): store.set_asset_metadata_attr(new_asset_loc, attribute, value, ModuleStoreEnum.UserID.test) # Find the same course and check its changed attribute. updated_asset_md = store.find_asset_metadata(new_asset_loc) - self.assertIsNotNone(updated_asset_md) + assert updated_asset_md is not None # Make sure the unknown field was *not* added. - with self.assertRaises(AttributeError): - self.assertEqual(getattr(updated_asset_md, attribute), value) + with pytest.raises(AttributeError): + assert getattr(updated_asset_md, attribute) == value @ddt.data(*MODULESTORE_SETUPS) def test_save_one_different_asset(self, storebuilder): @@ -416,9 +414,9 @@ class TestMongoAssetMetadataStorage(TestCase): self._make_asset_metadata(asset_key) ) store.save_asset_metadata(new_asset_thumbnail, ModuleStoreEnum.UserID.test) - self.assertEqual(len(store.get_all_asset_metadata(course.id, 'different')), 1) - self.assertEqual(store.delete_asset_metadata(asset_key, ModuleStoreEnum.UserID.test), 1) - self.assertEqual(len(store.get_all_asset_metadata(course.id, 'different')), 0) + assert len(store.get_all_asset_metadata(course.id, 'different')) == 1 + assert store.delete_asset_metadata(asset_key, ModuleStoreEnum.UserID.test) == 1 + assert len(store.get_all_asset_metadata(course.id, 'different')) == 0 @ddt.data(*MODULESTORE_SETUPS) def test_find_different(self, storebuilder): @@ -433,17 +431,17 @@ class TestMongoAssetMetadataStorage(TestCase): ) store.save_asset_metadata(new_asset_thumbnail, ModuleStoreEnum.UserID.test) - self.assertIsNotNone(store.find_asset_metadata(asset_key)) + assert store.find_asset_metadata(asset_key) is not None unknown_asset_key = course.id.make_asset_key('different', 'nosuchfile.jpg') - self.assertIsNone(store.find_asset_metadata(unknown_asset_key)) + assert store.find_asset_metadata(unknown_asset_key) is None def _check_asset_values(self, assets, orig): """ Check asset type/path values. """ for idx, asset in enumerate(orig): - self.assertEqual(assets[idx].asset_id.asset_type, asset[0]) - self.assertEqual(assets[idx].asset_id.path, asset[1]) + assert assets[idx].asset_id.asset_type == asset[0] + assert assets[idx].asset_id.path == asset[1] @ddt.data(*MODULESTORE_SETUPS) def test_get_multiple_types(self, storebuilder): @@ -468,17 +466,17 @@ class TestMongoAssetMetadataStorage(TestCase): ('asset', self.regular_assets), ): assets = store.get_all_asset_metadata(course.id, asset_type) - self.assertEqual(len(assets), len(asset_list)) + assert len(assets) == len(asset_list) self._check_asset_values(assets, asset_list) - self.assertEqual(len(store.get_all_asset_metadata(course.id, 'not_here')), 0) - self.assertEqual(len(store.get_all_asset_metadata(course.id, None)), 4) + assert len(store.get_all_asset_metadata(course.id, 'not_here')) == 0 + assert len(store.get_all_asset_metadata(course.id, None)) == 4 assets = store.get_all_asset_metadata( course.id, None, start=0, maxresults=-1, sort=('displayname', ModuleStoreEnum.SortOrder.ascending) ) - self.assertEqual(len(assets), len(self.alls)) + assert len(assets) == len(self.alls) self._check_asset_values(assets, self.alls) @ddt.data(*MODULESTORE_SETUPS) @@ -507,17 +505,17 @@ class TestMongoAssetMetadataStorage(TestCase): ('asset', self.regular_assets), ): assets = store.get_all_asset_metadata(course.id, asset_type) - self.assertEqual(len(assets), len(asset_list)) + assert len(assets) == len(asset_list) self._check_asset_values(assets, asset_list) - self.assertEqual(len(store.get_all_asset_metadata(course.id, 'not_here')), 0) - self.assertEqual(len(store.get_all_asset_metadata(course.id, None)), 4) + assert len(store.get_all_asset_metadata(course.id, 'not_here')) == 0 + assert len(store.get_all_asset_metadata(course.id, None)) == 4 assets = store.get_all_asset_metadata( course.id, None, start=0, maxresults=-1, sort=('displayname', ModuleStoreEnum.SortOrder.ascending) ) - self.assertEqual(len(assets), len(self.alls)) + assert len(assets) == len(self.alls) self._check_asset_values(assets, self.alls) @ddt.data(*MODULESTORE_SETUPS) @@ -549,17 +547,17 @@ class TestMongoAssetMetadataStorage(TestCase): ('vrml', self.vrmls), ): assets = store.get_all_asset_metadata(course1.id, asset_type) - self.assertEqual(len(assets), len(asset_list)) + assert len(assets) == len(asset_list) self._check_asset_values(assets, asset_list) - self.assertEqual(len(store.get_all_asset_metadata(course1.id, 'asset')), 0) - self.assertEqual(len(store.get_all_asset_metadata(course1.id, None)), 3) + assert len(store.get_all_asset_metadata(course1.id, 'asset')) == 0 + assert len(store.get_all_asset_metadata(course1.id, None)) == 3 assets = store.get_all_asset_metadata( course1.id, None, start=0, maxresults=-1, sort=('displayname', ModuleStoreEnum.SortOrder.ascending) ) - self.assertEqual(len(assets), len(self.differents + self.vrmls)) + assert len(assets) == len((self.differents + self.vrmls)) self._check_asset_values(assets, self.differents + self.vrmls) @ddt.data(*MODULESTORE_SETUPS) @@ -575,7 +573,7 @@ class TestMongoAssetMetadataStorage(TestCase): ) store.save_asset_metadata(new_asset_thumbnail, ModuleStoreEnum.UserID.test) - self.assertEqual(len(store.get_all_asset_metadata(course.id, 'different')), 1) + assert len(store.get_all_asset_metadata(course.id, 'different')) == 1 @ddt.data(*MODULESTORE_SETUPS) def test_get_all_assets_with_paging(self, storebuilder): @@ -617,38 +615,38 @@ class TestMongoAssetMetadataStorage(TestCase): ) num_expected_results = sort_test[2][i] expected_filename = sort_test[1][2 * i] - self.assertEqual(len(asset_page), num_expected_results) - self.assertEqual(asset_page[0].asset_id.path, expected_filename) + assert len(asset_page) == num_expected_results + assert asset_page[0].asset_id.path == expected_filename if num_expected_results == 2: expected_filename = sort_test[1][(2 * i) + 1] - self.assertEqual(asset_page[1].asset_id.path, expected_filename) + assert asset_page[1].asset_id.path == expected_filename # Now fetch everything. asset_page = store.get_all_asset_metadata( course2.id, 'asset', start=0, sort=('displayname', ModuleStoreEnum.SortOrder.ascending) ) - self.assertEqual(len(asset_page), 5) - self.assertEqual(asset_page[0].asset_id.path, 'code.tgz') - self.assertEqual(asset_page[1].asset_id.path, 'demo.swf') - self.assertEqual(asset_page[2].asset_id.path, 'dog.png') - self.assertEqual(asset_page[3].asset_id.path, 'roman_history.pdf') - self.assertEqual(asset_page[4].asset_id.path, 'weather_patterns.bmp') + assert len(asset_page) == 5 + assert asset_page[0].asset_id.path == 'code.tgz' + assert asset_page[1].asset_id.path == 'demo.swf' + assert asset_page[2].asset_id.path == 'dog.png' + assert asset_page[3].asset_id.path == 'roman_history.pdf' + assert asset_page[4].asset_id.path == 'weather_patterns.bmp' # Some odd conditions. asset_page = store.get_all_asset_metadata( course2.id, 'asset', start=100, sort=('uploadDate', ModuleStoreEnum.SortOrder.ascending) ) - self.assertEqual(len(asset_page), 0) + assert len(asset_page) == 0 asset_page = store.get_all_asset_metadata( course2.id, 'asset', start=3, maxresults=0, sort=('displayname', ModuleStoreEnum.SortOrder.ascending) ) - self.assertEqual(len(asset_page), 0) + assert len(asset_page) == 0 asset_page = store.get_all_asset_metadata( course2.id, 'asset', start=3, maxresults=-12345, sort=('displayname', ModuleStoreEnum.SortOrder.descending) ) - self.assertEqual(len(asset_page), 2) + assert len(asset_page) == 2 @ddt.data('XML_MODULESTORE_BUILDER', 'MIXED_MODULESTORE_BUILDER') def test_xml_not_yet_implemented(self, storebuilderName): @@ -659,8 +657,8 @@ class TestMongoAssetMetadataStorage(TestCase): with storebuilder.build(contentstore=None) as (__, store): course_key = store.make_course_key("org", "course", "run") asset_key = course_key.make_asset_key('asset', 'foo.jpg') - self.assertEqual(store.find_asset_metadata(asset_key), None) - self.assertEqual(store.get_all_asset_metadata(course_key, 'asset'), []) + assert store.find_asset_metadata(asset_key) is None + assert store.get_all_asset_metadata(course_key, 'asset') == [] @ddt.data(*MODULESTORE_SETUPS) def test_copy_all_assets_same_modulestore(self, storebuilder): @@ -671,16 +669,16 @@ class TestMongoAssetMetadataStorage(TestCase): course1 = CourseFactory.create(modulestore=store) course2 = CourseFactory.create(modulestore=store) self.setup_assets(course1.id, None, store) - self.assertEqual(len(store.get_all_asset_metadata(course1.id, 'asset')), 2) - self.assertEqual(len(store.get_all_asset_metadata(course2.id, 'asset')), 0) + assert len(store.get_all_asset_metadata(course1.id, 'asset')) == 2 + assert len(store.get_all_asset_metadata(course2.id, 'asset')) == 0 store.copy_all_asset_metadata(course1.id, course2.id, ModuleStoreEnum.UserID.test * 101) - self.assertEqual(len(store.get_all_asset_metadata(course1.id, 'asset')), 2) + assert len(store.get_all_asset_metadata(course1.id, 'asset')) == 2 all_assets = store.get_all_asset_metadata( course2.id, 'asset', sort=('displayname', ModuleStoreEnum.SortOrder.ascending) ) - self.assertEqual(len(all_assets), 2) - self.assertEqual(all_assets[0].asset_id.path, 'pic1.jpg') - self.assertEqual(all_assets[1].asset_id.path, 'shout.ogg') + assert len(all_assets) == 2 + assert all_assets[0].asset_id.path == 'pic1.jpg' + assert all_assets[1].asset_id.path == 'shout.ogg' @ddt.data(*MODULESTORE_SETUPS) def test_copy_all_assets_from_course_with_no_assets(self, storebuilder): @@ -691,12 +689,12 @@ class TestMongoAssetMetadataStorage(TestCase): course1 = CourseFactory.create(modulestore=store) course2 = CourseFactory.create(modulestore=store) store.copy_all_asset_metadata(course1.id, course2.id, ModuleStoreEnum.UserID.test * 101) - self.assertEqual(len(store.get_all_asset_metadata(course1.id, 'asset')), 0) - self.assertEqual(len(store.get_all_asset_metadata(course2.id, 'asset')), 0) + assert len(store.get_all_asset_metadata(course1.id, 'asset')) == 0 + assert len(store.get_all_asset_metadata(course2.id, 'asset')) == 0 all_assets = store.get_all_asset_metadata( course2.id, 'asset', sort=('displayname', ModuleStoreEnum.SortOrder.ascending) ) - self.assertEqual(len(all_assets), 0) + assert len(all_assets) == 0 @ddt.data( ('mongo', 'split'), @@ -714,12 +712,12 @@ class TestMongoAssetMetadataStorage(TestCase): with mixed_store.default_store(to_store): course2 = CourseFactory.create(modulestore=mixed_store) self.setup_assets(course1.id, None, mixed_store) - self.assertEqual(len(mixed_store.get_all_asset_metadata(course1.id, 'asset')), 2) - self.assertEqual(len(mixed_store.get_all_asset_metadata(course2.id, 'asset')), 0) + assert len(mixed_store.get_all_asset_metadata(course1.id, 'asset')) == 2 + assert len(mixed_store.get_all_asset_metadata(course2.id, 'asset')) == 0 mixed_store.copy_all_asset_metadata(course1.id, course2.id, ModuleStoreEnum.UserID.test * 102) all_assets = mixed_store.get_all_asset_metadata( course2.id, 'asset', sort=('displayname', ModuleStoreEnum.SortOrder.ascending) ) - self.assertEqual(len(all_assets), 2) - self.assertEqual(all_assets[0].asset_id.path, 'pic1.jpg') - self.assertEqual(all_assets[1].asset_id.path, 'shout.ogg') + assert len(all_assets) == 2 + assert all_assets[0].asset_id.path == 'pic1.jpg' + assert all_assets[1].asset_id.path == 'shout.ogg' diff --git a/common/lib/xmodule/xmodule/modulestore/tests/test_contentstore.py b/common/lib/xmodule/xmodule/modulestore/tests/test_contentstore.py index 44ad9f2f64..3b78556bd8 100644 --- a/common/lib/xmodule/xmodule/modulestore/tests/test_contentstore.py +++ b/common/lib/xmodule/xmodule/modulestore/tests/test_contentstore.py @@ -10,6 +10,7 @@ import unittest from tempfile import mkdtemp from uuid import uuid4 +import pytest import ddt import path from opaque_keys.edx.keys import AssetKey @@ -101,7 +102,7 @@ class TestContentstore(unittest.TestCase): asset_key = self.course1_key.make_asset_key('asset', self.course1_files[0]) self.contentstore.delete(asset_key) - with self.assertRaises(NotFoundError): + with pytest.raises(NotFoundError): self.contentstore.find(asset_key) # ensure deleting a non-existent file is a noop @@ -114,17 +115,15 @@ class TestContentstore(unittest.TestCase): """ self.set_up_assets(deprecated) asset_key = self.course1_key.make_asset_key('asset', self.course1_files[0]) - self.assertIsNotNone(self.contentstore.find(asset_key), "Could not find {}".format(asset_key)) + assert self.contentstore.find(asset_key) is not None, 'Could not find {}'.format(asset_key) - self.assertIsNotNone(self.contentstore.find(asset_key, as_stream=True), "Could not find {}".format(asset_key)) + assert self.contentstore.find(asset_key, as_stream=True) is not None, 'Could not find {}'.format(asset_key) unknown_asset = self.course1_key.make_asset_key('asset', 'no_such_file.gif') - with self.assertRaises(NotFoundError): + with pytest.raises(NotFoundError): self.contentstore.find(unknown_asset) - self.assertIsNone( - self.contentstore.find(unknown_asset, throw_on_not_found=False), - "Found unknown asset {}".format(unknown_asset) - ) + assert self.contentstore.find(unknown_asset, throw_on_not_found=False) is None,\ + f'Found unknown asset {unknown_asset}' @ddt.data(True, False) def test_export_for_course(self, deprecated): @@ -140,11 +139,11 @@ class TestContentstore(unittest.TestCase): ) for filename in self.course1_files: filepath = path.Path(root_dir / filename) - self.assertTrue(filepath.isfile(), "{} is not a file".format(filepath)) + assert filepath.isfile(), '{} is not a file'.format(filepath) for filename in self.course2_files: if filename not in self.course1_files: filepath = path.Path(root_dir / filename) - self.assertFalse(filepath.isfile(), "{} is unexpected exported a file".format(filepath)) + assert not filepath.isfile(), '{} is unexpected exported a file'.format(filepath) finally: shutil.rmtree(root_dir) @@ -155,18 +154,18 @@ class TestContentstore(unittest.TestCase): """ self.set_up_assets(deprecated) course1_assets, count = self.contentstore.get_all_content_for_course(self.course1_key) - self.assertEqual(count, len(self.course1_files), course1_assets) + assert count == len(self.course1_files), course1_assets for asset in course1_assets: parsed = AssetKey.from_string(asset['filename']) - self.assertIn(parsed.block_id, self.course1_files) + assert parsed.block_id in self.course1_files course1_assets, __ = self.contentstore.get_all_content_for_course(self.course1_key, 1, 1) - self.assertEqual(len(course1_assets), 1, course1_assets) + assert len(course1_assets) == 1, course1_assets fake_course = CourseLocator('test', 'fake', 'non') course_assets, count = self.contentstore.get_all_content_for_course(fake_course) - self.assertEqual(count, 0) - self.assertEqual(course_assets, []) + assert count == 0 + assert course_assets == [] @ddt.data(True, False) def test_attrs(self, deprecated): @@ -178,7 +177,7 @@ class TestContentstore(unittest.TestCase): asset_key = self.course1_key.make_asset_key('asset', filename) prelocked = self.contentstore.get_attr(asset_key, 'locked', False) self.contentstore.set_attr(asset_key, 'locked', not prelocked) - self.assertEqual(self.contentstore.get_attr(asset_key, 'locked', False), not prelocked) + assert self.contentstore.get_attr(asset_key, 'locked', False) == (not prelocked) @ddt.data(True, False) def test_copy_assets(self, deprecated): @@ -194,10 +193,10 @@ class TestContentstore(unittest.TestCase): source = self.contentstore.find(asset_key) copied = self.contentstore.find(dest_key) for propname in ['name', 'content_type', 'length', 'locked']: - self.assertEqual(getattr(source, propname), getattr(copied, propname)) + assert getattr(source, propname) == getattr(copied, propname) __, count = self.contentstore.get_all_content_for_course(dest_course) - self.assertEqual(count, len(self.course1_files)) + assert count == len(self.course1_files) @ddt.data(True, False) def test_copy_assets_with_duplicates(self, deprecated): @@ -209,7 +208,7 @@ class TestContentstore(unittest.TestCase): self.contentstore.copy_all_course_assets(self.course1_key, dest_course) __, count = self.contentstore.get_all_content_for_course(dest_course) - self.assertEqual(count, 5) + assert count == 5 @ddt.data(True, False) def test_delete_assets(self, deprecated): @@ -219,7 +218,7 @@ class TestContentstore(unittest.TestCase): self.set_up_assets(deprecated) self.contentstore.delete_all_course_assets(self.course1_key) __, count = self.contentstore.get_all_content_for_course(self.course1_key) - self.assertEqual(count, 0) + assert count == 0 # ensure it didn't remove any from other course __, count = self.contentstore.get_all_content_for_course(self.course2_key) - self.assertEqual(count, len(self.course2_files)) + assert count == len(self.course2_files) diff --git a/common/lib/xmodule/xmodule/modulestore/tests/test_cross_modulestore_import_export.py b/common/lib/xmodule/xmodule/modulestore/tests/test_cross_modulestore_import_export.py index 989dba15b3..f44516b02d 100644 --- a/common/lib/xmodule/xmodule/modulestore/tests/test_cross_modulestore_import_export.py +++ b/common/lib/xmodule/xmodule/modulestore/tests/test_cross_modulestore_import_export.py @@ -188,12 +188,12 @@ class CrossStoreXMLRoundtrip(CourseComparisonTest, PartitionTestCase): source_course = source_store.get_course(source_course_key, depth=None, lazy=False) # lint-amnesty, pylint: disable=no-member - self.assertEqual(source_course.url_name, 'course') + assert source_course.url_name == 'course' export_dir_path = path(self.export_dir) policy_dir = export_dir_path / 'exported_source_course' / 'policies' / source_course_key.run policy_path = policy_dir / 'policy.json' - self.assertTrue(os.path.exists(policy_path)) + assert os.path.exists(policy_path) import_course_from_xml( dest_store, @@ -208,4 +208,4 @@ class CrossStoreXMLRoundtrip(CourseComparisonTest, PartitionTestCase): dest_course = dest_store.get_course(dest_course_key, depth=None, lazy=False) # lint-amnesty, pylint: disable=no-member - self.assertEqual(dest_course.url_name, 'course') + assert dest_course.url_name == 'course' diff --git a/common/lib/xmodule/xmodule/modulestore/tests/test_inheritance.py b/common/lib/xmodule/xmodule/modulestore/tests/test_inheritance.py index 24234473ce..3a1e27972c 100644 --- a/common/lib/xmodule/xmodule/modulestore/tests/test_inheritance.py +++ b/common/lib/xmodule/xmodule/modulestore/tests/test_inheritance.py @@ -64,4 +64,4 @@ class TestInheritanceMixin(unittest.TestCase): confirm if the submission deadline has passed or not. """ self.add_submission_deadline_information(due_date, graceperiod, self_paced) - self.assertEqual(is_past_deadline, self.xblock.has_deadline_passed()) + assert is_past_deadline == self.xblock.has_deadline_passed() diff --git a/common/lib/xmodule/xmodule/modulestore/tests/test_libraries.py b/common/lib/xmodule/xmodule/modulestore/tests/test_libraries.py index 72c0e35fa4..0ea137fc94 100644 --- a/common/lib/xmodule/xmodule/modulestore/tests/test_libraries.py +++ b/common/lib/xmodule/xmodule/modulestore/tests/test_libraries.py @@ -5,7 +5,7 @@ Basic unit tests related to content libraries. Higher-level tests are in `cms/djangoapps/contentstore`. """ - +import pytest import ddt import six from bson.objectid import ObjectId @@ -45,7 +45,7 @@ class TestLibraries(MixedSplitTestCase): """ org, lib_code = ('DuplicateX', "DUP") LibraryFactory.create(org=org, library=lib_code, modulestore=self.store) - with self.assertRaises(DuplicateCourseError): + with pytest.raises(DuplicateCourseError): LibraryFactory.create(org=org, library=lib_code, modulestore=self.store) @ddt.data( @@ -57,9 +57,9 @@ class TestLibraries(MixedSplitTestCase): Test __unicode__() and __str__() methods of libraries """ library = LibraryFactory.create(metadata={"display_name": name}, modulestore=self.store) - self.assertIn(name, six.text_type(library)) + assert name in six.text_type(library) if not isinstance(name, six.text_type): - self.assertIn(name, str(library)) + assert name in str(library) def test_display_with_default_methods(self): """ @@ -69,8 +69,8 @@ class TestLibraries(MixedSplitTestCase): org = 'TestOrgX' lib_code = 'LC101' library = LibraryFactory.create(org=org, library=lib_code, modulestore=self.store) - self.assertEqual(library.display_org_with_default, org) - self.assertEqual(library.display_number_with_default, lib_code) + assert library.display_org_with_default == org + assert library.display_number_with_default == lib_code def test_block_with_children(self): """ @@ -94,7 +94,7 @@ class TestLibraries(MixedSplitTestCase): metadata={"data": "Hello world", }, modulestore=self.store, ) - self.assertEqual(child_block.parent.replace(version_guid=None, branch=None), vert_block.location) + assert child_block.parent.replace(version_guid=None, branch=None) == vert_block.location def test_update_item(self): """ @@ -116,10 +116,10 @@ class TestLibraries(MixedSplitTestCase): self.store.update_item(block, self.user_id) # Reload block from the modulestore block = self.store.get_item(block_key) - self.assertEqual(block.data, "NEW") - self.assertEqual(block.location, block_key) + assert block.data == 'NEW' + assert block.location == block_key new_version = self.store.get_item(block_key, remove_version=False, remove_branch=False).location.version_guid - self.assertNotEqual(old_version, new_version) + assert old_version != new_version def test_delete_item(self): """ @@ -135,15 +135,15 @@ class TestLibraries(MixedSplitTestCase): modulestore=self.store, ) library = self.store.get_library(lib_key) - self.assertEqual(len(library.children), 1) + assert len(library.children) == 1 self.store.delete_item(block.location, self.user_id) library = self.store.get_library(lib_key) - self.assertEqual(len(library.children), 0) + assert len(library.children) == 0 def test_get_library_non_existent(self): """ Test get_library() with non-existent key """ result = self.store.get_library(LibraryLocator("non", "existent")) - self.assertEqual(result, None) + assert result is None def test_get_library_keys(self): """ Test get_library_keys() """ @@ -159,9 +159,9 @@ class TestLibraries(MixedSplitTestCase): lib_list = self.store.get_libraries() - self.assertEqual(len(lib_list), len(libraries)) + assert len(lib_list) == len(libraries) for lib in lib_list: - self.assertIn(lib.location.library_key, lib_dict) + assert lib.location.library_key in lib_dict def test_strip(self): """ @@ -172,10 +172,10 @@ class TestLibraries(MixedSplitTestCase): lib_key = LibraryFactory.create(modulestore=self.store).location.library_key # Re-load the library from the modulestore, explicitly including version information: lib = self.store.get_library(lib_key) - self.assertEqual(lib.location.version_guid, None) - self.assertEqual(lib.location.branch, None) - self.assertEqual(lib.location.library_key.version_guid, None) - self.assertEqual(lib.location.library_key.branch, None) + assert lib.location.version_guid is None + assert lib.location.branch is None + assert lib.location.library_key.version_guid is None + assert lib.location.library_key.branch is None def test_get_lib_version(self): """ @@ -186,7 +186,7 @@ class TestLibraries(MixedSplitTestCase): # Re-load the library from the modulestore, explicitly including version information: lib = self.store.get_library(lib_key, remove_version=False, remove_branch=False) version = lib.location.library_key.version_guid - self.assertIsInstance(version, ObjectId) + assert isinstance(version, ObjectId) def test_xblock_in_lib_have_published_version_returns_false(self): library = LibraryFactory.create(modulestore=self.store) @@ -197,4 +197,4 @@ class TestLibraries(MixedSplitTestCase): publish_item=False, modulestore=self.store, ) - self.assertFalse(self.store.has_published_version(block)) + assert not self.store.has_published_version(block) diff --git a/common/lib/xmodule/xmodule/modulestore/tests/test_mixed_modulestore.py b/common/lib/xmodule/xmodule/modulestore/tests/test_mixed_modulestore.py index 74c119b051..7852995749 100644 --- a/common/lib/xmodule/xmodule/modulestore/tests/test_mixed_modulestore.py +++ b/common/lib/xmodule/xmodule/modulestore/tests/test_mixed_modulestore.py @@ -166,7 +166,7 @@ class CommonMixedModuleStoreSetup(CourseComparisonTest): if isinstance(self.course.id, CourseLocator): self.course_locations[self.MONGO_COURSEID] = self.course.location else: - self.assertEqual(self.course.id, course_key) + assert self.course.id == course_key # create chapter chapter = self.store.create_child(self.user_id, self.course.location, 'chapter', @@ -283,7 +283,7 @@ class CommonMixedModuleStoreSetup(CourseComparisonTest): ).make_usage_key('vertical', 'fake') self._create_course(test_course_key) - self.assertEqual(default, self.store.get_modulestore_type(self.course.id)) + assert default == self.store.get_modulestore_type(self.course.id) class AsideFoo(XBlockAside): @@ -328,13 +328,9 @@ class TestMixedModuleStore(CommonMixedModuleStoreSetup): Make sure we get back the store type we expect for given mappings """ self.initdb(default_ms) - self.assertEqual(self.store.get_modulestore_type( - self._course_key_from_string(self.MONGO_COURSEID)), default_ms - ) + assert self.store.get_modulestore_type(self._course_key_from_string(self.MONGO_COURSEID)) == default_ms # try an unknown mapping, it should be the 'default' store - self.assertEqual(self.store.get_modulestore_type( - CourseKey.from_string('foo/bar/2012_Fall')), default_ms - ) + assert self.store.get_modulestore_type(CourseKey.from_string('foo/bar/2012_Fall')) == default_ms @ddt.data(ModuleStoreEnum.Type.mongo, ModuleStoreEnum.Type.split) def test_get_modulestore_cache(self, default_ms): @@ -346,9 +342,9 @@ class TestMixedModuleStore(CommonMixedModuleStoreSetup): self.store.mappings = {} course_key = self.course_locations[self.MONGO_COURSEID].course_key with check_exact_number_of_calls(self.store.default_modulestore, 'has_course', 1): - self.assertEqual(self.store.default_modulestore, self.store._get_modulestore_for_courselike(course_key)) # pylint: disable=protected-access - self.assertIn(course_key, self.store.mappings) - self.assertEqual(self.store.default_modulestore, self.store._get_modulestore_for_courselike(course_key)) # pylint: disable=protected-access + assert self.store.default_modulestore == self.store._get_modulestore_for_courselike(course_key) # pylint: disable=protected-access, line-too-long + assert course_key in self.store.mappings + assert self.store.default_modulestore == self.store._get_modulestore_for_courselike(course_key) # pylint: disable=protected-access, line-too-long @ddt.data(*itertools.product( (ModuleStoreEnum.Type.mongo, ModuleStoreEnum.Type.split), @@ -364,7 +360,7 @@ class TestMixedModuleStore(CommonMixedModuleStoreSetup): self.store.create_course('org_x', 'course_y', 'run_z', self.user_id) if reset_mixed_mappings: self.store.mappings = {} - with self.assertRaises(DuplicateCourseError): + with pytest.raises(DuplicateCourseError): self.store.create_course('org_x', 'course_y', 'run_z', self.user_id) @ddt.data(ModuleStoreEnum.Type.split, ModuleStoreEnum.Type.mongo) @@ -376,7 +372,7 @@ class TestMixedModuleStore(CommonMixedModuleStoreSetup): with self.store.default_store(default_store): self.store.create_course('org_x', 'course_y', 'run_z', self.user_id) - with self.assertRaises(DuplicateCourseError): + with pytest.raises(DuplicateCourseError): self.store.create_course('ORG_X', 'COURSE_Y', 'RUN_Z', self.user_id) # Draft: @@ -390,14 +386,14 @@ class TestMixedModuleStore(CommonMixedModuleStoreSetup): self._create_block_hierarchy() with check_mongo_calls(max_find.pop(0), max_send): - self.assertTrue(self.store.has_item(self.problem_x1a_1)) # lint-amnesty, pylint: disable=no-member + assert self.store.has_item(self.problem_x1a_1) # lint-amnesty, pylint: disable=no-member # try negative cases with check_mongo_calls(max_find.pop(0), max_send): - self.assertFalse(self.store.has_item(self.fake_location)) + assert not self.store.has_item(self.fake_location) # verify that an error is raised when the revision is not valid - with self.assertRaises(UnsupportedRevisionError): + with pytest.raises(UnsupportedRevisionError): self.store.has_item(self.fake_location, revision=ModuleStoreEnum.RevisionOption.draft_preferred) # draft queries: @@ -413,15 +409,15 @@ class TestMixedModuleStore(CommonMixedModuleStoreSetup): self._create_block_hierarchy() with check_mongo_calls(max_find.pop(0), max_send): - self.assertIsNotNone(self.store.get_item(self.problem_x1a_1)) # lint-amnesty, pylint: disable=no-member + assert self.store.get_item(self.problem_x1a_1) is not None # lint-amnesty, pylint: disable=no-member # try negative cases with check_mongo_calls(max_find.pop(0), max_send): - with self.assertRaises(ItemNotFoundError): + with pytest.raises(ItemNotFoundError): self.store.get_item(self.fake_location) # verify that an error is raised when the revision is not valid - with self.assertRaises(UnsupportedRevisionError): + with pytest.raises(UnsupportedRevisionError): self.store.get_item(self.fake_location, revision=ModuleStoreEnum.RevisionOption.draft_preferred) # Draft: @@ -437,10 +433,10 @@ class TestMixedModuleStore(CommonMixedModuleStoreSetup): course_locn = self.course_locations[self.MONGO_COURSEID] with check_mongo_calls(max_find, max_send): modules = self.store.get_items(course_locn.course_key, qualifiers={'category': 'problem'}) - self.assertEqual(len(modules), 6) + assert len(modules) == 6 # verify that an error is raised when the revision is not valid - with self.assertRaises(UnsupportedRevisionError): + with pytest.raises(UnsupportedRevisionError): self.store.get_items( self.course_locations[self.MONGO_COURSEID].course_key, revision=ModuleStoreEnum.RevisionOption.draft_preferred @@ -455,19 +451,19 @@ class TestMixedModuleStore(CommonMixedModuleStoreSetup): course_version = course.course_version if default_ms == ModuleStoreEnum.Type.split: - self.assertIsNotNone(course_version) + assert course_version is not None else: - self.assertIsNone(course_version) + assert course_version is None blocks = self.store.get_items(self.course.id, qualifiers={'category': 'problem'}) blocks.append(self.store.get_item(self.problem_x1a_1)) # lint-amnesty, pylint: disable=no-member - self.assertEqual(len(blocks), 7) + assert len(blocks) == 7 for block in blocks: - self.assertEqual(block.course_version, course_version) + assert block.course_version == course_version # ensure that when the block is retrieved from the runtime cache, # the course version is still present cached_block = course.runtime.load_item(block.location) - self.assertEqual(cached_block.course_version, block.course_version) + assert cached_block.course_version == block.course_version @ddt.data((ModuleStoreEnum.Type.split, 2, False), (ModuleStoreEnum.Type.mongo, 3, True)) @ddt.unpack @@ -496,17 +492,15 @@ class TestMixedModuleStore(CommonMixedModuleStoreSetup): items = self.store.get_items(course_key) # Check items found are either course or about type - self.assertTrue(set(['course', 'about']).issubset(set([item.location.block_type for item in items]))) # lint-amnesty, pylint: disable=consider-using-set-comprehension + assert set(['course', 'about']).issubset(set([item.location.block_type for item in items])) # pylint: disable=consider-using-set-comprehension, line-too-long # Assert that about is a detached category found in get_items - self.assertIn( - [item.location.block_type for item in items if item.location.block_type == 'about'][0], - DETACHED_XBLOCK_TYPES - ) - self.assertEqual(len(items), 2) + assert [item.location.block_type for item in items if item.location.block_type == 'about'][0]\ + in DETACHED_XBLOCK_TYPES + assert len(items) == 2 # Check that orphans are not found orphans = self.store.get_orphans(course_key) - self.assertEqual(len(orphans), 0) + assert len(orphans) == 0 # Add an orphan to test course orphan = course_key.make_usage_key('chapter', 'OrphanChapter') @@ -514,22 +508,22 @@ class TestMixedModuleStore(CommonMixedModuleStoreSetup): # Check that now an orphan is found orphans = self.store.get_orphans(course_key) - self.assertIn(orphan, orphans) - self.assertEqual(len(orphans), 1) + assert orphan in orphans + assert len(orphans) == 1 # Check now `get_items` retrieves an extra item added above which is an orphan. items = self.store.get_items(course_key) - self.assertIn(orphan, [item.location for item in items]) - self.assertEqual(len(items), 3) + assert orphan in [item.location for item in items] + assert len(items) == 3 # Check now `get_items` with `include_orphans` kwarg does not retrieves an orphan block. items_in_tree = self.store.get_items(course_key, include_orphans=False) # Check that course and about blocks are found in get_items - self.assertTrue(set(['course', 'about']).issubset(set([item.location.block_type for item in items_in_tree]))) # lint-amnesty, pylint: disable=consider-using-set-comprehension + assert set(['course', 'about']).issubset({item.location.block_type for item in items_in_tree}) # Check orphan is found or not - this is based on mongo/split modulestore. It should be found in mongo. - self.assertEqual(orphan in [item.location for item in items_in_tree], orphan_in_items) - self.assertEqual(len(items_in_tree), expected_items_in_tree) + assert (orphan in [item.location for item in items_in_tree]) == orphan_in_items + assert len(items_in_tree) == expected_items_in_tree # draft: get draft, get ancestors up to course (2-6), compute inheritance # sends: update problem and then each ancestor up to course (edit info) @@ -545,12 +539,12 @@ class TestMixedModuleStore(CommonMixedModuleStoreSetup): self._create_block_hierarchy() problem = self.store.get_item(self.problem_x1a_1) # lint-amnesty, pylint: disable=no-member # if following raised, then the test is really a noop, change it - self.assertNotEqual(problem.max_attempts, 2, "Default changed making test meaningless") + assert problem.max_attempts != 2, 'Default changed making test meaningless' problem.max_attempts = 2 with check_mongo_calls(max_find, max_send): problem = self.store.update_item(problem, self.user_id) - self.assertEqual(problem.max_attempts, 2, "Update didn't persist") + assert problem.max_attempts == 2, "Update didn't persist" @ddt.data(ModuleStoreEnum.Type.mongo, ModuleStoreEnum.Type.split) def test_has_changes_direct_only(self, default_ms): @@ -570,8 +564,8 @@ class TestMixedModuleStore(CommonMixedModuleStoreSetup): ) # Check that neither xblock has changes - self.assertFalse(self.store.has_changes(test_course)) - self.assertFalse(self.store.has_changes(chapter)) + assert not self.store.has_changes(test_course) + assert not self.store.has_changes(chapter) @ddt.data(ModuleStoreEnum.Type.mongo, ModuleStoreEnum.Type.split) def test_has_changes(self, default_ms): @@ -591,22 +585,22 @@ class TestMixedModuleStore(CommonMixedModuleStoreSetup): ) # Not yet published, so changes are present - self.assertTrue(self.store.has_changes(xblock)) + assert self.store.has_changes(xblock) # Publish and verify that there are no unpublished changes newXBlock = self.store.publish(xblock.location, self.user_id) - self.assertFalse(self.store.has_changes(newXBlock)) + assert not self.store.has_changes(newXBlock) # Change the component, then check that there now are changes component = self.store.get_item(xblock.location) component.display_name = 'Changed Display Name' component = self.store.update_item(component, self.user_id) - self.assertTrue(self.store.has_changes(component)) + assert self.store.has_changes(component) # Publish and verify again component = self.store.publish(component.location, self.user_id) - self.assertFalse(self.store.has_changes(component)) + assert not self.store.has_changes(component) @ddt.data(ModuleStoreEnum.Type.mongo, ModuleStoreEnum.Type.split) def test_unit_stuck_in_draft_mode(self, default_ms): @@ -626,19 +620,19 @@ class TestMixedModuleStore(CommonMixedModuleStoreSetup): ) # Not yet published, so changes are present - self.assertTrue(self.store.has_changes(xblock)) + assert self.store.has_changes(xblock) # Publish and verify that there are no unpublished changes component = self.store.publish(xblock.location, self.user_id) - self.assertFalse(self.store.has_changes(component)) + assert not self.store.has_changes(component) self.store.revert_to_published(component.location, self.user_id) component = self.store.get_item(component.location) - self.assertFalse(self.store.has_changes(component)) + assert not self.store.has_changes(component) # Publish and verify again component = self.store.publish(component.location, self.user_id) - self.assertFalse(self.store.has_changes(component)) + assert not self.store.has_changes(component) @ddt.data(ModuleStoreEnum.Type.mongo, ModuleStoreEnum.Type.split) def test_unit_stuck_in_published_mode(self, default_ms): @@ -658,16 +652,16 @@ class TestMixedModuleStore(CommonMixedModuleStoreSetup): ) # Not yet published, so changes are present - self.assertTrue(self.store.has_changes(xblock)) + assert self.store.has_changes(xblock) # Publish and verify that there are no unpublished changes component = self.store.publish(xblock.location, self.user_id) - self.assertFalse(self.store.has_changes(component)) + assert not self.store.has_changes(component) # Discard changes and verify that there are no changes self.store.revert_to_published(component.location, self.user_id) component = self.store.get_item(component.location) - self.assertFalse(self.store.has_changes(component)) + assert not self.store.has_changes(component) # Change the component, then check that there now are changes component = self.store.get_item(component.location) @@ -675,7 +669,7 @@ class TestMixedModuleStore(CommonMixedModuleStoreSetup): self.store.update_item(component, self.user_id) # Verify that changes are present - self.assertTrue(self.store.has_changes(component)) + assert self.store.has_changes(component) @ddt.data(ModuleStoreEnum.Type.mongo, ModuleStoreEnum.Type.split) def test_unit_stuck_in_published_mode_after_delete(self, default_ms): @@ -703,22 +697,22 @@ class TestMixedModuleStore(CommonMixedModuleStoreSetup): # publish vertical changes self.store.publish(vertical.location, self.user_id) - self.assertFalse(self._has_changes(vertical.location)) + assert not self._has_changes(vertical.location) # Change a component, then check that there now are changes component = self.store.get_item(component.location) component.display_name = 'Changed Display Name' self.store.update_item(component, self.user_id) - self.assertTrue(self._has_changes(vertical.location)) + assert self._has_changes(vertical.location) # Discard changes and verify that there are no changes self.store.revert_to_published(vertical.location, self.user_id) - self.assertFalse(self._has_changes(vertical.location)) + assert not self._has_changes(vertical.location) # Delete the component and verify that the unit has changes self.store.delete_item(component.location, self.user_id) vertical = self.store.get_item(vertical.location) - self.assertTrue(self._has_changes(vertical.location)) + assert self._has_changes(vertical.location) @ddt.data(ModuleStoreEnum.Type.mongo, ModuleStoreEnum.Type.split) def test_publish_automatically_after_delete_unit(self, default_ms): @@ -735,11 +729,11 @@ class TestMixedModuleStore(CommonMixedModuleStoreSetup): # publish sequential changes self.store.publish(sequential.location, self.user_id) - self.assertFalse(self._has_changes(sequential.location)) + assert not self._has_changes(sequential.location) # delete vertical and check sequential has no changes self.store.delete_item(vertical.location, self.user_id) - self.assertFalse(self._has_changes(sequential.location)) + assert not self._has_changes(sequential.location) def setup_has_changes(self, default_ms): """ @@ -772,7 +766,7 @@ class TestMixedModuleStore(CommonMixedModuleStoreSetup): # Verify that there are no unpublished changes for key in locations: - self.assertFalse(self._has_changes(locations[key])) + assert not self._has_changes(locations[key]) # Change the child child = self.store.get_item(locations['child']) @@ -780,18 +774,18 @@ class TestMixedModuleStore(CommonMixedModuleStoreSetup): self.store.update_item(child, self.user_id) # All ancestors should have changes, but not siblings - self.assertTrue(self._has_changes(locations['grandparent'])) - self.assertTrue(self._has_changes(locations['parent'])) - self.assertTrue(self._has_changes(locations['child'])) - self.assertFalse(self._has_changes(locations['parent_sibling'])) - self.assertFalse(self._has_changes(locations['child_sibling'])) + assert self._has_changes(locations['grandparent']) + assert self._has_changes(locations['parent']) + assert self._has_changes(locations['child']) + assert not self._has_changes(locations['parent_sibling']) + assert not self._has_changes(locations['child_sibling']) # Publish the unit with changes self.store.publish(locations['parent'], self.user_id) # Verify that there are no unpublished changes for key in locations: - self.assertFalse(self._has_changes(locations[key])) + assert not self._has_changes(locations[key]) @ddt.data(ModuleStoreEnum.Type.mongo, ModuleStoreEnum.Type.split) def test_has_changes_publish_ancestors(self, default_ms): @@ -802,7 +796,7 @@ class TestMixedModuleStore(CommonMixedModuleStoreSetup): # Verify that there are no unpublished changes for key in locations: - self.assertFalse(self._has_changes(locations[key])) + assert not self._has_changes(locations[key]) # Change both children child = self.store.get_item(locations['child']) @@ -813,22 +807,22 @@ class TestMixedModuleStore(CommonMixedModuleStoreSetup): self.store.update_item(child_sibling, user_id=self.user_id) # Verify that ancestors have changes - self.assertTrue(self._has_changes(locations['grandparent'])) - self.assertTrue(self._has_changes(locations['parent'])) + assert self._has_changes(locations['grandparent']) + assert self._has_changes(locations['parent']) # Publish one child self.store.publish(locations['child_sibling'], self.user_id) # Verify that ancestors still have changes - self.assertTrue(self._has_changes(locations['grandparent'])) - self.assertTrue(self._has_changes(locations['parent'])) + assert self._has_changes(locations['grandparent']) + assert self._has_changes(locations['parent']) # Publish the other child self.store.publish(locations['child'], self.user_id) # Verify that ancestors now have no changes - self.assertFalse(self._has_changes(locations['grandparent'])) - self.assertFalse(self._has_changes(locations['parent'])) + assert not self._has_changes(locations['grandparent']) + assert not self._has_changes(locations['parent']) @ddt.data(ModuleStoreEnum.Type.mongo, ModuleStoreEnum.Type.split) def test_has_changes_add_remove_child(self, default_ms): @@ -839,8 +833,8 @@ class TestMixedModuleStore(CommonMixedModuleStoreSetup): locations = self.setup_has_changes(default_ms) # Test that the ancestors don't have changes - self.assertFalse(self._has_changes(locations['grandparent'])) - self.assertFalse(self._has_changes(locations['parent'])) + assert not self._has_changes(locations['grandparent']) + assert not self._has_changes(locations['parent']) # Create a new child and attach it to parent self.store.create_child( @@ -851,8 +845,8 @@ class TestMixedModuleStore(CommonMixedModuleStoreSetup): ) # Verify that the ancestors now have changes - self.assertTrue(self._has_changes(locations['grandparent'])) - self.assertTrue(self._has_changes(locations['parent'])) + assert self._has_changes(locations['grandparent']) + assert self._has_changes(locations['parent']) # Remove the child from the parent parent = self.store.get_item(locations['parent']) @@ -860,8 +854,8 @@ class TestMixedModuleStore(CommonMixedModuleStoreSetup): self.store.update_item(parent, user_id=self.user_id) # Verify that ancestors now have no changes - self.assertFalse(self._has_changes(locations['grandparent'])) - self.assertFalse(self._has_changes(locations['parent'])) + assert not self._has_changes(locations['grandparent']) + assert not self._has_changes(locations['parent']) @ddt.data(ModuleStoreEnum.Type.mongo, ModuleStoreEnum.Type.split) def test_has_changes_non_direct_only_children(self, default_ms): @@ -885,16 +879,16 @@ class TestMixedModuleStore(CommonMixedModuleStoreSetup): self.store.publish(parent.location, self.user_id) # Verify that there are no changes - self.assertFalse(self._has_changes(parent.location)) - self.assertFalse(self._has_changes(child.location)) + assert not self._has_changes(parent.location) + assert not self._has_changes(child.location) # Change the child child.display_name = 'Changed Display Name' self.store.update_item(child, user_id=self.user_id) # Verify that both parent and child have changes - self.assertTrue(self._has_changes(parent.location)) - self.assertTrue(self._has_changes(child.location)) + assert self._has_changes(parent.location) + assert self._has_changes(child.location) @ddt.data(*itertools.product( (ModuleStoreEnum.Type.mongo, ModuleStoreEnum.Type.split), @@ -919,7 +913,7 @@ class TestMixedModuleStore(CommonMixedModuleStoreSetup): parent = self.store.update_item(parent, self.user_id) # Check the parent for changes should return True and not throw an exception - self.assertTrue(self.store.has_changes(parent)) + assert self.store.has_changes(parent) # Draft # Find: find parents (definition.children query), get parent, get course (fill in run?), @@ -944,10 +938,10 @@ class TestMixedModuleStore(CommonMixedModuleStoreSetup): self.store.delete_item(self.writable_chapter_location, self.user_id) # verify it's gone - with self.assertRaises(ItemNotFoundError): + with pytest.raises(ItemNotFoundError): self.store.get_item(self.writable_chapter_location) # verify it's gone from published too - with self.assertRaises(ItemNotFoundError): + with pytest.raises(ItemNotFoundError): self.store.get_item(self.writable_chapter_location, revision=ModuleStoreEnum.RevisionOption.published_only) # Draft: @@ -984,10 +978,10 @@ class TestMixedModuleStore(CommonMixedModuleStoreSetup): vert_loc = private_vert.location.for_version(private_leaf.location.version_guid) else: vert_loc = private_vert.location - self.assertTrue(self.store.has_item(vert_loc)) - self.assertTrue(self.store.has_item(private_leaf.location)) + assert self.store.has_item(vert_loc) + assert self.store.has_item(private_leaf.location) course = self.store.get_course(self.course_locations[self.MONGO_COURSEID].course_key, 0) - self.assertIn(vert_loc, course.children) + assert vert_loc in course.children # delete the vertical and ensure the course no longer points to it with check_mongo_calls(max_find, max_send): @@ -1000,9 +994,9 @@ class TestMixedModuleStore(CommonMixedModuleStoreSetup): else: vert_loc = private_vert.location leaf_loc = private_leaf.location - self.assertFalse(self.store.has_item(vert_loc)) - self.assertFalse(self.store.has_item(leaf_loc)) - self.assertNotIn(vert_loc, course.children) + assert not self.store.has_item(vert_loc) + assert not self.store.has_item(leaf_loc) + assert vert_loc not in course.children # Draft: # find: find parent (definition.children) 2x, find draft item, get inheritance items @@ -1029,7 +1023,7 @@ class TestMixedModuleStore(CommonMixedModuleStoreSetup): ) # verify that an error is raised when the revision is not valid - with self.assertRaises(UnsupportedRevisionError): + with pytest.raises(UnsupportedRevisionError): self.store.delete_item( private_leaf.location, self.user_id, @@ -1061,14 +1055,14 @@ class TestMixedModuleStore(CommonMixedModuleStoreSetup): with check_mongo_calls(max_find, max_send): courses = self.store.get_courses() course_ids = [course.location for course in courses] - self.assertEqual(len(courses), 1, "Not one course: {}".format(course_ids)) - self.assertIn(self.course_locations[self.MONGO_COURSEID], course_ids) + assert len(courses) == 1, 'Not one course: {}'.format(course_ids) + assert self.course_locations[self.MONGO_COURSEID] in course_ids with self.store.branch_setting(ModuleStoreEnum.Branch.draft_preferred): draft_courses = self.store.get_courses(remove_branch=True) with self.store.branch_setting(ModuleStoreEnum.Branch.published_only): published_courses = self.store.get_courses(remove_branch=True) - self.assertEqual([c.id for c in draft_courses], [c.id for c in published_courses]) + assert [c.id for c in draft_courses] == [c.id for c in published_courses] @ddt.data(ModuleStoreEnum.Type.mongo, ModuleStoreEnum.Type.split) def test_create_child_detached_tabs(self, default_ms): @@ -1078,7 +1072,7 @@ class TestMixedModuleStore(CommonMixedModuleStoreSetup): """ self.initdb(default_ms) mongo_course = self.store.get_course(self.course_locations[self.MONGO_COURSEID].course_key) - self.assertEqual(len(mongo_course.children), 1) + assert len(mongo_course.children) == 1 # create a static tab of the course self.store.create_child( @@ -1089,7 +1083,7 @@ class TestMixedModuleStore(CommonMixedModuleStoreSetup): # now check that the course has same number of children mongo_course = self.store.get_course(self.course_locations[self.MONGO_COURSEID].course_key) - self.assertEqual(len(mongo_course.children), 1) + assert len(mongo_course.children) == 1 # draft is 2: find out which ms owns course, get item # split: active_versions, structure, definition (to load course wiki string) @@ -1103,7 +1097,7 @@ class TestMixedModuleStore(CommonMixedModuleStoreSetup): self.initdb(default_ms) with check_mongo_calls(max_find, max_send): course = self.store.get_item(self.course_locations[self.MONGO_COURSEID]) - self.assertEqual(course.id, self.course_locations[self.MONGO_COURSEID].course_key) + assert course.id == self.course_locations[self.MONGO_COURSEID].course_key @ddt.data(ModuleStoreEnum.Type.mongo, ModuleStoreEnum.Type.split) def test_get_library(self, default_ms): @@ -1116,15 +1110,15 @@ class TestMixedModuleStore(CommonMixedModuleStoreSetup): with self.store.default_store(ModuleStoreEnum.Type.split): # The CMS also wraps create_library like this library = self.store.create_library("org", "lib", self.user_id, {"display_name": "Test Library"}) library_key = library.location.library_key - self.assertIsInstance(library_key, LibraryLocator) + assert isinstance(library_key, LibraryLocator) # Now load with get_library and make sure it works: library = self.store.get_library(library_key) - self.assertEqual(library.location.library_key, library_key) + assert library.location.library_key == library_key # Clear the mappings so we can test get_library code path without mapping set: self.store.mappings.clear() library = self.store.get_library(library_key) - self.assertEqual(library.location.library_key, library_key) + assert library.location.library_key == library_key # notice this doesn't test getting a public item via draft_preferred which draft would have 2 hits (split # still only 2) @@ -1141,17 +1135,14 @@ class TestMixedModuleStore(CommonMixedModuleStoreSetup): with check_mongo_calls(max_find, max_send): parent = self.store.get_parent_location(self.problem_x1a_1) # lint-amnesty, pylint: disable=no-member - self.assertEqual(parent, self.vertical_x1a) # lint-amnesty, pylint: disable=no-member + assert parent == self.vertical_x1a # lint-amnesty, pylint: disable=no-member def verify_get_parent_locations_results(self, expected_results): """ Verifies the results of calling get_parent_locations matches expected_results. """ for child_location, parent_location, revision in expected_results: - self.assertEqual( - parent_location, - self.store.get_parent_location(child_location, revision=revision) - ) + assert parent_location == self.store.get_parent_location(child_location, revision=revision) def verify_item_parent(self, item_location, expected_parent_location, old_parent_location, is_reverted=False): """ @@ -1168,7 +1159,7 @@ class TestMixedModuleStore(CommonMixedModuleStoreSetup): old_parent = self.store.get_item(old_parent_location) expected_parent = self.store.get_item(expected_parent_location) - self.assertEqual(expected_parent_location, source_item.get_parent().location) + assert expected_parent_location == source_item.get_parent().location # If an item is reverted, it means it's actual parent was the one that is the current parent now # i.e expected_parent_location otherwise old_parent_location. @@ -1176,9 +1167,9 @@ class TestMixedModuleStore(CommonMixedModuleStoreSetup): # Check parent locations wrt branches with self.store.branch_setting(ModuleStoreEnum.Branch.draft_preferred): - self.assertEqual(expected_parent_location, self.store.get_item(item_location).get_parent().location) + assert expected_parent_location == self.store.get_item(item_location).get_parent().location with self.store.branch_setting(ModuleStoreEnum.Branch.published_only): - self.assertEqual(published_parent_location, self.store.get_item(item_location).get_parent().location) + assert published_parent_location == self.store.get_item(item_location).get_parent().location # Make location specific to published branch for verify_get_parent_locations_results call. published_parent_location = published_parent_location.for_branch(ModuleStoreEnum.BranchName.published) @@ -1191,12 +1182,12 @@ class TestMixedModuleStore(CommonMixedModuleStoreSetup): ]) # Also verify item.parent has correct parent location set. - self.assertEqual(source_item.parent, expected_parent_location) - self.assertEqual(source_item.parent, self.store.get_parent_location(item_location)) + assert source_item.parent == expected_parent_location + assert source_item.parent == self.store.get_parent_location(item_location) # Item should be present in new parent's children list but not in old parent's children list. - self.assertIn(item_location, expected_parent.children) - self.assertNotIn(item_location, old_parent.children) + assert item_location in expected_parent.children + assert item_location not in old_parent.children @ddt.data(ModuleStoreEnum.Type.mongo, ModuleStoreEnum.Type.split) def test_update_item_parent(self, store_type): @@ -1216,7 +1207,7 @@ class TestMixedModuleStore(CommonMixedModuleStoreSetup): updated_item_location = self.store.update_item_parent( item_location, new_parent_location, old_parent_location, self.user_id ) - self.assertEqual(updated_item_location, item_location) + assert updated_item_location == item_location self.verify_item_parent( item_location=item_location, @@ -1243,7 +1234,7 @@ class TestMixedModuleStore(CommonMixedModuleStoreSetup): updated_item_location = self.store.update_item_parent( item_location, new_parent_location, old_parent_location, self.user_id ) - self.assertEqual(updated_item_location, item_location) + assert updated_item_location == item_location self.verify_item_parent( item_location=item_location, @@ -1280,7 +1271,7 @@ class TestMixedModuleStore(CommonMixedModuleStoreSetup): updated_item_location = self.store.update_item_parent( item_location, new_parent_location, old_parent_location, self.user_id ) - self.assertEqual(updated_item_location, item_location) + assert updated_item_location == item_location self.verify_item_parent( item_location=item_location, @@ -1321,7 +1312,7 @@ class TestMixedModuleStore(CommonMixedModuleStoreSetup): updated_item_location = self.store.update_item_parent( item_location, new_parent_location, old_parent_location, self.user_id ) - self.assertEqual(updated_item_location, item_location) + assert updated_item_location == item_location self.verify_item_parent( item_location=item_location, @@ -1343,7 +1334,7 @@ class TestMixedModuleStore(CommonMixedModuleStoreSetup): updated_item_location = self.store.update_item_parent( item_location, new_parent_location, old_parent_location, self.user_id ) - self.assertEqual(updated_item_location, item_location) + assert updated_item_location == item_location self.verify_item_parent( item_location=item_location, @@ -1376,13 +1367,13 @@ class TestMixedModuleStore(CommonMixedModuleStoreSetup): self.store.update_item(problem, self.user_id) updated_problem = self.store.get_item(self.problem_x1a_1) # lint-amnesty, pylint: disable=no-member - self.assertEqual(updated_problem.display_name, 'updated') + assert updated_problem.display_name == 'updated' # Now, move from x1 to y1. updated_item_location = self.store.update_item_parent( item_location, new_parent_location, old_parent_location, self.user_id ) - self.assertEqual(updated_item_location, item_location) + assert updated_item_location == item_location self.verify_item_parent( item_location=item_location, @@ -1395,7 +1386,7 @@ class TestMixedModuleStore(CommonMixedModuleStoreSetup): # Check that problem has the original name back. reverted_problem = self.store.get_item(self.problem_x1a_1) # lint-amnesty, pylint: disable=no-member - self.assertEqual(orig_display_name, reverted_problem.display_name) + assert orig_display_name == reverted_problem.display_name @ddt.data(ModuleStoreEnum.Type.mongo, ModuleStoreEnum.Type.split) def test_move_1_moved_1_unchanged(self, store_type): @@ -1420,7 +1411,7 @@ class TestMixedModuleStore(CommonMixedModuleStoreSetup): updated_item_location = self.store.update_item_parent( item_location, new_parent_location, old_parent_location, self.user_id ) - self.assertEqual(updated_item_location, item_location) + assert updated_item_location == item_location self.verify_item_parent( item_location=item_location, @@ -1430,8 +1421,8 @@ class TestMixedModuleStore(CommonMixedModuleStoreSetup): # Check that problem_item2 is still present in vertical_x1a problem_item2 = self.store.get_item(problem_item2.location) - self.assertEqual(problem_item2.parent, self.vertical_x1a) # lint-amnesty, pylint: disable=no-member - self.assertIn(problem_item2.location, problem_item2.get_parent().children) + assert problem_item2.parent == self.vertical_x1a # lint-amnesty, pylint: disable=no-member + assert problem_item2.location in problem_item2.get_parent().children @ddt.data(ModuleStoreEnum.Type.mongo, ModuleStoreEnum.Type.split) def test_move_1_moved_1_edited(self, store_type): @@ -1455,7 +1446,7 @@ class TestMixedModuleStore(CommonMixedModuleStoreSetup): self.store.update_item(problem_item2, self.user_id) updated_problem2 = self.store.get_item(problem_item2.location) - self.assertEqual(updated_problem2.display_name, 'updated') + assert updated_problem2.display_name == 'updated' item_location = self.problem_x1a_1 # lint-amnesty, pylint: disable=no-member new_parent_location = self.vertical_y1a # lint-amnesty, pylint: disable=no-member @@ -1465,7 +1456,7 @@ class TestMixedModuleStore(CommonMixedModuleStoreSetup): updated_item_location = self.store.update_item_parent( item_location, new_parent_location, old_parent_location, self.user_id ) - self.assertEqual(updated_item_location, item_location) + assert updated_item_location == item_location self.verify_item_parent( item_location=item_location, @@ -1478,7 +1469,7 @@ class TestMixedModuleStore(CommonMixedModuleStoreSetup): # Check that problem_item2 has the original name back. reverted_problem2 = self.store.get_item(problem_item2.location) - self.assertEqual(orig_display_name, reverted_problem2.display_name) + assert orig_display_name == reverted_problem2.display_name @ddt.data(ModuleStoreEnum.Type.mongo, ModuleStoreEnum.Type.split) def test_move_1_moved_1_deleted(self, store_type): @@ -1509,7 +1500,7 @@ class TestMixedModuleStore(CommonMixedModuleStoreSetup): updated_item_location = self.store.update_item_parent( item_location, new_parent_location, old_parent_location, self.user_id ) - self.assertEqual(updated_item_location, item_location) + assert updated_item_location == item_location self.verify_item_parent( item_location=item_location, @@ -1522,8 +1513,8 @@ class TestMixedModuleStore(CommonMixedModuleStoreSetup): # Check that problem_item2 is also back in vertical_x1a problem_item2 = self.store.get_item(problem_item2.location) - self.assertEqual(problem_item2.parent, self.vertical_x1a) # lint-amnesty, pylint: disable=no-member - self.assertIn(problem_item2.location, problem_item2.get_parent().children) + assert problem_item2.parent == self.vertical_x1a # lint-amnesty, pylint: disable=no-member + assert problem_item2.location in problem_item2.get_parent().children @ddt.data(ModuleStoreEnum.Type.mongo, ModuleStoreEnum.Type.split) def test_get_parent_locations_moved_child(self, default_ms): @@ -1546,7 +1537,7 @@ class TestMixedModuleStore(CommonMixedModuleStoreSetup): with self.store.branch_setting(ModuleStoreEnum.Branch.draft_preferred): old_parent = self.store.get_item(child_to_move_location).get_parent() - self.assertEqual(old_parent_location, old_parent.location) + assert old_parent_location == old_parent.location child_to_move_contextualized = child_to_move_location.map_into_course(old_parent.location.course_key) old_parent.children.remove(child_to_move_contextualized) @@ -1557,9 +1548,9 @@ class TestMixedModuleStore(CommonMixedModuleStoreSetup): self.store.update_item(new_parent, self.user_id) with self.store.branch_setting(ModuleStoreEnum.Branch.draft_preferred): - self.assertEqual(new_parent_location, self.store.get_item(child_to_move_location).get_parent().location) + assert new_parent_location == self.store.get_item(child_to_move_location).get_parent().location with self.store.branch_setting(ModuleStoreEnum.Branch.published_only): - self.assertEqual(old_parent_location, self.store.get_item(child_to_move_location).get_parent().location) + assert old_parent_location == self.store.get_item(child_to_move_location).get_parent().location old_parent_published_location = old_parent_location.for_branch(ModuleStoreEnum.BranchName.published) self.verify_get_parent_locations_results([ (child_to_move_location, new_parent_location, None), @@ -1631,7 +1622,7 @@ class TestMixedModuleStore(CommonMixedModuleStoreSetup): # convert first parent (unit) "vertical_x1a" of problem "problem_x1a_1" to draft self.store.convert_to_draft(self.vertical_x1a, self.user_id) # lint-amnesty, pylint: disable=no-member item = self.store.get_item(self.vertical_x1a) # lint-amnesty, pylint: disable=no-member - self.assertTrue(self.store.has_published_version(item)) + assert self.store.has_published_version(item) # now problem "problem_x1a_1" has 3 parents [vertical_x1a (draft), # vertical_x1a (published), vertical_x1b (published)] @@ -1640,7 +1631,7 @@ class TestMixedModuleStore(CommonMixedModuleStoreSetup): # problem location revision with self.store.branch_setting(ModuleStoreEnum.Branch.draft_preferred, course_id): parent = mongo_store.get_parent_location(self.problem_x1a_1) # lint-amnesty, pylint: disable=no-member - self.assertEqual(parent, self.vertical_x1a) # lint-amnesty, pylint: disable=no-member + assert parent == self.vertical_x1a # lint-amnesty, pylint: disable=no-member # Draft: # Problem path: @@ -1673,14 +1664,14 @@ class TestMixedModuleStore(CommonMixedModuleStoreSetup): # each iteration has different find count, pop this iter's find count with check_mongo_calls(num_finds.pop(0), num_sends): path = path_to_location(self.store, location) - self.assertEqual(path, expected) + assert path == expected not_found = ( course_key.make_usage_key('video', 'WelcomeX'), course_key.make_usage_key('course', 'NotHome'), ) for location in not_found: - with self.assertRaises(ItemNotFoundError): + with pytest.raises(ItemNotFoundError): path_to_location(self.store, location) # Orphaned items should not be found. @@ -1692,7 +1683,7 @@ class TestMixedModuleStore(CommonMixedModuleStoreSetup): block_id=orphan.block_id ) - with self.assertRaises(NoPathToItem): + with pytest.raises(NoPathToItem): path_to_location(self.store, orphan) def test_navigation_index(self): @@ -1700,12 +1691,12 @@ class TestMixedModuleStore(CommonMixedModuleStoreSetup): Make sure that navigation_index correctly parses the various position values that we might get from calls to path_to_location """ - self.assertEqual(1, navigation_index("1")) - self.assertEqual(10, navigation_index("10")) - self.assertEqual(None, navigation_index(None)) - self.assertEqual(1, navigation_index("1_2")) - self.assertEqual(5, navigation_index("5_2")) - self.assertEqual(7, navigation_index("7_3_5_6_")) + assert 1 == navigation_index('1') + assert 10 == navigation_index('10') + assert navigation_index(None) is None + assert 1 == navigation_index('1_2') + assert 5 == navigation_index('5_2') + assert 7 == navigation_index('7_3_5_6_') @ddt.data(ModuleStoreEnum.Type.mongo, ModuleStoreEnum.Type.split) def test_revert_to_published_root_draft(self, default_ms): @@ -1719,25 +1710,25 @@ class TestMixedModuleStore(CommonMixedModuleStoreSetup): vertical_children_num = len(vertical.children) self.store.publish(self.course.location, self.user_id) - self.assertFalse(self._has_changes(self.vertical_x1a)) # lint-amnesty, pylint: disable=no-member + assert not self._has_changes(self.vertical_x1a) # lint-amnesty, pylint: disable=no-member # delete leaf problem (will make parent vertical a draft) self.store.delete_item(self.problem_x1a_1, self.user_id) # lint-amnesty, pylint: disable=no-member - self.assertTrue(self._has_changes(self.vertical_x1a)) # lint-amnesty, pylint: disable=no-member + assert self._has_changes(self.vertical_x1a) # lint-amnesty, pylint: disable=no-member draft_parent = self.store.get_item(self.vertical_x1a) # lint-amnesty, pylint: disable=no-member - self.assertEqual(vertical_children_num - 1, len(draft_parent.children)) + assert (vertical_children_num - 1) == len(draft_parent.children) published_parent = self.store.get_item( self.vertical_x1a, # lint-amnesty, pylint: disable=no-member revision=ModuleStoreEnum.RevisionOption.published_only ) - self.assertEqual(vertical_children_num, len(published_parent.children)) + assert vertical_children_num == len(published_parent.children) self.store.revert_to_published(self.vertical_x1a, self.user_id) # lint-amnesty, pylint: disable=no-member reverted_parent = self.store.get_item(self.vertical_x1a) # lint-amnesty, pylint: disable=no-member - self.assertEqual(vertical_children_num, len(published_parent.children)) + assert vertical_children_num == len(published_parent.children) self.assertBlocksEqualByFields(reverted_parent, published_parent) - self.assertFalse(self._has_changes(self.vertical_x1a)) # lint-amnesty, pylint: disable=no-member + assert not self._has_changes(self.vertical_x1a) # lint-amnesty, pylint: disable=no-member @ddt.data(ModuleStoreEnum.Type.mongo, ModuleStoreEnum.Type.split) def test_revert_to_published_root_published(self, default_ms): @@ -1757,7 +1748,7 @@ class TestMixedModuleStore(CommonMixedModuleStoreSetup): self.store.revert_to_published(self.vertical_x1a, self.user_id) # lint-amnesty, pylint: disable=no-member reverted_problem = self.store.get_item(self.problem_x1a_1) # lint-amnesty, pylint: disable=no-member - self.assertEqual(orig_display_name, reverted_problem.display_name) + assert orig_display_name == reverted_problem.display_name @ddt.data(ModuleStoreEnum.Type.mongo, ModuleStoreEnum.Type.split) def test_revert_to_published_no_draft(self, default_ms): @@ -1781,7 +1772,7 @@ class TestMixedModuleStore(CommonMixedModuleStoreSetup): """ self.initdb(default_ms) self._create_block_hierarchy() - with self.assertRaises(InvalidVersionError): + with pytest.raises(InvalidVersionError): self.store.revert_to_published(self.vertical_x1a, self.user_id) # lint-amnesty, pylint: disable=no-member @ddt.data(ModuleStoreEnum.Type.mongo, ModuleStoreEnum.Type.split) @@ -1795,7 +1786,7 @@ class TestMixedModuleStore(CommonMixedModuleStoreSetup): self.store.revert_to_published(self.sequential_x1, self.user_id) # lint-amnesty, pylint: disable=no-member reverted_parent = self.store.get_item(self.sequential_x1) # lint-amnesty, pylint: disable=no-member # It does not discard the child vertical, even though that child is a draft (with no published version) - self.assertEqual(num_children, len(reverted_parent.children)) + assert num_children == len(reverted_parent.children) def test_reset_course_to_version(self): """ @@ -1943,7 +1934,7 @@ class TestMixedModuleStore(CommonMixedModuleStoreSetup): mongo_store = self.store._get_modulestore_for_courselike(course_id) # pylint: disable=protected-access with self.store.branch_setting(ModuleStoreEnum.Branch.published_only, course_id): parent = mongo_store.get_parent_location(self.problem_x1a_1) # lint-amnesty, pylint: disable=no-member - self.assertEqual(parent, self.vertical_x1a) # lint-amnesty, pylint: disable=no-member + assert parent == self.vertical_x1a # lint-amnesty, pylint: disable=no-member # add some published orphans orphan_sequential = course_id.make_usage_key('sequential', 'OrphanSequential') @@ -1959,8 +1950,8 @@ class TestMixedModuleStore(CommonMixedModuleStoreSetup): self.store.publish(location, self.user_id) found_orphans = mongo_store.get_orphans(course_id) - self.assertEqual(set(found_orphans), set(orphan_locations)) - self.assertEqual(len(set(found_orphans)), 2) + assert set(found_orphans) == set(orphan_locations) + assert len(set(found_orphans)) == 2 # add orphan vertical and sequential as another parents of problem "problem_x1a_1" mongo_store.collection.update_one( @@ -1975,18 +1966,15 @@ class TestMixedModuleStore(CommonMixedModuleStoreSetup): # problem "problem_x1a_1" since the two other parents are orphans with self.store.branch_setting(ModuleStoreEnum.Branch.published_only, course_id): parent = mongo_store.get_parent_location(self.problem_x1a_1) # lint-amnesty, pylint: disable=no-member - self.assertEqual(parent, self.vertical_x1a) # lint-amnesty, pylint: disable=no-member + assert parent == self.vertical_x1a # lint-amnesty, pylint: disable=no-member # now add valid published vertical as another parent of problem - mongo_store.collection.update_one( - self.sequential_x1.to_deprecated_son('_id.'), # lint-amnesty, pylint: disable=no-member - {'$push': {'definition.children': six.text_type(self.problem_x1a_1)}} # lint-amnesty, pylint: disable=no-member - ) + mongo_store.collection.update_one(self.sequential_x1.to_deprecated_son('_id.'), {'$push': {'definition.children': six.text_type(self.problem_x1a_1)}}) # lint-amnesty, pylint: disable=no-member, line-too-long # now check that "get_parent_location" method of published branch raises "ReferentialIntegrityError" for # problem "problem_x1a_1" since it has now 2 valid published parents with self.store.branch_setting(ModuleStoreEnum.Branch.published_only, course_id): - self.assertTrue(self.store.has_item(self.problem_x1a_1)) # lint-amnesty, pylint: disable=no-member - with self.assertRaises(ReferentialIntegrityError): + assert self.store.has_item(self.problem_x1a_1) # lint-amnesty, pylint: disable=no-member + with pytest.raises(ReferentialIntegrityError): self.store.get_parent_location(self.problem_x1a_1) # lint-amnesty, pylint: disable=no-member @ddt.data(ModuleStoreEnum.Type.mongo) @@ -2003,7 +1991,7 @@ class TestMixedModuleStore(CommonMixedModuleStoreSetup): block_id='orphan' ) orphans = self.store.get_orphans(self.course_locations[self.MONGO_COURSEID].course_key) - self.assertEqual(len(orphans), 0, "unexpected orphans: {}".format(orphans)) + assert len(orphans) == 0, 'unexpected orphans: {}'.format(orphans) @ddt.data(ModuleStoreEnum.Type.mongo, ModuleStoreEnum.Type.split) def test_create_item_populates_edited_info(self, default_ms): @@ -2013,8 +2001,8 @@ class TestMixedModuleStore(CommonMixedModuleStoreSetup): self.course.location.course_key, 'problem' ) - self.assertEqual(self.user_id, block.edited_by) - self.assertGreater(datetime.datetime.now(UTC), block.edited_on) + assert self.user_id == block.edited_by + assert datetime.datetime.now(UTC) > block.edited_on @ddt.data(ModuleStoreEnum.Type.mongo, ModuleStoreEnum.Type.split) def test_create_item_populates_subtree_edited_info(self, default_ms): @@ -2024,8 +2012,8 @@ class TestMixedModuleStore(CommonMixedModuleStoreSetup): self.course.location.course_key, 'problem' ) - self.assertEqual(self.user_id, block.subtree_edited_by) - self.assertGreater(datetime.datetime.now(UTC), block.subtree_edited_on) + assert self.user_id == block.subtree_edited_by + assert datetime.datetime.now(UTC) > block.subtree_edited_on # Draft: wildcard search of draft and split # Split: wildcard search of draft and split @@ -2039,14 +2027,11 @@ class TestMixedModuleStore(CommonMixedModuleStoreSetup): # Test Mongo wiki with check_mongo_calls(max_find, max_send): wiki_courses = self.store.get_courses_for_wiki('999') - self.assertEqual(len(wiki_courses), 1) - self.assertIn( - self.course_locations[self.MONGO_COURSEID].course_key.replace(branch=None), # Branch agnostic - wiki_courses - ) + assert len(wiki_courses) == 1 + assert self.course_locations[self.MONGO_COURSEID].course_key.replace(branch=None) in wiki_courses - self.assertEqual(len(self.store.get_courses_for_wiki('edX.simple.2012_Fall')), 0) - self.assertEqual(len(self.store.get_courses_for_wiki('no_such_wiki')), 0) + assert len(self.store.get_courses_for_wiki('edX.simple.2012_Fall')) == 0 + assert len(self.store.get_courses_for_wiki('no_such_wiki')) == 0 # Draft: # Find: find vertical, find children @@ -2075,13 +2060,13 @@ class TestMixedModuleStore(CommonMixedModuleStoreSetup): self.vertical_x1a, # lint-amnesty, pylint: disable=no-member revision=ModuleStoreEnum.RevisionOption.published_only ) - self.assertIsNotNone(published_xblock) + assert published_xblock is not None # unpublish with check_mongo_calls(max_find, max_send): self.store.unpublish(self.vertical_x1a, self.user_id) # lint-amnesty, pylint: disable=no-member - with self.assertRaises(ItemNotFoundError): + with pytest.raises(ItemNotFoundError): self.store.get_item( self.vertical_x1a, # lint-amnesty, pylint: disable=no-member revision=ModuleStoreEnum.RevisionOption.published_only @@ -2092,7 +2077,7 @@ class TestMixedModuleStore(CommonMixedModuleStoreSetup): self.vertical_x1a, # lint-amnesty, pylint: disable=no-member revision=ModuleStoreEnum.RevisionOption.draft_only ) - self.assertIsNotNone(draft_xblock) + assert draft_xblock is not None # Draft: specific query for revision None # Split: active_versions, structure @@ -2109,33 +2094,33 @@ class TestMixedModuleStore(CommonMixedModuleStoreSetup): item = self.store.create_child(self.user_id, self.writable_chapter_location, 'problem', 'test_compute_publish_state') # lint-amnesty, pylint: disable=line-too-long item_location = item.location with check_mongo_calls(max_find, max_send): - self.assertFalse(self.store.has_published_version(item)) + assert not self.store.has_published_version(item) # Private -> Public self.store.publish(item_location, self.user_id) item = self.store.get_item(item_location) - self.assertTrue(self.store.has_published_version(item)) + assert self.store.has_published_version(item) # Public -> Private self.store.unpublish(item_location, self.user_id) item = self.store.get_item(item_location) - self.assertFalse(self.store.has_published_version(item)) + assert not self.store.has_published_version(item) # Private -> Public self.store.publish(item_location, self.user_id) item = self.store.get_item(item_location) - self.assertTrue(self.store.has_published_version(item)) + assert self.store.has_published_version(item) # Public -> Draft with NO changes self.store.convert_to_draft(item_location, self.user_id) item = self.store.get_item(item_location) - self.assertTrue(self.store.has_published_version(item)) + assert self.store.has_published_version(item) # Draft WITH changes item.display_name = 'new name' item = self.store.update_item(item, self.user_id) - self.assertTrue(self.store.has_changes(item)) - self.assertTrue(self.store.has_published_version(item)) + assert self.store.has_changes(item) + assert self.store.has_published_version(item) @ddt.data(ModuleStoreEnum.Type.mongo, ModuleStoreEnum.Type.split) def test_update_edit_info_ancestors(self, default_ms): @@ -2152,13 +2137,13 @@ class TestMixedModuleStore(CommonMixedModuleStoreSetup): """ node = self.store.get_item(location_key) if after: - self.assertLess(after, node.edited_on) - self.assertLess(node.edited_on, before) - self.assertEqual(node.edited_by, edited_by) + assert after < node.edited_on + assert node.edited_on < before + assert node.edited_by == edited_by if subtree_after: - self.assertLess(subtree_after, node.subtree_edited_on) - self.assertLess(node.subtree_edited_on, subtree_before) - self.assertEqual(node.subtree_edited_by, subtree_by) + assert subtree_after < node.subtree_edited_on + assert node.subtree_edited_on < subtree_before + assert node.subtree_edited_by == subtree_by with self.store.bulk_operations(test_course.id): # Create a dummy vertical & html to test against @@ -2230,7 +2215,7 @@ class TestMixedModuleStore(CommonMixedModuleStoreSetup): ) # Store the current edit time and verify that user created the component - self.assertEqual(component.edited_by, self.user_id) + assert component.edited_by == self.user_id old_edited_on = component.edited_on edit_user = self.user_id - 2 @@ -2240,8 +2225,8 @@ class TestMixedModuleStore(CommonMixedModuleStoreSetup): updated_component = self.store.get_item(component.location) # Verify the ordering of edit times and that dummy_user made the edit - self.assertLess(old_edited_on, updated_component.edited_on) - self.assertEqual(updated_component.edited_by, edit_user) + assert old_edited_on < updated_component.edited_on + assert updated_component.edited_by == edit_user @ddt.data(ModuleStoreEnum.Type.mongo, ModuleStoreEnum.Type.split) def test_update_published_info(self, default_ms): @@ -2267,15 +2252,15 @@ class TestMixedModuleStore(CommonMixedModuleStoreSetup): updated_component = self.store.get_item(component.location) # Verify the time order and that publish_user caused publication - self.assertLessEqual(old_time, updated_component.published_on) - self.assertEqual(updated_component.published_by, publish_user) + assert old_time <= updated_component.published_on + assert updated_component.published_by == publish_user # Verify that changing the item doesn't unset the published info updated_component.display_name = 'changed' self.store.update_item(updated_component, self.user_id) updated_component = self.store.get_item(updated_component.location) - self.assertLessEqual(old_time, updated_component.published_on) - self.assertEqual(updated_component.published_by, publish_user) + assert old_time <= updated_component.published_on + assert updated_component.published_by == publish_user @ddt.data(ModuleStoreEnum.Type.mongo, ModuleStoreEnum.Type.split) def test_auto_publish(self, default_ms): @@ -2290,62 +2275,53 @@ class TestMixedModuleStore(CommonMixedModuleStoreSetup): # test create_course to make sure we are autopublishing test_course = self.store.create_course('testx', 'GreekHero', 'test_run', self.user_id) - self.assertTrue(self.store.has_published_version(test_course)) + assert self.store.has_published_version(test_course) test_course_key = test_course.id # test create_item of direct-only category to make sure we are autopublishing chapter = self.store.create_child(self.user_id, test_course.location, 'chapter', 'Overview') with self.store.branch_setting(ModuleStoreEnum.Branch.published_only): - self.assertIn( - chapter.location, - self.store.get_item(test_course.location).children, - ) - self.assertTrue(self.store.has_published_version(chapter)) + assert chapter.location in self.store.get_item(test_course.location).children + assert self.store.has_published_version(chapter) chapter_location = chapter.location # test create_child of direct-only category to make sure we are autopublishing sequential = self.store.create_child(self.user_id, chapter_location, 'sequential', 'Sequence') with self.store.branch_setting(ModuleStoreEnum.Branch.published_only): - self.assertIn( - sequential.location, - self.store.get_item(chapter_location).children, - ) - self.assertTrue(self.store.has_published_version(sequential)) + assert sequential.location in self.store.get_item(chapter_location).children + assert self.store.has_published_version(sequential) # test update_item of direct-only category to make sure we are autopublishing sequential.display_name = 'sequential1' sequential = self.store.update_item(sequential, self.user_id) - self.assertTrue(self.store.has_published_version(sequential)) + assert self.store.has_published_version(sequential) # test delete_item of direct-only category to make sure we are autopublishing self.store.delete_item(sequential.location, self.user_id, revision=ModuleStoreEnum.RevisionOption.all) with self.store.branch_setting(ModuleStoreEnum.Branch.published_only): - self.assertNotIn( - sequential.location, - self.store.get_item(chapter_location).children, - ) + assert sequential.location not in self.store.get_item(chapter_location).children chapter = self.store.get_item(chapter.location.for_branch(None)) - self.assertTrue(self.store.has_published_version(chapter)) + assert self.store.has_published_version(chapter) # test create_child of NOT direct-only category to make sure we aren't autopublishing problem_child = self.store.create_child(self.user_id, chapter_location, 'problem', 'Problem_Child') - self.assertFalse(self.store.has_published_version(problem_child)) + assert not self.store.has_published_version(problem_child) # test create_item of NOT direct-only category to make sure we aren't autopublishing problem_item = self.store.create_item(self.user_id, test_course_key, 'problem', 'Problem_Item') - self.assertFalse(self.store.has_published_version(problem_item)) + assert not self.store.has_published_version(problem_item) # test update_item of NOT direct-only category to make sure we aren't autopublishing problem_item.display_name = 'Problem_Item1' problem_item = self.store.update_item(problem_item, self.user_id) - self.assertFalse(self.store.has_published_version(problem_item)) + assert not self.store.has_published_version(problem_item) # test delete_item of NOT direct-only category to make sure we aren't autopublishing self.store.delete_item(problem_child.location, self.user_id) chapter = self.store.get_item(chapter.location.for_branch(None)) - self.assertTrue(self.store.has_published_version(chapter)) + assert self.store.has_published_version(chapter) @ddt.data(ModuleStoreEnum.Type.mongo, ModuleStoreEnum.Type.split) def test_get_courses_for_wiki_shared(self, default_ms): @@ -2356,10 +2332,7 @@ class TestMixedModuleStore(CommonMixedModuleStoreSetup): # verify initial state - initially, we should have a wiki for the Mongo course wiki_courses = self.store.get_courses_for_wiki('999') - self.assertIn( - self.course_locations[self.MONGO_COURSEID].course_key.replace(branch=None), # Branch agnostic - wiki_courses - ) + assert self.course_locations[self.MONGO_COURSEID].course_key.replace(branch=None) in wiki_courses # set Mongo course to share the wiki with simple course mongo_course = self.store.get_course(self.course_locations[self.MONGO_COURSEID].course_key) @@ -2368,15 +2341,12 @@ class TestMixedModuleStore(CommonMixedModuleStoreSetup): # now mongo_course should not be retrievable with old wiki_slug wiki_courses = self.store.get_courses_for_wiki('999') - self.assertEqual(len(wiki_courses), 0) + assert len(wiki_courses) == 0 # but there should be one course with wiki_slug 'simple' wiki_courses = self.store.get_courses_for_wiki('simple') - self.assertEqual(len(wiki_courses), 1) - self.assertIn( - self.course_locations[self.MONGO_COURSEID].course_key.replace(branch=None), - wiki_courses - ) + assert len(wiki_courses) == 1 + assert self.course_locations[self.MONGO_COURSEID].course_key.replace(branch=None) in wiki_courses # configure mongo course to use unique wiki_slug. mongo_course = self.store.get_course(self.course_locations[self.MONGO_COURSEID].course_key) @@ -2384,18 +2354,12 @@ class TestMixedModuleStore(CommonMixedModuleStoreSetup): self.store.update_item(mongo_course, self.user_id) # it should be retrievable with its new wiki_slug wiki_courses = self.store.get_courses_for_wiki('MITx.999.2013_Spring') - self.assertEqual(len(wiki_courses), 1) - self.assertIn( - self.course_locations[self.MONGO_COURSEID].course_key.replace(branch=None), - wiki_courses - ) + assert len(wiki_courses) == 1 + assert self.course_locations[self.MONGO_COURSEID].course_key.replace(branch=None) in wiki_courses # and NOT retriveable with its old wiki_slug wiki_courses = self.store.get_courses_for_wiki('simple') - self.assertEqual(len(wiki_courses), 0) - self.assertNotIn( - self.course_locations[self.MONGO_COURSEID].course_key.replace(branch=None), - wiki_courses - ) + assert len(wiki_courses) == 0 + assert self.course_locations[self.MONGO_COURSEID].course_key.replace(branch=None) not in wiki_courses @ddt.data(ModuleStoreEnum.Type.mongo, ModuleStoreEnum.Type.split) def test_branch_setting(self, default_ms): @@ -2415,10 +2379,8 @@ class TestMixedModuleStore(CommonMixedModuleStoreSetup): """ Asserts the number of problems with the given display name is the given expected number. """ - self.assertEqual( - len(self.store.get_items(course_key.for_branch(None), settings={'display_name': display_name})), - expected_number - ) + assert len(self.store.get_items(course_key.for_branch(None), settings={'display_name': display_name})) ==\ + expected_number def assertProblemNameEquals(expected_display_name): """ @@ -2426,20 +2388,20 @@ class TestMixedModuleStore(CommonMixedModuleStoreSetup): """ # check the display_name of the problem problem = self.store.get_item(problem_location) - self.assertEqual(problem.display_name, expected_display_name) + assert problem.display_name == expected_display_name # there should be only 1 problem with the expected_display_name assertNumProblems(expected_display_name, 1) # verify Draft problem with self.store.branch_setting(ModuleStoreEnum.Branch.draft_preferred, course_key): - self.assertTrue(self.store.has_item(problem_location)) + assert self.store.has_item(problem_location) assertProblemNameEquals(problem_original_name) # verify Published problem doesn't exist with self.store.branch_setting(ModuleStoreEnum.Branch.published_only, course_key): - self.assertFalse(self.store.has_item(problem_location)) - with self.assertRaises(ItemNotFoundError): + assert not self.store.has_item(problem_location) + with pytest.raises(ItemNotFoundError): self.store.get_item(problem_location) # PUBLISH the problem @@ -2448,7 +2410,7 @@ class TestMixedModuleStore(CommonMixedModuleStoreSetup): # verify Published problem with self.store.branch_setting(ModuleStoreEnum.Branch.published_only, course_key): - self.assertTrue(self.store.has_item(problem_location)) + assert self.store.has_item(problem_location) assertProblemNameEquals(problem_original_name) # verify Draft-preferred @@ -2481,25 +2443,25 @@ class TestMixedModuleStore(CommonMixedModuleStoreSetup): # verify branch setting is published-only in manager with self.store.branch_setting(ModuleStoreEnum.Branch.published_only): - self.assertEqual(self.store.get_branch_setting(), ModuleStoreEnum.Branch.published_only) + assert self.store.get_branch_setting() == ModuleStoreEnum.Branch.published_only # verify branch setting is draft-preferred in manager with self.store.branch_setting(ModuleStoreEnum.Branch.draft_preferred): - self.assertEqual(self.store.get_branch_setting(), ModuleStoreEnum.Branch.draft_preferred) + assert self.store.get_branch_setting() == ModuleStoreEnum.Branch.draft_preferred def verify_default_store(self, store_type): """ Verifies the default_store property """ - self.assertEqual(self.store.default_modulestore.get_modulestore_type(), store_type) + assert self.store.default_modulestore.get_modulestore_type() == store_type # verify internal helper method store = self.store._get_modulestore_for_courselike() # pylint: disable=protected-access - self.assertEqual(store.get_modulestore_type(), store_type) + assert store.get_modulestore_type() == store_type # verify store used for creating a course course = self.store.create_course("org", "course{}".format(uuid4().hex[:5]), "run", self.user_id) - self.assertEqual(course.system.modulestore.get_modulestore_type(), store_type) + assert course.system.modulestore.get_modulestore_type() == store_type @ddt.data(ModuleStoreEnum.Type.mongo, ModuleStoreEnum.Type.split) def test_default_store(self, default_ms): @@ -2619,7 +2581,7 @@ class TestMixedModuleStore(CommonMixedModuleStoreSetup): self.store.create_item(self.user_id, course_key, block_type) signal_handler.send.assert_not_called() - self.assertEqual(mock_clear_bulk_ops_record.call_count, 1) + assert mock_clear_bulk_ops_record.call_count == 1 signal_handler.send.assert_called_with('course_published', course_key=course.id) @@ -2637,7 +2599,7 @@ class TestMixedModuleStore(CommonMixedModuleStoreSetup): self.addCleanup(self.store.close_all_connections) with self.store.default_store(default): - self.assertIsNotNone(self.store.thread_cache.default_store.signal_handler) + assert self.store.thread_cache.default_store.signal_handler is not None signal_handler.send.assert_not_called() @@ -2678,7 +2640,7 @@ class TestMixedModuleStore(CommonMixedModuleStoreSetup): self.addCleanup(self.store.close_all_connections) with self.store.default_store(default): - self.assertIsNotNone(self.store.thread_cache.default_store.signal_handler) + assert self.store.thread_cache.default_store.signal_handler is not None signal_handler.send.assert_not_called() @@ -2709,7 +2671,7 @@ class TestMixedModuleStore(CommonMixedModuleStoreSetup): self.addCleanup(self.store.close_all_connections) with self.store.default_store(default): - self.assertIsNotNone(self.store.thread_cache.default_store.signal_handler) + assert self.store.thread_cache.default_store.signal_handler is not None signal_handler.send.assert_not_called() @@ -2742,7 +2704,7 @@ class TestMixedModuleStore(CommonMixedModuleStoreSetup): self.addCleanup(self.store.close_all_connections) with self.store.default_store(default): - self.assertIsNotNone(self.store.thread_cache.default_store.signal_handler) + assert self.store.thread_cache.default_store.signal_handler is not None signal_handler.send.assert_not_called() @@ -2798,7 +2760,7 @@ class TestMixedModuleStore(CommonMixedModuleStoreSetup): self.addCleanup(self.store.close_all_connections) with self.store.default_store(default): - self.assertIsNotNone(self.store.thread_cache.default_store.signal_handler) + assert self.store.thread_cache.default_store.signal_handler is not None signal_handler.send.assert_not_called() @@ -2840,7 +2802,7 @@ class TestMixedModuleStore(CommonMixedModuleStoreSetup): self.addCleanup(self.store.close_all_connections) with self.store.default_store(default): - self.assertIsNotNone(self.store.thread_cache.default_store.signal_handler) + assert self.store.thread_cache.default_store.signal_handler is not None signal_handler.send.assert_not_called() @@ -2909,7 +2871,7 @@ class TestMixedModuleStore(CommonMixedModuleStoreSetup): self.addCleanup(self.store.close_all_connections) with self.store.default_store(default): - self.assertIsNotNone(self.store.thread_cache.default_store.signal_handler) + assert self.store.thread_cache.default_store.signal_handler is not None signal_handler.send.assert_not_called() @@ -2949,23 +2911,23 @@ class TestMixedModuleStore(CommonMixedModuleStoreSetup): self.store.publish(chapter.location, self.user_id) # Verify that there are no changes - self.assertFalse(self._has_changes(chapter.location)) - self.assertFalse(self._has_changes(sequential.location)) - self.assertFalse(self._has_changes(vertical.location)) - self.assertFalse(self._has_changes(problem.location)) + assert not self._has_changes(chapter.location) + assert not self._has_changes(sequential.location) + assert not self._has_changes(vertical.location) + assert not self._has_changes(problem.location) # No orphans in course course_orphans = self.store.get_orphans(course_locator) - self.assertEqual(len(course_orphans), 0) + assert len(course_orphans) == 0 self.store.delete_item(vertical.location, self.user_id) # No orphans in course after delete, except # in old mongo, which still creates orphans course_orphans = self.store.get_orphans(course_locator) if default_store == ModuleStoreEnum.Type.mongo: - self.assertEqual(len(course_orphans), 1) + assert len(course_orphans) == 1 else: - self.assertEqual(len(course_orphans), 0) + assert len(course_orphans) == 0 course_locator_publish = course_locator.for_branch(ModuleStoreEnum.BranchName.published) # No published oprhans after delete, except @@ -2973,9 +2935,9 @@ class TestMixedModuleStore(CommonMixedModuleStoreSetup): course_publish_orphans = self.store.get_orphans(course_locator_publish) if default_store == ModuleStoreEnum.Type.mongo: - self.assertEqual(len(course_publish_orphans), 1) + assert len(course_publish_orphans) == 1 else: - self.assertEqual(len(course_publish_orphans), 0) + assert len(course_publish_orphans) == 0 @ddt.data(ModuleStoreEnum.Type.mongo, ModuleStoreEnum.Type.split) def test_delete_draft_item_orphans(self, default_store): @@ -3003,28 +2965,28 @@ class TestMixedModuleStore(CommonMixedModuleStoreSetup): self.store.publish(chapter.location, self.user_id) # Verify that there are no changes - self.assertFalse(self._has_changes(chapter.location)) - self.assertFalse(self._has_changes(sequential.location)) - self.assertFalse(self._has_changes(vertical.location)) - self.assertFalse(self._has_changes(problem.location)) + assert not self._has_changes(chapter.location) + assert not self._has_changes(sequential.location) + assert not self._has_changes(vertical.location) + assert not self._has_changes(problem.location) # No orphans in course course_orphans = self.store.get_orphans(course_locator) - self.assertEqual(len(course_orphans), 0) + assert len(course_orphans) == 0 problem.display_name = 'changed' problem = self.store.update_item(problem, self.user_id) - self.assertTrue(self._has_changes(vertical.location)) - self.assertTrue(self._has_changes(problem.location)) + assert self._has_changes(vertical.location) + assert self._has_changes(problem.location) self.store.delete_item(vertical.location, self.user_id) # No orphans in course after delete, except # in old mongo, which still creates them course_orphans = self.store.get_orphans(course_locator) if default_store == ModuleStoreEnum.Type.mongo: - self.assertEqual(len(course_orphans), 1) + assert len(course_orphans) == 1 else: - self.assertEqual(len(course_orphans), 0) + assert len(course_orphans) == 0 course_locator_publish = course_locator.for_branch(ModuleStoreEnum.BranchName.published) # No published orphans after delete, except @@ -3032,9 +2994,9 @@ class TestMixedModuleStore(CommonMixedModuleStoreSetup): course_publish_orphans = self.store.get_orphans(course_locator_publish) if default_store == ModuleStoreEnum.Type.mongo: - self.assertEqual(len(course_publish_orphans), 1) + assert len(course_publish_orphans) == 1 else: - self.assertEqual(len(course_publish_orphans), 0) + assert len(course_publish_orphans) == 0 @ddt.ddt @@ -3106,14 +3068,14 @@ class TestPublishOverExportImport(CommonMixedModuleStoreSetup): block_id='test_vertical' ) # Not yet published, so changes are present - self.assertTrue(self._has_changes(draft_xblock.location)) + assert self._has_changes(draft_xblock.location) self._export_import_course_round_trip( self.store, contentstore, source_course_key, self.export_dir ) # Verify that the imported block still is a draft, i.e. has changes. - self.assertTrue(self._has_changes(draft_xblock.location)) + assert self._has_changes(draft_xblock.location) @ddt.data(ModuleStoreEnum.Type.mongo, ModuleStoreEnum.Type.split) def test_published_has_changes_before_export_and_after_import(self, default_ms): @@ -3132,7 +3094,7 @@ class TestPublishOverExportImport(CommonMixedModuleStoreSetup): self.store.publish(published_xblock.location, self.user_id) # Retrieve the published block and make sure it's published. - self.assertFalse(self._has_changes(published_xblock.location)) + assert not self._has_changes(published_xblock.location) self._export_import_course_round_trip( self.store, contentstore, source_course_key, self.export_dir @@ -3140,7 +3102,7 @@ class TestPublishOverExportImport(CommonMixedModuleStoreSetup): # Get the published xblock from the imported course. # Verify that it still is published, i.e. has no changes. - self.assertFalse(self._has_changes(published_xblock.location)) + assert not self._has_changes(published_xblock.location) @ddt.data(ModuleStoreEnum.Type.mongo, ModuleStoreEnum.Type.split) def test_changed_published_has_changes_before_export_and_after_import(self, default_ms): @@ -3159,13 +3121,13 @@ class TestPublishOverExportImport(CommonMixedModuleStoreSetup): self.store.publish(published_xblock.location, self.user_id) # Retrieve the published block and make sure it's published. - self.assertFalse(self._has_changes(published_xblock.location)) + assert not self._has_changes(published_xblock.location) updated_display_name = 'Changed Display Name' component = self.store.get_item(published_xblock.location) component.display_name = updated_display_name component = self.store.update_item(component, self.user_id) - self.assertTrue(self.store.has_changes(component)) + assert self.store.has_changes(component) self._export_import_course_round_trip( self.store, contentstore, source_course_key, self.export_dir @@ -3173,12 +3135,12 @@ class TestPublishOverExportImport(CommonMixedModuleStoreSetup): # Get the published xblock from the imported course. # Verify that the published block still has a draft block, i.e. has changes. - self.assertTrue(self._has_changes(published_xblock.location)) + assert self._has_changes(published_xblock.location) # Verify that the changes in the draft vertical still exist. with self.store.branch_setting(ModuleStoreEnum.Branch.draft_preferred, source_course_key): component = self.store.get_item(published_xblock.location) - self.assertEqual(component.display_name, updated_display_name) + assert component.display_name == updated_display_name @ddt.data(ModuleStoreEnum.Type.mongo, ModuleStoreEnum.Type.split) def test_seq_with_unpublished_vertical_has_changes_before_export_and_after_import(self, default_ms): @@ -3206,11 +3168,11 @@ class TestPublishOverExportImport(CommonMixedModuleStoreSetup): # Retrieve the published block and make sure it's published. # Chapter is published - but the changes in vertical below means it "has_changes". - self.assertTrue(self._has_changes(chapter.location)) + assert self._has_changes(chapter.location) # Sequential is published - but the changes in vertical below means it "has_changes". - self.assertTrue(self._has_changes(sequential.location)) + assert self._has_changes(sequential.location) # Vertical is unpublished - so it "has_changes". - self.assertTrue(self._has_changes(vertical.location)) + assert self._has_changes(vertical.location) self._export_import_course_round_trip( self.store, contentstore, source_course_key, self.export_dir @@ -3218,9 +3180,9 @@ class TestPublishOverExportImport(CommonMixedModuleStoreSetup): # Get the published xblock from the imported course. # Verify that the published block still has a draft block, i.e. has changes. - self.assertTrue(self._has_changes(chapter.location)) - self.assertTrue(self._has_changes(sequential.location)) - self.assertTrue(self._has_changes(vertical.location)) + assert self._has_changes(chapter.location) + assert self._has_changes(sequential.location) + assert self._has_changes(vertical.location) @ddt.data(ModuleStoreEnum.Type.mongo, ModuleStoreEnum.Type.split) def test_vertical_with_draft_and_published_unit_has_changes_before_export_and_after_import(self, default_ms): @@ -3246,41 +3208,41 @@ class TestPublishOverExportImport(CommonMixedModuleStoreSetup): self.user_id, sequential.location, 'vertical', block_id='moon_unit' ) # Vertical has changes until it is actually published. - self.assertTrue(self._has_changes(vertical.location)) + assert self._has_changes(vertical.location) self.store.publish(vertical.location, self.user_id) - self.assertFalse(self._has_changes(vertical.location)) + assert not self._has_changes(vertical.location) # create unit unit = self.store.create_child( self.user_id, vertical.location, 'html', block_id='html_unit' ) # Vertical has a new child -and- unit is unpublished. So both have changes. - self.assertTrue(self._has_changes(vertical.location)) - self.assertTrue(self._has_changes(unit.location)) + assert self._has_changes(vertical.location) + assert self._has_changes(unit.location) # Publishing the vertical also publishes its unit child. self.store.publish(vertical.location, self.user_id) - self.assertFalse(self._has_changes(vertical.location)) - self.assertFalse(self._has_changes(unit.location)) + assert not self._has_changes(vertical.location) + assert not self._has_changes(unit.location) # Publishing the unit separately has no effect on whether it has changes - it's already published. self.store.publish(unit.location, self.user_id) - self.assertFalse(self._has_changes(vertical.location)) - self.assertFalse(self._has_changes(unit.location)) + assert not self._has_changes(vertical.location) + assert not self._has_changes(unit.location) # Retrieve the published block and make sure it's published. self.store.publish(chapter.location, self.user_id) - self.assertFalse(self._has_changes(chapter.location)) - self.assertFalse(self._has_changes(sequential.location)) - self.assertFalse(self._has_changes(vertical.location)) - self.assertFalse(self._has_changes(unit.location)) + assert not self._has_changes(chapter.location) + assert not self._has_changes(sequential.location) + assert not self._has_changes(vertical.location) + assert not self._has_changes(unit.location) # Now make changes to the unit - but don't publish them. component = self.store.get_item(unit.location) updated_display_name = 'Changed Display Name' component.display_name = updated_display_name component = self.store.update_item(component, self.user_id) - self.assertTrue(self._has_changes(component.location)) + assert self._has_changes(component.location) # Export the course - then import the course export. self._export_import_course_round_trip( @@ -3289,20 +3251,20 @@ class TestPublishOverExportImport(CommonMixedModuleStoreSetup): # Get the published xblock from the imported course. # Verify that the published block still has a draft block, i.e. has changes. - self.assertTrue(self._has_changes(chapter.location)) - self.assertTrue(self._has_changes(sequential.location)) - self.assertTrue(self._has_changes(vertical.location)) - self.assertTrue(self._has_changes(unit.location)) + assert self._has_changes(chapter.location) + assert self._has_changes(sequential.location) + assert self._has_changes(vertical.location) + assert self._has_changes(unit.location) # Verify that the changes in the draft unit still exist. with self.store.branch_setting(ModuleStoreEnum.Branch.draft_preferred, source_course_key): component = self.store.get_item(unit.location) - self.assertEqual(component.display_name, updated_display_name) + assert component.display_name == updated_display_name # Verify that the draft changes don't exist in the published unit - it still uses the default name. with self.store.branch_setting(ModuleStoreEnum.Branch.published_only, source_course_key): component = self.store.get_item(unit.location) - self.assertEqual(component.display_name, 'Text') + assert component.display_name == 'Text' @ddt.data(ModuleStoreEnum.Type.mongo, ModuleStoreEnum.Type.split) def test_vertical_with_published_unit_remains_published_before_export_and_after_import(self, default_ms): @@ -3328,9 +3290,9 @@ class TestPublishOverExportImport(CommonMixedModuleStoreSetup): self.user_id, sequential.location, 'vertical', block_id='moon_unit' ) # Vertical has changes until it is actually published. - self.assertTrue(self._has_changes(vertical.location)) + assert self._has_changes(vertical.location) self.store.publish(vertical.location, self.user_id) - self.assertFalse(self._has_changes(vertical.location)) + assert not self._has_changes(vertical.location) # create unit unit = self.store.create_child( @@ -3340,12 +3302,12 @@ class TestPublishOverExportImport(CommonMixedModuleStoreSetup): updated_display_name = 'Changed Display Name' unit.display_name = updated_display_name unit = self.store.update_item(unit, self.user_id) - self.assertTrue(self._has_changes(unit.location)) + assert self._has_changes(unit.location) # Publishing the vertical also publishes its unit child. self.store.publish(vertical.location, self.user_id) - self.assertFalse(self._has_changes(vertical.location)) - self.assertFalse(self._has_changes(unit.location)) + assert not self._has_changes(vertical.location) + assert not self._has_changes(unit.location) # Export the course - then import the course export. self._export_import_course_round_trip( @@ -3354,15 +3316,15 @@ class TestPublishOverExportImport(CommonMixedModuleStoreSetup): # Get the published xblock from the imported course. # Verify that the published block still has a draft block, i.e. has changes. - self.assertFalse(self._has_changes(chapter.location)) - self.assertFalse(self._has_changes(sequential.location)) - self.assertFalse(self._has_changes(vertical.location)) - self.assertFalse(self._has_changes(unit.location)) + assert not self._has_changes(chapter.location) + assert not self._has_changes(sequential.location) + assert not self._has_changes(vertical.location) + assert not self._has_changes(unit.location) # Verify that the published changes exist in the published unit. with self.store.branch_setting(ModuleStoreEnum.Branch.published_only, source_course_key): component = self.store.get_item(unit.location) - self.assertEqual(component.display_name, updated_display_name) + assert component.display_name == updated_display_name @ddt.data(ModuleStoreEnum.Type.mongo, ModuleStoreEnum.Type.split) @XBlockAside.register_temp_plugin(AsideTestType, 'test_aside') @@ -3399,11 +3361,11 @@ class TestPublishOverExportImport(CommonMixedModuleStoreSetup): """ asides = block.runtime.get_asides(block) - self.assertEqual(len(asides), 1, "Found {} asides but expected only test_aside".format(asides)) - self.assertIsInstance(asides[0], AsideTestType) + assert len(asides) == 1, 'Found {} asides but expected only test_aside'.format(asides) + assert isinstance(asides[0], AsideTestType) category = block.scope_ids.block_type - self.assertEqual(asides[0].data_field, "{} aside data".format(category)) - self.assertEqual(asides[0].content, "{} Aside".format(category.capitalize())) + assert asides[0].data_field == '{} aside data'.format(category) + assert asides[0].content == '{} Aside'.format(category.capitalize()) for child in block.get_children(): check_block(child) @@ -3414,17 +3376,13 @@ class TestPublishOverExportImport(CommonMixedModuleStoreSetup): new_chapter = self.store.create_child(self.user_id, courses[0].location, 'chapter', 'new_chapter') asides = new_chapter.runtime.get_asides(new_chapter) - self.assertEqual(len(asides), 1, "Found {} asides but expected only test_aside".format(asides)) + assert len(asides) == 1, 'Found {} asides but expected only test_aside'.format(asides) chapter_aside = asides[0] - self.assertIsInstance(chapter_aside, AsideTestType) - self.assertFalse( - chapter_aside.fields['data_field'].is_set_on(chapter_aside), - "data_field says it's assigned to {}".format(chapter_aside.data_field) - ) - self.assertFalse( - chapter_aside.fields['content'].is_set_on(chapter_aside), - "content says it's assigned to {}".format(chapter_aside.content) - ) + assert isinstance(chapter_aside, AsideTestType) + assert not chapter_aside.fields['data_field'].is_set_on(chapter_aside), \ + f"data_field says it's assigned to {chapter_aside.data_field}" + assert not chapter_aside.fields['content'].is_set_on(chapter_aside), \ + f"content says it's assigned to {chapter_aside.content}" # now update the values chapter_aside.data_field = 'new value' @@ -3432,7 +3390,7 @@ class TestPublishOverExportImport(CommonMixedModuleStoreSetup): new_chapter = self.store.get_item(new_chapter.location) chapter_aside = new_chapter.runtime.get_asides(new_chapter)[0] - self.assertEqual('new value', chapter_aside.data_field) + assert 'new value' == chapter_aside.data_field # update the values the second time chapter_aside.data_field = 'another one value' @@ -3440,7 +3398,7 @@ class TestPublishOverExportImport(CommonMixedModuleStoreSetup): new_chapter2 = self.store.get_item(new_chapter.location) chapter_aside2 = new_chapter2.runtime.get_asides(new_chapter2)[0] - self.assertEqual('another one value', chapter_aside2.data_field) + assert 'another one value' == chapter_aside2.data_field @ddt.data(ModuleStoreEnum.Type.mongo, ModuleStoreEnum.Type.split) @XBlockAside.register_temp_plugin(AsideTestType, 'test_aside') @@ -3509,7 +3467,7 @@ class TestPublishOverExportImport(CommonMixedModuleStoreSetup): raise_on_failure=True, ) - self.assertEqual(1, len(courses2)) + assert 1 == len(courses2) # check that the imported blocks have the right asides and values def check_block(block): @@ -3518,11 +3476,11 @@ class TestPublishOverExportImport(CommonMixedModuleStoreSetup): """ asides = block.runtime.get_asides(block) - self.assertEqual(len(asides), 1, "Found {} asides but expected only test_aside".format(asides)) - self.assertIsInstance(asides[0], AsideTestType) + assert len(asides) == 1, 'Found {} asides but expected only test_aside'.format(asides) + assert isinstance(asides[0], AsideTestType) category = block.scope_ids.block_type - self.assertEqual(asides[0].data_field, "Exported data_field {} aside data".format(category)) - self.assertEqual(asides[0].content, "Exported content {} Aside".format(category.capitalize())) + assert asides[0].data_field == 'Exported data_field {} aside data'.format(category) + assert asides[0].content == 'Exported content {} Aside'.format(category.capitalize()) for child in block.get_children(): check_block(child) @@ -3565,9 +3523,9 @@ class TestPublishOverExportImport(CommonMixedModuleStoreSetup): new_chapter.display_name = new_chapter_display_name asides = new_chapter.runtime.get_asides(new_chapter) - self.assertEqual(len(asides), 1, "Found {} asides but expected only test_aside".format(asides)) + assert len(asides) == 1, 'Found {} asides but expected only test_aside'.format(asides) chapter_aside = asides[0] - self.assertIsInstance(chapter_aside, AsideTestType) + assert isinstance(chapter_aside, AsideTestType) chapter_aside.data_field = 'new value' self.store.update_item(new_chapter, self.user_id, asides=[chapter_aside]) @@ -3578,9 +3536,9 @@ class TestPublishOverExportImport(CommonMixedModuleStoreSetup): new_problem.display_name = new_problem_display_name asides = new_problem.runtime.get_asides(new_problem) - self.assertEqual(len(asides), 1, "Found {} asides but expected only test_aside".format(asides)) + assert len(asides) == 1, 'Found {} asides but expected only test_aside'.format(asides) problem_aside = asides[0] - self.assertIsInstance(problem_aside, AsideTestType) + assert isinstance(problem_aside, AsideTestType) problem_aside.data_field = 'new problem value' problem_aside.content = 'new content value' self.store.update_item(new_problem, self.user_id, asides=[problem_aside]) @@ -3607,44 +3565,44 @@ class TestPublishOverExportImport(CommonMixedModuleStoreSetup): raise_on_failure=True, ) - self.assertEqual(1, len(courses2)) + assert 1 == len(courses2) # check that aside for the new chapter was exported/imported properly chapters = courses2[0].get_children() - self.assertEqual(2, len(chapters)) - self.assertIn(new_chapter_display_name, [item.display_name for item in chapters]) + assert 2 == len(chapters) + assert new_chapter_display_name in [item.display_name for item in chapters] found = False for child in chapters: if new_chapter.display_name == child.display_name: found = True asides = child.runtime.get_asides(child) - self.assertEqual(len(asides), 1) + assert len(asides) == 1 child_aside = asides[0] - self.assertIsInstance(child_aside, AsideTestType) - self.assertEqual(child_aside.data_field, 'new value') + assert isinstance(child_aside, AsideTestType) + assert child_aside.data_field == 'new value' break - self.assertTrue(found, "new_chapter not found") + assert found, 'new_chapter not found' # check that aside for the new problem was exported/imported properly sequence_children = courses2[0].get_children()[0].get_children()[0].get_children() - self.assertEqual(2, len(sequence_children)) - self.assertIn(new_problem_display_name, [item.display_name for item in sequence_children]) + assert 2 == len(sequence_children) + assert new_problem_display_name in [item.display_name for item in sequence_children] found = False for child in sequence_children: if new_problem.display_name == child.display_name: found = True asides = child.runtime.get_asides(child) - self.assertEqual(len(asides), 1) + assert len(asides) == 1 child_aside = asides[0] - self.assertIsInstance(child_aside, AsideTestType) - self.assertEqual(child_aside.data_field, 'new problem value') - self.assertEqual(child_aside.content, 'new content value') + assert isinstance(child_aside, AsideTestType) + assert child_aside.data_field == 'new problem value' + assert child_aside.content == 'new content value' break - self.assertTrue(found, "new_chapter not found") + assert found, 'new_chapter not found' @ddt.ddt @@ -3704,12 +3662,12 @@ class TestAsidesWithMixedModuleStore(CommonMixedModuleStoreSetup): def _check_asides(asides, field11, field12, field21, field22): """ Helper function to check asides """ - self.assertEqual(len(asides), 2) - self.assertEqual({type(asides[0]), type(asides[1])}, {AsideFoo, AsideBar}) - self.assertEqual(asides[0].field11, field11) - self.assertEqual(asides[0].field12, field12) - self.assertEqual(asides[1].field21, field21) - self.assertEqual(asides[1].field22, field22) + assert len(asides) == 2 + assert {type(asides[0]), type(asides[1])} == {AsideFoo, AsideBar} + assert asides[0].field11 == field11 + assert asides[0].field12 == field12 + assert asides[1].field21 == field21 + assert asides[1].field22 == field22 # get saved item and check asides component = self.store.get_item(published_xblock.location) @@ -3767,13 +3725,13 @@ class TestAsidesWithMixedModuleStore(CommonMixedModuleStoreSetup): for block in actual_items: if block.scope_ids.block_type == 'chapter': asides = block.runtime.get_asides(block) - self.assertEqual(len(asides), 1) - self.assertEqual(asides[0].field11, 'test1') - self.assertEqual(asides[0].field12, 'aside1_default_value2') + assert len(asides) == 1 + assert asides[0].field11 == 'test1' + assert asides[0].field12 == 'aside1_default_value2' chapter_is_found = True break - self.assertTrue(chapter_is_found) + assert chapter_is_found @ddt.data(ModuleStoreEnum.Type.mongo, ModuleStoreEnum.Type.split) @XBlockAside.register_temp_plugin(AsideFoo, 'test_aside1') @@ -3805,8 +3763,8 @@ class TestAsidesWithMixedModuleStore(CommonMixedModuleStoreSetup): ) asides = published_xblock.runtime.get_asides(published_xblock) - self.assertEqual(asides[0].field11, 'new_value11') - self.assertEqual(asides[0].field12, 'new_value12') + assert asides[0].field11 == 'new_value11' + assert asides[0].field12 == 'new_value12' # remove item self.store.delete_item(published_xblock.location, self.user_id) @@ -3821,8 +3779,8 @@ class TestAsidesWithMixedModuleStore(CommonMixedModuleStoreSetup): # check that aside has default values asides2 = published_xblock2.runtime.get_asides(published_xblock2) - self.assertEqual(asides2[0].field11, 'aside1_default_value1') - self.assertEqual(asides2[0].field12, 'aside1_default_value2') + assert asides2[0].field11 == 'aside1_default_value1' + assert asides2[0].field12 == 'aside1_default_value2' @ddt.data((ModuleStoreEnum.Type.mongo, 1, 0), (ModuleStoreEnum.Type.split, 2, 0)) @XBlockAside.register_temp_plugin(AsideFoo, 'test_aside1') @@ -3849,15 +3807,15 @@ class TestAsidesWithMixedModuleStore(CommonMixedModuleStoreSetup): def _check_asides(item): """ Helper function to check asides """ asides = item.runtime.get_asides(item) - self.assertEqual(asides[0].field11, 'new_value11') - self.assertEqual(asides[0].field12, 'new_value12') + assert asides[0].field11 == 'new_value11' + assert asides[0].field12 == 'new_value12' # start off as Private item = self.store.create_child(self.user_id, self.writable_chapter_location, 'problem', 'test_compute_publish_state', asides=[aside1]) item_location = item.location with check_mongo_calls(max_find, max_send): - self.assertFalse(self.store.has_published_version(item)) + assert not self.store.has_published_version(item) _check_asides(item) # Private -> Public @@ -3865,7 +3823,7 @@ class TestAsidesWithMixedModuleStore(CommonMixedModuleStoreSetup): _check_asides(published_block) item = self.store.get_item(item_location) - self.assertTrue(self.store.has_published_version(item)) + assert self.store.has_published_version(item) _check_asides(item) # Public -> Private @@ -3873,5 +3831,5 @@ class TestAsidesWithMixedModuleStore(CommonMixedModuleStoreSetup): _check_asides(unpublished_block) item = self.store.get_item(item_location) - self.assertFalse(self.store.has_published_version(item)) + assert not self.store.has_published_version(item) _check_asides(item) diff --git a/common/lib/xmodule/xmodule/modulestore/tests/test_modulestore_settings.py b/common/lib/xmodule/xmodule/modulestore/tests/test_modulestore_settings.py index 79b25f12ce..349c93b474 100644 --- a/common/lib/xmodule/xmodule/modulestore/tests/test_modulestore_settings.py +++ b/common/lib/xmodule/xmodule/modulestore/tests/test_modulestore_settings.py @@ -5,7 +5,7 @@ Tests for testing the modulestore settings migration code. import copy from unittest import TestCase - +import pytest import ddt from openedx.core.lib.tempdir import mkdtemp_clean @@ -124,7 +124,7 @@ class ModuleStoreSettingsMigration(TestCase): """ store_fields = ["OPTIONS", "DOC_STORE_CONFIG"] for field in store_fields: - self.assertEqual(store_setting1[field], store_setting2[field]) + assert store_setting1[field] == store_setting2[field] def assertMigrated(self, old_setting): """ @@ -135,11 +135,11 @@ class ModuleStoreSettingsMigration(TestCase): new_mixed_setting = convert_module_store_setting_if_needed(copy.deepcopy(old_setting)) # check whether the configuration is encapsulated within Mixed. - self.assertEqual(new_mixed_setting["default"]["ENGINE"], "xmodule.modulestore.mixed.MixedModuleStore") + assert new_mixed_setting['default']['ENGINE'] == 'xmodule.modulestore.mixed.MixedModuleStore' # check whether the stores are in an ordered list new_stores = get_mixed_stores(new_mixed_setting) - self.assertIsInstance(new_stores, list) + assert isinstance(new_stores, list) return new_mixed_setting, new_stores[0] @@ -151,9 +151,9 @@ class ModuleStoreSettingsMigration(TestCase): split_settings = [store for store in stores if store['ENGINE'].endswith('.DraftVersioningModuleStore')] if len(split_settings): # lint-amnesty, pylint: disable=len-as-condition # there should only be one setting for split - self.assertEqual(len(split_settings), 1) + assert len(split_settings) == 1 # verify name - self.assertEqual(split_settings[0]['NAME'], 'split') + assert split_settings[0]['NAME'] == 'split' # verify split config settings equal those of mongo self.assertStoreValuesEqual( split_settings[0], @@ -165,28 +165,28 @@ class ModuleStoreSettingsMigration(TestCase): old_setting = self.OLD_CONFIG new_mixed_setting, new_default_store_setting = self.assertMigrated(old_setting) self.assertStoreValuesEqual(new_default_store_setting, old_setting["default"]) - self.assertEqual(new_default_store_setting["ENGINE"], old_setting["default"]["ENGINE"]) - self.assertFalse(self.is_split_configured(new_mixed_setting)) + assert new_default_store_setting['ENGINE'] == old_setting['default']['ENGINE'] + assert not self.is_split_configured(new_mixed_setting) def test_convert_from_old_mongo_to_draft_store(self): old_setting = self.OLD_CONFIG_WITH_DIRECT_MONGO new_mixed_setting, new_default_store_setting = self.assertMigrated(old_setting) self.assertStoreValuesEqual(new_default_store_setting, old_setting["default"]) - self.assertEqual(new_default_store_setting["ENGINE"], "xmodule.modulestore.mongo.draft.DraftModuleStore") - self.assertTrue(self.is_split_configured(new_mixed_setting)) + assert new_default_store_setting['ENGINE'] == 'xmodule.modulestore.mongo.draft.DraftModuleStore' + assert self.is_split_configured(new_mixed_setting) def test_convert_from_dict_to_list(self): old_mixed_setting = self.OLD_MIXED_CONFIG_WITH_DICT new_mixed_setting, new_default_store_setting = self.assertMigrated(old_mixed_setting) - self.assertEqual(new_default_store_setting["ENGINE"], "the_default_store") - self.assertTrue(self.is_split_configured(new_mixed_setting)) + assert new_default_store_setting['ENGINE'] == 'the_default_store' + assert self.is_split_configured(new_mixed_setting) # exclude split when comparing old and new, since split was added as part of the migration new_stores = [store for store in get_mixed_stores(new_mixed_setting) if store['NAME'] != 'split'] old_stores = get_mixed_stores(self.OLD_MIXED_CONFIG_WITH_DICT) # compare each store configured in mixed - self.assertEqual(len(new_stores), len(old_stores)) + assert len(new_stores) == len(old_stores) for new_store in new_stores: self.assertStoreValuesEqual(new_store, old_stores[new_store['NAME']]) @@ -194,16 +194,16 @@ class ModuleStoreSettingsMigration(TestCase): # make sure there is no migration done on an already updated config old_mixed_setting = self.ALREADY_UPDATED_MIXED_CONFIG new_mixed_setting, new_default_store_setting = self.assertMigrated(old_mixed_setting) # lint-amnesty, pylint: disable=unused-variable - self.assertTrue(self.is_split_configured(new_mixed_setting)) - self.assertEqual(old_mixed_setting, new_mixed_setting) + assert self.is_split_configured(new_mixed_setting) + assert old_mixed_setting == new_mixed_setting @ddt.data('draft', 'split') def test_update_settings(self, default_store): mixed_setting = self.ALREADY_UPDATED_MIXED_CONFIG update_module_store_settings(mixed_setting, default_store=default_store) - self.assertEqual(get_mixed_stores(mixed_setting)[0]['NAME'], default_store) + assert get_mixed_stores(mixed_setting)[0]['NAME'] == default_store def test_update_settings_error(self): mixed_setting = self.ALREADY_UPDATED_MIXED_CONFIG - with self.assertRaises(Exception): + with pytest.raises(Exception): update_module_store_settings(mixed_setting, default_store='non-existent store') diff --git a/common/lib/xmodule/xmodule/modulestore/tests/test_mongo.py b/common/lib/xmodule/xmodule/modulestore/tests/test_mongo.py index e61303f6be..7a9d88ba1b 100644 --- a/common/lib/xmodule/xmodule/modulestore/tests/test_mongo.py +++ b/common/lib/xmodule/xmodule/modulestore/tests/test_mongo.py @@ -298,7 +298,7 @@ class TestMongoModuleStore(TestMongoModuleStoreBase): """ course_key = CourseKey.from_string('course-v1:edX+simple+2012_Fall') - with self.assertRaises(ItemNotFoundError): + with pytest.raises(ItemNotFoundError): self.draft_store.get_course(course_key) def test_has_mongo_course_with_split_course_key(self): @@ -307,7 +307,7 @@ class TestMongoModuleStore(TestMongoModuleStoreBase): """ course_key = CourseKey.from_string('course-v1:edX+simple+2012_Fall') - self.assertFalse(self.draft_store.has_course(course_key)) + assert not self.draft_store.has_course(course_key) def test_has_course_with_library(self): """ @@ -369,10 +369,8 @@ class TestMongoModuleStore(TestMongoModuleStoreBase): def test_get_courses_has_no_templates(self): courses = self.draft_store.get_courses() for course in courses: - self.assertFalse( - course.location.org == 'edx' and course.location.course == 'templates', + assert not ((course.location.org == 'edx') and (course.location.course == 'templates')),\ '{0} is a template course'.format(course) - ) def test_contentstore_attrs(self): """ @@ -566,8 +564,8 @@ class TestMongoModuleStore(TestMongoModuleStoreBase): root_dir = path(mkdtemp()) self.addCleanup(shutil.rmtree, root_dir) export_course_to_xml(self.draft_store, self.content_store, course_key, root_dir, u'test_export') - self.assertTrue(path(root_dir / 'test_export/static/images/course_image.jpg').isfile()) - self.assertTrue(path(root_dir / 'test_export/static/images_course_image.jpg').isfile()) + assert path((root_dir / 'test_export/static/images/course_image.jpg')).isfile() + assert path((root_dir / 'test_export/static/images_course_image.jpg')).isfile() @patch('xmodule.video_module.video_module.edxval_api', None) @patch('xmodule.tabs.CourseTab.from_json', side_effect=mock_tab_from_json) @@ -582,8 +580,8 @@ class TestMongoModuleStore(TestMongoModuleStoreBase): root_dir = path(mkdtemp()) self.addCleanup(shutil.rmtree, root_dir) export_course_to_xml(self.draft_store, self.content_store, course.id, root_dir, u'test_export') - self.assertTrue(path(root_dir / 'test_export/static/just_a_test.jpg').isfile()) - self.assertFalse(path(root_dir / 'test_export/static/images/course_image.jpg').isfile()) + assert path((root_dir / 'test_export/static/just_a_test.jpg')).isfile() + assert not path((root_dir / 'test_export/static/images/course_image.jpg')).isfile() @patch('xmodule.video_module.video_module.edxval_api', None) def test_course_without_image(self): @@ -595,8 +593,8 @@ class TestMongoModuleStore(TestMongoModuleStoreBase): root_dir = path(mkdtemp()) self.addCleanup(shutil.rmtree, root_dir) export_course_to_xml(self.draft_store, self.content_store, course.id, root_dir, u'test_export') - self.assertFalse(path(root_dir / 'test_export/static/images/course_image.jpg').isfile()) - self.assertFalse(path(root_dir / 'test_export/static/images_course_image.jpg').isfile()) + assert not path((root_dir / 'test_export/static/images/course_image.jpg')).isfile() + assert not path((root_dir / 'test_export/static/images_course_image.jpg')).isfile() def _create_test_tree(self, name, user_id=None): """ @@ -677,8 +675,8 @@ class TestMongoModuleStore(TestMongoModuleStoreBase): # Retrieve the block and verify its fields component = self.draft_store.get_item(location) - self.assertEqual(component.published_on, published_date) - self.assertEqual(component.published_by, published_by) + assert component.published_on == published_date + assert component.published_by == published_by def test_draft_modulestore_create_child_with_position(self): """ @@ -703,8 +701,8 @@ class TestMongoModuleStore(TestMongoModuleStoreBase): # First child should have been moved to second position, and better child takes the lead course = self.draft_store.get_course(course.id) - self.assertEqual(six.text_type(course.children[1]), six.text_type(first_child.location)) - self.assertEqual(six.text_type(course.children[0]), six.text_type(second_child.location)) + assert six.text_type(course.children[1]) == six.text_type(first_child.location) + assert six.text_type(course.children[0]) == six.text_type(second_child.location) # Clean up the data so we don't break other tests which apparently expect a particular state self.draft_store.delete_course(course.id, self.dummy_user) @@ -713,8 +711,8 @@ class TestMongoModuleStore(TestMongoModuleStoreBase): """Test that we get back the appropriate usage key for the root of a course key.""" course_key = CourseLocator(org="edX", course="101", run="2015") root_block_key = self.draft_store.make_course_usage_key(course_key) - self.assertEqual(root_block_key.block_type, "course") - self.assertEqual(root_block_key.block_id, "2015") + assert root_block_key.block_type == 'course' + assert root_block_key.block_id == '2015' class TestMongoModuleStoreWithNoAssetCollection(TestMongoModuleStore): # lint-amnesty, pylint: disable=test-inherits-tests @@ -741,12 +739,12 @@ class TestMongoModuleStoreWithNoAssetCollection(TestMongoModuleStore): # lint-a courses = self.draft_store.get_courses() course = courses[0] # Confirm that no specified asset collection name means empty asset metadata. - self.assertEqual(self.draft_store.get_all_asset_metadata(course.id, 'asset'), []) + assert self.draft_store.get_all_asset_metadata(course.id, 'asset') == [] def test_no_asset_invalid_key(self): course_key = CourseLocator(org="edx3", course="test_course", run=None, deprecated=True) # Confirm that invalid course key raises ItemNotFoundError - self.assertRaises(ItemNotFoundError, lambda: self.draft_store.get_all_asset_metadata(course_key, 'asset')[:1]) + pytest.raises(ItemNotFoundError, (lambda: self.draft_store.get_all_asset_metadata(course_key, 'asset')[:1])) class TestMongoKeyValueStore(TestCase): diff --git a/common/lib/xmodule/xmodule/modulestore/tests/test_publish.py b/common/lib/xmodule/xmodule/modulestore/tests/test_publish.py index 57e4709326..5ab6ec70a6 100644 --- a/common/lib/xmodule/xmodule/modulestore/tests/test_publish.py +++ b/common/lib/xmodule/xmodule/modulestore/tests/test_publish.py @@ -13,6 +13,7 @@ from contextlib import contextmanager from shutil import rmtree from tempfile import mkdtemp +import pytest import ddt import six from six.moves import range @@ -136,7 +137,7 @@ class TestPublish(SplitWMongoCourseBootstrapper): # verify status item = self.draft_mongo.get_item(vert_location, 0) - self.assertFalse(getattr(item, 'is_draft', False), "Item was published. Draft should not exist") + assert not getattr(item, 'is_draft', False), 'Item was published. Draft should not exist' # however, children are still draft, but I'm not sure that's by design # delete the draft version of the discussion @@ -144,8 +145,8 @@ class TestPublish(SplitWMongoCourseBootstrapper): self.draft_mongo.delete_item(location, self.user_id) draft_vert = self.draft_mongo.get_item(vert_location, 0) - self.assertTrue(getattr(draft_vert, 'is_draft', False), "Deletion didn't convert parent to draft") - self.assertNotIn(location, draft_vert.children) + assert getattr(draft_vert, 'is_draft', False), "Deletion didn't convert parent to draft" + assert location not in draft_vert.children # move the other child other_child_loc = self.old_course_key.make_usage_key('html', block_id='Html2') draft_vert.children.remove(other_child_loc) @@ -156,12 +157,12 @@ class TestPublish(SplitWMongoCourseBootstrapper): # publish self.draft_mongo.publish(vert_location, self.user_id) item = self.draft_mongo.get_item(draft_vert.location, revision=ModuleStoreEnum.RevisionOption.published_only) - self.assertNotIn(location, item.children) - self.assertIsNone(self.draft_mongo.get_parent_location(location)) - with self.assertRaises(ItemNotFoundError): + assert location not in item.children + assert self.draft_mongo.get_parent_location(location) is None + with pytest.raises(ItemNotFoundError): self.draft_mongo.get_item(location) - self.assertNotIn(other_child_loc, item.children) - self.assertTrue(self.draft_mongo.has_item(other_child_loc), "Oops, lost moved item") + assert other_child_loc not in item.children + assert self.draft_mongo.has_item(other_child_loc), 'Oops, lost moved item' class DraftPublishedOpTestCourseSetup(unittest.TestCase): @@ -305,10 +306,7 @@ class OLXFormatChecker(unittest.TestCase): self._ensure_exported() block_path = os.path.join(self.root_export_dir, self.export_dir) # pylint: disable=no-member - self.assertTrue( - os.path.isdir(block_path), - msg='{} is not a dir.'.format(block_path) - ) + assert os.path.isdir(block_path), '{} is not a dir.'.format(block_path) return block_path def _get_block_type_path(self, course_export_dir, block_type, draft): @@ -335,10 +333,7 @@ class OLXFormatChecker(unittest.TestCase): block_file = self._get_block_filename(block_id) block_file_path = os.path.join(block_subdir_path, block_file) - self.assertTrue( - os.path.isfile(block_file_path), - msg='{} is not an existing file.'.format(block_file_path) - ) + assert os.path.isfile(block_file_path), '{} is not an existing file.'.format(block_file_path) with open(block_file_path, "r") as file_handle: return file_handle.read() @@ -350,7 +345,7 @@ class OLXFormatChecker(unittest.TestCase): element (ElementTree.Element): the element to check. tag (str): The tag to validate. """ - self.assertEqual(element.tag, tag) + assert element.tag == tag def assertElementAttrsSubset(self, element, attrs): """ @@ -395,10 +390,7 @@ class OLXFormatChecker(unittest.TestCase): is_draft = kwargs.pop('draft', False) block_path = self._get_block_type_path(course_export_dir, block_type, is_draft) block_file_path = os.path.join(block_path, self._get_block_filename(block_id)) - self.assertFalse( - os.path.exists(block_file_path), - msg='{} exists but should not!'.format(block_file_path) - ) + assert not os.path.exists(block_file_path), '{} exists but should not!'.format(block_file_path) def assertParentReferences(self, element, course_key, parent_type, parent_id, index_in_children_list): """ @@ -458,7 +450,7 @@ class OLXFormatChecker(unittest.TestCase): """ for block_data in block_list: block_params = self.course_db.get(block_data) - self.assertIsNotNone(block_params) + assert block_params is not None (block_type, block_id) = block_data if draft: element = self.parse_olx(block_type, block_id, draft=True) @@ -691,7 +683,7 @@ class ElementalPublishingTests(DraftPublishedOpBaseTestSetup): # In Split, you cannot publish an item whose parents are unpublished. # Split will raise an exception when the item's parent(s) aren't found # in the published branch. - with self.assertRaises(ItemNotFoundError): + with pytest.raises(ItemNotFoundError): self.publish((('html', 'html00'),)) @ddt.data(*MODULESTORE_SETUPS) @@ -839,7 +831,7 @@ class ElementalUnpublishingTests(DraftPublishedOpBaseTestSetup): # The unit is a draft. self.assertOLXIsDraftOnly(block_list_to_unpublish) # Since there's no published version, attempting an unpublish throws an exception. - with self.assertRaises(ItemNotFoundError): + with pytest.raises(ItemNotFoundError): self.unpublish(block_list_to_unpublish) @ddt.data(*MODULESTORE_SETUPS) @@ -887,7 +879,7 @@ class ElementalUnpublishingTests(DraftPublishedOpBaseTestSetup): # The vertical is a draft. self.assertOLXIsDraftOnly(block_list_to_unpublish) # Since there's no published version, attempting an unpublish throws an exception. - with self.assertRaises(ItemNotFoundError): + with pytest.raises(ItemNotFoundError): self.unpublish(block_list_to_unpublish) @ddt.data(*MODULESTORE_SETUPS) @@ -939,7 +931,7 @@ class ElementalUnpublishingTests(DraftPublishedOpBaseTestSetup): block_list_to_unpublish = ( ('sequential', 'sequential03'), ) - with self.assertRaises(InvalidVersionError): + with pytest.raises(InvalidVersionError): self.unpublish(block_list_to_unpublish) @@ -983,7 +975,7 @@ class ElementalDeleteItemTests(DraftPublishedOpBaseTestSetup): if revision in (ModuleStoreEnum.RevisionOption.published_only, ModuleStoreEnum.RevisionOption.all): # Split throws an exception when trying to delete an item from the published branch # that isn't yet published. - with self.assertRaises(ValueError): + with pytest.raises(ValueError): self.delete_item(block_list_to_delete, revision=revision) else: self.delete_item(block_list_to_delete, revision=revision) @@ -1060,7 +1052,7 @@ class ElementalDeleteItemTests(DraftPublishedOpBaseTestSetup): # MODULESTORE_DIFFERENCE: # Split throws an exception when trying to delete an item from the published branch # that isn't yet published. - with self.assertRaises(ValueError): + with pytest.raises(ValueError): self.delete_item(block_list_to_delete, revision=revision) else: self.delete_item(block_list_to_delete, revision=revision) @@ -1190,7 +1182,7 @@ class ElementalConvertToDraftTests(DraftPublishedOpBaseTestSetup): elif self.is_old_mongo_modulestore: # Old Mongo: # Direct-only categories are never allowed to be converted to draft. - with self.assertRaises(InvalidVersionError): + with pytest.raises(InvalidVersionError): self.convert_to_draft(block_list_to_convert) else: raise Exception("Must test either Old Mongo or Split modulestore!") @@ -1212,7 +1204,7 @@ class ElementalRevertToPublishedTests(DraftPublishedOpBaseTestSetup): self.assertOLXIsDraftOnly(block_list_to_revert) # Now, without publishing anything first, revert the same vertical to published. # Since no published version exists, an exception is raised. - with self.assertRaises(InvalidVersionError): + with pytest.raises(InvalidVersionError): self.revert_to_published(block_list_to_revert) @ddt.data(*MODULESTORE_SETUPS) diff --git a/common/lib/xmodule/xmodule/modulestore/tests/test_semantics.py b/common/lib/xmodule/xmodule/modulestore/tests/test_semantics.py index e432aef030..0dcb2c9049 100644 --- a/common/lib/xmodule/xmodule/modulestore/tests/test_semantics.py +++ b/common/lib/xmodule/xmodule/modulestore/tests/test_semantics.py @@ -6,6 +6,7 @@ Tests of modulestore semantics: How do the interfaces methods of ModuleStore rel import itertools from collections import namedtuple +import pytest import ddt from mock import patch from xblock.core import XBlock, XBlockAside @@ -79,12 +80,12 @@ class DirectOnlyCategorySemantics(PureModulestoreTestCase): """ if draft is None or draft: with self.store.branch_setting(ModuleStoreEnum.Branch.draft_preferred): - with self.assertRaises(ItemNotFoundError): + with pytest.raises(ItemNotFoundError): self.store.get_item(block_usage_key) if draft is None or not draft: with self.store.branch_setting(ModuleStoreEnum.Branch.published_only): - with self.assertRaises(ItemNotFoundError): + with pytest.raises(ItemNotFoundError): self.store.get_item(block_usage_key) def assertBlockHasContent(self, block_usage_key, field_name, content, @@ -108,22 +109,22 @@ class DirectOnlyCategorySemantics(PureModulestoreTestCase): target_block = self.store.get_item( block_usage_key, ) - self.assertEqual(content, target_block.fields[field_name].read_from(target_block)) + assert content == target_block.fields[field_name].read_from(target_block) if aside_field_name and aside_content: aside = self._get_aside(target_block) - self.assertIsNotNone(aside) - self.assertEqual(aside_content, aside.fields[aside_field_name].read_from(aside)) + assert aside is not None + assert aside_content == aside.fields[aside_field_name].read_from(aside) if draft is None or draft: with self.store.branch_setting(ModuleStoreEnum.Branch.draft_preferred): target_block = self.store.get_item( block_usage_key, ) - self.assertEqual(content, target_block.fields[field_name].read_from(target_block)) + assert content == target_block.fields[field_name].read_from(target_block) if aside_field_name and aside_content: aside = self._get_aside(target_block) - self.assertIsNotNone(aside) - self.assertEqual(aside_content, aside.fields[aside_field_name].read_from(aside)) + assert aside is not None + assert aside_content == aside.fields[aside_field_name].read_from(aside) def assertParentOf(self, parent_usage_key, child_usage_key, draft=None): """ @@ -142,14 +143,14 @@ class DirectOnlyCategorySemantics(PureModulestoreTestCase): parent_block = self.store.get_item( parent_usage_key, ) - self.assertIn(child_usage_key, parent_block.children) + assert child_usage_key in parent_block.children if draft is None or draft: with self.store.branch_setting(ModuleStoreEnum.Branch.draft_preferred): parent_block = self.store.get_item( parent_usage_key, ) - self.assertIn(child_usage_key, parent_block.children) + assert child_usage_key in parent_block.children def assertNotParentOf(self, parent_usage_key, child_usage_key, draft=None): """ @@ -168,14 +169,14 @@ class DirectOnlyCategorySemantics(PureModulestoreTestCase): parent_block = self.store.get_item( parent_usage_key, ) - self.assertNotIn(child_usage_key, parent_block.children) + assert child_usage_key not in parent_block.children if draft is None or draft: with self.store.branch_setting(ModuleStoreEnum.Branch.draft_preferred): parent_block = self.store.get_item( parent_usage_key, ) - self.assertNotIn(child_usage_key, parent_block.children) + assert child_usage_key not in parent_block.children def assertCoursePointsToBlock(self, block_usage_key, draft=None): """ @@ -215,7 +216,7 @@ class DirectOnlyCategorySemantics(PureModulestoreTestCase): expected_fields = CourseSummary.course_info_fields + ['id', 'location', 'has_ended'] return all([hasattr(course_summary, field) for field in expected_fields]) - self.assertTrue(all(verify_course_summery_fields(course_summary) for course_summary in course_summaries)) + assert all((verify_course_summery_fields(course_summary) for course_summary in course_summaries)) def is_detached(self, block_type): """ @@ -313,7 +314,7 @@ class DirectOnlyCategorySemantics(PureModulestoreTestCase): test_data = self.DATA_FIELDS[block_type] updated_field_value = test_data.updated - self.assertNotEqual(updated_field_value, block.fields[test_data.field_name].read_from(block)) + assert updated_field_value != block.fields[test_data.field_name].read_from(block) block.fields[test_data.field_name].write_to(block, updated_field_value) @@ -338,13 +339,13 @@ class DirectOnlyCategorySemantics(PureModulestoreTestCase): course_summaries = self.store.get_course_summaries() # Verify course summaries - self.assertEqual(len(course_summaries), 1) + assert len(course_summaries) == 1 # Verify that all course summary objects have the required attributes. self.assertCourseSummaryFields(course_summaries) # Verify fetched accessible courses list is a list of CourseSummery instances - self.assertTrue(all(isinstance(course, CourseSummary) for course in course_summaries)) + assert all((isinstance(course, CourseSummary) for course in course_summaries)) @ddt.data(*itertools.product(['chapter', 'sequential'], [True, False])) @ddt.unpack @@ -437,7 +438,7 @@ class TestSplitDirectOnlyCategorySemantics(DirectOnlyCategorySemantics): with self.store.branch_setting(ModuleStoreEnum.Branch.draft_preferred): block = self.store.get_item(block_usage_key) aside = self._get_aside(block) - self.assertIsNotNone(aside) + assert aside is not None aside.fields[self.ASIDE_DATA_FIELD.field_name].write_to(aside, self.ASIDE_DATA_FIELD.updated) self.store.update_item(block, ModuleStoreEnum.UserID.test, allow_not_found=True, asides=[aside]) diff --git a/common/lib/xmodule/xmodule/modulestore/tests/test_split_copy_from_template.py b/common/lib/xmodule/xmodule/modulestore/tests/test_split_copy_from_template.py index 099b17e564..86eb5e0f31 100644 --- a/common/lib/xmodule/xmodule/modulestore/tests/test_split_copy_from_template.py +++ b/common/lib/xmodule/xmodule/modulestore/tests/test_split_copy_from_template.py @@ -7,6 +7,7 @@ However for these tests, we make sure it also works when copying from course to import ddt from six.moves import range +import pytest from xmodule.modulestore import ModuleStoreEnum from xmodule.modulestore.exceptions import ItemNotFoundError @@ -49,20 +50,20 @@ class TestSplitCopyTemplate(MixedSplitTestCase): # Inherit the vertical and the problem from the library into the course: source_keys = [source_container.children[0]] new_blocks = self.store.copy_from_template(source_keys, dest_key=course.location, user_id=self.user_id) - self.assertEqual(len(new_blocks), 1) + assert len(new_blocks) == 1 course = self.store.get_course(course.location.course_key) # Reload from modulestore - self.assertEqual(len(course.children), 1) + assert len(course.children) == 1 vertical_block_course = self.store.get_item(course.children[0]) - self.assertEqual(new_blocks[0], vertical_block_course.location) + assert new_blocks[0] == vertical_block_course.location problem_block_course = self.store.get_item(vertical_block_course.children[0]) - self.assertEqual(problem_block_course.display_name, problem_library_display_name) + assert problem_block_course.display_name == problem_library_display_name # Check that when capa modules are copied, their "markdown" fields (Scope.settings) are removed. # (See note in split.py:copy_from_template()) - self.assertIsNotNone(problem_block.markdown) - self.assertIsNone(problem_block_course.markdown) + assert problem_block.markdown is not None + assert problem_block_course.markdown is None # Override the display_name and weight: new_display_name = "The Trouble with Tribbles" @@ -77,16 +78,16 @@ class TestSplitCopyTemplate(MixedSplitTestCase): # Repeat the copy_from_template(): new_blocks2 = self.store.copy_from_template(source_keys, dest_key=course.location, user_id=self.user_id) - self.assertEqual(new_blocks, new_blocks2) + assert new_blocks == new_blocks2 # Reload problem_block_course: problem_block_course = self.store.get_item(problem_block_course.location) - self.assertEqual(problem_block_course.display_name, new_display_name) - self.assertEqual(problem_block_course.weight, new_weight) + assert problem_block_course.display_name == new_display_name + assert problem_block_course.weight == new_weight # Ensure that extra_block was deleted: vertical_block_course = self.store.get_item(new_blocks2[0]) - self.assertEqual(len(vertical_block_course.children), 1) - with self.assertRaises(ItemNotFoundError): + assert len(vertical_block_course.children) == 1 + with pytest.raises(ItemNotFoundError): self.store.get_item(extra_block.location) def test_copy_from_template_publish(self): @@ -119,7 +120,7 @@ class TestSplitCopyTemplate(MixedSplitTestCase): problem_published = self.store.get_item( problem_key_in_course.for_branch(ModuleStoreEnum.BranchName.published) ) - self.assertEqual(problem_published.display_name, display_name_expected) + assert problem_published.display_name == display_name_expected def test_copy_from_template_auto_publish(self): """ @@ -146,7 +147,7 @@ class TestSplitCopyTemplate(MixedSplitTestCase): # Inherit the vertical and the problem from the library into the course: source_keys = [block.location for block in [about, chapter, html]] block_keys = self.store.copy_from_template(source_keys, dest_key=course.location, user_id=self.user_id) - self.assertEqual(len(block_keys), len(source_keys)) + assert len(block_keys) == len(source_keys) # Build dict of the new blocks in 'course', keyed by category (which is a unique key in our case) new_blocks = {} @@ -167,14 +168,15 @@ class TestSplitCopyTemplate(MixedSplitTestCase): return False # Check that the auto-publish blocks have been published: - self.assertFalse(self.store.has_changes(new_blocks["about"])) + assert not self.store.has_changes(new_blocks['about']) # We can't use has_changes because it includes descendants - self.assertTrue(published_version_exists(new_blocks["chapter"])) - self.assertTrue(published_version_exists(new_blocks["sequential"])) # Ditto + assert published_version_exists(new_blocks['chapter']) + assert published_version_exists(new_blocks['sequential']) + # Ditto # Check that non-auto-publish blocks and blocks with non-auto-publish descendants show changes: - self.assertTrue(self.store.has_changes(new_blocks["html"])) - self.assertTrue(self.store.has_changes(new_blocks["problem"])) + assert self.store.has_changes(new_blocks['html']) + assert self.store.has_changes(new_blocks['problem']) # Will have changes since a child block has changes. - self.assertTrue(self.store.has_changes(new_blocks["chapter"])) + assert self.store.has_changes(new_blocks['chapter']) # Verify that our published_version_exists works - self.assertFalse(published_version_exists(new_blocks["vertical"])) + assert not published_version_exists(new_blocks['vertical']) diff --git a/common/lib/xmodule/xmodule/modulestore/tests/test_split_migrator.py b/common/lib/xmodule/xmodule/modulestore/tests/test_split_migrator.py index 89d1e0c2f9..60600ff798 100644 --- a/common/lib/xmodule/xmodule/modulestore/tests/test_split_migrator.py +++ b/common/lib/xmodule/xmodule/modulestore/tests/test_split_migrator.py @@ -165,7 +165,7 @@ class TestMigration(SplitWMongoCourseBootstrapper): def compare_dags(self, presplit, presplit_dag_root, split_dag_root, published): # lint-amnesty, pylint: disable=missing-function-docstring if split_dag_root.category != 'course': - self.assertEqual(presplit_dag_root.location.block_id, split_dag_root.location.block_id) + assert presplit_dag_root.location.block_id == split_dag_root.location.block_id # compare all fields but references for name, field in six.iteritems(presplit_dag_root.fields): # fields generated from UNIQUE_IDs are unique to an XBlock's scope, @@ -176,23 +176,11 @@ class TestMigration(SplitWMongoCourseBootstrapper): field_generated_from_unique_id or isinstance(field, (Reference, ReferenceList, ReferenceValueDict)) ) if should_check_field: - self.assertEqual( - getattr(presplit_dag_root, name), - getattr(split_dag_root, name), - u"{}/{}: {} != {}".format( - split_dag_root.location, name, getattr(presplit_dag_root, name), getattr(split_dag_root, name) - ) - ) + assert getattr(presplit_dag_root, name) == getattr(split_dag_root, name), f'{split_dag_root.location}/{name}: {getattr(presplit_dag_root, name)} != {getattr(split_dag_root, name)}' # pylint: disable=line-too-long # compare children if presplit_dag_root.has_children: - self.assertEqual( - # need get_children to filter out drafts - len(presplit_dag_root.get_children()), len(split_dag_root.children), - u"{0.category} '{0.display_name}': children {1} != {2}".format( - presplit_dag_root, presplit_dag_root.children, split_dag_root.children - ) - ) + assert len(presplit_dag_root.get_children()) == len(split_dag_root.children), f"{presplit_dag_root.category} '{presplit_dag_root.display_name}': children {presplit_dag_root.children} != {split_dag_root.children}" # pylint: disable=line-too-long for pre_child, split_child in zip(presplit_dag_root.get_children(), split_dag_root.get_children()): self.compare_dags(presplit, pre_child, split_child, published) diff --git a/common/lib/xmodule/xmodule/modulestore/tests/test_split_modulestore.py b/common/lib/xmodule/xmodule/modulestore/tests/test_split_modulestore.py index 14856a3c00..7391e8f763 100644 --- a/common/lib/xmodule/xmodule/modulestore/tests/test_split_modulestore.py +++ b/common/lib/xmodule/xmodule/modulestore/tests/test_split_modulestore.py @@ -10,6 +10,7 @@ import re import unittest from importlib import import_module +import pytest import ddt import six from ccx_keys.locator import CCXBlockUsageLocator @@ -589,25 +590,25 @@ class TestHasChildrenAtDepth(SplitModuleTest): self.assertRaises( ValueError, block.has_children_at_depth, -1, ) - self.assertTrue(block.has_children_at_depth(0)) - self.assertTrue(block.has_children_at_depth(1)) - self.assertFalse(block.has_children_at_depth(2)) + assert block.has_children_at_depth(0) + assert block.has_children_at_depth(1) + assert not block.has_children_at_depth(2) ch1 = modulestore().get_item( BlockUsageLocator(course_locator, 'chapter', block_id='chapter1') ) - self.assertFalse(ch1.has_children_at_depth(0)) + assert not ch1.has_children_at_depth(0) ch2 = modulestore().get_item( BlockUsageLocator(course_locator, 'chapter', block_id='chapter2') ) - self.assertFalse(ch2.has_children_at_depth(0)) + assert not ch2.has_children_at_depth(0) ch3 = modulestore().get_item( BlockUsageLocator(course_locator, 'chapter', block_id='chapter3') ) - self.assertTrue(ch3.has_children_at_depth(0)) - self.assertFalse(ch3.has_children_at_depth(1)) + assert ch3.has_children_at_depth(0) + assert not ch3.has_children_at_depth(1) @ddt.ddt @@ -620,23 +621,17 @@ class SplitModuleCourseTests(SplitModuleTest): def test_get_courses(self, _from_json): courses = modulestore().get_courses(branch=BRANCH_NAME_DRAFT) # should have gotten 3 draft courses - self.assertEqual(len(courses), 3, "Wrong number of courses") + assert len(courses) == 3, 'Wrong number of courses' # check metadata -- NOTE no promised order course = self.findByIdInResult(courses, "head12345") - self.assertEqual(course.location.org, "testx") - self.assertEqual(course.category, 'course', 'wrong category') - self.assertEqual(len(course.tabs), 6, "wrong number of tabs") - self.assertEqual( - course.display_name, "The Ancient Greek Hero", - "wrong display name" - ) - self.assertEqual( - course.advertised_start, "Fall 2013", - "advertised_start" - ) - self.assertEqual(len(course.children), 4, "children") + assert course.location.org == 'testx' + assert course.category == 'course', 'wrong category' + assert len(course.tabs) == 6, 'wrong number of tabs' + assert course.display_name == 'The Ancient Greek Hero', 'wrong display name' + assert course.advertised_start == 'Fall 2013', 'advertised_start' + assert len(course.children) == 4, 'children' # check dates and graders--forces loading of descriptor - self.assertEqual(course.edited_by, "testassist@edx.org") + assert course.edited_by == 'testassist@edx.org' self.assertDictEqual(course.grade_cutoffs, {"Pass": 0.45}) @patch('xmodule.tabs.CourseTab.from_json', side_effect=mock_tab_from_json) @@ -647,7 +642,7 @@ class SplitModuleCourseTests(SplitModuleTest): """ courses = modulestore().get_courses(branch=BRANCH_NAME_DRAFT) # Should have gotten 3 draft courses. - self.assertEqual(len(courses), 3) + assert len(courses) == 3 course_index = modulestore().get_course_index_info(courses[0].id) # Creating a new course with same course index of another course. @@ -656,44 +651,42 @@ class SplitModuleCourseTests(SplitModuleTest): ) courses = modulestore().get_courses(branch=BRANCH_NAME_DRAFT) # Should have gotten 4 draft courses. - self.assertEqual(len(courses), 4) - self.assertIn(new_draft_course.id.version_agnostic(), [c.id for c in courses]) + assert len(courses) == 4 + assert new_draft_course.id.version_agnostic() in [c.id for c in courses] @patch('xmodule.tabs.CourseTab.from_json', side_effect=mock_tab_from_json) def test_get_org_courses(self, _from_json): courses = modulestore().get_courses(branch=BRANCH_NAME_DRAFT, org='guestx') # should have gotten 1 draft courses - self.assertEqual(len(courses), 1) + assert len(courses) == 1 courses = modulestore().get_courses(branch=BRANCH_NAME_DRAFT, org='testx') # should have gotten 2 draft courses - self.assertEqual(len(courses), 2) + assert len(courses) == 2 # although this is already covered in other tests, let's # also not pass in org= parameter to make sure we get back # 3 courses courses = modulestore().get_courses(branch=BRANCH_NAME_DRAFT) - self.assertEqual(len(courses), 3) + assert len(courses) == 3 @patch('xmodule.tabs.CourseTab.from_json', side_effect=mock_tab_from_json) def test_branch_requests(self, _from_json): # query w/ branch qualifier (both draft and published) def _verify_published_course(courses_published): """ Helper function for verifying published course. """ - self.assertEqual(len(courses_published), 1, len(courses_published)) + assert len(courses_published) == 1, len(courses_published) course = self.findByIdInResult(courses_published, "head23456") - self.assertIsNotNone(course, "published courses") - self.assertEqual(course.location.course_key.org, "testx") - self.assertEqual(course.location.course_key.course, "wonderful") - self.assertEqual(course.category, 'course', 'wrong category') - self.assertEqual(len(course.tabs), 4, "wrong number of tabs") - self.assertEqual(course.display_name, "The most wonderful course", - course.display_name) - self.assertIsNone(course.advertised_start) - self.assertEqual(len(course.children), 0, - "children") + assert course is not None, 'published courses' + assert course.location.course_key.org == 'testx' + assert course.location.course_key.course == 'wonderful' + assert course.category == 'course', 'wrong category' + assert len(course.tabs) == 4, 'wrong number of tabs' + assert course.display_name == 'The most wonderful course', course.display_name + assert course.advertised_start is None + assert len(course.children) == 0, 'children' _verify_published_course(modulestore().get_courses(branch=BRANCH_NAME_PUBLISHED)) @@ -715,34 +708,34 @@ class SplitModuleCourseTests(SplitModuleTest): ''' locator = CourseLocator(org='testx', course='GreekHero', run="run", branch=BRANCH_NAME_DRAFT) head_course = modulestore().get_course(locator) - self.assertNotEqual(head_course.location.version_guid, head_course.previous_version) + assert head_course.location.version_guid != head_course.previous_version locator = CourseLocator(version_guid=head_course.previous_version) course = modulestore().get_course(locator) - self.assertIsNone(course.location.course_key.org) - self.assertEqual(course.location.version_guid, head_course.previous_version) - self.assertEqual(course.category, 'course') - self.assertEqual(len(course.tabs), 6) - self.assertEqual(course.display_name, "The Ancient Greek Hero") - self.assertEqual(course.graceperiod, datetime.timedelta(hours=2)) - self.assertIsNone(course.advertised_start) - self.assertEqual(len(course.children), 0) - self.assertNotEqual(course.definition_locator.definition_id, head_course.definition_locator.definition_id) + assert course.location.course_key.org is None + assert course.location.version_guid == head_course.previous_version + assert course.category == 'course' + assert len(course.tabs) == 6 + assert course.display_name == 'The Ancient Greek Hero' + assert course.graceperiod == datetime.timedelta(hours=2) + assert course.advertised_start is None + assert len(course.children) == 0 + assert course.definition_locator.definition_id != head_course.definition_locator.definition_id # check dates and graders--forces loading of descriptor - self.assertEqual(course.edited_by, "testassist@edx.org") + assert course.edited_by == 'testassist@edx.org' self.assertDictEqual(course.grade_cutoffs, {"Pass": 0.55}) locator = CourseLocator(org='testx', course='GreekHero', run="run", branch=BRANCH_NAME_DRAFT) course = modulestore().get_course(locator) - self.assertEqual(course.location.course_key.org, "testx") - self.assertEqual(course.location.course_key.course, "GreekHero") - self.assertEqual(course.location.course_key.run, "run") - self.assertEqual(course.category, 'course') - self.assertEqual(len(course.tabs), 6) - self.assertEqual(course.display_name, "The Ancient Greek Hero") - self.assertEqual(course.advertised_start, "Fall 2013") - self.assertEqual(len(course.children), 4) + assert course.location.course_key.org == 'testx' + assert course.location.course_key.course == 'GreekHero' + assert course.location.course_key.run == 'run' + assert course.category == 'course' + assert len(course.tabs) == 6 + assert course.display_name == 'The Ancient Greek Hero' + assert course.advertised_start == 'Fall 2013' + assert len(course.children) == 4 # check dates and graders--forces loading of descriptor - self.assertEqual(course.edited_by, "testassist@edx.org") + assert course.edited_by == 'testassist@edx.org' self.assertDictEqual(course.grade_cutoffs, {"Pass": 0.45}) locator = CourseLocator(org='testx', course='wonderful', run="run", branch=BRANCH_NAME_PUBLISHED) @@ -751,15 +744,15 @@ class SplitModuleCourseTests(SplitModuleTest): locator = CourseLocator(org='testx', course='wonderful', run="run", branch=BRANCH_NAME_DRAFT) course = modulestore().get_course(locator) - self.assertNotEqual(course.location.version_guid, published_version) + assert course.location.version_guid != published_version def test_get_course_negative(self): # Now negative testing - with self.assertRaises(InsufficientSpecificationError): + with pytest.raises(InsufficientSpecificationError): modulestore().get_course(CourseLocator(org='edu', course='meh', run='blah')) - with self.assertRaises(ItemNotFoundError): + with pytest.raises(ItemNotFoundError): modulestore().get_course(CourseLocator(org='edu', course='nosuchthing', run="run", branch=BRANCH_NAME_DRAFT)) # lint-amnesty, pylint: disable=line-too-long - with self.assertRaises(ItemNotFoundError): + with pytest.raises(ItemNotFoundError): modulestore().get_course(CourseLocator(org='testx', course='GreekHero', run="run", branch=BRANCH_NAME_PUBLISHED)) # lint-amnesty, pylint: disable=line-too-long @patch('xmodule.tabs.CourseTab.from_json', side_effect=mock_tab_from_json) @@ -772,8 +765,8 @@ class SplitModuleCourseTests(SplitModuleTest): block_map = modulestore().cache_items( course.system, [BlockKey.from_usage_key(child) for child in course.children], course.id, depth=3 ) - self.assertIn(BlockKey('chapter', 'chapter1'), block_map) - self.assertIn(BlockKey('problem', 'problem3_2'), block_map) + assert BlockKey('chapter', 'chapter1') in block_map + assert BlockKey('problem', 'problem3_2') in block_map @patch('xmodule.tabs.CourseTab.from_json', side_effect=mock_tab_from_json) def test_course_successors(self, _from_json): @@ -789,23 +782,23 @@ class SplitModuleCourseTests(SplitModuleTest): locator = CourseLocator(version_guid=course.previous_version) result = modulestore().get_course_successors(locator) - self.assertIsInstance(result, VersionTree) - self.assertIsNone(result.locator.org) - self.assertEqual(result.locator.version_guid, versions[-1]) - self.assertEqual(len(result.children), 1) - self.assertEqual(result.children[0].locator.version_guid, versions[-2]) - self.assertEqual(len(result.children[0].children), 0, "descended more than one level") + assert isinstance(result, VersionTree) + assert result.locator.org is None + assert result.locator.version_guid == versions[(- 1)] + assert len(result.children) == 1 + assert result.children[0].locator.version_guid == versions[(- 2)] + assert len(result.children[0].children) == 0, 'descended more than one level' result = modulestore().get_course_successors(locator, version_history_depth=2) - self.assertEqual(len(result.children), 1) - self.assertEqual(result.children[0].locator.version_guid, versions[-2]) - self.assertEqual(len(result.children[0].children), 1) + assert len(result.children) == 1 + assert result.children[0].locator.version_guid == versions[(- 2)] + assert len(result.children[0].children) == 1 result = modulestore().get_course_successors(locator, version_history_depth=99) - self.assertEqual(len(result.children), 1) - self.assertEqual(result.children[0].locator.version_guid, versions[-2]) - self.assertEqual(len(result.children[0].children), 1) - self.assertEqual(result.children[0].children[0].locator.version_guid, versions[0]) + assert len(result.children) == 1 + assert result.children[0].locator.version_guid == versions[(- 2)] + assert len(result.children[0].children) == 1 + assert result.children[0].children[0].locator.version_guid == versions[0] @patch('xmodule.tabs.CourseTab.from_json', side_effect=mock_tab_from_json) def test_persist_dag(self, _from_json): @@ -821,7 +814,7 @@ class SplitModuleCourseTests(SplitModuleTest): test_course.system, test_course.id, 'chapter', fields={'display_name': 'chapter n'}, parent_xblock=test_course ) - self.assertEqual(test_chapter.display_name, 'chapter n') + assert test_chapter.display_name == 'chapter n' test_def_content = 'boo' # create child new_block = modulestore().create_xblock( @@ -833,24 +826,24 @@ class SplitModuleCourseTests(SplitModuleTest): }, parent_xblock=test_chapter ) - self.assertIsNotNone(new_block.definition_locator) - self.assertTrue(isinstance(new_block.definition_locator.definition_id, LocalId)) + assert new_block.definition_locator is not None + assert isinstance(new_block.definition_locator.definition_id, LocalId) # better to pass in persisted parent over the subdag so # subdag gets the parent pointer (otherwise 2 ops, persist dag, update parent children, # persist parent persisted_course = modulestore().persist_xblock_dag(test_course, 'testbot') - self.assertEqual(len(persisted_course.children), 1) + assert len(persisted_course.children) == 1 persisted_chapter = persisted_course.get_children()[0] - self.assertEqual(persisted_chapter.category, 'chapter') - self.assertEqual(persisted_chapter.display_name, 'chapter n') - self.assertEqual(len(persisted_chapter.children), 1) + assert persisted_chapter.category == 'chapter' + assert persisted_chapter.display_name == 'chapter n' + assert len(persisted_chapter.children) == 1 persisted_problem = persisted_chapter.get_children()[0] - self.assertEqual(persisted_problem.category, 'problem') - self.assertEqual(persisted_problem.data, test_def_content) + assert persisted_problem.category == 'problem' + assert persisted_problem.data == test_def_content # update it persisted_problem.display_name = 'altered problem' persisted_problem = modulestore().update_item(persisted_problem, 'testbot') - self.assertEqual(persisted_problem.display_name, 'altered problem') + assert persisted_problem.display_name == 'altered problem' @patch('xmodule.tabs.CourseTab.from_json', side_effect=mock_tab_from_json) def test_block_generations(self, _from_json): @@ -886,9 +879,9 @@ class SplitModuleCourseTests(SplitModuleTest): first_problem.max_attempts = 3 first_problem.save() # decache the above into the kvs updated_problem = modulestore().update_item(first_problem, 'testbot') - self.assertIsNotNone(updated_problem.previous_version) - self.assertEqual(updated_problem.previous_version, first_problem.update_version) - self.assertNotEqual(updated_problem.update_version, first_problem.update_version) + assert updated_problem.previous_version is not None + assert updated_problem.previous_version == first_problem.update_version + assert updated_problem.update_version != first_problem.update_version modulestore().delete_item(updated_problem.location, 'testbot') second_problem = modulestore().create_child( @@ -901,27 +894,28 @@ class SplitModuleCourseTests(SplitModuleTest): # The draft course root has 2 revisions: the published revision, and then the subsequent # changes to the draft revision version_history = modulestore().get_block_generations(test_course.location) - self.assertIsNotNone(version_history) - self.assertEqual(version_history.locator.version_guid, test_course.location.version_guid) - self.assertEqual(len(version_history.children), 1) - self.assertEqual(version_history.children[0].children, []) - self.assertEqual(version_history.children[0].locator.version_guid, chapter.location.version_guid) + assert version_history is not None + assert version_history.locator.version_guid == test_course.location.version_guid + assert len(version_history.children) == 1 + assert version_history.children[0].children == [] + assert version_history.children[0].locator.version_guid == chapter.location.version_guid # sub changed on add, add problem, delete problem, add problem in strict linear seq version_history = modulestore().get_block_generations(sub.location) - self.assertEqual(len(version_history.children), 1) - self.assertEqual(len(version_history.children[0].children), 1) - self.assertEqual(len(version_history.children[0].children[0].children), 1) - self.assertEqual(len(version_history.children[0].children[0].children[0].children), 0) + assert len(version_history.children) == 1 + assert len(version_history.children[0].children) == 1 + assert len(version_history.children[0].children[0].children) == 1 + assert len(version_history.children[0].children[0].children[0].children) == 0 # first and second problem may show as same usage_id; so, need to ensure their histories are right version_history = modulestore().get_block_generations(updated_problem.location) - self.assertEqual(version_history.locator.version_guid, first_problem.location.version_guid) - self.assertEqual(len(version_history.children), 1) # updated max_attempts - self.assertEqual(len(version_history.children[0].children), 0) + assert version_history.locator.version_guid == first_problem.location.version_guid + assert len(version_history.children) == 1 + # updated max_attempts + assert len(version_history.children[0].children) == 0 version_history = modulestore().get_block_generations(second_problem.location) - self.assertNotEqual(version_history.locator.version_guid, first_problem.location.version_guid) + assert version_history.locator.version_guid != first_problem.location.version_guid @ddt.data( ("course-v1:edx+test_course+test_run", BlockUsageLocator), @@ -935,9 +929,9 @@ class SplitModuleCourseTests(SplitModuleTest): """ course_key = CourseKey.from_string(course_id) root_block_key = modulestore().make_course_usage_key(course_key) - self.assertIsInstance(root_block_key, root_block_cls) - self.assertEqual(root_block_key.block_type, "course") - self.assertEqual(root_block_key.block_id, "course") + assert isinstance(root_block_key, root_block_cls) + assert root_block_key.block_type == 'course' + assert root_block_key.block_id == 'course' class TestCourseStructureCache(SplitModuleTest): @@ -975,7 +969,7 @@ class TestCourseStructureCache(SplitModuleTest): cached_structure = self._get_structure(self.new_course) # now make sure that you get the same structure - self.assertEqual(cached_structure, not_cached_structure) + assert cached_structure == not_cached_structure # If data is corrupted, get it from mongo again. cache_key = self.new_course.id.version_guid @@ -984,7 +978,7 @@ class TestCourseStructureCache(SplitModuleTest): not_corrupt_structure = self._get_structure(self.new_course) # now make sure that you get the same structure - self.assertEqual(not_corrupt_structure, not_cached_structure) + assert not_corrupt_structure == not_cached_structure @patch('xmodule.modulestore.split_mongo.mongo_connection.get_cache') def test_course_structure_cache_no_cache_configured(self, mock_get_cache): @@ -999,7 +993,7 @@ class TestCourseStructureCache(SplitModuleTest): cached_structure = self._get_structure(self.new_course) # now make sure that you get the same structure - self.assertEqual(cached_structure, not_cached_structure) + assert cached_structure == not_cached_structure def test_dummy_cache(self): with check_mongo_calls(1): @@ -1011,7 +1005,7 @@ class TestCourseStructureCache(SplitModuleTest): cached_structure = self._get_structure(self.new_course) # now make sure that you get the same structure - self.assertEqual(cached_structure, not_cached_structure) + assert cached_structure == not_cached_structure def _get_structure(self, course): """ @@ -1040,31 +1034,18 @@ class SplitModuleItemTests(SplitModuleTest): previous_version = course.previous_version # positive tests of various forms locator = course.location.map_into_course(CourseLocator(version_guid=previous_version)) - self.assertTrue( - modulestore().has_item(locator), "couldn't find in %s" % previous_version - ) + assert modulestore().has_item(locator), ("couldn't find in %s" % previous_version) locator = course.location.version_agnostic() - self.assertTrue( - modulestore().has_item(locator), - ) - self.assertFalse( - modulestore().has_item( - BlockUsageLocator( - locator.course_key.for_branch(BRANCH_NAME_PUBLISHED), - block_type=locator.block_type, - block_id=locator.block_id - ) - ), - "found in published head" - ) + assert modulestore().has_item(locator) + assert not modulestore()\ + .has_item(BlockUsageLocator(locator.course_key.for_branch(BRANCH_NAME_PUBLISHED), + block_type=locator.block_type, + block_id=locator.block_id)), 'found in published head' # not a course obj locator = BlockUsageLocator(course_locator, block_type='chapter', block_id='chapter1') - self.assertTrue( - modulestore().has_item(locator), - "couldn't find chapter1" - ) + assert modulestore().has_item(locator), "couldn't find chapter1" # in published course locator = BlockUsageLocator( @@ -1072,9 +1053,7 @@ class SplitModuleItemTests(SplitModuleTest): block_type="course", block_id="head23456" ) - self.assertTrue( - modulestore().has_item(locator.for_branch(BRANCH_NAME_PUBLISHED)) - ) + assert modulestore().has_item(locator.for_branch(BRANCH_NAME_PUBLISHED)) def test_negative_has_item(self): # negative tests--not found @@ -1084,13 +1063,13 @@ class SplitModuleItemTests(SplitModuleTest): block_type="course", block_id="head23456" ) - self.assertFalse(modulestore().has_item(locator)) + assert not modulestore().has_item(locator) locator = BlockUsageLocator( CourseLocator(org="testx", course="wonderful", run="run", branch=BRANCH_NAME_DRAFT), block_type="vertical", block_id="doesnotexist" ) - self.assertFalse(modulestore().has_item(locator)) + assert not modulestore().has_item(locator) @patch('xmodule.tabs.CourseTab.from_json', side_effect=mock_tab_from_json) def test_get_item(self, _from_json): @@ -1104,22 +1083,22 @@ class SplitModuleItemTests(SplitModuleTest): # positive tests of various forms locator = course.location.map_into_course(CourseLocator(version_guid=previous_version)) block = modulestore().get_item(locator) - self.assertIsInstance(block, CourseDescriptor) - self.assertIsInstance(modulestore().get_item(locator), CourseDescriptor) + assert isinstance(block, CourseDescriptor) + assert isinstance(modulestore().get_item(locator), CourseDescriptor) def verify_greek_hero(block): """ Check contents of block """ - self.assertEqual(block.location.org, "testx") - self.assertEqual(block.location.course, "GreekHero") - self.assertEqual(block.location.run, "run") - self.assertEqual(len(block.tabs), 6, "wrong number of tabs") - self.assertEqual(block.display_name, "The Ancient Greek Hero") - self.assertEqual(block.advertised_start, "Fall 2013") - self.assertEqual(len(block.children), 4) + assert block.location.org == 'testx' + assert block.location.course == 'GreekHero' + assert block.location.run == 'run' + assert len(block.tabs) == 6, 'wrong number of tabs' + assert block.display_name == 'The Ancient Greek Hero' + assert block.advertised_start == 'Fall 2013' + assert len(block.children) == 4 # check dates and graders--forces loading of descriptor - self.assertEqual(block.edited_by, "testassist@edx.org") + assert block.edited_by == 'testassist@edx.org' self.assertDictEqual( block.grade_cutoffs, {"Pass": 0.45}, ) @@ -1127,7 +1106,7 @@ class SplitModuleItemTests(SplitModuleTest): verify_greek_hero(modulestore().get_item(course.location)) # try to look up other branches - with self.assertRaises(ItemNotFoundError): + with pytest.raises(ItemNotFoundError): modulestore().get_item(course.location.for_branch(BRANCH_NAME_PUBLISHED)) def test_get_non_root(self): @@ -1136,32 +1115,29 @@ class SplitModuleItemTests(SplitModuleTest): CourseLocator(org='testx', course='GreekHero', run="run", branch=BRANCH_NAME_DRAFT), 'chapter', 'chapter1' ) block = modulestore().get_item(locator) - self.assertEqual(block.location.org, "testx") - self.assertEqual(block.location.course, "GreekHero") - self.assertEqual(block.category, 'chapter') - self.assertEqual(block.display_name, "Hercules") - self.assertEqual(block.edited_by, "testassist@edx.org") + assert block.location.org == 'testx' + assert block.location.course == 'GreekHero' + assert block.category == 'chapter' + assert block.display_name == 'Hercules' + assert block.edited_by == 'testassist@edx.org' # in published course locator = BlockUsageLocator( CourseLocator(org='testx', course='wonderful', run="run", branch=BRANCH_NAME_PUBLISHED), 'course', 'head23456' # lint-amnesty, pylint: disable=line-too-long ) - self.assertIsInstance( - modulestore().get_item(locator), - CourseDescriptor - ) + assert isinstance(modulestore().get_item(locator), CourseDescriptor) # negative tests--not found # no such course or block locator = BlockUsageLocator( CourseLocator(org='doesnotexist', course='doesnotexist', run="run", branch=BRANCH_NAME_DRAFT), 'course', 'head23456' # lint-amnesty, pylint: disable=line-too-long ) - with self.assertRaises(ItemNotFoundError): + with pytest.raises(ItemNotFoundError): modulestore().get_item(locator) locator = BlockUsageLocator( CourseLocator(org='testx', course='wonderful', run="run", branch=BRANCH_NAME_DRAFT), 'html', 'doesnotexist' ) - with self.assertRaises(ItemNotFoundError): + with pytest.raises(ItemNotFoundError): modulestore().get_item(locator) # pylint: disable=protected-access @@ -1169,41 +1145,37 @@ class SplitModuleItemTests(SplitModuleTest): ''' test the block and value matches help functions ''' - self.assertTrue(modulestore()._value_matches('help', 'help')) - self.assertFalse(modulestore()._value_matches('help', 'Help')) - self.assertTrue(modulestore()._value_matches(['distract', 'help', 'notme'], 'help')) - self.assertFalse(modulestore()._value_matches(['distract', 'Help', 'notme'], 'help')) - self.assertFalse(modulestore()._block_matches({'field': ['distract', 'Help', 'notme']}, {'field': 'help'})) - self.assertTrue(modulestore()._block_matches( - {'field': ['distract', 'help', 'notme'], - 'irrelevant': 2}, - {'field': 'help'})) - self.assertTrue(modulestore()._value_matches('I need some help', re.compile(r'help'))) - self.assertTrue(modulestore()._value_matches(['I need some help', 'today'], re.compile(r'help'))) - self.assertFalse(modulestore()._value_matches('I need some help', re.compile(r'Help'))) - self.assertTrue(modulestore()._value_matches(['I need some help', 'today'], re.compile(r'Help', re.IGNORECASE))) + assert modulestore()._value_matches('help', 'help') + assert not modulestore()._value_matches('help', 'Help') + assert modulestore()._value_matches(['distract', 'help', 'notme'], 'help') + assert not modulestore()._value_matches(['distract', 'Help', 'notme'], 'help') + assert not modulestore()._block_matches({'field': ['distract', 'Help', 'notme']}, {'field': 'help'}) + assert modulestore()._block_matches({'field': ['distract', 'help', 'notme'], 'irrelevant': 2}, + {'field': 'help'}) + assert modulestore()._value_matches('I need some help', re.compile('help')) + assert modulestore()._value_matches(['I need some help', 'today'], re.compile('help')) + assert not modulestore()._value_matches('I need some help', re.compile('Help')) + assert modulestore()._value_matches(['I need some help', 'today'], re.compile('Help', re.IGNORECASE)) - self.assertTrue(modulestore()._value_matches('gotcha', {'$in': ['a', 'bunch', 'of', 'gotcha']})) - self.assertFalse(modulestore()._value_matches('gotcha', {'$in': ['a', 'bunch', 'of', 'gotchas']})) - self.assertFalse(modulestore()._value_matches('gotcha', {'$nin': ['a', 'bunch', 'of', 'gotcha']})) - self.assertTrue(modulestore()._value_matches('gotcha', {'$nin': ['a', 'bunch', 'of', 'gotchas']})) + assert modulestore()._value_matches('gotcha', {'$in': ['a', 'bunch', 'of', 'gotcha']}) + assert not modulestore()._value_matches('gotcha', {'$in': ['a', 'bunch', 'of', 'gotchas']}) + assert not modulestore()._value_matches('gotcha', {'$nin': ['a', 'bunch', 'of', 'gotcha']}) + assert modulestore()._value_matches('gotcha', {'$nin': ['a', 'bunch', 'of', 'gotchas']}) - self.assertTrue(modulestore()._block_matches({'group_access': {'1': [1]}}, {'group_access': {'$exists': True}})) - self.assertTrue(modulestore()._block_matches({'a': 1, 'b': 2}, {'group_access': {'$exists': False}})) - self.assertTrue(modulestore()._block_matches( - {'a': 1, 'group_access': {'1': [1]}}, - {'a': 1, 'group_access': {'$exists': True}})) - self.assertFalse(modulestore()._block_matches( - {'a': 1, 'group_access': {'1': [1]}}, - {'a': 111, 'group_access': {'$exists': True}})) - self.assertTrue(modulestore()._block_matches({'a': 1, 'b': 2}, {'a': 1, 'group_access': {'$exists': False}})) - self.assertFalse(modulestore()._block_matches({'a': 1, 'b': 2}, {'a': 9, 'group_access': {'$exists': False}})) + assert modulestore()._block_matches({'group_access': {'1': [1]}}, {'group_access': {'$exists': True}}) + assert modulestore()._block_matches({'a': 1, 'b': 2}, {'group_access': {'$exists': False}}) + assert modulestore()._block_matches({'a': 1, 'group_access': {'1': [1]}}, + {'a': 1, 'group_access': {'$exists': True}}) + assert not modulestore()._block_matches({'a': 1, 'group_access': {'1': [1]}}, + {'a': 111, 'group_access': {'$exists': True}}) + assert modulestore()._block_matches({'a': 1, 'b': 2}, {'a': 1, 'group_access': {'$exists': False}}) + assert not modulestore()._block_matches({'a': 1, 'b': 2}, {'a': 9, 'group_access': {'$exists': False}}) - self.assertTrue(modulestore()._block_matches({'a': 1, 'b': 2}, {'a': 1})) - self.assertFalse(modulestore()._block_matches({'a': 1, 'b': 2}, {'a': 2})) - self.assertFalse(modulestore()._block_matches({'a': 1, 'b': 2}, {'c': 1})) - self.assertFalse(modulestore()._block_matches({'a': 1, 'b': 2}, {'a': 1, 'c': 1})) - self.assertTrue(modulestore()._block_matches({'a': 1, 'b': 2}, {'a': lambda i: 0 < i < 2})) + assert modulestore()._block_matches({'a': 1, 'b': 2}, {'a': 1}) + assert not modulestore()._block_matches({'a': 1, 'b': 2}, {'a': 2}) + assert not modulestore()._block_matches({'a': 1, 'b': 2}, {'c': 1}) + assert not modulestore()._block_matches({'a': 1, 'b': 2}, {'a': 1, 'c': 1}) + assert modulestore()._block_matches({'a': 1, 'b': 2}, {'a': (lambda i: (0 < i < 2))}) def test_get_items(self): ''' @@ -1212,28 +1184,28 @@ class SplitModuleItemTests(SplitModuleTest): locator = CourseLocator(org='testx', course='GreekHero', run="run", branch=BRANCH_NAME_DRAFT) # get all modules matches = modulestore().get_items(locator) - self.assertEqual(len(matches), 8) + assert len(matches) == 8 matches = modulestore().get_items(locator) - self.assertEqual(len(matches), 8) + assert len(matches) == 8 matches = modulestore().get_items(locator, qualifiers={'category': 'chapter'}) - self.assertEqual(len(matches), 4) + assert len(matches) == 4 matches = modulestore().get_items(locator, qualifiers={'category': 'garbage'}) - self.assertEqual(len(matches), 0) + assert len(matches) == 0 # Test that we don't accidentally get an item with a similar name. matches = modulestore().get_items(locator, qualifiers={'name': 'chapter1'}) - self.assertEqual(len(matches), 1) + assert len(matches) == 1 matches = modulestore().get_items(locator, qualifiers={'name': ['chapter1', 'chapter2']}) - self.assertEqual(len(matches), 2) + assert len(matches) == 2 matches = modulestore().get_items( locator, qualifiers={'category': 'chapter'}, settings={'display_name': re.compile(r'Hera')}, ) - self.assertEqual(len(matches), 2) + assert len(matches) == 2 matches = modulestore().get_items(locator, settings={'group_access': {'$exists': True}}) - self.assertEqual(len(matches), 1) + assert len(matches) == 1 matches = modulestore().get_items(locator, settings={'group_access': {'$exists': False}}) - self.assertEqual(len(matches), 7) + assert len(matches) == 7 def test_get_parents(self): ''' @@ -1244,17 +1216,17 @@ class SplitModuleItemTests(SplitModuleTest): 'chapter', block_id='chapter1' ) parent = modulestore().get_parent_location(locator) - self.assertIsNotNone(parent) - self.assertEqual(parent.block_id, 'head12345') - self.assertEqual(parent.org, "testx") - self.assertEqual(parent.course, "GreekHero") + assert parent is not None + assert parent.block_id == 'head12345' + assert parent.org == 'testx' + assert parent.course == 'GreekHero' locator = locator.course_key.make_usage_key('chapter', 'chapter2') parent = modulestore().get_parent_location(locator) - self.assertIsNotNone(parent) - self.assertEqual(parent.block_id, 'head12345') + assert parent is not None + assert parent.block_id == 'head12345' locator = locator.course_key.make_usage_key('garbage', 'nosuchblock') parent = modulestore().get_parent_location(locator) - self.assertIsNone(parent) + assert parent is None @patch('xmodule.tabs.CourseTab.from_json', side_effect=mock_tab_from_json) def test_get_children(self, _from_json): @@ -1270,10 +1242,10 @@ class SplitModuleItemTests(SplitModuleTest): "chapter1", "chap", "chapter2", "chapter3" ] for child in children: - self.assertEqual(child.category, "chapter") - self.assertIn(child.location.block_id, expected_ids) + assert child.category == 'chapter' + assert child.location.block_id in expected_ids expected_ids.remove(child.location.block_id) - self.assertEqual(len(expected_ids), 0) + assert len(expected_ids) == 0 def version_agnostic(children): @@ -1323,25 +1295,26 @@ class TestItemCrud(SplitModuleTest): fields={'display_name': 'new sequential'} ) # check that course version changed and course's previous is the other one - self.assertEqual(new_module.location.course, "GreekHero") - self.assertNotEqual(new_module.location.version_guid, premod_course.location.version_guid) - self.assertIsNone(locator.version_guid, "Version inadvertently filled in") # lint-amnesty, pylint: disable=no-member + assert new_module.location.course == 'GreekHero' + assert new_module.location.version_guid != premod_course.location.version_guid + assert locator.version_guid is None,\ + 'Version inadvertently filled in' # lint-amnesty, pylint: disable=no-member current_course = modulestore().get_course(locator) - self.assertEqual(new_module.location.version_guid, current_course.location.version_guid) + assert new_module.location.version_guid == current_course.location.version_guid history_info = modulestore().get_course_history_info(current_course.location.course_key) - self.assertEqual(history_info['previous_version'], premod_course.location.version_guid) - self.assertEqual(history_info['original_version'], premod_history['original_version']) - self.assertEqual(history_info['edited_by'], "user123") + assert history_info['previous_version'] == premod_course.location.version_guid + assert history_info['original_version'] == premod_history['original_version'] + assert history_info['edited_by'] == 'user123' # check block's info: category, definition_locator, and display_name - self.assertEqual(new_module.category, 'sequential') - self.assertIsNotNone(new_module.definition_locator) - self.assertEqual(new_module.display_name, 'new sequential') + assert new_module.category == 'sequential' + assert new_module.definition_locator is not None + assert new_module.display_name == 'new sequential' # check that block does not exist in previous version locator = new_module.location.map_into_course( CourseLocator(version_guid=premod_course.location.version_guid) ) - with self.assertRaises(ItemNotFoundError): + with pytest.raises(ItemNotFoundError): modulestore().get_item(locator) def test_create_parented_item(self): @@ -1365,10 +1338,10 @@ class TestItemCrud(SplitModuleTest): definition_locator=original.definition_locator ) # check that course version changed and course's previous is the other one - self.assertNotEqual(new_module.location.version_guid, premod_course.location.version_guid) + assert new_module.location.version_guid != premod_course.location.version_guid parent = modulestore().get_item(locator) - self.assertIn(new_module.location.version_agnostic(), version_agnostic(parent.children)) - self.assertEqual(new_module.definition_locator.definition_id, original.definition_locator.definition_id) + assert new_module.location.version_agnostic() in version_agnostic(parent.children) + assert new_module.definition_locator.definition_id == original.definition_locator.definition_id def test_unique_naming(self): """ @@ -1399,18 +1372,18 @@ class TestItemCrud(SplitModuleTest): ) # check that course version changed and course's previous is the other one parent = modulestore().get_item(locator) - self.assertNotEqual(new_module.location.block_id, another_module.location.block_id) - self.assertIn(new_module.location.version_agnostic(), version_agnostic(parent.children)) - self.assertIn(another_module.location.version_agnostic(), version_agnostic(parent.children)) - self.assertEqual(new_module.data, new_payload) - self.assertEqual(another_module.data, another_payload) + assert new_module.location.block_id != another_module.location.block_id + assert new_module.location.version_agnostic() in version_agnostic(parent.children) + assert another_module.location.version_agnostic() in version_agnostic(parent.children) + assert new_module.data == new_payload + assert another_module.data == another_payload # check definition histories new_history = modulestore().get_definition_history_info(new_module.definition_locator) - self.assertIsNone(new_history['previous_version']) - self.assertEqual(new_history['original_version'], new_module.definition_locator.definition_id) - self.assertEqual(new_history['edited_by'], "anotheruser") + assert new_history['previous_version'] is None + assert new_history['original_version'] == new_module.definition_locator.definition_id + assert new_history['edited_by'] == 'anotheruser' another_history = modulestore().get_definition_history_info(another_module.definition_locator) - self.assertEqual(another_history['previous_version'], original.definition_locator.definition_id) + assert another_history['previous_version'] == original.definition_locator.definition_id def test_encoded_naming(self): """ @@ -1426,7 +1399,8 @@ class TestItemCrud(SplitModuleTest): ) # check that course version changed and course's previous is the other one new_module = modulestore().get_item(chapter_locator) - self.assertEqual(new_module.location.block_id, "foo.bar_-~:0") # hardcode to ensure BUL init didn't change + assert new_module.location.block_id == 'foo.bar_-~:0' + # hardcode to ensure BUL init didn't change # now try making that a parent of something new_payload = "empty" problem_locator = BlockUsageLocator(course_key, 'problem', block_id="prob.bar_-~:99a") @@ -1437,9 +1411,9 @@ class TestItemCrud(SplitModuleTest): ) # check that course version changed and course's previous is the other one new_module = modulestore().get_item(problem_locator) - self.assertEqual(new_module.location.block_id, problem_locator.block_id) + assert new_module.location.block_id == problem_locator.block_id chapter = modulestore().get_item(chapter_locator) - self.assertIn(problem_locator, version_agnostic(chapter.children)) + assert problem_locator in version_agnostic(chapter.children) def test_create_bulk_operations(self): """ @@ -1454,7 +1428,7 @@ class TestItemCrud(SplitModuleTest): index_history_info = modulestore().get_course_history_info(new_course.location.course_key) course_block_prev_version = new_course.previous_version course_block_update_version = new_course.update_version - self.assertIsNotNone(new_course_locator.version_guid, "Want to test a definite version") + assert new_course_locator.version_guid is not None, 'Want to test a definite version' versionless_course_locator = new_course_locator.version_agnostic() # positive simple case: no force, add chapter @@ -1463,18 +1437,18 @@ class TestItemCrud(SplitModuleTest): fields={'display_name': 'chapter 1'}, ) # version info shouldn't change - self.assertEqual(new_ele.update_version, course_block_update_version) - self.assertEqual(new_ele.update_version, new_ele.location.version_guid) + assert new_ele.update_version == course_block_update_version + assert new_ele.update_version == new_ele.location.version_guid refetch_course = modulestore().get_course(versionless_course_locator) - self.assertEqual(refetch_course.location.version_guid, new_course.location.version_guid) - self.assertEqual(refetch_course.previous_version, course_block_prev_version) - self.assertEqual(refetch_course.update_version, course_block_update_version) + assert refetch_course.location.version_guid == new_course.location.version_guid + assert refetch_course.previous_version == course_block_prev_version + assert refetch_course.update_version == course_block_update_version refetch_index_history_info = modulestore().get_course_history_info(refetch_course.location.course_key) - self.assertEqual(refetch_index_history_info, index_history_info) - self.assertIn(new_ele.location.version_agnostic(), version_agnostic(refetch_course.children)) + assert refetch_index_history_info == index_history_info + assert new_ele.location.version_agnostic() in version_agnostic(refetch_course.children) # try to create existing item - with self.assertRaises(DuplicateItemError): + with pytest.raises(DuplicateItemError): _fail = modulestore().create_child( user, new_course.location, 'chapter', block_id=new_ele.location.block_id, @@ -1489,7 +1463,7 @@ class TestItemCrud(SplitModuleTest): ) transaction_guid = new_ele.location.version_guid # ensure force w/ continue gives exception - with self.assertRaises(VersionConflictError): + with pytest.raises(VersionConflictError): _fail = modulestore().create_child( user, new_course.location, 'chapter', fields={'display_name': 'chapter 2'}, @@ -1497,7 +1471,7 @@ class TestItemCrud(SplitModuleTest): ) # ensure trying to continue the old one gives exception - with self.assertRaises(VersionConflictError): + with pytest.raises(VersionConflictError): _fail = modulestore().create_child( user, new_course.location, 'chapter', fields={'display_name': 'chapter 3'}, @@ -1509,14 +1483,14 @@ class TestItemCrud(SplitModuleTest): user, course_module_locator, 'chapter', fields={'display_name': 'chapter 4'}, ) - self.assertNotEqual(new_ele.update_version, course_block_update_version) - self.assertEqual(new_ele.location.version_guid, transaction_guid) + assert new_ele.update_version != course_block_update_version + assert new_ele.location.version_guid == transaction_guid # check children, previous_version refetch_course = modulestore().get_course(versionless_course_locator) - self.assertIn(new_ele.location.version_agnostic(), version_agnostic(refetch_course.children)) - self.assertEqual(refetch_course.previous_version, course_block_update_version) - self.assertEqual(refetch_course.update_version, transaction_guid) + assert new_ele.location.version_agnostic() in version_agnostic(refetch_course.children) + assert refetch_course.previous_version == course_block_update_version + assert refetch_course.update_version == transaction_guid def test_bulk_ops_org_filtering(self): """ @@ -1531,23 +1505,23 @@ class TestItemCrud(SplitModuleTest): modulestore().create_course('test_org', 'test_transaction', 'test_run', user, BRANCH_NAME_DRAFT) courses = modulestore().get_courses(branch=BRANCH_NAME_DRAFT, org='test_org') - self.assertEqual(len(courses), 1) - self.assertEqual(courses[0].id.org, course_key.org) - self.assertEqual(courses[0].id.course, course_key.course) - self.assertEqual(courses[0].id.run, course_key.run) + assert len(courses) == 1 + assert courses[0].id.org == course_key.org + assert courses[0].id.course == course_key.course + assert courses[0].id.run == course_key.run courses = modulestore().get_courses(branch=BRANCH_NAME_DRAFT, org='other_org') - self.assertEqual(len(courses), 0) + assert len(courses) == 0 # re-assert after the end of the with scope courses = modulestore().get_courses(branch=BRANCH_NAME_DRAFT, org='test_org') - self.assertEqual(len(courses), 1) - self.assertEqual(courses[0].id.org, course_key.org) - self.assertEqual(courses[0].id.course, course_key.course) - self.assertEqual(courses[0].id.run, course_key.run) + assert len(courses) == 1 + assert courses[0].id.org == course_key.org + assert courses[0].id.course == course_key.course + assert courses[0].id.run == course_key.run courses = modulestore().get_courses(branch=BRANCH_NAME_DRAFT, org='other_org') - self.assertEqual(len(courses), 0) + assert len(courses) == 0 def test_update_metadata(self): """ @@ -1560,28 +1534,28 @@ class TestItemCrud(SplitModuleTest): problem = modulestore().get_item(locator) pre_def_id = problem.definition_locator.definition_id pre_version_guid = problem.location.version_guid - self.assertIsNotNone(pre_def_id) - self.assertIsNotNone(pre_version_guid) - self.assertNotEqual(problem.max_attempts, 4, "Invalidates rest of test") + assert pre_def_id is not None + assert pre_version_guid is not None + assert problem.max_attempts != 4, 'Invalidates rest of test' problem.max_attempts = 4 problem.save() # decache above setting into the kvs updated_problem = modulestore().update_item(problem, self.user_id) # check that course version changed and course's previous is the other one - self.assertEqual(updated_problem.definition_locator.definition_id, pre_def_id) - self.assertNotEqual(updated_problem.location.version_guid, pre_version_guid) - self.assertEqual(updated_problem.max_attempts, 4) + assert updated_problem.definition_locator.definition_id == pre_def_id + assert updated_problem.location.version_guid != pre_version_guid + assert updated_problem.max_attempts == 4 # refetch to ensure original didn't change original_location = problem.location.map_into_course(CourseLocator(version_guid=pre_version_guid)) problem = modulestore().get_item(original_location) - self.assertNotEqual(problem.max_attempts, 4, "original changed") + assert problem.max_attempts != 4, 'original changed' current_course = modulestore().get_course(locator.course_key) - self.assertEqual(updated_problem.location.version_guid, current_course.location.version_guid) + assert updated_problem.location.version_guid == current_course.location.version_guid history_info = modulestore().get_course_history_info(current_course.location.course_key) - self.assertEqual(history_info['previous_version'], pre_version_guid) - self.assertEqual(history_info['edited_by'], self.user_id) + assert history_info['previous_version'] == pre_version_guid + assert history_info['edited_by'] == self.user_id def test_update_children(self): """ @@ -1595,20 +1569,20 @@ class TestItemCrud(SplitModuleTest): pre_version_guid = block.location.version_guid # reorder children - self.assertGreater(len(block.children), 0, "meaningless test") + assert len(block.children) > 0, 'meaningless test' moved_child = block.children.pop() block.save() # decache model changes updated_problem = modulestore().update_item(block, self.user_id) # check that course version changed and course's previous is the other one - self.assertEqual(updated_problem.definition_locator.definition_id, pre_def_id) - self.assertNotEqual(updated_problem.location.version_guid, pre_version_guid) - self.assertEqual(version_agnostic(updated_problem.children), version_agnostic(block.children)) - self.assertNotIn(moved_child, version_agnostic(updated_problem.children)) + assert updated_problem.definition_locator.definition_id == pre_def_id + assert updated_problem.location.version_guid != pre_version_guid + assert version_agnostic(updated_problem.children) == version_agnostic(block.children) + assert moved_child not in version_agnostic(updated_problem.children) locator = locator.course_key.make_usage_key('chapter', "chapter1") other_block = modulestore().get_item(locator) other_block.children.append(moved_child) other_updated = modulestore().update_item(other_block, self.user_id) - self.assertIn(moved_child.version_agnostic(), version_agnostic(other_updated.children)) + assert moved_child.version_agnostic() in version_agnostic(other_updated.children) @patch('xmodule.tabs.CourseTab.from_json', side_effect=mock_tab_from_json) def test_update_definition(self, _from_json): @@ -1626,9 +1600,9 @@ class TestItemCrud(SplitModuleTest): block.save() # decache model changes updated_block = modulestore().update_item(block, self.user_id) - self.assertNotEqual(updated_block.definition_locator.definition_id, pre_def_id) - self.assertNotEqual(updated_block.location.version_guid, pre_version_guid) - self.assertEqual(updated_block.grading_policy['GRADER'][0]['min_count'], 13) + assert updated_block.definition_locator.definition_id != pre_def_id + assert updated_block.location.version_guid != pre_version_guid + assert updated_block.grading_policy['GRADER'][0]['min_count'] == 13 def test_update_manifold(self): """ @@ -1664,22 +1638,22 @@ class TestItemCrud(SplitModuleTest): pre_def_id = block.definition_locator.definition_id pre_version_guid = block.location.version_guid - self.assertNotEqual(block.grading_policy['GRADER'][0]['min_count'], 13) + assert block.grading_policy['GRADER'][0]['min_count'] != 13 block.grading_policy['GRADER'][0]['min_count'] = 13 block.children = block.children[1:] + [block.children[0]] block.advertised_start = "Soon" block.save() # decache model changes updated_block = modulestore().update_item(block, self.user_id) - self.assertNotEqual(updated_block.definition_locator.definition_id, pre_def_id) - self.assertNotEqual(updated_block.location.version_guid, pre_version_guid) - self.assertEqual(updated_block.grading_policy['GRADER'][0]['min_count'], 13) - self.assertEqual(updated_block.children[0].version_agnostic(), block.children[0].version_agnostic()) - self.assertEqual(updated_block.advertised_start, "Soon") + assert updated_block.definition_locator.definition_id != pre_def_id + assert updated_block.location.version_guid != pre_version_guid + assert updated_block.grading_policy['GRADER'][0]['min_count'] == 13 + assert updated_block.children[0].version_agnostic() == block.children[0].version_agnostic() + assert updated_block.advertised_start == 'Soon' def test_delete_item(self): course = self.create_course_for_deletion() - with self.assertRaises(ValueError): + with pytest.raises(ValueError): modulestore().delete_item(course.location, self.user_id) reusable_location = course.id.version_agnostic().for_branch(BRANCH_NAME_DRAFT) @@ -1688,14 +1662,14 @@ class TestItemCrud(SplitModuleTest): locn_to_del = problems[0].location new_course_loc = modulestore().delete_item(locn_to_del, self.user_id) deleted = locn_to_del.version_agnostic() - self.assertFalse(modulestore().has_item(deleted)) - with self.assertRaises(VersionConflictError): + assert not modulestore().has_item(deleted) + with pytest.raises(VersionConflictError): modulestore().has_item(locn_to_del) - with self.assertRaises(ValueError): + with pytest.raises(ValueError): modulestore().delete_item(deleted, self.user_id) - self.assertTrue(modulestore().has_item(locn_to_del.course_agnostic())) - self.assertNotEqual(new_course_loc.version_guid, course.location.version_guid) + assert modulestore().has_item(locn_to_del.course_agnostic()) + assert new_course_loc.version_guid != course.location.version_guid # delete a subtree nodes = modulestore().get_items(reusable_location, qualifiers={'category': 'chapter'}) @@ -1708,10 +1682,8 @@ class TestItemCrud(SplitModuleTest): """ if node: node_loc = node.location - self.assertFalse( - modulestore().has_item(node_loc.version_agnostic()) - ) - self.assertTrue(modulestore().has_item(node_loc.course_agnostic())) + assert not modulestore().has_item(node_loc.version_agnostic()) + assert modulestore().has_item(node_loc.course_agnostic()) if node.has_children: for sub in node.get_children(): check_subtree(sub) @@ -1769,8 +1741,8 @@ class TestItemCrud(SplitModuleTest): # First child should have been moved to second position, and better child takes the lead refetch_course = store.get_course(versionless_course_locator) children = refetch_course.get_children() - self.assertEqual(six.text_type(children[1].location), six.text_type(first_child.location)) - self.assertEqual(six.text_type(children[0].location), six.text_type(second_child.location)) + assert six.text_type(children[1].location) == six.text_type(first_child.location) + assert six.text_type(children[0].location) == six.text_type(second_child.location) # Clean up the data so we don't break other tests which apparently expect a particular state store.delete_course(refetch_course.id, user) @@ -1791,22 +1763,22 @@ class TestCourseCreation(SplitModuleTest): new_locator = new_course.location # check index entry index_info = modulestore().get_course_index_info(new_locator.course_key) - self.assertEqual(index_info['org'], 'test_org') - self.assertEqual(index_info['edited_by'], 'create_user') + assert index_info['org'] == 'test_org' + assert index_info['edited_by'] == 'create_user' # check structure info structure_info = modulestore().get_course_history_info(new_locator.course_key) - self.assertEqual(structure_info['original_version'], index_info['versions'][BRANCH_NAME_DRAFT]) - self.assertIsNone(structure_info['previous_version']) + assert structure_info['original_version'] == index_info['versions'][BRANCH_NAME_DRAFT] + assert structure_info['previous_version'] is None - self.assertEqual(structure_info['edited_by'], 'create_user') + assert structure_info['edited_by'] == 'create_user' # check the returned course object - self.assertIsInstance(new_course, CourseDescriptor) - self.assertEqual(new_course.category, 'course') - self.assertFalse(new_course.show_calculator) - self.assertTrue(new_course.allow_anonymous) - self.assertEqual(len(new_course.children), 0) - self.assertEqual(new_course.edited_by, "create_user") - self.assertEqual(len(new_course.grading_policy['GRADER']), 4) + assert isinstance(new_course, CourseDescriptor) + assert new_course.category == 'course' + assert not new_course.show_calculator + assert new_course.allow_anonymous + assert len(new_course.children) == 0 + assert new_course.edited_by == 'create_user' + assert len(new_course.grading_policy['GRADER']) == 4 self.assertDictEqual(new_course.grade_cutoffs, {"Pass": 0.5}) def test_cloned_course(self): @@ -1821,16 +1793,16 @@ class TestCourseCreation(SplitModuleTest): new_draft_locator = new_draft.location self.assertRegex(new_draft_locator.org, 'best') # the edited_by and other meta fields on the new course will be the original author not this one - self.assertEqual(new_draft.edited_by, 'test@edx.org') - self.assertEqual(new_draft_locator.version_guid, original_index['versions'][BRANCH_NAME_DRAFT]) + assert new_draft.edited_by == 'test@edx.org' + assert new_draft_locator.version_guid == original_index['versions'][BRANCH_NAME_DRAFT] # however the edited_by and other meta fields on course_index will be this one new_index = modulestore().get_course_index_info(new_draft_locator.course_key) - self.assertEqual(new_index['edited_by'], 'leech_master') + assert new_index['edited_by'] == 'leech_master' new_published_locator = new_draft_locator.course_key.for_branch(BRANCH_NAME_PUBLISHED) new_published = modulestore().get_course(new_published_locator) - self.assertEqual(new_published.edited_by, 'test@edx.org') - self.assertEqual(new_published.location.version_guid, original_index['versions'][BRANCH_NAME_PUBLISHED]) + assert new_published.edited_by == 'test@edx.org' + assert new_published.location.version_guid == original_index['versions'][BRANCH_NAME_PUBLISHED] # changing this course will not change the original course # using new_draft.location will insert the chapter under the course root @@ -1840,16 +1812,16 @@ class TestCourseCreation(SplitModuleTest): ) new_draft_locator = new_draft_locator.course_key.version_agnostic() new_index = modulestore().get_course_index_info(new_draft_locator) - self.assertNotEqual(new_index['versions'][BRANCH_NAME_DRAFT], original_index['versions'][BRANCH_NAME_DRAFT]) + assert new_index['versions'][BRANCH_NAME_DRAFT] != original_index['versions'][BRANCH_NAME_DRAFT] new_draft = modulestore().get_course(new_draft_locator) - self.assertEqual(new_item.edited_by, 'leech_master') - self.assertNotEqual(new_item.location.version_guid, original_index['versions'][BRANCH_NAME_DRAFT]) - self.assertNotEqual(new_draft.location.version_guid, original_index['versions'][BRANCH_NAME_DRAFT]) + assert new_item.edited_by == 'leech_master' + assert new_item.location.version_guid != original_index['versions'][BRANCH_NAME_DRAFT] + assert new_draft.location.version_guid != original_index['versions'][BRANCH_NAME_DRAFT] structure_info = modulestore().get_course_history_info(new_draft_locator) - self.assertEqual(structure_info['edited_by'], 'leech_master') + assert structure_info['edited_by'] == 'leech_master' original_course = modulestore().get_course(original_locator) - self.assertEqual(original_course.location.version_guid, original_index['versions'][BRANCH_NAME_DRAFT]) + assert original_course.location.version_guid == original_index['versions'][BRANCH_NAME_DRAFT] def test_derived_course(self): """ @@ -1871,12 +1843,12 @@ class TestCourseCreation(SplitModuleTest): new_draft_locator = new_draft.location self.assertRegex(new_draft_locator.org, 'counter') # the edited_by and other meta fields on the new course will be the original author not this one - self.assertEqual(new_draft.edited_by, 'leech_master') - self.assertNotEqual(new_draft_locator.version_guid, original_index['versions'][BRANCH_NAME_DRAFT]) + assert new_draft.edited_by == 'leech_master' + assert new_draft_locator.version_guid != original_index['versions'][BRANCH_NAME_DRAFT] # however the edited_by and other meta fields on course_index will be this one new_index = modulestore().get_course_index_info(new_draft_locator.course_key) - self.assertEqual(new_index['edited_by'], 'leech_master') - self.assertEqual(new_draft.display_name, fields['display_name']) + assert new_index['edited_by'] == 'leech_master' + assert new_draft.display_name == fields['display_name'] self.assertDictEqual( new_draft.grading_policy['GRADE_CUTOFFS'], fields['grading_policy']['GRADE_CUTOFFS'] @@ -1898,13 +1870,13 @@ class TestCourseCreation(SplitModuleTest): versions[BRANCH_NAME_DRAFT] = head_course.previous_version modulestore().update_course_index(None, course_info) course = modulestore().get_course(locator) - self.assertEqual(course.location.version_guid, versions[BRANCH_NAME_DRAFT]) + assert course.location.version_guid == versions[BRANCH_NAME_DRAFT] # an allowed but not recommended way to publish a course versions[BRANCH_NAME_PUBLISHED] = versions[BRANCH_NAME_DRAFT] modulestore().update_course_index(None, course_info) course = modulestore().get_course(locator.for_branch(BRANCH_NAME_PUBLISHED)) - self.assertEqual(course.location.version_guid, versions[BRANCH_NAME_DRAFT]) + assert course.location.version_guid == versions[BRANCH_NAME_DRAFT] def test_create_with_root(self): """ @@ -1915,16 +1887,16 @@ class TestCourseCreation(SplitModuleTest): 'test_org', 'test_transaction', 'test_run', user, BRANCH_NAME_DRAFT, root_block_id='top', root_category='chapter' ) - self.assertEqual(new_course.location.block_id, 'top') - self.assertEqual(new_course.category, 'chapter') + assert new_course.location.block_id == 'top' + assert new_course.category == 'chapter' # look at db to verify db_structure = modulestore().db_connection.get_structure( new_course.location.as_object_id(new_course.location.version_guid) ) - self.assertIsNotNone(db_structure, "Didn't find course") - self.assertNotIn(BlockKey('course', 'course'), db_structure['blocks']) - self.assertIn(BlockKey('chapter', 'top'), db_structure['blocks']) - self.assertEqual(db_structure['blocks'][BlockKey('chapter', 'top')].block_type, 'chapter') + assert db_structure is not None, "Didn't find course" + assert BlockKey('course', 'course') not in db_structure['blocks'] + assert BlockKey('chapter', 'top') in db_structure['blocks'] + assert db_structure['blocks'][BlockKey('chapter', 'top')].block_type == 'chapter' def test_create_id_dupe(self): """ @@ -1932,7 +1904,7 @@ class TestCourseCreation(SplitModuleTest): """ user = random.getrandbits(32) courses = modulestore().get_courses(BRANCH_NAME_DRAFT) - with self.assertRaises(DuplicateCourseError): + with pytest.raises(DuplicateCourseError): dupe_course_key = courses[0].location.course_key modulestore().create_course( dupe_course_key.org, dupe_course_key.course, dupe_course_key.run, user, BRANCH_NAME_DRAFT @@ -1966,12 +1938,12 @@ class TestCourseCreation(SplitModuleTest): # now get_courses courses = split_store.get_courses(BRANCH_NAME_DRAFT) - self.assertEqual(len(courses), 3) + assert len(courses) == 3 course_ids = [course.id.for_branch(None) for course in courses] - self.assertNotIn(to_be_deleted, course_ids) - self.assertIn(to_be_created, course_ids) + assert to_be_deleted not in course_ids + assert to_be_created in course_ids fetched_modified = [course for course in courses if course.id == modified_course_loc][0] - self.assertEqual(fetched_modified.advertised_start, modified_course.advertised_start) + assert fetched_modified.advertised_start == modified_course.advertised_start class TestInheritance(SplitModuleTest): @@ -1990,13 +1962,13 @@ class TestInheritance(SplitModuleTest): ) node = modulestore().get_item(locator) # inherited - self.assertEqual(node.graceperiod, datetime.timedelta(hours=2)) + assert node.graceperiod == datetime.timedelta(hours=2) locator = BlockUsageLocator( CourseLocator(org='testx', course='GreekHero', run="run", branch=BRANCH_NAME_DRAFT), 'problem', 'problem1' ) node = modulestore().get_item(locator) # overridden - self.assertEqual(node.graceperiod, datetime.timedelta(hours=4)) + assert node.graceperiod == datetime.timedelta(hours=4) def test_inheritance_not_saved(self): """ @@ -2013,12 +1985,12 @@ class TestInheritance(SplitModuleTest): CourseLocator(org='testx', course='GreekHero', run="run", branch=BRANCH_NAME_DRAFT), 'problem', 'problem3_2' # lint-amnesty, pylint: disable=line-too-long ) ) - self.assertFalse(problem.visible_to_staff_only) + assert not problem.visible_to_staff_only chapter.visible_to_staff_only = True modulestore().update_item(chapter, self.user_id) problem = modulestore().get_item(problem.location.version_agnostic()) - self.assertTrue(problem.visible_to_staff_only) + assert problem.visible_to_staff_only # unset on parent, retrieve child, verify unset chapter = modulestore().get_item(chapter.location.version_agnostic()) @@ -2026,7 +1998,7 @@ class TestInheritance(SplitModuleTest): modulestore().update_item(chapter, self.user_id) problem = modulestore().get_item(problem.location.version_agnostic()) - self.assertFalse(problem.visible_to_staff_only) + assert not problem.visible_to_staff_only def test_dynamic_inheritance(self): """ @@ -2037,13 +2009,13 @@ class TestInheritance(SplitModuleTest): chapter.visible_to_staff_only = True orphan_problem = modulestore().create_item(self.user_id, course_key, 'problem') - self.assertFalse(orphan_problem.visible_to_staff_only) + assert not orphan_problem.visible_to_staff_only parented_problem = modulestore().create_child(self.user_id, chapter.location.version_agnostic(), 'problem') # lint-amnesty, pylint: disable=unused-variable # FIXME LMS-11376 # self.assertTrue(parented_problem.visible_to_staff_only) orphan_problem = modulestore().create_xblock(chapter.runtime, course_key, 'problem') - self.assertFalse(orphan_problem.visible_to_staff_only) + assert not orphan_problem.visible_to_staff_only parented_problem = modulestore().create_xblock(chapter.runtime, course_key, 'problem', parent_xblock=chapter) # FIXME LMS-11376 # self.assertTrue(parented_problem.visible_to_staff_only) @@ -2081,16 +2053,14 @@ class TestPublish(SplitModuleTest): # remove chapter1 from expected b/c its pub'd version != the source anymore since source changed expected.remove(BlockKey.from_usage_key(chapter1)) # check that it's not in published course - with self.assertRaises(ItemNotFoundError): + with pytest.raises(ItemNotFoundError): modulestore().get_item(new_module.location.map_into_course(dest_course)) # publish it modulestore().copy(self.user_id, source_course, dest_course, [new_module.location], None) expected.append(BlockKey.from_usage_key(new_module.location)) # check that it is in the published course and that its parent is the chapter pub_module = modulestore().get_item(new_module.location.map_into_course(dest_course)) - self.assertEqual( - modulestore().get_parent_location(pub_module.location).block_id, chapter1.block_id - ) + assert modulestore().get_parent_location(pub_module.location).block_id == chapter1.block_id # ensure intentionally orphaned blocks work (e.g., course_info) new_module = modulestore().create_item( self.user_id, source_course, "course_info", block_id="handouts" @@ -2112,15 +2082,15 @@ class TestPublish(SplitModuleTest): head = source_course.make_usage_key('course', "head12345") chapter3 = source_course.make_usage_key('chapter', 'chapter3') problem1 = source_course.make_usage_key('problem', 'problem1') - with self.assertRaises(ItemNotFoundError): + with pytest.raises(ItemNotFoundError): modulestore().copy(self.user_id, source_course, destination_course, [chapter3], None) # publishing into a new branch w/o publishing the root destination_course = CourseLocator(org='testx', course='GreekHero', run='run', branch=BRANCH_NAME_PUBLISHED) - with self.assertRaises(ItemNotFoundError): + with pytest.raises(ItemNotFoundError): modulestore().copy(self.user_id, source_course, destination_course, [chapter3], None) # publishing a subdag w/o the parent already in course modulestore().copy(self.user_id, source_course, destination_course, [head], [chapter3]) - with self.assertRaises(ItemNotFoundError): + with pytest.raises(ItemNotFoundError): modulestore().copy(self.user_id, source_course, destination_course, [problem1], []) @patch('xmodule.tabs.CourseTab.from_json', side_effect=mock_tab_from_json) @@ -2163,31 +2133,25 @@ class TestPublish(SplitModuleTest): Check that the course has the expected blocks and does not have the unexpected blocks """ history_info = modulestore().get_course_history_info(dest_course_loc) - self.assertEqual(history_info['edited_by'], self.user_id) + assert history_info['edited_by'] == self.user_id for expected in expected_blocks: source = modulestore().get_item(source_course_loc.make_usage_key(expected.type, expected.id)) pub_copy = modulestore().get_item(dest_course_loc.make_usage_key(expected.type, expected.id)) # everything except previous_version & children should be the same - self.assertEqual(source.category, pub_copy.category) - self.assertEqual( - source.update_version, pub_copy.source_version, - u"Versions don't match for {}: {} != {}".format( - expected, source.update_version, pub_copy.update_version - ) - ) - self.assertEqual( - self.user_id, pub_copy.edited_by, - "{} edited_by {} not {}".format(pub_copy.location, pub_copy.edited_by, self.user_id) - ) + assert source.category == pub_copy.category + assert source.update_version == pub_copy.source_version,\ + f"Versions don't match for {expected}: {source.update_version} != {pub_copy.update_version}" + assert self.user_id == pub_copy.edited_by,\ + f'{pub_copy.location} edited_by {pub_copy.edited_by} not {self.user_id}' for field in source.fields.values(): if field.name == 'children': self._compare_children(field.read_from(source), field.read_from(pub_copy), unexpected_blocks) elif isinstance(field, (Reference, ReferenceList, ReferenceValueDict)): self.assertReferenceEqual(field.read_from(source), field.read_from(pub_copy)) else: - self.assertEqual(field.read_from(source), field.read_from(pub_copy)) + assert field.read_from(source) == field.read_from(pub_copy) for unexp in unexpected_blocks: - with self.assertRaises(ItemNotFoundError): + with pytest.raises(ItemNotFoundError): modulestore().get_item(dest_course_loc.make_usage_key(unexp.type, unexp.id)) def assertReferenceEqual(self, expected, actual): # lint-amnesty, pylint: disable=missing-function-docstring @@ -2200,7 +2164,7 @@ class TestPublish(SplitModuleTest): elif isinstance(expected, dict): expected = {key: BlockKey.from_usage_key(val) for (key, val) in expected} actual = {key: BlockKey.from_usage_key(val) for (key, val) in actual} - self.assertEqual(expected, actual) + assert expected == actual @contract( source_children="list(BlockUsageLocator)", @@ -2219,9 +2183,9 @@ class TestPublish(SplitModuleTest): ] dest_block_keys = [BlockKey.from_usage_key(dest) for dest in dest_children] for unexp in unexpected: - self.assertNotIn(unexp, dest_block_keys) + assert unexp not in dest_block_keys - self.assertEqual(source_block_keys, dest_block_keys) + assert source_block_keys == dest_block_keys class TestSchema(SplitModuleTest): @@ -2234,16 +2198,10 @@ class TestSchema(SplitModuleTest): """ db_connection = modulestore().db_connection for collection in [db_connection.course_index, db_connection.structures, db_connection.definitions]: - self.assertEqual( - collection.count_documents({'schema_version': {'$exists': False}}), - 0, - "{0.name} has records without schema_version".format(collection) - ) - self.assertEqual( - collection.count_documents({'schema_version': {'$ne': SplitMongoModuleStore.SCHEMA_VERSION}}), - 0, - "{0.name} has records with wrong schema_version".format(collection) - ) + assert collection.count_documents({'schema_version': {'$exists': False}}) == 0, \ + f'{collection.name} has records without schema_version' + assert collection.count_documents({'schema_version': {'$ne': SplitMongoModuleStore.SCHEMA_VERSION}}) == 0, \ + f'{collection.name} has records with wrong schema_version' # =========================================== diff --git a/common/lib/xmodule/xmodule/modulestore/tests/test_split_modulestore_bulk_operations.py b/common/lib/xmodule/xmodule/modulestore/tests/test_split_modulestore_bulk_operations.py index 128b9324bc..d577876aa1 100644 --- a/common/lib/xmodule/xmodule/modulestore/tests/test_split_modulestore_bulk_operations.py +++ b/common/lib/xmodule/xmodule/modulestore/tests/test_split_modulestore_bulk_operations.py @@ -42,10 +42,10 @@ class TestBulkWriteMixin(unittest.TestCase): # lint-amnesty, pylint: disable=mi self.index_entry = {'this': 'is', 'an': 'index'} def assertConnCalls(self, *calls): - self.assertEqual(list(calls), self.conn.mock_calls) + assert list(calls) == self.conn.mock_calls def assertCacheNotCleared(self): - self.assertFalse(self.clear_cache.called) + assert not self.clear_cache.called class TestBulkWriteMixinPreviousTransaction(TestBulkWriteMixin): @@ -77,7 +77,7 @@ class TestBulkWriteMixinClosed(TestBulkWriteMixin): self.assertConnCalls( call.get_structure(self.course_key.as_object_id(version_guid), self.course_key) ) - self.assertEqual(result, self.conn.get_structure.return_value) + assert result == self.conn.get_structure.return_value self.assertCacheNotCleared() def test_no_bulk_write_structure(self): @@ -100,7 +100,7 @@ class TestBulkWriteMixinClosed(TestBulkWriteMixin): self.course_key ) ) - self.assertEqual(result, self.conn.get_definition.return_value) + assert result == self.conn.get_definition.return_value def test_no_bulk_write_definition(self): # Writing a definition when no bulk operation is active should just @@ -114,7 +114,7 @@ class TestBulkWriteMixinClosed(TestBulkWriteMixin): # through to the db_connection result = self.bulk.get_course_index(self.course_key, ignore_case=ignore_case) self.assertConnCalls(call.get_course_index(self.course_key, ignore_case)) - self.assertEqual(result, self.conn.get_course_index.return_value) + assert result == self.conn.get_course_index.return_value self.assertCacheNotCleared() def test_no_bulk_write_index(self): @@ -291,17 +291,14 @@ class TestBulkWriteMixinClosed(TestBulkWriteMixin): ) def test_version_structure_creates_new_version(self): - self.assertNotEqual( - self.bulk.version_structure(self.course_key, self.structure, 'user_id')['_id'], - self.structure['_id'] - ) + assert self.bulk.version_structure(self.course_key, self.structure, 'user_id')['_id'] != self.structure['_id'] def test_version_structure_new_course(self): self.conn.get_course_index.return_value = None self.bulk._begin_bulk_operation(self.course_key) version_result = self.bulk.version_structure(self.course_key, self.structure, 'user_id') get_result = self.bulk.get_structure(self.course_key, version_result['_id']) - self.assertEqual(version_result, get_result) + assert version_result == get_result class TestBulkWriteMixinClosedAfterPrevTransaction(TestBulkWriteMixinClosed, TestBulkWriteMixinPreviousTransaction): # lint-amnesty, pylint: disable=test-inherits-tests @@ -330,7 +327,7 @@ class TestBulkWriteMixinFindMethods(TestBulkWriteMixin): course_keys=None ) ) - self.assertEqual(result, self.conn.find_matching_course_indexes.return_value) + assert result == self.conn.find_matching_course_indexes.return_value self.assertCacheNotCleared() @ddt.data( @@ -399,14 +396,14 @@ class TestBulkWriteMixinFindMethods(TestBulkWriteMixin): result = self.bulk.find_matching_course_indexes(branch, search_targets) six.assertCountEqual(self, result, expected) for item in unmatching: - self.assertNotIn(item, result) + assert item not in result def test_no_bulk_find_structures_by_id(self): ids = [Mock(name='id')] self.conn.find_structures_by_id.return_value = [MagicMock(name='result')] result = self.bulk.find_structures_by_id(ids) self.assertConnCalls(call.find_structures_by_id(ids)) - self.assertEqual(result, self.conn.find_structures_by_id.return_value) + assert result == self.conn.find_structures_by_id.return_value self.assertCacheNotCleared() @ddt.data( @@ -431,14 +428,14 @@ class TestBulkWriteMixinFindMethods(TestBulkWriteMixin): self.conn.find_structures_by_id.assert_called_once_with(list(set(search_ids) - set(active_ids))) for _id in active_ids: if _id in search_ids: - self.assertIn(active_structure(_id), results) + assert active_structure(_id) in results else: - self.assertNotIn(active_structure(_id), results) + assert active_structure(_id) not in results for _id in db_ids: if _id in search_ids and _id not in active_ids: - self.assertIn(db_structure(_id), results) + assert db_structure(_id) in results else: - self.assertNotIn(db_structure(_id), results) + assert db_structure(_id) not in results @ddt.data( ([], [], []), @@ -463,17 +460,17 @@ class TestBulkWriteMixinFindMethods(TestBulkWriteMixin): self.conn.get_definitions.assert_called_once_with(definitions_gotten, self.course_key) else: # If no definitions to get, then get_definitions() should *not* have been called. - self.assertEqual(self.conn.get_definitions.call_count, 0) + assert self.conn.get_definitions.call_count == 0 for _id in active_ids: if _id in search_ids: - self.assertIn(active_definition(_id), results) + assert active_definition(_id) in results else: - self.assertNotIn(active_definition(_id), results) + assert active_definition(_id) not in results for _id in db_ids: if _id in search_ids and _id not in active_ids: - self.assertIn(db_definition(_id), results) + assert db_definition(_id) in results else: - self.assertNotIn(db_definition(_id), results) + assert db_definition(_id) not in results def test_get_definitions_doesnt_update_db(self): test_ids = [1, 2] @@ -484,14 +481,14 @@ class TestBulkWriteMixinFindMethods(TestBulkWriteMixin): self.bulk._begin_bulk_operation(self.course_key) self.bulk.get_definitions(self.course_key, test_ids) self.bulk._end_bulk_operation(self.course_key) - self.assertFalse(self.conn.insert_definition.called) + assert not self.conn.insert_definition.called def test_no_bulk_find_structures_derived_from(self): ids = [Mock(name='id')] self.conn.find_structures_derived_from.return_value = [MagicMock(name='result')] result = self.bulk.find_structures_derived_from(ids) self.assertConnCalls(call.find_structures_derived_from(ids)) - self.assertEqual(result, self.conn.find_structures_derived_from.return_value) + assert result == self.conn.find_structures_derived_from.return_value self.assertCacheNotCleared() @ddt.data( @@ -529,17 +526,17 @@ class TestBulkWriteMixinFindMethods(TestBulkWriteMixin): self.conn.find_structures_derived_from.assert_called_once_with(search_ids) for structure in active_structures: if structure['previous_version'] in search_ids: - self.assertIn(structure, results) + assert structure in results else: - self.assertNotIn(structure, results) + assert structure not in results for structure in db_structures: if ( structure['previous_version'] in search_ids and # We're searching for this document not any(active.endswith(structure['_id']) for active in active_ids) # This document doesn't match any active _ids # lint-amnesty, pylint: disable=line-too-long ): - self.assertIn(structure, results) + assert structure in results else: - self.assertNotIn(structure, results) + assert structure not in results def test_no_bulk_find_ancestor_structures(self): original_version = Mock(name='original_version') @@ -547,7 +544,7 @@ class TestBulkWriteMixinFindMethods(TestBulkWriteMixin): self.conn.find_ancestor_structures.return_value = [MagicMock(name='result')] result = self.bulk.find_ancestor_structures(original_version, block_id) self.assertConnCalls(call.find_ancestor_structures(original_version, block_id)) - self.assertEqual(result, self.conn.find_ancestor_structures.return_value) + assert result == self.conn.find_ancestor_structures.return_value self.assertCacheNotCleared() @ddt.data( @@ -604,8 +601,8 @@ class TestBulkWriteMixinOpen(TestBulkWriteMixin): # returns the structure from the database version_guid = VERSION_GUID_DICT[version_guid_name] result = self.bulk.get_structure(self.course_key, version_guid) - self.assertEqual(self.conn.get_structure.call_count, 1) - self.assertEqual(result, self.conn.get_structure.return_value) + assert self.conn.get_structure.call_count == 1 + assert result == self.conn.get_structure.return_value self.assertCacheNotCleared() @ddt.data(*SAMPLE_GUIDS_LIST) @@ -615,8 +612,8 @@ class TestBulkWriteMixinOpen(TestBulkWriteMixin): version_guid = VERSION_GUID_DICT[version_guid_name] for _ in range(2): result = self.bulk.get_structure(self.course_key, version_guid) - self.assertEqual(self.conn.get_structure.call_count, 1) - self.assertEqual(result, self.conn.get_structure.return_value) + assert self.conn.get_structure.call_count == 1 + assert result == self.conn.get_structure.return_value self.assertCacheNotCleared() @ddt.data(*SAMPLE_GUIDS_LIST) @@ -626,8 +623,8 @@ class TestBulkWriteMixinOpen(TestBulkWriteMixin): self.structure['_id'] = version_guid self.bulk.update_structure(self.course_key, self.structure) result = self.bulk.get_structure(self.course_key, version_guid) - self.assertEqual(self.conn.get_structure.call_count, 0) - self.assertEqual(result, self.structure) + assert self.conn.get_structure.call_count == 0 + assert result == self.structure @ddt.data(*SAMPLE_GUIDS_LIST) def test_read_structure_after_write_after_read(self, version_guid_name): @@ -638,8 +635,8 @@ class TestBulkWriteMixinOpen(TestBulkWriteMixin): self.bulk.get_structure(self.course_key, version_guid) self.bulk.update_structure(self.course_key, self.structure) result = self.bulk.get_structure(self.course_key, version_guid) - self.assertEqual(self.conn.get_structure.call_count, 1) - self.assertEqual(result, self.structure) + assert self.conn.get_structure.call_count == 1 + assert result == self.structure @ddt.data(*SAMPLE_GUIDS_LIST) def test_read_definition_without_write_from_db(self, version_guid_name): @@ -647,8 +644,8 @@ class TestBulkWriteMixinOpen(TestBulkWriteMixin): # returns the definition from the database version_guid = VERSION_GUID_DICT[version_guid_name] result = self.bulk.get_definition(self.course_key, version_guid) - self.assertEqual(self.conn.get_definition.call_count, 1) - self.assertEqual(result, self.conn.get_definition.return_value) + assert self.conn.get_definition.call_count == 1 + assert result == self.conn.get_definition.return_value self.assertCacheNotCleared() @ddt.data(*SAMPLE_GUIDS_LIST) @@ -658,8 +655,8 @@ class TestBulkWriteMixinOpen(TestBulkWriteMixin): version_guid = VERSION_GUID_DICT[version_guid_name] for _ in range(2): result = self.bulk.get_definition(self.course_key, version_guid) - self.assertEqual(self.conn.get_definition.call_count, 1) - self.assertEqual(result, self.conn.get_definition.return_value) + assert self.conn.get_definition.call_count == 1 + assert result == self.conn.get_definition.return_value self.assertCacheNotCleared() @ddt.data(*SAMPLE_GUIDS_LIST) @@ -669,8 +666,8 @@ class TestBulkWriteMixinOpen(TestBulkWriteMixin): self.definition['_id'] = version_guid self.bulk.update_definition(self.course_key, self.definition) result = self.bulk.get_definition(self.course_key, version_guid) - self.assertEqual(self.conn.get_definition.call_count, 0) - self.assertEqual(result, self.definition) + assert self.conn.get_definition.call_count == 0 + assert result == self.definition @ddt.data(*SAMPLE_GUIDS_LIST) def test_read_definition_after_write_after_read(self, version_guid_name): @@ -681,15 +678,15 @@ class TestBulkWriteMixinOpen(TestBulkWriteMixin): self.bulk.get_definition(self.course_key, version_guid) self.bulk.update_definition(self.course_key, self.definition) result = self.bulk.get_definition(self.course_key, version_guid) - self.assertEqual(self.conn.get_definition.call_count, 1) - self.assertEqual(result, self.definition) + assert self.conn.get_definition.call_count == 1 + assert result == self.definition @ddt.data(True, False) def test_read_index_without_write_from_db(self, ignore_case): # Reading the index without writing to it should pull from the database result = self.bulk.get_course_index(self.course_key, ignore_case=ignore_case) - self.assertEqual(self.conn.get_course_index.call_count, 1) - self.assertEqual(self.conn.get_course_index.return_value, result) + assert self.conn.get_course_index.call_count == 1 + assert self.conn.get_course_index.return_value == result @ddt.data(True, False) def test_read_index_without_write_only_reads_once(self, ignore_case): @@ -697,8 +694,8 @@ class TestBulkWriteMixinOpen(TestBulkWriteMixin): # the database for _ in range(2): result = self.bulk.get_course_index(self.course_key, ignore_case=ignore_case) - self.assertEqual(self.conn.get_course_index.call_count, 1) - self.assertEqual(self.conn.get_course_index.return_value, result) + assert self.conn.get_course_index.call_count == 1 + assert self.conn.get_course_index.return_value == result @ddt.data(True, False) def test_read_index_after_write(self, ignore_case): @@ -706,8 +703,8 @@ class TestBulkWriteMixinOpen(TestBulkWriteMixin): # initial index, and should return the written index_entry self.bulk.insert_course_index(self.course_key, self.index_entry) result = self.bulk.get_course_index(self.course_key, ignore_case=ignore_case) - self.assertEqual(self.conn.get_course_index.call_count, 1) - self.assertEqual(self.index_entry, result) + assert self.conn.get_course_index.call_count == 1 + assert self.index_entry == result def test_read_index_ignore_case(self): # Reading using ignore case should find an already written entry with a different case @@ -720,22 +717,16 @@ class TestBulkWriteMixinOpen(TestBulkWriteMixin): ), ignore_case=True ) - self.assertEqual(self.conn.get_course_index.call_count, 1) - self.assertEqual(self.index_entry, result) + assert self.conn.get_course_index.call_count == 1 + assert self.index_entry == result def test_version_structure_creates_new_version_before_read(self): - self.assertNotEqual( - self.bulk.version_structure(self.course_key, self.structure, 'user_id')['_id'], - self.structure['_id'] - ) + assert self.bulk.version_structure(self.course_key, self.structure, 'user_id')['_id'] != self.structure['_id'] def test_version_structure_creates_new_version_after_read(self): self.conn.get_structure.return_value = copy.deepcopy(self.structure) self.bulk.get_structure(self.course_key, self.structure['_id']) - self.assertNotEqual( - self.bulk.version_structure(self.course_key, self.structure, 'user_id')['_id'], - self.structure['_id'] - ) + assert self.bulk.version_structure(self.course_key, self.structure, 'user_id')['_id'] != self.structure['_id'] def test_copy_branch_versions(self): # Directly updating an index so that the draft branch points to the published index diff --git a/common/lib/xmodule/xmodule/modulestore/tests/test_split_mongo_mongo_connection.py b/common/lib/xmodule/xmodule/modulestore/tests/test_split_mongo_mongo_connection.py index e6932a2724..7512c3da00 100644 --- a/common/lib/xmodule/xmodule/modulestore/tests/test_split_mongo_mongo_connection.py +++ b/common/lib/xmodule/xmodule/modulestore/tests/test_split_mongo_mongo_connection.py @@ -2,7 +2,7 @@ import unittest - +import pytest from mock import patch from pymongo.errors import ConnectionFailure @@ -21,5 +21,5 @@ class TestHeartbeatFailureException(unittest.TestCase): mock_proxy.return_value.admin.command.side_effect = ConnectionFailure('Test') useless_conn = MongoConnection('useless', 'useless', 'useless') - with self.assertRaises(HeartbeatFailure): + with pytest.raises(HeartbeatFailure): useless_conn.heartbeat() diff --git a/common/lib/xmodule/xmodule/modulestore/tests/test_store_utilities.py b/common/lib/xmodule/xmodule/modulestore/tests/test_store_utilities.py index 98e9c8e54b..166c633e62 100644 --- a/common/lib/xmodule/xmodule/modulestore/tests/test_store_utilities.py +++ b/common/lib/xmodule/xmodule/modulestore/tests/test_store_utilities.py @@ -81,4 +81,4 @@ class TestUtils(unittest.TestCase): module_nodes.append(draft_node_constructor(Mock(), node_args[0], node_args[1])) subtree_roots_urls = [root.url for root in get_draft_subtree_roots(module_nodes)] # check that we return the expected urls - self.assertEqual(set(subtree_roots_urls), set(expected_roots_urls)) + assert set(subtree_roots_urls) == set(expected_roots_urls) diff --git a/common/lib/xmodule/xmodule/modulestore/tests/test_xml.py b/common/lib/xmodule/xmodule/modulestore/tests/test_xml.py index d20f9e4194..bbd47227c5 100644 --- a/common/lib/xmodule/xmodule/modulestore/tests/test_xml.py +++ b/common/lib/xmodule/xmodule/modulestore/tests/test_xml.py @@ -6,7 +6,7 @@ well-formed and not-well-formed XML. import os.path from glob import glob - +import pytest from django.test import TestCase from mock import Mock, patch from opaque_keys.edx.keys import CourseKey @@ -44,7 +44,7 @@ class TestXMLModuleStore(TestCase): # Ensure that there really is a non-ASCII character in the course. with open(os.path.join(DATA_DIR, "toy/sequential/vertical_sequential.xml"), 'rb') as xmlf: xml = xmlf.read() - with self.assertRaises(UnicodeDecodeError): + with pytest.raises(UnicodeDecodeError): xml.decode('ascii') # Load the course, but don't make error modules. This will succeed, @@ -66,23 +66,23 @@ class TestXMLModuleStore(TestCase): store = XMLModuleStore(DATA_DIR, source_dirs=['toy', 'simple']) for course in store.get_courses(): course_locations = store.get_courses_for_wiki(course.wiki_slug) - self.assertEqual(len(course_locations), 1) - self.assertIn(course.location.course_key, course_locations) + assert len(course_locations) == 1 + assert course.location.course_key in course_locations course_locations = store.get_courses_for_wiki('no_such_wiki') - self.assertEqual(len(course_locations), 0) + assert len(course_locations) == 0 # now set toy course to share the wiki with simple course toy_course = store.get_course(CourseKey.from_string('edX/toy/2012_Fall')) toy_course.wiki_slug = 'simple' course_locations = store.get_courses_for_wiki('toy') - self.assertEqual(len(course_locations), 0) + assert len(course_locations) == 0 course_locations = store.get_courses_for_wiki('simple') - self.assertEqual(len(course_locations), 2) + assert len(course_locations) == 2 for course_number in ['toy', 'simple']: - self.assertIn(CourseKey.from_string('/'.join(['edX', course_number, '2012_Fall'])), course_locations) + assert CourseKey.from_string('/'.join(['edX', course_number, '2012_Fall'])) in course_locations def test_has_course(self): """ @@ -106,7 +106,7 @@ class TestXMLModuleStore(TestCase): store.get_item(course.location) # XML store does NOT allow draft_preferred branch setting - with self.assertRaises(ValueError): + with pytest.raises(ValueError): with store.branch_setting(ModuleStoreEnum.Branch.draft_preferred, course.id): # verify that the above context manager raises a ValueError pass # pragma: no cover @@ -130,15 +130,15 @@ class TestXMLModuleStore(TestCase): shared_item_loc = course_key.make_usage_key('html', 'toyhtml') shared_item = store.get_item(shared_item_loc) parent = shared_item.get_parent() - self.assertIsNotNone(parent, "get_parent failed to return a value") + assert parent is not None, 'get_parent failed to return a value' parent_loc = course_key.make_usage_key('vertical', 'vertical_test') - self.assertEqual(parent.location, parent_loc) - self.assertIn(shared_item.location, [x.location for x in parent.get_children()]) + assert parent.location == parent_loc + assert shared_item.location in [x.location for x in parent.get_children()] # ensure it's still a child of the other parent even tho it doesn't claim the other parent as its parent other_parent_loc = course_key.make_usage_key('vertical', 'zeta') other_parent = store.get_item(other_parent_loc) # children rather than get_children b/c the instance returned by get_children != shared_item - self.assertIn(shared_item_loc, other_parent.children) + assert shared_item_loc in other_parent.children class TestModuleStoreIgnore(TestXMLModuleStore): # lint-amnesty, pylint: disable=missing-class-docstring, test-inherits-tests @@ -156,5 +156,5 @@ class TestModuleStoreIgnore(TestXMLModuleStore): # lint-amnesty, pylint: disabl 'about', 'index', ) about_module = modulestore.get_item(about_location) - self.assertIn("GREEN", about_module.data) - self.assertNotIn("RED", about_module.data) + assert 'GREEN' in about_module.data + assert 'RED' not in about_module.data diff --git a/common/lib/xmodule/xmodule/modulestore/tests/test_xml_importer.py b/common/lib/xmodule/xmodule/modulestore/tests/test_xml_importer.py index 042c8010d1..b702a574b1 100644 --- a/common/lib/xmodule/xmodule/modulestore/tests/test_xml_importer.py +++ b/common/lib/xmodule/xmodule/modulestore/tests/test_xml_importer.py @@ -7,7 +7,7 @@ import importlib import os import unittest from uuid import uuid4 - +import pytest import mock import six from opaque_keys.edx.keys import CourseKey @@ -165,22 +165,16 @@ class RemapNamespaceTest(ModuleStoreNoSettings): ) # Check the XBlock's location - self.assertEqual(new_version.location.course_key, target_location_namespace) + assert new_version.location.course_key == target_location_namespace # Check the values of the fields. # The content and settings fields should be preserved - self.assertEqual(new_version.test_content_field, 'Explicitly set') - self.assertEqual(new_version.test_settings_field, 'Explicitly set') + assert new_version.test_content_field == 'Explicitly set' + assert new_version.test_settings_field == 'Explicitly set' # Expect that these fields are marked explicitly set - self.assertIn( - 'test_content_field', - new_version.get_explicitly_set_fields_by_scope(scope=Scope.content) - ) - self.assertIn( - 'test_settings_field', - new_version.get_explicitly_set_fields_by_scope(scope=Scope.settings) - ) + assert 'test_content_field' in new_version.get_explicitly_set_fields_by_scope(scope=Scope.content) + assert 'test_settings_field' in new_version.get_explicitly_set_fields_by_scope(scope=Scope.settings) def test_remap_namespace_native_xblock_default_values(self): @@ -203,18 +197,12 @@ class RemapNamespaceTest(ModuleStoreNoSettings): # Check the values of the fields. # The content and settings fields should be the default values - self.assertEqual(new_version.test_content_field, 'default value') - self.assertEqual(new_version.test_settings_field, 'default value') + assert new_version.test_content_field == 'default value' + assert new_version.test_settings_field == 'default value' # The fields should NOT appear in the explicitly set fields - self.assertNotIn( - 'test_content_field', - new_version.get_explicitly_set_fields_by_scope(scope=Scope.content) - ) - self.assertNotIn( - 'test_settings_field', - new_version.get_explicitly_set_fields_by_scope(scope=Scope.settings) - ) + assert 'test_content_field' not in new_version.get_explicitly_set_fields_by_scope(scope=Scope.content) + assert 'test_settings_field' not in new_version.get_explicitly_set_fields_by_scope(scope=Scope.settings) def test_remap_namespace_native_xblock_inherited_values(self): @@ -234,12 +222,8 @@ class RemapNamespaceTest(ModuleStoreNoSettings): ) # Inherited fields should NOT be explicitly set - self.assertNotIn( - 'start', new_version.get_explicitly_set_fields_by_scope(scope=Scope.settings) - ) - self.assertNotIn( - 'graded', new_version.get_explicitly_set_fields_by_scope(scope=Scope.settings) - ) + assert 'start' not in new_version.get_explicitly_set_fields_by_scope(scope=Scope.settings) + assert 'graded' not in new_version.get_explicitly_set_fields_by_scope(scope=Scope.settings) def test_xblock_invalid_field_value_type(self): # Setting the wrong field-value in Xblock-field will raise TypeError. @@ -255,7 +239,7 @@ class RemapNamespaceTest(ModuleStoreNoSettings): # clearing the dirty fields and removing value from cache will fetch the value from field-data. self.xblock._dirty_fields = {} # pylint: disable=protected-access self.xblock.fields['test_content_field']._del_cached_value(self.xblock) # lint-amnesty, pylint: disable=protected-access, unsubscriptable-object - with self.assertRaises(TypeError): + with pytest.raises(TypeError): self.xblock.get_explicitly_set_fields_by_scope(scope=Scope.content) @@ -326,15 +310,15 @@ class UpdateLocationTest(ModuleStoreNoSettings): new_version = self.xblock # _update_module_location updates in-place # Check the XBlock's location - self.assertEqual(new_version.location, target_location) + assert new_version.location == target_location # Check the values of the fields. # The content, settings and children fields should be preserved - self.assertEqual(new_version.test_content_field, 'Explicitly set') - self.assertEqual(new_version.test_settings_field, 'Explicitly set') - self.assertEqual(new_version.test_mutable_content_field, [1, 2, 3]) - self.assertEqual(new_version.test_mutable_settings_field, ["a", "s", "d"]) - self.assertEqual(new_version.children, self.fake_children_locations) + assert new_version.test_content_field == 'Explicitly set' + assert new_version.test_settings_field == 'Explicitly set' + assert new_version.test_mutable_content_field == [1, 2, 3] + assert new_version.test_mutable_settings_field == ['a', 's', 'd'] + assert new_version.children == self.fake_children_locations # Expect that these fields are marked explicitly set self._check_explicitly_set(new_version, Scope.content, self.CONTENT_FIELDS, should_be_set=True) @@ -343,7 +327,7 @@ class UpdateLocationTest(ModuleStoreNoSettings): # Expect these fields pass "is_set_on" test for field in self.CONTENT_FIELDS + self.SETTINGS_FIELDS + self.CHILDREN_FIELDS: - self.assertTrue(new_version.fields[field].is_set_on(new_version)) # lint-amnesty, pylint: disable=unsubscriptable-object + assert new_version.fields[field].is_set_on(new_version) # pylint: disable=unsubscriptable-object class StaticContentImporterTest(unittest.TestCase): # lint-amnesty, pylint: disable=missing-class-docstring diff --git a/common/lib/xmodule/xmodule/partitions/tests/test_partitions.py b/common/lib/xmodule/xmodule/partitions/tests/test_partitions.py index c171494700..804759dd5f 100644 --- a/common/lib/xmodule/xmodule/partitions/tests/test_partitions.py +++ b/common/lib/xmodule/xmodule/partitions/tests/test_partitions.py @@ -6,6 +6,7 @@ Test the partitions and partitions service from datetime import datetime +import pytest import six from django.test import TestCase from mock import Mock, patch # lint-amnesty, pylint: disable=unused-import @@ -31,14 +32,14 @@ class TestGroup(TestCase): test_id = 10 name = "Grendel" group = Group(test_id, name) - self.assertEqual(group.id, test_id) - self.assertEqual(group.name, name) + assert group.id == test_id + assert group.name == name def test_string_id(self): test_id = "10" name = "Grendel" group = Group(test_id, name) - self.assertEqual(group.id, 10) + assert group.id == 10 def test_to_json(self): test_id = 10 @@ -50,7 +51,7 @@ class TestGroup(TestCase): "name": name, "version": group.VERSION } - self.assertEqual(jsonified, act_jsonified) + assert jsonified == act_jsonified def test_from_json(self): test_id = 5 @@ -61,8 +62,8 @@ class TestGroup(TestCase): "version": Group.VERSION } group = Group.from_json(jsonified) - self.assertEqual(group.id, test_id) - self.assertEqual(group.name, name) + assert group.id == test_id + assert group.name == name def test_from_json_broken(self): test_id = 5 @@ -92,7 +93,7 @@ class TestGroup(TestCase): "programmer": "Cale" } group = Group.from_json(jsonified) - self.assertNotIn("programmer", group.to_json()) + assert 'programmer' not in group.to_json() class MockUserPartitionScheme(object): @@ -192,12 +193,12 @@ class TestUserPartition(PartitionTestCase): MockUserPartitionScheme(), self.TEST_PARAMETERS, ) - self.assertEqual(user_partition.id, self.TEST_ID) - self.assertEqual(user_partition.name, self.TEST_NAME) - self.assertEqual(user_partition.description, self.TEST_DESCRIPTION) - self.assertEqual(user_partition.groups, self.TEST_GROUPS) - self.assertEqual(user_partition.scheme.name, self.TEST_SCHEME_NAME) - self.assertEqual(user_partition.parameters, self.TEST_PARAMETERS) + assert user_partition.id == self.TEST_ID + assert user_partition.name == self.TEST_NAME + assert user_partition.description == self.TEST_DESCRIPTION + assert user_partition.groups == self.TEST_GROUPS + assert user_partition.scheme.name == self.TEST_SCHEME_NAME + assert user_partition.parameters == self.TEST_PARAMETERS def test_string_id(self): user_partition = UserPartition( @@ -208,7 +209,7 @@ class TestUserPartition(PartitionTestCase): MockUserPartitionScheme(), self.TEST_PARAMETERS, ) - self.assertEqual(user_partition.id, 70) + assert user_partition.id == 70 def test_to_json(self): jsonified = self.user_partition.to_json() @@ -222,7 +223,7 @@ class TestUserPartition(PartitionTestCase): "scheme": self.TEST_SCHEME_NAME, "active": True, } - self.assertEqual(jsonified, act_jsonified) + assert jsonified == act_jsonified def test_from_json(self): jsonified = { @@ -235,16 +236,16 @@ class TestUserPartition(PartitionTestCase): "scheme": "mock", } user_partition = UserPartition.from_json(jsonified) - self.assertEqual(user_partition.id, self.TEST_ID) - self.assertEqual(user_partition.name, self.TEST_NAME) - self.assertEqual(user_partition.description, self.TEST_DESCRIPTION) - self.assertEqual(user_partition.parameters, self.TEST_PARAMETERS) + assert user_partition.id == self.TEST_ID + assert user_partition.name == self.TEST_NAME + assert user_partition.description == self.TEST_DESCRIPTION + assert user_partition.parameters == self.TEST_PARAMETERS for act_group in user_partition.groups: - self.assertIn(act_group.id, [0, 1]) + assert act_group.id in [0, 1] exp_group = self.TEST_GROUPS[act_group.id] - self.assertEqual(exp_group.id, act_group.id) - self.assertEqual(exp_group.name, act_group.name) + assert exp_group.id == act_group.id + assert exp_group.name == act_group.name def test_version_upgrade(self): # Test that version 1 partitions did not have a scheme specified @@ -257,9 +258,9 @@ class TestUserPartition(PartitionTestCase): "version": 1, } user_partition = UserPartition.from_json(jsonified) - self.assertEqual(user_partition.scheme.name, "random") - self.assertEqual(user_partition.parameters, {}) - self.assertTrue(user_partition.active) + assert user_partition.scheme.name == 'random' + assert user_partition.parameters == {} + assert user_partition.active def test_version_upgrade_2_to_3(self): # Test that version 3 user partition raises error if 'scheme' field is @@ -287,9 +288,9 @@ class TestUserPartition(PartitionTestCase): "scheme": self.TEST_SCHEME_NAME, } user_partition = UserPartition.from_json(jsonified) - self.assertEqual(user_partition.scheme.name, self.TEST_SCHEME_NAME) - self.assertEqual(user_partition.parameters, {}) - self.assertTrue(user_partition.active) + assert user_partition.scheme.name == self.TEST_SCHEME_NAME + assert user_partition.parameters == {} + assert user_partition.active # now test that parameters dict is present in response with same value # as provided @@ -303,8 +304,8 @@ class TestUserPartition(PartitionTestCase): "scheme": self.TEST_SCHEME_NAME, } user_partition = UserPartition.from_json(jsonified) - self.assertEqual(user_partition.parameters, self.TEST_PARAMETERS) - self.assertTrue(user_partition.active) + assert user_partition.parameters == self.TEST_PARAMETERS + assert user_partition.active def test_from_json_broken(self): # Missing field @@ -369,7 +370,7 @@ class TestUserPartition(PartitionTestCase): "programmer": "Cale", } user_partition = UserPartition.from_json(jsonified) - self.assertNotIn("programmer", user_partition.to_json()) + assert 'programmer' not in user_partition.to_json() # No error on missing parameters key (which is optional) jsonified = { @@ -381,7 +382,7 @@ class TestUserPartition(PartitionTestCase): "scheme": "mock", } user_partition = UserPartition.from_json(jsonified) - self.assertEqual(user_partition.parameters, {}) + assert user_partition.parameters == {} def test_get_group(self): """ @@ -389,15 +390,9 @@ class TestUserPartition(PartitionTestCase): `group_id` parameter, or raises NoSuchUserPartitionGroupError when the lookup fails. """ - self.assertEqual( - self.user_partition.get_group(self.TEST_GROUPS[0].id), - self.TEST_GROUPS[0] - ) - self.assertEqual( - self.user_partition.get_group(self.TEST_GROUPS[1].id), - self.TEST_GROUPS[1] - ) - with self.assertRaises(NoSuchUserPartitionGroupError): + assert self.user_partition.get_group(self.TEST_GROUPS[0].id) == self.TEST_GROUPS[0] + assert self.user_partition.get_group(self.TEST_GROUPS[1].id) == self.TEST_GROUPS[1] + with pytest.raises(NoSuchUserPartitionGroupError): self.user_partition.get_group(3) def test_forward_compatibility(self): @@ -415,8 +410,8 @@ class TestUserPartition(PartitionTestCase): "additional_new_field": "foo", } partition = UserPartition.from_json(newer_version_json) - self.assertEqual(partition.id, self.TEST_ID) - self.assertEqual(partition.name, self.TEST_NAME) + assert partition.id == self.TEST_ID + assert partition.name == self.TEST_NAME class MockPartitionService(PartitionService): @@ -506,10 +501,7 @@ class TestPartitionService(PartitionServiceBaseClass): # Make sure our partition services all return the right thing, but skip # ps_shared_cache_2 so we can see if its cache got updated anyway. for part_svc in [ps_shared_cache_1, ps_diff_cache, ps_uncached]: - self.assertEqual( - first_group.id, - part_svc.get_user_group_id_for_partition(self.user, user_partition_id) - ) + assert first_group.id == part_svc.get_user_group_id_for_partition(self.user, user_partition_id) # Now select a new target group second_group = self.user_partition.groups[1] @@ -519,23 +511,14 @@ class TestPartitionService(PartitionServiceBaseClass): # ps_shared_cache_2, which was never asked for the value the first time # Likewise, our separately cached piece should return the original answer for part_svc in [ps_shared_cache_1, ps_shared_cache_2, ps_diff_cache]: - self.assertEqual( - first_group.id, - part_svc.get_user_group_id_for_partition(self.user, user_partition_id) - ) + assert first_group.id == part_svc.get_user_group_id_for_partition(self.user, user_partition_id) # Our uncached service should be accurate. - self.assertEqual( - second_group.id, - ps_uncached.get_user_group_id_for_partition(self.user, user_partition_id) - ) + assert second_group.id == ps_uncached.get_user_group_id_for_partition(self.user, user_partition_id) # And a newly created service should see the right thing ps_new_cache = self._create_service(username, {}) - self.assertEqual( - second_group.id, - ps_new_cache.get_user_group_id_for_partition(self.user, user_partition_id) - ) + assert second_group.id == ps_new_cache.get_user_group_id_for_partition(self.user, user_partition_id) def test_get_group(self): """ @@ -546,12 +529,12 @@ class TestPartitionService(PartitionServiceBaseClass): # assign first group and verify that it is returned for the user self.user_partition.scheme.current_group = groups[0] group1 = self.partition_service.get_group(self.user, self.user_partition) - self.assertEqual(group1, groups[0]) + assert group1 == groups[0] # switch to the second group and verify that it is returned for the user self.user_partition.scheme.current_group = groups[1] group2 = self.partition_service.get_group(self.user, self.user_partition) - self.assertEqual(group2, groups[1]) + assert group2 == groups[1] class TestGetCourseUserPartitions(PartitionServiceBaseClass): @@ -575,12 +558,12 @@ class TestGetCourseUserPartitions(PartitionServiceBaseClass): Test that the dynamic enrollment track scheme is added if there is no conflict with the user partition ID. """ all_partitions = get_all_partitions_for_course(self.course) - self.assertEqual(2, len(all_partitions)) - self.assertEqual(self.TEST_SCHEME_NAME, all_partitions[0].scheme.name) + assert 2 == len(all_partitions) + assert self.TEST_SCHEME_NAME == all_partitions[0].scheme.name enrollment_track_partition = all_partitions[1] - self.assertEqual(self.ENROLLMENT_TRACK_SCHEME_NAME, enrollment_track_partition.scheme.name) - self.assertEqual(six.text_type(self.course.id), enrollment_track_partition.parameters['course_id']) - self.assertEqual(ENROLLMENT_TRACK_PARTITION_ID, enrollment_track_partition.id) + assert self.ENROLLMENT_TRACK_SCHEME_NAME == enrollment_track_partition.scheme.name + assert six.text_type(self.course.id) == enrollment_track_partition.parameters['course_id'] + assert ENROLLMENT_TRACK_PARTITION_ID == enrollment_track_partition.id def test_enrollment_track_partition_not_added_if_conflict(self): """ @@ -596,8 +579,8 @@ class TestGetCourseUserPartitions(PartitionServiceBaseClass): ) self.course.user_partitions = [self.user_partition] all_partitions = get_all_partitions_for_course(self.course) - self.assertEqual(1, len(all_partitions)) - self.assertEqual(self.TEST_SCHEME_NAME, all_partitions[0].scheme.name) + assert 1 == len(all_partitions) + assert self.TEST_SCHEME_NAME == all_partitions[0].scheme.name def test_enrollment_track_partition_not_added_if_disabled(self): """ @@ -605,8 +588,8 @@ class TestGetCourseUserPartitions(PartitionServiceBaseClass): """ TestGetCourseUserPartitions._enable_enrollment_track_partition(False) all_partitions = get_all_partitions_for_course(self.course) - self.assertEqual(1, len(all_partitions)) - self.assertEqual(self.TEST_SCHEME_NAME, all_partitions[0].scheme.name) + assert 1 == len(all_partitions) + assert self.TEST_SCHEME_NAME == all_partitions[0].scheme.name def test_filter_inactive_user_partitions(self): """ @@ -624,10 +607,10 @@ class TestGetCourseUserPartitions(PartitionServiceBaseClass): self.course.user_partitions = [self.user_partition] all_partitions = get_all_partitions_for_course(self.course, active_only=True) - self.assertEqual(1, len(all_partitions)) - self.assertEqual(self.ENROLLMENT_TRACK_SCHEME_NAME, all_partitions[0].scheme.name) + assert 1 == len(all_partitions) + assert self.ENROLLMENT_TRACK_SCHEME_NAME == all_partitions[0].scheme.name all_partitions = get_all_partitions_for_course(self.course, active_only=False) - self.assertEqual(2, len(all_partitions)) - self.assertEqual(self.TEST_SCHEME_NAME, all_partitions[0].scheme.name) - self.assertEqual(self.ENROLLMENT_TRACK_SCHEME_NAME, all_partitions[1].scheme.name) + assert 2 == len(all_partitions) + assert self.TEST_SCHEME_NAME == all_partitions[0].scheme.name + assert self.ENROLLMENT_TRACK_SCHEME_NAME == all_partitions[1].scheme.name diff --git a/common/lib/xmodule/xmodule/tests/__init__.py b/common/lib/xmodule/xmodule/tests/__init__.py index 79fe8ff2fd..298e12c146 100644 --- a/common/lib/xmodule/xmodule/tests/__init__.py +++ b/common/lib/xmodule/xmodule/tests/__init__.py @@ -187,7 +187,7 @@ class ModelsTest(unittest.TestCase): # lint-amnesty, pylint: disable=missing-cl def test_load_class(self): vc = XModuleDescriptor.load_class('sequential') vc_str = "" - self.assertEqual(str(vc), vc_str) + assert str(vc) == vc_str class LogicTest(unittest.TestCase): @@ -307,24 +307,18 @@ class CourseComparisonTest(TestCase): elif isinstance(reference_field, ReferenceValueDict): expected = {key: extract_key(val) for (key, val) in six.iteritems(expected)} actual = {key: extract_key(val) for (key, val) in six.iteritems(actual)} - self.assertEqual( - expected, - actual, - LazyFormat( - "Field {} doesn't match between usages {} and {}: {!r} != {!r}", - reference_field.name, - expected_block.scope_ids.usage_id, - actual_block.scope_ids.usage_id, - expected, - actual - ) - ) + assert expected == actual,\ + LazyFormat("Field {} doesn't match between usages {} and {}: {!r} != {!r}", + reference_field.name, + expected_block.scope_ids.usage_id, + actual_block.scope_ids.usage_id, + expected, actual) def assertBlocksEqualByFields(self, expected_block, actual_block): """ Compare block fields to check for equivalence. """ - self.assertEqual(expected_block.fields, actual_block.fields) + assert expected_block.fields == actual_block.fields for field in expected_block.fields.values(): self.assertFieldEqual(field, expected_block, actual_block) @@ -337,18 +331,12 @@ class CourseComparisonTest(TestCase): else: expected = field.read_from(expected_block) actual = field.read_from(actual_block) - self.assertEqual( - expected, - actual, - LazyFormat( - "Field {} doesn't match between usages {} and {}: {!r} != {!r}", - field.name, - expected_block.scope_ids.usage_id, - actual_block.scope_ids.usage_id, - expected, - actual - ) - ) + assert expected == actual,\ + LazyFormat("Field {} doesn't match between usages {} and {}: {!r} != {!r}", + field.name, + expected_block.scope_ids.usage_id, + actual_block.scope_ids.usage_id, + expected, actual) def assertCoursesEqual(self, expected_store, expected_course_key, actual_store, actual_course_key): """ @@ -364,7 +352,7 @@ class CourseComparisonTest(TestCase): with actual_store.branch_setting(ModuleStoreEnum.Branch.published_only, actual_course_key): expected_items = expected_store.get_items(expected_course_key, revision=ModuleStoreEnum.RevisionOption.published_only) # lint-amnesty, pylint: disable=line-too-long actual_items = actual_store.get_items(actual_course_key, revision=ModuleStoreEnum.RevisionOption.published_only) # lint-amnesty, pylint: disable=line-too-long - self.assertGreater(len(expected_items), 0) + assert len(expected_items) > 0 self._assertCoursesEqual(expected_items, actual_items, actual_course_key) # if the modulestore supports having a draft branch @@ -389,7 +377,7 @@ class CourseComparisonTest(TestCase): Actual algorithm to compare courses. """ - self.assertEqual(len(expected_items), len(actual_items)) + assert len(expected_items) == len(actual_items) def map_key(usage_key): return (usage_key.block_type, usage_key.block_id) @@ -416,11 +404,11 @@ class CourseComparisonTest(TestCase): actual_item_location = actual_item_location.replace(name='course') actual_item = actual_item_map.get(map_key(actual_item_location)) # Formatting the message slows down tests of large courses significantly, so only do it if it would be used - self.assertIn(map_key(actual_item_location), list(actual_item_map.keys())) + assert map_key(actual_item_location) in list(actual_item_map.keys()) if actual_item is None: continue # compare fields - self.assertEqual(expected_item.fields, actual_item.fields) + assert expected_item.fields == actual_item.fields for field_name, field in six.iteritems(expected_item.fields): if (expected_item.scope_ids.usage_id, field_name) in self.field_exclusions: continue @@ -431,7 +419,7 @@ class CourseComparisonTest(TestCase): continue self.assertFieldEqual(field, expected_item, actual_item) # compare children - self.assertEqual(expected_item.has_children, actual_item.has_children) + assert expected_item.has_children == actual_item.has_children if expected_item.has_children: expected_children = [ (expected_item_child.location.block_type, expected_item_child.location.block_id) @@ -443,7 +431,7 @@ class CourseComparisonTest(TestCase): # get_children() rather than children to strip privates from public parents for item_child in actual_item.get_children() ] - self.assertEqual(expected_children, actual_children) + assert expected_children == actual_children def assertAssetEqual(self, expected_course_key, expected_asset, actual_course_key, actual_asset): """ @@ -457,20 +445,20 @@ class CourseComparisonTest(TestCase): expected_key = expected_asset.pop('asset_key') actual_key = actual_asset.pop('asset_key') - self.assertEqual(expected_key.map_into_course(actual_course_key), actual_key) - self.assertEqual(expected_key, actual_key.map_into_course(expected_course_key)) + assert expected_key.map_into_course(actual_course_key) == actual_key + assert expected_key == actual_key.map_into_course(expected_course_key) expected_filename = expected_asset.pop('filename') actual_filename = actual_asset.pop('filename') - self.assertEqual(text_type(expected_key), expected_filename) - self.assertEqual(text_type(actual_key), actual_filename) - self.assertEqual(expected_asset, actual_asset) + assert text_type(expected_key) == expected_filename + assert text_type(actual_key) == actual_filename + assert expected_asset == actual_asset def _assertAssetsEqual(self, expected_course_key, expected_assets, actual_course_key, actual_assets): # pylint: disable=invalid-name """ Private helper method for assertAssetsEqual """ - self.assertEqual(len(expected_assets), len(actual_assets)) + assert len(expected_assets) == len(actual_assets) actual_assets_map = {asset['asset_key']: asset for asset in actual_assets} for expected_item in expected_assets: @@ -486,7 +474,7 @@ class CourseComparisonTest(TestCase): expected_content, expected_count = expected_store.get_all_content_for_course(expected_course_key) actual_content, actual_count = actual_store.get_all_content_for_course(actual_course_key) - self.assertEqual(expected_count, actual_count) + assert expected_count == actual_count self._assertAssetsEqual(expected_course_key, expected_content, actual_course_key, actual_content) expected_thumbs = expected_store.get_all_content_thumbnails_for_course(expected_course_key) actual_thumbs = actual_store.get_all_content_thumbnails_for_course(actual_course_key) @@ -503,10 +491,10 @@ class CourseComparisonTest(TestCase): actual_course_assets = actual_modulestore.get_all_asset_metadata( actual_course_key, None, sort=('displayname', ModuleStoreEnum.SortOrder.descending) ) - self.assertEqual(len(expected_course_assets), len(actual_course_assets)) + assert len(expected_course_assets) == len(actual_course_assets) for idx, __ in enumerate(expected_course_assets): for attr in AssetMetadata.ATTRS_ALLOWED_TO_UPDATE: if attr in ('edited_on',): # edited_on is updated upon import. continue - self.assertEqual(getattr(expected_course_assets[idx], attr), getattr(actual_course_assets[idx], attr)) + assert getattr(expected_course_assets[idx], attr) == getattr(actual_course_assets[idx], attr) diff --git a/common/lib/xmodule/xmodule/tests/test_annotatable_module.py b/common/lib/xmodule/xmodule/tests/test_annotatable_module.py index 26787c90c7..b0ca0d9853 100644 --- a/common/lib/xmodule/xmodule/tests/test_annotatable_module.py +++ b/common/lib/xmodule/xmodule/tests/test_annotatable_module.py @@ -51,7 +51,7 @@ class AnnotatableBlockTestCase(unittest.TestCase): # lint-amnesty, pylint: disa actual_attr = self.annotatable._get_annotation_data_attr(0, el) # lint-amnesty, pylint: disable=protected-access - self.assertIsInstance(actual_attr, dict) + assert isinstance(actual_attr, dict) self.assertDictEqual(expected_attr, actual_attr) def test_annotation_class_attr_default(self): @@ -61,7 +61,7 @@ class AnnotatableBlockTestCase(unittest.TestCase): # lint-amnesty, pylint: disa expected_attr = {'class': {'value': 'annotatable-span highlight'}} actual_attr = self.annotatable._get_annotation_class_attr(0, el) # lint-amnesty, pylint: disable=protected-access - self.assertIsInstance(actual_attr, dict) + assert isinstance(actual_attr, dict) self.assertDictEqual(expected_attr, actual_attr) def test_annotation_class_attr_with_valid_highlight(self): @@ -79,7 +79,7 @@ class AnnotatableBlockTestCase(unittest.TestCase): # lint-amnesty, pylint: disa } actual_attr = self.annotatable._get_annotation_class_attr(0, el) # lint-amnesty, pylint: disable=protected-access - self.assertIsInstance(actual_attr, dict) + assert isinstance(actual_attr, dict) self.assertDictEqual(expected_attr, actual_attr) def test_annotation_class_attr_with_invalid_highlight(self): @@ -95,7 +95,7 @@ class AnnotatableBlockTestCase(unittest.TestCase): # lint-amnesty, pylint: disa } actual_attr = self.annotatable._get_annotation_class_attr(0, el) # lint-amnesty, pylint: disable=protected-access - self.assertIsInstance(actual_attr, dict) + assert isinstance(actual_attr, dict) self.assertDictEqual(expected_attr, actual_attr) def test_render_annotation(self): @@ -105,33 +105,33 @@ class AnnotatableBlockTestCase(unittest.TestCase): # lint-amnesty, pylint: disa actual_el = etree.fromstring('z') self.annotatable._render_annotation(0, actual_el) # lint-amnesty, pylint: disable=protected-access - self.assertEqual(expected_el.tag, actual_el.tag) - self.assertEqual(expected_el.text, actual_el.text) + assert expected_el.tag == actual_el.tag + assert expected_el.text == actual_el.text self.assertDictEqual(dict(expected_el.attrib), dict(actual_el.attrib)) def test_render_content(self): content = self.annotatable._render_content() # lint-amnesty, pylint: disable=protected-access el = etree.fromstring(content) - self.assertEqual('div', el.tag, 'root tag is a div') + assert 'div' == el.tag, 'root tag is a div' expected_num_annotations = 5 actual_num_annotations = el.xpath('count(//span[contains(@class,"annotatable-span")])') - self.assertEqual(expected_num_annotations, actual_num_annotations, 'check number of annotations') + assert expected_num_annotations == actual_num_annotations, 'check number of annotations' def test_get_html(self): context = self.annotatable.get_html() for key in ['display_name', 'element_id', 'content_html', 'instructions_html']: - self.assertIn(key, context) + assert key in context def test_extract_instructions(self): xmltree = etree.fromstring(self.sample_xml) expected_xml = u"
Read the text.
" actual_xml = self.annotatable._extract_instructions(xmltree) # lint-amnesty, pylint: disable=protected-access - self.assertIsNotNone(actual_xml) - self.assertEqual(expected_xml.strip(), actual_xml.strip()) + assert actual_xml is not None + assert expected_xml.strip() == actual_xml.strip() xmltree = etree.fromstring('foo') actual = self.annotatable._extract_instructions(xmltree) # lint-amnesty, pylint: disable=protected-access - self.assertIsNone(actual) + assert actual is None diff --git a/common/lib/xmodule/xmodule/tests/test_annotator_mixin.py b/common/lib/xmodule/xmodule/tests/test_annotator_mixin.py index b4903b0863..813e265d8e 100644 --- a/common/lib/xmodule/xmodule/tests/test_annotator_mixin.py +++ b/common/lib/xmodule/xmodule/tests/test_annotator_mixin.py @@ -32,12 +32,12 @@ class HelperFunctionTest(unittest.TestCase): expected_xml = u"

Helper Test Instructions.

" actual_xml = get_instructions(xmltree) - self.assertIsNotNone(actual_xml) - self.assertEqual(expected_xml.strip(), actual_xml.strip()) + assert actual_xml is not None + assert expected_xml.strip() == actual_xml.strip() xmltree = etree.fromstring('foo') actual = get_instructions(xmltree) - self.assertIsNone(actual) + assert actual is None def test_get_extension(self): """ @@ -47,10 +47,10 @@ class HelperFunctionTest(unittest.TestCase): expectednotyoutube = 'video/mp4' result1 = get_extension(self.sample_sourceurl) result2 = get_extension(self.sample_youtubeurl) - self.assertEqual(expectedyoutube, result2) - self.assertEqual(expectednotyoutube, result1) + assert expectedyoutube == result2 + assert expectednotyoutube == result1 def test_html_to_text(self): expectedtext = "Testing here and not bolded here" result = html_to_text(self.sample_html) - self.assertEqual(expectedtext, result) + assert expectedtext == result diff --git a/common/lib/xmodule/xmodule/tests/test_capa_module.py b/common/lib/xmodule/xmodule/tests/test_capa_module.py index 0587ecf5ef..f79d197e45 100644 --- a/common/lib/xmodule/xmodule/tests/test_capa_module.py +++ b/common/lib/xmodule/xmodule/tests/test_capa_module.py @@ -12,6 +12,7 @@ import random import textwrap import unittest +import pytest import ddt import requests import six @@ -194,22 +195,21 @@ class ProblemBlockTest(unittest.TestCase): # lint-amnesty, pylint: disable=miss def test_import(self): module = CapaFactory.create() - self.assertEqual(module.get_score().raw_earned, 0) + assert module.get_score().raw_earned == 0 other_module = CapaFactory.create() - self.assertEqual(module.get_score().raw_earned, 0) - self.assertNotEqual(module.url_name, other_module.url_name, - "Factory should be creating unique names for each problem") + assert module.get_score().raw_earned == 0 + assert module.url_name != other_module.url_name, 'Factory should be creating unique names for each problem' def test_correct(self): """ Check that the factory creates correct and incorrect problems properly. """ module = CapaFactory.create() - self.assertEqual(module.get_score().raw_earned, 0) + assert module.get_score().raw_earned == 0 other_module = CapaFactory.create(correct=True) - self.assertEqual(other_module.get_score().raw_earned, 1) + assert other_module.get_score().raw_earned == 1 def test_get_score(self): """ @@ -222,17 +222,17 @@ class ProblemBlockTest(unittest.TestCase): # lint-amnesty, pylint: disable=miss module = CapaFactory.create(correct=True, override_get_score=False) module.lcp.correct_map = correct_map module.lcp.student_answers = student_answers - self.assertEqual(module.get_score().raw_earned, 0.0) + assert module.get_score().raw_earned == 0.0 module.set_score(module.score_from_lcp(module.lcp)) - self.assertEqual(module.get_score().raw_earned, 0.9) + assert module.get_score().raw_earned == 0.9 other_correct_map = CorrectMap(answer_id='1_2_1', correctness="incorrect", npoints=0.1) other_module = CapaFactory.create(correct=False, override_get_score=False) other_module.lcp.correct_map = other_correct_map other_module.lcp.student_answers = student_answers - self.assertEqual(other_module.get_score().raw_earned, 0.0) + assert other_module.get_score().raw_earned == 0.0 other_module.set_score(other_module.score_from_lcp(other_module.lcp)) - self.assertEqual(other_module.get_score().raw_earned, 0.1) + assert other_module.get_score().raw_earned == 0.1 def test_showanswer_default(self): """ @@ -241,7 +241,7 @@ class ProblemBlockTest(unittest.TestCase): # lint-amnesty, pylint: disable=miss # default, no due date, showanswer 'closed', so problem is open, and show_answer # not visible. problem = CapaFactory.create() - self.assertFalse(problem.answer_available()) + assert not problem.answer_available() @ddt.data( (requests.exceptions.ReadTimeout, (1, 'failed to read from the server')), @@ -257,13 +257,13 @@ class ProblemBlockTest(unittest.TestCase): # lint-amnesty, pylint: disable=miss with patch.object(xqueue_interface.session, 'post', side_effect=exception): # pylint: disable = protected-access response = xqueue_interface._http_post('http://some/fake/url', {}) - self.assertEqual(response, result) + assert response == result def test_showanswer_attempted(self): problem = CapaFactory.create(showanswer='attempted') - self.assertFalse(problem.answer_available()) + assert not problem.answer_available() problem.attempts = 1 - self.assertTrue(problem.answer_available()) + assert problem.answer_available() @ddt.data( # If show_correctness=always, Answer is visible after attempted @@ -285,9 +285,9 @@ class ProblemBlockTest(unittest.TestCase): # lint-amnesty, pylint: disable=miss if 'due' in problem_data: problem_data['due'] = getattr(self, problem_data['due']) problem = CapaFactory.create(**problem_data) - self.assertEqual(problem.answer_available(), answer_available_no_attempt) + assert problem.answer_available() == answer_available_no_attempt problem.attempts = 1 - self.assertEqual(problem.answer_available(), answer_available_after_attempt) + assert problem.answer_available() == answer_available_after_attempt def test_showanswer_closed(self): @@ -296,7 +296,7 @@ class ProblemBlockTest(unittest.TestCase): # lint-amnesty, pylint: disable=miss max_attempts="1", attempts="1", due=self.tomorrow_str) - self.assertTrue(used_all_attempts.answer_available()) + assert used_all_attempts.answer_available() # can see after due date after_due_date = CapaFactory.create(showanswer='closed', @@ -304,14 +304,14 @@ class ProblemBlockTest(unittest.TestCase): # lint-amnesty, pylint: disable=miss attempts="0", due=self.yesterday_str) - self.assertTrue(after_due_date.answer_available()) + assert after_due_date.answer_available() # can't see because attempts left attempts_left_open = CapaFactory.create(showanswer='closed', max_attempts="1", attempts="0", due=self.tomorrow_str) - self.assertFalse(attempts_left_open.answer_available()) + assert not attempts_left_open.answer_available() # Can't see because grace period hasn't expired still_in_grace = CapaFactory.create(showanswer='closed', @@ -319,7 +319,7 @@ class ProblemBlockTest(unittest.TestCase): # lint-amnesty, pylint: disable=miss attempts="0", due=self.yesterday_str, graceperiod=self.two_day_delta_str) - self.assertFalse(still_in_grace.answer_available()) + assert not still_in_grace.answer_available() def test_showanswer_correct_or_past_due(self): """ @@ -333,14 +333,14 @@ class ProblemBlockTest(unittest.TestCase): # lint-amnesty, pylint: disable=miss attempts="0", due=self.tomorrow_str, correct=True) - self.assertTrue(answer_correct.answer_available()) + assert answer_correct.answer_available() # can see after due date, even when answer isn't correct past_due_date = CapaFactory.create(showanswer='correct_or_past_due', max_attempts="1", attempts="0", due=self.yesterday_str) - self.assertTrue(past_due_date.answer_available()) + assert past_due_date.answer_available() # can also see after due date when answer _is_ correct past_due_date_correct = CapaFactory.create(showanswer='correct_or_past_due', @@ -348,7 +348,7 @@ class ProblemBlockTest(unittest.TestCase): # lint-amnesty, pylint: disable=miss attempts="0", due=self.yesterday_str, correct=True) - self.assertTrue(past_due_date_correct.answer_available()) + assert past_due_date_correct.answer_available() # Can't see because grace period hasn't expired and answer isn't correct still_in_grace = CapaFactory.create(showanswer='correct_or_past_due', @@ -356,7 +356,7 @@ class ProblemBlockTest(unittest.TestCase): # lint-amnesty, pylint: disable=miss attempts="1", due=self.yesterday_str, graceperiod=self.two_day_delta_str) - self.assertFalse(still_in_grace.answer_available()) + assert not still_in_grace.answer_available() def test_showanswer_past_due(self): """ @@ -369,21 +369,21 @@ class ProblemBlockTest(unittest.TestCase): # lint-amnesty, pylint: disable=miss max_attempts="1", attempts="1", due=self.tomorrow_str) - self.assertFalse(used_all_attempts.answer_available()) + assert not used_all_attempts.answer_available() # can see after due date past_due_date = CapaFactory.create(showanswer='past_due', max_attempts="1", attempts="0", due=self.yesterday_str) - self.assertTrue(past_due_date.answer_available()) + assert past_due_date.answer_available() # can't see because attempts left attempts_left_open = CapaFactory.create(showanswer='past_due', max_attempts="1", attempts="0", due=self.tomorrow_str) - self.assertFalse(attempts_left_open.answer_available()) + assert not attempts_left_open.answer_available() # Can't see because grace period hasn't expired, even though have no more # attempts. @@ -392,7 +392,7 @@ class ProblemBlockTest(unittest.TestCase): # lint-amnesty, pylint: disable=miss attempts="1", due=self.yesterday_str, graceperiod=self.two_day_delta_str) - self.assertFalse(still_in_grace.answer_available()) + assert not still_in_grace.answer_available() def test_showanswer_after_attempts_with_max(self): """ @@ -408,7 +408,7 @@ class ProblemBlockTest(unittest.TestCase): # lint-amnesty, pylint: disable=miss attempts_before_showanswer_button='3', max_attempts='5', ) - self.assertFalse(problem.answer_available()) + assert not problem.answer_available() def test_showanswer_after_attempts_no_max(self): """ @@ -423,7 +423,7 @@ class ProblemBlockTest(unittest.TestCase): # lint-amnesty, pylint: disable=miss attempts='2', attempts_before_showanswer_button='3', ) - self.assertFalse(problem.answer_available()) + assert not problem.answer_available() def test_showanswer_after_attempts_used_all_attempts(self): """ @@ -440,7 +440,7 @@ class ProblemBlockTest(unittest.TestCase): # lint-amnesty, pylint: disable=miss attempts='3', due=self.tomorrow_str, ) - self.assertTrue(problem.answer_available()) + assert problem.answer_available() def test_showanswer_after_attempts_past_due_date(self): """ @@ -455,7 +455,7 @@ class ProblemBlockTest(unittest.TestCase): # lint-amnesty, pylint: disable=miss attempts='2', due=self.yesterday_str, ) - self.assertTrue(problem.answer_available()) + assert problem.answer_available() def test_showanswer_after_attempts_still_in_grace(self): """ @@ -471,7 +471,7 @@ class ProblemBlockTest(unittest.TestCase): # lint-amnesty, pylint: disable=miss due=self.yesterday_str, graceperiod=self.two_day_delta_str, ) - self.assertTrue(problem.answer_available()) + assert problem.answer_available() def test_showanswer_after_attempts_large(self): """ @@ -487,7 +487,7 @@ class ProblemBlockTest(unittest.TestCase): # lint-amnesty, pylint: disable=miss max_attempts='3', attempts='3', ) - self.assertTrue(problem.answer_available()) + assert problem.answer_available() def test_showanswer_after_attempts_zero(self): """ @@ -501,7 +501,7 @@ class ProblemBlockTest(unittest.TestCase): # lint-amnesty, pylint: disable=miss attempts_before_showanswer_button='0', attempts='0', ) - self.assertTrue(problem.answer_available()) + assert problem.answer_available() def test_showanswer_finished(self): """ @@ -514,21 +514,21 @@ class ProblemBlockTest(unittest.TestCase): # lint-amnesty, pylint: disable=miss max_attempts="1", attempts="1", due=self.tomorrow_str) - self.assertTrue(used_all_attempts.answer_available()) + assert used_all_attempts.answer_available() # can see after due date past_due_date = CapaFactory.create(showanswer='finished', max_attempts="1", attempts="0", due=self.yesterday_str) - self.assertTrue(past_due_date.answer_available()) + assert past_due_date.answer_available() # can't see because attempts left and wrong attempts_left_open = CapaFactory.create(showanswer='finished', max_attempts="1", attempts="0", due=self.tomorrow_str) - self.assertFalse(attempts_left_open.answer_available()) + assert not attempts_left_open.answer_available() # _can_ see because attempts left and right correct_ans = CapaFactory.create(showanswer='finished', @@ -536,7 +536,7 @@ class ProblemBlockTest(unittest.TestCase): # lint-amnesty, pylint: disable=miss attempts="0", due=self.tomorrow_str, correct=True) - self.assertTrue(correct_ans.answer_available()) + assert correct_ans.answer_available() # Can see even though grace period hasn't expired, because have no more # attempts. @@ -545,7 +545,7 @@ class ProblemBlockTest(unittest.TestCase): # lint-amnesty, pylint: disable=miss attempts="1", due=self.yesterday_str, graceperiod=self.two_day_delta_str) - self.assertTrue(still_in_grace.answer_available()) + assert still_in_grace.answer_available() def test_showanswer_answered(self): """ @@ -560,7 +560,7 @@ class ProblemBlockTest(unittest.TestCase): # lint-amnesty, pylint: disable=miss due=self.tomorrow_str, correct=False ) - self.assertFalse(answer_wrong.answer_available()) + assert not answer_wrong.answer_available() # Expect to see "Show Answer" when answer is correct answer_correct = CapaFactory.create( @@ -570,7 +570,7 @@ class ProblemBlockTest(unittest.TestCase): # lint-amnesty, pylint: disable=miss due=self.tomorrow_str, correct=True ) - self.assertTrue(answer_correct.answer_available()) + assert answer_correct.answer_available() @ddt.data('', 'other-value') def test_show_correctness_other(self, show_correctness): @@ -579,21 +579,21 @@ class ProblemBlockTest(unittest.TestCase): # lint-amnesty, pylint: disable=miss from SHOW_CORRECTNESS constant. """ problem = CapaFactory.create(show_correctness=show_correctness) - self.assertTrue(problem.correctness_available()) + assert problem.correctness_available() def test_show_correctness_default(self): """ Test that correctness is visible by default. """ problem = CapaFactory.create() - self.assertTrue(problem.correctness_available()) + assert problem.correctness_available() def test_show_correctness_never(self): """ Test that correctness is hidden when show_correctness turned off. """ problem = CapaFactory.create(show_correctness='never') - self.assertFalse(problem.correctness_available()) + assert not problem.correctness_available() @ddt.data( # Correctness not visible if due date in the future, even after using up all attempts @@ -616,34 +616,34 @@ class ProblemBlockTest(unittest.TestCase): # lint-amnesty, pylint: disable=miss if 'graceperiod' in problem_data: problem_data['graceperiod'] = getattr(self, problem_data['graceperiod']) problem = CapaFactory.create(**problem_data) - self.assertEqual(problem.correctness_available(), expected_result) + assert problem.correctness_available() == expected_result def test_closed(self): # Attempts < Max attempts --> NOT closed module = CapaFactory.create(max_attempts="1", attempts="0") - self.assertFalse(module.closed()) + assert not module.closed() # Attempts < Max attempts --> NOT closed module = CapaFactory.create(max_attempts="2", attempts="1") - self.assertFalse(module.closed()) + assert not module.closed() # Attempts = Max attempts --> closed module = CapaFactory.create(max_attempts="1", attempts="1") - self.assertTrue(module.closed()) + assert module.closed() # Attempts > Max attempts --> closed module = CapaFactory.create(max_attempts="1", attempts="2") - self.assertTrue(module.closed()) + assert module.closed() # Max attempts = 0 --> closed module = CapaFactory.create(max_attempts="0", attempts="2") - self.assertTrue(module.closed()) + assert module.closed() # Past due --> closed module = CapaFactory.create(max_attempts="1", attempts="0", due=self.yesterday_str) - self.assertTrue(module.closed()) + assert module.closed() def test_parse_get_params(self): @@ -664,25 +664,25 @@ class ProblemBlockTest(unittest.TestCase): # lint-amnesty, pylint: disable=miss # and that we get the same values back for key in result.keys(): # lint-amnesty, pylint: disable=consider-iterating-dictionary original_key = "input_" + key - self.assertIn(original_key, valid_get_dict, "Output dict should have key %s" % original_key) - self.assertEqual(valid_get_dict[original_key], result[key]) + assert original_key in valid_get_dict, ('Output dict should have key %s' % original_key) + assert valid_get_dict[original_key] == result[key] # Valid GET param dict with list keys # Each tuple represents a single parameter in the query string valid_get_dict = MultiDict((('input_2[]', 'test1'), ('input_2[]', 'test2'))) result = ProblemBlock.make_dict_of_responses(valid_get_dict) - self.assertIn('2', result) - self.assertEqual(['test1', 'test2'], result['2']) + assert '2' in result + assert ['test1', 'test2'] == result['2'] # If we use [] at the end of a key name, we should always # get a list, even if there's just one value valid_get_dict = MultiDict({'input_1[]': 'test'}) result = ProblemBlock.make_dict_of_responses(valid_get_dict) - self.assertEqual(result['1'], ['test']) + assert result['1'] == ['test'] # If we have no underscores in the name, then the key is invalid invalid_get_dict = MultiDict({'input': 'test'}) - with self.assertRaises(ValueError): + with pytest.raises(ValueError): result = ProblemBlock.make_dict_of_responses(invalid_get_dict) # Two equivalent names (one list, one non-list) @@ -690,7 +690,7 @@ class ProblemBlockTest(unittest.TestCase): # lint-amnesty, pylint: disable=miss # and raise an exception invalid_get_dict = MultiDict({'input_1[]': 'test 1', 'input_1': 'test 2'}) - with self.assertRaises(ValueError): + with pytest.raises(ValueError): result = ProblemBlock.make_dict_of_responses(invalid_get_dict) def test_submit_problem_correct(self): @@ -710,15 +710,15 @@ class ProblemBlockTest(unittest.TestCase): # lint-amnesty, pylint: disable=miss result = module.submit_problem(get_request_dict) # Expect that the problem is marked correct - self.assertEqual(result['success'], 'correct') + assert result['success'] == 'correct' # Expect that we get the (mocked) HTML - self.assertEqual(result['contents'], 'Test HTML') + assert result['contents'] == 'Test HTML' # Expect that the number of attempts is incremented by 1 - self.assertEqual(module.attempts, 2) + assert module.attempts == 2 # and that this was considered attempt number 2 for grading purposes - self.assertEqual(module.lcp.context['attempt'], 2) + assert module.lcp.context['attempt'] == 2 def test_submit_problem_incorrect(self): @@ -733,12 +733,12 @@ class ProblemBlockTest(unittest.TestCase): # lint-amnesty, pylint: disable=miss result = module.submit_problem(get_request_dict) # Expect that the problem is marked correct - self.assertEqual(result['success'], 'incorrect') + assert result['success'] == 'incorrect' # Expect that the number of attempts is incremented by 1 - self.assertEqual(module.attempts, 1) + assert module.attempts == 1 # and that this is considered the first attempt - self.assertEqual(module.lcp.context['attempt'], 1) + assert module.lcp.context['attempt'] == 1 def test_submit_problem_closed(self): module = CapaFactory.create(attempts=3) @@ -747,12 +747,12 @@ class ProblemBlockTest(unittest.TestCase): # lint-amnesty, pylint: disable=miss # Simulate that ProblemBlock.closed() always returns True with patch('xmodule.capa_module.ProblemBlock.closed') as mock_closed: mock_closed.return_value = True - with self.assertRaises(xmodule.exceptions.NotFoundError): + with pytest.raises(xmodule.exceptions.NotFoundError): get_request_dict = {CapaFactory.input_key(): '3.14'} module.submit_problem(get_request_dict) # Expect that number of attempts NOT incremented - self.assertEqual(module.attempts, 3) + assert module.attempts == 3 @ddt.data( RANDOMIZATION.ALWAYS, @@ -766,12 +766,12 @@ class ProblemBlockTest(unittest.TestCase): # lint-amnesty, pylint: disable=miss module.done = True # Expect that we cannot submit - with self.assertRaises(xmodule.exceptions.NotFoundError): + with pytest.raises(xmodule.exceptions.NotFoundError): get_request_dict = {CapaFactory.input_key(): '3.14'} module.submit_problem(get_request_dict) # Expect that number of attempts NOT incremented - self.assertEqual(module.attempts, 0) + assert module.attempts == 0 @ddt.data( RANDOMIZATION.NEVER, @@ -786,11 +786,11 @@ class ProblemBlockTest(unittest.TestCase): # lint-amnesty, pylint: disable=miss get_request_dict = {CapaFactory.input_key(): '3.14'} result = module.submit_problem(get_request_dict) - self.assertEqual(result['success'], 'correct') + assert result['success'] == 'correct' # Expect that number of attempts IS incremented, still same attempt - self.assertEqual(module.attempts, 1) - self.assertEqual(module.lcp.context['attempt'], 1) + assert module.attempts == 1 + assert module.lcp.context['attempt'] == 1 def test_submit_problem_queued(self): module = CapaFactory.create(attempts=1) @@ -809,10 +809,10 @@ class ProblemBlockTest(unittest.TestCase): # lint-amnesty, pylint: disable=miss result = module.submit_problem(get_request_dict) # Expect an AJAX alert message in 'success' - self.assertIn('You must wait', result['success']) + assert 'You must wait' in result['success'] # Expect that the number of attempts is NOT incremented - self.assertEqual(module.attempts, 1) + assert module.attempts == 1 def test_submit_problem_with_files(self): # Check a problem with uploaded files, using the submit_problem API. @@ -859,11 +859,11 @@ class ProblemBlockTest(unittest.TestCase): # lint-amnesty, pylint: disable=miss # ) # pylint: enable=line-too-long - self.assertEqual(xqueue_interface._http_post.call_count, 1) + assert xqueue_interface._http_post.call_count == 1 _, kwargs = xqueue_interface._http_post.call_args six.assertCountEqual(self, fpaths, list(kwargs['files'].keys())) for fpath, fileobj in six.iteritems(kwargs['files']): - self.assertEqual(fpath, fileobj.name) + assert fpath == fileobj.name def test_submit_problem_with_files_as_xblock(self): # Check a problem with uploaded files, using the XBlock API. @@ -892,11 +892,11 @@ class ProblemBlockTest(unittest.TestCase): # lint-amnesty, pylint: disable=miss module.handle('xmodule_handler', request, 'problem_check') - self.assertEqual(xqueue_interface._http_post.call_count, 1) + assert xqueue_interface._http_post.call_count == 1 _, kwargs = xqueue_interface._http_post.call_args six.assertCountEqual(self, fnames, list(kwargs['files'].keys())) for fpath, fileobj in six.iteritems(kwargs['files']): - self.assertEqual(fpath, fileobj.name) + assert fpath == fileobj.name def test_submit_problem_error(self): @@ -918,12 +918,12 @@ class ProblemBlockTest(unittest.TestCase): # lint-amnesty, pylint: disable=miss # Expect an AJAX alert message in 'success' expected_msg = 'test error' - self.assertEqual(expected_msg, result['success']) + assert expected_msg == result['success'] # Expect that the number of attempts is NOT incremented - self.assertEqual(module.attempts, 1) + assert module.attempts == 1 # but that this was considered attempt number 2 for grading purposes - self.assertEqual(module.lcp.context['attempt'], 2) + assert module.lcp.context['attempt'] == 2 def test_submit_problem_error_with_codejail_exception(self): @@ -953,12 +953,12 @@ class ProblemBlockTest(unittest.TestCase): # lint-amnesty, pylint: disable=miss # Expect an AJAX alert message in 'success' without the text of the stack trace expected_msg = 'Couldn\'t execute jailed code' - self.assertEqual(expected_msg, result['success']) + assert expected_msg == result['success'] # Expect that the number of attempts is NOT incremented - self.assertEqual(module.attempts, 1) + assert module.attempts == 1 # but that this was considered the second attempt for grading purposes - self.assertEqual(module.lcp.context['attempt'], 2) + assert module.lcp.context['attempt'] == 2 def test_submit_problem_other_errors(self): """ @@ -981,7 +981,7 @@ class ProblemBlockTest(unittest.TestCase): # lint-amnesty, pylint: disable=miss result = module.submit_problem(get_request_dict) # Expect an AJAX alert message in 'success' - self.assertIn(error_msg, result['success']) + assert error_msg in result['success'] def test_submit_problem_zero_max_grade(self): """ @@ -1017,12 +1017,12 @@ class ProblemBlockTest(unittest.TestCase): # lint-amnesty, pylint: disable=miss # Expect an AJAX alert message in 'success' expected_msg = u'ȧƈƈḗƞŧḗḓ ŧḗẋŧ ƒǿř ŧḗşŧīƞɠ' - self.assertEqual(expected_msg, result['success']) + assert expected_msg == result['success'] # Expect that the number of attempts is NOT incremented - self.assertEqual(module.attempts, 1) + assert module.attempts == 1 # but that this was considered the second attempt for grading purposes - self.assertEqual(module.lcp.context['attempt'], 2) + assert module.lcp.context['attempt'] == 2 def test_submit_problem_error_with_staff_user(self): @@ -1041,15 +1041,15 @@ class ProblemBlockTest(unittest.TestCase): # lint-amnesty, pylint: disable=miss result = module.submit_problem(get_request_dict) # Expect an AJAX alert message in 'success' - self.assertIn('test error', result['success']) + assert 'test error' in result['success'] # We DO include traceback information for staff users - self.assertIn('Traceback', result['success']) + assert 'Traceback' in result['success'] # Expect that the number of attempts is NOT incremented - self.assertEqual(module.attempts, 1) + assert module.attempts == 1 # but that it was considered the second attempt for grading purposes - self.assertEqual(module.lcp.context['attempt'], 2) + assert module.lcp.context['attempt'] == 2 @ddt.data( ("never", True, None, 'submitted'), @@ -1075,12 +1075,12 @@ class ProblemBlockTest(unittest.TestCase): # lint-amnesty, pylint: disable=miss result = json.loads(json_result) # Expect that the AJAX result withholds correctness and score - self.assertEqual(result['current_score'], expected_score) - self.assertEqual(result['success'], expected_success) + assert result['current_score'] == expected_score + assert result['success'] == expected_success # Expect that the number of attempts is incremented by 1 - self.assertEqual(module.attempts, 1) - self.assertEqual(module.lcp.context['attempt'], 1) + assert module.attempts == 1 + assert module.lcp.context['attempt'] == 1 def test_reset_problem(self): module = CapaFactory.create(done=True) @@ -1096,11 +1096,11 @@ class ProblemBlockTest(unittest.TestCase): # lint-amnesty, pylint: disable=miss result = module.reset_problem(get_request_dict) # Expect that the request was successful - self.assertTrue('success' in result and result['success']) + assert (('success' in result) and result['success']) # Expect that the problem HTML is retrieved - self.assertIn('html', result) - self.assertEqual(result['html'], "
Test HTML
") + assert 'html' in result + assert result['html'] == '
Test HTML
' # Expect that the problem was reset module.new_lcp.assert_called_once_with(None) @@ -1118,7 +1118,7 @@ class ProblemBlockTest(unittest.TestCase): # lint-amnesty, pylint: disable=miss result = module.reset_problem(get_request_dict) # Expect that the problem was NOT reset - self.assertTrue('success' in result and not result['success']) + assert (('success' in result) and (not result['success'])) def test_reset_problem_not_done(self): # Simulate that the problem is NOT done @@ -1129,7 +1129,7 @@ class ProblemBlockTest(unittest.TestCase): # lint-amnesty, pylint: disable=miss result = module.reset_problem(get_request_dict) # Expect that the problem was NOT reset - self.assertTrue('success' in result and not result['success']) + assert (('success' in result) and (not result['success'])) def test_rescore_problem_correct(self): @@ -1152,12 +1152,12 @@ class ProblemBlockTest(unittest.TestCase): # lint-amnesty, pylint: disable=miss module.rescore(only_if_higher=False) # Expect that the problem is marked correct - self.assertEqual(module.is_correct(), True) + assert module.is_correct() is True # Expect that the number of attempts is not incremented - self.assertEqual(module.attempts, 1) + assert module.attempts == 1 # and that this was considered attempt number 1 for grading purposes - self.assertEqual(module.lcp.context['attempt'], 1) + assert module.lcp.context['attempt'] == 1 def test_rescore_problem_additional_correct(self): # make sure it also works when new correct answer has been added @@ -1169,13 +1169,13 @@ class ProblemBlockTest(unittest.TestCase): # lint-amnesty, pylint: disable=miss result = module.submit_problem(get_request_dict) # Expect that the problem is marked incorrect and user didn't earn score - self.assertEqual(result['success'], 'incorrect') - self.assertEqual(module.get_score(), (0, 1)) - self.assertEqual(module.correct_map[answer_id]['correctness'], 'incorrect') + assert result['success'] == 'incorrect' + assert module.get_score() == (0, 1) + assert module.correct_map[answer_id]['correctness'] == 'incorrect' # Expect that the number of attempts has incremented to 1 - self.assertEqual(module.attempts, 1) - self.assertEqual(module.lcp.context['attempt'], 1) + assert module.attempts == 1 + assert module.lcp.context['attempt'] == 1 # Simulate that after making an incorrect answer to the correct answer # the new calculated score is (1,1) @@ -1191,12 +1191,12 @@ class ProblemBlockTest(unittest.TestCase): # lint-amnesty, pylint: disable=miss module.rescore(only_if_higher=True) # Expect that the problem is marked correct and user earned the score - self.assertEqual(module.get_score(), (1, 1)) - self.assertEqual(module.correct_map[answer_id]['correctness'], 'correct') + assert module.get_score() == (1, 1) + assert module.correct_map[answer_id]['correctness'] == 'correct' # Expect that the number of attempts is not incremented - self.assertEqual(module.attempts, 1) + assert module.attempts == 1 # and hence that this was still considered the first attempt for grading purposes - self.assertEqual(module.lcp.context['attempt'], 1) + assert module.lcp.context['attempt'] == 1 def test_rescore_problem_incorrect(self): # make sure it also works when attempts have been reset, @@ -1210,19 +1210,19 @@ class ProblemBlockTest(unittest.TestCase): # lint-amnesty, pylint: disable=miss module.rescore(only_if_higher=False) # Expect that the problem is marked incorrect - self.assertEqual(module.is_correct(), False) + assert module.is_correct() is False # Expect that the number of attempts is not incremented - self.assertEqual(module.attempts, 0) + assert module.attempts == 0 # and that this is treated as the first attempt for grading purposes - self.assertEqual(module.lcp.context['attempt'], 1) + assert module.lcp.context['attempt'] == 1 def test_rescore_problem_not_done(self): # Simulate that the problem is NOT done module = CapaFactory.create(done=False) # Try to rescore the problem, and get exception - with self.assertRaises(xmodule.exceptions.NotFoundError): + with pytest.raises(xmodule.exceptions.NotFoundError): module.rescore(only_if_higher=False) def test_rescore_problem_not_supported(self): @@ -1231,7 +1231,7 @@ class ProblemBlockTest(unittest.TestCase): # lint-amnesty, pylint: disable=miss # Try to rescore the problem, and get exception with patch('capa.capa_problem.LoncapaProblem.supports_rescoring') as mock_supports_rescoring: mock_supports_rescoring.return_value = False - with self.assertRaises(NotImplementedError): + with pytest.raises(NotImplementedError): module.rescore(only_if_higher=False) def _rescore_problem_error_helper(self, exception_class): @@ -1242,13 +1242,13 @@ class ProblemBlockTest(unittest.TestCase): # lint-amnesty, pylint: disable=miss # Simulate answering a problem that raises the exception with patch('capa.capa_problem.LoncapaProblem.get_grade_from_current_answers') as mock_rescore: mock_rescore.side_effect = exception_class(u'test error \u03a9') - with self.assertRaises(exception_class): + with pytest.raises(exception_class): module.rescore(only_if_higher=False) # Expect that the number of attempts is NOT incremented - self.assertEqual(module.attempts, 1) + assert module.attempts == 1 # and that this was considered the first attempt for grading purposes - self.assertEqual(module.lcp.context['attempt'], 1) + assert module.lcp.context['attempt'] == 1 def test_rescore_problem_student_input_error(self): self._rescore_problem_error_helper(StudentInputError) @@ -1268,10 +1268,10 @@ class ProblemBlockTest(unittest.TestCase): # lint-amnesty, pylint: disable=miss # Expect that answers are saved to the problem expected_answers = {CapaFactory.answer_key(): '3.14'} - self.assertEqual(module.lcp.student_answers, expected_answers) + assert module.lcp.student_answers == expected_answers # Expect that the result is success - self.assertTrue('success' in result and result['success']) + assert (('success' in result) and result['success']) def test_save_problem_closed(self): module = CapaFactory.create(done=False) @@ -1285,7 +1285,7 @@ class ProblemBlockTest(unittest.TestCase): # lint-amnesty, pylint: disable=miss result = module.save_problem(get_request_dict) # Expect that the result is failure - self.assertTrue('success' in result and not result['success']) + assert (('success' in result) and (not result['success'])) @ddt.data( RANDOMIZATION.ALWAYS, @@ -1300,7 +1300,7 @@ class ProblemBlockTest(unittest.TestCase): # lint-amnesty, pylint: disable=miss result = module.save_problem(get_request_dict) # Expect that we cannot save - self.assertTrue('success' in result and not result['success']) + assert (('success' in result) and (not result['success'])) @ddt.data( RANDOMIZATION.NEVER, @@ -1316,15 +1316,15 @@ class ProblemBlockTest(unittest.TestCase): # lint-amnesty, pylint: disable=miss result = module.save_problem(get_request_dict) # Expect that we succeed - self.assertTrue('success' in result and result['success']) + assert (('success' in result) and result['success']) def test_submit_button_name(self): module = CapaFactory.create(attempts=0) - self.assertEqual(module.submit_button_name(), "Submit") + assert module.submit_button_name() == 'Submit' def test_submit_button_submitting_name(self): module = CapaFactory.create(attempts=1, max_attempts=10) - self.assertEqual(module.submit_button_submitting_name(), "Submitting") + assert module.submit_button_submitting_name() == 'Submitting' def test_should_enable_submit_button(self): @@ -1332,41 +1332,41 @@ class ProblemBlockTest(unittest.TestCase): # lint-amnesty, pylint: disable=miss # If we're after the deadline, disable the submit button module = CapaFactory.create(due=self.yesterday_str) - self.assertFalse(module.should_enable_submit_button()) + assert not module.should_enable_submit_button() # If user is out of attempts, disable the submit button module = CapaFactory.create(attempts=attempts, max_attempts=attempts) - self.assertFalse(module.should_enable_submit_button()) + assert not module.should_enable_submit_button() # If survey question (max_attempts = 0), disable the submit button module = CapaFactory.create(max_attempts=0) - self.assertFalse(module.should_enable_submit_button()) + assert not module.should_enable_submit_button() # If user submitted a problem but hasn't reset, # disable the submit button # Note: we can only reset when rerandomize="always" or "true" module = CapaFactory.create(rerandomize=RANDOMIZATION.ALWAYS, done=True) - self.assertFalse(module.should_enable_submit_button()) + assert not module.should_enable_submit_button() module = CapaFactory.create(rerandomize="true", done=True) - self.assertFalse(module.should_enable_submit_button()) + assert not module.should_enable_submit_button() # Otherwise, enable the submit button module = CapaFactory.create() - self.assertTrue(module.should_enable_submit_button()) + assert module.should_enable_submit_button() # If the user has submitted the problem # and we do NOT have a reset button, then we can enable the submit button # Setting rerandomize to "never" or "false" ensures that the reset button # is not shown module = CapaFactory.create(rerandomize=RANDOMIZATION.NEVER, done=True) - self.assertTrue(module.should_enable_submit_button()) + assert module.should_enable_submit_button() module = CapaFactory.create(rerandomize="false", done=True) - self.assertTrue(module.should_enable_submit_button()) + assert module.should_enable_submit_button() module = CapaFactory.create(rerandomize=RANDOMIZATION.PER_STUDENT, done=True) - self.assertTrue(module.should_enable_submit_button()) + assert module.should_enable_submit_button() def test_should_show_reset_button(self): @@ -1374,43 +1374,43 @@ class ProblemBlockTest(unittest.TestCase): # lint-amnesty, pylint: disable=miss # If we're after the deadline, do NOT show the reset button module = CapaFactory.create(due=self.yesterday_str, done=True) - self.assertFalse(module.should_show_reset_button()) + assert not module.should_show_reset_button() # If the user is out of attempts, do NOT show the reset button module = CapaFactory.create(attempts=attempts, max_attempts=attempts, done=True) - self.assertFalse(module.should_show_reset_button()) + assert not module.should_show_reset_button() # pre studio default value, DO show the reset button module = CapaFactory.create(rerandomize=RANDOMIZATION.ALWAYS, done=True) - self.assertTrue(module.should_show_reset_button()) + assert module.should_show_reset_button() # If survey question for capa (max_attempts = 0), # DO show the reset button module = CapaFactory.create(rerandomize=RANDOMIZATION.ALWAYS, max_attempts=0, done=True) - self.assertTrue(module.should_show_reset_button()) + assert module.should_show_reset_button() # If the question is not correct # DO show the reset button module = CapaFactory.create(rerandomize=RANDOMIZATION.ALWAYS, max_attempts=0, done=True, correct=False) - self.assertTrue(module.should_show_reset_button()) + assert module.should_show_reset_button() # If the question is correct and randomization is never # DO not show the reset button module = CapaFactory.create(rerandomize=RANDOMIZATION.NEVER, max_attempts=0, done=True, correct=True) - self.assertFalse(module.should_show_reset_button()) + assert not module.should_show_reset_button() # If the question is correct and randomization is always # Show the reset button module = CapaFactory.create(rerandomize=RANDOMIZATION.ALWAYS, max_attempts=0, done=True, correct=True) - self.assertTrue(module.should_show_reset_button()) + assert module.should_show_reset_button() # Don't show reset button if randomization is turned on and the question is not done module = CapaFactory.create(rerandomize=RANDOMIZATION.ALWAYS, show_reset_button=False, done=False) - self.assertFalse(module.should_show_reset_button()) + assert not module.should_show_reset_button() # Show reset button if randomization is turned on and the problem is done module = CapaFactory.create(rerandomize=RANDOMIZATION.ALWAYS, show_reset_button=False, done=True) - self.assertTrue(module.should_show_reset_button()) + assert module.should_show_reset_button() def test_should_show_save_button(self): @@ -1418,49 +1418,49 @@ class ProblemBlockTest(unittest.TestCase): # lint-amnesty, pylint: disable=miss # If we're after the deadline, do NOT show the save button module = CapaFactory.create(due=self.yesterday_str, done=True) - self.assertFalse(module.should_show_save_button()) + assert not module.should_show_save_button() # If the user is out of attempts, do NOT show the save button module = CapaFactory.create(attempts=attempts, max_attempts=attempts, done=True) - self.assertFalse(module.should_show_save_button()) + assert not module.should_show_save_button() # If user submitted a problem but hasn't reset, do NOT show the save button module = CapaFactory.create(rerandomize=RANDOMIZATION.ALWAYS, done=True) - self.assertFalse(module.should_show_save_button()) + assert not module.should_show_save_button() module = CapaFactory.create(rerandomize="true", done=True) - self.assertFalse(module.should_show_save_button()) + assert not module.should_show_save_button() # If the user has unlimited attempts and we are not randomizing, # then do NOT show a save button # because they can keep using "Check" module = CapaFactory.create(max_attempts=None, rerandomize=RANDOMIZATION.NEVER, done=False) - self.assertFalse(module.should_show_save_button()) + assert not module.should_show_save_button() module = CapaFactory.create(max_attempts=None, rerandomize="false", done=True) - self.assertFalse(module.should_show_save_button()) + assert not module.should_show_save_button() module = CapaFactory.create(max_attempts=None, rerandomize=RANDOMIZATION.PER_STUDENT, done=True) - self.assertFalse(module.should_show_save_button()) + assert not module.should_show_save_button() # pre-studio default, DO show the save button module = CapaFactory.create(rerandomize=RANDOMIZATION.ALWAYS, done=False) - self.assertTrue(module.should_show_save_button()) + assert module.should_show_save_button() # If we're not randomizing and we have limited attempts, then we can save module = CapaFactory.create(rerandomize=RANDOMIZATION.NEVER, max_attempts=2, done=True) - self.assertTrue(module.should_show_save_button()) + assert module.should_show_save_button() module = CapaFactory.create(rerandomize="false", max_attempts=2, done=True) - self.assertTrue(module.should_show_save_button()) + assert module.should_show_save_button() module = CapaFactory.create(rerandomize=RANDOMIZATION.PER_STUDENT, max_attempts=2, done=True) - self.assertTrue(module.should_show_save_button()) + assert module.should_show_save_button() # If survey question for capa (max_attempts = 0), # DO show the save button module = CapaFactory.create(max_attempts=0, done=False) - self.assertTrue(module.should_show_save_button()) + assert module.should_show_save_button() def test_should_show_save_button_force_save_button(self): # If we're after the deadline, do NOT show the save button @@ -1468,7 +1468,7 @@ class ProblemBlockTest(unittest.TestCase): # lint-amnesty, pylint: disable=miss module = CapaFactory.create(due=self.yesterday_str, force_save_button="true", done=True) - self.assertFalse(module.should_show_save_button()) + assert not module.should_show_save_button() # If the user is out of attempts, do NOT show the save button attempts = random.randint(1, 10) @@ -1476,7 +1476,7 @@ class ProblemBlockTest(unittest.TestCase): # lint-amnesty, pylint: disable=miss max_attempts=attempts, force_save_button="true", done=True) - self.assertFalse(module.should_show_save_button()) + assert not module.should_show_save_button() # Otherwise, if we force the save button, # then show it even if we would ordinarily @@ -1484,17 +1484,17 @@ class ProblemBlockTest(unittest.TestCase): # lint-amnesty, pylint: disable=miss module = CapaFactory.create(force_save_button="true", rerandomize=RANDOMIZATION.ALWAYS, done=True) - self.assertTrue(module.should_show_save_button()) + assert module.should_show_save_button() module = CapaFactory.create(force_save_button="true", rerandomize="true", done=True) - self.assertTrue(module.should_show_save_button()) + assert module.should_show_save_button() def test_no_max_attempts(self): module = CapaFactory.create(max_attempts='') html = module.get_problem_html() - self.assertIsNotNone(html) + assert html is not None # assert that we got here without exploding def test_get_problem_html(self): @@ -1524,24 +1524,24 @@ class ProblemBlockTest(unittest.TestCase): # lint-amnesty, pylint: disable=miss html_encapsulated = module.get_problem_html(encapsulate=True) # Expect that we get the rendered template back - self.assertEqual(html, "
Test Template HTML
") + assert html == '
Test Template HTML
' # Check the rendering context render_args, _ = module.system.render_template.call_args - self.assertEqual(len(render_args), 2) + assert len(render_args) == 2 template_name = render_args[0] - self.assertEqual(template_name, "problem.html") + assert template_name == 'problem.html' context = render_args[1] - self.assertEqual(context['problem']['html'], "
Test Problem HTML
") - self.assertEqual(bool(context['should_enable_submit_button']), enable_submit_button) - self.assertEqual(bool(context['reset_button']), show_reset_button) - self.assertEqual(bool(context['save_button']), show_save_button) - self.assertFalse(context['demand_hint_possible']) + assert context['problem']['html'] == '
Test Problem HTML
' + assert bool(context['should_enable_submit_button']) == enable_submit_button + assert bool(context['reset_button']) == show_reset_button + assert bool(context['save_button']) == show_save_button + assert not context['demand_hint_possible'] # Assert that the encapsulated html contains the original html - self.assertIn(html, html_encapsulated) + assert html in html_encapsulated demand_xml = """ @@ -1565,21 +1565,21 @@ class ProblemBlockTest(unittest.TestCase): # lint-amnesty, pylint: disable=miss module = CapaFactory.create(xml=self.demand_xml) module.get_problem_html() # ignoring html result context = module.system.render_template.call_args[0][1] - self.assertTrue(context['demand_hint_possible']) - self.assertTrue(context['should_enable_next_hint']) + assert context['demand_hint_possible'] + assert context['should_enable_next_hint'] # Check the AJAX call that gets the hint by index result = module.get_demand_hint(0) - self.assertEqual(result['hint_index'], 0) - self.assertTrue(result['should_enable_next_hint']) + assert result['hint_index'] == 0 + assert result['should_enable_next_hint'] result = module.get_demand_hint(1) - self.assertEqual(result['hint_index'], 1) - self.assertFalse(result['should_enable_next_hint']) + assert result['hint_index'] == 1 + assert not result['should_enable_next_hint'] result = module.get_demand_hint(2) # here the server wraps around to index 0 - self.assertEqual(result['hint_index'], 0) - self.assertTrue(result['should_enable_next_hint']) + assert result['hint_index'] == 0 + assert result['should_enable_next_hint'] def test_single_demand_hint(self): """ @@ -1602,13 +1602,13 @@ class ProblemBlockTest(unittest.TestCase): # lint-amnesty, pylint: disable=miss module = CapaFactory.create(xml=test_xml) module.get_problem_html() # ignoring html result context = module.system.render_template.call_args[0][1] - self.assertTrue(context['demand_hint_possible']) - self.assertTrue(context['should_enable_next_hint']) + assert context['demand_hint_possible'] + assert context['should_enable_next_hint'] # Check the AJAX call that gets the hint by index result = module.get_demand_hint(0) - self.assertEqual(result['hint_index'], 0) - self.assertFalse(result['should_enable_next_hint']) + assert result['hint_index'] == 0 + assert not result['should_enable_next_hint'] def test_image_hint(self): """ @@ -1633,13 +1633,13 @@ class ProblemBlockTest(unittest.TestCase): # lint-amnesty, pylint: disable=miss module = CapaFactory.create(xml=test_xml) module.get_problem_html() # ignoring html result context = module.system.render_template.call_args[0][1] - self.assertTrue(context['demand_hint_possible']) - self.assertTrue(context['should_enable_next_hint']) + assert context['demand_hint_possible'] + assert context['should_enable_next_hint'] # Check the AJAX call that gets the hint by index result = module.get_demand_hint(0) - self.assertEqual(result['hint_index'], 0) - self.assertFalse(result['should_enable_next_hint']) + assert result['hint_index'] == 0 + assert not result['should_enable_next_hint'] def test_demand_hint_logging(self): def mock_location_text(self): # lint-amnesty, pylint: disable=unused-argument @@ -1671,12 +1671,12 @@ class ProblemBlockTest(unittest.TestCase): # lint-amnesty, pylint: disable=miss # check to make sure that the input_state and the keys have the same values module1.set_state_from_lcp() - self.assertEqual(list(module1.lcp.inputs.keys()), list(module1.input_state.keys())) + assert list(module1.lcp.inputs.keys()) == list(module1.input_state.keys()) module2.set_state_from_lcp() intersection = set(module2.input_state.keys()).intersection(set(module1.input_state.keys())) - self.assertEqual(len(intersection), 0) + assert len(intersection) == 0 def test_get_problem_html_error(self): """ @@ -1702,15 +1702,15 @@ class ProblemBlockTest(unittest.TestCase): # lint-amnesty, pylint: disable=miss # Try to render the module with DEBUG turned off html = module.get_problem_html() - self.assertIsNotNone(html) + assert html is not None # Check the rendering context render_args, _ = module.system.render_template.call_args context = render_args[1] - self.assertIn("error", context['problem']['html']) + assert 'error' in context['problem']['html'] # Expect that the module has created a new dummy problem with the error - self.assertNotEqual(original_problem, module.lcp) + assert original_problem != module.lcp def test_get_problem_html_error_w_debug(self): """ @@ -1732,12 +1732,12 @@ class ProblemBlockTest(unittest.TestCase): # lint-amnesty, pylint: disable=miss # Try to render the module with DEBUG turned on html = module.get_problem_html() - self.assertIsNotNone(html) + assert html is not None # Check the rendering context render_args, _ = module.system.render_template.call_args context = render_args[1] - self.assertIn(error_msg, context['problem']['html']) + assert error_msg in context['problem']['html'] @ddt.data( 'false', @@ -1756,26 +1756,25 @@ class ProblemBlockTest(unittest.TestCase): # lint-amnesty, pylint: disable=miss # Get the seed # By this point, the module should have persisted the seed seed = module.seed - self.assertIsNotNone(seed) + assert seed is not None # If we're not rerandomizing, the seed is always set # to the same value (1) if rerandomize == RANDOMIZATION.NEVER: - self.assertEqual(seed, 1, - msg="Seed should always be 1 when rerandomize='%s'" % rerandomize) + assert seed == 1, "Seed should always be 1 when rerandomize='%s'" % rerandomize # Check the problem get_request_dict = {CapaFactory.input_key(): '3.14'} module.submit_problem(get_request_dict) # Expect that the seed is the same - self.assertEqual(seed, module.seed) + assert seed == module.seed # Save the problem module.save_problem(get_request_dict) # Expect that the seed is the same - self.assertEqual(seed, module.seed) + assert seed == module.seed @ddt.data( 'false', @@ -1827,7 +1826,7 @@ class ProblemBlockTest(unittest.TestCase): # lint-amnesty, pylint: disable=miss # Get the seed # By this point, the module should have persisted the seed seed = module.seed - self.assertIsNotNone(seed) + assert seed is not None # We do NOT want the seed to reset if rerandomize # is set to 'never' -- it should still be 1 @@ -1836,7 +1835,7 @@ class ProblemBlockTest(unittest.TestCase): # lint-amnesty, pylint: disable=miss if rerandomize in [RANDOMIZATION.NEVER, 'false', RANDOMIZATION.PER_STUDENT]: - self.assertEqual(seed, _reset_and_get_seed(module)) + assert seed == _reset_and_get_seed(module) # Otherwise, we expect the seed to change # to another valid seed @@ -1847,9 +1846,9 @@ class ProblemBlockTest(unittest.TestCase): # lint-amnesty, pylint: disable=miss # to generate a different seed success = _retry_and_check(10, lambda: _reset_and_get_seed(module) != seed) - self.assertIsNotNone(module.seed) + assert module.seed is not None msg = 'Could not get a new seed from reset after 10 tries' - self.assertTrue(success, msg) + assert success, msg @ddt.data( 'false', @@ -1881,10 +1880,10 @@ class ProblemBlockTest(unittest.TestCase): # lint-amnesty, pylint: disable=miss # Get the seed # By this point, the module should have persisted the seed seed = module.seed - self.assertIsNotNone(seed) + assert seed is not None # the seed should never change because the student hasn't finished the problem - self.assertEqual(seed, _reset_and_get_seed(module)) + assert seed == _reset_and_get_seed(module) @ddt.data( RANDOMIZATION.ALWAYS, @@ -1911,7 +1910,7 @@ class ProblemBlockTest(unittest.TestCase): # lint-amnesty, pylint: disable=miss for error_type in error_types: mock_progress.side_effect = error_type module = CapaFactory.create() - self.assertIsNone(module.get_progress()) + assert module.get_progress() is None mock_log.exception.assert_called_once_with('Got bad progress') mock_log.reset_mock() @@ -1924,8 +1923,8 @@ class ProblemBlockTest(unittest.TestCase): # lint-amnesty, pylint: disable=miss module = CapaFactory.create() module.weight = 0 progress = module.get_progress() - self.assertIsNone(progress) - self.assertFalse(mock_progress.called) + assert progress is None + assert not mock_progress.called @patch('xmodule.capa_base.Progress') def test_get_progress_calculate_progress_fraction(self, mock_progress): @@ -1960,8 +1959,8 @@ class ProblemBlockTest(unittest.TestCase): # lint-amnesty, pylint: disable=miss due=self.tomorrow_str) module.weight = 1 score, total = module.get_display_progress() - self.assertEqual(score, expected_score) - self.assertEqual(total, 1) + assert score == expected_score + assert total == 1 def test_get_html(self): """ @@ -1977,7 +1976,7 @@ class ProblemBlockTest(unittest.TestCase): # lint-amnesty, pylint: disable=miss Check that get_problem() returns the expected dictionary. """ module = CapaFactory.create() - self.assertEqual(module.get_problem("data"), {'html': module.get_problem_html(encapsulate=False)}) + assert module.get_problem('data') == {'html': module.get_problem_html(encapsulate=False)} # Standard question with shuffle="true" used by a few tests common_shuffle_xml = textwrap.dedent(""" @@ -2004,11 +2003,11 @@ class ProblemBlockTest(unittest.TestCase): # lint-amnesty, pylint: disable=miss module.submit_problem(get_request_dict) mock_call = mock_track_function.mock_calls[1] event_info = mock_call[1][2] - self.assertEqual(event_info['answers'][CapaFactory.answer_key()], 'choice_3') + assert event_info['answers'][CapaFactory.answer_key()] == 'choice_3' # 'permutation' key added to record how problem was shown - self.assertEqual(event_info['permutation'][CapaFactory.answer_key()], - ('shuffle', ['choice_3', 'choice_1', 'choice_2', 'choice_0'])) - self.assertEqual(event_info['success'], 'correct') + assert event_info['permutation'][CapaFactory.answer_key()] ==\ + ('shuffle', ['choice_3', 'choice_1', 'choice_2', 'choice_0']) + assert event_info['success'] == 'correct' @unittest.skip("masking temporarily disabled") def test_save_unmask(self): @@ -2019,8 +2018,8 @@ class ProblemBlockTest(unittest.TestCase): # lint-amnesty, pylint: disable=miss module.save_problem(get_request_dict) mock_call = mock_track_function.mock_calls[0] event_info = mock_call[1][1] - self.assertEqual(event_info['answers'][CapaFactory.answer_key()], 'choice_2') - self.assertIsNotNone(event_info['permutation'][CapaFactory.answer_key()]) + assert event_info['answers'][CapaFactory.answer_key()] == 'choice_2' + assert event_info['permutation'][CapaFactory.answer_key()] is not None @unittest.skip("masking temporarily disabled") def test_reset_unmask(self): @@ -2033,9 +2032,9 @@ class ProblemBlockTest(unittest.TestCase): # lint-amnesty, pylint: disable=miss module.reset_problem(None) mock_call = mock_track_function.mock_calls[0] event_info = mock_call[1][1] - self.assertEqual(mock_call[1][0], 'reset_problem') - self.assertEqual(event_info['old_state']['student_answers'][CapaFactory.answer_key()], 'choice_2') - self.assertIsNotNone(event_info['permutation'][CapaFactory.answer_key()]) + assert mock_call[1][0] == 'reset_problem' + assert event_info['old_state']['student_answers'][CapaFactory.answer_key()] == 'choice_2' + assert event_info['permutation'][CapaFactory.answer_key()] is not None @unittest.skip("masking temporarily disabled") def test_rescore_unmask(self): @@ -2048,9 +2047,9 @@ class ProblemBlockTest(unittest.TestCase): # lint-amnesty, pylint: disable=miss module.rescore_problem(only_if_higher=False) # lint-amnesty, pylint: disable=no-member mock_call = mock_track_function.mock_calls[0] event_info = mock_call[1][1] - self.assertEqual(mock_call[1][0], 'problem_rescore') - self.assertEqual(event_info['state']['student_answers'][CapaFactory.answer_key()], 'choice_2') - self.assertIsNotNone(event_info['permutation'][CapaFactory.answer_key()]) + assert mock_call[1][0] == 'problem_rescore' + assert event_info['state']['student_answers'][CapaFactory.answer_key()] == 'choice_2' + assert event_info['permutation'][CapaFactory.answer_key()] is not None def test_check_unmask_answerpool(self): """Check answer-pool question track_function uses unmasked names""" @@ -2072,11 +2071,11 @@ class ProblemBlockTest(unittest.TestCase): # lint-amnesty, pylint: disable=miss module.submit_problem(get_request_dict) mock_call = mock_track_function.mock_calls[1] event_info = mock_call[1][2] - self.assertEqual(event_info['answers'][CapaFactory.answer_key()], 'choice_2') + assert event_info['answers'][CapaFactory.answer_key()] == 'choice_2' # 'permutation' key added to record how problem was shown - self.assertEqual(event_info['permutation'][CapaFactory.answer_key()], - ('answerpool', ['choice_1', 'choice_3', 'choice_2', 'choice_0'])) - self.assertEqual(event_info['success'], 'incorrect') + assert event_info['permutation'][CapaFactory.answer_key()] ==\ + ('answerpool', ['choice_1', 'choice_3', 'choice_2', 'choice_0']) + assert event_info['success'] == 'incorrect' @ddt.unpack @ddt.data( @@ -2090,7 +2089,7 @@ class ProblemBlockTest(unittest.TestCase): # lint-amnesty, pylint: disable=miss Verify that display_name_with_default works as expected. """ module = CapaFactory.create(display_name=display_name) - self.assertEqual(module.display_name_with_default, expected_display_name) + assert module.display_name_with_default == expected_display_name @ddt.data( '', @@ -2104,7 +2103,7 @@ class ProblemBlockTest(unittest.TestCase): # lint-amnesty, pylint: disable=miss module.get_problem_html() render_args, _ = module.system.render_template.call_args context = render_args[1] - self.assertEqual(context['problem']['name'], module.location.block_type) + assert context['problem']['name'] == module.location.block_type @ddt.ddt @@ -2476,15 +2475,11 @@ class ProblemBlockXMLTest(unittest.TestCase): # lint-amnesty, pylint: disable=m xml = "<{response_tag}>".format(response_tag=response_tag) name = "Some Capa Problem" descriptor = self._create_descriptor(xml, name=name) - self.assertEqual(descriptor.problem_types, {response_tag}) - self.assertEqual(descriptor.index_dictionary(), { - 'content_type': ProblemBlock.INDEX_CONTENT_TYPE, - 'problem_types': [response_tag], - 'content': { - 'display_name': name, - 'capa_content': '' - } - }) + assert descriptor.problem_types == {response_tag} + assert descriptor.index_dictionary() ==\ + {'content_type': ProblemBlock.INDEX_CONTENT_TYPE, + 'problem_types': [response_tag], + 'content': {'display_name': name, 'capa_content': ''}} def test_response_types_ignores_non_response_tags(self): xml = textwrap.dedent(""" @@ -2503,15 +2498,11 @@ class ProblemBlockXMLTest(unittest.TestCase): # lint-amnesty, pylint: disable=m """) name = "Test Capa Problem" descriptor = self._create_descriptor(xml, name=name) - self.assertEqual(descriptor.problem_types, {"multiplechoiceresponse"}) - self.assertEqual(descriptor.index_dictionary(), { - 'content_type': ProblemBlock.INDEX_CONTENT_TYPE, - 'problem_types': ["multiplechoiceresponse"], - 'content': { - 'display_name': name, - 'capa_content': ' Label Some comment Apple Banana Chocolate Donut ' - } - }) + assert descriptor.problem_types == {'multiplechoiceresponse'} + assert descriptor.index_dictionary() ==\ + {'content_type': ProblemBlock.INDEX_CONTENT_TYPE, + 'problem_types': ['multiplechoiceresponse'], + 'content': {'display_name': name, 'capa_content': ' Label Some comment Apple Banana Chocolate Donut '}} def test_response_types_multiple_tags(self): xml = textwrap.dedent(""" @@ -2535,7 +2526,7 @@ class ProblemBlockXMLTest(unittest.TestCase): # lint-amnesty, pylint: disable=m """) name = "Other Test Capa Problem" descriptor = self._create_descriptor(xml, name=name) - self.assertEqual(descriptor.problem_types, {"multiplechoiceresponse", "optionresponse"}) + assert descriptor.problem_types == {'multiplechoiceresponse', 'optionresponse'} # We are converting problem_types to a set to compare it later without taking into account the order # the reasoning behind is that the problem_types (property) is represented by dict and when it is converted @@ -2580,16 +2571,10 @@ class ProblemBlockXMLTest(unittest.TestCase): # lint-amnesty, pylint: disable=m """) name = "Blank Common Capa Problem" descriptor = self._create_descriptor(xml, name=name) - self.assertEqual( - descriptor.index_dictionary(), { - 'content_type': ProblemBlock.INDEX_CONTENT_TYPE, + assert descriptor.index_dictionary() ==\ + {'content_type': ProblemBlock.INDEX_CONTENT_TYPE, 'problem_types': [], - 'content': { - 'display_name': name, - 'capa_content': ' ' - } - } - ) + 'content': {'display_name': name, 'capa_content': ' '}} def test_indexing_checkboxes(self): name = "Checkboxes" @@ -2606,18 +2591,11 @@ class ProblemBlockXMLTest(unittest.TestCase): # lint-amnesty, pylint: disable=m Hungarian Note: Make sure you select all of the correct options—there may be more than one! """) - self.assertEqual(descriptor.problem_types, {"choiceresponse"}) - self.assertEqual( - descriptor.index_dictionary(), - { - 'content_type': ProblemBlock.INDEX_CONTENT_TYPE, - 'problem_types': ["choiceresponse"], - 'content': { - 'display_name': name, - 'capa_content': capa_content.replace("\n", " ") - } - } - ) + assert descriptor.problem_types == {'choiceresponse'} + assert descriptor.index_dictionary() ==\ + {'content_type': ProblemBlock.INDEX_CONTENT_TYPE, + 'problem_types': ['choiceresponse'], + 'content': {'display_name': name, 'capa_content': capa_content.replace('\n', ' ')}} def test_indexing_dropdown(self): name = "Dropdown" @@ -2628,17 +2606,11 @@ class ProblemBlockXMLTest(unittest.TestCase): # lint-amnesty, pylint: disable=m You can use the following example problem as a model. Which of the following countries celebrates its independence on August 15? 'India','Spain','China','Bermuda' """) - self.assertEqual(descriptor.problem_types, {"optionresponse"}) - self.assertEqual( - descriptor.index_dictionary(), { - 'content_type': ProblemBlock.INDEX_CONTENT_TYPE, - 'problem_types': ["optionresponse"], - 'content': { - 'display_name': name, - 'capa_content': capa_content.replace("\n", " ") - } - } - ) + assert descriptor.problem_types == {'optionresponse'} + assert descriptor.index_dictionary() ==\ + {'content_type': ProblemBlock.INDEX_CONTENT_TYPE, + 'problem_types': ['optionresponse'], + 'content': {'display_name': name, 'capa_content': capa_content.replace('\n', ' ')}} def test_indexing_multiple_choice(self): name = "Multiple Choice" @@ -2653,17 +2625,11 @@ class ProblemBlockXMLTest(unittest.TestCase): # lint-amnesty, pylint: disable=m Indonesia Russia """) - self.assertEqual(descriptor.problem_types, {"multiplechoiceresponse"}) - self.assertEqual( - descriptor.index_dictionary(), { - 'content_type': ProblemBlock.INDEX_CONTENT_TYPE, - 'problem_types': ["multiplechoiceresponse"], - 'content': { - 'display_name': name, - 'capa_content': capa_content.replace("\n", " ") - } - } - ) + assert descriptor.problem_types == {'multiplechoiceresponse'} + assert descriptor.index_dictionary() ==\ + {'content_type': ProblemBlock.INDEX_CONTENT_TYPE, + 'problem_types': ['multiplechoiceresponse'], + 'content': {'display_name': name, 'capa_content': capa_content.replace('\n', ' ')}} def test_indexing_numerical_input(self): name = "Numerical Input" @@ -2681,17 +2647,11 @@ class ProblemBlockXMLTest(unittest.TestCase): # lint-amnesty, pylint: disable=m How many miles away from Earth is the sun? Use scientific notation to answer. The square of what number is -100? """) - self.assertEqual(descriptor.problem_types, {"numericalresponse"}) - self.assertEqual( - descriptor.index_dictionary(), { - 'content_type': ProblemBlock.INDEX_CONTENT_TYPE, - 'problem_types': ["numericalresponse"], - 'content': { - 'display_name': name, - 'capa_content': capa_content.replace("\n", " ") - } - } - ) + assert descriptor.problem_types == {'numericalresponse'} + assert descriptor.index_dictionary() ==\ + {'content_type': ProblemBlock.INDEX_CONTENT_TYPE, + 'problem_types': ['numericalresponse'], + 'content': {'display_name': name, 'capa_content': capa_content.replace('\n', ' ')}} def test_indexing_text_input(self): name = "Text Input" @@ -2706,17 +2666,11 @@ class ProblemBlockXMLTest(unittest.TestCase): # lint-amnesty, pylint: disable=m You can use the following example problem as a model. What was the first post-secondary school in China to allow both male and female students? """) - self.assertEqual(descriptor.problem_types, {"stringresponse"}) - self.assertEqual( - descriptor.index_dictionary(), { - 'content_type': ProblemBlock.INDEX_CONTENT_TYPE, - 'problem_types': ["stringresponse"], - 'content': { - 'display_name': name, - 'capa_content': capa_content.replace("\n", " ") - } - } - ) + assert descriptor.problem_types == {'stringresponse'} + assert descriptor.index_dictionary() ==\ + {'content_type': ProblemBlock.INDEX_CONTENT_TYPE, + 'problem_types': ['stringresponse'], + 'content': {'display_name': name, 'capa_content': capa_content.replace('\n', ' ')}} def test_indexing_non_latin_problem(self): sample_text_input_problem_xml = textwrap.dedent(""" @@ -2730,9 +2684,7 @@ class ProblemBlockXMLTest(unittest.TestCase): # lint-amnesty, pylint: disable=m capa_content = " FX1_VAL='Καλημέρα' Δοκιμή με μεταβλητές με Ελληνικούς χαρακτήρες μέσα σε python: $FX1_VAL " descriptor_dict = descriptor.index_dictionary() - self.assertEqual( - descriptor_dict['content']['capa_content'], smart_text(capa_content) - ) + assert descriptor_dict['content']['capa_content'] == smart_text(capa_content) def test_indexing_checkboxes_with_hints_and_feedback(self): name = "Checkboxes with Hints and Feedback" @@ -2752,17 +2704,11 @@ class ProblemBlockXMLTest(unittest.TestCase): # lint-amnesty, pylint: disable=m potato tomato """) - self.assertEqual(descriptor.problem_types, {"choiceresponse"}) - self.assertEqual( - descriptor.index_dictionary(), { - 'content_type': ProblemBlock.INDEX_CONTENT_TYPE, - 'problem_types': ["choiceresponse"], - 'content': { - 'display_name': name, - 'capa_content': capa_content.replace("\n", " ") - } - } - ) + assert descriptor.problem_types == {'choiceresponse'} + assert descriptor.index_dictionary() ==\ + {'content_type': ProblemBlock.INDEX_CONTENT_TYPE, + 'problem_types': ['choiceresponse'], + 'content': {'display_name': name, 'capa_content': capa_content.replace('\n', ' ')}} def test_indexing_dropdown_with_hints_and_feedback(self): name = "Dropdown with Hints and Feedback" @@ -2778,17 +2724,11 @@ class ProblemBlockXMLTest(unittest.TestCase): # lint-amnesty, pylint: disable=m potato tomato """) - self.assertEqual(descriptor.problem_types, {"optionresponse"}) - self.assertEqual( - descriptor.index_dictionary(), { - 'content_type': ProblemBlock.INDEX_CONTENT_TYPE, - 'problem_types': ["optionresponse"], - 'content': { - 'display_name': name, - 'capa_content': capa_content.replace("\n", " ") - } - } - ) + assert descriptor.problem_types == {'optionresponse'} + assert descriptor.index_dictionary() ==\ + {'content_type': ProblemBlock.INDEX_CONTENT_TYPE, + 'problem_types': ['optionresponse'], + 'content': {'display_name': name, 'capa_content': capa_content.replace('\n', ' ')}} def test_indexing_multiple_choice_with_hints_and_feedback(self): name = "Multiple Choice with Hints and Feedback" @@ -2804,17 +2744,11 @@ class ProblemBlockXMLTest(unittest.TestCase): # lint-amnesty, pylint: disable=m potato tomato """) - self.assertEqual(descriptor.problem_types, {"multiplechoiceresponse"}) - self.assertEqual( - descriptor.index_dictionary(), { - 'content_type': ProblemBlock.INDEX_CONTENT_TYPE, - 'problem_types': ["multiplechoiceresponse"], - 'content': { - 'display_name': name, - 'capa_content': capa_content.replace("\n", " ") - } - } - ) + assert descriptor.problem_types == {'multiplechoiceresponse'} + assert descriptor.index_dictionary() ==\ + {'content_type': ProblemBlock.INDEX_CONTENT_TYPE, + 'problem_types': ['multiplechoiceresponse'], + 'content': {'display_name': name, 'capa_content': capa_content.replace('\n', ' ')}} def test_indexing_numerical_input_with_hints_and_feedback(self): name = "Numerical Input with Hints and Feedback" @@ -2828,17 +2762,11 @@ class ProblemBlockXMLTest(unittest.TestCase): # lint-amnesty, pylint: disable=m Use the following example problem as a model. What is the arithmetic mean for the following set of numbers? (1, 5, 6, 3, 5) """) - self.assertEqual(descriptor.problem_types, {"numericalresponse"}) - self.assertEqual( - descriptor.index_dictionary(), { - 'content_type': ProblemBlock.INDEX_CONTENT_TYPE, - 'problem_types': ["numericalresponse"], - 'content': { - 'display_name': name, - 'capa_content': capa_content.replace("\n", " ") - } - } - ) + assert descriptor.problem_types == {'numericalresponse'} + assert descriptor.index_dictionary() ==\ + {'content_type': ProblemBlock.INDEX_CONTENT_TYPE, + 'problem_types': ['numericalresponse'], + 'content': {'display_name': name, 'capa_content': capa_content.replace('\n', ' ')}} def test_indexing_text_input_with_hints_and_feedback(self): name = "Text Input with Hints and Feedback" @@ -2852,17 +2780,11 @@ class ProblemBlockXMLTest(unittest.TestCase): # lint-amnesty, pylint: disable=m Use the following example problem as a model. Which U.S. state has the largest land area? """) - self.assertEqual(descriptor.problem_types, {"stringresponse"}) - self.assertEqual( - descriptor.index_dictionary(), { - 'content_type': ProblemBlock.INDEX_CONTENT_TYPE, - 'problem_types': ["stringresponse"], - 'content': { - 'display_name': name, - 'capa_content': capa_content.replace("\n", " ") - } - } - ) + assert descriptor.problem_types == {'stringresponse'} + assert descriptor.index_dictionary() ==\ + {'content_type': ProblemBlock.INDEX_CONTENT_TYPE, + 'problem_types': ['stringresponse'], + 'content': {'display_name': name, 'capa_content': capa_content.replace('\n', ' ')}} def test_indexing_problem_with_html_tags(self): sample_problem_xml = textwrap.dedent(""" @@ -2885,16 +2807,10 @@ class ProblemBlockXMLTest(unittest.TestCase): # lint-amnesty, pylint: disable=m This has HTML comment in it. HTML end. """) - self.assertEqual( - descriptor.index_dictionary(), { - 'content_type': ProblemBlock.INDEX_CONTENT_TYPE, + assert descriptor.index_dictionary() ==\ + {'content_type': ProblemBlock.INDEX_CONTENT_TYPE, 'problem_types': [], - 'content': { - 'display_name': name, - 'capa_content': capa_content.replace("\n", " ") - } - } - ) + 'content': {'display_name': name, 'capa_content': capa_content.replace('\n', ' ')}} def test_invalid_xml_handling(self): """ @@ -2905,7 +2821,7 @@ class ProblemBlockXMLTest(unittest.TestCase): # lint-amnesty, pylint: disable=m -

You can use this template as a guide to the simple editor markdown and OLX markup to use for dropdown problems. Edit this component to replace this template with your own assessment.

+

You can use this template as a guide to the simple editor markdown and OLX markup to use for dropdown + problems. Edit this component to replace this template with your own assessment.

You can add an optional tip or note related to the prompt like this. @@ -2926,7 +2843,7 @@ class ProblemBlockXMLTest(unittest.TestCase): # lint-amnesty, pylint: disable=m """) - with self.assertRaises(Exception): + with pytest.raises(Exception): CapaFactory.create(xml=problem_xml) @@ -2939,7 +2856,8 @@ class ComplexEncoderTest(unittest.TestCase): # lint-amnesty, pylint: disable=mi complex_num = 1 - 1j expected_str = '1-1*j' json_str = json.dumps(complex_num, cls=ComplexEncoder) - self.assertEqual(expected_str, json_str[1:-1]) # ignore quotes + assert expected_str == json_str[1:(- 1)] + # ignore quotes class ProblemCheckTrackingTest(unittest.TestCase): @@ -2993,35 +2911,27 @@ class ProblemCheckTrackingTest(unittest.TestCase): } event = self.get_event_for_answers(module, answer_input_dict) - self.assertEqual(event['submission'], { - factory.answer_key(2): { - 'question': 'What color is the open ocean on a sunny day?', - 'answer': 'blue', - 'response_type': 'optionresponse', - 'input_type': 'optioninput', - 'correct': True, - 'group_label': '', - 'variant': '', - }, - factory.answer_key(3): { - 'question': 'Which piece of furniture is built for sitting?', - 'answer': u'a table', - 'response_type': 'multiplechoiceresponse', - 'input_type': 'choicegroup', - 'correct': False, - 'group_label': '', - 'variant': '', - }, - factory.answer_key(4): { - 'question': 'Which of the following are musical instruments?', - 'answer': [u'a piano', u'a tree'], - 'response_type': 'choiceresponse', - 'input_type': 'checkboxgroup', - 'correct': False, - 'group_label': '', - 'variant': '', - }, - }) + assert event['submission'] ==\ + {factory.answer_key(2): {'question': 'What color is the open ocean on a sunny day?', + 'answer': 'blue', 'response_type': 'optionresponse', + 'input_type': 'optioninput', + 'correct': True, + 'group_label': '', + 'variant': ''}, + factory.answer_key(3): {'question': 'Which piece of furniture is built for sitting?', + 'answer': u'a table', + 'response_type': 'multiplechoiceresponse', + 'input_type': 'choicegroup', + 'correct': False, + 'group_label': '', + 'variant': ''}, + factory.answer_key(4): {'question': 'Which of the following are musical instruments?', + 'answer': [u'a piano', u'a tree'], + 'response_type': 'choiceresponse', + 'input_type': 'checkboxgroup', + 'correct': False, + 'group_label': '', + 'variant': ''}} def capa_factory_for_problem_xml(self, xml): # lint-amnesty, pylint: disable=missing-function-docstring class CustomCapaFactory(CapaFactory): @@ -3036,7 +2946,7 @@ class ProblemCheckTrackingTest(unittest.TestCase): with patch.object(module.runtime, 'publish') as mock_track_function: module.submit_problem(answer_input_dict) - self.assertGreaterEqual(len(mock_track_function.mock_calls), 2) + assert len(mock_track_function.mock_calls) >= 2 # There are potentially 2 track logs: answers and hint. [-1]=answers. mock_call = mock_track_function.mock_calls[-1] event = mock_call[1][2] @@ -3052,17 +2962,13 @@ class ProblemCheckTrackingTest(unittest.TestCase): } event = self.get_event_for_answers(module, answer_input_dict) - self.assertEqual(event['submission'], { - factory.answer_key(2): { - 'question': '', - 'answer': '3.14', - 'response_type': 'numericalresponse', - 'input_type': 'textline', - 'correct': True, - 'group_label': '', - 'variant': '', - } - }) + assert event['submission'] ==\ + {factory.answer_key(2): {'question': '', 'answer': '3.14', + 'response_type': 'numericalresponse', + 'input_type': 'textline', + 'correct': True, + 'group_label': '', + 'variant': ''}} def test_multiple_inputs(self): group_label = 'Choose the correct color' @@ -3084,26 +2990,19 @@ class ProblemCheckTrackingTest(unittest.TestCase): } event = self.get_event_for_answers(module, answer_input_dict) - self.assertEqual(event['submission'], { - factory.answer_key(2, 1): { - 'group_label': group_label, - 'question': input1_label, - 'answer': 'blue', - 'response_type': 'optionresponse', - 'input_type': 'optioninput', - 'correct': True, - 'variant': '', - }, - factory.answer_key(2, 2): { - 'group_label': group_label, - 'question': input2_label, - 'answer': 'yellow', - 'response_type': 'optionresponse', - 'input_type': 'optioninput', - 'correct': False, - 'variant': '', - }, - }) + assert event['submission'] ==\ + {factory.answer_key(2, 1): {'group_label': group_label, + 'question': input1_label, + 'answer': 'blue', + 'response_type': 'optionresponse', + 'input_type': 'optioninput', + 'correct': True, 'variant': ''}, + factory.answer_key(2, 2): {'group_label': group_label, + 'question': input2_label, + 'answer': 'yellow', + 'response_type': 'optionresponse', + 'input_type': 'optioninput', + 'correct': False, 'variant': ''}} def test_optioninput_extended_xml(self): """Test the new XML form of writing with