Modified tests to account for new code generation.

#30
2014-05-08 14:55:32 -07:00 · 2014-05-08 14:55:32 -07:00 · 570760ddc7
parent 9b267dadbd
commit 570760ddc7
17 changed files with 71 additions and 71 deletions
--- a/test/Microsoft.AspNet.Razor.Test/Generator/CSharpRazorCodeGeneratorTest.cs
+++ b/test/Microsoft.AspNet.Razor.Test/Generator/CSharpRazorCodeGeneratorTest.cs
@ -101,20 +101,20 @@ namespace Microsoft.AspNet.Razor.Test.Generator
                    expectedDesignTimePragmas: new List<LineMapping>()
                    {
                        BuildLineMapping(12, 0, 12, 173, 9, 0, 76),
-                        BuildLineMapping(192, 9, 39, 637, 30, 15, 11),
-                        BuildLineMapping(247, 10, 38, 750, 35, 14, 11),
-                        BuildLineMapping(304, 11, 39, 832, 40, 12, 14),
-                        BuildLineMapping(371, 12, 46, 919, 46, 13, 1),
-                        BuildLineMapping(376, 12, 51, 1027, 52, 18, 11),
-                        BuildLineMapping(391, 12, 66, 1115, 57, 18, 1),
-                        BuildLineMapping(448, 13, 49, 1224, 63, 19, 5),
-                        BuildLineMapping(578, 18, 42, 1332, 68, 15, 15),
-                        BuildLineMapping(640, 19, 41, 1452, 73, 17, 22),
-                        BuildLineMapping(711, 20, 42, 1545, 78, 12, 39),
-                        BuildLineMapping(806, 21, 49, 1657, 84, 13, 1),
-                        BuildLineMapping(811, 21, 54, 1765, 90, 18, 27),
-                        BuildLineMapping(842, 21, 85, 1873, 95, 22, 1),
-                        BuildLineMapping(902, 22, 52, 1982, 101, 19, 19)
+                        BuildLineMapping(192, 9, 39, 608, 30, 15, 11),
+                        BuildLineMapping(247, 10, 38, 692, 35, 14, 11),
+                        BuildLineMapping(304, 11, 39, 774, 40, 12, 14),
+                        BuildLineMapping(371, 12, 46, 861, 46, 13, 1),
+                        BuildLineMapping(376, 12, 51, 940, 52, 18, 11),
+                        BuildLineMapping(391, 12, 66, 1028, 57, 18, 1),
+                        BuildLineMapping(448, 13, 49, 1108, 63, 19, 5),
+                        BuildLineMapping(578, 18, 42, 1187, 68, 15, 15),
+                        BuildLineMapping(640, 19, 41, 1278, 73, 17, 22),
+                        BuildLineMapping(711, 20, 42, 1371, 78, 12, 39),
+                        BuildLineMapping(806, 21, 49, 1483, 84, 13, 1),
+                        BuildLineMapping(811, 21, 54, 1562, 90, 18, 27),
+                        BuildLineMapping(842, 21, 85, 1670, 95, 22, 1),
+                        BuildLineMapping(902, 22, 52, 1750, 101, 19, 19)
                    });
        }

@ -142,9 +142,9 @@ namespace Microsoft.AspNet.Razor.Test.Generator
                    BuildLineMapping(122, 4, 39, 598, 28, 38, 22),
                    BuildLineMapping(173, 5, 49, 735, 35, 48, 58),
                    BuildLineMapping(238, 11, 861, 44, 2, 24),
-                    BuildLineMapping(310, 12, 1019, 50, 45, 3),
-                    BuildLineMapping(323, 14, 2, 1116, 55, 6, 1),
-                    BuildLineMapping(328, 14, 1159, 57, 7, 1),
+                    BuildLineMapping(310, 12, 998, 50, 45, 3),
+                    BuildLineMapping(323, 14, 2, 1074, 55, 6, 1),
+                    BuildLineMapping(328, 14, 1117, 57, 7, 1)

            });
        }
