Fixed Tests

Advanced Software Engineering/Advanced Software Engineering Tests/Advanced Software Engineering Tests.xml

@@ -82,11 +82,6 @@
             tests the "square" command. See <see cref="T:Advanced_Software_Engineering.Verbs.DrawingVerbs.Square"/>.
             </summary>
         </member>
-        <member name="M:Advanced_Software_Engineering_Tests.CommandTester.QuadrilateralTester_Manual1">
-            <summary>
-            tests the "quadrilateral" command using <see cref="T:Advanced_Software_Engineering.Verbs.DrawingVerbs.DrawLines" />. See <see cref="T:Advanced_Software_Engineering.Verbs.DrawingVerbs.Quadrilateral" />.
-            </summary>
-        </member>
         <member name="M:Advanced_Software_Engineering_Tests.CommandTester.CircleTester_Manual1">
             <summary>
             Tests the "circle" command. See <see cref="T:Advanced_Software_Engineering.Verbs.DrawingVerbs.Circle"/>.
@@ -147,6 +142,61 @@
             Tests the "int" declaration and assignment. It hasn't been implemented yet.
             </summary>
         </member>
+        <member name="T:Advanced_Software_Engineering_Tests.HelperFunctionsTester">
+            <summary>
+            This class tests <see cref="T:Advanced_Software_Engineering.HelperFunctions"/> methods. It uses a combination of manual and random tests.
+            </summary>
+        </member>
+        <member name="M:Advanced_Software_Engineering_Tests.HelperFunctionsTester.Strip_Random1">
+            <summary>
+            Random strip spaces test
+            </summary>
+        </member>
+        <member name="M:Advanced_Software_Engineering_Tests.HelperFunctionsTester.Strip_Manual1">
+            <summary>
+            Manual <see cref="M:Advanced_Software_Engineering.HelperFunctions.Strip(System.String)"/> test
+            </summary>
+        </member>
+        <member name="M:Advanced_Software_Engineering_Tests.HelperFunctionsTester.Strip_Manual2">
+            <summary>
+            Manual <see cref="M:Advanced_Software_Engineering.HelperFunctions.Strip(System.String)"/> test
+            </summary>
+        </member>
+        <member name="M:Advanced_Software_Engineering_Tests.HelperFunctionsTester.StripStringArray_Manual1">
+            <summary>
+            Manual <see cref="M:Advanced_Software_Engineering.HelperFunctions.StripStringArray(System.String[])"/> test.
+            </summary>
+        </member>
+        <member name="M:Advanced_Software_Engineering_Tests.HelperFunctionsTester.StripStringArray_Manual2">
+            <summary>
+            Manual <see cref="M:Advanced_Software_Engineering.HelperFunctions.StripStringArray(System.String[])"/> test.
+            </summary>
+        </member>
+        <member name="M:Advanced_Software_Engineering_Tests.HelperFunctionsTester.CommandAndParameterParser_Manual1">
+            <summary>
+            Manual <see cref="M:Advanced_Software_Engineering.HelperFunctions.CommandAndParameterParser(System.String)"/> test.
+            </summary>
+        </member>
+        <member name="M:Advanced_Software_Engineering_Tests.HelperFunctionsTester.CommandAndParameterParser_Manual2">
+            <summary>
+            Manual <see cref="M:Advanced_Software_Engineering.HelperFunctions.CommandAndParameterParser(System.String)"/> test.
+            </summary>
+        </member>
+        <member name="M:Advanced_Software_Engineering_Tests.HelperFunctionsTester.CommandAndParameterParser_Manual3">
+            <summary>
+            Manual <see cref="M:Advanced_Software_Engineering.HelperFunctions.CommandAndParameterParser(System.String)"/> test.
+            </summary>
+        </member>
+        <member name="M:Advanced_Software_Engineering_Tests.HelperFunctionsTester.CommandAndParameterParser_Manual4">
+            <summary>
+            Manual <see cref="M:Advanced_Software_Engineering.HelperFunctions.CommandAndParameterParser(System.String)"/> test.
+            </summary>
+        </member>
+        <member name="M:Advanced_Software_Engineering_Tests.HelperFunctionsTester.CommandAndParameterParser_Random1">
+            <summary>
+            Random <see cref="M:Advanced_Software_Engineering.HelperFunctions.CommandAndParameterParser(System.String)"/> test.
+            </summary>
+        </member>
         <member name="T:Advanced_Software_Engineering_Tests.Properties.Resources">
             <summary>
               A strongly-typed resource class, for looking up localized strings, etc.
