From b5ad0ebcdb337598c7351e3f5ff7c360d978ba5e Mon Sep 17 00:00:00 2001 From: Mike Phares Date: Mon, 21 Mar 2022 15:57:59 -0700 Subject: [PATCH] Callback changes --- .../FileHandlers/DownloadRsMFile/FileRead.cs | 2 - Adaptation/FileHandlers/Dummy/FileRead.cs | 46 +++----- .../FileHandlers/MET08RESIMAPCDE/FileRead.cs | 2 - Adaptation/FileHandlers/RsM/Description.cs | 2 +- Adaptation/FileHandlers/RsM/FileRead.cs | 20 ++-- Adaptation/FileHandlers/ToArchive/FileRead.cs | 4 +- Adaptation/FileHandlers/pcl/FileRead.cs | 19 ++-- Adaptation/MET08RESIMAPCDE.Tests.csproj | 105 ++++++++---------- Adaptation/Shared/Duplicator/Description.cs | 2 +- .../Staging/v2.36.1/CDE2.cs | 7 +- .../Staging/v2.36.1/CDE3-EQPT.cs | 7 +- .../Staging/v2.36.1/CDE3.cs | 7 +- .../Staging/v2.36.1/CDE5.cs | 7 +- .../Staging/v2.36.1/MET08RESIMAPCDE.cs | 7 +- .../Extract/Staging/v2.36.1/CDE3-EQPT.cs | 7 +- .../_Tests/Extract/Staging/v2.36.1/CDE3.cs | 7 +- .../Staging/v2.36.1/MET08RESIMAPCDE.cs | 7 +- Adaptation/_Tests/Shared/AdaptationTesting.cs | 4 +- MET08RESIMAPCDE.csproj | 4 +- Properties/AssemblyInfo.cs | 4 +- 20 files changed, 100 insertions(+), 170 deletions(-) diff --git a/Adaptation/FileHandlers/DownloadRsMFile/FileRead.cs b/Adaptation/FileHandlers/DownloadRsMFile/FileRead.cs index 90b4fd8..f6e5331 100644 --- a/Adaptation/FileHandlers/DownloadRsMFile/FileRead.cs +++ b/Adaptation/FileHandlers/DownloadRsMFile/FileRead.cs @@ -114,8 +114,6 @@ public class FileRead : Shared.FileRead, IFileRead void IFileRead.CheckTests(Test[] tests, bool extra) => throw new Exception(string.Concat("Not ", nameof(_IsDuplicator))); - void IFileRead.Callback(object state) => Callback(state); - private Tuple> GetExtractResult(string reportFullPath, DateTime dateTime) { if (reportFullPath is null) diff --git a/Adaptation/FileHandlers/Dummy/FileRead.cs b/Adaptation/FileHandlers/Dummy/FileRead.cs index 13e1876..6ef5f81 100644 --- a/Adaptation/FileHandlers/Dummy/FileRead.cs +++ b/Adaptation/FileHandlers/Dummy/FileRead.cs @@ -220,61 +220,47 @@ public class FileRead : Shared.FileRead, IFileRead { try { - string pathSegment; - string monARessource; + string sourceParentDirectory; + string targetParentDirectory; DateTime dateTime = DateTime.Now; - if (!_FileConnectorConfiguration.TargetFileLocation.Contains(_FileConnectorConfiguration.SourceFileLocation)) - throw new Exception("Target must start with source"); + if (!string.IsNullOrEmpty(Path.GetFileName(_FileConnectorConfiguration.SourceFileLocation))) + sourceParentDirectory = Path.GetDirectoryName(_FileConnectorConfiguration.SourceFileLocation); + else + sourceParentDirectory = Path.GetDirectoryName(Path.GetDirectoryName(_FileConnectorConfiguration.SourceFileLocation)); + if (!string.IsNullOrEmpty(Path.GetFileName(_FileConnectorConfiguration.TargetFileLocation))) + targetParentDirectory = Path.GetDirectoryName(_FileConnectorConfiguration.TargetFileLocation); + else + targetParentDirectory = Path.GetDirectoryName(Path.GetDirectoryName(_FileConnectorConfiguration.TargetFileLocation)); + if (sourceParentDirectory != targetParentDirectory) + throw new Exception("Target and source must have the same parent for Si Dummy FileConnectorConfiguration!"); bool check = dateTime.Hour > 7 && dateTime.Hour < 18 && dateTime.DayOfWeek != DayOfWeek.Sunday && dateTime.DayOfWeek != DayOfWeek.Saturday; if (!_IsEAFHosted || check) { - string checkSegment; - string checkDirectory; + string monARessource; string sourceFileFilter; string sourceArchiveFile; - string sourceFileLocation; string weekOfYear = _Calendar.GetWeekOfYear(dateTime, CalendarWeekRule.FirstDay, DayOfWeek.Sunday).ToString("00"); string traceDummyDirectory = Path.Combine(Path.GetPathRoot(_TracePath), "TracesDummy", _CellInstanceName, "Source", $"{dateTime:yyyy}___Week_{weekOfYear}"); if (!Directory.Exists(traceDummyDirectory)) _ = Directory.CreateDirectory(traceDummyDirectory); string traceDummyFile = Path.Combine(traceDummyDirectory, $"{dateTime.Ticks} - {_CellInstanceName}.txt"); File.AppendAllText(traceDummyFile, string.Empty); - if (_FileConnectorConfiguration.SourceFileLocation.EndsWith("\\")) - sourceFileLocation = _FileConnectorConfiguration.SourceFileLocation; - else - sourceFileLocation = string.Concat(_FileConnectorConfiguration.SourceFileLocation, '\\'); for (int i = 0; i < _FileConnectorConfiguration.SourceFileFilters.Count; i++) { _LastDummyRunIndex += 1; if (_LastDummyRunIndex >= _FileConnectorConfiguration.SourceFileFilters.Count) _LastDummyRunIndex = 0; sourceFileFilter = _FileConnectorConfiguration.SourceFileFilters[_LastDummyRunIndex]; - sourceArchiveFile = Path.GetFullPath(string.Concat(sourceFileLocation, sourceFileFilter)); + sourceArchiveFile = Path.Combine(_FileConnectorConfiguration.SourceFileLocation, sourceFileFilter); if (File.Exists(sourceArchiveFile)) { - checkSegment = _FileConnectorConfiguration.TargetFileLocation.Substring(sourceFileLocation.Length); - checkDirectory = Path.GetDirectoryName(sourceArchiveFile); - for (int z = 0; z < int.MaxValue; z++) - { - if (checkDirectory.Length < sourceFileLocation.Length || !checkDirectory.StartsWith(sourceFileLocation)) - break; - checkDirectory = Path.GetDirectoryName(checkDirectory); - if (Directory.Exists(Path.Combine(checkDirectory, checkSegment))) - { - checkDirectory = Path.Combine(checkDirectory, checkSegment); - break; - } - } - if (!checkDirectory.EndsWith(checkSegment)) - throw new Exception("Could not determine dummy target directory for extract!"); if (!long.TryParse(Path.GetFileNameWithoutExtension(sourceArchiveFile).Replace("x", string.Empty), out long sequence)) throw new Exception("Invalid file name for source archive file!"); - pathSegment = checkDirectory.Substring(sourceFileLocation.Length); - monARessource = GetCellName(pathSegment); + monARessource = GetCellName(sourceArchiveFile); if (string.IsNullOrEmpty(monARessource)) throw new Exception("Could not determine which cell archive file is associated with!"); if (_IsEAFHosted) - CallbackFileExists(sourceArchiveFile, traceDummyFile, checkDirectory, monARessource, sequence); + CallbackFileExists(sourceArchiveFile, traceDummyFile, _FileConnectorConfiguration.TargetFileLocation, monARessource, sequence); break; } } diff --git a/Adaptation/FileHandlers/MET08RESIMAPCDE/FileRead.cs b/Adaptation/FileHandlers/MET08RESIMAPCDE/FileRead.cs index 6198b98..59ce7c1 100644 --- a/Adaptation/FileHandlers/MET08RESIMAPCDE/FileRead.cs +++ b/Adaptation/FileHandlers/MET08RESIMAPCDE/FileRead.cs @@ -4,13 +4,11 @@ using Adaptation.Shared; using Adaptation.Shared.Duplicator; using Adaptation.Shared.Methods; using Adaptation.Shared.Metrology; -using Infineon.Monitoring.MonA; using System; using System.Collections.Generic; using System.Diagnostics; using System.Globalization; using System.IO; -using System.IO.Compression; using System.Linq; using System.Text.Json; using System.Text.Json.Serialization; diff --git a/Adaptation/FileHandlers/RsM/Description.cs b/Adaptation/FileHandlers/RsM/Description.cs index 2dd1477..22621d9 100644 --- a/Adaptation/FileHandlers/RsM/Description.cs +++ b/Adaptation/FileHandlers/RsM/Description.cs @@ -7,7 +7,7 @@ using System.Text.Json; namespace Adaptation.FileHandlers.RsM; -public class Description : IDescription +public class Description : IDescription, Shared.Properties.IDescription { public int Test { get; set; } diff --git a/Adaptation/FileHandlers/RsM/FileRead.cs b/Adaptation/FileHandlers/RsM/FileRead.cs index cceb5af..d92efd3 100644 --- a/Adaptation/FileHandlers/RsM/FileRead.cs +++ b/Adaptation/FileHandlers/RsM/FileRead.cs @@ -104,19 +104,17 @@ public class FileRead : Shared.FileRead, IFileRead results.Item4.Add(new FileInfo(reportFullPath)); else { - string logBody = string.Empty; IProcessData iProcessData = new ProcessData(this, _Logistics, results.Item4); - if (iProcessData is ProcessData processData) - { - string mid = string.Concat(processData.Reactor, "-", processData.RDS, "-", processData.PSN); - mid = Regex.Replace(mid, @"[\\,\/,\:,\*,\?,\"",\<,\>,\|]", "_").Split('\r')[0].Split('\n')[0]; - _Logistics.MID = mid; - SetFileParameterLotID(mid); - _Logistics.ProcessJobID = processData.Reactor; - logBody = processData.LogBody; - } + if (iProcessData is not ProcessData processData) + throw new Exception(string.Concat("A) No Data - ", dateTime.Ticks)); + string mid = string.Concat(processData.Reactor, "-", processData.RDS, "-", processData.PSN); + mid = Regex.Replace(mid, @"[\\,\/,\:,\*,\?,\"",\<,\>,\|]", "_").Split('\r')[0].Split('\n')[0]; + _Logistics.MID = mid; + SetFileParameterLotID(mid); + _Logistics.ProcessJobID = processData.Reactor; + string logBody = processData.LogBody; if (!iProcessData.Details.Any()) - throw new Exception(string.Concat("No Data - ", dateTime.Ticks)); + throw new Exception(string.Concat("B) No Data - ", dateTime.Ticks)); results = iProcessData.GetResults(this, _Logistics, results.Item4); if (!_IsEAFHosted) results = new(logBody, results.Item2, results.Item3, results.Item4); diff --git a/Adaptation/FileHandlers/ToArchive/FileRead.cs b/Adaptation/FileHandlers/ToArchive/FileRead.cs index 0a20e26..05860a0 100644 --- a/Adaptation/FileHandlers/ToArchive/FileRead.cs +++ b/Adaptation/FileHandlers/ToArchive/FileRead.cs @@ -113,9 +113,9 @@ public class FileRead : Shared.FileRead, IFileRead { if (dateTime == DateTime.MinValue) { } - Tuple> results = new(string.Empty, null, null, new List()); + Tuple> results = new(string.Empty, null, null, new List()); Tuple pdsf = ProcessDataStandardFormat.GetLogisticsColumnsAndBody(reportFullPath); - _Logistics = new Logistics(reportFullPath, pdsf.Item1); + _Logistics = new Logistics(reportFullPath, pdsf.Item1); SetFileParameterLotIDToLogisticsMID(); return results; } diff --git a/Adaptation/FileHandlers/pcl/FileRead.cs b/Adaptation/FileHandlers/pcl/FileRead.cs index 30583d9..872ab73 100644 --- a/Adaptation/FileHandlers/pcl/FileRead.cs +++ b/Adaptation/FileHandlers/pcl/FileRead.cs @@ -17,7 +17,7 @@ public class FileRead : Shared.FileRead, IFileRead public FileRead(ISMTP smtp, Dictionary fileParameter, string cellInstanceName, string cellInstanceConnectionName, FileConnectorConfiguration fileConnectorConfiguration, string equipmentTypeName, string parameterizedModelObjectDefinitionType, IList modelObjectParameters, string equipmentDictionaryName, Dictionary> dummyRuns, bool useCyclicalForDescription, bool isEAFHosted) : base(new Description(), true, smtp, fileParameter, cellInstanceName, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, useCyclicalForDescription, isEAFHosted) { - _MinFileLength = 10; + _MinFileLength = 15; _NullData = string.Empty; _Logistics = new Logistics(this); if (_FileParameter is null) @@ -105,16 +105,15 @@ public class FileRead : Shared.FileRead, IFileRead else { IProcessData iProcessData = new ProcessData(this, _Logistics, results.Item4); - if (iProcessData is ProcessData processData) - { - string mid = string.Concat(processData.Reactor, "-", processData.RDS, "-", processData.PSN); - mid = Regex.Replace(mid, @"[\\,\/,\:,\*,\?,\"",\<,\>,\|]", "_").Split('\r')[0].Split('\n')[0]; - _Logistics.MID = mid; - SetFileParameterLotID(mid); - _Logistics.ProcessJobID = processData.Reactor; - } + if (iProcessData is not ProcessData processData) + throw new Exception(string.Concat("A) No Data - ", dateTime.Ticks)); + string mid = string.Concat(processData.Reactor, "-", processData.RDS, "-", processData.PSN); + mid = Regex.Replace(mid, @"[\\,\/,\:,\*,\?,\"",\<,\>,\|]", "_").Split('\r')[0].Split('\n')[0]; + _Logistics.MID = mid; + SetFileParameterLotID(mid); + _Logistics.ProcessJobID = processData.Reactor; if (!iProcessData.Details.Any()) - throw new Exception(string.Concat("No Data - ", dateTime.Ticks)); + throw new Exception(string.Concat("B) No Data - ", dateTime.Ticks)); results = iProcessData.GetResults(this, _Logistics, results.Item4); } return results; diff --git a/Adaptation/MET08RESIMAPCDE.Tests.csproj b/Adaptation/MET08RESIMAPCDE.Tests.csproj index 1466859..5294b48 100644 --- a/Adaptation/MET08RESIMAPCDE.Tests.csproj +++ b/Adaptation/MET08RESIMAPCDE.Tests.csproj @@ -6,6 +6,10 @@ SAK + enable + 10.0 + disable + win-x64 net6.0 false @@ -28,70 +32,55 @@ Linux - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + - - NU1701 - - - NU1701 - - - NU1701 - - - NU1701 - - - NU1701 - + + - - NU1701 - - - NU1701 - - - NU1701 - - - NU1701 - - - NU1701 - - - NU1701 - - - NU1701 - - - NU1701 - - + + + + + + + + + + + + + + + + NU1701 + NU1701 + NU1701 + + + NU1701 + NU1701 + NU1701 + NU1701 + NU1701 + NU1701 + NU1701 + NU1701 + Always diff --git a/Adaptation/Shared/Duplicator/Description.cs b/Adaptation/Shared/Duplicator/Description.cs index abbb7a4..04295ef 100644 --- a/Adaptation/Shared/Duplicator/Description.cs +++ b/Adaptation/Shared/Duplicator/Description.cs @@ -6,7 +6,7 @@ using System.Text.Json; namespace Adaptation.Shared.Duplicator; -public class Description : IDescription, Properties.IDescription +public class Description : IDescription, Shared.Properties.IDescription { public int Test { get; set; } diff --git a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.36.1/CDE2.cs b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.36.1/CDE2.cs index 54d5cde..2757607 100644 --- a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.36.1/CDE2.cs +++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.36.1/CDE2.cs @@ -51,9 +51,4 @@ public class CDE2 : EAFLoggingUnitTesting { } -} - -// dotnet build --runtime win-x64 -// dotnet test --runtime win-x64 --no-build --filter "FullyQualifiedName~_Tests.CreateSelfDescription.Staging.v2_36_1" --% -- TestRunParameters.Parameter(name=\"Debug\", value=\"Debugger.IsAttached\") -// dotnet test --runtime win-x64 --no-build --filter "FullyQualifiedName~_Tests.CreateSelfDescription.Staging.v2_36_1 & ClassName~CDE2" --% -- TestRunParameters.Parameter(name=\"Debug\", value=\"Debugger.IsAttached\") -// dotnet test --runtime win-x64 --no-build --filter "FullyQualifiedName~_Tests.CreateSelfDescription.Staging.v2_36_1 & ClassName~CDE2 & Staging__v2_36_1__CDE2__xlsx" --% -- TestRunParameters.Parameter(name=\"Debug\", value=\"Debugger.IsAttached\") \ No newline at end of file +} \ No newline at end of file diff --git a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.36.1/CDE3-EQPT.cs b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.36.1/CDE3-EQPT.cs index 04d9860..68fd515 100644 --- a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.36.1/CDE3-EQPT.cs +++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.36.1/CDE3-EQPT.cs @@ -58,9 +58,4 @@ public class CDE3_EQPT : EAFLoggingUnitTesting EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } -} - -// dotnet build --runtime win-x64 -// dotnet test --runtime win-x64 --no-build --filter "FullyQualifiedName~_Tests.CreateSelfDescription.Staging.v2_36_1" --% -- TestRunParameters.Parameter(name=\"Debug\", value=\"Debugger.IsAttached\") -// dotnet test --runtime win-x64 --no-build --filter "FullyQualifiedName~_Tests.CreateSelfDescription.Staging.v2_36_1 & ClassName~CDE3_EQPT" --% -- TestRunParameters.Parameter(name=\"Debug\", value=\"Debugger.IsAttached\") -// dotnet test --runtime win-x64 --no-build --filter "FullyQualifiedName~_Tests.CreateSelfDescription.Staging.v2_36_1 & ClassName~CDE3_EQPT & Staging__v2_36_1__CDE3_EQPT__DownloadRsMFile" --% -- TestRunParameters.Parameter(name=\"Debug\", value=\"Debugger.IsAttached\") \ No newline at end of file +} \ No newline at end of file diff --git a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.36.1/CDE3.cs b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.36.1/CDE3.cs index 8e5e408..9ca7978 100644 --- a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.36.1/CDE3.cs +++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.36.1/CDE3.cs @@ -58,9 +58,4 @@ public class CDE3 : EAFLoggingUnitTesting EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } -} - -// dotnet build --runtime win-x64 -// dotnet test --runtime win-x64 --no-build --filter "FullyQualifiedName~_Tests.CreateSelfDescription.Staging.v2_36_1" --% -- TestRunParameters.Parameter(name=\"Debug\", value=\"Debugger.IsAttached\") -// dotnet test --runtime win-x64 --no-build --filter "FullyQualifiedName~_Tests.CreateSelfDescription.Staging.v2_36_1 & ClassName~CDE3" --% -- TestRunParameters.Parameter(name=\"Debug\", value=\"Debugger.IsAttached\") -// dotnet test --runtime win-x64 --no-build --filter "FullyQualifiedName~_Tests.CreateSelfDescription.Staging.v2_36_1 & ClassName~CDE3 & Staging__v2_36_1__CDE3__RsM" --% -- TestRunParameters.Parameter(name=\"Debug\", value=\"Debugger.IsAttached\") \ No newline at end of file +} \ No newline at end of file diff --git a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.36.1/CDE5.cs b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.36.1/CDE5.cs index 423e9e4..c6c548a 100644 --- a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.36.1/CDE5.cs +++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.36.1/CDE5.cs @@ -56,9 +56,4 @@ public class CDE5 : EAFLoggingUnitTesting { } -} - -// dotnet build --runtime win-x64 -// dotnet test --runtime win-x64 --no-build --filter "FullyQualifiedName~_Tests.CreateSelfDescription.Staging.v2_36_1" --% -- TestRunParameters.Parameter(name=\"Debug\", value=\"Debugger.IsAttached\") -// dotnet test --runtime win-x64 --no-build --filter "FullyQualifiedName~_Tests.CreateSelfDescription.Staging.v2_36_1 & ClassName~CDE5" --% -- TestRunParameters.Parameter(name=\"Debug\", value=\"Debugger.IsAttached\") -// dotnet test --runtime win-x64 --no-build --filter "FullyQualifiedName~_Tests.CreateSelfDescription.Staging.v2_36_1 & ClassName~CDE5 & Staging__v2_36_1__CDE5__xlsx" --% -- TestRunParameters.Parameter(name=\"Debug\", value=\"Debugger.IsAttached\") \ No newline at end of file +} \ No newline at end of file diff --git a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.36.1/MET08RESIMAPCDE.cs b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.36.1/MET08RESIMAPCDE.cs index 298d2f6..f144bc6 100644 --- a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.36.1/MET08RESIMAPCDE.cs +++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.36.1/MET08RESIMAPCDE.cs @@ -138,9 +138,4 @@ public class MET08RESIMAPCDE : EAFLoggingUnitTesting EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } -} - -// dotnet build --runtime win-x64 -// dotnet test --runtime win-x64 --no-build --filter "FullyQualifiedName~_Tests.CreateSelfDescription.Staging.v2_36_1" --% -- TestRunParameters.Parameter(name=\"Debug\", value=\"Debugger.IsAttached\") -// dotnet test --runtime win-x64 --no-build --filter "FullyQualifiedName~_Tests.CreateSelfDescription.Staging.v2_36_1 & ClassName~MET08RESIMAPCDE" --% -- TestRunParameters.Parameter(name=\"Debug\", value=\"Debugger.IsAttached\") -// dotnet test --runtime win-x64 --no-build --filter "FullyQualifiedName~_Tests.CreateSelfDescription.Staging.v2_36_1 & ClassName~MET08RESIMAPCDE & Staging__v2_36_1__MET08RESIMAPCDE__MET08RESIMAPCDE________" --% -- TestRunParameters.Parameter(name=\"Debug\", value=\"Debugger.IsAttached\") \ No newline at end of file +} \ No newline at end of file diff --git a/Adaptation/_Tests/Extract/Staging/v2.36.1/CDE3-EQPT.cs b/Adaptation/_Tests/Extract/Staging/v2.36.1/CDE3-EQPT.cs index dc425bc..acd9b00 100644 --- a/Adaptation/_Tests/Extract/Staging/v2.36.1/CDE3-EQPT.cs +++ b/Adaptation/_Tests/Extract/Staging/v2.36.1/CDE3-EQPT.cs @@ -29,9 +29,4 @@ public class CDE3_EQPT [TestMethod] public void Staging__v2_36_1__CDE3_EQPT__DownloadRsMFile() => _CDE3_EQPT.Staging__v2_36_1__CDE3_EQPT__DownloadRsMFile(); -} - -// dotnet build --runtime win-x64 -// dotnet test --runtime win-x64 --no-build --filter "FullyQualifiedName~_Tests.Extract.Staging.v2_36_1" --% -- TestRunParameters.Parameter(name=\"Debug\", value=\"Debugger.IsAttached\") -// dotnet test --runtime win-x64 --no-build --filter "FullyQualifiedName~_Tests.Extract.Staging.v2_36_1 & ClassName~CDE3_EQPT" --% -- TestRunParameters.Parameter(name=\"Debug\", value=\"Debugger.IsAttached\") -// dotnet test --runtime win-x64 --no-build --filter "FullyQualifiedName~_Tests.Extract.Staging.v2_36_1 & ClassName~CDE3_EQPT & Staging__v2_36_1__CDE3_EQPT__DownloadRsMFile" --% -- TestRunParameters.Parameter(name=\"Debug\", value=\"Debugger.IsAttached\") \ No newline at end of file +} \ No newline at end of file diff --git a/Adaptation/_Tests/Extract/Staging/v2.36.1/CDE3.cs b/Adaptation/_Tests/Extract/Staging/v2.36.1/CDE3.cs index 06a3d97..1aa486a 100644 --- a/Adaptation/_Tests/Extract/Staging/v2.36.1/CDE3.cs +++ b/Adaptation/_Tests/Extract/Staging/v2.36.1/CDE3.cs @@ -70,9 +70,4 @@ Avg = 577.2195 0.58% SEMI Radial= 0.81% Assert.IsTrue(logBodyCheck, "Log Body doesn't match!"); } -} - -// dotnet build --runtime win-x64 -// dotnet test --runtime win-x64 --no-build --filter "FullyQualifiedName~_Tests.Extract.Staging.v2_36_1" --% -- TestRunParameters.Parameter(name=\"Debug\", value=\"Debugger.IsAttached\") -// dotnet test --runtime win-x64 --no-build --filter "FullyQualifiedName~_Tests.Extract.Staging.v2_36_1 & ClassName~CDE3" --% -- TestRunParameters.Parameter(name=\"Debug\", value=\"Debugger.IsAttached\") -// dotnet test --runtime win-x64 --no-build --filter "FullyQualifiedName~_Tests.Extract.Staging.v2_36_1 & ClassName~CDE3 & Staging__v2_36_1__CDE3__RsM643047560320000000__Normal" --% -- TestRunParameters.Parameter(name=\"Debug\", value=\"Debugger.IsAttached\") \ No newline at end of file +} \ No newline at end of file diff --git a/Adaptation/_Tests/Extract/Staging/v2.36.1/MET08RESIMAPCDE.cs b/Adaptation/_Tests/Extract/Staging/v2.36.1/MET08RESIMAPCDE.cs index eb1774a..09e1f93 100644 --- a/Adaptation/_Tests/Extract/Staging/v2.36.1/MET08RESIMAPCDE.cs +++ b/Adaptation/_Tests/Extract/Staging/v2.36.1/MET08RESIMAPCDE.cs @@ -65,9 +65,4 @@ public class MET08RESIMAPCDE [TestMethod] public void Staging__v2_36_1__MET08RESIMAPCDE__MET08RESIMAPCDE________() => _MET08RESIMAPCDE.Staging__v2_36_1__MET08RESIMAPCDE__MET08RESIMAPCDE________(); -} - -// dotnet build --runtime win-x64 -// dotnet test --runtime win-x64 --no-build --filter "FullyQualifiedName~_Tests.Extract.Staging.v2_36_1" --% -- TestRunParameters.Parameter(name=\"Debug\", value=\"Debugger.IsAttached\") -// dotnet test --runtime win-x64 --no-build --filter "FullyQualifiedName~_Tests.Extract.Staging.v2_36_1 & ClassName~MET08RESIMAPCDE" --% -- TestRunParameters.Parameter(name=\"Debug\", value=\"Debugger.IsAttached\") -// dotnet test --runtime win-x64 --no-build --filter "FullyQualifiedName~_Tests.Extract.Staging.v2_36_1 & ClassName~MET08RESIMAPCDE & Staging__v2_36_1__MET08RESIMAPCDE__MET08RESIMAPCDE637710931421087642__Normal" --% -- TestRunParameters.Parameter(name=\"Debug\", value=\"Debugger.IsAttached\") \ No newline at end of file +} \ No newline at end of file diff --git a/Adaptation/_Tests/Shared/AdaptationTesting.cs b/Adaptation/_Tests/Shared/AdaptationTesting.cs index ec06ba5..ae60df3 100644 --- a/Adaptation/_Tests/Shared/AdaptationTesting.cs +++ b/Adaptation/_Tests/Shared/AdaptationTesting.cs @@ -541,7 +541,7 @@ public class AdaptationTesting : ISMTP { _ = stringBuilder. AppendLine("[TestMethod]"). - Append("public void ").Append(methodName).Append("() => ").Append('_').Append(cellInstanceNameWithoutHyphen).Append('.').Append(methodName).AppendLine("();"); + Append("public void ").Append(methodName).Append("() => ").Append('_').Append(cellInstanceNameWithoutHyphen).Append('.').Append(methodName).AppendLine("();").AppendLine(); } else if (i == 1) { @@ -982,6 +982,8 @@ public class AdaptationTesting : ISMTP throw new Exception("Ticks should only appear once in source file location!"); if (segments.Length != 2) throw new Exception("Ticks missing from source file location!"); + if (segments[1].Contains(ticks)) + throw new Exception("From source file location path should not contain ticks!"); if (!segments[1].EndsWith(methodBaseNameWithActualCICN.Replace(ticks, string.Empty))) throw new Exception("Method name missing from source file location!"); sourceFileLocation = lines[0]; diff --git a/MET08RESIMAPCDE.csproj b/MET08RESIMAPCDE.csproj index 0afc0c9..1ac56ea 100644 --- a/MET08RESIMAPCDE.csproj +++ b/MET08RESIMAPCDE.csproj @@ -10,7 +10,7 @@ Properties MET08RESIMAPCDE MET08RESIMAPCDE - v4.7.2 + v4.8 512 SAK SAK @@ -152,7 +152,7 @@ - 2.36.0 + 2.39.2 5.0.1 diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs index f06713a..73fee06 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.39.0.0")] -[assembly: AssemblyFileVersion("2.39.0.0")] +[assembly: AssemblyVersion("2.39.2.0")] +[assembly: AssemblyFileVersion("2.39.2.0")]