diff --git a/Advanced Software Engineering/Advanced Software Engineering Tests/SettingsAndHelperFunctionsTester.cs b/Advanced Software Engineering/Advanced Software Engineering Tests/SettingsAndHelperFunctionsTester.cs index 85fac97..40d3951 100644 --- a/Advanced Software Engineering/Advanced Software Engineering Tests/SettingsAndHelperFunctionsTester.cs +++ b/Advanced Software Engineering/Advanced Software Engineering Tests/SettingsAndHelperFunctionsTester.cs @@ -3,6 +3,7 @@ using Advanced_Software_Engineering; using System; using System.Collections.Generic; using System.Linq; +using Advanced_Software_Engineering.Verbs; namespace Advanced_Software_Engineering_Tests { [TestClass] @@ -52,7 +53,7 @@ namespace Advanced_Software_Engineering_Tests { int expected = rand.Next(int.MinValue, int.MaxValue); string input = expected.ToString(); - Assert.AreEqual(expected, SettingsAndHelperFunctions.ConvertToInt(input)); + Assert.AreEqual(expected, Value.ConvertToInt(input)); } } @@ -62,7 +63,7 @@ namespace Advanced_Software_Engineering_Tests { double expected = rand.NextDouble(); string input = expected.ToString(); - Assert.AreEqual(expected, SettingsAndHelperFunctions.ConvertToDouble(input)); + Assert.AreEqual(expected, Value.ConvertToDouble(input)); } } @@ -72,7 +73,7 @@ namespace Advanced_Software_Engineering_Tests { double expected = rand.Next(100, 100) * rand.NextDouble(); string input = expected.ToString(); - Assert.AreEqual(expected, SettingsAndHelperFunctions.ConvertToDouble(input)); + Assert.AreEqual(expected, Value.ConvertToDouble(input)); } } @@ -82,7 +83,7 @@ namespace Advanced_Software_Engineering_Tests { int expected = rand.Next(100, 100); string input = ((double)expected).ToString(); - Assert.AreEqual((double)expected, SettingsAndHelperFunctions.ConvertToDouble(input)); + Assert.AreEqual((double)expected, Value.ConvertToDouble(input)); } } diff --git a/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Quadrilateral.cs b/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Quadrilateral.cs index 9e53e2c..be8645e 100644 --- a/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Quadrilateral.cs +++ b/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Quadrilateral.cs @@ -9,9 +9,6 @@ namespace Advanced_Software_Engineering.Verbs.DrawingVerbs { class Quadrilateral : Verb { Verb verb; - bool descCreated = false; - string desc; - public Quadrilateral(Drawer drawer, Point point1, Point point2, Point point3, Point point4) { verb = new DrawLines(drawer, new Point[] { point1, point2, point3, point4 }); } diff --git a/Advanced Software Engineering/Advanced Software Engineering/Verbs/Value.cs b/Advanced Software Engineering/Advanced Software Engineering/Verbs/Value.cs index 9b0189b..a3514ca 100644 --- a/Advanced Software Engineering/Advanced Software Engineering/Verbs/Value.cs +++ b/Advanced Software Engineering/Advanced Software Engineering/Verbs/Value.cs @@ -5,8 +5,8 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Advanced_Software_Engineering { - class Value { +namespace Advanced_Software_Engineering.Verbs { + public class Value { public static int ConvertToInt(string text) { text = SettingsAndHelperFunctions.Strip(text); return int.Parse(text); diff --git a/Advanced Software Engineering/Advanced Software Engineering/Verbs/VerbFactory.cs b/Advanced Software Engineering/Advanced Software Engineering/Verbs/VerbFactory.cs index 1477eeb..059af96 100644 --- a/Advanced Software Engineering/Advanced Software Engineering/Verbs/VerbFactory.cs +++ b/Advanced Software Engineering/Advanced Software Engineering/Verbs/VerbFactory.cs @@ -6,6 +6,7 @@ using System.Linq; using System.Security.Cryptography; using System.Windows.Forms; using System.Windows.Forms.VisualStyles; +using Advanced_Software_Engineering.Verbs; using Advanced_Software_Engineering.Verbs.DrawingVerbs; namespace Advanced_Software_Engineering {