Add public API to build provider-specific convention sets without usi…

…ng DI Fixes dotnet#3529
brandondahler · Dec 9, 2015 · 3445477 · 3445477
1 parent 5ae361b
commit 3445477
Show file tree

Hide file tree

Showing 33 changed files with 141 additions and 47 deletions.
diff --git a/src/EntityFramework.MicrosoftSqlServer/EntityFramework.MicrosoftSqlServer.csproj b/src/EntityFramework.MicrosoftSqlServer/EntityFramework.MicrosoftSqlServer.csproj
@@ -50,7 +50,7 @@
     <Compile Include="Infrastructure\Internal\SqlServerModelSource.cs" />
     <Compile Include="Internal\SqlServerModelValidator.cs" />
     <Compile Include="Infrastructure\Internal\SqlServerOptionsExtension.cs" />
-    <Compile Include="Metadata\Conventions\Internal\SqlServerConventionSetBuilder.cs" />
+    <Compile Include="Metadata\Conventions\SqlServerConventionSetBuilder.cs" />
     <Compile Include="Metadata\Conventions\Internal\SqlServerValueGenerationStrategyConvention.cs" />
     <Compile Include="Metadata\Internal\SqlServerAnnotationNames.cs" />
     <Compile Include="Metadata\Internal\SqlServerIndexBuilderAnnotations.cs" />

diff --git a/...mework.MicrosoftSqlServer/Extensions/SqlServerEntityFrameworkServicesBuilderExtensions.cs b/...mework.MicrosoftSqlServer/Extensions/SqlServerEntityFrameworkServicesBuilderExtensions.cs
@@ -6,7 +6,7 @@
 using Microsoft.Data.Entity.Infrastructure.Internal;
 using Microsoft.Data.Entity.Internal;
 using Microsoft.Data.Entity.Metadata;
-using Microsoft.Data.Entity.Metadata.Conventions.Internal;
+using Microsoft.Data.Entity.Metadata.Conventions;
 using Microsoft.Data.Entity.Migrations;
 using Microsoft.Data.Entity.Migrations.Internal;
 using Microsoft.Data.Entity.Query.ExpressionTranslators.Internal;
@@ -50,7 +50,7 @@ public static class SqlServerEntityFrameworkServicesBuilderExtensions
         ///         }
         ///     </code>
         /// </example>
-        /// <param name="serviceCollection"> The <see cref="IServiceCollection" /> to add services to. </param>
+        /// <param name="builder"> The <see cref="IServiceCollection" /> to add services to. </param>
         /// <returns>
         ///     A builder that allows further Entity Framework specific setup of the <see cref="IServiceCollection" />.
         /// </returns>

diff --git a/...Internal/SqlServerConventionSetBuilder.cs → ...ventions/SqlServerConventionSetBuilder.cs b/...Internal/SqlServerConventionSetBuilder.cs → ...ventions/SqlServerConventionSetBuilder.cs
@@ -2,10 +2,12 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using JetBrains.Annotations;
+using Microsoft.Data.Entity.Metadata.Conventions.Internal;
 using Microsoft.Data.Entity.Storage;
+using Microsoft.Data.Entity.Storage.Internal;
 using Microsoft.Data.Entity.Utilities;
 
-namespace Microsoft.Data.Entity.Metadata.Conventions.Internal
+namespace Microsoft.Data.Entity.Metadata.Conventions
 {
     public class SqlServerConventionSetBuilder : RelationalConventionSetBuilder
     {
@@ -24,5 +26,9 @@ public override ConventionSet AddConventions(ConventionSet conventionSet)
 
             return conventionSet;
         }
+
+        public static ConventionSet Build()
+            => new SqlServerConventionSetBuilder(new SqlServerTypeMapper())
+                .AddConventions(new CoreConventionSetBuilder().CreateConventionSet());
     }
 }
diff --git a/src/EntityFramework.MicrosoftSqlServer/Storage/Internal/SqlServerDatabaseProviderServices.cs b/src/EntityFramework.MicrosoftSqlServer/Storage/Internal/SqlServerDatabaseProviderServices.cs
@@ -8,6 +8,7 @@
 using Microsoft.Data.Entity.Infrastructure.Internal;
 using Microsoft.Data.Entity.Internal;
 using Microsoft.Data.Entity.Metadata;
