Added End to End test for Nested enum in complex type

Author: Amberg

CodeFirstStoreFunctionsTests/E2ETests.cs

@@ -30,6 +30,7 @@ public class Airport_ResultType
         public string CountryCode { get; set; }
         public string Name { get; set; }
         public byte TerminalCount { get; set; }
+        public AirportType ResultType { get; set; }
     }
 
     public class Vehicle
@@ -321,7 +322,8 @@ protected override void Seed(MyContext context)
                 "   [CityCode], " +
                 "   [CountryCode], " +
                 "   [Name], " +
-                "   [TerminalCount] " +
+                "   [TerminalCount], " +
+                "   [Type] AS [ResultType] " +
                 "FROM [dbo].[Airports] " +
                 "WHERE [CountryCode] = @CountryCode");
 
@@ -369,7 +371,8 @@ protected override void Seed(MyContext context)
                 "   [CityCode], " +
                 "   [CountryCode], " +
                 "   [Name], " +
-                "   [TerminalCount] " +
+                "   [TerminalCount], " +
+                "   [Type] AS [ResultType] " +
                 "FROM [dbo].[Airports] " +
                 "WHERE [CountryCode] = @CountryCode");
 
@@ -410,7 +413,8 @@ protected override void Seed(MyContext context)
                 "   [CityCode], " +
                 "   [CountryCode], " +
                 "   [Name], " +
-                "   [TerminalCount] " +
+                "   [TerminalCount], " +
+                "   [Type] AS [ResultType] " +
                 "FROM [dbo].[Airports] " +
                 "SELECT [IATACode], " +
                 "   [CityCode], " +
@@ -493,7 +497,8 @@ public void Can_invoke_TVF_returning_complex_type_in_a_query()
     [Extent1].[CityCode] AS [CityCode], 
     [Extent1].[CountryCode] AS [CountryCode], 
     [Extent1].[Name] AS [Name], 
-    [Extent1].[TerminalCount] AS [TerminalCount]
+    [Extent1].[TerminalCount] AS [TerminalCount], 
+    [Extent1].[ResultType] AS [ResultType]
     FROM [dbo].[GetAirports_ComplexType](@CountryCode) AS [Extent1]
     WHERE  CAST( [Extent1].[TerminalCount] AS int) > 0";
 

CodeFirstStoreFunctionsTests/StoreFunctionBuilderTests.cs

@@ -55,7 +55,7 @@ public void Crate_creates_store_function_for_complex_type_function_import()
             var model = new DbModelBuilder()
                     .Build(new DbProviderInfo("System.Data.SqlClient", "2012"));
 
-            var enumType = EnumType.Create("TestEnum", "TestNs",PrimitiveType.GetEdmPrimitiveType(PrimitiveTypeKind.Int32), false, new EnumMember[]{EnumMember.Create("foo", 1, null)}, null);
+            var enumType = EnumType.Create("TestEnum", "TestNs", PrimitiveType.GetEdmPrimitiveType(PrimitiveTypeKind.Int32), false, new [] { EnumMember.Create("foo", 1, null) }, null);
 
             var complexType = ComplexType.Create("CT", "ns", DataSpace.CSpace,
                 new[]
@@ -73,7 +73,7 @@ public void Crate_creates_store_function_for_complex_type_function_import()
                     "f",
                     new[]
                     {new ParameterDescriptor("p1", PrimitiveType.GetEdmPrimitiveType(PrimitiveTypeKind.String), null, false)},
-                    new EdmType[] {complexType},
+                    new EdmType[] { complexType },
                     "ResultCol",
                     "dbo",
                     StoreFunctionKind.StoredProcedure,
@@ -133,7 +133,6 @@ public void Crate_creates_store_function_for_complex_type_withEnum_in_TableValue
             Assert.True(storeFunction.IsComposableAttribute);
         }
 
-
         [Fact]
         public void Crate_creates_store_function_for_enum_type_function_import()
         {
@@ -211,7 +210,7 @@ public void StoreFunctionBuilder_uses_default_namespace_if_no_entities()
                     "f",
                     new[]
                     {new ParameterDescriptor("p1", PrimitiveType.GetEdmPrimitiveType(PrimitiveTypeKind.String), null, false)},
-                    new EdmType[] {PrimitiveType.GetEdmPrimitiveType(PrimitiveTypeKind.Int64)},
+                    new EdmType[] { PrimitiveType.GetEdmPrimitiveType(PrimitiveTypeKind.Int64) },
                     "ResultCol", "dbo", StoreFunctionKind.TableValuedFunction, isBuiltIn: null);
 
             var storeFunction = new StoreFunctionBuilder(model, "docs").Create(functionDescriptor);
@@ -255,7 +254,7 @@ public void Exception_thrown_if_provided_store_type_invalid()
                         new ParameterDescriptor(
                             "p1", PrimitiveType.GetEdmPrimitiveType(PrimitiveTypeKind.String), "json", true),
                     },
-                    new EdmType[] {PrimitiveType.GetEdmPrimitiveType(PrimitiveTypeKind.Int64)},
+                    new EdmType[] { PrimitiveType.GetEdmPrimitiveType(PrimitiveTypeKind.Int64) },
                     "ResultCol", "dbo", StoreFunctionKind.StoredProcedure, isBuiltIn: null);
 
             Assert.Contains("'json'",