Updated tests and task in Packages

Author: sofiiako

Modules and packages/From import/calculator.py

@@ -1,5 +1,5 @@
 """
-This module contains calculator classes
+This module contains a calculator
 """
 
 

Modules and packages/Packages/classes/calculator.py

@@ -1,36 +1,26 @@
 """
-This module contains calculator classes
+This module contains a calculator
 """
 
 
-class Add:
+class Calculator:
     def __init__(self):
         self.current = 0
 
     def add(self, amount):
         self.current += amount
 
-    def get_current(self):
-        return self.current
-
-
-class Subtract:
-    def __init__(self):
-        self.current = 100
-
     def subtract(self, amount):
         self.current -= amount
 
-    def get_current(self):
-        return self.current
-
-
-class Multiply:
-    def __init__(self):
-        self.current = 10
-
     def multiply(self, amount):
         self.current *= amount
 
+    def divide(self, amount):
+        try:
+            self.current /= amount
+        except ZeroDivisionError:
+            print('Can not divide by zero.')
+
     def get_current(self):
         return self.current

Modules and packages/Packages/task.py renamed to Modules and packages/Packages/packages.py

@@ -5,10 +5,11 @@
 
 
 print(functions.greeting.hello.hello('Susan'))
-bye.good_bye('Alex')
-c = calculator.Multiply()
-c.multiply(2)
+print(bye.good_bye('Alex'))
+
+c = calculator.Calculator()
+c.add(2)
+c.multiply(10)
 print(c.get_current())
 
 print(official.hello('Sam'))
-

Modules and packages/Packages/task-info.yaml

@@ -1,13 +1,14 @@
 type: edu
 files:
-- name: task.py
+- name: packages.py
   visible: true
   placeholders:
   - offset: 95
     length: 46
-    placeholder_text: '# Import the official module as official'
-- name: tests.py
-  visible: false
+    placeholder_text: '# Import the `official` module here'
+  - offset: 197
+    length: 20
+    placeholder_text: '''Say goodbye to Alex'''
 - name: functions/greeting/hello.py
   visible: true
 - name: functions/goodbye.py
@@ -22,3 +23,7 @@ files:
   visible: true
 - name: functions/greeting/official.py
   visible: true
+- name: tests/__init__.py
+  visible: false
+- name: tests/test_task.py
+  visible: false

Modules and packages/Packages/task.md

@@ -43,5 +43,9 @@ You can learn more about packages by reading <a href="https://docs.python.org/3/
 In the code editor, import the `official` module properly to make the last `print` 
 statement work.
 
+In the second print statement, add a function call (find the right function) so that it prints a goodbye to `'Alex'`.
+
 <div class="hint">Access the module using syntax such as <code>package.subpackage.module</code>.</div>
 <div class="hint">Use syntax such as <code>import module as something</code>.</div>
+<div class="hint">Check out imports: there's one that might have the right function for the second task.
+Be careful when using it: the module is already imported with a specific name.</div>

Modules and packages/Packages/tests.py

@@ -0,0 +1,27 @@
+import unittest
+import contextlib
+import io
+
+f = io.StringIO()
+
+with contextlib.redirect_stdout(f):
+    import packages
+output = f.getvalue().split('\n')
+
+
+class TestCase(unittest.TestCase):
+    def test_alex(self):
+        self.assertEqual('See you later, Alex!', output[1],
+                         msg='The second line of output should contain a goodbye to '
+                             'Alex produced by the function `good_bye` that can be found in one of the modules.')
+
+    def test_sam(self):
+        self.assertEqual('Dear Sam, I am glad to finally meet you in person.', output[3],
+                         msg='The fourth line of output should contain an official greeting for Sam.')
+
+    def test_out_len(self):
+        self.assertEqual(5, len(output), msg='Please do not remove or add any print statements')
+
+
+
+