From 021c88e69bd03eaeaa5f98a9b751c9b99039eae1 Mon Sep 17 00:00:00 2001 From: paulo Date: Sat, 16 Jun 2018 11:33:25 -0300 Subject: [PATCH 01/33] add tests for catmath --- tests/test_catmath.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/tests/test_catmath.py b/tests/test_catmath.py index ced6358..2a29273 100644 --- a/tests/test_catmath.py +++ b/tests/test_catmath.py @@ -2,18 +2,21 @@ def test__cat_years_to_hooman_years__middle_age__succeeds(): - assert True + cat_years = 10 + human_years = catmath.cat_years_to_hooman_years(cat_years) + assert human_years == 50 def test__cat_years_to_hooman_years__less_than_one_year__succeeds(): - assert True + cat_years = 0.5 + human_years = catmath.cat_years_to_hooman_years(cat_years) + assert human_years == 2.5 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 - def test__is_cat_leap_year__succeeds(): assert catmath.is_cat_leap_year(2016) is True From a6e13829e22db8a302937a373f117e8ea197a3ad Mon Sep 17 00:00:00 2001 From: paulo Date: Tue, 19 Jun 2018 21:14:35 -0300 Subject: [PATCH 02/33] add tests for safecatmath --- tests/test_safecatmath.py | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/tests/test_safecatmath.py b/tests/test_safecatmath.py index 3f85a35..bf15d68 100644 --- a/tests/test_safecatmath.py +++ b/tests/test_safecatmath.py @@ -1,6 +1,7 @@ -# import pytest +import pytest from catinabox import safecatmath +from catinabox.safecatmath import InvalidAge def test__cat_years_to_hooman_years__middle_age__succeeds(): @@ -19,17 +20,20 @@ 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(InvalidAge): + safecatmath.cat_years_to_hooman_years(-1) def test__cat_years_to_hooman_years__older_than_1000__raises(): - assert True + with pytest.raises(InvalidAge): + safecatmath.cat_years_to_hooman_years(1001) def test__cat_years_to_hooman_years__string__raises(): - assert True + with pytest.raises(InvalidAge): + safecatmath.cat_years_to_hooman_years('str') def test__cat_years_to_hooman_years__nan__raises(): - # hooman_age = float('nan') - assert True + with pytest.raises(InvalidAge): + safecatmath.cat_years_to_hooman_years(float('nan')) From 3e4c7b531d1720d854ed075907b4e784309b4396 Mon Sep 17 00:00:00 2001 From: paulo Date: Tue, 19 Jun 2018 22:23:26 -0300 Subject: [PATCH 03/33] Add tests for cattery --- tests/test_cattery.py | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/tests/test_cattery.py b/tests/test_cattery.py index b36692c..3ecd863 100644 --- a/tests/test_cattery.py +++ b/tests/test_cattery.py @@ -6,34 +6,34 @@ ########################################################################### # add_cats ########################################################################### +@pytest.fixture(scope='function') +def cattery_client(): + return cattery.Cattery() -def test__add_cats__succeeds(): - c = cattery.Cattery() - c.add_cats(["Fluffy", "Snookums"]) - assert c.cats == ["Fluffy", "Snookums"] - assert c.num_cats == 2 + +def test__add_cats__succeeds(cattery_client): + cattery_client.add_cats(["Fluffy", "Snookums"]) + assert cattery_client.cats == ["Fluffy", "Snookums"] + assert cattery_client.num_cats == 2 ########################################################################### # remove_cat ########################################################################### -def test__remove_cat__succeeds(): - c = cattery.Cattery() - c.add_cats(["Fluffy", "Junior"]) - c.remove_cat("Fluffy") - assert c.cats == ["Junior"] - assert c.num_cats == 1 +def test__remove_cat__succeeds(cattery_client): + cattery_client.add_cats(["Fluffy", "Junior"]) + cattery_client.remove_cat("Fluffy") + assert cattery_client.cats == ["Junior"] + assert cattery_client.num_cats == 1 -def test__remove_cat__no_cats__fails(): - c = cattery.Cattery() +def test__remove_cat__no_cats__fails(cattery_client): with pytest.raises(cattery.CatNotFound): - c.remove_cat("Fluffles") + cattery_client.remove_cat("Fluffles") -def test__remove_cat__cat_not_in_cattery__fails(): - c = cattery.Cattery() - c.add_cats(["Fluffy"]) +def test__remove_cat__cat_not_in_cattery__fails(cattery_client): + cattery_client.add_cats(["Fluffy"]) with pytest.raises(cattery.CatNotFound): - c.remove_cat("Snookums") + cattery_client.remove_cat("Snookums") From caa3a980e7b3cd7584e10ea00cbf0a3fbcbbacf1 Mon Sep 17 00:00:00 2001 From: paulo Date: Tue, 19 Jun 2018 22:36:59 -0300 Subject: [PATCH 04/33] add tests for catactivities --- tests/test_catactivities.py | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/tests/test_catactivities.py b/tests/test_catactivities.py index e2051b1..55bc6da 100644 --- a/tests/test_catactivities.py +++ b/tests/test_catactivities.py @@ -1,14 +1,18 @@ -# import pytest -# import time +import pytest +import time -# from catinabox import catactivities +from catinabox import catactivities +from catinabox.catactivities import NapWillNotBeSatisfying def test__cat_nap__satisfying_nap(mocker): - # mock_sleep = mocker.patch.object(time, "sleep", autospec=True) - assert True + mock_sleep = mocker.patch.object(time, "sleep", autospec=True) + catactivities.cat_nap(301) + mock_sleep.assert_called() def test__cat_nap__not_satisfying(mocker): - # mock_sleep = mocker.patch.object(time, "sleep", autospec=True) - assert True + mock_sleep = mocker.patch.object(time, "sleep", autospec=True) + with pytest.raises(NapWillNotBeSatisfying): + catactivities.cat_nap(200) + mock_sleep.assert_not_called() From 813f86dc3979509f2ecb483b33050712238fdbe5 Mon Sep 17 00:00:00 2001 From: paulo Date: Tue, 19 Jun 2018 22:56:44 -0300 Subject: [PATCH 05/33] add tests for mccattery --- tests/test_catactivities.py | 3 +-- tests/test_catmath.py | 9 +++++---- tests/test_cattery.py | 9 ++++++--- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/tests/test_catactivities.py b/tests/test_catactivities.py index 55bc6da..0860194 100644 --- a/tests/test_catactivities.py +++ b/tests/test_catactivities.py @@ -2,7 +2,6 @@ import time from catinabox import catactivities -from catinabox.catactivities import NapWillNotBeSatisfying def test__cat_nap__satisfying_nap(mocker): @@ -13,6 +12,6 @@ def test__cat_nap__satisfying_nap(mocker): def test__cat_nap__not_satisfying(mocker): mock_sleep = mocker.patch.object(time, "sleep", autospec=True) - with pytest.raises(NapWillNotBeSatisfying): + with pytest.raises(catactivities.NapWillNotBeSatisfying): catactivities.cat_nap(200) mock_sleep.assert_not_called() diff --git a/tests/test_catmath.py b/tests/test_catmath.py index 2a29273..8248494 100644 --- a/tests/test_catmath.py +++ b/tests/test_catmath.py @@ -1,10 +1,11 @@ from catinabox import catmath +import pytest -def test__cat_years_to_hooman_years__middle_age__succeeds(): - cat_years = 10 - human_years = catmath.cat_years_to_hooman_years(cat_years) - assert human_years == 50 +@pytest.mark.parametrize('age_cat,age_human', [(10, 50), (20, 100)]) +def test__cat_years_to_hooman_years__middle_age__succeeds(age_cat, age_human): + human_years = catmath.cat_years_to_hooman_years(age_cat) + assert human_years == age_human def test__cat_years_to_hooman_years__less_than_one_year__succeeds(): diff --git a/tests/test_cattery.py b/tests/test_cattery.py index 3ecd863..8524895 100644 --- a/tests/test_cattery.py +++ b/tests/test_cattery.py @@ -1,14 +1,17 @@ import pytest from catinabox import cattery +from catinabox import mccattery ########################################################################### # add_cats ########################################################################### -@pytest.fixture(scope='function') -def cattery_client(): - return cattery.Cattery() +@pytest.fixture(scope='function', + params=[cattery.Cattery, mccattery.McCattery], + ids=['cattery', 'mccattery']) +def cattery_client(request): + return request.param() def test__add_cats__succeeds(cattery_client): From 18fcd6424265ade79f876e56767a5e4207b2a902 Mon Sep 17 00:00:00 2001 From: Paulo Date: Tue, 17 Dec 2019 11:02:56 -0300 Subject: [PATCH 06/33] test1 --- example.py | 1 + 1 file changed, 1 insertion(+) create mode 100644 example.py diff --git a/example.py b/example.py new file mode 100644 index 0000000..d35e62f --- /dev/null +++ b/example.py @@ -0,0 +1 @@ +blabla From a0b4d883df2cfada4a50ab6717bbc3d43b48e655 Mon Sep 17 00:00:00 2001 From: Paulo Date: Tue, 17 Dec 2019 11:08:53 -0300 Subject: [PATCH 07/33] test1 --- example.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/example.py b/example.py index d35e62f..e6dab0a 100644 --- a/example.py +++ b/example.py @@ -1 +1 @@ -blabla +tata From bd1448d32ec708078d941cebc59d15b08f2affe0 Mon Sep 17 00:00:00 2001 From: Paulo Date: Tue, 17 Dec 2019 11:10:03 -0300 Subject: [PATCH 08/33] test1 --- example.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/example.py b/example.py index e6dab0a..70b8a06 100644 --- a/example.py +++ b/example.py @@ -1 +1 @@ -tata +hah From d4feefddbcc1492bfd0de21c4f13d153536890cb Mon Sep 17 00:00:00 2001 From: Paulo Date: Tue, 17 Dec 2019 11:13:58 -0300 Subject: [PATCH 09/33] test1 --- example.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/example.py b/example.py index 70b8a06..2303ac2 100644 --- a/example.py +++ b/example.py @@ -1 +1 @@ -hah +tasa From c60b5d00a8cc699362c969191cfbae19a2ddcab8 Mon Sep 17 00:00:00 2001 From: Paulo Date: Tue, 17 Dec 2019 11:19:14 -0300 Subject: [PATCH 10/33] test1 --- example.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/example.py b/example.py index 2303ac2..77b956e 100644 --- a/example.py +++ b/example.py @@ -1 +1 @@ -tasa +tassda From cdbda7ca4edc483cbbfbcdd013cddf2c0deda277 Mon Sep 17 00:00:00 2001 From: Paulo Date: Tue, 17 Dec 2019 11:24:42 -0300 Subject: [PATCH 11/33] test1 --- example.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/example.py b/example.py index 77b956e..14cf5d1 100644 --- a/example.py +++ b/example.py @@ -1 +1 @@ -tassda +tassadsda From 55702628145c28704634f8913f4c351928098946 Mon Sep 17 00:00:00 2001 From: Paulo Date: Tue, 17 Dec 2019 11:26:57 -0300 Subject: [PATCH 12/33] test1 --- example.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/example.py b/example.py index 14cf5d1..fdf1cba 100644 --- a/example.py +++ b/example.py @@ -1 +1 @@ -tassadsda +tasds From 0f692ff0ab5f86048b223cf19275996aa36464d4 Mon Sep 17 00:00:00 2001 From: Paulo Date: Tue, 17 Dec 2019 14:24:31 -0300 Subject: [PATCH 13/33] test1 --- example.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/example.py b/example.py index fdf1cba..b74adcc 100644 --- a/example.py +++ b/example.py @@ -1 +1 @@ -tasds +tdsass From cace774b6a0fb419f6e0234d2cc7cd2138421262 Mon Sep 17 00:00:00 2001 From: Paulo Date: Tue, 17 Dec 2019 15:02:39 -0300 Subject: [PATCH 14/33] test1 --- example.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/example.py b/example.py index b74adcc..8cb8caa 100644 --- a/example.py +++ b/example.py @@ -1 +1 @@ -tdsass +tdasdad From 8a25653653df6e07919f809d0aa7c09404612b52 Mon Sep 17 00:00:00 2001 From: Paulo Date: Tue, 17 Dec 2019 15:10:25 -0300 Subject: [PATCH 15/33] test1 --- example.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/example.py b/example.py index 8cb8caa..c25c66a 100644 --- a/example.py +++ b/example.py @@ -1 +1 @@ -tdasdad +ddsds From 9d6754b53c9f24c3b64fd03907adcaf4c010465d Mon Sep 17 00:00:00 2001 From: Paulo Date: Tue, 17 Dec 2019 23:34:06 -0300 Subject: [PATCH 16/33] test1 --- example.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/example.py b/example.py index c25c66a..b8d917f 100644 --- a/example.py +++ b/example.py @@ -1 +1 @@ -ddsds +ddsajdsds From 516e5b201c092865778ed3511dabfcf0c03978a0 Mon Sep 17 00:00:00 2001 From: Paulo Date: Tue, 17 Dec 2019 23:37:06 -0300 Subject: [PATCH 17/33] test1 --- example.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/example.py b/example.py index b8d917f..81e88ff 100644 --- a/example.py +++ b/example.py @@ -1 +1 @@ -ddsajdsds +ddsaddddd From 0d902f69fd528dc57ad8bfc8baa88d90c7bbd5c9 Mon Sep 17 00:00:00 2001 From: Paulo Date: Tue, 17 Dec 2019 23:43:47 -0300 Subject: [PATCH 18/33] test1 --- example.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/example.py b/example.py index 81e88ff..10f5b4f 100644 --- a/example.py +++ b/example.py @@ -1 +1 @@ -ddsaddddd +xxddddd From a51827d2ddf9979e39e62e03d73dd84cad1b8f84 Mon Sep 17 00:00:00 2001 From: Paulo Date: Tue, 17 Dec 2019 23:50:25 -0300 Subject: [PATCH 19/33] test1 --- example.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/example.py b/example.py index 10f5b4f..0f1e01c 100644 --- a/example.py +++ b/example.py @@ -1 +1 @@ -xxddddd +TTT From e25beebef6a9edb07b3ebb5ec09f26bdff0e570d Mon Sep 17 00:00:00 2001 From: Paulo Date: Tue, 17 Dec 2019 23:52:19 -0300 Subject: [PATCH 20/33] test1 --- example.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/example.py b/example.py index 0f1e01c..00e4e10 100644 --- a/example.py +++ b/example.py @@ -1 +1 @@ -TTT +ddsdasda From 9b5e6adbba4fcdf1ec6c64885329f90cfa926ab9 Mon Sep 17 00:00:00 2001 From: Paulo Date: Wed, 18 Dec 2019 00:05:24 -0300 Subject: [PATCH 21/33] test1 --- example.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/example.py b/example.py index 00e4e10..7898192 100644 --- a/example.py +++ b/example.py @@ -1 +1 @@ -ddsdasda +a From 9554d69b3f48e1d6de6aa5d7607db34e9d18230e Mon Sep 17 00:00:00 2001 From: Paulo Date: Wed, 18 Dec 2019 00:09:16 -0300 Subject: [PATCH 22/33] test1 --- example.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/example.py b/example.py index 7898192..6178079 100644 --- a/example.py +++ b/example.py @@ -1 +1 @@ -a +b From 57b8d03cab2214783c2c23c1db6d42a89f96e58b Mon Sep 17 00:00:00 2001 From: Paulo Date: Wed, 18 Dec 2019 00:13:00 -0300 Subject: [PATCH 23/33] test1 --- example.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/example.py b/example.py index 6178079..7898192 100644 --- a/example.py +++ b/example.py @@ -1 +1 @@ -b +a From 7c213360f8ba81fbb5a358115a8f27191b39dfef Mon Sep 17 00:00:00 2001 From: Paulo Date: Wed, 18 Dec 2019 00:27:01 -0300 Subject: [PATCH 24/33] test1 --- example.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/example.py b/example.py index 7898192..6178079 100644 --- a/example.py +++ b/example.py @@ -1 +1 @@ -a +b From 8ea781116385cea52dcffe3e6b22868cf203c54a Mon Sep 17 00:00:00 2001 From: Paulo Date: Wed, 18 Dec 2019 00:54:29 -0300 Subject: [PATCH 25/33] test1 --- example.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/example.py b/example.py index 6178079..7898192 100644 --- a/example.py +++ b/example.py @@ -1 +1 @@ -b +a From 5078c327dcc475c41476545752f1ae2ad69946df Mon Sep 17 00:00:00 2001 From: Paulo Date: Wed, 18 Dec 2019 01:25:33 -0300 Subject: [PATCH 26/33] test1 --- example.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/example.py b/example.py index 7898192..6178079 100644 --- a/example.py +++ b/example.py @@ -1 +1 @@ -a +b From c7c7b5b68968bccc9a4ff8b9fe1e6f56684f4fd7 Mon Sep 17 00:00:00 2001 From: Paulo Date: Wed, 18 Dec 2019 01:34:26 -0300 Subject: [PATCH 27/33] test1 --- example.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/example.py b/example.py index 6178079..7898192 100644 --- a/example.py +++ b/example.py @@ -1 +1 @@ -b +a From 6393995b507afd71772a7d433ff05a0a28917cce Mon Sep 17 00:00:00 2001 From: Paulo Date: Wed, 18 Dec 2019 01:35:47 -0300 Subject: [PATCH 28/33] testWebhook --- example.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/example.py b/example.py index 7898192..f2ad6c7 100644 --- a/example.py +++ b/example.py @@ -1 +1 @@ -a +c From 21b6895303b4f8182182362d22a1cce27e77ee52 Mon Sep 17 00:00:00 2001 From: Paulo Date: Wed, 18 Dec 2019 01:38:40 -0300 Subject: [PATCH 29/33] testWebhook1 --- example.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/example.py b/example.py index f2ad6c7..4bcfe98 100644 --- a/example.py +++ b/example.py @@ -1 +1 @@ -c +d From edb0cf3531f77491a3e60d58bc3c310d0a23498c Mon Sep 17 00:00:00 2001 From: Paulo Date: Wed, 18 Dec 2019 01:38:46 -0300 Subject: [PATCH 30/33] testWebhook2 --- example.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/example.py b/example.py index 4bcfe98..d905d9d 100644 --- a/example.py +++ b/example.py @@ -1 +1 @@ -d +e From 777009d9d0b9d5a4a8ee266d089bb1ff0940f7e3 Mon Sep 17 00:00:00 2001 From: Paulo Date: Wed, 18 Dec 2019 14:46:00 -0300 Subject: [PATCH 31/33] testWebhook3 --- example.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/example.py b/example.py index d905d9d..718f4d2 100644 --- a/example.py +++ b/example.py @@ -1 +1 @@ -e +t From 6925c7091772963e0065ddbfc812c5646f8ef994 Mon Sep 17 00:00:00 2001 From: Paulo Date: Wed, 18 Dec 2019 14:49:52 -0300 Subject: [PATCH 32/33] testWebhook3 --- example.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/example.py b/example.py index 718f4d2..b680253 100644 --- a/example.py +++ b/example.py @@ -1 +1 @@ -t +z From ca9704e0acc1050158e82c41f11a34afe0627858 Mon Sep 17 00:00:00 2001 From: Paulo Date: Wed, 18 Dec 2019 15:13:34 -0300 Subject: [PATCH 33/33] testWebhook4 --- example.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/example.py b/example.py index b680253..7898192 100644 --- a/example.py +++ b/example.py @@ -1 +1 @@ -z +a