diff --git a/.gitignore b/.gitignore index dce63ed..56d8c06 100644 --- a/.gitignore +++ b/.gitignore @@ -342,3 +342,4 @@ ASALocalRun/ *.lnk .kanbn +Adaptation/.kanbn diff --git a/.vscode/mklink.md b/.vscode/mklink.md deleted file mode 100644 index 373cccc..0000000 --- a/.vscode/mklink.md +++ /dev/null @@ -1,11 +0,0 @@ ---- -type: "note" -created: "2023-10-20T03:52:57.401Z" -updated: "2023-10-20T03:53:49.161Z" ---- - -# mklink - -```bash -mklink /J "L:\Workspaces\33_CS29_79_72\MIT_EAF_Adaptations\Trunk\MET08DDUPSP1TBI\06_SourceCode\MET08DDUPSP1TBI\.kanbn" "D:\5-Other-Small\Kanban\MET08DDUPSP1TBI" -``` diff --git a/Adaptation/.editorconfig b/Adaptation/.editorconfig index bd60911..69ecc38 100644 --- a/Adaptation/.editorconfig +++ b/Adaptation/.editorconfig @@ -100,6 +100,7 @@ dotnet_diagnostic.CA1846.severity = none # CA1846: Prefer AsSpan over Substring dotnet_diagnostic.CA1847.severity = none # CA1847: Use string.Contains(char) instead of string.Contains(string) with single characters dotnet_diagnostic.CA1854.severity = warning # CA1854: Prefer a 'TryGetValue' call over a Dictionary indexer access guarded by a 'ContainsKey' check to avoid double lookup dotnet_diagnostic.CA1860.severity = error # CA1860: Prefer comparing 'Count' to 0 rather than using 'Any()', both for clarity and for performance +dotnet_diagnostic.CA1861.severity = none # CA1861: Prefer 'static readonly' fields over constant array arguments dotnet_diagnostic.CA1862.severity = none # CA1862: Prefer using 'string.Equals(string, StringComparison)' to perform a case-insensitive comparison, but keep in mind that this might cause subtle changes in behavior, so make sure to conduct thorough testing after applying the suggestion, or if culturally sensitive comparison is not required, consider using 'StringComparison.OrdinalIgnoreCase' dotnet_diagnostic.CA1864.severity = none # CA1864: To avoid double lookup, call 'TryAdd' instead of calling 'Add' with a 'ContainsKey' guard dotnet_diagnostic.CA1866.severity = none # CA1866: Use 'string.EndsWith(char)' instead of 'string.EndsWith(string)' when you have a string with a single char diff --git a/Adaptation/.kanbn/index.md b/Adaptation/.kanbn/index.md index dfef0a6..f321b5d 100644 --- a/Adaptation/.kanbn/index.md +++ b/Adaptation/.kanbn/index.md @@ -1,11 +1,13 @@ --- -type: kanbn +type: "Kanban" startedColumns: - 'In Progress' completedColumns: - Done dateFormat: mm/dd taskTemplate: '^+^_${overdue ? ''^R'' : ''''}${name}^: ${relations ? (''\n^-^/^g'' + relations.reduce((accumulator, currentValue) => accumulator.task + currentValue.task + '' '', '''')) : ''''}' +created: "2024-04-11T15:50:50.874Z" +updated: "2024-04-11T16:10:05.831Z" --- # MET08DDUPSP1TBI diff --git a/Adaptation/.vscode/launch.json b/Adaptation/.vscode/launch.json index 97b0d27..57acf40 100644 --- a/Adaptation/.vscode/launch.json +++ b/Adaptation/.vscode/launch.json @@ -4,7 +4,7 @@ "name": ".NET Core Attach", "type": "coreclr", "request": "attach", - "processId": 23684 + "processId": 21440 } ] } diff --git a/Adaptation/.vscode/mklink.md b/Adaptation/.vscode/mklink.md new file mode 100644 index 0000000..ac33dfd --- /dev/null +++ b/Adaptation/.vscode/mklink.md @@ -0,0 +1,9 @@ +--- +type: "note" +--- + +# mklink + +```bash +mklink /J "T:\MET08RESIHGCV\06_SourceCode\MET08RESIHGCV\Adaptation\.kanbn" "D:\5-Other-Small\Kanban\MET08RESIHGCV" +``` diff --git a/Adaptation/.vscode/tasks.json b/Adaptation/.vscode/tasks.json index 64be28d..6714d4e 100644 --- a/Adaptation/.vscode/tasks.json +++ b/Adaptation/.vscode/tasks.json @@ -12,6 +12,28 @@ ], "problemMatcher": "$msCompile" }, + { + "label": "Test-Debug", + "command": "dotnet", + "type": "process", + "args": [ + "test", + "-c", + "Debug" + ], + "problemMatcher": "$msCompile" + }, + { + "label": "Test-Release", + "command": "dotnet", + "type": "process", + "args": [ + "test", + "-c", + "Release" + ], + "problemMatcher": "$msCompile" + }, { "label": "Format", "command": "dotnet", @@ -46,7 +68,7 @@ "args": [ "/target:Build", "/restore:True", - "/p:RestoreSources=https://api.nuget.org/v3/index.json%3Bhttps://packagemanagement.eu.infineon.com:4430/api/v2/%3Bhttps://tfs.intra.infineon.com/tfs/ManufacturingIT/_packaging/eaf/nuget/v3/index.json%3Bhttps://localhost/v3/index.json", + "/p:RestoreSources=https://artifactory.intra.infineon.com/artifactory/api/nuget/ngt-fi-package-main-vir/%3Bhttps://packagemanagement.eu.infineon.com:4430/api/v2/%3Bhttps://tfs.intra.infineon.com/tfs/ManufacturingIT/_packaging/eaf/nuget/v3/index.json%3Bhttps://tfs.intra.infineon.com/tfs/FactoryIntegration/_packaging/EAF%40Local/nuget/v3/index.json%3Bhttps://api.nuget.org/v3/index.json", "/detailedsummary", "/consoleloggerparameters:PerformanceSummary;ErrorsOnly;", "/property:Configuration=Debug;TargetFrameworkVersion=v4.8", @@ -57,7 +79,7 @@ { "label": "File-Folder-Helper AOT s M .Kanbn Tasks", "type": "shell", - "command": "& L:/DevOps/Mesa_FI/File-Folder-Helper/bin/Release/net8.0/win-x64/publish/File-Folder-Helper.exe s M T:/MET08DDUPSP1TBI/06_SourceCode/MET08DDUPSP1TBI/Adaptation -s T:/MET08DDUPSP1TBI/06_SourceCode/MET08DDUPSP1TBI/Adaptation/.kanbn/tasks", + "command": "L:/DevOps/Mesa_FI/File-Folder-Helper/bin/Release/net8.0/win-x64/publish/File-Folder-Helper.exe s M T:/MET08DDUPSP1TBI/06_SourceCode/MET08DDUPSP1TBI/Adaptation -s T:/MET08DDUPSP1TBI/06_SourceCode/MET08DDUPSP1TBI/Adaptation/.kanbn/tasks", "problemMatcher": [] }, { diff --git a/Adaptation/FileHandlers/OpenInsight/FileRead.cs b/Adaptation/FileHandlers/OpenInsight/FileRead.cs index c531a7c..9431c79 100644 --- a/Adaptation/FileHandlers/OpenInsight/FileRead.cs +++ b/Adaptation/FileHandlers/OpenInsight/FileRead.cs @@ -26,8 +26,8 @@ public class FileRead : Shared.FileRead, IFileRead base(new Description(), false, smtp, fileParameter, cellInstanceName, connectionCount, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted: connectionCount is null) { _MinFileLength = 10; - _NullData = string.Empty; _Logistics = new(this); + _NullData = string.Empty; if (_FileParameter is null) throw new Exception(cellInstanceConnectionName); if (_ModelObjectParameterDefinitions is null) @@ -195,8 +195,8 @@ public class FileRead : Shared.FileRead, IFileRead bool save = string.IsNullOrEmpty(_LastLines) || check != _LastLines; if (save && !string.IsNullOrEmpty(check)) { - _LastLines = check; long? subGroupId; + _LastLines = check; 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)) diff --git a/Adaptation/FileHandlers/OpenInsight/FromIQS.cs b/Adaptation/FileHandlers/OpenInsight/FromIQS.cs index 1d05f3b..98d998c 100644 --- a/Adaptation/FileHandlers/OpenInsight/FromIQS.cs +++ b/Adaptation/FileHandlers/OpenInsight/FromIQS.cs @@ -226,6 +226,99 @@ public class FromIQS File.WriteAllText(checkFile, json); } + private static string GetCommandText(string[] iqsCopyValues) + { // cSpell:disable + StringBuilder result = new(); + if (iqsCopyValues.Length != 4) + throw new NotSupportedException(); + string find = iqsCopyValues[1]; + string replace = iqsCopyValues[3]; + _ = result + .AppendLine(" select pd.f_name [Part Name], ") + .AppendLine(" null [Part Revision], ") + .Append(" '").Append(replace).AppendLine("' [Test Name], ") + .AppendLine(" null [Description], ") + .AppendLine(" null [Lot Number], ") + .AppendLine(" null [Job Name], ") + .AppendLine(" null [Process Name], ") + .AppendLine(" case when sl.f_url = 0 then null else sl.f_url end [Reasonable Limit (Upper)], ") + .AppendLine(" case when sl.f_url = 0 then 0 else 1 end [Alarm Reasonable Limit (Upper)], ") + .AppendLine(" case when sl.f_usl = 0 then null else sl.f_usl end [Specification Limit (Upper)], ") + .AppendLine(" case when sl.f_usl = 0 then 0 else 1 end [Alarm Specification Limit (Upper)], ") + .AppendLine(" case when sl.f_ugb = 0 then null else sl.f_ugb end [Warning Limit (Upper)], ") + .AppendLine(" case when sl.f_ugb = 0 then 0 else 1 end [Alarm Warning Limit (Upper)], ") + .AppendLine(" case when sl.f_tar = 0 then null else sl.f_tar end [Specification Limit (Target)], ") + .AppendLine(" case when sl.f_lgb = 0 then null else sl.f_lgb end [Warning Limit (Lower)], ") + .AppendLine(" case when sl.f_lgb = 0 then 0 else 1 end [Alarm Warning Limit (Lower)], ") + .AppendLine(" case when sl.f_lsl = 0 then null else sl.f_lsl end [Specification Limit (Lower)], ") + .AppendLine(" case when sl.f_lsl = 0 then 0 else 1 end [Alarm Specification Limit (Lower)], ") + .AppendLine(" case when sl.f_lrl = 0 then null else sl.f_lrl end [Reasonable Limit (Lower)], ") + .AppendLine(" case when sl.f_lrl = 0 then 0 else 1 end [Alarm Reasonable Limit (Lower)], ") + .AppendLine(" td.f_name [Original Test Name], ") + .AppendLine(" td.f_test [Test Id], ") + .AppendLine(" ( ") + .AppendLine(" select count(sl_b.f_spec) ") + .AppendLine(" from [spcepiworld].[dbo].[spec_lim] sl_b ") + .AppendLine(" join [spcepiworld].[dbo].[part_dat] pd_b ") + .AppendLine(" on sl_b.f_part = pd_b.f_part ") + .AppendLine(" join [spcepiworld].[dbo].[test_dat] td_b ") + .AppendLine(" on sl_b.f_test = td_b.f_test ") + .AppendLine(" where sl_b.f_prcs = 0 ") + .Append(" and td_b.f_name = '").Append(replace).AppendLine("' ") + .AppendLine(" and pd_b.f_name = pd.f_name ") + .AppendLine(" and sl_b.f_url = sl.f_url ") + .AppendLine(" and sl_b.f_usl = sl.f_usl ") + .AppendLine(" and sl_b.f_ugb = sl.f_ugb ") + .AppendLine(" and sl_b.f_tar = sl.f_tar ") + .AppendLine(" and sl_b.f_lgb = sl.f_lgb ") + .AppendLine(" and sl_b.f_lsl = sl.f_lsl ") + .AppendLine(" and sl_b.f_lrl = sl.f_lrl ") + .AppendLine(" group by sl_b.f_spec ") + .AppendLine(" ) count ") + .AppendLine(" from [spcepiworld].[dbo].[spec_lim] sl ") + .AppendLine(" join [spcepiworld].[dbo].[part_dat] pd ") + .AppendLine(" on sl.f_part = pd.f_part ") + .AppendLine(" join [spcepiworld].[dbo].[test_dat] td ") + .AppendLine(" on sl.f_test = td.f_test ") + .AppendLine(" where sl.f_prcs = 0 ") + .Append(" and td.f_name = '").Append(find).AppendLine("' ") + .AppendLine(" and isnull(( ") + .AppendLine(" select count(sl_b.f_spec) ") + .AppendLine(" from [spcepiworld].[dbo].[spec_lim] sl_b ") + .AppendLine(" join [spcepiworld].[dbo].[part_dat] pd_b ") + .AppendLine(" on sl_b.f_part = pd_b.f_part ") + .AppendLine(" join [spcepiworld].[dbo].[test_dat] td_b ") + .AppendLine(" on sl_b.f_test = td_b.f_test ") + .AppendLine(" where sl_b.f_prcs = 0 ") + .Append(" and td_b.f_name = '").Append(replace).AppendLine("' ") + .AppendLine(" and pd_b.f_name = pd.f_name ") + .AppendLine(" and sl_b.f_url = sl.f_url ") + .AppendLine(" and sl_b.f_usl = sl.f_usl ") + .AppendLine(" and sl_b.f_ugb = sl.f_ugb ") + .AppendLine(" and sl_b.f_tar = sl.f_tar ") + .AppendLine(" and sl_b.f_lgb = sl.f_lgb ") + .AppendLine(" and sl_b.f_lsl = sl.f_lsl ") + .AppendLine(" and sl_b.f_lrl = sl.f_lrl ") + .AppendLine(" group by sl_b.f_spec ") + .AppendLine(" ), 0) = 0 ") + .AppendLine(" for json path "); + return result.ToString(); + } // cSpell:restore + + internal static void SaveCopy(string fileConnectorConfigurationSourceFileLocation, string connectionString, string name, string[] iqsCopyValues) + { + string checkFile = Path.Combine(fileConnectorConfigurationSourceFileLocation, $"{name}.json"); + if (!File.Exists(checkFile)) + { + string commandText = GetCommandText(iqsCopyValues); + StringBuilder stringBuilder = GetForJsonPath(connectionString, commandText); + if (stringBuilder.Length != 0) + File.WriteAllText(checkFile, stringBuilder.ToString()); + else + File.WriteAllText(Path.Combine(fileConnectorConfigurationSourceFileLocation, $"{name}.sql"), commandText); + } + } + #nullable disable } \ No newline at end of file diff --git a/Adaptation/FileHandlers/OpenInsightMetrologyViewer/FileRead.cs b/Adaptation/FileHandlers/OpenInsightMetrologyViewer/FileRead.cs index 430e270..efbfdde 100644 --- a/Adaptation/FileHandlers/OpenInsightMetrologyViewer/FileRead.cs +++ b/Adaptation/FileHandlers/OpenInsightMetrologyViewer/FileRead.cs @@ -31,8 +31,8 @@ public class FileRead : Shared.FileRead, IFileRead throw new Exception(cellInstanceConnectionName); if (!_IsDuplicator) throw new Exception(cellInstanceConnectionName); - _OpenInsightMetrologyViewerFileShare = @"\\mesfs.infineon.com\EC_Metrology_Si\MetrologyAttachments\SP1RunHeader_"; _OpenInsightMetrologyViewerAPI = GetPropertyValue(cellInstanceConnectionName, modelObjectParameters, "OpenInsight.MetrologyViewerAPI"); + _OpenInsightMetrologyViewerFileShare = GetPropertyValue(cellInstanceConnectionName, modelObjectParameters, "OpenInsight.MetrologyViewerFileShare"); } void IFileRead.Move(Tuple> extractResults, Exception exception) @@ -112,16 +112,15 @@ public class FileRead : Shared.FileRead, IFileRead private void SendData(string reportFullPath, DateTime dateTime, List descriptions) { + string checkDirectory; + WSRequest wsRequest = new(this, _Logistics, descriptions); int weekOfYear = _Calendar.GetWeekOfYear(dateTime, CalendarWeekRule.FirstDay, DayOfWeek.Sunday); - string directory = Path.Combine(_OpenInsightMetrologyViewerFileShare, dateTime.Year.ToString(), $"WW{weekOfYear:00}", _Logistics.Sequence.ToString()); - if (!Directory.Exists(directory)) - _ = Directory.CreateDirectory(directory); - string fullPath = Path.Combine(directory, Path.GetFileName(reportFullPath)); - if (File.Exists(fullPath)) - File.Delete(fullPath); - File.Copy(reportFullPath, fullPath); - WSRequest wsRequest = new(this, _Logistics, descriptions, fullPath); - (string json, WS.Results wsResults) = WS.SendData(_OpenInsightMetrologyViewerAPI, wsRequest); + string directory = Path.Combine(_OpenInsightMetrologyViewerFileShare, dateTime.Year.ToString(), $"WW{weekOfYear:00}"); + checkDirectory = Path.Combine(directory, _Logistics.Sequence.ToString()); + if (!Directory.Exists(checkDirectory)) + _ = Directory.CreateDirectory(checkDirectory); + File.Copy(reportFullPath, Path.Combine(checkDirectory, Path.GetFileName(reportFullPath)), overwrite: true); + (string jsonResults, WS.Results wsResults) = WS.SendData(_OpenInsightMetrologyViewerAPI, _Logistics.Sequence, directory, wsRequest); if (!wsResults.Success) throw new Exception(wsResults.ToString()); _Log.Debug(wsResults.HeaderID); @@ -129,8 +128,12 @@ public class FileRead : Shared.FileRead, IFileRead { if (!_StaticRuns.ContainsKey(_Logistics.Sequence)) _StaticRuns.Add(_Logistics.Sequence, new()); - _StaticRuns[_Logistics.Sequence].Add(json); + _StaticRuns[_Logistics.Sequence].Add(jsonResults); } + checkDirectory = Path.Combine(directory, $"-{wsResults.HeaderID}"); + if (!Directory.Exists(checkDirectory)) + _ = Directory.CreateDirectory(checkDirectory); + File.Copy(reportFullPath, Path.Combine(checkDirectory, Path.GetFileName(reportFullPath)), overwrite: true); } private Tuple> GetExtractResult(string reportFullPath, DateTime dateTime) diff --git a/Adaptation/FileHandlers/OpenInsightMetrologyViewer/WSRequest.cs b/Adaptation/FileHandlers/OpenInsightMetrologyViewer/WSRequest.cs index 87120ed..2d064cf 100644 --- a/Adaptation/FileHandlers/OpenInsightMetrologyViewer/WSRequest.cs +++ b/Adaptation/FileHandlers/OpenInsightMetrologyViewer/WSRequest.cs @@ -268,7 +268,6 @@ public class WSRequest public string DwnSlipMin { get; set; } public string DwnSlipStDev { get; set; } public List Details { get; protected set; } - public string ProcessDataStandardFormat { get; set; } [Obsolete("For json")] public WSRequest() { } @@ -276,7 +275,6 @@ public class WSRequest internal WSRequest(IFileRead fileRead, Logistics logistics, List descriptions, string processDataStandardFormat = null) #pragma warning restore IDE0060 { - ProcessDataStandardFormat = processDataStandardFormat; Id = -1; Details = new List(); CellName = logistics.MesEntity; @@ -634,22 +632,29 @@ public class WSRequest return result; } -#pragma warning disable IDE0060 - internal static void PostOpenInsightMetrologyViewerAttachments(IFileRead fileRead, Logistics logistics, string openInsightMetrologyViewerAPI, string ghostPCLFileName, DateTime dateTime, string json, List descriptions, string matchDirectory) -#pragma warning restore IDE0060 + internal static long GetHeaderId(IFileRead fileRead, Logistics logistics, string openInsightMetrologyViewerAPI, DateTime dateTime, int weekOfYear, string json, List descriptions) { + long result; if (string.IsNullOrEmpty(json)) { - WSRequest wsRequest = new(fileRead, logistics, descriptions, string.Empty); - (json, WS.Results wsResults) = WS.SendData(openInsightMetrologyViewerAPI, wsRequest); + WSRequest wsRequest = new(fileRead, logistics, descriptions); + string directory = Path.Combine(openInsightMetrologyViewerAPI, dateTime.Year.ToString(), $"WW{weekOfYear:00}"); + (json, WS.Results wsResults) = WS.SendData(openInsightMetrologyViewerAPI, logistics.Sequence, directory, wsRequest); if (!wsResults.Success) throw new Exception(wsResults.ToString()); } WS.Results metrologyWSRequest = JsonSerializer.Deserialize(json, new JsonSerializerOptions { PropertyNameCaseInsensitive = true }); - long wsResultsHeaderID = metrologyWSRequest.HeaderID; + result = metrologyWSRequest.HeaderID; + return result; + } + +#pragma warning disable IDE0060 + internal static void PostOpenInsightMetrologyViewerAttachments(IFileRead fileRead, Logistics logistics, string openInsightMetrologyViewerAPI, string ghostPCLFileName, List descriptions, string matchDirectory, string subGroupId, long headerId, string headerIdDirectory) +#pragma warning restore IDE0060 + { string[] summaryFiles = Directory.GetFiles(matchDirectory, "*.txt", SearchOption.TopDirectoryOnly); if (summaryFiles.Length != 1) - throw new Exception($"Invalid source file count for <{wsResultsHeaderID}>!{Environment.NewLine}{json}"); + throw new Exception($"Invalid source file count for <{headerId}>!"); string[] prnFiles = Directory.GetFiles(matchDirectory, "WaferMap*.prn", SearchOption.TopDirectoryOnly); List pdfFiles = new(); foreach (string prnFile in prnFiles.OrderBy(l => l)) @@ -658,7 +663,9 @@ public class WSRequest throw new Exception("Invalid *.pdf file count!"); List dataAttachments = new(); List headerAttachments = new() - { new WS.Attachment(descriptions[0].HeaderUniqueId, "Data.txt", summaryFiles[0]) }; + { + new WS.Attachment(subGroupId, headerId, headerIdDirectory, descriptions[0].HeaderUniqueId, "Data.txt", summaryFiles[0]) + }; int count; if (pdfFiles.Count < descriptions.Count) count = pdfFiles.Count; @@ -667,11 +674,11 @@ public class WSRequest for (int i = 0; i < count; i++) { if (!string.IsNullOrEmpty(pdfFiles[i])) - dataAttachments.Add(new WS.Attachment(descriptions[i].UniqueId, "Image.pdf", pdfFiles[i])); + dataAttachments.Add(new WS.Attachment(subGroupId, headerId, headerIdDirectory, descriptions[i].UniqueId, "Image.pdf", pdfFiles[i])); } if (dataAttachments.Count == 0 || dataAttachments.Count != descriptions.Count) throw new Exception($"Invalid attachment count! {dataAttachments.Count} != {descriptions.Count}"); - WS.AttachFiles(openInsightMetrologyViewerAPI, wsResultsHeaderID, headerAttachments, dataAttachments); + WS.AttachFiles(openInsightMetrologyViewerAPI, headerAttachments, dataAttachments); } } \ No newline at end of file diff --git a/Adaptation/FileHandlers/OpenInsightMetrologyViewerAttachments/FileRead.cs b/Adaptation/FileHandlers/OpenInsightMetrologyViewerAttachments/FileRead.cs index 05c6e9f..a91881c 100644 --- a/Adaptation/FileHandlers/OpenInsightMetrologyViewerAttachments/FileRead.cs +++ b/Adaptation/FileHandlers/OpenInsightMetrologyViewerAttachments/FileRead.cs @@ -5,6 +5,7 @@ using Adaptation.Shared.Duplicator; using Adaptation.Shared.Methods; using System; using System.Collections.Generic; +using System.Globalization; using System.IO; using System.Linq; using System.Text.Json; @@ -14,9 +15,9 @@ namespace Adaptation.FileHandlers.OpenInsightMetrologyViewerAttachments; public class FileRead : Shared.FileRead, IFileRead { - private readonly string _JobIdParentDirectory; private readonly string _GhostPCLFileName; private readonly string _OpenInsightMetrologyViewerAPI; + private readonly string _OpenInsightMetrologyViewerFileShare; public FileRead(ISMTP smtp, Dictionary fileParameter, string cellInstanceName, int? connectionCount, 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, connectionCount, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted: connectionCount is null) @@ -30,8 +31,8 @@ public class FileRead : Shared.FileRead, IFileRead throw new Exception(cellInstanceConnectionName); if (!_IsDuplicator) throw new Exception(cellInstanceConnectionName); - _JobIdParentDirectory = GetJobIdParentDirectory(_FileConnectorConfiguration.SourceFileLocation); _OpenInsightMetrologyViewerAPI = GetPropertyValue(cellInstanceConnectionName, modelObjectParameters, "OpenInsight.MetrologyViewerAPI"); + _OpenInsightMetrologyViewerFileShare = GetPropertyValue(cellInstanceConnectionName, modelObjectParameters, "OpenInsight.MetrologyViewerFileShare"); _GhostPCLFileName = Path.Combine(AppContext.BaseDirectory, "gpcl6win64.exe"); if (!File.Exists(_GhostPCLFileName)) throw new Exception("Ghost PCL FileName doesn't Exist!"); @@ -112,26 +113,58 @@ public class FileRead : Shared.FileRead, IFileRead return results; } -#pragma warning disable IDE0060 - private void PostOpenInsightMetrologyViewerAttachments(string reportFullPath, DateTime dateTime, List descriptions) -#pragma warning restore IDE0060 +#nullable enable + + private string? GetHeaderIdDirectory(DateTime[] dateTimes, long headerId) { - string jobIdDirectory = Path.Combine(_JobIdParentDirectory, _Logistics.JobID); + string? result = null; + int weekNum; + string year; + string weekDirectory; + string checkDirectory; + foreach (DateTime dateTime in dateTimes) + { + year = dateTime.Year.ToString(); + weekNum = _Calendar.GetWeekOfYear(dateTime, CalendarWeekRule.FirstDay, DayOfWeek.Sunday); + weekDirectory = Path.Combine(_OpenInsightMetrologyViewerFileShare, dateTime.Year.ToString(), $"WW{weekNum:00}"); + if (!Directory.Exists(weekDirectory)) + _ = Directory.CreateDirectory(weekDirectory); + checkDirectory = Path.Combine(weekDirectory, $"-{headerId}"); + if (!Directory.Exists(checkDirectory)) + continue; + result = checkDirectory; + break; + } + return result; + } + + private void PostOpenInsightMetrologyViewerAttachments(DateTime dateTime, List descriptions) + { + string? json; + string? subGroupId; + string jobIdDirectory = Path.Combine(Path.GetDirectoryName(_FileConnectorConfiguration.AlternateTargetFolder) ?? throw new Exception(), _Logistics.JobID); if (!Directory.Exists(jobIdDirectory)) _ = Directory.CreateDirectory(jobIdDirectory); - string json; string[] matchDirectories = GetInProcessDirectory(jobIdDirectory); - if (!_StaticRuns.TryGetValue(_Logistics.Sequence, out List collection)) - json = string.Empty; + if (!_StaticRuns.TryGetValue(_Logistics.Sequence, out List? values)) + (json, subGroupId) = (null, null); else { - if (collection.Count != 1) - throw new Exception($"{nameof(_StaticRuns)} has too many values for {_Logistics.Sequence}!"); - json = collection[0]; + if (values.Count != 1) + throw new Exception($"{nameof(_StaticRuns)} {values.Count} != 1 {_Logistics.Sequence}!"); + string[] segments = values[0].Split(new string[] { "|" }, StringSplitOptions.None); + json = segments[0]; + subGroupId = segments.Length > 1 ? segments[1] : null; lock (_StaticRuns) _ = _StaticRuns.Remove(_Logistics.Sequence); } - OpenInsightMetrologyViewer.WSRequest.PostOpenInsightMetrologyViewerAttachments(this, _Logistics, _OpenInsightMetrologyViewerAPI, _GhostPCLFileName, dateTime, json, descriptions, matchDirectories[0]); + DateTime[] dateTimes = new DateTime[] { dateTime, dateTime.AddDays(-6.66) }; + int weekOfYear = _Calendar.GetWeekOfYear(dateTime, CalendarWeekRule.FirstDay, DayOfWeek.Sunday); + long headerId = OpenInsightMetrologyViewer.WSRequest.GetHeaderId(this, _Logistics, _OpenInsightMetrologyViewerAPI, dateTime, weekOfYear, json, descriptions); + string? headerIdDirectory = GetHeaderIdDirectory(dateTimes, headerId); + if (string.IsNullOrEmpty(headerIdDirectory)) + throw new Exception($"Didn't find header id directory <{headerId}>"); + OpenInsightMetrologyViewer.WSRequest.PostOpenInsightMetrologyViewerAttachments(this, _Logistics, _OpenInsightMetrologyViewerAPI, _GhostPCLFileName, descriptions, matchDirectories[0], subGroupId, headerId, headerIdDirectory); } private Tuple> GetExtractResult(string reportFullPath, DateTime dateTime) @@ -144,7 +177,7 @@ public class FileRead : Shared.FileRead, IFileRead List descriptions = txt.ProcessData.GetDescriptions(jsonElements); Test[] tests = (from l in descriptions select (Test)l.Test).ToArray(); if (_IsEAFHosted && _FileConnectorConfiguration.FileScanningIntervalInSeconds > 0) - PostOpenInsightMetrologyViewerAttachments(reportFullPath, dateTime, descriptions); + PostOpenInsightMetrologyViewerAttachments(dateTime, descriptions); results = new Tuple>(pdsf.Item1, tests, jsonElements, new List()); return results; } diff --git a/Adaptation/FileHandlers/TIBCO/FileRead.cs b/Adaptation/FileHandlers/TIBCO/FileRead.cs index 0d6eeba..888154d 100644 --- a/Adaptation/FileHandlers/TIBCO/FileRead.cs +++ b/Adaptation/FileHandlers/TIBCO/FileRead.cs @@ -11,7 +11,7 @@ using System.Text.Json; namespace Adaptation.FileHandlers.TIBCO; public class FileRead : Shared.FileRead, IFileRead -{ +{ // cSpell:disable #nullable enable @@ -23,7 +23,7 @@ public class FileRead : Shared.FileRead, IFileRead public FileRead(ISMTP smtp, Dictionary fileParameter, string cellInstanceName, int? connectionCount, 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, connectionCount, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted: connectionCount is null) - { + { // cSpell:restore _MinFileLength = 10; _NullData = string.Empty; _Logistics = new(this); diff --git a/Adaptation/FileHandlers/TIBCO/Transport/Common.cs b/Adaptation/FileHandlers/TIBCO/Transport/Common.cs new file mode 100644 index 0000000..2141b30 --- /dev/null +++ b/Adaptation/FileHandlers/TIBCO/Transport/Common.cs @@ -0,0 +1,21 @@ +namespace Adaptation.FileHandlers.TIBCO.Transport; + +public class Common +{ + + public string Layer { get; } + public string PSN { get; } + public int? RDSNumber { get; } + public int? ReactorNumber { get; } + public string Zone { get; } + + public Common(string layer, string psn, int? rdsNumber, int? reactor, string zone) + { + Layer = layer; + PSN = psn; + RDSNumber = rdsNumber; + ReactorNumber = reactor; + Zone = zone; + } + +} \ No newline at end of file diff --git a/Adaptation/FileHandlers/TIBCO/Transport/CommonB.cs b/Adaptation/FileHandlers/TIBCO/Transport/CommonB.cs new file mode 100644 index 0000000..5f55d24 --- /dev/null +++ b/Adaptation/FileHandlers/TIBCO/Transport/CommonB.cs @@ -0,0 +1,23 @@ +namespace Adaptation.FileHandlers.TIBCO.Transport; + +public class CommonB +{ + + public string Comment { get; } + public string Layer { get; } + public int? RDSNumber { get; } + public string PSN { get; } + public int? ReactorNumber { get; } + public string Zone { get; } + + public CommonB(string comment, string layer, int? rdsNumber, string psn, int? reactorNumber, string zone) + { + Comment = comment; + Layer = layer; + RDSNumber = rdsNumber; + PSN = psn; + ReactorNumber = reactorNumber; + Zone = zone; + } + +} \ No newline at end of file diff --git a/Adaptation/FileHandlers/TIBCO/Transport/Job.cs b/Adaptation/FileHandlers/TIBCO/Transport/Job.cs index 11c108b..de48abb 100644 --- a/Adaptation/FileHandlers/TIBCO/Transport/Job.cs +++ b/Adaptation/FileHandlers/TIBCO/Transport/Job.cs @@ -11,11 +11,9 @@ using System.Text.RegularExpressions; namespace Adaptation.FileHandlers.TIBCO.Transport; -public class Job +public partial class Job { -#nullable restore - public string AutomationMode { get; } public string BasicType { get; } public string CreationUser { get; } @@ -39,26 +37,6 @@ public class Job public DateTime DateTime { get; } public List Items { get; } - private class Common - { - - public string Layer { get; } - public string PSN { get; } - public int? RDSNumber { get; } - public int? Reactor { get; } - public string Zone { get; } - - public Common(string layer, string psn, int? rdsNumber, int? reactor, string zone) - { - Layer = layer; - PSN = psn; - RDSNumber = rdsNumber; - Reactor = reactor; - Zone = zone; - } - - } - public Job(string lsl2SQLConnectionString, string metrologyFileShare, string barcodeHostFileShare, string mid) { const int zero = 0; @@ -67,42 +45,39 @@ public class Job IsAreaSi = false; else { - string psn; - string zone; - string layer; Common common; - int? rdsNumber; - string comment; - int? slotNumber; - bool isWorkOrder; + CommonB commonB; int? reactorNumber; - int? workOrderNumber; - int? workOrderCassette; + WorkOrder workOrder; const string hyphen = "-"; + const string bioRad2 = "BIORAD2"; + const string bioRad3 = "BIORAD3"; + const string twoAlphaPattern = "^[a-zA-z]{2,3}"; + const string reactorNumberPattern = @"^[0-9]{2}--"; Input input = JsonSerializer.Deserialize(mid); if (!long.TryParse(input.Sequence, out long sequence)) DateTime = DateTime.Now; else DateTime = new DateTime(sequence); - if (!string.IsNullOrEmpty(input.MID) && !string.IsNullOrEmpty(input.MesEntity) && Regex.IsMatch(input.MID, @"^[0-9]{2}--") && input.MesEntity is "BIORAD2" or "BIORAD3") - (common, workOrderNumber, _, workOrderCassette, slotNumber, isWorkOrder) = Get(input, barcodeHostFileShare); + if (!string.IsNullOrEmpty(input.MID) && !string.IsNullOrEmpty(input.MesEntity) && Regex.IsMatch(input.MID, reactorNumberPattern) && input.MesEntity is bioRad2 or bioRad3) + (common, workOrder) = Get(input, barcodeHostFileShare); else { + workOrder = GetWorkOrder(input); reactorNumber = GetReactorNumber(input); - (workOrderNumber, _, workOrderCassette, slotNumber, isWorkOrder) = GetWorkOrder(input); - if (isWorkOrder || reactorNumber.HasValue) + if (workOrder.IsWorkOrder || reactorNumber.HasValue) common = new(string.Empty, string.Empty, null, null, string.Empty); - else if (!string.IsNullOrEmpty(input.MID) && input.MID.Length is 2 or 3 && Regex.IsMatch(input.MID, "^[a-zA-z]{2,3}")) + else if (!string.IsNullOrEmpty(input.MID) && input.MID.Length is 2 or 3 && Regex.IsMatch(input.MID, twoAlphaPattern)) common = Get(metrologyFileShare, input); else common = Get(input); } if (IsValid(common.RDSNumber)) - (comment, layer, rdsNumber, psn, reactorNumber, zone) = GetWithValidRDS(lsl2SQLConnectionString, common.Layer, common.PSN, common.RDSNumber, common.Reactor, common.Zone); - else if (isWorkOrder || common.RDSNumber.HasValue) - (comment, layer, rdsNumber, psn, reactorNumber, zone) = Get(lsl2SQLConnectionString, common.Layer, common.PSN, common.Reactor, slotNumber, workOrderNumber, workOrderCassette, common.Zone); + commonB = GetWithValidRDS(lsl2SQLConnectionString, common.Layer, common.PSN, common.RDSNumber, common.ReactorNumber, common.Zone); + else if (workOrder.IsWorkOrder || common.RDSNumber.HasValue) + commonB = Get(lsl2SQLConnectionString, common.Layer, common.PSN, common.ReactorNumber, workOrder.SlotNumber, workOrder.WorkOrderNumber, workOrder.WorkOrderCassette, common.Zone); else - (comment, layer, rdsNumber, psn, reactorNumber, zone) = (hyphen, hyphen, common.RDSNumber, common.PSN, common.Reactor, hyphen); + commonB = new(hyphen, hyphen, common.RDSNumber, common.PSN, common.ReactorNumber, hyphen); Qty = "1"; Status = hyphen; // INFO CreationUser = hyphen; // ? @@ -115,13 +90,13 @@ public class Job IsAreaSi = input.Area == "Si"; // N/A StateModel = input.EquipmentType; // ? JobName = DateTime.Ticks.ToString(); // ? - SpecName = !string.IsNullOrEmpty(layer) ? layer : hyphen; // LAYER - ProductName = !string.IsNullOrEmpty(psn) ? psn : hyphen; // PRODUCT AutomationMode = string.Concat(DateTime.Ticks, ".", input.MesEntity); // ? - ProcessSpecName = !string.IsNullOrEmpty(zone) ? zone : hyphen; // WAFER_POS - BasicType = !string.IsNullOrEmpty(comment) ? comment : hyphen; // BASIC_TYPE - LotName = rdsNumber is not null ? rdsNumber.Value.ToString() : hyphen; // MID - ProcessType = reactorNumber is not null ? reactorNumber.Value.ToString() : hyphen; // PROCESS_JOBID + SpecName = !string.IsNullOrEmpty(commonB.Layer) ? commonB.Layer : hyphen; // LAYER + ProductName = !string.IsNullOrEmpty(commonB.PSN) ? commonB.PSN : hyphen; // PRODUCT + ProcessSpecName = !string.IsNullOrEmpty(commonB.Zone) ? commonB.Zone : hyphen; // WAFER_POS + BasicType = !string.IsNullOrEmpty(commonB.Comment) ? commonB.Comment : hyphen; // BASIC_TYPE + LotName = commonB.RDSNumber is not null ? commonB.RDSNumber.Value.ToString() : hyphen; // MID + ProcessType = commonB.ReactorNumber is not null ? commonB.ReactorNumber.Value.ToString() : hyphen; // PROCESS_JOBID Items.Add(new Item { Name = "0", Type = "NA", Number = (0 + 1).ToString(), Qty = "1", CarrierName = hyphen }); } } @@ -139,7 +114,7 @@ public class Job return result; } - private static (int?, int?, int?, int?, bool) GetWorkOrder(Input input) + private static WorkOrder GetWorkOrder(Input input) { int? slotNumber; int? workOrderStep = null; @@ -373,17 +348,13 @@ public class Job return result; } - private static (Common common, int?, int?, int?, int?, bool) Get(Input input, string barcodeHostFileShare) + private static (Common common, WorkOrder workOrder) Get(Input input, string barcodeHostFileShare) { if (string.IsNullOrEmpty(barcodeHostFileShare) || !Directory.Exists(barcodeHostFileShare)) throw new Exception($"Unable to access file-share <{barcodeHostFileShare}>"); int? rds; - int? slotNumber; - bool isWorkOrder; long sequence = 0; - int? workOrderStep; - int? workOrderNumber; - int? workOrderCassette; + WorkOrder workOrder; string psn = string.Empty; string zone = string.Empty; string layer = string.Empty; @@ -398,28 +369,27 @@ public class Job if (text is null || text.Length < 3) { rds = null; - (workOrderNumber, workOrderStep, workOrderCassette, slotNumber, isWorkOrder) = (null, null, null, null, false); + workOrder = new(null, null, null, null, false); } else if (!text.Contains('.')) { rds = !int.TryParse(text.Substring(2), out int rdsNumber) ? null : rdsNumber; - (workOrderNumber, workOrderStep, workOrderCassette, slotNumber, isWorkOrder) = (null, null, null, null, false); + workOrder = new(null, null, null, null, false); } else { rds = null; - (workOrderNumber, workOrderStep, workOrderCassette, slotNumber, isWorkOrder) = GetWorkOrder(new(input, text.Substring(2))); + workOrder = GetWorkOrder(new(input, text.Substring(2))); } Common common = new(layer, psn, rds, reactor, zone); - return new(common, workOrderNumber, workOrderStep, workOrderCassette, slotNumber, isWorkOrder); + return new(common, workOrder); } #nullable disable - private static string GetRunJson(string lsl2SQLConnectionString, int? rds, int? workOrderNumber, int? workOrderCassette, int? slot, int? reactor) + private static string GetRunJson(string lsl2SQLConnectionString, string commandText) { StringBuilder result = new(); - string commandText = GetCommandText(rds, workOrderNumber, workOrderCassette, slot, reactor); try { using SqlConnection sqlConnection = new(lsl2SQLConnectionString); @@ -507,20 +477,21 @@ public class Job Append(" select max(qa.rds_no) "). Append(" from lsl2sql.dbo.react_run qa "). Append(" where qa.load_sig != '' "). - Append(" and qa.load_sig_dtm > '2022-07-01 00:00:00.000' "). + Append(" and qa.load_sig_dtm > '2023-05-01 00:00:00.000' "). Append(" and qa.reactor = ").Append(reactor is null ? -1 : reactor.Value).Append(' '). Append(" ) "). Append(" for json path "); return result.ToString(); } // cSpell:restore - private static (string, string, int?, string, int?, string) Get(string lsl2SQLConnectionString, string layer, string psn, int? reactorNumber, int? slotNumber, int? workOrderNumber, int? workOrderCassette, string zone) + private static CommonB Get(string lsl2SQLConnectionString, string layer, string psn, int? reactorNumber, int? slotNumber, int? workOrderNumber, int? workOrderCassette, string zone) { int? rdsNumber; string comment; const int zero = 0; const string hyphen = "-"; - string json = GetRunJson(lsl2SQLConnectionString, rds: null, workOrderNumber, workOrderCassette, slotNumber, reactorNumber); + string commandText = GetCommandText(rds: null, workOrderNumber, workOrderCassette, slotNumber, reactorNumber); + string json = GetRunJson(lsl2SQLConnectionString, commandText); if (string.IsNullOrEmpty(json)) { rdsNumber = null; @@ -565,12 +536,13 @@ public class Job return new(comment, layer, rdsNumber, psn, reactorNumber, zone); } - private static (string, string, int?, string, int?, string) GetWithValidRDS(string lsl2SQLConnectionString, string layer, string psn, int? rdsNumber, int? reactorNumber, string zone) + private static CommonB GetWithValidRDS(string lsl2SQLConnectionString, string layer, string psn, int? rdsNumber, int? reactorNumber, string zone) { string comment; const int zero = 0; const string hyphen = "-"; - string json = GetRunJson(lsl2SQLConnectionString, rdsNumber, workOrderNumber: null, workOrderCassette: null, slot: null, reactor: null); + string commandText = GetCommandText(rdsNumber, workOrderNumber: null, workOrderCassette: null, slot: null, reactor: null); + string json = GetRunJson(lsl2SQLConnectionString, commandText); if (string.IsNullOrEmpty(json)) { comment = hyphen; diff --git a/Adaptation/FileHandlers/TIBCO/Transport/WorkOrder.cs b/Adaptation/FileHandlers/TIBCO/Transport/WorkOrder.cs new file mode 100644 index 0000000..464fa34 --- /dev/null +++ b/Adaptation/FileHandlers/TIBCO/Transport/WorkOrder.cs @@ -0,0 +1,21 @@ +namespace Adaptation.FileHandlers.TIBCO.Transport; + +public class WorkOrder +{ + + public int? WorkOrderNumber { get; } + public int? WorkOrderStep { get; } + public int? WorkOrderCassette { get; } + public int? SlotNumber { get; } + public bool IsWorkOrder { get; } + + public WorkOrder(int? workOrderNumber, int? workOrderStep, int? workOrderCassette, int? slotNumber, bool isWorkOrder) + { + WorkOrderNumber = workOrderNumber; + WorkOrderStep = workOrderStep; + WorkOrderCassette = workOrderCassette; + SlotNumber = slotNumber; + IsWorkOrder = isWorkOrder; + } + +} \ No newline at end of file diff --git a/Adaptation/MET08DDUPSP1TBI.Tests.csproj b/Adaptation/MET08DDUPSP1TBI.Tests.csproj index 9c686b6..f6e53a8 100644 --- a/Adaptation/MET08DDUPSP1TBI.Tests.csproj +++ b/Adaptation/MET08DDUPSP1TBI.Tests.csproj @@ -32,7 +32,10 @@ Linux - + + + + NU1701 NU1701 @@ -42,7 +45,7 @@ NU1701 NU1701 - + @@ -52,17 +55,17 @@ - + - - + + NU1701 - + - - - + + + diff --git a/Adaptation/Shared/FileRead.cs b/Adaptation/Shared/FileRead.cs index 5f35f7b..16fcf8a 100644 --- a/Adaptation/Shared/FileRead.cs +++ b/Adaptation/Shared/FileRead.cs @@ -571,16 +571,99 @@ public class FileRead : Properties.IFileRead } } + internal static List GetDirectoryNames(string directory) + { +#nullable enable + List results = new(); + string? fileName; + string? checkDirectory = directory; + string? pathRoot = Path.GetPathRoot(directory); + string extension = Path.GetExtension(directory); + if (string.IsNullOrEmpty(pathRoot)) + throw new NullReferenceException(nameof(pathRoot)); + if (Directory.Exists(directory)) + { + fileName = Path.GetFileName(directory); + if (!string.IsNullOrEmpty(fileName)) + results.Add(fileName); + } + else if ((string.IsNullOrEmpty(extension) || extension.Length > 3) && !File.Exists(directory)) + { + fileName = Path.GetFileName(directory); + if (!string.IsNullOrEmpty(fileName)) + results.Add(fileName); + } + for (int i = 0; i < int.MaxValue; i++) + { + checkDirectory = Path.GetDirectoryName(checkDirectory); + if (string.IsNullOrEmpty(checkDirectory) || checkDirectory == pathRoot) + break; + fileName = Path.GetFileName(checkDirectory); + if (string.IsNullOrEmpty(fileName)) + continue; + results.Add(fileName); + } + results.Add(pathRoot); + results.Reverse(); + return results; +#nullable disable + } + + private string GetJobIdDirectory(string path) + { + string result; + List directoryNames = GetDirectoryNames(path); + if (!directoryNames.Contains(_Logistics.JobID)) + result = Path.GetDirectoryName(path); + else + { + result = string.Empty; + foreach (string directoryName in directoryNames) + { + result = Path.Combine(result, directoryName); + if (directoryName == _Logistics.JobID) + break; + } + } + return result; + } + + private static void DeleteEmptyTopDirectories(string rootDirectory) + { + if (Directory.Exists(rootDirectory)) + { + string[] files; + string[] directories; + string[] subDirectories = Directory.GetDirectories(rootDirectory, "*", SearchOption.TopDirectoryOnly); + foreach (string subDirectory in subDirectories) + { + files = Directory.GetFiles(subDirectory, "*", SearchOption.AllDirectories); + if (files.Length > 0) + continue; + directories = Directory.GetDirectories(subDirectory, "*", SearchOption.TopDirectoryOnly); + if (directories.Length > 0) + continue; + try + { Directory.Delete(subDirectory); } + catch (UnauthorizedAccessException) + { + new DirectoryInfo(subDirectory).Attributes = FileAttributes.Normal; + Directory.Delete(subDirectory); + } + } + } + } + private void Shared1811(string to, FileInfo sourceFile) { if (!_IsDuplicator && _FileConnectorConfiguration.SourceFileFilter != "*" && sourceFile.Exists && sourceFile.Length < _MinFileLength) { string directoryName = Path.GetFileName(to); - string jobIdDirectory = Path.GetDirectoryName(to); + string jobIdDirectory = GetJobIdDirectory(to); DateTime dateTime = DateTime.Now.AddMinutes(-15); string weekOfYear = _Calendar.GetWeekOfYear(_Logistics.DateTimeFromSequence, CalendarWeekRule.FirstDay, DayOfWeek.Sunday).ToString("00"); string weekDirectory = $"{_Logistics.DateTimeFromSequence:yyyy}_Week_{weekOfYear}{@"\"}{_Logistics.DateTimeFromSequence:yyyy-MM-dd}"; - string destinationDirectory = string.Concat(jobIdDirectory, @"\_ Ignore 100 bytes\", weekDirectory, @"\", directoryName); + string destinationDirectory = Path.Combine(jobIdDirectory, "_ Ignore 100 bytes", weekDirectory, directoryName); if (!Directory.Exists(destinationDirectory)) _ = Directory.CreateDirectory(destinationDirectory); File.Move(sourceFile.FullName, string.Concat(destinationDirectory, @"\", sourceFile.Name)); @@ -605,6 +688,7 @@ public class FileRead : Properties.IFileRead } } catch (Exception) { throw; } + DeleteEmptyTopDirectories(jobIdDirectory); } } diff --git a/Adaptation/Shared/Metrology/WS.Attachment.cs b/Adaptation/Shared/Metrology/WS.Attachment.cs index ea105ed..8edb116 100644 --- a/Adaptation/Shared/Metrology/WS.Attachment.cs +++ b/Adaptation/Shared/Metrology/WS.Attachment.cs @@ -2,18 +2,27 @@ public partial class WS { + public class Attachment { + public string SubGroupId { get; set; } + public long HeaderId { get; set; } + public string HeaderIdDirectory { get; set; } public string UniqueId { get; set; } public string DestinationFileName { get; set; } public string SourceFileName { get; set; } + public string AttachmentId { get; set; } - public Attachment(string uniqueId, string destinationFileName, string sourceFileName) + public Attachment(string subGroupId, long headerId, string headerIdDirectory, string uniqueId, string destinationFileName, string sourceFileName) { + SubGroupId = subGroupId; + HeaderId = headerId; + HeaderIdDirectory = headerIdDirectory; UniqueId = uniqueId; DestinationFileName = destinationFileName; SourceFileName = sourceFileName; + AttachmentId = System.Guid.NewGuid().ToString(); } } diff --git a/Adaptation/Shared/Metrology/WS.cs b/Adaptation/Shared/Metrology/WS.cs index 844efea..4e43fa3 100644 --- a/Adaptation/Shared/Metrology/WS.cs +++ b/Adaptation/Shared/Metrology/WS.cs @@ -10,7 +10,7 @@ namespace Adaptation.Shared.Metrology; public partial class WS { - public static (string, Results) SendData(string url, object payload, int timeoutSeconds = 120) + public static (string, Results) SendData(string url, long sequence, string directory, object payload, int timeoutSeconds = 120) { Results results = new(); string resultsJson = string.Empty; @@ -31,6 +31,10 @@ public partial class WS HttpResponseMessage httpResponseMessage = httpClient.SendAsync(httpRequestMessage, HttpCompletionOption.ResponseContentRead).Result; resultsJson = httpResponseMessage.Content.ReadAsStringAsync().Result; results = JsonSerializer.Deserialize(resultsJson, new JsonSerializerOptions { PropertyNameCaseInsensitive = true }); + string checkDirectory = Path.Combine(directory, $"-{results.HeaderID}"); + if (!Directory.Exists(checkDirectory)) + _ = Directory.CreateDirectory(checkDirectory); + File.WriteAllText(Path.Combine(checkDirectory, $"{sequence}.json"), json); } if (!results.Success) results.Errors.Add(results.ToString()); @@ -51,58 +55,42 @@ public partial class WS return new(resultsJson, results); } - // this method is a wrapper for attaching a file to either a header or data record - // URL is the same URL used for SendData, ex: http://localhost/api/inbound/CDE - // attachToHeaderId is the ID returned by SendData - // attachToDataUniqueId is the string unique ID for the data record, aka the Title of the Sharepoint list entry - // fileContents is a byte array with the contents of the file - // fileName is which attachment this is, image.pdf, data.pdf, data.txt, header.pdf, etc - // timeoutSeconds is configured as the request timeout - // this method will either succeed or throw an exception - // also, this has been made synchronous - public static void AttachFile(string url, long attachToHeaderId, string attachToDataUniqueId, byte[] fileContents, string fileName, int timeoutSeconds = 60) + public static void AttachFile(string url, Attachment attachment, int timeoutSeconds = 60) { using HttpClient httpClient = new(); - string requestUrl = url + "/attachment?headerid=" + attachToHeaderId.ToString(); - if (!string.IsNullOrWhiteSpace(attachToDataUniqueId)) - { - requestUrl += "&datauniqueid="; - requestUrl += System.Net.WebUtility.UrlEncode(attachToDataUniqueId); - } - requestUrl += "&filename="; // this is just so the web server log shows the filename - requestUrl += System.Net.WebUtility.UrlEncode(fileName); - + string json = JsonSerializer.Serialize(attachment); httpClient.Timeout = new TimeSpan(0, 0, 0, timeoutSeconds, 0); - - MultipartFormDataContent multipartFormDataContent = new(); - ByteArrayContent byteArrayContent = new(fileContents); - byteArrayContent.Headers.ContentType = new System.Net.Http.Headers.MediaTypeHeaderValue("application/octet-stream"); - - multipartFormDataContent.Add(byteArrayContent, "attachment", fileName); - - HttpResponseMessage httpResponseMessage = httpClient.PostAsync(requestUrl, multipartFormDataContent).Result; - - if (httpResponseMessage.IsSuccessStatusCode) - return; - - string resultBody = httpResponseMessage.Content.ReadAsStringAsync().Result; - - throw new Exception("Attachment failed: " + resultBody); + StringContent httpContent = new(json, Encoding.UTF8, "application/json"); + HttpResponseMessage httpResponseMessage = httpClient.PostAsync($"{url}/attachment", httpContent).Result; + if (!httpResponseMessage.IsSuccessStatusCode) + { + string resultBody = httpResponseMessage.Content.ReadAsStringAsync().Result; + throw new Exception($"Attachment failed: {resultBody}"); + } } - public static void AttachFiles(string url, long headerID, List headerAttachments = null, List dataAttachments = null) + public static void AttachFiles(string url, List headerAttachments = null, List dataAttachments = null) { + string directory; try { if (headerAttachments is not null) { foreach (Attachment attachment in headerAttachments) - AttachFile(url, headerID, "", File.ReadAllBytes(attachment.SourceFileName), attachment.DestinationFileName); + { + directory = Path.GetDirectoryName(attachment.HeaderIdDirectory) ?? throw new Exception(); + File.Copy(attachment.SourceFileName, Path.Combine(directory, attachment.AttachmentId, attachment.DestinationFileName), overwrite: true); + AttachFile(url, attachment); + } } if (dataAttachments is not null) { foreach (Attachment attachment in dataAttachments) - AttachFile(url, headerID, attachment.UniqueId, File.ReadAllBytes(attachment.SourceFileName), attachment.DestinationFileName); + { + directory = Path.GetDirectoryName(attachment.HeaderIdDirectory) ?? throw new Exception(); + File.Copy(attachment.SourceFileName, Path.Combine(directory, attachment.AttachmentId, attachment.DestinationFileName), overwrite: true); + AttachFile(url, attachment); + } } //MessageBox.Show(r.ToString()); } diff --git a/Adaptation/Shared/Test.cs b/Adaptation/Shared/Test.cs index 3aa3552..169f05b 100644 --- a/Adaptation/Shared/Test.cs +++ b/Adaptation/Shared/Test.cs @@ -14,6 +14,7 @@ public enum Test CandelaPSL = 38, CandelaVerify = 37, CDE = 24, + Climatec = 54, //Largest CV = 3, DailyRPMAverage = 19, DailyRPMPLRatio = 20, @@ -38,7 +39,7 @@ public enum Test RPMPLRatio = 17, RPMXY = 15, SP1 = 8, - SRP2100 = 53, //Largest + SRP2100 = 53, Tencor = 7, UV = 35, VerificationLehighton = 14, diff --git a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.39.0/MET08DDUPSP1TBI.cs b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.39.0/MET08DDUPSP1TBI.cs index 3682fe2..8082cee 100644 --- a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.39.0/MET08DDUPSP1TBI.cs +++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.39.0/MET08DDUPSP1TBI.cs @@ -1,3 +1,4 @@ +#if v2_39_0 using Adaptation._Tests.Shared; using Microsoft.Extensions.Logging; using Microsoft.VisualStudio.TestTools.UnitTesting; @@ -45,7 +46,7 @@ public class MET08DDUPSP1TBI : EAFLoggingUnitTesting EAFLoggingUnitTesting?.Dispose(); } -#if true +#if DEBUG [Ignore] #endif [TestMethod] @@ -58,7 +59,7 @@ public class MET08DDUPSP1TBI : EAFLoggingUnitTesting EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } -#if true +#if DEBUG [Ignore] #endif [TestMethod] @@ -71,7 +72,7 @@ public class MET08DDUPSP1TBI : EAFLoggingUnitTesting EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } -#if true +#if DEBUG [Ignore] #endif [TestMethod] @@ -84,7 +85,7 @@ public class MET08DDUPSP1TBI : EAFLoggingUnitTesting EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } -#if true +#if DEBUG [Ignore] #endif [TestMethod] @@ -97,7 +98,7 @@ public class MET08DDUPSP1TBI : EAFLoggingUnitTesting EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } -#if true +#if DEBUG [Ignore] #endif [TestMethod] @@ -110,7 +111,7 @@ public class MET08DDUPSP1TBI : EAFLoggingUnitTesting EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } -#if true +#if DEBUG [Ignore] #endif [TestMethod] @@ -123,7 +124,7 @@ public class MET08DDUPSP1TBI : EAFLoggingUnitTesting EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } -#if true +#if DEBUG [Ignore] #endif [TestMethod] @@ -136,7 +137,7 @@ public class MET08DDUPSP1TBI : EAFLoggingUnitTesting EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } -#if true +#if DEBUG [Ignore] #endif [TestMethod] @@ -149,7 +150,7 @@ public class MET08DDUPSP1TBI : EAFLoggingUnitTesting EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } -#if true +#if DEBUG [Ignore] #endif [TestMethod] @@ -162,7 +163,7 @@ public class MET08DDUPSP1TBI : EAFLoggingUnitTesting EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } -#if true +#if DEBUG [Ignore] #endif [TestMethod] @@ -175,4 +176,5 @@ public class MET08DDUPSP1TBI : EAFLoggingUnitTesting EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } -} \ No newline at end of file +} +#endif \ No newline at end of file diff --git a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.39.0/SP101-EQPT.cs b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.39.0/SP101-EQPT.cs index f46e477..99425a0 100644 --- a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.39.0/SP101-EQPT.cs +++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.39.0/SP101-EQPT.cs @@ -1,3 +1,4 @@ +#if v2_39_0 using Adaptation._Tests.Shared; using Microsoft.Extensions.Logging; using Microsoft.VisualStudio.TestTools.UnitTesting; @@ -44,7 +45,7 @@ public class SP101_EQPT : EAFLoggingUnitTesting EAFLoggingUnitTesting?.Dispose(); } -#if true +#if DEBUG [Ignore] #endif [TestMethod] @@ -57,4 +58,5 @@ public class SP101_EQPT : EAFLoggingUnitTesting EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } -} \ No newline at end of file +} +#endif \ No newline at end of file diff --git a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.39.0/SP101.cs b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.39.0/SP101.cs index 09e81ab..6921fb3 100644 --- a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.39.0/SP101.cs +++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.39.0/SP101.cs @@ -1,3 +1,4 @@ +#if v2_39_0 using Adaptation._Tests.Shared; using Microsoft.Extensions.Logging; using Microsoft.VisualStudio.TestTools.UnitTesting; @@ -45,7 +46,7 @@ public class SP101 : EAFLoggingUnitTesting EAFLoggingUnitTesting?.Dispose(); } -#if true +#if DEBUG [Ignore] #endif [TestMethod] @@ -58,4 +59,5 @@ public class SP101 : EAFLoggingUnitTesting EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } -} \ No newline at end of file +} +#endif \ No newline at end of file diff --git a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.0/MET08DDUPSP1TBI.cs b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.0/MET08DDUPSP1TBI.cs index a376913..10dbdbb 100644 --- a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.0/MET08DDUPSP1TBI.cs +++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.0/MET08DDUPSP1TBI.cs @@ -1,3 +1,4 @@ +#if v2_43_0 using Adaptation._Tests.Shared; using Microsoft.Extensions.Logging; using Microsoft.VisualStudio.TestTools.UnitTesting; @@ -45,7 +46,7 @@ public class MET08DDUPSP1TBI : EAFLoggingUnitTesting EAFLoggingUnitTesting?.Dispose(); } -#if true +#if DEBUG [Ignore] #endif [TestMethod] @@ -58,7 +59,7 @@ public class MET08DDUPSP1TBI : EAFLoggingUnitTesting EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } -#if true +#if DEBUG [Ignore] #endif [TestMethod] @@ -71,7 +72,7 @@ public class MET08DDUPSP1TBI : EAFLoggingUnitTesting EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } -#if true +#if DEBUG [Ignore] #endif [TestMethod] @@ -84,7 +85,7 @@ public class MET08DDUPSP1TBI : EAFLoggingUnitTesting EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } -#if true +#if DEBUG [Ignore] #endif [TestMethod] @@ -97,7 +98,7 @@ public class MET08DDUPSP1TBI : EAFLoggingUnitTesting EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } -#if true +#if DEBUG [Ignore] #endif [TestMethod] @@ -110,7 +111,7 @@ public class MET08DDUPSP1TBI : EAFLoggingUnitTesting EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } -#if true +#if DEBUG [Ignore] #endif [TestMethod] @@ -123,7 +124,7 @@ public class MET08DDUPSP1TBI : EAFLoggingUnitTesting EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } -#if true +#if DEBUG [Ignore] #endif [TestMethod] @@ -136,7 +137,7 @@ public class MET08DDUPSP1TBI : EAFLoggingUnitTesting EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } -#if true +#if DEBUG [Ignore] #endif [TestMethod] @@ -149,7 +150,7 @@ public class MET08DDUPSP1TBI : EAFLoggingUnitTesting EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } -#if true +#if DEBUG [Ignore] #endif [TestMethod] @@ -162,7 +163,7 @@ public class MET08DDUPSP1TBI : EAFLoggingUnitTesting EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } -#if true +#if DEBUG [Ignore] #endif [TestMethod] @@ -175,4 +176,5 @@ public class MET08DDUPSP1TBI : EAFLoggingUnitTesting EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } -} \ No newline at end of file +} +#endif \ No newline at end of file diff --git a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.0/SP101-EQPT.cs b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.0/SP101-EQPT.cs index 8e1e900..2ffb52e 100644 --- a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.0/SP101-EQPT.cs +++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.0/SP101-EQPT.cs @@ -1,3 +1,4 @@ +#if v2_43_0 using Adaptation._Tests.Shared; using Microsoft.Extensions.Logging; using Microsoft.VisualStudio.TestTools.UnitTesting; @@ -44,7 +45,7 @@ public class SP101_EQPT : EAFLoggingUnitTesting EAFLoggingUnitTesting?.Dispose(); } -#if true +#if DEBUG [Ignore] #endif [TestMethod] @@ -57,4 +58,5 @@ public class SP101_EQPT : EAFLoggingUnitTesting EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } -} \ No newline at end of file +} +#endif \ No newline at end of file diff --git a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.0/SP101.cs b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.0/SP101.cs index cd67d4f..f11c83b 100644 --- a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.0/SP101.cs +++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.0/SP101.cs @@ -1,3 +1,4 @@ +#if v2_43_0 using Adaptation._Tests.Shared; using Microsoft.Extensions.Logging; using Microsoft.VisualStudio.TestTools.UnitTesting; @@ -45,7 +46,7 @@ public class SP101 : EAFLoggingUnitTesting EAFLoggingUnitTesting?.Dispose(); } -#if true +#if DEBUG [Ignore] #endif [TestMethod] @@ -58,4 +59,5 @@ public class SP101 : EAFLoggingUnitTesting EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } -} \ No newline at end of file +} +#endif \ No newline at end of file diff --git a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.3/MET08DDUPSP1TBI.cs b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.3/MET08DDUPSP1TBI.cs index d9b62a8..79ae85d 100644 --- a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.3/MET08DDUPSP1TBI.cs +++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.3/MET08DDUPSP1TBI.cs @@ -1,3 +1,4 @@ +#if v2_43_3 using Adaptation._Tests.Shared; using Microsoft.Extensions.Logging; using Microsoft.VisualStudio.TestTools.UnitTesting; @@ -45,7 +46,7 @@ public class MET08DDUPSP1TBI : EAFLoggingUnitTesting EAFLoggingUnitTesting?.Dispose(); } -#if true +#if DEBUG [Ignore] #endif [TestMethod] @@ -58,7 +59,7 @@ public class MET08DDUPSP1TBI : EAFLoggingUnitTesting EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } -#if true +#if DEBUG [Ignore] #endif [TestMethod] @@ -71,7 +72,7 @@ public class MET08DDUPSP1TBI : EAFLoggingUnitTesting EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } -#if true +#if DEBUG [Ignore] #endif [TestMethod] @@ -84,7 +85,7 @@ public class MET08DDUPSP1TBI : EAFLoggingUnitTesting EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } -#if true +#if DEBUG [Ignore] #endif [TestMethod] @@ -97,7 +98,7 @@ public class MET08DDUPSP1TBI : EAFLoggingUnitTesting EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } -#if true +#if DEBUG [Ignore] #endif [TestMethod] @@ -110,7 +111,7 @@ public class MET08DDUPSP1TBI : EAFLoggingUnitTesting EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } -#if true +#if DEBUG [Ignore] #endif [TestMethod] @@ -123,7 +124,7 @@ public class MET08DDUPSP1TBI : EAFLoggingUnitTesting EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } -#if true +#if DEBUG [Ignore] #endif [TestMethod] @@ -136,7 +137,7 @@ public class MET08DDUPSP1TBI : EAFLoggingUnitTesting EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } -#if true +#if DEBUG [Ignore] #endif [TestMethod] @@ -149,7 +150,7 @@ public class MET08DDUPSP1TBI : EAFLoggingUnitTesting EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } -#if true +#if DEBUG [Ignore] #endif [TestMethod] @@ -162,7 +163,7 @@ public class MET08DDUPSP1TBI : EAFLoggingUnitTesting EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } -#if true +#if DEBUG [Ignore] #endif [TestMethod] @@ -175,7 +176,7 @@ public class MET08DDUPSP1TBI : EAFLoggingUnitTesting EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } -#if true +#if DEBUG [Ignore] #endif [TestMethod] @@ -188,4 +189,5 @@ public class MET08DDUPSP1TBI : EAFLoggingUnitTesting EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } -} \ No newline at end of file +} +#endif \ No newline at end of file diff --git a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.4/MET08DDUPSP1TBI.cs b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.4/MET08DDUPSP1TBI.cs index 5082530..2f3aa77 100644 --- a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.4/MET08DDUPSP1TBI.cs +++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.4/MET08DDUPSP1TBI.cs @@ -1,3 +1,4 @@ +#if v2_43_4 using Adaptation._Tests.Shared; using Microsoft.Extensions.Logging; using Microsoft.VisualStudio.TestTools.UnitTesting; @@ -47,7 +48,7 @@ public class MET08DDUPSP1TBI : EAFLoggingUnitTesting EAFLoggingUnitTesting?.Dispose(); } -#if true +#if DEBUG [Ignore] #endif [TestMethod] @@ -60,7 +61,7 @@ public class MET08DDUPSP1TBI : EAFLoggingUnitTesting EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } -#if true +#if DEBUG [Ignore] #endif [TestMethod] @@ -73,7 +74,7 @@ public class MET08DDUPSP1TBI : EAFLoggingUnitTesting EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } -#if true +#if DEBUG [Ignore] #endif [TestMethod] @@ -86,7 +87,7 @@ public class MET08DDUPSP1TBI : EAFLoggingUnitTesting EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } -#if true +#if DEBUG [Ignore] #endif [TestMethod] @@ -99,7 +100,7 @@ public class MET08DDUPSP1TBI : EAFLoggingUnitTesting EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } -#if true +#if DEBUG [Ignore] #endif [TestMethod] @@ -112,7 +113,7 @@ public class MET08DDUPSP1TBI : EAFLoggingUnitTesting EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } -#if true +#if DEBUG [Ignore] #endif [TestMethod] @@ -125,7 +126,7 @@ public class MET08DDUPSP1TBI : EAFLoggingUnitTesting EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } -#if true +#if DEBUG [Ignore] #endif [TestMethod] @@ -138,7 +139,7 @@ public class MET08DDUPSP1TBI : EAFLoggingUnitTesting EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } -#if true +#if DEBUG [Ignore] #endif [TestMethod] @@ -151,7 +152,7 @@ public class MET08DDUPSP1TBI : EAFLoggingUnitTesting EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } -#if true +#if DEBUG [Ignore] #endif [TestMethod] @@ -164,7 +165,7 @@ public class MET08DDUPSP1TBI : EAFLoggingUnitTesting EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } -#if true +#if DEBUG [Ignore] #endif [TestMethod] @@ -177,4 +178,5 @@ public class MET08DDUPSP1TBI : EAFLoggingUnitTesting EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } -} \ No newline at end of file +} +#endif \ No newline at end of file diff --git a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.4/SP101-EQPT.cs b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.4/SP101-EQPT.cs index cbc07f8..d32d997 100644 --- a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.4/SP101-EQPT.cs +++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.4/SP101-EQPT.cs @@ -1,3 +1,4 @@ +#if v2_43_4 using Adaptation._Tests.Shared; using Microsoft.Extensions.Logging; using Microsoft.VisualStudio.TestTools.UnitTesting; @@ -46,7 +47,7 @@ public class SP101_EQPT : EAFLoggingUnitTesting EAFLoggingUnitTesting?.Dispose(); } -#if true +#if DEBUG [Ignore] #endif [TestMethod] @@ -59,4 +60,5 @@ public class SP101_EQPT : EAFLoggingUnitTesting EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } -} \ No newline at end of file +} +#endif \ No newline at end of file diff --git a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.4/SP101.cs b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.4/SP101.cs index 09c5f8f..b34e15a 100644 --- a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.4/SP101.cs +++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.4/SP101.cs @@ -1,3 +1,4 @@ +#if v2_43_4 using Adaptation._Tests.Shared; using Microsoft.Extensions.Logging; using Microsoft.VisualStudio.TestTools.UnitTesting; @@ -47,7 +48,7 @@ public class SP101 : EAFLoggingUnitTesting EAFLoggingUnitTesting?.Dispose(); } -#if true +#if DEBUG [Ignore] #endif [TestMethod] @@ -60,4 +61,5 @@ public class SP101 : EAFLoggingUnitTesting EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } -} \ No newline at end of file +} +#endif \ No newline at end of file diff --git a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.47.0/SP101-EQPT.cs b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.47.0/SP101-EQPT.cs index fc66be4..abe9fa9 100644 --- a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.47.0/SP101-EQPT.cs +++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.47.0/SP101-EQPT.cs @@ -1,3 +1,4 @@ +#if v2_47_0 using Adaptation._Tests.Shared; using Microsoft.Extensions.Logging; using Microsoft.VisualStudio.TestTools.UnitTesting; @@ -46,7 +47,9 @@ public class SP101_EQPT : EAFLoggingUnitTesting EAFLoggingUnitTesting?.Dispose(); } +#if DEBUG [Ignore] +#endif [TestMethod] public void Staging__v2_47_0__SP101_EQPT__MoveAllFiles() { @@ -57,4 +60,5 @@ public class SP101_EQPT : EAFLoggingUnitTesting EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } -} \ No newline at end of file +} +#endif \ No newline at end of file diff --git a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.47.0/SP101.cs b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.47.0/SP101.cs index e1dd7c3..c5124e7 100644 --- a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.47.0/SP101.cs +++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.47.0/SP101.cs @@ -1,3 +1,4 @@ +#if v2_47_0 using Adaptation._Tests.Shared; using Microsoft.Extensions.Logging; using Microsoft.VisualStudio.TestTools.UnitTesting; @@ -47,7 +48,9 @@ public class SP101 : EAFLoggingUnitTesting EAFLoggingUnitTesting?.Dispose(); } +#if DEBUG [Ignore] +#endif [TestMethod] public void Staging__v2_47_0__SP101__txt() { @@ -58,4 +61,5 @@ public class SP101 : EAFLoggingUnitTesting EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } -} \ No newline at end of file +} +#endif \ No newline at end of file diff --git a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.49.0/MET08DDUPSP1TBI.cs b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.49.0/MET08DDUPSP1TBI.cs index 38befff..e396f65 100644 --- a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.49.0/MET08DDUPSP1TBI.cs +++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.49.0/MET08DDUPSP1TBI.cs @@ -1,3 +1,4 @@ +#if v2_49_0 using Adaptation._Tests.Shared; using Microsoft.Extensions.Logging; using Microsoft.VisualStudio.TestTools.UnitTesting; @@ -47,7 +48,9 @@ public class MET08DDUPSP1TBI : EAFLoggingUnitTesting EAFLoggingUnitTesting?.Dispose(); } +#if DEBUG [Ignore] +#endif [TestMethod] public void Staging__v2_49_0__MET08DDUPSP1TBI__MoveMatchingFiles() { @@ -58,7 +61,9 @@ public class MET08DDUPSP1TBI : EAFLoggingUnitTesting EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } +#if DEBUG [Ignore] +#endif [TestMethod] public void Staging__v2_49_0__MET08DDUPSP1TBI__OpenInsightMetrologyViewer() { @@ -69,7 +74,9 @@ public class MET08DDUPSP1TBI : EAFLoggingUnitTesting EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } +#if DEBUG [Ignore] +#endif [TestMethod] public void Staging__v2_49_0__MET08DDUPSP1TBI__IQSSi() { @@ -80,7 +87,9 @@ public class MET08DDUPSP1TBI : EAFLoggingUnitTesting EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } +#if DEBUG [Ignore] +#endif [TestMethod] public void Staging__v2_49_0__MET08DDUPSP1TBI__OpenInsight() { @@ -91,7 +100,9 @@ public class MET08DDUPSP1TBI : EAFLoggingUnitTesting EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } +#if DEBUG [Ignore] +#endif [TestMethod] public void Staging__v2_49_0__MET08DDUPSP1TBI__OpenInsightMetrologyViewerAttachments() { @@ -102,7 +113,9 @@ public class MET08DDUPSP1TBI : EAFLoggingUnitTesting EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } +#if DEBUG [Ignore] +#endif [TestMethod] public void Staging__v2_49_0__MET08DDUPSP1TBI__APC() { @@ -113,7 +126,9 @@ public class MET08DDUPSP1TBI : EAFLoggingUnitTesting EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } +#if DEBUG [Ignore] +#endif [TestMethod] public void Staging__v2_49_0__MET08DDUPSP1TBI__SPaCe() { @@ -124,7 +139,9 @@ public class MET08DDUPSP1TBI : EAFLoggingUnitTesting EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } +#if DEBUG [Ignore] +#endif [TestMethod] public void Staging__v2_49_0__MET08DDUPSP1TBI__Processed() { @@ -135,7 +152,9 @@ public class MET08DDUPSP1TBI : EAFLoggingUnitTesting EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } +#if DEBUG [Ignore] +#endif [TestMethod] public void Staging__v2_49_0__MET08DDUPSP1TBI__Archive() { @@ -146,7 +165,9 @@ public class MET08DDUPSP1TBI : EAFLoggingUnitTesting EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } +#if DEBUG [Ignore] +#endif [TestMethod] public void Staging__v2_49_0__MET08DDUPSP1TBI__Dummy() { @@ -157,4 +178,5 @@ public class MET08DDUPSP1TBI : EAFLoggingUnitTesting EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } -} \ No newline at end of file +} +#endif \ No newline at end of file diff --git a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.49.0/SP101.cs b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.49.0/SP101.cs index d11ef21..59a4e2d 100644 --- a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.49.0/SP101.cs +++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.49.0/SP101.cs @@ -1,3 +1,4 @@ +#if v2_49_0 using Adaptation._Tests.Shared; using Microsoft.Extensions.Logging; using Microsoft.VisualStudio.TestTools.UnitTesting; @@ -47,7 +48,9 @@ public class SP101 : EAFLoggingUnitTesting EAFLoggingUnitTesting?.Dispose(); } +#if DEBUG [Ignore] +#endif [TestMethod] public void Staging__v2_49_0__SP101__txt() { @@ -58,4 +61,5 @@ public class SP101 : EAFLoggingUnitTesting EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } -} \ No newline at end of file +} +#endif \ No newline at end of file diff --git a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.49.2/MET08DDUPSP1TBI.cs b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.49.2/MET08DDUPSP1TBI.cs index 2d5a487..1864e67 100644 --- a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.49.2/MET08DDUPSP1TBI.cs +++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.49.2/MET08DDUPSP1TBI.cs @@ -1,3 +1,4 @@ +#if v2_49_2 using Adaptation._Tests.Shared; using Microsoft.Extensions.Logging; using Microsoft.VisualStudio.TestTools.UnitTesting; @@ -47,7 +48,9 @@ public class MET08DDUPSP1TBI : EAFLoggingUnitTesting EAFLoggingUnitTesting?.Dispose(); } +#if DEBUG [Ignore] +#endif [TestMethod] public void Staging__v2_49_2__MET08DDUPSP1TBI__MoveMatchingFiles() { @@ -58,7 +61,9 @@ public class MET08DDUPSP1TBI : EAFLoggingUnitTesting EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } +#if DEBUG [Ignore] +#endif [TestMethod] public void Staging__v2_49_2__MET08DDUPSP1TBI__OpenInsightMetrologyViewer() { @@ -69,7 +74,9 @@ public class MET08DDUPSP1TBI : EAFLoggingUnitTesting EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } +#if DEBUG [Ignore] +#endif [TestMethod] public void Staging__v2_49_2__MET08DDUPSP1TBI__IQSSi() { @@ -80,7 +87,9 @@ public class MET08DDUPSP1TBI : EAFLoggingUnitTesting EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } +#if DEBUG [Ignore] +#endif [TestMethod] public void Staging__v2_49_2__MET08DDUPSP1TBI__OpenInsight() { @@ -91,7 +100,9 @@ public class MET08DDUPSP1TBI : EAFLoggingUnitTesting EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } +#if DEBUG [Ignore] +#endif [TestMethod] public void Staging__v2_49_2__MET08DDUPSP1TBI__OpenInsightMetrologyViewerAttachments() { @@ -102,7 +113,9 @@ public class MET08DDUPSP1TBI : EAFLoggingUnitTesting EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } +#if DEBUG [Ignore] +#endif [TestMethod] public void Staging__v2_49_2__MET08DDUPSP1TBI__APC() { @@ -113,7 +126,9 @@ public class MET08DDUPSP1TBI : EAFLoggingUnitTesting EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } +#if DEBUG [Ignore] +#endif [TestMethod] public void Staging__v2_49_2__MET08DDUPSP1TBI__SPaCe() { @@ -124,7 +139,9 @@ public class MET08DDUPSP1TBI : EAFLoggingUnitTesting EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } +#if DEBUG [Ignore] +#endif [TestMethod] public void Staging__v2_49_2__MET08DDUPSP1TBI__Processed() { @@ -135,7 +152,9 @@ public class MET08DDUPSP1TBI : EAFLoggingUnitTesting EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } +#if DEBUG [Ignore] +#endif [TestMethod] public void Staging__v2_49_2__MET08DDUPSP1TBI__Archive() { @@ -146,7 +165,9 @@ public class MET08DDUPSP1TBI : EAFLoggingUnitTesting EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } +#if DEBUG [Ignore] +#endif [TestMethod] public void Staging__v2_49_2__MET08DDUPSP1TBI__Dummy() { @@ -157,7 +178,9 @@ public class MET08DDUPSP1TBI : EAFLoggingUnitTesting EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } +#if DEBUG [Ignore] +#endif [TestMethod] public void Staging__v2_49_2__MET08DDUPSP1TBI__TIBCO() { @@ -168,4 +191,5 @@ public class MET08DDUPSP1TBI : EAFLoggingUnitTesting EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } -} \ No newline at end of file +} +#endif \ No newline at end of file diff --git a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.49.2/SP101.cs b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.49.2/SP101.cs index ab7fc3c..d958f93 100644 --- a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.49.2/SP101.cs +++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.49.2/SP101.cs @@ -1,3 +1,4 @@ +#if v2_49_2 using Adaptation._Tests.Shared; using Microsoft.Extensions.Logging; using Microsoft.VisualStudio.TestTools.UnitTesting; @@ -47,7 +48,9 @@ public class SP101 : EAFLoggingUnitTesting EAFLoggingUnitTesting?.Dispose(); } +#if DEBUG [Ignore] +#endif [TestMethod] public void Staging__v2_49_2__SP101__txt() { @@ -58,4 +61,5 @@ public class SP101 : EAFLoggingUnitTesting EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } -} \ No newline at end of file +} +#endif \ No newline at end of file diff --git a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.49.3/MET08DDUPSP1TBI.cs b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.49.3/MET08DDUPSP1TBI.cs index 5acefdf..352e6e7 100644 --- a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.49.3/MET08DDUPSP1TBI.cs +++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.49.3/MET08DDUPSP1TBI.cs @@ -1,3 +1,4 @@ +#if v2_49_3 using Adaptation._Tests.Shared; using Microsoft.Extensions.Logging; using Microsoft.VisualStudio.TestTools.UnitTesting; @@ -47,7 +48,9 @@ public class MET08DDUPSP1TBI : EAFLoggingUnitTesting EAFLoggingUnitTesting?.Dispose(); } +#if DEBUG [Ignore] +#endif [TestMethod] public void Staging__v2_49_3__MET08DDUPSP1TBI__MoveMatchingFiles() { @@ -58,7 +61,9 @@ public class MET08DDUPSP1TBI : EAFLoggingUnitTesting EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } +#if DEBUG [Ignore] +#endif [TestMethod] public void Staging__v2_49_3__MET08DDUPSP1TBI__OpenInsightMetrologyViewer() { @@ -69,7 +74,9 @@ public class MET08DDUPSP1TBI : EAFLoggingUnitTesting EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } +#if DEBUG [Ignore] +#endif [TestMethod] public void Staging__v2_49_3__MET08DDUPSP1TBI__IQSSi() { @@ -80,7 +87,9 @@ public class MET08DDUPSP1TBI : EAFLoggingUnitTesting EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } +#if DEBUG [Ignore] +#endif [TestMethod] public void Staging__v2_49_3__MET08DDUPSP1TBI__OpenInsight() { @@ -91,7 +100,9 @@ public class MET08DDUPSP1TBI : EAFLoggingUnitTesting EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } +#if DEBUG [Ignore] +#endif [TestMethod] public void Staging__v2_49_3__MET08DDUPSP1TBI__OpenInsightMetrologyViewerAttachments() { @@ -102,7 +113,9 @@ public class MET08DDUPSP1TBI : EAFLoggingUnitTesting EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } +#if DEBUG [Ignore] +#endif [TestMethod] public void Staging__v2_49_3__MET08DDUPSP1TBI__APC() { @@ -113,7 +126,9 @@ public class MET08DDUPSP1TBI : EAFLoggingUnitTesting EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } +#if DEBUG [Ignore] +#endif [TestMethod] public void Staging__v2_49_3__MET08DDUPSP1TBI__SPaCe() { @@ -124,7 +139,9 @@ public class MET08DDUPSP1TBI : EAFLoggingUnitTesting EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } +#if DEBUG [Ignore] +#endif [TestMethod] public void Staging__v2_49_3__MET08DDUPSP1TBI__Processed() { @@ -135,7 +152,9 @@ public class MET08DDUPSP1TBI : EAFLoggingUnitTesting EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } +#if DEBUG [Ignore] +#endif [TestMethod] public void Staging__v2_49_3__MET08DDUPSP1TBI__Archive() { @@ -146,7 +165,9 @@ public class MET08DDUPSP1TBI : EAFLoggingUnitTesting EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } +#if DEBUG [Ignore] +#endif [TestMethod] public void Staging__v2_49_3__MET08DDUPSP1TBI__Dummy() { @@ -157,7 +178,9 @@ public class MET08DDUPSP1TBI : EAFLoggingUnitTesting EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } +#if DEBUG [Ignore] +#endif [TestMethod] public void Staging__v2_49_3__MET08DDUPSP1TBI__TIBCO() { @@ -168,4 +191,5 @@ public class MET08DDUPSP1TBI : EAFLoggingUnitTesting EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } -} \ No newline at end of file +} +#endif \ No newline at end of file diff --git a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.49.3/SP101-EQPT.cs b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.49.3/SP101-EQPT.cs index d989f05..ff82457 100644 --- a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.49.3/SP101-EQPT.cs +++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.49.3/SP101-EQPT.cs @@ -1,3 +1,4 @@ +#if v2_49_3 using Adaptation._Tests.Shared; using Microsoft.Extensions.Logging; using Microsoft.VisualStudio.TestTools.UnitTesting; @@ -65,4 +66,5 @@ public class SP101_EQPT : EAFLoggingUnitTesting NonThrowTryCatch(); } -} \ No newline at end of file +} +#endif \ No newline at end of file diff --git a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.49.3/SP101.cs b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.49.3/SP101.cs index 420605e..3321b4e 100644 --- a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.49.3/SP101.cs +++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.49.3/SP101.cs @@ -1,3 +1,4 @@ +#if v2_49_3 using Adaptation._Tests.Shared; using Microsoft.Extensions.Logging; using Microsoft.VisualStudio.TestTools.UnitTesting; @@ -47,7 +48,9 @@ public class SP101 : EAFLoggingUnitTesting EAFLoggingUnitTesting?.Dispose(); } +#if DEBUG [Ignore] +#endif [TestMethod] public void Staging__v2_49_3__SP101__txt() { @@ -58,4 +61,5 @@ public class SP101 : EAFLoggingUnitTesting EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } -} \ No newline at end of file +} +#endif \ No newline at end of file diff --git a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.52.0/MET08DDUPSP1TBI.cs b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.52.0/MET08DDUPSP1TBI.cs index fb6581c..75f3487 100644 --- a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.52.0/MET08DDUPSP1TBI.cs +++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.52.0/MET08DDUPSP1TBI.cs @@ -1,3 +1,4 @@ +#if v2_52_0 using Adaptation._Tests.Shared; using Microsoft.Extensions.Logging; using Microsoft.VisualStudio.TestTools.UnitTesting; @@ -177,7 +178,9 @@ public class MET08DDUPSP1TBI : EAFLoggingUnitTesting EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } +#if DEBUG [Ignore] +#endif [TestMethod] public void Staging__v2_52_0__MET08DDUPSP1TBI__TIBCO() { @@ -188,4 +191,5 @@ public class MET08DDUPSP1TBI : EAFLoggingUnitTesting EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } -} \ No newline at end of file +} +#endif \ No newline at end of file diff --git a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.52.0/SP101-EQPT.cs b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.52.0/SP101-EQPT.cs index c3eec55..8b7499e 100644 --- a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.52.0/SP101-EQPT.cs +++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.52.0/SP101-EQPT.cs @@ -1,3 +1,4 @@ +#if v2_52_0 using Adaptation._Tests.Shared; using Microsoft.Extensions.Logging; using Microsoft.VisualStudio.TestTools.UnitTesting; @@ -53,9 +54,7 @@ public class SP101_EQPT : EAFLoggingUnitTesting catch (Exception) { } } -#if DEBUG [Ignore] -#endif [TestMethod] public void Staging__v2_52_0__SP101_EQPT__MoveAllFiles() { @@ -67,4 +66,5 @@ public class SP101_EQPT : EAFLoggingUnitTesting NonThrowTryCatch(); } -} \ No newline at end of file +} +#endif \ No newline at end of file diff --git a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.52.0/SP101.cs b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.52.0/SP101.cs index b2d9c62..e5968da 100644 --- a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.52.0/SP101.cs +++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.52.0/SP101.cs @@ -1,3 +1,4 @@ +#if v2_52_0 using Adaptation._Tests.Shared; using Microsoft.Extensions.Logging; using Microsoft.VisualStudio.TestTools.UnitTesting; @@ -60,4 +61,5 @@ public class SP101 : EAFLoggingUnitTesting EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } -} \ No newline at end of file +} +#endif \ No newline at end of file diff --git a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.56.0/MET08DDUPSP1TBI.cs b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.56.0/MET08DDUPSP1TBI.cs new file mode 100644 index 0000000..d86c255 --- /dev/null +++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.56.0/MET08DDUPSP1TBI.cs @@ -0,0 +1,195 @@ +#if true +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_56_0; + +[TestClass] +public class MET08DDUPSP1TBI : EAFLoggingUnitTesting +{ + +#pragma warning disable CA2254 +#pragma warning disable IDE0060 + + internal static string DummyRoot { get; private set; } + internal static MET08DDUPSP1TBI EAFLoggingUnitTesting { get; private set; } + + static MET08DDUPSP1TBI() => DummyRoot = @"\\mesfs.infineon.com\EC_Characterization_Si\Dummy"; + + public MET08DDUPSP1TBI() : base(DummyRoot, testContext: null, declaringType: null, skipEquipmentDictionary: false) + { + if (EAFLoggingUnitTesting is null) + throw new Exception(); + } + + public MET08DDUPSP1TBI(TestContext testContext) : base(DummyRoot, testContext, new StackFrame().GetMethod().DeclaringType, skipEquipmentDictionary: false) + { + } + + [ClassInitialize] + public static void ClassInitialize(TestContext testContext) + { + EAFLoggingUnitTesting ??= new MET08DDUPSP1TBI(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_56_0__MET08DDUPSP1TBI__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_56_0__MET08DDUPSP1TBI__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_56_0__MET08DDUPSP1TBI__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_56_0__MET08DDUPSP1TBI__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_56_0__MET08DDUPSP1TBI__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_56_0__MET08DDUPSP1TBI__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_56_0__MET08DDUPSP1TBI__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_56_0__MET08DDUPSP1TBI__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_56_0__MET08DDUPSP1TBI__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_56_0__MET08DDUPSP1TBI__Dummy() + { + string check = "637400748000000000.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")); + } + +#if DEBUG + [Ignore] +#endif + [TestMethod] + public void Staging__v2_56_0__MET08DDUPSP1TBI__TIBCO() + { + string check = "*.idc"; + 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")); + } + +} +#endif \ No newline at end of file diff --git a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.56.0/SP101-EQPT.cs b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.56.0/SP101-EQPT.cs new file mode 100644 index 0000000..9f98894 --- /dev/null +++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.56.0/SP101-EQPT.cs @@ -0,0 +1,70 @@ +#if true +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_56_0; + +[TestClass] +public class SP101_EQPT : EAFLoggingUnitTesting +{ + +#pragma warning disable CA2254 +#pragma warning disable IDE0060 + + internal static string DummyRoot { get; private set; } + internal static SP101_EQPT EAFLoggingUnitTesting { get; private set; } + + static SP101_EQPT() => DummyRoot = @"\\mesfs.infineon.com\EC_Characterization_Si\Dummy"; + + public SP101_EQPT() : base(DummyRoot, testContext: null, declaringType: null, skipEquipmentDictionary: false) + { + if (EAFLoggingUnitTesting is null) + throw new Exception(); + } + + public SP101_EQPT(TestContext testContext) : base(DummyRoot, testContext, new StackFrame().GetMethod().DeclaringType, skipEquipmentDictionary: false) + { + } + + [ClassInitialize] + public static void ClassInitialize(TestContext testContext) + { + EAFLoggingUnitTesting ??= new SP101_EQPT(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(); + } + + private static void NonThrowTryCatch() + { + try + { throw new Exception(); } + catch (Exception) { } + } + + [Ignore] + [TestMethod] + public void Staging__v2_56_0__SP101_EQPT__MoveAllFiles() + { + string check = "*"; + 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")); + NonThrowTryCatch(); + } + +} +#endif \ No newline at end of file diff --git a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.56.0/SP101.cs b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.56.0/SP101.cs new file mode 100644 index 0000000..194421c --- /dev/null +++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.56.0/SP101.cs @@ -0,0 +1,65 @@ +#if true +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_56_0; + +[TestClass] +public class SP101 : EAFLoggingUnitTesting +{ + +#pragma warning disable CA2254 +#pragma warning disable IDE0060 + + internal static string DummyRoot { get; private set; } + internal static SP101 EAFLoggingUnitTesting { get; private set; } + + static SP101() => DummyRoot = @"\\mesfs.infineon.com\EC_Characterization_Si\Dummy"; + + public SP101() : base(DummyRoot, testContext: null, declaringType: null, skipEquipmentDictionary: false) + { + if (EAFLoggingUnitTesting is null) + throw new Exception(); + } + + public SP101(TestContext testContext) : base(DummyRoot, testContext, new StackFrame().GetMethod().DeclaringType, skipEquipmentDictionary: false) + { + } + + [ClassInitialize] + public static void ClassInitialize(TestContext testContext) + { + EAFLoggingUnitTesting ??= new SP101(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_56_0__SP101__txt() + { + string check = "*.txt"; + MethodBase methodBase = new StackFrame().GetMethod(); + EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration")); + _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting); + EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); + } + +} +#endif \ No newline at end of file diff --git a/Adaptation/_Tests/Extract/Staging/v2.39.0/MET08DDUPSP1TBI.cs b/Adaptation/_Tests/Extract/Staging/v2.39.0/MET08DDUPSP1TBI.cs index 3899958..4079e77 100644 --- a/Adaptation/_Tests/Extract/Staging/v2.39.0/MET08DDUPSP1TBI.cs +++ b/Adaptation/_Tests/Extract/Staging/v2.39.0/MET08DDUPSP1TBI.cs @@ -1,3 +1,4 @@ +#if v2_39_0 using Microsoft.VisualStudio.TestTools.UnitTesting; namespace Adaptation._Tests.Extract.Staging.v2_39_0; @@ -18,4 +19,5 @@ public class MET08DDUPSP1TBI _MET08DDUPSP1TBI = CreateSelfDescription.Staging.v2_39_0.MET08DDUPSP1TBI.EAFLoggingUnitTesting; } -} \ No newline at end of file +} +#endif \ No newline at end of file diff --git a/Adaptation/_Tests/Extract/Staging/v2.39.0/SP101-EQPT.cs b/Adaptation/_Tests/Extract/Staging/v2.39.0/SP101-EQPT.cs index b33d92b..4bd046a 100644 --- a/Adaptation/_Tests/Extract/Staging/v2.39.0/SP101-EQPT.cs +++ b/Adaptation/_Tests/Extract/Staging/v2.39.0/SP101-EQPT.cs @@ -1,3 +1,4 @@ +#if v2_39_0 using Microsoft.VisualStudio.TestTools.UnitTesting; namespace Adaptation._Tests.Extract.Staging.v2_39_0; @@ -18,10 +19,11 @@ public class SP101_EQPT _SP101_EQPT = CreateSelfDescription.Staging.v2_39_0.SP101_EQPT.EAFLoggingUnitTesting; } -#if true +#if DEBUG [Ignore] #endif [TestMethod] public void Staging__v2_39_0__SP101_EQPT__MoveAllFiles() => _SP101_EQPT.Staging__v2_39_0__SP101_EQPT__MoveAllFiles(); -} \ No newline at end of file +} +#endif \ No newline at end of file diff --git a/Adaptation/_Tests/Extract/Staging/v2.39.0/SP101.cs b/Adaptation/_Tests/Extract/Staging/v2.39.0/SP101.cs index 3a011b8..d77030b 100644 --- a/Adaptation/_Tests/Extract/Staging/v2.39.0/SP101.cs +++ b/Adaptation/_Tests/Extract/Staging/v2.39.0/SP101.cs @@ -1,3 +1,4 @@ +#if v2_39_0 using Microsoft.VisualStudio.TestTools.UnitTesting; namespace Adaptation._Tests.Extract.Staging.v2_39_0; @@ -18,10 +19,11 @@ public class SP101 _SP101 = CreateSelfDescription.Staging.v2_39_0.SP101.EAFLoggingUnitTesting; } -#if true +#if DEBUG [Ignore] #endif [TestMethod] public void Staging__v2_39_0__SP101__txt() => _SP101.Staging__v2_39_0__SP101__txt(); -} \ No newline at end of file +} +#endif \ No newline at end of file diff --git a/Adaptation/_Tests/Extract/Staging/v2.43.0/MET08DDUPSP1TBI.cs b/Adaptation/_Tests/Extract/Staging/v2.43.0/MET08DDUPSP1TBI.cs index f749067..dff1774 100644 --- a/Adaptation/_Tests/Extract/Staging/v2.43.0/MET08DDUPSP1TBI.cs +++ b/Adaptation/_Tests/Extract/Staging/v2.43.0/MET08DDUPSP1TBI.cs @@ -1,3 +1,4 @@ +#if v2_43_0 using Microsoft.VisualStudio.TestTools.UnitTesting; namespace Adaptation._Tests.Extract.Staging.v2_43_0; @@ -18,64 +19,65 @@ public class MET08DDUPSP1TBI _MET08DDUPSP1TBI = CreateSelfDescription.Staging.v2_43_0.MET08DDUPSP1TBI.EAFLoggingUnitTesting; } -#if true +#if DEBUG [Ignore] #endif [TestMethod] public void Staging__v2_43_0__MET08DDUPSP1TBI__MoveMatchingFiles() => _MET08DDUPSP1TBI.Staging__v2_43_0__MET08DDUPSP1TBI__MoveMatchingFiles(); -#if true +#if DEBUG [Ignore] #endif [TestMethod] public void Staging__v2_43_0__MET08DDUPSP1TBI__OpenInsightMetrologyViewer() => _MET08DDUPSP1TBI.Staging__v2_43_0__MET08DDUPSP1TBI__OpenInsightMetrologyViewer(); -#if true +#if DEBUG [Ignore] #endif [TestMethod] public void Staging__v2_43_0__MET08DDUPSP1TBI__IQSSi() => _MET08DDUPSP1TBI.Staging__v2_43_0__MET08DDUPSP1TBI__IQSSi(); -#if true +#if DEBUG [Ignore] #endif [TestMethod] public void Staging__v2_43_0__MET08DDUPSP1TBI__OpenInsight() => _MET08DDUPSP1TBI.Staging__v2_43_0__MET08DDUPSP1TBI__OpenInsight(); -#if true +#if DEBUG [Ignore] #endif [TestMethod] public void Staging__v2_43_0__MET08DDUPSP1TBI__OpenInsightMetrologyViewerAttachments() => _MET08DDUPSP1TBI.Staging__v2_43_0__MET08DDUPSP1TBI__OpenInsightMetrologyViewerAttachments(); -#if true +#if DEBUG [Ignore] #endif [TestMethod] public void Staging__v2_43_0__MET08DDUPSP1TBI__APC() => _MET08DDUPSP1TBI.Staging__v2_43_0__MET08DDUPSP1TBI__APC(); -#if true +#if DEBUG [Ignore] #endif [TestMethod] public void Staging__v2_43_0__MET08DDUPSP1TBI__SPaCe() => _MET08DDUPSP1TBI.Staging__v2_43_0__MET08DDUPSP1TBI__SPaCe(); -#if true +#if DEBUG [Ignore] #endif [TestMethod] public void Staging__v2_43_0__MET08DDUPSP1TBI__Processed() => _MET08DDUPSP1TBI.Staging__v2_43_0__MET08DDUPSP1TBI__Processed(); -#if true +#if DEBUG [Ignore] #endif [TestMethod] public void Staging__v2_43_0__MET08DDUPSP1TBI__Archive() => _MET08DDUPSP1TBI.Staging__v2_43_0__MET08DDUPSP1TBI__Archive(); -#if true +#if DEBUG [Ignore] #endif [TestMethod] public void Staging__v2_43_0__MET08DDUPSP1TBI__Dummy() => _MET08DDUPSP1TBI.Staging__v2_43_0__MET08DDUPSP1TBI__Dummy(); -} \ No newline at end of file +} +#endif \ No newline at end of file diff --git a/Adaptation/_Tests/Extract/Staging/v2.43.0/SP101-EQPT.cs b/Adaptation/_Tests/Extract/Staging/v2.43.0/SP101-EQPT.cs index abc3ab7..5e2a03f 100644 --- a/Adaptation/_Tests/Extract/Staging/v2.43.0/SP101-EQPT.cs +++ b/Adaptation/_Tests/Extract/Staging/v2.43.0/SP101-EQPT.cs @@ -1,3 +1,4 @@ +#if v2_43_0 using Microsoft.VisualStudio.TestTools.UnitTesting; namespace Adaptation._Tests.Extract.Staging.v2_43_0; @@ -18,10 +19,11 @@ public class SP101_EQPT _SP101_EQPT = CreateSelfDescription.Staging.v2_43_0.SP101_EQPT.EAFLoggingUnitTesting; } -#if true +#if DEBUG [Ignore] #endif [TestMethod] public void Staging__v2_43_0__SP101_EQPT__MoveAllFiles() => _SP101_EQPT.Staging__v2_43_0__SP101_EQPT__MoveAllFiles(); -} \ No newline at end of file +} +#endif \ No newline at end of file diff --git a/Adaptation/_Tests/Extract/Staging/v2.43.0/SP101.cs b/Adaptation/_Tests/Extract/Staging/v2.43.0/SP101.cs index 029436f..84c8b30 100644 --- a/Adaptation/_Tests/Extract/Staging/v2.43.0/SP101.cs +++ b/Adaptation/_Tests/Extract/Staging/v2.43.0/SP101.cs @@ -1,3 +1,4 @@ +#if v2_43_0 using Microsoft.VisualStudio.TestTools.UnitTesting; namespace Adaptation._Tests.Extract.Staging.v2_43_0; @@ -18,10 +19,11 @@ public class SP101 _SP101 = CreateSelfDescription.Staging.v2_43_0.SP101.EAFLoggingUnitTesting; } -#if true +#if DEBUG [Ignore] #endif [TestMethod] public void Staging__v2_43_0__SP101__txt() => _SP101.Staging__v2_43_0__SP101__txt(); -} \ No newline at end of file +} +#endif \ No newline at end of file diff --git a/Adaptation/_Tests/Extract/Staging/v2.43.3/MET08DDUPSP1TBI.cs b/Adaptation/_Tests/Extract/Staging/v2.43.3/MET08DDUPSP1TBI.cs index cc85a94..8040ce3 100644 --- a/Adaptation/_Tests/Extract/Staging/v2.43.3/MET08DDUPSP1TBI.cs +++ b/Adaptation/_Tests/Extract/Staging/v2.43.3/MET08DDUPSP1TBI.cs @@ -1,3 +1,4 @@ +#if v2_43_3 using Microsoft.VisualStudio.TestTools.UnitTesting; namespace Adaptation._Tests.Extract.Staging.v2_43_3; @@ -18,70 +19,71 @@ public class MET08DDUPSP1TBI _MET08DDUPSP1TBI = CreateSelfDescription.Staging.v2_43_3.MET08DDUPSP1TBI.EAFLoggingUnitTesting; } -#if true +#if DEBUG [Ignore] #endif [TestMethod] public void Staging__v2_43_3__MET08DDUPSP1TBI__MoveMatchingFiles() => _MET08DDUPSP1TBI.Staging__v2_43_3__MET08DDUPSP1TBI__MoveMatchingFiles(); -#if true +#if DEBUG [Ignore] #endif [TestMethod] public void Staging__v2_43_3__MET08DDUPSP1TBI__OpenInsightMetrologyViewer() => _MET08DDUPSP1TBI.Staging__v2_43_3__MET08DDUPSP1TBI__OpenInsightMetrologyViewer(); -#if true +#if DEBUG [Ignore] #endif [TestMethod] public void Staging__v2_43_3__MET08DDUPSP1TBI__IQSSi() => _MET08DDUPSP1TBI.Staging__v2_43_3__MET08DDUPSP1TBI__IQSSi(); -#if true +#if DEBUG [Ignore] #endif [TestMethod] public void Staging__v2_43_3__MET08DDUPSP1TBI__OpenInsight() => _MET08DDUPSP1TBI.Staging__v2_43_3__MET08DDUPSP1TBI__OpenInsight(); -#if true +#if DEBUG [Ignore] #endif [TestMethod] public void Staging__v2_43_3__MET08DDUPSP1TBI__OpenInsightMetrologyViewerAttachments() => _MET08DDUPSP1TBI.Staging__v2_43_3__MET08DDUPSP1TBI__OpenInsightMetrologyViewerAttachments(); -#if true +#if DEBUG [Ignore] #endif [TestMethod] public void Staging__v2_43_3__MET08DDUPSP1TBI__APC() => _MET08DDUPSP1TBI.Staging__v2_43_3__MET08DDUPSP1TBI__APC(); -#if true +#if DEBUG [Ignore] #endif [TestMethod] public void Staging__v2_43_3__MET08DDUPSP1TBI__SPaCe() => _MET08DDUPSP1TBI.Staging__v2_43_3__MET08DDUPSP1TBI__SPaCe(); -#if true +#if DEBUG [Ignore] #endif [TestMethod] public void Staging__v2_43_3__MET08DDUPSP1TBI__Processed() => _MET08DDUPSP1TBI.Staging__v2_43_3__MET08DDUPSP1TBI__Processed(); -#if true +#if DEBUG [Ignore] #endif [TestMethod] public void Staging__v2_43_3__MET08DDUPSP1TBI__Archive() => _MET08DDUPSP1TBI.Staging__v2_43_3__MET08DDUPSP1TBI__Archive(); -#if true +#if DEBUG [Ignore] #endif [TestMethod] public void Staging__v2_43_3__MET08DDUPSP1TBI__Dummy() => _MET08DDUPSP1TBI.Staging__v2_43_3__MET08DDUPSP1TBI__Dummy(); -#if true +#if DEBUG [Ignore] #endif [TestMethod] public void Staging__v2_43_3__MET08DDUPSP1TBI__TIBCO() => _MET08DDUPSP1TBI.Staging__v2_43_3__MET08DDUPSP1TBI__TIBCO(); -} \ No newline at end of file +} +#endif \ No newline at end of file diff --git a/Adaptation/_Tests/Extract/Staging/v2.43.4/MET08DDUPSP1TBI.cs b/Adaptation/_Tests/Extract/Staging/v2.43.4/MET08DDUPSP1TBI.cs index 9a5332e..bd27e72 100644 --- a/Adaptation/_Tests/Extract/Staging/v2.43.4/MET08DDUPSP1TBI.cs +++ b/Adaptation/_Tests/Extract/Staging/v2.43.4/MET08DDUPSP1TBI.cs @@ -1,3 +1,4 @@ +#if v2_43_4 using Adaptation.Shared; using Adaptation.Shared.Methods; using Microsoft.VisualStudio.TestTools.UnitTesting; @@ -22,13 +23,13 @@ public class MET08DDUPSP1TBI _MET08DDUPSP1TBI = CreateSelfDescription.Staging.v2_43_4.MET08DDUPSP1TBI.EAFLoggingUnitTesting; } -#if true +#if DEBUG [Ignore] #endif [TestMethod] public void Staging__v2_43_4__MET08DDUPSP1TBI__MoveMatchingFiles() => _MET08DDUPSP1TBI.Staging__v2_43_4__MET08DDUPSP1TBI__MoveMatchingFiles(); -#if true +#if DEBUG [Ignore] #endif [TestMethod] @@ -44,58 +45,59 @@ public class MET08DDUPSP1TBI _ = Shared.AdaptationTesting.ReExtractCompareUpdatePassDirectory(variables, fileRead, logistics, validatePDSF); } -#if true +#if DEBUG [Ignore] #endif [TestMethod] public void Staging__v2_43_4__MET08DDUPSP1TBI__OpenInsightMetrologyViewer() => _MET08DDUPSP1TBI.Staging__v2_43_4__MET08DDUPSP1TBI__OpenInsightMetrologyViewer(); -#if true +#if DEBUG [Ignore] #endif [TestMethod] public void Staging__v2_43_4__MET08DDUPSP1TBI__IQSSi() => _MET08DDUPSP1TBI.Staging__v2_43_4__MET08DDUPSP1TBI__IQSSi(); -#if true +#if DEBUG [Ignore] #endif [TestMethod] public void Staging__v2_43_4__MET08DDUPSP1TBI__OpenInsight() => _MET08DDUPSP1TBI.Staging__v2_43_4__MET08DDUPSP1TBI__OpenInsight(); -#if true +#if DEBUG [Ignore] #endif [TestMethod] public void Staging__v2_43_4__MET08DDUPSP1TBI__OpenInsightMetrologyViewerAttachments() => _MET08DDUPSP1TBI.Staging__v2_43_4__MET08DDUPSP1TBI__OpenInsightMetrologyViewerAttachments(); -#if true +#if DEBUG [Ignore] #endif [TestMethod] public void Staging__v2_43_4__MET08DDUPSP1TBI__APC() => _MET08DDUPSP1TBI.Staging__v2_43_4__MET08DDUPSP1TBI__APC(); -#if true +#if DEBUG [Ignore] #endif [TestMethod] public void Staging__v2_43_4__MET08DDUPSP1TBI__SPaCe() => _MET08DDUPSP1TBI.Staging__v2_43_4__MET08DDUPSP1TBI__SPaCe(); -#if true +#if DEBUG [Ignore] #endif [TestMethod] public void Staging__v2_43_4__MET08DDUPSP1TBI__Processed() => _MET08DDUPSP1TBI.Staging__v2_43_4__MET08DDUPSP1TBI__Processed(); -#if true +#if DEBUG [Ignore] #endif [TestMethod] public void Staging__v2_43_4__MET08DDUPSP1TBI__Archive() => _MET08DDUPSP1TBI.Staging__v2_43_4__MET08DDUPSP1TBI__Archive(); -#if true +#if DEBUG [Ignore] #endif [TestMethod] public void Staging__v2_43_4__MET08DDUPSP1TBI__Dummy() => _MET08DDUPSP1TBI.Staging__v2_43_4__MET08DDUPSP1TBI__Dummy(); -} \ No newline at end of file +} +#endif \ No newline at end of file diff --git a/Adaptation/_Tests/Extract/Staging/v2.43.4/SP101.cs b/Adaptation/_Tests/Extract/Staging/v2.43.4/SP101.cs index 66894e2..a78d964 100644 --- a/Adaptation/_Tests/Extract/Staging/v2.43.4/SP101.cs +++ b/Adaptation/_Tests/Extract/Staging/v2.43.4/SP101.cs @@ -1,3 +1,4 @@ +#if v2_43_4 using Adaptation.Shared; using Adaptation.Shared.Methods; using Microsoft.VisualStudio.TestTools.UnitTesting; @@ -22,13 +23,13 @@ public class SP101 _SP101 = CreateSelfDescription.Staging.v2_43_4.SP101.EAFLoggingUnitTesting; } -#if true +#if DEBUG [Ignore] #endif [TestMethod] public void Staging__v2_43_4__SP101__txt() => _SP101.Staging__v2_43_4__SP101__txt(); -#if true +#if DEBUG [Ignore] #endif [TestMethod] @@ -44,4 +45,5 @@ public class SP101 _ = Shared.AdaptationTesting.ReExtractCompareUpdatePassDirectory(variables, fileRead, logistics, validatePDSF); } -} \ No newline at end of file +} +#endif \ No newline at end of file diff --git a/Adaptation/_Tests/Extract/Staging/v2.47.0/SP101.cs b/Adaptation/_Tests/Extract/Staging/v2.47.0/SP101.cs index bc3b2da..45f6860 100644 --- a/Adaptation/_Tests/Extract/Staging/v2.47.0/SP101.cs +++ b/Adaptation/_Tests/Extract/Staging/v2.47.0/SP101.cs @@ -1,3 +1,4 @@ +#if v2_47_0 using Adaptation.Shared; using Adaptation.Shared.Methods; using Microsoft.VisualStudio.TestTools.UnitTesting; @@ -22,11 +23,15 @@ public class SP101 _SP101 = CreateSelfDescription.Staging.v2_47_0.SP101.EAFLoggingUnitTesting; } +#if DEBUG [Ignore] +#endif [TestMethod] public void Staging__v2_47_0__SP101__txt() => _SP101.Staging__v2_47_0__SP101__txt(); +#if DEBUG [Ignore] +#endif [TestMethod] public void Staging__v2_47_0__SP101__txt637955319879801344__Normal() { @@ -40,4 +45,5 @@ public class SP101 _ = Shared.AdaptationTesting.ReExtractCompareUpdatePassDirectory(variables, fileRead, logistics, validatePDSF); } -} \ No newline at end of file +} +#endif \ No newline at end of file diff --git a/Adaptation/_Tests/Extract/Staging/v2.49.0/MET08DDUPSP1TBI.cs b/Adaptation/_Tests/Extract/Staging/v2.49.0/MET08DDUPSP1TBI.cs index bebd054..dab2ff1 100644 --- a/Adaptation/_Tests/Extract/Staging/v2.49.0/MET08DDUPSP1TBI.cs +++ b/Adaptation/_Tests/Extract/Staging/v2.49.0/MET08DDUPSP1TBI.cs @@ -1,3 +1,4 @@ +#if v2_49_0 using Adaptation.Shared; using Adaptation.Shared.Methods; using Microsoft.VisualStudio.TestTools.UnitTesting; @@ -22,11 +23,15 @@ public class MET08DDUPSP1TBI _MET08DDUPSP1TBI = CreateSelfDescription.Staging.v2_49_0.MET08DDUPSP1TBI.EAFLoggingUnitTesting; } +#if DEBUG [Ignore] +#endif [TestMethod] public void Staging__v2_49_0__MET08DDUPSP1TBI__MoveMatchingFiles() => _MET08DDUPSP1TBI.Staging__v2_49_0__MET08DDUPSP1TBI__MoveMatchingFiles(); +#if DEBUG [Ignore] +#endif [TestMethod] public void Staging__v2_49_0__MET08DDUPSP1TBI__MoveMatchingFiles637955319879801344__Normal() { @@ -40,19 +45,27 @@ public class MET08DDUPSP1TBI _ = Shared.AdaptationTesting.ReExtractCompareUpdatePassDirectory(variables, fileRead, logistics, validatePDSF); } +#if DEBUG [Ignore] +#endif [TestMethod] public void Staging__v2_49_0__MET08DDUPSP1TBI__OpenInsightMetrologyViewer() => _MET08DDUPSP1TBI.Staging__v2_49_0__MET08DDUPSP1TBI__OpenInsightMetrologyViewer(); +#if DEBUG [Ignore] +#endif [TestMethod] public void Staging__v2_49_0__MET08DDUPSP1TBI__IQSSi() => _MET08DDUPSP1TBI.Staging__v2_49_0__MET08DDUPSP1TBI__IQSSi(); +#if DEBUG [Ignore] +#endif [TestMethod] public void Staging__v2_49_0__MET08DDUPSP1TBI__OpenInsight() => _MET08DDUPSP1TBI.Staging__v2_49_0__MET08DDUPSP1TBI__OpenInsight(); +#if DEBUG [Ignore] +#endif [TestMethod] public void Staging__v2_49_0__MET08DDUPSP1TBI__OpenInsight638052814829645888__IqsSql() { @@ -65,28 +78,41 @@ public class MET08DDUPSP1TBI _ = Shared.AdaptationTesting.ReExtractCompareUpdatePassDirectory(variables, fileRead, logistics); } +#if DEBUG [Ignore] +#endif [TestMethod] public void Staging__v2_49_0__MET08DDUPSP1TBI__OpenInsightMetrologyViewerAttachments() => _MET08DDUPSP1TBI.Staging__v2_49_0__MET08DDUPSP1TBI__OpenInsightMetrologyViewerAttachments(); +#if DEBUG [Ignore] +#endif [TestMethod] public void Staging__v2_49_0__MET08DDUPSP1TBI__APC() => _MET08DDUPSP1TBI.Staging__v2_49_0__MET08DDUPSP1TBI__APC(); +#if DEBUG [Ignore] +#endif [TestMethod] public void Staging__v2_49_0__MET08DDUPSP1TBI__SPaCe() => _MET08DDUPSP1TBI.Staging__v2_49_0__MET08DDUPSP1TBI__SPaCe(); +#if DEBUG [Ignore] +#endif [TestMethod] public void Staging__v2_49_0__MET08DDUPSP1TBI__Processed() => _MET08DDUPSP1TBI.Staging__v2_49_0__MET08DDUPSP1TBI__Processed(); +#if DEBUG [Ignore] +#endif [TestMethod] public void Staging__v2_49_0__MET08DDUPSP1TBI__Archive() => _MET08DDUPSP1TBI.Staging__v2_49_0__MET08DDUPSP1TBI__Archive(); +#if DEBUG [Ignore] +#endif [TestMethod] public void Staging__v2_49_0__MET08DDUPSP1TBI__Dummy() => _MET08DDUPSP1TBI.Staging__v2_49_0__MET08DDUPSP1TBI__Dummy(); -} \ No newline at end of file +} +#endif \ No newline at end of file diff --git a/Adaptation/_Tests/Extract/Staging/v2.49.0/SP101.cs b/Adaptation/_Tests/Extract/Staging/v2.49.0/SP101.cs index a525a08..ed123ce 100644 --- a/Adaptation/_Tests/Extract/Staging/v2.49.0/SP101.cs +++ b/Adaptation/_Tests/Extract/Staging/v2.49.0/SP101.cs @@ -1,3 +1,4 @@ +#if v2_49_0 using Adaptation.Shared; using Adaptation.Shared.Methods; using Microsoft.VisualStudio.TestTools.UnitTesting; @@ -22,11 +23,15 @@ public class SP101 _SP101 = CreateSelfDescription.Staging.v2_49_0.SP101.EAFLoggingUnitTesting; } +#if DEBUG [Ignore] +#endif [TestMethod] public void Staging__v2_49_0__SP101__txt() => _SP101.Staging__v2_49_0__SP101__txt(); +#if DEBUG [Ignore] +#endif [TestMethod] public void Staging__v2_49_0__SP101__txt637955319879801344__Normal() { @@ -40,4 +45,5 @@ public class SP101 _ = Shared.AdaptationTesting.ReExtractCompareUpdatePassDirectory(variables, fileRead, logistics, validatePDSF); } -} \ No newline at end of file +} +#endif \ No newline at end of file diff --git a/Adaptation/_Tests/Extract/Staging/v2.49.2/MET08DDUPSP1TBI.cs b/Adaptation/_Tests/Extract/Staging/v2.49.2/MET08DDUPSP1TBI.cs index 8d393b7..3d5eab9 100644 --- a/Adaptation/_Tests/Extract/Staging/v2.49.2/MET08DDUPSP1TBI.cs +++ b/Adaptation/_Tests/Extract/Staging/v2.49.2/MET08DDUPSP1TBI.cs @@ -1,3 +1,4 @@ +#if v2_49_2 using Adaptation.Shared; using Adaptation.Shared.Methods; using Microsoft.VisualStudio.TestTools.UnitTesting; @@ -30,11 +31,15 @@ public class MET08DDUPSP1TBI catch (Exception) { } } +#if DEBUG [Ignore] +#endif [TestMethod] public void Staging__v2_49_2__MET08DDUPSP1TBI__MoveMatchingFiles() => _MET08DDUPSP1TBI.Staging__v2_49_2__MET08DDUPSP1TBI__MoveMatchingFiles(); +#if DEBUG [Ignore] +#endif [TestMethod] public void Staging__v2_49_2__MET08DDUPSP1TBI__MoveMatchingFiles637955319879801344__Normal() { @@ -48,19 +53,27 @@ public class MET08DDUPSP1TBI _ = Shared.AdaptationTesting.ReExtractCompareUpdatePassDirectory(variables, fileRead, logistics, validatePDSF); } +#if DEBUG [Ignore] +#endif [TestMethod] public void Staging__v2_49_2__MET08DDUPSP1TBI__OpenInsightMetrologyViewer() => _MET08DDUPSP1TBI.Staging__v2_49_2__MET08DDUPSP1TBI__OpenInsightMetrologyViewer(); +#if DEBUG [Ignore] +#endif [TestMethod] public void Staging__v2_49_2__MET08DDUPSP1TBI__IQSSi() => _MET08DDUPSP1TBI.Staging__v2_49_2__MET08DDUPSP1TBI__IQSSi(); +#if DEBUG [Ignore] +#endif [TestMethod] public void Staging__v2_49_2__MET08DDUPSP1TBI__OpenInsight() => _MET08DDUPSP1TBI.Staging__v2_49_2__MET08DDUPSP1TBI__OpenInsight(); +#if DEBUG [Ignore] +#endif [TestMethod] public void Staging__v2_49_2__MET08DDUPSP1TBI__OpenInsight638052814829645888__IqsSql() { @@ -73,35 +86,51 @@ public class MET08DDUPSP1TBI _ = Shared.AdaptationTesting.ReExtractCompareUpdatePassDirectory(variables, fileRead, logistics); } +#if DEBUG [Ignore] +#endif [TestMethod] public void Staging__v2_49_2__MET08DDUPSP1TBI__OpenInsightMetrologyViewerAttachments() => _MET08DDUPSP1TBI.Staging__v2_49_2__MET08DDUPSP1TBI__OpenInsightMetrologyViewerAttachments(); +#if DEBUG [Ignore] +#endif [TestMethod] public void Staging__v2_49_2__MET08DDUPSP1TBI__APC() => _MET08DDUPSP1TBI.Staging__v2_49_2__MET08DDUPSP1TBI__APC(); +#if DEBUG [Ignore] +#endif [TestMethod] public void Staging__v2_49_2__MET08DDUPSP1TBI__SPaCe() => _MET08DDUPSP1TBI.Staging__v2_49_2__MET08DDUPSP1TBI__SPaCe(); +#if DEBUG [Ignore] +#endif [TestMethod] public void Staging__v2_49_2__MET08DDUPSP1TBI__Processed() => _MET08DDUPSP1TBI.Staging__v2_49_2__MET08DDUPSP1TBI__Processed(); +#if DEBUG [Ignore] +#endif [TestMethod] public void Staging__v2_49_2__MET08DDUPSP1TBI__Archive() => _MET08DDUPSP1TBI.Staging__v2_49_2__MET08DDUPSP1TBI__Archive(); +#if DEBUG [Ignore] +#endif [TestMethod] public void Staging__v2_49_2__MET08DDUPSP1TBI__Dummy() => _MET08DDUPSP1TBI.Staging__v2_49_2__MET08DDUPSP1TBI__Dummy(); +#if DEBUG [Ignore] +#endif [TestMethod] public void Staging__v2_49_2__MET08DDUPSP1TBI__TIBCO() => _MET08DDUPSP1TBI.Staging__v2_49_2__MET08DDUPSP1TBI__TIBCO(); +#if DEBUG [Ignore] +#endif [TestMethod] public void Staging__v2_49_2__MET08DDUPSP1TBI__TIBCO638217888620242702__Normal() { @@ -115,4 +144,5 @@ public class MET08DDUPSP1TBI NonThrowTryCatch(); } -} \ No newline at end of file +} +#endif \ No newline at end of file diff --git a/Adaptation/_Tests/Extract/Staging/v2.49.2/SP101.cs b/Adaptation/_Tests/Extract/Staging/v2.49.2/SP101.cs index 428982a..0cac237 100644 --- a/Adaptation/_Tests/Extract/Staging/v2.49.2/SP101.cs +++ b/Adaptation/_Tests/Extract/Staging/v2.49.2/SP101.cs @@ -1,3 +1,4 @@ +#if v2_49_2 using Adaptation.Shared; using Adaptation.Shared.Methods; using Microsoft.VisualStudio.TestTools.UnitTesting; @@ -22,11 +23,15 @@ public class SP101 _SP101 = CreateSelfDescription.Staging.v2_49_2.SP101.EAFLoggingUnitTesting; } +#if DEBUG [Ignore] +#endif [TestMethod] public void Staging__v2_49_2__SP101__txt() => _SP101.Staging__v2_49_2__SP101__txt(); +#if DEBUG [Ignore] +#endif [TestMethod] public void Staging__v2_49_2__SP101__txt637955319879801344__Normal() { @@ -40,4 +45,5 @@ public class SP101 _ = Shared.AdaptationTesting.ReExtractCompareUpdatePassDirectory(variables, fileRead, logistics, validatePDSF); } -} \ No newline at end of file +} +#endif \ No newline at end of file diff --git a/Adaptation/_Tests/Extract/Staging/v2.49.3/MET08DDUPSP1TBI.cs b/Adaptation/_Tests/Extract/Staging/v2.49.3/MET08DDUPSP1TBI.cs index 5f2f0dc..a69b5c6 100644 --- a/Adaptation/_Tests/Extract/Staging/v2.49.3/MET08DDUPSP1TBI.cs +++ b/Adaptation/_Tests/Extract/Staging/v2.49.3/MET08DDUPSP1TBI.cs @@ -1,3 +1,4 @@ +#if v2_49_3 using Adaptation.Shared; using Adaptation.Shared.Methods; using Microsoft.VisualStudio.TestTools.UnitTesting; @@ -30,11 +31,15 @@ public class MET08DDUPSP1TBI catch (Exception) { } } +#if DEBUG [Ignore] +#endif [TestMethod] public void Staging__v2_49_3__MET08DDUPSP1TBI__MoveMatchingFiles() => _MET08DDUPSP1TBI.Staging__v2_49_3__MET08DDUPSP1TBI__MoveMatchingFiles(); +#if DEBUG [Ignore] +#endif [TestMethod] public void Staging__v2_49_3__MET08DDUPSP1TBI__MoveMatchingFiles637955319879801344__Normal() { @@ -49,19 +54,27 @@ public class MET08DDUPSP1TBI NonThrowTryCatch(); } +#if DEBUG [Ignore] +#endif [TestMethod] public void Staging__v2_49_3__MET08DDUPSP1TBI__OpenInsightMetrologyViewer() => _MET08DDUPSP1TBI.Staging__v2_49_3__MET08DDUPSP1TBI__OpenInsightMetrologyViewer(); +#if DEBUG [Ignore] +#endif [TestMethod] public void Staging__v2_49_3__MET08DDUPSP1TBI__IQSSi() => _MET08DDUPSP1TBI.Staging__v2_49_3__MET08DDUPSP1TBI__IQSSi(); +#if DEBUG [Ignore] +#endif [TestMethod] public void Staging__v2_49_3__MET08DDUPSP1TBI__OpenInsight() => _MET08DDUPSP1TBI.Staging__v2_49_3__MET08DDUPSP1TBI__OpenInsight(); +#if DEBUG [Ignore] +#endif [TestMethod] public void Staging__v2_49_3__MET08DDUPSP1TBI__OpenInsight638052814829645888__IqsSql() { @@ -75,37 +88,49 @@ public class MET08DDUPSP1TBI NonThrowTryCatch(); } +#if DEBUG [Ignore] +#endif [TestMethod] public void Staging__v2_49_3__MET08DDUPSP1TBI__OpenInsightMetrologyViewerAttachments() => _MET08DDUPSP1TBI.Staging__v2_49_3__MET08DDUPSP1TBI__OpenInsightMetrologyViewerAttachments(); +#if DEBUG [Ignore] +#endif [TestMethod] public void Staging__v2_49_3__MET08DDUPSP1TBI__APC() => _MET08DDUPSP1TBI.Staging__v2_49_3__MET08DDUPSP1TBI__APC(); +#if DEBUG [Ignore] +#endif [TestMethod] public void Staging__v2_49_3__MET08DDUPSP1TBI__SPaCe() => _MET08DDUPSP1TBI.Staging__v2_49_3__MET08DDUPSP1TBI__SPaCe(); +#if DEBUG [Ignore] +#endif [TestMethod] public void Staging__v2_49_3__MET08DDUPSP1TBI__Processed() => _MET08DDUPSP1TBI.Staging__v2_49_3__MET08DDUPSP1TBI__Processed(); +#if DEBUG [Ignore] +#endif [TestMethod] public void Staging__v2_49_3__MET08DDUPSP1TBI__Archive() => _MET08DDUPSP1TBI.Staging__v2_49_3__MET08DDUPSP1TBI__Archive(); +#if DEBUG [Ignore] +#endif [TestMethod] public void Staging__v2_49_3__MET08DDUPSP1TBI__Dummy() => _MET08DDUPSP1TBI.Staging__v2_49_3__MET08DDUPSP1TBI__Dummy(); -#if true +#if DEBUG [Ignore] #endif [TestMethod] public void Staging__v2_49_3__MET08DDUPSP1TBI__TIBCO() => _MET08DDUPSP1TBI.Staging__v2_49_3__MET08DDUPSP1TBI__TIBCO(); -#if true +#if DEBUG [Ignore] #endif [TestMethod] @@ -121,4 +146,5 @@ public class MET08DDUPSP1TBI NonThrowTryCatch(); } -} \ No newline at end of file +} +#endif \ No newline at end of file diff --git a/Adaptation/_Tests/Extract/Staging/v2.49.3/SP101-EQPT.cs b/Adaptation/_Tests/Extract/Staging/v2.49.3/SP101-EQPT.cs index 7cdade2..ef64c92 100644 --- a/Adaptation/_Tests/Extract/Staging/v2.49.3/SP101-EQPT.cs +++ b/Adaptation/_Tests/Extract/Staging/v2.49.3/SP101-EQPT.cs @@ -1,3 +1,4 @@ +#if v2_49_3 using Microsoft.VisualStudio.TestTools.UnitTesting; namespace Adaptation._Tests.Extract.Staging.v2_49_3; @@ -18,10 +19,11 @@ public class SP101_EQPT _SP101_EQPT = CreateSelfDescription.Staging.v2_49_3.SP101_EQPT.EAFLoggingUnitTesting; } -#if true +#if DEBUG [Ignore] #endif [TestMethod] public void Staging__v2_49_3__SP101_EQPT__MoveAllFiles() => _SP101_EQPT.Staging__v2_49_3__SP101_EQPT__MoveAllFiles(); -} \ No newline at end of file +} +#endif \ No newline at end of file diff --git a/Adaptation/_Tests/Extract/Staging/v2.49.3/SP101.cs b/Adaptation/_Tests/Extract/Staging/v2.49.3/SP101.cs index 9fdbeae..f5cd3d0 100644 --- a/Adaptation/_Tests/Extract/Staging/v2.49.3/SP101.cs +++ b/Adaptation/_Tests/Extract/Staging/v2.49.3/SP101.cs @@ -1,3 +1,4 @@ +#if v2_49_3 using Adaptation.Shared; using Adaptation.Shared.Methods; using Microsoft.VisualStudio.TestTools.UnitTesting; @@ -30,11 +31,15 @@ public class SP101 catch (Exception) { } } +#if DEBUG [Ignore] +#endif [TestMethod] public void Staging__v2_49_3__SP101__txt() => _SP101.Staging__v2_49_3__SP101__txt(); +#if DEBUG [Ignore] +#endif [TestMethod] public void Staging__v2_49_3__SP101__txt637955319879801344__Normal() { @@ -49,4 +54,5 @@ public class SP101 NonThrowTryCatch(); } -} \ No newline at end of file +} +#endif \ No newline at end of file diff --git a/Adaptation/_Tests/Extract/Staging/v2.52.0/MET08DDUPSP1TBI.cs b/Adaptation/_Tests/Extract/Staging/v2.52.0/MET08DDUPSP1TBI.cs index b3dca7f..fff93d7 100644 --- a/Adaptation/_Tests/Extract/Staging/v2.52.0/MET08DDUPSP1TBI.cs +++ b/Adaptation/_Tests/Extract/Staging/v2.52.0/MET08DDUPSP1TBI.cs @@ -1,3 +1,4 @@ +#if v2_52_0 using Adaptation.Shared; using Adaptation.Shared.Methods; using Microsoft.VisualStudio.TestTools.UnitTesting; @@ -123,13 +124,13 @@ public class MET08DDUPSP1TBI [TestMethod] public void Staging__v2_52_0__MET08DDUPSP1TBI__Dummy() => _MET08DDUPSP1TBI.Staging__v2_52_0__MET08DDUPSP1TBI__Dummy(); -#if true +#if DEBUG [Ignore] #endif [TestMethod] public void Staging__v2_52_0__MET08DDUPSP1TBI__TIBCO() => _MET08DDUPSP1TBI.Staging__v2_52_0__MET08DDUPSP1TBI__TIBCO(); -#if true +#if DEBUG [Ignore] #endif [TestMethod] @@ -145,4 +146,5 @@ public class MET08DDUPSP1TBI NonThrowTryCatch(); } -} \ No newline at end of file +} +#endif \ No newline at end of file diff --git a/Adaptation/_Tests/Extract/Staging/v2.52.0/SP101-EQPT.cs b/Adaptation/_Tests/Extract/Staging/v2.52.0/SP101-EQPT.cs index cee9c9b..6c14247 100644 --- a/Adaptation/_Tests/Extract/Staging/v2.52.0/SP101-EQPT.cs +++ b/Adaptation/_Tests/Extract/Staging/v2.52.0/SP101-EQPT.cs @@ -1,3 +1,4 @@ +#if v2_52_0 using Microsoft.VisualStudio.TestTools.UnitTesting; namespace Adaptation._Tests.Extract.Staging.v2_52_0; @@ -18,10 +19,11 @@ public class SP101_EQPT _SP101_EQPT = CreateSelfDescription.Staging.v2_52_0.SP101_EQPT.EAFLoggingUnitTesting; } -#if true +#if DEBUG [Ignore] #endif [TestMethod] public void Staging__v2_52_0__SP101_EQPT__MoveAllFiles() => _SP101_EQPT.Staging__v2_52_0__SP101_EQPT__MoveAllFiles(); -} \ No newline at end of file +} +#endif \ No newline at end of file diff --git a/Adaptation/_Tests/Extract/Staging/v2.52.0/SP101.cs b/Adaptation/_Tests/Extract/Staging/v2.52.0/SP101.cs index c6da0d6..7f022d8 100644 --- a/Adaptation/_Tests/Extract/Staging/v2.52.0/SP101.cs +++ b/Adaptation/_Tests/Extract/Staging/v2.52.0/SP101.cs @@ -1,3 +1,4 @@ +#if v2_52_0 using Adaptation.Shared; using Adaptation.Shared.Methods; using Microsoft.VisualStudio.TestTools.UnitTesting; @@ -53,4 +54,5 @@ public class SP101 NonThrowTryCatch(); } -} \ No newline at end of file +} +#endif \ No newline at end of file diff --git a/Adaptation/_Tests/Extract/Staging/v2.56.0/MET08DDUPSP1TBI.cs b/Adaptation/_Tests/Extract/Staging/v2.56.0/MET08DDUPSP1TBI.cs new file mode 100644 index 0000000..b90c2e1 --- /dev/null +++ b/Adaptation/_Tests/Extract/Staging/v2.56.0/MET08DDUPSP1TBI.cs @@ -0,0 +1,148 @@ +#if true +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_56_0; + +[TestClass] +public class MET08DDUPSP1TBI +{ + +#pragma warning disable CA2254 +#pragma warning disable IDE0060 + + private static CreateSelfDescription.Staging.v2_56_0.MET08DDUPSP1TBI _MET08DDUPSP1TBI; + + [ClassInitialize] + public static void ClassInitialize(TestContext testContext) + { + CreateSelfDescription.Staging.v2_56_0.MET08DDUPSP1TBI.ClassInitialize(testContext); + _MET08DDUPSP1TBI = CreateSelfDescription.Staging.v2_56_0.MET08DDUPSP1TBI.EAFLoggingUnitTesting; + } + + private static void NonThrowTryCatch() + { + try + { throw new Exception(); } + catch (Exception) { } + } + +#if DEBUG + [Ignore] +#endif + [TestMethod] + public void Staging__v2_56_0__MET08DDUPSP1TBI__MoveMatchingFiles() => _MET08DDUPSP1TBI.Staging__v2_56_0__MET08DDUPSP1TBI__MoveMatchingFiles(); + +#if DEBUG + [Ignore] +#endif + [TestMethod] + public void Staging__v2_56_0__MET08DDUPSP1TBI__MoveMatchingFiles637955319879801344__Normal() + { + string check = "*.pdsf"; + bool validatePDSF = false; + MethodBase methodBase = new StackFrame().GetMethod(); + _MET08DDUPSP1TBI.Staging__v2_56_0__MET08DDUPSP1TBI__MoveMatchingFiles(); + string[] variables = _MET08DDUPSP1TBI.AdaptationTesting.GetVariables(methodBase, check, validatePDSF); + IFileRead fileRead = _MET08DDUPSP1TBI.AdaptationTesting.Get(methodBase, sourceFileLocation: variables[2], sourceFileFilter: variables[3], useCyclicalForDescription: false); + Logistics logistics = new(fileRead); + _ = Shared.AdaptationTesting.ReExtractCompareUpdatePassDirectory(variables, fileRead, logistics, validatePDSF); + NonThrowTryCatch(); + } + +#if DEBUG + [Ignore] +#endif + [TestMethod] + public void Staging__v2_56_0__MET08DDUPSP1TBI__OpenInsightMetrologyViewer() => _MET08DDUPSP1TBI.Staging__v2_56_0__MET08DDUPSP1TBI__OpenInsightMetrologyViewer(); + +#if DEBUG + [Ignore] +#endif + [TestMethod] + public void Staging__v2_56_0__MET08DDUPSP1TBI__IQSSi() => _MET08DDUPSP1TBI.Staging__v2_56_0__MET08DDUPSP1TBI__IQSSi(); + +#if DEBUG + [Ignore] +#endif + [TestMethod] + public void Staging__v2_56_0__MET08DDUPSP1TBI__OpenInsight() => _MET08DDUPSP1TBI.Staging__v2_56_0__MET08DDUPSP1TBI__OpenInsight(); + +#if DEBUG + [Ignore] +#endif + [TestMethod] + public void Staging__v2_56_0__MET08DDUPSP1TBI__OpenInsight638052814829645888__IqsSql() + { + string check = "*.pdsf"; + MethodBase methodBase = new StackFrame().GetMethod(); + _MET08DDUPSP1TBI.Staging__v2_56_0__MET08DDUPSP1TBI__OpenInsight(); + string[] variables = _MET08DDUPSP1TBI.AdaptationTesting.GetVariables(methodBase, check, validatePDSF: false); + IFileRead fileRead = _MET08DDUPSP1TBI.AdaptationTesting.Get(methodBase, sourceFileLocation: variables[2], sourceFileFilter: variables[3], useCyclicalForDescription: false); + Logistics logistics = new(fileRead); + _ = Shared.AdaptationTesting.ReExtractCompareUpdatePassDirectory(variables, fileRead, logistics); + NonThrowTryCatch(); + } + +#if DEBUG + [Ignore] +#endif + [TestMethod] + public void Staging__v2_56_0__MET08DDUPSP1TBI__OpenInsightMetrologyViewerAttachments() => _MET08DDUPSP1TBI.Staging__v2_56_0__MET08DDUPSP1TBI__OpenInsightMetrologyViewerAttachments(); + +#if DEBUG + [Ignore] +#endif + [TestMethod] + public void Staging__v2_56_0__MET08DDUPSP1TBI__APC() => _MET08DDUPSP1TBI.Staging__v2_56_0__MET08DDUPSP1TBI__APC(); + +#if DEBUG + [Ignore] +#endif + [TestMethod] + public void Staging__v2_56_0__MET08DDUPSP1TBI__SPaCe() => _MET08DDUPSP1TBI.Staging__v2_56_0__MET08DDUPSP1TBI__SPaCe(); + +#if DEBUG + [Ignore] +#endif + [TestMethod] + public void Staging__v2_56_0__MET08DDUPSP1TBI__Processed() => _MET08DDUPSP1TBI.Staging__v2_56_0__MET08DDUPSP1TBI__Processed(); + +#if DEBUG + [Ignore] +#endif + [TestMethod] + public void Staging__v2_56_0__MET08DDUPSP1TBI__Archive() => _MET08DDUPSP1TBI.Staging__v2_56_0__MET08DDUPSP1TBI__Archive(); + +#if DEBUG + [Ignore] +#endif + [TestMethod] + public void Staging__v2_56_0__MET08DDUPSP1TBI__Dummy() => _MET08DDUPSP1TBI.Staging__v2_56_0__MET08DDUPSP1TBI__Dummy(); + +#if DEBUG + [Ignore] +#endif + [TestMethod] + public void Staging__v2_56_0__MET08DDUPSP1TBI__TIBCO() => _MET08DDUPSP1TBI.Staging__v2_56_0__MET08DDUPSP1TBI__TIBCO(); + + [Ignore] + [TestMethod] + public void Staging__v2_56_0__MET08DDUPSP1TBI__TIBCO638217888620242702__Normal() + { + string check = "*.idc"; + MethodBase methodBase = new StackFrame().GetMethod(); + _MET08DDUPSP1TBI.Staging__v2_56_0__MET08DDUPSP1TBI__TIBCO(); + string[] variables = _MET08DDUPSP1TBI.AdaptationTesting.GetVariables(methodBase, check, validatePDSF: false); + _ = _MET08DDUPSP1TBI.AdaptationTesting.Get(methodBase, sourceFileLocation: variables[2], sourceFileFilter: variables[3], useCyclicalForDescription: false); + for (int i = 0; i < int.MaxValue; i++) + System.Threading.Thread.Sleep(500); + NonThrowTryCatch(); + } + +} +#endif \ No newline at end of file diff --git a/Adaptation/_Tests/Extract/Staging/v2.56.0/SP101-EQPT.cs b/Adaptation/_Tests/Extract/Staging/v2.56.0/SP101-EQPT.cs new file mode 100644 index 0000000..6a4fa0f --- /dev/null +++ b/Adaptation/_Tests/Extract/Staging/v2.56.0/SP101-EQPT.cs @@ -0,0 +1,27 @@ +#if true +using Microsoft.VisualStudio.TestTools.UnitTesting; + +namespace Adaptation._Tests.Extract.Staging.v2_56_0; + +[TestClass] +public class SP101_EQPT +{ + +#pragma warning disable CA2254 +#pragma warning disable IDE0060 + + private static CreateSelfDescription.Staging.v2_56_0.SP101_EQPT _SP101_EQPT; + + [ClassInitialize] + public static void ClassInitialize(TestContext testContext) + { + CreateSelfDescription.Staging.v2_56_0.SP101_EQPT.ClassInitialize(testContext); + _SP101_EQPT = CreateSelfDescription.Staging.v2_56_0.SP101_EQPT.EAFLoggingUnitTesting; + } + + [Ignore] + [TestMethod] + public void Staging__v2_56_0__SP101_EQPT__MoveAllFiles() => _SP101_EQPT.Staging__v2_56_0__SP101_EQPT__MoveAllFiles(); + +} +#endif \ No newline at end of file diff --git a/Adaptation/_Tests/Extract/Staging/v2.56.0/SP101.cs b/Adaptation/_Tests/Extract/Staging/v2.56.0/SP101.cs new file mode 100644 index 0000000..8eddbb4 --- /dev/null +++ b/Adaptation/_Tests/Extract/Staging/v2.56.0/SP101.cs @@ -0,0 +1,58 @@ +#if true +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_56_0; + +[TestClass] +public class SP101 +{ + +#pragma warning disable CA2254 +#pragma warning disable IDE0060 + + private static CreateSelfDescription.Staging.v2_56_0.SP101 _SP101; + + [ClassInitialize] + public static void ClassInitialize(TestContext testContext) + { + CreateSelfDescription.Staging.v2_56_0.SP101.ClassInitialize(testContext); + _SP101 = CreateSelfDescription.Staging.v2_56_0.SP101.EAFLoggingUnitTesting; + } + + private static void NonThrowTryCatch() + { + try + { throw new Exception(); } + catch (Exception) { } + } + +#if DEBUG + [Ignore] +#endif + [TestMethod] + public void Staging__v2_56_0__SP101__txt() => _SP101.Staging__v2_56_0__SP101__txt(); + +#if DEBUG + [Ignore] +#endif + [TestMethod] + public void Staging__v2_56_0__SP101__txt637955319879801344__Normal() + { + string check = "*.txt"; + bool validatePDSF = false; + _SP101.Staging__v2_56_0__SP101__txt(); + MethodBase methodBase = new StackFrame().GetMethod(); + string[] variables = _SP101.AdaptationTesting.GetVariables(methodBase, check, validatePDSF); + IFileRead fileRead = _SP101.AdaptationTesting.Get(methodBase, sourceFileLocation: variables[2], sourceFileFilter: variables[3], useCyclicalForDescription: false); + Logistics logistics = new(fileRead); + _ = Shared.AdaptationTesting.ReExtractCompareUpdatePassDirectory(variables, fileRead, logistics, validatePDSF); + NonThrowTryCatch(); + } + +} +#endif \ No newline at end of file diff --git a/Adaptation/_Tests/Shared/AdaptationTesting.cs b/Adaptation/_Tests/Shared/AdaptationTesting.cs index dea1507..dad8ffe 100644 --- a/Adaptation/_Tests/Shared/AdaptationTesting.cs +++ b/Adaptation/_Tests/Shared/AdaptationTesting.cs @@ -97,9 +97,9 @@ public class AdaptationTesting : ISMTP result = environment switch { "LocalHost" => "localhost:9003", - "Development" => "eaf-dev.mesfs.infineon.com:9003", - "Staging" => "eaf-staging.mesfs.infineon.com:9003", - "Production" => "eaf-prod.mesfs.infineon.com:9003", + "Development" => "eaf-dev.mes.infineon.com:9003", + "Staging" => "eaf-staging.mes.infineon.com:9003", + "Production" => "eaf-prod.mes.infineon.com:9003", _ => throw new Exception(), }; return result; @@ -562,7 +562,7 @@ public class AdaptationTesting : ISMTP else if (i == 1) { if (componentsCellComponentCellComponent.Equipment.EquipmentType.Version != cellInstanceVersionName) - throw new Exception("Versions should match!"); + throw new Exception($"Versions should match! {componentsCellComponentCellComponent.Equipment.EquipmentType.Version} != {cellInstanceVersionName}"); equipmentTypeName = componentsCellComponentCellComponent.Equipment.EquipmentType.Name; _ = stringBuilder. AppendLine("#if true"). @@ -1244,6 +1244,8 @@ public class AdaptationTesting : ISMTP { string result; Tuple> extractResult = fileRead.ReExtract(); + if (extractResult is null) + throw new Exception($"Using pattern {variables[4]} no file was found <{variables[2]}>"); if (!fileRead.IsDuplicator) { Assert.IsFalse(string.IsNullOrEmpty(extractResult?.Item1)); diff --git a/Adaptation/_Tests/Static/Job.cs b/Adaptation/_Tests/Static/Job.cs index b66365c..15cef52 100644 --- a/Adaptation/_Tests/Static/Job.cs +++ b/Adaptation/_Tests/Static/Job.cs @@ -43,18 +43,16 @@ public class Job : LoggingUnitTesting, IDisposable catch (Exception) { } } -#if true [Ignore] -#endif [TestMethod] public void TestJobA() { FileHandlers.TIBCO.Transport.Job job; MethodBase methodBase = new StackFrame().GetMethod(); - string barcodeHostFileShare = @"\\mesfs.infineon.com\EC_Metrology_Si\BarcodeHost\API"; - string metrologyFileShare = @"\\mesfs.infineon.com\EC_Metrology_Si\WorkMaterialOut\API"; + string metrologyFileShare = FileHandlers.TIBCO.FileRead.MetrologyFileShare; + string barcodeHostFileShare = FileHandlers.TIBCO.FileRead.BarcodeHostFileShare; + string lsl2SQLConnectionString = FileHandlers.TIBCO.FileRead.LSL2SQLConnectionString; LoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration")); - string lsl2SQLConnectionString = "Data Source=messqlec1.infineon.com\\PROD1,53959;Initial Catalog=LSL2SQL;Persist Security Info=True;User ID=srpadmin;Password=0okm9ijn;"; job = new(lsl2SQLConnectionString, metrologyFileShare, barcodeHostFileShare, "{\"Area\": \"Si\", \"EquipmentType\": \"MET08RESIMAPCDE\", \"MesEntity\": \"CDE4\", \"Sequence\": \"123456789\", \"MID\": \"12-123456-1234\", \"Recipe\": \"Recipe\"}"); Assert.IsTrue(!string.IsNullOrEmpty(job.ProcessType)); // == "21"); Assert.IsTrue(job.LotName == "123456"); @@ -67,7 +65,7 @@ public class Job : LoggingUnitTesting, IDisposable Assert.IsTrue(!string.IsNullOrEmpty(job.ProcessType)); // == "51"); Assert.IsTrue(job.LotName == "544481"); Assert.IsTrue(!string.IsNullOrEmpty(job.ProductName)); // == "5158"); - job = new(lsl2SQLConnectionString, metrologyFileShare, barcodeHostFileShare, "{\"Area\": \"Si\", \"EquipmentType\": \"MET08RESIMAPCDE\", \"MesEntity\": \"CDE4\", \"Sequence\": \"123456789\", \"MID\": \"37\", \"Recipe\": \"Recipe\"}"); + job = new(lsl2SQLConnectionString, metrologyFileShare, barcodeHostFileShare, "{\"Area\": \"Si\", \"EquipmentType\": \"MET08THFTIRQS408M\", \"MesEntity\": \"BIORAD2\", \"Sequence\": \"123456789\", \"MID\": \"37--\", \"Recipe\": \"Recipe\"}"); Assert.IsTrue(job.ProcessType == "37"); Assert.IsTrue(!string.IsNullOrEmpty(job.LotName)); // == "549918"); Assert.IsTrue(!string.IsNullOrEmpty(job.ProductName)); // == "5101"); @@ -84,18 +82,16 @@ public class Job : LoggingUnitTesting, IDisposable NonThrowTryCatch(); } -#if true [Ignore] -#endif [TestMethod] public void TestJobB() { - MethodBase methodBase = new StackFrame().GetMethod(); FileHandlers.TIBCO.Transport.Job job; - string barcodeHostFileShare = @"\\mesfs.infineon.com\EC_Metrology_Si\BarcodeHost\API"; - string metrologyFileShare = @"\\mesfs.infineon.com\EC_Metrology_Si\WorkMaterialOut\API"; + MethodBase methodBase = new StackFrame().GetMethod(); + string metrologyFileShare = FileHandlers.TIBCO.FileRead.MetrologyFileShare; + string barcodeHostFileShare = FileHandlers.TIBCO.FileRead.BarcodeHostFileShare; + string lsl2SQLConnectionString = FileHandlers.TIBCO.FileRead.LSL2SQLConnectionString; LoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration")); - string lsl2SQLConnectionString = "Data Source=messqlec1.infineon.com\\PROD1,53959;Initial Catalog=LSL2SQL;Persist Security Info=True;User ID=srpadmin;Password=0okm9ijn;"; job = new(lsl2SQLConnectionString, metrologyFileShare, barcodeHostFileShare, "{\"Area\": \"Si\", \"EquipmentType\": \"MET08RESIMAPCDE\", \"MesEntity\": \"CDE4\", \"Sequence\": \"123456789\", \"MID\": \"P1234\", \"Recipe\": \"Recipe\"}"); Assert.IsTrue(!string.IsNullOrEmpty(job.ProcessType)); Assert.IsTrue(!string.IsNullOrEmpty(job.LotName)); @@ -104,18 +100,16 @@ public class Job : LoggingUnitTesting, IDisposable NonThrowTryCatch(); } -#if true [Ignore] -#endif [TestMethod] public void TestJobC() { - MethodBase methodBase = new StackFrame().GetMethod(); FileHandlers.TIBCO.Transport.Job job; - string barcodeHostFileShare = @"\\mesfs.infineon.com\EC_Metrology_Si\BarcodeHost\API"; - string metrologyFileShare = @"\\mesfs.infineon.com\EC_Metrology_Si\WorkMaterialOut\API"; + MethodBase methodBase = new StackFrame().GetMethod(); + string metrologyFileShare = FileHandlers.TIBCO.FileRead.MetrologyFileShare; + string barcodeHostFileShare = FileHandlers.TIBCO.FileRead.BarcodeHostFileShare; + string lsl2SQLConnectionString = FileHandlers.TIBCO.FileRead.LSL2SQLConnectionString; LoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration")); - string lsl2SQLConnectionString = "Data Source=messqlec1.infineon.com\\PROD1,53959;Initial Catalog=LSL2SQL;Persist Security Info=True;User ID=srpadmin;Password=0okm9ijn;"; job = new(lsl2SQLConnectionString, metrologyFileShare, barcodeHostFileShare, "{\"Area\": \"Si\", \"EquipmentType\": \"MET08RESIMAPCDE\", \"MesEntity\": \"BIORAD3\", \"Sequence\": \"638234699589174855\", \"MID\": \"33--\", \"Recipe\": \"Recipe\"}"); Assert.IsTrue(!string.IsNullOrEmpty(job.ProcessType)); Assert.IsTrue(!string.IsNullOrEmpty(job.LotName)); diff --git a/Adaptation/_Tests/Static/MET08DDUPSP1TBI.cs b/Adaptation/_Tests/Static/MET08DDUPSP1TBI.cs index 5080302..4490519 100644 --- a/Adaptation/_Tests/Static/MET08DDUPSP1TBI.cs +++ b/Adaptation/_Tests/Static/MET08DDUPSP1TBI.cs @@ -64,7 +64,7 @@ public class MET08DDUPSP1TBI : LoggingUnitTesting, IDisposable StringBuilder results = new(); (string cellInstanceName, string cellInstanceVersionName)[] collection = new (string, string)[] { - new("MET08DDUPSP1TBI", "v2.52.0"), + new("MET08DDUPSP1TBI", "v2.56.0"), }; string staging = "http://mestsa07ec.infineon.com: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 c11f1fb..8458322 100644 --- a/Adaptation/_Tests/Static/txt.cs +++ b/Adaptation/_Tests/Static/txt.cs @@ -210,8 +210,8 @@ public class TXT : LoggingUnitTesting, IDisposable StringBuilder results = new(); (string cellInstanceName, string cellInstanceVersionName)[] collection = new (string, string)[] { - new("SP101", "v2.52.0"), - new("SP101-EQPT", "v2.52.0"), + new("SP101", "v2.56.0"), + new("SP101-EQPT", "v2.56.0"), }; string staging = "http://mestsa07ec.infineon.com:9003/CellInstanceServiceV2"; Shared.PasteSpecialXml.EAF.XML.API.CellInstance.CellInstanceVersion cellInstanceVersion; diff --git a/MET08DDUPSP1TBI.csproj b/MET08DDUPSP1TBI.csproj index 89c50ed..0f05104 100644 --- a/MET08DDUPSP1TBI.csproj +++ b/MET08DDUPSP1TBI.csproj @@ -51,6 +51,9 @@ NETFRAMEWORK;NET20;NET35;NET40;NET45;NET451;NET452;NET46;NET461;NET462;NET47;NET471;NET472;NET48;$(DefineConstants) + + + @@ -115,6 +118,8 @@ + + @@ -122,6 +127,7 @@ + @@ -178,7 +184,7 @@ 7.2.4630.5 - 2.52.0 + 2.56.0 1.1.1