From 8b4359cbc418b861e461cbdfd333d9be387a2003 Mon Sep 17 00:00:00 2001 From: jlcoto Date: Sun, 9 Jun 2019 18:30:51 +0200 Subject: [PATCH 1/2] Test cat_years_to_hooman_years --- tests/test_catmath.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/test_catmath.py b/tests/test_catmath.py index ced6358..eb59735 100644 --- a/tests/test_catmath.py +++ b/tests/test_catmath.py @@ -2,15 +2,15 @@ def test__cat_years_to_hooman_years__middle_age__succeeds(): - assert True + assert catmath.cat_years_to_hooman_years(10) == 50 def test__cat_years_to_hooman_years__less_than_one_year__succeeds(): - assert True + assert catmath.cat_years_to_hooman_years(0.2) == 1 def test__cat_years_to_hooman_years__0__returns_0(): - assert True + assert catmath.cat_years_to_hooman_years(0) == 0 # BONUS MATERIAL FOR STEP 2 From 3e51c0b85e3fb09e52b9dd51561158e15703067f Mon Sep 17 00:00:00 2001 From: jlcoto Date: Sun, 9 Jun 2019 21:33:15 +0200 Subject: [PATCH 2/2] Add tests --- tests/test_cattery.py | 21 +++++++++++++-------- tests/test_safecatmath.py | 16 ++++++++++------ 2 files changed, 23 insertions(+), 14 deletions(-) diff --git a/tests/test_cattery.py b/tests/test_cattery.py index b36692c..510f229 100644 --- a/tests/test_cattery.py +++ b/tests/test_cattery.py @@ -3,12 +3,17 @@ from catinabox import cattery +@pytest.fixture() +def cattery_fix(): + return cattery.Cattery() + + ########################################################################### # add_cats ########################################################################### -def test__add_cats__succeeds(): - c = cattery.Cattery() +def test__add_cats__succeeds(cattery_fix): + c = cattery_fix c.add_cats(["Fluffy", "Snookums"]) assert c.cats == ["Fluffy", "Snookums"] assert c.num_cats == 2 @@ -18,22 +23,22 @@ def test__add_cats__succeeds(): # remove_cat ########################################################################### -def test__remove_cat__succeeds(): - c = cattery.Cattery() +def test__remove_cat__succeeds(cattery_fix): + c = cattery_fix c.add_cats(["Fluffy", "Junior"]) c.remove_cat("Fluffy") assert c.cats == ["Junior"] assert c.num_cats == 1 -def test__remove_cat__no_cats__fails(): - c = cattery.Cattery() +def test__remove_cat__no_cats__fails(cattery_fix): + c = cattery_fix with pytest.raises(cattery.CatNotFound): c.remove_cat("Fluffles") -def test__remove_cat__cat_not_in_cattery__fails(): - c = cattery.Cattery() +def test__remove_cat__cat_not_in_cattery__fails(cattery_fix): + c = cattery_fix c.add_cats(["Fluffy"]) with pytest.raises(cattery.CatNotFound): c.remove_cat("Snookums") diff --git a/tests/test_safecatmath.py b/tests/test_safecatmath.py index 3f85a35..764f476 100644 --- a/tests/test_safecatmath.py +++ b/tests/test_safecatmath.py @@ -1,4 +1,4 @@ -# import pytest +import pytest from catinabox import safecatmath @@ -19,17 +19,21 @@ def test__cat_years_to_hooman_years__0__returns_0(): def test__cat_years_to_hooman_years__less_0__raises(): - assert True + with pytest.raises(safecatmath.InvalidAge): + safecatmath.cat_years_to_hooman_years(-10) def test__cat_years_to_hooman_years__older_than_1000__raises(): - assert True + with pytest.raises(safecatmath.InvalidAge): + safecatmath.cat_years_to_hooman_years(3000) def test__cat_years_to_hooman_years__string__raises(): - assert True + with pytest.raises(safecatmath.InvalidAge): + safecatmath.cat_years_to_hooman_years('3000') def test__cat_years_to_hooman_years__nan__raises(): - # hooman_age = float('nan') - assert True + hooman_age = float('nan') + with pytest.raises(safecatmath.InvalidAge): + safecatmath.cat_years_to_hooman_years(hooman_age)