Fixed dead links in docs

Added basic test for PgVersionTargetedFactDiscoverer
JasperFx · Jul 23, 2023 · a4e0ee5 · a4e0ee5
1 parent cb1d37f
commit a4e0ee5
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 13 deletions.
diff --git a/docs/configuration/multitenancy.md b/docs/configuration/multitenancy.md
@@ -108,7 +108,7 @@ You can place this code somewhere in the tenant initialization code. For instanc
 
 * tenant setup procedure,
 * dedicated API endpoint
-* [custom session factory](/configuration/hostbuilder/#customizing-session-creation-globally), although that's not recommended for the reasons mentioned above. 
+* [custom session factory](/configuration/hostbuilder#customizing-session-creation-globally), although that's not recommended for the reasons mentioned above. 
 
 ## Write your own tenancy strategy!
 

diff --git a/src/Marten.Testing/Harness/PgVersionTargetedFact.cs b/src/Marten.Testing/Harness/PgVersionTargetedFact.cs
@@ -1,6 +1,10 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
+using Marten.Testing.Harness;
 using Npgsql;
+using NSubstitute;
+using Shouldly;
 using Xunit;
 using Xunit.Abstractions;
 using Xunit.Sdk;
@@ -20,38 +24,44 @@ public sealed class PgVersionTargetedFact: FactAttribute
 
     public sealed class PgVersionTargetedFactDiscoverer: FactDiscoverer
     {
-        private static readonly Version Version;
+        internal static readonly Version Version;
 
         static PgVersionTargetedFactDiscoverer()
         {
             // PG version does not change during test run so we can do static ctor
-            using (var c = new NpgsqlConnection(ConnectionSource.ConnectionString))
-            {
-                c.Open();
-                Version = c.PostgreSqlVersion;
-                c.Close();
-            }
+            using var c = new NpgsqlConnection(ConnectionSource.ConnectionString);
+            c.Open();
+            Version = c.PostgreSqlVersion;
+            c.Close();
         }
 
         public PgVersionTargetedFactDiscoverer(IMessageSink diagnosticMessageSink): base(diagnosticMessageSink)
         {
         }
 
-        public override IEnumerable<IXunitTestCase> Discover(ITestFrameworkDiscoveryOptions discoveryOptions, ITestMethod testMethod,
+        public override IEnumerable<IXunitTestCase> Discover(ITestFrameworkDiscoveryOptions discoveryOptions,
+            ITestMethod testMethod,
             IAttributeInfo factAttribute)
         {
             var minimumVersion = factAttribute.GetNamedArgument<string>(nameof(PgVersionTargetedFact.MinimumVersion));
             var maximumVersion = factAttribute.GetNamedArgument<string>(nameof(PgVersionTargetedFact.MaximumVersion));
 
             if (minimumVersion != null && Version.TryParse(minimumVersion, out var minVersion) && Version < minVersion)
             {
-                yield return new TestCaseSkippedDueToVersion($"Minimum required PG version {minimumVersion} is higher than {Version}", DiagnosticMessageSink, discoveryOptions.MethodDisplayOrDefault(), discoveryOptions.MethodDisplayOptionsOrDefault(), testMethod);
+                yield return new TestCaseSkippedDueToVersion(
+                    $"Minimum required PG version {minimumVersion} is higher than {Version}", DiagnosticMessageSink,
+                    discoveryOptions.MethodDisplayOrDefault(), discoveryOptions.MethodDisplayOptionsOrDefault(),
+                    testMethod);
             }
+
             if (maximumVersion != null && Version.TryParse(maximumVersion, out var maxVersion) && Version > maxVersion)
             {
-                yield return new TestCaseSkippedDueToVersion($"Maximum allowed PG version {maximumVersion} is higher than {Version}", DiagnosticMessageSink, discoveryOptions.MethodDisplayOrDefault(), discoveryOptions.MethodDisplayOptionsOrDefault(), testMethod);
+                yield return new TestCaseSkippedDueToVersion(
+                    $"Maximum allowed PG version {maximumVersion} is higher than {Version}", DiagnosticMessageSink,
+                    discoveryOptions.MethodDisplayOrDefault(), discoveryOptions.MethodDisplayOptionsOrDefault(),
+                    testMethod);
             }
-            
+
             yield return base.CreateTestCase(discoveryOptions, testMethod, factAttribute);
         }
 
@@ -62,10 +72,22 @@ public TestCaseSkippedDueToVersion()
             {
             }
 
-            public TestCaseSkippedDueToVersion(string skipReason, IMessageSink diagnosticMessageSink, TestMethodDisplay defaultMethodDisplay, TestMethodDisplayOptions defaultMethodDisplayOptions, ITestMethod testMethod, object[] testMethodArguments = null) : base(diagnosticMessageSink, defaultMethodDisplay, defaultMethodDisplayOptions, testMethod, testMethodArguments)
+            public TestCaseSkippedDueToVersion(string skipReason, IMessageSink diagnosticMessageSink,
+                TestMethodDisplay defaultMethodDisplay, TestMethodDisplayOptions defaultMethodDisplayOptions,
+                ITestMethod testMethod, object[] testMethodArguments = null): base(diagnosticMessageSink,
+                defaultMethodDisplay, defaultMethodDisplayOptions, testMethod, testMethodArguments)
             {
                 SkipReason = skipReason;
             }
         }
     }
 }
+
+public class PgVersionTargetedFactDiscovererTests
+{
+    [Fact]
+    public void PgVersionTargetedFactDiscoverer_CanConnectToDatabase()
+    {
+        PgVersionTargetedFactDiscoverer.Version.ShouldNotBe(default);
+    }
+}