diff --git a/.gitignore b/.gitignore index e85055c..dce63ed 100644 --- a/.gitignore +++ b/.gitignore @@ -337,5 +337,8 @@ ASALocalRun/ !**/.vscode/launch.json !**/.vscode/settings.json !**/.vscode/tasks.json +!**/.vscode/mklink.md *.lnk + +.kanbn diff --git a/.vscode/mklink.md b/.vscode/mklink.md new file mode 100644 index 0000000..373cccc --- /dev/null +++ b/.vscode/mklink.md @@ -0,0 +1,11 @@ +--- +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/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..71cf24f --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,55 @@ +{ + "files.eol": "\n", + "[markdown]": { + "editor.wordWrap": "off" + }, + "cSpell.words": [ + "PDSF", + "Syncthing" + ], + "files.exclude": { + "**/node_modules": true + }, + "files.watcherExclude": { + "**/node_modules": true + }, + "foam.files.ignore": [ + ".foam/**/*", + ".stfolder/**/*", + "**/_layouts/**/*", + "**/_site/**/*", + "**/.vscode/**/*", + "**/node_modules/**/*" + ], + "kanbn.showBurndownButton": false, + "kanbn.showSprintButton": false, + "foam.links.hover.enable": false, + "foam.placeholders.exclude": [ + ".kanbn/Archive/**/*" + ], + "foam.orphans.exclude": [ + ".journal/**/*" + ], + "foam.graph.style": { + "background": "#202020", + "node": { + "wired": "green", + "wireless": "orange", + "person": "white", + "topic": "#bc2a3c", + "kanbn": "#ff7b00", + "basic-note": "#773b93", + "daily-note": "#ff9d00", + "note": "#f2cb1d", + "placeholder": "#ff9d00", + "tag": "#0494c1", + "bug": "#bc2a3c", + "epic": "#ff7b00", + "feature": "#773b93", + "issue": "#ff9d00", + "task": "#f2cb1d", + "test-case": "#ff9d00", + "user-story": "#0494c1" + } + } +} \ No newline at end of file diff --git a/Adaptation/.editorconfig b/Adaptation/.editorconfig index b45701e..bd60911 100644 --- a/Adaptation/.editorconfig +++ b/Adaptation/.editorconfig @@ -1,3 +1,19 @@ +[*.md] +end_of_line = crlf +file_header_template = unset +indent_size = 2 +indent_style = space +insert_final_newline = false +root = true +tab_width = 2 +[*.csproj] +end_of_line = crlf +file_header_template = unset +indent_size = 2 +indent_style = space +insert_final_newline = false +root = true +tab_width = 2 [*.cs] csharp_indent_block_contents = true csharp_indent_braces = false @@ -82,13 +98,29 @@ dotnet_diagnostic.CA1829.severity = warning # CA1829: Use Length/Count property dotnet_diagnostic.CA1834.severity = warning # CA1834: Consider using 'StringBuilder.Append(char)' when applicable 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.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 +dotnet_diagnostic.CA1869.severity = none # CA1869: Avoid creating a new 'JsonSerializerOptions' instance for every serialization operation. Cache and reuse instances instead. +dotnet_diagnostic.CA2254.severity = none # CA2254: The logging message template should not vary between calls to 'LoggerExtensions.LogInformation(ILogger, string?, params object?[])' dotnet_diagnostic.IDE0001.severity = warning # IDE0001: Simplify name dotnet_diagnostic.IDE0002.severity = warning # Simplify (member access) - System.Version.Equals("1", "2"); Version.Equals("1", "2"); dotnet_diagnostic.IDE0004.severity = warning # IDE0004: Cast is redundant. dotnet_diagnostic.IDE0005.severity = warning # Using directive is unnecessary +dotnet_diagnostic.IDE0028.severity = none # IDE0028: Collection initialization can be simplified +dotnet_diagnostic.IDE0031.severity = warning # Use null propagation (IDE0031) dotnet_diagnostic.IDE0047.severity = warning # IDE0047: Parentheses can be removed dotnet_diagnostic.IDE0049.severity = warning # Use language keywords instead of framework type names for type references (IDE0049) dotnet_diagnostic.IDE0060.severity = warning # IDE0060: Remove unused parameter +dotnet_diagnostic.IDE0200.severity = warning # IDE0200: Lambda expression can be removed +dotnet_diagnostic.IDE0270.severity = none # IDE0270: Null check can be simplified +dotnet_diagnostic.IDE0290.severity = none # Use primary constructor [Distance]csharp(IDE0290) +dotnet_diagnostic.IDE0300.severity = none # IDE0300: Collection initialization can be simplified +dotnet_diagnostic.IDE0301.severity = none #IDE0301: Collection initialization can be simplified +dotnet_diagnostic.IDE0305.severity = none # IDE0305: Collection initialization can be simplified +dotnet_diagnostic.SYSLIB1045.severity = none # SYSLIB1045: diagnostics for regex source generation dotnet_naming_rule.abstract_method_should_be_pascal_case.severity = warning dotnet_naming_rule.abstract_method_should_be_pascal_case.style = pascal_case dotnet_naming_rule.abstract_method_should_be_pascal_case.symbols = abstract_method diff --git a/Adaptation/.kanbn/index.md b/Adaptation/.kanbn/index.md index 9c29fec..dfef0a6 100644 --- a/Adaptation/.kanbn/index.md +++ b/Adaptation/.kanbn/index.md @@ -1,7 +1,5 @@ --- type: kanbn -created: 2023-07-07T15:37:56.040Z -updated: 2023-07-18T19:52:59.668Z startedColumns: - 'In Progress' completedColumns: diff --git a/Adaptation/.kanbn/tasks/public-const-to-eaf.md b/Adaptation/.kanbn/tasks/public-const-to-eaf.md index 23abe14..f215f6f 100644 --- a/Adaptation/.kanbn/tasks/public-const-to-eaf.md +++ b/Adaptation/.kanbn/tasks/public-const-to-eaf.md @@ -1,9 +1,7 @@ --- -created: 2023-08-02T14:35:58.342Z -updated: 2023-08-02T14:35:58.333Z assigned: "" progress: 0 -tags: [] +type: "note" --- # public const to EAF diff --git a/Adaptation/.vscode/settings.json b/Adaptation/.vscode/settings.json index d5513a1..860ecfe 100644 --- a/Adaptation/.vscode/settings.json +++ b/Adaptation/.vscode/settings.json @@ -3,6 +3,7 @@ "editor.wordWrap": "off" }, "cSpell.words": [ + "BIORAD", "CASS", "CUST", "DDUPSP", diff --git a/Adaptation/.vscode/tasks.json b/Adaptation/.vscode/tasks.json index 255de2b..64be28d 100644 --- a/Adaptation/.vscode/tasks.json +++ b/Adaptation/.vscode/tasks.json @@ -57,7 +57,7 @@ { "label": "File-Folder-Helper AOT s M .Kanbn Tasks", "type": "shell", - "command": "& L:/DevOps/Mesa_FI/File-Folder-Helper/bin/Release/net7.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/Archive/FileRead.cs b/Adaptation/FileHandlers/Archive/FileRead.cs index 3cc4d71..0e79541 100644 --- a/Adaptation/FileHandlers/Archive/FileRead.cs +++ b/Adaptation/FileHandlers/Archive/FileRead.cs @@ -128,7 +128,7 @@ public class FileRead : Shared.FileRead, IFileRead string jobIdDirectory = Path.Combine(_JobIdParentDirectory, _Logistics.JobID); if (!Directory.Exists(jobIdDirectory)) _ = Directory.CreateDirectory(jobIdDirectory); - if (!Directory.GetDirectories(jobIdDirectory).Any()) + if (Directory.GetDirectories(jobIdDirectory).Length == 0) File.Copy(reportFullPath, Path.Combine(destinationArchiveDirectory, Path.GetFileName(reportFullPath))); else { diff --git a/Adaptation/FileHandlers/Dummy/FileRead.cs b/Adaptation/FileHandlers/Dummy/FileRead.cs index 79eda27..916f5d7 100644 --- a/Adaptation/FileHandlers/Dummy/FileRead.cs +++ b/Adaptation/FileHandlers/Dummy/FileRead.cs @@ -157,7 +157,7 @@ public class FileRead : Shared.FileRead, IFileRead if (!Directory.Exists(inProcessDirectory)) _ = Directory.CreateDirectory(inProcessDirectory); files = Directory.GetFiles(inProcessDirectory, "*", SearchOption.AllDirectories); - if (files.Any()) + if (files.Length != 0) { if (files.Length > 250) throw new Exception("Safety net!"); diff --git a/Adaptation/FileHandlers/IQSSi/FileRead.cs b/Adaptation/FileHandlers/IQSSi/FileRead.cs index 48ad9fe..2b58a9a 100644 --- a/Adaptation/FileHandlers/IQSSi/FileRead.cs +++ b/Adaptation/FileHandlers/IQSSi/FileRead.cs @@ -111,7 +111,7 @@ public class FileRead : Shared.FileRead, IFileRead private void SaveIQSFile(string reportFullPath, DateTime dateTime, List descriptions, Test[] tests) { - if (!tests.Any()) + if (tests.Length == 0) _LastLines = string.Empty; else { diff --git a/Adaptation/FileHandlers/MoveAllFiles/ApiController/BarcodeController.cs b/Adaptation/FileHandlers/MoveAllFiles/ApiController/BarcodeController.cs deleted file mode 100644 index 3c60582..0000000 --- a/Adaptation/FileHandlers/MoveAllFiles/ApiController/BarcodeController.cs +++ /dev/null @@ -1,31 +0,0 @@ -#if NETFRAMEWORK && NET48 -using System.Web.Http; -using System.Web.Http.Results; - -namespace Adaptation.FileHandlers.MoveAllFiles.ApiController; - -[Route("api/[controller]")] -public class BarcodeController : System.Web.Http.ApiController -{ - -#nullable enable - -#pragma warning disable CA1822 - public OkNegotiatedContentResult Get() -#pragma warning restore CA1822 - { - string result = "record"; - return Ok(result); - } - - [Route("{id}")] -#pragma warning disable CA1822 - public JsonResult Post(string id) -#pragma warning restore CA1822 - { - PostReplay? postReplay = BarcodeHelper.Post(id, Request.Content); - return Json(postReplay); - } - -} -#endif \ No newline at end of file diff --git a/Adaptation/FileHandlers/MoveAllFiles/ApiController/BarcodeHelper.cs b/Adaptation/FileHandlers/MoveAllFiles/ApiController/BarcodeHelper.cs deleted file mode 100644 index 19d904d..0000000 --- a/Adaptation/FileHandlers/MoveAllFiles/ApiController/BarcodeHelper.cs +++ /dev/null @@ -1,120 +0,0 @@ -using Adaptation.FileHandlers.MoveAllFiles.OpenInsight; -using Adaptation.FileHandlers.TIBCO.Transport; -using System; -using System.Collections.Generic; -using System.Globalization; -using System.IO; -using System.Net.Http; -using System.Text.Json; -using System.Threading.Tasks; - -namespace Adaptation.FileHandlers.MoveAllFiles.ApiController; - -public class BarcodeHelper -{ - -#nullable enable - - private static string? GetJson(HttpContent? httpContent) - { - string? result; - if (httpContent is null) - result = null; - else - { - Task task = httpContent.ReadAsStringAsync(); - task.Wait(); - result = task.Result; - } - return result; - } - - private static void Write(string barcodeHostFileShare, string cellInstanceConnectionName, Notification notification) - { - DateTime dateTime = DateTime.Now; - Calendar calendar = new CultureInfo("en-US").Calendar; - string weekOfYear = $"{dateTime:yyyy}_Week_{calendar.GetWeekOfYear(dateTime, CalendarWeekRule.FirstDay, DayOfWeek.Sunday):00}"; - string directory = Path.Combine(barcodeHostFileShare, weekOfYear, dateTime.ToString("yyyy-MM-dd_HH")); - if (!Directory.Exists(directory)) - _ = Directory.CreateDirectory(directory); - File.WriteAllText(Path.Combine(directory, $"{cellInstanceConnectionName}.csv"), notification.LastScanServiceResultValue); - } - - private static Job GetJob(string lsl2SQLConnectionString, string metrologyFileShare, string barcodeHostFileShare, string id, Notification notification) - { - Job result; - string lastScan = notification.LastScanServiceResultValue.Length < 3 || notification.LastScanServiceResultValue[1] is not 't' and not 'T' || notification.LastScanServiceResultValue[0] != '1' ? notification.LastScanServiceResultValue : notification.LastScanServiceResultValue.Substring(2); - string json = string.Concat("{\"Area\": \"Si\", \"EquipmentType\": \"MET08THFTIRQS408M\", \"MesEntity\": \"", id, "\", \"Sequence\": \"", notification.KeyPressEvent.DateTime.Ticks, "\", \"MID\": \"-", lastScan, "-\", \"Recipe\": \"Recipe\"}"); - result = new(lsl2SQLConnectionString, metrologyFileShare, barcodeHostFileShare, json); - return result; - } - - private static Root? GetRoot(string rds) - { - HttpClient httpClient = new(); - string url = $"{FileRead.OpenInsightApplicationProgrammingInterface}/materials/rds/{rds}"; - string httpClientResult = httpClient.GetStringAsync(url).Result; - Root? root = JsonSerializer.Deserialize(httpClientResult); - httpClient.Dispose(); - return root; - } - - private static void SetQaMetTests(string toolClass, Root root, Dictionary> qaMetTests) - { - List? collection; - foreach (PrsStage prsStage in root.Rds.ProdSpec.PrsStages) - { - if (prsStage.QaMetTests is null) - continue; - foreach (QaMetTest qaMetTest in prsStage.QaMetTests) - { - if (qaMetTest.ToolClass != toolClass) - continue; - if (!qaMetTests.TryGetValue(prsStage.Stage, out collection)) - { - qaMetTests.Add(prsStage.Stage, new()); - if (!qaMetTests.TryGetValue(prsStage.Stage, out collection)) - throw new Exception(); - } - collection.Add(qaMetTest); - } - } - } - - internal static PostReplay? Post(string id, HttpContent? httpContent) - { - PostReplay? result; - string? json = GetJson(httpContent); - if (json is null) - result = null; - else - { - Notification? notification = JsonSerializer.Deserialize(json); - if (notification is null) - result = null; - else - { - Job? job; - string? mid; - Dictionary> qaMetTests = new(); - Write(TIBCO.FileRead.BarcodeHostFileShare, id, notification.Value); - try - { - const string hyphen = "-"; - job = GetJob(TIBCO.FileRead.LSL2SQLConnectionString, TIBCO.FileRead.MetrologyFileShare, TIBCO.FileRead.BarcodeHostFileShare, id, notification.Value); - mid = job.SpecName == hyphen || job.ProcessSpecName == hyphen ? $"{job.ProcessType}" : $"{job.ProcessType}.{job.SpecName}.{job.ProcessSpecName}"; - Root? root = GetRoot(job.LotName); - if (root is not null) - SetQaMetTests(notification.Value.ToolClass, root, qaMetTests); - } - catch (Exception ex) - { - mid = string.Concat(ex.Message, Environment.NewLine, ex.StackTrace); - } - result = new(mid, qaMetTests); // .ProdSpec.PrsStages[0].QaMetTests[0].Recipe); - } - } - return result; - } - -} \ No newline at end of file diff --git a/Adaptation/FileHandlers/MoveAllFiles/ApiController/EventCode.cs b/Adaptation/FileHandlers/MoveAllFiles/ApiController/EventCode.cs deleted file mode 100644 index 01c679d..0000000 --- a/Adaptation/FileHandlers/MoveAllFiles/ApiController/EventCode.cs +++ /dev/null @@ -1,277 +0,0 @@ -namespace Adaptation.FileHandlers.MoveAllFiles.ApiController; - -/// -/// Mapping for this can be found here: https://github.com/torvalds/linux/blob/master/include/uapi/linux/input-event-codes.h -/// -public enum EventCode -{ - Reserved = 0, - Esc = 1, - Num1 = 2, - Num2 = 3, - Num3 = 4, - Num4 = 5, - Num5 = 6, - Num6 = 7, - Num7 = 8, - Num8 = 9, - Num9 = 10, - Num0 = 11, - Minus = 12, - Equal = 13, - Backspace = 14, - Tab = 15, - Q = 16, - W = 17, - E = 18, - R = 19, - T = 20, - Y = 21, - U = 22, - I = 23, - O = 24, - P = 25, - LeftBrace = 26, - RightBrace = 27, - Enter = 28, - LeftCtrl = 29, - A = 30, - S = 31, - D = 32, - F = 33, - G = 34, - H = 35, - J = 36, - K = 37, - L = 38, - Semicolon = 39, - Apostrophe = 40, - Grave = 41, - LeftShift = 42, - Backslash = 43, - Z = 44, - X = 45, - C = 46, - V = 47, - B = 48, - N = 49, - M = 50, - Comma = 51, - Dot = 52, - Slash = 53, - RightShift = 54, - KpAsterisk = 55, - LeftAlt = 56, - Space = 57, - Capslock = 58, - F1 = 59, - Pf2 = 60, - F3 = 61, - F4 = 62, - F5 = 63, - F6 = 64, - F7 = 65, - F8 = 66, - Pf9 = 67, - F10 = 68, - Numlock = 69, - ScrollLock = 70, - Kp7 = 71, - Kp8 = 72, - Kp9 = 73, - PkpMinus = 74, - Kp4 = 75, - Kp5 = 76, - Kp6 = 77, - KpPlus = 78, - Kp1 = 79, - Kp2 = 80, - Kp3 = 81, - Kp0 = 82, - KpDot = 83, - - Zenkakuhankaku = 85, - //102ND = 86, - F11 = 87, - F12 = 88, - Ro = 89, - Katakana = 90, - Hiragana = 91, - Henkan = 92, - Katakanahiragana = 93, - Muhenkan = 94, - KpJpComma = 95, - KpEnter = 96, - RightCtrl = 97, - KpSlash = 98, - SysRq = 99, - RightAlt = 100, - LineFeed = 101, - Home = 102, - Up = 103, - Pageup = 104, - Left = 105, - Right = 106, - End = 107, - Down = 108, - Pagedown = 109, - Insert = 110, - Delete = 111, - Macro = 112, - Mute = 113, - VolumeDown = 114, - VolumeUp = 115, - Power = 116, // SC System Power Down - KpEqual = 117, - KpPlusMinus = 118, - Pause = 119, - Scale = 120, // AL Compiz Scale (Expose) - - KpComma = 121, - Hangeul = 122, - Hanja = 123, - Yen = 124, - LeftMeta = 125, - RightMeta = 126, - Compose = 127, - - Stop = 128, // AC Stop - Again = 129, - Props = 130, // AC Properties - Undo = 131, // AC Undo - Front = 132, - Copy = 133, // AC Copy - Open = 134, // AC Open - Paste = 135, // AC Paste - Find = 136, // AC Search - Cut = 137, // AC Cut - Help = 138, // AL Integrated Help Center - Menu = 139, // Menu (show menu) - Calc = 140, // AL Calculator - Setup = 141, - Sleep = 142, // SC System Sleep - Wakeup = 143, // System Wake Up - File = 144, // AL Local Machine Browser - Sendfile = 145, - DeleteFile = 146, - Xfer = 147, - Prog1 = 148, - Prog2 = 149, - Www = 150, // AL Internet Browser - MsDos = 151, - Coffee = 152, // AL Terminal Lock/Screensaver - RotateDisplay = 153, // Display orientation for e.g. tablets - CycleWindows = 154, - Mail = 155, - Bookmarks = 156, // AC Bookmarks - Computer = 157, - Back = 158, // AC Back - Forward = 159, // AC Forward - CloseCd = 160, - EjectCd = 161, - EjectCloseCd = 162, - NextSong = 163, - PlayPause = 164, - PreviousSong = 165, - StopCd = 166, - Record = 167, - Rewind = 168, - Phone = 169, // Media Select Telephone - Iso = 170, - Config = 171, // AL Consumer Control Configuration - Homepage = 172, // AC Home - Refresh = 173, // AC Refresh - Exit = 174, // AC Exit - Move = 175, - Edit = 176, - ScrollUp = 177, - ScrollDown = 178, - KpLeftParen = 179, - KpRightParen = 180, - New = 181, // AC New - Redo = 182, // AC Redo/Repeat - - F13 = 183, - F14 = 184, - F15 = 185, - F16 = 186, - F17 = 187, - F18 = 188, - F19 = 189, - F20 = 190, - F21 = 191, - F22 = 192, - F23 = 193, - F24 = 194, - - PlayCd = 200, - PauseCd = 201, - Prog3 = 202, - Prog4 = 203, - Dashboard = 204, // AL Dashboard - Suspend = 205, - Close = 206, // AC Close - Play = 207, - FastForward = 208, - BassBoost = 209, - Print = 210, // AC Print - Hp = 211, - Camera = 212, - Sound = 213, - Question = 214, - Email = 215, - Chat = 216, - Search = 217, - Connect = 218, - Finance = 219, // AL Checkbook/Finance - Sport = 220, - Shop = 221, - AltErase = 222, - Cancel = 223, // AC Cancel - BrightnessDown = 224, - BrightnessUp = 225, - Media = 226, - - SwitchVideoMode = 227, // Cycle between available video outputs (Monitor/LCD/TV-out/etc) - KbdIllumToggle = 228, - KbdIllumDown = 229, - KbdIllumUp = 230, - - Send = 231, // AC Send - Reply = 232, // AC Reply - ForwardMail = 233, // AC Forward Msg - Save = 234, // AC Save - Documents = 235, - - Battery = 236, - - Bluetooth = 237, - Wlan = 238, - Uwb = 239, - - Unknown = 240, - - VideoNext = 241, // drive next video source - VideoPrev = 242, // drive previous video source - BrightnessCycle = 243, // brightness up, after max is min - BrightnessAuto = 244, // Set Auto Brightness: manual brightness control is off, rely on ambient - DisplayOff = 245, // display device to off state - - Wwan = 246, // Wireless WAN (LTE, UMTS, GSM, etc.) - RfKill = 247, // Key that controls all radios - - MicMute = 248, // Mute / unmute the microphone - LeftMouse = 272, - RightMouse = 273, - MiddleMouse = 274, - MouseBack = 275, - MouseForward = 276, - - ToolFinger = 325, - ToolQuintTap = 328, - Touch = 330, - ToolDoubleTap = 333, - ToolTripleTap = 334, - ToolQuadTap = 335, - Mic = 582 -} \ No newline at end of file diff --git a/Adaptation/FileHandlers/MoveAllFiles/ApiController/KeyPressEvent.cs b/Adaptation/FileHandlers/MoveAllFiles/ApiController/KeyPressEvent.cs deleted file mode 100644 index aa7e1fe..0000000 --- a/Adaptation/FileHandlers/MoveAllFiles/ApiController/KeyPressEvent.cs +++ /dev/null @@ -1,20 +0,0 @@ -using System; - -namespace Adaptation.FileHandlers.MoveAllFiles.ApiController; - -public readonly struct KeyPressEvent -{ - public DateTime DateTime { get; } - public EventCode EventCode { get; } - public KeyState KeyState { get; } - public TimeSpan TimeSpan { get; } - - public KeyPressEvent(DateTime dateTime, EventCode eventCode, KeyState keyState, TimeSpan timeSpan) - { - DateTime = dateTime; - EventCode = eventCode; - KeyState = keyState; - TimeSpan = timeSpan; - } - -} \ No newline at end of file diff --git a/Adaptation/FileHandlers/MoveAllFiles/ApiController/KeyState.cs b/Adaptation/FileHandlers/MoveAllFiles/ApiController/KeyState.cs deleted file mode 100644 index 5a52452..0000000 --- a/Adaptation/FileHandlers/MoveAllFiles/ApiController/KeyState.cs +++ /dev/null @@ -1,8 +0,0 @@ -namespace Adaptation.FileHandlers.MoveAllFiles.ApiController; - -public enum KeyState -{ - KeyUp, - KeyDown, - KeyHold -} \ No newline at end of file diff --git a/Adaptation/FileHandlers/MoveAllFiles/ApiController/Notification.cs b/Adaptation/FileHandlers/MoveAllFiles/ApiController/Notification.cs deleted file mode 100644 index 79f8176..0000000 --- a/Adaptation/FileHandlers/MoveAllFiles/ApiController/Notification.cs +++ /dev/null @@ -1,20 +0,0 @@ -namespace Adaptation.FileHandlers.MoveAllFiles.ApiController; - -public readonly struct Notification -{ - - public KeyPressEvent KeyPressEvent { get; } - public string LastScanServiceResultValue { get; } - public string ToolClass { get; } - public string HttpContentBody { get; } - - [System.Text.Json.Serialization.JsonConstructor] - public Notification(KeyPressEvent keyPressEvent, string lastScanServiceResultValue, string toolClass, string httpContentBody) - { - KeyPressEvent = keyPressEvent; - LastScanServiceResultValue = lastScanServiceResultValue; - ToolClass = toolClass; - HttpContentBody = httpContentBody; - } - -} \ No newline at end of file diff --git a/Adaptation/FileHandlers/MoveAllFiles/ApiController/PostReplay.cs b/Adaptation/FileHandlers/MoveAllFiles/ApiController/PostReplay.cs deleted file mode 100644 index 4048df0..0000000 --- a/Adaptation/FileHandlers/MoveAllFiles/ApiController/PostReplay.cs +++ /dev/null @@ -1,21 +0,0 @@ -using Adaptation.FileHandlers.MoveAllFiles.OpenInsight; -using System.Collections.Generic; - -namespace Adaptation.FileHandlers.MoveAllFiles.ApiController; - -public class PostReplay -{ - -#nullable enable - - public string? MId { get; } - public Dictionary> QaMetTests { get; } - - [System.Text.Json.Serialization.JsonConstructor] - public PostReplay(string? mid, Dictionary> qaMetTests) - { - MId = mid; - QaMetTests = qaMetTests; - } - -} \ No newline at end of file diff --git a/Adaptation/FileHandlers/MoveAllFiles/FileRead.cs b/Adaptation/FileHandlers/MoveAllFiles/FileRead.cs index 364ae54..52df351 100644 --- a/Adaptation/FileHandlers/MoveAllFiles/FileRead.cs +++ b/Adaptation/FileHandlers/MoveAllFiles/FileRead.cs @@ -7,10 +7,6 @@ using System; using System.Collections.Generic; using System.IO; using System.Text.Json; -#if NETFRAMEWORK && NET48 -using System.Web.Http; -using System.Web.Http.SelfHost; -#endif namespace Adaptation.FileHandlers.MoveAllFiles; @@ -19,13 +15,7 @@ public class FileRead : Shared.FileRead, IFileRead #nullable enable - public const string HttpSelfHostConfigurationBaseAddress = "http://localhost:8080/"; - public const string OpenInsightApplicationProgrammingInterface = "https://oi-prod-ec-api.mes.infineon.com/api/oiWizard"; - private long? _TickOffset; -#if NETFRAMEWORK && NET48 - private readonly HttpSelfHostServer? _HttpSelfHostServer; -#endif 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) @@ -39,32 +29,6 @@ public class FileRead : Shared.FileRead, IFileRead throw new Exception(cellInstanceConnectionName); if (_IsDuplicator) throw new Exception(cellInstanceConnectionName); - string barcodeHostFileShare = GetPropertyValue(cellInstanceConnectionName, modelObjectParameters, "Barcode.Host.FileShare"); - if (barcodeHostFileShare != TIBCO.FileRead.BarcodeHostFileShare) - throw new NotSupportedException($"Update configuration for [{nameof(TIBCO.FileRead.BarcodeHostFileShare)}]"); - string httpSelfHostConfigurationBaseAddress = GetPropertyValue(cellInstanceConnectionName, modelObjectParameters, "Http.Self.Host.Configuration.Base.Address"); - if (httpSelfHostConfigurationBaseAddress != HttpSelfHostConfigurationBaseAddress) - throw new NotSupportedException($"Update configuration for [{nameof(HttpSelfHostConfigurationBaseAddress)}]"); - string lsl2SQLConnectionString = GetPropertyValue(cellInstanceConnectionName, modelObjectParameters, "ConnectionString.LSL2SQL"); - if (lsl2SQLConnectionString != TIBCO.FileRead.LSL2SQLConnectionString) - throw new NotSupportedException($"Update configuration for [{nameof(TIBCO.FileRead.LSL2SQLConnectionString)}]"); - string metrologyFileShare = GetPropertyValue(cellInstanceConnectionName, modelObjectParameters, "Metrology.FileShare"); - if (metrologyFileShare != TIBCO.FileRead.MetrologyFileShare) - throw new NotSupportedException($"Update configuration for [{nameof(TIBCO.FileRead.MetrologyFileShare)}]"); - string openInsightApplicationProgrammingInterface = GetPropertyValue(cellInstanceConnectionName, modelObjectParameters, "OpenInsight.Application.Programming.Interface"); - if (openInsightApplicationProgrammingInterface != OpenInsightApplicationProgrammingInterface) - throw new NotSupportedException($"Update configuration for [{nameof(OpenInsightApplicationProgrammingInterface)}]"); -#if NETFRAMEWORK && NET48 - if (!_IsEAFHosted) - _HttpSelfHostServer = null; - else - { - HttpSelfHostConfiguration config = new(httpSelfHostConfigurationBaseAddress); - _ = config.Routes.MapHttpRoute("API Default", "api/{controller}/{id}", new { id = RouteParameter.Optional }); - _HttpSelfHostServer = new(config); - _HttpSelfHostServer.OpenAsync().Wait(); - } -#endif } #nullable disable diff --git a/Adaptation/FileHandlers/MoveAllFiles/OpenInsight/BackSide.cs b/Adaptation/FileHandlers/MoveAllFiles/OpenInsight/BackSide.cs deleted file mode 100644 index 3b24b36..0000000 --- a/Adaptation/FileHandlers/MoveAllFiles/OpenInsight/BackSide.cs +++ /dev/null @@ -1,18 +0,0 @@ -using System.Text.Json.Serialization; - -namespace Adaptation.FileHandlers.MoveAllFiles.OpenInsight; - -public class BackSide -{ - [JsonPropertyName("scratches")] - public int? Scratches { get; set; } - - [JsonPropertyName("scratchLen")] - public int? ScratchLen { get; set; } - - [JsonPropertyName("nodules")] - public object Nodules { get; set; } - - [JsonPropertyName("spikes")] - public object Spikes { get; set; } -} \ No newline at end of file diff --git a/Adaptation/FileHandlers/MoveAllFiles/OpenInsight/CleanInsp.cs b/Adaptation/FileHandlers/MoveAllFiles/OpenInsight/CleanInsp.cs deleted file mode 100644 index 1d9e754..0000000 --- a/Adaptation/FileHandlers/MoveAllFiles/OpenInsight/CleanInsp.cs +++ /dev/null @@ -1,21 +0,0 @@ -using System.Text.Json.Serialization; - -namespace Adaptation.FileHandlers.MoveAllFiles.OpenInsight; - -public class CleanInsp -{ - [JsonPropertyName("keyId")] - public int KeyId { get; set; } - - [JsonPropertyName("stage")] - public string Stage { get; set; } - - [JsonPropertyName("cleans")] - public Cleans Cleans { get; set; } - - [JsonPropertyName("inspection")] - public Inspection Inspection { get; set; } - - [JsonPropertyName("surfScan")] - public SurfScan SurfScan { get; set; } -} \ No newline at end of file diff --git a/Adaptation/FileHandlers/MoveAllFiles/OpenInsight/Cleans.cs b/Adaptation/FileHandlers/MoveAllFiles/OpenInsight/Cleans.cs deleted file mode 100644 index 26a98af..0000000 --- a/Adaptation/FileHandlers/MoveAllFiles/OpenInsight/Cleans.cs +++ /dev/null @@ -1,22 +0,0 @@ -using System.Collections.Generic; -using System.Text.Json.Serialization; - -namespace Adaptation.FileHandlers.MoveAllFiles.OpenInsight; - -public class Cleans -{ - [JsonPropertyName("cleanRecipe")] - public object CleanRecipe { get; set; } - - [JsonPropertyName("cleanSigReq")] - public bool CleanSigReq { get; set; } - - [JsonPropertyName("cleanTools")] - public List CleanTools { get; set; } - - [JsonPropertyName("specs")] - public Spec Specs { get; set; } - - [JsonPropertyName("operations")] - public List Operations { get; set; } -} \ No newline at end of file diff --git a/Adaptation/FileHandlers/MoveAllFiles/OpenInsight/CustEpiPart.cs b/Adaptation/FileHandlers/MoveAllFiles/OpenInsight/CustEpiPart.cs deleted file mode 100644 index 9098c4f..0000000 --- a/Adaptation/FileHandlers/MoveAllFiles/OpenInsight/CustEpiPart.cs +++ /dev/null @@ -1,9 +0,0 @@ -using System.Text.Json.Serialization; - -namespace Adaptation.FileHandlers.MoveAllFiles.OpenInsight; - -public class CustEpiPart -{ - [JsonPropertyName("keyId")] - public string KeyId { get; set; } -} \ No newline at end of file diff --git a/Adaptation/FileHandlers/MoveAllFiles/OpenInsight/EpiPart.cs b/Adaptation/FileHandlers/MoveAllFiles/OpenInsight/EpiPart.cs deleted file mode 100644 index a856d82..0000000 --- a/Adaptation/FileHandlers/MoveAllFiles/OpenInsight/EpiPart.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System.Text.Json.Serialization; - -namespace Adaptation.FileHandlers.MoveAllFiles.OpenInsight; - -public class EpiPart -{ - [JsonPropertyName("keyID")] - public int KeyID { get; set; } - - [JsonPropertyName("waferSize")] - public string WaferSize { get; set; } -} \ No newline at end of file diff --git a/Adaptation/FileHandlers/MoveAllFiles/OpenInsight/FrontSide.cs b/Adaptation/FileHandlers/MoveAllFiles/OpenInsight/FrontSide.cs deleted file mode 100644 index 64735fc..0000000 --- a/Adaptation/FileHandlers/MoveAllFiles/OpenInsight/FrontSide.cs +++ /dev/null @@ -1,33 +0,0 @@ -using System.Text.Json.Serialization; - -namespace Adaptation.FileHandlers.MoveAllFiles.OpenInsight; - -public class FrontSide -{ - [JsonPropertyName("lpd")] - public int? Lpd { get; set; } - - [JsonPropertyName("scratches")] - public int? Scratches { get; set; } - - [JsonPropertyName("scratchLen")] - public string ScratchLen { get; set; } - - [JsonPropertyName("pits")] - public int? Pits { get; set; } - - [JsonPropertyName("mounds")] - public int? Mounds { get; set; } - - [JsonPropertyName("stackFaults")] - public int? StackFaults { get; set; } - - [JsonPropertyName("spikes")] - public int? Spikes { get; set; } - - [JsonPropertyName("spots")] - public int? Spots { get; set; } - - [JsonPropertyName("blDefects")] - public int? BlDefects { get; set; } -} \ No newline at end of file diff --git a/Adaptation/FileHandlers/MoveAllFiles/OpenInsight/Inspection.cs b/Adaptation/FileHandlers/MoveAllFiles/OpenInsight/Inspection.cs deleted file mode 100644 index 543ee54..0000000 --- a/Adaptation/FileHandlers/MoveAllFiles/OpenInsight/Inspection.cs +++ /dev/null @@ -1,27 +0,0 @@ -using System.Text.Json.Serialization; - -namespace Adaptation.FileHandlers.MoveAllFiles.OpenInsight; - -public class Inspection -{ - [JsonPropertyName("microscope")] - public bool Microscope { get; set; } - - [JsonPropertyName("brightlight")] - public bool Brightlight { get; set; } - - [JsonPropertyName("inspSigReq")] - public bool InspSigReq { get; set; } - - [JsonPropertyName("inspInterval")] - public int? InspInterval { get; set; } - - [JsonPropertyName("frontSide")] - public FrontSide FrontSide { get; set; } - - [JsonPropertyName("backSide")] - public BackSide BackSide { get; set; } - - [JsonPropertyName("specs")] - public Spec Specs { get; set; } -} \ No newline at end of file diff --git a/Adaptation/FileHandlers/MoveAllFiles/OpenInsight/ProdSpec.cs b/Adaptation/FileHandlers/MoveAllFiles/OpenInsight/ProdSpec.cs deleted file mode 100644 index df0dc97..0000000 --- a/Adaptation/FileHandlers/MoveAllFiles/OpenInsight/ProdSpec.cs +++ /dev/null @@ -1,49 +0,0 @@ -using System.Collections.Generic; -using System.Text.Json.Serialization; - -namespace Adaptation.FileHandlers.MoveAllFiles.OpenInsight; - -public class ProdSpec -{ - // [JsonPropertyName("keyId")] - // public int KeyId { get; set; } - - // [JsonPropertyName("specType")] - // public string SpecType { get; set; } - - // [JsonPropertyName("status")] - // public string Status { get; set; } - - // [JsonPropertyName("minutesPerWafer")] - // public double MinutesPerWafer { get; set; } - - // [JsonPropertyName("proveInTime")] - // public double ProveInTime { get; set; } - - // [JsonPropertyName("layerType")] - // public string LayerType { get; set; } - - // [JsonPropertyName("reactorType")] - // public string ReactorType { get; set; } - - // [JsonPropertyName("susceptorType")] - // public string SusceptorType { get; set; } - - // [JsonPropertyName("tubePressureType")] - // public string TubePressureType { get; set; } - - // [JsonPropertyName("recipeLayers")] - // public List RecipeLayers { get; set; } - - // [JsonPropertyName("prodVers")] - // public List ProdVers { get; set; } - - // [JsonPropertyName("epiPart")] - // public EpiPart EpiPart { get; set; } - - // [JsonPropertyName("custEpiParts")] - // public List CustEpiParts { get; set; } - - [JsonPropertyName("prsStages")] - public List PrsStages { get; set; } -} \ No newline at end of file diff --git a/Adaptation/FileHandlers/MoveAllFiles/OpenInsight/ProdVer.cs b/Adaptation/FileHandlers/MoveAllFiles/OpenInsight/ProdVer.cs deleted file mode 100644 index fe80341..0000000 --- a/Adaptation/FileHandlers/MoveAllFiles/OpenInsight/ProdVer.cs +++ /dev/null @@ -1,9 +0,0 @@ -using System.Text.Json.Serialization; - -namespace Adaptation.FileHandlers.MoveAllFiles.OpenInsight; - -public class ProdVer -{ - [JsonPropertyName("keyId")] - public int KeyId { get; set; } -} \ No newline at end of file diff --git a/Adaptation/FileHandlers/MoveAllFiles/OpenInsight/PrsStage.cs b/Adaptation/FileHandlers/MoveAllFiles/OpenInsight/PrsStage.cs deleted file mode 100644 index d9af473..0000000 --- a/Adaptation/FileHandlers/MoveAllFiles/OpenInsight/PrsStage.cs +++ /dev/null @@ -1,28 +0,0 @@ -using System.Collections.Generic; -using System.Text.Json.Serialization; - -namespace Adaptation.FileHandlers.MoveAllFiles.OpenInsight; - -public class PrsStage -{ - // [JsonPropertyName("keyId")] - // public string KeyId { get; set; } - - // [JsonPropertyName("psn")] - // public int Psn { get; set; } - - [JsonPropertyName("stage")] - public string Stage { get; set; } - - // [JsonPropertyName("cleans")] - // public Cleans Cleans { get; set; } - - // [JsonPropertyName("inspection")] - // public Inspection Inspection { get; set; } - - // [JsonPropertyName("surfscan")] - // public SurfScan Surfscan { get; set; } - - [JsonPropertyName("qaMetTests")] - public List QaMetTests { get; set; } -} \ No newline at end of file diff --git a/Adaptation/FileHandlers/MoveAllFiles/OpenInsight/QaMetTest.cs b/Adaptation/FileHandlers/MoveAllFiles/OpenInsight/QaMetTest.cs deleted file mode 100644 index 8652ec6..0000000 --- a/Adaptation/FileHandlers/MoveAllFiles/OpenInsight/QaMetTest.cs +++ /dev/null @@ -1,51 +0,0 @@ -using System.Text.Json.Serialization; - -namespace Adaptation.FileHandlers.MoveAllFiles.OpenInsight; - -public class QaMetTest -{ - [JsonPropertyName("test")] - public string Test { get; set; } - - [JsonPropertyName("property")] - public string Property { get; set; } - - [JsonPropertyName("propertyDesc")] - public string PropertyDesc { get; set; } - - [JsonPropertyName("toolClass")] - public string ToolClass { get; set; } - - [JsonPropertyName("recipe")] - public string Recipe { get; set; } - - [JsonPropertyName("recipePattern")] - public string RecipePattern { get; set; } - - [JsonPropertyName("min")] - public object Min { get; set; } - - [JsonPropertyName("max")] - public object Max { get; set; } - - [JsonPropertyName("phaseMin")] - public object PhaseMin { get; set; } - - [JsonPropertyName("slots")] - public object Slots { get; set; } - - [JsonPropertyName("wfrQty")] - public int? WfrQty { get; set; } - - [JsonPropertyName("reactSched")] - public bool? ReactSched { get; set; } - - [JsonPropertyName("interval")] - public int? Interval { get; set; } - - [JsonPropertyName("start")] - public int? Start { get; set; } - - [JsonPropertyName("sequence")] - public string Sequence { get; set; } -} \ No newline at end of file diff --git a/Adaptation/FileHandlers/MoveAllFiles/OpenInsight/Rds.cs b/Adaptation/FileHandlers/MoveAllFiles/OpenInsight/Rds.cs deleted file mode 100644 index 0bd0390..0000000 --- a/Adaptation/FileHandlers/MoveAllFiles/OpenInsight/Rds.cs +++ /dev/null @@ -1,96 +0,0 @@ -using System.Text.Json.Serialization; - -namespace Adaptation.FileHandlers.MoveAllFiles.OpenInsight; - -public class Rds -{ - [JsonPropertyName("keyId")] - public int KeyId { get; set; } - - [JsonPropertyName("reactor")] - public int Reactor { get; set; } - - // [JsonPropertyName("workOrder")] - // public int WorkOrder { get; set; } - - // [JsonPropertyName("cassNo")] - // public int CassNo { get; set; } - - // [JsonPropertyName("combStatus")] - // public string CombStatus { get; set; } - - // [JsonPropertyName("partNo")] - // public int PartNo { get; set; } - - // [JsonPropertyName("PSN")] - // public int PSN { get; set; } - - // [JsonPropertyName("entryId")] - // public string EntryId { get; set; } - - // [JsonPropertyName("entryDtm")] - // public string EntryDtm { get; set; } - - // [JsonPropertyName("preEpiSig")] - // public string PreEpiSig { get; set; } - - // [JsonPropertyName("preEpiSigDtm")] - // public string PreEpiSigDtm { get; set; } - - // [JsonPropertyName("operatorIn")] - // public string OperatorIn { get; set; } - - // [JsonPropertyName("dtmIn")] - // public string DtmIn { get; set; } - - // [JsonPropertyName("operatorOut")] - // public string OperatorOut { get; set; } - - // [JsonPropertyName("dtmOut")] - // public string DtmOut { get; set; } - - // [JsonPropertyName("postEpiSig")] - // public string PostEpiSig { get; set; } - - // [JsonPropertyName("postEpiSigDtm")] - // public string PostEpiSigDtm { get; set; } - - // [JsonPropertyName("supVerSig")] - // public string SupVerSig { get; set; } - - // [JsonPropertyName("supVerSigDtm")] - // public string SupVerSigDtm { get; set; } - - // [JsonPropertyName("shipDtm")] - // public object ShipDtm { get; set; } - - // [JsonPropertyName("subPartNo")] - // public int SubPartNo { get; set; } - - // [JsonPropertyName("shipNo")] - // public object ShipNo { get; set; } - - // [JsonPropertyName("cassWaferQty")] - // public int CassWaferQty { get; set; } - - // [JsonPropertyName("loadLockSide")] - // public string LoadLockSide { get; set; } - - // [JsonPropertyName("waferSize")] - // public string WaferSize { get; set; } - - // [JsonPropertyName("reactorType")] - // public string ReactorType { get; set; } - - [JsonPropertyName("prodSpec")] - public ProdSpec ProdSpec { get; set; } - - // [JsonPropertyName("cleanInsp")] - // public List CleanInsp { get; set; } - - // [JsonPropertyName("woMatQA")] - // public WoMatQA WoMatQA { get; set; } - - // [JsonPropertyName("rdsLayers")] - // public List RdsLayers { get; set; } -} \ No newline at end of file diff --git a/Adaptation/FileHandlers/MoveAllFiles/OpenInsight/RdsLayer.cs b/Adaptation/FileHandlers/MoveAllFiles/OpenInsight/RdsLayer.cs deleted file mode 100644 index ff28a0e..0000000 --- a/Adaptation/FileHandlers/MoveAllFiles/OpenInsight/RdsLayer.cs +++ /dev/null @@ -1,63 +0,0 @@ -using System.Text.Json.Serialization; - -namespace Adaptation.FileHandlers.MoveAllFiles.OpenInsight; - -public class RdsLayer -{ - [JsonPropertyName("keyID")] - public string KeyID { get; set; } - - [JsonPropertyName("EpiTime")] - public double EpiTime { get; set; } - - [JsonPropertyName("DiluentAdjParam")] - public int DiluentAdjParam { get; set; } - - [JsonPropertyName("DopantFlow")] - public double DopantFlow { get; set; } - - [JsonPropertyName("HCLFlow")] - public object HCLFlow { get; set; } - - [JsonPropertyName("BakeTime")] - public string BakeTime { get; set; } - - [JsonPropertyName("EpiH2Flow")] - public int EpiH2Flow { get; set; } - - [JsonPropertyName("TCSFlow")] - public int TCSFlow { get; set; } - - [JsonPropertyName("DCSFlow")] - public object DCSFlow { get; set; } - - [JsonPropertyName("FOffset")] - public int FOffset { get; set; } - - [JsonPropertyName("SOffset")] - public int SOffset { get; set; } - - [JsonPropertyName("ROffset")] - public int ROffset { get; set; } - - [JsonPropertyName("Etch1")] - public string Etch1 { get; set; } - - [JsonPropertyName("Etch2")] - public string Etch2 { get; set; } - - [JsonPropertyName("Etch3")] - public string Etch3 { get; set; } - - [JsonPropertyName("AUX1")] - public object AUX1 { get; set; } - - [JsonPropertyName("AUX2")] - public object AUX2 { get; set; } - - [JsonPropertyName("ULTemp")] - public int ULTemp { get; set; } - - [JsonPropertyName("SuscEtch")] - public object SuscEtch { get; set; } -} \ No newline at end of file diff --git a/Adaptation/FileHandlers/MoveAllFiles/OpenInsight/RecipeLayer.cs b/Adaptation/FileHandlers/MoveAllFiles/OpenInsight/RecipeLayer.cs deleted file mode 100644 index ddf5c23..0000000 --- a/Adaptation/FileHandlers/MoveAllFiles/OpenInsight/RecipeLayer.cs +++ /dev/null @@ -1,69 +0,0 @@ -using System.Text.Json.Serialization; - -namespace Adaptation.FileHandlers.MoveAllFiles.OpenInsight; - -public class RecipeLayer -{ - [JsonPropertyName("layerNo")] - public int LayerNo { get; set; } - - [JsonPropertyName("layerId")] - public string LayerId { get; set; } - - [JsonPropertyName("layerType")] - public string LayerType { get; set; } - - [JsonPropertyName("layerRecipe")] - public int LayerRecipe { get; set; } - - [JsonPropertyName("layerDopant")] - public string LayerDopant { get; set; } - - [JsonPropertyName("layerThickMin")] - public double LayerThickMin { get; set; } - - [JsonPropertyName("layerThickTarget")] - public double LayerThickTarget { get; set; } - - [JsonPropertyName("layerThickMax")] - public double LayerThickMax { get; set; } - - [JsonPropertyName("layerThickUnits")] - public string LayerThickUnits { get; set; } - - [JsonPropertyName("layerThickAMin")] - public object LayerThickAMin { get; set; } - - [JsonPropertyName("layerThickATarget")] - public object LayerThickATarget { get; set; } - - [JsonPropertyName("layerThickAMaxes")] - public object LayerThickAMaxes { get; set; } - - [JsonPropertyName("layerThickAUnits")] - public object LayerThickAUnits { get; set; } - - [JsonPropertyName("layerResMin")] - public double LayerResMin { get; set; } - - [JsonPropertyName("layerResTarget")] - public int LayerResTarget { get; set; } - - [JsonPropertyName("layerResMax")] - public double LayerResMax { get; set; } - - [JsonPropertyName("layerResUnits")] - public string LayerResUnits { get; set; } - - [JsonPropertyName("layerSResMin")] - public object LayerSResMin { get; set; } - - [JsonPropertyName("layerSResTarget")] - public object LayerSResTarget { get; set; } - - [JsonPropertyName("layerSResMax")] - public object LayerSResMax { get; set; } - - [JsonPropertyName("layerSResUnits")] - public object LayerSResUnits { get; set; } -} \ No newline at end of file diff --git a/Adaptation/FileHandlers/MoveAllFiles/OpenInsight/Root.cs b/Adaptation/FileHandlers/MoveAllFiles/OpenInsight/Root.cs deleted file mode 100644 index 20570ff..0000000 --- a/Adaptation/FileHandlers/MoveAllFiles/OpenInsight/Root.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System.Text.Json.Serialization; - -namespace Adaptation.FileHandlers.MoveAllFiles.OpenInsight; - -public class Root -{ - [JsonPropertyName("rds")] - public Rds Rds { get; set; } - - [JsonPropertyName("_links")] - public object Links { get; set; } - - [JsonPropertyName("_class")] - public string Class { get; set; } -} \ No newline at end of file diff --git a/Adaptation/FileHandlers/MoveAllFiles/OpenInsight/Spec.cs b/Adaptation/FileHandlers/MoveAllFiles/OpenInsight/Spec.cs deleted file mode 100644 index 8c80990..0000000 --- a/Adaptation/FileHandlers/MoveAllFiles/OpenInsight/Spec.cs +++ /dev/null @@ -1,73 +0,0 @@ -using System.Collections.Generic; -using System.Text.Json.Serialization; - -namespace Adaptation.FileHandlers.MoveAllFiles.OpenInsight; - -public class Spec -{ - [JsonPropertyName("recipe")] - public string Recipe { get; set; } - - [JsonPropertyName("defect")] - public int Defect { get; set; } - - [JsonPropertyName("haze")] - public int Haze { get; set; } - - [JsonPropertyName("sampleQty")] - public int SampleQty { get; set; } - - [JsonPropertyName("tools")] - public List Tools { get; set; } - - [JsonPropertyName("recipes")] - public List Recipes { get; set; } - - [JsonPropertyName("microscopeReq")] - public bool MicroscopeReq { get; set; } - - [JsonPropertyName("brightlightReq")] - public bool BrightlightReq { get; set; } - - [JsonPropertyName("lpd")] - public int Lpd { get; set; } - - [JsonPropertyName("scratches")] - public int Scratches { get; set; } - - [JsonPropertyName("scratchLen")] - public int ScratchLen { get; set; } - - [JsonPropertyName("pits")] - public int Pits { get; set; } - - [JsonPropertyName("mounds")] - public int Mounds { get; set; } - - [JsonPropertyName("stackFaults")] - public int StackFaults { get; set; } - - [JsonPropertyName("spikes")] - public int Spikes { get; set; } - - [JsonPropertyName("spots")] - public int Spots { get; set; } - - [JsonPropertyName("fov")] - public int Fov { get; set; } - - [JsonPropertyName("blDefects")] - public int BlDefects { get; set; } - - [JsonPropertyName("bsideScratches")] - public int BsideScratches { get; set; } - - [JsonPropertyName("bsideScratchLen")] - public int BsideScratchLen { get; set; } - - [JsonPropertyName("bsideNodules")] - public object BsideNodules { get; set; } - - [JsonPropertyName("bsideSpikes")] - public object BsideSpikes { get; set; } -} \ No newline at end of file diff --git a/Adaptation/FileHandlers/MoveAllFiles/OpenInsight/SurfScan.cs b/Adaptation/FileHandlers/MoveAllFiles/OpenInsight/SurfScan.cs deleted file mode 100644 index bfa25d6..0000000 --- a/Adaptation/FileHandlers/MoveAllFiles/OpenInsight/SurfScan.cs +++ /dev/null @@ -1,13 +0,0 @@ -using System.Collections.Generic; -using System.Text.Json.Serialization; - -namespace Adaptation.FileHandlers.MoveAllFiles.OpenInsight; - -public class SurfScan -{ - [JsonPropertyName("surfscanSigReq")] - public bool SurfscanSigReq { get; set; } - - [JsonPropertyName("surfscanRecipes")] - public List SurfscanRecipes { get; set; } -} \ No newline at end of file diff --git a/Adaptation/FileHandlers/MoveAllFiles/OpenInsight/SurfScan2.cs b/Adaptation/FileHandlers/MoveAllFiles/OpenInsight/SurfScan2.cs deleted file mode 100644 index 194e7f2..0000000 --- a/Adaptation/FileHandlers/MoveAllFiles/OpenInsight/SurfScan2.cs +++ /dev/null @@ -1,10 +0,0 @@ -using System.Collections.Generic; -using System.Text.Json.Serialization; - -namespace Adaptation.FileHandlers.MoveAllFiles.OpenInsight; - -public class SurfScan2 -{ - [JsonPropertyName("specs")] - public List Specs { get; set; } -} \ No newline at end of file diff --git a/Adaptation/FileHandlers/MoveAllFiles/OpenInsight/SurfscanRecipe.cs b/Adaptation/FileHandlers/MoveAllFiles/OpenInsight/SurfscanRecipe.cs deleted file mode 100644 index eee86d4..0000000 --- a/Adaptation/FileHandlers/MoveAllFiles/OpenInsight/SurfscanRecipe.cs +++ /dev/null @@ -1,18 +0,0 @@ -using System.Text.Json.Serialization; - -namespace Adaptation.FileHandlers.MoveAllFiles.OpenInsight; - -public class SurfscanRecipe -{ - [JsonPropertyName("recipe")] - public string Recipe { get; set; } - - [JsonPropertyName("defects")] - public int Defects { get; set; } - - [JsonPropertyName("haze")] - public int Haze { get; set; } - - [JsonPropertyName("sampleSize")] - public int SampleSize { get; set; } -} \ No newline at end of file diff --git a/Adaptation/FileHandlers/MoveAllFiles/OpenInsight/Test.cs b/Adaptation/FileHandlers/MoveAllFiles/OpenInsight/Test.cs deleted file mode 100644 index 4c55def..0000000 --- a/Adaptation/FileHandlers/MoveAllFiles/OpenInsight/Test.cs +++ /dev/null @@ -1,73 +0,0 @@ -using System.Collections.Generic; -using System.Text.Json.Serialization; - -namespace Adaptation.FileHandlers.MoveAllFiles.OpenInsight; - -public class Test -{ - [JsonPropertyName("stage")] - public string Stage { get; set; } - - [JsonPropertyName("profile")] - public string Profile { get; set; } - - [JsonPropertyName("prop")] - public string Prop { get; set; } - - [JsonPropertyName("toolClass")] - public string ToolClass { get; set; } - - [JsonPropertyName("recipe")] - public string Recipe { get; set; } - - [JsonPropertyName("recipePattern")] - public string RecipePattern { get; set; } - - [JsonPropertyName("specMin")] - public double SpecMin { get; set; } - - [JsonPropertyName("specMax")] - public double SpecMax { get; set; } - - [JsonPropertyName("specSlot")] - public object SpecSlot { get; set; } - - [JsonPropertyName("testSlot")] - public object TestSlot { get; set; } - - [JsonPropertyName("testResult")] - public List TestResult { get; set; } - - [JsonPropertyName("testSig")] - public string TestSig { get; set; } - - [JsonPropertyName("testSigDtm")] - public string TestSigDtm { get; set; } - - [JsonPropertyName("specStdDev")] - public object SpecStdDev { get; set; } - - [JsonPropertyName("testStdDev")] - public object TestStdDev { get; set; } - - [JsonPropertyName("specWfrQty")] - public int SpecWfrQty { get; set; } - - [JsonPropertyName("dataPoints")] - public List> DataPoints { get; set; } - - [JsonPropertyName("testResultMin")] - public List TestResultMin { get; set; } - - [JsonPropertyName("testResultMax")] - public List TestResultMax { get; set; } - - [JsonPropertyName("testOutOfSpec")] - public bool TestOutOfSpec { get; set; } - - [JsonPropertyName("phaseMin")] - public object PhaseMin { get; set; } - - [JsonPropertyName("failReason")] - public object FailReason { get; set; } -} \ No newline at end of file diff --git a/Adaptation/FileHandlers/MoveAllFiles/OpenInsight/WoMatQA.cs b/Adaptation/FileHandlers/MoveAllFiles/OpenInsight/WoMatQA.cs deleted file mode 100644 index 3a60119..0000000 --- a/Adaptation/FileHandlers/MoveAllFiles/OpenInsight/WoMatQA.cs +++ /dev/null @@ -1,13 +0,0 @@ -using System.Collections.Generic; -using System.Text.Json.Serialization; - -namespace Adaptation.FileHandlers.MoveAllFiles.OpenInsight; - -public class WoMatQA -{ - [JsonPropertyName("keyId")] - public string KeyId { get; set; } - - [JsonPropertyName("tests")] - public List Tests { get; set; } -} \ No newline at end of file diff --git a/Adaptation/FileHandlers/MoveMatchingFiles/FileRead.cs b/Adaptation/FileHandlers/MoveMatchingFiles/FileRead.cs index 39f8d62..2d8a495 100644 --- a/Adaptation/FileHandlers/MoveMatchingFiles/FileRead.cs +++ b/Adaptation/FileHandlers/MoveMatchingFiles/FileRead.cs @@ -6,7 +6,6 @@ using Adaptation.Shared.Methods; using System; using System.Collections.Generic; using System.IO; -using System.Linq; using System.Text; using System.Text.Json; using System.Threading; @@ -129,7 +128,7 @@ public class FileRead : Shared.FileRead, IFileRead for (int i = 0; i < int.MaxValue; i++) { found = Directory.GetFiles(searchDirectory, fileName, SearchOption.AllDirectories); - if (found.Any()) + if (found.Length != 0) { results.AddRange(found); break; @@ -205,7 +204,7 @@ public class FileRead : Shared.FileRead, IFileRead Thread.Sleep(500); } } - if (postCollection.Any()) + if (postCollection.Count != 0) { Thread.Sleep(500); StringBuilder stringBuilder = new(); diff --git a/Adaptation/FileHandlers/OpenInsight/FileRead.cs b/Adaptation/FileHandlers/OpenInsight/FileRead.cs index d0bbc18..c531a7c 100644 --- a/Adaptation/FileHandlers/OpenInsight/FileRead.cs +++ b/Adaptation/FileHandlers/OpenInsight/FileRead.cs @@ -21,7 +21,6 @@ public class FileRead : Shared.FileRead, IFileRead private readonly string _IqsConnectionString; private readonly string _OpenInsightFilePattern; private readonly string _OpenInsightApiECDirectory; - private readonly string _OpenInsightApiIFXDirectory; 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) @@ -38,7 +37,6 @@ public class FileRead : Shared.FileRead, IFileRead _LastLines = string.Empty; _IqsConnectionString = GetPropertyValue(cellInstanceConnectionName, modelObjectParameters, "IQS.ConnectionString"); _OpenInsightApiECDirectory = GetPropertyValue(cellInstanceConnectionName, modelObjectParameters, "API.EC.Directory"); - _OpenInsightApiIFXDirectory = GetPropertyValue(cellInstanceConnectionName, modelObjectParameters, "API.IFX.Directory"); _OpenInsightFilePattern = GetPropertyValue(cellInstanceConnectionName, modelObjectParameters, "OpenInsight.FilePattern"); } @@ -188,7 +186,7 @@ public class FileRead : Shared.FileRead, IFileRead _ = Directory.CreateDirectory(duplicateDirectory); } string duplicateFile = Path.Combine(duplicateDirectory, Path.GetFileName(reportFullPath)); - if (!descriptions.Any() || !tests.Any()) + if (descriptions.Count == 0 || tests.Length == 0) _LastLines = string.Empty; else { @@ -210,7 +208,7 @@ public class FileRead : Shared.FileRead, IFileRead else collection.Add(new(new ScopeInfo(tests[0], $"{subGroupId.Value} {_OpenInsightFilePattern}"), lines.Item1)); string weekOfYear = _Calendar.GetWeekOfYear(_Logistics.DateTimeFromSequence, CalendarWeekRule.FirstDay, DayOfWeek.Sunday).ToString("00"); - FromIQS.Save(_OpenInsightApiECDirectory, _OpenInsightApiIFXDirectory, _Logistics, reportFullPath, logistics, descriptions.First(), lines.Item1, subGroupId, weekOfYear); + FromIQS.Save(_OpenInsightApiECDirectory, _Logistics, reportFullPath, logistics, descriptions.First(), lines.Item1, subGroupId, weekOfYear); } if (!Directory.Exists(duplicateDirectory)) _ = Directory.CreateDirectory(duplicateDirectory); diff --git a/Adaptation/FileHandlers/OpenInsight/FromIQS.cs b/Adaptation/FileHandlers/OpenInsight/FromIQS.cs index 26dfbdc..1d05f3b 100644 --- a/Adaptation/FileHandlers/OpenInsight/FromIQS.cs +++ b/Adaptation/FileHandlers/OpenInsight/FromIQS.cs @@ -17,7 +17,7 @@ public class FromIQS #nullable enable private static string GetCommandText(Logistics logistics, txt.Description description, string dateTime, long? subGroupId) - { + { // cSpell:disable StringBuilder result = new(); _ = result .AppendLine(" select iq.ev_count, iq.cl_count, iq.sl_count, iq.se_sgrp, iq.se_sgtm, iq.se_tsno, iq.td_test, iq.pr_name, iq.jd_name, iq.pl_name, iq.pd_name, iq.td_name, iq.se_val ") @@ -58,7 +58,7 @@ public class FromIQS .AppendLine(" on se.f_lot = pl.f_lot ") .AppendLine(" join [spcepiworld].[dbo].[part_dat] pd ") .AppendLine(" on se.f_part = pd.f_part ") - .AppendLine(" join [spcepiworld].[dbo].[test_dat] td ") + .AppendLine(" join [spcepiworld].[dbo].[test_dat] td ") .AppendLine(" on se.f_test = td.f_test ") .AppendLine(" where se.f_flag = 0 "); if (subGroupId is not null) @@ -75,7 +75,7 @@ public class FromIQS .AppendLine(" order by iq.ev_count desc, iq.cl_count desc, iq.sl_count desc, iq.se_sgrp, iq.se_tsno, iq.td_test ") .AppendLine(" for json path "); return result.ToString(); - } + } // cSpell:restore private static StringBuilder GetForJsonPath(string connectionString, string commandText) { @@ -135,17 +135,17 @@ public class FromIQS else { JsonElement[]? jsonElements = JsonSerializer.Deserialize(stringBuilder.ToString()); - if (jsonElements is null || !jsonElements.Any() || jsonElements[0].ValueKind != JsonValueKind.Object) + if (jsonElements is null || jsonElements.Length == 0 || jsonElements[0].ValueKind != JsonValueKind.Object) commandText = stringBuilder.ToString(); else { JsonProperty[] jsonProperties = jsonElements[0].EnumerateObject().ToArray(); - if (!jsonProperties.Any() || jsonProperties[3].Name != "se_sgrp" || !long.TryParse(jsonProperties[3].Value.ToString(), out long subGroupId)) + if (jsonProperties.Length == 0 || jsonProperties[3].Name != "se_sgrp" || !long.TryParse(jsonProperties[3].Value.ToString(), out long subGroupId)) commandText = stringBuilder.ToString(); else { result = subGroupId; - if (jsonProperties.Any() && jsonProperties[0].Name == "ev_count" && int.TryParse(jsonProperties[0].Value.ToString(), out int evCount)) + if (jsonProperties.Length != 0 && jsonProperties[0].Name == "ev_count" && int.TryParse(jsonProperties[0].Value.ToString(), out int evCount)) count = evCount; } } @@ -204,40 +204,26 @@ public class FromIQS return result; } - internal static void Save(string openInsightApiECDirectory, string openInsightApiIFXDirectory, Logistics logistics, string reportFullPath, string logisticLines, txt.Description description, string lines, long? subGroupId, string weekOfYear) + internal static void Save(string openInsightApiECDirectory, Logistics logistics, string reportFullPath, string logisticLines, txt.Description description, string lines, long? subGroupId, string weekOfYear) { string checkFile; string fileName = Path.GetFileName(reportFullPath); string json = GetJson(logistics, logisticLines, description); string? ecPathRoot = Path.GetPathRoot(openInsightApiECDirectory); - string? ifxPathRoot = Path.GetPathRoot(openInsightApiIFXDirectory); bool ecExists = ecPathRoot is not null && Directory.Exists(ecPathRoot); - bool ifxExists = ifxPathRoot is not null && Directory.Exists(ifxPathRoot); string weekYear = $"{logistics.DateTimeFromSequence:yyyy}_Week_{weekOfYear}"; string ecDirectory = Path.Combine(openInsightApiECDirectory, weekYear, $"-{description.PSN}", $"-{description.Reactor}", $"-{description.RDS}", $"-{subGroupId}"); - string ifxDirectory = Path.Combine(openInsightApiIFXDirectory, weekYear, $"-{description.PSN}", $"-{description.Reactor}", $"-{description.RDS}", $"-{subGroupId}"); if (ecExists && !Directory.Exists(ecDirectory)) _ = Directory.CreateDirectory(ecDirectory); - if (ifxExists && !Directory.Exists(ifxDirectory)) - _ = Directory.CreateDirectory(ifxDirectory); checkFile = Path.Combine(ecDirectory, fileName); if (ecExists && !File.Exists(checkFile)) File.Copy(reportFullPath, checkFile); - checkFile = Path.Combine(ifxDirectory, fileName); - if (ifxExists && !File.Exists(checkFile)) - File.Copy(reportFullPath, checkFile); checkFile = Path.Combine(ecDirectory, $"{logistics.DateTimeFromSequence.Ticks}.txt"); if (ecExists && !File.Exists(checkFile)) File.WriteAllText(checkFile, lines); - checkFile = Path.Combine(ifxDirectory, $"{logistics.DateTimeFromSequence.Ticks}.txt"); - if (ifxExists && !File.Exists(checkFile)) - File.WriteAllText(checkFile, lines); checkFile = Path.Combine(ecDirectory, $"{logistics.DateTimeFromSequence.Ticks}.json"); if (ecExists && !File.Exists(checkFile)) File.WriteAllText(checkFile, json); - checkFile = Path.Combine(ifxDirectory, $"{logistics.DateTimeFromSequence.Ticks}.json"); - if (ifxExists && !File.Exists(checkFile)) - File.WriteAllText(checkFile, json); } #nullable disable diff --git a/Adaptation/FileHandlers/OpenInsightMetrologyViewer/FileRead.cs b/Adaptation/FileHandlers/OpenInsightMetrologyViewer/FileRead.cs index a14a964..430e270 100644 --- a/Adaptation/FileHandlers/OpenInsightMetrologyViewer/FileRead.cs +++ b/Adaptation/FileHandlers/OpenInsightMetrologyViewer/FileRead.cs @@ -31,7 +31,7 @@ public class FileRead : Shared.FileRead, IFileRead throw new Exception(cellInstanceConnectionName); if (!_IsDuplicator) throw new Exception(cellInstanceConnectionName); - _OpenInsightMetrologyViewerFileShare = @"\\messv02ecc1.ec.local\EC_Metrology_Si\MetrologyAttachments\SP1RunHeader_"; + _OpenInsightMetrologyViewerFileShare = @"\\mesfs.infineon.com\EC_Metrology_Si\MetrologyAttachments\SP1RunHeader_"; _OpenInsightMetrologyViewerAPI = GetPropertyValue(cellInstanceConnectionName, modelObjectParameters, "OpenInsight.MetrologyViewerAPI"); } @@ -117,6 +117,8 @@ public class FileRead : Shared.FileRead, IFileRead 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); diff --git a/Adaptation/FileHandlers/OpenInsightMetrologyViewer/WSRequest.cs b/Adaptation/FileHandlers/OpenInsightMetrologyViewer/WSRequest.cs index 9b022ab..87120ed 100644 --- a/Adaptation/FileHandlers/OpenInsightMetrologyViewer/WSRequest.cs +++ b/Adaptation/FileHandlers/OpenInsightMetrologyViewer/WSRequest.cs @@ -609,7 +609,7 @@ public class WSRequest Details.Add(detail); } Date = logistics.DateTimeFromSequence.ToString(); - if (UniqueID is null && Details.Any()) + if (UniqueID is null && Details.Count != 0) UniqueID = Details[0].HeaderUniqueID; } @@ -651,8 +651,6 @@ public class WSRequest if (summaryFiles.Length != 1) throw new Exception($"Invalid source file count for <{wsResultsHeaderID}>!{Environment.NewLine}{json}"); string[] prnFiles = Directory.GetFiles(matchDirectory, "WaferMap*.prn", SearchOption.TopDirectoryOnly); - if (prnFiles.Length == 0 || prnFiles.Length != descriptions.Count) - throw new Exception("Invalid WaferMap*.prn file count!"); List pdfFiles = new(); foreach (string prnFile in prnFiles.OrderBy(l => l)) pdfFiles.Add(ConvertSourceFileToPdf(ghostPCLFileName, prnFile)); diff --git a/Adaptation/FileHandlers/OpenInsightMetrologyViewerAttachments/FileRead.cs b/Adaptation/FileHandlers/OpenInsightMetrologyViewerAttachments/FileRead.cs index 1d29295..05c6e9f 100644 --- a/Adaptation/FileHandlers/OpenInsightMetrologyViewerAttachments/FileRead.cs +++ b/Adaptation/FileHandlers/OpenInsightMetrologyViewerAttachments/FileRead.cs @@ -121,13 +121,13 @@ public class FileRead : Shared.FileRead, IFileRead _ = Directory.CreateDirectory(jobIdDirectory); string json; string[] matchDirectories = GetInProcessDirectory(jobIdDirectory); - if (!_StaticRuns.ContainsKey(_Logistics.Sequence)) + if (!_StaticRuns.TryGetValue(_Logistics.Sequence, out List collection)) json = string.Empty; else { - if (_StaticRuns[_Logistics.Sequence].Count != 1) + if (collection.Count != 1) throw new Exception($"{nameof(_StaticRuns)} has too many values for {_Logistics.Sequence}!"); - json = _StaticRuns[_Logistics.Sequence][0]; + json = collection[0]; lock (_StaticRuns) _ = _StaticRuns.Remove(_Logistics.Sequence); } diff --git a/Adaptation/FileHandlers/TIBCO/FileRead.cs b/Adaptation/FileHandlers/TIBCO/FileRead.cs index 8a6307e..0d6eeba 100644 --- a/Adaptation/FileHandlers/TIBCO/FileRead.cs +++ b/Adaptation/FileHandlers/TIBCO/FileRead.cs @@ -15,9 +15,9 @@ public class FileRead : Shared.FileRead, IFileRead #nullable enable - public const string BarcodeHostFileShare = @"\\messv02ecc1.ec.local\EC_Metrology_Si\BarcodeHost\API"; - public const string MetrologyFileShare = @"\\messv02ecc1.ec.local\EC_Metrology_Si\WorkMaterialOut\API"; - public const string LSL2SQLConnectionString = @"Data Source=10.95.128.28\PROD1,53959;Initial Catalog=LSL2SQL;Persist Security Info=True;User ID=srpadmin;Password=0okm9ijn;"; + public const string BarcodeHostFileShare = @"\\mesfs.infineon.com\EC_Metrology_Si\BarcodeHost\API"; + public const string MetrologyFileShare = @"\\mesfs.infineon.com\EC_Metrology_Si\WorkMaterialOut\API"; + public const string LSL2SQLConnectionString = @"Data Source=messqlec1.infineon.com\PROD1,53959;Initial Catalog=LSL2SQL;Persist Security Info=True;User ID=srpadmin;Password=0okm9ijn;"; private long? _TickOffset; diff --git a/Adaptation/FileHandlers/TIBCO/Transport/Job.cs b/Adaptation/FileHandlers/TIBCO/Transport/Job.cs index 77d3dc7..11c108b 100644 --- a/Adaptation/FileHandlers/TIBCO/Transport/Job.cs +++ b/Adaptation/FileHandlers/TIBCO/Transport/Job.cs @@ -362,7 +362,7 @@ public class Job if (fileInfo.LastWriteTime.Ticks > sequence) continue; lines = File.ReadAllLines(file); - if (!lines.Any()) + if (lines.Length == 0) continue; text = lines.First(); if (string.IsNullOrEmpty(text) || text.Length < 3 || text[0] != '1' || (text[1] != 't' && text[1] != 'T')) @@ -437,7 +437,7 @@ public class Job } private static string GetCommandText(int? rds, int? workOrderNumber, int? workOrderCassette, int? slot, int? reactor) - { + { // cSpell:disable StringBuilder result = new(); _ = result.Append(" select "). Append(" rr.rds_no "). @@ -512,7 +512,7 @@ public class Job 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) { @@ -535,7 +535,7 @@ public class Job { runs = JsonSerializer.Deserialize(json); } catch (Exception) { runs = Array.Empty(); } - if (!runs.Any()) + if (runs.Length == 0) { rdsNumber = null; comment = hyphen; @@ -583,7 +583,7 @@ public class Job { runs = JsonSerializer.Deserialize(json); } catch (Exception) { runs = Array.Empty(); } - if (!runs.Any()) + if (runs.Length == 0) { comment = hyphen; zone = string.Empty; diff --git a/Adaptation/FileHandlers/txt/Description.cs b/Adaptation/FileHandlers/txt/Description.cs index beb3d2c..447be5f 100644 --- a/Adaptation/FileHandlers/txt/Description.cs +++ b/Adaptation/FileHandlers/txt/Description.cs @@ -746,7 +746,7 @@ public class Description : IDescription, Shared.Properties.IDescription List IDescription.GetDescriptions(IFileRead fileRead, Logistics logistics, List tests, IProcessData iProcessData) { List results = new(); - if (iProcessData is null || !iProcessData.Details.Any() || iProcessData is not ProcessData processData) + if (iProcessData is null || iProcessData.Details.Count == 0 || iProcessData is not ProcessData processData) results.Add(GetDefault(fileRead, logistics)); else { diff --git a/Adaptation/FileHandlers/txt/FileRead.cs b/Adaptation/FileHandlers/txt/FileRead.cs index 42acc8c..63722d0 100644 --- a/Adaptation/FileHandlers/txt/FileRead.cs +++ b/Adaptation/FileHandlers/txt/FileRead.cs @@ -5,7 +5,6 @@ using Adaptation.Shared.Methods; using System; using System.Collections.Generic; using System.IO; -using System.Linq; using System.Text.Json; using System.Text.RegularExpressions; @@ -120,7 +119,7 @@ public class FileRead : Shared.FileRead, IFileRead } SetFileParameterLotID(mid); _Logistics.Update(mid, processData.Reactor); - if (!iProcessData.Details.Any()) + if (iProcessData.Details.Count == 0) throw new Exception(string.Concat("B) No Data - ", dateTime.Ticks)); results = iProcessData.GetResults(this, _Logistics, results.Item4); } diff --git a/Adaptation/Infineon/Monitoring/MonA/MonIn.cs b/Adaptation/Infineon/Monitoring/MonA/MonIn.cs index e9ffce8..7a8a711 100644 --- a/Adaptation/Infineon/Monitoring/MonA/MonIn.cs +++ b/Adaptation/Infineon/Monitoring/MonA/MonIn.cs @@ -18,21 +18,12 @@ public class MonIn : IMonIn, IDisposable public static MonIn GetInstance(string url = "http://moninhttp.{0}.infineon.com/input/text") { MonIn instance; - if (_Instances.ContainsKey(url)) + lock (_Instances) { - instance = _Instances[url]; - } - else - { - lock (_Instances) + if (_Instances.TryGetValue(url, out instance)) { - if (!_Instances.ContainsKey(url)) - { - instance = new MonIn(url); - _Instances.Add(url, instance); - } - else - instance = _Instances[url]; + instance = new MonIn(url); + _Instances.Add(url, instance); } } return instance; diff --git a/Adaptation/MET08DDUPSP1TBI-Development.yml b/Adaptation/MET08DDUPSP1TBI-Development.yml index 5868631..9cd4aad 100644 --- a/Adaptation/MET08DDUPSP1TBI-Development.yml +++ b/Adaptation/MET08DDUPSP1TBI-Development.yml @@ -7,7 +7,7 @@ trigger: - "Adaptation/*" pool: - name: Mesa-Windows-Service + name: eaf demands: MET08DDUPSP1TBI-Development steps: @@ -68,7 +68,8 @@ steps: - task: CopyFiles@2 displayName: "Copy Files to: - GhostPCL" inputs: - SourceFolder: '\\messv02ecc1.ec.local\EC_EAFRepository\Staging\DeploymentStorage\GhostPCL\gpcl6win64' + Contents: '*' + SourceFolder: '\\mesfs.infineon.com\EC_EAFRepository\Staging\DeploymentStorage\GhostPCL\gpcl6win64' TargetFolder: 'Adaptation\bin\$(Configuration)\net6.0\win-x64' OverWrite: true enabled: false @@ -76,7 +77,8 @@ steps: - task: CopyFiles@2 displayName: "Copy Files to: - LincPDFC" inputs: - SourceFolder: '\\messv02ecc1.ec.local\EC_EAFRepository\Staging\DeploymentStorage\LincPDFC\v2.6.6.21' + Contents: '*' + SourceFolder: '\\mesfs.infineon.com\EC_EAFRepository\Staging\DeploymentStorage\LincPDFC\v2.6.6.21' TargetFolder: 'Adaptation\bin\$(Configuration)\net6.0\win-x64' OverWrite: true enabled: false @@ -84,7 +86,8 @@ steps: - task: CopyFiles@2 displayName: "Copy Files to: - PDF-Text-Stripper" inputs: - SourceFolder: '\\messv02ecc1.ec.local\EC_EAFRepository\Staging\DeploymentStorage\PDF-Text-Stripper\v4.8.0.1' + Contents: '*' + SourceFolder: '\\mesfs.infineon.com\EC_EAFRepository\Staging\DeploymentStorage\PDF-Text-Stripper\v4.8.0.1' TargetFolder: 'Adaptation\bin\$(Configuration)\net6.0\win-x64' OverWrite: true enabled: false @@ -157,18 +160,18 @@ steps: - task: CopyFiles@2 displayName: 'Copy Files to: D:\Framework4.8' inputs: - SourceFolder: 'bin\$(Configuration)' Contents: "*$(Build.Repository.Name)*" + SourceFolder: 'bin\$(Configuration)' TargetFolder: 'D:\Framework4.8\$(GitCommitSeven)-$(Build.BuildId)-$(Build.Repository.Name)-$(Configuration)' OverWrite: true enabled: false - task: CopyFiles@2 - displayName: 'Copy Files to: \\messv02ecc1.ec.local\EC_EAFRepository' + displayName: 'Copy Files to: \\mesfs.infineon.com\EC_EAFRepository' inputs: - SourceFolder: 'bin\$(Configuration)' Contents: "*$(Build.Repository.Name)*" - TargetFolder: '\\messv02ecc1.ec.local\EC_EAFRepository\Staging\DeploymentStorage\Adaptation_$(Build.Repository.Name)' + SourceFolder: 'bin\$(Configuration)' + TargetFolder: '\\mesfs.infineon.com\EC_EAFRepository\Staging\DeploymentStorage\Adaptation_$(Build.Repository.Name)' OverWrite: true enabled: false diff --git a/Adaptation/MET08DDUPSP1TBI.Tests.csproj b/Adaptation/MET08DDUPSP1TBI.Tests.csproj index eadfa41..9c686b6 100644 --- a/Adaptation/MET08DDUPSP1TBI.Tests.csproj +++ b/Adaptation/MET08DDUPSP1TBI.Tests.csproj @@ -8,10 +8,9 @@ disable false - 10.0 disable win-x64 - net7.0 + net8.0 trx @@ -43,27 +42,27 @@ NU1701 NU1701 - - - - - - - - - - - - - - + + + + + + + + + + + + + + NU1701 - - - + + + - - + + @@ -93,10 +92,10 @@ PreserveNewest - + PreserveNewest - + PreserveNewest diff --git a/Adaptation/MET08DDUPSP1TBI.yml b/Adaptation/MET08DDUPSP1TBI.yml index de24b40..0d38704 100644 --- a/Adaptation/MET08DDUPSP1TBI.yml +++ b/Adaptation/MET08DDUPSP1TBI.yml @@ -7,7 +7,7 @@ trigger: - "Adaptation/*" pool: - name: Mesa-Windows-Service + name: eaf demands: MET08DDUPSP1TBI steps: @@ -68,21 +68,24 @@ steps: - task: CopyFiles@2 displayName: "Copy Files to: - GhostPCL" inputs: - SourceFolder: '\\messv02ecc1.ec.local\EC_EAFRepository\Staging\DeploymentStorage\GhostPCL\gpcl6win64' + Contents: '*' + SourceFolder: '\\mesfs.infineon.com\EC_EAFRepository\Staging\DeploymentStorage\GhostPCL\gpcl6win64' TargetFolder: 'Adaptation\bin\$(Configuration)\net6.0\win-x64' OverWrite: true - task: CopyFiles@2 displayName: "Copy Files to: - LincPDFC" inputs: - SourceFolder: '\\messv02ecc1.ec.local\EC_EAFRepository\Staging\DeploymentStorage\LincPDFC\v2.6.6.21' + Contents: '*' + SourceFolder: '\\mesfs.infineon.com\EC_EAFRepository\Staging\DeploymentStorage\LincPDFC\v2.6.6.21' TargetFolder: 'Adaptation\bin\$(Configuration)\net6.0\win-x64' OverWrite: true - task: CopyFiles@2 displayName: "Copy Files to: - PDF-Text-Stripper" inputs: - SourceFolder: '\\messv02ecc1.ec.local\EC_EAFRepository\Staging\DeploymentStorage\PDF-Text-Stripper\v4.8.0.1' + Contents: '*' + SourceFolder: '\\mesfs.infineon.com\EC_EAFRepository\Staging\DeploymentStorage\PDF-Text-Stripper\v4.8.0.1' TargetFolder: 'Adaptation\bin\$(Configuration)\net6.0\win-x64' OverWrite: true @@ -154,17 +157,17 @@ steps: - task: CopyFiles@2 displayName: 'Copy Files to: D:\Framework4.8' inputs: - SourceFolder: 'bin\$(Configuration)' Contents: "*$(Build.Repository.Name)*" + SourceFolder: 'bin\$(Configuration)' TargetFolder: 'D:\Framework4.8\$(GitCommitSeven)-$(Build.BuildId)-$(Build.Repository.Name)-$(Configuration)' OverWrite: true - task: CopyFiles@2 - displayName: 'Copy Files to: \\messv02ecc1.ec.local\EC_EAFRepository' + displayName: 'Copy Files to: \\mesfs.infineon.com\EC_EAFRepository' inputs: - SourceFolder: 'bin\$(Configuration)' Contents: "*$(Build.Repository.Name)*" - TargetFolder: '\\messv02ecc1.ec.local\EC_EAFRepository\Staging\DeploymentStorage\Adaptation_$(Build.Repository.Name)' + SourceFolder: 'bin\$(Configuration)' + TargetFolder: '\\mesfs.infineon.com\EC_EAFRepository\Staging\DeploymentStorage\Adaptation_$(Build.Repository.Name)' OverWrite: true - script: | diff --git a/Adaptation/Shared/Duplicator/Description.cs b/Adaptation/Shared/Duplicator/Description.cs index ee6eb49..964612e 100644 --- a/Adaptation/Shared/Duplicator/Description.cs +++ b/Adaptation/Shared/Duplicator/Description.cs @@ -110,7 +110,7 @@ public class Description : IDescription, Properties.IDescription List IDescription.GetDescriptions(IFileRead fileRead, Logistics logistics, List tests, IProcessData iProcessData) { List results = new(); - if (iProcessData is null || !iProcessData.Details.Any()) + if (iProcessData is null || iProcessData.Details.Count == 0) results.Add(GetDefault(fileRead, logistics)); else { diff --git a/Adaptation/Shared/FileRead.cs b/Adaptation/Shared/FileRead.cs index f66b29b..5f35f7b 100644 --- a/Adaptation/Shared/FileRead.cs +++ b/Adaptation/Shared/FileRead.cs @@ -163,7 +163,7 @@ public class FileRead : Properties.IFileRead protected static ModelObjectParameterDefinition[] GetProperties(string cellInstanceConnectionName, IList modelObjectParameters, string propertyNamePrefix) { ModelObjectParameterDefinition[] results = (from l in modelObjectParameters where l.Name.StartsWith(propertyNamePrefix) select l).ToArray(); - if (!results.Any()) + if (results.Length == 0) throw new Exception(cellInstanceConnectionName); return results; } @@ -171,7 +171,7 @@ public class FileRead : Properties.IFileRead protected static ModelObjectParameterDefinition[] GetProperties(string cellInstanceConnectionName, IList modelObjectParameters, string propertyNamePrefix, string propertyNameSuffix) { ModelObjectParameterDefinition[] results = (from l in modelObjectParameters where l.Name.StartsWith(propertyNamePrefix) && l.Name.EndsWith(propertyNameSuffix) select l).ToArray(); - if (!results.Any()) + if (results.Length == 0) throw new Exception(cellInstanceConnectionName); return results; } @@ -203,7 +203,7 @@ public class FileRead : Properties.IFileRead } lock (threadExceptions) { - if (threadExceptions.Any()) + if (threadExceptions.Count != 0) { foreach (Exception item in threadExceptions) _Log.Error(string.Concat(item.Message, Environment.NewLine, Environment.NewLine, item.StackTrace)); @@ -241,7 +241,7 @@ public class FileRead : Properties.IFileRead if (!_IsDuplicator) WriteAllLines(to, results); } - if (extractResults is not null && extractResults.Item4 is not null && extractResults.Item4.Any()) + if (extractResults is not null && extractResults.Item4 is not null && extractResults.Item4.Count != 0) { string itemFile; List directories = new(); @@ -268,7 +268,7 @@ public class FileRead : Properties.IFileRead string dateValue; string rdsPlaceholder = "%RDS%"; string mesEntityPlaceholder = "%MesEntity%"; - if (!descriptions.Any() || string.IsNullOrEmpty(descriptions[0].RDS)) + if (descriptions.Count == 0 || string.IsNullOrEmpty(descriptions[0].RDS)) rds = logistics.MID; else rds = descriptions[0].RDS; @@ -312,7 +312,7 @@ public class FileRead : Properties.IFileRead preWait = dateTime.AddMilliseconds(1234).Ticks; else preWait = dateTime.AddMilliseconds(_FileConnectorConfiguration.FileHandleWaitTime.Value).Ticks; - if (!collection.Any()) + if (collection.Count == 0) duplicateFiles.Add(duplicateFile); string fileName = Path.GetFileNameWithoutExtension(logistics.ReportFullPath); string successFile = string.Concat(successDirectory, @"\", Path.GetFileName(logistics.ReportFullPath)); @@ -422,10 +422,12 @@ public class FileRead : Properties.IFileRead protected void WritePDSF(IFileRead fileRead, JsonElement[] jsonElements) { string directory; + string weekOfYear = _Calendar.GetWeekOfYear(_Logistics.DateTimeFromSequence, CalendarWeekRule.FirstDay, DayOfWeek.Sunday).ToString("00"); + string weekDirectory = $"{_Logistics.DateTimeFromSequence:yyyy}_Week_{weekOfYear}{@"\"}{_Logistics.DateTimeFromSequence:yyyy-MM-dd}"; if (!_CellInstanceConnectionName.StartsWith(_CellInstanceName) && _CellInstanceConnectionNameBase == _EquipmentType) - directory = Path.Combine(_TracePath, _EquipmentType, "Target", _CellInstanceName, _CellInstanceConnectionName); + directory = Path.Combine(_TracePath, _EquipmentType, "Target", weekDirectory, _CellInstanceName, _CellInstanceConnectionName); else - directory = Path.Combine(_TracePath, _EquipmentType, "Source", _CellInstanceName, _CellInstanceConnectionName); + directory = Path.Combine(_TracePath, _EquipmentType, "Source", weekDirectory, _CellInstanceName, _CellInstanceConnectionName); if (!Directory.Exists(directory)) _ = Directory.CreateDirectory(directory); string file = Path.Combine(directory, string.Concat(_Logistics.MesEntity, "_", _Logistics.Sequence, ".ipdsf")); @@ -460,6 +462,7 @@ public class FileRead : Properties.IFileRead protected void TriggerEvents(Tuple> extractResults, List headerNames, Dictionary keyValuePairs) { object value; + string segments; string description; List list; for (int i = 0; i < extractResults.Item3.Length; i++) @@ -467,10 +470,10 @@ public class FileRead : Properties.IFileRead _Log.Debug(string.Concat("TriggerEvent - {", _Logistics.ReportFullPath, "} ", i, " of ", extractResults.Item3.Length)); foreach (JsonProperty jsonProperty in extractResults.Item3[i].EnumerateObject()) { - if (jsonProperty.Value.ValueKind != JsonValueKind.String || !keyValuePairs.ContainsKey(jsonProperty.Name)) + if (jsonProperty.Value.ValueKind != JsonValueKind.String || !keyValuePairs.TryGetValue(jsonProperty.Name, out segments)) description = string.Empty; else - description = keyValuePairs[jsonProperty.Name].Split('|')[0]; + description = segments.Split('|')[0]; if (!_UseCyclicalForDescription || headerNames.Contains(jsonProperty.Name)) value = jsonProperty.Value.ToString(); else @@ -502,10 +505,10 @@ public class FileRead : Properties.IFileRead matches = Directory.GetFiles(_FileConnectorConfiguration.SourceFileLocation, segments.Last(), SearchOption.AllDirectories); else matches = Directory.GetFiles(_FileConnectorConfiguration.SourceFileLocation, segments.Last(), SearchOption.TopDirectoryOnly); - if (matches.Any()) + if (matches.Length != 0) break; } - if (matches is null || !matches.Any()) + if (matches is null || matches.Length == 0) results = null; else { @@ -588,13 +591,13 @@ public class FileRead : Properties.IFileRead { if (!checkDirectory.Contains('_')) continue; - if (Directory.GetDirectories(checkDirectory, "*", SearchOption.TopDirectoryOnly).Any()) + if (Directory.GetDirectories(checkDirectory, "*", SearchOption.TopDirectoryOnly).Length != 0) continue; - if (Directory.GetFiles(checkDirectory, "*", SearchOption.TopDirectoryOnly).Any()) + if (Directory.GetFiles(checkDirectory, "*", SearchOption.TopDirectoryOnly).Length != 0) continue; - if (Directory.GetDirectories(checkDirectory, "*", SearchOption.AllDirectories).Any()) + if (Directory.GetDirectories(checkDirectory, "*", SearchOption.AllDirectories).Length != 0) continue; - if (Directory.GetFiles(checkDirectory, "*", SearchOption.AllDirectories).Any()) + if (Directory.GetFiles(checkDirectory, "*", SearchOption.AllDirectories).Length != 0) continue; if (new DirectoryInfo(checkDirectory).CreationTime > dateTime) continue; @@ -611,7 +614,7 @@ public class FileRead : Properties.IFileRead { foreach (string directory in (from l in directories orderby l.Split('\\').Length descending select l).Distinct()) { - if (Directory.Exists(directory) && !Directory.GetFiles(directory).Any()) + if (Directory.Exists(directory) && Directory.GetFiles(directory).Length == 0) Directory.Delete(directory); } } diff --git a/Adaptation/Shared/Logistics.cs b/Adaptation/Shared/Logistics.cs index a6ca882..cb1f805 100644 --- a/Adaptation/Shared/Logistics.cs +++ b/Adaptation/Shared/Logistics.cs @@ -91,7 +91,7 @@ public class Logistics : ILogistics string[] segments; _FileInfo = new(reportFullPath); _Logistics1 = logistics.Split(new string[] { Environment.NewLine }, StringSplitOptions.RemoveEmptyEntries).ToList(); - if (!Logistics1.Any() || !Logistics1[0].StartsWith("LOGISTICS_1")) + if (Logistics1.Count == 0 || !Logistics1[0].StartsWith("LOGISTICS_1")) { _NullData = null; _JobID = "null"; diff --git a/Adaptation/Shared/ProcessDataStandardFormat.cs b/Adaptation/Shared/ProcessDataStandardFormat.cs index b256f0f..136ccae 100644 --- a/Adaptation/Shared/ProcessDataStandardFormat.cs +++ b/Adaptation/Shared/ProcessDataStandardFormat.cs @@ -23,7 +23,7 @@ public class ProcessDataStandardFormat public static string GetPDSFText(IFileRead fileRead, Logistics logistics, JsonElement[] jsonElements, string logisticsText) { string result; - if (!jsonElements.Any()) + if (jsonElements.Length == 0) result = string.Empty; else { @@ -146,7 +146,7 @@ public class ProcessDataStandardFormat string logistics = pdsf.Item1; string[] columns = pdsf.Item2; string[] bodyLines = pdsf.Item3; - if (!bodyLines.Any() || !bodyLines[0].Contains('\t')) + if (bodyLines.Length == 0 || !bodyLines[0].Contains('\t')) results = JsonSerializer.Deserialize("[]"); else { @@ -211,9 +211,10 @@ public class ProcessDataStandardFormat public static Tuple>>> GetTestDictionary(Tuple pdsf) { Dictionary>> results = new(); + List collection; string testColumn = nameof(Test); Dictionary> keyValuePairs = GetDictionary(pdsf); - if (!keyValuePairs.ContainsKey(testColumn)) + if (!keyValuePairs.TryGetValue(testColumn, out collection)) throw new Exception(); int min; int max; @@ -221,9 +222,9 @@ public class ProcessDataStandardFormat List vs; string columnKey; Dictionary> tests = new(); - for (int i = 0; i < keyValuePairs[testColumn].Count; i++) + for (int i = 0; i < collection.Count; i++) { - if (Enum.TryParse(keyValuePairs[testColumn][i], out Test test)) + if (Enum.TryParse(collection[i], out Test test)) { if (!results.ContainsKey(test)) { @@ -325,7 +326,7 @@ public class ProcessDataStandardFormat _ = line.Append(';'); } } - if (!pairedParameterNames.Any()) + if (pairedParameterNames.Count == 0) { _ = line.Remove(line.Length - 1, 1); _ = result.AppendLine(line.ToString()); diff --git a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.4/MET08DDUPSP1TBI.cs b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.4/MET08DDUPSP1TBI.cs index a14caca..5082530 100644 --- a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.4/MET08DDUPSP1TBI.cs +++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.4/MET08DDUPSP1TBI.cs @@ -18,7 +18,7 @@ public class MET08DDUPSP1TBI : EAFLoggingUnitTesting internal static string DummyRoot { get; private set; } internal static MET08DDUPSP1TBI EAFLoggingUnitTesting { get; private set; } - static MET08DDUPSP1TBI() => DummyRoot = @"\\messv02ecc1.ec.local\EC_Characterization_Si\Dummy"; + static MET08DDUPSP1TBI() => DummyRoot = @"\\mesfs.infineon.com\EC_Characterization_Si\Dummy"; public MET08DDUPSP1TBI() : base(DummyRoot, testContext: null, declaringType: null, skipEquipmentDictionary: false) { 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 d5ec785..cbc07f8 100644 --- a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.4/SP101-EQPT.cs +++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.4/SP101-EQPT.cs @@ -17,7 +17,7 @@ public class SP101_EQPT : EAFLoggingUnitTesting internal static string DummyRoot { get; private set; } internal static SP101_EQPT EAFLoggingUnitTesting { get; private set; } - static SP101_EQPT() => DummyRoot = @"\\messv02ecc1.ec.local\EC_Characterization_Si\Dummy"; + static SP101_EQPT() => DummyRoot = @"\\mesfs.infineon.com\EC_Characterization_Si\Dummy"; public SP101_EQPT() : base(DummyRoot, testContext: null, declaringType: null, skipEquipmentDictionary: false) { diff --git a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.4/SP101.cs b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.4/SP101.cs index c52b677..09c5f8f 100644 --- a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.4/SP101.cs +++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.4/SP101.cs @@ -18,7 +18,7 @@ public class SP101 : EAFLoggingUnitTesting internal static string DummyRoot { get; private set; } internal static SP101 EAFLoggingUnitTesting { get; private set; } - static SP101() => DummyRoot = @"\\messv02ecc1.ec.local\EC_Characterization_Si\Dummy"; + static SP101() => DummyRoot = @"\\mesfs.infineon.com\EC_Characterization_Si\Dummy"; public SP101() : base(DummyRoot, testContext: null, declaringType: null, skipEquipmentDictionary: false) { 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 7300a5a..fc66be4 100644 --- a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.47.0/SP101-EQPT.cs +++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.47.0/SP101-EQPT.cs @@ -17,7 +17,7 @@ public class SP101_EQPT : EAFLoggingUnitTesting internal static string DummyRoot { get; private set; } internal static SP101_EQPT EAFLoggingUnitTesting { get; private set; } - static SP101_EQPT() => DummyRoot = @"\\messv02ecc1.ec.local\EC_Characterization_Si\Dummy"; + static SP101_EQPT() => DummyRoot = @"\\mesfs.infineon.com\EC_Characterization_Si\Dummy"; public SP101_EQPT() : base(DummyRoot, testContext: null, declaringType: null, skipEquipmentDictionary: false) { diff --git a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.47.0/SP101.cs b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.47.0/SP101.cs index 6a95695..e1dd7c3 100644 --- a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.47.0/SP101.cs +++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.47.0/SP101.cs @@ -18,7 +18,7 @@ public class SP101 : EAFLoggingUnitTesting internal static string DummyRoot { get; private set; } internal static SP101 EAFLoggingUnitTesting { get; private set; } - static SP101() => DummyRoot = @"\\messv02ecc1.ec.local\EC_Characterization_Si\Dummy"; + static SP101() => DummyRoot = @"\\mesfs.infineon.com\EC_Characterization_Si\Dummy"; public SP101() : base(DummyRoot, testContext: null, declaringType: null, skipEquipmentDictionary: false) { diff --git a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.49.0/MET08DDUPSP1TBI.cs b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.49.0/MET08DDUPSP1TBI.cs index efd7653..38befff 100644 --- a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.49.0/MET08DDUPSP1TBI.cs +++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.49.0/MET08DDUPSP1TBI.cs @@ -18,7 +18,7 @@ public class MET08DDUPSP1TBI : EAFLoggingUnitTesting internal static string DummyRoot { get; private set; } internal static MET08DDUPSP1TBI EAFLoggingUnitTesting { get; private set; } - static MET08DDUPSP1TBI() => DummyRoot = @"\\messv02ecc1.ec.local\EC_Characterization_Si\Dummy"; + static MET08DDUPSP1TBI() => DummyRoot = @"\\mesfs.infineon.com\EC_Characterization_Si\Dummy"; public MET08DDUPSP1TBI() : base(DummyRoot, testContext: null, declaringType: null, skipEquipmentDictionary: false) { diff --git a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.49.0/SP101.cs b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.49.0/SP101.cs index ceea6dc..d11ef21 100644 --- a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.49.0/SP101.cs +++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.49.0/SP101.cs @@ -18,7 +18,7 @@ public class SP101 : EAFLoggingUnitTesting internal static string DummyRoot { get; private set; } internal static SP101 EAFLoggingUnitTesting { get; private set; } - static SP101() => DummyRoot = @"\\messv02ecc1.ec.local\EC_Characterization_Si\Dummy"; + static SP101() => DummyRoot = @"\\mesfs.infineon.com\EC_Characterization_Si\Dummy"; public SP101() : base(DummyRoot, testContext: null, declaringType: null, skipEquipmentDictionary: false) { diff --git a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.49.2/MET08DDUPSP1TBI.cs b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.49.2/MET08DDUPSP1TBI.cs index b5177d1..2d5a487 100644 --- a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.49.2/MET08DDUPSP1TBI.cs +++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.49.2/MET08DDUPSP1TBI.cs @@ -18,7 +18,7 @@ public class MET08DDUPSP1TBI : EAFLoggingUnitTesting internal static string DummyRoot { get; private set; } internal static MET08DDUPSP1TBI EAFLoggingUnitTesting { get; private set; } - static MET08DDUPSP1TBI() => DummyRoot = @"\\messv02ecc1.ec.local\EC_Characterization_Si\Dummy"; + static MET08DDUPSP1TBI() => DummyRoot = @"\\mesfs.infineon.com\EC_Characterization_Si\Dummy"; public MET08DDUPSP1TBI() : base(DummyRoot, testContext: null, declaringType: null, skipEquipmentDictionary: false) { diff --git a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.49.2/SP101.cs b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.49.2/SP101.cs index c730ebb..ab7fc3c 100644 --- a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.49.2/SP101.cs +++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.49.2/SP101.cs @@ -18,7 +18,7 @@ public class SP101 : EAFLoggingUnitTesting internal static string DummyRoot { get; private set; } internal static SP101 EAFLoggingUnitTesting { get; private set; } - static SP101() => DummyRoot = @"\\messv02ecc1.ec.local\EC_Characterization_Si\Dummy"; + static SP101() => DummyRoot = @"\\mesfs.infineon.com\EC_Characterization_Si\Dummy"; public SP101() : base(DummyRoot, testContext: null, declaringType: null, skipEquipmentDictionary: false) { diff --git a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.49.3/MET08DDUPSP1TBI.cs b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.49.3/MET08DDUPSP1TBI.cs index 2a113db..5acefdf 100644 --- a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.49.3/MET08DDUPSP1TBI.cs +++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.49.3/MET08DDUPSP1TBI.cs @@ -18,7 +18,7 @@ public class MET08DDUPSP1TBI : EAFLoggingUnitTesting internal static string DummyRoot { get; private set; } internal static MET08DDUPSP1TBI EAFLoggingUnitTesting { get; private set; } - static MET08DDUPSP1TBI() => DummyRoot = @"\\messv02ecc1.ec.local\EC_Characterization_Si\Dummy"; + static MET08DDUPSP1TBI() => DummyRoot = @"\\mesfs.infineon.com\EC_Characterization_Si\Dummy"; public MET08DDUPSP1TBI() : base(DummyRoot, testContext: null, declaringType: null, skipEquipmentDictionary: false) { @@ -47,9 +47,7 @@ public class MET08DDUPSP1TBI : EAFLoggingUnitTesting EAFLoggingUnitTesting?.Dispose(); } -#if DEBUG [Ignore] -#endif [TestMethod] public void Staging__v2_49_3__MET08DDUPSP1TBI__MoveMatchingFiles() { @@ -60,9 +58,7 @@ 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() { @@ -73,9 +69,7 @@ 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() { @@ -86,9 +80,7 @@ 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() { @@ -99,9 +91,7 @@ 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() { @@ -112,9 +102,7 @@ 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() { @@ -125,9 +113,7 @@ 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() { @@ -138,9 +124,7 @@ 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() { @@ -151,9 +135,7 @@ 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() { @@ -164,9 +146,7 @@ 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() { 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 83fa3e9..d989f05 100644 --- a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.49.3/SP101-EQPT.cs +++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.49.3/SP101-EQPT.cs @@ -17,7 +17,7 @@ public class SP101_EQPT : EAFLoggingUnitTesting internal static string DummyRoot { get; private set; } internal static SP101_EQPT EAFLoggingUnitTesting { get; private set; } - static SP101_EQPT() => DummyRoot = @"\\messv02ecc1.ec.local\EC_Characterization_Si\Dummy"; + static SP101_EQPT() => DummyRoot = @"\\mesfs.infineon.com\EC_Characterization_Si\Dummy"; public SP101_EQPT() : base(DummyRoot, testContext: null, declaringType: null, skipEquipmentDictionary: false) { @@ -53,9 +53,7 @@ public class SP101_EQPT : EAFLoggingUnitTesting catch (Exception) { } } -#if DEBUG [Ignore] -#endif [TestMethod] public void Staging__v2_49_3__SP101_EQPT__MoveAllFiles() { diff --git a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.49.3/SP101.cs b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.49.3/SP101.cs index a0c1829..420605e 100644 --- a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.49.3/SP101.cs +++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.49.3/SP101.cs @@ -18,7 +18,7 @@ public class SP101 : EAFLoggingUnitTesting internal static string DummyRoot { get; private set; } internal static SP101 EAFLoggingUnitTesting { get; private set; } - static SP101() => DummyRoot = @"\\messv02ecc1.ec.local\EC_Characterization_Si\Dummy"; + static SP101() => DummyRoot = @"\\mesfs.infineon.com\EC_Characterization_Si\Dummy"; public SP101() : base(DummyRoot, testContext: null, declaringType: null, skipEquipmentDictionary: false) { @@ -47,9 +47,7 @@ public class SP101 : EAFLoggingUnitTesting EAFLoggingUnitTesting?.Dispose(); } -#if DEBUG [Ignore] -#endif [TestMethod] public void Staging__v2_49_3__SP101__txt() { diff --git a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.52.0/MET08DDUPSP1TBI.cs b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.52.0/MET08DDUPSP1TBI.cs new file mode 100644 index 0000000..fb6581c --- /dev/null +++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.52.0/MET08DDUPSP1TBI.cs @@ -0,0 +1,191 @@ +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_52_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_52_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_52_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_52_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_52_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_52_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_52_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_52_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_52_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_52_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_52_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")); + } + + [Ignore] + [TestMethod] + public void Staging__v2_52_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")); + } + +} \ 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 new file mode 100644 index 0000000..c3eec55 --- /dev/null +++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.52.0/SP101-EQPT.cs @@ -0,0 +1,70 @@ +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_52_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) { } + } + +#if DEBUG + [Ignore] +#endif + [TestMethod] + public void Staging__v2_52_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(); + } + +} \ 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 new file mode 100644 index 0000000..b2d9c62 --- /dev/null +++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.52.0/SP101.cs @@ -0,0 +1,63 @@ +using Adaptation._Tests.Shared; +using Microsoft.Extensions.Logging; +using Microsoft.VisualStudio.TestTools.UnitTesting; +using System; +using System.Diagnostics; +using System.IO; +using System.Reflection; + +namespace Adaptation._Tests.CreateSelfDescription.Staging.v2_52_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_52_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")); + } + +} \ 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 ee520d0..8d393b7 100644 --- a/Adaptation/_Tests/Extract/Staging/v2.49.2/MET08DDUPSP1TBI.cs +++ b/Adaptation/_Tests/Extract/Staging/v2.49.2/MET08DDUPSP1TBI.cs @@ -97,15 +97,11 @@ public class MET08DDUPSP1TBI [TestMethod] public void Staging__v2_49_2__MET08DDUPSP1TBI__Dummy() => _MET08DDUPSP1TBI.Staging__v2_49_2__MET08DDUPSP1TBI__Dummy(); -#if true [Ignore] -#endif [TestMethod] public void Staging__v2_49_2__MET08DDUPSP1TBI__TIBCO() => _MET08DDUPSP1TBI.Staging__v2_49_2__MET08DDUPSP1TBI__TIBCO(); -#if true [Ignore] -#endif [TestMethod] public void Staging__v2_49_2__MET08DDUPSP1TBI__TIBCO638217888620242702__Normal() { diff --git a/Adaptation/_Tests/Extract/Staging/v2.49.3/MET08DDUPSP1TBI.cs b/Adaptation/_Tests/Extract/Staging/v2.49.3/MET08DDUPSP1TBI.cs index 783aec8..5f2f0dc 100644 --- a/Adaptation/_Tests/Extract/Staging/v2.49.3/MET08DDUPSP1TBI.cs +++ b/Adaptation/_Tests/Extract/Staging/v2.49.3/MET08DDUPSP1TBI.cs @@ -30,15 +30,11 @@ 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() { @@ -53,27 +49,19 @@ 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() { @@ -87,39 +75,27 @@ 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(); diff --git a/Adaptation/_Tests/Extract/Staging/v2.49.3/SP101.cs b/Adaptation/_Tests/Extract/Staging/v2.49.3/SP101.cs index dc1ca8f..9fdbeae 100644 --- a/Adaptation/_Tests/Extract/Staging/v2.49.3/SP101.cs +++ b/Adaptation/_Tests/Extract/Staging/v2.49.3/SP101.cs @@ -30,15 +30,11 @@ 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() { diff --git a/Adaptation/_Tests/Extract/Staging/v2.52.0/MET08DDUPSP1TBI.cs b/Adaptation/_Tests/Extract/Staging/v2.52.0/MET08DDUPSP1TBI.cs new file mode 100644 index 0000000..b3dca7f --- /dev/null +++ b/Adaptation/_Tests/Extract/Staging/v2.52.0/MET08DDUPSP1TBI.cs @@ -0,0 +1,148 @@ +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_52_0; + +[TestClass] +public class MET08DDUPSP1TBI +{ + +#pragma warning disable CA2254 +#pragma warning disable IDE0060 + + private static CreateSelfDescription.Staging.v2_52_0.MET08DDUPSP1TBI _MET08DDUPSP1TBI; + + [ClassInitialize] + public static void ClassInitialize(TestContext testContext) + { + CreateSelfDescription.Staging.v2_52_0.MET08DDUPSP1TBI.ClassInitialize(testContext); + _MET08DDUPSP1TBI = CreateSelfDescription.Staging.v2_52_0.MET08DDUPSP1TBI.EAFLoggingUnitTesting; + } + + private static void NonThrowTryCatch() + { + try + { throw new Exception(); } + catch (Exception) { } + } + +#if DEBUG + [Ignore] +#endif + [TestMethod] + public void Staging__v2_52_0__MET08DDUPSP1TBI__MoveMatchingFiles() => _MET08DDUPSP1TBI.Staging__v2_52_0__MET08DDUPSP1TBI__MoveMatchingFiles(); + +#if DEBUG + [Ignore] +#endif + [TestMethod] + public void Staging__v2_52_0__MET08DDUPSP1TBI__MoveMatchingFiles637955319879801344__Normal() + { + string check = "*.pdsf"; + bool validatePDSF = false; + MethodBase methodBase = new StackFrame().GetMethod(); + _MET08DDUPSP1TBI.Staging__v2_52_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_52_0__MET08DDUPSP1TBI__OpenInsightMetrologyViewer() => _MET08DDUPSP1TBI.Staging__v2_52_0__MET08DDUPSP1TBI__OpenInsightMetrologyViewer(); + +#if DEBUG + [Ignore] +#endif + [TestMethod] + public void Staging__v2_52_0__MET08DDUPSP1TBI__IQSSi() => _MET08DDUPSP1TBI.Staging__v2_52_0__MET08DDUPSP1TBI__IQSSi(); + +#if DEBUG + [Ignore] +#endif + [TestMethod] + public void Staging__v2_52_0__MET08DDUPSP1TBI__OpenInsight() => _MET08DDUPSP1TBI.Staging__v2_52_0__MET08DDUPSP1TBI__OpenInsight(); + +#if DEBUG + [Ignore] +#endif + [TestMethod] + public void Staging__v2_52_0__MET08DDUPSP1TBI__OpenInsight638052814829645888__IqsSql() + { + string check = "*.pdsf"; + MethodBase methodBase = new StackFrame().GetMethod(); + _MET08DDUPSP1TBI.Staging__v2_52_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_52_0__MET08DDUPSP1TBI__OpenInsightMetrologyViewerAttachments() => _MET08DDUPSP1TBI.Staging__v2_52_0__MET08DDUPSP1TBI__OpenInsightMetrologyViewerAttachments(); + +#if DEBUG + [Ignore] +#endif + [TestMethod] + public void Staging__v2_52_0__MET08DDUPSP1TBI__APC() => _MET08DDUPSP1TBI.Staging__v2_52_0__MET08DDUPSP1TBI__APC(); + +#if DEBUG + [Ignore] +#endif + [TestMethod] + public void Staging__v2_52_0__MET08DDUPSP1TBI__SPaCe() => _MET08DDUPSP1TBI.Staging__v2_52_0__MET08DDUPSP1TBI__SPaCe(); + +#if DEBUG + [Ignore] +#endif + [TestMethod] + public void Staging__v2_52_0__MET08DDUPSP1TBI__Processed() => _MET08DDUPSP1TBI.Staging__v2_52_0__MET08DDUPSP1TBI__Processed(); + +#if DEBUG + [Ignore] +#endif + [TestMethod] + public void Staging__v2_52_0__MET08DDUPSP1TBI__Archive() => _MET08DDUPSP1TBI.Staging__v2_52_0__MET08DDUPSP1TBI__Archive(); + +#if DEBUG + [Ignore] +#endif + [TestMethod] + public void Staging__v2_52_0__MET08DDUPSP1TBI__Dummy() => _MET08DDUPSP1TBI.Staging__v2_52_0__MET08DDUPSP1TBI__Dummy(); + +#if true + [Ignore] +#endif + [TestMethod] + public void Staging__v2_52_0__MET08DDUPSP1TBI__TIBCO() => _MET08DDUPSP1TBI.Staging__v2_52_0__MET08DDUPSP1TBI__TIBCO(); + +#if true + [Ignore] +#endif + [TestMethod] + public void Staging__v2_52_0__MET08DDUPSP1TBI__TIBCO638217888620242702__Normal() + { + string check = "*.idc"; + MethodBase methodBase = new StackFrame().GetMethod(); + _MET08DDUPSP1TBI.Staging__v2_52_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(); + } + +} \ 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 new file mode 100644 index 0000000..cee9c9b --- /dev/null +++ b/Adaptation/_Tests/Extract/Staging/v2.52.0/SP101-EQPT.cs @@ -0,0 +1,27 @@ +using Microsoft.VisualStudio.TestTools.UnitTesting; + +namespace Adaptation._Tests.Extract.Staging.v2_52_0; + +[TestClass] +public class SP101_EQPT +{ + +#pragma warning disable CA2254 +#pragma warning disable IDE0060 + + private static CreateSelfDescription.Staging.v2_52_0.SP101_EQPT _SP101_EQPT; + + [ClassInitialize] + public static void ClassInitialize(TestContext testContext) + { + CreateSelfDescription.Staging.v2_52_0.SP101_EQPT.ClassInitialize(testContext); + _SP101_EQPT = CreateSelfDescription.Staging.v2_52_0.SP101_EQPT.EAFLoggingUnitTesting; + } + +#if true + [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 diff --git a/Adaptation/_Tests/Extract/Staging/v2.52.0/SP101.cs b/Adaptation/_Tests/Extract/Staging/v2.52.0/SP101.cs new file mode 100644 index 0000000..c6da0d6 --- /dev/null +++ b/Adaptation/_Tests/Extract/Staging/v2.52.0/SP101.cs @@ -0,0 +1,56 @@ +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_52_0; + +[TestClass] +public class SP101 +{ + +#pragma warning disable CA2254 +#pragma warning disable IDE0060 + + private static CreateSelfDescription.Staging.v2_52_0.SP101 _SP101; + + [ClassInitialize] + public static void ClassInitialize(TestContext testContext) + { + CreateSelfDescription.Staging.v2_52_0.SP101.ClassInitialize(testContext); + _SP101 = CreateSelfDescription.Staging.v2_52_0.SP101.EAFLoggingUnitTesting; + } + + private static void NonThrowTryCatch() + { + try + { throw new Exception(); } + catch (Exception) { } + } + +#if DEBUG + [Ignore] +#endif + [TestMethod] + public void Staging__v2_52_0__SP101__txt() => _SP101.Staging__v2_52_0__SP101__txt(); + +#if DEBUG + [Ignore] +#endif + [TestMethod] + public void Staging__v2_52_0__SP101__txt637955319879801344__Normal() + { + string check = "*.txt"; + bool validatePDSF = false; + _SP101.Staging__v2_52_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(); + } + +} \ No newline at end of file diff --git a/Adaptation/_Tests/Shared/AdaptationTesting.cs b/Adaptation/_Tests/Shared/AdaptationTesting.cs index e55beee..dea1507 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.mes.infineon.com:9003", - "Staging" => "eaf-staging.mes.infineon.com:9003", - "Production" => "eaf-prod.mes.infineon.com:9003", + "Development" => "eaf-dev.mesfs.infineon.com:9003", + "Staging" => "eaf-staging.mesfs.infineon.com:9003", + "Production" => "eaf-prod.mesfs.infineon.com:9003", _ => throw new Exception(), }; return result; @@ -305,7 +305,7 @@ public class AdaptationTesting : ISMTP else { results = Directory.GetFiles(mbn.TextFileDirectory, "*.txt", SearchOption.TopDirectoryOnly); - if (!string.IsNullOrEmpty(mbn.Ticks) && _HasWaitForProperty && !results.Any()) + if (!string.IsNullOrEmpty(mbn.Ticks) && _HasWaitForProperty && results.Length == 0) { _ = Process.Start("explorer.exe", mbn.TextFileDirectory); File.WriteAllText(Path.Combine(mbn.TextFileDirectory, "_ Why.why"), string.Empty); @@ -373,9 +373,7 @@ public class AdaptationTesting : ISMTP Tuple result; CellInstanceVersion cellInstanceVersion; string cellInstanceServiceV2 = string.Concat("http://", _HostNameAndPort, "/CellInstanceServiceV2/", cellInstanceName, "/", cellInstanceVersionName, "/configuration"); - if (_CellInstanceVersions.ContainsKey(cellInstanceServiceV2)) - cellInstanceVersion = _CellInstanceVersions[cellInstanceServiceV2]; - else + if (!_CellInstanceVersions.TryGetValue(cellInstanceServiceV2, out cellInstanceVersion)) { cellInstanceVersion = GetCellInstanceVersion(cellInstanceServiceV2); _CellInstanceVersions.Add(cellInstanceServiceV2, cellInstanceVersion); @@ -401,7 +399,7 @@ public class AdaptationTesting : ISMTP } } } - if (!results.Any() || (!string.IsNullOrEmpty(cellInstanceConnectionName) && !results.ContainsKey(cellInstanceConnectionName))) + if (results.Count == 0 || (!string.IsNullOrEmpty(cellInstanceConnectionName) && !results.ContainsKey(cellInstanceConnectionName))) throw new Exception("Match not found (check test method name matches Mango)!"); return results; } @@ -413,9 +411,8 @@ public class AdaptationTesting : ISMTP result = componentModelComponentsIndexes.ElementAt(0).Value; else { - if (componentModelComponentsIndexes is null || !componentModelComponentsIndexes.ContainsKey(cellInstanceConnectionName)) + if (componentModelComponentsIndexes is null || !componentModelComponentsIndexes.TryGetValue(cellInstanceConnectionName, out result)) throw new Exception(); - result = componentModelComponentsIndexes[cellInstanceConnectionName]; } return result; } @@ -487,7 +484,7 @@ public class AdaptationTesting : ISMTP else if (i == 1) _ = stringBuilder. AppendLine(). - Append("static ").Append(cellInstanceNameWithoutHyphen).AppendLine("() => DummyRoot = @\"\\\\messv02ecc1.ec.local\\EC_Characterization_Si\\Dummy\";"). + Append("static ").Append(cellInstanceNameWithoutHyphen).AppendLine("() => DummyRoot = @\"\\\\mesfs.infineon.com\\EC_Characterization_Si\\Dummy\";"). AppendLine(). Append("public ").Append(cellInstanceNameWithoutHyphen).AppendLine("() : base(DummyRoot, testContext: null, declaringType: null, skipEquipmentDictionary: false)"). AppendLine("{"). @@ -596,7 +593,7 @@ public class AdaptationTesting : ISMTP throw new Exception(); _ = stringBuilder.Clear(); } - if (componentsCellComponentCellComponentEquipmentDictionaryNames.Any() && string.IsNullOrEmpty(cellInstanceVersion.FrozenBy)) + if (componentsCellComponentCellComponentEquipmentDictionaryNames.Count != 0 && string.IsNullOrEmpty(cellInstanceVersion.FrozenBy)) { if (!cellInstanceVersion.CellCommunicatingRule.EndsWith(".Communicating") || !(from l in componentsCellComponentCellComponentEquipmentNames where l == cellInstanceVersion.CellCommunicatingRule.Split('.')[0] select true).Any()) throw new Exception($"{methodName} - CellCommunicatingRule not correct in Mango!"); @@ -648,9 +645,7 @@ public class AdaptationTesting : ISMTP Tuple result; FileConnectorConfiguration fileConnectorConfiguration; string cellInstanceServiceV2With = string.Concat(cellInstanceVersionTuple.Item1, '/', cellInstanceConnectionName); - if (_FileConnectorConfigurations.ContainsKey(cellInstanceServiceV2With)) - fileConnectorConfiguration = _FileConnectorConfigurations[cellInstanceServiceV2With]; - else + if (!_FileConnectorConfigurations.TryGetValue(cellInstanceServiceV2With, out fileConnectorConfiguration)) { Dictionary componentModelComponentsIndexes = GetComponentModelComponentsIndexes(cellInstanceVersionTuple.Item2, cellInstanceConnectionName); int[] cellInstanceConnectionNameIndexes = GetCellInstanceConnectionNameIndexes(cellInstanceConnectionName, componentModelComponentsIndexes); @@ -696,9 +691,7 @@ public class AdaptationTesting : ISMTP int[] cellInstanceConnectionNameIndexes = GetCellInstanceConnectionNameIndexes(cellInstanceConnectionName, componentModelComponentsIndexes); ComponentsCellComponentCellComponent componentsCellComponentCellComponent = cellInstanceVersion.ComponentModel.Components[cellInstanceConnectionNameIndexes[0]].Children[cellInstanceConnectionNameIndexes[1]]; string equipmentTypeServiceV2 = string.Concat("http://", _HostNameAndPort, "/EquipmentTypeServiceV2/", componentsCellComponentCellComponent.Equipment.EquipmentType.Name, "/", componentsCellComponentCellComponent.Equipment.EquipmentType.Version, "/configuration"); - if (_EquipmentTypeVersions.ContainsKey(equipmentTypeServiceV2)) - equipmentTypeVersion = _EquipmentTypeVersions[equipmentTypeServiceV2]; - else + if (!_EquipmentTypeVersions.TryGetValue(equipmentTypeServiceV2, out equipmentTypeVersion)) { equipmentTypeVersion = GetEquipmentTypeVersion(equipmentTypeServiceV2); _EquipmentTypeVersions.Add(equipmentTypeServiceV2, equipmentTypeVersion); @@ -763,7 +756,7 @@ public class AdaptationTesting : ISMTP string[] results; string equipmentDictionaryName; string equipmentDictionaryVersionName; - if (_SkipEquipmentDictionary || equipmentTypeVersion?.EventActionSequences is null || !equipmentTypeVersion.EventActionSequences.Any() || !(from l in equipmentTypeVersion.EventActionSequences where l.HandledEvent.StartsWith("Equipment.FileRead") select 1).Any()) + if (_SkipEquipmentDictionary || equipmentTypeVersion?.EventActionSequences is null || equipmentTypeVersion.EventActionSequences.Length == 0 || !(from l in equipmentTypeVersion.EventActionSequences where l.HandledEvent.StartsWith("Equipment.FileRead") select 1).Any()) { equipmentDictionaryName = string.Empty; equipmentDictionaryVersionName = string.Empty; @@ -834,9 +827,7 @@ public class AdaptationTesting : ISMTP equipmentDictionaryVersion = null; else { - if (_EquipmentDictionaryVersions.ContainsKey(equipmentDictionaryServiceV2)) - equipmentDictionaryVersion = _EquipmentDictionaryVersions[equipmentDictionaryServiceV2]; - else + if (!_EquipmentDictionaryVersions.TryGetValue(equipmentDictionaryServiceV2, out equipmentDictionaryVersion)) { equipmentDictionaryVersion = GetEquipmentDictionaryVersion(equipmentDictionaryServiceV2); _EquipmentDictionaryVersions.Add(equipmentDictionaryServiceV2, equipmentDictionaryVersion); @@ -850,14 +841,15 @@ public class AdaptationTesting : ISMTP { Tuple>> result; List> results; + List> collection; if (_SkipEquipmentDictionary) results = new List>(); else if (string.IsNullOrEmpty(equipmentDictionaryVersionTuple.Item1)) throw new Exception(); else if (equipmentDictionaryVersionTuple?.Item4?.Events?.Event is null) results = new List>(); - else if (_EquipmentDictionaryEventDescriptions.ContainsKey(equipmentDictionaryVersionTuple.Item1)) - results = _EquipmentDictionaryEventDescriptions[equipmentDictionaryVersionTuple.Item1]; + else if (_EquipmentDictionaryEventDescriptions.TryGetValue(equipmentDictionaryVersionTuple.Item1, out collection)) + results = collection; else { results = new List>(); @@ -963,25 +955,33 @@ public class AdaptationTesting : ISMTP } if (_TestContext.FullyQualifiedTestClassName.Contains(nameof(Extract))) { - if (!string.IsNullOrEmpty(fileConnectorConfigurationTuple.Item2.ErrorTargetFileLocation)) + try { - if (!Directory.Exists(fileConnectorConfigurationTuple.Item2.ErrorTargetFileLocation)) - _ = Directory.CreateDirectory(fileConnectorConfigurationTuple.Item2.ErrorTargetFileLocation); + if (!string.IsNullOrEmpty(fileConnectorConfigurationTuple.Item2.ErrorTargetFileLocation)) + { + if (!Directory.Exists(fileConnectorConfigurationTuple.Item2.ErrorTargetFileLocation)) + _ = Directory.CreateDirectory(fileConnectorConfigurationTuple.Item2.ErrorTargetFileLocation); + } + if (!string.IsNullOrEmpty(fileConnectorConfigurationTuple.Item2.SourceFileLocation)) + { + if (!Directory.Exists(fileConnectorConfigurationTuple.Item2.SourceFileLocation)) + _ = Directory.CreateDirectory(fileConnectorConfigurationTuple.Item2.SourceFileLocation); + } + if (!string.IsNullOrEmpty(fileConnectorConfigurationTuple.Item2.TargetFileLocation)) + { + if (!Directory.Exists(fileConnectorConfigurationTuple.Item2.TargetFileLocation)) + _ = Directory.CreateDirectory(fileConnectorConfigurationTuple.Item2.TargetFileLocation); + } + if (!string.IsNullOrEmpty(fileConnectorConfigurationTuple.Item2.AlternateTargetFolder)) + { + if (!Directory.Exists(fileConnectorConfigurationTuple.Item2.AlternateTargetFolder)) + _ = Directory.CreateDirectory(fileConnectorConfigurationTuple.Item2.AlternateTargetFolder); + } } - if (!string.IsNullOrEmpty(fileConnectorConfigurationTuple.Item2.SourceFileLocation)) + catch (IOException ex) { - if (!Directory.Exists(fileConnectorConfigurationTuple.Item2.SourceFileLocation)) - _ = Directory.CreateDirectory(fileConnectorConfigurationTuple.Item2.SourceFileLocation); - } - if (!string.IsNullOrEmpty(fileConnectorConfigurationTuple.Item2.TargetFileLocation)) - { - if (!Directory.Exists(fileConnectorConfigurationTuple.Item2.TargetFileLocation)) - _ = Directory.CreateDirectory(fileConnectorConfigurationTuple.Item2.TargetFileLocation); - } - if (!string.IsNullOrEmpty(fileConnectorConfigurationTuple.Item2.AlternateTargetFolder)) - { - if (!Directory.Exists(fileConnectorConfigurationTuple.Item2.AlternateTargetFolder)) - _ = Directory.CreateDirectory(fileConnectorConfigurationTuple.Item2.AlternateTargetFolder); + if (!ex.Message.Contains("SMB1")) + throw; } } result = FileHandlers.CellInstanceConnectionName.Get(this, fileParameter, mbn.CellInstanceName, mbn.CellInstanceConnectionName, fileConnectorConfigurationTuple.Item2, equipmentTypeVersionTuple.Item2, parameterizedModelObjectDefinitionTypeTuple.Item2, modelObjectParametersTuple.Item2, equipmentDictionaryVersionTuple.Item2, dummyRuns, staticRuns, useCyclicalForDescription, connectionCount: cellInstanceVersionTuple.Item2.EquipmentConnections.Length); @@ -1001,7 +1001,7 @@ public class AdaptationTesting : ISMTP string sourceFileLocation = string.Empty; MethodBaseName mbn = GetMethodBaseName(methodBase); string[] textFiles = GetTextFiles(mbn); - if (!textFiles.Any()) + if (textFiles.Length == 0) { if (_HasWaitForProperty) throw new Exception("Set text file!"); @@ -1065,7 +1065,7 @@ public class AdaptationTesting : ISMTP else { string[] files = Directory.GetFiles(ipdsfDirectory, searchPattern, SearchOption.TopDirectoryOnly); - if (files.Any()) + if (files.Length != 0) ipdsfFile = files[0]; else ipdsfFile = searchPattern; @@ -1109,9 +1109,9 @@ public class AdaptationTesting : ISMTP { string[] pdsfFiles; pdsfFiles = Directory.GetFiles(searchDirectory, searchPattern, SearchOption.TopDirectoryOnly); - if (!pdsfFiles.Any()) + if (pdsfFiles.Length == 0) _ = Process.Start("explorer.exe", searchDirectory); - Assert.IsTrue(pdsfFiles.Any(), "GetFiles check"); + Assert.IsTrue(pdsfFiles.Length != 0, "GetFiles check"); results = GetLogisticsColumnsAndBody(pdsfFiles[0]); } Assert.IsFalse(string.IsNullOrEmpty(results.Item1)); diff --git a/Adaptation/_Tests/Shared/UnitTesting.cs b/Adaptation/_Tests/Shared/UnitTesting.cs index 1833834..e4ef794 100644 --- a/Adaptation/_Tests/Shared/UnitTesting.cs +++ b/Adaptation/_Tests/Shared/UnitTesting.cs @@ -2,7 +2,6 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; using System; using System.Diagnostics; using System.IO; -using System.Linq; using System.Reflection; using System.Text; using System.Text.Json; @@ -74,7 +73,7 @@ public class UnitTesting if (string.IsNullOrEmpty(result)) break; checkFiles = Directory.GetFiles(result, "*.Tests.*proj", SearchOption.TopDirectoryOnly); - if (checkFiles.Any()) + if (checkFiles.Length != 0) break; result = Path.GetDirectoryName(result); } diff --git a/Adaptation/_Tests/Static/API.cs b/Adaptation/_Tests/Static/API.cs deleted file mode 100644 index 62268fa..0000000 --- a/Adaptation/_Tests/Static/API.cs +++ /dev/null @@ -1,124 +0,0 @@ -using Adaptation._Tests.Shared; -using Adaptation.FileHandlers.MoveAllFiles; -using Microsoft.Extensions.Logging; -using Microsoft.VisualStudio.TestTools.UnitTesting; -using System; -using System.Collections.Generic; -using System.Diagnostics; -using System.Net.Http; -using System.Reflection; -using System.Text.Json; - -namespace Adaptation._Tests.Static; - -[TestClass] -public class API : LoggingUnitTesting, IDisposable -{ - -#pragma warning disable CA2254 -#pragma warning disable IDE0060 - - internal static API LoggingUnitTesting { get; private set; } - - public API() : base(testContext: null, declaringType: null) - { - if (LoggingUnitTesting is null) - throw new Exception(); - } - - public API(TestContext testContext) : base(testContext, new StackFrame().GetMethod().DeclaringType) - { - } - - [ClassInitialize] - public static void ClassInitialize(TestContext testContext) => LoggingUnitTesting ??= new API(testContext); - - [ClassCleanup()] - public static void ClassCleanup() - { - LoggingUnitTesting?.Logger?.LogInformation("Cleanup"); - LoggingUnitTesting?.Dispose(); - } - - private static void NonThrowTryCatch() - { - try - { throw new Exception(); } - catch (Exception) { } - } - -#if true - [Ignore] -#endif - [TestMethod] - public void TestApiA() - { - MethodBase methodBase = new StackFrame().GetMethod(); -#nullable enable - int[] runDataSheets = new int[] - { - 504162, - 601132, - 602591, - 602705, - 601247, - 602092, - 603002, - 602666, - 602804, - 602598, - 601939 - }; - string url; - string json; - int failures = 0; - string httpClientResult; - HttpClient httpClient = new(); - FileHandlers.MoveAllFiles.OpenInsight.Root? root; - List? collection; - Dictionary> qaMetTests = new(); - foreach (int runDataSheet in runDataSheets) - { - url = $"{FileRead.OpenInsightApplicationProgrammingInterface}/materials/rds/{runDataSheet}"; - httpClientResult = httpClient.GetStringAsync(url).Result; - try - { root = JsonSerializer.Deserialize(httpClientResult); } - catch (Exception) - { - root = null; - failures += 1; - System.IO.File.WriteAllText($"D:/{runDataSheet}.json", httpClientResult); - } - if (root is null) - continue; - Assert.IsNotNull(root?.Rds.ProdSpec.PrsStages); - foreach (FileHandlers.MoveAllFiles.OpenInsight.PrsStage prsStage in root.Rds.ProdSpec.PrsStages) - { - if (prsStage.QaMetTests is null) - continue; - foreach (FileHandlers.MoveAllFiles.OpenInsight.QaMetTest qaMetTest in prsStage.QaMetTests) - { - if (qaMetTest.ToolClass != "FTIR") - continue; - if (!qaMetTests.TryGetValue(prsStage.Stage, out collection)) - { - qaMetTests.Add(prsStage.Stage, new()); - if (!qaMetTests.TryGetValue(prsStage.Stage, out collection)) - throw new Exception(); - } - collection.Add(qaMetTest); - } - } - Assert.IsTrue(qaMetTests.Count > 0); - } - httpClient.Dispose(); - json = JsonSerializer.Serialize(qaMetTests, new JsonSerializerOptions { WriteIndented = true }); - Assert.IsTrue(!string.IsNullOrEmpty(json)); - System.IO.File.WriteAllText("D:/.json", json); - LoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase?.Name, " - Exit")); - Assert.IsTrue(failures == 0); - NonThrowTryCatch(); -#nullable restore - } - -} \ No newline at end of file diff --git a/Adaptation/_Tests/Static/Job.cs b/Adaptation/_Tests/Static/Job.cs index 6571a25..b66365c 100644 --- a/Adaptation/_Tests/Static/Job.cs +++ b/Adaptation/_Tests/Static/Job.cs @@ -51,10 +51,10 @@ public class Job : LoggingUnitTesting, IDisposable { FileHandlers.TIBCO.Transport.Job job; MethodBase methodBase = new StackFrame().GetMethod(); - string barcodeHostFileShare = @"\\messv02ecc1.ec.local\EC_Metrology_Si\BarcodeHost\API"; - string metrologyFileShare = @"\\messv02ecc1.ec.local\EC_Metrology_Si\WorkMaterialOut\API"; + string barcodeHostFileShare = @"\\mesfs.infineon.com\EC_Metrology_Si\BarcodeHost\API"; + string metrologyFileShare = @"\\mesfs.infineon.com\EC_Metrology_Si\WorkMaterialOut\API"; LoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration")); - string lsl2SQLConnectionString = "Data Source=10.95.128.28\\PROD1,53959;Initial Catalog=LSL2SQL;Persist Security Info=True;User ID=srpadmin;Password=0okm9ijn;"; + 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"); @@ -92,10 +92,10 @@ public class Job : LoggingUnitTesting, IDisposable { MethodBase methodBase = new StackFrame().GetMethod(); FileHandlers.TIBCO.Transport.Job job; - string barcodeHostFileShare = @"\\messv02ecc1.ec.local\EC_Metrology_Si\BarcodeHost\API"; - string metrologyFileShare = @"\\messv02ecc1.ec.local\EC_Metrology_Si\WorkMaterialOut\API"; + string barcodeHostFileShare = @"\\mesfs.infineon.com\EC_Metrology_Si\BarcodeHost\API"; + string metrologyFileShare = @"\\mesfs.infineon.com\EC_Metrology_Si\WorkMaterialOut\API"; LoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration")); - string lsl2SQLConnectionString = "Data Source=10.95.128.28\\PROD1,53959;Initial Catalog=LSL2SQL;Persist Security Info=True;User ID=srpadmin;Password=0okm9ijn;"; + 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)); @@ -112,10 +112,10 @@ public class Job : LoggingUnitTesting, IDisposable { MethodBase methodBase = new StackFrame().GetMethod(); FileHandlers.TIBCO.Transport.Job job; - string barcodeHostFileShare = @"\\messv02ecc1.ec.local\EC_Metrology_Si\BarcodeHost\API"; - string metrologyFileShare = @"\\messv02ecc1.ec.local\EC_Metrology_Si\WorkMaterialOut\API"; + string barcodeHostFileShare = @"\\mesfs.infineon.com\EC_Metrology_Si\BarcodeHost\API"; + string metrologyFileShare = @"\\mesfs.infineon.com\EC_Metrology_Si\WorkMaterialOut\API"; LoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration")); - string lsl2SQLConnectionString = "Data Source=10.95.128.28\\PROD1,53959;Initial Catalog=LSL2SQL;Persist Security Info=True;User ID=srpadmin;Password=0okm9ijn;"; + 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 809d01e..5080302 100644 --- a/Adaptation/_Tests/Static/MET08DDUPSP1TBI.cs +++ b/Adaptation/_Tests/Static/MET08DDUPSP1TBI.cs @@ -2,8 +2,10 @@ using Adaptation._Tests.Shared; using Microsoft.Extensions.Logging; using Microsoft.VisualStudio.TestTools.UnitTesting; using System; +using System.Collections.Generic; using System.Diagnostics; using System.IO; +using System.Linq; using System.Reflection; using System.Text; @@ -38,6 +40,13 @@ public class MET08DDUPSP1TBI : LoggingUnitTesting, IDisposable LoggingUnitTesting?.Dispose(); } + private static void NonThrowTryCatch() + { + try + { throw new Exception(); } + catch (Exception) { } + } + [TestMethod] public void TestDateTime() { @@ -55,9 +64,9 @@ public class MET08DDUPSP1TBI : LoggingUnitTesting, IDisposable StringBuilder results = new(); (string cellInstanceName, string cellInstanceVersionName)[] collection = new (string, string)[] { - new("MET08DDUPSP1TBI", "v2.49.3"), + new("MET08DDUPSP1TBI", "v2.52.0"), }; - string staging = "http://mestsa07ec.ec.local:9003/CellInstanceServiceV2"; + string staging = "http://mestsa07ec.infineon.com:9003/CellInstanceServiceV2"; Shared.PasteSpecialXml.EAF.XML.API.CellInstance.CellInstanceVersion cellInstanceVersion; LoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration")); foreach ((string cellInstanceName, string cellInstanceVersionName) in collection) @@ -65,8 +74,31 @@ public class MET08DDUPSP1TBI : LoggingUnitTesting, IDisposable cellInstanceVersion = AdaptationTesting.GetCellInstanceVersion($"{staging}/{cellInstanceName}/{cellInstanceVersionName}/configuration"); _ = results.AppendLine($"{cellInstanceName}\t{cellInstanceVersionName}\t{cellInstanceVersion.EdaConnection.PortNumber}"); } - File.WriteAllText($"D:/Tmp/{methodBase.Module.Name}-{methodBase.ReflectedType.Name}-{methodBase.Name}.tsv", results.ToString()); + string sourceDirectory = "D:/Tmp/cellInstanceVersion.EdaConnection.PortNumber"; + if (!Directory.Exists(sourceDirectory)) + _ = Directory.CreateDirectory(sourceDirectory); + File.WriteAllText(Path.Combine(sourceDirectory, $"{methodBase.Module.Name}-{methodBase.ReflectedType.Name}-{methodBase.Name}.tsv"), results.ToString()); LoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } + [TestMethod] + public void CellInstanceVersionEdaConnectionPortNumber() + { + MethodBase methodBase = new StackFrame().GetMethod(); + string sourceDirectory = "D:/Tmp/cellInstanceVersion.EdaConnection.PortNumber"; + if (Directory.Exists(sourceDirectory)) + { + string destinationDirectory = Path.Combine(sourceDirectory, "All"); + if (!Directory.Exists(destinationDirectory)) + _ = Directory.CreateDirectory(destinationDirectory); + List lines = new(); + string[] files = Directory.GetFiles(sourceDirectory, "*.tsv", SearchOption.TopDirectoryOnly); + foreach (string file in files) + lines.AddRange(File.ReadAllLines(file)); + File.WriteAllLines(Path.Combine(destinationDirectory, $"{DateTime.Now.Ticks}.tsv"), lines.Distinct().OrderBy(l => l)); + } + LoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); + NonThrowTryCatch(); + } + } \ No newline at end of file diff --git a/Adaptation/_Tests/Static/txt.cs b/Adaptation/_Tests/Static/txt.cs index fe50648..c11f1fb 100644 --- a/Adaptation/_Tests/Static/txt.cs +++ b/Adaptation/_Tests/Static/txt.cs @@ -2,8 +2,10 @@ using Adaptation._Tests.Shared; using Microsoft.Extensions.Logging; using Microsoft.VisualStudio.TestTools.UnitTesting; using System; +using System.Collections.Generic; using System.Diagnostics; using System.IO; +using System.Linq; using System.Reflection; using System.Text; @@ -208,10 +210,10 @@ public class TXT : LoggingUnitTesting, IDisposable StringBuilder results = new(); (string cellInstanceName, string cellInstanceVersionName)[] collection = new (string, string)[] { - new("SP101", "v2.49.3"), - new("SP101-EQPT", "v2.47.0"), + new("SP101", "v2.52.0"), + new("SP101-EQPT", "v2.52.0"), }; - string staging = "http://mestsa07ec.ec.local:9003/CellInstanceServiceV2"; + string staging = "http://mestsa07ec.infineon.com:9003/CellInstanceServiceV2"; Shared.PasteSpecialXml.EAF.XML.API.CellInstance.CellInstanceVersion cellInstanceVersion; LoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration")); foreach ((string cellInstanceName, string cellInstanceVersionName) in collection) @@ -219,8 +221,31 @@ public class TXT : LoggingUnitTesting, IDisposable cellInstanceVersion = AdaptationTesting.GetCellInstanceVersion($"{staging}/{cellInstanceName}/{cellInstanceVersionName}/configuration"); _ = results.AppendLine($"{cellInstanceName}\t{cellInstanceVersionName}\t{cellInstanceVersion.EdaConnection.PortNumber}"); } - File.WriteAllText($"D:/Tmp/{methodBase.Module.Name}-{methodBase.ReflectedType.Name}-{methodBase.Name}.tsv", results.ToString()); + string sourceDirectory = "D:/Tmp/cellInstanceVersion.EdaConnection.PortNumber"; + if (!Directory.Exists(sourceDirectory)) + _ = Directory.CreateDirectory(sourceDirectory); + File.WriteAllText(Path.Combine(sourceDirectory, $"{methodBase.Module.Name}-{methodBase.ReflectedType.Name}-{methodBase.Name}.tsv"), results.ToString()); LoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } + [TestMethod] + public void CellInstanceVersionEdaConnectionPortNumber() + { + MethodBase methodBase = new StackFrame().GetMethod(); + string sourceDirectory = "D:/Tmp/cellInstanceVersion.EdaConnection.PortNumber"; + if (Directory.Exists(sourceDirectory)) + { + string destinationDirectory = Path.Combine(sourceDirectory, "All"); + if (!Directory.Exists(destinationDirectory)) + _ = Directory.CreateDirectory(destinationDirectory); + List lines = new(); + string[] files = Directory.GetFiles(sourceDirectory, "*.tsv", SearchOption.TopDirectoryOnly); + foreach (string file in files) + lines.AddRange(File.ReadAllLines(file)); + File.WriteAllLines(Path.Combine(destinationDirectory, $"{DateTime.Now.Ticks}.tsv"), lines.Distinct().OrderBy(l => l)); + } + LoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); + NonThrowTryCatch(); + } + } \ No newline at end of file diff --git a/Adaptation/appsettings.Development.json b/Adaptation/appsettings.Development.json index f7e0b36..8630239 100644 --- a/Adaptation/appsettings.Development.json +++ b/Adaptation/appsettings.Development.json @@ -45,7 +45,7 @@ "Password": "tVyC7uPHtScZR8NLInSaxQ==" }, { - "Use": true, + "Use": false, "Letter": "i", "Share": "\\\\messdv002.na.infineon.com\\Candela", "User": "INFINEON\\MESGaNEAF", @@ -115,14 +115,14 @@ "Password": "rzXkXdHKetDfsukhZKW0yA==" }, { - "Use": true, + "Use": false, "Letter": "s", "Share": "\\\\messv02ecc1.ec.local\\EC_EAFRepository", "User": "EC\\ECMESEAF", "Password": "CUGygiPwahy4U3j+6KqqoMZ08STyVDR1rKm6MwPpt00=" }, { - "Use": true, + "Use": false, "Letter": "t", "Share": "\\\\messv02ecc1.ec.local\\EC_EDA", "User": "EC\\ECEDASvc", diff --git a/Adaptation/appsettings.json b/Adaptation/appsettings.json index d15d437..842b156 100644 --- a/Adaptation/appsettings.json +++ b/Adaptation/appsettings.json @@ -45,7 +45,7 @@ "Password": "tVyC7uPHtScZR8NLInSaxQ==" }, { - "Use": true, + "Use": false, "Letter": "i", "Share": "\\\\messdv002.na.infineon.com\\Candela", "User": "INFINEON\\MESGaNEAF", @@ -115,14 +115,14 @@ "Password": "rzXkXdHKetDfsukhZKW0yA==" }, { - "Use": true, + "Use": false, "Letter": "s", "Share": "\\\\messv02ecc1.ec.local\\EC_EAFRepository", "User": "EC\\ECMESEAF", "Password": "CUGygiPwahy4U3j+6KqqoMZ08STyVDR1rKm6MwPpt00=" }, { - "Use": true, + "Use": false, "Letter": "t", "Share": "\\\\messv02ecc1.ec.local\\EC_EDA", "User": "EC\\ECEDASvc", diff --git a/MET08DDUPSP1TBI.csproj b/MET08DDUPSP1TBI.csproj index 9d70e7e..89c50ed 100644 --- a/MET08DDUPSP1TBI.csproj +++ b/MET08DDUPSP1TBI.csproj @@ -105,41 +105,13 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + @@ -202,19 +174,18 @@ + + 7.2.4630.5 + - 2.49.3 + 2.52.0 - - 5.2.7 - - - 5.2.7 + + 1.1.1 6.0.3 - \ No newline at end of file diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs index 3ccda69..ba5ed44 100644 --- a/Properties/AssemblyInfo.cs +++ b/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.49.3.0")] -[assembly: AssemblyFileVersion("2.49.3.0")] +[assembly: AssemblyVersion("2.52.0.0")] +[assembly: AssemblyFileVersion("2.52.0.0")]