ProcessDataStandardFormat

run.json
descriptions.json
MissingMethodException
Infineon.Mesa.PDF.Text.Stripper 4.8.0.2
MSTEST0037

Adaptation/.editorconfig

@@ -122,6 +122,7 @@ dotnet_diagnostic.IDE0290.severity = none # Use primary constructor [Distance]cs
 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.MSTEST0037.severity = error # MSTEST0037: Use proper 'Assert' methods
 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

Adaptation/FileHandlers/pcl/Convert.cs

@@ -4,6 +4,7 @@ using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Diagnostics;
 using System.IO;
+using System.Linq;
 
 namespace Adaptation.FileHandlers.pcl;
 
@@ -31,7 +32,35 @@ internal class Convert
         return result;
     }
 
-    internal static ReadOnlyDictionary<string, string> PDF(Logistics logistics, string ghostPCLFileName, List<FileInfo> fileInfoCollection)
+    private static Dictionary<string, string> PortableDocumentFormatSplit(string pdfTextStripperFileName, string sourcePath, string sourceFileNamePdf)
+    {
+        Dictionary<string, string> results = new();
+        ProcessStartInfo processStartInfo = new(pdfTextStripperFileName, $"s \"{sourceFileNamePdf}\"")
+        {
+            UseShellExecute = false,
+            RedirectStandardError = true,
+            RedirectStandardOutput = true,
+        };
+        Process process = Process.Start(processStartInfo);
+        _ = process.WaitForExit(30000);
+        string text;
+        string checkFile;
+        string[] pdfFiles = Directory.GetFiles(sourcePath, "*.pdf", SearchOption.TopDirectoryOnly);
+        string[] textFiles = Directory.GetFiles(sourcePath, "*.txt", SearchOption.TopDirectoryOnly);
+        foreach (string pdfFile in pdfFiles)
+        {
+            if (pdfFile == sourceFileNamePdf)
+                continue;
+            checkFile = Path.ChangeExtension(pdfFile, ".txt");
+            if (!textFiles.Contains(checkFile))
+                continue;
+            text = File.ReadAllText(checkFile);
+            results.Add(pdfFile, text);
+        }
+        return results;
+    }
+
+    internal static ReadOnlyDictionary<string, string> PDF(Logistics logistics, string ghostPCLFileName, string pdfTextStripperFileName, List<FileInfo> fileInfoCollection)
     {
         Dictionary<string, string> results = new();
         object item;
@@ -57,6 +86,8 @@ internal class Convert
             }
         }
         if (results.Count == 0)
+        {
+            try
             {
                 java.io.File file = new(sourceFileNamePdf);
                 org.apache.pdfbox.util.Splitter splitter = new();
@@ -104,6 +135,12 @@ internal class Convert
                 }
                 pdDocument.close();
             }
+            catch (MissingMethodException)
+            {
+                if (results.Count == 0)
+                    results = PortableDocumentFormatSplit(pdfTextStripperFileName, sourcePath, sourceFileNamePdf);
+            }
+        }
         foreach (string sourceFile in sourceFiles)
             fileInfoCollection.Add(new FileInfo(sourceFile));
         return new(results);

Adaptation/FileHandlers/pcl/FileRead.cs

@@ -16,6 +16,7 @@ public class FileRead : Shared.FileRead, IFileRead
 
     private long? _TickOffset;
     private readonly string _GhostPCLFileName;
+    private readonly string _PDFTextStripperFileName;
 
     public FileRead(ISMTP smtp, Dictionary<string, string> fileParameter, string cellInstanceName, int? connectionCount, string cellInstanceConnectionName, FileConnectorConfiguration fileConnectorConfiguration, string equipmentTypeName, string parameterizedModelObjectDefinitionType, IList<ModelObjectParameterDefinition> modelObjectParameters, string equipmentDictionaryName, Dictionary<string, List<long>> dummyRuns, Dictionary<long, List<string>> staticRuns, bool useCyclicalForDescription, bool isEAFHosted) :
         base(new Description(), true, smtp, fileParameter, cellInstanceName, connectionCount, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted: connectionCount is null)