@@ -163,61 +213,6 @@
               resource lookups using this strongly typed resource class.
             </summary>
         </member>
-        <member name="T:Advanced_Software_Engineering_Tests.SettingsAndHelperFunctionsTester">
-            <summary>
-            This class tests <see cref="T:Advanced_Software_Engineering.SettingsAndHelperFunctions" /> methods. It uses a combination of manual and random tests.
-            </summary>
-        </member>
-        <member name="M:Advanced_Software_Engineering_Tests.SettingsAndHelperFunctionsTester.Strip_Random1">
-            <summary>
-            Random strip spaces test
-            </summary>
-        </member>
-        <member name="M:Advanced_Software_Engineering_Tests.SettingsAndHelperFunctionsTester.Strip_Manual1">
-            <summary>
-            Manual <see cref="M:Advanced_Software_Engineering.SettingsAndHelperFunctions.Strip(System.String)" /> test
-            </summary>
-        </member>
-        <member name="M:Advanced_Software_Engineering_Tests.SettingsAndHelperFunctionsTester.Strip_Manual2">
-            <summary>
-            Manual <see cref="M:Advanced_Software_Engineering.SettingsAndHelperFunctions.Strip(System.String)" /> test
-            </summary>
-        </member>
-        <member name="M:Advanced_Software_Engineering_Tests.SettingsAndHelperFunctionsTester.StripStringArray_Manual1">
-            <summary>
-            Manual <see cref="M:Advanced_Software_Engineering.SettingsAndHelperFunctions.StripStringArray(System.String[])" /> test.
-            </summary>
-        </member>
-        <member name="M:Advanced_Software_Engineering_Tests.SettingsAndHelperFunctionsTester.StripStringArray_Manual2">
-            <summary>
-            Manual <see cref="M:Advanced_Software_Engineering.SettingsAndHelperFunctions.StripStringArray(System.String[])" /> test.
-            </summary>
-        </member>
-        <member name="M:Advanced_Software_Engineering_Tests.SettingsAndHelperFunctionsTester.CommandAndParameterParser_Manual1">
-            <summary>
-            Manual <see cref="M:Advanced_Software_Engineering.SettingsAndHelperFunctions.CommandAndParameterParser(System.String)" /> test.
-            </summary>
-        </member>
-        <member name="M:Advanced_Software_Engineering_Tests.SettingsAndHelperFunctionsTester.CommandAndParameterParser_Manual2">
-            <summary>
-            Manual <see cref="M:Advanced_Software_Engineering.SettingsAndHelperFunctions.CommandAndParameterParser(System.String)" /> test.
-            </summary>
-        </member>
-        <member name="M:Advanced_Software_Engineering_Tests.SettingsAndHelperFunctionsTester.CommandAndParameterParser_Manual3">
-            <summary>
-            Manual <see cref="M:Advanced_Software_Engineering.SettingsAndHelperFunctions.CommandAndParameterParser(System.String)" /> test.
-            </summary>
-        </member>
-        <member name="M:Advanced_Software_Engineering_Tests.SettingsAndHelperFunctionsTester.CommandAndParameterParser_Manual4">
-            <summary>
-            Manual <see cref="M:Advanced_Software_Engineering.SettingsAndHelperFunctions.CommandAndParameterParser(System.String)" /> test.
-            </summary>
-        </member>
-        <member name="M:Advanced_Software_Engineering_Tests.SettingsAndHelperFunctionsTester.CommandAndParameterParser_Random1">
-            <summary>
-            Random <see cref="M:Advanced_Software_Engineering.SettingsAndHelperFunctions.CommandAndParameterParser(System.String)" /> test.
-            </summary>
-        </member>
         <member name="T:Advanced_Software_Engineering_Tests.ValueHelperTester">
             <summary>
             This class tests <see cref="T:Advanced_Software_Engineering.Verbs.Value.ValueHelper"/> methods. It uses a combination of manual and random tests.

Advanced Software Engineering/Advanced Software Engineering Tests/CommandTester.cs

