Updated tests and task in From Import

Author: sofiiako

Modules and packages/From import/calculator.py

@@ -3,34 +3,24 @@
 """
 
 
-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/From import/from_import.py

@@ -1,10 +1,14 @@
-from calculator import Add
+from calculator import Calculator
 from my_module import hello as hey
 
+print(hey("User"))
 
-calc = Add()  # Name `Calculator` used directly without prefix `calculator`
+calc = Calculator()  # Name `Calculator` used directly without prefix `calculator`
 calc.add(2)
+calc.multiply(100)
+calc.divide(3)
+
 print(calc.get_current())
 
 
-print(hey("User"))
+

Modules and packages/From import/task-info.yaml

@@ -7,8 +7,13 @@ files:
 - name: from_import.py
   visible: true
   placeholders:
-  - offset: 27
-    length: 34
-    placeholder_text: '# Import hello_world from my_module'
-- name: tests.py
+  - offset: 0
+    length: 33
+    placeholder_text: '# Import class Calculator from another module'
+  - offset: 97
+    length: 12
+    placeholder_text: '''Instantiate a calculator'''
+- name: tests/__init__.py
+  visible: false
+- name: tests/test_task.py
   visible: false

Modules and packages/From import/task.md

@@ -6,7 +6,7 @@ can use the imported name without the `module_name` prefix.  For example:
 ```python
 from calculator import Add
 
-calc = Add()    # name `Calculator` used directly without prefix `calculator`
+calc = Add()    # name `Add` used directly without prefix `calculator`
 ```
 
 This does not introduce the name of the module from which the imports are taken in the 
@@ -37,8 +37,9 @@ when utilising `from` with similar effects:
 from calculator import Subtract as Minus
 ```
 
-Import the `hello` function from `my_module` as `hey` and call it to print your name.
+Import the `Calculator` class from `calculator` and create an instance of this class. Remember how to access it correctly in 
+this case.
 
-<div class='hint'>Use syntax such as <code>from some_module import some_func as func</code>.</div>
-<div class="hint">Note: The <code>hey</code> function should be called without a prefix. The function expects
-one string argument.</div>
+
+<div class="hint">Note: The <code>Calculator</code> class should be called without a prefix because you 
+imported it directly.</div>

Modules and packages/From import/tests.py

@@ -0,0 +1,25 @@
+import unittest
+import contextlib
+import io
+
+f = io.StringIO()
+try:
+    with contextlib.redirect_stdout(f):
+        import from_import
+    output = f.getvalue().split('\n')
+
+
+    class TestCase(unittest.TestCase):
+        def test_output(self):
+            self.assertEqual('Hey there, User!', output[0],
+                             msg='Please do not change the starter code.')
+            self.assertEqual('66.66666666666667', output[1],
+                             msg='Calculation result is wrong. Please do not change the starter code.')
+
+except NameError:
+    class TestFailCase(unittest.TestCase):
+        def test_fail(self):
+            self.assertTrue(False, msg='Use `Calculator` directly, without a prefix.')
+
+
+