From: Thomas Perl Date: Wed, 28 Sep 2011 19:10:07 +0000 (+0200) Subject: Move unit tests and images to subfolders X-Git-Url: https://vcs.maemo.org/git/?a=commitdiff_plain;h=37b396dc337011f32ca085d3dbac81c446d2abf2;p=pywienerlinien Move unit tests and images to subfolders --- diff --git a/README b/README index e225d65..d80b35c 100644 --- a/README +++ b/README @@ -4,3 +4,8 @@ Using qml gui to show results Show next bus/tram/underground departures. This program ist unofficial. + +Running unit tests: + +$ python -m gotovienna.tests.runner + diff --git a/gotovienna/tests/__init__.py b/gotovienna/tests/__init__.py new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/gotovienna/tests/__init__.py @@ -0,0 +1 @@ + diff --git a/gotovienna/tests/realtime.py b/gotovienna/tests/realtime.py new file mode 100644 index 0000000..d7cf44a --- /dev/null +++ b/gotovienna/tests/realtime.py @@ -0,0 +1,26 @@ +import unittest +import sys +import os +sys.path.insert(0, os.path.join(os.path.dirname(__file__), '..')) + +from gotovienna.realtime import * + +parser = ITipParser() + +class ParseTest(unittest.TestCase): + + def test_lines(self): + lines = parser.lines + self.assertTrue(type(lines) == dict) + self.assertTrue(lines) + + def test_stations(self): + lines = parser.lines + + s = [] + for line in lines: + s.append(parser.get_stations(line[0])) + self.assertTrue(s) + +if __name__ == '__main__': + unittest.main() diff --git a/gotovienna/tests/routing.py b/gotovienna/tests/routing.py new file mode 100644 index 0000000..3f27286 --- /dev/null +++ b/gotovienna/tests/routing.py @@ -0,0 +1,74 @@ +# -*- coding: utf-8 -*- + +import unittest +from datetime import datetime + +from gotovienna.routing import * + +dtime = datetime.now() +dtime = dtime.replace(hour=15, minute=0) + +origin = u'Börse'.encode('UTF-8') +destination = 'Handelskai' +s = search((origin, 'stop'), (destination, 'stop'), dtime).read() +parser = sParser(s) +p = rParser(s) + + +originc = 'Simmeri' +destinationc = 'Karlspla' +sc = search((originc, 'stop'), (destinationc, 'stop'), dtime).read() +parserc = sParser(sc) + + +origina = 'Zwicklgasse 1' +destinationa = 'Himmelstrasse 1' +ot = dt = 'address' + + +originac = 'Foobar Strasse 123' +destinationac = 'Bazgasse 321' + + +class SearchTest(unittest.TestCase): + + def test_state(self): + state = parser.check_page() + statec = parserc.check_page() + + self.assertEqual(PageType.RESULT, state) + self.assertEqual(PageType.CORRECTION, statec) + + def test_correction(self): + cor = parserc.get_correction() + s = search((cor[0][0], 'stop'), (cor[1][0], 'stop'), dtime).read() + parser = sParser(s) + self.assertEqual(PageType.RESULT, parser.check_page()) + + def test_overview_shouldFindMultipleItems(self): + # TODO Replace with assertGreater in new python version + self.assertTrue(len(p.overview) > 1) + + def test_detail_shouldFindMultipleItems(self): + # TODO Replace with assertGreater in new python version + self.assertTrue(len(p.details) > 1) + + def test_detail_shouldFindMultipleStations(self): + # TODO Replace with assertGreater in new python version + self.assertTrue(len(p.details[0]) > 1) + + def test_parser_overviewAndDetailsShouldHaveSameLength(self): + self.assertEqual(len(p.details), len(p.overview)) + + def test_parser_shouldFindMoreThanOneChange(self): + self.assertTrue(p.overview[0]['change'] > 0) + + def test_parser_shouldFindPriceGreaterZero(self): + self.assertTrue(p.overview[0]['price'] > 0.0) + + def test_parser_shouldFindDate(self): + self.assertTrue(p.overview[0]['date'] == dtime.date()) + + +if __name__ == '__main__': + unittest.main() diff --git a/gotovienna/tests/runner.py b/gotovienna/tests/runner.py new file mode 100644 index 0000000..7c520f9 --- /dev/null +++ b/gotovienna/tests/runner.py @@ -0,0 +1,11 @@ + +import unittest + +# XXX: This is not really nice - we should use some kind of discovery + +from gotovienna.tests.realtime import * +from gotovienna.tests.routing import * + +if __name__ == '__main__': + unittest.main() + diff --git a/images/logo.png b/images/logo.png new file mode 100644 index 0000000..fec950d Binary files /dev/null and b/images/logo.png differ diff --git a/images/logo.svg b/images/logo.svg new file mode 100644 index 0000000..58f9914 --- /dev/null +++ b/images/logo.svg @@ -0,0 +1,112 @@ + + + + + + + + + + image/svg+xml + + + + + + goto + vienna + + + diff --git a/logo.png b/logo.png deleted file mode 100644 index fec950d..0000000 Binary files a/logo.png and /dev/null differ diff --git a/logo.svg b/logo.svg deleted file mode 100644 index 58f9914..0000000 --- a/logo.svg +++ /dev/null @@ -1,112 +0,0 @@ - - - - - - - - - - image/svg+xml - - - - - - goto - vienna - - - diff --git a/tests/__init__.py b/tests/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/tests/realtime.py b/tests/realtime.py deleted file mode 100644 index 9d2b1e3..0000000 --- a/tests/realtime.py +++ /dev/null @@ -1,25 +0,0 @@ -import unittest -import sys -import os -sys.path.insert(0, os.path.join(os.path.dirname(__file__), '..')) -from iTip import iParser - -parser = iParser() - -class ParseTest(unittest.TestCase): - - def test_lines(self): - lines = parser.lines - self.assertTrue(type(lines) == dict) - self.assertTrue(lines) - - def test_stations(self): - lines = parser.lines - - s = [] - for line in lines: - s.append(parser.get_stations(line[0])) - self.assertTrue(s) - -if __name__ == '__main__': - unittest.main() diff --git a/tests/routing.py b/tests/routing.py deleted file mode 100644 index 07a9d90..0000000 --- a/tests/routing.py +++ /dev/null @@ -1,74 +0,0 @@ -#!/usr/bin/env python -# -*- coding: UTF-8 -*- -import unittest -from scotty import search, ParserError, sParser, rParser, PageType -from datetime import datetime -from BeautifulSoup import BeautifulSoup - -dtime = datetime.now() -dtime = dtime.replace(hour=15, minute=0) - -origin = u'Börse'.encode('UTF-8') -destination = 'Handelskai' -s = search((origin, 'stop'), (destination, 'stop'), dtime).read() -parser = sParser(s) -p = rParser(s) - - -originc = 'Simmeri' -destinationc = 'Karlspla' -sc = search((originc, 'stop'), (destinationc, 'stop'), dtime).read() -parserc = sParser(sc) - - -origina = 'Zwicklgasse 1' -destinationa = 'Himmelstrasse 1' -ot = dt = 'address' - - -originac = 'Foobar Strasse 123' -destinationac = 'Bazgasse 321' - - -class SearchTest(unittest.TestCase): - - def test_state(self): - state = parser.check_page() - statec = parserc.check_page() - - self.assertEqual(PageType.RESULT, state) - self.assertEqual(PageType.CORRECTION, statec) - - def test_correction(self): - cor = parserc.get_correction() - s = search((cor[0][0], 'stop'), (cor[1][0], 'stop'), dtime).read() - parser = sParser(s) - self.assertEqual(PageType.RESULT, parser.check_page()) - - def test_overview_shouldFindMultipleItems(self): - # TODO Replace with assertGreater in new python version - self.assertTrue(len(p.overview) > 1) - - def test_detail_shouldFindMultipleItems(self): - # TODO Replace with assertGreater in new python version - self.assertTrue(len(p.details) > 1) - - def test_detail_shouldFindMultipleStations(self): - # TODO Replace with assertGreater in new python version - self.assertTrue(len(p.details[0]) > 1) - - def test_parser_overviewAndDetailsShouldHaveSameLength(self): - self.assertEqual(len(p.details), len(p.overview)) - - def test_parser_shouldFindMoreThanOneChange(self): - self.assertTrue(p.overview[0]['change'] > 0) - - def test_parser_shouldFindPriceGreaterZero(self): - self.assertTrue(p.overview[0]['price'] > 0.0) - - def test_parser_shouldFindDate(self): - self.assertTrue(p.overview[0]['date'] == dtime.date()) - - -if __name__ == '__main__': - unittest.main()