Detect SqlServer features automagically rather than using env vars

fixes dotnet#20318 I have attempted to cater for current implicit assumptions - but it is opaque to me what SQL Server edtions tests are actually run against. Tested with SQL 2016 Developer Edition and LocalDb version 14
ErikEJ · Mar 22, 2020 · 48674c6 · 48674c6
1 parent ac46335
commit 48674c6
Show file tree

Hide file tree

Showing 8 changed files with 229 additions and 49 deletions.
diff --git a/test/EFCore.SqlServer.FunctionalTests/CommandConfigurationTest.cs b/test/EFCore.SqlServer.FunctionalTests/CommandConfigurationTest.cs
@@ -30,7 +30,6 @@ public void Constructed_select_query_CommandBuilder_throws_when_negative_Command
         }
 
         [ConditionalTheory]
-        [SqlServerCondition(SqlServerCondition.SupportsSequences)]
         [InlineData(59, 6)]
         [InlineData(50, 5)]
         [InlineData(20, 2)]
@@ -82,10 +81,7 @@ public ChipsContext(DbContextOptions options)
 
             protected override void OnModelCreating(ModelBuilder modelBuilder)
             {
-                if (TestEnvironment.GetFlag(nameof(SqlServerCondition.SupportsSequences)) ?? true)
-                {
-                    modelBuilder.UseHiLo();
-                }
+                modelBuilder.UseHiLo();
             }
         }
 

diff --git a/test/EFCore.SqlServer.FunctionalTests/Scaffolding/SqlServerDatabaseModelFactoryTest.cs b/test/EFCore.SqlServer.FunctionalTests/Scaffolding/SqlServerDatabaseModelFactoryTest.cs
@@ -37,7 +37,6 @@ public SqlServerDatabaseModelFactoryTest(SqlServerDatabaseModelFixture fixture)
         #region Sequences
 
         [ConditionalFact]