+using Microsoft.Data.Entity.Metadata.Conventions;
 using Microsoft.Data.Entity.Metadata.Conventions.Internal;
 using Microsoft.Data.Entity.Migrations;
 using Microsoft.Data.Entity.Migrations.Internal;

diff --git a/src/EntityFramework.Sqlite/EntityFramework.Sqlite.csproj b/src/EntityFramework.Sqlite/EntityFramework.Sqlite.csproj
@@ -90,7 +90,7 @@
     <Compile Include="Query\ExpressionTranslators\Internal\SqliteCompositeMemberTranslator.cs" />
     <Compile Include="Storage\Internal\SqliteDatabaseCreator.cs" />
     <Compile Include="Storage\Internal\SqliteRelationalConnection.cs" />
-    <Compile Include="Metadata\Conventions\Internal\SqliteConventionSetBuilder.cs" />
+    <Compile Include="Metadata\Conventions\SqliteConventionSetBuilder.cs" />
     <Compile Include="Infrastructure\SqliteDbContextOptionsBuilder.cs" />
     <Compile Include="SqliteDbContextOptionsBuilderExtensions.cs" />
     <Compile Include="Infrastructure\SqliteEntityFrameworkServicesBuilderExtensions.cs" />

diff --git a/src/EntityFramework.Sqlite/Infrastructure/SqliteEntityFrameworkServicesBuilderExtensions.cs b/src/EntityFramework.Sqlite/Infrastructure/SqliteEntityFrameworkServicesBuilderExtensions.cs
@@ -5,7 +5,7 @@
 using Microsoft.Data.Entity.Infrastructure;
 using Microsoft.Data.Entity.Infrastructure.Internal;
 using Microsoft.Data.Entity.Internal;
-using Microsoft.Data.Entity.Metadata.Conventions.Internal;
+using Microsoft.Data.Entity.Metadata.Conventions;
 using Microsoft.Data.Entity.Metadata.Internal;
 using Microsoft.Data.Entity.Migrations;
 using Microsoft.Data.Entity.Migrations.Internal;

diff --git a/src/EntityFramework.Sqlite/Metadata/Conventions/Internal/SqliteConventionSetBuilder.cs b/src/EntityFramework.Sqlite/Metadata/Conventions/Internal/SqliteConventionSetBuilder.cs
diff --git a/src/EntityFramework.Sqlite/Metadata/Conventions/SqliteConventionSetBuilder.cs b/src/EntityFramework.Sqlite/Metadata/Conventions/SqliteConventionSetBuilder.cs
@@ -0,0 +1,22 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using JetBrains.Annotations;
+using Microsoft.Data.Entity.Metadata.Conventions.Internal;
+using Microsoft.Data.Entity.Storage;
+using Microsoft.Data.Entity.Storage.Internal;
+
+namespace Microsoft.Data.Entity.Metadata.Conventions
+{
+    public class SqliteConventionSetBuilder : RelationalConventionSetBuilder
+    {
+        public SqliteConventionSetBuilder([NotNull] IRelationalTypeMapper typeMapper)
+            : base(typeMapper)
+        {
+        }
+
+        public static ConventionSet Build()
+            => new SqliteConventionSetBuilder(new SqliteTypeMapper())
+                .AddConventions(new CoreConventionSetBuilder().CreateConventionSet());
+    }
+}
diff --git a/src/EntityFramework.Sqlite/Storage/SqliteDatabaseProviderServices.cs b/src/EntityFramework.Sqlite/Storage/SqliteDatabaseProviderServices.cs
@@ -8,6 +8,7 @@
 using Microsoft.Data.Entity.Infrastructure.Internal;
 using Microsoft.Data.Entity.Internal;
 using Microsoft.Data.Entity.Metadata;
+using Microsoft.Data.Entity.Metadata.Conventions;
 using Microsoft.Data.Entity.Metadata.Conventions.Internal;
 using Microsoft.Data.Entity.Metadata.Internal;
 using Microsoft.Data.Entity.Migrations;

