Merge branch 'Marvins' into 'develop'

Integration von Marvins Code + Tests

See merge request !13

others/Marvin/reportMarvinImp.md

+| Name   | Interface break | Failed Testcases                                                                                                                              |
+|--------|-----------------|-----------------------------------------------------------------------------------------------------------------------------------------------|
+| Marvin | no              | test_add_multiple_negative_numbers (tests.testStringcalculator.TestStringCalculator) ... Negative numbers are not allowed: -10, -20, -30 FAIL |
+| Marvin | no              | test_add_single_negative_number (tests.testStringcalculator.TestStringCalculator) ... Negative numbers are not allowed: -2 FAIL               |
\ No newline at end of file

others/Marvin/reportMarvinTests.md

+| Name   | Interface break | Failed Testcases                                                                                                                                                                                        |
+|--------|-----------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| Marvin | no              | test_add_negative_numbers (others.Marvin.MarvinStringCalculator.TestStringCalculator) Feature 4: Negative Zahlen sollen Fehler werfen ... FAIL                                                          |
+| Marvin | no              | test_custom_long_delimiter_with_negative_numbers (others.Marvin.MarvinStringCalculator.TestStringCalculator) Feature 4 und 7: Benutzerdefinierter Delimiter beliebiger Länge + negative Zahlen ... FAIL |
\ No newline at end of file

tests/testStringcalculator.py

@@ -42,9 +42,12 @@ from others.Wasili.WasiliStringCalculator import IStringCalculator, StringCalcul
 
 import unittest
 from others.Momo.MomoStringCalculator import StringCalculator
-'''
+
 import unittest
 from others.Alma.AlmaStringCalculator import IStringCalculator, StringCalculator
+'''
+import unittest
+from others.Marvin.MarvinStringCalculator import StringCalculator
 
 class TestStringCalculator(unittest.TestCase):
     def setUp(self):