diff --git a/Advanced Software Engineering/Advanced Software Engineering Tests/Advanced Software Engineering Tests.csproj b/Advanced Software Engineering/Advanced Software Engineering Tests/Advanced Software Engineering Tests.csproj index 1711911..91a2fe8 100644 --- a/Advanced Software Engineering/Advanced Software Engineering Tests/Advanced Software Engineering Tests.csproj +++ b/Advanced Software Engineering/Advanced Software Engineering Tests/Advanced Software Engineering Tests.csproj @@ -1,10 +1,12 @@ - + netcoreapp3.1 Advanced_Software_Engineering_Tests false + + WinExe @@ -12,10 +14,26 @@ + + + + True + True + Resources.resx + + + + + + ResXFileCodeGenerator + Resources.Designer.cs + + + diff --git a/Advanced Software Engineering/Advanced Software Engineering Tests/Properties/Resources.Designer.cs b/Advanced Software Engineering/Advanced Software Engineering Tests/Properties/Resources.Designer.cs new file mode 100644 index 0000000..34505fc --- /dev/null +++ b/Advanced Software Engineering/Advanced Software Engineering Tests/Properties/Resources.Designer.cs @@ -0,0 +1,63 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace Advanced_Software_Engineering_Tests.Properties { + using System; + + + /// + /// A strongly-typed resource class, for looking up localized strings, etc. + /// + // This class was auto-generated by the StronglyTypedResourceBuilder + // class via a tool like ResGen or Visual Studio. + // To add or remove a member, edit your .ResX file then rerun ResGen + // with the /str option, or rebuild your VS project. + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + internal class Resources { + + private static global::System.Resources.ResourceManager resourceMan; + + private static global::System.Globalization.CultureInfo resourceCulture; + + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] + internal Resources() { + } + + /// + /// Returns the cached ResourceManager instance used by this class. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Resources.ResourceManager ResourceManager { + get { + if (object.ReferenceEquals(resourceMan, null)) { + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Advanced_Software_Engineering_Tests.Properties.Resources", typeof(Resources).Assembly); + resourceMan = temp; + } + return resourceMan; + } + } + + /// + /// Overrides the current thread's CurrentUICulture property for all + /// resource lookups using this strongly typed resource class. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Globalization.CultureInfo Culture { + get { + return resourceCulture; + } + set { + resourceCulture = value; + } + } + } +} diff --git a/Advanced Software Engineering/Advanced Software Engineering Tests/Properties/Resources.resx b/Advanced Software Engineering/Advanced Software Engineering Tests/Properties/Resources.resx new file mode 100644 index 0000000..4fdb1b6 --- /dev/null +++ b/Advanced Software Engineering/Advanced Software Engineering Tests/Properties/Resources.resx @@ -0,0 +1,101 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 1.3 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/Advanced Software Engineering/Advanced Software Engineering Tests/SettingsAndHelperFunctionsTester.cs b/Advanced Software Engineering/Advanced Software Engineering Tests/SettingsAndHelperFunctionsTester.cs index e5fe4c4..788f0f8 100644 --- a/Advanced Software Engineering/Advanced Software Engineering Tests/SettingsAndHelperFunctionsTester.cs +++ b/Advanced Software Engineering/Advanced Software Engineering Tests/SettingsAndHelperFunctionsTester.cs @@ -12,7 +12,7 @@ namespace Advanced_Software_Engineering_Tests { Random rand = new Random(); [TestMethod] - public void TestStrip_Random1() { + public void Strip_Random1() { for (int test = 0; test < 200; test++) { int until = rand.Next(50); @@ -32,7 +32,7 @@ namespace Advanced_Software_Engineering_Tests { } [TestMethod] - public void TestStrip_Manual1() { + public void Strip_Manual1() { string input = " a simple sentence surrounded by spaces "; string expected = "a simple sentence surrounded by spaces"; @@ -40,7 +40,7 @@ namespace Advanced_Software_Engineering_Tests { } [TestMethod] - public void TestStrip_Manual2() { + public void Strip_Manual2() { string input = " a simple sentence surrounded by spaces "; string expected = "a simple sentence surrounded by spaces"; diff --git a/Advanced Software Engineering/Advanced Software Engineering/Command.cs b/Advanced Software Engineering/Advanced Software Engineering/Command.cs index cf5708d..8304969 100644 --- a/Advanced Software Engineering/Advanced Software Engineering/Command.cs +++ b/Advanced Software Engineering/Advanced Software Engineering/Command.cs @@ -84,7 +84,7 @@ namespace Advanced_Software_Engineering { string GetDescription(); } - class MoveTo : Verb { + public class MoveTo : Verb { protected Drawer drawer; protected Point moveToPoint; @@ -109,7 +109,7 @@ namespace Advanced_Software_Engineering { } - class DrawTo : Verb { + public class DrawTo : Verb { protected Drawer drawer; protected Point moveToPoint; diff --git a/Advanced Software Engineering/Advanced Software Engineering/Commander.cs b/Advanced Software Engineering/Advanced Software Engineering/Commander.cs index 8ff78fd..9bc4c08 100644 --- a/Advanced Software Engineering/Advanced Software Engineering/Commander.cs +++ b/Advanced Software Engineering/Advanced Software Engineering/Commander.cs @@ -3,10 +3,9 @@ using System.Collections.Generic; using System.Drawing; using System.Drawing.Drawing2D; using System.Linq; -using System.Windows.Forms; namespace Advanced_Software_Engineering { - class Commander { + public class Commander { Graphics graphics; List commands = new List(); @@ -28,6 +27,10 @@ namespace Advanced_Software_Engineering { drawer.ResetDrawer(); } + public Commander(string command) { + Console.WriteLine("Warning! No graphics context!!!"); + } + public Commander(Graphics graphics, string rawCommands) { this.graphics = graphics; this.drawer = new Drawer(this.graphics); @@ -61,14 +64,19 @@ namespace Advanced_Software_Engineering { Console.WriteLine(verb.GetDescription()); } } catch (Exception e) { + Console.WriteLine("Error: Unknown error."); - new ErrorWindow( - "Unexpected error parsing commands", - "The program phraser has encountered an undexpected error." + Environment.NewLine, - e.Message + Environment.NewLine + e.StackTrace, - ErrorWindow.ERROR_MESSAGE - ).Show(); - + try { + new ErrorWindow( + "Unexpected error parsing commands", + "The program phraser has encountered an undexpected error." + Environment.NewLine, + e.Message + Environment.NewLine + e.StackTrace, + ErrorWindow.ERROR_MESSAGE + ).Show(); + } + catch(Exception windowError) { + Console.WriteLine("Failed to display error window!"); + } RemoveAllCommands(); } } @@ -87,9 +95,17 @@ namespace Advanced_Software_Engineering { drawer.ResetDrawer(); } + public string ExplainCommands() { + string desc = ""; + foreach(Verb command in commands) { + desc += command.GetDescription() + Environment.NewLine; + } + return desc; + } + } - class Drawer { + public class Drawer { protected static Color defaultColor = Color.Black; protected static float defaultWidth = 1f; protected bool fill = false;