From d51f315a8da246c3852017b4a1c127a29a43811f Mon Sep 17 00:00:00 2001 From: uzvkl Date: Mon, 20 May 2019 03:00:44 +0200 Subject: Begin Testing --- DSALib/Auxiliary/Calculator/StringSolver.cs | 4 ++-- DSALib/Auxiliary/Dice.cs | 10 ++++++---- 2 files changed, 8 insertions(+), 6 deletions(-) (limited to 'DSALib') diff --git a/DSALib/Auxiliary/Calculator/StringSolver.cs b/DSALib/Auxiliary/Calculator/StringSolver.cs index bf903da..45d6a54 100644 --- a/DSALib/Auxiliary/Calculator/StringSolver.cs +++ b/DSALib/Auxiliary/Calculator/StringSolver.cs @@ -67,7 +67,7 @@ namespace DSALib.Auxiliary.Calculator } } - return string.Empty; + throw new ArgumentException("Invalid brace sequence"); } private static Ops GetOps(char c) @@ -120,7 +120,7 @@ namespace DSALib.Auxiliary.Calculator switch (c) { case ')': - throw new ArgumentException("Unmögliche Anordnung von Klammern"); + throw new ArgumentException("Invalid brace sequence"); case '(': arguments.Add(new StringSolver(GetInner(ref workInput))); index = -1; diff --git a/DSALib/Auxiliary/Dice.cs b/DSALib/Auxiliary/Dice.cs index b07d47f..0bfabeb 100644 --- a/DSALib/Auxiliary/Dice.cs +++ b/DSALib/Auxiliary/Dice.cs @@ -15,18 +15,20 @@ namespace DSALib.Auxiliary public static int Roll(string input) { var strings = input.ToLower().Split(new[] {'w', 'd'}, 2, StringSplitOptions.RemoveEmptyEntries).ToList(); - var count = Convert.ToInt32(strings[0]); - var d = Convert.ToInt32(strings[0]); + if (strings.Count != 2) - throw new ArgumentException($"{input}: erfüllt nicht die Formatvogaben( Anzahl d Augenzahl)"); + throw new ArgumentException($"{input}: does not satisfy the format requirements( dice count (d|w) die size)"); + + var count = Convert.ToInt32(strings[0]); + var d = Convert.ToInt32(strings[0]); return Roll(count, d); } public static int Roll(int count, int d) { - if (d <= 0) return 0; + if (d <= 0 || count <= 0) return 0; var sum = 0; for (var i = 0; i < Math.Abs(count); i++) -- cgit v1.2.3-54-g00ecf