diff --git a/lms/djangoapps/ccx/tests/test_views.py b/lms/djangoapps/ccx/tests/test_views.py index 324caad27d7e..e31a3239ba81 100644 --- a/lms/djangoapps/ccx/tests/test_views.py +++ b/lms/djangoapps/ccx/tests/test_views.py @@ -19,7 +19,7 @@ from edx_django_utils.cache import RequestCache from opaque_keys.edx.keys import CourseKey from pytz import UTC -from xblocks_contrib.problem.capa.tests.response_xml_factory import StringResponseXMLFactory +from xblocks_contrib.problem.capa.testing.response_xml_factory import StringResponseXMLFactory from common.djangoapps.edxmako.shortcuts import render_to_response from common.djangoapps.student.models import CourseEnrollment, CourseEnrollmentAllowed diff --git a/lms/djangoapps/courseware/tests/test_block_render.py b/lms/djangoapps/courseware/tests/test_block_render.py index 2e38c0b4ebff..c58283a3d857 100644 --- a/lms/djangoapps/courseware/tests/test_block_render.py +++ b/lms/djangoapps/courseware/tests/test_block_render.py @@ -51,7 +51,7 @@ Mixologist, # pylint: disable=wrong-import-order ) from xblock.test.tools import TestRuntime # pylint: disable=wrong-import-order -from xblocks_contrib.problem.capa.tests.response_xml_factory import ( +from xblocks_contrib.problem.capa.testing.response_xml_factory import ( OptionResponseXMLFactory, # pylint: disable=reimported ) diff --git a/lms/djangoapps/courseware/tests/test_entrance_exam.py b/lms/djangoapps/courseware/tests/test_entrance_exam.py index a386f8cff527..fb17ca4bf67b 100644 --- a/lms/djangoapps/courseware/tests/test_entrance_exam.py +++ b/lms/djangoapps/courseware/tests/test_entrance_exam.py @@ -7,7 +7,7 @@ from django.test import override_settings from django.urls import reverse from milestones.tests.utils import MilestonesTestCaseMixin -from xblocks_contrib.problem.capa.tests.response_xml_factory import MultipleChoiceResponseXMLFactory +from xblocks_contrib.problem.capa.testing.response_xml_factory import MultipleChoiceResponseXMLFactory from common.djangoapps.student.models import CourseEnrollment from common.djangoapps.student.tests.factories import ( diff --git a/lms/djangoapps/courseware/tests/test_masquerade.py b/lms/djangoapps/courseware/tests/test_masquerade.py index e072e9449dd5..df7191af325f 100644 --- a/lms/djangoapps/courseware/tests/test_masquerade.py +++ b/lms/djangoapps/courseware/tests/test_masquerade.py @@ -15,7 +15,7 @@ from django.urls import reverse from pytz import UTC from xblock.runtime import DictKeyValueStore -from xblocks_contrib.problem.capa.tests.response_xml_factory import OptionResponseXMLFactory +from xblocks_contrib.problem.capa.testing.response_xml_factory import OptionResponseXMLFactory from common.djangoapps.student.models import CourseEnrollment from common.djangoapps.student.tests.factories import StaffFactory, UserFactory diff --git a/lms/djangoapps/courseware/tests/test_submitting_problems.py b/lms/djangoapps/courseware/tests/test_submitting_problems.py index e15107d93422..e50532154b6a 100644 --- a/lms/djangoapps/courseware/tests/test_submitting_problems.py +++ b/lms/djangoapps/courseware/tests/test_submitting_problems.py @@ -21,13 +21,13 @@ from django.urls import reverse from django.utils.timezone import now from submissions import api as submissions_api -from xblocks_contrib.problem.capa.tests.response_xml_factory import ( +from xblocks_contrib.problem.capa.testing.codejail import UseUnsafeCodejail +from xblocks_contrib.problem.capa.testing.response_xml_factory import ( CodeResponseXMLFactory, CustomResponseXMLFactory, OptionResponseXMLFactory, SchematicResponseXMLFactory, ) -from xblocks_contrib.problem.capa.tests.test_util import UseUnsafeCodejail from xblocks_contrib.problem.capa.xqueue_interface import XQueueInterface from common.djangoapps.course_modes.models import CourseMode diff --git a/lms/djangoapps/courseware/tests/test_views.py b/lms/djangoapps/courseware/tests/test_views.py index 65c573726d6a..b4c5382376a5 100644 --- a/lms/djangoapps/courseware/tests/test_views.py +++ b/lms/djangoapps/courseware/tests/test_views.py @@ -35,7 +35,7 @@ from xblock.core import XBlock from xblock.fields import Scope, String from xblock.scorable import ShowCorrectness -from xblocks_contrib.problem.capa.tests.response_xml_factory import MultipleChoiceResponseXMLFactory +from xblocks_contrib.problem.capa.testing.response_xml_factory import MultipleChoiceResponseXMLFactory import lms.djangoapps.courseware.views.views as views from common.djangoapps.course_modes.models import CourseMode diff --git a/lms/djangoapps/grades/rest_api/v1/tests/test_grading_policy_view.py b/lms/djangoapps/grades/rest_api/v1/tests/test_grading_policy_view.py index d92700ffcb2c..7339fbdfdf7f 100644 --- a/lms/djangoapps/grades/rest_api/v1/tests/test_grading_policy_view.py +++ b/lms/djangoapps/grades/rest_api/v1/tests/test_grading_policy_view.py @@ -8,7 +8,7 @@ import ddt from django.urls import reverse from pytz import UTC -from xblocks_contrib.problem.capa.tests.response_xml_factory import MultipleChoiceResponseXMLFactory +from xblocks_contrib.problem.capa.testing.response_xml_factory import MultipleChoiceResponseXMLFactory from common.djangoapps.student.tests.factories import GlobalStaffFactory, StaffFactory, UserFactory from openedx.core.djangoapps.oauth_dispatch.tests.factories import AccessTokenFactory, ApplicationFactory diff --git a/lms/djangoapps/grades/tests/base.py b/lms/djangoapps/grades/tests/base.py index 2000ccb1f26b..00c63e8e1da5 100644 --- a/lms/djangoapps/grades/tests/base.py +++ b/lms/djangoapps/grades/tests/base.py @@ -4,7 +4,7 @@ from crum import set_current_request -from xblocks_contrib.problem.capa.tests.response_xml_factory import MultipleChoiceResponseXMLFactory +from xblocks_contrib.problem.capa.testing.response_xml_factory import MultipleChoiceResponseXMLFactory from common.djangoapps.student.models import CourseEnrollment from common.djangoapps.student.tests.factories import UserFactory diff --git a/lms/djangoapps/grades/tests/integration/test_access.py b/lms/djangoapps/grades/tests/integration/test_access.py index fd28ef5102d6..a7f94f5eefb5 100644 --- a/lms/djangoapps/grades/tests/integration/test_access.py +++ b/lms/djangoapps/grades/tests/integration/test_access.py @@ -4,7 +4,7 @@ from crum import set_current_request -from xblocks_contrib.problem.capa.tests.response_xml_factory import MultipleChoiceResponseXMLFactory +from xblocks_contrib.problem.capa.testing.response_xml_factory import MultipleChoiceResponseXMLFactory from common.djangoapps.student.models import CourseEnrollment from common.djangoapps.student.tests.factories import UserFactory diff --git a/lms/djangoapps/grades/tests/integration/test_events.py b/lms/djangoapps/grades/tests/integration/test_events.py index ecd89a721665..5d2b4b3aa84a 100644 --- a/lms/djangoapps/grades/tests/integration/test_events.py +++ b/lms/djangoapps/grades/tests/integration/test_events.py @@ -6,7 +6,7 @@ import ddt from crum import set_current_request -from xblocks_contrib.problem.capa.tests.response_xml_factory import MultipleChoiceResponseXMLFactory +from xblocks_contrib.problem.capa.testing.response_xml_factory import MultipleChoiceResponseXMLFactory import openedx.core.djangoapps.content.block_structure.api as bs_api from common.djangoapps.student.models import CourseEnrollment diff --git a/lms/djangoapps/grades/tests/integration/test_problems.py b/lms/djangoapps/grades/tests/integration/test_problems.py index 8a892e7f4090..eabcc3564b56 100644 --- a/lms/djangoapps/grades/tests/integration/test_problems.py +++ b/lms/djangoapps/grades/tests/integration/test_problems.py @@ -6,7 +6,7 @@ import pytz from crum import set_current_request from django.test.utils import override_settings -from xblocks_contrib.problem.capa.tests.response_xml_factory import MultipleChoiceResponseXMLFactory +from xblocks_contrib.problem.capa.testing.response_xml_factory import MultipleChoiceResponseXMLFactory from common.djangoapps.student.models import CourseEnrollment from common.djangoapps.student.tests.factories import UserFactory diff --git a/lms/djangoapps/instructor/tests/test_enrollment.py b/lms/djangoapps/instructor/tests/test_enrollment.py index 090195302717..2dff18417e54 100644 --- a/lms/djangoapps/instructor/tests/test_enrollment.py +++ b/lms/djangoapps/instructor/tests/test_enrollment.py @@ -17,7 +17,7 @@ from django.utils.translation import override as override_language from opaque_keys.edx.locator import CourseLocator from submissions import api as sub_api -from xblocks_contrib.problem.capa.tests.response_xml_factory import MultipleChoiceResponseXMLFactory +from xblocks_contrib.problem.capa.testing.response_xml_factory import MultipleChoiceResponseXMLFactory from common.djangoapps.student.models import CourseEnrollment, CourseEnrollmentAllowed, anonymous_id_for_user from common.djangoapps.student.roles import CourseCcxCoachRole diff --git a/lms/djangoapps/instructor/tests/test_spoc_gradebook.py b/lms/djangoapps/instructor/tests/test_spoc_gradebook.py index 1b77cd72a59c..12721b83c2bd 100644 --- a/lms/djangoapps/instructor/tests/test_spoc_gradebook.py +++ b/lms/djangoapps/instructor/tests/test_spoc_gradebook.py @@ -2,7 +2,7 @@ Tests of the instructor dashboard spoc gradebook """ from django.urls import reverse -from xblocks_contrib.problem.capa.tests.response_xml_factory import StringResponseXMLFactory +from xblocks_contrib.problem.capa.testing.response_xml_factory import StringResponseXMLFactory from common.djangoapps.student.tests.factories import AdminFactory, CourseEnrollmentFactory, UserFactory from lms.djangoapps.courseware.tests.factories import StudentModuleFactory diff --git a/lms/djangoapps/instructor_task/tests/test_base.py b/lms/djangoapps/instructor_task/tests/test_base.py index 3e1c4d6b06bd..3f4c9376fda3 100644 --- a/lms/djangoapps/instructor_task/tests/test_base.py +++ b/lms/djangoapps/instructor_task/tests/test_base.py @@ -19,7 +19,7 @@ from django.urls import reverse from opaque_keys.edx.keys import CourseKey from opaque_keys.edx.locations import Location -from xblocks_contrib.problem.capa.tests.response_xml_factory import OptionResponseXMLFactory +from xblocks_contrib.problem.capa.testing.response_xml_factory import OptionResponseXMLFactory from common.djangoapps.student.tests.factories import CourseEnrollmentFactory, UserFactory from lms.djangoapps.courseware.model_data import StudentModule diff --git a/lms/djangoapps/instructor_task/tests/test_integration.py b/lms/djangoapps/instructor_task/tests/test_integration.py index 5a170754ac2f..79317d72719c 100644 --- a/lms/djangoapps/instructor_task/tests/test_integration.py +++ b/lms/djangoapps/instructor_task/tests/test_integration.py @@ -20,8 +20,8 @@ from django.test.utils import override_settings from django.urls import reverse from xblocks_contrib.problem.capa.responsetypes import StudentInputError -from xblocks_contrib.problem.capa.tests.response_xml_factory import CodeResponseXMLFactory, CustomResponseXMLFactory -from xblocks_contrib.problem.capa.tests.test_util import UseUnsafeCodejail +from xblocks_contrib.problem.capa.testing.codejail import UseUnsafeCodejail +from xblocks_contrib.problem.capa.testing.response_xml_factory import CodeResponseXMLFactory, CustomResponseXMLFactory from common.test.utils import assert_dict_contains_subset from lms.djangoapps.courseware.model_data import StudentModule diff --git a/lms/djangoapps/instructor_task/tests/test_tasks_helper.py b/lms/djangoapps/instructor_task/tests/test_tasks_helper.py index 7e988966b64c..b9f400ed6d12 100644 --- a/lms/djangoapps/instructor_task/tests/test_tasks_helper.py +++ b/lms/djangoapps/instructor_task/tests/test_tasks_helper.py @@ -23,7 +23,7 @@ from edx_django_utils.cache import RequestCache from freezegun import freeze_time from pytz import UTC -from xblocks_contrib.problem.capa.tests.response_xml_factory import ( +from xblocks_contrib.problem.capa.testing.response_xml_factory import ( MultipleChoiceResponseXMLFactory, # pylint: disable=wrong-import-order ) diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index a57db6802710..f453cae7f2a4 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -1311,7 +1311,7 @@ xblock-google-drive==0.8.2 # via -r requirements/edx/bundled.in xblock-poll==1.16.1 # via -r requirements/edx/bundled.in -xblocks-contrib==0.17.0 +xblocks-contrib==1.0.5 # via -r requirements/edx/bundled.in xmlsec==1.3.14 # via diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index a6ba8a991c7a..f626df9b7577 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -2319,7 +2319,7 @@ xblock-poll==1.16.1 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt -xblocks-contrib==0.17.0 +xblocks-contrib==1.0.5 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt diff --git a/requirements/edx/doc.txt b/requirements/edx/doc.txt index 014f66820678..b006be5118a1 100644 --- a/requirements/edx/doc.txt +++ b/requirements/edx/doc.txt @@ -1651,7 +1651,7 @@ xblock-google-drive==0.8.2 # via -r requirements/edx/base.txt xblock-poll==1.16.1 # via -r requirements/edx/base.txt -xblocks-contrib==0.17.0 +xblocks-contrib==1.0.5 # via -r requirements/edx/base.txt xmlsec==1.3.14 # via diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index bca394c007fe..e39a4edc5501 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -1730,7 +1730,7 @@ xblock-google-drive==0.8.2 # via -r requirements/edx/base.txt xblock-poll==1.16.1 # via -r requirements/edx/base.txt -xblocks-contrib==0.17.0 +xblocks-contrib==1.0.5 # via -r requirements/edx/base.txt xmlsec==1.3.14 # via diff --git a/xmodule/tests/test_capa_block.py b/xmodule/tests/test_capa_block.py index 49860b8fa3cc..67e656fcdd1f 100644 --- a/xmodule/tests/test_capa_block.py +++ b/xmodule/tests/test_capa_block.py @@ -29,7 +29,7 @@ from xblocks_contrib.problem.capa import responsetypes from xblocks_contrib.problem.capa.correctmap import CorrectMap from xblocks_contrib.problem.capa.responsetypes import LoncapaProblemError, ResponseError, StudentInputError -from xblocks_contrib.problem.capa.tests.test_util import UseUnsafeCodejail +from xblocks_contrib.problem.capa.testing.codejail import UseUnsafeCodejail from xblocks_contrib.problem.capa.xqueue_interface import XQueueInterface from lms.djangoapps.courseware.user_state_client import XBlockUserState