From 4875b31723100fa007c47ae03a89969251e3622b Mon Sep 17 00:00:00 2001 From: Mike Phares Date: Thu, 1 Dec 2022 13:37:27 -0700 Subject: [PATCH] v2.47.1 - Ready to test ISQ query --- Adaptation/.editorconfig | 4 +- Adaptation/.vscode/Reactor.js | 26 +++ Adaptation/.vscode/format-report.json | 183 +----------------- Adaptation/.vscode/psn.js | 26 +++ Adaptation/FileHandlers/APC/FileRead.cs | 8 +- Adaptation/FileHandlers/IQSSi/FileRead.cs | 8 +- .../FileHandlers/OpenInsight/FileRead.cs | 43 +++- .../FileHandlers/OpenInsight/FromIQS.cs | 104 ++++++++++ .../OpenInsightMetrologyViewer/WSRequest.cs | 3 +- Adaptation/FileHandlers/RsM/Description.cs | 4 +- Adaptation/FileHandlers/RsM/FileRead.cs | 5 +- Adaptation/FileHandlers/RsM/ProcessData.cs | 12 +- Adaptation/FileHandlers/SPaCe/FileRead.cs | 8 +- Adaptation/FileHandlers/txt/Description.cs | 4 +- Adaptation/FileHandlers/txt/FileRead.cs | 5 +- Adaptation/FileHandlers/txt/ProcessData.cs | 7 +- Adaptation/Shared/Duplicator/Description.cs | 3 + Adaptation/Shared/FileRead.cs | 48 +++-- Adaptation/Shared/Logistics.cs | 4 +- Adaptation/Shared/Metrology/ScopeInfo.cs | 2 +- Adaptation/Shared/Metrology/WS.cs | 3 +- .../Shared/ProcessDataStandardFormat.cs | 9 +- Adaptation/Shared/Properties/IDescription.cs | 1 + .../Staging/v2.36.1/CDE2.cs | 9 +- .../Staging/v2.36.1/CDE3-EQPT.cs | 9 +- .../Staging/v2.36.1/CDE3.cs | 9 +- .../Staging/v2.36.1/CDE5.cs | 9 +- .../Staging/v2.36.1/MET08RESIMAPCDE.cs | 9 +- .../Staging/v2.39.0/CDE2.cs | 9 +- .../Staging/v2.39.0/CDE3-EQPT.cs | 9 +- .../Staging/v2.39.0/CDE3.cs | 9 +- .../Staging/v2.39.0/CDE5.cs | 9 +- .../Staging/v2.39.0/MET08RESIMAPCDE.cs | 9 +- .../Staging/v2.43.2/CDE2.cs | 9 +- .../Staging/v2.43.2/CDE3-EQPT.cs | 9 +- .../Staging/v2.43.2/CDE3.cs | 9 +- .../Staging/v2.43.2/CDE5.cs | 9 +- .../Staging/v2.43.2/MET08RESIMAPCDE.cs | 9 +- .../Staging/v2.43.3/CDE5-EQPT.cs | 9 +- .../Staging/v2.43.3/CDE5.cs | 9 +- .../Staging/v2.43.4/CDE2.cs | 9 +- .../Staging/v2.43.4/CDE5.cs | 9 +- .../Staging/v2.43.4/MET08RESIMAPCDE.cs | 9 +- .../Staging/v2.47.1/CDE2.cs | 63 ++++++ .../Staging/v2.47.1/CDE5.cs | 63 ++++++ .../Staging/v2.47.1/MET08RESIMAPCDE.cs | 180 +++++++++++++++++ .../_Tests/Extract/Staging/v2.43.4/CDE2.cs | 3 + .../_Tests/Extract/Staging/v2.43.4/CDE5.cs | 3 + .../Staging/v2.43.4/MET08RESIMAPCDE.cs | 3 + .../_Tests/Extract/Staging/v2.47.1/CDE2.cs | 54 ++++++ .../_Tests/Extract/Staging/v2.47.1/CDE5.cs | 54 ++++++ .../Staging/v2.47.1/MET08RESIMAPCDE.cs | 124 ++++++++++++ Adaptation/_Tests/Shared/AdaptationTesting.cs | 12 +- Adaptation/_Tests/Shared/UnitTesting.cs | 3 +- Adaptation/_Tests/Static/RsM.cs | 12 +- Adaptation/_Tests/Static/txt.cs | 12 +- Adaptation/appsettings.Development.json | 12 +- Adaptation/appsettings.json | 12 +- Adaptation/package.json | 25 +-- MET08RESIMAPCDE.csproj | 1 + Properties/AssemblyInfo.cs | 4 +- 61 files changed, 919 insertions(+), 421 deletions(-) create mode 100644 Adaptation/.vscode/Reactor.js create mode 100644 Adaptation/.vscode/psn.js create mode 100644 Adaptation/FileHandlers/OpenInsight/FromIQS.cs create mode 100644 Adaptation/_Tests/CreateSelfDescription/Staging/v2.47.1/CDE2.cs create mode 100644 Adaptation/_Tests/CreateSelfDescription/Staging/v2.47.1/CDE5.cs create mode 100644 Adaptation/_Tests/CreateSelfDescription/Staging/v2.47.1/MET08RESIMAPCDE.cs create mode 100644 Adaptation/_Tests/Extract/Staging/v2.47.1/CDE2.cs create mode 100644 Adaptation/_Tests/Extract/Staging/v2.47.1/CDE5.cs create mode 100644 Adaptation/_Tests/Extract/Staging/v2.47.1/MET08RESIMAPCDE.cs diff --git a/Adaptation/.editorconfig b/Adaptation/.editorconfig index 2220133..b84fca4 100644 --- a/Adaptation/.editorconfig +++ b/Adaptation/.editorconfig @@ -80,9 +80,11 @@ dotnet_diagnostic.CA1825.severity = warning # CA1823: Avoid zero-length array al dotnet_diagnostic.CA1829.severity = warning # CA1829: Use Length/Count property instead of Count() when available dotnet_diagnostic.CA1834.severity = warning # CA1834: Consider using 'StringBuilder.Append(char)' when applicable dotnet_diagnostic.IDE0001.severity = warning # IDE0001: Simplify name +dotnet_diagnostic.IDE0004.severity = warning # IDE0004: Cast is redundant. dotnet_diagnostic.IDE0002.severity = warning # Simplify (member access) - System.Version.Equals("1", "2"); Version.Equals("1", "2"); dotnet_diagnostic.IDE0005.severity = warning # Using directive is unnecessary dotnet_diagnostic.IDE0047.severity = warning # IDE0047: Parentheses can be removed +dotnet_diagnostic.IDE0049.severity = warning # Use language keywords instead of framework type names for type references (IDE0049) dotnet_diagnostic.IDE0060.severity = warning # IDE0060: Remove unused parameter dotnet_naming_rule.abstract_method_should_be_pascal_case.severity = warning dotnet_naming_rule.abstract_method_should_be_pascal_case.style = pascal_case @@ -215,7 +217,7 @@ dotnet_style_parentheses_in_other_binary_operators = always_for_clarity dotnet_style_parentheses_in_other_operators = never_if_unnecessary dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity dotnet_style_predefined_type_for_locals_parameters_members = true -dotnet_style_predefined_type_for_member_access = true +dotnet_style_predefined_type_for_member_access = true:warning dotnet_style_prefer_auto_properties = true:warning dotnet_style_prefer_compound_assignment = true:warning dotnet_style_prefer_conditional_expression_over_assignment = false diff --git a/Adaptation/.vscode/Reactor.js b/Adaptation/.vscode/Reactor.js new file mode 100644 index 0000000..9e63d78 --- /dev/null +++ b/Adaptation/.vscode/Reactor.js @@ -0,0 +1,26 @@ +// (self.length != 0) ? +// self : +// (getContextData('2', 'cds.PROCESS_JOBID', '') == '-') ? +// self : +// getContextData('2', 'cds.PROCESS_JOBID', '') + +getValue(self, self.length, $('dcp.CDE5/RsM/MesEntity', ''), getContextData('2', 'cds.PROCESS_JOBID', ''), $('dcp.CDE5/RsM/Recipe', '')); + +function getValue(value, length, mesEntity, recipe, processJobId) { + if (recipe.toUpperCase() === 'SHEET RHO LOW') + return mesEntity; + else if (recipe.toUpperCase() === 'SHEET RHO MID') + return mesEntity; + else if (recipe.toUpperCase() === 'SHEET RHO HIGH') + return mesEntity; + else if (recipe.toUpperCase() === 'SHEET RHO THIN') + return mesEntity; + else if (recipe.toUpperCase() === 'EPRO LOW') + return mesEntity; + else if (recipe.toUpperCase() === 'EPRO HIGH') + return mesEntity; + else if (length !== 0 || processJobId === '-') + return value; + else + return processJobId; +} \ No newline at end of file diff --git a/Adaptation/.vscode/format-report.json b/Adaptation/.vscode/format-report.json index b52cd1d..0637a08 100644 --- a/Adaptation/.vscode/format-report.json +++ b/Adaptation/.vscode/format-report.json @@ -1,182 +1 @@ -[ - { - "DocumentId": { - "ProjectId": { - "Id": "d8671d76-c7d6-43f9-b1df-26c88f02f625" - }, - "Id": "60949adb-0f09-465d-94a4-88b5934cca95" - }, - "FileName": "MET08RESIMAPCDE.cs", - "FilePath": "T:\\MET08RESIMAPCDE\\06_SourceCode\\MET08RESIMAPCDE\\Adaptation\\_Tests\\CreateSelfDescription\\Staging\\v2.43.4\\MET08RESIMAPCDE.cs", - "FileChanges": [ - { - "LineNumber": 102, - "CharNumber": 13, - "DiagnosticId": "IDE0002", - "FormatDescription": "warning IDE0002: Name can be simplified." - } - ] - }, - { - "DocumentId": { - "ProjectId": { - "Id": "d8671d76-c7d6-43f9-b1df-26c88f02f625" - }, - "Id": "60949adb-0f09-465d-94a4-88b5934cca95" - }, - "FileName": "MET08RESIMAPCDE.cs", - "FilePath": "T:\\MET08RESIMAPCDE\\06_SourceCode\\MET08RESIMAPCDE\\Adaptation\\_Tests\\CreateSelfDescription\\Staging\\v2.43.4\\MET08RESIMAPCDE.cs", - "FileChanges": [ - { - "LineNumber": 115, - "CharNumber": 13, - "DiagnosticId": "IDE0002", - "FormatDescription": "warning IDE0002: Name can be simplified." - } - ] - }, - { - "DocumentId": { - "ProjectId": { - "Id": "d8671d76-c7d6-43f9-b1df-26c88f02f625" - }, - "Id": "60949adb-0f09-465d-94a4-88b5934cca95" - }, - "FileName": "MET08RESIMAPCDE.cs", - "FilePath": "T:\\MET08RESIMAPCDE\\06_SourceCode\\MET08RESIMAPCDE\\Adaptation\\_Tests\\CreateSelfDescription\\Staging\\v2.43.4\\MET08RESIMAPCDE.cs", - "FileChanges": [ - { - "LineNumber": 141, - "CharNumber": 13, - "DiagnosticId": "IDE0002", - "FormatDescription": "warning IDE0002: Name can be simplified." - } - ] - }, - { - "DocumentId": { - "ProjectId": { - "Id": "d8671d76-c7d6-43f9-b1df-26c88f02f625" - }, - "Id": "60949adb-0f09-465d-94a4-88b5934cca95" - }, - "FileName": "MET08RESIMAPCDE.cs", - "FilePath": "T:\\MET08RESIMAPCDE\\06_SourceCode\\MET08RESIMAPCDE\\Adaptation\\_Tests\\CreateSelfDescription\\Staging\\v2.43.4\\MET08RESIMAPCDE.cs", - "FileChanges": [ - { - "LineNumber": 128, - "CharNumber": 13, - "DiagnosticId": "IDE0002", - "FormatDescription": "warning IDE0002: Name can be simplified." - } - ] - }, - { - "DocumentId": { - "ProjectId": { - "Id": "d8671d76-c7d6-43f9-b1df-26c88f02f625" - }, - "Id": "60949adb-0f09-465d-94a4-88b5934cca95" - }, - "FileName": "MET08RESIMAPCDE.cs", - "FilePath": "T:\\MET08RESIMAPCDE\\06_SourceCode\\MET08RESIMAPCDE\\Adaptation\\_Tests\\CreateSelfDescription\\Staging\\v2.43.4\\MET08RESIMAPCDE.cs", - "FileChanges": [ - { - "LineNumber": 167, - "CharNumber": 13, - "DiagnosticId": "IDE0002", - "FormatDescription": "warning IDE0002: Name can be simplified." - } - ] - }, - { - "DocumentId": { - "ProjectId": { - "Id": "d8671d76-c7d6-43f9-b1df-26c88f02f625" - }, - "Id": "60949adb-0f09-465d-94a4-88b5934cca95" - }, - "FileName": "MET08RESIMAPCDE.cs", - "FilePath": "T:\\MET08RESIMAPCDE\\06_SourceCode\\MET08RESIMAPCDE\\Adaptation\\_Tests\\CreateSelfDescription\\Staging\\v2.43.4\\MET08RESIMAPCDE.cs", - "FileChanges": [ - { - "LineNumber": 180, - "CharNumber": 13, - "DiagnosticId": "IDE0002", - "FormatDescription": "warning IDE0002: Name can be simplified." - } - ] - }, - { - "DocumentId": { - "ProjectId": { - "Id": "d8671d76-c7d6-43f9-b1df-26c88f02f625" - }, - "Id": "60949adb-0f09-465d-94a4-88b5934cca95" - }, - "FileName": "MET08RESIMAPCDE.cs", - "FilePath": "T:\\MET08RESIMAPCDE\\06_SourceCode\\MET08RESIMAPCDE\\Adaptation\\_Tests\\CreateSelfDescription\\Staging\\v2.43.4\\MET08RESIMAPCDE.cs", - "FileChanges": [ - { - "LineNumber": 63, - "CharNumber": 13, - "DiagnosticId": "IDE0002", - "FormatDescription": "warning IDE0002: Name can be simplified." - } - ] - }, - { - "DocumentId": { - "ProjectId": { - "Id": "d8671d76-c7d6-43f9-b1df-26c88f02f625" - }, - "Id": "60949adb-0f09-465d-94a4-88b5934cca95" - }, - "FileName": "MET08RESIMAPCDE.cs", - "FilePath": "T:\\MET08RESIMAPCDE\\06_SourceCode\\MET08RESIMAPCDE\\Adaptation\\_Tests\\CreateSelfDescription\\Staging\\v2.43.4\\MET08RESIMAPCDE.cs", - "FileChanges": [ - { - "LineNumber": 76, - "CharNumber": 13, - "DiagnosticId": "IDE0002", - "FormatDescription": "warning IDE0002: Name can be simplified." - } - ] - }, - { - "DocumentId": { - "ProjectId": { - "Id": "d8671d76-c7d6-43f9-b1df-26c88f02f625" - }, - "Id": "60949adb-0f09-465d-94a4-88b5934cca95" - }, - "FileName": "MET08RESIMAPCDE.cs", - "FilePath": "T:\\MET08RESIMAPCDE\\06_SourceCode\\MET08RESIMAPCDE\\Adaptation\\_Tests\\CreateSelfDescription\\Staging\\v2.43.4\\MET08RESIMAPCDE.cs", - "FileChanges": [ - { - "LineNumber": 89, - "CharNumber": 13, - "DiagnosticId": "IDE0002", - "FormatDescription": "warning IDE0002: Name can be simplified." - } - ] - }, - { - "DocumentId": { - "ProjectId": { - "Id": "d8671d76-c7d6-43f9-b1df-26c88f02f625" - }, - "Id": "60949adb-0f09-465d-94a4-88b5934cca95" - }, - "FileName": "MET08RESIMAPCDE.cs", - "FilePath": "T:\\MET08RESIMAPCDE\\06_SourceCode\\MET08RESIMAPCDE\\Adaptation\\_Tests\\CreateSelfDescription\\Staging\\v2.43.4\\MET08RESIMAPCDE.cs", - "FileChanges": [ - { - "LineNumber": 154, - "CharNumber": 13, - "DiagnosticId": "IDE0002", - "FormatDescription": "warning IDE0002: Name can be simplified." - } - ] - } -] \ No newline at end of file +[] \ No newline at end of file diff --git a/Adaptation/.vscode/psn.js b/Adaptation/.vscode/psn.js new file mode 100644 index 0000000..98ec086 --- /dev/null +++ b/Adaptation/.vscode/psn.js @@ -0,0 +1,26 @@ +// (self.length != 0) ? +// self : +// (getContextData('2', 'cds.PRODUCT', '') == '-') ? +// self : +// getContextData('2', 'cds.PRODUCT', '') + +getValue(self, self.length, getContextData('2', 'cds.PRODUCT', ''), $('dcp.CDE5/RsM/Recipe', '')); + +function getValue(value, length, product, recipe) { + if (recipe.toUpperCase() === 'SHEET RHO LOW') + return 'Sheet Rho Low'; + else if (recipe.toUpperCase() === 'SHEET RHO MID') + return 'Sheet Rho Mid'; + else if (recipe.toUpperCase() === 'SHEET RHO HIGH') + return 'Sheet Rho High'; + else if (recipe.toUpperCase() === 'SHEET RHO THIN') + return 'Sheet Rho Thin'; + else if (recipe.toUpperCase() === 'EPRO LOW') + return 'EPro Low'; + else if (recipe.toUpperCase() === 'EPRO HIGH') + return 'EPro High'; + else if (length !== 0 || product === '-') + return value; + else + return product; +} \ No newline at end of file diff --git a/Adaptation/FileHandlers/APC/FileRead.cs b/Adaptation/FileHandlers/APC/FileRead.cs index 9bff0b2..516a83f 100644 --- a/Adaptation/FileHandlers/APC/FileRead.cs +++ b/Adaptation/FileHandlers/APC/FileRead.cs @@ -103,10 +103,10 @@ public class FileRead : Shared.FileRead, IFileRead return results; } - private void FileCopy(string reportFullPath, DateTime dateTime) + private void FileCopy(string reportFullPath, DateTime dateTime, List descriptions) where T : Shared.Properties.IDescription { bool isDummyRun = false; - List<(Shared.Properties.IScopeInfo, string)> tuples = new(); + List<(Shared.Properties.IScopeInfo, string)> collection = new(); string successDirectory = _FileConnectorConfiguration.AlternateTargetFolder; string fileNameAfterUnderscoreSplit = GetFileNameAfterUnderscoreSplit(reportFullPath); string duplicateDirectory = Path.Combine(_FileConnectorConfiguration.TargetFileLocation, fileNameAfterUnderscoreSplit); @@ -114,7 +114,7 @@ public class FileRead : Shared.FileRead, IFileRead _ = Directory.CreateDirectory(duplicateDirectory); string duplicateFile = Path.Combine(duplicateDirectory, Path.GetFileName(reportFullPath)); File.Copy(reportFullPath, duplicateFile, overwrite: true); - WaitForFileConsumption(dateTime, isDummyRun, successDirectory, duplicateDirectory, tuples, duplicateFile); + WaitForFileConsumption(dateTime, descriptions, isDummyRun, successDirectory, duplicateDirectory, collection, duplicateFile); } private Tuple> GetExtractResult(string reportFullPath, DateTime dateTime) @@ -127,7 +127,7 @@ public class FileRead : Shared.FileRead, IFileRead List descriptions = GetDuplicatorDescriptions(jsonElements); Test[] tests = (from l in descriptions select (Test)l.Test).ToArray(); if (_IsEAFHosted && _FileConnectorConfiguration.FileScanningIntervalInSeconds > 0) - FileCopy(reportFullPath, dateTime); + FileCopy(reportFullPath, dateTime, descriptions); results = new Tuple>(pdsf.Item1, tests, jsonElements, new List()); return results; } diff --git a/Adaptation/FileHandlers/IQSSi/FileRead.cs b/Adaptation/FileHandlers/IQSSi/FileRead.cs index 6bbe58e..a0563cf 100644 --- a/Adaptation/FileHandlers/IQSSi/FileRead.cs +++ b/Adaptation/FileHandlers/IQSSi/FileRead.cs @@ -103,17 +103,17 @@ public class FileRead : Shared.FileRead, IFileRead return results; } - private void FileCopy(string reportFullPath, DateTime dateTime) + private void FileCopy(string reportFullPath, DateTime dateTime, List descriptions) where T : Shared.Properties.IDescription { bool isDummyRun = false; string successDirectory = string.Empty; - List<(Shared.Properties.IScopeInfo, string)> tuples = new(); + List<(Shared.Properties.IScopeInfo, string)> collection = new(); string duplicateDirectory = Path.Combine(_FileConnectorConfiguration.SourceFileLocation, _CellInstanceName); if (!Directory.Exists(duplicateDirectory)) _ = Directory.CreateDirectory(duplicateDirectory); string duplicateFile = Path.Combine(duplicateDirectory, Path.GetFileName(reportFullPath)); File.Copy(reportFullPath, duplicateFile, overwrite: true); - WaitForFileConsumption(dateTime, isDummyRun, successDirectory, duplicateDirectory, tuples, duplicateFile); + WaitForFileConsumption(dateTime, descriptions, isDummyRun, successDirectory, duplicateDirectory, collection, duplicateFile); } private Tuple> GetExtractResult(string reportFullPath, DateTime dateTime) @@ -128,7 +128,7 @@ public class FileRead : Shared.FileRead, IFileRead List descriptions = GetDuplicatorDescriptions(jsonElements); Test[] tests = (from l in descriptions select (Test)l.Test).ToArray(); if (_IsEAFHosted && _FileConnectorConfiguration.FileScanningIntervalInSeconds > 0) - FileCopy(reportFullPath, dateTime); + FileCopy(reportFullPath, dateTime, descriptions); results = new Tuple>(pdsf.Item1, tests, jsonElements, new List()); return results; } diff --git a/Adaptation/FileHandlers/OpenInsight/FileRead.cs b/Adaptation/FileHandlers/OpenInsight/FileRead.cs index accc5f7..148d2f7 100644 --- a/Adaptation/FileHandlers/OpenInsight/FileRead.cs +++ b/Adaptation/FileHandlers/OpenInsight/FileRead.cs @@ -3,10 +3,12 @@ using Adaptation.Ifx.Eaf.EquipmentConnector.File.Configuration; using Adaptation.Shared; using Adaptation.Shared.Duplicator; using Adaptation.Shared.Methods; +using Adaptation.Shared.Metrology; using System; using System.Collections.Generic; using System.IO; using System.Linq; +using System.Text; using System.Text.Json; namespace Adaptation.FileHandlers.OpenInsight; @@ -14,6 +16,9 @@ namespace Adaptation.FileHandlers.OpenInsight; public class FileRead : Shared.FileRead, IFileRead { + private readonly string _IqsConnectionString; + private readonly string _OpenInsightFilePattern; + public FileRead(ISMTP smtp, Dictionary fileParameter, string cellInstanceName, string cellInstanceConnectionName, FileConnectorConfiguration fileConnectorConfiguration, string equipmentTypeName, string parameterizedModelObjectDefinitionType, IList modelObjectParameters, string equipmentDictionaryName, Dictionary> dummyRuns, Dictionary> staticRuns, bool useCyclicalForDescription, bool isEAFHosted) : base(new Description(), false, smtp, fileParameter, cellInstanceName, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted) { @@ -26,6 +31,8 @@ public class FileRead : Shared.FileRead, IFileRead throw new Exception(cellInstanceConnectionName); if (!_IsDuplicator) throw new Exception(cellInstanceConnectionName); + _IqsConnectionString = GetPropertyValue(cellInstanceConnectionName, modelObjectParameters, "IQS.ConnectionString"); + _OpenInsightFilePattern = GetPropertyValue(cellInstanceConnectionName, modelObjectParameters, "OpenInsight.FilePattern"); } void IFileRead.Move(Tuple> extractResults, Exception exception) @@ -103,16 +110,40 @@ public class FileRead : Shared.FileRead, IFileRead return results; } - private static void SaveOpenInsightFile(string reportFullPath, DateTime dateTime, List descriptions, Test[] tests) + internal static string GetLines(Logistics logistics, List descriptions) { - if (reportFullPath is null) - { } - if (dateTime == DateTime.MinValue) + StringBuilder result = new(); + if (logistics is null) { } if (descriptions is null) { } - if (tests is null) - { } + return result.ToString(); + } + + private void SaveOpenInsightFile(string reportFullPath, DateTime dateTime, List descriptions, Test[] tests) + { + bool isDummyRun = false; + List<(Shared.Properties.IScopeInfo, string)> collection = new(); + string successDirectory = _FileConnectorConfiguration.AlternateTargetFolder; + string parentParent = GetParentParent(_FileConnectorConfiguration.SourceFileLocation); + if (parentParent.Contains(_CellInstanceName)) + parentParent = Path.GetDirectoryName(parentParent); + string duplicateDirectory = Path.Combine(parentParent, "Data"); + if (!Directory.Exists(duplicateDirectory)) + _ = Directory.CreateDirectory(duplicateDirectory); + string duplicateFile = Path.Combine(duplicateDirectory, Path.GetFileName(reportFullPath)); + if (descriptions.Any() && tests.Any()) + { + string lines = GetLines(_Logistics, descriptions); + if (!string.IsNullOrEmpty(lines)) + collection.Add(new(new ScopeInfo(tests[0], _OpenInsightFilePattern), lines)); + _ = FromIQS.GetCommandText(_IqsConnectionString, _Logistics, descriptions[0]); + // string commandText = FromIQS.GetCommandText(_IqsConnectionString, _Logistics, descriptions[0]); + // if (!string.IsNullOrEmpty(commandText)) + // collection.Add(new(new ScopeInfo(tests[0], _OpenInsightFilePattern), commandText)); + } + if (_IsEAFHosted && _FileConnectorConfiguration.FileScanningIntervalInSeconds > 0) + WaitForFileConsumption(dateTime, descriptions, isDummyRun, successDirectory, duplicateDirectory, collection, duplicateFile); } private Tuple> GetExtractResult(string reportFullPath, DateTime dateTime) diff --git a/Adaptation/FileHandlers/OpenInsight/FromIQS.cs b/Adaptation/FileHandlers/OpenInsight/FromIQS.cs new file mode 100644 index 0000000..fab469a --- /dev/null +++ b/Adaptation/FileHandlers/OpenInsight/FromIQS.cs @@ -0,0 +1,104 @@ +using Adaptation.Shared; +using System; +using System.Data.SqlClient; +using System.Globalization; +using System.Linq; +using System.Text; +using System.Text.Json; + +namespace Adaptation.FileHandlers.OpenInsight; + +public class FromIQS +{ + +#nullable enable + + private static string GetCommandText(Logistics logistics, txt.Description description, string dateTime, string? sid) + { + StringBuilder result = new(); + _ = result + .AppendLine(" select ") + .AppendLine(" se.f_sgrp se_sgrp, ") + .AppendLine(" se.f_sgtm se_sgtm, ") + .AppendLine(" se.f_tsno se_tsno, ") + .AppendLine(" se.f_val se_val, ") + .AppendLine(" rd.f_name rd_name, ") + .AppendLine(" jd.f_name jd_name, ") + .AppendLine(" pl.f_name pl_name, ") + .AppendLine(" pd.f_name pd_name, ") + .AppendLine(" td.f_test td_test, ") + .AppendLine(" td.f_name td_name ") + .AppendLine(" from [spcepiworld].[dbo].[sgrp_ext] se ") + .AppendLine(" join [spcepiworld].[dbo].[prcs_dat] rd ") + .AppendLine(" on se.f_prcs = rd.f_prcs ") + .AppendLine(" join [spcepiworld].[dbo].[job_dat] jd ") + .AppendLine(" on se.f_job = jd.f_job ") + .AppendLine(" join [spcepiworld].[dbo].[part_lot] pl ") + .AppendLine(" on se.f_lot = pl.f_lot ") + .AppendLine(" join [spcepiworld].[dbo].[part_dat] pd ") + .AppendLine(" on se.f_part = pd.f_part ") + .AppendLine(" join [spcepiworld].[dbo].[test_dat] td ") + .AppendLine(" on se.f_test = td.f_test ") + .AppendLine(" where se.f_flag = 0 "); + if (!string.IsNullOrEmpty(sid)) + _ = result.Append(" and se.f_sgrp = ").Append(sid).AppendLine(" "); + _ = result + .Append(" and rd.f_name = '").Append(description.Reactor).AppendLine("' ") + .Append(" and pd.f_name = '").Append(description.PSN).AppendLine("' ") + .AppendLine(" and jd.f_name in ('CDE1', 'CDE2', 'CDE3', 'CDE4', 'CDE5', 'CDE6') ") + .Append(" and jd.f_name = '").Append(logistics.MesEntity).AppendLine("' ") + .Append(" and pl.f_name = '").Append(description.RDS).AppendLine("' ") + .Append(" and dateadd(HH, -7, (dateadd(SS, convert(bigint, se.f_sgtm), '19700101'))) = '").Append(dateTime).AppendLine("' ") + .AppendLine(" for json path "); + return result.ToString(); + } + + private static StringBuilder GetForJsonPath(string connectionString, string commandText) + { + StringBuilder stringBuilder = new(); + using (SqlConnection sqlConnection = new(connectionString)) + { + sqlConnection.Open(); + using SqlCommand sqlCommand = new(commandText, sqlConnection); + SqlDataReader sqlDataReader = sqlCommand.ExecuteReader(System.Data.CommandBehavior.SequentialAccess); + while (sqlDataReader.Read()) + _ = stringBuilder.Append(sqlDataReader.GetString(0)); + } + return stringBuilder; + } + + internal static string GetCommandText(string connectionString, Logistics logistics, txt.Description description) + { + string result; + string dateTime; + string dateFormat = txt.Description.GetDateFormat(); + if (DateTime.TryParseExact(description.Date, dateFormat, CultureInfo.InvariantCulture, DateTimeStyles.None, out DateTime dateTimeParsed)) + dateTime = dateTimeParsed.ToString("yyyy-MM-dd HH:mm:ss"); + else if (DateTime.TryParse(description.Date, CultureInfo.InvariantCulture, DateTimeStyles.None, out dateTimeParsed)) + dateTime = dateTimeParsed.ToString("yyyy-MM-dd HH:mm:ss"); + else + dateTime = logistics.DateTimeFromSequence.ToString("yyyy-MM-dd HH:mm:ss"); + string commandText = GetCommandText(logistics, description, dateTime, sid: null); + StringBuilder stringBuilder = GetForJsonPath(connectionString, commandText); + if (stringBuilder.Length == 0) + result = commandText; + else + { + JsonElement[]? jsonElements = JsonSerializer.Deserialize(stringBuilder.ToString()); + if (jsonElements is null || !jsonElements.Any() || jsonElements[0].ValueKind != JsonValueKind.Object) + result = commandText; + else + { + JsonProperty[] jsonProperties = jsonElements[0].EnumerateObject().ToArray(); + if (!jsonProperties.Any() || jsonProperties[0].Name != "se_sgrp") + result = commandText; + else + result = GetCommandText(logistics, description, dateTime, sid: jsonProperties[0].Value.ToString()); + } + } + return result; + } + +#nullable disable + +} \ No newline at end of file diff --git a/Adaptation/FileHandlers/OpenInsightMetrologyViewer/WSRequest.cs b/Adaptation/FileHandlers/OpenInsightMetrologyViewer/WSRequest.cs index f947318..db05fd7 100644 --- a/Adaptation/FileHandlers/OpenInsightMetrologyViewer/WSRequest.cs +++ b/Adaptation/FileHandlers/OpenInsightMetrologyViewer/WSRequest.cs @@ -96,8 +96,7 @@ public class WSRequest }; Details.Add(detail); } - if (Date is null) - Date = logistics.DateTimeFromSequence.ToString(); + Date ??= logistics.DateTimeFromSequence.ToString(); if (UniqueId is null && Details.Any()) UniqueId = Details[0].HeaderUniqueId; string onlyWSRequest = string.Empty; diff --git a/Adaptation/FileHandlers/RsM/Description.cs b/Adaptation/FileHandlers/RsM/Description.cs index 45ecd3a..4f65207 100644 --- a/Adaptation/FileHandlers/RsM/Description.cs +++ b/Adaptation/FileHandlers/RsM/Description.cs @@ -208,7 +208,7 @@ public class Description : IDescription, Shared.Properties.IDescription ProcessJobID = logistics.ProcessJobID, MID = logistics.MID, // - Date = processData.Date, + Date = processData.Date.ToString(GetDateFormat()), Employee = processData.Employee, Lot = processData.Lot, PSN = processData.PSN, @@ -306,4 +306,6 @@ public class Description : IDescription, Shared.Properties.IDescription return result; } + internal static string GetDateFormat() => "MM/dd/yyyy hh:mm:ss tt"; + } \ No newline at end of file diff --git a/Adaptation/FileHandlers/RsM/FileRead.cs b/Adaptation/FileHandlers/RsM/FileRead.cs index f28ddf7..23f6ba3 100644 --- a/Adaptation/FileHandlers/RsM/FileRead.cs +++ b/Adaptation/FileHandlers/RsM/FileRead.cs @@ -14,6 +14,8 @@ namespace Adaptation.FileHandlers.RsM; public class FileRead : Shared.FileRead, IFileRead { + private long? _TickOffset; + public FileRead(ISMTP smtp, Dictionary fileParameter, string cellInstanceName, string cellInstanceConnectionName, FileConnectorConfiguration fileConnectorConfiguration, string equipmentTypeName, string parameterizedModelObjectDefinitionType, IList modelObjectParameters, string equipmentDictionaryName, Dictionary> dummyRuns, Dictionary> staticRuns, bool useCyclicalForDescription, bool isEAFHosted) : base(new Description(), true, smtp, fileParameter, cellInstanceName, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted) { @@ -96,7 +98,8 @@ public class FileRead : Shared.FileRead, IFileRead private Tuple> GetExtractResult(string reportFullPath, DateTime dateTime) { Tuple> results = new(string.Empty, null, null, new List()); - _Logistics = new Logistics(this, reportFullPath, useSplitForMID: true); + _TickOffset ??= new FileInfo(reportFullPath).LastWriteTime.Ticks - dateTime.Ticks; + _Logistics = new Logistics(this, _TickOffset.Value, reportFullPath, useSplitForMID: true); SetFileParameterLotIDToLogisticsMID(); if (_Logistics.FileInfo.Length < _MinFileLength) results.Item4.Add(_Logistics.FileInfo); diff --git a/Adaptation/FileHandlers/RsM/ProcessData.cs b/Adaptation/FileHandlers/RsM/ProcessData.cs index 37793df..264f28d 100644 --- a/Adaptation/FileHandlers/RsM/ProcessData.cs +++ b/Adaptation/FileHandlers/RsM/ProcessData.cs @@ -25,8 +25,7 @@ public class ProcessData : IProcessData public string Avg { get; set; } public string DLRatio { get; set; } public string DataReject { get; set; } - public string Date { get; set; } - public DateTime DateTime { get; set; } + public DateTime Date { get; set; } public string Employee { get; set; } public string Engineer { get; set; } public string EquipId { get; set; } @@ -232,7 +231,7 @@ public class ProcessData : IProcessData internal static DateTime GetDateTime(Logistics logistics, string dateTimeText) { DateTime result; - string inputDateFormat = "HxHx:xmxmx xMxMx/xdxdx/xyxy"; + string inputDateFormat = "HH:mm MM/dd/yy"; if (dateTimeText.Length != inputDateFormat.Length) result = logistics.DateTimeFromSequence; else @@ -260,8 +259,7 @@ public class ProcessData : IProcessData string dateTimeText = string.Concat(segments[0], ' ', segments[1]); dateTime = GetDateTime(logistics, dateTimeText); } - DateTime = dateTime; - Date = dateTime.ToString(); + Date = dateTime; if (segments.Length > 3 && float.TryParse(segments[2], out float temp)) Temp = temp.ToString("0.0"); if (segments.Length > 7 && segments[6] == "Avg=") @@ -360,10 +358,10 @@ public class ProcessData : IProcessData _ = stringBuilder.AppendLine($"Recipe {Project} \\ {RecipeName} RESISTIVITY {"####"}"); _ = stringBuilder.AppendLine($"EQUIP# {EquipId} Engineer {Engineer}"); _ = stringBuilder.AppendLine($"LotID {Lot} D.L.RATIO {"#.####"}"); - _ = stringBuilder.AppendLine($"OPERATOR {Employee} TEMP {Temp} {DateTime:HH:mm MM/dd/yy}"); + _ = stringBuilder.AppendLine($"OPERATOR {Employee} TEMP {Temp} {Date:HH:mm MM/dd/yy}"); _ = stringBuilder.AppendLine($"AutoOptimizeGain = {"###"} AutoProbeHeightSet = {"##"}"); _ = stringBuilder.AppendLine($"DataReject > {"#.#"}Sigma"); - _ = stringBuilder.AppendLine($"0 ..\\{Project}.prj\\{RecipeName}.rcp\\{reportFileName} {DateTime:HH:mm MM/dd/yy}"); + _ = stringBuilder.AppendLine($"0 ..\\{Project}.prj\\{RecipeName}.rcp\\{reportFileName} {Date:HH:mm MM/dd/yy}"); _ = stringBuilder.AppendLine($"pt# R Th Rs[Ohm/sq@T] Merit"); for (int i = 0; i < _Details.Count; i++) { diff --git a/Adaptation/FileHandlers/SPaCe/FileRead.cs b/Adaptation/FileHandlers/SPaCe/FileRead.cs index 15a6c20..a6c47a1 100644 --- a/Adaptation/FileHandlers/SPaCe/FileRead.cs +++ b/Adaptation/FileHandlers/SPaCe/FileRead.cs @@ -103,15 +103,15 @@ public class FileRead : Shared.FileRead, IFileRead return results; } - private void FileCopy(string reportFullPath, DateTime dateTime) + private void FileCopy(string reportFullPath, DateTime dateTime, List descriptions) where T : Shared.Properties.IDescription { bool isDummyRun = false; string successDirectory = string.Empty; - List<(Shared.Properties.IScopeInfo, string)> tuples = new(); + List<(Shared.Properties.IScopeInfo, string)> collection = new(); string duplicateDirectory = _FileConnectorConfiguration.TargetFileLocation; string duplicateFile = Path.Combine(duplicateDirectory, Path.GetFileName(reportFullPath)); File.Copy(reportFullPath, duplicateFile, overwrite: true); - WaitForFileConsumption(dateTime, isDummyRun, successDirectory, duplicateDirectory, tuples, duplicateFile); + WaitForFileConsumption(dateTime, descriptions, isDummyRun, successDirectory, duplicateDirectory, collection, duplicateFile); } private Tuple> GetExtractResult(string reportFullPath, DateTime dateTime) @@ -126,7 +126,7 @@ public class FileRead : Shared.FileRead, IFileRead List descriptions = GetDuplicatorDescriptions(jsonElements); Test[] tests = (from l in descriptions select (Test)l.Test).ToArray(); if (_IsEAFHosted && _FileConnectorConfiguration.FileScanningIntervalInSeconds > 0) - FileCopy(reportFullPath, dateTime); + FileCopy(reportFullPath, dateTime, descriptions); results = new Tuple>(pdsf.Item1, tests, jsonElements, new List()); return results; } diff --git a/Adaptation/FileHandlers/txt/Description.cs b/Adaptation/FileHandlers/txt/Description.cs index 6af34fb..2139451 100644 --- a/Adaptation/FileHandlers/txt/Description.cs +++ b/Adaptation/FileHandlers/txt/Description.cs @@ -208,7 +208,7 @@ public class Description : IDescription, Shared.Properties.IDescription ProcessJobID = logistics.ProcessJobID, MID = logistics.MID, // - Date = processData.Date, + Date = processData.Date.ToString(GetDateFormat()), Employee = processData.Employee, Lot = processData.Lot, PSN = processData.PSN, @@ -306,4 +306,6 @@ public class Description : IDescription, Shared.Properties.IDescription return result; } + internal static string GetDateFormat() => "MM/dd/yyyy hh:mm:ss tt"; + } \ No newline at end of file diff --git a/Adaptation/FileHandlers/txt/FileRead.cs b/Adaptation/FileHandlers/txt/FileRead.cs index 0ed06d0..5304b8c 100644 --- a/Adaptation/FileHandlers/txt/FileRead.cs +++ b/Adaptation/FileHandlers/txt/FileRead.cs @@ -14,6 +14,8 @@ namespace Adaptation.FileHandlers.txt; public class FileRead : Shared.FileRead, IFileRead { + private long? _TickOffset; + public FileRead(ISMTP smtp, Dictionary fileParameter, string cellInstanceName, string cellInstanceConnectionName, FileConnectorConfiguration fileConnectorConfiguration, string equipmentTypeName, string parameterizedModelObjectDefinitionType, IList modelObjectParameters, string equipmentDictionaryName, Dictionary> dummyRuns, Dictionary> staticRuns, bool useCyclicalForDescription, bool isEAFHosted) : base(new Description(), true, smtp, fileParameter, cellInstanceName, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted) { @@ -96,7 +98,8 @@ public class FileRead : Shared.FileRead, IFileRead private Tuple> GetExtractResult(string reportFullPath, DateTime dateTime) { Tuple> results = new(string.Empty, null, null, new List()); - _Logistics = new Logistics(this, reportFullPath, useSplitForMID: true); + _TickOffset ??= new FileInfo(reportFullPath).LastWriteTime.Ticks - dateTime.Ticks; + _Logistics = new Logistics(this, _TickOffset.Value, reportFullPath, useSplitForMID: true); SetFileParameterLotIDToLogisticsMID(); if (_Logistics.FileInfo.Length < _MinFileLength) results.Item4.Add(_Logistics.FileInfo); diff --git a/Adaptation/FileHandlers/txt/ProcessData.cs b/Adaptation/FileHandlers/txt/ProcessData.cs index 7ba949f..2e2fade 100644 --- a/Adaptation/FileHandlers/txt/ProcessData.cs +++ b/Adaptation/FileHandlers/txt/ProcessData.cs @@ -30,7 +30,7 @@ public class ProcessData : IProcessData public string Avg { get; set; } public string DLRatio { get; set; } public string DataReject { get; set; } - public string Date { get; set; } + public DateTime Date { get; set; } public string Employee { get; set; } public string Engineer { get; set; } public string EquipId { get; set; } @@ -367,11 +367,11 @@ public class ProcessData : IProcessData string psn; string rds; string run; - string date; string temp; string zone; string layer; string title; + DateTime date; string recipe; string dlRatio; string equipId; @@ -421,8 +421,7 @@ public class ProcessData : IProcessData employee = GetBefore("TEMP:"); temp = GetToken(); string dateTimeText = GetToEOL(); - DateTime dateTime = GetDateTime(logistics, dateTimeText); - date = dateTime.ToString(); + date = GetDateTime(logistics, dateTimeText); //create filename / unique id string timeFormat = "yyyyMMddHHmmss"; _Log.Debug($"****ParseData - Title:{title}; EquipId:{equipId};"); diff --git a/Adaptation/Shared/Duplicator/Description.cs b/Adaptation/Shared/Duplicator/Description.cs index abbb7a4..ee456bf 100644 --- a/Adaptation/Shared/Duplicator/Description.cs +++ b/Adaptation/Shared/Duplicator/Description.cs @@ -12,6 +12,7 @@ public class Description : IDescription, Properties.IDescription public int Test { get; set; } public int Count { get; set; } public int Index { get; set; } + public string RDS { get; set; } // public string EventName { get; set; } public string NullData { get; set; } @@ -139,4 +140,6 @@ public class Description : IDescription, Properties.IDescription return result; } + internal static string GetDateFormat() => "MM/dd/yyyy hh:mm:ss tt"; + } \ No newline at end of file diff --git a/Adaptation/Shared/FileRead.cs b/Adaptation/Shared/FileRead.cs index 06374d3..dd0c860 100644 --- a/Adaptation/Shared/FileRead.cs +++ b/Adaptation/Shared/FileRead.cs @@ -260,24 +260,23 @@ public class FileRead : Properties.IFileRead return results; } - protected static string GetTupleFile(Logistics logistics, Properties.IScopeInfo scopeInfo, string duplicateDirectory) + protected static string GetTupleFile(Logistics logistics, List descriptions, Properties.IScopeInfo scopeInfo, string duplicateDirectory) where T : Properties.IDescription { string result; string rds; string dateValue; - string datePlaceholder; - string[] segments = logistics.MID.Split('-'); - if (segments.Length < 2) - rds = "%RDS%"; + string rdsPlaceholder = "%RDS%"; + if (!descriptions.Any() || string.IsNullOrEmpty(descriptions[0].RDS)) + rds = logistics.MID; else - rds = segments[1]; - segments = scopeInfo.FileName.Split(new string[] { "DateTime:" }, StringSplitOptions.RemoveEmptyEntries); + rds = descriptions[0].RDS; + string[] segments = scopeInfo.FileName.Split(new string[] { "DateTime:" }, StringSplitOptions.RemoveEmptyEntries); if (segments.Length == 0) - result = string.Concat(duplicateDirectory, @"\", scopeInfo.FileNameWithoutExtension.Replace("%RDS%", rds)); + result = string.Concat(duplicateDirectory, @"\", scopeInfo.FileNameWithoutExtension.Replace(rdsPlaceholder, rds)); else { - datePlaceholder = "%DateTime%"; segments = segments[1].Split('%'); + string datePlaceholder = "%DateTime%"; dateValue = logistics.DateTimeFromSequence.ToString(segments[0]); foreach (string segment in scopeInfo.FileName.Split('%')) { @@ -285,18 +284,19 @@ public class FileRead : Properties.IFileRead continue; datePlaceholder = string.Concat('%', segment, '%'); } - result = string.Concat(duplicateDirectory, @"\", scopeInfo.FileName.Replace("%RDS%", rds).Replace(datePlaceholder, dateValue)); + result = string.Concat(duplicateDirectory, @"\", scopeInfo.FileName.Replace(rdsPlaceholder, rds).Replace(datePlaceholder, dateValue)); } if (result.Contains('%')) throw new Exception("Placeholder exists!"); return result; } - protected void WaitForFileConsumption(string sourceDirectoryCloaking, Logistics logistics, DateTime dateTime, string successDirectory, string duplicateDirectory, string duplicateFile, List<(Properties.IScopeInfo, string)> tuples) + protected void WaitForFileConsumption(string sourceDirectoryCloaking, Logistics logistics, DateTime dateTime, List descriptions, string successDirectory, string duplicateDirectory, string duplicateFile, List<(Properties.IScopeInfo, string)> collection) where T : Properties.IDescription { bool check; long preWait; string tupleFile; + string tupleFileName = string.Empty; List duplicateFiles = new(); StringBuilder stringBuilder = new(); List consumedFileIndices = new(); @@ -306,20 +306,22 @@ public class FileRead : Properties.IFileRead preWait = dateTime.AddMilliseconds(1234).Ticks; else preWait = dateTime.AddMilliseconds(_FileConnectorConfiguration.FileHandleWaitTime.Value).Ticks; - if (!tuples.Any()) + if (!collection.Any()) duplicateFiles.Add(duplicateFile); string fileName = Path.GetFileNameWithoutExtension(logistics.ReportFullPath); string successFile = string.Concat(successDirectory, @"\", Path.GetFileName(logistics.ReportFullPath)); - foreach ((Properties.IScopeInfo scopeInfo, string text) in tuples) + foreach ((Properties.IScopeInfo scopeInfo, string text) in collection) { if (scopeInfo.FileName.StartsWith(@"\")) tupleFile = scopeInfo.FileName; else if (!scopeInfo.FileName.Contains('%')) tupleFile = string.Concat(duplicateDirectory, @"\", fileName, "_", scopeInfo.FileNameWithoutExtension, ".pdsfc"); else - tupleFile = GetTupleFile(logistics, scopeInfo, duplicateDirectory); + tupleFile = GetTupleFile(logistics, descriptions, scopeInfo, duplicateDirectory); + tupleFileName = Path.GetFileNameWithoutExtension(tupleFile).Split('.')[0]; duplicateFiles.Add(tupleFile); - File.WriteAllText(tupleFile, text); + if (_IsEAFHosted) + File.WriteAllText(tupleFile, text); } for (short i = 0; i < short.MaxValue; i++) { @@ -340,7 +342,17 @@ public class FileRead : Properties.IFileRead for (int i = 0; i < duplicateFiles.Count; i++) { if (!File.Exists(duplicateFiles[i])) - consumedFileIndices.Add(i); + { + if (string.IsNullOrEmpty(tupleFileName)) + consumedFileIndices.Add(i); + else if (duplicateFiles.All(l => Path.GetFileNameWithoutExtension(l).Split('.')[0] == tupleFileName)) + { + for (int j = 0; j < duplicateFiles.Count; j++) + consumedFileIndices.Add(j); + } + else + consumedFileIndices.Add(i); + } } if (consumedFileIndices.Count == duplicateFiles.Count) break; @@ -599,10 +611,10 @@ public class FileRead : Properties.IFileRead } } - protected void WaitForFileConsumption(DateTime dateTime, bool isDummyRun, string successDirectory, string duplicateDirectory, List<(Properties.IScopeInfo, string)> tuples, string duplicateFile) + protected void WaitForFileConsumption(DateTime dateTime, List descriptions, bool isDummyRun, string successDirectory, string duplicateDirectory, List<(Properties.IScopeInfo, string)> collection, string duplicateFile) where T : Properties.IDescription { if (!isDummyRun && _IsEAFHosted) - WaitForFileConsumption(_FileConnectorConfiguration.SourceDirectoryCloaking, _Logistics, dateTime, successDirectory, duplicateDirectory, duplicateFile, tuples); + WaitForFileConsumption(_FileConnectorConfiguration.SourceDirectoryCloaking, _Logistics, dateTime, descriptions, successDirectory, duplicateDirectory, duplicateFile, collection); else { long breakAfter = DateTime.Now.AddSeconds(_FileConnectorConfiguration.FileHandleWaitTime.Value).Ticks; diff --git a/Adaptation/Shared/Logistics.cs b/Adaptation/Shared/Logistics.cs index 38ed83c..a6ca882 100644 --- a/Adaptation/Shared/Logistics.cs +++ b/Adaptation/Shared/Logistics.cs @@ -51,7 +51,7 @@ public class Logistics : ILogistics _Logistics2 = new List(); } - public Logistics(IFileRead fileRead, string reportFullPath, bool useSplitForMID, int? fileInfoLength = null) + public Logistics(IFileRead fileRead, long tickOffset, string reportFullPath, bool useSplitForMID, int? fileInfoLength = null) { if (string.IsNullOrEmpty(fileRead.CellInstanceName)) throw new Exception(); @@ -59,7 +59,7 @@ public class Logistics : ILogistics throw new Exception(); _NullData = fileRead.NullData; _FileInfo = new(reportFullPath); - DateTime dateTime = _FileInfo.LastWriteTime; + DateTime dateTime = new(_FileInfo.LastWriteTime.Ticks + tickOffset); if (fileInfoLength.HasValue && _FileInfo.Length < fileInfoLength.Value) dateTime = dateTime.AddTicks(-1); _JobID = fileRead.CellInstanceName; diff --git a/Adaptation/Shared/Metrology/ScopeInfo.cs b/Adaptation/Shared/Metrology/ScopeInfo.cs index 2de909e..539bd09 100644 --- a/Adaptation/Shared/Metrology/ScopeInfo.cs +++ b/Adaptation/Shared/Metrology/ScopeInfo.cs @@ -16,7 +16,7 @@ public class ScopeInfo : Properties.IScopeInfo public string QueryFilter { get; private set; } public string FileNameWithoutExtension { get; private set; } - public ScopeInfo(Test test, string fileName, string queryFilter = "", string title = "", string html = "") + public ScopeInfo(Test test, string fileName, string queryFilter = "", string title = "", string html = "", string extraExtension = "") { Enum = test; Test = test; diff --git a/Adaptation/Shared/Metrology/WS.cs b/Adaptation/Shared/Metrology/WS.cs index b892219..12f261b 100644 --- a/Adaptation/Shared/Metrology/WS.cs +++ b/Adaptation/Shared/Metrology/WS.cs @@ -44,8 +44,7 @@ public partial class WS _ = stringBuilder.AppendLine(exception.Message); exception = exception.InnerException; } - if (results.Errors is null) - results.Errors = new List(); + results.Errors ??= new List(); results.Errors.Add(stringBuilder.ToString()); } return new(resultsJson, results); diff --git a/Adaptation/Shared/ProcessDataStandardFormat.cs b/Adaptation/Shared/ProcessDataStandardFormat.cs index 9dcdb0a..b256f0f 100644 --- a/Adaptation/Shared/ProcessDataStandardFormat.cs +++ b/Adaptation/Shared/ProcessDataStandardFormat.cs @@ -91,8 +91,7 @@ public class ProcessDataStandardFormat string segment; List body = new(); StringBuilder logistics = new(); - if (lines is null) - lines = File.ReadAllLines(reportFullPath); + lines ??= File.ReadAllLines(reportFullPath); string[] segments; if (lines.Length < 7) segments = Array.Empty(); @@ -276,8 +275,7 @@ public class ProcessDataStandardFormat public static string GetLines(Logistics logistics, Properties.IScopeInfo scopeInfo, List names, Dictionary> keyValuePairs, string dateFormat, string timeFormat, List pairedParameterNames, bool useDateTimeFromSequence = true, string format = "", List ignoreParameterNames = null) { StringBuilder result = new(); - if (ignoreParameterNames is null) - ignoreParameterNames = new List(); + ignoreParameterNames ??= new List(); if (useDateTimeFromSequence && !string.IsNullOrEmpty(format)) throw new Exception(); else if (!useDateTimeFromSequence && string.IsNullOrEmpty(format)) @@ -357,8 +355,7 @@ public class ProcessDataStandardFormat if (string.IsNullOrEmpty(lines[i])) continue; segments = lines[i].Split(inputSeparator); - if (currentGroup is null) - currentGroup = segments.Length; + currentGroup ??= segments.Length; if (segments.Length != currentGroup) { currentGroup = segments.Length; diff --git a/Adaptation/Shared/Properties/IDescription.cs b/Adaptation/Shared/Properties/IDescription.cs index 93e6de5..1166e17 100644 --- a/Adaptation/Shared/Properties/IDescription.cs +++ b/Adaptation/Shared/Properties/IDescription.cs @@ -6,5 +6,6 @@ public interface IDescription int Test { get; } int Count { get; } int Index { get; } + string RDS { get; } } \ No newline at end of file diff --git a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.36.1/CDE2.cs b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.36.1/CDE2.cs index bb0b105..41ab38e 100644 --- a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.36.1/CDE2.cs +++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.36.1/CDE2.cs @@ -32,8 +32,7 @@ public class CDE2 : EAFLoggingUnitTesting [ClassInitialize] public static void ClassInitialize(TestContext testContext) { - if (EAFLoggingUnitTesting is null) - EAFLoggingUnitTesting = new CDE2(testContext); + EAFLoggingUnitTesting ??= new CDE2(testContext); EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(testContext.TestName, " - ClassInitialize")); string[] fileNameAndText = EAFLoggingUnitTesting.AdaptationTesting.GetCSharpText(testContext.TestName); File.WriteAllText(fileNameAndText[0], fileNameAndText[1]); @@ -43,10 +42,8 @@ public class CDE2 : EAFLoggingUnitTesting [ClassCleanup()] public static void ClassCleanup() { - if (EAFLoggingUnitTesting.Logger is not null) - EAFLoggingUnitTesting.Logger.LogInformation("Cleanup"); - if (EAFLoggingUnitTesting is not null) - EAFLoggingUnitTesting.Dispose(); + EAFLoggingUnitTesting.Logger?.LogInformation("Cleanup"); + EAFLoggingUnitTesting?.Dispose(); } #if true diff --git a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.36.1/CDE3-EQPT.cs b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.36.1/CDE3-EQPT.cs index 0fd529f..62d5171 100644 --- a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.36.1/CDE3-EQPT.cs +++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.36.1/CDE3-EQPT.cs @@ -33,8 +33,7 @@ public class CDE3_EQPT : EAFLoggingUnitTesting [ClassInitialize] public static void ClassInitialize(TestContext testContext) { - if (EAFLoggingUnitTesting is null) - EAFLoggingUnitTesting = new CDE3_EQPT(testContext); + EAFLoggingUnitTesting ??= new CDE3_EQPT(testContext); EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(testContext.TestName, " - ClassInitialize")); string[] fileNameAndText = EAFLoggingUnitTesting.AdaptationTesting.GetCSharpText(testContext.TestName); File.WriteAllText(fileNameAndText[0], fileNameAndText[1]); @@ -44,10 +43,8 @@ public class CDE3_EQPT : EAFLoggingUnitTesting [ClassCleanup()] public static void ClassCleanup() { - if (EAFLoggingUnitTesting.Logger is not null) - EAFLoggingUnitTesting.Logger.LogInformation("Cleanup"); - if (EAFLoggingUnitTesting is not null) - EAFLoggingUnitTesting.Dispose(); + EAFLoggingUnitTesting.Logger?.LogInformation("Cleanup"); + EAFLoggingUnitTesting?.Dispose(); } #if true diff --git a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.36.1/CDE3.cs b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.36.1/CDE3.cs index 9aed78c..3002142 100644 --- a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.36.1/CDE3.cs +++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.36.1/CDE3.cs @@ -33,8 +33,7 @@ public class CDE3 : EAFLoggingUnitTesting [ClassInitialize] public static void ClassInitialize(TestContext testContext) { - if (EAFLoggingUnitTesting is null) - EAFLoggingUnitTesting = new CDE3(testContext); + EAFLoggingUnitTesting ??= new CDE3(testContext); EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(testContext.TestName, " - ClassInitialize")); string[] fileNameAndText = EAFLoggingUnitTesting.AdaptationTesting.GetCSharpText(testContext.TestName); File.WriteAllText(fileNameAndText[0], fileNameAndText[1]); @@ -44,10 +43,8 @@ public class CDE3 : EAFLoggingUnitTesting [ClassCleanup()] public static void ClassCleanup() { - if (EAFLoggingUnitTesting.Logger is not null) - EAFLoggingUnitTesting.Logger.LogInformation("Cleanup"); - if (EAFLoggingUnitTesting is not null) - EAFLoggingUnitTesting.Dispose(); + EAFLoggingUnitTesting.Logger?.LogInformation("Cleanup"); + EAFLoggingUnitTesting?.Dispose(); } #if true diff --git a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.36.1/CDE5.cs b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.36.1/CDE5.cs index 256ce42..6bb1fb6 100644 --- a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.36.1/CDE5.cs +++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.36.1/CDE5.cs @@ -32,8 +32,7 @@ public class CDE5 : EAFLoggingUnitTesting [ClassInitialize] public static void ClassInitialize(TestContext testContext) { - if (EAFLoggingUnitTesting is null) - EAFLoggingUnitTesting = new CDE5(testContext); + EAFLoggingUnitTesting ??= new CDE5(testContext); EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(testContext.TestName, " - ClassInitialize")); string[] fileNameAndText = EAFLoggingUnitTesting.AdaptationTesting.GetCSharpText(testContext.TestName); File.WriteAllText(fileNameAndText[0], fileNameAndText[1]); @@ -43,10 +42,8 @@ public class CDE5 : EAFLoggingUnitTesting [ClassCleanup()] public static void ClassCleanup() { - if (EAFLoggingUnitTesting.Logger is not null) - EAFLoggingUnitTesting.Logger.LogInformation("Cleanup"); - if (EAFLoggingUnitTesting is not null) - EAFLoggingUnitTesting.Dispose(); + EAFLoggingUnitTesting.Logger?.LogInformation("Cleanup"); + EAFLoggingUnitTesting?.Dispose(); } #if true diff --git a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.36.1/MET08RESIMAPCDE.cs b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.36.1/MET08RESIMAPCDE.cs index 5b1b839..9f79bc4 100644 --- a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.36.1/MET08RESIMAPCDE.cs +++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.36.1/MET08RESIMAPCDE.cs @@ -33,8 +33,7 @@ public class MET08RESIMAPCDE : EAFLoggingUnitTesting [ClassInitialize] public static void ClassInitialize(TestContext testContext) { - if (EAFLoggingUnitTesting is null) - EAFLoggingUnitTesting = new MET08RESIMAPCDE(testContext); + EAFLoggingUnitTesting ??= new MET08RESIMAPCDE(testContext); EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(testContext.TestName, " - ClassInitialize")); string[] fileNameAndText = EAFLoggingUnitTesting.AdaptationTesting.GetCSharpText(testContext.TestName); File.WriteAllText(fileNameAndText[0], fileNameAndText[1]); @@ -44,10 +43,8 @@ public class MET08RESIMAPCDE : EAFLoggingUnitTesting [ClassCleanup()] public static void ClassCleanup() { - if (EAFLoggingUnitTesting.Logger is not null) - EAFLoggingUnitTesting.Logger.LogInformation("Cleanup"); - if (EAFLoggingUnitTesting is not null) - EAFLoggingUnitTesting.Dispose(); + EAFLoggingUnitTesting.Logger?.LogInformation("Cleanup"); + EAFLoggingUnitTesting?.Dispose(); } #if true diff --git a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.39.0/CDE2.cs b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.39.0/CDE2.cs index d22dada..b94ca4a 100644 --- a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.39.0/CDE2.cs +++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.39.0/CDE2.cs @@ -32,8 +32,7 @@ public class CDE2 : EAFLoggingUnitTesting [ClassInitialize] public static void ClassInitialize(TestContext testContext) { - if (EAFLoggingUnitTesting is null) - EAFLoggingUnitTesting = new CDE2(testContext); + EAFLoggingUnitTesting ??= new CDE2(testContext); EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(testContext.TestName, " - ClassInitialize")); string[] fileNameAndText = EAFLoggingUnitTesting.AdaptationTesting.GetCSharpText(testContext.TestName); File.WriteAllText(fileNameAndText[0], fileNameAndText[1]); @@ -43,10 +42,8 @@ public class CDE2 : EAFLoggingUnitTesting [ClassCleanup()] public static void ClassCleanup() { - if (EAFLoggingUnitTesting.Logger is not null) - EAFLoggingUnitTesting.Logger.LogInformation("Cleanup"); - if (EAFLoggingUnitTesting is not null) - EAFLoggingUnitTesting.Dispose(); + EAFLoggingUnitTesting.Logger?.LogInformation("Cleanup"); + EAFLoggingUnitTesting?.Dispose(); } #if true diff --git a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.39.0/CDE3-EQPT.cs b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.39.0/CDE3-EQPT.cs index db0b118..e95b539 100644 --- a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.39.0/CDE3-EQPT.cs +++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.39.0/CDE3-EQPT.cs @@ -33,8 +33,7 @@ public class CDE3_EQPT : EAFLoggingUnitTesting [ClassInitialize] public static void ClassInitialize(TestContext testContext) { - if (EAFLoggingUnitTesting is null) - EAFLoggingUnitTesting = new CDE3_EQPT(testContext); + EAFLoggingUnitTesting ??= new CDE3_EQPT(testContext); EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(testContext.TestName, " - ClassInitialize")); string[] fileNameAndText = EAFLoggingUnitTesting.AdaptationTesting.GetCSharpText(testContext.TestName); File.WriteAllText(fileNameAndText[0], fileNameAndText[1]); @@ -44,10 +43,8 @@ public class CDE3_EQPT : EAFLoggingUnitTesting [ClassCleanup()] public static void ClassCleanup() { - if (EAFLoggingUnitTesting.Logger is not null) - EAFLoggingUnitTesting.Logger.LogInformation("Cleanup"); - if (EAFLoggingUnitTesting is not null) - EAFLoggingUnitTesting.Dispose(); + EAFLoggingUnitTesting.Logger?.LogInformation("Cleanup"); + EAFLoggingUnitTesting?.Dispose(); } #if true diff --git a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.39.0/CDE3.cs b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.39.0/CDE3.cs index 5d67bd8..1a01f0a 100644 --- a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.39.0/CDE3.cs +++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.39.0/CDE3.cs @@ -33,8 +33,7 @@ public class CDE3 : EAFLoggingUnitTesting [ClassInitialize] public static void ClassInitialize(TestContext testContext) { - if (EAFLoggingUnitTesting is null) - EAFLoggingUnitTesting = new CDE3(testContext); + EAFLoggingUnitTesting ??= new CDE3(testContext); EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(testContext.TestName, " - ClassInitialize")); string[] fileNameAndText = EAFLoggingUnitTesting.AdaptationTesting.GetCSharpText(testContext.TestName); File.WriteAllText(fileNameAndText[0], fileNameAndText[1]); @@ -44,10 +43,8 @@ public class CDE3 : EAFLoggingUnitTesting [ClassCleanup()] public static void ClassCleanup() { - if (EAFLoggingUnitTesting.Logger is not null) - EAFLoggingUnitTesting.Logger.LogInformation("Cleanup"); - if (EAFLoggingUnitTesting is not null) - EAFLoggingUnitTesting.Dispose(); + EAFLoggingUnitTesting.Logger?.LogInformation("Cleanup"); + EAFLoggingUnitTesting?.Dispose(); } #if true diff --git a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.39.0/CDE5.cs b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.39.0/CDE5.cs index 2370a69..d01b183 100644 --- a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.39.0/CDE5.cs +++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.39.0/CDE5.cs @@ -32,8 +32,7 @@ public class CDE5 : EAFLoggingUnitTesting [ClassInitialize] public static void ClassInitialize(TestContext testContext) { - if (EAFLoggingUnitTesting is null) - EAFLoggingUnitTesting = new CDE5(testContext); + EAFLoggingUnitTesting ??= new CDE5(testContext); EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(testContext.TestName, " - ClassInitialize")); string[] fileNameAndText = EAFLoggingUnitTesting.AdaptationTesting.GetCSharpText(testContext.TestName); File.WriteAllText(fileNameAndText[0], fileNameAndText[1]); @@ -43,10 +42,8 @@ public class CDE5 : EAFLoggingUnitTesting [ClassCleanup()] public static void ClassCleanup() { - if (EAFLoggingUnitTesting.Logger is not null) - EAFLoggingUnitTesting.Logger.LogInformation("Cleanup"); - if (EAFLoggingUnitTesting is not null) - EAFLoggingUnitTesting.Dispose(); + EAFLoggingUnitTesting.Logger?.LogInformation("Cleanup"); + EAFLoggingUnitTesting?.Dispose(); } #if true diff --git a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.39.0/MET08RESIMAPCDE.cs b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.39.0/MET08RESIMAPCDE.cs index e98e6ff..8702c7c 100644 --- a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.39.0/MET08RESIMAPCDE.cs +++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.39.0/MET08RESIMAPCDE.cs @@ -33,8 +33,7 @@ public class MET08RESIMAPCDE : EAFLoggingUnitTesting [ClassInitialize] public static void ClassInitialize(TestContext testContext) { - if (EAFLoggingUnitTesting is null) - EAFLoggingUnitTesting = new MET08RESIMAPCDE(testContext); + EAFLoggingUnitTesting ??= new MET08RESIMAPCDE(testContext); EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(testContext.TestName, " - ClassInitialize")); string[] fileNameAndText = EAFLoggingUnitTesting.AdaptationTesting.GetCSharpText(testContext.TestName); File.WriteAllText(fileNameAndText[0], fileNameAndText[1]); @@ -44,10 +43,8 @@ public class MET08RESIMAPCDE : EAFLoggingUnitTesting [ClassCleanup()] public static void ClassCleanup() { - if (EAFLoggingUnitTesting.Logger is not null) - EAFLoggingUnitTesting.Logger.LogInformation("Cleanup"); - if (EAFLoggingUnitTesting is not null) - EAFLoggingUnitTesting.Dispose(); + EAFLoggingUnitTesting.Logger?.LogInformation("Cleanup"); + EAFLoggingUnitTesting?.Dispose(); } #if true diff --git a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.2/CDE2.cs b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.2/CDE2.cs index 38c6887..ce18633 100644 --- a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.2/CDE2.cs +++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.2/CDE2.cs @@ -32,8 +32,7 @@ public class CDE2 : EAFLoggingUnitTesting [ClassInitialize] public static void ClassInitialize(TestContext testContext) { - if (EAFLoggingUnitTesting is null) - EAFLoggingUnitTesting = new CDE2(testContext); + EAFLoggingUnitTesting ??= new CDE2(testContext); EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(testContext.TestName, " - ClassInitialize")); string[] fileNameAndText = EAFLoggingUnitTesting.AdaptationTesting.GetCSharpText(testContext.TestName); File.WriteAllText(fileNameAndText[0], fileNameAndText[1]); @@ -43,10 +42,8 @@ public class CDE2 : EAFLoggingUnitTesting [ClassCleanup()] public static void ClassCleanup() { - if (EAFLoggingUnitTesting.Logger is not null) - EAFLoggingUnitTesting.Logger.LogInformation("Cleanup"); - if (EAFLoggingUnitTesting is not null) - EAFLoggingUnitTesting.Dispose(); + EAFLoggingUnitTesting.Logger?.LogInformation("Cleanup"); + EAFLoggingUnitTesting?.Dispose(); } #if true diff --git a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.2/CDE3-EQPT.cs b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.2/CDE3-EQPT.cs index 64cd620..1ec0695 100644 --- a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.2/CDE3-EQPT.cs +++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.2/CDE3-EQPT.cs @@ -33,8 +33,7 @@ public class CDE3_EQPT : EAFLoggingUnitTesting [ClassInitialize] public static void ClassInitialize(TestContext testContext) { - if (EAFLoggingUnitTesting is null) - EAFLoggingUnitTesting = new CDE3_EQPT(testContext); + EAFLoggingUnitTesting ??= new CDE3_EQPT(testContext); EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(testContext.TestName, " - ClassInitialize")); string[] fileNameAndText = EAFLoggingUnitTesting.AdaptationTesting.GetCSharpText(testContext.TestName); File.WriteAllText(fileNameAndText[0], fileNameAndText[1]); @@ -44,10 +43,8 @@ public class CDE3_EQPT : EAFLoggingUnitTesting [ClassCleanup()] public static void ClassCleanup() { - if (EAFLoggingUnitTesting.Logger is not null) - EAFLoggingUnitTesting.Logger.LogInformation("Cleanup"); - if (EAFLoggingUnitTesting is not null) - EAFLoggingUnitTesting.Dispose(); + EAFLoggingUnitTesting.Logger?.LogInformation("Cleanup"); + EAFLoggingUnitTesting?.Dispose(); } #if true diff --git a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.2/CDE3.cs b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.2/CDE3.cs index 641c752..1ed888e 100644 --- a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.2/CDE3.cs +++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.2/CDE3.cs @@ -33,8 +33,7 @@ public class CDE3 : EAFLoggingUnitTesting [ClassInitialize] public static void ClassInitialize(TestContext testContext) { - if (EAFLoggingUnitTesting is null) - EAFLoggingUnitTesting = new CDE3(testContext); + EAFLoggingUnitTesting ??= new CDE3(testContext); EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(testContext.TestName, " - ClassInitialize")); string[] fileNameAndText = EAFLoggingUnitTesting.AdaptationTesting.GetCSharpText(testContext.TestName); File.WriteAllText(fileNameAndText[0], fileNameAndText[1]); @@ -44,10 +43,8 @@ public class CDE3 : EAFLoggingUnitTesting [ClassCleanup()] public static void ClassCleanup() { - if (EAFLoggingUnitTesting.Logger is not null) - EAFLoggingUnitTesting.Logger.LogInformation("Cleanup"); - if (EAFLoggingUnitTesting is not null) - EAFLoggingUnitTesting.Dispose(); + EAFLoggingUnitTesting.Logger?.LogInformation("Cleanup"); + EAFLoggingUnitTesting?.Dispose(); } #if true diff --git a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.2/CDE5.cs b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.2/CDE5.cs index 6552dc7..443c894 100644 --- a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.2/CDE5.cs +++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.2/CDE5.cs @@ -32,8 +32,7 @@ public class CDE5 : EAFLoggingUnitTesting [ClassInitialize] public static void ClassInitialize(TestContext testContext) { - if (EAFLoggingUnitTesting is null) - EAFLoggingUnitTesting = new CDE5(testContext); + EAFLoggingUnitTesting ??= new CDE5(testContext); EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(testContext.TestName, " - ClassInitialize")); string[] fileNameAndText = EAFLoggingUnitTesting.AdaptationTesting.GetCSharpText(testContext.TestName); File.WriteAllText(fileNameAndText[0], fileNameAndText[1]); @@ -43,10 +42,8 @@ public class CDE5 : EAFLoggingUnitTesting [ClassCleanup()] public static void ClassCleanup() { - if (EAFLoggingUnitTesting.Logger is not null) - EAFLoggingUnitTesting.Logger.LogInformation("Cleanup"); - if (EAFLoggingUnitTesting is not null) - EAFLoggingUnitTesting.Dispose(); + EAFLoggingUnitTesting.Logger?.LogInformation("Cleanup"); + EAFLoggingUnitTesting?.Dispose(); } #if true diff --git a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.2/MET08RESIMAPCDE.cs b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.2/MET08RESIMAPCDE.cs index 050cbaa..41a75b4 100644 --- a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.2/MET08RESIMAPCDE.cs +++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.2/MET08RESIMAPCDE.cs @@ -33,8 +33,7 @@ public class MET08RESIMAPCDE : EAFLoggingUnitTesting [ClassInitialize] public static void ClassInitialize(TestContext testContext) { - if (EAFLoggingUnitTesting is null) - EAFLoggingUnitTesting = new MET08RESIMAPCDE(testContext); + EAFLoggingUnitTesting ??= new MET08RESIMAPCDE(testContext); EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(testContext.TestName, " - ClassInitialize")); string[] fileNameAndText = EAFLoggingUnitTesting.AdaptationTesting.GetCSharpText(testContext.TestName); File.WriteAllText(fileNameAndText[0], fileNameAndText[1]); @@ -44,10 +43,8 @@ public class MET08RESIMAPCDE : EAFLoggingUnitTesting [ClassCleanup()] public static void ClassCleanup() { - if (EAFLoggingUnitTesting.Logger is not null) - EAFLoggingUnitTesting.Logger.LogInformation("Cleanup"); - if (EAFLoggingUnitTesting is not null) - EAFLoggingUnitTesting.Dispose(); + EAFLoggingUnitTesting.Logger?.LogInformation("Cleanup"); + EAFLoggingUnitTesting?.Dispose(); } #if true diff --git a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.3/CDE5-EQPT.cs b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.3/CDE5-EQPT.cs index 37b23e3..a8bdd09 100644 --- a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.3/CDE5-EQPT.cs +++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.3/CDE5-EQPT.cs @@ -33,8 +33,7 @@ public class CDE5_EQPT : EAFLoggingUnitTesting [ClassInitialize] public static void ClassInitialize(TestContext testContext) { - if (EAFLoggingUnitTesting is null) - EAFLoggingUnitTesting = new CDE5_EQPT(testContext); + EAFLoggingUnitTesting ??= new CDE5_EQPT(testContext); EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(testContext.TestName, " - ClassInitialize")); string[] fileNameAndText = EAFLoggingUnitTesting.AdaptationTesting.GetCSharpText(testContext.TestName); File.WriteAllText(fileNameAndText[0], fileNameAndText[1]); @@ -44,10 +43,8 @@ public class CDE5_EQPT : EAFLoggingUnitTesting [ClassCleanup()] public static void ClassCleanup() { - if (EAFLoggingUnitTesting.Logger is not null) - EAFLoggingUnitTesting.Logger.LogInformation("Cleanup"); - if (EAFLoggingUnitTesting is not null) - EAFLoggingUnitTesting.Dispose(); + EAFLoggingUnitTesting.Logger?.LogInformation("Cleanup"); + EAFLoggingUnitTesting?.Dispose(); } #if true diff --git a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.3/CDE5.cs b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.3/CDE5.cs index 7c9dcf0..e0a723e 100644 --- a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.3/CDE5.cs +++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.3/CDE5.cs @@ -33,8 +33,7 @@ public class CDE5 : EAFLoggingUnitTesting [ClassInitialize] public static void ClassInitialize(TestContext testContext) { - if (EAFLoggingUnitTesting is null) - EAFLoggingUnitTesting = new CDE5(testContext); + EAFLoggingUnitTesting ??= new CDE5(testContext); EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(testContext.TestName, " - ClassInitialize")); string[] fileNameAndText = EAFLoggingUnitTesting.AdaptationTesting.GetCSharpText(testContext.TestName); File.WriteAllText(fileNameAndText[0], fileNameAndText[1]); @@ -44,10 +43,8 @@ public class CDE5 : EAFLoggingUnitTesting [ClassCleanup()] public static void ClassCleanup() { - if (EAFLoggingUnitTesting.Logger is not null) - EAFLoggingUnitTesting.Logger.LogInformation("Cleanup"); - if (EAFLoggingUnitTesting is not null) - EAFLoggingUnitTesting.Dispose(); + EAFLoggingUnitTesting.Logger?.LogInformation("Cleanup"); + EAFLoggingUnitTesting?.Dispose(); } #if true diff --git a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.4/CDE2.cs b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.4/CDE2.cs index f5ea3ac..29d95a1 100644 --- a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.4/CDE2.cs +++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.4/CDE2.cs @@ -33,8 +33,7 @@ public class CDE2 : EAFLoggingUnitTesting [ClassInitialize] public static void ClassInitialize(TestContext testContext) { - if (EAFLoggingUnitTesting is null) - EAFLoggingUnitTesting = new CDE2(testContext); + EAFLoggingUnitTesting ??= new CDE2(testContext); EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(testContext.TestName, " - ClassInitialize")); string[] fileNameAndText = EAFLoggingUnitTesting.AdaptationTesting.GetCSharpText(testContext.TestName); File.WriteAllText(fileNameAndText[0], fileNameAndText[1]); @@ -44,10 +43,8 @@ public class CDE2 : EAFLoggingUnitTesting [ClassCleanup()] public static void ClassCleanup() { - if (EAFLoggingUnitTesting.Logger is not null) - EAFLoggingUnitTesting.Logger.LogInformation("Cleanup"); - if (EAFLoggingUnitTesting is not null) - EAFLoggingUnitTesting.Dispose(); + EAFLoggingUnitTesting.Logger?.LogInformation("Cleanup"); + EAFLoggingUnitTesting?.Dispose(); } #if true diff --git a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.4/CDE5.cs b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.4/CDE5.cs index fb68c7f..4d8586a 100644 --- a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.4/CDE5.cs +++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.4/CDE5.cs @@ -33,8 +33,7 @@ public class CDE5 : EAFLoggingUnitTesting [ClassInitialize] public static void ClassInitialize(TestContext testContext) { - if (EAFLoggingUnitTesting is null) - EAFLoggingUnitTesting = new CDE5(testContext); + EAFLoggingUnitTesting ??= new CDE5(testContext); EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(testContext.TestName, " - ClassInitialize")); string[] fileNameAndText = EAFLoggingUnitTesting.AdaptationTesting.GetCSharpText(testContext.TestName); File.WriteAllText(fileNameAndText[0], fileNameAndText[1]); @@ -44,10 +43,8 @@ public class CDE5 : EAFLoggingUnitTesting [ClassCleanup()] public static void ClassCleanup() { - if (EAFLoggingUnitTesting.Logger is not null) - EAFLoggingUnitTesting.Logger.LogInformation("Cleanup"); - if (EAFLoggingUnitTesting is not null) - EAFLoggingUnitTesting.Dispose(); + EAFLoggingUnitTesting.Logger?.LogInformation("Cleanup"); + EAFLoggingUnitTesting?.Dispose(); } #if true diff --git a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.4/MET08RESIMAPCDE.cs b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.4/MET08RESIMAPCDE.cs index b1f40d5..1736c00 100644 --- a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.4/MET08RESIMAPCDE.cs +++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.4/MET08RESIMAPCDE.cs @@ -33,8 +33,7 @@ public class MET08RESIMAPCDE : EAFLoggingUnitTesting [ClassInitialize] public static void ClassInitialize(TestContext testContext) { - if (EAFLoggingUnitTesting is null) - EAFLoggingUnitTesting = new MET08RESIMAPCDE(testContext); + EAFLoggingUnitTesting ??= new MET08RESIMAPCDE(testContext); EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(testContext.TestName, " - ClassInitialize")); string[] fileNameAndText = EAFLoggingUnitTesting.AdaptationTesting.GetCSharpText(testContext.TestName); File.WriteAllText(fileNameAndText[0], fileNameAndText[1]); @@ -44,10 +43,8 @@ public class MET08RESIMAPCDE : EAFLoggingUnitTesting [ClassCleanup()] public static void ClassCleanup() { - if (EAFLoggingUnitTesting.Logger is not null) - EAFLoggingUnitTesting.Logger.LogInformation("Cleanup"); - if (EAFLoggingUnitTesting is not null) - EAFLoggingUnitTesting.Dispose(); + EAFLoggingUnitTesting.Logger?.LogInformation("Cleanup"); + EAFLoggingUnitTesting?.Dispose(); } #if true diff --git a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.47.1/CDE2.cs b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.47.1/CDE2.cs new file mode 100644 index 0000000..d53db87 --- /dev/null +++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.47.1/CDE2.cs @@ -0,0 +1,63 @@ +using Adaptation._Tests.Shared; +using Microsoft.Extensions.Logging; +using Microsoft.VisualStudio.TestTools.UnitTesting; +using System; +using System.Diagnostics; +using System.IO; +using System.Reflection; + +namespace Adaptation._Tests.CreateSelfDescription.Staging.v2_47_1; + +[TestClass] +public class CDE2 : EAFLoggingUnitTesting +{ + +#pragma warning disable CA2254 +#pragma warning disable IDE0060 + + internal static string DummyRoot { get; private set; } + internal static CDE2 EAFLoggingUnitTesting { get; private set; } + + static CDE2() => DummyRoot = @"\\messv02ecc1.ec.local\EC_Characterization_Si\Dummy"; + + public CDE2() : base(DummyRoot, testContext: null, declaringType: null, skipEquipmentDictionary: false) + { + if (EAFLoggingUnitTesting is null) + throw new Exception(); + } + + public CDE2(TestContext testContext) : base(DummyRoot, testContext, new StackFrame().GetMethod().DeclaringType, skipEquipmentDictionary: false) + { + } + + [ClassInitialize] + public static void ClassInitialize(TestContext testContext) + { + EAFLoggingUnitTesting ??= new CDE2(testContext); + EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(testContext.TestName, " - ClassInitialize")); + string[] fileNameAndText = EAFLoggingUnitTesting.AdaptationTesting.GetCSharpText(testContext.TestName); + File.WriteAllText(fileNameAndText[0], fileNameAndText[1]); + File.WriteAllText(fileNameAndText[2], fileNameAndText[3]); + } + + [ClassCleanup()] + public static void ClassCleanup() + { + EAFLoggingUnitTesting.Logger?.LogInformation("Cleanup"); + EAFLoggingUnitTesting?.Dispose(); + } + +#if true + [Ignore] +#endif + [TestMethod] + public void Staging__v2_47_1__CDE2__txt() + { + string check = "*.txt"; + MethodBase methodBase = new StackFrame().GetMethod(); + EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration")); + _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting); + EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); + } + +} \ No newline at end of file diff --git a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.47.1/CDE5.cs b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.47.1/CDE5.cs new file mode 100644 index 0000000..705d44b --- /dev/null +++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.47.1/CDE5.cs @@ -0,0 +1,63 @@ +using Adaptation._Tests.Shared; +using Microsoft.Extensions.Logging; +using Microsoft.VisualStudio.TestTools.UnitTesting; +using System; +using System.Diagnostics; +using System.IO; +using System.Reflection; + +namespace Adaptation._Tests.CreateSelfDescription.Staging.v2_47_1; + +[TestClass] +public class CDE5 : EAFLoggingUnitTesting +{ + +#pragma warning disable CA2254 +#pragma warning disable IDE0060 + + internal static string DummyRoot { get; private set; } + internal static CDE5 EAFLoggingUnitTesting { get; private set; } + + static CDE5() => DummyRoot = @"\\messv02ecc1.ec.local\EC_Characterization_Si\Dummy"; + + public CDE5() : base(DummyRoot, testContext: null, declaringType: null, skipEquipmentDictionary: false) + { + if (EAFLoggingUnitTesting is null) + throw new Exception(); + } + + public CDE5(TestContext testContext) : base(DummyRoot, testContext, new StackFrame().GetMethod().DeclaringType, skipEquipmentDictionary: false) + { + } + + [ClassInitialize] + public static void ClassInitialize(TestContext testContext) + { + EAFLoggingUnitTesting ??= new CDE5(testContext); + EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(testContext.TestName, " - ClassInitialize")); + string[] fileNameAndText = EAFLoggingUnitTesting.AdaptationTesting.GetCSharpText(testContext.TestName); + File.WriteAllText(fileNameAndText[0], fileNameAndText[1]); + File.WriteAllText(fileNameAndText[2], fileNameAndText[3]); + } + + [ClassCleanup()] + public static void ClassCleanup() + { + EAFLoggingUnitTesting.Logger?.LogInformation("Cleanup"); + EAFLoggingUnitTesting?.Dispose(); + } + +#if true + [Ignore] +#endif + [TestMethod] + public void Staging__v2_47_1__CDE5__RsM() + { + string check = "*.RsM"; + MethodBase methodBase = new StackFrame().GetMethod(); + EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration")); + _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting); + EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); + } + +} \ No newline at end of file diff --git a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.47.1/MET08RESIMAPCDE.cs b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.47.1/MET08RESIMAPCDE.cs new file mode 100644 index 0000000..3ec5144 --- /dev/null +++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.47.1/MET08RESIMAPCDE.cs @@ -0,0 +1,180 @@ +using Adaptation._Tests.Shared; +using Microsoft.Extensions.Logging; +using Microsoft.VisualStudio.TestTools.UnitTesting; +using System; +using System.Diagnostics; +using System.IO; +using System.Reflection; + +namespace Adaptation._Tests.CreateSelfDescription.Staging.v2_47_1; + +[TestClass] +public class MET08RESIMAPCDE : EAFLoggingUnitTesting +{ + +#pragma warning disable CA2254 +#pragma warning disable IDE0060 + + internal static string DummyRoot { get; private set; } + internal static MET08RESIMAPCDE EAFLoggingUnitTesting { get; private set; } + + static MET08RESIMAPCDE() => DummyRoot = @"\\messv02ecc1.ec.local\EC_Characterization_Si\Dummy"; + + public MET08RESIMAPCDE() : base(DummyRoot, testContext: null, declaringType: null, skipEquipmentDictionary: false) + { + if (EAFLoggingUnitTesting is null) + throw new Exception(); + } + + public MET08RESIMAPCDE(TestContext testContext) : base(DummyRoot, testContext, new StackFrame().GetMethod().DeclaringType, skipEquipmentDictionary: false) + { + } + + [ClassInitialize] + public static void ClassInitialize(TestContext testContext) + { + EAFLoggingUnitTesting ??= new MET08RESIMAPCDE(testContext); + EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(testContext.TestName, " - ClassInitialize")); + string[] fileNameAndText = EAFLoggingUnitTesting.AdaptationTesting.GetCSharpText(testContext.TestName); + File.WriteAllText(fileNameAndText[0], fileNameAndText[1]); + File.WriteAllText(fileNameAndText[2], fileNameAndText[3]); + } + + [ClassCleanup()] + public static void ClassCleanup() + { + EAFLoggingUnitTesting.Logger?.LogInformation("Cleanup"); + EAFLoggingUnitTesting?.Dispose(); + } + +#if true + [Ignore] +#endif + [TestMethod] + public void Staging__v2_47_1__MET08RESIMAPCDE__MoveMatchingFiles() + { + string check = "*.pdsf"; + MethodBase methodBase = new StackFrame().GetMethod(); + EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration")); + _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting); + EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); + } + +#if true + [Ignore] +#endif + [TestMethod] + public void Staging__v2_47_1__MET08RESIMAPCDE__OpenInsightMetrologyViewer() + { + string check = "*.pdsf"; + MethodBase methodBase = new StackFrame().GetMethod(); + EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration")); + _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting); + EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); + } + +#if true + [Ignore] +#endif + [TestMethod] + public void Staging__v2_47_1__MET08RESIMAPCDE__IQSSi() + { + string check = "*.pdsf"; + MethodBase methodBase = new StackFrame().GetMethod(); + EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration")); + _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting); + EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); + } + +#if true + [Ignore] +#endif + [TestMethod] + public void Staging__v2_47_1__MET08RESIMAPCDE__OpenInsight() + { + string check = "*.pdsf"; + MethodBase methodBase = new StackFrame().GetMethod(); + EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration")); + _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting); + EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); + } + +#if true + [Ignore] +#endif + [TestMethod] + public void Staging__v2_47_1__MET08RESIMAPCDE__OpenInsightMetrologyViewerAttachments() + { + string check = "*.pdsf"; + MethodBase methodBase = new StackFrame().GetMethod(); + EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration")); + _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting); + EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); + } + +#if true + [Ignore] +#endif + [TestMethod] + public void Staging__v2_47_1__MET08RESIMAPCDE__APC() + { + string check = "*.pdsf"; + MethodBase methodBase = new StackFrame().GetMethod(); + EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration")); + _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting); + EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); + } + +#if true + [Ignore] +#endif + [TestMethod] + public void Staging__v2_47_1__MET08RESIMAPCDE__SPaCe() + { + string check = "*.pdsf"; + MethodBase methodBase = new StackFrame().GetMethod(); + EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration")); + _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting); + EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); + } + +#if true + [Ignore] +#endif + [TestMethod] + public void Staging__v2_47_1__MET08RESIMAPCDE__Processed() + { + string check = "*.pdsf"; + MethodBase methodBase = new StackFrame().GetMethod(); + EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration")); + _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting); + EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); + } + +#if true + [Ignore] +#endif + [TestMethod] + public void Staging__v2_47_1__MET08RESIMAPCDE__Archive() + { + string check = "*.pdsf"; + MethodBase methodBase = new StackFrame().GetMethod(); + EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration")); + _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting); + EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); + } + +#if true + [Ignore] +#endif + [TestMethod] + public void Staging__v2_47_1__MET08RESIMAPCDE__Dummy() + { + string check = "637400762024374000.zip"; + MethodBase methodBase = new StackFrame().GetMethod(); + EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration")); + _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting); + EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); + } + +} \ No newline at end of file diff --git a/Adaptation/_Tests/Extract/Staging/v2.43.4/CDE2.cs b/Adaptation/_Tests/Extract/Staging/v2.43.4/CDE2.cs index 47dfbd5..cf9dbae 100644 --- a/Adaptation/_Tests/Extract/Staging/v2.43.4/CDE2.cs +++ b/Adaptation/_Tests/Extract/Staging/v2.43.4/CDE2.cs @@ -29,6 +29,9 @@ public class CDE2 [TestMethod] public void Staging__v2_43_4__CDE2__txt() => _CDE2.Staging__v2_43_4__CDE2__txt(); +#if true + [Ignore] +#endif [TestMethod] public void Staging__v2_43_4__CDE2__txt637953079123289252__Normal() { diff --git a/Adaptation/_Tests/Extract/Staging/v2.43.4/CDE5.cs b/Adaptation/_Tests/Extract/Staging/v2.43.4/CDE5.cs index eb62f27..c69a982 100644 --- a/Adaptation/_Tests/Extract/Staging/v2.43.4/CDE5.cs +++ b/Adaptation/_Tests/Extract/Staging/v2.43.4/CDE5.cs @@ -29,6 +29,9 @@ public class CDE5 [TestMethod] public void Staging__v2_43_4__CDE5__RsM() => _CDE5.Staging__v2_43_4__CDE5__RsM(); +#if true + [Ignore] +#endif [TestMethod] public void Staging__v2_43_4__CDE5__RsM637952212190000000__Normal() { diff --git a/Adaptation/_Tests/Extract/Staging/v2.43.4/MET08RESIMAPCDE.cs b/Adaptation/_Tests/Extract/Staging/v2.43.4/MET08RESIMAPCDE.cs index df034e2..9b90fd5 100644 --- a/Adaptation/_Tests/Extract/Staging/v2.43.4/MET08RESIMAPCDE.cs +++ b/Adaptation/_Tests/Extract/Staging/v2.43.4/MET08RESIMAPCDE.cs @@ -30,6 +30,9 @@ public class MET08RESIMAPCDE [TestMethod] public void Staging__v2_43_4__MET08RESIMAPCDE__MoveMatchingFiles() => _MET08RESIMAPCDE.Staging__v2_43_4__MET08RESIMAPCDE__MoveMatchingFiles(); +#if true + [Ignore] +#endif [TestMethod] public void Staging__v2_43_4__MET08RESIMAPCDE__MoveMatchingFiles637953064190000000__Normal() { diff --git a/Adaptation/_Tests/Extract/Staging/v2.47.1/CDE2.cs b/Adaptation/_Tests/Extract/Staging/v2.47.1/CDE2.cs new file mode 100644 index 0000000..03243bd --- /dev/null +++ b/Adaptation/_Tests/Extract/Staging/v2.47.1/CDE2.cs @@ -0,0 +1,54 @@ +using Adaptation.Shared; +using Adaptation.Shared.Methods; +using Microsoft.VisualStudio.TestTools.UnitTesting; +using System; +using System.Diagnostics; +using System.Reflection; + +namespace Adaptation._Tests.Extract.Staging.v2_47_1; + +[TestClass] +public class CDE2 +{ + +#pragma warning disable CA2254 +#pragma warning disable IDE0060 + + private static CreateSelfDescription.Staging.v2_47_1.CDE2 _CDE2; + + [ClassInitialize] + public static void ClassInitialize(TestContext testContext) + { + CreateSelfDescription.Staging.v2_47_1.CDE2.ClassInitialize(testContext); + _CDE2 = CreateSelfDescription.Staging.v2_47_1.CDE2.EAFLoggingUnitTesting; + } + +#if true + [Ignore] +#endif + [TestMethod] + public void Staging__v2_47_1__CDE2__txt() => _CDE2.Staging__v2_47_1__CDE2__txt(); + +#if true + [Ignore] +#endif + [TestMethod] + public void Staging__v2_47_1__CDE2__txt637953079123289252__Normal() + { + DateTime dateTime; + string check = "*.txt"; + bool validatePDSF = false; + _CDE2.Staging__v2_47_1__CDE2__txt(); + MethodBase methodBase = new StackFrame().GetMethod(); + Assert.IsFalse(string.IsNullOrEmpty(_CDE2.AdaptationTesting.TestContext.FullyQualifiedTestClassName)); + string[] variables = _CDE2.AdaptationTesting.GetVariables(methodBase, check, validatePDSF); + IFileRead fileRead = _CDE2.AdaptationTesting.Get(methodBase, sourceFileLocation: variables[2], sourceFileFilter: variables[3], useCyclicalForDescription: false); + Logistics logistics = new(fileRead); + _ = Shared.AdaptationTesting.ReExtractCompareUpdatePassDirectory(variables, fileRead, logistics, validatePDSF); + dateTime = FileHandlers.RsM.ProcessData.GetDateTime(logistics, string.Empty); + Assert.IsTrue(dateTime == logistics.DateTimeFromSequence); + dateTime = FileHandlers.RsM.ProcessData.GetDateTime(logistics, "00:13 09/27/38"); + Assert.IsTrue(dateTime == logistics.DateTimeFromSequence); + } + +} \ No newline at end of file diff --git a/Adaptation/_Tests/Extract/Staging/v2.47.1/CDE5.cs b/Adaptation/_Tests/Extract/Staging/v2.47.1/CDE5.cs new file mode 100644 index 0000000..ac5bf63 --- /dev/null +++ b/Adaptation/_Tests/Extract/Staging/v2.47.1/CDE5.cs @@ -0,0 +1,54 @@ +using Adaptation.Shared; +using Adaptation.Shared.Methods; +using Microsoft.VisualStudio.TestTools.UnitTesting; +using System; +using System.Diagnostics; +using System.Reflection; + +namespace Adaptation._Tests.Extract.Staging.v2_47_1; + +[TestClass] +public class CDE5 +{ + +#pragma warning disable CA2254 +#pragma warning disable IDE0060 + + private static CreateSelfDescription.Staging.v2_47_1.CDE5 _CDE5; + + [ClassInitialize] + public static void ClassInitialize(TestContext testContext) + { + CreateSelfDescription.Staging.v2_47_1.CDE5.ClassInitialize(testContext); + _CDE5 = CreateSelfDescription.Staging.v2_47_1.CDE5.EAFLoggingUnitTesting; + } + +#if true + [Ignore] +#endif + [TestMethod] + public void Staging__v2_47_1__CDE5__RsM() => _CDE5.Staging__v2_47_1__CDE5__RsM(); + +#if true + [Ignore] +#endif + [TestMethod] + public void Staging__v2_47_1__CDE5__RsM637952212190000000__Normal() + { + DateTime dateTime; + string check = "*.RsM"; + bool validatePDSF = false; + _CDE5.Staging__v2_47_1__CDE5__RsM(); + MethodBase methodBase = new StackFrame().GetMethod(); + Assert.IsFalse(string.IsNullOrEmpty(_CDE5.AdaptationTesting.TestContext.FullyQualifiedTestClassName)); + string[] variables = _CDE5.AdaptationTesting.GetVariables(methodBase, check, validatePDSF); + IFileRead fileRead = _CDE5.AdaptationTesting.Get(methodBase, sourceFileLocation: variables[2], sourceFileFilter: variables[3], useCyclicalForDescription: false); + Logistics logistics = new(fileRead); + _ = Shared.AdaptationTesting.ReExtractCompareUpdatePassDirectory(variables, fileRead, logistics, validatePDSF); + dateTime = FileHandlers.RsM.ProcessData.GetDateTime(logistics, string.Empty); + Assert.IsTrue(dateTime == logistics.DateTimeFromSequence); + dateTime = FileHandlers.RsM.ProcessData.GetDateTime(logistics, "00:13 09/27/38"); + Assert.IsTrue(dateTime == logistics.DateTimeFromSequence); + } + +} \ No newline at end of file diff --git a/Adaptation/_Tests/Extract/Staging/v2.47.1/MET08RESIMAPCDE.cs b/Adaptation/_Tests/Extract/Staging/v2.47.1/MET08RESIMAPCDE.cs new file mode 100644 index 0000000..a396b7c --- /dev/null +++ b/Adaptation/_Tests/Extract/Staging/v2.47.1/MET08RESIMAPCDE.cs @@ -0,0 +1,124 @@ +using Adaptation._Tests.Shared; +using Adaptation.Shared; +using Adaptation.Shared.Methods; +using Microsoft.VisualStudio.TestTools.UnitTesting; +using System; +using System.Diagnostics; +using System.Reflection; + +namespace Adaptation._Tests.Extract.Staging.v2_47_1; + +[TestClass] +public class MET08RESIMAPCDE +{ + +#pragma warning disable CA2254 +#pragma warning disable IDE0060 + + private static CreateSelfDescription.Staging.v2_47_1.MET08RESIMAPCDE _MET08RESIMAPCDE; + + [ClassInitialize] + public static void ClassInitialize(TestContext testContext) + { + CreateSelfDescription.Staging.v2_47_1.MET08RESIMAPCDE.ClassInitialize(testContext); + _MET08RESIMAPCDE = CreateSelfDescription.Staging.v2_47_1.MET08RESIMAPCDE.EAFLoggingUnitTesting; + } + +#if true + [Ignore] +#endif + [TestMethod] + public void Staging__v2_47_1__MET08RESIMAPCDE__MoveMatchingFiles() => _MET08RESIMAPCDE.Staging__v2_47_1__MET08RESIMAPCDE__MoveMatchingFiles(); + +#if true + [Ignore] +#endif + [TestMethod] + public void Staging__v2_47_1__MET08RESIMAPCDE__MoveMatchingFiles637953064190000000__Normal() + { + DateTime dateTime; + string check = "*"; + bool validatePDSF = false; + _MET08RESIMAPCDE.Staging__v2_47_1__MET08RESIMAPCDE__MoveMatchingFiles(); + MethodBase methodBase = new StackFrame().GetMethod(); + Assert.IsFalse(string.IsNullOrEmpty(_MET08RESIMAPCDE.AdaptationTesting.TestContext.FullyQualifiedTestClassName)); + string[] variables = _MET08RESIMAPCDE.AdaptationTesting.GetVariables(methodBase, check, validatePDSF); + IFileRead fileRead = _MET08RESIMAPCDE.AdaptationTesting.Get(methodBase, sourceFileLocation: variables[2], sourceFileFilter: variables[3], useCyclicalForDescription: false); + Logistics logistics = new(fileRead); + _ = AdaptationTesting.ReExtractCompareUpdatePassDirectory(variables, fileRead, logistics, validatePDSF); + dateTime = FileHandlers.RsM.ProcessData.GetDateTime(logistics, string.Empty); + Assert.IsTrue(dateTime == logistics.DateTimeFromSequence); + dateTime = FileHandlers.RsM.ProcessData.GetDateTime(logistics, "00:13 09/27/38"); + Assert.IsTrue(dateTime == logistics.DateTimeFromSequence); + } + +#if true + [Ignore] +#endif + [TestMethod] + public void Staging__v2_47_1__MET08RESIMAPCDE__OpenInsightMetrologyViewer() => _MET08RESIMAPCDE.Staging__v2_47_1__MET08RESIMAPCDE__OpenInsightMetrologyViewer(); + +#if true + [Ignore] +#endif + [TestMethod] + public void Staging__v2_47_1__MET08RESIMAPCDE__IQSSi() => _MET08RESIMAPCDE.Staging__v2_47_1__MET08RESIMAPCDE__IQSSi(); + +#if true + [Ignore] +#endif + [TestMethod] + public void Staging__v2_47_1__MET08RESIMAPCDE__OpenInsight() => _MET08RESIMAPCDE.Staging__v2_47_1__MET08RESIMAPCDE__OpenInsight(); + +#if true + [Ignore] +#endif + [TestMethod] + public void Staging__v2_47_1__MET08RESIMAPCDE__OpenInsight638054501710000000__IqsSql() + { + string check = "*.pdsf"; + MethodBase methodBase = new StackFrame().GetMethod(); + _MET08RESIMAPCDE.Staging__v2_47_1__MET08RESIMAPCDE__OpenInsight(); + string[] variables = _MET08RESIMAPCDE.AdaptationTesting.GetVariables(methodBase, check, validatePDSF: false); + IFileRead fileRead = _MET08RESIMAPCDE.AdaptationTesting.Get(methodBase, sourceFileLocation: variables[2], sourceFileFilter: variables[3], useCyclicalForDescription: false); + Logistics logistics = new(fileRead); + _ = AdaptationTesting.ReExtractCompareUpdatePassDirectory(variables, fileRead, logistics); + } + +#if true + [Ignore] +#endif + [TestMethod] + public void Staging__v2_47_1__MET08RESIMAPCDE__OpenInsightMetrologyViewerAttachments() => _MET08RESIMAPCDE.Staging__v2_47_1__MET08RESIMAPCDE__OpenInsightMetrologyViewerAttachments(); + +#if true + [Ignore] +#endif + [TestMethod] + public void Staging__v2_47_1__MET08RESIMAPCDE__APC() => _MET08RESIMAPCDE.Staging__v2_47_1__MET08RESIMAPCDE__APC(); + +#if true + [Ignore] +#endif + [TestMethod] + public void Staging__v2_47_1__MET08RESIMAPCDE__SPaCe() => _MET08RESIMAPCDE.Staging__v2_47_1__MET08RESIMAPCDE__SPaCe(); + +#if true + [Ignore] +#endif + [TestMethod] + public void Staging__v2_47_1__MET08RESIMAPCDE__Processed() => _MET08RESIMAPCDE.Staging__v2_47_1__MET08RESIMAPCDE__Processed(); + +#if true + [Ignore] +#endif + [TestMethod] + public void Staging__v2_47_1__MET08RESIMAPCDE__Archive() => _MET08RESIMAPCDE.Staging__v2_47_1__MET08RESIMAPCDE__Archive(); + +#if true + [Ignore] +#endif + [TestMethod] + public void Staging__v2_47_1__MET08RESIMAPCDE__Dummy() => _MET08RESIMAPCDE.Staging__v2_47_1__MET08RESIMAPCDE__Dummy(); + +} \ No newline at end of file diff --git a/Adaptation/_Tests/Shared/AdaptationTesting.cs b/Adaptation/_Tests/Shared/AdaptationTesting.cs index 7e7c8cc..c011f8e 100644 --- a/Adaptation/_Tests/Shared/AdaptationTesting.cs +++ b/Adaptation/_Tests/Shared/AdaptationTesting.cs @@ -621,14 +621,10 @@ public class AdaptationTesting : ISMTP result = JsonSerializer.Deserialize(json, jsonSerializerOptions); if (string.IsNullOrEmpty(result.SourceFileFilter)) result.SourceFileFilter = string.Empty; - if (result.ErrorTargetFileLocation is null) - result.ErrorTargetFileLocation = string.Empty; - if (result.SourceFileLocation is null) - result.SourceFileLocation = string.Empty; - if (result.TargetFileLocation is null) - result.TargetFileLocation = string.Empty; - if (result.FolderAgeCheckIndividualSubFolders is null) - result.FolderAgeCheckIndividualSubFolders = false; + result.ErrorTargetFileLocation ??= string.Empty; + result.SourceFileLocation ??= string.Empty; + result.TargetFileLocation ??= string.Empty; + result.FolderAgeCheckIndividualSubFolders ??= false; result.ConnectionSettings = new List(); result.SourceFileFilters = result.SourceFileFilter.Split('|').ToList(); if (componentsCellComponentCellComponent.Equipment?.ConnectionSettings is not null) diff --git a/Adaptation/_Tests/Shared/UnitTesting.cs b/Adaptation/_Tests/Shared/UnitTesting.cs index 28df790..38cf36f 100644 --- a/Adaptation/_Tests/Shared/UnitTesting.cs +++ b/Adaptation/_Tests/Shared/UnitTesting.cs @@ -55,8 +55,7 @@ public class UnitTesting _IsEnvironment = new IsEnvironment(testCategory); } } - if (_IsEnvironment is null) - _IsEnvironment = new IsEnvironment(processesCount: null, nullASPNetCoreEnvironmentIsDevelopment: Debugger.IsAttached, nullASPNetCoreEnvironmentIsProduction: !Debugger.IsAttached); + _IsEnvironment ??= new IsEnvironment(processesCount: null, nullASPNetCoreEnvironmentIsDevelopment: Debugger.IsAttached, nullASPNetCoreEnvironmentIsProduction: !Debugger.IsAttached); } } diff --git a/Adaptation/_Tests/Static/RsM.cs b/Adaptation/_Tests/Static/RsM.cs index 9bea5d3..e77ebe3 100644 --- a/Adaptation/_Tests/Static/RsM.cs +++ b/Adaptation/_Tests/Static/RsM.cs @@ -27,19 +27,13 @@ public class RsM : LoggingUnitTesting, IDisposable } [ClassInitialize] - public static void ClassInitialize(TestContext testContext) - { - if (LoggingUnitTesting is null) - LoggingUnitTesting = new RsM(testContext); - } + public static void ClassInitialize(TestContext testContext) => LoggingUnitTesting ??= new RsM(testContext); [ClassCleanup()] public static void ClassCleanup() { - if (LoggingUnitTesting.Logger is not null) - LoggingUnitTesting.Logger.LogInformation("Cleanup"); - if (LoggingUnitTesting is not null) - LoggingUnitTesting.Dispose(); + LoggingUnitTesting.Logger?.LogInformation("Cleanup"); + LoggingUnitTesting?.Dispose(); } [TestMethod] diff --git a/Adaptation/_Tests/Static/txt.cs b/Adaptation/_Tests/Static/txt.cs index 94a2bef..debd2f9 100644 --- a/Adaptation/_Tests/Static/txt.cs +++ b/Adaptation/_Tests/Static/txt.cs @@ -27,19 +27,13 @@ public class TXT : LoggingUnitTesting, IDisposable } [ClassInitialize] - public static void ClassInitialize(TestContext testContext) - { - if (LoggingUnitTesting is null) - LoggingUnitTesting = new TXT(testContext); - } + public static void ClassInitialize(TestContext testContext) => LoggingUnitTesting ??= new TXT(testContext); [ClassCleanup()] public static void ClassCleanup() { - if (LoggingUnitTesting.Logger is not null) - LoggingUnitTesting.Logger.LogInformation("Cleanup"); - if (LoggingUnitTesting is not null) - LoggingUnitTesting.Dispose(); + LoggingUnitTesting.Logger?.LogInformation("Cleanup"); + LoggingUnitTesting?.Dispose(); } [TestMethod] diff --git a/Adaptation/appsettings.Development.json b/Adaptation/appsettings.Development.json index 923c216..f7e0b36 100644 --- a/Adaptation/appsettings.Development.json +++ b/Adaptation/appsettings.Development.json @@ -59,7 +59,7 @@ "Password": "tLIPgqM6R9hVQOteRnTHwPqIg3Zxv8CohTjFkjkFz8k=" }, { - "Use": true, + "Use": false, "Letter": "k", "Share": "\\\\messdv002.na.infineon.com\\GaN_NEC\\Characterization", "User": "INFINEON\\MESGaNEAF", @@ -80,35 +80,35 @@ "Password": "CUGygiPwahy4U3j+6KqqoMZ08STyVDR1rKm6MwPpt00=" }, { - "Use": true, + "Use": false, "Letter": "n", "Share": "\\\\10.95.154.22\\C", "User": "10.95.154.22\\Aixtron", "Password": "DYVBOr2HJdB7KOhd/IFhLA==" }, { - "Use": true, + "Use": false, "Letter": "o", "Share": "\\\\10.95.154.16\\Aixtron", "User": "10.95.154.16\\Aixtron", "Password": "DYVBOr2HJdB7KOhd/IFhLA==" }, { - "Use": true, + "Use": false, "Letter": "p", "Share": "\\\\10.95.154.15\\Aixtron", "User": "10.95.154.15\\Aixtron", "Password": "DYVBOr2HJdB7KOhd/IFhLA==" }, { - "Use": true, + "Use": false, "Letter": "q", "Share": "\\\\10.95.154.21\\Data", "User": "10.95.154.21\\XRD04Admin", "Password": "v1NOsEOCvbnhzKabspPcCQ==" }, { - "Use": true, + "Use": false, "Letter": "r", "Share": "\\\\10.95.154.23\\Data", "User": "\"10.95.154.23\\infineon us\"", diff --git a/Adaptation/appsettings.json b/Adaptation/appsettings.json index bfeb1ac..d15d437 100644 --- a/Adaptation/appsettings.json +++ b/Adaptation/appsettings.json @@ -59,7 +59,7 @@ "Password": "tLIPgqM6R9hVQOteRnTHwPqIg3Zxv8CohTjFkjkFz8k=" }, { - "Use": true, + "Use": false, "Letter": "k", "Share": "\\\\messdv002.na.infineon.com\\GaN_NEC\\Characterization", "User": "INFINEON\\MESGaNEAF", @@ -80,35 +80,35 @@ "Password": "CUGygiPwahy4U3j+6KqqoMZ08STyVDR1rKm6MwPpt00=" }, { - "Use": true, + "Use": false, "Letter": "n", "Share": "\\\\10.95.154.22\\C", "User": "10.95.154.22\\Aixtron", "Password": "DYVBOr2HJdB7KOhd/IFhLA==" }, { - "Use": true, + "Use": false, "Letter": "o", "Share": "\\\\10.95.154.16\\Aixtron", "User": "10.95.154.16\\Aixtron", "Password": "DYVBOr2HJdB7KOhd/IFhLA==" }, { - "Use": true, + "Use": false, "Letter": "p", "Share": "\\\\10.95.154.15\\Aixtron", "User": "10.95.154.15\\Aixtron", "Password": "DYVBOr2HJdB7KOhd/IFhLA==" }, { - "Use": true, + "Use": false, "Letter": "q", "Share": "\\\\10.95.154.21\\Data", "User": "10.95.154.21\\XRD04Admin", "Password": "v1NOsEOCvbnhzKabspPcCQ==" }, { - "Use": true, + "Use": false, "Letter": "r", "Share": "\\\\10.95.154.23\\Data", "User": "\"10.95.154.23\\infineon us\"", diff --git a/Adaptation/package.json b/Adaptation/package.json index 763fdfd..b807d44 100644 --- a/Adaptation/package.json +++ b/Adaptation/package.json @@ -1,17 +1,18 @@ { "scripts": { - "AA-CreateSelfDescription.Staging.v2_43_4-CDE2_EQPT": "dotnet test --runtime win-x64 --no-build --filter \"FullyQualifiedName~Adaptation._Tests.CreateSelfDescription.Staging.v2_43_4 & ClassName~CDE2_EQPT\" -- TestRunParameters.Parameter(name=\\\"WaitFor\\\", value=\\\"Debugger.IsAttached\\\")", - "AB-CreateSelfDescription.Staging.v2_43_4-CDE5_EQPT": "dotnet test --runtime win-x64 --no-build --filter \"FullyQualifiedName~Adaptation._Tests.CreateSelfDescription.Staging.v2_43_4 & ClassName~CDE5_EQPT\" -- TestRunParameters.Parameter(name=\\\"WaitFor\\\", value=\\\"Debugger.IsAttached\\\")", - "BA-CreateSelfDescription.Staging.v2_43_4-CDE2": "dotnet test --runtime win-x64 --no-build --filter \"FullyQualifiedName~Adaptation._Tests.CreateSelfDescription.Staging.v2_43_4 & ClassName~CDE2\" -- TestRunParameters.Parameter(name=\\\"WaitFor\\\", value=\\\"Debugger.IsAttached\\\")", - "BB-CreateSelfDescription.Staging.v2_43_4-CDE5": "dotnet test --runtime win-x64 --no-build --filter \"FullyQualifiedName~Adaptation._Tests.CreateSelfDescription.Staging.v2_43_4 & ClassName~CDE5\" -- TestRunParameters.Parameter(name=\\\"WaitFor\\\", value=\\\"Debugger.IsAttached\\\")", - "CA-CreateSelfDescription.Staging.v2_43_4-MET08RESIMAPCDE": "dotnet test --runtime win-x64 --no-build --filter \"FullyQualifiedName~Adaptation._Tests.CreateSelfDescription.Staging.v2_43_4 & ClassName~MET08RESIMAPCDE\" -- TestRunParameters.Parameter(name=\\\"WaitFor\\\", value=\\\"Debugger.IsAttached\\\")", - "DA-CreateSelfDescription.Staging.v2_43_4": "dotnet test --runtime win-x64 --no-build --filter \"FullyQualifiedName~Adaptation._Tests.CreateSelfDescription.Staging.v2_43_4\" -- TestRunParameters.Parameter(name=\\\"WaitFor\\\", value=\\\"Debugger.IsAttached\\\")", - "EA-Extract.Staging.v2_43_4-CDE2_EQPT-Staging__v2_43_4__CDE2_EQPT__DownloadRsMFile637953072332628623__Normal": "dotnet test --runtime win-x64 --no-build --filter \"FullyQualifiedName~Adaptation._Tests.Extract.Staging.v2_43_4 & ClassName~CDE2_EQPT & Name~Staging__v2_43_4__CDE2_EQPT__DownloadRsMFile637953072332628623__Normal\" -- TestRunParameters.Parameter(name=\\\"WaitFor\\\", value=\\\"Debugger.IsAttached\\\")", - "EB-Extract.Staging.v2_43_4-CDE5_EQPT-Staging__v2_43_4__CDE5_EQPT__DownloadRsMFile637953072332628623__Normal": "dotnet test --runtime win-x64 --no-build --filter \"FullyQualifiedName~Adaptation._Tests.Extract.Staging.v2_43_4 & ClassName~CDE5_EQPT & Name~Staging__v2_43_4__CDE5_EQPT__DownloadRsMFile637953072332628623__Normal\" -- TestRunParameters.Parameter(name=\\\"WaitFor\\\", value=\\\"Debugger.IsAttached\\\")", - "FA-Extract.Staging.v2_43_4-CDE2-Staging__v2_43_4__CDE2__txt637953079123289252__Normal": "dotnet test --runtime win-x64 --no-build --filter \"FullyQualifiedName~Adaptation._Tests.Extract.Staging.v2_43_4 & ClassName~CDE2 & Name~Staging__v2_43_4__CDE2__txt637953079123289252__Normal\" -- TestRunParameters.Parameter(name=\\\"WaitFor\\\", value=\\\"Debugger.IsAttached\\\")", - "FB-Extract.Staging.v2_43_4-CDE5-Staging__v2_43_4__CDE5__RsM637952212190000000__Normal": "dotnet test --runtime win-x64 --no-build --filter \"FullyQualifiedName~Adaptation._Tests.Extract.Staging.v2_43_4 & ClassName~CDE5 & Name~Staging__v2_43_4__CDE5__RsM637952212190000000__Normal\" -- TestRunParameters.Parameter(name=\\\"WaitFor\\\", value=\\\"Debugger.IsAttached\\\")", - "GA-Extract.Staging.v2_43_4-MET08RESIMAPCDE-Staging__v2_43_4__MET08RESIMAPCDE__MoveMatchingFiles637953064190000000__Normal": "dotnet test --runtime win-x64 --no-build --filter \"FullyQualifiedName~Adaptation._Tests.Extract.Staging.v2_43_4 & ClassName~MET08RESIMAPCDE & Name~Staging__v2_43_4__MET08RESIMAPCDE__MoveMatchingFiles637953064190000000__Normal\" -- TestRunParameters.Parameter(name=\\\"WaitFor\\\", value=\\\"Debugger.IsAttached\\\")", - "HA-Extract.Staging.v2_43_4-CDE2-Staging__v2_43_4__CDE2__pcl637812984345592512__MinFileLength": "dotnet test --filter \"FullyQualifiedName~Adaptation._Tests.Extract.Staging.v2_43_4 & ClassName~CDE2 & Name~Staging__v2_43_4__CDE2__pcl637812984345592512__MinFileLength\" -- TestRunParameters.Parameter(name=\\\"WaitFor\\\", value=\\\"Debugger.IsAttached\\\")", + "AA-CreateSelfDescription.Staging.v2_47_1-CDE2_EQPT": "dotnet test --runtime win-x64 --no-build --filter \"FullyQualifiedName~Adaptation._Tests.CreateSelfDescription.Staging.v2_47_1 & ClassName~CDE2_EQPT\" -- TestRunParameters.Parameter(name=\\\"WaitFor\\\", value=\\\"Debugger.IsAttached\\\")", + "AB-CreateSelfDescription.Staging.v2_47_1-CDE5_EQPT": "dotnet test --runtime win-x64 --no-build --filter \"FullyQualifiedName~Adaptation._Tests.CreateSelfDescription.Staging.v2_47_1 & ClassName~CDE5_EQPT\" -- TestRunParameters.Parameter(name=\\\"WaitFor\\\", value=\\\"Debugger.IsAttached\\\")", + "BA-CreateSelfDescription.Staging.v2_47_1-CDE2": "dotnet test --runtime win-x64 --no-build --filter \"FullyQualifiedName~Adaptation._Tests.CreateSelfDescription.Staging.v2_47_1 & ClassName~CDE2\" -- TestRunParameters.Parameter(name=\\\"WaitFor\\\", value=\\\"Debugger.IsAttached\\\")", + "BB-CreateSelfDescription.Staging.v2_47_1-CDE5": "dotnet test --runtime win-x64 --no-build --filter \"FullyQualifiedName~Adaptation._Tests.CreateSelfDescription.Staging.v2_47_1 & ClassName~CDE5\" -- TestRunParameters.Parameter(name=\\\"WaitFor\\\", value=\\\"Debugger.IsAttached\\\")", + "CA-CreateSelfDescription.Staging.v2_47_1-MET08RESIMAPCDE": "dotnet test --runtime win-x64 --no-build --filter \"FullyQualifiedName~Adaptation._Tests.CreateSelfDescription.Staging.v2_47_1 & ClassName~MET08RESIMAPCDE\" -- TestRunParameters.Parameter(name=\\\"WaitFor\\\", value=\\\"Debugger.IsAttached\\\")", + "DA-CreateSelfDescription.Staging.v2_47_1": "dotnet test --runtime win-x64 --no-build --filter \"FullyQualifiedName~Adaptation._Tests.CreateSelfDescription.Staging.v2_47_1\" -- TestRunParameters.Parameter(name=\\\"WaitFor\\\", value=\\\"Debugger.IsAttached\\\")", + "EA-Extract.Staging.v2_47_1-CDE2_EQPT-Staging__v2_47_1__CDE2_EQPT__DownloadRsMFile637953072332628623__Normal": "dotnet test --runtime win-x64 --no-build --filter \"FullyQualifiedName~Adaptation._Tests.Extract.Staging.v2_47_1 & ClassName~CDE2_EQPT & Name~Staging__v2_47_1__CDE2_EQPT__DownloadRsMFile637953072332628623__Normal\" -- TestRunParameters.Parameter(name=\\\"WaitFor\\\", value=\\\"Debugger.IsAttached\\\")", + "EB-Extract.Staging.v2_47_1-CDE5_EQPT-Staging__v2_47_1__CDE5_EQPT__DownloadRsMFile637953072332628623__Normal": "dotnet test --runtime win-x64 --no-build --filter \"FullyQualifiedName~Adaptation._Tests.Extract.Staging.v2_47_1 & ClassName~CDE5_EQPT & Name~Staging__v2_47_1__CDE5_EQPT__DownloadRsMFile637953072332628623__Normal\" -- TestRunParameters.Parameter(name=\\\"WaitFor\\\", value=\\\"Debugger.IsAttached\\\")", + "FA-Extract.Staging.v2_47_1-CDE2-Staging__v2_47_1__CDE2__txt637953079123289252__Normal": "dotnet test --runtime win-x64 --no-build --filter \"FullyQualifiedName~Adaptation._Tests.Extract.Staging.v2_47_1 & ClassName~CDE2 & Name~Staging__v2_47_1__CDE2__txt637953079123289252__Normal\" -- TestRunParameters.Parameter(name=\\\"WaitFor\\\", value=\\\"Debugger.IsAttached\\\")", + "FB-Extract.Staging.v2_47_1-CDE5-Staging__v2_47_1__CDE5__RsM637952212190000000__Normal": "dotnet test --runtime win-x64 --no-build --filter \"FullyQualifiedName~Adaptation._Tests.Extract.Staging.v2_47_1 & ClassName~CDE5 & Name~Staging__v2_47_1__CDE5__RsM637952212190000000__Normal\" -- TestRunParameters.Parameter(name=\\\"WaitFor\\\", value=\\\"Debugger.IsAttached\\\")", + "GA-Extract.Staging.v2_47_1-MET08RESIMAPCDE-Staging__v2_47_1__MET08RESIMAPCDE__MoveMatchingFiles637953064190000000__Normal": "dotnet test --runtime win-x64 --no-build --filter \"FullyQualifiedName~Adaptation._Tests.Extract.Staging.v2_47_1 & ClassName~MET08RESIMAPCDE & Name~Staging__v2_47_1__MET08RESIMAPCDE__MoveMatchingFiles637953064190000000__Normal\" -- TestRunParameters.Parameter(name=\\\"WaitFor\\\", value=\\\"Debugger.IsAttached\\\")", + "HA-Extract.Staging.v2_47_1-CDE2-Staging__v2_47_1__CDE2__pcl637812984345592512__MinFileLength": "dotnet test --filter \"FullyQualifiedName~Adaptation._Tests.Extract.Staging.v2_47_1 & ClassName~CDE2 & Name~Staging__v2_47_1__CDE2__pcl637812984345592512__MinFileLength\" -- TestRunParameters.Parameter(name=\\\"WaitFor\\\", value=\\\"Debugger.IsAttached\\\")", + "HB-Extract.Staging.v2_47_1-MET08RESIMAPCDE-Staging__v2_47_1__MET08RESIMAPCDE__OpenInsight638054501710000000__IqsSql": "dotnet test --filter \"FullyQualifiedName~Adaptation._Tests.Extract.Staging.v2_47_1 & ClassName~MET08RESIMAPCDE & Name~Staging__v2_47_1__MET08RESIMAPCDE__OpenInsight638054501710000000__IqsSql\" -- TestRunParameters.Parameter(name=\\\"WaitFor\\\", value=\\\"Debugger.IsAttached\\\")", "Alpha": "ABCDEFGHIJKLMNOPQRSTUVWXYZ", "nuget-clear": "dotnet nuget locals all --clear", "build": "dotnet build --runtime win-x64 --self-contained", diff --git a/MET08RESIMAPCDE.csproj b/MET08RESIMAPCDE.csproj index 7831c1a..cd42895 100644 --- a/MET08RESIMAPCDE.csproj +++ b/MET08RESIMAPCDE.csproj @@ -108,6 +108,7 @@ + diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs index 57b3893..63cb1b2 100644 --- a/Properties/AssemblyInfo.cs +++ b/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.47.0.0")] -[assembly: AssemblyFileVersion("2.47.0.0")] +[assembly: AssemblyVersion("2.47.1.0")] +[assembly: AssemblyFileVersion("2.47.1.0")]