From a8274b633a62262e65c7d013e61a54541ce07bf8 Mon Sep 17 00:00:00 2001 From: Duda Dornelles Date: Thu, 22 Jan 2015 10:25:40 -0200 Subject: #224 renaming tests so they get caught by trial runner --- .../unit/resources/sync_info_controller_test.py | 54 ---------------------- .../unit/resources/test_sync_info_controller.py | 54 ++++++++++++++++++++++ 2 files changed, 54 insertions(+), 54 deletions(-) delete mode 100644 service/test/unit/resources/sync_info_controller_test.py create mode 100644 service/test/unit/resources/test_sync_info_controller.py (limited to 'service/test/unit/resources') diff --git a/service/test/unit/resources/sync_info_controller_test.py b/service/test/unit/resources/sync_info_controller_test.py deleted file mode 100644 index c24c7181..00000000 --- a/service/test/unit/resources/sync_info_controller_test.py +++ /dev/null @@ -1,54 +0,0 @@ -# -# Copyright (c) 2014 ThoughtWorks, Inc. -# -# Pixelated is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Pixelated is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Pixelated. If not, see . -import unittest -import json - -from test.support.test_helper import request_mock -from pixelated.resources.sync_info_resource import SyncInfoResource -from mockito import * - - -class SyncInfoControllerTest(unittest.TestCase): - - def setUp(self): - self.dummy_request = request_mock() - self.controller = SyncInfoResource() - - def _set_count(self, current, total): - soledad_sync_data = mock() - soledad_sync_data.content = "%s/%s" % (current, total) - self.controller.set_sync_info(soledad_sync_data) - - def get_sync_info(self): - self.controller.render_GET(self.dummy_request) - return json.loads(self.dummy_request.written[0]) - - def test_is_not_syncing_if_total_is_equal_to_current(self): - self._set_count(total=0, current=0) - - sync_info = self.get_sync_info() - - self.assertFalse(sync_info['is_syncing']) - - def test_is_syncing_if_total_is_not_equal_to_current_and_adds_count(self): - self._set_count(total=10, current=5) - - sync_info = self.get_sync_info() - - self.assertTrue(sync_info['is_syncing']) - self.assertEquals(5, sync_info['count']['current']) - self.assertEquals(10, sync_info['count']['total']) - self.assertEquals(0.5, sync_info['count']['progress']) diff --git a/service/test/unit/resources/test_sync_info_controller.py b/service/test/unit/resources/test_sync_info_controller.py new file mode 100644 index 00000000..c24c7181 --- /dev/null +++ b/service/test/unit/resources/test_sync_info_controller.py @@ -0,0 +1,54 @@ +# +# Copyright (c) 2014 ThoughtWorks, Inc. +# +# Pixelated is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# Pixelated is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with Pixelated. If not, see . +import unittest +import json + +from test.support.test_helper import request_mock +from pixelated.resources.sync_info_resource import SyncInfoResource +from mockito import * + + +class SyncInfoControllerTest(unittest.TestCase): + + def setUp(self): + self.dummy_request = request_mock() + self.controller = SyncInfoResource() + + def _set_count(self, current, total): + soledad_sync_data = mock() + soledad_sync_data.content = "%s/%s" % (current, total) + self.controller.set_sync_info(soledad_sync_data) + + def get_sync_info(self): + self.controller.render_GET(self.dummy_request) + return json.loads(self.dummy_request.written[0]) + + def test_is_not_syncing_if_total_is_equal_to_current(self): + self._set_count(total=0, current=0) + + sync_info = self.get_sync_info() + + self.assertFalse(sync_info['is_syncing']) + + def test_is_syncing_if_total_is_not_equal_to_current_and_adds_count(self): + self._set_count(total=10, current=5) + + sync_info = self.get_sync_info() + + self.assertTrue(sync_info['is_syncing']) + self.assertEquals(5, sync_info['count']['current']) + self.assertEquals(10, sync_info['count']['total']) + self.assertEquals(0.5, sync_info['count']['progress']) -- cgit v1.2.3