phares3757/met08resimapcde
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SRP, nuget server name, _Details from details, WMO and

Browse Source 
Static bump
This commit is contained in:
Mike Phares 2023-05-17 13:20:43 -07:00
parent 1d4c45210d
commit cc900bea27
11 changed files with 79 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Adaptation/FileHandlers/RsM/FileRead.cs
View File

@ -109,7 +109,9 @@ public class FileRead : Shared.FileRead, IFileRead
if (iProcessData is not ProcessData processData) if (iProcessData is not ProcessData processData)
throw new Exception(string.Concat("A) No Data - ", dateTime.Ticks)); throw new Exception(string.Concat("A) No Data - ", dateTime.Ticks));
string mid; 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; mid = processData.Employee;
else else
{ {

2
Adaptation/FileHandlers/RsM/ProcessData.cs
View File

@ -161,7 +161,7 @@ public class ProcessData : IProcessData
string defaultLayer = string.Empty; string defaultLayer = string.Empty;
string defaultReactor = string.Empty; string defaultReactor = string.Empty;
string defaultEmployee = 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(); run = text.ToUpper();
psn = defaultPSN; psn = defaultPSN;

4
Adaptation/FileHandlers/txt/FileRead.cs
View File

@ -109,7 +109,9 @@ public class FileRead : Shared.FileRead, IFileRead
if (iProcessData is not ProcessData processData) if (iProcessData is not ProcessData processData)
throw new Exception(string.Concat("A) No Data - ", dateTime.Ticks)); throw new Exception(string.Concat("A) No Data - ", dateTime.Ticks));
string mid; 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; mid = processData.Employee;
else else
{ {

14
Adaptation/FileHandlers/txt/ProcessData.cs
View File

@ -318,7 +318,7 @@ public class ProcessData : IProcessData
string defaultLayer = string.Empty; string defaultLayer = string.Empty;
string defaultReactor = string.Empty; string defaultReactor = string.Empty;
string defaultEmployee = 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(); run = text.ToUpper();
title = text; title = text;
@ -491,6 +491,7 @@ public class ProcessData : IProcessData
Detail detail; Detail detail;
_I = 0; _I = 0;
_Data = receivedData; _Data = receivedData;
List<Detail> details = new();
Set(logistics, receivedData); Set(logistics, receivedData);
ScanPast("AutoOptimizeGain ="); ScanPast("AutoOptimizeGain =");
AutoOptimizeGain = GetBefore("AutoProbeHeightSet ="); AutoOptimizeGain = GetBefore("AutoProbeHeightSet =");
@ -513,9 +514,9 @@ public class ProcessData : IProcessData
detail.T = GetToken(); detail.T = GetToken();
detail.Rs = GetToken(); detail.Rs = GetToken();
detail.Merit = GetToken(); detail.Merit = GetToken();
detail.UniqueId = string.Concat("_Point-", _Details.Count + 1); detail.UniqueId = string.Concat("_Point-", details.Count + 1);
_ = GetToEOL(); _ = GetToEOL();
_Details.Add(detail); details.Add(detail);
} }
else else
{ {
@ -556,16 +557,17 @@ public class ProcessData : IProcessData
detail.Pt = num1.ToString(); detail.Pt = num1.ToString();
detail.Rs = i; detail.Rs = i;
detail.Merit = GetToken().Replace("|", ""); detail.Merit = GetToken().Replace("|", "");
detail.UniqueId = string.Concat("_Point-", _Details.Count + 1); detail.UniqueId = string.Concat("_Point-", details.Count + 1);
_Details.Add(detail); details.Add(detail);
} }
} }
} }
foreach (Detail item in _Details.Cast<Detail>()) foreach (Detail item in details)
{ {
item.HeaderUniqueId = UniqueId; item.HeaderUniqueId = UniqueId;
item.UniqueId = string.Concat(item, item.UniqueId); item.UniqueId = string.Concat(item, item.UniqueId);
} }
_Details.AddRange(details);
fileInfoCollection.Add(logistics.FileInfo); fileInfoCollection.Add(logistics.FileInfo);
} }

2
Adaptation/MET08RESIMAPCDE-Development.yml
View File

@ -26,7 +26,7 @@ steps:
displayName: Configuration displayName: Configuration
- script: | - 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 %nugetSource%
echo ##vso[task.setvariable variable=NugetSource;]%nugetSource% echo ##vso[task.setvariable variable=NugetSource;]%nugetSource%
echo $(NugetSource) echo $(NugetSource)

3
Adaptation/Shared/Test.cs
View File