@ -169,8 +169,8 @@ namespace Microsoft.AspNet.Razor.Test.Generator
                BuildLineMapping(1, 0, 1, 51, 3, 0, 15),
                BuildLineMapping(19, 1, 1, 132, 9, 0, 32),
                BuildLineMapping(54, 2, 1, 230, 15, 0, 12),
-                BuildLineMapping(99, 4, 762, 38, 29, 21),
-                BuildLineMapping(161, 5, 906, 43, 35, 20),
+                BuildLineMapping(99, 4, 734, 38, 29, 21),
+                BuildLineMapping(161, 5, 850, 43, 35, 20)
            });
        }

@ -185,7 +185,7 @@ namespace Microsoft.AspNet.Razor.Test.Generator
            {
                BuildLineMapping(12, 0, 12, 191, 9, 0, 4),
                BuildLineMapping(33, 4, 12, 259, 15, 0, 104),
-                BuildLineMapping(167, 11, 770, 36, 25, 11)
+                BuildLineMapping(167, 11, 750, 36, 25, 11)
            });
        }

@ -200,7 +200,7 @@ namespace Microsoft.AspNet.Razor.Test.Generator
            {
                BuildLineMapping(12, 0, 12, 191, 9, 0, 4),
                BuildLineMapping(33, 4, 12, 259, 15, 0, 104),
-                BuildLineMapping(167, 11, 25, 758, 36, 13, 11)
+                BuildLineMapping(167, 11, 25, 738, 36, 13, 11)
            });
        }

@ -248,7 +248,7 @@ namespace Microsoft.AspNet.Razor.Test.Generator
            RunTest("Inherits", baselineName: "Inherits.Designtime", designTimeMode: true, tabTest: TabTest.NoTabs, expectedDesignTimePragmas: new List<LineMapping>()
            {
                BuildLineMapping(20, 2, 321, 12, 10, 25),
-                BuildLineMapping(1, 0, 1, 651, 26, 6, 5)
+                BuildLineMapping(1, 0, 1, 624, 26, 6, 5)
            });
        }

@ -258,8 +258,8 @@ namespace Microsoft.AspNet.Razor.Test.Generator
            RunTest("UnfinishedExpressionInCode", tabTest: TabTest.NoTabs, designTimeMode: true, expectedDesignTimePragmas: new List<LineMapping>()
            {
                BuildLineMapping(2, 0, 526, 21, 2, 2),
-                BuildLineMapping(5, 1, 1, 621, 27, 6, 9),
-                BuildLineMapping(14, 1, 719, 32, 10, 2)
+                BuildLineMapping(5, 1, 1, 612, 27, 6, 9),
+                BuildLineMapping(14, 1, 710, 32, 10, 2)
            });
        }

@ -272,8 +272,8 @@ namespace Microsoft.AspNet.Razor.Test.Generator
                    designTimeMode: true, expectedDesignTimePragmas: new List<LineMapping>()
            {
                BuildLineMapping(2, 0, 526, 21, 2, 2),
-                BuildLineMapping(5, 1, 1, 621, 27, 6, 9),
-                BuildLineMapping(14, 1, 10, 713, 32, 4, 2)
+                BuildLineMapping(5, 1, 1, 612, 27, 6, 9),
+                BuildLineMapping(14, 1, 10, 704, 32, 4, 2)
            });
        }

@ -290,13 +290,13 @@ namespace Microsoft.AspNet.Razor.Test.Generator
                BuildLineMapping(265, 18, 461, 24, 18, 9),
                BuildLineMapping(274, 20, 556, 33, 0, 1),
                BuildLineMapping(20, 1, 13, 926, 51, 12, 36),