diff --git a/test/EntityFramework.Core.Tests/EntityFramework.Core.Tests.csproj b/test/EntityFramework.Core.Tests/EntityFramework.Core.Tests.csproj
@@ -71,6 +71,7 @@
     <Compile Include="Infrastructure\LoggingModelValidatorTest.cs" />
     <Compile Include="Infrastructure\NonThrowingModelValidatorTest.cs" />
     <Compile Include="Infrastructure\ThrowingModelValidatorTest.cs" />
+    <Compile Include="Metadata\Conventions\ConventionSetBuilderTests.cs" />
     <Compile Include="Metadata\Internal\ClrPropertySetterFactoryTest.cs" />
     <Compile Include="Metadata\Internal\CollectionTypeFactoryTest.cs" />
     <Compile Include="Metadata\EntityTypeExtensionsTest.cs" />
@@ -83,18 +84,18 @@
     <Compile Include="Metadata\Internal\InternalPropertyBuilderTest.cs" />
     <Compile Include="Metadata\Internal\InternalRelationshipBuilderTest.cs" />
     <Compile Include="Metadata\MetadataBuilderTest.cs" />
-    <Compile Include="Metadata\ModelConventions\BaseTypeDiscoveryConventionTest.cs" />
-    <Compile Include="Metadata\ModelConventions\CascadeDeleteConventionTest.cs" />
-    <Compile Include="Metadata\ModelConventions\ConventionDispatcherTest.cs" />
-    <Compile Include="Metadata\ModelConventions\DerivedTypeDiscoveryConventionTest.cs" />
-    <Compile Include="Metadata\ModelConventions\ForeignKeyPropertyDiscoveryConventionTest.cs" />
-    <Compile Include="Metadata\ModelConventions\KeyConventionTest.cs" />
-    <Compile Include="Metadata\ModelConventions\EntityTypeAttributeConventionTest.cs" />
-    <Compile Include="Metadata\ModelConventions\ModelCleanupConventionTest.cs" />
-    <Compile Include="Metadata\ModelConventions\NavigationAttributeConventionTest.cs" />
-    <Compile Include="Metadata\ModelConventions\PropertyAttributeConventionTest.cs" />
-    <Compile Include="Metadata\ModelConventions\PropertyMappingValidationConventionTest.cs" />
-    <Compile Include="Metadata\ModelConventions\RelationshipDiscoveryConventionTest.cs" />
+    <Compile Include="Metadata\Conventions\Internal\BaseTypeDiscoveryConventionTest.cs" />
+    <Compile Include="Metadata\Conventions\Internal\CascadeDeleteConventionTest.cs" />
+    <Compile Include="Metadata\Conventions\Internal\ConventionDispatcherTest.cs" />
+    <Compile Include="Metadata\Conventions\Internal\DerivedTypeDiscoveryConventionTest.cs" />
+    <Compile Include="Metadata\Conventions\Internal\ForeignKeyPropertyDiscoveryConventionTest.cs" />
+    <Compile Include="Metadata\Conventions\Internal\KeyConventionTest.cs" />
+    <Compile Include="Metadata\Conventions\Internal\EntityTypeAttributeConventionTest.cs" />
+    <Compile Include="Metadata\Conventions\Internal\ModelCleanupConventionTest.cs" />
+    <Compile Include="Metadata\Conventions\Internal\NavigationAttributeConventionTest.cs" />
+    <Compile Include="Metadata\Conventions\Internal\PropertyAttributeConventionTest.cs" />
+    <Compile Include="Metadata\Conventions\Internal\PropertyMappingValidationConventionTest.cs" />
+    <Compile Include="Metadata\Conventions\Internal\RelationshipDiscoveryConventionTest.cs" />
     <Compile Include="Metadata\NavigationExtensionsTest.cs" />
     <Compile Include="Extensions\QueryableExtensionsTest.cs" />
     <Compile Include="Infrastructure\TypedAnnotationTest.cs" />
@@ -129,8 +130,8 @@
     <Compile Include="Metadata\Internal\ModelTest.cs" />
     <Compile Include="Metadata\Internal\NavigationTest.cs" />
     <Compile Include="Metadata\Internal\PropertyTest.cs" />