@ -21,7 +21,7 @@ public enum Test
Denton = 9, Denton = 9,
DiffusionLength = 45, DiffusionLength = 45,
GRATXTCenter = 51, GRATXTCenter = 51,
GRATXTEdge = 52, //Largest GRATXTEdge = 52,
GrowthRateXML = 50, GrowthRateXML = 50,
Hall = 10, Hall = 10,
HgCV = 23, HgCV = 23,
@ -38,6 +38,7 @@ public enum Test
RPMPLRatio = 17, RPMPLRatio = 17,
RPMXY = 15, RPMXY = 15,
SP1 = 8, SP1 = 8,
SRP2100 = 53, //Largest
Tencor = 7, Tencor = 7,
UV = 35, UV = 35,
VerificationLehighton = 14, VerificationLehighton = 14,

26
Adaptation/_Tests/Extract/Staging/v2.49.0/CDE5.cs
View File

@ -23,6 +23,13 @@ public class CDE5
_CDE5 = CreateSelfDescription.Staging.v2_49_0.CDE5.EAFLoggingUnitTesting; _CDE5 = CreateSelfDescription.Staging.v2_49_0.CDE5.EAFLoggingUnitTesting;
} }
private static void NonThrowTryCatch()
{
try
{ throw new Exception(); }
catch (Exception) { }
}
#if DEBUG #if DEBUG
[Ignore] [Ignore]
#endif #endif
@ -49,6 +56,25 @@ public class CDE5
Assert.IsTrue(dateTime == logistics.DateTimeFromSequence); Assert.IsTrue(dateTime == logistics.DateTimeFromSequence);
dateTime = FileHandlers.RsM.ProcessData.GetDateTime(logistics, "00:13 09/27/38"); dateTime = FileHandlers.RsM.ProcessData.GetDateTime(logistics, "00:13 09/27/38");
Assert.IsTrue(dateTime == logistics.DateTimeFromSequence); 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();
} }
} }

2
Adaptation/_Tests/Static/MET08RESIMAPCDE.cs
View File

@ -55,7 +55,7 @@ public class MET08RESIMAPCDE : LoggingUnitTesting, IDisposable
StringBuilder results = new(); StringBuilder results = new();
(string cellInstanceName, string cellInstanceVersionName)[] collection = new (string, string)[] (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"; string staging = "http://mestsa07ec.ec.local:9003/CellInstanceServiceV2";
Shared.PasteSpecialXml.EAF.XML.API.CellInstance.CellInstanceVersion cellInstanceVersion; Shared.PasteSpecialXml.EAF.XML.API.CellInstance.CellInstanceVersion cellInstanceVersion;

32
Adaptation/_Tests/Static/RsM.cs
View File

@ -38,6 +38,13 @@ public class RsM : LoggingUnitTesting, IDisposable
LoggingUnitTesting?.Dispose(); LoggingUnitTesting?.Dispose();
} }
private static void NonThrowTryCatch()
{
try
{ throw new Exception(); }
catch (Exception) { }
}
[TestMethod] [TestMethod]
public void TestDateTime() public void TestDateTime()
{ {
@ -150,10 +157,10 @@ public class RsM : LoggingUnitTesting, IDisposable
Assert.IsTrue(descriptor.Reactor is "75"); Assert.IsTrue(descriptor.Reactor is "75");
Assert.IsTrue(string.IsNullOrEmpty(descriptor.Zone)); Assert.IsTrue(string.IsNullOrEmpty(descriptor.Zone));
Assert.IsTrue(string.IsNullOrEmpty(descriptor.Employee)); Assert.IsTrue(string.IsNullOrEmpty(descriptor.Employee));
descriptor = FileHandlers.RsM.ProcessData.GetDescriptor("p5801"); descriptor = FileHandlers.RsM.ProcessData.GetDescriptor("B48");
Assert.IsTrue(descriptor.Run == "P5801"); Assert.IsTrue(descriptor.Run == "B48");
descriptor = FileHandlers.RsM.ProcessData.GetDescriptor("P5801"); descriptor = FileHandlers.RsM.ProcessData.GetDescriptor("B48");
Assert.IsTrue(descriptor.Run == "P5801"); Assert.IsTrue(descriptor.Run == "B48");
Assert.IsTrue(string.IsNullOrEmpty(descriptor.Layer)); Assert.IsTrue(string.IsNullOrEmpty(descriptor.Layer));
Assert.IsTrue(string.IsNullOrEmpty(descriptor.PSN)); Assert.IsTrue(string.IsNullOrEmpty(descriptor.PSN));
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.Zone));
Assert.IsTrue(string.IsNullOrEmpty(descriptor.Employee)); Assert.IsTrue(string.IsNullOrEmpty(descriptor.Employee));
LoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); LoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit"));
NonThrowTryCatch();
} }
#if DEBUG #if DEBUG
@ -173,14 +181,14 @@ public class RsM : LoggingUnitTesting, IDisposable
StringBuilder results = new(); StringBuilder results = new();
(string cellInstanceName, string cellInstanceVersionName)[] collection = new (string, string)[] (string cellInstanceName, string cellInstanceVersionName)[] collection = new (string, string)[]
{ {
new("CDE3", "v2.47.5"), new("CDE3", "v2.49.0"),
new("CDE4", "v2.47.5"), new("CDE4", "v2.49.0"),
new("CDE5", "v2.47.5"), new("CDE5", "v2.49.0"),
new("CDE6", "v2.47.5"), new("CDE6", "v2.49.0"),
new("CDE3-EQPT", "v2.47.0"), new("CDE3-EQPT", "v2.49.0"),
new("CDE4-EQPT", "v2.47.0"), new("CDE4-EQPT", "v2.49.0"),
new("CDE5-EQPT", "v2.47.0"), new("CDE5-EQPT", "v2.49.0"),
new("CDE6-EQPT", "v2.47.2"), new("CDE6-EQPT", "v2.49.0"),
}; };
string staging = "http://mestsa07ec.ec.local:9003/CellInstanceServiceV2"; string staging = "http://mestsa07ec.ec.local:9003/CellInstanceServiceV2";
Shared.PasteSpecialXml.EAF.XML.API.CellInstance.CellInstanceVersion cellInstanceVersion; Shared.PasteSpecialXml.EAF.XML.API.CellInstance.CellInstanceVersion cellInstanceVersion;