-        [SqlServerCondition(SqlServerCondition.SupportsSequences)]
         public void Create_sequences_with_facets()
         {
             Test(
@@ -82,7 +81,6 @@ MAXVALUE 8
         }
 
         [ConditionalFact]
-        [SqlServerCondition(SqlServerCondition.SupportsSequences)]
         public void Sequence_min_max_start_values_are_null_if_default()
         {
             Test(
@@ -118,7 +116,6 @@ public void Sequence_min_max_start_values_are_null_if_default()
         }
 
         [ConditionalFact]
-        [SqlServerCondition(SqlServerCondition.SupportsSequences)]
         public void Sequence_min_max_start_values_are_not_null_if_decimal()
         {
             Test(
@@ -146,7 +143,6 @@ public void Sequence_min_max_start_values_are_not_null_if_decimal()
         }
 
         [ConditionalFact]
-        [SqlServerCondition(SqlServerCondition.SupportsSequences)]
         public void Sequence_using_type_alias()
         {
             Fixture.TestStore.ExecuteNonQuery(
@@ -177,7 +173,6 @@ public void Sequence_using_type_alias()
         }
 
         [ConditionalFact]
-        [SqlServerCondition(SqlServerCondition.SupportsSequences)]
         public void Sequence_using_type_with_facets()
         {
             Test(
@@ -200,7 +195,6 @@ public void Sequence_using_type_with_facets()
         }
 
         [ConditionalFact]
-        [SqlServerCondition(SqlServerCondition.SupportsSequences)]
         public void Filter_sequences_based_on_schema()
         {
             Test(

diff --git a/test/EFCore.SqlServer.FunctionalTests/SequenceEndToEndTest.cs b/test/EFCore.SqlServer.FunctionalTests/SequenceEndToEndTest.cs
@@ -13,7 +13,6 @@
 // ReSharper disable InconsistentNaming
 namespace Microsoft.EntityFrameworkCore
 {
-    [SqlServerCondition(SqlServerCondition.SupportsSequences)]
     public class SequenceEndToEndTest : IDisposable
     {
         [ConditionalFact]

diff --git a/test/EFCore.SqlServer.FunctionalTests/SqlServerValueGenerationScenariosTest.cs b/test/EFCore.SqlServer.FunctionalTests/SqlServerValueGenerationScenariosTest.cs
@@ -51,7 +51,6 @@ public BlogContextIdentity(string databaseName)
             }
         }
 
-        [SqlServerCondition(SqlServerCondition.SupportsSequences)]
         [ConditionalFact]
         public void Insert_with_sequence_HiLo()
         {
@@ -99,7 +98,6 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
         }
 
         [ConditionalFact]
-        [SqlServerCondition(SqlServerCondition.SupportsSequences)]
         public void Insert_with_default_value_from_sequence()
         {
             using var testStore = SqlServerTestStore.CreateInitialized(DatabaseName);
@@ -177,7 +175,6 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
         }
 
         [ConditionalFact]
-        [SqlServerCondition(SqlServerCondition.SupportsSequences)]
         public void Insert_with_default_string_value_from_sequence()
         {
             using var testStore = SqlServerTestStore.CreateInitialized(DatabaseName);
@@ -231,7 +228,6 @@ public class BlogWithStringKey
         }
 
         [ConditionalFact]
-        [SqlServerCondition(SqlServerCondition.SupportsSequences)]
         public void Insert_with_key_default_value_from_sequence()
         {
             using var testStore = SqlServerTestStore.CreateInitialized(DatabaseName);
@@ -872,7 +868,6 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
         }
 
         [ConditionalFact]
-        [SqlServerCondition(SqlServerCondition.SupportsSequences)]
         public void Insert_explicit_value_throws_when_readonly_sequence_before_save()
         {
             using var testStore = SqlServerTestStore.CreateInitialized(DatabaseName);

diff --git a/test/EFCore.SqlServer.FunctionalTests/TestUtilities/SqlServerCondition.cs b/test/EFCore.SqlServer.FunctionalTests/TestUtilities/SqlServerCondition.cs
@@ -8,14 +8,13 @@ namespace Microsoft.EntityFrameworkCore.TestUtilities
     [Flags]
     public enum SqlServerCondition
     {
-        SupportsSequences = 1 << 0,
-        IsSqlAzure = 1 << 1,
-        IsNotSqlAzure = 1 << 2,
-        SupportsMemoryOptimized = 1 << 3,
-        SupportsAttach = 1 << 4,
-        SupportsHiddenColumns = 1 << 5,
-        IsNotCI = 1 << 6,
-        SupportsFullTextSearch = 1 << 7,
-        SupportsOnlineIndexes = 1 << 8
+        IsSqlAzure = 1 << 0,
+        IsNotSqlAzure = 1 << 1,
+        SupportsMemoryOptimized = 1 << 2,
+        SupportsAttach = 1 << 3,
+        SupportsHiddenColumns = 1 << 4,
+        IsNotCI = 1 << 5,
+        SupportsFullTextSearch = 1 << 6,
+        SupportsOnlineIndexes = 1 << 7,
     }
 }
diff --git a/test/EFCore.SqlServer.FunctionalTests/TestUtilities/SqlServerConditionAttribute.cs b/test/EFCore.SqlServer.FunctionalTests/TestUtilities/SqlServerConditionAttribute.cs
@@ -22,19 +22,15 @@ public SqlServerConditionAttribute(SqlServerCondition conditions)
         public ValueTask<bool> IsMetAsync()
         {
             var isMet = true;
-            if (Conditions.HasFlag(SqlServerCondition.SupportsSequences))
-            {
-                isMet &= TestEnvironment.GetFlag(nameof(SqlServerCondition.SupportsSequences)) ?? true;
-            }
 
             if (Conditions.HasFlag(SqlServerCondition.SupportsHiddenColumns))
             {
-                isMet &= TestEnvironment.GetFlag(nameof(SqlServerCondition.SupportsHiddenColumns)) ?? false;
+                isMet &= TestEnvironment.IsHiddenColumnsSupported;
             }
 
             if (Conditions.HasFlag(SqlServerCondition.SupportsMemoryOptimized))
             {
-                isMet &= TestEnvironment.GetFlag(nameof(SqlServerCondition.SupportsMemoryOptimized)) ?? false;
+                isMet &= TestEnvironment.IsMemoryOptimizedTablesSupported;
             }
 
             if (Conditions.HasFlag(SqlServerCondition.IsSqlAzure))
@@ -50,7 +46,7 @@ public ValueTask<bool> IsMetAsync()
             if (Conditions.HasFlag(SqlServerCondition.SupportsAttach))
             {
                 var defaultConnection = new SqlConnectionStringBuilder(TestEnvironment.DefaultConnection);
-                isMet &= defaultConnection.DataSource.Contains("(localdb)")
+                isMet &= defaultConnection.DataSource.Contains("(localdb)", StringComparison.OrdinalIgnoreCase)
                     || defaultConnection.UserInstance;
             }
 
@@ -64,6 +60,11 @@ public ValueTask<bool> IsMetAsync()
                 isMet &= TestEnvironment.IsFullTextSearchSupported;
             }
 
+            if (Conditions.HasFlag(SqlServerCondition.SupportsOnlineIndexes))
+            {
+                isMet &= TestEnvironment.IsOnlineIndexingSupported;
+            }
+
             return new ValueTask<bool>(isMet);
         }