From 34b7d75b207039dca9b24f868dfcb26b750df21c Mon Sep 17 00:00:00 2001 From: Mike Phares Date: Thu, 20 Apr 2023 11:33:46 -0700 Subject: [PATCH] 2.49.0 Removed 24 hour filter for missing header Added MesEntity to file name for OI --- .../FileHandlers/OpenInsight/FileRead.cs | 9 +- Adaptation/FileHandlers/QS408M/ProcessData.cs | 75 ++++---- Adaptation/MET08THFTIRQS408M-Development.yml | 2 +- Adaptation/MET08THFTIRQS408M.yml | 4 +- Adaptation/Shared/FileRead.cs | 5 +- .../Staging/v2.47.5/BIORAD2.cs | 2 - .../Staging/v2.47.5/BIORAD3.cs | 2 - .../Staging/v2.47.5/MET08THFTIRQS408M.cs | 20 -- .../Staging/v2.49.0/BIORAD2.cs | 63 ++++++ .../Staging/v2.49.0/BIORAD3.cs | 63 ++++++ .../Staging/v2.49.0/MET08THFTIRQS408M.cs | 180 ++++++++++++++++++ .../_Tests/Extract/Staging/v2.47.5/BIORAD2.cs | 2 - .../_Tests/Extract/Staging/v2.47.5/BIORAD3.cs | 4 - .../Staging/v2.47.5/MET08THFTIRQS408M.cs | 22 --- .../_Tests/Extract/Staging/v2.49.0/BIORAD2.cs | 27 +++ .../_Tests/Extract/Staging/v2.49.0/BIORAD3.cs | 53 ++++++ .../Staging/v2.49.0/MET08THFTIRQS408M.cs | 106 +++++++++++ Adaptation/_Tests/Static/MET08THFTIRQS408M.cs | 2 +- Adaptation/_Tests/Static/QS408M.cs | 48 ++++- 19 files changed, 589 insertions(+), 100 deletions(-) create mode 100644 Adaptation/_Tests/CreateSelfDescription/Staging/v2.49.0/BIORAD2.cs create mode 100644 Adaptation/_Tests/CreateSelfDescription/Staging/v2.49.0/BIORAD3.cs create mode 100644 Adaptation/_Tests/CreateSelfDescription/Staging/v2.49.0/MET08THFTIRQS408M.cs create mode 100644 Adaptation/_Tests/Extract/Staging/v2.49.0/BIORAD2.cs create mode 100644 Adaptation/_Tests/Extract/Staging/v2.49.0/BIORAD3.cs create mode 100644 Adaptation/_Tests/Extract/Staging/v2.49.0/MET08THFTIRQS408M.cs diff --git a/Adaptation/FileHandlers/OpenInsight/FileRead.cs b/Adaptation/FileHandlers/OpenInsight/FileRead.cs index 09848cb..057ffb2 100644 --- a/Adaptation/FileHandlers/OpenInsight/FileRead.cs +++ b/Adaptation/FileHandlers/OpenInsight/FileRead.cs @@ -152,20 +152,17 @@ public class FileRead : Shared.FileRead, IFileRead string lines = GetLines(descriptions); if (!string.IsNullOrEmpty(lines)) { - int? count; long? subGroupId; long breakAfter = dateTime.AddSeconds(_BreakAfterSeconds).Ticks; long preWait = _FileConnectorConfiguration?.FileHandleWaitTime is null ? dateTime.AddMilliseconds(1234).Ticks : dateTime.AddMilliseconds(_FileConnectorConfiguration.FileHandleWaitTime.Value).Ticks; if (string.IsNullOrEmpty(descriptions[0].Reactor) || string.IsNullOrEmpty(descriptions[0].PSN)) - (subGroupId, count) = (null, null); + subGroupId = null; else - (subGroupId, count, string _) = FromIQS.GetCommandText(_IqsConnectionString, _Logistics, descriptions[0], breakAfter, preWait); + (subGroupId, int? _, string _) = FromIQS.GetCommandText(_IqsConnectionString, _Logistics, descriptions[0], breakAfter, preWait); if (subGroupId is null) collection.Add(new(new ScopeInfo(tests[0], _OpenInsightFilePattern), lines)); - else if (count is null) - collection.Add(new(new ScopeInfo(tests[0], $"{subGroupId.Value} {_OpenInsightFilePattern}"), lines)); else - collection.Add(new(new ScopeInfo(tests[0], $"{subGroupId.Value} E{count.Value} {_OpenInsightFilePattern}"), lines)); + collection.Add(new(new ScopeInfo(tests[0], $"{subGroupId.Value} {_OpenInsightFilePattern}"), lines)); string weekOfYear = _Calendar.GetWeekOfYear(_Logistics.DateTimeFromSequence, CalendarWeekRule.FirstDay, DayOfWeek.Sunday).ToString("00"); FromIQS.Save(_OpenInsightApiECDirectory, _OpenInsightApiIFXDirectory, _Logistics, reportFullPath, logistics, descriptions.First(), lines, subGroupId, weekOfYear); } diff --git a/Adaptation/FileHandlers/QS408M/ProcessData.cs b/Adaptation/FileHandlers/QS408M/ProcessData.cs index 7dd82f3..007c01d 100644 --- a/Adaptation/FileHandlers/QS408M/ProcessData.cs +++ b/Adaptation/FileHandlers/QS408M/ProcessData.cs @@ -328,7 +328,17 @@ public partial class ProcessData : IProcessData 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}"))) + if (Regex.IsMatch(text, @"^[a-zA-z][0-9]{4}$")) + { + wafer = text.ToUpper(); + psn = defaultPSN; + rds = defaultRDS; + zone = defaultZone; + layer = defaultLayer; + reactor = defaultReactor; + employee = defaultEmployee; + } + else if (string.IsNullOrEmpty(text) || (text.Length is 2 or 3 && Regex.IsMatch(text, "^[a-zA-z]{2,3}"))) { wafer = text; employee = text; @@ -419,41 +429,38 @@ public partial class ProcessData : IProcessData reactor = descriptor.Reactor; if (employee != wafer) employee = descriptor.Employee; - if (logistics.DateTimeFromSequence > DateTime.Now.AddHours(-24)) + if (string.IsNullOrEmpty(lastProcessData.Wafer)) { - if (string.IsNullOrEmpty(lastProcessData.Wafer)) - { - lastProcessData.Batch = JobID; - lastProcessData.Cassette = JobID; - lastProcessData.Employee = JobID; - lastProcessData.Recipe = JobID; - lastProcessData.Title = JobID; - } - lastProcessData.Wafer = wafer; - lastProcessData.Reactor = reactor; - lastProcessData.RDS = rds; - string check = "--------"; - if (string.IsNullOrEmpty(batch) || batch.Contains(check)) - batch = lastProcessData.Batch; - else - lastProcessData.Batch = batch; - if (string.IsNullOrEmpty(cassette) || cassette.Contains(check)) - cassette = lastProcessData.Cassette; - else - lastProcessData.Cassette = cassette; - if (string.IsNullOrEmpty(employee) || employee.Contains(check)) - employee = lastProcessData.Employee; - else - lastProcessData.Employee = employee; - if (string.IsNullOrEmpty(recipe) || recipe.Contains(check)) - recipe = lastProcessData.Recipe; - else - lastProcessData.Recipe = recipe; - if (string.IsNullOrEmpty(title) || title.Contains(check)) - title = lastProcessData.Title; - else - lastProcessData.Title = title; + lastProcessData.Batch = JobID; + lastProcessData.Cassette = JobID; + lastProcessData.Employee = JobID; + lastProcessData.Recipe = JobID; + lastProcessData.Title = JobID; } + lastProcessData.Wafer = wafer; + lastProcessData.Reactor = reactor; + lastProcessData.RDS = rds; + string check = "--------"; + if (string.IsNullOrEmpty(batch) || batch.Contains(check)) + batch = lastProcessData.Batch; + else + lastProcessData.Batch = batch; + if (string.IsNullOrEmpty(cassette) || cassette.Contains(check)) + cassette = lastProcessData.Cassette; + else + lastProcessData.Cassette = cassette; + if (string.IsNullOrEmpty(employee) || employee.Contains(check)) + employee = lastProcessData.Employee; + else + lastProcessData.Employee = employee; + if (string.IsNullOrEmpty(recipe) || recipe.Contains(check)) + recipe = lastProcessData.Recipe; + else + lastProcessData.Recipe = recipe; + if (string.IsNullOrEmpty(title) || title.Contains(check)) + title = lastProcessData.Title; + else + lastProcessData.Title = title; //fix title StringBuilder titleFixed = new(); foreach (char c in title) diff --git a/Adaptation/MET08THFTIRQS408M-Development.yml b/Adaptation/MET08THFTIRQS408M-Development.yml index 1ea8489..89b4f2a 100644 --- a/Adaptation/MET08THFTIRQS408M-Development.yml +++ b/Adaptation/MET08THFTIRQS408M-Development.yml @@ -12,7 +12,7 @@ pool: steps: - script: | - set coreVersion=net6.0 + set coreVersion=net7.0 echo %coreVersion% echo ##vso[task.setvariable variable=CoreVersion;]%coreVersion% echo $(CoreVersion) diff --git a/Adaptation/MET08THFTIRQS408M.yml b/Adaptation/MET08THFTIRQS408M.yml index f1f43cd..18bb429 100644 --- a/Adaptation/MET08THFTIRQS408M.yml +++ b/Adaptation/MET08THFTIRQS408M.yml @@ -12,7 +12,7 @@ pool: steps: - script: | - set coreVersion=net6.0 + set coreVersion=net7.0 echo %coreVersion% echo ##vso[task.setvariable variable=CoreVersion;]%coreVersion% echo $(CoreVersion) @@ -26,7 +26,7 @@ steps: displayName: Configuration - script: | - set nugetSource=https://messa08ec.ec.local/v3/index.json + set nugetSource=https://eaf-prod.mes.infineon.com/v3/index.json echo %nugetSource% echo ##vso[task.setvariable variable=NugetSource;]%nugetSource% echo $(NugetSource) diff --git a/Adaptation/Shared/FileRead.cs b/Adaptation/Shared/FileRead.cs index 169f19d..fd9aaff 100644 --- a/Adaptation/Shared/FileRead.cs +++ b/Adaptation/Shared/FileRead.cs @@ -266,13 +266,14 @@ public class FileRead : Properties.IFileRead string rds; string dateValue; string rdsPlaceholder = "%RDS%"; + string mesEntityPlaceholder = "%MesEntity%"; if (!descriptions.Any() || string.IsNullOrEmpty(descriptions[0].RDS)) rds = logistics.MID; else 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(rdsPlaceholder, rds)); + result = string.Concat(duplicateDirectory, @"\", scopeInfo.FileNameWithoutExtension.Replace(rdsPlaceholder, rds).Replace(mesEntityPlaceholder, logistics.MesEntity)); else { segments = segments[1].Split('%'); @@ -284,7 +285,7 @@ public class FileRead : Properties.IFileRead continue; datePlaceholder = string.Concat('%', segment, '%'); } - result = string.Concat(duplicateDirectory, @"\", scopeInfo.FileName.Replace(rdsPlaceholder, rds).Replace(datePlaceholder, dateValue)); + result = string.Concat(duplicateDirectory, @"\", scopeInfo.FileName.Replace(rdsPlaceholder, rds).Replace(mesEntityPlaceholder, logistics.MesEntity).Replace(datePlaceholder, dateValue)); } if (result.Contains('%')) throw new Exception("Placeholder exists!"); diff --git a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.47.5/BIORAD2.cs b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.47.5/BIORAD2.cs index 55da29c..d4faaf5 100644 --- a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.47.5/BIORAD2.cs +++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.47.5/BIORAD2.cs @@ -47,9 +47,7 @@ public class BIORAD2 : EAFLoggingUnitTesting EAFLoggingUnitTesting?.Dispose(); } -#if DEBUG [Ignore] -#endif [TestMethod] public void Staging__v2_47_5__BIORAD2__QS408M() { diff --git a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.47.5/BIORAD3.cs b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.47.5/BIORAD3.cs index ee54d04..7cf1998 100644 --- a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.47.5/BIORAD3.cs +++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.47.5/BIORAD3.cs @@ -47,9 +47,7 @@ public class BIORAD3 : EAFLoggingUnitTesting EAFLoggingUnitTesting?.Dispose(); } -#if DEBUG [Ignore] -#endif [TestMethod] public void Staging__v2_47_5__BIORAD3__QS408M() { diff --git a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.47.5/MET08THFTIRQS408M.cs b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.47.5/MET08THFTIRQS408M.cs index 54ba9c2..6ade369 100644 --- a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.47.5/MET08THFTIRQS408M.cs +++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.47.5/MET08THFTIRQS408M.cs @@ -47,9 +47,7 @@ public class MET08THFTIRQS408M : EAFLoggingUnitTesting EAFLoggingUnitTesting?.Dispose(); } -#if DEBUG [Ignore] -#endif [TestMethod] public void Staging__v2_47_5__MET08THFTIRQS408M__MoveMatchingFiles() { @@ -60,9 +58,7 @@ public class MET08THFTIRQS408M : EAFLoggingUnitTesting EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } -#if DEBUG [Ignore] -#endif [TestMethod] public void Staging__v2_47_5__MET08THFTIRQS408M__OpenInsightMetrologyViewer() { @@ -73,9 +69,7 @@ public class MET08THFTIRQS408M : EAFLoggingUnitTesting EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } -#if DEBUG [Ignore] -#endif [TestMethod] public void Staging__v2_47_5__MET08THFTIRQS408M__IQSSi() { @@ -86,9 +80,7 @@ public class MET08THFTIRQS408M : EAFLoggingUnitTesting EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } -#if DEBUG [Ignore] -#endif [TestMethod] public void Staging__v2_47_5__MET08THFTIRQS408M__OpenInsight() { @@ -99,9 +91,7 @@ public class MET08THFTIRQS408M : EAFLoggingUnitTesting EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } -#if DEBUG [Ignore] -#endif [TestMethod] public void Staging__v2_47_5__MET08THFTIRQS408M__OpenInsightMetrologyViewerAttachments() { @@ -112,9 +102,7 @@ public class MET08THFTIRQS408M : EAFLoggingUnitTesting EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } -#if DEBUG [Ignore] -#endif [TestMethod] public void Staging__v2_47_5__MET08THFTIRQS408M__APC() { @@ -125,9 +113,7 @@ public class MET08THFTIRQS408M : EAFLoggingUnitTesting EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } -#if DEBUG [Ignore] -#endif [TestMethod] public void Staging__v2_47_5__MET08THFTIRQS408M__SPaCe() { @@ -138,9 +124,7 @@ public class MET08THFTIRQS408M : EAFLoggingUnitTesting EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } -#if DEBUG [Ignore] -#endif [TestMethod] public void Staging__v2_47_5__MET08THFTIRQS408M__Processed() { @@ -151,9 +135,7 @@ public class MET08THFTIRQS408M : EAFLoggingUnitTesting EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } -#if DEBUG [Ignore] -#endif [TestMethod] public void Staging__v2_47_5__MET08THFTIRQS408M__Archive() { @@ -164,9 +146,7 @@ public class MET08THFTIRQS408M : EAFLoggingUnitTesting EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } -#if DEBUG [Ignore] -#endif [TestMethod] public void Staging__v2_47_5__MET08THFTIRQS408M__Dummy() { diff --git a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.49.0/BIORAD2.cs b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.49.0/BIORAD2.cs new file mode 100644 index 0000000..a60299b --- /dev/null +++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.49.0/BIORAD2.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_49_0; + +[TestClass] +public class BIORAD2 : EAFLoggingUnitTesting +{ + +#pragma warning disable CA2254 +#pragma warning disable IDE0060 + + internal static string DummyRoot { get; private set; } + internal static BIORAD2 EAFLoggingUnitTesting { get; private set; } + + static BIORAD2() => DummyRoot = @"\\messv02ecc1.ec.local\EC_Characterization_Si\Dummy"; + + public BIORAD2() : base(DummyRoot, testContext: null, declaringType: null, skipEquipmentDictionary: false) + { + if (EAFLoggingUnitTesting is null) + throw new Exception(); + } + + public BIORAD2(TestContext testContext) : base(DummyRoot, testContext, new StackFrame().GetMethod().DeclaringType, skipEquipmentDictionary: false) + { + } + + [ClassInitialize] + public static void ClassInitialize(TestContext testContext) + { + EAFLoggingUnitTesting ??= new BIORAD2(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 DEBUG + [Ignore] +#endif + [TestMethod] + public void Staging__v2_49_0__BIORAD2__QS408M() + { + string check = "*.txt"; + MethodBase methodBase = new StackFrame().GetMethod(); + EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration")); + _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting); + EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); + } + +} \ No newline at end of file diff --git a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.49.0/BIORAD3.cs b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.49.0/BIORAD3.cs new file mode 100644 index 0000000..77afff6 --- /dev/null +++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.49.0/BIORAD3.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_49_0; + +[TestClass] +public class BIORAD3 : EAFLoggingUnitTesting +{ + +#pragma warning disable CA2254 +#pragma warning disable IDE0060 + + internal static string DummyRoot { get; private set; } + internal static BIORAD3 EAFLoggingUnitTesting { get; private set; } + + static BIORAD3() => DummyRoot = @"\\messv02ecc1.ec.local\EC_Characterization_Si\Dummy"; + + public BIORAD3() : base(DummyRoot, testContext: null, declaringType: null, skipEquipmentDictionary: false) + { + if (EAFLoggingUnitTesting is null) + throw new Exception(); + } + + public BIORAD3(TestContext testContext) : base(DummyRoot, testContext, new StackFrame().GetMethod().DeclaringType, skipEquipmentDictionary: false) + { + } + + [ClassInitialize] + public static void ClassInitialize(TestContext testContext) + { + EAFLoggingUnitTesting ??= new BIORAD3(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 DEBUG + [Ignore] +#endif + [TestMethod] + public void Staging__v2_49_0__BIORAD3__QS408M() + { + string check = "*.txt"; + MethodBase methodBase = new StackFrame().GetMethod(); + EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration")); + _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting); + EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); + } + +} \ No newline at end of file diff --git a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.49.0/MET08THFTIRQS408M.cs b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.49.0/MET08THFTIRQS408M.cs new file mode 100644 index 0000000..948c366 --- /dev/null +++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.49.0/MET08THFTIRQS408M.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_49_0; + +[TestClass] +public class MET08THFTIRQS408M : EAFLoggingUnitTesting +{ + +#pragma warning disable CA2254 +#pragma warning disable IDE0060 + + internal static string DummyRoot { get; private set; } + internal static MET08THFTIRQS408M EAFLoggingUnitTesting { get; private set; } + + static MET08THFTIRQS408M() => DummyRoot = @"\\messv02ecc1.ec.local\EC_Characterization_Si\Dummy"; + + public MET08THFTIRQS408M() : base(DummyRoot, testContext: null, declaringType: null, skipEquipmentDictionary: false) + { + if (EAFLoggingUnitTesting is null) + throw new Exception(); + } + + public MET08THFTIRQS408M(TestContext testContext) : base(DummyRoot, testContext, new StackFrame().GetMethod().DeclaringType, skipEquipmentDictionary: false) + { + } + + [ClassInitialize] + public static void ClassInitialize(TestContext testContext) + { + EAFLoggingUnitTesting ??= new MET08THFTIRQS408M(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 DEBUG + [Ignore] +#endif + [TestMethod] + public void Staging__v2_49_0__MET08THFTIRQS408M__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 DEBUG + [Ignore] +#endif + [TestMethod] + public void Staging__v2_49_0__MET08THFTIRQS408M__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 DEBUG + [Ignore] +#endif + [TestMethod] + public void Staging__v2_49_0__MET08THFTIRQS408M__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 DEBUG + [Ignore] +#endif + [TestMethod] + public void Staging__v2_49_0__MET08THFTIRQS408M__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 DEBUG + [Ignore] +#endif + [TestMethod] + public void Staging__v2_49_0__MET08THFTIRQS408M__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 DEBUG + [Ignore] +#endif + [TestMethod] + public void Staging__v2_49_0__MET08THFTIRQS408M__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 DEBUG + [Ignore] +#endif + [TestMethod] + public void Staging__v2_49_0__MET08THFTIRQS408M__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 DEBUG + [Ignore] +#endif + [TestMethod] + public void Staging__v2_49_0__MET08THFTIRQS408M__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 DEBUG + [Ignore] +#endif + [TestMethod] + public void Staging__v2_49_0__MET08THFTIRQS408M__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 DEBUG + [Ignore] +#endif + [TestMethod] + public void Staging__v2_49_0__MET08THFTIRQS408M__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.47.5/BIORAD2.cs b/Adaptation/_Tests/Extract/Staging/v2.47.5/BIORAD2.cs index a4575f3..8b2c049 100644 --- a/Adaptation/_Tests/Extract/Staging/v2.47.5/BIORAD2.cs +++ b/Adaptation/_Tests/Extract/Staging/v2.47.5/BIORAD2.cs @@ -18,9 +18,7 @@ public class BIORAD2 _BIORAD2 = CreateSelfDescription.Staging.v2_47_5.BIORAD2.EAFLoggingUnitTesting; } -#if DEBUG [Ignore] -#endif [TestMethod] public void Staging__v2_47_5__BIORAD2__QS408M() => _BIORAD2.Staging__v2_47_5__BIORAD2__QS408M(); diff --git a/Adaptation/_Tests/Extract/Staging/v2.47.5/BIORAD3.cs b/Adaptation/_Tests/Extract/Staging/v2.47.5/BIORAD3.cs index 9bdb54b..f31af35 100644 --- a/Adaptation/_Tests/Extract/Staging/v2.47.5/BIORAD3.cs +++ b/Adaptation/_Tests/Extract/Staging/v2.47.5/BIORAD3.cs @@ -23,15 +23,11 @@ public class BIORAD3 _BIORAD3 = CreateSelfDescription.Staging.v2_47_5.BIORAD3.EAFLoggingUnitTesting; } -#if DEBUG [Ignore] -#endif [TestMethod] public void Staging__v2_47_5__BIORAD3__QS408M() => _BIORAD3.Staging__v2_47_5__BIORAD3__QS408M(); -#if DEBUG [Ignore] -#endif [TestMethod] public void Staging__v2_47_5__BIORAD3__QS408M637406016892454000__ReactorAndRDS() { diff --git a/Adaptation/_Tests/Extract/Staging/v2.47.5/MET08THFTIRQS408M.cs b/Adaptation/_Tests/Extract/Staging/v2.47.5/MET08THFTIRQS408M.cs index e732708..e00f6ce 100644 --- a/Adaptation/_Tests/Extract/Staging/v2.47.5/MET08THFTIRQS408M.cs +++ b/Adaptation/_Tests/Extract/Staging/v2.47.5/MET08THFTIRQS408M.cs @@ -23,33 +23,23 @@ public class MET08THFTIRQS408M _MET08THFTIRQS408M = CreateSelfDescription.Staging.v2_47_5.MET08THFTIRQS408M.EAFLoggingUnitTesting; } -#if DEBUG [Ignore] -#endif [TestMethod] public void Staging__v2_47_5__MET08THFTIRQS408M__MoveMatchingFiles() => _MET08THFTIRQS408M.Staging__v2_47_5__MET08THFTIRQS408M__MoveMatchingFiles(); -#if DEBUG [Ignore] -#endif [TestMethod] public void Staging__v2_47_5__MET08THFTIRQS408M__OpenInsightMetrologyViewer() => _MET08THFTIRQS408M.Staging__v2_47_5__MET08THFTIRQS408M__OpenInsightMetrologyViewer(); -#if DEBUG [Ignore] -#endif [TestMethod] public void Staging__v2_47_5__MET08THFTIRQS408M__IQSSi() => _MET08THFTIRQS408M.Staging__v2_47_5__MET08THFTIRQS408M__IQSSi(); -#if DEBUG [Ignore] -#endif [TestMethod] public void Staging__v2_47_5__MET08THFTIRQS408M__OpenInsight() => _MET08THFTIRQS408M.Staging__v2_47_5__MET08THFTIRQS408M__OpenInsight(); -#if DEBUG [Ignore] -#endif [TestMethod] public void Staging__v2_47_5__MET08THFTIRQS408M__OpenInsight638042558563679143__IqsSql() { @@ -67,39 +57,27 @@ public class MET08THFTIRQS408M _ = Shared.AdaptationTesting.ReExtractCompareUpdatePassDirectory(variables, fileRead, logistics); } -#if DEBUG [Ignore] -#endif [TestMethod] public void Staging__v2_47_5__MET08THFTIRQS408M__OpenInsightMetrologyViewerAttachments() => _MET08THFTIRQS408M.Staging__v2_47_5__MET08THFTIRQS408M__OpenInsightMetrologyViewerAttachments(); -#if DEBUG [Ignore] -#endif [TestMethod] public void Staging__v2_47_5__MET08THFTIRQS408M__APC() => _MET08THFTIRQS408M.Staging__v2_47_5__MET08THFTIRQS408M__APC(); -#if DEBUG [Ignore] -#endif [TestMethod] public void Staging__v2_47_5__MET08THFTIRQS408M__SPaCe() => _MET08THFTIRQS408M.Staging__v2_47_5__MET08THFTIRQS408M__SPaCe(); -#if DEBUG [Ignore] -#endif [TestMethod] public void Staging__v2_47_5__MET08THFTIRQS408M__Processed() => _MET08THFTIRQS408M.Staging__v2_47_5__MET08THFTIRQS408M__Processed(); -#if DEBUG [Ignore] -#endif [TestMethod] public void Staging__v2_47_5__MET08THFTIRQS408M__Archive() => _MET08THFTIRQS408M.Staging__v2_47_5__MET08THFTIRQS408M__Archive(); -#if DEBUG [Ignore] -#endif [TestMethod] public void Staging__v2_47_5__MET08THFTIRQS408M__Dummy() => _MET08THFTIRQS408M.Staging__v2_47_5__MET08THFTIRQS408M__Dummy(); diff --git a/Adaptation/_Tests/Extract/Staging/v2.49.0/BIORAD2.cs b/Adaptation/_Tests/Extract/Staging/v2.49.0/BIORAD2.cs new file mode 100644 index 0000000..102eb2f --- /dev/null +++ b/Adaptation/_Tests/Extract/Staging/v2.49.0/BIORAD2.cs @@ -0,0 +1,27 @@ +using Microsoft.VisualStudio.TestTools.UnitTesting; + +namespace Adaptation._Tests.Extract.Staging.v2_49_0; + +[TestClass] +public class BIORAD2 +{ + +#pragma warning disable CA2254 +#pragma warning disable IDE0060 + + private static CreateSelfDescription.Staging.v2_49_0.BIORAD2 _BIORAD2; + + [ClassInitialize] + public static void ClassInitialize(TestContext testContext) + { + CreateSelfDescription.Staging.v2_49_0.BIORAD2.ClassInitialize(testContext); + _BIORAD2 = CreateSelfDescription.Staging.v2_49_0.BIORAD2.EAFLoggingUnitTesting; + } + +#if DEBUG + [Ignore] +#endif + [TestMethod] + public void Staging__v2_49_0__BIORAD2__QS408M() => _BIORAD2.Staging__v2_49_0__BIORAD2__QS408M(); + +} \ No newline at end of file diff --git a/Adaptation/_Tests/Extract/Staging/v2.49.0/BIORAD3.cs b/Adaptation/_Tests/Extract/Staging/v2.49.0/BIORAD3.cs new file mode 100644 index 0000000..9573673 --- /dev/null +++ b/Adaptation/_Tests/Extract/Staging/v2.49.0/BIORAD3.cs @@ -0,0 +1,53 @@ +using Adaptation.Shared; +using Adaptation.Shared.Methods; +using Microsoft.VisualStudio.TestTools.UnitTesting; +using System; +using System.Diagnostics; +using System.Reflection; + +namespace Adaptation._Tests.Extract.Staging.v2_49_0; + +[TestClass] +public class BIORAD3 +{ + +#pragma warning disable CA2254 +#pragma warning disable IDE0060 + + private static CreateSelfDescription.Staging.v2_49_0.BIORAD3 _BIORAD3; + + [ClassInitialize] + public static void ClassInitialize(TestContext testContext) + { + CreateSelfDescription.Staging.v2_49_0.BIORAD3.ClassInitialize(testContext); + _BIORAD3 = CreateSelfDescription.Staging.v2_49_0.BIORAD3.EAFLoggingUnitTesting; + } + +#if DEBUG + [Ignore] +#endif + [TestMethod] + public void Staging__v2_49_0__BIORAD3__QS408M() => _BIORAD3.Staging__v2_49_0__BIORAD3__QS408M(); + +#if DEBUG + [Ignore] +#endif + [TestMethod] + public void Staging__v2_49_0__BIORAD3__QS408M637406016892454000__ReactorAndRDS() + { + DateTime dateTime; + string check = "*.txt"; + bool validatePDSF = false; + _BIORAD3.Staging__v2_49_0__BIORAD3__QS408M(); + MethodBase methodBase = new StackFrame().GetMethod(); + string[] variables = _BIORAD3.AdaptationTesting.GetVariables(methodBase, check); + IFileRead fileRead = _BIORAD3.AdaptationTesting.Get(methodBase, sourceFileLocation: variables[2], sourceFileFilter: variables[3], useCyclicalForDescription: false); + Logistics logistics = new(fileRead); + dateTime = FileHandlers.QS408M.ProcessData.GetDateTime(logistics, tickOffset: 0, dateTimeText: string.Empty); + Assert.IsTrue(dateTime == logistics.DateTimeFromSequence); + dateTime = FileHandlers.QS408M.ProcessData.GetDateTime(logistics, tickOffset: 0, dateTimeText: "Tue Nov 10 12:03:56 1970"); + Assert.IsTrue(dateTime == logistics.DateTimeFromSequence); + _ = Shared.AdaptationTesting.ReExtractCompareUpdatePassDirectory(variables, fileRead, logistics, validatePDSF); + } + +} \ No newline at end of file diff --git a/Adaptation/_Tests/Extract/Staging/v2.49.0/MET08THFTIRQS408M.cs b/Adaptation/_Tests/Extract/Staging/v2.49.0/MET08THFTIRQS408M.cs new file mode 100644 index 0000000..d6a80d0 --- /dev/null +++ b/Adaptation/_Tests/Extract/Staging/v2.49.0/MET08THFTIRQS408M.cs @@ -0,0 +1,106 @@ +using Adaptation.Shared; +using Adaptation.Shared.Methods; +using Microsoft.VisualStudio.TestTools.UnitTesting; +using System; +using System.Diagnostics; +using System.Reflection; + +namespace Adaptation._Tests.Extract.Staging.v2_49_0; + +[TestClass] +public class MET08THFTIRQS408M +{ + +#pragma warning disable CA2254 +#pragma warning disable IDE0060 + + private static CreateSelfDescription.Staging.v2_49_0.MET08THFTIRQS408M _MET08THFTIRQS408M; + + [ClassInitialize] + public static void ClassInitialize(TestContext testContext) + { + CreateSelfDescription.Staging.v2_49_0.MET08THFTIRQS408M.ClassInitialize(testContext); + _MET08THFTIRQS408M = CreateSelfDescription.Staging.v2_49_0.MET08THFTIRQS408M.EAFLoggingUnitTesting; + } + +#if DEBUG + [Ignore] +#endif + [TestMethod] + public void Staging__v2_49_0__MET08THFTIRQS408M__MoveMatchingFiles() => _MET08THFTIRQS408M.Staging__v2_49_0__MET08THFTIRQS408M__MoveMatchingFiles(); + +#if DEBUG + [Ignore] +#endif + [TestMethod] + public void Staging__v2_49_0__MET08THFTIRQS408M__OpenInsightMetrologyViewer() => _MET08THFTIRQS408M.Staging__v2_49_0__MET08THFTIRQS408M__OpenInsightMetrologyViewer(); + +#if DEBUG + [Ignore] +#endif + [TestMethod] + public void Staging__v2_49_0__MET08THFTIRQS408M__IQSSi() => _MET08THFTIRQS408M.Staging__v2_49_0__MET08THFTIRQS408M__IQSSi(); + +#if DEBUG + [Ignore] +#endif + [TestMethod] + public void Staging__v2_49_0__MET08THFTIRQS408M__OpenInsight() => _MET08THFTIRQS408M.Staging__v2_49_0__MET08THFTIRQS408M__OpenInsight(); + +#if DEBUG + [Ignore] +#endif + [TestMethod] + public void Staging__v2_49_0__MET08THFTIRQS408M__OpenInsight638042558563679143__IqsSql() + { + DateTime dateTime; + string check = "*.pdsf"; + MethodBase methodBase = new StackFrame().GetMethod(); + _MET08THFTIRQS408M.Staging__v2_49_0__MET08THFTIRQS408M__OpenInsight(); + string[] variables = _MET08THFTIRQS408M.AdaptationTesting.GetVariables(methodBase, check, validatePDSF: false); + IFileRead fileRead = _MET08THFTIRQS408M.AdaptationTesting.Get(methodBase, sourceFileLocation: variables[2], sourceFileFilter: variables[3], useCyclicalForDescription: false); + Logistics logistics = new(fileRead); + dateTime = FileHandlers.QS408M.ProcessData.GetDateTime(logistics, tickOffset: 0, dateTimeText: string.Empty); + Assert.IsTrue(dateTime == logistics.DateTimeFromSequence); + dateTime = FileHandlers.QS408M.ProcessData.GetDateTime(logistics, tickOffset: 0, dateTimeText: "Tue Nov 10 12:03:56 1970"); + Assert.IsTrue(dateTime == logistics.DateTimeFromSequence); + _ = Shared.AdaptationTesting.ReExtractCompareUpdatePassDirectory(variables, fileRead, logistics); + } + +#if DEBUG + [Ignore] +#endif + [TestMethod] + public void Staging__v2_49_0__MET08THFTIRQS408M__OpenInsightMetrologyViewerAttachments() => _MET08THFTIRQS408M.Staging__v2_49_0__MET08THFTIRQS408M__OpenInsightMetrologyViewerAttachments(); + +#if DEBUG + [Ignore] +#endif + [TestMethod] + public void Staging__v2_49_0__MET08THFTIRQS408M__APC() => _MET08THFTIRQS408M.Staging__v2_49_0__MET08THFTIRQS408M__APC(); + +#if DEBUG + [Ignore] +#endif + [TestMethod] + public void Staging__v2_49_0__MET08THFTIRQS408M__SPaCe() => _MET08THFTIRQS408M.Staging__v2_49_0__MET08THFTIRQS408M__SPaCe(); + +#if DEBUG + [Ignore] +#endif + [TestMethod] + public void Staging__v2_49_0__MET08THFTIRQS408M__Processed() => _MET08THFTIRQS408M.Staging__v2_49_0__MET08THFTIRQS408M__Processed(); + +#if DEBUG + [Ignore] +#endif + [TestMethod] + public void Staging__v2_49_0__MET08THFTIRQS408M__Archive() => _MET08THFTIRQS408M.Staging__v2_49_0__MET08THFTIRQS408M__Archive(); + +#if DEBUG + [Ignore] +#endif + [TestMethod] + public void Staging__v2_49_0__MET08THFTIRQS408M__Dummy() => _MET08THFTIRQS408M.Staging__v2_49_0__MET08THFTIRQS408M__Dummy(); + +} \ No newline at end of file diff --git a/Adaptation/_Tests/Static/MET08THFTIRQS408M.cs b/Adaptation/_Tests/Static/MET08THFTIRQS408M.cs index a0a1ded..ab225f9 100644 --- a/Adaptation/_Tests/Static/MET08THFTIRQS408M.cs +++ b/Adaptation/_Tests/Static/MET08THFTIRQS408M.cs @@ -53,7 +53,7 @@ public class MET08THFTIRQS408M : LoggingUnitTesting, IDisposable StringBuilder results = new(); (string cellInstanceName, string cellInstanceVersionName)[] collection = new (string, string)[] { - new("MET08THFTIRQS408M", "v2.47.1"), + new("MET08THFTIRQS408M", "v2.49.0"), }; string staging = "http://mestsa07ec.ec.local:9003/CellInstanceServiceV2"; Shared.PasteSpecialXml.EAF.XML.API.CellInstance.CellInstanceVersion cellInstanceVersion; diff --git a/Adaptation/_Tests/Static/QS408M.cs b/Adaptation/_Tests/Static/QS408M.cs index 09fb0ca..ef12ea5 100644 --- a/Adaptation/_Tests/Static/QS408M.cs +++ b/Adaptation/_Tests/Static/QS408M.cs @@ -132,6 +132,40 @@ public class QS408M : LoggingUnitTesting, IDisposable Assert.IsTrue(descriptor.Reactor is "P2"); Assert.IsTrue(string.IsNullOrEmpty(descriptor.Zone)); Assert.IsTrue(string.IsNullOrEmpty(descriptor.Employee)); + Assert.IsTrue(string.IsNullOrEmpty(descriptor.Layer)); + Assert.IsTrue(descriptor.PSN is "RR"); + Assert.IsTrue(string.IsNullOrEmpty(descriptor.RDS)); + Assert.IsTrue(descriptor.Reactor is "P2"); + Assert.IsTrue(string.IsNullOrEmpty(descriptor.Zone)); + Assert.IsTrue(string.IsNullOrEmpty(descriptor.Employee)); + descriptor = FileHandlers.QS408M.ProcessData.GetDescriptor("i171308.1.51"); + Assert.IsTrue(string.IsNullOrEmpty(descriptor.Layer)); + Assert.IsTrue(string.IsNullOrEmpty(descriptor.PSN)); + Assert.IsTrue(descriptor.RDS is "i171308.1.51"); + Assert.IsTrue(string.IsNullOrEmpty(descriptor.Reactor)); + Assert.IsTrue(string.IsNullOrEmpty(descriptor.Zone)); + Assert.IsTrue(string.IsNullOrEmpty(descriptor.Employee)); + descriptor = FileHandlers.QS408M.ProcessData.GetDescriptor("o171308.1.51"); + Assert.IsTrue(string.IsNullOrEmpty(descriptor.Layer)); + Assert.IsTrue(string.IsNullOrEmpty(descriptor.PSN)); + Assert.IsTrue(descriptor.RDS is "o171308.1.51"); + Assert.IsTrue(string.IsNullOrEmpty(descriptor.Reactor)); + Assert.IsTrue(string.IsNullOrEmpty(descriptor.Zone)); + Assert.IsTrue(string.IsNullOrEmpty(descriptor.Employee)); + descriptor = FileHandlers.QS408M.ProcessData.GetDescriptor("O171308.1.51"); + Assert.IsTrue(string.IsNullOrEmpty(descriptor.Layer)); + Assert.IsTrue(string.IsNullOrEmpty(descriptor.PSN)); + Assert.IsTrue(descriptor.RDS is "O171308.1.51"); + Assert.IsTrue(string.IsNullOrEmpty(descriptor.Reactor)); + Assert.IsTrue(string.IsNullOrEmpty(descriptor.Zone)); + Assert.IsTrue(string.IsNullOrEmpty(descriptor.Employee)); + descriptor = FileHandlers.QS408M.ProcessData.GetDescriptor("171308.1.51"); + Assert.IsTrue(string.IsNullOrEmpty(descriptor.Layer)); + Assert.IsTrue(string.IsNullOrEmpty(descriptor.PSN)); + Assert.IsTrue(descriptor.RDS is "171308.1.51"); + Assert.IsTrue(string.IsNullOrEmpty(descriptor.Reactor)); + Assert.IsTrue(string.IsNullOrEmpty(descriptor.Zone)); + Assert.IsTrue(string.IsNullOrEmpty(descriptor.Employee)); descriptor = FileHandlers.QS408M.ProcessData.GetDescriptor("75-QP1414-SPLIT4"); Assert.IsTrue(!string.IsNullOrEmpty(descriptor.Wafer)); Assert.IsTrue(string.IsNullOrEmpty(descriptor.Layer)); @@ -140,6 +174,16 @@ public class QS408M : LoggingUnitTesting, IDisposable Assert.IsTrue(descriptor.Reactor is "75"); Assert.IsTrue(string.IsNullOrEmpty(descriptor.Zone)); Assert.IsTrue(string.IsNullOrEmpty(descriptor.Employee)); + descriptor = FileHandlers.QS408M.ProcessData.GetDescriptor("p5801"); + Assert.IsTrue(descriptor.Wafer == "P5801"); + descriptor = FileHandlers.QS408M.ProcessData.GetDescriptor("P5801"); + Assert.IsTrue(descriptor.Wafer == "P5801"); + Assert.IsTrue(string.IsNullOrEmpty(descriptor.Layer)); + Assert.IsTrue(string.IsNullOrEmpty(descriptor.PSN)); + Assert.IsTrue(string.IsNullOrEmpty(descriptor.PSN)); + Assert.IsTrue(string.IsNullOrEmpty(descriptor.Reactor)); + Assert.IsTrue(string.IsNullOrEmpty(descriptor.Zone)); + Assert.IsTrue(string.IsNullOrEmpty(descriptor.Employee)); LoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } @@ -151,8 +195,8 @@ public class QS408M : LoggingUnitTesting, IDisposable StringBuilder results = new(); (string cellInstanceName, string cellInstanceVersionName)[] collection = new (string, string)[] { - new("BIORAD2", "v2.47.0"), - new("BIORAD3", "v2.47.0"), + new("BIORAD2", "v2.49.0"), + new("BIORAD3", "v2.49.0"), }; string staging = "http://mestsa07ec.ec.local:9003/CellInstanceServiceV2"; Shared.PasteSpecialXml.EAF.XML.API.CellInstance.CellInstanceVersion cellInstanceVersion;