-                BuildLineMapping(74, 2, 1073, 58, 22, 1),
-                BuildLineMapping(79, 2, 1164, 63, 27, 15),
-                BuildLineMapping(113, 7, 2, 1274, 70, 6, 12),
-                BuildLineMapping(129, 8, 1, 1380, 75, 6, 4),
-                BuildLineMapping(142, 8, 1505, 77, 14, 3),
-                BuildLineMapping(153, 8, 1602, 84, 25, 1),
-                BuildLineMapping(204, 13, 5, 1811, 94, 6, 3)
+                BuildLineMapping(74, 2, 1048, 58, 22, 1),
+                BuildLineMapping(79, 2, 1139, 63, 27, 15),
+                BuildLineMapping(113, 7, 2, 1224, 70, 6, 12),
+                BuildLineMapping(129, 8, 1, 1305, 75, 6, 4),
+                BuildLineMapping(142, 8, 1405, 77, 14, 3),
+                BuildLineMapping(153, 8, 1502, 84, 25, 1),
+                BuildLineMapping(204, 13, 5, 1687, 94, 6, 3)
            });
        }

@ -306,7 +306,7 @@ namespace Microsoft.AspNet.Razor.Test.Generator
        {
            RunTest("ImplicitExpressionAtEOF", designTimeMode: true, expectedDesignTimePragmas: new List<LineMapping>()
            {
-                BuildLineMapping(19, 2, 1, 533, 21, 6, 0)
+                BuildLineMapping(19, 2, 1, 521, 21, 6, 0)
            });
        }

@ -315,7 +315,7 @@ namespace Microsoft.AspNet.Razor.Test.Generator
        {
            RunTest("ExplicitExpressionAtEOF", designTimeMode: true, expectedDesignTimePragmas: new List<LineMapping>()
            {
-                BuildLineMapping(20, 2, 2, 533, 21, 6, 0)
+                BuildLineMapping(20, 2, 2, 521, 21, 6, 0)
            });
        }

@ -333,7 +333,7 @@ namespace Microsoft.AspNet.Razor.Test.Generator
        {
            RunTest("EmptyImplicitExpression", designTimeMode: true, expectedDesignTimePragmas: new List<LineMapping>()
            {
-                BuildLineMapping(19, 2, 1, 533, 21, 6, 0)
+                BuildLineMapping(19, 2, 1, 521, 21, 6, 0)
            });
        }

@ -343,8 +343,8 @@ namespace Microsoft.AspNet.Razor.Test.Generator
            RunTest("EmptyImplicitExpressionInCode", tabTest: TabTest.NoTabs, designTimeMode: true, expectedDesignTimePragmas: new List<LineMapping>()
            {
                BuildLineMapping(2, 0, 535, 21, 2, 6),
-                BuildLineMapping(9, 1, 5, 636, 28, 6, 0),
-                BuildLineMapping(9, 1, 723, 33, 5, 2)
+                BuildLineMapping(9, 1, 5, 630, 28, 6, 0),
+                BuildLineMapping(9, 1, 717, 33, 5, 2)
            });
        }

@ -357,8 +357,8 @@ namespace Microsoft.AspNet.Razor.Test.Generator
                    designTimeMode: true, expectedDesignTimePragmas: new List<LineMapping>()
            {
                BuildLineMapping(2, 0, 535, 21, 2, 6),
-                BuildLineMapping(9, 1, 5, 636, 28, 6, 0),
-                BuildLineMapping(9, 1, 5, 720, 33, 2, 2)
+                BuildLineMapping(9, 1, 5, 630, 28, 6, 0),
+                BuildLineMapping(9, 1, 5, 714, 33, 2, 2)
            });
        }

@ -367,7 +367,7 @@ namespace Microsoft.AspNet.Razor.Test.Generator
        {
            RunTest("EmptyExplicitExpression", designTimeMode: true, expectedDesignTimePragmas: new List<LineMapping>()
            {
-                BuildLineMapping(20, 2, 2, 533, 21, 6, 0)
+                BuildLineMapping(20, 2, 2, 521, 21, 6, 0)
            });
        }

--- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/Await.DesignTime.cs
+++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/Await.DesignTime.cs
@ -30,12 +30,12 @@ namespace TestOutput

        public override async Task ExecuteAsync()
        {
-#line 1 "------------------------------------------"
+#line 10 "Await.cshtml"
 								 __o = await Foo();

 #line default
 #line hidden
-#line 1 "------------------------------------------"
+#line 11 "Await.cshtml"
 								__o = await Foo();

 #line default
@ -52,7 +52,7 @@ namespace TestOutput
 #line default
 #line hidden

-#line 1 "------------------------------------------"
+#line 13 "Await.cshtml"
 											 __o = await Foo();

 #line default
@ -63,17 +63,17 @@ namespace TestOutput
 #line default
 #line hidden

-#line 1 "------------------------------------------"
+#line 14 "Await.cshtml"
 										   __o = await;

 #line default
 #line hidden
-#line 1 "------------------------------------------"
+#line 19 "Await.cshtml"
 									__o = await Foo(1, 2);

 #line default
 #line hidden
-#line 1 "------------------------------------------"
+#line 20 "Await.cshtml"
 								   __o = await Foo("bob", true);

 #line default
@ -90,7 +90,7 @@ namespace TestOutput
 #line default
 #line hidden

-#line 1 "------------------------------------------"
+#line 22 "Await.cshtml"
 												__o = await Foo(boolValue: false);

 #line default
@ -101,7 +101,7 @@ namespace TestOutput
 #line default
 #line hidden

-#line 1 "------------------------------------------"
+#line 23 "Await.cshtml"
 											  __o = await ("wrrronggg");

 #line default
--- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/DesignTime.cs
+++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/DesignTime.cs
@ -58,7 +58,7 @@ Foo() {
 #line default
 #line hidden

-#line 1 "------------------------------------------"
+#line 3 "DesignTime.cshtml"
                __o = i;

 #line default
@ -70,14 +70,14 @@ Foo() {
 #line default
 #line hidden

-#line 1 "------------------------------------------"
+#line 8 "DesignTime.cshtml"
 __o = Foo(Bar.Baz);

 #line default
 #line hidden
-#line 1 "------------------------------------------"
+#line 9 "DesignTime.cshtml"
 __o = Foo(item => new Template((__razor_template_writer) => {
-#line 1 "------------------------------------------"
+#line 9 "DesignTime.cshtml"
        __o = baz;

 #line default
@ -94,7 +94,7 @@ __o = Foo(item => new Template((__razor_template_writer) => {
 #line default
 #line hidden
            DefineSection("Footer", new Template((__razor_template_writer) => {
-#line 1 "------------------------------------------"
+#line 14 "DesignTime.cshtml"
 __o = bar;

 #line default
--- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/EmptyExplicitExpression.cs
+++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/EmptyExplicitExpression.cs
@ -21,7 +21,7 @@ namespace TestOutput

        public override async Task ExecuteAsync()
        {
-#line 1 "------------------------------------------"
+#line 3 "EmptyExplicitExpression.cshtml"
 __o = ;

 #line default
--- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/EmptyImplicitExpression.cs
+++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/EmptyImplicitExpression.cs
@ -21,7 +21,7 @@ namespace TestOutput

        public override async Task ExecuteAsync()
        {
-#line 1 "------------------------------------------"
+#line 3 "EmptyImplicitExpression.cshtml"
 __o = ;

 #line default
--- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/EmptyImplicitExpressionInCode.Tabs.cs
+++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/EmptyImplicitExpressionInCode.Tabs.cs
@ -28,7 +28,7 @@ namespace TestOutput
 #line default
 #line hidden

-#line 1 "------------------------------------------"
+#line 2 "EmptyImplicitExpressionInCode.cshtml"
 __o = ;

 #line default
--- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/EmptyImplicitExpressionInCode.cs
+++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/EmptyImplicitExpressionInCode.cs
@ -28,7 +28,7 @@ namespace TestOutput
 #line default
 #line hidden

-#line 1 "------------------------------------------"
+#line 2 "EmptyImplicitExpressionInCode.cshtml"
 __o = ;

 #line default
--- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/ExplicitExpressionAtEOF.cs
+++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/ExplicitExpressionAtEOF.cs
@ -21,7 +21,7 @@ namespace TestOutput

        public override async Task ExecuteAsync()
        {
-#line 1 "------------------------------------------"
+#line 3 "ExplicitExpressionAtEOF.cshtml"
 __o = ;

 #line default
--- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/FunctionsBlock.DesignTime.Tabs.cs
+++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/FunctionsBlock.DesignTime.Tabs.cs
@ -36,7 +36,7 @@ namespace TestOutput

        public override async Task ExecuteAsync()
        {
-#line 1 "------------------------------------------"
+#line 12 "FunctionsBlock.cshtml"
 				   __o = RandomInt();

 #line default
--- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/FunctionsBlock.DesignTime.cs
+++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/FunctionsBlock.DesignTime.cs
@ -36,7 +36,7 @@ namespace TestOutput

        public override async Task ExecuteAsync()
        {
-#line 1 "------------------------------------------"
+#line 12 "FunctionsBlock.cshtml"
                   __o = RandomInt();

 #line default
--- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/ImplicitExpressionAtEOF.cs
+++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/ImplicitExpressionAtEOF.cs
@ -21,7 +21,7 @@ namespace TestOutput

        public override async Task ExecuteAsync()
        {
-#line 1 "------------------------------------------"
+#line 3 "ImplicitExpressionAtEOF.cshtml"
 __o = ;

 #line default
--- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/Imports.DesignTime.cs
+++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/Imports.DesignTime.cs
@ -38,12 +38,12 @@ using System

        public override async Task ExecuteAsync()
        {
-#line 1 "------------------------------------------"
+#line 5 "Imports.cshtml"
                       __o = typeof(Path).FullName;

 #line default
 #line hidden
-#line 1 "------------------------------------------"
+#line 6 "Imports.cshtml"
                             __o = typeof(Foo).FullName;

 #line default
--- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/Inherits.Designtime.cs
+++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/Inherits.Designtime.cs
@ -26,7 +26,7 @@ namespace TestOutput

        public override async Task ExecuteAsync()
        {
-#line 1 "------------------------------------------"
+#line 1 "Inherits.cshtml"
 __o = foo();

 #line default
--- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/RazorComments.DesignTime.cs
+++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/RazorComments.DesignTime.cs
@ -50,12 +50,12 @@ namespace TestOutput
 #line default
 #line hidden

-#line 1 "------------------------------------------"
+#line 13 "RazorComments.cshtml"
                                       __o = bar;

 #line default
 #line hidden
-#line 1 "------------------------------------------"
+#line 15 "RazorComments.cshtml"
 __o = a
 #line 15 "RazorComments.cshtml"
       b
--- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/UnfinishedExpressionInCode.Tabs.cs
+++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/UnfinishedExpressionInCode.Tabs.cs
@ -27,7 +27,7 @@ namespace TestOutput
 #line default
 #line hidden

-#line 1 "------------------------------------------"
+#line 2 "UnfinishedExpressionInCode.cshtml"
 __o = DateTime.;

 #line default
--- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/UnfinishedExpressionInCode.cs
+++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/UnfinishedExpressionInCode.cs
@ -27,7 +27,7 @@ namespace TestOutput
 #line default
 #line hidden

-#line 1 "------------------------------------------"
+#line 2 "UnfinishedExpressionInCode.cshtml"
 __o = DateTime.;

 #line default
--- a/test/Microsoft.AspNet.Razor.Test/TestFiles/DesignTime/Simple.txt
+++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/DesignTime/Simple.txt
@ -24,7 +24,7 @@
 #line default
 #line hidden

-#line 1 "------------------------------------------"
+#line 11 "C:\This\Path\Is\Just\For\Line\Pragmas.cshtml"
      __o = hello;

 #line default
@ -35,7 +35,7 @@
 #line default
 #line hidden

-#line 1 "------------------------------------------"
+#line 13 "C:\This\Path\Is\Just\For\Line\Pragmas.cshtml"
                                  __o = c;

 #line default