From a96b2bd734e95f57dd87340f66f6f966a3f70dc0 Mon Sep 17 00:00:00 2001 From: cahrens Date: Tue, 2 Sep 2014 16:36:08 -0400 Subject: [PATCH] Move tests into appropriate directory structure. --- .../acceptance/tests/discussion/__init__.py | 0 .../tests/{ => discussion}/test_discussion.py | 12 +++--- .../test/acceptance/tests/studio/__init__.py | 0 .../tests/{ => studio}/base_studio_test.py | 10 ++--- .../{ => studio}/test_studio_acid_xblock.py | 8 ++-- .../{ => studio}/test_studio_bad_data.py | 6 +-- .../{ => studio}/test_studio_container.py | 14 +++---- .../tests/{ => studio}/test_studio_general.py | 38 +++++++++---------- .../tests/{ => studio}/test_studio_outline.py | 18 ++++----- .../tests/{ => studio}/test_studio_rerun.py | 12 +++--- .../{ => studio}/test_studio_settings.py | 4 +- .../{ => studio}/test_studio_split_test.py | 20 +++++----- .../test_studio_with_ora_component.py | 12 +++--- 13 files changed, 77 insertions(+), 77 deletions(-) create mode 100644 common/test/acceptance/tests/discussion/__init__.py rename common/test/acceptance/tests/{ => discussion}/test_discussion.py (98%) create mode 100644 common/test/acceptance/tests/studio/__init__.py rename common/test/acceptance/tests/{ => studio}/base_studio_test.py (92%) rename common/test/acceptance/tests/{ => studio}/test_studio_acid_xblock.py (97%) rename common/test/acceptance/tests/{ => studio}/test_studio_bad_data.py (96%) rename common/test/acceptance/tests/{ => studio}/test_studio_container.py (98%) rename common/test/acceptance/tests/{ => studio}/test_studio_general.py (81%) rename common/test/acceptance/tests/{ => studio}/test_studio_outline.py (99%) rename common/test/acceptance/tests/{ => studio}/test_studio_rerun.py (92%) rename common/test/acceptance/tests/{ => studio}/test_studio_settings.py (98%) rename common/test/acceptance/tests/{ => studio}/test_studio_split_test.py (98%) rename common/test/acceptance/tests/{ => studio}/test_studio_with_ora_component.py (90%) diff --git a/common/test/acceptance/tests/discussion/__init__.py b/common/test/acceptance/tests/discussion/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/common/test/acceptance/tests/test_discussion.py b/common/test/acceptance/tests/discussion/test_discussion.py similarity index 98% rename from common/test/acceptance/tests/test_discussion.py rename to common/test/acceptance/tests/discussion/test_discussion.py index 8c5fe9558a..c2023f8de8 100644 --- a/common/test/acceptance/tests/test_discussion.py +++ b/common/test/acceptance/tests/discussion/test_discussion.py @@ -7,10 +7,10 @@ from pytz import UTC from uuid import uuid4 from nose.plugins.attrib import attr -from .helpers import UniqueCourseTest -from ..pages.lms.auto_auth import AutoAuthPage -from ..pages.lms.courseware import CoursewarePage -from ..pages.lms.discussion import ( +from ..helpers import UniqueCourseTest +from ...pages.lms.auto_auth import AutoAuthPage +from ...pages.lms.courseware import CoursewarePage +from ...pages.lms.discussion import ( DiscussionTabSingleThreadPage, InlineDiscussionPage, InlineDiscussionThreadPage, @@ -18,8 +18,8 @@ from ..pages.lms.discussion import ( DiscussionTabHomePage, DiscussionSortPreferencePage, ) -from ..fixtures.course import CourseFixture, XBlockFixtureDesc -from ..fixtures.discussion import ( +from ...fixtures.course import CourseFixture, XBlockFixtureDesc +from ...fixtures.discussion import ( SingleThreadViewFixture, UserProfileViewFixture, SearchResultFixture, diff --git a/common/test/acceptance/tests/studio/__init__.py b/common/test/acceptance/tests/studio/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/common/test/acceptance/tests/base_studio_test.py b/common/test/acceptance/tests/studio/base_studio_test.py similarity index 92% rename from common/test/acceptance/tests/base_studio_test.py rename to common/test/acceptance/tests/studio/base_studio_test.py index 674a167ec0..fa07533fba 100644 --- a/common/test/acceptance/tests/base_studio_test.py +++ b/common/test/acceptance/tests/studio/base_studio_test.py @@ -1,8 +1,8 @@ -from ..pages.studio.auto_auth import AutoAuthPage -from ..fixtures.course import CourseFixture -from .helpers import UniqueCourseTest -from ..pages.studio.overview import CourseOutlinePage -from ..pages.studio.utils import verify_ordering +from ...pages.studio.auto_auth import AutoAuthPage +from ...fixtures.course import CourseFixture +from ..helpers import UniqueCourseTest +from ...pages.studio.overview import CourseOutlinePage +from ...pages.studio.utils import verify_ordering class StudioCourseTest(UniqueCourseTest): diff --git a/common/test/acceptance/tests/test_studio_acid_xblock.py b/common/test/acceptance/tests/studio/test_studio_acid_xblock.py similarity index 97% rename from common/test/acceptance/tests/test_studio_acid_xblock.py rename to common/test/acceptance/tests/studio/test_studio_acid_xblock.py index 74ab26d66c..6d04fa861d 100644 --- a/common/test/acceptance/tests/test_studio_acid_xblock.py +++ b/common/test/acceptance/tests/studio/test_studio_acid_xblock.py @@ -4,10 +4,10 @@ Acceptance tests for Studio related to the acid xblock. from unittest import skip from bok_choy.web_app_test import WebAppTest -from ..pages.studio.auto_auth import AutoAuthPage -from ..pages.studio.overview import CourseOutlinePage -from ..pages.xblock.acid import AcidView -from ..fixtures.course import CourseFixture, XBlockFixtureDesc +from ...pages.studio.auto_auth import AutoAuthPage +from ...pages.studio.overview import CourseOutlinePage +from ...pages.xblock.acid import AcidView +from ...fixtures.course import CourseFixture, XBlockFixtureDesc class XBlockAcidBase(WebAppTest): diff --git a/common/test/acceptance/tests/test_studio_bad_data.py b/common/test/acceptance/tests/studio/test_studio_bad_data.py similarity index 96% rename from common/test/acceptance/tests/test_studio_bad_data.py rename to common/test/acceptance/tests/studio/test_studio_bad_data.py index bcb5b41f1e..17e738f7a4 100644 --- a/common/test/acceptance/tests/test_studio_bad_data.py +++ b/common/test/acceptance/tests/studio/test_studio_bad_data.py @@ -1,6 +1,6 @@ -from .base_studio_test import ContainerBase -from ..fixtures.course import XBlockFixtureDesc -from ..pages.studio.utils import verify_ordering +from base_studio_test import ContainerBase +from ...fixtures.course import XBlockFixtureDesc +from ...pages.studio.utils import verify_ordering class BadComponentTest(ContainerBase): diff --git a/common/test/acceptance/tests/test_studio_container.py b/common/test/acceptance/tests/studio/test_studio_container.py similarity index 98% rename from common/test/acceptance/tests/test_studio_container.py rename to common/test/acceptance/tests/studio/test_studio_container.py index e58724d3f3..c619373014 100644 --- a/common/test/acceptance/tests/test_studio_container.py +++ b/common/test/acceptance/tests/studio/test_studio_container.py @@ -5,16 +5,16 @@ displaying containers within units. """ from nose.plugins.attrib import attr -from ..fixtures.course import XBlockFixtureDesc -from ..pages.studio.component_editor import ComponentEditorView -from ..pages.studio.html_component_editor import HtmlComponentEditorView -from ..pages.studio.utils import add_discussion, drag -from ..pages.lms.courseware import CoursewarePage -from ..pages.lms.staff_view import StaffPage +from ...fixtures.course import XBlockFixtureDesc +from ...pages.studio.component_editor import ComponentEditorView +from ...pages.studio.html_component_editor import HtmlComponentEditorView +from ...pages.studio.utils import add_discussion, drag +from ...pages.lms.courseware import CoursewarePage +from ...pages.lms.staff_view import StaffPage import datetime from bok_choy.promise import Promise, EmptyPromise -from .base_studio_test import ContainerBase +from base_studio_test import ContainerBase class NestedVerticalTest(ContainerBase): diff --git a/common/test/acceptance/tests/test_studio_general.py b/common/test/acceptance/tests/studio/test_studio_general.py similarity index 81% rename from common/test/acceptance/tests/test_studio_general.py rename to common/test/acceptance/tests/studio/test_studio_general.py index 4558df6e58..88dc314673 100644 --- a/common/test/acceptance/tests/test_studio_general.py +++ b/common/test/acceptance/tests/studio/test_studio_general.py @@ -5,26 +5,26 @@ Acceptance tests for Studio. from unittest import skip from bok_choy.web_app_test import WebAppTest -from ..pages.studio.asset_index import AssetIndexPage -from ..pages.studio.auto_auth import AutoAuthPage -from ..pages.studio.checklists import ChecklistsPage -from ..pages.studio.course_import import ImportPage -from ..pages.studio.course_info import CourseUpdatesPage -from ..pages.studio.edit_tabs import PagesPage -from ..pages.studio.export import ExportPage -from ..pages.studio.howitworks import HowitworksPage -from ..pages.studio.index import DashboardPage -from ..pages.studio.login import LoginPage -from ..pages.studio.manage_users import CourseTeamPage -from ..pages.studio.overview import CourseOutlinePage -from ..pages.studio.settings import SettingsPage -from ..pages.studio.settings_advanced import AdvancedSettingsPage -from ..pages.studio.settings_graders import GradingPage -from ..pages.studio.signup import SignupPage -from ..pages.studio.textbooks import TextbooksPage -from ..fixtures.course import XBlockFixtureDesc +from ...pages.studio.asset_index import AssetIndexPage +from ...pages.studio.auto_auth import AutoAuthPage +from ...pages.studio.checklists import ChecklistsPage +from ...pages.studio.course_import import ImportPage +from ...pages.studio.course_info import CourseUpdatesPage +from ...pages.studio.edit_tabs import PagesPage +from ...pages.studio.export import ExportPage +from ...pages.studio.howitworks import HowitworksPage +from ...pages.studio.index import DashboardPage +from ...pages.studio.login import LoginPage +from ...pages.studio.manage_users import CourseTeamPage +from ...pages.studio.overview import CourseOutlinePage +from ...pages.studio.settings import SettingsPage +from ...pages.studio.settings_advanced import AdvancedSettingsPage +from ...pages.studio.settings_graders import GradingPage +from ...pages.studio.signup import SignupPage +from ...pages.studio.textbooks import TextbooksPage +from ...fixtures.course import XBlockFixtureDesc -from .base_studio_test import StudioCourseTest +from base_studio_test import StudioCourseTest class LoggedOutTest(WebAppTest): diff --git a/common/test/acceptance/tests/test_studio_outline.py b/common/test/acceptance/tests/studio/test_studio_outline.py similarity index 99% rename from common/test/acceptance/tests/test_studio_outline.py rename to common/test/acceptance/tests/studio/test_studio_outline.py index 2bd05387f7..834a3a28ba 100644 --- a/common/test/acceptance/tests/test_studio_outline.py +++ b/common/test/acceptance/tests/studio/test_studio_outline.py @@ -6,16 +6,16 @@ import itertools from pytz import UTC from bok_choy.promise import EmptyPromise -from ..pages.studio.overview import CourseOutlinePage, ContainerPage, ExpandCollapseLinkState -from ..pages.studio.utils import add_discussion, drag, verify_ordering -from ..pages.lms.courseware import CoursewarePage -from ..pages.lms.course_nav import CourseNavPage -from ..pages.lms.staff_view import StaffPage -from ..fixtures.course import XBlockFixtureDesc +from ...pages.studio.overview import CourseOutlinePage, ContainerPage, ExpandCollapseLinkState +from ...pages.studio.utils import add_discussion, drag, verify_ordering +from ...pages.lms.courseware import CoursewarePage +from ...pages.lms.course_nav import CourseNavPage +from ...pages.lms.staff_view import StaffPage +from ...fixtures.course import XBlockFixtureDesc -from .base_studio_test import StudioCourseTest -from .helpers import load_data_str -from ..pages.lms.progress import ProgressPage +from base_studio_test import StudioCourseTest +from ..helpers import load_data_str +from ...pages.lms.progress import ProgressPage SECTION_NAME = 'Test Section' diff --git a/common/test/acceptance/tests/test_studio_rerun.py b/common/test/acceptance/tests/studio/test_studio_rerun.py similarity index 92% rename from common/test/acceptance/tests/test_studio_rerun.py rename to common/test/acceptance/tests/studio/test_studio_rerun.py index 7a0a956314..4862ba4d7e 100644 --- a/common/test/acceptance/tests/test_studio_rerun.py +++ b/common/test/acceptance/tests/studio/test_studio_rerun.py @@ -5,13 +5,13 @@ Acceptance tests for Studio related to course reruns. import random from bok_choy.promise import EmptyPromise -from ..pages.studio.index import DashboardPage -from ..pages.studio.course_rerun import CourseRerunPage -from ..pages.studio.overview import CourseOutlinePage -from ..pages.lms.courseware import CoursewarePage -from ..fixtures.course import XBlockFixtureDesc +from ...pages.studio.index import DashboardPage +from ...pages.studio.course_rerun import CourseRerunPage +from ...pages.studio.overview import CourseOutlinePage +from ...pages.lms.courseware import CoursewarePage +from ...fixtures.course import XBlockFixtureDesc -from .base_studio_test import StudioCourseTest +from base_studio_test import StudioCourseTest class CourseRerunTest(StudioCourseTest): diff --git a/common/test/acceptance/tests/test_studio_settings.py b/common/test/acceptance/tests/studio/test_studio_settings.py similarity index 98% rename from common/test/acceptance/tests/test_studio_settings.py rename to common/test/acceptance/tests/studio/test_studio_settings.py index 86f2c40577..51c98961a3 100644 --- a/common/test/acceptance/tests/test_studio_settings.py +++ b/common/test/acceptance/tests/studio/test_studio_settings.py @@ -4,9 +4,9 @@ Acceptance tests for Studio's Setting pages from nose.plugins.attrib import attr -from acceptance.tests.base_studio_test import StudioCourseTest +from base_studio_test import StudioCourseTest -from ..pages.studio.settings_advanced import AdvancedSettingsPage +from ...pages.studio.settings_advanced import AdvancedSettingsPage @attr('shard_1') diff --git a/common/test/acceptance/tests/test_studio_split_test.py b/common/test/acceptance/tests/studio/test_studio_split_test.py similarity index 98% rename from common/test/acceptance/tests/test_studio_split_test.py rename to common/test/acceptance/tests/studio/test_studio_split_test.py index 07983bda17..1fabdff540 100644 --- a/common/test/acceptance/tests/test_studio_split_test.py +++ b/common/test/acceptance/tests/studio/test_studio_split_test.py @@ -11,17 +11,17 @@ from selenium.webdriver.support.ui import Select from xmodule.partitions.partitions import Group, UserPartition from bok_choy.promise import Promise, EmptyPromise -from ..fixtures.course import XBlockFixtureDesc -from ..pages.studio.component_editor import ComponentEditorView -from ..pages.studio.overview import CourseOutlinePage, CourseOutlineUnit -from ..pages.studio.settings_advanced import AdvancedSettingsPage -from ..pages.studio.container import ContainerPage -from ..pages.studio.settings_group_configurations import GroupConfigurationsPage -from ..pages.studio.utils import add_advanced_component -from ..pages.xblock.utils import wait_for_xblock_initialization -from ..pages.lms.courseware import CoursewarePage +from ...fixtures.course import XBlockFixtureDesc +from ...pages.studio.component_editor import ComponentEditorView +from ...pages.studio.overview import CourseOutlinePage, CourseOutlineUnit +from ...pages.studio.settings_advanced import AdvancedSettingsPage +from ...pages.studio.container import ContainerPage +from ...pages.studio.settings_group_configurations import GroupConfigurationsPage +from ...pages.studio.utils import add_advanced_component +from ...pages.xblock.utils import wait_for_xblock_initialization +from ...pages.lms.courseware import CoursewarePage -from .base_studio_test import StudioCourseTest +from base_studio_test import StudioCourseTest from test_studio_container import ContainerBase diff --git a/common/test/acceptance/tests/test_studio_with_ora_component.py b/common/test/acceptance/tests/studio/test_studio_with_ora_component.py similarity index 90% rename from common/test/acceptance/tests/test_studio_with_ora_component.py rename to common/test/acceptance/tests/studio/test_studio_with_ora_component.py index 3101468a61..6d0a6f7ac6 100644 --- a/common/test/acceptance/tests/test_studio_with_ora_component.py +++ b/common/test/acceptance/tests/studio/test_studio_with_ora_component.py @@ -2,12 +2,12 @@ Acceptance tests for Studio related to edit/save peer grading interface. """ -from ..fixtures.course import XBlockFixtureDesc -from ..pages.studio.export import ExportPage -from ..pages.studio.component_editor import ComponentEditorView -from ..pages.studio.overview import CourseOutlinePage -from .base_studio_test import StudioCourseTest -from .helpers import load_data_str +from ...fixtures.course import XBlockFixtureDesc +from ...pages.studio.export import ExportPage +from ...pages.studio.component_editor import ComponentEditorView +from ...pages.studio.overview import CourseOutlinePage +from base_studio_test import StudioCourseTest +from ..helpers import load_data_str class ORAComponentTest(StudioCourseTest):