Skip to content

Commit 301d7b8

Browse files
dbeuchlerdbeuchler
committed
Renamed Moryx.Resources.Mqtt.Tests to Moryx.Drivers.Mqtt.Tests
1 parent f39e64e commit 301d7b8

12 files changed

+24
-27
lines changed

‎MORYX-Framework.sln‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -216,8 +216,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Drivers", "Drivers", "{93C9
216216
EndProject
217217
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Moryx.Drivers.Mqtt", "src\Moryx.Drivers.Mqtt\Moryx.Drivers.Mqtt.csproj", "{7EDCD56F-EF56-40DF-A25F-5896990D2407}"
218218
EndProject
219-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Moryx.Resources.Mqtt.Tests", "src\Tests\Moryx.Recources.Mqtt.Tests\Moryx.Resources.Mqtt.Tests.csproj", "{4C32122A-90B9-4E49-AE3E-985FA5D4AC54}"
220-
EndProject
221219
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Moryx.Drivers.OpcUa", "src\Moryx.Drivers.OpcUa\Moryx.Drivers.OpcUa.csproj", "{BD3B74DF-9EC2-4A5A-BCFE-1707C83756CC}"
222220
EndProject
223221
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Moryx.Drivers.OpcUa.Tests", "src\Tests\Moryx.Drivers.OpcUa.Tests\Moryx.Drivers.OpcUa.Tests.csproj", "{CB5BC342-4952-4419-ABB9-0D240684A3DE}"
@@ -308,6 +306,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Moryx.Shifts.Management.Int
308306
EndProject
309307
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Moryx.Model.SqlServer", "src\Moryx.Model.SqlServer\Moryx.Model.SqlServer.csproj", "{4402EF2E-CBA8-4EEF-B8A6-EC8364960306}"
310308
EndProject
309+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Moryx.Drivers.Mqtt.Tests", "src\Tests\Moryx.Drivers.Mqtt.Tests\Moryx.Drivers.Mqtt.Tests.csproj", "{B2F922C0-F7C3-4C70-9BC5-5B5743BD8D7F}"
310+
EndProject
311311
Global
312312
GlobalSection(SolutionConfigurationPlatforms) = preSolution
313313
Debug|Any CPU = Debug|Any CPU
@@ -646,10 +646,6 @@ Global
646646
{7EDCD56F-EF56-40DF-A25F-5896990D2407}.Debug|Any CPU.Build.0 = Debug|Any CPU
647647
{7EDCD56F-EF56-40DF-A25F-5896990D2407}.Release|Any CPU.ActiveCfg = Release|Any CPU
648648
{7EDCD56F-EF56-40DF-A25F-5896990D2407}.Release|Any CPU.Build.0 = Release|Any CPU
649-
{4C32122A-90B9-4E49-AE3E-985FA5D4AC54}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
650-
{4C32122A-90B9-4E49-AE3E-985FA5D4AC54}.Debug|Any CPU.Build.0 = Debug|Any CPU
651-
{4C32122A-90B9-4E49-AE3E-985FA5D4AC54}.Release|Any CPU.ActiveCfg = Release|Any CPU
652-
{4C32122A-90B9-4E49-AE3E-985FA5D4AC54}.Release|Any CPU.Build.0 = Release|Any CPU
653649
{BD3B74DF-9EC2-4A5A-BCFE-1707C83756CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
654650
{BD3B74DF-9EC2-4A5A-BCFE-1707C83756CC}.Debug|Any CPU.Build.0 = Debug|Any CPU
655651
{BD3B74DF-9EC2-4A5A-BCFE-1707C83756CC}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -810,6 +806,10 @@ Global
810806
{4402EF2E-CBA8-4EEF-B8A6-EC8364960306}.Debug|Any CPU.Build.0 = Debug|Any CPU
811807
{4402EF2E-CBA8-4EEF-B8A6-EC8364960306}.Release|Any CPU.ActiveCfg = Release|Any CPU
812808
{4402EF2E-CBA8-4EEF-B8A6-EC8364960306}.Release|Any CPU.Build.0 = Release|Any CPU
809+
{B2F922C0-F7C3-4C70-9BC5-5B5743BD8D7F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
810+
{B2F922C0-F7C3-4C70-9BC5-5B5743BD8D7F}.Debug|Any CPU.Build.0 = Debug|Any CPU
811+
{B2F922C0-F7C3-4C70-9BC5-5B5743BD8D7F}.Release|Any CPU.ActiveCfg = Release|Any CPU
812+
{B2F922C0-F7C3-4C70-9BC5-5B5743BD8D7F}.Release|Any CPU.Build.0 = Release|Any CPU
813813
EndGlobalSection
814814
GlobalSection(SolutionProperties) = preSolution
815815
HideSolutionNode = FALSE
@@ -893,7 +893,6 @@ Global
893893
{39EDE0BB-F7D8-4E2E-9D1B-36A7A245FA05} = {8BBF84BB-4A8B-49F4-BA74-F25CBEED3F57}
894894
{D473D554-26F3-47EC-AE7D-A9754556C9D9} = {8BBF84BB-4A8B-49F4-BA74-F25CBEED3F57}
895895
{7EDCD56F-EF56-40DF-A25F-5896990D2407} = {93C94C82-873F-4D31-8A9C-0227047BD5A8}
896-
{4C32122A-90B9-4E49-AE3E-985FA5D4AC54} = {0A466330-6ED6-4861-9C94-31B1949CDDB9}
897896
{BD3B74DF-9EC2-4A5A-BCFE-1707C83756CC} = {93C94C82-873F-4D31-8A9C-0227047BD5A8}
898897
{CB5BC342-4952-4419-ABB9-0D240684A3DE} = {0A466330-6ED6-4861-9C94-31B1949CDDB9}
899898
{58CD8D72-1000-479A-B82A-D8C018345239} = {73AFB51B-B1A2-4144-AB4C-9CDE80CBCFBC}
@@ -934,6 +933,7 @@ Global
934933
{22358E04-0AE4-4ADA-9018-56C881E313F1} = {8DF13E64-63FC-44A9-A54C-ADEFC356CDE8}
935934
{5E02B439-B91F-4297-9AE4-7B92F2AA2AFF} = {8517D209-5BC1-47BD-A7C7-9CF9ADD9F5B6}
936935
{4402EF2E-CBA8-4EEF-B8A6-EC8364960306} = {74112169-6672-4907-A187-F055111940A9}
936+
{B2F922C0-F7C3-4C70-9BC5-5B5743BD8D7F} = {0A466330-6ED6-4861-9C94-31B1949CDDB9}
937937
EndGlobalSection
938938
GlobalSection(ExtensibilityGlobals) = postSolution
939939
SolutionGuid = {36EFC961-F4E7-49DC-A36A-99594FFB8243}

‎src/Moryx.Drivers.Mqtt/Properties/AssemblyInfo.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33

44
using System.Runtime.CompilerServices;
55

6-
[assembly: InternalsVisibleTo("Moryx.Resources.Mqtt.Tests")]
6+
[assembly: InternalsVisibleTo("Moryx.Drivers.Mqtt.Tests")]

src/Tests/Moryx.Recources.Mqtt.Tests/Moryx.Resources.Mqtt.Tests.csproj renamed to src/Tests/Moryx.Drivers.Mqtt.Tests/Moryx.Drivers.Mqtt.Tests.csproj

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,25 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2+
23
<PropertyGroup>
34
<OutputType>Library</OutputType>
45
<TargetFramework>net10.0</TargetFramework>
56
<DebugType>full</DebugType>
67
<IsTestProject>true</IsTestProject>
78
</PropertyGroup>
9+
810
<ItemGroup>
911
<PackageReference Include="Moq" />
1012
<PackageReference Include="Microsoft.NET.Test.Sdk" />
1113
<PackageReference Include="NUnit" />
1214
<PackageReference Include="NUnit3TestAdapter" />
1315
<PackageReference Include="coverlet.collector" />
1416
</ItemGroup>
17+
1518
<ItemGroup>
1619
<ProjectReference Include="..\..\Moryx\Moryx.csproj" />
1720
<ProjectReference Include="..\..\Moryx.AbstractionLayer.TestTools\Moryx.AbstractionLayer.TestTools.csproj" />
1821
<ProjectReference Include="..\..\Moryx.Drivers.Mqtt\Moryx.Drivers.Mqtt.csproj" />
1922
<ProjectReference Include="..\..\Moryx.TestTools.UnitTest\Moryx.TestTools.UnitTest.csproj" />
2023
</ItemGroup>
21-
</Project>
24+
25+
</Project>

src/Tests/Moryx.Recources.Mqtt.Tests/TestDriverMqttChannelFunctions.cs renamed to src/Tests/Moryx.Drivers.Mqtt.Tests/TestDriverMqttChannelFunctions.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,10 @@
99
using Moq;
1010
using Moryx.AbstractionLayer.Products;
1111
using Moryx.AbstractionLayer.TestTools;
12-
using Moryx.Drivers.Mqtt;
1312
using Moryx.Drivers.Mqtt.MqttTopics;
13+
using Moryx.Drivers.Mqtt.Tests.TestMessages;
1414
using Moryx.Logging;
1515
using Moryx.Modules;
16-
using Moryx.Resources.Mqtt.Tests.TestMessages;
1716
using Moryx.TestTools.UnitTest;
1817
using Moryx.Tools;
1918
using MQTTnet;
@@ -23,7 +22,7 @@
2322
using Newtonsoft.Json;
2423
using NUnit.Framework;
2524

26-
namespace Moryx.Resources.Mqtt.Tests
25+
namespace Moryx.Drivers.Mqtt.Tests
2726
{
2827
[TestFixture(MqttProtocolVersion.V310)]
2928
[TestFixture(MqttProtocolVersion.V311)]

src/Tests/Moryx.Recources.Mqtt.Tests/TestDriverMqttIByteSerializable.cs renamed to src/Tests/Moryx.Drivers.Mqtt.Tests/TestDriverMqttIByteSerializable.cs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,21 @@
55
using System.Buffers;
66
using System.Linq.Expressions;
77
using System.Threading;
8-
using System.Threading.Tasks;
98
using Microsoft.Extensions.Logging.Abstractions;
109
using Moq;
1110
using Moryx.AbstractionLayer.TestTools;
12-
using Moryx.Drivers.Mqtt;
1311
using Moryx.Drivers.Mqtt.MqttTopics;
12+
using Moryx.Drivers.Mqtt.Tests.TestMessages;
1413
using Moryx.Logging;
1514
using Moryx.Modules;
16-
using Moryx.Resources.Mqtt.Tests.TestMessages;
1715
using Moryx.Tools;
1816
using MQTTnet;
1917
using MQTTnet.Formatter;
2018
using MQTTnet.Packets;
2119
using MQTTnet.Protocol;
2220
using NUnit.Framework;
2321

24-
namespace Moryx.Resources.Mqtt.Tests
22+
namespace Moryx.Drivers.Mqtt.Tests
2523
{
2624
[TestFixture(MqttProtocolVersion.V310)]
2725
[TestFixture(MqttProtocolVersion.V311)]

src/Tests/Moryx.Recources.Mqtt.Tests/TestDriverMqttJsonTopic.cs renamed to src/Tests/Moryx.Drivers.Mqtt.Tests/TestDriverMqttJsonTopic.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
using Microsoft.Extensions.Logging.Abstractions;
1010
using Moq;
1111
using Moryx.AbstractionLayer.TestTools;
12-
using Moryx.Drivers.Mqtt;
1312
using Moryx.Drivers.Mqtt.MqttTopics;
1413
using Moryx.Logging;
1514
using Moryx.Modules;
@@ -21,7 +20,7 @@
2120
using Newtonsoft.Json.Serialization;
2221
using NUnit.Framework;
2322

24-
namespace Moryx.Resources.Mqtt.Tests
23+
namespace Moryx.Drivers.Mqtt.Tests
2524
{
2625
[TestFixture(MqttProtocolVersion.V310)]
2726
[TestFixture(MqttProtocolVersion.V311)]

src/Tests/Moryx.Recources.Mqtt.Tests/TestDriverMqttPrimitiveDatatypeTopic.cs renamed to src/Tests/Moryx.Drivers.Mqtt.Tests/TestDriverMqttPrimitiveDatatypeTopic.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,7 @@
88
using System.Threading;
99
using Microsoft.Extensions.Logging.Abstractions;
1010
using Moq;
11-
using Moryx.AbstractionLayer.Resources;
1211
using Moryx.AbstractionLayer.TestTools;
13-
using Moryx.Drivers.Mqtt;
1412
using Moryx.Drivers.Mqtt.MqttTopics;
1513
using Moryx.Logging;
1614
using Moryx.Modules;
@@ -21,7 +19,7 @@
2119
using MQTTnet.Protocol;
2220
using NUnit.Framework;
2321

24-
namespace Moryx.Resources.Mqtt.Tests
22+
namespace Moryx.Drivers.Mqtt.Tests
2523
{
2624
[TestFixture(MqttProtocolVersion.V310)]
2725
[TestFixture(MqttProtocolVersion.V311)]

src/Tests/Moryx.Recources.Mqtt.Tests/TestDriverStateMachine.cs renamed to src/Tests/Moryx.Drivers.Mqtt.Tests/TestDriverStateMachine.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,14 @@
77
using Moq;
88
using Moryx.AbstractionLayer.Drivers;
99
using Moryx.AbstractionLayer.TestTools;
10-
using Moryx.Drivers.Mqtt;
1110
using Moryx.Logging;
1211
using Moryx.Modules;
1312
using Moryx.Tools;
1413
using MQTTnet;
1514
using MQTTnet.Formatter;
1615
using NUnit.Framework;
1716

18-
namespace Moryx.Resources.Mqtt.Tests
17+
namespace Moryx.Drivers.Mqtt.Tests
1918
{
2019
[TestFixture(MqttProtocolVersion.V310)]
2120
[TestFixture(MqttProtocolVersion.V311)]

src/Tests/Moryx.Recources.Mqtt.Tests/TestMessages/BoolByteSerializableMessage.cs renamed to src/Tests/Moryx.Drivers.Mqtt.Tests/TestMessages/BoolByteSerializableMessage.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
using System;
55
using Moryx.Communication;
66

7-
namespace Moryx.Resources.Mqtt.Tests.TestMessages
7+
namespace Moryx.Drivers.Mqtt.Tests.TestMessages
88
{
99
public class BoolByteSerializableMessage : IByteSerializable
1010
{

src/Tests/Moryx.Recources.Mqtt.Tests/TestMessages/BoolMqttMessage.cs renamed to src/Tests/Moryx.Drivers.Mqtt.Tests/TestMessages/BoolMqttMessage.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
using Moryx.AbstractionLayer.Drivers.Message;
66
using Moryx.Communication;
77

8-
namespace Moryx.Resources.Mqtt.Tests.TestMessages
8+
namespace Moryx.Drivers.Mqtt.Tests.TestMessages
99
{
1010
public class BoolMqttMessage : IIdentifierMessage, IByteSerializable
1111
{

0 commit comments

Comments
 (0)