18
Adaptation/_Tests/Static/txt.cs
View File

@ -38,6 +38,13 @@ public class TXT : LoggingUnitTesting, IDisposable
LoggingUnitTesting?.Dispose(); LoggingUnitTesting?.Dispose();
} }
private static void NonThrowTryCatch()
{
try
{ throw new Exception(); }
catch (Exception) { }
}
[TestMethod] [TestMethod]
public void TestDateTime() public void TestDateTime()
{ {
@ -171,10 +178,10 @@ public class TXT : LoggingUnitTesting, IDisposable
Assert.IsTrue(descriptor.Reactor is "75"); Assert.IsTrue(descriptor.Reactor is "75");
Assert.IsTrue(string.IsNullOrEmpty(descriptor.Zone)); Assert.IsTrue(string.IsNullOrEmpty(descriptor.Zone));
Assert.IsTrue(string.IsNullOrEmpty(descriptor.Employee)); Assert.IsTrue(string.IsNullOrEmpty(descriptor.Employee));
descriptor = FileHandlers.txt.ProcessData.GetDescriptor("p5801"); descriptor = FileHandlers.txt.ProcessData.GetDescriptor("B48");
Assert.IsTrue(descriptor.Run == "P5801"); Assert.IsTrue(descriptor.Run == "B48");
descriptor = FileHandlers.txt.ProcessData.GetDescriptor("P5801"); descriptor = FileHandlers.txt.ProcessData.GetDescriptor("B48");
Assert.IsTrue(descriptor.Run == "P5801"); Assert.IsTrue(descriptor.Run == "B48");
Assert.IsTrue(string.IsNullOrEmpty(descriptor.Layer)); Assert.IsTrue(string.IsNullOrEmpty(descriptor.Layer));
Assert.IsTrue(string.IsNullOrEmpty(descriptor.PSN)); Assert.IsTrue(string.IsNullOrEmpty(descriptor.PSN));
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.Zone));
Assert.IsTrue(string.IsNullOrEmpty(descriptor.Employee)); Assert.IsTrue(string.IsNullOrEmpty(descriptor.Employee));
LoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); LoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit"));
NonThrowTryCatch();
} }
#if DEBUG #if DEBUG
@ -194,7 +202,7 @@ public class TXT : LoggingUnitTesting, IDisposable
StringBuilder results = new(); StringBuilder results = new();
(string cellInstanceName, string cellInstanceVersionName)[] collection = new (string, string)[] (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"; string staging = "http://mestsa07ec.ec.local:9003/CellInstanceServiceV2";
Shared.PasteSpecialXml.EAF.XML.API.CellInstance.CellInstanceVersion cellInstanceVersion; Shared.PasteSpecialXml.EAF.XML.API.CellInstance.CellInstanceVersion cellInstanceVersion;

2
FileHandlers/FileRead.cs
View File

@ -165,7 +165,7 @@ public partial class FileRead : FileReaderHandler, ISMTP
Equipment.SelfDescriptionBuilder.AddParameterTypeDefinition(structuredType); Equipment.SelfDescriptionBuilder.AddParameterTypeDefinition(structuredType);
} }
if (!parameterTypeDefinitions.ContainsKey(jsonProperty.Value.ValueKind)) 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) foreach (JsonProperty jsonProperty in jsonProperties)
{ {