Annotate functional tests for nullability (#3418)

Where the base classes are annotated
npgsql · Dec 22, 2024 · 5785b40 · 5785b40
1 parent 9cce847
commit 5785b40
Show file tree

Hide file tree

Showing 90 changed files with 259 additions and 244 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -3,6 +3,7 @@
     <VersionPrefix>10.0.0</VersionPrefix>
     <TargetFramework>net10.0</TargetFramework>
     <LangVersion>latest</LangVersion>
+    <Nullable>enable</Nullable>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <AnalysisLevel>latest</AnalysisLevel>
     <NoWarn>NU5105</NoWarn>

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -5,7 +5,6 @@
     <IncludeSymbols>true</IncludeSymbols>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
-    <Nullable>enable</Nullable>
     <Feature>nullablePublicOnly</Feature>
   </PropertyGroup>
 

diff --git a/test/EFCore.PG.FunctionalTests/BadDataJsonDeserializationNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/BadDataJsonDeserializationNpgsqlTest.cs
@@ -1,5 +1,3 @@
-#nullable enable
-
 namespace Npgsql.EntityFrameworkCore.PostgreSQL;
 
 public class BadDataJsonDeserializationSqlServerTest : BadDataJsonDeserializationTestBase

diff --git a/test/EFCore.PG.FunctionalTests/BatchingTest.cs b/test/EFCore.PG.FunctionalTests/BatchingTest.cs
@@ -7,6 +7,8 @@
 // ReSharper disable InconsistentNaming
 namespace Npgsql.EntityFrameworkCore.PostgreSQL;
 
+#nullable disable
+
 public class BatchingTest(BatchingTest.BatchingTestFixture fixture) : IClassFixture<BatchingTest.BatchingTestFixture>
 {
     protected BatchingTestFixture Fixture { get; } = fixture;

diff --git a/test/EFCore.PG.FunctionalTests/BuiltInDataTypesNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/BuiltInDataTypesNpgsqlTest.cs
@@ -5,6 +5,8 @@
 
 namespace Npgsql.EntityFrameworkCore.PostgreSQL;
 
+#nullable disable
+
 public class BuiltInDataTypesNpgsqlTest : BuiltInDataTypesTestBase<BuiltInDataTypesNpgsqlTest.BuiltInDataTypesNpgsqlFixture>
 {
     // ReSharper disable once UnusedParameter.Local

diff --git a/test/EFCore.PG.FunctionalTests/BulkUpdates/NonSharedModelBulkUpdatesNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/BulkUpdates/NonSharedModelBulkUpdatesNpgsqlTest.cs
@@ -236,7 +236,7 @@ protected class Context3001(DbContextOptions options) : DbContext(options)
     protected class EntityWithPrimitiveCollection
     {
         public int Id { get; set; }
-        public List<string> Tags { get; set; }
+        public List<string> Tags { get; set; } = null!;
     }
 
     public override async Task Delete_with_view_mapping(bool async)

diff --git a/test/EFCore.PG.FunctionalTests/ComputedColumnTest.cs b/test/EFCore.PG.FunctionalTests/ComputedColumnTest.cs
@@ -134,7 +134,7 @@ public void Can_use_computed_columns_with_nullable_enum()
         Assert.Equal(FlagEnum.AValue | FlagEnum.BValue, entity.CalculatedFlagEnum);
     }
 
-    protected NpgsqlTestStore TestStore { get; private set; }
+    protected NpgsqlTestStore TestStore { get; private set; } = null!;
 
     public async Task InitializeAsync()
         => TestStore = await NpgsqlTestStore.CreateInitializedAsync("ComputedColumnTest");

diff --git a/test/EFCore.PG.FunctionalTests/ConferencePlannerNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/ConferencePlannerNpgsqlTest.cs
@@ -4,6 +4,8 @@
 
 namespace Npgsql.EntityFrameworkCore.PostgreSQL;
 
+#nullable disable
+
 public class ConferencePlannerNpgsqlTest(ConferencePlannerNpgsqlTest.ConferencePlannerNpgsqlFixture fixture)
     : ConferencePlannerTestBase<ConferencePlannerNpgsqlTest.ConferencePlannerNpgsqlFixture>(fixture)
 {

diff --git a/test/EFCore.PG.FunctionalTests/ConnectionInterceptionNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/ConnectionInterceptionNpgsqlTest.cs
@@ -1,5 +1,6 @@
 using System.Data;
 using System.Data.Common;
+using System.Diagnostics.CodeAnalysis;
 using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities;
 
 namespace Npgsql.EntityFrameworkCore.PostgreSQL;
@@ -45,6 +46,7 @@ protected override BadUniverseContext CreateBadUniverse(DbContextOptionsBuilder
 
     public class FakeDbConnection : DbConnection
     {
+        [AllowNull]
         public override string ConnectionString { get; set; }
 
         public override string Database

diff --git a/test/EFCore.PG.FunctionalTests/ConnectionSpecificationTest.cs b/test/EFCore.PG.FunctionalTests/ConnectionSpecificationTest.cs
@@ -4,6 +4,8 @@
 // ReSharper disable StringLiteralTypo
 namespace Npgsql.EntityFrameworkCore.PostgreSQL;
 
+#nullable disable
+
 public class ConnectionSpecificationTest
 {
     [Fact]

diff --git a/test/EFCore.PG.FunctionalTests/DefaultValuesTest.cs b/test/EFCore.PG.FunctionalTests/DefaultValuesTest.cs
@@ -69,7 +69,7 @@ private class KettleChips
     {
         // ReSharper disable once UnusedMember.Local
         public int Id { get; set; }
-        public string Name { get; set; }
+        public string Name { get; set; } = null!;
         public DateTime BestBuyDate { get; set; }
     }
 }
diff --git a/test/EFCore.PG.FunctionalTests/ExecutionStrategyTest.cs b/test/EFCore.PG.FunctionalTests/ExecutionStrategyTest.cs
@@ -7,6 +7,8 @@
 // ReSharper disable AccessToDisposedClosure
 namespace Npgsql.EntityFrameworkCore.PostgreSQL;
 
+#nullable disable
+
 public class ExecutionStrategyTest : IClassFixture<ExecutionStrategyTest.ExecutionStrategyFixture>
 {
     public ExecutionStrategyTest(ExecutionStrategyFixture fixture)

diff --git a/test/EFCore.PG.FunctionalTests/ExistingConnectionTest.cs b/test/EFCore.PG.FunctionalTests/ExistingConnectionTest.cs
@@ -93,12 +93,12 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
     private class Customer
     {
         // ReSharper disable once UnusedAutoPropertyAccessor.Local
-        public string CustomerId { get; set; }
+        public string CustomerId { get; set; } = null!;
 
         // ReSharper disable once UnusedMember.Local
-        public string CompanyName { get; set; }
+        public string CompanyName { get; set; } = null!;
 
         // ReSharper disable once UnusedMember.Local
-        public string Fax { get; set; }
+        public string Fax { get; set; } = null!;
     }
 }
diff --git a/test/EFCore.PG.FunctionalTests/F1NpgsqlFixture.cs b/test/EFCore.PG.FunctionalTests/F1NpgsqlFixture.cs
@@ -34,15 +34,15 @@ protected override void BuildModelExternal(ModelBuilder modelBuilder)
         base.BuildModelExternal(modelBuilder);
 
         // TODO: This is a hack to work around, remove in 8.0 after https://github.com/dotnet/efcore/pull/29401
-        modelBuilder.Entity<Chassis>().Property<uint>("Version").HasConversion((ValueConverter)null);
-        modelBuilder.Entity<Driver>().Property<uint>("Version").HasConversion((ValueConverter)null);
-        modelBuilder.Entity<Team>().Property<uint>("Version").HasConversion((ValueConverter)null);
-        modelBuilder.Entity<Sponsor>().Property<uint>("Version").HasConversion((ValueConverter)null);
+        modelBuilder.Entity<Chassis>().Property<uint>("Version").HasConversion((ValueConverter?)null);
+        modelBuilder.Entity<Driver>().Property<uint>("Version").HasConversion((ValueConverter?)null);
+        modelBuilder.Entity<Team>().Property<uint>("Version").HasConversion((ValueConverter?)null);
+        modelBuilder.Entity<Sponsor>().Property<uint>("Version").HasConversion((ValueConverter?)null);
         modelBuilder.Entity<TitleSponsor>()
             .OwnsOne(
                 s => s.Details, eb =>
                 {
-                    eb.Property<uint>("Version").IsRowVersion().HasConversion((ValueConverter)null);
+                    eb.Property<uint>("Version").IsRowVersion().HasConversion((ValueConverter?)null);
                 });
     }
 }

diff --git a/test/EFCore.PG.FunctionalTests/JsonTypesNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/JsonTypesNpgsqlTest.cs
@@ -1,5 +1,3 @@
-#nullable enable
-
 using System.Collections;
 using System.Globalization;
 using System.Numerics;

diff --git a/test/EFCore.PG.FunctionalTests/LazyLoadProxyNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/LazyLoadProxyNpgsqlTest.cs
@@ -25,7 +25,7 @@ protected override void RecordLog()
         => Sql = Fixture.TestSqlLoggerFactory.Sql;
 
     // ReSharper disable once UnusedAutoPropertyAccessor.Local
-    private string Sql { get; set; }
+    private string Sql { get; set; } = null!;
 
     #region Expected JSON override
 

diff --git a/test/EFCore.PG.FunctionalTests/LoadNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/LoadNpgsqlTest.cs
@@ -18,7 +18,7 @@ protected override void RecordLog()
         => Sql = Fixture.TestSqlLoggerFactory.Sql;
 
     // ReSharper disable once UnusedAutoPropertyAccessor.Local
-    private string Sql { get; set; }
+    private string Sql { get; set; } = null!;
 
     public class LoadNpgsqlFixture : LoadFixtureBase
     {

diff --git a/test/EFCore.PG.FunctionalTests/LoggingNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/LoggingNpgsqlTest.cs
@@ -72,5 +72,5 @@ protected override string ProviderName
 
     protected override string ProviderVersion
         => typeof(NpgsqlOptionsExtension).Assembly
-            .GetCustomAttribute<AssemblyInformationalVersionAttribute>()?.InformationalVersion;
+            .GetCustomAttribute<AssemblyInformationalVersionAttribute>()?.InformationalVersion!;
 }
diff --git a/test/EFCore.PG.FunctionalTests/MaterializationInterceptionNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/MaterializationInterceptionNpgsqlTest.cs
@@ -1,5 +1,3 @@
-#nullable enable
-
 using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities;
 
 namespace Npgsql.EntityFrameworkCore.PostgreSQL;

diff --git a/test/EFCore.PG.FunctionalTests/Migrations/MigrationsInfrastructureNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/Migrations/MigrationsInfrastructureNpgsqlTest.cs
@@ -2,6 +2,8 @@
 using Npgsql.EntityFrameworkCore.PostgreSQL.Storage.Internal;
 using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities;
 
+#nullable disable
+
 namespace Npgsql.EntityFrameworkCore.PostgreSQL.Migrations
 {
     public class MigrationsInfrastructureNpgsqlTest(MigrationsInfrastructureNpgsqlTest.MigrationsInfrastructureNpgsqlFixture fixture)

diff --git a/test/EFCore.PG.FunctionalTests/Migrations/MigrationsNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/Migrations/MigrationsNpgsqlTest.cs
@@ -1,6 +1,4 @@
-#nullable enable
-
-using Npgsql.EntityFrameworkCore.PostgreSQL.Infrastructure;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Infrastructure;
 using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
 using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata.Internal;
 using Npgsql.EntityFrameworkCore.PostgreSQL.Scaffolding.Internal;

diff --git a/test/EFCore.PG.FunctionalTests/Migrations/NpgsqlMigrationsSqlGeneratorTest.cs b/test/EFCore.PG.FunctionalTests/Migrations/NpgsqlMigrationsSqlGeneratorTest.cs
@@ -615,7 +615,7 @@ public override void InsertDataOperation_throws_for_unsupported_column_types()
                             Schema = "dbo",
                             Columns = ["First Name"],
                             ColumnTypes = ["foo"],
-                            Values = new object[,] { { null } }
+                            Values = new object?[,] { { null } }
                         })).Message);
 
 #pragma warning restore 618

