From de0e573519cf55c21f051d29f1a6e235023a6afc Mon Sep 17 00:00:00 2001
From: Congyong Su <cysu@microsoft.com>
Date: Wed, 9 Dec 2015 23:49:08 +0800
Subject: [PATCH] E2E cases also use MsSqlLocalDb in VS2015

---
 .../AstoriaDefaultServiceDBModel.Context.cs   |  6 +++---
 ...crosoft.Test.OData.Services.Astoria.csproj |  1 +
 .../Astoria/PublicProvider/DatabaseHelper.cs  | 20 +++++++++++++++++--
 .../Tests/Client/Build.Desktop/App.config     |  2 +-
 4 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/test/EndToEndTests/Services/Astoria/AstoriaDefaultServiceDBModel.Context.cs b/test/EndToEndTests/Services/Astoria/AstoriaDefaultServiceDBModel.Context.cs
index 36ace66989..4bc60a0e26 100644
--- a/test/EndToEndTests/Services/Astoria/AstoriaDefaultServiceDBModel.Context.cs
+++ b/test/EndToEndTests/Services/Astoria/AstoriaDefaultServiceDBModel.Context.cs
@@ -9,14 +9,14 @@
 
 namespace Microsoft.Test.OData.Services.Astoria
 {
-    using System;
     using System.Data.Entity;
     using System.Data.Entity.Infrastructure;
-    
+    using Microsoft.Test.OData.Services.PublicProvider;
+
     public partial class AstoriaDefaultServiceDBEntities : DbContext
     {
         public AstoriaDefaultServiceDBEntities()
-            : base("name=AstoriaDefaultServiceDBEntities")
+            : base(DatabaseHelper.ConnectionString)
         {
         }
     
diff --git a/test/EndToEndTests/Services/Astoria/Microsoft.Test.OData.Services.Astoria.csproj b/test/EndToEndTests/Services/Astoria/Microsoft.Test.OData.Services.Astoria.csproj
index af0ee2fb7e..fed6c8f186 100644
--- a/test/EndToEndTests/Services/Astoria/Microsoft.Test.OData.Services.Astoria.csproj
+++ b/test/EndToEndTests/Services/Astoria/Microsoft.Test.OData.Services.Astoria.csproj
@@ -9,6 +9,7 @@
     <RootNamespace>Microsoft.Test.OData.Services.Astoria</RootNamespace>
     <AssemblyName>Microsoft.Test.OData.Services.Astoria</AssemblyName>
     <DefineConstants>$(DefineConstants);TEST_ODATA_SERVICES_ASTORIA</DefineConstants>
+    <DefineConstants Condition="'$(VisualStudioVersion)' == '14.0'">$(DefineConstants);VS2015</DefineConstants>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <UseIISExpress>true</UseIISExpress>
     <AssemblyAttributeClsCompliant>false</AssemblyAttributeClsCompliant>
diff --git a/test/EndToEndTests/Services/Astoria/PublicProvider/DatabaseHelper.cs b/test/EndToEndTests/Services/Astoria/PublicProvider/DatabaseHelper.cs
index f4a681f658..360010dcb6 100644
--- a/test/EndToEndTests/Services/Astoria/PublicProvider/DatabaseHelper.cs
+++ b/test/EndToEndTests/Services/Astoria/PublicProvider/DatabaseHelper.cs
@@ -27,8 +27,7 @@ public static void EnsureDatabaseCreated()
             const string databaseName = "AstoriaDefaultServiceDB";
             const string resourceName = "Microsoft.Test.OData.Services.Astoria.PublicProvider.AstoriaDefaultServiceDB.bak";
             Log.Trace(string.Format("Ensure database {0} exists", databaseName));
-            string connstr = ConfigurationManager.ConnectionStrings["AstoriaDefaultServiceDBEntities"].ConnectionString;
-            var entityConnBuilder = new EntityConnectionStringBuilder(connstr);
+            var entityConnBuilder = new EntityConnectionStringBuilder(ConnectionString);
             var sqlConnBuilder = new SqlConnectionStringBuilder(entityConnBuilder.ProviderConnectionString)
                 {
                     InitialCatalog = "master"
@@ -86,5 +85,22 @@ public static void EnsureDatabaseCreated()
                 }
             }
         }
+
+        internal static string ConnectionString
+        {
+            get { return connectionString; }
+        }
+
+        private static string connectionString = GetConnectionString();
+
+        private static string GetConnectionString()
+        {
+            var connStr = ConfigurationManager.ConnectionStrings["AstoriaDefaultServiceDBEntities"].ConnectionString;
+#if VS2015
+            connStr = connStr.Replace(@".\SQLExpress", @"(LocalDB)\MSSQLLocalDB");
+#endif
+            return connStr;
+        }
+
     }
 }
\ No newline at end of file
diff --git a/test/EndToEndTests/Tests/Client/Build.Desktop/App.config b/test/EndToEndTests/Tests/Client/Build.Desktop/App.config
index f90b1de528..5ee1624926 100644
--- a/test/EndToEndTests/Tests/Client/Build.Desktop/App.config
+++ b/test/EndToEndTests/Tests/Client/Build.Desktop/App.config
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <configuration>
   <connectionStrings>
-    <add name="AstoriaDefaultServiceDBEntities" connectionString="metadata=res://*/AstoriaDefaultServiceDBModel.csdl|res://*/AstoriaDefaultServiceDBModel.ssdl|res://*/AstoriaDefaultServiceDBModel.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=.\SQLExpress;initial catalog=AstoriaDefaultServiceDB;integrated security=True;multipleactiveresultsets=True;App=EntityFramework&quot;" providerName="System.Data.EntityClient"/>
+    <add name="AstoriaDefaultServiceDBEntities" connectionString="metadata=res://*/AstoriaDefaultServiceDBModel.csdl|res://*/AstoriaDefaultServiceDBModel.ssdl|res://*/AstoriaDefaultServiceDBModel.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=(LocalDB)\MSSQLLocalDB;initial catalog=AstoriaDefaultServiceDB;integrated security=True;multipleactiveresultsets=True;App=EntityFramework&quot;" providerName="System.Data.EntityClient"/>
   </connectionStrings>
   <startup>
     <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/>