From 00f4974d435fb747a64bb0194f1649ee446f1c24 Mon Sep 17 00:00:00 2001 From: Si Carter Date: Sat, 23 Dec 2023 09:14:56 +1100 Subject: [PATCH] Updates from CA and SonarCloud --- .../Analyzers/AnalyzeM605PlaySounds.cs | 2 +- .../Analyzers/AnalyzeM62XComPorts.cs | 2 +- .../Analyzers/AnalyzeM630RunProgram.cs | 2 +- .../Analyzers/AnalyzeM630_1RunParameters.cs | 2 +- .../Analyzers/AnalyzeM631_1RunParameters.cs | 2 +- src/GCAAnalyser/Analyzers/AnalyzeVariables.cs | 6 ++-- src/GCAAnalyser/Analyzers/BaseAnalyzer.cs | 2 +- src/GCAAnalyser/GCodeAnalyses.cs | 16 +++++----- src/GCAAnalyser/GCodeCommand.cs | 2 +- src/GCAAnalyser/GCodeLine.cs | 2 +- src/GCAAnalyser/Internal/GCodeParser.cs | 2 +- src/GCATests/GCService/JobProfileApiTests.cs | 32 +++++++++++-------- src/GCATests/GCService/MachineApiTests.cs | 26 ++++++++------- .../GCService/ProcessorMediatorTests.cs | 10 +++--- src/GCATests/GCService/ToolProfileApiTests.cs | 2 +- src/GCATests/GSendApi/JobExecutionTests.cs | 15 +++++---- src/GCATests/GSendApi/JobProfileApiTests.cs | 28 ++++++++-------- src/GCATests/GSendApi/MachineApiTests.cs | 22 ++++++------- src/GCATests/GSendApi/ToolProfileApiTests.cs | 2 +- src/GCATests/GSendTests.csproj | 8 +++++ .../OverrideTests/SpindleStartStopTests.cs | 4 +-- src/GCSDesktop/Internal/GSendContext.cs | 2 +- .../Controllers/ServiceHistoryController.cs | 2 +- src/GSendCS/Program.cs | 8 ++--- src/GSendCommon/ComPortFactory.cs | 2 +- .../MCodeOverrides/M631Override.cs | 2 +- src/GSendCommon/ProcessorMediator.cs | 7 +++- 27 files changed, 116 insertions(+), 96 deletions(-) diff --git a/src/GCAAnalyser/Analyzers/AnalyzeM605PlaySounds.cs b/src/GCAAnalyser/Analyzers/AnalyzeM605PlaySounds.cs index 99f5c8bc..9485fe46 100644 --- a/src/GCAAnalyser/Analyzers/AnalyzeM605PlaySounds.cs +++ b/src/GCAAnalyser/Analyzers/AnalyzeM605PlaySounds.cs @@ -19,7 +19,7 @@ public void Analyze(string fileName, IGCodeAnalyses gCodeAnalyses) if (!gCodeAnalyses.AnalysesOptions.HasFlag(AnalysesOptions.PlaySound)) codeAnalyses.AddOptions(AnalysesOptions.PlaySound); - List lineNumbers = new(); + List lineNumbers = []; foreach (IGCodeCommand command in m605Commands) { diff --git a/src/GCAAnalyser/Analyzers/AnalyzeM62XComPorts.cs b/src/GCAAnalyser/Analyzers/AnalyzeM62XComPorts.cs index 524b05aa..f7e894a0 100644 --- a/src/GCAAnalyser/Analyzers/AnalyzeM62XComPorts.cs +++ b/src/GCAAnalyser/Analyzers/AnalyzeM62XComPorts.cs @@ -30,7 +30,7 @@ public void Analyze(string fileName, IGCodeAnalyses gCodeAnalyses) if (gCodeAnalyses is GCodeAnalyses codeAnalyses) { - Dictionary comPortUsage = new(); + Dictionary comPortUsage = []; foreach (IGCodeCommand command in comPortCommands) { diff --git a/src/GCAAnalyser/Analyzers/AnalyzeM630RunProgram.cs b/src/GCAAnalyser/Analyzers/AnalyzeM630RunProgram.cs index d3412205..189c61f4 100644 --- a/src/GCAAnalyser/Analyzers/AnalyzeM630RunProgram.cs +++ b/src/GCAAnalyser/Analyzers/AnalyzeM630RunProgram.cs @@ -19,7 +19,7 @@ public void Analyze(string fileName, IGCodeAnalyses gCodeAnalyses) if (!gCodeAnalyses.AnalysesOptions.HasFlag(AnalysesOptions.RunProgram)) codeAnalyses.AddOptions(AnalysesOptions.RunProgram); - List lineNumbers = new(); + List lineNumbers = []; foreach (IGCodeCommand command in m630Commands) { diff --git a/src/GCAAnalyser/Analyzers/AnalyzeM630_1RunParameters.cs b/src/GCAAnalyser/Analyzers/AnalyzeM630_1RunParameters.cs index 4c269ec4..db2eacd3 100644 --- a/src/GCAAnalyser/Analyzers/AnalyzeM630_1RunParameters.cs +++ b/src/GCAAnalyser/Analyzers/AnalyzeM630_1RunParameters.cs @@ -16,7 +16,7 @@ public void Analyze(string fileName, IGCodeAnalyses gCodeAnalyses) if (mCommands.Count > 0 && gCodeAnalyses is GCodeAnalyses codeAnalyses) { - List lineNumbers = new(); + List lineNumbers = []; foreach (IGCodeCommand command in mCommands) { diff --git a/src/GCAAnalyser/Analyzers/AnalyzeM631_1RunParameters.cs b/src/GCAAnalyser/Analyzers/AnalyzeM631_1RunParameters.cs index ddf88308..33661a0f 100644 --- a/src/GCAAnalyser/Analyzers/AnalyzeM631_1RunParameters.cs +++ b/src/GCAAnalyser/Analyzers/AnalyzeM631_1RunParameters.cs @@ -16,7 +16,7 @@ public void Analyze(string fileName, IGCodeAnalyses gCodeAnalyses) if (mCommands.Count > 0 && gCodeAnalyses is GCodeAnalyses codeAnalyses) { - List lineNumbers = new(); + List lineNumbers = []; foreach (IGCodeCommand command in mCommands) { diff --git a/src/GCAAnalyser/Analyzers/AnalyzeVariables.cs b/src/GCAAnalyser/Analyzers/AnalyzeVariables.cs index 5e050fae..9459b052 100644 --- a/src/GCAAnalyser/Analyzers/AnalyzeVariables.cs +++ b/src/GCAAnalyser/Analyzers/AnalyzeVariables.cs @@ -18,10 +18,10 @@ public void Analyze(string fileName, IGCodeAnalyses gCodeAnalyses) { if (gCodeAnalyses is GCodeAnalyses codeAnalyses) { - Dictionary subprogramVariableDeclarations = new(); - Dictionary declaredVariables = new(); + Dictionary subprogramVariableDeclarations = []; + Dictionary declaredVariables = []; List subprograms = gCodeAnalyses.Commands.Where(c => c.Command.Equals('O')).ToList(); - List subprogramVariables = new(); + List subprogramVariables = []; foreach (IGCodeCommand subProgram in subprograms) { diff --git a/src/GCAAnalyser/Analyzers/BaseAnalyzer.cs b/src/GCAAnalyser/Analyzers/BaseAnalyzer.cs index 6d3455f9..8350366a 100644 --- a/src/GCAAnalyser/Analyzers/BaseAnalyzer.cs +++ b/src/GCAAnalyser/Analyzers/BaseAnalyzer.cs @@ -15,7 +15,7 @@ protected static List CommandsOnSameLine(IGCodeCommand command) { ArgumentNullException.ThrowIfNull(command); - List Result = new(); + List Result = []; LookPrevious(command, Result); LookNext(command, Result); diff --git a/src/GCAAnalyser/GCodeAnalyses.cs b/src/GCAAnalyser/GCodeAnalyses.cs index e836c223..84f0096d 100644 --- a/src/GCAAnalyser/GCodeAnalyses.cs +++ b/src/GCAAnalyser/GCodeAnalyses.cs @@ -15,13 +15,13 @@ namespace GSendAnalyzer internal class GCodeAnalyses : IGCodeAnalyses { private readonly object _lockObject = new(); - private readonly List _commands = new(); + private readonly List _commands = []; private List _allCommands; - private readonly Dictionary> _allSpecificCommands = new(); + private readonly Dictionary> _allSpecificCommands = []; private readonly IPluginClassesService _pluginClassesService; - private readonly Dictionary _variables = new(); - private readonly List _errors = new(); - private readonly List _warnings = new(); + private readonly Dictionary _variables = []; + private readonly List _errors = []; + private readonly List _warnings = []; public GCodeAnalyses(IPluginClassesService pluginClassesService) { @@ -92,7 +92,7 @@ public IReadOnlyList AllCommands { if (_allCommands == null) { - List Result = new(); + List Result = []; int lineNumber = 0; RecursivelyRetrieveAllCommands(Result, _commands, ref lineNumber, 0); @@ -197,7 +197,7 @@ private void RecursivelyRetrieveAllCommands(List Result, IReadOnl public List Lines(out int lineCount) { - List Result = new(); + List Result = []; lineCount = 0; GCodeLine currentLine = null; @@ -219,7 +219,7 @@ public List Lines(out int lineCount) public List AllLines(out int lineCount) { - List Result = new(); + List Result = []; lineCount = 0; GCodeLine currentLine = null; diff --git a/src/GCAAnalyser/GCodeCommand.cs b/src/GCAAnalyser/GCodeCommand.cs index 4c1bb640..0c2fd57a 100644 --- a/src/GCAAnalyser/GCodeCommand.cs +++ b/src/GCAAnalyser/GCodeCommand.cs @@ -43,7 +43,7 @@ public GCodeCommand(int index, char currentCommand, decimal commandValue, string CommandValue = commandValue; CommandValueString = commandValueString; Comment = comment ?? String.Empty; - VariableBlocks = variables ?? new(); + VariableBlocks = variables ?? []; _currentCodeValues = currentValues ?? throw new ArgumentNullException(nameof(currentValues)); Attributes = currentValues.Attributes; LineNumber = lineNumber; diff --git a/src/GCAAnalyser/GCodeLine.cs b/src/GCAAnalyser/GCodeLine.cs index f68e9d63..0448fd4c 100644 --- a/src/GCAAnalyser/GCodeLine.cs +++ b/src/GCAAnalyser/GCodeLine.cs @@ -30,7 +30,7 @@ public GCodeLine(IGCodeAnalyses gCodeAnalyses, IGCodeCommand command) public LineStatus Status { get; set; } - public List Commands { get; } = new(); + public List Commands { get; } = []; public int LineNumber { get; } diff --git a/src/GCAAnalyser/Internal/GCodeParser.cs b/src/GCAAnalyser/Internal/GCodeParser.cs index 448fecc7..fec24a08 100644 --- a/src/GCAAnalyser/Internal/GCodeParser.cs +++ b/src/GCAAnalyser/Internal/GCodeParser.cs @@ -363,7 +363,7 @@ private GCodeCommand UpdateGCodeValue(GCodeAnalyses analysis, GCodeCommand lastC int lineNumber, int recursionDepth, ref GCodeCommand result, char currentCommand, StringBuilder comment) { string lineValue = lineValues.ToString().Trim(); - List variables = new(); + List variables = []; bool commandValueConvert = Decimal.TryParse(lineValue, out decimal commandValue); if (!commandValueConvert) diff --git a/src/GCATests/GCService/JobProfileApiTests.cs b/src/GCATests/GCService/JobProfileApiTests.cs index d424c137..f5a3d445 100644 --- a/src/GCATests/GCService/JobProfileApiTests.cs +++ b/src/GCATests/GCService/JobProfileApiTests.cs @@ -15,6 +15,8 @@ using static GSendShared.Constants; +#pragma warning disable CA1861 + namespace GSendTests.GCService { [TestClass] @@ -24,7 +26,7 @@ public class JobProfileApiTests [ExcludeFromCodeCoverage] public void JobProfilesGet_RetrievesAllJobProfiles_Success() { - MockGSendDataProvider gSendDataProvider = new(new string[] { "ProverXL", "3018" }); + MockGSendDataProvider gSendDataProvider = new(["ProverXL", "3018"]); gSendDataProvider.JobProfiles.Add(new JobProfileModel(1) { Name = "Profile 1", Description = "test 1" }); gSendDataProvider.JobProfiles.Add(new JobProfileModel(325) { Name = "Profile 2", Description = "test 2" }); gSendDataProvider.JobProfiles.Add(new JobProfileModel(9865433) { Name = "Profile 3", Description = "test 3" }); @@ -63,7 +65,7 @@ public void JobProfilesGet_RetrievesAllJobProfiles_Success() [TestMethod] public void JobProfileAdd_NullParameter_Returns_JsonErrorResponse() { - IGSendDataProvider gSendDataProvider = new MockGSendDataProvider(new string[] { "ProverXL", "3018" }); + IGSendDataProvider gSendDataProvider = new MockGSendDataProvider(["ProverXL", "3018"]); JobProfileApi sut = new(gSendDataProvider, new MockNotification()); ActionResult Result = sut.JobProfileAdd(null) as ActionResult; Assert.IsNotNull(Result); @@ -81,7 +83,7 @@ public void JobProfileAdd_NullParameter_Returns_JsonErrorResponse() [TestMethod] public void JobProfileAdd_NullName_Returns_JsonErrorResponse() { - IGSendDataProvider gSendDataProvider = new MockGSendDataProvider(new string[] { "ProverXL", "3018" }); + IGSendDataProvider gSendDataProvider = new MockGSendDataProvider(["ProverXL", "3018"]); JobProfileApi sut = new(gSendDataProvider, new MockNotification()); ActionResult Result = sut.JobProfileAdd(new JobProfileModel(1) { Description = "a desc" }) as ActionResult; Assert.IsNotNull(Result); @@ -99,7 +101,7 @@ public void JobProfileAdd_NullName_Returns_JsonErrorResponse() [TestMethod] public void JobProfileAdd_NullDescription_Returns_JsonErrorResponse() { - IGSendDataProvider gSendDataProvider = new MockGSendDataProvider(new string[] { "ProverXL", "3018" }); + IGSendDataProvider gSendDataProvider = new MockGSendDataProvider(["ProverXL", "3018"]); JobProfileApi sut = new(gSendDataProvider, new MockNotification()); ActionResult Result = sut.JobProfileAdd(new JobProfileModel(1) { Name = "a test" }) as ActionResult; Assert.IsNotNull(Result); @@ -118,7 +120,7 @@ public void JobProfileAdd_NullDescription_Returns_JsonErrorResponse() public void JobProfileAdd_ValidModel_Returns_JsonResponse() { MockNotification notification = new(); - IGSendDataProvider gSendDataProvider = new MockGSendDataProvider(new string[] { "ProverXL", "3018" }); + IGSendDataProvider gSendDataProvider = new MockGSendDataProvider(["ProverXL", "3018"]); JobProfileApi sut = new(gSendDataProvider, notification); ActionResult Result = sut.JobProfileAdd(new JobProfileModel(1) { Name = "a test", Description = "a test" }) as ActionResult; Assert.IsNotNull(Result); @@ -140,7 +142,7 @@ public void JobProfileAdd_ValidModel_Returns_JsonResponse() public void JobProfileAdd_InvalidModel_DuplicateName_Returns_JsonResponse() { MockNotification notification = new(); - IGSendDataProvider gSendDataProvider = new MockGSendDataProvider(new string[] { "ProverXL", "3018" }); + IGSendDataProvider gSendDataProvider = new MockGSendDataProvider(["ProverXL", "3018"]); JobProfileApi sut = new(gSendDataProvider, notification); ActionResult Result = sut.JobProfileAdd(new JobProfileModel(0) { Name = "a test", Description = "a test" }) as ActionResult; Assert.IsNotNull(Result); @@ -174,7 +176,7 @@ public void JobProfileAdd_InvalidModel_DuplicateName_Returns_JsonResponse() public void JobProfileDelete_InvalidItemNotFound_ReturnsJsonErrorResponse() { MockNotification notification = new(); - IGSendDataProvider gSendDataProvider = new MockGSendDataProvider(new string[] { "ProverXL", "3018" }); + IGSendDataProvider gSendDataProvider = new MockGSendDataProvider(["ProverXL", "3018"]); JobProfileApi sut = new(gSendDataProvider, notification); ActionResult Result = sut.JobProfileDelete(111) as ActionResult; Assert.IsNotNull(Result); @@ -195,7 +197,7 @@ public void JobProfileDelete_InvalidItemNotFound_ReturnsJsonErrorResponse() public void JobProfileDelete_ValidModel_LastRemainingJobProfile_Returns_JsonErrorResponse() { MockNotification notification = new(); - IGSendDataProvider gSendDataProvider = new MockGSendDataProvider(new string[] { "ProverXL", "3018" }); + IGSendDataProvider gSendDataProvider = new MockGSendDataProvider(["ProverXL", "3018"]); JobProfileApi sut = new(gSendDataProvider, notification); ActionResult Result = sut.JobProfileAdd(new JobProfileModel(1) { Name = "a test", Description = "a test" }) as ActionResult; Assert.IsNotNull(Result); @@ -226,7 +228,7 @@ public void JobProfileDelete_ValidModel_LastRemainingJobProfile_Returns_JsonErro public void JobProfileDelete_ValidModel_ItemCanBeDeleted_Returns_JsonSuccessResponse() { MockNotification notification = new(); - MockGSendDataProvider gSendDataProvider = new(new string[] { "ProverXL", "3018" }); + MockGSendDataProvider gSendDataProvider = new(["ProverXL", "3018"]); JobProfileApi sut = new(gSendDataProvider, notification); ActionResult Result = sut.JobProfileAdd(new JobProfileModel(-1) { Name = "a test", Description = "a test" }) as ActionResult; Assert.IsNotNull(Result); @@ -257,7 +259,7 @@ public void JobProfileDelete_ValidModel_ItemCanBeDeleted_Returns_JsonSuccessResp public void JobProfileUpdate_InvalidModel_Null_Returns_JsonErrorResponse() { MockNotification notification = new(); - MockGSendDataProvider gSendDataProvider = new(new string[] { "ProverXL", "3018" }); + MockGSendDataProvider gSendDataProvider = new(["ProverXL", "3018"]); JobProfileApi sut = new(gSendDataProvider, notification); ActionResult Result = sut.JobProfileAdd(new JobProfileModel(-1) { Name = "a test", Description = "a test" }) as ActionResult; Assert.IsNotNull(Result); @@ -284,7 +286,7 @@ public void JobProfileUpdate_InvalidModel_Null_Returns_JsonErrorResponse() public void JobProfileUpdate_InvalidModel_NameNull_Returns_JsonErrorResponse() { MockNotification notification = new(); - MockGSendDataProvider gSendDataProvider = new(new string[] { "ProverXL", "3018" }); + MockGSendDataProvider gSendDataProvider = new(["ProverXL", "3018"]); JobProfileApi sut = new(gSendDataProvider, notification); IActionResult result = sut.JobProfileUpdate(new JobProfileModel(0)); @@ -309,7 +311,7 @@ public void JobProfileUpdate_InvalidModel_NameNull_Returns_JsonErrorResponse() public void JobProfileUpdate_InvalidModel_DescriptionNull_Returns_JsonErrorResponse() { MockNotification notification = new(); - MockGSendDataProvider gSendDataProvider = new(new string[] { "ProverXL", "3018" }); + MockGSendDataProvider gSendDataProvider = new(["ProverXL", "3018"]); JobProfileApi sut = new(gSendDataProvider, notification); IActionResult result = sut.JobProfileUpdate(new JobProfileModel(0) { Name = "name" }); @@ -334,7 +336,7 @@ public void JobProfileUpdate_InvalidModel_DescriptionNull_Returns_JsonErrorRespo public void JobProfileUpdate_InvalidModel_NotFound_Returns_JsonErrorResponse() { MockNotification notification = new(); - MockGSendDataProvider gSendDataProvider = new(new string[] { "ProverXL", "3018" }); + MockGSendDataProvider gSendDataProvider = new(["ProverXL", "3018"]); JobProfileApi sut = new(gSendDataProvider, notification); IActionResult result = sut.JobProfileUpdate(new JobProfileModel(245) { Name = "name", Description = "desc" }); @@ -358,7 +360,7 @@ public void JobProfileUpdate_InvalidModel_NotFound_Returns_JsonErrorResponse() [TestMethod] public void JobProfileUpdate_ValidModel_ItemCanBeUpdated_Returns_JsonSuccessResponse() { - MockGSendDataProvider gSendDataProvider = new(new string[] { "ProverXL", "3018" }); + MockGSendDataProvider gSendDataProvider = new(["ProverXL", "3018"]); gSendDataProvider.JobProfiles.Add(new JobProfileModel(1) { Name = "Profile 1", Description = "test 1" }); gSendDataProvider.JobProfiles.Add(new JobProfileModel(325) { Name = "Profile 2", Description = "test 2" }); gSendDataProvider.JobProfiles.Add(new JobProfileModel(9865433) { Name = "Profile 3", Description = "test 3" }); @@ -412,3 +414,5 @@ public void JobProfileUpdate_ValidModel_ItemCanBeUpdated_Returns_JsonSuccessResp } } } + +#pragma warning restore CA1861 \ No newline at end of file diff --git a/src/GCATests/GCService/MachineApiTests.cs b/src/GCATests/GCService/MachineApiTests.cs index 8bb7385d..b062000a 100644 --- a/src/GCATests/GCService/MachineApiTests.cs +++ b/src/GCATests/GCService/MachineApiTests.cs @@ -16,6 +16,8 @@ using static GSendShared.Constants; +#pragma warning disable CA1861 + namespace GSendTests.GCService { [TestClass] @@ -42,7 +44,7 @@ public void Construct_ValidInstance_Success() [TestMethod] public void MachinesGet_RetrievesAllListedMachines_Success() { - IGSendDataProvider gSendDataProvider = new MockGSendDataProvider(new string[] { "ProverXL", "3018" }); + IGSendDataProvider gSendDataProvider = new MockGSendDataProvider(["ProverXL", "3018"]); MachineApi sut = new(gSendDataProvider, new MockComPortProvider(), new MockSettingsProvider(), new MockNotification()); IActionResult result = sut.MachinesGet(); @@ -76,7 +78,7 @@ public void MachinesGet_RetrievesAllListedMachines_Success() [TestMethod] public void MachinesAdd_NullParameter_Returns_JsonErrorResponse() { - IGSendDataProvider gSendDataProvider = new MockGSendDataProvider(new string[] { "ProverXL", "3018" }); + IGSendDataProvider gSendDataProvider = new MockGSendDataProvider(["ProverXL", "3018"]); MachineApi sut = new(gSendDataProvider, new MockComPortProvider(), new MockSettingsProvider(), new MockNotification()); ActionResult Result = sut.MachineAdd(null) as ActionResult; Assert.IsNotNull(Result); @@ -94,7 +96,7 @@ public void MachinesAdd_NullParameter_Returns_JsonErrorResponse() [TestMethod] public void MachinesAdd_NameMissing_Returns_JsonErrorResponse() { - IGSendDataProvider gSendDataProvider = new MockGSendDataProvider(new string[] { "ProverXL", "3018" }); + IGSendDataProvider gSendDataProvider = new MockGSendDataProvider(["ProverXL", "3018"]); MachineApi sut = new(gSendDataProvider, new MockComPortProvider(), new MockSettingsProvider(), new MockNotification()); MachineModel model = new(); @@ -115,7 +117,7 @@ public void MachinesAdd_NameMissing_Returns_JsonErrorResponse() [TestMethod] public void MachinesAdd_NameIsDuplicate_Returns_JsonErrorResponse() { - IGSendDataProvider gSendDataProvider = new MockGSendDataProvider(new string[] { "ProverXL", "3018" }); + IGSendDataProvider gSendDataProvider = new MockGSendDataProvider(["ProverXL", "3018"]); MachineApi sut = new(gSendDataProvider, new MockComPortProvider(), new MockSettingsProvider(), new MockNotification()); MachineModel model = new() @@ -141,7 +143,7 @@ public void MachinesAdd_NameIsDuplicate_Returns_JsonErrorResponse() [TestMethod] public void MachinesAdd_InvalidMachineType_Returns_JsonErrorResponse() { - IGSendDataProvider gSendDataProvider = new MockGSendDataProvider(new string[] { "ProverXL", "3018" }); + IGSendDataProvider gSendDataProvider = new MockGSendDataProvider(["ProverXL", "3018"]); MachineApi sut = new(gSendDataProvider, new MockComPortProvider(), new MockSettingsProvider(), new MockNotification()); MachineModel model = new() @@ -166,7 +168,7 @@ public void MachinesAdd_InvalidMachineType_Returns_JsonErrorResponse() [TestMethod] public void MachinesAdd_DuplicateComPort_Returns_JsonErrorResponse() { - IGSendDataProvider gSendDataProvider = new MockGSendDataProvider(new string[] { "ProverXL", "3018" }); + IGSendDataProvider gSendDataProvider = new MockGSendDataProvider(["ProverXL", "3018"]); MachineApi sut = new(gSendDataProvider, new MockComPortProvider(new byte[] { 2 }), new MockSettingsProvider(), new MockNotification()); MachineModel model = new() @@ -192,7 +194,7 @@ public void MachinesAdd_DuplicateComPort_Returns_JsonErrorResponse() [TestMethod] public void MachinesAdd_ComPortNotFound_Returns_JsonErrorResponse() { - IGSendDataProvider gSendDataProvider = new MockGSendDataProvider(new string[] { "ProverXL", "3018" }); + IGSendDataProvider gSendDataProvider = new MockGSendDataProvider(["ProverXL", "3018"]); MachineApi sut = new(gSendDataProvider, new MockComPortProvider(), new MockSettingsProvider(), new MockNotification()); MachineModel model = new() @@ -219,7 +221,7 @@ public void MachinesAdd_ComPortNotFound_Returns_JsonErrorResponse() public void MachinesAdd_ValidNewDetails_Returns_JsonSuccessResponse() { MockNotification notification = new(); - IGSendDataProvider gSendDataProvider = new MockGSendDataProvider(new string[] { "ProverXL", "3018" }); + IGSendDataProvider gSendDataProvider = new MockGSendDataProvider(["ProverXL", "3018"]); MachineApi sut = new(gSendDataProvider, new MockComPortProvider(), new MockSettingsProvider(), notification); MachineModel model = new() @@ -247,7 +249,7 @@ public void MachinesAdd_ValidNewDetails_Returns_JsonSuccessResponse() [TestMethod] public void MachinesDelete_InvalidMachineNotFound_Returns_JsonErrorResponse() { - IGSendDataProvider gSendDataProvider = new MockGSendDataProvider(new string[] { "ProverXL", "3018" }); + IGSendDataProvider gSendDataProvider = new MockGSendDataProvider(["ProverXL", "3018"]); MachineApi sut = new(gSendDataProvider, new MockComPortProvider(), new MockSettingsProvider(), new MockNotification()); ActionResult Result = sut.MachineDelete(245) as ActionResult; @@ -267,7 +269,7 @@ public void MachinesDelete_InvalidMachineNotFound_Returns_JsonErrorResponse() public void MachinesDelete_ValidRequest_Returns_JsonSuccessResponse() { MockNotification notification = new(); - IGSendDataProvider gSendDataProvider = new MockGSendDataProvider(new string[] { "ProverXL", "3018" }); + IGSendDataProvider gSendDataProvider = new MockGSendDataProvider(["ProverXL", "3018"]); MachineApi sut = new(gSendDataProvider, new MockComPortProvider(), new MockSettingsProvider(), notification); ActionResult Result = sut.MachineDelete(1) as ActionResult; @@ -289,7 +291,7 @@ public void MachinesDelete_ValidRequest_Returns_JsonSuccessResponse() public void MachinesUpdate_ValidRequest_Returns_JsonSuccessResponse() { MockNotification notification = new(); - IGSendDataProvider gSendDataProvider = new MockGSendDataProvider(new string[] { "ProverXL", "3018" }); + IGSendDataProvider gSendDataProvider = new MockGSendDataProvider(["ProverXL", "3018"]); MachineApi sut = new(gSendDataProvider, new MockComPortProvider(new byte[] { 3 }), new MockSettingsProvider(), notification); MachineModel machineToUpdate = JsonSerializer.Deserialize(JsonSerializer.Serialize(gSendDataProvider.MachineGet(1)), @@ -312,3 +314,5 @@ public void MachinesUpdate_ValidRequest_Returns_JsonSuccessResponse() } } } + +#pragma warning restore CA1861 \ No newline at end of file diff --git a/src/GCATests/GCService/ProcessorMediatorTests.cs b/src/GCATests/GCService/ProcessorMediatorTests.cs index aefedcb2..61acc9ae 100644 --- a/src/GCATests/GCService/ProcessorMediatorTests.cs +++ b/src/GCATests/GCService/ProcessorMediatorTests.cs @@ -101,7 +101,7 @@ public void ExecuteAsync_StartsAllMachines_Success() public void OpenProcessors_OpensAndInitializesAllProcessors_Success() { ProcessorMediator sut = new(new MockServiceProvider(), new Logger(), - new MockGSendDataProvider(new string[] { "Machine 1", "Machine 2" }), + new MockGSendDataProvider(["Machine 1", "Machine 2"]), new MockComPortFactory(), new MockNotification(), new MockSettingsProvider(), new GCodeParserFactory(new MockPluginClassesService(), new MockSubprograms())); @@ -119,7 +119,7 @@ public void OpenProcessors_OpensAndInitializesAllProcessors_Success() public void CloseProcessors_ClosesAllProcessors_Success() { ProcessorMediator sut = new(new MockServiceProvider(), new Logger(), - new MockGSendDataProvider(new string[] { "Machine 1", "Machine 2" }), + new MockGSendDataProvider(["Machine 1", "Machine 2"]), new MockComPortFactory(), new MockNotification(), new MockSettingsProvider(), new GCodeParserFactory(new MockPluginClassesService(), new MockSubprograms())); @@ -142,7 +142,7 @@ public void CloseProcessors_ClosesAllProcessors_Success() public void EventRaised_NotRecognized_DoesNothing() { ProcessorMediator sut = new(new MockServiceProvider(), new Logger(), - new MockGSendDataProvider(new string[] { "Machine 1", "Machine 2" }), + new MockGSendDataProvider(["Machine 1", "Machine 2"]), new MockComPortFactory(), new MockNotification(), new MockSettingsProvider(), new GCodeParserFactory(new MockPluginClassesService(), new MockSubprograms())); @@ -175,7 +175,7 @@ public void EventRaised_NotRecognized_DoesNothing() public void EventRaised_MachineRemove_RemovesExistingMachine() { ProcessorMediator sut = new(new MockServiceProvider(), new Logger(), - new MockGSendDataProvider(new string[] { "Machine 1", "Machine 2" }), + new MockGSendDataProvider(["Machine 1", "Machine 2"]), new MockComPortFactory(), new MockNotification(), new MockSettingsProvider(), new GCodeParserFactory(new MockPluginClassesService(), new MockSubprograms())); @@ -197,7 +197,7 @@ public void EventRaised_MachineRemove_RemovesExistingMachine() [TestMethod] public void EventRaised_MachineUpdate_RemovesExistingMachineAndReAdds() { - MockGSendDataProvider gSendDataProvider = new(new string[] { "Machine 1", "Machine 2" }); + MockGSendDataProvider gSendDataProvider = new(["Machine 1", "Machine 2"]); ProcessorMediator sut = new(new MockServiceProvider(), new Logger(), gSendDataProvider, new MockComPortFactory(), new MockNotification(), new MockSettingsProvider(), new GCodeParserFactory(new MockPluginClassesService(), new MockSubprograms())); diff --git a/src/GCATests/GCService/ToolProfileApiTests.cs b/src/GCATests/GCService/ToolProfileApiTests.cs index bf6f0fe1..a1c35669 100644 --- a/src/GCATests/GCService/ToolProfileApiTests.cs +++ b/src/GCATests/GCService/ToolProfileApiTests.cs @@ -23,7 +23,7 @@ public class ToolProfileApiTests [TestMethod] public void ToolGet_ReturnsAllTools_Success() { - MockGSendDataProvider gSendDataProvider = new(new string[] { "ProverXL", "3018" }); + MockGSendDataProvider gSendDataProvider = new(["ProverXL", "3018"]); gSendDataProvider.ToolProfiles.Add(new ToolProfileModel() { Id = 1, Name = "Tool 1", Description = "Tool 1 Desc" }); gSendDataProvider.ToolProfiles.Add(new ToolProfileModel() { Id = 2, Name = "Tool 2", Description = "Tool 2 Desc" }); gSendDataProvider.ToolProfiles.Add(new ToolProfileModel() { Id = 3, Name = "Tool 3", Description = "Tool 3 Desc" }); diff --git a/src/GCATests/GSendApi/JobExecutionTests.cs b/src/GCATests/GSendApi/JobExecutionTests.cs index 2cc8586f..55effcfe 100644 --- a/src/GCATests/GSendApi/JobExecutionTests.cs +++ b/src/GCATests/GSendApi/JobExecutionTests.cs @@ -1,19 +1,18 @@ using System; -using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; -using System.Linq; -using System.Text; using System.Text.Json; -using System.Threading.Tasks; using GSendService.Api; + using GSendShared; -using GSendShared.Models; using GSendTests.Mocks; + using Microsoft.AspNetCore.Mvc; using Microsoft.VisualStudio.TestTools.UnitTesting; +#pragma warning disable CA1861 + namespace GSendTests.GSendApi { [ExcludeFromCodeCoverage] @@ -23,7 +22,7 @@ public class JobExecutionTests [TestMethod] public void CreateJobExecution_FailToCreateDBRecord_Returns_JsonErrorResponse() { - MockGSendDataProvider gSendDataProvider = new(new string[] { "ProverXL", "3018" }) + MockGSendDataProvider gSendDataProvider = new(["ProverXL", "3018"]) { CreateFalseResponseWhenCalled = true }; @@ -45,7 +44,7 @@ public void CreateJobExecution_FailToCreateDBRecord_Returns_JsonErrorResponse() [TestMethod] public void CreateJobExecution_DBRecordCreated_Returns_JsonSuccess() { - MockGSendDataProvider gSendDataProvider = new(new string[] { "ProverXL", "3018" }); + MockGSendDataProvider gSendDataProvider = new(["ProverXL", "3018"]); JobExecutionApi sut = new(gSendDataProvider, new MockNotification()); ActionResult Result = sut.CreateJobExecution(1, 2, 3) as ActionResult; @@ -66,3 +65,5 @@ public void CreateJobExecution_DBRecordCreated_Returns_JsonSuccess() } } } + +#pragma warning restore CA1861 \ No newline at end of file diff --git a/src/GCATests/GSendApi/JobProfileApiTests.cs b/src/GCATests/GSendApi/JobProfileApiTests.cs index d8e61810..1bf70173 100644 --- a/src/GCATests/GSendApi/JobProfileApiTests.cs +++ b/src/GCATests/GSendApi/JobProfileApiTests.cs @@ -24,7 +24,7 @@ public class JobProfileApiTests [ExcludeFromCodeCoverage] public void JobProfilesGet_RetrievesAllJobProfiles_Success() { - MockGSendDataProvider gSendDataProvider = new(new string[] { "ProverXL", "3018" }); + MockGSendDataProvider gSendDataProvider = new(["ProverXL", "3018"]); gSendDataProvider.JobProfiles.Add(new JobProfileModel(1) { Name = "Profile 1", Description = "test 1" }); gSendDataProvider.JobProfiles.Add(new JobProfileModel(325) { Name = "Profile 2", Description = "test 2" }); gSendDataProvider.JobProfiles.Add(new JobProfileModel(9865433) { Name = "Profile 3", Description = "test 3" }); @@ -63,7 +63,7 @@ public void JobProfilesGet_RetrievesAllJobProfiles_Success() [TestMethod] public void JobProfileAdd_NullParameter_Returns_JsonErrorResponse() { - IGSendDataProvider gSendDataProvider = new MockGSendDataProvider(new string[] { "ProverXL", "3018" }); + IGSendDataProvider gSendDataProvider = new MockGSendDataProvider(["ProverXL", "3018"]); JobProfileApi sut = new(gSendDataProvider, new MockNotification()); ActionResult Result = sut.JobProfileAdd(null) as ActionResult; Assert.IsNotNull(Result); @@ -81,7 +81,7 @@ public void JobProfileAdd_NullParameter_Returns_JsonErrorResponse() [TestMethod] public void JobProfileAdd_NullName_Returns_JsonErrorResponse() { - IGSendDataProvider gSendDataProvider = new MockGSendDataProvider(new string[] { "ProverXL", "3018" }); + IGSendDataProvider gSendDataProvider = new MockGSendDataProvider(["ProverXL", "3018"]); JobProfileApi sut = new(gSendDataProvider, new MockNotification()); ActionResult Result = sut.JobProfileAdd(new JobProfileModel(1) { Description = "a desc" }) as ActionResult; Assert.IsNotNull(Result); @@ -99,7 +99,7 @@ public void JobProfileAdd_NullName_Returns_JsonErrorResponse() [TestMethod] public void JobProfileAdd_NullDescription_Returns_JsonErrorResponse() { - IGSendDataProvider gSendDataProvider = new MockGSendDataProvider(new string[] { "ProverXL", "3018" }); + IGSendDataProvider gSendDataProvider = new MockGSendDataProvider(["ProverXL", "3018"]); JobProfileApi sut = new(gSendDataProvider, new MockNotification()); ActionResult Result = sut.JobProfileAdd(new JobProfileModel(1) { Name = "a test" }) as ActionResult; Assert.IsNotNull(Result); @@ -118,7 +118,7 @@ public void JobProfileAdd_NullDescription_Returns_JsonErrorResponse() public void JobProfileAdd_ValidModel_Returns_JsonResponse() { MockNotification notification = new(); - IGSendDataProvider gSendDataProvider = new MockGSendDataProvider(new string[] { "ProverXL", "3018" }); + IGSendDataProvider gSendDataProvider = new MockGSendDataProvider(["ProverXL", "3018"]); JobProfileApi sut = new(gSendDataProvider, notification); ActionResult Result = sut.JobProfileAdd(new JobProfileModel(1) { Name = "a test", Description = "a test" }) as ActionResult; Assert.IsNotNull(Result); @@ -140,7 +140,7 @@ public void JobProfileAdd_ValidModel_Returns_JsonResponse() public void JobProfileAdd_InvalidModel_DuplicateName_Returns_JsonResponse() { MockNotification notification = new(); - IGSendDataProvider gSendDataProvider = new MockGSendDataProvider(new string[] { "ProverXL", "3018" }); + IGSendDataProvider gSendDataProvider = new MockGSendDataProvider(["ProverXL", "3018"]); JobProfileApi sut = new(gSendDataProvider, notification); ActionResult Result = sut.JobProfileAdd(new JobProfileModel(0) { Name = "a test", Description = "a test" }) as ActionResult; Assert.IsNotNull(Result); @@ -174,7 +174,7 @@ public void JobProfileAdd_InvalidModel_DuplicateName_Returns_JsonResponse() public void JobProfileDelete_InvalidItemNotFound_ReturnsJsonErrorResponse() { MockNotification notification = new(); - IGSendDataProvider gSendDataProvider = new MockGSendDataProvider(new string[] { "ProverXL", "3018" }); + IGSendDataProvider gSendDataProvider = new MockGSendDataProvider(["ProverXL", "3018"]); JobProfileApi sut = new(gSendDataProvider, notification); ActionResult Result = sut.JobProfileDelete(111) as ActionResult; Assert.IsNotNull(Result); @@ -195,7 +195,7 @@ public void JobProfileDelete_InvalidItemNotFound_ReturnsJsonErrorResponse() public void JobProfileDelete_ValidModel_LastRemainingJobProfile_Returns_JsonErrorResponse() { MockNotification notification = new(); - IGSendDataProvider gSendDataProvider = new MockGSendDataProvider(new string[] { "ProverXL", "3018" }); + IGSendDataProvider gSendDataProvider = new MockGSendDataProvider(["ProverXL", "3018"]); JobProfileApi sut = new(gSendDataProvider, notification); ActionResult Result = sut.JobProfileAdd(new JobProfileModel(1) { Name = "a test", Description = "a test" }) as ActionResult; Assert.IsNotNull(Result); @@ -226,7 +226,7 @@ public void JobProfileDelete_ValidModel_LastRemainingJobProfile_Returns_JsonErro public void JobProfileDelete_ValidModel_ItemCanBeDeleted_Returns_JsonSuccessResponse() { MockNotification notification = new(); - MockGSendDataProvider gSendDataProvider = new(new string[] { "ProverXL", "3018" }); + MockGSendDataProvider gSendDataProvider = new(["ProverXL", "3018"]); JobProfileApi sut = new(gSendDataProvider, notification); ActionResult Result = sut.JobProfileAdd(new JobProfileModel(-1) { Name = "a test", Description = "a test" }) as ActionResult; Assert.IsNotNull(Result); @@ -257,7 +257,7 @@ public void JobProfileDelete_ValidModel_ItemCanBeDeleted_Returns_JsonSuccessResp public void JobProfileUpdate_InvalidModel_Null_Returns_JsonErrorResponse() { MockNotification notification = new(); - MockGSendDataProvider gSendDataProvider = new(new string[] { "ProverXL", "3018" }); + MockGSendDataProvider gSendDataProvider = new(["ProverXL", "3018"]); JobProfileApi sut = new(gSendDataProvider, notification); ActionResult Result = sut.JobProfileAdd(new JobProfileModel(-1) { Name = "a test", Description = "a test" }) as ActionResult; Assert.IsNotNull(Result); @@ -284,7 +284,7 @@ public void JobProfileUpdate_InvalidModel_Null_Returns_JsonErrorResponse() public void JobProfileUpdate_InvalidModel_NameNull_Returns_JsonErrorResponse() { MockNotification notification = new(); - MockGSendDataProvider gSendDataProvider = new(new string[] { "ProverXL", "3018" }); + MockGSendDataProvider gSendDataProvider = new(["ProverXL", "3018"]); JobProfileApi sut = new(gSendDataProvider, notification); IActionResult result = sut.JobProfileUpdate(new JobProfileModel(0)); @@ -309,7 +309,7 @@ public void JobProfileUpdate_InvalidModel_NameNull_Returns_JsonErrorResponse() public void JobProfileUpdate_InvalidModel_DescriptionNull_Returns_JsonErrorResponse() { MockNotification notification = new(); - MockGSendDataProvider gSendDataProvider = new(new string[] { "ProverXL", "3018" }); + MockGSendDataProvider gSendDataProvider = new(["ProverXL", "3018"]); JobProfileApi sut = new(gSendDataProvider, notification); IActionResult result = sut.JobProfileUpdate(new JobProfileModel(0) { Name = "name" }); @@ -334,7 +334,7 @@ public void JobProfileUpdate_InvalidModel_DescriptionNull_Returns_JsonErrorRespo public void JobProfileUpdate_InvalidModel_NotFound_Returns_JsonErrorResponse() { MockNotification notification = new(); - MockGSendDataProvider gSendDataProvider = new(new string[] { "ProverXL", "3018" }); + MockGSendDataProvider gSendDataProvider = new(["ProverXL", "3018"]); JobProfileApi sut = new(gSendDataProvider, notification); IActionResult result = sut.JobProfileUpdate(new JobProfileModel(245) { Name = "name", Description = "desc" }); @@ -358,7 +358,7 @@ public void JobProfileUpdate_InvalidModel_NotFound_Returns_JsonErrorResponse() [TestMethod] public void JobProfileUpdate_ValidModel_ItemCanBeUpdated_Returns_JsonSuccessResponse() { - MockGSendDataProvider gSendDataProvider = new(new string[] { "ProverXL", "3018" }); + MockGSendDataProvider gSendDataProvider = new(["ProverXL", "3018"]); gSendDataProvider.JobProfiles.Add(new JobProfileModel(1) { Name = "Profile 1", Description = "test 1" }); gSendDataProvider.JobProfiles.Add(new JobProfileModel(325) { Name = "Profile 2", Description = "test 2" }); gSendDataProvider.JobProfiles.Add(new JobProfileModel(9865433) { Name = "Profile 3", Description = "test 3" }); diff --git a/src/GCATests/GSendApi/MachineApiTests.cs b/src/GCATests/GSendApi/MachineApiTests.cs index 35701a1d..da3d78de 100644 --- a/src/GCATests/GSendApi/MachineApiTests.cs +++ b/src/GCATests/GSendApi/MachineApiTests.cs @@ -42,7 +42,7 @@ public void Construct_ValidInstance_Success() [TestMethod] public void MachinesGet_RetrievesAllListedMachines_Success() { - IGSendDataProvider gSendDataProvider = new MockGSendDataProvider(new string[] { "ProverXL", "3018" }); + IGSendDataProvider gSendDataProvider = new MockGSendDataProvider(["ProverXL", "3018"]); MachineApi sut = new(gSendDataProvider, new MockComPortProvider(), new MockSettingsProvider(), new MockNotification()); IActionResult result = sut.MachinesGet(); @@ -76,7 +76,7 @@ public void MachinesGet_RetrievesAllListedMachines_Success() [TestMethod] public void MachinesAdd_NullParameter_Returns_JsonErrorResponse() { - IGSendDataProvider gSendDataProvider = new MockGSendDataProvider(new string[] { "ProverXL", "3018" }); + IGSendDataProvider gSendDataProvider = new MockGSendDataProvider(["ProverXL", "3018"]); MachineApi sut = new(gSendDataProvider, new MockComPortProvider(), new MockSettingsProvider(), new MockNotification()); ActionResult Result = sut.MachineAdd(null) as ActionResult; Assert.IsNotNull(Result); @@ -94,7 +94,7 @@ public void MachinesAdd_NullParameter_Returns_JsonErrorResponse() [TestMethod] public void MachinesAdd_NameMissing_Returns_JsonErrorResponse() { - IGSendDataProvider gSendDataProvider = new MockGSendDataProvider(new string[] { "ProverXL", "3018" }); + IGSendDataProvider gSendDataProvider = new MockGSendDataProvider(["ProverXL", "3018"]); MachineApi sut = new(gSendDataProvider, new MockComPortProvider(), new MockSettingsProvider(), new MockNotification()); MachineModel model = new(); @@ -115,7 +115,7 @@ public void MachinesAdd_NameMissing_Returns_JsonErrorResponse() [TestMethod] public void MachinesAdd_NameIsDuplicate_Returns_JsonErrorResponse() { - IGSendDataProvider gSendDataProvider = new MockGSendDataProvider(new string[] { "ProverXL", "3018" }); + IGSendDataProvider gSendDataProvider = new MockGSendDataProvider(["ProverXL", "3018"]); MachineApi sut = new(gSendDataProvider, new MockComPortProvider(), new MockSettingsProvider(), new MockNotification()); MachineModel model = new() @@ -141,7 +141,7 @@ public void MachinesAdd_NameIsDuplicate_Returns_JsonErrorResponse() [TestMethod] public void MachinesAdd_InvalidMachineType_Returns_JsonErrorResponse() { - IGSendDataProvider gSendDataProvider = new MockGSendDataProvider(new string[] { "ProverXL", "3018" }); + IGSendDataProvider gSendDataProvider = new MockGSendDataProvider(["ProverXL", "3018"]); MachineApi sut = new(gSendDataProvider, new MockComPortProvider(), new MockSettingsProvider(), new MockNotification()); MachineModel model = new() @@ -166,7 +166,7 @@ public void MachinesAdd_InvalidMachineType_Returns_JsonErrorResponse() [TestMethod] public void MachinesAdd_DuplicateComPort_Returns_JsonErrorResponse() { - IGSendDataProvider gSendDataProvider = new MockGSendDataProvider(new string[] { "ProverXL", "3018" }); + IGSendDataProvider gSendDataProvider = new MockGSendDataProvider(["ProverXL", "3018"]); MachineApi sut = new(gSendDataProvider, new MockComPortProvider(new byte[] { 2 }), new MockSettingsProvider(), new MockNotification()); MachineModel model = new() @@ -192,7 +192,7 @@ public void MachinesAdd_DuplicateComPort_Returns_JsonErrorResponse() [TestMethod] public void MachinesAdd_ComPortNotFound_Returns_JsonErrorResponse() { - IGSendDataProvider gSendDataProvider = new MockGSendDataProvider(new string[] { "ProverXL", "3018" }); + IGSendDataProvider gSendDataProvider = new MockGSendDataProvider(["ProverXL", "3018"]); MachineApi sut = new(gSendDataProvider, new MockComPortProvider(), new MockSettingsProvider(), new MockNotification()); MachineModel model = new() @@ -219,7 +219,7 @@ public void MachinesAdd_ComPortNotFound_Returns_JsonErrorResponse() public void MachinesAdd_ValidNewDetails_Returns_JsonSuccessResponse() { MockNotification notification = new(); - IGSendDataProvider gSendDataProvider = new MockGSendDataProvider(new string[] { "ProverXL", "3018" }); + IGSendDataProvider gSendDataProvider = new MockGSendDataProvider(["ProverXL", "3018"]); MachineApi sut = new(gSendDataProvider, new MockComPortProvider(), new MockSettingsProvider(), notification); MachineModel model = new() @@ -247,7 +247,7 @@ public void MachinesAdd_ValidNewDetails_Returns_JsonSuccessResponse() [TestMethod] public void MachinesDelete_InvalidMachineNotFound_Returns_JsonErrorResponse() { - IGSendDataProvider gSendDataProvider = new MockGSendDataProvider(new string[] { "ProverXL", "3018" }); + IGSendDataProvider gSendDataProvider = new MockGSendDataProvider(["ProverXL", "3018"]); MachineApi sut = new(gSendDataProvider, new MockComPortProvider(), new MockSettingsProvider(), new MockNotification()); ActionResult Result = sut.MachineDelete(245) as ActionResult; @@ -267,7 +267,7 @@ public void MachinesDelete_InvalidMachineNotFound_Returns_JsonErrorResponse() public void MachinesDelete_ValidRequest_Returns_JsonSuccessResponse() { MockNotification notification = new(); - IGSendDataProvider gSendDataProvider = new MockGSendDataProvider(new string[] { "ProverXL", "3018" }); + IGSendDataProvider gSendDataProvider = new MockGSendDataProvider(["ProverXL", "3018"]); MachineApi sut = new(gSendDataProvider, new MockComPortProvider(), new MockSettingsProvider(), notification); ActionResult Result = sut.MachineDelete(1) as ActionResult; @@ -289,7 +289,7 @@ public void MachinesDelete_ValidRequest_Returns_JsonSuccessResponse() public void MachinesUpdate_ValidRequest_Returns_JsonSuccessResponse() { MockNotification notification = new(); - IGSendDataProvider gSendDataProvider = new MockGSendDataProvider(new string[] { "ProverXL", "3018" }); + IGSendDataProvider gSendDataProvider = new MockGSendDataProvider(["ProverXL", "3018"]); MachineApi sut = new(gSendDataProvider, new MockComPortProvider(new byte[] { 3 }), new MockSettingsProvider(), notification); MachineModel machineToUpdate = JsonSerializer.Deserialize(JsonSerializer.Serialize(gSendDataProvider.MachineGet(1)), diff --git a/src/GCATests/GSendApi/ToolProfileApiTests.cs b/src/GCATests/GSendApi/ToolProfileApiTests.cs index 36bde8cd..2884665f 100644 --- a/src/GCATests/GSendApi/ToolProfileApiTests.cs +++ b/src/GCATests/GSendApi/ToolProfileApiTests.cs @@ -23,7 +23,7 @@ public class ToolProfileApiTests [TestMethod] public void ToolGet_ReturnsAllTools_Success() { - MockGSendDataProvider gSendDataProvider = new(new string[] { "ProverXL", "3018" }); + MockGSendDataProvider gSendDataProvider = new(["ProverXL", "3018"]); gSendDataProvider.ToolProfiles.Add(new ToolProfileModel() { Id = 1, Name = "Tool 1", Description = "Tool 1 Desc" }); gSendDataProvider.ToolProfiles.Add(new ToolProfileModel() { Id = 2, Name = "Tool 2", Description = "Tool 2 Desc" }); gSendDataProvider.ToolProfiles.Add(new ToolProfileModel() { Id = 3, Name = "Tool 3", Description = "Tool 3 Desc" }); diff --git a/src/GCATests/GSendTests.csproj b/src/GCATests/GSendTests.csproj index f3628c44..042c5133 100644 --- a/src/GCATests/GSendTests.csproj +++ b/src/GCATests/GSendTests.csproj @@ -6,6 +6,14 @@ false + + 1701;1702;8032;8981;IDE0079;IDE0076;IDE0028;IDE0017;IDE0301;CA1861;CA1854;CA1859;IDE0090;IDE0290;IDE0300;IDE0305 + + + + 1701;1702;8032;8981;IDE0079;IDE0076;IDE0028;IDE0017;IDE0301;CA1861;CA1854;CA1859;IDE0090;IDE0290;IDE0300;IDE0305 + + diff --git a/src/GCATests/OverrideTests/SpindleStartStopTests.cs b/src/GCATests/OverrideTests/SpindleStartStopTests.cs index 32ece5cb..a45a3560 100644 --- a/src/GCATests/OverrideTests/SpindleStartStopTests.cs +++ b/src/GCATests/OverrideTests/SpindleStartStopTests.cs @@ -45,7 +45,7 @@ public void SpindleActiveTime_SpindleStarts_M3_StartsTimer() IGCodeAnalyses analyses = gCodeParser.Parse("S3000M3"); gCodeLine.Commands.AddRange(analyses.Commands); - MockGSendDataProvider gSendDataProvider = new(new string[] { "Machine 1" }); + MockGSendDataProvider gSendDataProvider = new(["Machine 1"]); IMachine mockMachine = gSendDataProvider.MachineGet(0); MockComPort mockComport = new(mockMachine); IComPortFactory comPortFactory = new MockComPortFactory(mockComport); @@ -73,7 +73,7 @@ public void SpindleSoftStart_SpindleStarts_M3_SpindleSpeedIncreasesEvery200Ms() IGCodeAnalyses analyses = gCodeParser.Parse("S3000M3"); gCodeLine.Commands.AddRange(analyses.Commands); - MockGSendDataProvider gSendDataProvider = new(new string[] { "Machine 1" }); + MockGSendDataProvider gSendDataProvider = new(["Machine 1"]); IMachine mockMachine = gSendDataProvider.MachineGet(0); mockMachine.AddOptions(MachineOptions.SoftStart); mockMachine.SoftStartSeconds = 30; diff --git a/src/GCSDesktop/Internal/GSendContext.cs b/src/GCSDesktop/Internal/GSendContext.cs index 49686c85..01fbab5f 100644 --- a/src/GCSDesktop/Internal/GSendContext.cs +++ b/src/GCSDesktop/Internal/GSendContext.cs @@ -23,7 +23,7 @@ public void ShowMachine(IMachine machine) { ArgumentNullException.ThrowIfNull(machine); - if (!_machines.ContainsKey(machine)) + if (!_machines.TryGetValue(machine, out FrmMachine _)) { _machines.Add(machine, new FrmMachine(this, machine, _serviceProvider)); } diff --git a/src/GCSService/Controllers/ServiceHistoryController.cs b/src/GCSService/Controllers/ServiceHistoryController.cs index 7189db46..723f04ab 100644 --- a/src/GCSService/Controllers/ServiceHistoryController.cs +++ b/src/GCSService/Controllers/ServiceHistoryController.cs @@ -36,7 +36,7 @@ public IActionResult Index() long machineId = -1; - if (machineNames.Any()) + if (machineNames.Count > 0) { machineId = machineNames[0].Id; } diff --git a/src/GSendCS/Program.cs b/src/GSendCS/Program.cs index d66abb5a..f04ab3c0 100644 --- a/src/GSendCS/Program.cs +++ b/src/GSendCS/Program.cs @@ -1,6 +1,4 @@ -using System.Net; - -using CommandLinePlus; +using CommandLinePlus; using GSendCS.Internal; using GSendCS.Processors; @@ -11,9 +9,9 @@ internal static class Program { static int Main() { - IConsoleProcessorFactory factory = new ConsoleProcessorFactory(); + ConsoleProcessorFactory factory = new ConsoleProcessorFactory(); Environment.SetEnvironmentVariable(GSendShared.Constants.GSendPathEnvVar, - Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData), + Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData), GSendShared.Constants.GSendProAppFolder)); string pluginFileName = Path.Combine(Environment.GetEnvironmentVariable(GSendShared.Constants.GSendPathEnvVar), diff --git a/src/GSendCommon/ComPortFactory.cs b/src/GSendCommon/ComPortFactory.cs index 5bc5180b..99979c0f 100644 --- a/src/GSendCommon/ComPortFactory.cs +++ b/src/GSendCommon/ComPortFactory.cs @@ -72,7 +72,7 @@ public IComPort GetComPort(string comPort) using (TimedLock tl = TimedLock.Lock(_lockObject)) { - if (!_comPorts.ContainsKey(comPort)) + if (!_comPorts.TryGetValue(comPort, out IComPort _)) throw new InvalidOperationException(String.Format(ErrorComPortNotOpen, comPort)); return _comPorts[comPort]; diff --git a/src/GSendCommon/MCodeOverrides/M631Override.cs b/src/GSendCommon/MCodeOverrides/M631Override.cs index 412434fc..12518bf9 100644 --- a/src/GSendCommon/MCodeOverrides/M631Override.cs +++ b/src/GSendCommon/MCodeOverrides/M631Override.cs @@ -28,7 +28,7 @@ public bool Process(IGCodeOverrideContext overrideContext, CancellationToken can try { - List previousCommands = PreviousCommands(command, new string[] { "M601", "M631.1", "M631.2", "P" }); + List previousCommands = PreviousCommands(command, ["M601", "M631.1", "M631.2", "P"]); IGCodeCommand parameters = previousCommands.Find(p => p.CommandValue == Constants.MCode631RunProgramParams); string args = null; diff --git a/src/GSendCommon/ProcessorMediator.cs b/src/GSendCommon/ProcessorMediator.cs index 91c93763..f0d1e5e9 100644 --- a/src/GSendCommon/ProcessorMediator.cs +++ b/src/GSendCommon/ProcessorMediator.cs @@ -44,7 +44,6 @@ public class ProcessorMediator : IProcessorMediator, INotificationListener private static readonly object _staticLockObject = new(); private static bool _eventsRegistered = false; - public ProcessorMediator(IServiceProvider serviceProvider, ILogger logger, IGSendDataProvider gSendDataProvider, @@ -76,6 +75,12 @@ public ProcessorMediator(IServiceProvider serviceProvider, _cancellationTokenSource = new CancellationTokenSource(); } + + ~ProcessorMediator() + { + _cancellationTokenSource?.Dispose(); + } + #region IProcessorMediator Methods public void OpenProcessors()