Create function optional_set.

[philipp/winterrodeln/wrpylib.git] / tests / test_wrvalidators.py

diff --git a/tests/test_wrvalidators.py b/tests/test_wrvalidators.py
index 2725b0e19093f810e1e9f5ffa2f4bf47f0fefd58..0cd3937051d602c485dc7b48cbc11ec48ed0b733 100644 (file)
--- a/tests/test_wrvalidators.py
+++ b/tests/test_wrvalidators.py
@@ -1,7 +1,7 @@
-#!/usr/bin/python3.4
 import unittest
 from wrpylib.wrvalidators import *
 
+
 # optional converter
 # ------------------
 
@@ -203,16 +203,16 @@ class TestInt(unittest.TestCase):
         self.assertEqual(42, int_from_str('42'))
         self.assertEqual(42, int_from_str('+42'))
         self.assertEqual(-20, int_from_str('-20'))
-        self.assertEqual(0, int_from_str('0', min=0))
-        self.assertEqual(10, int_from_str('10', max=10))
+        self.assertEqual(0, int_from_str('0', minimum=0))
+        self.assertEqual(10, int_from_str('10', maximum=10))
         with self.assertRaises(ValueError):
             int_from_str('abc')
         with self.assertRaises(ValueError):
             int_from_str('')
         with self.assertRaises(ValueError):
-            int_from_str('-1', min=0)
+            int_from_str('-1', minimum=0)
         with self.assertRaises(ValueError):
-            int_from_str('11', max=10)
+            int_from_str('11', maximum=10)
         with self.assertRaises(ValueError):
             int_from_str('10.0')
         with self.assertRaises(ValueError):
@@ -386,6 +386,14 @@ class TestWikipage(unittest.TestCase):
             wikipage_from_str('')
         with self.assertRaises(ValueError):
             wikipage_from_str('Birgitzer Alm')
+        with self.assertRaises(ValueError):
+            wikipage_from_str('x[[Birgitzer Alm]]')
+        with self.assertRaises(ValueError):
+            wikipage_from_str('[[Birgitzer Alm]]x')
+        with self.assertRaises(ValueError):
+            wikipage_from_str('[[Birgitzer Alm]]; [[Kemater Alm]]')
+        with self.assertRaises(ValueError):
+            wikipage_from_str('[[Birgitzer Alm]], [[Kemater Alm]]')
 
     def test_to_str(self):
         self.assertEqual('[[Birgitzer Alm]]', wikipage_to_str('[[Birgitzer Alm]]'))
@@ -806,12 +814,12 @@ class TestRodelbahnbox(unittest.TestCase):
         self.assertEqual(LonLat(12.806522, 46.807218), value['Position'])
         self.assertEqual(LonLat(12.818658, 46.799014), value['Position oben'])
         self.assertEqual(1046, value['Höhe oben'])
-        self.assertEqual(LonLat(None, None), value['Position unten'])
+        self.assertEqual(None, value['Position unten'])
         self.assertEqual(None, value['Höhe unten'])
         self.assertEqual(3500, value['Länge'])
         self.assertEqual(2, value['Schwierigkeit'])
         self.assertEqual(1, value['Lawinen'])
-        self.assertEqual('Bringungsgemeinschaft Kreithof-Dolomitenhütte', value['Betreiber'])
+        self.assertEqual((True, 'Bringungsgemeinschaft Kreithof-Dolomitenhütte'), value['Betreiber'])
         self.assertEqual(4, value['Öffentliche Anreise'])
         self.assertEqual(True, value['Aufstieg möglich'])
         self.assertEqual((0.5, None), value['Aufstieg getrennt'])
@@ -832,12 +840,12 @@ class TestRodelbahnbox(unittest.TestCase):
             ('Position', LonLat(12.806522, 46.807218)),
             ('Position oben', LonLat(12.818658, 46.799014)),
             ('Höhe oben', 1046),
-            ('Position unten', LonLat(None, None)),
+            ('Position unten', None),
             ('Höhe unten', None),
             ('Länge', 3500),
             ('Schwierigkeit', 2),
             ('Lawinen', 1),
-            ('Betreiber', 'Bringungsgemeinschaft Kreithof-Dolomitenhütte'),
+            ('Betreiber', (True, 'Bringungsgemeinschaft Kreithof-Dolomitenhütte')),
             ('Öffentliche Anreise', 4),
             ('Aufstieg möglich', True),
             ('Aufstieg getrennt', (0.5, None)),