Skip to content
Snippets Groups Projects
Commit a4f2f70e authored by Lasse Pikkemaat's avatar Lasse Pikkemaat
Browse files

Merge branch 'Almas' into 'develop'

Integration von Almas Code + Tests

See merge request !12
parents ff87045d 3720f98f
No related branches found
No related tags found
2 merge requests!15Develop,!12Integration von Almas Code + Tests
from abc import ABC, abstractmethod
import unittest
from src.stringcalculator import StringCalculator #Auskommentieren, falls andere Implementierung genutzt wird
'''
class IStringCalculator(ABC):
@abstractmethod
def add(self, numbers: str) -> int:
pass
class StringCalculator(IStringCalculator):
def add(self, numbers: str) -> int:
if not numbers:
return 0
# Überprüfe, ob ein benutzerdefiniertes Trennzeichen angegeben ist
if numbers.startswith("//"):
delimiter_line_end = numbers.find("\n")
delimiter = numbers[2:delimiter_line_end] # Extrahiere das Trennzeichen
numbers = numbers[delimiter_line_end + 1:] # Entferne die erste Zeile mit dem Trennzeichen
else:
delimiter = ',' # Standard-Trennzeichen ist Komma, wenn keine Zeile mit dem Trennzeichen vorhanden ist
# Ersetze alle Vorkommen des Trennzeichens und teile die Eingabe
numbers = numbers.replace("\n", delimiter)
nums = numbers.split(delimiter)
# Filtere alle Zahlen, die größer als 1000 sind
nums = [int(num) for num in nums if int(num) <= 1000]
# Prüfe auf negative Zahlen
negatives = [num for num in nums if num < 0]
if negatives:
# Wenn negative Zahlen vorhanden sind, werfe eine Ausnahme
raise ValueError(f"Negatives not allowed: {', '.join(map(str, negatives))}")
# Berechne die Summe der Zahlen, die <= 1000 sind
return sum(nums)
'''
class TestStringCalculator(unittest.TestCase):
def setUp(self):
self.calculator = StringCalculator()
def test_empty_string(self):
self.assertEqual(self.calculator.add(""), 0)
def test_single_number(self):
self.assertEqual(self.calculator.add("1"), 1)
def test_two_numbers(self):
self.assertEqual(self.calculator.add("1,2"), 3)
def test_multiple_numbers(self):
self.assertEqual(self.calculator.add("1,2,3,4,5"), 15)
def test_numbers_with_newline(self):
self.assertEqual(self.calculator.add("1\n2,3"), 6)
def test_numbers_with_multiple_newlines(self):
self.assertEqual(self.calculator.add("1\n2\n3\n4\n5"), 15)
def test_negative_number(self):
with self.assertRaises(ValueError) as context:
self.calculator.add("1,-2,3")
self.assertEqual(str(context.exception), "Negatives not allowed: -2")
def test_multiple_negative_numbers(self):
with self.assertRaises(ValueError) as context:
self.calculator.add("1,-2,-3,4")
self.assertEqual(str(context.exception), "Negatives not allowed: -2, -3")
def test_custom_delimiter(self):
self.assertEqual(self.calculator.add("//;\n1;2"), 3)
def test_custom_delimiter_with_newline(self):
self.assertEqual(self.calculator.add("//;\n1;2\n3"), 6)
def test_custom_delimiter_with_multiple_numbers(self):
self.assertEqual(self.calculator.add("//|\n1|2|3|4"), 10)
def test_numbers_greater_than_1000(self):
self.assertEqual(self.calculator.add("2,1001"), 2)
def test_numbers_greater_than_1000_with_custom_delimiter(self):
self.assertEqual(self.calculator.add("//;\n2;1001"), 2)
def test_long_delimiter(self):
self.assertEqual(self.calculator.add("//[***]\n1***2***3"), 6)
def test_long_delimiter_with_multiple_numbers(self):
self.assertEqual(self.calculator.add("//[---]\n1---2---3---4"), 10)
if __name__ == "__main__":
unittest.main()
# python -m unittest others.Alma.AlmaStringCalculator -v
\ No newline at end of file
| Name | Interface break | Failed Testcases | Comment |
|------|-----------------|------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------|
| Alma | no | test_add_multiple_negative_numbers (tests.testStringcalculator.TestStringCalculator) ... Negatives not allowed: -10, -20, -30 FAIL | |
| Alma | no | test_add_single_negative_number (tests.testStringcalculator.TestStringCalculator) ... Negatives not allowed: -2 FAIL | |
| Alma | no | test_add_with_custom_delimiter_multiple_characters (tests.testStringcalculator.TestStringCalculator) ... ERROR | Dein Code verarbeitet nur ein Zeichen als Delimiter, aber nicht mehrere Zeichen |
\ No newline at end of file
| Name | Interface break | Failed Testcases |
|------|-----------------|-------------------------------------------------------------------------------------------------|
| Alma | no | test_multiple_negative_numbers (others.Alma.AlmaStringCalculator.TestStringCalculator) ... FAIL |
| Alma | no | test_negative_number (others.Alma.AlmaStringCalculator.TestStringCalculator) ... FAIL |
\ No newline at end of file
...@@ -39,9 +39,12 @@ from others.Dani.DaniStringCalculator import IStringCalculator, StringCalculator ...@@ -39,9 +39,12 @@ from others.Dani.DaniStringCalculator import IStringCalculator, StringCalculator
import unittest import unittest
from others.Wasili.WasiliStringCalculator import IStringCalculator, StringCalculator from others.Wasili.WasiliStringCalculator import IStringCalculator, StringCalculator
'''
import unittest import unittest
from others.Momo.MomoStringCalculator import StringCalculator from others.Momo.MomoStringCalculator import StringCalculator
'''
import unittest
from others.Alma.AlmaStringCalculator import IStringCalculator, StringCalculator
class TestStringCalculator(unittest.TestCase): class TestStringCalculator(unittest.TestCase):
def setUp(self): def setUp(self):
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment