diff options
author | Markus Holtermann <info@markusholtermann.eu> | 2013-01-30 20:56:55 +0100 |
---|---|---|
committer | Markus Holtermann <info@markusholtermann.eu> | 2013-01-30 20:56:55 +0100 |
commit | 2443c414af8901e89b1b55e126ab4867c2cf91e4 (patch) | |
tree | 54e734c0b42358c5c066cfe872d7c73d99ad77e3 /tests/test_api.py | |
parent | 41af0a769e8896b6df5baccfff31d5ccea3f7da8 (diff) | |
download | bvg-grabber-2443c414af8901e89b1b55e126ab4867c2cf91e4.tar.gz bvg-grabber-2443c414af8901e89b1b55e126ab4867c2cf91e4.tar.bz2 bvg-grabber-2443c414af8901e89b1b55e126ab4867c2cf91e4.zip |
Move hourformat and fullformat to separate module. Add and adjust tests
Diffstat (limited to 'tests/test_api.py')
-rw-r--r-- | tests/test_api.py | 27 |
1 files changed, 6 insertions, 21 deletions
diff --git a/tests/test_api.py b/tests/test_api.py index 778b9b8..cf111d7 100644 --- a/tests/test_api.py +++ b/tests/test_api.py @@ -3,23 +3,8 @@ import datetime import json import unittest -from bvggrabber.api import QueryApi, Departure, fullformat, \ - compute_remaining - -from bvggrabber.utils.format import int2bin - - -class TestUtils(unittest.TestCase): - - def test_int2bin(self): - nums = [(0b1101110, 7, '1101110'), - (0b0010001, 7, '0010001'), - (0b111111, 6, '111111'), - (0b00000001, 8, '00000001'), - (0b00111, 5, '00111'), - (0b1100011, 7, '1100011')] - for b, l, s in nums: - self.assertEqual(int2bin(b, l), s) +from bvggrabber.api import QueryApi, Departure, compute_remaining +from bvggrabber.utils.format import fullformat class TestFunctions(unittest.TestCase): @@ -256,9 +241,9 @@ class TestDepartureTotalOrder(unittest.TestCase): def test_sorting_single(self): l = [self.dt_now1, self.dt_later, self.dt_earlier] self.assertEqual([self.dt_earlier, self.dt_now1, self.dt_later], - sorted(l)) + sorted(l)) self.assertEqual([self.dt_later, self.dt_now1, self.dt_earlier], - sorted(l, reverse=True)) + sorted(l, reverse=True)) def test_sorting_multiple(self): l = [self.dt_now1, self.dt_earlier, self.dt_later, @@ -267,8 +252,8 @@ class TestDepartureTotalOrder(unittest.TestCase): self.assertEqual([self.dt_earlier, self.dt_earlier, self.dt_earlier, self.dt_now1, self.dt_now2, self.dt_now2, self.dt_later, self.dt_later, self.dt_later], - sorted(l)) + sorted(l)) self.assertEqual([self.dt_later, self.dt_later, self.dt_later, self.dt_now1, self.dt_now2, self.dt_now2, self.dt_earlier, self.dt_earlier, self.dt_earlier], - sorted(l, reverse=True)) + sorted(l, reverse=True)) |