переделывание тестов

2025-02-05 10:58:50 +03:00
parent fd1eda2661
commit f51dd93c87
28 changed files with 407 additions and 325 deletions
@@ -1,6 +1,8 @@
 using System.Net;
 using System.Net.Sockets;
 using System.Reflection;
+using mROA.Abstract;
+using mROA.Codegen;
 using mROA.Example;
 using mROA.Implementation;

@@ -21,21 +23,33 @@ public class FrontendFinalTest
    [SetUp]
    public void Setup()
    {
-        var repo = new MethodRepository();
-        repo.CollectForAssembly(Assembly.GetExecutingAssembly());
-        _methodRepository = repo;
+        _methodRepository = new CoCodegenMethodRepository();
        var repo2 = new ContextRepository();
-        repo2.FillSingletons(Assembly.GetExecutingAssembly());
+        repo2.FillSingletons(typeof(ITestController).Assembly);
        _contextRepository = repo2;
+        
        _interactionModule = new StreamBasedInteractionModule();

-        _serialisationModule = new JsonSerialisationModule(_interactionModule, _methodRepository);
+        _serialisationModule = new JsonSerialisationModule();

-        _executeModule = new LaunchReadyExecutionModule(_methodRepository, _serialisationModule, _contextRepository);
+        _executeModule = new LaunchReadyExecutionModule();
+        
+        IInjectableModule[] backendModules = [_methodRepository, _contextRepository, _interactionModule, _serialisationModule, _executeModule];
+        
+        foreach (var backendModule in backendModules)
+        foreach (var injection in backendModules)
+            backendModule.Inject(injection);

        _frontendInteractionModule = new StreamBasedFrontendInteractionModule();
-        _frontendSerialisationModule = new JsonFrontendSerialisationModule(_frontendInteractionModule);
+        _frontendSerialisationModule = new JsonFrontendSerialisationModule();
+        _frontendContextRepository = new FrontendContextRepository();
+        
+        IInjectableModule[] frontendModules = [_frontendInteractionModule, _frontendSerialisationModule, _frontendContextRepository];

+        foreach (var backendModule in frontendModules)
+        foreach (var injection in frontendModules)
+            backendModule.Inject(injection);
+        
        Task.Run(() =>
        {
            TcpListener listener = new TcpListener(IPAddress.Loopback, 4567);
@@ -1,66 +1,65 @@
-using System.Net;
-using System.Net.Sockets;
-using System.Text.Json;
-using mROA.Implementation;
-using mROA.Implementation.Test;
-
-namespace mROA.Test;
-
-public class StreamTest
-{
-    private StreamBasedInteractionModule _interactionModule;
-    private StreamBasedFrontendInteractionModule _frontendInteractionModule;
-    private JsonFrontendSerialisationModule _frontendSerialisationModule;
-    private ISerialisationModule _serialisationModule;
-    private IExecuteModule _executeModule;
-    bool isTestNotFinished = true;
-
-    [SetUp]
-    public void Setup()
-    {
-        _interactionModule = new StreamBasedInteractionModule();
-
-        _serialisationModule = new JsonSerialisationModule(_interactionModule, new MockMethodRepository());
-
-        _executeModule = new MockExecModule();
-        _serialisationModule.SetExecuteModule(_executeModule);
-
-        _frontendInteractionModule = new StreamBasedFrontendInteractionModule();
-        _frontendSerialisationModule = new JsonFrontendSerialisationModule(_frontendInteractionModule);
-        
-        Task.Run(() =>
-        {
-            TcpListener listener = new TcpListener(IPAddress.Loopback, 4567);
-            listener.Start();
-
-            var stream = listener.AcceptTcpClient().GetStream();
-
-            Console.WriteLine("Client connected");
-
-            _interactionModule.RegisterSourse(stream);
-
-            while (isTestNotFinished) ;
-        });
-    }
-
-    [Test]
-    public void StreamingTest()
-    {
-        var tcpClient = new TcpClient();
-        tcpClient.Connect(IPAddress.Loopback, 4567);
-        _frontendInteractionModule.ServerStream = tcpClient.GetStream();
-        
-        var req = new DefaultCallRequest { CommandId = 1, ObjectId = -1 };
-        _frontendSerialisationModule.PostCallRequest(req);
-        var res = ((JsonElement)_frontendSerialisationModule.GetNextCommandExecution<FinalCommandExecution>(req.CallRequestId).GetAwaiter().GetResult().Result!).Deserialize<MockResult>();
-        isTestNotFinished = false;
-        Assert.That(res.A == "wqer" && res.B == 5);
-    }
-
-    [Test]
-    public void RemoteObjectTest()
-    {
-        
-    }
-    
-}
+// using System.Net;
+// using System.Net.Sockets;
+// using System.Text.Json;
+// using mROA.Implementation;
+//
+// namespace mROA.Test;
+//
+// public class StreamTest
+// {
+//     private StreamBasedInteractionModule _interactionModule;
+//     private StreamBasedFrontendInteractionModule _frontendInteractionModule;
+//     private JsonFrontendSerialisationModule _frontendSerialisationModule;
+//     private ISerialisationModule _serialisationModule;
+//     private IExecuteModule _executeModule;
+//     bool isTestNotFinished = true;
+//
+//     [SetUp]
+//     public void Setup()
+//     {
+//         _interactionModule = new StreamBasedInteractionModule();
+//
+//         _serialisationModule = new JsonSerialisationModule(_interactionModule, new MockMethodRepository());
+//
+//         _executeModule = new MockExecModule();
+//         _serialisationModule.SetExecuteModule(_executeModule);
+//
+//         _frontendInteractionModule = new StreamBasedFrontendInteractionModule();
+//         _frontendSerialisationModule = new JsonFrontendSerialisationModule(_frontendInteractionModule);
+//
+//         Task.Run(() =>
+//         {
+//             TcpListener listener = new TcpListener(IPAddress.Loopback, 4567);
+//             listener.Start();
+//
+//             var stream = listener.AcceptTcpClient().GetStream();
+//
+//             Console.WriteLine("Client connected");
+//
+//             _interactionModule.RegisterSourse(stream);
+//
+//             while (isTestNotFinished) ;
+//         });
+//     }
+//
+//     [Test]
+//     public void StreamingTest()
+//     {
+//         var tcpClient = new TcpClient();
+//         tcpClient.Connect(IPAddress.Loopback, 4567);
+//         _frontendInteractionModule.ServerStream = tcpClient.GetStream();
+//
+//         var req = new DefaultCallRequest { CommandId = 1, ObjectId = -1 };
+//         _frontendSerialisationModule.PostCallRequest(req);
+//         var res = ((JsonElement)_frontendSerialisationModule
+//                 .GetNextCommandExecution<FinalCommandExecution>(req.CallRequestId).GetAwaiter().GetResult().Result!)
+//             .Deserialize<MockResult>();
+//         isTestNotFinished = false;
+//         Assert.That(res.A == "wqer" && res.B == 5);
+//     }
+//
+//     [Test]
+//     public void RemoteObjectTest()
+//     {
+//     }
+// }
@@ -1,154 +1,154 @@
-using System.Diagnostics;
-using System.Reflection;
-using System.Text;
-using System.Text.Json;
-using mROA.Example;
-using mROA.Implementation;
-using Newtonsoft.Json;
-using JsonSerializer = System.Text.Json.JsonSerializer;
-
-namespace mROA.Test;
-
-public class Tests
-{
-    private ProgramlyInteractionChanel _interactionModule;
-    private ISerialisationModule _serialisationModule;
-    private IExecuteModule _executeModule;
-    private IMethodRepository _methodRepository;
-    private IContextRepository _contextRepository;
-
-    private ITestController _testController;
-
-    [SetUp]
-    public void Setup()
-    {
-        _interactionModule = new ProgramlyInteractionChanel();
-        var repo = new MethodRepository();
-        repo.CollectForAssembly(Assembly.GetExecutingAssembly());
-        _methodRepository = repo;
-        var repo2 = new ContextRepository();
-        repo2.FillSingletons(Assembly.GetExecutingAssembly());
-        _contextRepository = repo2;
-        _serialisationModule = new JsonSerialisationModule(_interactionModule, _methodRepository);
-
-        _executeModule = new LaunchReadyExecutionModule(_methodRepository, _serialisationModule, _contextRepository);
-        TransmissionConfig.DefaultContextRepository = _contextRepository;
-    }
-
-    [Test]
-    public void CommandPipelineTest()
-    {
-        var sw = Stopwatch.StartNew();
-
-        _interactionModule.PassCommand(132, """
-                                            {
-                                              "RequestTypeId": 0,
-                                              "CommandId": 2
-                                            }
-                                            """u8.ToArray());
-        Assert.Pass(_interactionModule.OutputBuffer.Last());
-    }
-
-    [Test]
-    public void CommandPipelineTestAsync()
-    {
-        var sw = Stopwatch.StartNew();
-        _interactionModule.PassCommand(132, """
-                                            {
-                                              "RequestTypeId": 0,
-                                              "CommandId": 3
-                                            }
-                                            """u8.ToArray());
-        while (_interactionModule.OutputBuffer.Count != 2) ;
-
-        Assert.Pass(_interactionModule.OutputBuffer.Last());
-    }
-
-    [Test]
-    public void MethodRegistrationTest()
-    {
-        var repo = new MethodRepository();
-        repo.CollectForAssembly(Assembly.GetExecutingAssembly());
-        Assert.That(repo.GetMethods().ToList().Count == 8);
-    }
-
-    [Test]
-    public void ContextSupplyTest()
-    {
-        var repo = new ContextRepository();
-        repo.FillSingletons(Assembly.GetExecutingAssembly());
-        var singleObject = repo.GetSingleObject(typeof(ITestController)) as ITestController;
-        singleObject.B();
-        Assert.That(singleObject.B() == 6);
-    }
-
-    [Test]
-    public void TransmissionTest()
-    {
-        _interactionModule.PassCommand(132, """
-                                            {
-                                              "CommandId": 4
-                                            }
-                                            """u8.ToArray());
-        var response =
-            JsonSerializer.Deserialize<TransmittedSharedObject<IContextRepository>>(
-                JsonSerializer.Deserialize<FinalCommandExecution>(_interactionModule.OutputBuffer.Last())
-                    ?.Result.ToString()
-            );
-
-        _interactionModule.PassCommand(132, Encoding.UTF8.GetBytes(
-            JsonSerializer.Serialize(new DefaultCallRequest { CommandId = 2, ObjectId = response.ContextId })));
-
-        var firstFull = JsonDocument.Parse(_interactionModule.OutputBuffer.Last()).RootElement.GetProperty("Result")
-            .GetInt32();
-
-        _interactionModule.PassCommand(132, Encoding.UTF8.GetBytes(
-            JsonSerializer.Serialize(new DefaultCallRequest { CommandId = 4, ObjectId = response.ContextId })));
-
-        response =
-            JsonSerializer.Deserialize<TransmittedSharedObject<IContextRepository>>(
-                JsonSerializer.Deserialize<FinalCommandExecution>(_interactionModule.OutputBuffer.Last())
-                    ?.Result.ToString()
-            );
-
-        _interactionModule.PassCommand(132, Encoding.UTF8.GetBytes(
-            JsonSerializer.Serialize(new DefaultCallRequest { CommandId = 2, ObjectId = response.ContextId })));
-        _interactionModule.PassCommand(132, Encoding.UTF8.GetBytes(
-            JsonSerializer.Serialize(new DefaultCallRequest { CommandId = 2, ObjectId = response.ContextId })));
-
-        var secondFull = JsonDocument.Parse(_interactionModule.OutputBuffer.Last()).RootElement.GetProperty("Result")
-            .GetInt32();
-
-        Assert.That(firstFull == 456789 && secondFull == 6);
-    }
-
-    [Test]
-    public void LinkedObjectsAndParametersTest()
-    {
-        _interactionModule.PassCommand(132, """
-                                            {
-                                              "CommandId": 6
-                                            }
-                                            """u8.ToArray());
-        var response =
-            JsonSerializer.Deserialize<TransmittedSharedObject<ITestParameter>>(
-                JsonSerializer.Deserialize<FinalCommandExecution>(_interactionModule.OutputBuffer.Last())
-                    ?.Result.ToString()
-            );
-        var x = response.ContextId;
-        _interactionModule.PassCommand(132,Encoding.UTF8.GetBytes(
-            JsonSerializer.Serialize(new DefaultCallRequest
-            {
-                CommandId = 5,
-                Parameter = new TestParameter
-                {
-                    A = 10,
-                    LinkedObject = new TransmittedSharedObject<ITestParameter> { ContextId = x }
-                }
-            })));
-        
-        var finalResponse = JsonDocument.Parse(_interactionModule.OutputBuffer.Last()).RootElement.GetProperty("Result").GetInt32();
-        
-        Assert.That(finalResponse, Is.EqualTo(20));
-    }
-}
+// using System.Diagnostics;
+// using System.Reflection;
+// using System.Text;
+// using System.Text.Json;
+// using mROA.Example;
+// using mROA.Implementation;
+// using Newtonsoft.Json;
+// using JsonSerializer = System.Text.Json.JsonSerializer;
+//
+// namespace mROA.Test;
+//
+// public class Tests
+// {
+//     private ProgramlyInteractionChanel _interactionModule;
+//     private ISerialisationModule _serialisationModule;
+//     private IExecuteModule _executeModule;
+//     private IMethodRepository _methodRepository;
+//     private IContextRepository _contextRepository;
+//
+//     private ITestController _testController;
+//
+//     [SetUp]
+//     public void Setup()
+//     {
+//         _interactionModule = new ProgramlyInteractionChanel();
+//         var repo = new MethodRepository();
+//         repo.CollectForAssembly(Assembly.GetExecutingAssembly());
+//         _methodRepository = repo;
+//         var repo2 = new ContextRepository();
+//         repo2.FillSingletons(Assembly.GetExecutingAssembly());
+//         _contextRepository = repo2;
+//         _serialisationModule = new JsonSerialisationModule(_interactionModule, _methodRepository);
+//
+//         _executeModule = new LaunchReadyExecutionModule(_methodRepository, _serialisationModule, _contextRepository);
+//         TransmissionConfig.DefaultContextRepository = _contextRepository;
+//     }
+//
+//     [Test]
+//     public void CommandPipelineTest()
+//     {
+//         var sw = Stopwatch.StartNew();
+//
+//         _interactionModule.PassCommand(132, """
+//                                             {
+//                                               "RequestTypeId": 0,
+//                                               "CommandId": 2
+//                                             }
+//                                             """u8.ToArray());
+//         Assert.Pass(_interactionModule.OutputBuffer.Last());
+//     }
+//
+//     [Test]
+//     public void CommandPipelineTestAsync()
+//     {
+//         var sw = Stopwatch.StartNew();
+//         _interactionModule.PassCommand(132, """
+//                                             {
+//                                               "RequestTypeId": 0,
+//                                               "CommandId": 3
+//                                             }
+//                                             """u8.ToArray());
+//         while (_interactionModule.OutputBuffer.Count != 2) ;
+//
+//         Assert.Pass(_interactionModule.OutputBuffer.Last());
+//     }
+//
+//     [Test]
+//     public void MethodRegistrationTest()
+//     {
+//         var repo = new MethodRepository();
+//         repo.CollectForAssembly(Assembly.GetExecutingAssembly());
+//         Assert.That(repo.GetMethods().ToList().Count == 8);
+//     }
+//
+//     [Test]
+//     public void ContextSupplyTest()
+//     {
+//         var repo = new ContextRepository();
+//         repo.FillSingletons(Assembly.GetExecutingAssembly());
+//         var singleObject = repo.GetSingleObject(typeof(ITestController)) as ITestController;
+//         singleObject.B();
+//         Assert.That(singleObject.B() == 6);
+//     }
+//
+//     [Test]
+//     public void TransmissionTest()
+//     {
+//         _interactionModule.PassCommand(132, """
+//                                             {
+//                                               "CommandId": 4
+//                                             }
+//                                             """u8.ToArray());
+//         var response =
+//             JsonSerializer.Deserialize<TransmittedSharedObject<IContextRepository>>(
+//                 JsonSerializer.Deserialize<FinalCommandExecution>(_interactionModule.OutputBuffer.Last())
+//                     ?.Result.ToString()
+//             );
+//
+//         _interactionModule.PassCommand(132, Encoding.UTF8.GetBytes(
+//             JsonSerializer.Serialize(new DefaultCallRequest { CommandId = 2, ObjectId = response.ContextId })));
+//
+//         var firstFull = JsonDocument.Parse(_interactionModule.OutputBuffer.Last()).RootElement.GetProperty("Result")
+//             .GetInt32();
+//
+//         _interactionModule.PassCommand(132, Encoding.UTF8.GetBytes(
+//             JsonSerializer.Serialize(new DefaultCallRequest { CommandId = 4, ObjectId = response.ContextId })));
+//
+//         response =
+//             JsonSerializer.Deserialize<TransmittedSharedObject<IContextRepository>>(
+//                 JsonSerializer.Deserialize<FinalCommandExecution>(_interactionModule.OutputBuffer.Last())
+//                     ?.Result.ToString()
+//             );
+//
+//         _interactionModule.PassCommand(132, Encoding.UTF8.GetBytes(
+//             JsonSerializer.Serialize(new DefaultCallRequest { CommandId = 2, ObjectId = response.ContextId })));
+//         _interactionModule.PassCommand(132, Encoding.UTF8.GetBytes(
+//             JsonSerializer.Serialize(new DefaultCallRequest { CommandId = 2, ObjectId = response.ContextId })));
+//
+//         var secondFull = JsonDocument.Parse(_interactionModule.OutputBuffer.Last()).RootElement.GetProperty("Result")
+//             .GetInt32();
+//
+//         Assert.That(firstFull == 456789 && secondFull == 6);
+//     }
+//
+//     [Test]
+//     public void LinkedObjectsAndParametersTest()
+//     {
+//         _interactionModule.PassCommand(132, """
+//                                             {
+//                                               "CommandId": 6
+//                                             }
+//                                             """u8.ToArray());
+//         var response =
+//             JsonSerializer.Deserialize<TransmittedSharedObject<ITestParameter>>(
+//                 JsonSerializer.Deserialize<FinalCommandExecution>(_interactionModule.OutputBuffer.Last())
+//                     ?.Result.ToString()
+//             );
+//         var x = response.ContextId;
+//         _interactionModule.PassCommand(132,Encoding.UTF8.GetBytes(
+//             JsonSerializer.Serialize(new DefaultCallRequest
+//             {
+//                 CommandId = 5,
+//                 Parameter = new TestParameter
+//                 {
+//                     A = 10,
+//                     LinkedObject = new TransmittedSharedObject<ITestParameter> { ContextId = x }
+//                 }
+//             })));
+//         
+//         var finalResponse = JsonDocument.Parse(_interactionModule.OutputBuffer.Last()).RootElement.GetProperty("Result").GetInt32();
+//         
+//         Assert.That(finalResponse, Is.EqualTo(20));
+//     }
+// }
@@ -13,7 +13,7 @@ using System.Reflection;
 [assembly: System.Reflection.AssemblyCompanyAttribute("mROA.Test")]
 [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
 [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+ad2ef8e4b754b4cb2c5d3dbaa5c24f15201dd0f9")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+fd1eda26618b8cebe94eaa0e27ce5e97353d2d09")]
 [assembly: System.Reflection.AssemblyProductAttribute("mROA.Test")]
 [assembly: System.Reflection.AssemblyTitleAttribute("mROA.Test")]
 [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
@@ -14,7 +14,7 @@ using System.Reflection;
 [assembly: System.Reflection.AssemblyCompanyAttribute("mROA.Test")]
 [assembly: System.Reflection.AssemblyConfigurationAttribute("Release")]
 [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+2fac34a1ceac82d71c748b1421917d8fc2a60fa7")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+fd1eda26618b8cebe94eaa0e27ce5e97353d2d09")]
 [assembly: System.Reflection.AssemblyProductAttribute("mROA.Test")]
 [assembly: System.Reflection.AssemblyTitleAttribute("mROA.Test")]
 [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
@@ -5,12 +5,12 @@
    <RestoreTool Condition=" '$(RestoreTool)' == '' ">NuGet</RestoreTool>
    <ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">$(MSBuildThisFileDirectory)project.assets.json</ProjectAssetsFile>
    <NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
-    <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\Mikhail\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages</NuGetPackageFolders>
+    <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\Mimm\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages</NuGetPackageFolders>
    <NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
    <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">6.12.0</NuGetToolVersion>
  </PropertyGroup>
  <ItemGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
-    <SourceRoot Include="C:\Users\Mikhail\.nuget\packages\" />
+    <SourceRoot Include="C:\Users\Mimm\.nuget\packages\" />
    <SourceRoot Include="C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages\" />
  </ItemGroup>
  <ImportGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
@@ -21,6 +21,6 @@
    <Import Project="$(NuGetPackageRoot)microsoft.net.test.sdk\17.12.0\build\netcoreapp3.1\Microsoft.NET.Test.Sdk.props" Condition="Exists('$(NuGetPackageRoot)microsoft.net.test.sdk\17.12.0\build\netcoreapp3.1\Microsoft.NET.Test.Sdk.props')" />
  </ImportGroup>
  <PropertyGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
-    <PkgNUnit_Analyzers Condition=" '$(PkgNUnit_Analyzers)' == '' ">C:\Users\Mikhail\.nuget\packages\nunit.analyzers\4.6.0</PkgNUnit_Analyzers>
+    <PkgNUnit_Analyzers Condition=" '$(PkgNUnit_Analyzers)' == '' ">C:\Users\Mimm\.nuget\packages\nunit.analyzers\4.6.0</PkgNUnit_Analyzers>
  </PropertyGroup>
 </Project>