-    <Compile Include="Metadata\ModelConventions\KeyDiscoveryConventionTest.cs" />
-    <Compile Include="Metadata\ModelConventions\PropertyDiscoveryConventionTest.cs" />
+    <Compile Include="Metadata\Conventions\Internal\KeyDiscoveryConventionTest.cs" />
+    <Compile Include="Metadata\Conventions\Internal\PropertyDiscoveryConventionTest.cs" />
     <Compile Include="Query\TaskResultAsyncEnumerableTest.cs" />
     <Compile Include="Storage\DatabaseProviderSelectorTest.cs" />
     <Compile Include="TestUtilities\ListLogger.cs" />

diff --git a/test/EntityFramework.Core.Tests/Metadata/Conventions/ConventionSetBuilderTests.cs b/test/EntityFramework.Core.Tests/Metadata/Conventions/ConventionSetBuilderTests.cs
@@ -0,0 +1,33 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System.ComponentModel.DataAnnotations.Schema;
+using System.Linq;
+using Microsoft.Data.Entity.Metadata.Conventions.Internal;
+using Xunit;
+
+namespace Microsoft.Data.Entity.Metadata.Conventions.Tests
+{
+    public class ConventionSetBuilderTests
+    {
+        [Fact]
+        public virtual IModel Can_build_a_model_with_default_conventions_without_DI()
+        {
+            var modelBuilder = new ModelBuilder(GetConventionSet());
+            modelBuilder.Entity<Product>();
+
+            var model = modelBuilder.Model;
+            Assert.Equal(2, model.GetEntityTypes().Single().GetProperties().Count());
+            return model;
+        }
+
+        protected virtual ConventionSet GetConventionSet() => new CoreConventionSetBuilder().CreateConventionSet();
+
+        [Table("ProductTable")]
+        protected class Product
+        {
+            public virtual int Id { get; set; }
+            public virtual string Name { get; set; }
+        }
+    }
+}
diff --git a/...ntions/BaseTypeDiscoveryConventionTest.cs → ...ternal/BaseTypeDiscoveryConventionTest.cs b/...ntions/BaseTypeDiscoveryConventionTest.cs → ...ternal/BaseTypeDiscoveryConventionTest.cs
diff --git a/...onventions/CascadeDeleteConventionTest.cs → ...s/Internal/CascadeDeleteConventionTest.cs b/...onventions/CascadeDeleteConventionTest.cs → ...s/Internal/CascadeDeleteConventionTest.cs
diff --git a/...elConventions/ConventionDispatcherTest.cs → ...ions/Internal/ConventionDispatcherTest.cs b/...elConventions/ConventionDispatcherTest.cs → ...ions/Internal/ConventionDispatcherTest.cs
diff --git a/...ons/DerivedTypeDiscoveryConventionTest.cs → ...nal/DerivedTypeDiscoveryConventionTest.cs b/...ons/DerivedTypeDiscoveryConventionTest.cs → ...nal/DerivedTypeDiscoveryConventionTest.cs
diff --git a/...ions/EntityTypeAttributeConventionTest.cs → ...rnal/EntityTypeAttributeConventionTest.cs b/...ions/EntityTypeAttributeConventionTest.cs → ...rnal/EntityTypeAttributeConventionTest.cs
diff --git a/...eignKeyPropertyDiscoveryConventionTest.cs → ...eignKeyPropertyDiscoveryConventionTest.cs b/...eignKeyPropertyDiscoveryConventionTest.cs → ...eignKeyPropertyDiscoveryConventionTest.cs
diff --git a/...ata/ModelConventions/KeyConventionTest.cs → ...Conventions/Internal/KeyConventionTest.cs b/...ata/ModelConventions/KeyConventionTest.cs → ...Conventions/Internal/KeyConventionTest.cs
diff --git a/...Conventions/KeyDiscoveryConventionTest.cs → ...ns/Internal/KeyDiscoveryConventionTest.cs b/...Conventions/KeyDiscoveryConventionTest.cs → ...ns/Internal/KeyDiscoveryConventionTest.cs
diff --git a/...Conventions/ModelCleanupConventionTest.cs → ...ns/Internal/ModelCleanupConventionTest.cs b/...Conventions/ModelCleanupConventionTest.cs → ...ns/Internal/ModelCleanupConventionTest.cs
diff --git a/...ions/NavigationAttributeConventionTest.cs → ...rnal/NavigationAttributeConventionTest.cs b/...ions/NavigationAttributeConventionTest.cs → ...rnal/NavigationAttributeConventionTest.cs
diff --git a/...ntions/PropertyAttributeConventionTest.cs → ...ternal/PropertyAttributeConventionTest.cs b/...ntions/PropertyAttributeConventionTest.cs → ...ternal/PropertyAttributeConventionTest.cs
diff --git a/...ntions/PropertyDiscoveryConventionTest.cs → ...ternal/PropertyDiscoveryConventionTest.cs b/...ntions/PropertyDiscoveryConventionTest.cs → ...ternal/PropertyDiscoveryConventionTest.cs
diff --git a/...ropertyMappingValidationConventionTest.cs → ...ropertyMappingValidationConventionTest.cs b/...ropertyMappingValidationConventionTest.cs → ...ropertyMappingValidationConventionTest.cs
diff --git a/...ns/RelationshipDiscoveryConventionTest.cs → ...al/RelationshipDiscoveryConventionTest.cs b/...ns/RelationshipDiscoveryConventionTest.cs → ...al/RelationshipDiscoveryConventionTest.cs
diff --git a/test/EntityFramework.Microbenchmarks/InitializationTests.cs b/test/EntityFramework.Microbenchmarks/InitializationTests.cs
@@ -1,4 +1,4 @@
-// Copyright (c) .NET Foundation. All rights reserved.
+// Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
@@ -8,6 +8,7 @@
 using EntityFramework.Microbenchmarks.Core.Models.AdventureWorks.TestHelpers;
 using EntityFramework.Microbenchmarks.Models.AdventureWorks;
 using Microsoft.Data.Entity;
