Rename NucuCar.Domain to NucuCar.Core and fix tests.

NucuCar.Core/Http/MinimalHttpClient.cs

@@ -1,14 +1,14 @@
 using System;
 using System.Collections.Generic;
+using System.Net.Http;
+using System.Net.Http.Headers;
 using System.Text;
 using System.Text.Json;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
-using System.Net.Http;
-using System.Net.Http.Headers;
 
-namespace NucuCar.Domain.Http
+namespace NucuCar.Core.Http
 {
     /// <summary>
     /// A simple HttpClient wrapper designed to make it easier to work with web requests with media type application/json.

NucuCar.Core/Http/MockMinimalHttpClient.cs

@@ -2,7 +2,7 @@ using System.Collections.Generic;
 using System.Net.Http;
 using System.Threading.Tasks;
 
-namespace NucuCar.Domain.Http
+namespace NucuCar.Core.Http
 {
     public class MockMinimalHttpClient : MinimalHttpClient
     {

NucuCar.Core/NucuCar.Core.csproj

@@ -2,6 +2,7 @@
 
     <PropertyGroup>
         <TargetFramework>netcoreapp3.1</TargetFramework>
+        <RootNamespace>NucuCar.Core</RootNamespace>
     </PropertyGroup>
     
     <ItemGroup>

NucuCar.Core/Readme.md

@@ -0,0 +1,3 @@
+# NucuCar.Core
+
+Contains core functionality.

NucuCar.Core/Utilities/ConnectionStringParser.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace NucuCar.Domain.Utilities
+namespace NucuCar.Core.Utilities
 {
     /// <summary>
     /// ConnectionStringParser is an utility service to parse and validate connection strings.

NucuCar.Core/Utilities/Guard.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace NucuCar.Domain.Utilities
+namespace NucuCar.Core.Utilities
 {
     /// <summary>  
     ///  Helper class used for checking arguments and raise exception if the checks don't pass.

NucuCar.Domain/Readme.md

@@ -1,4 +0,0 @@
-# Protos
-
-The files from Protos are compiled by the gRPC compiler and provide data 
-structures that are shared across the project.

NucuCar.Sensors/NucuCar.Sensors.csproj

@@ -77,7 +77,7 @@
     </ItemGroup>
 
     <ItemGroup>
-      <ProjectReference Include="..\NucuCar.Domain\NucuCar.Domain.csproj" />
+      <ProjectReference Include="..\NucuCar.Core\NucuCar.Core.csproj" />
       <ProjectReference Include="..\NucuCar.Telemetry\NucuCar.Telemetry.csproj" />
     </ItemGroup>
 </Project>

NucuCar.Telemetry/NucuCar.Telemetry.csproj

@@ -6,7 +6,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <ProjectReference Include="..\NucuCar.Domain\NucuCar.Domain.csproj" />
+      <ProjectReference Include="..\NucuCar.Core\NucuCar.Core.csproj" />
     </ItemGroup>
 
     <ItemGroup>

NucuCar.Telemetry/Publishers/TelemetryPublisherDisk.cs

@@ -6,7 +6,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
 using Newtonsoft.Json;
-using NucuCar.Domain.Utilities;
+using NucuCar.Core.Utilities;
 using NucuCar.Telemetry.Abstractions;
 
 namespace NucuCar.Telemetry.Publishers

NucuCar.Telemetry/Publishers/TelemetryPublisherFirestore.cs

@@ -5,8 +5,8 @@ using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
-using NucuCar.Domain.Http;
-using NucuCar.Domain.Utilities;
+using NucuCar.Core.Http;
+using NucuCar.Core.Utilities;
 using NucuCar.Telemetry.Abstractions;
 
 namespace NucuCar.Telemetry.Publishers

NucuCar.Telemetry/TelemetryPublisherFactory.cs

@@ -1,6 +1,6 @@
 using System;
 using Microsoft.Extensions.Logging;
-using NucuCar.Domain.Utilities;
+using NucuCar.Core.Utilities;
 using NucuCar.Telemetry.Abstractions;
 using NucuCar.Telemetry.Publishers;
 

NucuCar.UnitTests/NucuCar.Core/ConnectionStringParserTest.cs

@@ -1,9 +1,9 @@
 using System;
 using System.Collections.Generic;
-using NucuCar.Domain.Utilities;
+using NucuCar.Core.Utilities;
 using Xunit;
 
-namespace NucuCar.UnitTests.NucuCar.Domain.Tests
+namespace NucuCar.UnitTests.NucuCar.Core
 {
     public class ConnectionStringParserTest
     {

NucuCar.UnitTests/NucuCar.Core/GuardTest.cs

@@ -1,8 +1,8 @@
 using System;
-using NucuCar.Domain.Utilities;
+using NucuCar.Core.Utilities;
 using Xunit;
 
-namespace NucuCar.UnitTests.NucuCar.Domain.Tests
+namespace NucuCar.UnitTests.NucuCar.Core
 {
     public class GuardTest
     {

NucuCar.UnitTests/NucuCar.Sensors/Bme680/TestBme680Sensor.cs

@@ -2,7 +2,7 @@ using System.Threading.Tasks;
 using NucuCar.Sensors.Abstractions;
 using NucuCar.Sensors.Modules.BME680;
 
-namespace NucuCar.UnitTests.NucuCar.Sensors.Tests.EnvironmentSensor
+namespace NucuCar.UnitTests.NucuCar.Sensors.Bme680
 {
     public class TestBme680Sensor : Bme680Sensor
     {

NucuCar.UnitTests/NucuCar.Sensors/Bme680WorkerTest.cs

@@ -5,10 +5,11 @@ using Microsoft.Extensions.Options;
 using Moq;
 using NucuCar.Sensors.Abstractions;
 using NucuCar.Sensors.Modules.BME680;
-using NucuCar.UnitTests.NucuCar.Sensors.Tests.EnvironmentSensor;
+using NucuCar.Telemetry.Abstractions;
+using NucuCar.UnitTests.NucuCar.Sensors.Bme680;
 using Xunit;
 
-namespace NucuCar.UnitTests.NucuCar.Sensors.Tests
+namespace NucuCar.UnitTests.NucuCar.Sensors
 {
     /// <summary>
     /// Tests the functionality of the SensorWorker; Since the class is quite generic the test uses the
@@ -18,7 +19,7 @@ namespace NucuCar.UnitTests.NucuCar.Sensors.Tests
     {
         private readonly Mock<ILogger<Bme680Worker>> _mockLogger;
         private readonly Mock<IOptions<Bme680Config>> _mockOptions;
-        private readonly Mock<global::NucuCar.Telemetry.TelemetryPublisherProxy> _mockSensorTelemetry;
+        private readonly Mock<ITelemetryPublisher> _mockSensorTelemetry;
         private readonly Mock<TestBme680Sensor> _mockTestBme680Sensor;
         private readonly Mock<ISensor<Bme680Sensor>> _mockBme680ISensor;
         private readonly CancellationTokenSource _cts;
@@ -28,7 +29,7 @@ namespace NucuCar.UnitTests.NucuCar.Sensors.Tests
             _cts = new CancellationTokenSource();
             _mockLogger = new Mock<ILogger<Bme680Worker>>();
             _mockOptions = new Mock<IOptions<Bme680Config>>();
-            _mockSensorTelemetry = new Mock<global::NucuCar.Telemetry.TelemetryPublisherProxy>();
+            _mockSensorTelemetry = new Mock<ITelemetryPublisher>();
             _mockTestBme680Sensor = new Mock<TestBme680Sensor>();
             _mockBme680ISensor = new Mock<ISensor<Bme680Sensor>>();
 

NucuCar.UnitTests/NucuCar.Telemetry/TelemetryPublisherFactoryTest.cs

@@ -3,7 +3,7 @@ using NucuCar.Telemetry;
 using NucuCar.Telemetry.Publishers;
 using Xunit;
 
-namespace NucuCar.UnitTests.NucuCar.Domain.Telemetry.Tests
+namespace NucuCar.UnitTests.NucuCar.Telemetry
 {
     public class TelemetryPublisherFactoryTest
     {

NucuCar.UnitTests/NucuCar.Telemetry/TelemetryPublisherFirestoreTest.cs

@@ -2,15 +2,14 @@ using System;
 using System.Collections.Generic;
 using System.Net;
 using System.Net.Http;
-using System.Net.Http.Headers;
 using System.Threading;
 using System.Threading.Tasks;
-using NucuCar.Domain.Http;
+using NucuCar.Core.Http;
 using NucuCar.Telemetry;
 using NucuCar.Telemetry.Publishers;
 using Xunit;
 
-namespace NucuCar.UnitTests.NucuCar.Domain.Telemetry.Tests
+namespace NucuCar.UnitTests.NucuCar.Telemetry
 {
     /// <summary>
     /// Class used to test the TelemetryPublisherFirestore by mocking the GetTelemetry method and HttpClient field.

NucuCar.UnitTests/NucuCar.UnitTests.csproj

@@ -16,7 +16,7 @@
     </ItemGroup>
 
     <ItemGroup>
-      <ProjectReference Include="..\NucuCar.Domain\NucuCar.Domain.csproj" />
+      <ProjectReference Include="..\NucuCar.Core\NucuCar.Core.csproj" />
       <ProjectReference Include="..\NucuCar.Sensors\NucuCar.Sensors.csproj" />
       <ProjectReference Include="..\NucuCar.Telemetry\NucuCar.Telemetry.csproj" />
     </ItemGroup>

NucuCar.sln

@@ -2,7 +2,7 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NucuCar.Sensors", "NucuCar.Sensors\NucuCar.Sensors.csproj", "{94C44683-F5AF-4D7D-83AE-1F94A81E1E91}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NucuCar.Domain", "NucuCar.Domain\NucuCar.Domain.csproj", "{36BDA186-4C90-43C6-8991-A16DE245F91A}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NucuCar.Core", "NucuCar.Core\NucuCar.Core.csproj", "{36BDA186-4C90-43C6-8991-A16DE245F91A}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NucuCar.UnitTests", "NucuCar.UnitTests\NucuCar.UnitTests.csproj", "{C6F07921-1052-4945-911E-F328A622F229}"
 EndProject