@@ -1,5 +1,6 @@
 using Advanced_Software_Engineering;
 using Advanced_Software_Engineering.Verbs.DrawingVerbs;
+using Advanced_Software_Engineering.Verbs.Value.ValueObjects;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using System;
 using System.Collections.Generic;
@@ -267,27 +268,6 @@ namespace Advanced_Software_Engineering_Tests {
             Assert.AreEqual(correctDesc, verbDesc);
         }
 
-        /// <summary>
-        /// tests the "quadrilateral" command using <see cref="DrawLines"/>. See <see cref="Quadrilateral"/>.
-        /// </summary>
-        [TestMethod]
-        public void QuadrilateralTester_Manual1() {
-            string input = "quadrilateral 1, 2,  3, 4,  5, 6,  7, 8";
-            Point[] points = {
-                new Point(1, 2),
-                new Point(3, 4),
-                new Point(5, 6),
-                new Point(7, 8)
-            };
-
-            IVerb IVerb = VerbFactory.MakeVerb(null, input);
-
-            string verbDesc = IVerb.GetDescription();
-            string correctDesc = new DrawLines(null, points).GetDescription();
-
-            Assert.AreEqual(verbDesc, correctDesc);
-        }
-
         /// <summary>
         /// Tests the "circle" command. See <see cref="Circle"/>.
         /// </summary>

Advanced Software Engineering/Advanced Software Engineering Tests/HelperFunctionsTester.cs

