prepare to move to testcontainers

Author: Alex McCool

example/SampleApp/SampleApp.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

src/ElasticLogger.Test/ContainerESTests.cs

@@ -0,0 +1,50 @@
+using DotNet.Testcontainers.Builders;
+using DotNet.Testcontainers.Configurations;
+using DotNet.Testcontainers.Containers;
+using System.Threading.Tasks;
+using Xunit;
+
+namespace ElasticLogger.Test
+{
+    internal class ContainerESTests
+    {
+        ContainerESTests()
+        {
+        }
+
+        public async Task DoTheTest()
+        {
+            await new TestcontainersBuilder<ElasticsearchTestcontainer>()
+      .WithDatabase(new ElasticsearchTestcontainerConfiguration())
+      .Build()
+      .StartAsync()
+      .ConfigureAwait(false);
+        }
+    }
+
+
+    //[Collection(nameof(Testcontainers))]
+    public sealed class ElasticsearchTestcontainerTest : IClassFixture<ElasticsearchFixture>
+    {
+        private readonly ElasticsearchFixture elasticsearchFixture;
+
+        public ElasticsearchTestcontainerTest(ElasticsearchFixture elasticsearchFixture)
+        {
+            this.elasticsearchFixture = elasticsearchFixture;
+        }
+
+        [Fact]
+        [Trait("Category", "Elasticsearch")]
+        public async Task ConnectionEstablished()
+        {
+            // Given
+            var connection = this.elasticsearchFixture.Connection;
+
+            // When
+            var result = await connection.InfoAsync()
+              .ConfigureAwait(false);
+
+            // Then
+            Assert.True(result.IsValid);
+        }
+    }

src/ElasticLogger.Test/ElasticLogger.Test.csproj

@@ -7,11 +7,12 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="elasticsearch-inside" Version="6.6.1" />
+    <!--<PackageReference Include="elasticsearch-inside" Version="6.6.1" />-->
     <PackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="2.2.0" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="3.1.3" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.6.0" />
     <PackageReference Include="NEST" Version="6.0.2" />
+    <PackageReference Include="Testcontainers" Version="2.2.0" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
       <PrivateAssets>all</PrivateAssets>

src/ElasticLogger.Test/ElasticsearchLoggerFilterTests.cs

@@ -1,4 +1,4 @@
- using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using AM.Extensions.Logging.ElasticSearch;
@@ -10,6 +10,7 @@
 using Nest;
 using Xunit.Abstractions;
 using LogLevel = Microsoft.Extensions.Logging.LogLevel;
+using ElasticLogger.Test.Entities;
 
 namespace ElasticLogger.Test
 {

src/ElasticLogger.Test/Circle.cs renamed to src/ElasticLogger.Test/Entities/Circle.cs

@@ -1,4 +1,4 @@
-namespace ElasticLogger.Test
+namespace ElasticLogger.Test.Entities
 {
     public class Circle
     {

src/ElasticLogger.Test/Tweet.cs renamed to src/ElasticLogger.Test/Entities/Tweet.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace ElasticLogger.Test
+namespace ElasticLogger.Test.Entities
 {
     internal class Tweet : IEquatable<Tweet>
     {
@@ -15,18 +15,18 @@ public override bool Equals(object obj)
         {
             if (ReferenceEquals(null, obj)) return false;
             if (ReferenceEquals(this, obj)) return true;
-            if (obj.GetType() != this.GetType()) return false;
-            return Equals((Tweet) obj);
+            if (obj.GetType() != GetType()) return false;
+            return Equals((Tweet)obj);
         }
 
         public override int GetHashCode()
         {
             unchecked
             {
                 var hashCode = Id;
-                hashCode = (hashCode * 397) ^ (User != null ? User.GetHashCode() : 0);
-                hashCode = (hashCode * 397) ^ PostDate.GetHashCode();
-                hashCode = (hashCode * 397) ^ (Message != null ? Message.GetHashCode() : 0);
+                hashCode = hashCode * 397 ^ (User != null ? User.GetHashCode() : 0);
+                hashCode = hashCode * 397 ^ PostDate.GetHashCode();
+                hashCode = hashCode * 397 ^ (Message != null ? Message.GetHashCode() : 0);
                 return hashCode;
             }
         }

src/ElasticLogger.Test/Fixture/ESFixture.cs

@@ -0,0 +1,62 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace ElasticLogger.Test.Fixture
+{
+    internal class ESFixture
+    {
+    }
+
+    namespace DotNet.Testcontainers.Tests.Fixtures
+    {
+        using System;
+        using System.Threading.Tasks;
+        using DotNet.Testcontainers.Builders;
+        using DotNet.Testcontainers.Configurations;
+        using DotNet.Testcontainers.Containers;
+        using Elastic.Clients.Elasticsearch;
+        using Elastic.Transport;
+        using Elasticsearch.Net;
+        using global::DotNet.Testcontainers.Builders;
+        using global::DotNet.Testcontainers.Configurations;
+        using global::DotNet.Testcontainers.Containers;
+        using JetBrains.Annotations;
+
+        [UsedImplicitly]
+        public sealed class ElasticsearchFixture : DatabaseFixture<ElasticsearchTestcontainer, ElasticsearchClient>
+        {
+            private readonly TestcontainerDatabaseConfiguration configuration = new ElasticsearchTestcontainerConfiguration { Password = "secret" };
+
+            public ElasticsearchFixture()
+            {
+                this.Container = new TestcontainersBuilder<ElasticsearchTestcontainer>()
+                  .WithDatabase(this.configuration)
+                  .Build();
+            }
+
+            public override async Task InitializeAsync()
+            {
+                await this.Container.StartAsync()
+                  .ConfigureAwait(false);
+
+                var settings = new ElasticsearchClientSettings(new Uri(this.Container.ConnectionString))
+                  .ServerCertificateValidationCallback(CertificateValidations.AllowAll)
+                  .Authentication(new BasicAuthentication(this.Container.Username, this.Container.Password));
+
+                this.Connection = new ElasticsearchClient(settings);
+            }
+
+            public override async Task DisposeAsync()
+            {
+                await this.Container.DisposeAsync()
+                  .ConfigureAwait(false);
+            }
+
+            public override void Dispose()
+            {
+                this.configuration.Dispose();
+            }
+        }
+    }
+}

src/ElasticLogger.Test/MiscTests.cs

@@ -1,6 +1,7 @@
 using System.IO;
 using System.Threading.Tasks;
 using AM.Extensions.Logging.ElasticSearch;
+using ElasticLogger.Test.Entities;
 using Newtonsoft.Json;
 using Xunit;
 using Xunit.Abstractions;