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..a380051 --- /dev/null +++ b/Adaptation/.vscode/Reactor.js @@ -0,0 +1,22 @@ +// (self.length != 0) ? +// self : +// (getContextData('2', 'cds.PROCESS_JOBID', '') == '-') ? +// self : +// getContextData('2', 'cds.PROCESS_JOBID', '') + +getValue(self, self.length, $('dcp.HGCV1/pcl/MesEntity', ''), $('dcp.HGCV1/pcl/Pattern', ''), getContextData('2', 'cds.PROCESS_JOBID', '')); + +function getValue(value, length, mesEntity, pattern, processJobId) { + if (pattern === 'ONEPT.PAT' && lot.toUpperCase().indexOf('LOW') > -1) + return mesEntity; + else if (pattern === 'ONEPT.PAT' && lot.toUpperCase().indexOf('MID') > -1) + return mesEntity; + else if (pattern === 'ONEPT.PAT' && lot.toUpperCase().indexOf('HIGH') > -1) + return mesEntity; + else if (pattern === 'ONEPT.PAT' && lot.toUpperCase().indexOf('THIN') > -1) + return mesEntity; + else if (length !== 0 || processJobId === '-') + return value; + else + return processJobId; +} \ No newline at end of file diff --git a/Adaptation/.vscode/psn.js b/Adaptation/.vscode/psn.js new file mode 100644 index 0000000..923c820 --- /dev/null +++ b/Adaptation/.vscode/psn.js @@ -0,0 +1,16 @@ +// (self.length != 0) ? +// self : +// (getContextData('2', 'cds.PRODUCT', '') == '-') ? +// self : +// getContextData('2', 'cds.PRODUCT', '') + +getValue(self, self.length, getContextData('2', 'cds.PRODUCT', ''), $('dcp.HGCV3/pcl/Recipe', '')); + +function getValue(value, length, product, recipe) { + if (recipe.toUpperCase() === 'MERCURY PROBE WAFER TYPE HILO') + return 'Mercury Probe Wafer Type HiLo'; + 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 f8adac1..610e1a2 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..9f6fd06 --- /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, pcl.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 ('HGCV1', 'HGCV2', 'HGCV3') ") + .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, pcl.Description description) + { + string result; + string dateTime; + string dateFormat = pcl.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 efa7ee6..d6e0c91 100644 --- a/Adaptation/FileHandlers/OpenInsightMetrologyViewer/WSRequest.cs +++ b/Adaptation/FileHandlers/OpenInsightMetrologyViewer/WSRequest.cs @@ -153,8 +153,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; } 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/pcl/Description.cs b/Adaptation/FileHandlers/pcl/Description.cs index 7d3ab78..3edde50 100644 --- a/Adaptation/FileHandlers/pcl/Description.cs +++ b/Adaptation/FileHandlers/pcl/Description.cs @@ -272,7 +272,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, @@ -434,4 +434,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/pcl/FileRead.cs b/Adaptation/FileHandlers/pcl/FileRead.cs index 42082b4..1548a29 100644 --- a/Adaptation/FileHandlers/pcl/FileRead.cs +++ b/Adaptation/FileHandlers/pcl/FileRead.cs @@ -14,6 +14,7 @@ namespace Adaptation.FileHandlers.pcl; public class FileRead : Shared.FileRead, IFileRead { + private long? _TickOffset; private readonly string _GhostPCLFileName; private readonly string _PDFTextStripperFileName; @@ -105,7 +106,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/pcl/ProcessData.cs b/Adaptation/FileHandlers/pcl/ProcessData.cs index bc376b6..f35ee2b 100644 --- a/Adaptation/FileHandlers/pcl/ProcessData.cs +++ b/Adaptation/FileHandlers/pcl/ProcessData.cs @@ -27,7 +27,7 @@ public class ProcessData : IProcessData public string Area { get; set; } public string Ccomp { get; set; } public string CondType { get; set; } - public string Date { get; set; } + public DateTime Date { get; set; } public string Employee { get; set; } public string FlatZMean { get; set; } public string FlatZRadialGradient { get; set; } @@ -87,7 +87,7 @@ public class ProcessData : IProcessData JobID = logistics.JobID; MesEntity = logistics.MesEntity; _Log = LogManager.GetLogger(typeof(ProcessData)); - Date = DateTime.Now.ToString(); + Date = DateTime.Now; Parse(fileRead, logistics, fileInfoCollection, ghostPCLFileName, pdfTextStripperFileName); } @@ -218,78 +218,120 @@ public class ProcessData : IProcessData return result; } + private static (string, string) GetReactorAndRDS(string defaultReactor, string defaultRDS, string text, string formattedText, string[] segments) + { + string rds; + string reactor; + if (string.IsNullOrEmpty(text) || segments.Length == 0 || string.IsNullOrEmpty(formattedText)) + reactor = defaultReactor; + else + reactor = segments[0]; + if (segments.Length <= 1 || !int.TryParse(segments[1], out int rdsValue) || rdsValue < 99) + rds = defaultRDS; + else + rds = segments[1]; + if (reactor.Length > 3) + { + rds = reactor; + reactor = defaultReactor; + } + return new(reactor, rds); + } + + private static (string, string) GetLayerAndPSN(string defaultLayer, string defaultPSN, string[] segments) + { + string psn; + string layer; + if (segments.Length <= 2) + { + psn = defaultPSN; + layer = defaultLayer; + } + else + { + string[] segmentsB = segments[2].Split('.'); + psn = segmentsB[0]; + if (segmentsB.Length <= 1) + layer = defaultLayer; + else + { + layer = segmentsB[1]; + if (layer.Length > 1 && layer[0] == '0') + layer = layer.Substring(1); + } + } + return (layer, psn); + } + + private static string GetZone(string[] segments) + { + string result; + if (segments.Length <= 3) + result = string.Empty; + else + { + result = segments[3]; + if (result.Length > 1 && result[0] == '0') + result = result.Substring(1); + } + return result; + } + public static Descriptor GetDescriptor(string text) { Descriptor result; string lot; - string rds; string psn; + string rds; string zone; string layer; string reactor; string employee; - const string defaultPSN = "0000"; - const string defaultReactor = "00"; - const string defaultRDS = "000000"; - if (text.Length is 2 or 3) + string defaultPSN = string.Empty; + string defaultRDS = string.Empty; + string defaultZone = string.Empty; + string defaultLayer = string.Empty; + string defaultReactor = string.Empty; + string defaultEmployee = string.Empty; + if (string.IsNullOrEmpty(text) || (text.Length is 2 or 3 && Regex.IsMatch(text, "^[a-zA-z]{2,3}"))) { lot = text; employee = lot; - rds = defaultRDS; psn = defaultPSN; - zone = string.Empty; - layer = string.Empty; + rds = defaultRDS; + zone = defaultZone; + layer = defaultLayer; reactor = defaultReactor; } + else if (Regex.IsMatch(text, @"^[0-9]{2}[.][0-9]{1}[.]?[0-9]{0,1}")) + { + string[] segments = text.Split('.'); + lot = text; + psn = defaultPSN; + rds = defaultRDS; + layer = segments[1]; + reactor = segments[0]; + employee = defaultEmployee; + if (segments.Length <= 2) + zone = defaultZone; + else + zone = segments[2]; + } else { // Remove illegal characters \/:*?"<>| found in the Lot. lot = Regex.Replace(text, @"[\\,\/,\:,\*,\?,\"",\<,\>,\|]", "_").Split('\r')[0].Split('\n')[0]; - if (lot.StartsWith("1T") || lot.StartsWith("1t")) + if (lot.Length > 2 && lot[0] == '1' && (lot[1] == 'T' || lot[1] == 't')) lot = lot.Substring(2); string[] segments = lot.Split('-'); - if (segments.Length == 0) - reactor = defaultReactor; - else - reactor = segments[0]; - if (segments.Length <= 1) - rds = defaultRDS; - else - rds = segments[1]; - if (reactor.Length > 3) - { - rds = reactor; - reactor = defaultReactor; - } - if (segments.Length <= 2) - psn = defaultPSN; - else - psn = segments[2]; - if (segments.Length < 3) - layer = string.Empty; - else - { - string[] segmentsB = segments[2].Split('.'); - if (segmentsB.Length > 1) - psn = segmentsB[0]; - if (segmentsB.Length <= 1) - layer = string.Empty; - else - layer = segmentsB[1]; - } - if (segments.Length <= 3) - zone = string.Empty; - else - zone = segments[3]; + (reactor, rds) = GetReactorAndRDS(defaultReactor, defaultRDS, text, lot, segments); + (layer, psn) = GetLayerAndPSN(defaultLayer, defaultPSN, segments); + zone = GetZone(segments); if (segments.Length <= 4) - employee = string.Empty; + employee = defaultEmployee; else employee = segments[4]; } - if (layer.Length > 1 && layer[0] == '0') - layer = layer.Substring(1); - if (zone.Length > 1 && zone[0] == '0') - zone = zone.Substring(1); result = new(employee, layer, lot, psn, rds, reactor, zone); return result; } @@ -403,7 +445,7 @@ public class ProcessData : IProcessData Plan = GetBefore("G limit :"); //GLimit = GetBefore("S "); GLimit = GetBefore("S"); - Date = DateTime.Now.ToString(); + Date = DateTime.Now; ScanPast("Setup File:"); //SetupFile = GetBefore("O O"); SetupFile = GetBefore("O O"); diff --git a/Adaptation/MET08RESIHGCV.Tests.csproj b/Adaptation/MET08RESIHGCV.Tests.csproj index 48c9291..e7d5edd 100644 --- a/Adaptation/MET08RESIHGCV.Tests.csproj +++ b/Adaptation/MET08RESIHGCV.Tests.csproj @@ -39,11 +39,11 @@ - + - + @@ -51,11 +51,11 @@ - + - + - + @@ -65,7 +65,7 @@ - + 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.39.0/HGCV1.cs b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.39.0/HGCV1.cs index b084ef5..0c56e2a 100644 --- a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.39.0/HGCV1.cs +++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.39.0/HGCV1.cs @@ -31,8 +31,7 @@ public class HGCV1 : EAFLoggingUnitTesting [ClassInitialize] public static void ClassInitialize(TestContext testContext) { - if (EAFLoggingUnitTesting is null) - EAFLoggingUnitTesting = new HGCV1(testContext); + EAFLoggingUnitTesting ??= new HGCV1(testContext); EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(testContext.TestName, " - ClassInitialize")); string[] fileNameAndText = EAFLoggingUnitTesting.AdaptationTesting.GetCSharpText(testContext.TestName); File.WriteAllText(fileNameAndText[0], fileNameAndText[1]); @@ -42,10 +41,8 @@ public class HGCV1 : 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/HGCV2.cs b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.39.0/HGCV2.cs index 9eba27c..fe511f0 100644 --- a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.39.0/HGCV2.cs +++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.39.0/HGCV2.cs @@ -31,8 +31,7 @@ public class HGCV2 : EAFLoggingUnitTesting [ClassInitialize] public static void ClassInitialize(TestContext testContext) { - if (EAFLoggingUnitTesting is null) - EAFLoggingUnitTesting = new HGCV2(testContext); + EAFLoggingUnitTesting ??= new HGCV2(testContext); EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(testContext.TestName, " - ClassInitialize")); string[] fileNameAndText = EAFLoggingUnitTesting.AdaptationTesting.GetCSharpText(testContext.TestName); File.WriteAllText(fileNameAndText[0], fileNameAndText[1]); @@ -42,10 +41,8 @@ public class HGCV2 : 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/HGCV3.cs b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.39.0/HGCV3.cs index 11ca16f..5b6b8c1 100644 --- a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.39.0/HGCV3.cs +++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.39.0/HGCV3.cs @@ -31,8 +31,7 @@ public class HGCV3 : EAFLoggingUnitTesting [ClassInitialize] public static void ClassInitialize(TestContext testContext) { - if (EAFLoggingUnitTesting is null) - EAFLoggingUnitTesting = new HGCV3(testContext); + EAFLoggingUnitTesting ??= new HGCV3(testContext); EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(testContext.TestName, " - ClassInitialize")); string[] fileNameAndText = EAFLoggingUnitTesting.AdaptationTesting.GetCSharpText(testContext.TestName); File.WriteAllText(fileNameAndText[0], fileNameAndText[1]); @@ -42,10 +41,8 @@ public class HGCV3 : 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/MET08RESIHGCV.cs b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.39.0/MET08RESIHGCV.cs index e9b4144..9c05a49 100644 --- a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.39.0/MET08RESIHGCV.cs +++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.39.0/MET08RESIHGCV.cs @@ -31,8 +31,7 @@ public class MET08RESIHGCV : EAFLoggingUnitTesting [ClassInitialize] public static void ClassInitialize(TestContext testContext) { - if (EAFLoggingUnitTesting is null) - EAFLoggingUnitTesting = new MET08RESIHGCV(testContext); + EAFLoggingUnitTesting ??= new MET08RESIHGCV(testContext); EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(testContext.TestName, " - ClassInitialize")); string[] fileNameAndText = EAFLoggingUnitTesting.AdaptationTesting.GetCSharpText(testContext.TestName); File.WriteAllText(fileNameAndText[0], fileNameAndText[1]); @@ -42,10 +41,8 @@ public class MET08RESIHGCV : 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.0/HGCV1.cs b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.0/HGCV1.cs index 731b7fe..e9676ad 100644 --- a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.0/HGCV1.cs +++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.0/HGCV1.cs @@ -31,8 +31,7 @@ public class HGCV1 : EAFLoggingUnitTesting [ClassInitialize] public static void ClassInitialize(TestContext testContext) { - if (EAFLoggingUnitTesting is null) - EAFLoggingUnitTesting = new HGCV1(testContext); + EAFLoggingUnitTesting ??= new HGCV1(testContext); EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(testContext.TestName, " - ClassInitialize")); string[] fileNameAndText = EAFLoggingUnitTesting.AdaptationTesting.GetCSharpText(testContext.TestName); File.WriteAllText(fileNameAndText[0], fileNameAndText[1]); @@ -42,10 +41,8 @@ public class HGCV1 : 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.0/HGCV2.cs b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.0/HGCV2.cs index 88efc7d..85565bf 100644 --- a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.0/HGCV2.cs +++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.0/HGCV2.cs @@ -31,8 +31,7 @@ public class HGCV2 : EAFLoggingUnitTesting [ClassInitialize] public static void ClassInitialize(TestContext testContext) { - if (EAFLoggingUnitTesting is null) - EAFLoggingUnitTesting = new HGCV2(testContext); + EAFLoggingUnitTesting ??= new HGCV2(testContext); EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(testContext.TestName, " - ClassInitialize")); string[] fileNameAndText = EAFLoggingUnitTesting.AdaptationTesting.GetCSharpText(testContext.TestName); File.WriteAllText(fileNameAndText[0], fileNameAndText[1]); @@ -42,10 +41,8 @@ public class HGCV2 : 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.0/HGCV3.cs b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.0/HGCV3.cs index 90c5b8a..aea6261 100644 --- a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.0/HGCV3.cs +++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.0/HGCV3.cs @@ -31,8 +31,7 @@ public class HGCV3 : EAFLoggingUnitTesting [ClassInitialize] public static void ClassInitialize(TestContext testContext) { - if (EAFLoggingUnitTesting is null) - EAFLoggingUnitTesting = new HGCV3(testContext); + EAFLoggingUnitTesting ??= new HGCV3(testContext); EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(testContext.TestName, " - ClassInitialize")); string[] fileNameAndText = EAFLoggingUnitTesting.AdaptationTesting.GetCSharpText(testContext.TestName); File.WriteAllText(fileNameAndText[0], fileNameAndText[1]); @@ -42,10 +41,8 @@ public class HGCV3 : 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.0/MET08RESIHGCV.cs b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.0/MET08RESIHGCV.cs index 4f4150c..fb4bce3 100644 --- a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.0/MET08RESIHGCV.cs +++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.0/MET08RESIHGCV.cs @@ -31,8 +31,7 @@ public class MET08RESIHGCV : EAFLoggingUnitTesting [ClassInitialize] public static void ClassInitialize(TestContext testContext) { - if (EAFLoggingUnitTesting is null) - EAFLoggingUnitTesting = new MET08RESIHGCV(testContext); + EAFLoggingUnitTesting ??= new MET08RESIHGCV(testContext); EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(testContext.TestName, " - ClassInitialize")); string[] fileNameAndText = EAFLoggingUnitTesting.AdaptationTesting.GetCSharpText(testContext.TestName); File.WriteAllText(fileNameAndText[0], fileNameAndText[1]); @@ -42,10 +41,8 @@ public class MET08RESIHGCV : 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/HGCV1.cs b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.4/HGCV1.cs index 15208ca..b49dc74 100644 --- a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.4/HGCV1.cs +++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.4/HGCV1.cs @@ -33,8 +33,7 @@ public class HGCV1 : EAFLoggingUnitTesting [ClassInitialize] public static void ClassInitialize(TestContext testContext) { - if (EAFLoggingUnitTesting is null) - EAFLoggingUnitTesting = new HGCV1(testContext); + EAFLoggingUnitTesting ??= new HGCV1(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 HGCV1 : 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/HGCV2.cs b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.4/HGCV2.cs index 14923a1..795316e 100644 --- a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.4/HGCV2.cs +++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.4/HGCV2.cs @@ -33,8 +33,7 @@ public class HGCV2 : EAFLoggingUnitTesting [ClassInitialize] public static void ClassInitialize(TestContext testContext) { - if (EAFLoggingUnitTesting is null) - EAFLoggingUnitTesting = new HGCV2(testContext); + EAFLoggingUnitTesting ??= new HGCV2(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 HGCV2 : 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/HGCV3.cs b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.4/HGCV3.cs index 77461ac..0c2435c 100644 --- a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.4/HGCV3.cs +++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.4/HGCV3.cs @@ -33,8 +33,7 @@ public class HGCV3 : EAFLoggingUnitTesting [ClassInitialize] public static void ClassInitialize(TestContext testContext) { - if (EAFLoggingUnitTesting is null) - EAFLoggingUnitTesting = new HGCV3(testContext); + EAFLoggingUnitTesting ??= new HGCV3(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 HGCV3 : 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/MET08RESIHGCV.cs b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.4/MET08RESIHGCV.cs index dd1e617..452f44e 100644 --- a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.4/MET08RESIHGCV.cs +++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.4/MET08RESIHGCV.cs @@ -33,8 +33,7 @@ public class MET08RESIHGCV : EAFLoggingUnitTesting [ClassInitialize] public static void ClassInitialize(TestContext testContext) { - if (EAFLoggingUnitTesting is null) - EAFLoggingUnitTesting = new MET08RESIHGCV(testContext); + EAFLoggingUnitTesting ??= new MET08RESIHGCV(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 MET08RESIHGCV : 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/HGCV1.cs b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.47.1/HGCV1.cs new file mode 100644 index 0000000..05d88b1 --- /dev/null +++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.47.1/HGCV1.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 HGCV1 : EAFLoggingUnitTesting +{ + +#pragma warning disable CA2254 +#pragma warning disable IDE0060 + + internal static string DummyRoot { get; private set; } + internal static HGCV1 EAFLoggingUnitTesting { get; private set; } + + static HGCV1() => DummyRoot = @"\\messv02ecc1.ec.local\EC_Characterization_Si\Dummy"; + + public HGCV1() : base(DummyRoot, testContext: null, declaringType: null, skipEquipmentDictionary: false) + { + if (EAFLoggingUnitTesting is null) + throw new Exception(); + } + + public HGCV1(TestContext testContext) : base(DummyRoot, testContext, new StackFrame().GetMethod().DeclaringType, skipEquipmentDictionary: false) + { + } + + [ClassInitialize] + public static void ClassInitialize(TestContext testContext) + { + EAFLoggingUnitTesting ??= new HGCV1(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__HGCV1__pcl() + { + string check = "*.pcl"; + 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/HGCV2.cs b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.47.1/HGCV2.cs new file mode 100644 index 0000000..191796f --- /dev/null +++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.47.1/HGCV2.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 HGCV2 : EAFLoggingUnitTesting +{ + +#pragma warning disable CA2254 +#pragma warning disable IDE0060 + + internal static string DummyRoot { get; private set; } + internal static HGCV2 EAFLoggingUnitTesting { get; private set; } + + static HGCV2() => DummyRoot = @"\\messv02ecc1.ec.local\EC_Characterization_Si\Dummy"; + + public HGCV2() : base(DummyRoot, testContext: null, declaringType: null, skipEquipmentDictionary: false) + { + if (EAFLoggingUnitTesting is null) + throw new Exception(); + } + + public HGCV2(TestContext testContext) : base(DummyRoot, testContext, new StackFrame().GetMethod().DeclaringType, skipEquipmentDictionary: false) + { + } + + [ClassInitialize] + public static void ClassInitialize(TestContext testContext) + { + EAFLoggingUnitTesting ??= new HGCV2(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__HGCV2__pcl() + { + string check = "*.pcl"; + 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/HGCV3.cs b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.47.1/HGCV3.cs new file mode 100644 index 0000000..a04bc9f --- /dev/null +++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.47.1/HGCV3.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 HGCV3 : EAFLoggingUnitTesting +{ + +#pragma warning disable CA2254 +#pragma warning disable IDE0060 + + internal static string DummyRoot { get; private set; } + internal static HGCV3 EAFLoggingUnitTesting { get; private set; } + + static HGCV3() => DummyRoot = @"\\messv02ecc1.ec.local\EC_Characterization_Si\Dummy"; + + public HGCV3() : base(DummyRoot, testContext: null, declaringType: null, skipEquipmentDictionary: false) + { + if (EAFLoggingUnitTesting is null) + throw new Exception(); + } + + public HGCV3(TestContext testContext) : base(DummyRoot, testContext, new StackFrame().GetMethod().DeclaringType, skipEquipmentDictionary: false) + { + } + + [ClassInitialize] + public static void ClassInitialize(TestContext testContext) + { + EAFLoggingUnitTesting ??= new HGCV3(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__HGCV3__pcl() + { + string check = "*.pcl"; + 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/MET08RESIHGCV.cs b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.47.1/MET08RESIHGCV.cs new file mode 100644 index 0000000..2c511ac --- /dev/null +++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.47.1/MET08RESIHGCV.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 MET08RESIHGCV : EAFLoggingUnitTesting +{ + +#pragma warning disable CA2254 +#pragma warning disable IDE0060 + + internal static string DummyRoot { get; private set; } + internal static MET08RESIHGCV EAFLoggingUnitTesting { get; private set; } + + static MET08RESIHGCV() => DummyRoot = @"\\messv02ecc1.ec.local\EC_Characterization_Si\Dummy"; + + public MET08RESIHGCV() : base(DummyRoot, testContext: null, declaringType: null, skipEquipmentDictionary: false) + { + if (EAFLoggingUnitTesting is null) + throw new Exception(); + } + + public MET08RESIHGCV(TestContext testContext) : base(DummyRoot, testContext, new StackFrame().GetMethod().DeclaringType, skipEquipmentDictionary: false) + { + } + + [ClassInitialize] + public static void ClassInitialize(TestContext testContext) + { + EAFLoggingUnitTesting ??= new MET08RESIHGCV(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__MET08RESIHGCV__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__MET08RESIHGCV__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__MET08RESIHGCV__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__MET08RESIHGCV__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__MET08RESIHGCV__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__MET08RESIHGCV__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__MET08RESIHGCV__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__MET08RESIHGCV__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__MET08RESIHGCV__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__MET08RESIHGCV__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/HGCV1.cs b/Adaptation/_Tests/Extract/Staging/v2.43.4/HGCV1.cs index ae9722b..92bcc02 100644 --- a/Adaptation/_Tests/Extract/Staging/v2.43.4/HGCV1.cs +++ b/Adaptation/_Tests/Extract/Staging/v2.43.4/HGCV1.cs @@ -28,6 +28,9 @@ public class HGCV1 [TestMethod] public void Staging__v2_43_4__HGCV1__pcl() => _HGCV1.Staging__v2_43_4__HGCV1__pcl(); +#if true + [Ignore] +#endif [TestMethod] public void Staging__v2_43_4__HGCV1__pcl637955429602879992__Normal() { diff --git a/Adaptation/_Tests/Extract/Staging/v2.43.4/HGCV2.cs b/Adaptation/_Tests/Extract/Staging/v2.43.4/HGCV2.cs index 7cbea9f..dd20cd4 100644 --- a/Adaptation/_Tests/Extract/Staging/v2.43.4/HGCV2.cs +++ b/Adaptation/_Tests/Extract/Staging/v2.43.4/HGCV2.cs @@ -28,6 +28,9 @@ public class HGCV2 [TestMethod] public void Staging__v2_43_4__HGCV2__pcl() => _HGCV2.Staging__v2_43_4__HGCV2__pcl(); +#if true + [Ignore] +#endif [TestMethod] public void Staging__v2_43_4__HGCV2__pcl637955471606299897__Normal() { diff --git a/Adaptation/_Tests/Extract/Staging/v2.43.4/HGCV3.cs b/Adaptation/_Tests/Extract/Staging/v2.43.4/HGCV3.cs index 3a6282a..67df16d 100644 --- a/Adaptation/_Tests/Extract/Staging/v2.43.4/HGCV3.cs +++ b/Adaptation/_Tests/Extract/Staging/v2.43.4/HGCV3.cs @@ -28,6 +28,9 @@ public class HGCV3 [TestMethod] public void Staging__v2_43_4__HGCV3__pcl() => _HGCV3.Staging__v2_43_4__HGCV3__pcl(); +#if true + [Ignore] +#endif [TestMethod] [ExpectedException(typeof(AssertFailedException))] public void Staging__v2_43_4__HGCV3__pcl637812984345592512__MinFileLength() @@ -42,6 +45,9 @@ public class HGCV3 _ = Shared.AdaptationTesting.ReExtractCompareUpdatePassDirectory(variables, fileRead, logistics, validatePDSF); } +#if true + [Ignore] +#endif [TestMethod] public void Staging__v2_43_4__HGCV3__pcl637816384579205568__Normal() { @@ -55,6 +61,9 @@ public class HGCV3 _ = Shared.AdaptationTesting.ReExtractCompareUpdatePassDirectory(variables, fileRead, logistics, validatePDSF); } +#if true + [Ignore] +#endif [TestMethod] public void Staging__v2_43_4__HGCV3__pcl637955459372840332__Normal() { diff --git a/Adaptation/_Tests/Extract/Staging/v2.43.4/MET08RESIHGCV.cs b/Adaptation/_Tests/Extract/Staging/v2.43.4/MET08RESIHGCV.cs index 6d2dbb4..309f226 100644 --- a/Adaptation/_Tests/Extract/Staging/v2.43.4/MET08RESIHGCV.cs +++ b/Adaptation/_Tests/Extract/Staging/v2.43.4/MET08RESIHGCV.cs @@ -28,6 +28,10 @@ public class MET08RESIHGCV [TestMethod] public void Staging__v2_43_4__MET08RESIHGCV__MoveMatchingFiles() => _MET08RESIHGCV.Staging__v2_43_4__MET08RESIHGCV__MoveMatchingFiles(); +#if true + [Ignore] +#endif + [TestMethod] public void Staging__v2_43_4__MET08RESIHGCV__MoveMatchingFiles637955459372840332__Normal() { @@ -47,6 +51,9 @@ public class MET08RESIHGCV [TestMethod] public void Staging__v2_43_4__MET08RESIHGCV__OpenInsightMetrologyViewer() => _MET08RESIHGCV.Staging__v2_43_4__MET08RESIHGCV__OpenInsightMetrologyViewer(); +#if true + [Ignore] +#endif [TestMethod] public void Staging__v2_43_4__MET08RESIHGCV__OpenInsightMetrologyViewer637961644453719245__Normal() { diff --git a/Adaptation/_Tests/Extract/Staging/v2.47.1/HGCV1.cs b/Adaptation/_Tests/Extract/Staging/v2.47.1/HGCV1.cs new file mode 100644 index 0000000..1c67f00 --- /dev/null +++ b/Adaptation/_Tests/Extract/Staging/v2.47.1/HGCV1.cs @@ -0,0 +1,47 @@ +using Adaptation.Shared; +using Adaptation.Shared.Methods; +using Microsoft.VisualStudio.TestTools.UnitTesting; +using System.Diagnostics; +using System.Reflection; + +namespace Adaptation._Tests.Extract.Staging.v2_47_1; + +[TestClass] +public class HGCV1 +{ + +#pragma warning disable CA2254 +#pragma warning disable IDE0060 + + private static CreateSelfDescription.Staging.v2_47_1.HGCV1 _HGCV1; + + [ClassInitialize] + public static void ClassInitialize(TestContext testContext) + { + CreateSelfDescription.Staging.v2_47_1.HGCV1.ClassInitialize(testContext); + _HGCV1 = CreateSelfDescription.Staging.v2_47_1.HGCV1.EAFLoggingUnitTesting; + } + +#if true + [Ignore] +#endif + [TestMethod] + public void Staging__v2_47_1__HGCV1__pcl() => _HGCV1.Staging__v2_47_1__HGCV1__pcl(); + +#if true + [Ignore] +#endif + [TestMethod] + public void Staging__v2_47_1__HGCV1__pcl637955429602879992__Normal() + { + string check = "*.pcl"; + bool validatePDSF = false; + _HGCV1.Staging__v2_47_1__HGCV1__pcl(); + MethodBase methodBase = new StackFrame().GetMethod(); + string[] variables = _HGCV1.AdaptationTesting.GetVariables(methodBase, check, validatePDSF); + IFileRead fileRead = _HGCV1.AdaptationTesting.Get(methodBase, sourceFileLocation: variables[2], sourceFileFilter: variables[3], useCyclicalForDescription: false); + Logistics logistics = new(fileRead); + _ = Shared.AdaptationTesting.ReExtractCompareUpdatePassDirectory(variables, fileRead, logistics, validatePDSF); + } + +} \ No newline at end of file diff --git a/Adaptation/_Tests/Extract/Staging/v2.47.1/HGCV2.cs b/Adaptation/_Tests/Extract/Staging/v2.47.1/HGCV2.cs new file mode 100644 index 0000000..ff917c9 --- /dev/null +++ b/Adaptation/_Tests/Extract/Staging/v2.47.1/HGCV2.cs @@ -0,0 +1,47 @@ +using Adaptation.Shared; +using Adaptation.Shared.Methods; +using Microsoft.VisualStudio.TestTools.UnitTesting; +using System.Diagnostics; +using System.Reflection; + +namespace Adaptation._Tests.Extract.Staging.v2_47_1; + +[TestClass] +public class HGCV2 +{ + +#pragma warning disable CA2254 +#pragma warning disable IDE0060 + + private static CreateSelfDescription.Staging.v2_47_1.HGCV2 _HGCV2; + + [ClassInitialize] + public static void ClassInitialize(TestContext testContext) + { + CreateSelfDescription.Staging.v2_47_1.HGCV2.ClassInitialize(testContext); + _HGCV2 = CreateSelfDescription.Staging.v2_47_1.HGCV2.EAFLoggingUnitTesting; + } + +#if true + [Ignore] +#endif + [TestMethod] + public void Staging__v2_47_1__HGCV2__pcl() => _HGCV2.Staging__v2_47_1__HGCV2__pcl(); + +#if true + [Ignore] +#endif + [TestMethod] + public void Staging__v2_47_1__HGCV2__pcl637955471606299897__Normal() + { + string check = "*.pcl"; + bool validatePDSF = false; + _HGCV2.Staging__v2_47_1__HGCV2__pcl(); + MethodBase methodBase = new StackFrame().GetMethod(); + string[] variables = _HGCV2.AdaptationTesting.GetVariables(methodBase, check, validatePDSF); + IFileRead fileRead = _HGCV2.AdaptationTesting.Get(methodBase, sourceFileLocation: variables[2], sourceFileFilter: variables[3], useCyclicalForDescription: false); + Logistics logistics = new(fileRead); + _ = Shared.AdaptationTesting.ReExtractCompareUpdatePassDirectory(variables, fileRead, logistics, validatePDSF); + } + +} \ No newline at end of file diff --git a/Adaptation/_Tests/Extract/Staging/v2.47.1/HGCV3.cs b/Adaptation/_Tests/Extract/Staging/v2.47.1/HGCV3.cs new file mode 100644 index 0000000..003bc40 --- /dev/null +++ b/Adaptation/_Tests/Extract/Staging/v2.47.1/HGCV3.cs @@ -0,0 +1,80 @@ +using Adaptation.Shared; +using Adaptation.Shared.Methods; +using Microsoft.VisualStudio.TestTools.UnitTesting; +using System.Diagnostics; +using System.Reflection; + +namespace Adaptation._Tests.Extract.Staging.v2_47_1; + +[TestClass] +public class HGCV3 +{ + +#pragma warning disable CA2254 +#pragma warning disable IDE0060 + + private static CreateSelfDescription.Staging.v2_47_1.HGCV3 _HGCV3; + + [ClassInitialize] + public static void ClassInitialize(TestContext testContext) + { + CreateSelfDescription.Staging.v2_47_1.HGCV3.ClassInitialize(testContext); + _HGCV3 = CreateSelfDescription.Staging.v2_47_1.HGCV3.EAFLoggingUnitTesting; + } + +#if true + [Ignore] +#endif + [TestMethod] + public void Staging__v2_47_1__HGCV3__pcl() => _HGCV3.Staging__v2_47_1__HGCV3__pcl(); + +#if true + [Ignore] +#endif + [TestMethod] + [ExpectedException(typeof(AssertFailedException))] + public void Staging__v2_47_1__HGCV3__pcl637812984345592512__MinFileLength() + { + string check = "*.pcl"; + bool validatePDSF = false; + _HGCV3.Staging__v2_47_1__HGCV3__pcl(); + MethodBase methodBase = new StackFrame().GetMethod(); + string[] variables = _HGCV3.AdaptationTesting.GetVariables(methodBase, check, validatePDSF); + IFileRead fileRead = _HGCV3.AdaptationTesting.Get(methodBase, sourceFileLocation: variables[2], sourceFileFilter: variables[3], useCyclicalForDescription: false); + Logistics logistics = new(fileRead); + _ = Shared.AdaptationTesting.ReExtractCompareUpdatePassDirectory(variables, fileRead, logistics, validatePDSF); + } + +#if true + [Ignore] +#endif + [TestMethod] + public void Staging__v2_47_1__HGCV3__pcl637816384579205568__Normal() + { + string check = "*.pcl"; + bool validatePDSF = false; + _HGCV3.Staging__v2_47_1__HGCV3__pcl(); + MethodBase methodBase = new StackFrame().GetMethod(); + string[] variables = _HGCV3.AdaptationTesting.GetVariables(methodBase, check, validatePDSF); + IFileRead fileRead = _HGCV3.AdaptationTesting.Get(methodBase, sourceFileLocation: variables[2], sourceFileFilter: variables[3], useCyclicalForDescription: false); + Logistics logistics = new(fileRead); + _ = Shared.AdaptationTesting.ReExtractCompareUpdatePassDirectory(variables, fileRead, logistics, validatePDSF); + } + +#if true + [Ignore] +#endif + [TestMethod] + public void Staging__v2_47_1__HGCV3__pcl637955459372840332__Normal() + { + string check = "*.pcl"; + bool validatePDSF = false; + _HGCV3.Staging__v2_47_1__HGCV3__pcl(); + MethodBase methodBase = new StackFrame().GetMethod(); + string[] variables = _HGCV3.AdaptationTesting.GetVariables(methodBase, check, validatePDSF); + IFileRead fileRead = _HGCV3.AdaptationTesting.Get(methodBase, sourceFileLocation: variables[2], sourceFileFilter: variables[3], useCyclicalForDescription: false); + Logistics logistics = new(fileRead); + _ = Shared.AdaptationTesting.ReExtractCompareUpdatePassDirectory(variables, fileRead, logistics, validatePDSF); + } + +} \ No newline at end of file diff --git a/Adaptation/_Tests/Extract/Staging/v2.47.1/MET08RESIHGCV.cs b/Adaptation/_Tests/Extract/Staging/v2.47.1/MET08RESIHGCV.cs new file mode 100644 index 0000000..854e0d3 --- /dev/null +++ b/Adaptation/_Tests/Extract/Staging/v2.47.1/MET08RESIHGCV.cs @@ -0,0 +1,132 @@ +using Adaptation.Shared; +using Adaptation.Shared.Methods; +using Microsoft.VisualStudio.TestTools.UnitTesting; +using System.Diagnostics; +using System.Reflection; + +namespace Adaptation._Tests.Extract.Staging.v2_47_1; + +[TestClass] +public class MET08RESIHGCV +{ + +#pragma warning disable CA2254 +#pragma warning disable IDE0060 + + private static CreateSelfDescription.Staging.v2_47_1.MET08RESIHGCV _MET08RESIHGCV; + + [ClassInitialize] + public static void ClassInitialize(TestContext testContext) + { + CreateSelfDescription.Staging.v2_47_1.MET08RESIHGCV.ClassInitialize(testContext); + _MET08RESIHGCV = CreateSelfDescription.Staging.v2_47_1.MET08RESIHGCV.EAFLoggingUnitTesting; + } + +#if true + [Ignore] +#endif + [TestMethod] + public void Staging__v2_47_1__MET08RESIHGCV__MoveMatchingFiles() => _MET08RESIHGCV.Staging__v2_47_1__MET08RESIHGCV__MoveMatchingFiles(); + +#if true + [Ignore] +#endif + [TestMethod] + public void Staging__v2_47_1__MET08RESIHGCV__MoveMatchingFiles637955459372840332__Normal() + { + string check = "*.pdsf"; + bool validatePDSF = false; + MethodBase methodBase = new StackFrame().GetMethod(); + _MET08RESIHGCV.Staging__v2_47_1__MET08RESIHGCV__MoveMatchingFiles(); + string[] variables = _MET08RESIHGCV.AdaptationTesting.GetVariables(methodBase, check, validatePDSF); + IFileRead fileRead = _MET08RESIHGCV.AdaptationTesting.Get(methodBase, sourceFileLocation: variables[2], sourceFileFilter: variables[3], useCyclicalForDescription: false); + Logistics logistics = new(fileRead); + _ = Shared.AdaptationTesting.ReExtractCompareUpdatePassDirectory(variables, fileRead, logistics, validatePDSF); + } + +#if true + [Ignore] +#endif + [TestMethod] + public void Staging__v2_47_1__MET08RESIHGCV__OpenInsightMetrologyViewer() => _MET08RESIHGCV.Staging__v2_47_1__MET08RESIHGCV__OpenInsightMetrologyViewer(); + +#if true + [Ignore] +#endif + [TestMethod] + public void Staging__v2_47_1__MET08RESIHGCV__OpenInsightMetrologyViewer637961644453719245__Normal() + { + string check = "*.pdsf"; + bool validatePDSF = false; + MethodBase methodBase = new StackFrame().GetMethod(); + _MET08RESIHGCV.Staging__v2_47_1__MET08RESIHGCV__OpenInsightMetrologyViewer(); + string[] variables = _MET08RESIHGCV.AdaptationTesting.GetVariables(methodBase, check, validatePDSF); + IFileRead fileRead = _MET08RESIHGCV.AdaptationTesting.Get(methodBase, sourceFileLocation: variables[2], sourceFileFilter: variables[3], useCyclicalForDescription: false); + Logistics logistics = new(fileRead); + _ = Shared.AdaptationTesting.ReExtractCompareUpdatePassDirectory(variables, fileRead, logistics, validatePDSF); + } + +#if true + [Ignore] +#endif + [TestMethod] + public void Staging__v2_47_1__MET08RESIHGCV__IQSSi() => _MET08RESIHGCV.Staging__v2_47_1__MET08RESIHGCV__IQSSi(); + +#if true + [Ignore] +#endif + [TestMethod] + public void Staging__v2_47_1__MET08RESIHGCV__OpenInsight() => _MET08RESIHGCV.Staging__v2_47_1__MET08RESIHGCV__OpenInsight(); + +#if true + [Ignore] +#endif + [TestMethod] + public void Staging__v2_47_1__MET08RESIHGCV__OpenInsight638054470203066399__IqsSql() + { + string check = "*.pdsf"; + MethodBase methodBase = new StackFrame().GetMethod(); + _MET08RESIHGCV.Staging__v2_47_1__MET08RESIHGCV__OpenInsight(); + string[] variables = _MET08RESIHGCV.AdaptationTesting.GetVariables(methodBase, check, validatePDSF: false); + IFileRead fileRead = _MET08RESIHGCV.AdaptationTesting.Get(methodBase, sourceFileLocation: variables[2], sourceFileFilter: variables[3], useCyclicalForDescription: false); + Logistics logistics = new(fileRead); + _ = Shared.AdaptationTesting.ReExtractCompareUpdatePassDirectory(variables, fileRead, logistics); + } + +#if true + [Ignore] +#endif + [TestMethod] + public void Staging__v2_47_1__MET08RESIHGCV__OpenInsightMetrologyViewerAttachments() => _MET08RESIHGCV.Staging__v2_47_1__MET08RESIHGCV__OpenInsightMetrologyViewerAttachments(); + +#if true + [Ignore] +#endif + [TestMethod] + public void Staging__v2_47_1__MET08RESIHGCV__APC() => _MET08RESIHGCV.Staging__v2_47_1__MET08RESIHGCV__APC(); + +#if true + [Ignore] +#endif + [TestMethod] + public void Staging__v2_47_1__MET08RESIHGCV__SPaCe() => _MET08RESIHGCV.Staging__v2_47_1__MET08RESIHGCV__SPaCe(); + +#if true + [Ignore] +#endif + [TestMethod] + public void Staging__v2_47_1__MET08RESIHGCV__Processed() => _MET08RESIHGCV.Staging__v2_47_1__MET08RESIHGCV__Processed(); + +#if true + [Ignore] +#endif + [TestMethod] + public void Staging__v2_47_1__MET08RESIHGCV__Archive() => _MET08RESIHGCV.Staging__v2_47_1__MET08RESIHGCV__Archive(); + +#if true + [Ignore] +#endif + [TestMethod] + public void Staging__v2_47_1__MET08RESIHGCV__Dummy() => _MET08RESIHGCV.Staging__v2_47_1__MET08RESIHGCV__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/pcl.cs b/Adaptation/_Tests/Static/pcl.cs index 2aa91ed..c5c3548 100644 --- a/Adaptation/_Tests/Static/pcl.cs +++ b/Adaptation/_Tests/Static/pcl.cs @@ -27,19 +27,13 @@ public class PCL : LoggingUnitTesting, IDisposable } [ClassInitialize] - public static void ClassInitialize(TestContext testContext) - { - if (LoggingUnitTesting is null) - LoggingUnitTesting = new PCL(testContext); - } + public static void ClassInitialize(TestContext testContext) => LoggingUnitTesting ??= new PCL(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] @@ -48,35 +42,83 @@ public class PCL : LoggingUnitTesting, IDisposable FileHandlers.pcl.Descriptor descriptor; MethodBase methodBase = new StackFrame().GetMethod(); LoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration")); + descriptor = FileHandlers.pcl.ProcessData.GetDescriptor(string.Empty); + Assert.IsTrue(string.IsNullOrEmpty(descriptor.Reactor)); + Assert.IsTrue(string.IsNullOrEmpty(descriptor.RDS)); + Assert.IsTrue(string.IsNullOrEmpty(descriptor.PSN)); + Assert.IsTrue(string.IsNullOrEmpty(descriptor.Layer)); + Assert.IsTrue(string.IsNullOrEmpty(descriptor.Zone)); + Assert.IsTrue(string.IsNullOrEmpty(descriptor.Employee)); descriptor = FileHandlers.pcl.ProcessData.GetDescriptor("12-123456-1234"); Assert.IsTrue(descriptor.Reactor is "12"); Assert.IsTrue(descriptor.RDS is "123456"); Assert.IsTrue(descriptor.PSN is "1234"); + Assert.IsTrue(string.IsNullOrEmpty(descriptor.Layer)); + Assert.IsTrue(string.IsNullOrEmpty(descriptor.Zone)); + Assert.IsTrue(string.IsNullOrEmpty(descriptor.Employee)); descriptor = FileHandlers.pcl.ProcessData.GetDescriptor("123456"); - Assert.IsTrue(descriptor.Reactor is "00"); + Assert.IsTrue(string.IsNullOrEmpty(descriptor.Reactor)); Assert.IsTrue(descriptor.RDS is "123456"); - Assert.IsTrue(descriptor.PSN is "0000"); + Assert.IsTrue(string.IsNullOrEmpty(descriptor.PSN)); + Assert.IsTrue(string.IsNullOrEmpty(descriptor.Layer)); + Assert.IsTrue(string.IsNullOrEmpty(descriptor.Zone)); + Assert.IsTrue(string.IsNullOrEmpty(descriptor.Employee)); descriptor = FileHandlers.pcl.ProcessData.GetDescriptor("1T123456"); - Assert.IsTrue(descriptor.Reactor is "00"); + Assert.IsTrue(string.IsNullOrEmpty(descriptor.Reactor)); Assert.IsTrue(descriptor.RDS is "123456"); - Assert.IsTrue(descriptor.PSN is "0000"); + Assert.IsTrue(string.IsNullOrEmpty(descriptor.PSN)); + Assert.IsTrue(string.IsNullOrEmpty(descriptor.Layer)); + Assert.IsTrue(string.IsNullOrEmpty(descriptor.Zone)); + Assert.IsTrue(string.IsNullOrEmpty(descriptor.Employee)); descriptor = FileHandlers.pcl.ProcessData.GetDescriptor("MP"); - Assert.IsTrue(descriptor.Reactor is "00"); - Assert.IsTrue(descriptor.RDS is "000000"); - Assert.IsTrue(descriptor.PSN is "0000"); + Assert.IsTrue(string.IsNullOrEmpty(descriptor.Reactor)); + Assert.IsTrue(string.IsNullOrEmpty(descriptor.RDS)); + Assert.IsTrue(string.IsNullOrEmpty(descriptor.PSN)); Assert.IsTrue(descriptor.Employee is "MP"); + Assert.IsTrue(string.IsNullOrEmpty(descriptor.Layer)); + Assert.IsTrue(string.IsNullOrEmpty(descriptor.Zone)); descriptor = FileHandlers.pcl.ProcessData.GetDescriptor("12-123456-1234.2-1"); Assert.IsTrue(descriptor.Reactor is "12"); Assert.IsTrue(descriptor.RDS is "123456"); Assert.IsTrue(descriptor.PSN is "1234"); Assert.IsTrue(descriptor.Layer is "2"); Assert.IsTrue(descriptor.Zone is "1"); + Assert.IsTrue(string.IsNullOrEmpty(descriptor.Employee)); descriptor = FileHandlers.pcl.ProcessData.GetDescriptor("12-123456-1234.02-1"); Assert.IsTrue(descriptor.Reactor is "12"); Assert.IsTrue(descriptor.RDS is "123456"); Assert.IsTrue(descriptor.PSN is "1234"); Assert.IsTrue(descriptor.Layer is "2"); Assert.IsTrue(descriptor.Zone is "1"); + Assert.IsTrue(string.IsNullOrEmpty(descriptor.Employee)); + descriptor = FileHandlers.pcl.ProcessData.GetDescriptor("20"); + Assert.IsTrue(descriptor.Reactor is "20"); + Assert.IsTrue(string.IsNullOrEmpty(descriptor.RDS)); + Assert.IsTrue(string.IsNullOrEmpty(descriptor.PSN)); + Assert.IsTrue(string.IsNullOrEmpty(descriptor.Layer)); + Assert.IsTrue(string.IsNullOrEmpty(descriptor.Zone)); + Assert.IsTrue(string.IsNullOrEmpty(descriptor.Employee)); + descriptor = FileHandlers.pcl.ProcessData.GetDescriptor("20.2"); + Assert.IsTrue(descriptor.Reactor is "20"); + Assert.IsTrue(string.IsNullOrEmpty(descriptor.RDS)); + Assert.IsTrue(string.IsNullOrEmpty(descriptor.PSN)); + Assert.IsTrue(descriptor.Layer is "2"); + Assert.IsTrue(string.IsNullOrEmpty(descriptor.Zone)); + Assert.IsTrue(string.IsNullOrEmpty(descriptor.Employee)); + descriptor = FileHandlers.pcl.ProcessData.GetDescriptor("20.2.1"); + Assert.IsTrue(descriptor.Layer is "2"); + Assert.IsTrue(string.IsNullOrEmpty(descriptor.PSN)); + Assert.IsTrue(string.IsNullOrEmpty(descriptor.RDS)); + Assert.IsTrue(descriptor.Reactor is "20"); + Assert.IsTrue(descriptor.Zone is "1"); + Assert.IsTrue(string.IsNullOrEmpty(descriptor.Employee)); + descriptor = FileHandlers.pcl.ProcessData.GetDescriptor("20.1.1"); + Assert.IsTrue(descriptor.Layer is "1"); + Assert.IsTrue(string.IsNullOrEmpty(descriptor.PSN)); + Assert.IsTrue(string.IsNullOrEmpty(descriptor.RDS)); + Assert.IsTrue(descriptor.Reactor is "20"); + Assert.IsTrue(descriptor.Zone is "1"); + Assert.IsTrue(string.IsNullOrEmpty(descriptor.Employee)); LoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } 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 ab5edc8..7cbaa2c 100644 --- a/Adaptation/package.json +++ b/Adaptation/package.json @@ -1,22 +1,23 @@ { "scripts": { - "AA-CreateSelfDescription.Staging.v2_43_4-HGCV1_EQPT": "dotnet test --runtime win-x64 --no-build --filter \"FullyQualifiedName~Adaptation._Tests.CreateSelfDescription.Staging.v2_43_4 & ClassName~HGCV1_EQPT\" -- TestRunParameters.Parameter(name=\\\"WaitFor\\\", value=\\\"Debugger.IsAttached\\\")", - "AB-CreateSelfDescription.Staging.v2_43_4-HGCV2_EQPT": "dotnet test --runtime win-x64 --no-build --filter \"FullyQualifiedName~Adaptation._Tests.CreateSelfDescription.Staging.v2_43_4 & ClassName~HGCV2_EQPT\" -- TestRunParameters.Parameter(name=\\\"WaitFor\\\", value=\\\"Debugger.IsAttached\\\")", - "AC-CreateSelfDescription.Staging.v2_43_4-HGCV3_EQPT": "dotnet test --runtime win-x64 --no-build --filter \"FullyQualifiedName~Adaptation._Tests.CreateSelfDescription.Staging.v2_43_4 & ClassName~HGCV3_EQPT\" -- TestRunParameters.Parameter(name=\\\"WaitFor\\\", value=\\\"Debugger.IsAttached\\\")", - "BA-CreateSelfDescription.Staging.v2_43_4-HGCV1": "dotnet test --runtime win-x64 --no-build --filter \"FullyQualifiedName~Adaptation._Tests.CreateSelfDescription.Staging.v2_43_4 & ClassName~HGCV1\" -- TestRunParameters.Parameter(name=\\\"WaitFor\\\", value=\\\"Debugger.IsAttached\\\")", - "BB-CreateSelfDescription.Staging.v2_43_4-HGCV2": "dotnet test --runtime win-x64 --no-build --filter \"FullyQualifiedName~Adaptation._Tests.CreateSelfDescription.Staging.v2_43_4 & ClassName~HGCV2\" -- TestRunParameters.Parameter(name=\\\"WaitFor\\\", value=\\\"Debugger.IsAttached\\\")", - "BC-CreateSelfDescription.Staging.v2_43_4-HGCV3": "dotnet test --runtime win-x64 --no-build --filter \"FullyQualifiedName~Adaptation._Tests.CreateSelfDescription.Staging.v2_43_4 & ClassName~HGCV3\" -- TestRunParameters.Parameter(name=\\\"WaitFor\\\", value=\\\"Debugger.IsAttached\\\")", - "CA-CreateSelfDescription.Staging.v2_43_4-MET08RESIHGCV": "dotnet test --runtime win-x64 --no-build --filter \"FullyQualifiedName~Adaptation._Tests.CreateSelfDescription.Staging.v2_43_4 & ClassName~MET08RESIHGCV\" -- 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-HGCV1_EQPT-Staging__v2_43_4__HGCV1_EQPT__DownloadRsMFile637953072332628623__Normal": "dotnet test --runtime win-x64 --no-build --filter \"FullyQualifiedName~Adaptation._Tests.Extract.Staging.v2_43_4 & ClassName~HGCV1_EQPT & Name~Staging__v2_43_4__HGCV1_EQPT__DownloadRsMFile637953072332628623__Normal\" -- TestRunParameters.Parameter(name=\\\"WaitFor\\\", value=\\\"Debugger.IsAttached\\\")", - "EA-Extract.Staging.v2_43_4-HGCV2_EQPT-Staging__v2_43_4__HGCV2_EQPT__DownloadRsMFile637953072332628623__Normal": "dotnet test --runtime win-x64 --no-build --filter \"FullyQualifiedName~Adaptation._Tests.Extract.Staging.v2_43_4 & ClassName~HGCV2_EQPT & Name~Staging__v2_43_4__HGCV2_EQPT__DownloadRsMFile637953072332628623__Normal\" -- TestRunParameters.Parameter(name=\\\"WaitFor\\\", value=\\\"Debugger.IsAttached\\\")", - "EA-Extract.Staging.v2_43_4-HGCV3_EQPT-Staging__v2_43_4__HGCV3_EQPT__DownloadRsMFile637953072332628623__Normal": "dotnet test --runtime win-x64 --no-build --filter \"FullyQualifiedName~Adaptation._Tests.Extract.Staging.v2_43_4 & ClassName~HGCV3_EQPT & Name~Staging__v2_43_4__HGCV3_EQPT__DownloadRsMFile637953072332628623__Normal\" -- TestRunParameters.Parameter(name=\\\"WaitFor\\\", value=\\\"Debugger.IsAttached\\\")", - "FA-Extract.Staging.v2_43_4-HGCV1-Staging__v2_43_4__HGCV1__pcl637955429602879992__Normal": "dotnet test --filter \"FullyQualifiedName~Adaptation._Tests.Extract.Staging.v2_43_4 & ClassName~HGCV1 & Name~Staging__v2_43_4__HGCV1__pcl637955429602879992__Normal\" -- TestRunParameters.Parameter(name=\\\"WaitFor\\\", value=\\\"Debugger.IsAttached\\\")", - "FB-Extract.Staging.v2_43_4-HGCV2-Staging__v2_43_4__HGCV2__pcl637955471606299897__Normal": "dotnet test --filter \"FullyQualifiedName~Adaptation._Tests.Extract.Staging.v2_43_4 & ClassName~HGCV2 & Name~Staging__v2_43_4__HGCV2__pcl637955471606299897__Normal\" -- TestRunParameters.Parameter(name=\\\"WaitFor\\\", value=\\\"Debugger.IsAttached\\\")", - "FC-Extract.Staging.v2_43_4-HGCV3-Staging__v2_43_4__HGCV3__pcl637955459372840332__Normal": "dotnet test --filter \"FullyQualifiedName~Adaptation._Tests.Extract.Staging.v2_43_4 & ClassName~HGCV3 & Name~Staging__v2_43_4__HGCV3__pcl637955459372840332__Normal\" -- TestRunParameters.Parameter(name=\\\"WaitFor\\\", value=\\\"Debugger.IsAttached\\\")", - "GA-Extract.Staging.v2_43_4-MET08RESIHGCV-Staging__v2_43_4__MET08RESIHGCV__MoveMatchingFiles637955459372840332__Normal": "dotnet test --filter \"FullyQualifiedName~Adaptation._Tests.Extract.Staging.v2_43_4 & ClassName~MET08RESIHGCV & Name~Staging__v2_43_4__MET08RESIHGCV__MoveMatchingFiles637955459372840332__Normal\" -- TestRunParameters.Parameter(name=\\\"WaitFor\\\", value=\\\"Debugger.IsAttached\\\")", - "GB-Extract.Staging.v2_43_4-MET08RESIHGCV-Staging__v2_43_4__MET08RESIHGCV__OpenInsightMetrologyViewer637961644453719245__Normal": "dotnet test --filter \"FullyQualifiedName~Adaptation._Tests.Extract.Staging.v2_43_4 & ClassName~MET08RESIHGCV & Name~Staging__v2_43_4__MET08RESIHGCV__OpenInsightMetrologyViewer637961644453719245__Normal\" -- TestRunParameters.Parameter(name=\\\"WaitFor\\\", value=\\\"Debugger.IsAttached\\\")", - "HA-Extract.Staging.v2_43_4-HGCV3-Staging__v2_43_4__HGCV3__pcl637812984345592512__MinFileLength": "dotnet test --filter \"FullyQualifiedName~Adaptation._Tests.Extract.Staging.v2_43_4 & ClassName~HGCV3 & Name~Staging__v2_43_4__HGCV3__pcl637812984345592512__MinFileLength\" -- TestRunParameters.Parameter(name=\\\"WaitFor\\\", value=\\\"Debugger.IsAttached\\\")", + "AA-CreateSelfDescription.Staging.v2_47_1-HGCV1_EQPT": "dotnet test --runtime win-x64 --no-build --filter \"FullyQualifiedName~Adaptation._Tests.CreateSelfDescription.Staging.v2_47_1 & ClassName~HGCV1_EQPT\" -- TestRunParameters.Parameter(name=\\\"WaitFor\\\", value=\\\"Debugger.IsAttached\\\")", + "AB-CreateSelfDescription.Staging.v2_47_1-HGCV2_EQPT": "dotnet test --runtime win-x64 --no-build --filter \"FullyQualifiedName~Adaptation._Tests.CreateSelfDescription.Staging.v2_47_1 & ClassName~HGCV2_EQPT\" -- TestRunParameters.Parameter(name=\\\"WaitFor\\\", value=\\\"Debugger.IsAttached\\\")", + "AC-CreateSelfDescription.Staging.v2_47_1-HGCV3_EQPT": "dotnet test --runtime win-x64 --no-build --filter \"FullyQualifiedName~Adaptation._Tests.CreateSelfDescription.Staging.v2_47_1 & ClassName~HGCV3_EQPT\" -- TestRunParameters.Parameter(name=\\\"WaitFor\\\", value=\\\"Debugger.IsAttached\\\")", + "BA-CreateSelfDescription.Staging.v2_47_1-HGCV1": "dotnet test --runtime win-x64 --no-build --filter \"FullyQualifiedName~Adaptation._Tests.CreateSelfDescription.Staging.v2_47_1 & ClassName~HGCV1\" -- TestRunParameters.Parameter(name=\\\"WaitFor\\\", value=\\\"Debugger.IsAttached\\\")", + "BB-CreateSelfDescription.Staging.v2_47_1-HGCV2": "dotnet test --runtime win-x64 --no-build --filter \"FullyQualifiedName~Adaptation._Tests.CreateSelfDescription.Staging.v2_47_1 & ClassName~HGCV2\" -- TestRunParameters.Parameter(name=\\\"WaitFor\\\", value=\\\"Debugger.IsAttached\\\")", + "BC-CreateSelfDescription.Staging.v2_47_1-HGCV3": "dotnet test --runtime win-x64 --no-build --filter \"FullyQualifiedName~Adaptation._Tests.CreateSelfDescription.Staging.v2_47_1 & ClassName~HGCV3\" -- TestRunParameters.Parameter(name=\\\"WaitFor\\\", value=\\\"Debugger.IsAttached\\\")", + "CA-CreateSelfDescription.Staging.v2_47_1-MET08RESIHGCV": "dotnet test --runtime win-x64 --no-build --filter \"FullyQualifiedName~Adaptation._Tests.CreateSelfDescription.Staging.v2_47_1 & ClassName~MET08RESIHGCV\" -- 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-HGCV1_EQPT-Staging__v2_47_1__HGCV1_EQPT__DownloadRsMFile637953072332628623__Normal": "dotnet test --runtime win-x64 --no-build --filter \"FullyQualifiedName~Adaptation._Tests.Extract.Staging.v2_47_1 & ClassName~HGCV1_EQPT & Name~Staging__v2_47_1__HGCV1_EQPT__DownloadRsMFile637953072332628623__Normal\" -- TestRunParameters.Parameter(name=\\\"WaitFor\\\", value=\\\"Debugger.IsAttached\\\")", + "EA-Extract.Staging.v2_47_1-HGCV2_EQPT-Staging__v2_47_1__HGCV2_EQPT__DownloadRsMFile637953072332628623__Normal": "dotnet test --runtime win-x64 --no-build --filter \"FullyQualifiedName~Adaptation._Tests.Extract.Staging.v2_47_1 & ClassName~HGCV2_EQPT & Name~Staging__v2_47_1__HGCV2_EQPT__DownloadRsMFile637953072332628623__Normal\" -- TestRunParameters.Parameter(name=\\\"WaitFor\\\", value=\\\"Debugger.IsAttached\\\")", + "EA-Extract.Staging.v2_47_1-HGCV3_EQPT-Staging__v2_47_1__HGCV3_EQPT__DownloadRsMFile637953072332628623__Normal": "dotnet test --runtime win-x64 --no-build --filter \"FullyQualifiedName~Adaptation._Tests.Extract.Staging.v2_47_1 & ClassName~HGCV3_EQPT & Name~Staging__v2_47_1__HGCV3_EQPT__DownloadRsMFile637953072332628623__Normal\" -- TestRunParameters.Parameter(name=\\\"WaitFor\\\", value=\\\"Debugger.IsAttached\\\")", + "FA-Extract.Staging.v2_47_1-HGCV1-Staging__v2_47_1__HGCV1__pcl637955429602879992__Normal": "dotnet test --filter \"FullyQualifiedName~Adaptation._Tests.Extract.Staging.v2_47_1 & ClassName~HGCV1 & Name~Staging__v2_47_1__HGCV1__pcl637955429602879992__Normal\" -- TestRunParameters.Parameter(name=\\\"WaitFor\\\", value=\\\"Debugger.IsAttached\\\")", + "FB-Extract.Staging.v2_47_1-HGCV2-Staging__v2_47_1__HGCV2__pcl637955471606299897__Normal": "dotnet test --filter \"FullyQualifiedName~Adaptation._Tests.Extract.Staging.v2_47_1 & ClassName~HGCV2 & Name~Staging__v2_47_1__HGCV2__pcl637955471606299897__Normal\" -- TestRunParameters.Parameter(name=\\\"WaitFor\\\", value=\\\"Debugger.IsAttached\\\")", + "FC-Extract.Staging.v2_47_1-HGCV3-Staging__v2_47_1__HGCV3__pcl637955459372840332__Normal": "dotnet test --filter \"FullyQualifiedName~Adaptation._Tests.Extract.Staging.v2_47_1 & ClassName~HGCV3 & Name~Staging__v2_47_1__HGCV3__pcl637955459372840332__Normal\" -- TestRunParameters.Parameter(name=\\\"WaitFor\\\", value=\\\"Debugger.IsAttached\\\")", + "GA-Extract.Staging.v2_47_1-MET08RESIHGCV-Staging__v2_47_1__MET08RESIHGCV__MoveMatchingFiles637955459372840332__Normal": "dotnet test --filter \"FullyQualifiedName~Adaptation._Tests.Extract.Staging.v2_47_1 & ClassName~MET08RESIHGCV & Name~Staging__v2_47_1__MET08RESIHGCV__MoveMatchingFiles637955459372840332__Normal\" -- TestRunParameters.Parameter(name=\\\"WaitFor\\\", value=\\\"Debugger.IsAttached\\\")", + "GB-Extract.Staging.v2_47_1-MET08RESIHGCV-Staging__v2_47_1__MET08RESIHGCV__OpenInsightMetrologyViewer637961644453719245__Normal": "dotnet test --filter \"FullyQualifiedName~Adaptation._Tests.Extract.Staging.v2_47_1 & ClassName~MET08RESIHGCV & Name~Staging__v2_47_1__MET08RESIHGCV__OpenInsightMetrologyViewer637961644453719245__Normal\" -- TestRunParameters.Parameter(name=\\\"WaitFor\\\", value=\\\"Debugger.IsAttached\\\")", + "HA-Extract.Staging.v2_47_1-HGCV3-Staging__v2_47_1__HGCV3__pcl637812984345592512__MinFileLength": "dotnet test --filter \"FullyQualifiedName~Adaptation._Tests.Extract.Staging.v2_47_1 & ClassName~HGCV3 & Name~Staging__v2_47_1__HGCV3__pcl637812984345592512__MinFileLength\" -- TestRunParameters.Parameter(name=\\\"WaitFor\\\", value=\\\"Debugger.IsAttached\\\")", + "HB-Extract.Staging.v2_47_1-MET08RESIHGCV-Staging__v2_47_1__MET08RESIHGCV__OpenInsight638054470203066399__IqsSql": "dotnet test --filter \"FullyQualifiedName~Adaptation._Tests.Extract.Staging.v2_47_1 & ClassName~MET08RESIHGCV & Name~Staging__v2_47_1__MET08RESIHGCV__OpenInsight638054470203066399__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/MET08RESIHGCV.csproj b/MET08RESIHGCV.csproj index db86497..eedc936 100644 --- a/MET08RESIHGCV.csproj +++ b/MET08RESIHGCV.csproj @@ -106,6 +106,7 @@ + @@ -163,7 +164,7 @@ 7.2.4630.5 - 2.43.0 + 2.47.0 1.1.1 diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs index e22c68e..30dbf67 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.43.4.0")] -[assembly: AssemblyFileVersion("2.43.4.0")] +[assembly: AssemblyVersion("2.47.1.0")] +[assembly: AssemblyFileVersion("2.47.1.0")]