[Pkg-running-devel] [SCM] Debian package for pytrainer branch, master, updated. debian/1.8.0-4-6-g4614043
Christian Perrier
bubulle at debian.org
Sat Nov 26 18:24:53 UTC 2011
The following commit has been merged in the master branch:
commit 4614043fa130ba3e5da3e8a938468cf97fd58f51
Author: Christian Perrier <bubulle at debian.org>
Date: Sat Nov 26 19:08:48 2011 +0100
Drop dropped directory
diff --git a/test/pytrainer/environment_test.py b/test/pytrainer/environment_test.py
deleted file mode 100644
index 0b99875..0000000
--- a/test/pytrainer/environment_test.py
+++ /dev/null
@@ -1,75 +0,0 @@
-# -*- coding: iso-8859-1 -*-
-
-#Copyright (C) Nathan Jones ncjones at users.sourceforge.net
-
-#This program is free software; you can redistribute it and/or
-#modify it under the terms of the GNU General Public License
-#as published by the Free Software Foundation; either version 2
-#of the License, or (at your option) any later version.
-
-#This program 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 General Public License for more details.
-
-#You should have received a copy of the GNU General Public License
-#along with this program; if not, write to the Free Software
-#Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-import unittest
-
-from mock import Mock
-
-import pytrainer.platform
-from pytrainer.environment import Environment
-
-TEST_DIR_NAME = "/test/.pytrainer_test"
-
-PLATFORM = pytrainer.platform.get_platform()
-
-class Test(unittest.TestCase):
-
- def setUp(self):
- pass
-
- def tearDown(self):
- pass
-
- def test_get_conf_dir(self):
- environment = Environment(PLATFORM, TEST_DIR_NAME)
- self.assertEquals(TEST_DIR_NAME, environment.conf_dir)
-
- def test_get_conf_dir_default(self):
- test_platform = Mock(spec=pytrainer.platform.get_platform())
- test_platform.get_default_conf_dir.return_value = "/test/.pytrainer_test"
- environment = Environment(test_platform, None)
- self.assertEquals("/test/.pytrainer_test", environment.conf_dir)
-
- def test_get_conf_file(self):
- environment = Environment(PLATFORM, TEST_DIR_NAME)
- self.assertEquals(TEST_DIR_NAME + "/conf.xml", environment.conf_file)
-
- def test_get_log_file(self):
- environment = Environment(PLATFORM, TEST_DIR_NAME)
- self.assertEquals(TEST_DIR_NAME + "/log.out", environment.log_file)
-
- def test_get_temp_dir(self):
- environment = Environment(PLATFORM, TEST_DIR_NAME)
- self.assertEquals(TEST_DIR_NAME + "/tmp", environment.temp_dir)
-
- def test_get_gpx_dir(self):
- environment = Environment(PLATFORM, TEST_DIR_NAME)
- self.assertEquals(TEST_DIR_NAME + "/gpx", environment.gpx_dir)
-
- def test_get_extension_dir(self):
- environment = Environment(PLATFORM, TEST_DIR_NAME)
- self.assertEquals(TEST_DIR_NAME + "/extensions", environment.extension_dir)
-
- def test_get_plugin_dir(self):
- environment = Environment(PLATFORM, TEST_DIR_NAME)
- self.assertEquals(TEST_DIR_NAME + "/plugins", environment.plugin_dir)
-
-
-if __name__ == "__main__":
- #import sys;sys.argv = ['', 'Test.testName']
- unittest.main()
\ No newline at end of file
diff --git a/test/pytrainer/equipment_test.py b/test/pytrainer/equipment_test.py
deleted file mode 100644
index 24f78d3..0000000
--- a/test/pytrainer/equipment_test.py
+++ /dev/null
@@ -1,348 +0,0 @@
-# -*- coding: utf-8 -*-
-
-#Copyright (C) Nathan Jones ncjones at users.sourceforge.net
-
-#This program is free software; you can redistribute it and/or
-#modify it under the terms of the GNU General Public License
-#as published by the Free Software Foundation; either version 2
-#of the License, or (at your option) any later version.
-
-#This program 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 General Public License for more details.
-
-#You should have received a copy of the GNU General Public License
-#along with this program; if not, write to the Free Software
-#Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-import unittest
-import mock
-from pytrainer.equipment import Equipment, EquipmentService,\
- EquipmentServiceException
-from pytrainer.lib.sqliteUtils import Sql
-
-class EquipmentTest(unittest.TestCase):
-
- def setUp(self):
- pass
-
- def tearDown(self):
- pass
-
- def test_id_defaults_to_none(self):
- equipment = Equipment()
- self.assertEqual(None, equipment.id)
-
- def test_id_set_to_integer(self):
- equipment = Equipment()
- equipment.id = 2
- self.assertEquals(2, equipment.id)
-
- def test_id_set_to_numeric_string(self):
- equipment = Equipment()
- equipment.id = "3"
- self.assertEquals(3, equipment.id)
-
- def test_id_set_to_non_numeric_string(self):
- equipment = Equipment()
- try:
- equipment.id = "test"
- except(ValueError):
- pass
- else:
- self.fail("Should not be able to set equipment id to non numeric value.")
-
- def test_description_defaults_to_empty_string(self):
- equipment = Equipment()
- self.assertEquals(u"", equipment.description)
-
- def test_description_set_to_string(self):
- equipment = Equipment()
- try:
- equipment.description = "100$ Shoes"
- except(TypeError):
- pass
- else:
- self.fail("Should not be able to set description to non unicode string value.")
-
- def test_description_set_to_unicode_string(self):
- equipment = Equipment()
- equipment.description = u"Zapatos de €100"
- self.assertEquals(u"Zapatos de €100", equipment.description)
-
- def test_description_set_to_non_string(self):
- equipment = Equipment()
- try:
- equipment.description = 42
- except(TypeError):
- pass
- else:
- self.fail("Should not be able to set description to non string value.")
-
- def test_active_defaults_to_true(self):
- equipment = Equipment()
- self.assertTrue(equipment.active)
-
- def test_active_set_to_boolean(self):
- equipment = Equipment()
- equipment.active = False
- self.assertFalse(equipment.active)
-
- def test_active_set_to_non_boolean(self):
- equipment = Equipment()
- try:
- equipment.active = "test"
- except(TypeError):
- pass
- else:
- self.fail("Should not be able to set active to non-boolean value.")
-
- def test_life_expectancy_defaults_to_zero(self):
- equipment = Equipment()
- self.assertEqual(0, equipment.life_expectancy)
-
- def test_life_expectancy_set_to_integer(self):
- equipment = Equipment()
- equipment.life_expectancy = 2
- self.assertEquals(2, equipment.life_expectancy)
-
- def test_life_expectancy_set_to_numeric_string(self):
- equipment = Equipment()
- equipment.life_expectancy = "3"
- self.assertEquals(3, equipment.life_expectancy)
-
- def test_life_expectancy_set_to_non_numeric_string(self):
- equipment = Equipment()
- try:
- equipment.life_expectancy = "test"
- except(ValueError):
- pass
- else:
- self.fail("Should not be able to set life expectancy to non numeric value.")
-
- def test_prior_usage_defaults_to_zero(self):
- equipment = Equipment()
- self.assertEqual(0, equipment.prior_usage)
-
- def test_prior_usage_set_to_integer(self):
- equipment = Equipment()
- equipment.prior_usage = 2
- self.assertEquals(2, equipment.prior_usage)
-
- def test_prior_usage_set_to_numeric_string(self):
- equipment = Equipment()
- equipment.prior_usage = "3"
- self.assertEquals(3, equipment.prior_usage)
-
- def test_prior_usage_set_to_non_numeric_string(self):
- equipment = Equipment()
- try:
- equipment.prior_usage = "test"
- except(ValueError):
- pass
- else:
- self.fail("Should not be able to set life expectancy to non numeric value.")
-
- def test_notes_defaults_to_empty_string(self):
- equipment = Equipment()
- self.assertEquals(u"", equipment.notes)
-
- def test_notes_set_to_string(self):
- equipment = Equipment()
- try:
- equipment.notes = "100$ Shoes"
- except(TypeError):
- pass
- else:
- self.fail("Should not be able to set notes to non-unicode string value.")
-
- def test_notes_set_to_unicode_string(self):
- equipment = Equipment()
- equipment.notes = u"Zapatos de €100."
- self.assertEquals(u"Zapatos de €100.", equipment.notes)
-
- def test_notes_set_to_non_string(self):
- equipment = Equipment()
- try:
- equipment.notes = 42
- except(TypeError):
- pass
- else:
- self.fail("Should not be able to set notes to non-string value.")
-
- def test_equals_new_instances(self):
- equipment1 = Equipment()
- equipment2 = Equipment()
- self.assertNotEqual(equipment1, equipment2, "")
-
- def test_equals_instances_with_same_id(self):
- equipment1 = Equipment()
- equipment1.id = 1
- equipment2 = Equipment()
- equipment2.id = 1
- self.assertEqual(equipment1, equipment2, "Equipment instances with same id should be equal.")
-
- def test_equals_instances_with_different_ids(self):
- equipment1 = Equipment()
- equipment1.id = 1
- equipment2 = Equipment()
- equipment2.id = 2
- self.assertNotEqual(equipment1, equipment2, "Equipment instances with different ids should not be equal.")
-
-class EquipmentServiceTest(unittest.TestCase):
-
- def setUp(self):
- self.mock_ddbb = mock.Mock(spec=Sql)
- self.equipment_service = EquipmentService(self.mock_ddbb)
-
- def tearDown(self):
- pass
-
- def test_get_equipment_item(self):
- self.mock_ddbb.select.return_value = [(1, u"Test Description", True, 500, 200, u"Test notes.")]
- item = self.equipment_service.get_equipment_item(1)
- self.assertEquals(1, item.id)
- self.assertEquals("Test Description", item.description)
- self.assertTrue(item.active)
- self.assertEquals(500, item.life_expectancy)
- self.assertEquals(200, item.prior_usage)
- self.assertEquals("Test notes.", item.notes)
-
- def test_get_equipment_item_non_unicode(self):
- self.mock_ddbb.select.return_value = [(1, "Test Description", True, 500, 200, "Test notes.")]
- item = self.equipment_service.get_equipment_item(1)
- self.assertEquals("Test Description", item.description)
- self.assertEquals("Test notes.", item.notes)
-
- def test_get_equipment_item_non_existant(self):
- self.mock_ddbb.select.return_value = []
- item = self.equipment_service.get_equipment_item(1)
- self.assertEquals(None, item)
-
- def test_get_all_equipment(self):
- self.mock_ddbb.select.return_value = [(1, u"Test item 1", True, 500, 200, u"Test notes 1."),
- (2, u"Test item 2", False, 600, 300, u"Test notes 2.")]
- items = self.equipment_service.get_all_equipment()
- item = items[0]
- self.assertEquals(1, item.id)
- self.assertEquals("Test item 1", item.description)
- self.assertTrue(item.active)
- self.assertEquals(500, item.life_expectancy)
- self.assertEquals(200, item.prior_usage)
- self.assertEquals("Test notes 1.", item.notes)
- item = items[1]
- self.assertEquals(2, item.id)
- self.assertEquals("Test item 2", item.description)
- self.assertFalse(item.active)
- self.assertEquals(600, item.life_expectancy)
- self.assertEquals(300, item.prior_usage)
- self.assertEquals("Test notes 2.", item.notes)
-
- def test_get_all_equipment_non_existant(self):
- self.mock_ddbb.select.return_value = []
- items = self.equipment_service.get_all_equipment()
- self.assertEquals([], items)
-
- def test_get_active_equipment(self):
- self.mock_ddbb.select.return_value = [(1, u"Test item 1", True, 500, 200, u"Test notes 1."),
- (2, u"Test item 2", True, 600, 300, u"Test notes 2.")]
- items = self.equipment_service.get_active_equipment()
- item = items[0]
- self.assertEquals(1, item.id)
- self.assertEquals("Test item 1", item.description)
- self.assertTrue(item.active)
- self.assertEquals(500, item.life_expectancy)
- self.assertEquals(200, item.prior_usage)
- self.assertEquals("Test notes 1.", item.notes)
- item = items[1]
- self.assertEquals(2, item.id)
- self.assertEquals("Test item 2", item.description)
- self.assertTrue(item.active)
- self.assertEquals(600, item.life_expectancy)
- self.assertEquals(300, item.prior_usage)
- self.assertEquals("Test notes 2.", item.notes)
-
- def test_get_active_equipment_non_existant(self):
- self.mock_ddbb.select.return_value = []
- items = self.equipment_service.get_active_equipment()
- self.assertEquals([], items)
-
- def test_store_equipment(self):
- equipment = Equipment()
- equipment.description = u"test description"
- equipment_ids = []
- def mock_select(table, columns, where):
- if columns == "id":
- return equipment_ids
- else:
- return [(2, u"", 1, 0, 0,u"")]
- def update_equipment_ids(*args):
- equipment_ids.append([1])
- self.mock_ddbb.select = mock.Mock(wraps=mock_select)
- self.mock_ddbb.insert.side_effect = update_equipment_ids
- stored_equipment = self.equipment_service.store_equipment(equipment)
- self.mock_ddbb.insert.assert_called_with("equipment",
- "description,active,life_expectancy,prior_usage,notes",
- ["test description", 1, 0, 0,"" ])
- self.assertEquals(2, stored_equipment.id)
-
- def test_store_equipment_duplicate_description(self):
- self.mock_ddbb.select.return_value = [(1,)]
- equipment = Equipment()
- equipment.description = u"test item"
- try:
- self.equipment_service.store_equipment(equipment)
- self.fail("Should not be able to store new item with non-unique description.")
- except(EquipmentServiceException):
- pass
-
- def test_update_equipment(self):
- equipment = Equipment()
- equipment.id = 1
- equipment.description = u"new description"
- self.mock_ddbb.select.return_value = [(1, u"old description", 1, 0, 0,u"")]
- self.equipment_service.store_equipment(equipment)
- self.mock_ddbb.update.assert_called_with("equipment",
- "description,active,life_expectancy,prior_usage,notes",
- ["new description", 1, 0, 0,"" ],
- "id = 1")
-
- def test_update_equipment_non_existant(self):
- self.mock_ddbb.select.return_value = []
- equipment = Equipment()
- equipment.id = 1
- try:
- self.equipment_service.store_equipment(equipment)
- self.fail("Should not be able to update an item which did not previously exist.")
- except(EquipmentServiceException):
- pass
-
- def test_update_equipment_duplicate_description(self):
- self.mock_ddbb.select.return_value = [(1, u"test item", True, 500, 200, u"Test notes.")]
- equipment = Equipment()
- equipment.id = 2
- equipment.description = u"test item"
- try:
- self.equipment_service.store_equipment(equipment)
- self.fail("Should not be able to change item description to non-unique value.")
- except(EquipmentServiceException):
- pass
-
- def test_get_equipment_usage(self):
- self.mock_ddbb.select.return_value = [(250,)]
- equipment = Equipment()
- equipment.id = 1
- usage = self.equipment_service.get_equipment_usage(equipment)
- self.assertEquals(250, usage)
-
- def test_get_equipment_usage_none(self):
- self.mock_ddbb.select.return_value = [(None,)]
- equipment = Equipment()
- equipment.id = 1
- usage = self.equipment_service.get_equipment_usage(equipment)
- self.assertEquals(0, usage)
-
-if __name__ == "__main__":
- #import sys;sys.argv = ['', 'Test.testName']
- unittest.main()
diff --git a/test/pytrainer/gui/equipment_test.py b/test/pytrainer/gui/equipment_test.py
deleted file mode 100644
index 3fc9829..0000000
--- a/test/pytrainer/gui/equipment_test.py
+++ /dev/null
@@ -1,162 +0,0 @@
-# -*- coding: utf-8 -*-
-from unittest import TestCase
-from mock import Mock
-from pytrainer.equipment import Equipment, EquipmentService
-from pytrainer.gui.equipment import EquipmentStore
-
-#Copyright (C) Nathan Jones ncjones at users.sourceforge.net
-
-#This program is free software; you can redistribute it and/or
-#modify it under the terms of the GNU General Public License
-#as published by the Free Software Foundation; either version 2
-#of the License, or (at your option) any later version.
-
-#This program 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 General Public License for more details.
-
-#You should have received a copy of the GNU General Public License
-#along with this program; if not, write to the Free Software
-#Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-class EquipmentStoreTest(TestCase):
-
- def setUp(self):
- self.mock_equipment_service = Mock(spec=EquipmentService)
- self.mock_equipment_service.get_equipment_usage.return_value = 0
-
- def tearDown(self):
- pass
-
- def test_get_item_id(self):
- equipment = Equipment()
- equipment.id = 1
- self.mock_equipment_service.get_all_equipment.return_value = [equipment]
- equipment_store = EquipmentStore(self.mock_equipment_service)
- iter = equipment_store.get_iter_first()
- self.assertEquals(1, equipment_store.get_value(iter, 0))
-
- def test_get_item_description(self):
- equipment = Equipment()
- equipment.id = 1
- equipment.description = u"item description"
- self.mock_equipment_service.get_all_equipment.return_value = [equipment]
- equipment_store = EquipmentStore(self.mock_equipment_service)
- iter = equipment_store.get_iter_first()
- self.assertEquals("item description", equipment_store.get_value(iter, 1))
-
- def test_get_item_usage_percent(self):
- equipment = Equipment()
- equipment.id = 1
- equipment.life_expectancy = 200
- self.mock_equipment_service.get_all_equipment.return_value = [equipment]
- self.mock_equipment_service.get_equipment_usage.return_value = 100
- equipment_store = EquipmentStore(self.mock_equipment_service)
- iter = equipment_store.get_iter_first()
- self.assertEquals(50, equipment_store.get_value(iter, 2))
-
- def test_get_item_usage_percent_prior_usage(self):
- equipment = Equipment()
- equipment.id = 1
- equipment.life_expectancy = 200
- equipment.prior_usage = 50
- self.mock_equipment_service.get_all_equipment.return_value = [equipment]
- self.mock_equipment_service.get_equipment_usage.return_value = 100
- equipment_store = EquipmentStore(self.mock_equipment_service)
- iter = equipment_store.get_iter_first()
- self.assertEquals(75, equipment_store.get_value(iter, 2))
-
- def test_get_item_usage_percent_zero_usage(self):
- equipment = Equipment()
- equipment.id = 1
- equipment.life_expectancy = 200
- self.mock_equipment_service.get_all_equipment.return_value = [equipment]
- self.mock_equipment_service.get_equipment_usage.return_value = 0
- equipment_store = EquipmentStore(self.mock_equipment_service)
- iter = equipment_store.get_iter_first()
- self.assertEquals(0, equipment_store.get_value(iter, 2))
-
- def test_get_item_usage_percent_usage_exceeds_life_expectancy(self):
- equipment = Equipment()
- equipment.id = 1
- equipment.life_expectancy = 200
- self.mock_equipment_service.get_all_equipment.return_value = [equipment]
- self.mock_equipment_service.get_equipment_usage.return_value = 300
- equipment_store = EquipmentStore(self.mock_equipment_service)
- iter = equipment_store.get_iter_first()
- self.assertEquals(100, equipment_store.get_value(iter, 2), "Progress bar cannot exceed 100%.")
-
-
- def test_get_item_usage_text(self):
- equipment = Equipment()
- equipment.id = 1
- equipment.life_expectancy = 200
- self.mock_equipment_service.get_all_equipment.return_value = [equipment]
- self.mock_equipment_service.get_equipment_usage.return_value = 100
- equipment_store = EquipmentStore(self.mock_equipment_service)
- iter = equipment_store.get_iter_first()
- self.assertEquals("100 / 200", equipment_store.get_value(iter, 3))
-
- def test_get_item_usage_text_rounded(self):
- equipment = Equipment()
- equipment.id = 1
- equipment.life_expectancy = 200
- self.mock_equipment_service.get_all_equipment.return_value = [equipment]
- self.mock_equipment_service.get_equipment_usage.return_value = 100.5
- equipment_store = EquipmentStore(self.mock_equipment_service)
- iter = equipment_store.get_iter_first()
- self.assertEquals("101 / 200", equipment_store.get_value(iter, 3))
-
- def test_get_item_usage_text_prior_usage(self):
- equipment = Equipment()
- equipment.id = 1
- equipment.life_expectancy = 200
- equipment.prior_usage = 50
- self.mock_equipment_service.get_all_equipment.return_value = [equipment]
- self.mock_equipment_service.get_equipment_usage.return_value = 100
- equipment_store = EquipmentStore(self.mock_equipment_service)
- iter = equipment_store.get_iter_first()
- self.assertEquals("150 / 200", equipment_store.get_value(iter, 3))
-
- def test_get_item_usage_text_zero_usage(self):
- equipment = Equipment()
- equipment.id = 1
- equipment.life_expectancy = 200
- self.mock_equipment_service.get_all_equipment.return_value = [equipment]
- self.mock_equipment_service.get_equipment_usage.return_value = 0
- equipment_store = EquipmentStore(self.mock_equipment_service)
- iter = equipment_store.get_iter_first()
- self.assertEquals("0 / 200", equipment_store.get_value(iter, 3))
-
- def test_get_item_usage_text_usage_exceeds_life_expectancy(self):
- equipment = Equipment()
- equipment.id = 1
- equipment.life_expectancy = 200
- self.mock_equipment_service.get_all_equipment.return_value = [equipment]
- self.mock_equipment_service.get_equipment_usage.return_value = 300
- equipment_store = EquipmentStore(self.mock_equipment_service)
- iter = equipment_store.get_iter_first()
- self.assertEquals("300 / 200", equipment_store.get_value(iter, 3))
-
- def test_get_item_active(self):
- equipment = Equipment()
- equipment.id = 1
- equipment.active = False
- self.mock_equipment_service.get_all_equipment.return_value = [equipment]
- equipment_store = EquipmentStore(self.mock_equipment_service)
- iter = equipment_store.get_iter_first()
- self.assertFalse(equipment_store.get_value(iter, 4))
-
- def test_multiple_equipment_items(self):
- equipment1 = Equipment()
- equipment1.id = 1
- equipment2 = Equipment()
- equipment2.id = 2
- self.mock_equipment_service.get_all_equipment.return_value = [equipment1, equipment2]
- equipment_store = EquipmentStore(self.mock_equipment_service)
- iter = equipment_store.get_iter_first()
- iter = equipment_store.iter_next(iter)
- self.assertEquals(2, equipment_store.get_value(iter, 0))
-
-
--
Debian package for pytrainer
More information about the Pkg-running-devel
mailing list