From b822300140a85bd5de26b9e072e4a6887855bebb Mon Sep 17 00:00:00 2001 From: YEFY314 Date: Tue, 14 Jan 2020 14:39:24 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=95=8F=E6=8D=B7=E5=BC=80=E5=8F=91?= =?UTF-8?q?=E6=AF=94=E8=B5=9B=E5=88=9D=E8=B5=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fizzBuzz.py | 25 +++++++++++++++++++++++++ fizzBuzz_test.py | 18 ++++++++++++++++++ 2 files changed, 43 insertions(+) create mode 100644 fizzBuzz.py create mode 100644 fizzBuzz_test.py diff --git a/fizzBuzz.py b/fizzBuzz.py new file mode 100644 index 0000000..6552235 --- /dev/null +++ b/fizzBuzz.py @@ -0,0 +1,25 @@ +def canBedivide(dividend, *dividor): + result = True + for i in dividor: + if int(dividend) % int(i) !=0: + result = False + return result + + +def fizzBuzz(num=100): + result = [] + for i in range(int(num)): + i = i+1 + if canBedivide(i, 3, 5): + temp = "FizzBuzz" + elif canBedivide(i, 3): + temp = "Fizz" + elif canBedivide(i, 5): + temp = "Buzz" + else: + temp = i + print(temp) + result.append(temp) + return result + +fizzBuzz() \ No newline at end of file diff --git a/fizzBuzz_test.py b/fizzBuzz_test.py new file mode 100644 index 0000000..3825515 --- /dev/null +++ b/fizzBuzz_test.py @@ -0,0 +1,18 @@ +import unittest + +from fizzBuzz import canBedivide, fizzBuzz + +class fizzBuzz_test(unittest.TestCase): + + def test_canBedivideCase1(self): + self.assertTrue(canBedivide(15, 3, 5)) + + def test_canBedivideCase2(self): + self.assertFalse(canBedivide(7, 3)) + + def test_fizzBuzzCase1(self): + self.assertEqual(fizzBuzz(5),[1, 2, "Fizz", 4, "Buzz"]) + + +if __name__ == "__main__": + unittest.main() \ No newline at end of file From 46b7b61c8a859e32ef8e59f93396ebe73a96ba09 Mon Sep 17 00:00:00 2001 From: YEFY314 Date: Tue, 14 Jan 2020 16:17:32 +0800 Subject: [PATCH 2/2] =?UTF-8?q?pycodestyle=E4=BF=AE=E6=94=B9=E7=BC=A9?= =?UTF-8?q?=E8=BF=9B=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fizzBuzz.py | 41 +++++++++++++++++++++-------------------- fizzBuzz_test.py | 17 +++++++++-------- 2 files changed, 30 insertions(+), 28 deletions(-) diff --git a/fizzBuzz.py b/fizzBuzz.py index 6552235..2f66e05 100644 --- a/fizzBuzz.py +++ b/fizzBuzz.py @@ -1,25 +1,26 @@ def canBedivide(dividend, *dividor): - result = True - for i in dividor: - if int(dividend) % int(i) !=0: - result = False - return result + result = True + for i in dividor: + if int(dividend) % int(i) != 0: + result = False + return result def fizzBuzz(num=100): - result = [] - for i in range(int(num)): - i = i+1 - if canBedivide(i, 3, 5): - temp = "FizzBuzz" - elif canBedivide(i, 3): - temp = "Fizz" - elif canBedivide(i, 5): - temp = "Buzz" - else: - temp = i - print(temp) - result.append(temp) - return result + result = [] + for i in range(int(num)): + i = i+1 + if canBedivide(i, 3, 5): + temp = "FizzBuzz" + elif canBedivide(i, 3): + temp = "Fizz" + elif canBedivide(i, 5): + temp = "Buzz" + else: + temp = i + print(temp) + result.append(temp) + return result -fizzBuzz() \ No newline at end of file + +fizzBuzz() diff --git a/fizzBuzz_test.py b/fizzBuzz_test.py index 3825515..bfbbd4c 100644 --- a/fizzBuzz_test.py +++ b/fizzBuzz_test.py @@ -2,17 +2,18 @@ from fizzBuzz import canBedivide, fizzBuzz + class fizzBuzz_test(unittest.TestCase): - def test_canBedivideCase1(self): - self.assertTrue(canBedivide(15, 3, 5)) + def test_canBedivideCase1(self): + self.assertTrue(canBedivide(15, 3, 5)) + + def test_canBedivideCase2(self): + self.assertFalse(canBedivide(7, 3)) - def test_canBedivideCase2(self): - self.assertFalse(canBedivide(7, 3)) + def test_fizzBuzzCase1(self): + self.assertEqual(fizzBuzz(5), [1, 2, "Fizz", 4, "Buzz"]) - def test_fizzBuzzCase1(self): - self.assertEqual(fizzBuzz(5),[1, 2, "Fizz", 4, "Buzz"]) - if __name__ == "__main__": - unittest.main() \ No newline at end of file + unittest.main()