Merge pull request #81 from SergeyGulik/test_fix

Fixed tests compilation.

Author: PatrickRitchie

tests/IntegrationTests/ClientAgentCommunicationTests.cs

@@ -67,21 +67,6 @@ public ClientAgentCommunicationTests(
             //_machineName = $"Machine{_fixture.CurrentAgentPort}";
 
             var devicesFile = "devices.xml";
-
-            var configuration = new ShdrAgentConfiguration
-            {
-                Port = _fixture.CurrentAgentPort,
-                Adapters = new List<ShdrAdapterClientConfiguration>()
-                {
-                    new()
-                    {
-                        DeviceKey = _machineName, 
-                        Hostname = "localhost", 
-                        Port = _fixture.CurrentAdapterPort
-                    }
-                }
-            };
-
             GenerateDevicesXml(
                 _machineId,
                 _machineName,
@@ -93,10 +78,20 @@ public ClientAgentCommunicationTests(
 
             AddCuttingTools();
 
-            _agent = new MTConnectAgentBroker(configuration);
+            _agent = new MTConnectAgentBroker();
             //_agent.Version = new Version(1, 8);
             _agent.Start();
 
+            var adapters = new List<ShdrAdapterClientConfiguration>()
+            {
+                new()
+                {
+                    DeviceKey = _machineName,
+                    Hostname = "localhost",
+                    Port = _fixture.CurrentAdapterPort
+                }
+            };
+
             // Add Adapter Clients
             var devices = DeviceConfiguration.FromFile(devicesFile, DocumentFormat.XML).ToList();
             if (!devices.IsNullOrEmpty())
@@ -107,7 +102,7 @@ public ClientAgentCommunicationTests(
                     _agent.AddDevice(device);
                 }
 
-                foreach (var adapterConfiguration in configuration.Adapters)
+                foreach (var adapterConfiguration in adapters)
                 {
                     var device = devices.FirstOrDefault(o => o.Name == adapterConfiguration.DeviceKey);
                     if (device != null)
@@ -119,6 +114,10 @@ public ClientAgentCommunicationTests(
                 }
             }
 
+            var configuration = new HttpServerConfiguration
+            {
+                Port = _fixture.CurrentAgentPort
+            };
             _server = new MTConnectHttpServer(configuration, _agent);
             _server.Start();
         }

tests/MTConnect.NET-XML-Tests/Streams/Current.cs

@@ -5,6 +5,7 @@
 using System.IO;
 using System.Linq;
 using System.Text;
+using System.Xml;
 
 namespace MTConnect.Tests.XML.Streams
 {
@@ -19,9 +20,10 @@ public void ReadStreamTestFiles()
             {
                 foreach (var file in files)
                 {
-                    var originalBytes = File.ReadAllBytes(file);
+                    using var fileStream = File.OpenRead(file);
+                    using var xmlReader = XmlReader.Create(fileStream);
 
-                    var doc = XmlStreamsResponseDocument.FromXml(originalBytes);
+                    var doc = XmlStreamsResponseDocument.ReadXml(xmlReader);
 
                     Assert.That(doc != null, $"Read Original : {file}");
                 }

tests/MTConnect.NET-XML-Tests/XmlStreamsResponseDocumentTests.cs

@@ -1,6 +1,8 @@
 using System;
+using System.IO;
 using System.Linq;
 using System.Text;
+using System.Xml;
 using DeepEqual.Syntax;
 using MTConnect.Observations;
 using MTConnect.Streams.Xml;
@@ -28,7 +30,8 @@ public void TwoConditionsShouldBeParsed()
   </Streams>
 </MTConnectStreams>";
 
-            var doc = XmlStreamsResponseDocument.FromXml(Encoding.UTF8.GetBytes(text));
+            using var xmlStream = XmlReader.Create(new MemoryStream(Encoding.UTF8.GetBytes(text)));
+            var doc = XmlStreamsResponseDocument.ReadXml(xmlStream);
 
             Assert.AreEqual(1, doc.Streams.Count());
             var stream = doc.Streams.Single();