+using Microsoft.Data.Entity.Metadata.Conventions;
 using Microsoft.Data.Entity.Metadata.Conventions.Internal;
 using Microsoft.Data.Entity.Storage.Internal;
 using Xunit;
@@ -52,11 +53,8 @@ public void InitializeAndSaveChanges_AdventureWorks(IMetricCollector collector,
         public void BuildModel_AdventureWorks(IMetricCollector collector)
         {
             collector.StartCollection();
-
-            var conventions = new SqlServerConventionSetBuilder(new SqlServerTypeMapper())
-                .AddConventions(new CoreConventionSetBuilder().CreateConventionSet());
-
-            var builder = new ModelBuilder(conventions);
+
+            var builder = new ModelBuilder(SqlServerConventionSetBuilder.Build());
             AdventureWorksContext.ConfigureModel(builder);
 
             var model = builder.Model;

diff --git a/.../EntityFramework.MicrosoftSqlServer.Tests/EntityFramework.MicrosoftSqlServer.Tests.csproj b/.../EntityFramework.MicrosoftSqlServer.Tests/EntityFramework.MicrosoftSqlServer.Tests.csproj
@@ -36,8 +36,9 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="ApiConsistencyTest.cs" />
+    <Compile Include="Metadata\Conventions\SqlServerConventionSetBuilderTests.cs" />
     <Compile Include="Metadata\InternalSqlServerMetadataBuilderExtensionsTest.cs" />
-    <Compile Include="Metadata\ModelConventions\SqlServerValueGenerationStrategyConventionTest.cs" />
+    <Compile Include="Metadata\Conventions\SqlServerValueGenerationStrategyConventionTest.cs" />
     <Compile Include="Metadata\SqlServerBuilderExtensionsTest.cs" />
     <Compile Include="Metadata\SqlServerMetadataExtensionsTest.cs" />
     <Compile Include="Migrations\SqlServerHistoryRepositoryTest.cs" />

diff --git a/...ework.MicrosoftSqlServer.Tests/Metadata/Conventions/SqlServerConventionSetBuilderTests.cs b/...ework.MicrosoftSqlServer.Tests/Metadata/Conventions/SqlServerConventionSetBuilderTests.cs
@@ -0,0 +1,25 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System.Linq;
+using Microsoft.Data.Entity.Metadata;
+using Microsoft.Data.Entity.Metadata.Conventions;
+using Microsoft.Data.Entity.Metadata.Conventions.Tests;
+using Xunit;
+
+namespace Microsoft.Data.Entity.SqlServer.Metadata.Conventions.Tests
+{
+    public class SqlServerConventionSetBuilderTests : ConventionSetBuilderTests
+    {
+        public override IModel Can_build_a_model_with_default_conventions_without_DI()
+        {
+            var model = base.Can_build_a_model_with_default_conventions_without_DI();
+
+            Assert.Equal("ProductTable", model.GetEntityTypes().Single().SqlServer().TableName);
+
+            return model;
+        }
+
+        protected override ConventionSet GetConventionSet() => SqlServerConventionSetBuilder.Build();
+    }
+}
diff --git a/...rValueGenerationStrategyConventionTest.cs → ...rValueGenerationStrategyConventionTest.cs b/...rValueGenerationStrategyConventionTest.cs → ...rValueGenerationStrategyConventionTest.cs
@@ -2,12 +2,11 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System.Linq;
-using Microsoft.Data.Entity.Metadata;
 using Microsoft.Data.Entity.Metadata.Internal;
 using Microsoft.Data.Entity.Tests;
 using Xunit;
 
-namespace Microsoft.Data.Entity.SqlServer.Tests.Metadata.Conventions
+namespace Microsoft.Data.Entity.Metadata.Conventions.Tests
 {
     public class SqlServerValueGenerationStrategyConventionTest
     {

diff --git a/...amework.MicrosoftSqlServer.Tests/SqlServerEntityFrameworkServicesBuilderExtensionsTest.cs b/...amework.MicrosoftSqlServer.Tests/SqlServerEntityFrameworkServicesBuilderExtensionsTest.cs
@@ -4,7 +4,7 @@
 using Microsoft.Data.Entity.Infrastructure.Internal;
 using Microsoft.Data.Entity.Internal;
 using Microsoft.Data.Entity.Metadata;
-using Microsoft.Data.Entity.Metadata.Conventions.Internal;
+using Microsoft.Data.Entity.Metadata.Conventions;
 using Microsoft.Data.Entity.Migrations;
 using Microsoft.Data.Entity.Migrations.Internal;
 using Microsoft.Data.Entity.Query.ExpressionTranslators.Internal;

diff --git a/test/EntityFramework.Sqlite.Tests/EntityFramework.Sqlite.Tests.csproj b/test/EntityFramework.Sqlite.Tests/EntityFramework.Sqlite.Tests.csproj
@@ -36,6 +36,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="ApiConsistencyTest.cs" />
+    <Compile Include="Metadata\Conventions\SqliteConventionSetBuilderTests.cs" />
     <Compile Include="SqliteDbContextOptionsBuilderExtensionsTest.cs" />
     <Compile Include="Metadata\Builders\SqliteBuilderExtensionsTest.cs" />
     <Compile Include="Metadata\Internal\SqliteInternalMetadataBuilderExtensionsTest.cs" />

diff --git a/...amework.Sqlite.Tests/Infrastructure/SqliteEntityFrameworkServicesBuilderExtensionsTest.cs b/...amework.Sqlite.Tests/Infrastructure/SqliteEntityFrameworkServicesBuilderExtensionsTest.cs
@@ -3,7 +3,7 @@
 
 using Microsoft.Data.Entity.Infrastructure.Internal;
 using Microsoft.Data.Entity.Internal;
-using Microsoft.Data.Entity.Metadata.Conventions.Internal;
+using Microsoft.Data.Entity.Metadata.Conventions;
 using Microsoft.Data.Entity.Metadata.Internal;
 using Microsoft.Data.Entity.Migrations;
 using Microsoft.Data.Entity.Migrations.Internal;

diff --git a/test/EntityFramework.Sqlite.Tests/Metadata/Conventions/SqliteConventionSetBuilderTests.cs b/test/EntityFramework.Sqlite.Tests/Metadata/Conventions/SqliteConventionSetBuilderTests.cs
@@ -0,0 +1,22 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System.Linq;
+using Xunit;
+
+namespace Microsoft.Data.Entity.Metadata.Conventions.Tests
+{
+    public class SqliteConventionSetBuilderTests : ConventionSetBuilderTests
+    {
+        public override IModel Can_build_a_model_with_default_conventions_without_DI()
+        {
+            var model = base.Can_build_a_model_with_default_conventions_without_DI();
+
+            Assert.Equal("ProductTable", model.GetEntityTypes().Single().Sqlite().TableName);
+
+            return model;
+        }
+
+        protected override ConventionSet GetConventionSet() => SqliteConventionSetBuilder.Build();
+    }
+}