diff --git a/FizzBuzz.py b/FizzBuzz.py index 00b6ebd..577d092 100644 --- a/FizzBuzz.py +++ b/FizzBuzz.py @@ -1,6 +1,7 @@ """ Q1. Why is the report method untestable ? [2 pts] +report_file open and path is external collaborative (platform and system environment dependent) which is handled in the function so it is untestable. @@ -10,10 +11,9 @@ """ class FizzBuzz(object): - def report(self, numbers): - - report_file = open('c:/temp/fizzbuzz_report.txt', 'w') + def report(self, numbers, fileWrapper): + fileWrapper.open() for number in numbers: msg = str(number) + " " fizzbuzz_found = False @@ -25,12 +25,29 @@ def report(self, numbers): fizzbuzz_found = True if fizzbuzz_found: - report_file.write(msg + "\n") + fileWrapper.write(msg + "\n") - report_file.close() + fileWrapper.close() if "__main__" == __name__: fb = FizzBuzz() - fb.report(range(100)) + fileWrapper = FileWrapper('temp.txt', 'w') # can create open wrapper + fb.report(range(100), fileWrapper) + +class FileWrapper: + def __init__(self, fname, mode): + self.filename = fname + self.mode = mode + + def open(self): + self.filehandle = open (self.filename, self.mode) + return self.filehandle + + def write(self, buff): + self.filehandle.write(msg)\ + + def close(self) + self.filehandle.close() + diff --git a/TestFizzBuzzMocked.py b/TestFizzBuzzMocked.py index 6f1d0d5..55d19e8 100644 --- a/TestFizzBuzzMocked.py +++ b/TestFizzBuzzMocked.py @@ -17,7 +17,18 @@ def tearDown(self): self.fb = None def test_report(self): - pass + #create mock + mockFileProvider = self.mock() + mockFileWrapper = self.mockFileProvider('report.txt', 'w') + #replay + self.replay() + #Call the report method with mocked filewrapper + numbers=range(100) + FizzBuzz.report(self.numbers,self.mockFileWrapper) + #verify + self.verify() + + diff --git a/TestFizzBuzzStubbed.py b/TestFizzBuzzStubbed.py index 78ee454..d845e6e 100644 --- a/TestFizzBuzzStubbed.py +++ b/TestFizzBuzzStubbed.py @@ -5,7 +5,14 @@ Q3. What will be printed when we execute 'python FizzBuzzStubbed.py' ? [3 pts] - +setUpClass FizzBuzzStubbed +setup +test_report +teardown +setup +test_report +teardown +tearDownClass @@ -17,16 +24,21 @@ """ class MyStub(object): - pass - - - - - + def __init__(self, values) + self.flag = False + self.values = [] + + def open(self) + self.flag = True + + def write(self,msg) + self.values.append(msg) + + def close(self) + self.flag = False - class TestFizzBuzzStubbed(unittest.TestCase): @classmethod