@@ -7,10 +7,10 @@ using System.Linq;
 namespace Advanced_Software_Engineering_Tests {
 
     /// <summary>
-    /// This class tests <see cref="SettingsAndHelperFunctions"/> methods. It uses a combination of manual and random tests.
+    /// This class tests <see cref="HelperFunctions"/> methods. It uses a combination of manual and random tests.
     /// </summary>
     [TestClass]
-    public class SettingsAndHelperFunctionsTester {
+    public class HelperFunctionsTester {
         private readonly string alphabet = "abcdefghijklmnopqrstuvwxzy";
         private readonly Random rand = new Random();
 
@@ -36,7 +36,7 @@ namespace Advanced_Software_Engineering_Tests {
         }
 
         /// <summary>
-        /// Manual <see cref="SettingsAndHelperFunctions.Strip(string)"/> test
+        /// Manual <see cref="HelperFunctions.Strip(string)"/> test
         /// </summary>
         [TestMethod]
         public void Strip_Manual1() {
@@ -47,7 +47,7 @@ namespace Advanced_Software_Engineering_Tests {
         }
 
         /// <summary>
-        /// Manual <see cref="SettingsAndHelperFunctions.Strip(string)"/> test
+        /// Manual <see cref="HelperFunctions.Strip(string)"/> test
         /// </summary>
         [TestMethod]
         public void Strip_Manual2() {
@@ -58,7 +58,7 @@ namespace Advanced_Software_Engineering_Tests {
         }
 
         /// <summary>
-        /// Manual <see cref="SettingsAndHelperFunctions.StripStringArray(string[])"/> test.
+        /// Manual <see cref="HelperFunctions.StripStringArray(string[])"/> test.
         /// </summary>
         [TestMethod]
         public void StripStringArray_Manual1() {
@@ -72,7 +72,7 @@ namespace Advanced_Software_Engineering_Tests {
         }
 
         /// <summary>
-        /// Manual <see cref="SettingsAndHelperFunctions.StripStringArray(string[])"/> test.
+        /// Manual <see cref="HelperFunctions.StripStringArray(string[])"/> test.
         /// </summary>
         [TestMethod]
         public void StripStringArray_Manual2() {
@@ -86,47 +86,49 @@ namespace Advanced_Software_Engineering_Tests {
         }
 
         /// <summary>
-        /// Manual <see cref="SettingsAndHelperFunctions.CommandAndParameterParser(string)"/> test.
+        /// Manual <see cref="HelperFunctions.CommandAndParameterParser(string)"/> test.
         /// </summary>
         [TestMethod]
         public void CommandAndParameterParser_Manual1() {
-            Dictionary<string, string[]> commands = HelperFunctions.CommandAndParameterParser("moveto 200, 200");
+            CommandAndParameterParserResult commands = HelperFunctions.CommandAndParameterParser("moveto 200, 200");
-            Assert.AreEqual("moveto", commands["command"][0]);
+            Assert.AreEqual("moveto", commands.GetCommand());
-            Assert.AreEqual("200", commands["parameters"][0]);
+            Assert.AreEqual("200", commands.GetParameters()[0]);
-            Assert.AreEqual("200", commands["parameters"][1]);
+            Assert.AreEqual("200", commands.GetParameters()[1]);
         }
 
         /// <summary>
-        /// Manual <see cref="SettingsAndHelperFunctions.CommandAndParameterParser(string)"/> test.
+        /// Manual <see cref="HelperFunctions.CommandAndParameterParser(string)"/> test.
         /// </summary>
         [TestMethod]
         public void CommandAndParameterParser_Manual2() {
-            Dictionary<string, string[]> commands = HelperFunctions.CommandAndParameterParser("clear");
+            CommandAndParameterParserResult commands = HelperFunctions.CommandAndParameterParser("clear");
-            Assert.AreEqual("clear", commands["command"][0]);
+            Assert.AreEqual("clear", commands.GetCommand());
-            Assert.IsFalse(commands.Keys.Contains("parameters"));
+            Assert.IsTrue(commands.GetParameters() == null);
         }
 
         /// <summary>
-        /// Manual <see cref="SettingsAndHelperFunctions.CommandAndParameterParser(string)"/> test.
+        /// Manual <see cref="HelperFunctions.CommandAndParameterParser(string)"/> test.
         /// </summary>
         [TestMethod]
         public void CommandAndParameterParser_Manual3() {
-            Dictionary<string, string[]> commands = HelperFunctions.CommandAndParameterParser("");
+            CommandAndParameterParserResult commands = HelperFunctions.CommandAndParameterParser("");
-            Assert.IsFalse(commands.Keys.Contains("command"));
+            Assert.IsTrue(commands == null);
-            Assert.IsFalse(commands.Keys.Contains("parameters"));
         }
 
         /// <summary>
-        /// Manual <see cref="SettingsAndHelperFunctions.CommandAndParameterParser(string)"/> test.
+        /// Manual <see cref="HelperFunctions.CommandAndParameterParser(string)"/> test.
         /// </summary>
         [TestMethod]
         public void CommandAndParameterParser_Manual4() {
-            Dictionary<string, string[]> commands = HelperFunctions.CommandAndParameterParser("    genericCommand    2, 3,4 5");
+            CommandAndParameterParserResult commands = HelperFunctions.CommandAndParameterParser("    genericCommand    2, 3,4 5");
 
-            Assert.AreEqual("genericCommand", commands["command"][0]);
+            Assert.AreEqual("genericCommand", commands.GetCommand());
-            Assert.AreEqual("2", commands["parameters"][0]);
+
-            Assert.AreEqual("3", commands["parameters"][1]);
+            string[] parameters = commands.GetParameters();
-            Assert.AreEqual("4 5", commands["parameters"][2]);
+
+            Assert.AreEqual("2", parameters[0]);
+            Assert.AreEqual("3", parameters[1]);
+            Assert.AreEqual("4 5", parameters[2]);
         }
 
         private string RandomSpaces() {
@@ -136,7 +138,7 @@ namespace Advanced_Software_Engineering_Tests {
         }
 
         /// <summary>
-        /// Random <see cref="SettingsAndHelperFunctions.CommandAndParameterParser(string)"/> test.
+        /// Random <see cref="HelperFunctions.CommandAndParameterParser(string)"/> test.
         /// </summary>
         [TestMethod]
         public void CommandAndParameterParser_Random1() {
@@ -153,13 +155,13 @@ namespace Advanced_Software_Engineering_Tests {
                     input += RandomSpaces() + parameter + RandomSpaces() + "," + RandomSpaces();
                 }
 
-                Dictionary<string, string[]> commands = HelperFunctions.CommandAndParameterParser(input);
+                CommandAndParameterParserResult commands = HelperFunctions.CommandAndParameterParser(input);
 
-                Assert.AreEqual(command, commands["command"][0]);
+                Assert.AreEqual(command, commands.GetCommand());
 
                 int i = 0;
                 foreach (string expected in parameters) {
-                    Assert.AreEqual(expected, commands["parameters"][i++]);
+                    Assert.AreEqual(expected, commands.GetParameters()[i++]);
                 }
             }
         }