@@ -32,6 +33,9 @@ public class FileRead : Shared.FileRead, IFileRead
         _GhostPCLFileName = Path.Combine(AppContext.BaseDirectory, "gpcl6win64.exe");
         if (!File.Exists(_GhostPCLFileName))
             throw new Exception("Ghost PCL FileName doesn't Exist!");
+        _PDFTextStripperFileName = Path.Combine(AppContext.BaseDirectory, "PDF-Text-Stripper.exe");
+        if (!File.Exists(_PDFTextStripperFileName))
+            throw new Exception("PDF-Text-Stripper FileName doesn't Exist!");
         if (_IsEAFHosted)
             NestExistingFiles(_FileConnectorConfiguration);
     }
@@ -113,7 +117,7 @@ public class FileRead : Shared.FileRead, IFileRead
             results.Item4.Add(_Logistics.FileInfo);
         else
         {
-            ReadOnlyDictionary<string, string> pages = Convert.PDF(_Logistics, _GhostPCLFileName, results.Item4);
+            ReadOnlyDictionary<string, string> pages = Convert.PDF(_Logistics, _GhostPCLFileName, _PDFTextStripperFileName, results.Item4);
             Run? run = Run.Get(_Logistics, results.Item4, pages);
             if (run is null)
                 throw new Exception(string.Concat("A) No Data - ", dateTime.Ticks));

Adaptation/FileHandlers/pcl/ProcessData.cs

@@ -106,9 +106,13 @@ public class ProcessData : IProcessData
             if (description.Test != (int)tests[i])
                 throw new Exception();
         }
+        FileInfo fileInfo = new($"{logistics.ReportFullPath}.descriptions.json");
         List<Description> fileReadDescriptions = (from l in descriptions select (Description)l).ToList();
         string json = JsonSerializer.Serialize(fileReadDescriptions, fileReadDescriptions.GetType());
-        JsonElement[] jsonElements = JsonSerializer.Deserialize<JsonElement[]>(json);
+        File.WriteAllText(fileInfo.FullName, json);
+        File.SetLastWriteTime(fileInfo.FullName, logistics.DateTimeFromSequence);
+        fileInfoCollection.Add(fileInfo);
+        JsonElement[] jsonElements = JsonSerializer.Deserialize<JsonElement[]>(json) ?? throw new Exception();
         results = new Tuple<string, Test[], JsonElement[], List<FileInfo>>(logistics.Logistics1[0], tests.ToArray(), jsonElements, fileInfoCollection);
         return results;
     }

Adaptation/FileHandlers/pcl/Run.cs

@@ -26,7 +26,7 @@ internal class Run
 
     private static void WriteJson(Logistics logistics, List<FileInfo> fileInfoCollection, Run result)
     {
-        FileInfo fileInfo = new($"{logistics.ReportFullPath}.json");
+        FileInfo fileInfo = new($"{logistics.ReportFullPath}.run.json");
         string json = JsonSerializer.Serialize(result, RunSourceGenerationContext.Default.Run);
         File.WriteAllText(fileInfo.FullName, json);
         File.SetLastWriteTime(fileInfo.FullName, logistics.DateTimeFromSequence);

Adaptation/MET08DDUPSFS6420.Tests.csproj

@@ -69,7 +69,7 @@
         <PackageReference Include="System.Text.Json" Version="9.0.0" />
     </ItemGroup>
     <ItemGroup>
-        <PackageReference Include="Infineon.Mesa.PDF.Text.Stripper" Version="4.8.0.1"><NoWarn>NU1701</NoWarn></PackageReference>
+        <PackageReference Include="Infineon.Mesa.PDF.Text.Stripper" Version="4.8.0.2"><NoWarn>NU1701</NoWarn></PackageReference>
     </ItemGroup>
     <ItemGroup>
         <PackageReference Include="Infineon.Yoda.DotNetCore" Version="5.4.3" />

Adaptation/Shared/ProcessDataStandardFormat.cs

@@ -152,9 +152,11 @@ public class ProcessDataStandardFormat
         {
             string value;
             string[] segments;
+            List<string> lines = new();
             StringBuilder stringBuilder = new();
             foreach (string bodyLine in bodyLines)
             {
+                _ = stringBuilder.Clear();
                 _ = stringBuilder.Append('{');
                 segments = bodyLine.Trim().Split('\t');
                 if (!lookForNumbers)
@@ -179,10 +181,11 @@ public class ProcessDataStandardFormat
                     }
                 }
                 _ = stringBuilder.Remove(stringBuilder.Length - 1, 1);
-                _ = stringBuilder.AppendLine("},");
+                _ = stringBuilder.AppendLine("}");
+                lines.Add(stringBuilder.ToString());
             }
