feat: Add Papercut module

Testcontainers.sln

@@ -63,6 +63,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Testcontainers.Neo4j", "src
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Testcontainers.Oracle", "src\Testcontainers.Oracle\Testcontainers.Oracle.csproj", "{596EAFC1-0496-495C-B382-D57415FA456A}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Testcontainers.Papercut", "src\Testcontainers.Papercut\Testcontainers.Papercut.csproj", "{464F1120-A0DA-462B-B9E8-45176D883625}"
+EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Testcontainers.PostgreSql", "src\Testcontainers.PostgreSql\Testcontainers.PostgreSql.csproj", "{8AB91636-9055-4900-A72A-7CFFACDFDBF0}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Testcontainers.PubSub", "src\Testcontainers.PubSub\Testcontainers.PubSub.csproj", "{E6642255-667D-476B-B584-089AA5E6C0B1}"
@@ -135,6 +137,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Testcontainers.Neo4j.Tests"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Testcontainers.Oracle.Tests", "tests\Testcontainers.Oracle.Tests\Testcontainers.Oracle.Tests.csproj", "{4AC1088B-9965-4497-AC8E-570F1AD5631F}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Testcontainers.Papercut.Tests", "tests\Testcontainers.Papercut.Tests\Testcontainers.Papercut.Tests.csproj", "{904C8476-FCEF-41F0-8948-9EFA7C08712E}"
+EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Testcontainers.Platform.Linux.Tests", "tests\Testcontainers.Platform.Linux.Tests\Testcontainers.Platform.Linux.Tests.csproj", "{DA1D7ADE-452C-4369-83CC-56289176EACD}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Testcontainers.Platform.Windows.Tests", "tests\Testcontainers.Platform.Windows.Tests\Testcontainers.Platform.Windows.Tests.csproj", "{3E55CBE8-AFE8-426D-9470-49D63CD1051C}"
@@ -159,10 +163,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Testcontainers.Tests", "tes
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Testcontainers.WebDriver.Tests", "tests\Testcontainers.WebDriver.Tests\Testcontainers.WebDriver.Tests.csproj", "{EBA72C3B-57D5-43FF-A5B4-3D55B3B6D4C2}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Testcontainers.Papercut", "src\Testcontainers.Papercut\Testcontainers.Papercut.csproj", "{464F1120-A0DA-462B-B9E8-45176D883625}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Testcontainers.Papercut.Tests", "tests\Testcontainers.Papercut.Tests\Testcontainers.Papercut.Tests.csproj", "{904C8476-FCEF-41F0-8948-9EFA7C08712E}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -272,6 +272,10 @@ Global
 		{596EAFC1-0496-495C-B382-D57415FA456A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{596EAFC1-0496-495C-B382-D57415FA456A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{596EAFC1-0496-495C-B382-D57415FA456A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{464F1120-A0DA-462B-B9E8-45176D883625}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{464F1120-A0DA-462B-B9E8-45176D883625}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{464F1120-A0DA-462B-B9E8-45176D883625}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{464F1120-A0DA-462B-B9E8-45176D883625}.Release|Any CPU.Build.0 = Release|Any CPU
 		{8AB91636-9055-4900-A72A-7CFFACDFDBF0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{8AB91636-9055-4900-A72A-7CFFACDFDBF0}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{8AB91636-9055-4900-A72A-7CFFACDFDBF0}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -416,6 +420,10 @@ Global
 		{4AC1088B-9965-4497-AC8E-570F1AD5631F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{4AC1088B-9965-4497-AC8E-570F1AD5631F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4AC1088B-9965-4497-AC8E-570F1AD5631F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{904C8476-FCEF-41F0-8948-9EFA7C08712E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{904C8476-FCEF-41F0-8948-9EFA7C08712E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{904C8476-FCEF-41F0-8948-9EFA7C08712E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{904C8476-FCEF-41F0-8948-9EFA7C08712E}.Release|Any CPU.Build.0 = Release|Any CPU
 		{DA1D7ADE-452C-4369-83CC-56289176EACD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{DA1D7ADE-452C-4369-83CC-56289176EACD}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{DA1D7ADE-452C-4369-83CC-56289176EACD}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -464,14 +472,6 @@ Global
 		{EBA72C3B-57D5-43FF-A5B4-3D55B3B6D4C2}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{EBA72C3B-57D5-43FF-A5B4-3D55B3B6D4C2}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{EBA72C3B-57D5-43FF-A5B4-3D55B3B6D4C2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{464F1120-A0DA-462B-B9E8-45176D883625}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{464F1120-A0DA-462B-B9E8-45176D883625}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{464F1120-A0DA-462B-B9E8-45176D883625}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{464F1120-A0DA-462B-B9E8-45176D883625}.Release|Any CPU.Build.0 = Release|Any CPU
-		{904C8476-FCEF-41F0-8948-9EFA7C08712E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{904C8476-FCEF-41F0-8948-9EFA7C08712E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{904C8476-FCEF-41F0-8948-9EFA7C08712E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{904C8476-FCEF-41F0-8948-9EFA7C08712E}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{3F2E254F-C203-43FD-A078-DC3E2CBC0F9F} = {673F23AE-7694-4BB9-ABD4-136D6C13634E}
@@ -499,6 +499,7 @@ Global
 		{BF37BEA1-0816-4326-B1E0-E82290F8FCE0} = {673F23AE-7694-4BB9-ABD4-136D6C13634E}
 		{ADC2372B-6FE0-421D-8277-BB628E8EFC22} = {673F23AE-7694-4BB9-ABD4-136D6C13634E}
 		{596EAFC1-0496-495C-B382-D57415FA456A} = {673F23AE-7694-4BB9-ABD4-136D6C13634E}
+		{464F1120-A0DA-462B-B9E8-45176D883625} = {673F23AE-7694-4BB9-ABD4-136D6C13634E}
 		{8AB91636-9055-4900-A72A-7CFFACDFDBF0} = {673F23AE-7694-4BB9-ABD4-136D6C13634E}
 		{E6642255-667D-476B-B584-089AA5E6C0B1} = {673F23AE-7694-4BB9-ABD4-136D6C13634E}
 		{A6D480BC-FDE8-4B92-A2A6-FF16BEE486AE} = {673F23AE-7694-4BB9-ABD4-136D6C13634E}
@@ -535,6 +536,7 @@ Global
 		{87A3F137-6DC3-4CE5-91E6-01797D076086} = {7164F1FB-7F24-444A-ACD2-2C329C2B3CCF}
 		{D3F63405-C0FA-4F83-8B79-E30BFF5FF5BF} = {7164F1FB-7F24-444A-ACD2-2C329C2B3CCF}
 		{4AC1088B-9965-4497-AC8E-570F1AD5631F} = {7164F1FB-7F24-444A-ACD2-2C329C2B3CCF}
+		{904C8476-FCEF-41F0-8948-9EFA7C08712E} = {7164F1FB-7F24-444A-ACD2-2C329C2B3CCF}
 		{DA1D7ADE-452C-4369-83CC-56289176EACD} = {7164F1FB-7F24-444A-ACD2-2C329C2B3CCF}
 		{3E55CBE8-AFE8-426D-9470-49D63CD1051C} = {7164F1FB-7F24-444A-ACD2-2C329C2B3CCF}
 		{56D0DCA5-567F-4B3B-8B79-CB108F8EB8A6} = {7164F1FB-7F24-444A-ACD2-2C329C2B3CCF}
@@ -547,7 +549,5 @@ Global
 		{1A1983E6-5297-435F-B467-E8E1F11277D6} = {7164F1FB-7F24-444A-ACD2-2C329C2B3CCF}
 		{27CDB869-A150-4593-958F-6F26E5391E7C} = {7164F1FB-7F24-444A-ACD2-2C329C2B3CCF}
 		{EBA72C3B-57D5-43FF-A5B4-3D55B3B6D4C2} = {7164F1FB-7F24-444A-ACD2-2C329C2B3CCF}
-		{464F1120-A0DA-462B-B9E8-45176D883625} = {673F23AE-7694-4BB9-ABD4-136D6C13634E}
-		{904C8476-FCEF-41F0-8948-9EFA7C08712E} = {7164F1FB-7F24-444A-ACD2-2C329C2B3CCF}
 	EndGlobalSection
 EndGlobal

src/Testcontainers.Consul/Usings.cs

@@ -1,5 +1,4 @@
 global using System;
-global using System.Net;
 global using Docker.DotNet.Models;
 global using DotNet.Testcontainers.Builders;
 global using DotNet.Testcontainers.Configurations;

src/Testcontainers.Papercut/PapercutBuilder.cs

@@ -1,75 +1,69 @@
-namespace Testcontainers.Papercut
+namespace Testcontainers.Papercut;
+
+/// <inheritdoc cref="ContainerBuilder{TBuilderEntity, TContainerEntity, TConfigurationEntity}" />
+[PublicAPI]
+public sealed class PapercutBuilder : ContainerBuilder<PapercutBuilder, PapercutContainer, PapercutConfiguration>
 {
-    /// <inheritdoc cref="ContainerBuilder{TBuilderEntity, TContainerEntity, TConfigurationEntity}" />
-    [PublicAPI]
-    public sealed class PapercutBuilder : ContainerBuilder<PapercutBuilder, PapercutContainer, PapercutConfiguration>
-    {
-        private const string PapercutImage = "jijiechen/papercut:latest";
-        internal const int SmtpPort = 25;
-        internal const int WebInterfacePort = 37408;
+    public const string PapercutImage = "jijiechen/papercut:latest";
 
-        /// <summary>
-        ///     Initializes a new instance of the <see cref="Testcontainers.PapercutBuilder" /> class.
-        /// </summary>
-        public PapercutBuilder()
-            : this(new PapercutConfiguration())
-        {
-            DockerResourceConfiguration = Init().DockerResourceConfiguration;
-        }
+    public const ushort HttpPort = 37408;
 
-        /// <summary>
-        ///     Initializes a new instance of the <see cref="Testcontainers.PapercutBuilder" /> class.
-        /// </summary>
-        /// <param name="resourceConfiguration">The Docker resource configuration.</param>
-        private PapercutBuilder(PapercutConfiguration resourceConfiguration)
-            : base(resourceConfiguration)
-        {
-            DockerResourceConfiguration = resourceConfiguration;
-        }
+    public const ushort SmtpPort = 25;
 
-        /// <inheritdoc />
-        protected override PapercutConfiguration DockerResourceConfiguration { get; }
+    /// <summary>
+    /// Initializes a new instance of the <see cref="PapercutBuilder" /> class.
+    /// </summary>
+    public PapercutBuilder()
+        : this(new PapercutConfiguration())
+    {
+        DockerResourceConfiguration = Init().DockerResourceConfiguration;
+    }
 
-        /// <inheritdoc />
-        public override PapercutContainer Build()
-        {
-            Validate();
-            return new PapercutContainer(DockerResourceConfiguration, TestcontainersSettings.Logger);
-        }
+    /// <summary>
+    /// Initializes a new instance of the <see cref="PapercutBuilder" /> class.
+    /// </summary>
+    /// <param name="resourceConfiguration">The Docker resource configuration.</param>
+    private PapercutBuilder(PapercutConfiguration resourceConfiguration)
+        : base(resourceConfiguration)
+    {
+        DockerResourceConfiguration = resourceConfiguration;
+    }
 
-        /// <inheritdoc />
-        protected override PapercutBuilder Init()
-        {
-            return base.Init()
-                .WithImage(PapercutImage)
-                .WithPortBinding(SmtpPort, true)
-                .WithPortBinding(WebInterfacePort, true)
-                .WithWaitStrategy(
-                    Wait.ForUnixContainer()
-                        .UntilHttpRequestIsSucceeded(strategy =>
-                        {
-                            return strategy.ForPort(WebInterfacePort).ForStatusCode(HttpStatusCode.OK);
-                        })
-                );
-        }
+    /// <inheritdoc />
+    protected override PapercutConfiguration DockerResourceConfiguration { get; }
 
-        /// <inheritdoc />
-        protected override PapercutBuilder Clone(
-            IResourceConfiguration<CreateContainerParameters> resourceConfiguration)
-        {
-            return Merge(DockerResourceConfiguration, new PapercutConfiguration(resourceConfiguration));
-        }
+    /// <inheritdoc />
+    public override PapercutContainer Build()
+    {
+        Validate();
+        return new PapercutContainer(DockerResourceConfiguration, TestcontainersSettings.Logger);
+    }
 
-        /// <inheritdoc />
-        protected override PapercutBuilder Clone(IContainerConfiguration resourceConfiguration)
-        {
-            return Merge(DockerResourceConfiguration, new PapercutConfiguration(resourceConfiguration));
-        }
+    /// <inheritdoc />
+    protected override PapercutBuilder Init()
+    {
+        return base.Init()
+            .WithImage(PapercutImage)
+            .WithPortBinding(HttpPort, true)
+            .WithPortBinding(SmtpPort, true)
+            .WithWaitStrategy(Wait.ForUnixContainer().UntilHttpRequestIsSucceeded(request => request.ForPort(HttpPort)));
+    }
+
+    /// <inheritdoc />
+    protected override PapercutBuilder Clone(IResourceConfiguration<CreateContainerParameters> resourceConfiguration)
+    {
+        return Merge(DockerResourceConfiguration, new PapercutConfiguration(resourceConfiguration));
+    }
 
-        /// <inheritdoc />
-        protected override PapercutBuilder Merge(PapercutConfiguration oldValue, PapercutConfiguration newValue)
-        {
-            return new PapercutBuilder(new PapercutConfiguration(oldValue, newValue));
-        }
+    /// <inheritdoc />
+    protected override PapercutBuilder Clone(IContainerConfiguration resourceConfiguration)
+    {
+        return Merge(DockerResourceConfiguration, new PapercutConfiguration(resourceConfiguration));
+    }
+
+    /// <inheritdoc />
+    protected override PapercutBuilder Merge(PapercutConfiguration oldValue, PapercutConfiguration newValue)
+    {
+        return new PapercutBuilder(new PapercutConfiguration(oldValue, newValue));
     }
 }

src/Testcontainers.Papercut/PapercutConfiguration.cs

@@ -1,56 +1,53 @@
-namespace Testcontainers.Papercut
+namespace Testcontainers.Papercut;
+
+/// <inheritdoc cref="ContainerConfiguration" />
+[PublicAPI]
+public sealed class PapercutConfiguration : ContainerConfiguration
 {
-    /// <inheritdoc cref="ContainerConfiguration" />
-    [PublicAPI]
-    public sealed class PapercutConfiguration : ContainerConfiguration
+    /// <summary>
+    /// Initializes a new instance of the <see cref="PapercutConfiguration" /> class.
+    /// </summary>
+    public PapercutConfiguration()
     {
-        /// <summary>
-        ///     Initializes a new instance of the <see cref="Testcontainers.PapercutConfiguration" /> class.
-        /// </summary>
-        public PapercutConfiguration()
-        {
-        }
+    }
 
-        /// <summary>
-        ///     Initializes a new instance of the <see cref="Testcontainers.PapercutConfiguration" /> class.
-        /// </summary>
-        /// <param name="resourceConfiguration">The Docker resource configuration.</param>
-        public PapercutConfiguration(IResourceConfiguration<CreateContainerParameters> resourceConfiguration)
-            : base(resourceConfiguration)
-        {
-            // Passes the configuration upwards to the base implementations to create an updated immutable copy.
-        }
+    /// <summary>
+    /// Initializes a new instance of the <see cref="PapercutConfiguration" /> class.
+    /// </summary>
+    /// <param name="resourceConfiguration">The Docker resource configuration.</param>
+    public PapercutConfiguration(IResourceConfiguration<CreateContainerParameters> resourceConfiguration)
+        : base(resourceConfiguration)
+    {
+        // Passes the configuration upwards to the base implementations to create an updated immutable copy.
+    }
 
-        /// <summary>
-        ///     Initializes a new instance of the <see cref="Testcontainers.PapercutConfiguration" /> class.
-        /// </summary>
-        /// <param name="resourceConfiguration">The Docker resource configuration.</param>
-        public PapercutConfiguration(IContainerConfiguration resourceConfiguration)
-            : base(resourceConfiguration)
-        {
-            // Passes the configuration upwards to the base implementations to create an updated immutable copy.
-        }
+    /// <summary>
+    /// Initializes a new instance of the <see cref="PapercutConfiguration" /> class.
+    /// </summary>
+    /// <param name="resourceConfiguration">The Docker resource configuration.</param>
+    public PapercutConfiguration(IContainerConfiguration resourceConfiguration)
+        : base(resourceConfiguration)
+    {
+        // Passes the configuration upwards to the base implementations to create an updated immutable copy.
+    }
 
-        /// <summary>
-        ///     Initializes a new instance of the <see cref="Testcontainers.PapercutConfiguration" /> class.
-        /// </summary>
-        /// <param name="resourceConfiguration">The Docker resource configuration.</param>
-        public PapercutConfiguration(PapercutConfiguration resourceConfiguration)
-            : this(new PapercutConfiguration(), resourceConfiguration)
-        {
-            // Passes the configuration upwards to the base implementations to create an updated immutable copy.
-        }
+    /// <summary>
+    /// Initializes a new instance of the <see cref="PapercutConfiguration" /> class.
+    /// </summary>
+    /// <param name="resourceConfiguration">The Docker resource configuration.</param>
+    public PapercutConfiguration(PapercutConfiguration resourceConfiguration)
+        : this(new PapercutConfiguration(), resourceConfiguration)
+    {
+        // Passes the configuration upwards to the base implementations to create an updated immutable copy.
+    }
 
-        /// <summary>
-        ///     Initializes a new instance of the <see cref="Testcontainers.PapercutConfiguration" /> class.
-        /// </summary>
-        /// <param name="oldValue">The old Docker resource configuration.</param>
-        /// <param name="newValue">The new Docker resource configuration.</param>
-        public PapercutConfiguration(PapercutConfiguration oldValue, PapercutConfiguration newValue)
-            : base(oldValue, newValue)
-        {
-            // // Create an updated immutable copy of the module configuration.
-            // Config = BuildConfiguration.Combine(oldValue.Config, newValue.Config);
-        }
+    /// <summary>
+    /// Initializes a new instance of the <see cref="PapercutConfiguration" /> class.
+    /// </summary>
+    /// <param name="oldValue">The old Docker resource configuration.</param>
+    /// <param name="newValue">The new Docker resource configuration.</param>
+    public PapercutConfiguration(PapercutConfiguration oldValue, PapercutConfiguration newValue)
+        : base(oldValue, newValue)
+    {
     }
 }

src/Testcontainers.Papercut/PapercutContainer.cs

@@ -1,20 +1,30 @@
-namespace Testcontainers.Papercut
+namespace Testcontainers.Papercut;
+
+/// <inheritdoc cref="DockerContainer" />
+[PublicAPI]
+public sealed class PapercutContainer : DockerContainer
 {
-    /// <inheritdoc cref="DockerContainer" />
-    [PublicAPI]
-    public sealed class PapercutContainer : DockerContainer
+    /// <summary>
+    /// Initializes a new instance of the <see cref="PapercutContainer" /> class.
+    /// </summary>
+    /// <param name="configuration">The container configuration.</param>
+    /// <param name="logger">The logger.</param>
+    public PapercutContainer(PapercutConfiguration configuration, ILogger logger)
+        : base(configuration, logger)
     {
-        /// <summary>
-        ///     Initializes a new instance of the <see cref="PapercutContainer" /> class.
-        /// </summary>
-        /// <param name="configuration">The container configuration.</param>
-        /// <param name="logger">The logger.</param>
-        public PapercutContainer(PapercutConfiguration configuration, ILogger logger)
-            : base(configuration, logger)
-        {
-        }
+    }
 
-        public string WebUrl => "http://" + Hostname + ":" + GetMappedPublicPort(PapercutBuilder.WebInterfacePort);
-        public int PublicSmtpPort => GetMappedPublicPort(PapercutBuilder.SmtpPort);
+    /// <summary>
+    /// Gets the SMTP port.
+    /// </summary>
+    public ushort SmtpPort => GetMappedPublicPort(PapercutBuilder.SmtpPort);
+
+    /// <summary>
+    /// Gets the Papercut base address.
+    /// </summary>
+    /// <returns>The Papercut base address.</returns>
+    public string GetBaseAddress()
+    {
+        return new UriBuilder(Uri.UriSchemeHttp, Hostname, GetMappedPublicPort(PapercutBuilder.HttpPort)).ToString();
     }
 }