diff --git a/Adaptation/FileHandlers/RsM/FileRead.cs b/Adaptation/FileHandlers/RsM/FileRead.cs index 26f4e3d..994bb5b 100644 --- a/Adaptation/FileHandlers/RsM/FileRead.cs +++ b/Adaptation/FileHandlers/RsM/FileRead.cs @@ -109,7 +109,9 @@ public class FileRead : Shared.FileRead, IFileRead if (iProcessData is not ProcessData processData) throw new Exception(string.Concat("A) No Data - ", dateTime.Ticks)); string mid; - if (!string.IsNullOrEmpty(processData.Employee) && string.IsNullOrEmpty(processData.Reactor) && string.IsNullOrEmpty(processData.RDS) && string.IsNullOrEmpty(processData.PSN)) + if (!string.IsNullOrEmpty(processData.Run) && string.IsNullOrEmpty(processData.Reactor) && string.IsNullOrEmpty(processData.RDS) && string.IsNullOrEmpty(processData.PSN)) + mid = processData.Run; + else if (!string.IsNullOrEmpty(processData.Employee) && string.IsNullOrEmpty(processData.Reactor) && string.IsNullOrEmpty(processData.RDS) && string.IsNullOrEmpty(processData.PSN)) mid = processData.Employee; else { diff --git a/Adaptation/FileHandlers/RsM/ProcessData.cs b/Adaptation/FileHandlers/RsM/ProcessData.cs index 71af608..02e1e13 100644 --- a/Adaptation/FileHandlers/RsM/ProcessData.cs +++ b/Adaptation/FileHandlers/RsM/ProcessData.cs @@ -161,7 +161,7 @@ public class ProcessData : IProcessData string defaultLayer = string.Empty; string defaultReactor = string.Empty; string defaultEmployee = string.Empty; - if (Regex.IsMatch(text, @"^[a-zA-z][0-9]{4}$")) + if (Regex.IsMatch(text, @"^[a-zA-z][0-9]{2,4}$")) { run = text.ToUpper(); psn = defaultPSN; diff --git a/Adaptation/FileHandlers/txt/FileRead.cs b/Adaptation/FileHandlers/txt/FileRead.cs index 61347ff..70a6ea4 100644 --- a/Adaptation/FileHandlers/txt/FileRead.cs +++ b/Adaptation/FileHandlers/txt/FileRead.cs @@ -109,7 +109,9 @@ public class FileRead : Shared.FileRead, IFileRead if (iProcessData is not ProcessData processData) throw new Exception(string.Concat("A) No Data - ", dateTime.Ticks)); string mid; - if (!string.IsNullOrEmpty(processData.Employee) && string.IsNullOrEmpty(processData.Reactor) && string.IsNullOrEmpty(processData.RDS) && string.IsNullOrEmpty(processData.PSN)) + if (!string.IsNullOrEmpty(processData.Run) && string.IsNullOrEmpty(processData.Reactor) && string.IsNullOrEmpty(processData.RDS) && string.IsNullOrEmpty(processData.PSN)) + mid = processData.Run; + else if (!string.IsNullOrEmpty(processData.Employee) && string.IsNullOrEmpty(processData.Reactor) && string.IsNullOrEmpty(processData.RDS) && string.IsNullOrEmpty(processData.PSN)) mid = processData.Employee; else { diff --git a/Adaptation/FileHandlers/txt/ProcessData.cs b/Adaptation/FileHandlers/txt/ProcessData.cs index 85f513c..e00ba70 100644 --- a/Adaptation/FileHandlers/txt/ProcessData.cs +++ b/Adaptation/FileHandlers/txt/ProcessData.cs @@ -318,7 +318,7 @@ public class ProcessData : IProcessData string defaultLayer = string.Empty; string defaultReactor = string.Empty; string defaultEmployee = string.Empty; - if (Regex.IsMatch(text, @"^[a-zA-z][0-9]{4}$")) + if (Regex.IsMatch(text, @"^[a-zA-z][0-9]{2,4}$")) { run = text.ToUpper(); title = text; @@ -491,6 +491,7 @@ public class ProcessData : IProcessData Detail detail; _I = 0; _Data = receivedData; + List details = new(); Set(logistics, receivedData); ScanPast("AutoOptimizeGain ="); AutoOptimizeGain = GetBefore("AutoProbeHeightSet ="); @@ -513,9 +514,9 @@ public class ProcessData : IProcessData detail.T = GetToken(); detail.Rs = GetToken(); detail.Merit = GetToken(); - detail.UniqueId = string.Concat("_Point-", _Details.Count + 1); + detail.UniqueId = string.Concat("_Point-", details.Count + 1); _ = GetToEOL(); - _Details.Add(detail); + details.Add(detail); } else { @@ -556,16 +557,17 @@ public class ProcessData : IProcessData detail.Pt = num1.ToString(); detail.Rs = i; detail.Merit = GetToken().Replace("|", ""); - detail.UniqueId = string.Concat("_Point-", _Details.Count + 1); - _Details.Add(detail); + detail.UniqueId = string.Concat("_Point-", details.Count + 1); + details.Add(detail); } } } - foreach (Detail item in _Details.Cast()) + foreach (Detail item in details) { item.HeaderUniqueId = UniqueId; item.UniqueId = string.Concat(item, item.UniqueId); } + _Details.AddRange(details); fileInfoCollection.Add(logistics.FileInfo); } diff --git a/Adaptation/MET08RESIMAPCDE-Development.yml b/Adaptation/MET08RESIMAPCDE-Development.yml index e9b84a3..ec01134 100644 --- a/Adaptation/MET08RESIMAPCDE-Development.yml +++ b/Adaptation/MET08RESIMAPCDE-Development.yml @@ -26,7 +26,7 @@ steps: displayName: Configuration - script: | - set nugetSource=https://messa017.infineon.com/v3/index.json + set nugetSource=https://eaf-dev-reporting.mes.infineon.com/v3/index.json echo %nugetSource% echo ##vso[task.setvariable variable=NugetSource;]%nugetSource% echo $(NugetSource) diff --git a/Adaptation/Shared/Test.cs b/Adaptation/Shared/Test.cs index aeb4bea..3aa3552 100644 --- a/Adaptation/Shared/Test.cs +++ b/Adaptation/Shared/Test.cs @@ -21,7 +21,7 @@ public enum Test Denton = 9, DiffusionLength = 45, GRATXTCenter = 51, - GRATXTEdge = 52, //Largest + GRATXTEdge = 52, GrowthRateXML = 50, Hall = 10, HgCV = 23, @@ -38,6 +38,7 @@ public enum Test RPMPLRatio = 17, RPMXY = 15, SP1 = 8, + SRP2100 = 53, //Largest Tencor = 7, UV = 35, VerificationLehighton = 14, diff --git a/Adaptation/_Tests/Extract/Staging/v2.49.0/CDE5.cs b/Adaptation/_Tests/Extract/Staging/v2.49.0/CDE5.cs index 17041d2..7899dc4 100644 --- a/Adaptation/_Tests/Extract/Staging/v2.49.0/CDE5.cs +++ b/Adaptation/_Tests/Extract/Staging/v2.49.0/CDE5.cs @@ -23,6 +23,13 @@ public class CDE5 _CDE5 = CreateSelfDescription.Staging.v2_49_0.CDE5.EAFLoggingUnitTesting; } + private static void NonThrowTryCatch() + { + try + { throw new Exception(); } + catch (Exception) { } + } + #if DEBUG [Ignore] #endif @@ -49,6 +56,25 @@ public class CDE5 Assert.IsTrue(dateTime == logistics.DateTimeFromSequence); dateTime = FileHandlers.RsM.ProcessData.GetDateTime(logistics, "00:13 09/27/38"); Assert.IsTrue(dateTime == logistics.DateTimeFromSequence); + NonThrowTryCatch(); + } + +#if DEBUG + [Ignore] +#endif + [TestMethod] + public void Staging__v2_49_0__CDE5__RsM638181148290431160__WMO() + { + string check = "*.RsM"; + bool validatePDSF = false; + _CDE5.Staging__v2_49_0__CDE5__RsM(); + MethodBase methodBase = new StackFrame().GetMethod(); + Assert.IsFalse(string.IsNullOrEmpty(_CDE5.AdaptationTesting.TestContext.FullyQualifiedTestClassName)); + string[] variables = _CDE5.AdaptationTesting.GetVariables(methodBase, check, validatePDSF); + IFileRead fileRead = _CDE5.AdaptationTesting.Get(methodBase, sourceFileLocation: variables[2], sourceFileFilter: variables[3], useCyclicalForDescription: false); + Logistics logistics = new(fileRead); + _ = Shared.AdaptationTesting.ReExtractCompareUpdatePassDirectory(variables, fileRead, logistics, validatePDSF); + NonThrowTryCatch(); } } \ No newline at end of file diff --git a/Adaptation/_Tests/Static/MET08RESIMAPCDE.cs b/Adaptation/_Tests/Static/MET08RESIMAPCDE.cs index f47e64f..b2d0def 100644 --- a/Adaptation/_Tests/Static/MET08RESIMAPCDE.cs +++ b/Adaptation/_Tests/Static/MET08RESIMAPCDE.cs @@ -55,7 +55,7 @@ public class MET08RESIMAPCDE : LoggingUnitTesting, IDisposable StringBuilder results = new(); (string cellInstanceName, string cellInstanceVersionName)[] collection = new (string, string)[] { - new("MET08RESIMAPCDE", "v2.47.5"), + new("MET08RESIMAPCDE", "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/RsM.cs b/Adaptation/_Tests/Static/RsM.cs index de8ff00..341374f 100644 --- a/Adaptation/_Tests/Static/RsM.cs +++ b/Adaptation/_Tests/Static/RsM.cs @@ -38,6 +38,13 @@ public class RsM : LoggingUnitTesting, IDisposable LoggingUnitTesting?.Dispose(); } + private static void NonThrowTryCatch() + { + try + { throw new Exception(); } + catch (Exception) { } + } + [TestMethod] public void TestDateTime() { @@ -150,10 +157,10 @@ public class RsM : LoggingUnitTesting, IDisposable Assert.IsTrue(descriptor.Reactor is "75"); Assert.IsTrue(string.IsNullOrEmpty(descriptor.Zone)); Assert.IsTrue(string.IsNullOrEmpty(descriptor.Employee)); - descriptor = FileHandlers.RsM.ProcessData.GetDescriptor("p5801"); - Assert.IsTrue(descriptor.Run == "P5801"); - descriptor = FileHandlers.RsM.ProcessData.GetDescriptor("P5801"); - Assert.IsTrue(descriptor.Run == "P5801"); + descriptor = FileHandlers.RsM.ProcessData.GetDescriptor("B48"); + Assert.IsTrue(descriptor.Run == "B48"); + descriptor = FileHandlers.RsM.ProcessData.GetDescriptor("B48"); + Assert.IsTrue(descriptor.Run == "B48"); Assert.IsTrue(string.IsNullOrEmpty(descriptor.Layer)); Assert.IsTrue(string.IsNullOrEmpty(descriptor.PSN)); Assert.IsTrue(string.IsNullOrEmpty(descriptor.PSN)); @@ -161,6 +168,7 @@ public class RsM : LoggingUnitTesting, IDisposable Assert.IsTrue(string.IsNullOrEmpty(descriptor.Zone)); Assert.IsTrue(string.IsNullOrEmpty(descriptor.Employee)); LoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); + NonThrowTryCatch(); } #if DEBUG @@ -173,14 +181,14 @@ public class RsM : LoggingUnitTesting, IDisposable StringBuilder results = new(); (string cellInstanceName, string cellInstanceVersionName)[] collection = new (string, string)[] { - new("CDE3", "v2.47.5"), - new("CDE4", "v2.47.5"), - new("CDE5", "v2.47.5"), - new("CDE6", "v2.47.5"), - new("CDE3-EQPT", "v2.47.0"), - new("CDE4-EQPT", "v2.47.0"), - new("CDE5-EQPT", "v2.47.0"), - new("CDE6-EQPT", "v2.47.2"), + new("CDE3", "v2.49.0"), + new("CDE4", "v2.49.0"), + new("CDE5", "v2.49.0"), + new("CDE6", "v2.49.0"), + new("CDE3-EQPT", "v2.49.0"), + new("CDE4-EQPT", "v2.49.0"), + new("CDE5-EQPT", "v2.49.0"), + new("CDE6-EQPT", "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/txt.cs b/Adaptation/_Tests/Static/txt.cs index 6198714..b9b8eda 100644 --- a/Adaptation/_Tests/Static/txt.cs +++ b/Adaptation/_Tests/Static/txt.cs @@ -38,6 +38,13 @@ public class TXT : LoggingUnitTesting, IDisposable LoggingUnitTesting?.Dispose(); } + private static void NonThrowTryCatch() + { + try + { throw new Exception(); } + catch (Exception) { } + } + [TestMethod] public void TestDateTime() { @@ -171,10 +178,10 @@ public class TXT : LoggingUnitTesting, IDisposable Assert.IsTrue(descriptor.Reactor is "75"); Assert.IsTrue(string.IsNullOrEmpty(descriptor.Zone)); Assert.IsTrue(string.IsNullOrEmpty(descriptor.Employee)); - descriptor = FileHandlers.txt.ProcessData.GetDescriptor("p5801"); - Assert.IsTrue(descriptor.Run == "P5801"); - descriptor = FileHandlers.txt.ProcessData.GetDescriptor("P5801"); - Assert.IsTrue(descriptor.Run == "P5801"); + descriptor = FileHandlers.txt.ProcessData.GetDescriptor("B48"); + Assert.IsTrue(descriptor.Run == "B48"); + descriptor = FileHandlers.txt.ProcessData.GetDescriptor("B48"); + Assert.IsTrue(descriptor.Run == "B48"); Assert.IsTrue(string.IsNullOrEmpty(descriptor.Layer)); Assert.IsTrue(string.IsNullOrEmpty(descriptor.PSN)); Assert.IsTrue(string.IsNullOrEmpty(descriptor.PSN)); @@ -182,6 +189,7 @@ public class TXT : LoggingUnitTesting, IDisposable Assert.IsTrue(string.IsNullOrEmpty(descriptor.Zone)); Assert.IsTrue(string.IsNullOrEmpty(descriptor.Employee)); LoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); + NonThrowTryCatch(); } #if DEBUG @@ -194,7 +202,7 @@ public class TXT : LoggingUnitTesting, IDisposable StringBuilder results = new(); (string cellInstanceName, string cellInstanceVersionName)[] collection = new (string, string)[] { - new("CDE2", "v2.47.5"), + new("CDE2", "v2.49.0"), }; string staging = "http://mestsa07ec.ec.local:9003/CellInstanceServiceV2"; Shared.PasteSpecialXml.EAF.XML.API.CellInstance.CellInstanceVersion cellInstanceVersion; diff --git a/FileHandlers/FileRead.cs b/FileHandlers/FileRead.cs index b541c27..1b635f4 100644 --- a/FileHandlers/FileRead.cs +++ b/FileHandlers/FileRead.cs @@ -165,7 +165,7 @@ public partial class FileRead : FileReaderHandler, ISMTP Equipment.SelfDescriptionBuilder.AddParameterTypeDefinition(structuredType); } if (!parameterTypeDefinitions.ContainsKey(jsonProperty.Value.ValueKind)) - throw new Exception(string.Concat('{', jsonProperty.Value.ValueKind, "} is not mapped!")); + throw new Exception(string.Concat('<', jsonProperty.Name, "> {", jsonProperty.Value.ValueKind, "} is not mapped!")); } foreach (JsonProperty jsonProperty in jsonProperties) {