refactor test

svn: r23059
This commit is contained in:
Vassilii Khachaturov 2013-09-08 19:35:15 +00:00
parent a702a815b3
commit 8d867ec2a5

View File

@ -476,32 +476,26 @@ class Test_set2(BaseDateTest):
self.assertEqual(start, (1000, 10, 10)) self.assertEqual(start, (1000, 10, 10))
self.assertEqual(stop, (1000, 10, 10)) self.assertEqual(stop, (1000, 10, 10))
def test_set2_ymd_raises_error_unless_compound(self): def _test_set2_function_raises_error_unless_compound(self, function):
for mod in (Date.MOD_NONE, Date.MOD_BEFORE, Date.MOD_AFTER, for mod in (Date.MOD_NONE, Date.MOD_BEFORE, Date.MOD_AFTER,
Date.MOD_ABOUT, Date.MOD_ABOUT,
Date.MOD_TEXTONLY): Date.MOD_TEXTONLY):
self.date.set_modifier(mod) self.date.set_modifier(mod)
try: try:
self.date.set2_yr_mon_day(2013, 2, 2) function(self.date)
self.assertTrue(False, self.assertTrue(False,
"Modifier: {}, dateval: {} - exception expected!".format( "Modifier: {}, dateval: {} - exception expected!".format(
mod, self.date.dateval)) mod, self.date.dateval))
except DateError: except DateError:
pass pass
def test_set2_ymd_raises_error_unless_compound(self):
self._test_set2_function_raises_error_unless_compound(
lambda date: date.set2_yr_mon_day(2013, 2, 2))
def test_set2_ymd_offset_raises_error_unless_compound(self): def test_set2_ymd_offset_raises_error_unless_compound(self):
for mod in (Date.MOD_NONE, Date.MOD_BEFORE, Date.MOD_AFTER, self._test_set2_function_raises_error_unless_compound(
Date.MOD_ABOUT, lambda date: date.set2_yr_mon_day_offset(year=-1))
Date.MOD_TEXTONLY):
self.date.set_modifier(mod)
try:
self.date.set2_yr_mon_day_offset(year=-1)
self.assertTrue(False,
"Modifier: {}, dateval: {} - exception expected!".format(
mod, self.date.dateval))
except DateError:
pass
if __name__ == "__main__": if __name__ == "__main__":
unittest.main() unittest.main()