From c9120f692a9bba302ac2cf66315f3e5860b143b2 Mon Sep 17 00:00:00 2001 From: Paul Beckingham Date: Sun, 5 Jul 2015 15:30:20 -0400 Subject: [PATCH] Test: Corrected tests - Removed tests that were passing for the wrong reason. - Removed '@expectedFailures' from tests that now pass. --- test/datetime-negative.t | 192 +++++++++++---------------------------- 1 file changed, 52 insertions(+), 140 deletions(-) diff --git a/test/datetime-negative.t b/test/datetime-negative.t index 4ece6e812..863d29de2 100755 --- a/test/datetime-negative.t +++ b/test/datetime-negative.t @@ -73,11 +73,9 @@ class TestIncorrectDate(BaseDateTimeNegativeTest): def test_set_incorrect_datetime_invalid_characters_in_YYYY_MM_DD(self): self.assertInvalidDatetimeFormat('abcd-ab-ab') - @unittest.expectedFailure def test_set_incorrect_datetime_day_as_zeros_in_YYYY_DDD(self): self.assertInvalidDatetimeFormat('2014-000') - @unittest.expectedFailure def test_set_incorrect_datetime_overlap_day_in_nonoverlap_year_in_YYYY_DDD(self): self.assertInvalidDatetimeFormat('2014-366') @@ -87,19 +85,21 @@ class TestIncorrectDate(BaseDateTimeNegativeTest): def test_set_incorrect_datetime_huge_overlap_day_in_YYYY_DDD(self): self.assertInvalidDatetimeFormat('2014-999999999') - @unittest.expectedFailure def test_set_incorrect_datetime_week_with_the_number_zero_in_YYYY_Www(self): self.assertInvalidDatetimeFormat('2014-W00') def test_set_incorrect_datetime_overflow_in_week_in_YYYY_Www(self): self.assertInvalidDatetimeFormat('2014-W54') + # Unsupported non-extended form. def test_set_incorrect_datetime_day_zero_in_YYYY_WwwD(self): self.assertInvalidDatetimeFormat('2014-W240') + # Unsupported non-extended form. def test_set_incorrect_datetime_day_eight_in_YYYY_WwwD(self): self.assertInvalidDatetimeFormat('2014-W248') + # Unsupported non-extended form. def test_set_incorrect_datetime_day_two_hundred_in_YYYY_WwwD(self): self.assertInvalidDatetimeFormat('2014-W24200') @@ -119,18 +119,15 @@ class TestIncorrectTime(BaseDateTimeNegativeTest): accepted by TaskWarrior parser. """ - @unittest.expectedFailure def test_set_incorrect_datetime_hour_overflow_in_hh_mm(self): - self.assertInvalidDatetimeFormat('24:00') + self.assertInvalidDatetimeFormat('25:00') def test_set_incorrect_datetime_huge_hour_overflow_in_hh_mm(self): self.assertInvalidDatetimeFormat('99:00') - @unittest.expectedFailure def test_set_incorrect_datetime_minute_overflow_in_hh_mm(self): self.assertInvalidDatetimeFormat('12:60') - @unittest.expectedFailure def test_set_incorrect_datetime_huge_minute_overflow_in_hh_mm(self): self.assertInvalidDatetimeFormat('12:99') @@ -149,18 +146,15 @@ class TestIncorrectTime(BaseDateTimeNegativeTest): def test_set_incorrect_datetime_negative_minutes_in_hh_mm(self): self.assertInvalidDatetimeFormat('12:-12') - @unittest.expectedFailure def test_set_incorrect_datetime_hour_overflow_in_hh_mmZ(self): - self.assertInvalidDatetimeFormat('24:00Z') + self.assertInvalidDatetimeFormat('25:00Z') def test_set_incorrect_datetime_huge_hour_overflow_in_hh_mmZ(self): self.assertInvalidDatetimeFormat('99:00Z') - @unittest.expectedFailure def test_set_incorrect_datetime_minute_overflow_in_hh_mmZ(self): self.assertInvalidDatetimeFormat('12:60Z') - @unittest.expectedFailure def test_set_incorrect_datetime_huge_minute_overflow_in_hh_mmZ(self): self.assertInvalidDatetimeFormat('12:99Z') @@ -180,7 +174,7 @@ class TestIncorrectTime(BaseDateTimeNegativeTest): self.assertInvalidDatetimeFormat('12:-12Z') def test_set_incorrect_datetime_hour_overflow_in_hh_mm_plus_hh_mm(self): - self.assertInvalidDatetimeFormat('24:00+01:00') + self.assertInvalidDatetimeFormat('25:00+01:00') def test_set_incorrect_datetime_huge_hour_overflow_in_hh_mm_plus_hh_mm(self): self.assertInvalidDatetimeFormat('99:00+01:00') @@ -207,7 +201,7 @@ class TestIncorrectTime(BaseDateTimeNegativeTest): self.assertInvalidDatetimeFormat('12:-12+01:00') def test_set_incorrect_datetime_hour_overflow_in_hh_mm_minus_hh_mm(self): - self.assertInvalidDatetimeFormat('24:00-01:00') + self.assertInvalidDatetimeFormat('25:00-01:00') def test_set_incorrect_datetime_huge_hour_overflow_in_hh_mm_minus_hh_mm(self): self.assertInvalidDatetimeFormat('99:00-01:00') @@ -233,26 +227,21 @@ class TestIncorrectTime(BaseDateTimeNegativeTest): def test_set_incorrect_datetime_negative_minutes_in_hh_mm_minus_hh_mm(self): self.assertInvalidDatetimeFormat('12:-12-01:00') - @unittest.expectedFailure def test_set_incorrect_datetime_hour_overflow_in_hh_mm_ss(self): - self.assertInvalidDatetimeFormat('24:00:00') + self.assertInvalidDatetimeFormat('25:00:00') def test_set_incorrect_datetime_huge_hour_overflow_in_hh_mm_ss(self): self.assertInvalidDatetimeFormat('99:00:00') - @unittest.expectedFailure def test_set_incorrect_datetime_minute_overflow_in_hh_mm_ss(self): self.assertInvalidDatetimeFormat('12:60:00') - @unittest.expectedFailure def test_set_incorrect_datetime_huge_minute_overflow_in_hh_mm_ss(self): self.assertInvalidDatetimeFormat('12:99:00') - @unittest.expectedFailure def test_set_incorrect_datetime_second_overflow_in_hh_mm_ss(self): self.assertInvalidDatetimeFormat('12:12:60') - @unittest.expectedFailure def test_set_incorrect_datetime_huge_second_overflow_in_hh_mm_ss(self): self.assertInvalidDatetimeFormat('12:12:99') @@ -277,26 +266,21 @@ class TestIncorrectTime(BaseDateTimeNegativeTest): def test_set_incorrect_datetime_negative_seconds_in_hh_mm_ss(self): self.assertInvalidDatetimeFormat('12:12:-12') - @unittest.expectedFailure def test_set_incorrect_datetime_hour_overflow_in_hh_mm_ssZ(self): - self.assertInvalidDatetimeFormat('24:00:00Z') + self.assertInvalidDatetimeFormat('25:00:00Z') def test_set_incorrect_datetime_huge_hour_overflow_in_hh_mm_ssZ(self): self.assertInvalidDatetimeFormat('99:00:00Z') - @unittest.expectedFailure def test_set_incorrect_datetime_minute_overflow_in_hh_mm_ssZ(self): self.assertInvalidDatetimeFormat('12:60:00Z') - @unittest.expectedFailure def test_set_incorrect_datetime_huge_minute_overflow_in_hh_mm_ssZ(self): self.assertInvalidDatetimeFormat('12:99:00Z') - @unittest.expectedFailure def test_set_incorrect_datetime_second_overflow_in_hh_mm_ssZ(self): self.assertInvalidDatetimeFormat('12:12:60Z') - @unittest.expectedFailure def test_set_incorrect_datetime_huge_second_overflow_in_hh_mm_ssZ(self): self.assertInvalidDatetimeFormat('12:12:99Z') @@ -321,26 +305,21 @@ class TestIncorrectTime(BaseDateTimeNegativeTest): def test_set_incorrect_datetime_negative_seconds_in_hh_mm_ssZ(self): self.assertInvalidDatetimeFormat('12:12:-12Z') - @unittest.expectedFailure def test_set_incorrect_datetime_hour_overflow_in_hh_mm_ss_plus_hh_mm(self): - self.assertInvalidDatetimeFormat('24:00:00+01:00') + self.assertInvalidDatetimeFormat('25:00:00+01:00') def test_set_incorrect_datetime_huge_hour_overflow_in_hh_mm_ss_plus_hh_mm(self): self.assertInvalidDatetimeFormat('95:00:00+01:00') - @unittest.expectedFailure def test_set_incorrect_datetime_minute_overflow_in_hh_mm_ss_plus_hh_mm(self): self.assertInvalidDatetimeFormat('12:60:00+01:00') - @unittest.expectedFailure def test_set_incorrect_datetime_huge_minute_overflow_in_hh_mm_ss_plus_hh_mm(self): self.assertInvalidDatetimeFormat('12:99:00+01:00') - @unittest.expectedFailure def test_set_incorrect_datetime_second_overflow_in_hh_mm_ss_plus_hh_mm(self): self.assertInvalidDatetimeFormat('12:12:60+01:00') - @unittest.expectedFailure def test_set_incorrect_datetime_huge_second_overflow_in_hh_mm_ss_plus_hh_mm(self): self.assertInvalidDatetimeFormat('12:12:99+01:00') @@ -365,26 +344,21 @@ class TestIncorrectTime(BaseDateTimeNegativeTest): def test_set_incorrect_datetime_negative_seconds_in_hh_mm_ss_plus_hh_mm(self): self.assertInvalidDatetimeFormat('12:12:-12+01:00') - @unittest.expectedFailure def test_set_incorrect_datetime_hour_overflow_in_hh_mm_ss_minus_hh_mm(self): - self.assertInvalidDatetimeFormat('24:00:00-01:00') + self.assertInvalidDatetimeFormat('25:00:00-01:00') def test_set_incorrect_datetime_huge_hour_overflow_in_hh_mm_ss_minus_hh_mm(self): self.assertInvalidDatetimeFormat('95:00:00-01:00') - @unittest.expectedFailure def test_set_incorrect_datetime_minute_overflow_in_hh_mm_ss_minus_hh_mm(self): self.assertInvalidDatetimeFormat('12:60:00-01:00') - @unittest.expectedFailure def test_set_incorrect_datetime_huge_minute_overflow_in_hh_mm_ss_minus_hh_mm(self): self.assertInvalidDatetimeFormat('12:99:00-01:00') - @unittest.expectedFailure def test_set_incorrect_datetime_second_overflow_in_hh_mm_ss_minus_hh_mm(self): self.assertInvalidDatetimeFormat('12:12:60-01:00') - @unittest.expectedFailure def test_set_incorrect_datetime_huge_second_overflow_in_hh_mm_ss_minus_hh_mm(self): self.assertInvalidDatetimeFormat('12:12:99-01:00') @@ -409,109 +383,47 @@ class TestIncorrectTime(BaseDateTimeNegativeTest): def test_set_incorrect_datetime_negative_seconds_in_hh_mm_ss_minus_hh_mm(self): self.assertInvalidDatetimeFormat('12:12:-12-01:00') - @unittest.expectedFailure - def test_set_incorrect_datetime_invalid_hour_positive_offset_in_hh_mm_ss(self): - self.assertInvalidDatetimeFormat('12:12:12+13:00') - - @unittest.expectedFailure - def test_set_incorrect_datetime_invalid_medium_hour_positive_offset_in_hh_mm_ss(self): - self.assertInvalidDatetimeFormat('12:12:12+24:00') - - def test_set_incorrect_datetime_invalid_huge_hour_positive_offset_in_hh_mm_ss(self): - self.assertInvalidDatetimeFormat('12:12:12+99:00') - - @unittest.expectedFailure - def test_set_incorrect_datetime_invalid_minute_positive_offset_in_hh_mm_ss(self): - self.assertInvalidDatetimeFormat('12:12:12+03:60') - - @unittest.expectedFailure - def test_set_incorrect_datetime_invalid_huge_minute_positive_offset_in_hh_mm_ss(self): - self.assertInvalidDatetimeFormat('12:12:12+03:99') - - def test_set_incorrect_datetime_invalid_hour_positive_offset_length_in_hh_mm_ss(self): - self.assertInvalidDatetimeFormat('12:12:12+3:20') - - def test_set_incorrect_datetime_invalid_minute_positive_offset_lentgh_in_hh_mm_ss(self): - self.assertInvalidDatetimeFormat('12:12:12+03:2') - - def test_set_incorrect_datetime_invalid_positive_offset_length_in_hh_mm_ss(self): - self.assertInvalidDatetimeFormat('12:12:12+3:2') - - @unittest.expectedFailure - def test_set_incorrect_datetime_invalid_hour_negative_offset_in_hh_mm_ss(self): - self.assertInvalidDatetimeFormat('12:12:12-13:00') - - @unittest.expectedFailure - def test_set_incorrect_datetime_invalid_medium_hour_negative_offset_in_hh_mm_ss(self): - self.assertInvalidDatetimeFormat('12:12:12-24:00') - - def test_set_incorrect_datetime_invalid_huge_hour_negative_offset_in_hh_mm_ss(self): - self.assertInvalidDatetimeFormat('12:12:12-99:00') - - @unittest.expectedFailure - def test_set_incorrect_datetime_invalid_minute_negative_offset_in_hh_mm_ss(self): - self.assertInvalidDatetimeFormat('12:12:12-03:60') - - @unittest.expectedFailure - def test_set_incorrect_datetime_invalid_huge_minute_negative_offset_in_hh_mm_ss(self): - self.assertInvalidDatetimeFormat('12:12:12-03:99') - - def test_set_incorrect_datetime_invalid_hour_negative_offset_length_in_hh_mm_ss(self): - self.assertInvalidDatetimeFormat('12:12:12-3:20') - - def test_set_incorrect_datetime_invalid_minute_negative_offset_lentgh_in_hh_mm_ss(self): - self.assertInvalidDatetimeFormat('12:12:12-03:2') - - def test_set_incorrect_datetime_invalid_negative_offset_length_in_hh_mm_ss(self): - self.assertInvalidDatetimeFormat('12:12:12-3:2') - - def test_set_incorrect_datetime_invalid_hour_positive_offset_in_hh_mm(self): - self.assertInvalidDatetimeFormat('12:12+13:00') - - def test_set_incorrect_datetime_invalid_medium_hour_positive_offset_in_hh_mm(self): - self.assertInvalidDatetimeFormat('12:12+24:00') - - def test_set_incorrect_datetime_invalid_huge_hour_positive_offset_in_hh_mm(self): - self.assertInvalidDatetimeFormat('12:12+99:00') - - def test_set_incorrect_datetime_invalid_minute_positive_offset_in_hh_mm(self): - self.assertInvalidDatetimeFormat('12:12+03:60') - - def test_set_incorrect_datetime_invalid_huge_minute_positive_offset_in_hh_mm(self): - self.assertInvalidDatetimeFormat('12:12+03:99') - - def test_set_incorrect_datetime_invalid_hour_positive_offset_length_in_hh_mm(self): - self.assertInvalidDatetimeFormat('12:12+3:20') - - def test_set_incorrect_datetime_invalid_minute_positive_offset_lentgh_in_hh_mm(self): - self.assertInvalidDatetimeFormat('12:12+03:2') - - def test_set_incorrect_datetime_invalid_positive_offset_length_in_hh_mm(self): - self.assertInvalidDatetimeFormat('12:12+3:2') - - def test_set_incorrect_datetime_invalid_hour_negative_offset_in_hh_mm(self): - self.assertInvalidDatetimeFormat('12:12-13:00') - - def test_set_incorrect_datetime_invalid_medium_hour_negative_offset_in_hh_mm(self): - self.assertInvalidDatetimeFormat('12:12-24:00') - - def test_set_incorrect_datetime_invalid_huge_hour_negative_offset_in_hh_mm(self): - self.assertInvalidDatetimeFormat('12:12-99:00') - - def test_set_incorrect_datetime_invalid_minute_negative_offset_in_hh_mm(self): - self.assertInvalidDatetimeFormat('12:12-03:60') - - def test_set_incorrect_datetime_invalid_huge_minute_negative_offset_in_hh_mm(self): - self.assertInvalidDatetimeFormat('12:12-03:99') - - def test_set_incorrect_datetime_invalid_hour_negative_offset_length_in_hh_mm(self): - self.assertInvalidDatetimeFormat('12:12-3:20') - - def test_set_incorrect_datetime_invalid_minute_negative_offset_lentgh_in_hh_mm(self): - self.assertInvalidDatetimeFormat('12:12-03:2') - - def test_set_incorrect_datetime_invalid_negative_offset_length_in_hh_mm(self): - self.assertInvalidDatetimeFormat('12:12-3:2') + # There were a group of tests that failed for the wrong reason, and these + # have been removed. + # + # When an offset (+/-hh:mm[:ss]) exceeds the +/‐ 12 hour maximum, it is no + # longer considered an offset, and is instead considered to be the addition + # or subtraction of two times. Although valid, the tests are not + # datetime-negative.t tests. + # + # Tests were: + # 12:12:12-13:00 + # 12:12:12-24:00 + # 12:12:12-99:00 + # 12:12:12-03:60 + # 12:12:12-03:99 + # 12:12:12-3:20 + # 12:12:12-03:2 + # 12:12:12-3:2 + # 12:12:12+13:00 + # 12:12:12+24:00 + # 12:12:12+99:00 + # 12:12:12+03:60 + # 12:12:12+03:99 + # 12:12:12+3:20 + # 12:12:12+03:2 + # 12:12:12+3:2 + # 12:12-13:00 + # 12:12-24:00 + # 12:12-99:00 + # 12:12-03:60 + # 12:12-03:99 + # 12:12-3:20 + # 12:12-03:2 + # 12:12-3:2 + # 12:12+13:00 + # 12:12+24:00 + # 12:12+99:00 + # 12:12+03:60 + # 12:12+03:99 + # 12:12+3:20 + # 12:12+03:2 + # 12:12+3:2 if __name__ == "__main__": from simpletap import TAPTestRunner