-            _ = stringBuilder.Remove(stringBuilder.Length - 3, 3);
+            string json = $"[{string.Join(",", lines)}]";
-            results = JsonSerializer.Deserialize<JsonElement[]>(string.Concat("[", stringBuilder, "]"));
+            results = JsonSerializer.Deserialize<JsonElement[]>(json);
         }
         return results;
     }

Adaptation/_Tests/Shared/AdaptationTesting.cs

@@ -1111,7 +1111,7 @@ public class AdaptationTesting : ISMTP
             pdsfFiles = Directory.GetFiles(searchDirectory, searchPattern, SearchOption.TopDirectoryOnly);
             if (pdsfFiles.Length == 0)
                 _ = Process.Start("explorer.exe", searchDirectory);
-            Assert.IsTrue(pdsfFiles.Length != 0, "GetFiles check");
+            Assert.AreNotEqual(0, pdsfFiles.Length, "GetFiles check");
             results = GetLogisticsColumnsAndBody(pdsfFiles[0]);
         }
         Assert.IsFalse(string.IsNullOrEmpty(results.Item1));
@@ -1259,13 +1259,13 @@ public class AdaptationTesting : ISMTP
                 Tuple<string, string[], string[]> pdsf = GetLogisticsColumnsAndBody(variables[2], variables[4]);
                 Tuple<string, string[], string[]> pdsfNew = GetLogisticsColumnsAndBody(fileRead, logistics, extractResult, pdsf);
                 CompareSave(variables[5], pdsf, pdsfNew);
-                Assert.IsTrue(pdsf.Item1 == pdsfNew.Item1, "Item1 check!");
+                Assert.AreEqual(pdsfNew.Item1, pdsf.Item1, "Item1 check!");
                 string[] json = GetItem2(pdsf, pdsfNew);
                 CompareSaveJSON(variables[5], json);
-                Assert.IsTrue(json[0] == json[1], "Item2 check!");
+                Assert.AreEqual(json[1], json[0], "Item2 check!");
                 string[] join = GetItem3(pdsf, pdsfNew);
                 CompareSaveTSV(variables[5], join);
-                Assert.IsTrue(join[0] == join[1], "Item3 (Join) check!");
+                Assert.AreEqual(join[1], join[0], "Item3 (Join) check!");
             }
             UpdatePassDirectory(variables[2]);
         }

Adaptation/_Tests/Static/MET08DDUPSFS6420.cs

@@ -51,7 +51,7 @@ public class MET08DDUPSFS6420 : LoggingUnitTesting, IDisposable
     public void TestDateTime()
     {
         DateTime dateTime = DateTime.Now;
-        Assert.IsTrue(dateTime.ToString("M/d/yyyy h:mm:ss tt") == dateTime.ToString());
+        Assert.AreEqual(dateTime.ToString(), dateTime.ToString("M/d/yyyy h:mm:ss tt"));
     }
 
 #if DEBUG

