@@ -10,7 +10,7 @@ namespace CodeFirstStoreFunctions
1010 using System . Linq ;
1111 using Xunit ;
1212
13- public enum AirportType { International }
13+ public enum AirportType { Regional , International }
1414
1515 public class Airport
1616 {
@@ -30,7 +30,7 @@ public class Airport_ResultType
3030 public string CountryCode { get ; set ; }
3131 public string Name { get ; set ; }
3232 public byte TerminalCount { get ; set ; }
33- public AirportType ResultType { get ; set ; }
33+ public AirportType Type { get ; set ; }
3434 }
3535
3636 public class Vehicle
@@ -291,6 +291,17 @@ protected override void Seed(MyContext context)
291291 Type = AirportType . International
292292 } ) ;
293293
294+ context . Airports . Add (
295+ new Airport
296+ {
297+ IATACode = "OLM" ,
298+ CityCode = "OLM" ,
299+ CountryCode = "US" ,
300+ Name = "Olympia Regional Airport" ,
301+ TerminalCount = 1 ,
302+ Type = AirportType . Regional
303+ } ) ;
304+
294305 context . Vehicles . Add ( new Aircraft
295306 {
296307 Code = "AT7" ,
@@ -323,7 +334,7 @@ protected override void Seed(MyContext context)
323334 " [CountryCode], " +
324335 " [Name], " +
325336 " [TerminalCount], " +
326- " [Type] AS [ResultType] " +
337+ " [Type] " +
327338 "FROM [dbo].[Airports] " +
328339 "WHERE [CountryCode] = @CountryCode" ) ;
329340
@@ -372,7 +383,7 @@ protected override void Seed(MyContext context)
372383 " [CountryCode], " +
373384 " [Name], " +
374385 " [TerminalCount], " +
375- " [Type] AS [ResultType] " +
386+ " [Type] " +
376387 "FROM [dbo].[Airports] " +
377388 "WHERE [CountryCode] = @CountryCode" ) ;
378389
@@ -414,7 +425,7 @@ protected override void Seed(MyContext context)
414425 " [CountryCode], " +
415426 " [Name], " +
416427 " [TerminalCount], " +
417- " [Type] AS [ResultType] " +
428+ " [Type] " +
418429 "FROM [dbo].[Airports] " +
419430 "SELECT [IATACode], " +
420431 " [CityCode], " +
@@ -498,7 +509,7 @@ public void Can_invoke_TVF_returning_complex_type_in_a_query()
498509 [Extent1].[CountryCode] AS [CountryCode],
499510 [Extent1].[Name] AS [Name],
500511 [Extent1].[TerminalCount] AS [TerminalCount],
501- [Extent1].[ResultType ] AS [ResultType ]
512+ [Extent1].[Type ] AS [Type ]
502513 FROM [dbo].[GetAirports_ComplexType](@CountryCode) AS [Extent1]
503514 WHERE CAST( [Extent1].[TerminalCount] AS int) > 0" ;
504515
@@ -512,6 +523,7 @@ FROM [dbo].[GetAirports_ComplexType](@CountryCode) AS [Extent1]
512523 Assert . Equal ( "PL" , result [ 0 ] . CountryCode ) ;
513524 Assert . Equal ( 2 , result [ 0 ] . TerminalCount ) ;
514525 Assert . Equal ( "Wroclaw Copernicus Airport" , result [ 0 ] . Name ) ;
526+ Assert . Equal ( AirportType . International , result [ 0 ] . Type ) ;
515527 }
516528 }
517529
@@ -665,10 +677,10 @@ public void Can_invoke_stored_proc_with_multiple_resultsets()
665677 using ( var ctx = new MyContext ( ) )
666678 {
667679 var results = ctx . MultipleResultSets ( ) ;
668- Assert . Equal ( 4 , results . ToList ( ) . Count ) ;
680+ Assert . Equal ( 5 , results . ToList ( ) . Count ) ;
669681
670682 var secondResultSet = results . GetNextResult < Airport > ( ) ;
671- Assert . Equal ( 4 , secondResultSet . ToList ( ) . Count ) ;
683+ Assert . Equal ( 5 , secondResultSet . ToList ( ) . Count ) ;
672684
673685 var thirdResultSet = secondResultSet . GetNextResult < Aircraft > ( ) ;
674686 Assert . Equal ( new [ ] { "AT7" } , thirdResultSet . ToList ( ) . Select ( r => r . Code ) ) ;
@@ -750,7 +762,7 @@ FROM [dbo].[Airports] AS [Extent1]
750762 {
751763 var q = ctx . Airports . Where ( a => a . TerminalCount == MyContext . Square ( a . TerminalCount ) ) ;
752764 Assert . Equal ( expectedSql , q . ToString ( ) ) ;
753- Assert . Equal ( 2 , q . Count ( ) ) ;
765+ Assert . Equal ( 3 , q . Count ( ) ) ;
754766 }
755767 }
756768
0 commit comments