From 70e21663d4be586925e2506c64e4db417c2c8c22 Mon Sep 17 00:00:00 2001 From: water3D Date: Thu, 16 Jan 2020 00:05:29 +0800 Subject: [PATCH 01/13] Fizz Test --- helloworld_test.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/helloworld_test.py b/helloworld_test.py index 4c27dfe..e43fc3a 100644 --- a/helloworld_test.py +++ b/helloworld_test.py @@ -1,5 +1,10 @@ -from helloworld import get_greetings +import fizzbuzz +import unittest +class TestFizzBuzz(unittest.TestCase): -def test_get_helloworld(): - assert get_greetings() == 'Hello World!' + def test_div3(self): + self.assertEqual(fizzbuzz.process(3), 'Fizz') + +if __name__ == '__main__': + unittest.main() From c41bc159bcd4a750420d7efc63568fa604d677c4 Mon Sep 17 00:00:00 2001 From: water3D Date: Thu, 16 Jan 2020 00:06:12 +0800 Subject: [PATCH 02/13] Rename helloworld_test.py to test_fizzbuzz.py --- helloworld_test.py => test_fizzbuzz.py | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename helloworld_test.py => test_fizzbuzz.py (100%) diff --git a/helloworld_test.py b/test_fizzbuzz.py similarity index 100% rename from helloworld_test.py rename to test_fizzbuzz.py From d13e3f921590fa092eb720bd4f98d6cecb514132 Mon Sep 17 00:00:00 2001 From: water3D Date: Thu, 16 Jan 2020 00:07:23 +0800 Subject: [PATCH 03/13] Finish Fizz Test --- fizzbuzz.py | 4 ++++ helloworld.py | 2 -- 2 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 fizzbuzz.py delete mode 100644 helloworld.py diff --git a/fizzbuzz.py b/fizzbuzz.py new file mode 100644 index 0000000..2113c84 --- /dev/null +++ b/fizzbuzz.py @@ -0,0 +1,4 @@ +def process(number): + if number % 3 == 0: + return 'Fizz' + diff --git a/helloworld.py b/helloworld.py deleted file mode 100644 index 449b948..0000000 --- a/helloworld.py +++ /dev/null @@ -1,2 +0,0 @@ -def get_greetings(): - return 'Hello World!' From 826efd726c9a79aa141c866da4fada4c0f4bd100 Mon Sep 17 00:00:00 2001 From: water3D Date: Thu, 16 Jan 2020 00:11:43 +0800 Subject: [PATCH 04/13] Buzz Test --- test_fizzbuzz.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test_fizzbuzz.py b/test_fizzbuzz.py index e43fc3a..e67d65b 100644 --- a/test_fizzbuzz.py +++ b/test_fizzbuzz.py @@ -5,6 +5,8 @@ class TestFizzBuzz(unittest.TestCase): def test_div3(self): self.assertEqual(fizzbuzz.process(3), 'Fizz') + def test_div5(self): + self.assertEqual(fizzbuzz.process(5), 'Buzz') if __name__ == '__main__': unittest.main() From 630dfc6f02f079386614c9942d74488a5b19e905 Mon Sep 17 00:00:00 2001 From: water3D Date: Thu, 16 Jan 2020 00:12:37 +0800 Subject: [PATCH 05/13] Finish Buzz --- fizzbuzz.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/fizzbuzz.py b/fizzbuzz.py index 2113c84..b15044e 100644 --- a/fizzbuzz.py +++ b/fizzbuzz.py @@ -1,4 +1,6 @@ def process(number): if number % 3 == 0: return 'Fizz' + elif number % 5 == 0: + return 'Buzz' From e26431994e3882b67bb11a071fa420ae0473df57 Mon Sep 17 00:00:00 2001 From: water3D Date: Thu, 16 Jan 2020 00:13:39 +0800 Subject: [PATCH 06/13] FizzBuzz Test --- test_fizzbuzz.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/test_fizzbuzz.py b/test_fizzbuzz.py index e67d65b..6676aa1 100644 --- a/test_fizzbuzz.py +++ b/test_fizzbuzz.py @@ -6,7 +6,9 @@ class TestFizzBuzz(unittest.TestCase): def test_div3(self): self.assertEqual(fizzbuzz.process(3), 'Fizz') def test_div5(self): - self.assertEqual(fizzbuzz.process(5), 'Buzz') + self.assertEqual(fizzbuzz.process(5), 'Buzz') + def test_div3and5(self): + self.assertEqual(fizzbuzz.process(15), 'FizzBuzz') if __name__ == '__main__': unittest.main() From 3b26d02856f6897ff8a06b0692576d3dd2f7e03f Mon Sep 17 00:00:00 2001 From: water3D Date: Thu, 16 Jan 2020 00:14:56 +0800 Subject: [PATCH 07/13] Finis FizzBuzz --- fizzbuzz.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fizzbuzz.py b/fizzbuzz.py index b15044e..efb2fe8 100644 --- a/fizzbuzz.py +++ b/fizzbuzz.py @@ -1,6 +1,9 @@ def process(number): + if number % 3 == 0 and number % 5 == 0: + return 'FizzBuzz' if number % 3 == 0: return 'Fizz' elif number % 5 == 0: - return 'Buzz' + return 'Buzz' + From 19eed3bdaf7ff0d8e36ded115be0fc743b2aa4ec Mon Sep 17 00:00:00 2001 From: water3D Date: Thu, 16 Jan 2020 00:16:32 +0800 Subject: [PATCH 08/13] Final test --- test_fizzbuzz.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/test_fizzbuzz.py b/test_fizzbuzz.py index 6676aa1..1107d2d 100644 --- a/test_fizzbuzz.py +++ b/test_fizzbuzz.py @@ -8,7 +8,9 @@ def test_div3(self): def test_div5(self): self.assertEqual(fizzbuzz.process(5), 'Buzz') def test_div3and5(self): - self.assertEqual(fizzbuzz.process(15), 'FizzBuzz') - + self.assertEqual(fizzbuzz.process(15), 'FizzBuzz') + def test_divother(self): + self.assertEqual(fizzbuzz.process(2), 2) + if __name__ == '__main__': unittest.main() From 99421a53ede60c4be42c69cc5042f0fd7354a1c6 Mon Sep 17 00:00:00 2001 From: water3D Date: Thu, 16 Jan 2020 00:18:06 +0800 Subject: [PATCH 09/13] Final --- fizzbuzz.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/fizzbuzz.py b/fizzbuzz.py index efb2fe8..58d0cd2 100644 --- a/fizzbuzz.py +++ b/fizzbuzz.py @@ -5,5 +5,7 @@ def process(number): return 'Fizz' elif number % 5 == 0: return 'Buzz' + else: + return number From c72e4967e8456b3654c3f850c7303ad911d971d5 Mon Sep 17 00:00:00 2001 From: water3D Date: Thu, 16 Jan 2020 00:18:49 +0800 Subject: [PATCH 10/13] Final Test --- fizzbuzz.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fizzbuzz.py b/fizzbuzz.py index 58d0cd2..efaee31 100644 --- a/fizzbuzz.py +++ b/fizzbuzz.py @@ -7,5 +7,8 @@ def process(number): return 'Buzz' else: return number - + +if __name__ == '__main__': + for i in range(1, 101): + print(process(i)) From be135040afe5b81411afceff5aa5d9782a8e3513 Mon Sep 17 00:00:00 2001 From: water3D Date: Thu, 16 Jan 2020 00:20:46 +0800 Subject: [PATCH 11/13] =?UTF-8?q?Fix=203=E5=92=8C5=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fizzbuzz.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fizzbuzz.py b/fizzbuzz.py index efaee31..b8c987f 100644 --- a/fizzbuzz.py +++ b/fizzbuzz.py @@ -1,7 +1,7 @@ def process(number): - if number % 3 == 0 and number % 5 == 0: + if number % 15 == 0: return 'FizzBuzz' - if number % 3 == 0: + elif number % 3 == 0: return 'Fizz' elif number % 5 == 0: return 'Buzz' From dafa0954a8b4c30e6e3189e443b0e53cb59448e0 Mon Sep 17 00:00:00 2001 From: water3D Date: Thu, 16 Jan 2020 00:25:50 +0800 Subject: [PATCH 12/13] pycodestyle --- fizzbuzz.py | 1 - 1 file changed, 1 deletion(-) diff --git a/fizzbuzz.py b/fizzbuzz.py index b8c987f..bd4108c 100644 --- a/fizzbuzz.py +++ b/fizzbuzz.py @@ -11,4 +11,3 @@ def process(number): if __name__ == '__main__': for i in range(1, 101): print(process(i)) - From 876d55b32cd64d7ae49586d5523f4ea32b21dfdf Mon Sep 17 00:00:00 2001 From: water3D Date: Thu, 16 Jan 2020 00:35:04 +0800 Subject: [PATCH 13/13] fix codestyle --- fizzbuzz.py | 7 ++++--- test_fizzbuzz.py | 13 +++++++++---- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/fizzbuzz.py b/fizzbuzz.py index bd4108c..57bec2f 100644 --- a/fizzbuzz.py +++ b/fizzbuzz.py @@ -1,13 +1,14 @@ def process(number): if number % 15 == 0: - return 'FizzBuzz' + return 'FizzBuzz' elif number % 3 == 0: return 'Fizz' elif number % 5 == 0: return 'Buzz' else: - return number - + return number + + if __name__ == '__main__': for i in range(1, 101): print(process(i)) diff --git a/test_fizzbuzz.py b/test_fizzbuzz.py index 1107d2d..54a8b4d 100644 --- a/test_fizzbuzz.py +++ b/test_fizzbuzz.py @@ -1,16 +1,21 @@ import fizzbuzz import unittest + class TestFizzBuzz(unittest.TestCase): def test_div3(self): - self.assertEqual(fizzbuzz.process(3), 'Fizz') + self.assertEqual(fizzbuzz.process(3), 'Fizz') + def test_div5(self): - self.assertEqual(fizzbuzz.process(5), 'Buzz') + self.assertEqual(fizzbuzz.process(5), 'Buzz') + def test_div3and5(self): - self.assertEqual(fizzbuzz.process(15), 'FizzBuzz') + self.assertEqual(fizzbuzz.process(15), 'FizzBuzz') + def test_divother(self): self.assertEqual(fizzbuzz.process(2), 2) - + + if __name__ == '__main__': unittest.main()