Adaptation/_Tests/Static/pcl.cs

@@ -52,7 +52,7 @@ public class PCL : LoggingUnitTesting, IDisposable
     public void TestDateTime()
     {
         DateTime dateTime = DateTime.Now;
-        Assert.IsTrue(dateTime.ToString("M/d/yyyy h:mm:ss tt") == dateTime.ToString());
+        Assert.AreEqual(dateTime.ToString(), dateTime.ToString("M/d/yyyy h:mm:ss tt"));
     }
 
     [TestMethod]
@@ -69,22 +69,22 @@ public class PCL : LoggingUnitTesting, IDisposable
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.Zone));
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.Employee));
         descriptor = ProcessData.GetDescriptor("12-123456-1234");
-        Assert.IsTrue(descriptor.Reactor is "12");
+        Assert.AreEqual("12", descriptor.Reactor);
-        Assert.IsTrue(descriptor.RDS is "123456");
+        Assert.AreEqual("123456", descriptor.RDS);
-        Assert.IsTrue(descriptor.PSN is "1234");
+        Assert.AreEqual("1234", descriptor.PSN);
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.Layer));
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.Zone));
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.Employee));
         descriptor = ProcessData.GetDescriptor("123456");
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.Reactor));
-        Assert.IsTrue(descriptor.RDS is "123456");
+        Assert.AreEqual("123456", descriptor.RDS);
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.PSN));
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.Layer));
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.Zone));
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.Employee));
         descriptor = ProcessData.GetDescriptor("1T123456");
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.Reactor));
-        Assert.IsTrue(descriptor.RDS is "123456");
+        Assert.AreEqual("123456", descriptor.RDS);
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.PSN));
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.Layer));
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.Zone));
@@ -93,96 +93,96 @@ public class PCL : LoggingUnitTesting, IDisposable
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.Reactor));
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.RDS));
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.PSN));
-        Assert.IsTrue(descriptor.Employee is "MP");
+        Assert.AreEqual("MP", descriptor.Employee);
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.Layer));
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.Zone));
         descriptor = ProcessData.GetDescriptor("12-123456-1234.2-1");
-        Assert.IsTrue(descriptor.Reactor is "12");
+        Assert.AreEqual("12", descriptor.Reactor);
-        Assert.IsTrue(descriptor.RDS is "123456");
+        Assert.AreEqual("123456", descriptor.RDS);
-        Assert.IsTrue(descriptor.PSN is "1234");
+        Assert.AreEqual("1234", descriptor.PSN);
-        Assert.IsTrue(descriptor.Layer is "2");
+        Assert.AreEqual("2", descriptor.Layer);
-        Assert.IsTrue(descriptor.Zone is "1");
+        Assert.AreEqual("1", descriptor.Zone);
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.Employee));
         descriptor = ProcessData.GetDescriptor("12-123456-1234.02-1");
-        Assert.IsTrue(descriptor.Reactor is "12");
+        Assert.AreEqual("12", descriptor.Reactor);
-        Assert.IsTrue(descriptor.RDS is "123456");
+        Assert.AreEqual("123456", descriptor.RDS);
-        Assert.IsTrue(descriptor.PSN is "1234");
+        Assert.AreEqual("1234", descriptor.PSN);
-        Assert.IsTrue(descriptor.Layer is "2");
+        Assert.AreEqual("2", descriptor.Layer);
-        Assert.IsTrue(descriptor.Zone is "1");
+        Assert.AreEqual("1", descriptor.Zone);
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.Employee));
         descriptor = ProcessData.GetDescriptor("20");
-        Assert.IsTrue(descriptor.Reactor is "20");
+        Assert.AreEqual("20", descriptor.Reactor);
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.RDS));
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.PSN));
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.Layer));
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.Zone));
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.Employee));
         descriptor = ProcessData.GetDescriptor("20.2");
