Skip to content

Commit

Permalink
Merge pull request #726 from jpurviance/easter_pytest
Browse files Browse the repository at this point in the history
conversion of test_easter.py to use pytest
  • Loading branch information
pganssle committed May 29, 2018
2 parents 2353c6a + 8d13bdc commit c796acc
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 18 deletions.
1 change: 1 addition & 0 deletions AUTHORS.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ switch, and thus all their contributions are dual-licensed.
- Jake Chorley (gh: @jakec-github) **D**
- Jan Studený <jendas1@MASKED>
- Jitesh <jitesh@MASKED>
- John Purviance <jpurviance@MASKED> (gh @jpurviance) **D**
- Jon Dufresne <jon.dufresne@MASKED> (gh: @jdufresne) **R**
- Jonas Neubert <jonas@MASKED>
- Kevin Nguyen <kvn219@MASKED>
Expand Down
1 change: 1 addition & 0 deletions changelog.d/726.misc.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Migrated easter tests to use parametrized pytest tests rather than a for loop within a single test. Implemented by @jpurviance (gh pr #726)
34 changes: 16 additions & 18 deletions dateutil/test/test_easter.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
from dateutil.easter import EASTER_WESTERN, EASTER_ORTHODOX, EASTER_JULIAN

from datetime import date
import unittest
import pytest

# List of easters between 1990 and 2050
western_easter_dates = [
Expand Down Expand Up @@ -73,23 +73,21 @@
]


class EasterTest(unittest.TestCase):
def testEasterWestern(self):
for easter_date in western_easter_dates:
self.assertEqual(easter_date,
easter(easter_date.year, EASTER_WESTERN))
@pytest.mark.parametrize("easter_date", western_easter_dates)
def test_easter_western(easter_date):
assert easter_date == easter(easter_date.year, EASTER_WESTERN)

def testEasterOrthodox(self):
for easter_date in orthodox_easter_dates:
self.assertEqual(easter_date,
easter(easter_date.year, EASTER_ORTHODOX))

def testEasterJulian(self):
for easter_date in julian_easter_dates:
self.assertEqual(easter_date,
easter(easter_date.year, EASTER_JULIAN))
@pytest.mark.parametrize("easter_date", orthodox_easter_dates)
def test_easter_orthodox(easter_date):
assert easter_date == easter(easter_date.year, EASTER_ORTHODOX)

def testEasterBadMethod(self):
# Invalid methods raise ValueError
with self.assertRaises(ValueError):
easter(1975, 4)

@pytest.mark.parametrize("easter_date", julian_easter_dates)
def test_easter_julian(easter_date):
assert easter_date == easter(easter_date.year, EASTER_JULIAN)


def test_easter_bad_method():
with pytest.raises(ValueError):
easter(1975, 4)

0 comments on commit c796acc

Please sign in to comment.