diff --git a/test/EFCore.PG.FunctionalTests/ModelBuilding/NpgsqlModelBuilderGenericTest.cs b/test/EFCore.PG.FunctionalTests/ModelBuilding/NpgsqlModelBuilderGenericTest.cs
@@ -2,8 +2,6 @@
 
 namespace Npgsql.EntityFrameworkCore.PostgreSQL.ModelBuilding;
 
-#nullable enable
-
 public class NpgsqlModelBuilderGenericTest : NpgsqlModelBuilderTestBase
 {
     public class NpgsqlGenericNonRelationship(NpgsqlModelBuilderFixture fixture) : NpgsqlNonRelationship(fixture)

diff --git a/test/EFCore.PG.FunctionalTests/ModelBuilding/NpgsqlModelBuilderTestBase.cs b/test/EFCore.PG.FunctionalTests/ModelBuilding/NpgsqlModelBuilderTestBase.cs
@@ -1,5 +1,3 @@
-#nullable enable
-
 using Microsoft.EntityFrameworkCore.ModelBuilding;
 using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities;
 

diff --git a/test/EFCore.PG.FunctionalTests/NpgsqlApiConsistencyTest.cs b/test/EFCore.PG.FunctionalTests/NpgsqlApiConsistencyTest.cs
@@ -3,6 +3,8 @@
 
 namespace Npgsql.EntityFrameworkCore.PostgreSQL;
 
+#nullable disable
+
 public class NpgsqlApiConsistencyTest(NpgsqlApiConsistencyTest.NpgsqlApiConsistencyFixture fixture)
     : ApiConsistencyTestBase<NpgsqlApiConsistencyTest.NpgsqlApiConsistencyFixture>(fixture)
 {

diff --git a/test/EFCore.PG.FunctionalTests/NpgsqlDatabaseCreatorTest.cs b/test/EFCore.PG.FunctionalTests/NpgsqlDatabaseCreatorTest.cs
@@ -7,6 +7,8 @@
 
 namespace Npgsql.EntityFrameworkCore.PostgreSQL;
 
+#nullable disable
+
 public class NpgsqlDatabaseCreatorExistsTest : NpgsqlDatabaseCreatorTest
 {
     [ConditionalTheory]

diff --git a/test/EFCore.PG.FunctionalTests/NpgsqlValueGenerationScenariosTest.cs b/test/EFCore.PG.FunctionalTests/NpgsqlValueGenerationScenariosTest.cs
@@ -3,6 +3,8 @@
 
 namespace Npgsql.EntityFrameworkCore.PostgreSQL;
 
+#nullable disable
+
 public class NpgsqlValueGenerationScenariosTest
 {
     private static readonly string DatabaseName = "NpgsqlValueGenerationScenariosTest";

diff --git a/test/EFCore.PG.FunctionalTests/OptimisticConcurrencyNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/OptimisticConcurrencyNpgsqlTest.cs
@@ -2,6 +2,8 @@
 
 namespace Npgsql.EntityFrameworkCore.PostgreSQL;
 
+#nullable disable
+
 public class OptimisticConcurrencyBytesNpgsqlTest(F1BytesNpgsqlFixture fixture)
     : OptimisticConcurrencyNpgsqlTestBase<F1BytesNpgsqlFixture, byte[]>(fixture);
 

diff --git a/test/EFCore.PG.FunctionalTests/Query/AdHocJsonQueryNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/Query/AdHocJsonQueryNpgsqlTest.cs
@@ -2,6 +2,8 @@
 
 namespace Npgsql.EntityFrameworkCore.PostgreSQL.Query;
 
+#nullable disable
+
 public class AdHocJsonQueryNpgsqlTest : AdHocJsonQueryTestBase
 {
     protected override ITestStoreFactory TestStoreFactory

diff --git a/test/EFCore.PG.FunctionalTests/Query/AdHocQuerySplittingQueryNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/Query/AdHocQuerySplittingQueryNpgsqlTest.cs
@@ -4,6 +4,8 @@
 
 namespace Npgsql.EntityFrameworkCore.PostgreSQL.Query;
 
+#nullable disable
+
 public class AdHocQuerySplittingQueryNpgsqlTest : AdHocQuerySplittingQueryTestBase
 {
     protected override DbContextOptionsBuilder SetQuerySplittingBehavior(

diff --git a/test/EFCore.PG.FunctionalTests/Query/ArrayArrayQueryTest.cs b/test/EFCore.PG.FunctionalTests/Query/ArrayArrayQueryTest.cs
@@ -235,7 +235,7 @@ public override void Array_column_Contains_null_parameter_does_not_work()
     {
         using var ctx = CreateContext();
 
-        string p = null;
+        string? p = null;
 
         // We incorrectly miss arrays containing non-constant nulls, because detecting those
         // would prevent index use.
@@ -642,7 +642,7 @@ await AssertQuery(
             ss => ss.Set<ArrayEntity>()
                 .Where(e => new[] { "a%", "b%", "c%" }.Any(p => EF.Functions.Like(e.NullableText, p))),
             ss => ss.Set<ArrayEntity>()
-                .Where(e => new[] { "a", "b", "c" }.Any(p => e.NullableText.StartsWith(p, StringComparison.Ordinal))));
+                .Where(e => new[] { "a", "b", "c" }.Any(p => e.NullableText!.StartsWith(p, StringComparison.Ordinal))));
 
         AssertSql(
             """
@@ -657,9 +657,9 @@ public override async Task Any_ilike(bool async)
         await AssertQuery(
             async,
             ss => ss.Set<ArrayEntity>()
-                .Where(e => new[] { "a%", "b%", "c%" }.Any(p => EF.Functions.ILike(e.NullableText, p))),
+                .Where(e => new[] { "a%", "b%", "c%" }.Any(p => EF.Functions.ILike(e.NullableText!, p))),
             ss => ss.Set<ArrayEntity>()
-                .Where(e => new[] { "a", "b", "c" }.Any(p => e.NullableText.StartsWith(p, StringComparison.OrdinalIgnoreCase))));
+                .Where(e => new[] { "a", "b", "c" }.Any(p => e.NullableText!.StartsWith(p, StringComparison.OrdinalIgnoreCase))));
 
         AssertSql(
             """
@@ -681,7 +681,7 @@ await AssertQuery(
             ss => ss.Set<ArrayEntity>()
                 .Where(e => patternsActual.Any(p => EF.Functions.Like(e.NullableText, p))),
             ss => ss.Set<ArrayEntity>()
-                .Where(e => patternsExpected.Any(p => e.NullableText.StartsWith(p, StringComparison.Ordinal))));
+                .Where(e => patternsExpected.Any(p => e.NullableText!.StartsWith(p, StringComparison.Ordinal))));
 
         AssertSql(
             """
@@ -700,7 +700,7 @@ await AssertQuery(
             ss => ss.Set<ArrayEntity>()
                 .Where(e => new[] { "b%", "ba%" }.All(p => EF.Functions.Like(e.NullableText, p))),
             ss => ss.Set<ArrayEntity>()
-                .Where(e => new[] { "b", "ba" }.All(p => e.NullableText.StartsWith(p, StringComparison.Ordinal))));
+                .Where(e => new[] { "b", "ba" }.All(p => e.NullableText!.StartsWith(p, StringComparison.Ordinal))));
 
         AssertSql(
             """
@@ -715,9 +715,9 @@ public override async Task All_ilike(bool async)
         await AssertQuery(
             async,
             ss => ss.Set<ArrayEntity>()
-                .Where(e => new[] { "B%", "ba%" }.All(p => EF.Functions.ILike(e.NullableText, p))),
+                .Where(e => new[] { "B%", "ba%" }.All(p => EF.Functions.ILike(e.NullableText!, p))),
             ss => ss.Set<ArrayEntity>()
-                .Where(e => new[] { "B", "ba" }.All(p => e.NullableText.StartsWith(p, StringComparison.OrdinalIgnoreCase))));
+                .Where(e => new[] { "B", "ba" }.All(p => e.NullableText!.StartsWith(p, StringComparison.OrdinalIgnoreCase))));
 
         AssertSql(
             """