-        Assert.IsTrue(descriptor.Reactor is "20");
+        Assert.AreEqual("20", descriptor.Reactor);
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.RDS));
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.PSN));
-        Assert.IsTrue(descriptor.Layer is "2");
+        Assert.AreEqual("2", descriptor.Layer);
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.Zone));
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.Employee));
         descriptor = ProcessData.GetDescriptor("20.2.1");
-        Assert.IsTrue(descriptor.Layer is "2");
+        Assert.AreEqual("2", descriptor.Layer);
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.PSN));
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.RDS));
-        Assert.IsTrue(descriptor.Reactor is "20");
+        Assert.AreEqual("20", descriptor.Reactor);
-        Assert.IsTrue(descriptor.Zone is "1");
+        Assert.AreEqual("1", descriptor.Zone);
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.Employee));
         descriptor = ProcessData.GetDescriptor("20.1.1");
-        Assert.IsTrue(descriptor.Layer is "1");
+        Assert.AreEqual("1", descriptor.Layer);
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.PSN));
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.RDS));
-        Assert.IsTrue(descriptor.Reactor is "20");
+        Assert.AreEqual("20", descriptor.Reactor);
-        Assert.IsTrue(descriptor.Zone is "1");
+        Assert.AreEqual("1", descriptor.Zone);
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.Employee));
         descriptor = ProcessData.GetDescriptor("P2-LOW-RR");
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.Layer));
-        Assert.IsTrue(descriptor.PSN is "RR");
+        Assert.AreEqual("RR", descriptor.PSN);
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.RDS));
-        Assert.IsTrue(descriptor.Reactor is "P2");
+        Assert.AreEqual("P2", descriptor.Reactor);
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.Zone));
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.Employee));
         descriptor = ProcessData.GetDescriptor("i171308.1.51");
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.Layer));
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.PSN));
-        Assert.IsTrue(descriptor.RDS is "i171308.1.51");
+        Assert.AreEqual("i171308.1.51", descriptor.RDS);
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.Reactor));
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.Zone));
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.Employee));
         descriptor = ProcessData.GetDescriptor("o171308.1.51");
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.Layer));
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.PSN));
-        Assert.IsTrue(descriptor.RDS is "o171308.1.51");
+        Assert.AreEqual("o171308.1.51", descriptor.RDS);
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.Reactor));
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.Zone));
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.Employee));
         descriptor = ProcessData.GetDescriptor("O171308.1.51");
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.Layer));
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.PSN));
-        Assert.IsTrue(descriptor.RDS is "O171308.1.51");
+        Assert.AreEqual("O171308.1.51", descriptor.RDS);
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.Reactor));
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.Zone));
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.Employee));
         descriptor = ProcessData.GetDescriptor("171308.1.51");
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.Layer));
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.PSN));
-        Assert.IsTrue(descriptor.RDS is "171308.1.51");
+        Assert.AreEqual("171308.1.51", descriptor.RDS);
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.Reactor));
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.Zone));
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.Employee));
         descriptor = ProcessData.GetDescriptor("75-QP1414-SPLIT4");
-        Assert.IsTrue(!string.IsNullOrEmpty(descriptor.Lot));
+        Assert.IsFalse(string.IsNullOrEmpty(descriptor.Lot));
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.Layer));
-        Assert.IsTrue(descriptor.PSN is "SPLIT4");
+        Assert.AreEqual("SPLIT4", descriptor.PSN);
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.RDS));
-        Assert.IsTrue(descriptor.Reactor is "75");
+        Assert.AreEqual("75", descriptor.Reactor);
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.Zone));
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.Employee));
         descriptor = ProcessData.GetDescriptor("B48");
-        Assert.IsTrue(descriptor.Lot == "B48");
+        Assert.AreEqual("B48", descriptor.Lot);
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.Layer));
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.PSN));
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.PSN));