-
@Strings.DatabaseErrorPage_PendingMigrationsTitle(Model.ContextType.Name)
-
@Strings.DatabaseErrorPage_PendingMigrationsInfo(Model.ContextType.Name)
+
@Strings.FormatDatabaseErrorPage_PendingMigrationsTitle(Model.ContextType.Name)
+
@Strings.FormatDatabaseErrorPage_PendingMigrationsInfo(Model.ContextType.Name)
@if (Model.Options.ListMigrations)
{
@@ -130,7 +130,7 @@
else if (Model.PendingModelChanges)
{
-
@Strings.DatabaseErrorPage_PendingChangesTitle(Model.ContextType.Name)
+
@Strings.FormatDatabaseErrorPage_PendingChangesTitle(Model.ContextType.Name)
@Strings.DatabaseErrorPage_PendingChangesInfo
@Strings.DatabaseErrorPage_AddMigrationCommand
diff --git a/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/DatabaseErrorPageMiddlewareTest.cs b/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/DatabaseErrorPageMiddlewareTest.cs
index 23c0cc1ac4..cbd419e705 100644
--- a/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/DatabaseErrorPageMiddlewareTest.cs
+++ b/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/DatabaseErrorPageMiddlewareTest.cs
@@ -14,10 +14,10 @@ using Microsoft.AspNet.Http;
using Microsoft.AspNet.TestHost;
using Microsoft.Data.Entity;
using Microsoft.Data.Entity.Migrations.Infrastructure;
-using Microsoft.Data.Entity.SqlServer.FunctionalTests;
using Microsoft.Framework.DependencyInjection;
using Microsoft.Framework.Logging;
using Xunit;
+using Microsoft.AspNet.Diagnostics.Entity.Tests.Helpers;
namespace Microsoft.AspNet.Diagnostics.Entity.Tests
{
@@ -75,14 +75,14 @@ namespace Microsoft.AspNet.Diagnostics.Entity.Tests
[Fact]
public async Task Error_page_displayed_no_migrations()
{
- TestServer server = await SetupTestServer
();
+ TestServer server = SetupTestServer();
HttpResponseMessage response = await server.CreateClient().GetAsync("http://localhost/");
Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode);
var content = await response.Content.ReadAsStringAsync();
- Assert.Contains(Strings.DatabaseErrorPage_NoDbOrMigrationsTitle(typeof(BloggingContext).Name), content);
- Assert.Contains(Strings.DatabaseErrorPage_AddMigrationCommand.Replace(">", ">"), content);
- Assert.Contains(Strings.DatabaseErrorPage_ApplyMigrationsCommand.Replace(">", ">"), content);
+ Assert.Contains(StringsHelpers.GetResourceString("FormatDatabaseErrorPage_NoDbOrMigrationsTitle", typeof(BloggingContext).Name), content);
+ Assert.Contains(StringsHelpers.GetResourceString("FormatDatabaseErrorPage_AddMigrationCommand").Replace(">", ">"), content);
+ Assert.Contains(StringsHelpers.GetResourceString("FormatDatabaseErrorPage_ApplyMigrationsCommand").Replace(">", ">"), content);
}
class NoMigrationsMiddleware
@@ -104,18 +104,18 @@ namespace Microsoft.AspNet.Diagnostics.Entity.Tests
[Fact]
public async Task Error_page_displayed_pending_migrations()
{
- TestServer server = await SetupTestServer();
+ TestServer server = SetupTestServer();
HttpResponseMessage response = await server.CreateClient().GetAsync("http://localhost/");
Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode);
var content = await response.Content.ReadAsStringAsync();
- Assert.Contains(Strings.DatabaseErrorPage_PendingMigrationsTitle(typeof(BloggingContextWithMigrations).Name), content);
- Assert.Contains(Strings.DatabaseErrorPage_ApplyMigrationsCommand.Replace(">", ">"), content);
+ Assert.Contains(StringsHelpers.GetResourceString("FormatDatabaseErrorPage_PendingMigrationsTitle", typeof(BloggingContextWithMigrations).Name), content);
+ Assert.Contains(StringsHelpers.GetResourceString("FormatDatabaseErrorPage_ApplyMigrationsCommand").Replace(">", ">"), content);
Assert.Contains("111111111111111_MigrationOne", content);
Assert.Contains("222222222222222_MigrationTwo", content);
- Assert.DoesNotContain(Strings.DatabaseErrorPage_AddMigrationCommand.Replace(">", ">"), content);
+ Assert.DoesNotContain(StringsHelpers.GetResourceString("FormatDatabaseErrorPage_AddMigrationCommand").Replace(">", ">"), content);
}
class PendingMigrationsMiddleware
@@ -137,15 +137,15 @@ namespace Microsoft.AspNet.Diagnostics.Entity.Tests
[Fact]
public async Task Error_page_displayed_pending_model_changes()
{
- TestServer server = await SetupTestServer();
+ TestServer server = SetupTestServer();
HttpResponseMessage response = await server.CreateClient().GetAsync("http://localhost/");
Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode);
var content = await response.Content.ReadAsStringAsync();
- Assert.Contains(Strings.DatabaseErrorPage_PendingChangesTitle(typeof(BloggingContextWithPendingModelChanges).Name), content);
- Assert.Contains(Strings.DatabaseErrorPage_AddMigrationCommand.Replace(">", ">"), content);
- Assert.Contains(Strings.DatabaseErrorPage_ApplyMigrationsCommand.Replace(">", ">"), content);
+ Assert.Contains(StringsHelpers.GetResourceString("FormatDatabaseErrorPage_PendingChangesTitle", typeof(BloggingContextWithPendingModelChanges).Name), content);
+ Assert.Contains(StringsHelpers.GetResourceString("FormatDatabaseErrorPage_AddMigrationCommand").Replace(">", ">"), content);
+ Assert.Contains(StringsHelpers.GetResourceString("FormatDatabaseErrorPage_ApplyMigrationsCommand").Replace(">", ">"), content);
}
class PendingModelChangesMiddleware
@@ -170,7 +170,7 @@ namespace Microsoft.AspNet.Diagnostics.Entity.Tests
[Fact]
public async Task Error_page_then_apply_migrations()
{
- TestServer server = await SetupTestServer();
+ TestServer server = SetupTestServer();
var client = server.CreateClient();
var expectedMigrationsEndpoint = "/ApplyDatabaseMigrations";
@@ -223,7 +223,7 @@ namespace Microsoft.AspNet.Diagnostics.Entity.Tests
{
var migrationsEndpoint = "/MyCustomEndPoints/ApplyMyMigrationsHere";
- using (var database = await SqlServerTestStore.CreateScratchAsync(createDatabase: false))
+ using (var database = SqlServerTestStore.CreateScratch())
{
var server = TestServer.Create(app =>
{
@@ -231,7 +231,7 @@ namespace Microsoft.AspNet.Diagnostics.Entity.Tests
{
services.AddEntityFramework().AddSqlServer();
services.AddScoped();
- services.AddInstance(new DbContextOptions().UseSqlServer(database.Connection.ConnectionString));
+ services.AddInstance(new DbContextOptions().UseSqlServer(database.ConnectionString));
});
var options = DatabaseErrorPageOptions.ShowAll;
@@ -253,7 +253,7 @@ namespace Microsoft.AspNet.Diagnostics.Entity.Tests
[Fact]
public async Task Pass_thru_when_context_not_in_services()
{
- using (var database = await SqlServerTestStore.CreateScratchAsync(createDatabase: false))
+ using (var database = SqlServerTestStore.CreateScratch())
{
var logProvider = new TestLoggerProvider();
@@ -266,7 +266,7 @@ namespace Microsoft.AspNet.Diagnostics.Entity.Tests
services.AddInstance(
new DbContextOptions()
- .UseSqlServer(database.Connection.ConnectionString));
+ .UseSqlServer(database.ConnectionString));
});
app.UseDatabaseErrorPage();
@@ -280,7 +280,7 @@ namespace Microsoft.AspNet.Diagnostics.Entity.Tests
await server.CreateClient().GetAsync("http://localhost/"));
Assert.True(logProvider.Logger.Messages.Any(m =>
- m.StartsWith(Strings.DatabaseErrorPageMiddleware_ContextNotRegistered(typeof(BloggingContext)))));
+ m.StartsWith(StringsHelpers.GetResourceString("FormatDatabaseErrorPageMiddleware_ContextNotRegistered", typeof(BloggingContext)))));
}
}
@@ -304,17 +304,17 @@ namespace Microsoft.AspNet.Diagnostics.Entity.Tests
[Fact]
public async Task Pass_thru_when_exception_in_logic()
{
- using (var database = await SqlServerTestStore.CreateScratchAsync(createDatabase: false))
+ using (var database = SqlServerTestStore.CreateScratch())
{
var logProvider = new TestLoggerProvider();
- var server = await SetupTestServer(logProvider);
+ var server = SetupTestServer(logProvider);
var ex = await Assert.ThrowsAsync(async () =>
await server.CreateClient().GetAsync("http://localhost/"));
Assert.True(logProvider.Logger.Messages.Any(m =>
- m.StartsWith(Strings.DatabaseErrorPageMiddleware_Exception)));
+ m.StartsWith(StringsHelpers.GetResourceString("FormatDatabaseErrorPageMiddleware_Exception"))));
}
}
@@ -334,10 +334,10 @@ namespace Microsoft.AspNet.Diagnostics.Entity.Tests
}
}
- private static async Task SetupTestServer(ILoggerProvider logProvider = null)
+ private static TestServer SetupTestServer(ILoggerProvider logProvider = null)
where TContext : DbContext
{
- using (var database = await SqlServerTestStore.CreateScratchAsync(createDatabase: false))
+ using (var database = SqlServerTestStore.CreateScratch())
{
return TestServer.Create(app =>
{
@@ -349,7 +349,7 @@ namespace Microsoft.AspNet.Diagnostics.Entity.Tests
services.AddScoped();
services.AddInstance(
new DbContextOptions()
- .UseSqlServer(database.Connection.ConnectionString));
+ .UseSqlServer(database.ConnectionString));
});
app.UseDatabaseErrorPage();
diff --git a/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/MigrationsEndPointMiddlewareTest.cs b/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/MigrationsEndPointMiddlewareTest.cs
index 8c857030ef..9a60189923 100644
--- a/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/MigrationsEndPointMiddlewareTest.cs
+++ b/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/MigrationsEndPointMiddlewareTest.cs
@@ -13,9 +13,9 @@ using Microsoft.AspNet.TestHost;
using Microsoft.Data.Entity;
using Microsoft.Data.Entity.Migrations.Infrastructure;
using Microsoft.Data.Entity.Migrations.Utilities;
-using Microsoft.Data.Entity.SqlServer.FunctionalTests;
using Microsoft.Framework.DependencyInjection;
using Xunit;
+using Microsoft.AspNet.Diagnostics.Entity.Tests.Helpers;
namespace Microsoft.AspNet.Diagnostics.Entity.Tests
{
@@ -60,9 +60,9 @@ namespace Microsoft.AspNet.Diagnostics.Entity.Tests
private async Task Migration_request(bool useCustomPath)
{
- using (var database = await SqlServerTestStore.CreateScratchAsync(createDatabase: false))
+ using (var database = SqlServerTestStore.CreateScratch())
{
- var options = new DbContextOptions().UseSqlServer(database.Connection.ConnectionString);
+ var options = new DbContextOptions().UseSqlServer(database.ConnectionString);
var path = useCustomPath ? new PathString("/EndPoints/ApplyMyMigrations") : MigrationsEndPointOptions.DefaultPath;
TestServer server = TestServer.Create(app =>
@@ -122,7 +122,7 @@ namespace Microsoft.AspNet.Diagnostics.Entity.Tests
var content = await response.Content.ReadAsStringAsync();
Assert.Equal(HttpStatusCode.BadRequest, response.StatusCode);
- Assert.StartsWith(Strings.MigrationsEndPointMiddleware_NoContextType, content);
+ Assert.StartsWith(StringsHelpers.GetResourceString("FormatMigrationsEndPointMiddleware_NoContextType"), content);
Assert.True(content.Length > 512);
}
@@ -144,7 +144,7 @@ namespace Microsoft.AspNet.Diagnostics.Entity.Tests
var content = await response.Content.ReadAsStringAsync();
Assert.Equal(HttpStatusCode.BadRequest, response.StatusCode);
- Assert.StartsWith(Strings.MigrationsEndPointMiddleware_InvalidContextType(typeName), content);
+ Assert.StartsWith(StringsHelpers.GetResourceString("FormatMigrationsEndPointMiddleware_InvalidContextType", typeName), content);
Assert.True(content.Length > 512);
}
@@ -169,16 +169,16 @@ namespace Microsoft.AspNet.Diagnostics.Entity.Tests
var content = await response.Content.ReadAsStringAsync();
Assert.Equal(HttpStatusCode.BadRequest, response.StatusCode);
- Assert.StartsWith(Strings.MigrationsEndPointMiddleware_ContextNotRegistered(typeof(BloggingContext)), content);
+ Assert.StartsWith(StringsHelpers.GetResourceString("FormatMigrationsEndPointMiddleware_ContextNotRegistered", typeof(BloggingContext)), content);
Assert.True(content.Length > 512);
}
[Fact]
public async Task Exception_while_applying_migrations()
{
- using (var database = await SqlServerTestStore.CreateScratchAsync(createDatabase: false))
+ using (var database = SqlServerTestStore.CreateScratch())
{
- var options = new DbContextOptions().UseSqlServer(database.Connection.ConnectionString);
+ var options = new DbContextOptions().UseSqlServer(database.ConnectionString);
TestServer server = TestServer.Create(app =>
{
@@ -200,7 +200,7 @@ namespace Microsoft.AspNet.Diagnostics.Entity.Tests
var ex = await Assert.ThrowsAsync(async () =>
await server.CreateClient().PostAsync("http://localhost" + MigrationsEndPointOptions.DefaultPath, formData));
- Assert.Equal(Strings.MigrationsEndPointMiddleware_Exception(typeof(BloggingContextWithSnapshotThatThrows)), ex.Message);
+ Assert.Equal(StringsHelpers.GetResourceString("FormatMigrationsEndPointMiddleware_Exception", typeof(BloggingContextWithSnapshotThatThrows)), ex.Message);
Assert.Equal("Welcome to the invalid snapshot!", ex.InnerException.Message);
}
}
diff --git a/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/SqlServerTestStore.cs b/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/SqlServerTestStore.cs
new file mode 100644
index 0000000000..d4752ab46f
--- /dev/null
+++ b/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/SqlServerTestStore.cs
@@ -0,0 +1,54 @@
+// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Data.SqlClient;
+using System.Threading;
+using Microsoft.Data.Entity;
+
+namespace Microsoft.AspNet.Diagnostics.Entity.Tests
+{
+ public class SqlServerTestStore : IDisposable
+ {
+ private static int _scratchCount;
+
+ public static SqlServerTestStore CreateScratch()
+ {
+ var name = "Microsoft.AspNet.Diagnostics.Entity.FunctionalTests.Scratch_" + Interlocked.Increment(ref _scratchCount);
+ var db = new SqlServerTestStore(name);
+ db.EnsureDeleted();
+ return db;
+ }
+
+ private readonly string _connectionString;
+
+ private SqlServerTestStore(string name)
+ {
+ _connectionString = new SqlConnectionStringBuilder
+ {
+ DataSource = @"(localdb)\v11.0",
+ InitialCatalog = name,
+ IntegratedSecurity = true,
+ ConnectTimeout = 30
+ }.ConnectionString; ;
+ }
+
+ public string ConnectionString
+ {
+ get { return _connectionString; }
+ }
+
+ private void EnsureDeleted()
+ {
+ using (var db = new DbContext(new DbContextOptions().UseSqlServer(_connectionString)))
+ {
+ db.Database.EnsureDeleted();
+ }
+ }
+
+ public virtual void Dispose()
+ {
+ EnsureDeleted();
+ }
+ }
+}
\ No newline at end of file
diff --git a/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/TestModels/BloggingContext.cs b/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/TestModels/BloggingContext.cs
index 7d13248bac..a8ecc378aa 100644
--- a/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/TestModels/BloggingContext.cs
+++ b/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/TestModels/BloggingContext.cs
@@ -3,7 +3,6 @@
using Microsoft.Data.Entity;
using Microsoft.Data.Entity.Migrations.Infrastructure;
-using Microsoft.Data.Entity.SqlServer.FunctionalTests;
using System;
using System.Linq;
using System.Reflection;
diff --git a/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/project.json b/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/project.json
index 649018fad3..a064bdbca8 100644
--- a/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/project.json
+++ b/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/project.json
@@ -1,7 +1,6 @@
{
"dependencies": {
"EntityFramework.SqlServer": "7.0.0-*",
- "EntityFramework.SqlServer.FunctionalTests": "1.0.0",
"Microsoft.AspNet.Diagnostics.Entity": "7.0.0-*",
"Microsoft.AspNet.Diagnostics.Entity.Tests": "1.0.0",
"Microsoft.AspNet.TestHost": "1.0.0-*",
diff --git a/test/Microsoft.AspNet.Diagnostics.Entity.Tests/ApiConsistencyTestBase.cs b/test/Microsoft.AspNet.Diagnostics.Entity.Tests/ApiConsistencyTestBase.cs
new file mode 100644
index 0000000000..135add6c98
--- /dev/null
+++ b/test/Microsoft.AspNet.Diagnostics.Entity.Tests/ApiConsistencyTestBase.cs
@@ -0,0 +1,142 @@
+// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Threading;
+using System.Threading.Tasks;
+using Xunit;
+
+namespace Microsoft.Data.Entity
+{
+ public abstract class ApiConsistencyTestBase
+ {
+ protected const BindingFlags PublicInstance
+ = BindingFlags.Instance | BindingFlags.Public;
+
+ protected const BindingFlags AnyInstance
+ = BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic;
+
+ [Fact]
+ public void Public_inheritable_apis_should_be_virtual()
+ {
+ var nonVirtualMethods
+ = (from type in GetAllTypes(TargetAssembly.GetTypes())
+ where type.IsVisible
+ && !type.IsSealed
+ && type.GetConstructors(AnyInstance).Any(c => c.IsPublic || c.IsFamily || c.IsFamilyOrAssembly)
+ && type.Namespace != null
+ && !type.Namespace.EndsWith(".Compiled")
+ from method in type.GetMethods(PublicInstance)
+ where method.DeclaringType == type
+ && !(method.IsVirtual && !method.IsFinal)
+ select type.FullName + "." + method.Name)
+ .ToList();
+
+ Assert.False(
+ nonVirtualMethods.Any(),
+ "\r\n-- Missing virtual APIs --\r\n" + string.Join("\r\n", nonVirtualMethods));
+ }
+
+ [Fact]
+ public void Public_api_arguments_should_have_not_null_annotation()
+ {
+ var parametersMissingAttribute
+ = (from type in GetAllTypes(TargetAssembly.GetTypes())
+ where type.IsVisible && !typeof(Delegate).IsAssignableFrom(type)
+ let interfaceMappings = type.GetInterfaces().Select(type.GetInterfaceMap)
+ let events = type.GetEvents()
+ from method in type.GetMethods(PublicInstance | BindingFlags.Static)
+ .Concat(type.GetConstructors())
+ where method.DeclaringType == type
+ where type.IsInterface || !interfaceMappings.Any(im => im.TargetMethods.Contains(method))
+ where !events.Any(e => e.AddMethod == method || e.RemoveMethod == method)
+ from parameter in method.GetParameters()
+ where !parameter.ParameterType.IsValueType
+ && !parameter.GetCustomAttributes()
+ .Any(
+ a => a.GetType().Name == "NotNullAttribute"
+ || a.GetType().Name == "CanBeNullAttribute")
+ select type.FullName + "." + method.Name + "[" + parameter.Name + "]")
+ .ToList();
+
+ Assert.False(
+ parametersMissingAttribute.Any(),
+ "\r\n-- Missing NotNull annotations --\r\n" + string.Join("\r\n", parametersMissingAttribute));
+ }
+
+ [Fact]
+ public void Async_methods_should_have_overload_with_cancellation_token_and_end_with_async_suffix()
+ {
+ var asyncMethods
+ = (from type in GetAllTypes(TargetAssembly.GetTypes())
+ where type.IsVisible
+ from method in type.GetMethods(PublicInstance | BindingFlags.Static)
+ where method.DeclaringType == type
+ where typeof(Task).IsAssignableFrom(method.ReturnType)
+ select method).ToList();
+
+ var asyncMethodsWithToken
+ = (from method in asyncMethods
+ where method.GetParameters().Any(pi => pi.ParameterType == typeof(CancellationToken))
+ select method).ToList();
+
+ var asyncMethodsWithoutToken
+ = (from method in asyncMethods
+ where method.GetParameters().All(pi => pi.ParameterType != typeof(CancellationToken))
+ select method).ToList();
+
+ var missingOverloads
+ = (from methodWithoutToken in asyncMethodsWithoutToken
+ where !asyncMethodsWithToken
+ .Any(methodWithToken => methodWithoutToken.Name == methodWithToken.Name
+ && methodWithoutToken.ReflectedType == methodWithToken.ReflectedType)
+ // ReSharper disable once PossibleNullReferenceException
+ select methodWithoutToken.DeclaringType.Name + "." + methodWithoutToken.Name)
+ .Except(GetCancellationTokenExceptions())
+ .ToList();
+
+ Assert.False(
+ missingOverloads.Any(),
+ "\r\n-- Missing async overloads --\r\n" + string.Join("\r\n", missingOverloads));
+
+ var missingSuffixMethods
+ = asyncMethods
+ .Where(method => !method.Name.EndsWith("Async"))
+ .Select(method => method.DeclaringType.Name + "." + method.Name)
+ .Except(GetAsyncSuffixExceptions())
+ .ToList();
+
+ Assert.False(
+ missingSuffixMethods.Any(),
+ "\r\n-- Missing async suffix --\r\n" + string.Join("\r\n", missingSuffixMethods));
+ }
+
+ protected virtual IEnumerable GetCancellationTokenExceptions()
+ {
+ return Enumerable.Empty();
+ }
+
+ protected virtual IEnumerable GetAsyncSuffixExceptions()
+ {
+ return Enumerable.Empty();
+ }
+
+ protected abstract Assembly TargetAssembly { get; }
+
+ protected virtual IEnumerable GetAllTypes(IEnumerable types)
+ {
+ foreach (var type in types)
+ {
+ yield return type;
+
+ foreach (var nestedType in GetAllTypes(type.GetNestedTypes()))
+ {
+ yield return nestedType;
+ }
+ }
+ }
+ }
+}
diff --git a/test/Microsoft.AspNet.Diagnostics.Entity.Tests/Helpers/AssertHelpers.cs b/test/Microsoft.AspNet.Diagnostics.Entity.Tests/Helpers/AssertHelpers.cs
index bc230c5419..0a5feae8f0 100644
--- a/test/Microsoft.AspNet.Diagnostics.Entity.Tests/Helpers/AssertHelpers.cs
+++ b/test/Microsoft.AspNet.Diagnostics.Entity.Tests/Helpers/AssertHelpers.cs
@@ -10,32 +10,32 @@ namespace Microsoft.AspNet.Diagnostics.Entity.Tests.Helpers
{
public static void DisplaysScaffoldFirstMigration(Type contextType, string content)
{
- Assert.Contains(Strings.DatabaseErrorPage_NoDbOrMigrationsTitle(contextType.Name), content);
+ Assert.Contains(StringsHelpers.GetResourceString("FormatDatabaseErrorPage_NoDbOrMigrationsTitle", contextType.Name), content);
}
public static void NotDisplaysScaffoldFirstMigration(Type contextType, string content)
{
- Assert.DoesNotContain(Strings.DatabaseErrorPage_NoDbOrMigrationsTitle(contextType.Name), content);
+ Assert.DoesNotContain(StringsHelpers.GetResourceString("FormatDatabaseErrorPage_NoDbOrMigrationsTitle", contextType.Name), content);
}
public static void DisplaysApplyMigrations(Type contextType, string content)
{
- Assert.Contains(Strings.DatabaseErrorPage_PendingMigrationsTitle(contextType.Name), content);
+ Assert.Contains(StringsHelpers.GetResourceString("FormatDatabaseErrorPage_PendingMigrationsTitle", contextType.Name), content);
}
public static void NotDisplaysApplyMigrations(Type contextType, string content)
{
- Assert.DoesNotContain(Strings.DatabaseErrorPage_PendingMigrationsTitle(contextType.Name), content);
+ Assert.DoesNotContain(StringsHelpers.GetResourceString("FormatDatabaseErrorPage_PendingMigrationsTitle", contextType.Name), content);
}
public static void DisplaysScaffoldNextMigraion(Type contextType, string content)
{
- Assert.Contains(Strings.DatabaseErrorPage_PendingChangesTitle(contextType.Name), content);
+ Assert.Contains(StringsHelpers.GetResourceString("FormatDatabaseErrorPage_PendingChangesTitle", contextType.Name), content);
}
public static void NotDisplaysScaffoldNextMigraion(Type contextType, string content)
{
- Assert.DoesNotContain(Strings.DatabaseErrorPage_PendingChangesTitle(contextType.Name), content);
+ Assert.DoesNotContain(StringsHelpers.GetResourceString("FormatDatabaseErrorPage_PendingChangesTitle", contextType.Name), content);
}
}
}
\ No newline at end of file
diff --git a/test/Microsoft.AspNet.Diagnostics.Entity.Tests/Helpers/StringHelpers.cs b/test/Microsoft.AspNet.Diagnostics.Entity.Tests/Helpers/StringHelpers.cs
new file mode 100644
index 0000000000..9838f3b156
--- /dev/null
+++ b/test/Microsoft.AspNet.Diagnostics.Entity.Tests/Helpers/StringHelpers.cs
@@ -0,0 +1,19 @@
+// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Linq;
+using System.Reflection;
+
+namespace Microsoft.AspNet.Diagnostics.Entity.Tests.Helpers
+{
+ public class StringsHelpers
+ {
+ public static string GetResourceString(string stringName, params object[] parameters)
+ {
+ var strings = typeof(DatabaseErrorPageMiddleware).GetTypeInfo().Assembly.GetType("Microsoft.AspNet.Diagnostics.Entity.Strings").GetTypeInfo();
+ var method = strings.GetDeclaredMethods(stringName).Single();
+ return (string)method.Invoke(null, parameters);
+ }
+ }
+}
\ No newline at end of file