diff --git a/mopidy/internal/models.py b/mopidy/internal/models.py index 11d09bf7..67fff40d 100644 --- a/mopidy/internal/models.py +++ b/mopidy/internal/models.py @@ -25,7 +25,7 @@ class HistoryTrack(ValidatedImmutableObject): class HistoryState(ValidatedImmutableObject): """ State of the history controller. - Internally used for import/export of current state. + Internally used for save/load state. :param history: the track history :type history: list of :class:`HistoryTrack` @@ -38,7 +38,7 @@ class HistoryState(ValidatedImmutableObject): class MixerState(ValidatedImmutableObject): """ State of the mixer controller. - Internally used for import/export of current state. + Internally used for save/load state. :param volume: the volume :type volume: int @@ -56,7 +56,7 @@ class MixerState(ValidatedImmutableObject): class PlaybackState(ValidatedImmutableObject): """ State of the playback controller. - Internally used for import/export of current state. + Internally used for save/load state. :param tlid: current track tlid :type tlid: int @@ -80,7 +80,7 @@ class TracklistState(ValidatedImmutableObject): """ State of the tracklist controller. - Internally used for import/export of current state. + Internally used for save/load state. :param repeat: the repeat mode :type repeat: bool @@ -119,7 +119,7 @@ class CoreState(ValidatedImmutableObject): """ State of all Core controller. - Internally used for import/export of current state. + Internally used for save/load state. :param history: State of the history controller :type history: :class:`HistorState` diff --git a/tests/core/test_actor.py b/tests/core/test_actor.py index 62c0ba2b..b6669b58 100644 --- a/tests/core/test_actor.py +++ b/tests/core/test_actor.py @@ -52,7 +52,7 @@ class CoreActorTest(unittest.TestCase): self.assertEqual(self.core.version, versioning.get_version()) -class CoreActorExportRestoreTest(unittest.TestCase): +class CoreActorSaveLoadStateTest(unittest.TestCase): def setUp(self): self.temp_dir = tempfile.mkdtemp() diff --git a/tests/core/test_history.py b/tests/core/test_history.py index 84f8b1b1..57cc58ee 100644 --- a/tests/core/test_history.py +++ b/tests/core/test_history.py @@ -49,7 +49,7 @@ class PlaybackHistoryTest(unittest.TestCase): self.assertIn(artist.name, ref.name) -class CoreHistoryExportRestoreTest(unittest.TestCase): +class CoreHistorySaveLoadStateTest(unittest.TestCase): def setUp(self): # noqa: N802 self.tracks = [ @@ -64,7 +64,7 @@ class CoreHistoryExportRestoreTest(unittest.TestCase): self.history = HistoryController() - def test_export(self): + def test_save(self): self.history._add_track(self.tracks[2]) self.history._add_track(self.tracks[1]) @@ -75,7 +75,7 @@ class CoreHistoryExportRestoreTest(unittest.TestCase): self.assertEqual(value.history[0].track, self.refs[1]) self.assertEqual(value.history[1].track, self.refs[2]) - def test_import(self): + def test_load(self): state = HistoryState(history=[ HistoryTrack(timestamp=34, track=self.refs[0]), HistoryTrack(timestamp=45, track=self.refs[2]), @@ -98,9 +98,9 @@ class CoreHistoryExportRestoreTest(unittest.TestCase): self.assertEqual(hist[2], (45, self.refs[2])) self.assertEqual(hist[3], (56, self.refs[1])) - def test_import_invalid_type(self): + def test_load_invalid_type(self): with self.assertRaises(TypeError): self.history._load_state(11, None) - def test_import_none(self): + def test_load_none(self): self.history._load_state(None, None) diff --git a/tests/core/test_mixer.py b/tests/core/test_mixer.py index be4b314c..996b7c23 100644 --- a/tests/core/test_mixer.py +++ b/tests/core/test_mixer.py @@ -157,13 +157,13 @@ class SetMuteBadBackendTest(MockBackendCoreMixerBase): self.assertFalse(self.core.mixer.set_mute(True)) -class CoreMixerExportRestoreTest(unittest.TestCase): +class CoreMixerSaveLoadStateTest(unittest.TestCase): def setUp(self): # noqa: N802 self.mixer = dummy_mixer.create_proxy() self.core = core.Core(mixer=self.mixer, backends=[]) - def test_export_mute(self): + def test_save_mute(self): volume = 32 mute = False target = MixerState(volume=volume, mute=mute) @@ -172,7 +172,7 @@ class CoreMixerExportRestoreTest(unittest.TestCase): value = self.core.mixer._save_state() self.assertEqual(target, value) - def test_export_unmute(self): + def test_save_unmute(self): volume = 33 mute = True target = MixerState(volume=volume, mute=mute) @@ -181,7 +181,7 @@ class CoreMixerExportRestoreTest(unittest.TestCase): value = self.core.mixer._save_state() self.assertEqual(target, value) - def test_import(self): + def test_load(self): self.core.mixer.set_volume(11) volume = 45 target = MixerState(volume=volume) @@ -189,7 +189,7 @@ class CoreMixerExportRestoreTest(unittest.TestCase): self.core.mixer._load_state(target, coverage) self.assertEqual(volume, self.core.mixer.get_volume()) - def test_import_not_covered(self): + def test_load_not_covered(self): self.core.mixer.set_volume(21) self.core.mixer.set_mute(True) target = MixerState(volume=56, mute=False) @@ -198,7 +198,7 @@ class CoreMixerExportRestoreTest(unittest.TestCase): self.assertEqual(21, self.core.mixer.get_volume()) self.assertEqual(True, self.core.mixer.get_mute()) - def test_import_mute_on(self): + def test_load_mute_on(self): self.core.mixer.set_mute(False) self.assertEqual(False, self.core.mixer.get_mute()) target = MixerState(mute=True) @@ -206,7 +206,7 @@ class CoreMixerExportRestoreTest(unittest.TestCase): self.core.mixer._load_state(target, coverage) self.assertEqual(True, self.core.mixer.get_mute()) - def test_import_mute_off(self): + def test_load_mute_off(self): self.core.mixer.set_mute(True) self.assertEqual(True, self.core.mixer.get_mute()) target = MixerState(mute=False) @@ -214,9 +214,9 @@ class CoreMixerExportRestoreTest(unittest.TestCase): self.core.mixer._load_state(target, coverage) self.assertEqual(False, self.core.mixer.get_mute()) - def test_import_invalid_type(self): + def test_load_invalid_type(self): with self.assertRaises(TypeError): self.core.mixer._load_state(11, None) - def test_import_none(self): + def test_load_none(self): self.core.mixer._load_state(None, None) diff --git a/tests/core/test_playback.py b/tests/core/test_playback.py index e23c168e..e63609bf 100644 --- a/tests/core/test_playback.py +++ b/tests/core/test_playback.py @@ -1132,9 +1132,9 @@ class TestBug1177Regression(unittest.TestCase): b.playback.change_track.assert_called_once_with(track2) -class TesetCorePlaybackExportRestore(BaseTest): +class TestCorePlaybackSaveLoadState(BaseTest): - def test_export(self): + def test_save(self): tl_tracks = self.core.tracklist.get_tl_tracks() self.core.playback.play(tl_tracks[1]) @@ -1146,7 +1146,7 @@ class TesetCorePlaybackExportRestore(BaseTest): self.assertEqual(state, value) - def test_import(self): + def test_load(self): tl_tracks = self.core.tracklist.get_tl_tracks() self.core.playback.stop() @@ -1163,7 +1163,7 @@ class TesetCorePlaybackExportRestore(BaseTest): self.assertEqual(tl_tracks[2], self.core.playback.get_current_tl_track()) - def test_import_not_covered(self): + def test_load_not_covered(self): tl_tracks = self.core.tracklist.get_tl_tracks() self.core.playback.stop() @@ -1180,11 +1180,11 @@ class TesetCorePlaybackExportRestore(BaseTest): self.assertEqual(None, self.core.playback.get_current_tl_track()) - def test_import_invalid_type(self): + def test_load_invalid_type(self): with self.assertRaises(TypeError): self.core.playback._load_state(11, None) - def test_import_none(self): + def test_load_none(self): self.core.playback._load_state(None, None) diff --git a/tests/core/test_tracklist.py b/tests/core/test_tracklist.py index 4cd13d1e..120ae1f0 100644 --- a/tests/core/test_tracklist.py +++ b/tests/core/test_tracklist.py @@ -180,7 +180,7 @@ class TracklistIndexTest(unittest.TestCase): self.assertEqual(2, self.core.tracklist.index()) -class TracklistExportRestoreTest(unittest.TestCase): +class TracklistSaveLoadStateTest(unittest.TestCase): def setUp(self): # noqa: N802 config = { @@ -211,7 +211,7 @@ class TracklistExportRestoreTest(unittest.TestCase): self.core.playback = mock.Mock(spec=core.PlaybackController) - def test_export(self): + def test_save(self): tl_tracks = self.core.tracklist.add(uris=[ t.uri for t in self.tracks]) consume = True @@ -226,7 +226,7 @@ class TracklistExportRestoreTest(unittest.TestCase): value = self.core.tracklist._save_state() self.assertEqual(target, value) - def test_import(self): + def test_load(self): old_version = self.core.tracklist.get_version() target = TracklistState(consume=False, repeat=True, @@ -245,12 +245,12 @@ class TracklistExportRestoreTest(unittest.TestCase): self.assertEqual(self.tl_tracks, self.core.tracklist.get_tl_tracks()) self.assertGreater(self.core.tracklist.get_version(), old_version) - # after import, adding more tracks must be possible + # after load, adding more tracks must be possible self.core.tracklist.add(uris=[self.tracks[1].uri]) self.assertEqual(13, self.core.tracklist._next_tlid) self.assertEqual(5, self.core.tracklist.get_length()) - def test_import_mode_only(self): + def test_load_mode_only(self): old_version = self.core.tracklist.get_version() target = TracklistState(consume=False, repeat=True, @@ -269,7 +269,7 @@ class TracklistExportRestoreTest(unittest.TestCase): self.assertEqual([], self.core.tracklist.get_tl_tracks()) self.assertEqual(self.core.tracklist.get_version(), old_version) - def test_import_tracklist_only(self): + def test_load_tracklist_only(self): old_version = self.core.tracklist.get_version() target = TracklistState(consume=False, repeat=True, @@ -288,9 +288,9 @@ class TracklistExportRestoreTest(unittest.TestCase): self.assertEqual(self.tl_tracks, self.core.tracklist.get_tl_tracks()) self.assertGreater(self.core.tracklist.get_version(), old_version) - def test_import_invalid_type(self): + def test_load_invalid_type(self): with self.assertRaises(TypeError): self.core.tracklist._load_state(11, None) - def test_import_none(self): + def test_load_none(self): self.core.tracklist._load_state(None, None)