Clean up Version1_X tests

Update all "pass" tests in MS.ANC.Mvc.Razor.Extensions.Version1_X to create code documents from a project engine to ensure that options flow correctly.

Note: ModelDirectiveTest contains a tweak to a couple of test assertions to be correct, now that design-time code paths are taken.

Author: DustinCampbell

src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/InjectDirectiveTest.cs

@@ -1,37 +1,45 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-#nullable disable
-
 using Microsoft.AspNetCore.Razor.Language;
 using Microsoft.AspNetCore.Razor.Language.Intermediate;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X;
 
-public class InjectDirectiveTest
+public class InjectDirectiveTest : RazorProjectEngineTestBase
 {
+    protected override RazorLanguageVersion Version => RazorLanguageVersion.Version_1_1;
+
+    protected override void ConfigureProjectEngine(RazorProjectEngineBuilder builder)
+    {
+        // Notice we're not registering the InjectDirective.Pass here so we can run it on demand.
+        builder.AddDirective(InjectDirective.Directive);
+        builder.AddDirective(ModelDirective.Directive);
+
+        builder.Features.Add(new RazorPageDocumentClassifierPass());
+        builder.Features.Add(new MvcViewDocumentClassifierPass());
+    }
+
+    protected override void ConfigureProcessor(RazorCodeDocumentProcessor processor)
+    {
+        processor.RunPhasesTo<IRazorDocumentClassifierPhase>();
+    }
+
     [Fact]
     public void InjectDirectivePass_Execute_DefinesProperty()
     {
         // Arrange
-        var codeDocument = CreateDocument(@"
+        var processor = CreateAndInitializeCodeDocument(@"
 @inject PropertyType PropertyName
 ");
 
-        var engine = CreateEngine();
-        var pass = new InjectDirective.Pass()
-        {
-            Engine = engine,
-        };
-
-        var irDocument = CreateIRDocument(engine, codeDocument);
-
         // Act
-        pass.Execute(codeDocument, irDocument);
+        processor.ExecutePass<InjectDirective.Pass>();
+        var documentNode = processor.GetDocumentNode();
 
         // Assert
-        var @class = FindClassNode(irDocument);
+        var @class = documentNode.FindClassNode();
         Assert.NotNull(@class);
         Assert.Equal(2, @class.Children.Count);
 
@@ -44,24 +52,17 @@ @inject PropertyType PropertyName
     public void InjectDirectivePass_Execute_DedupesPropertiesByName()
     {
         // Arrange
-        var codeDocument = CreateDocument(@"
+        var processor = CreateAndInitializeCodeDocument(@"
 @inject PropertyType PropertyName
 @inject PropertyType2 PropertyName
 ");
 
-        var engine = CreateEngine();
-        var pass = new InjectDirective.Pass()
-        {
-            Engine = engine,
-        };
-
-        var irDocument = CreateIRDocument(engine, codeDocument);
-
         // Act
-        pass.Execute(codeDocument, irDocument);
+        processor.ExecutePass<InjectDirective.Pass>();
+        var documentNode = processor.GetDocumentNode();
 
         // Assert
-        var @class = FindClassNode(irDocument);
+        var @class = documentNode.FindClassNode();
         Assert.NotNull(@class);
         Assert.Equal(2, @class.Children.Count);
 
@@ -74,23 +75,16 @@ @inject PropertyType2 PropertyName
     public void InjectDirectivePass_Execute_ExpandsTModel_WithDynamic()
     {
         // Arrange
-        var codeDocument = CreateDocument(@"
+        var processor = CreateAndInitializeCodeDocument(@"
 @inject PropertyType<TModel> PropertyName
 ");
 
-        var engine = CreateEngine();
-        var pass = new InjectDirective.Pass()
-        {
-            Engine = engine,
-        };
-
-        var irDocument = CreateIRDocument(engine, codeDocument);
-
         // Act
-        pass.Execute(codeDocument, irDocument);
+        processor.ExecutePass<InjectDirective.Pass>();
+        var documentNode = processor.GetDocumentNode();
 
         // Assert
-        var @class = FindClassNode(irDocument);
+        var @class = documentNode.FindClassNode();
         Assert.NotNull(@class);
         Assert.Equal(2, @class.Children.Count);
 
@@ -103,24 +97,17 @@ @inject PropertyType<TModel> PropertyName
     public void InjectDirectivePass_Execute_ExpandsTModel_WithModelTypeFirst()
     {
         // Arrange
-        var codeDocument = CreateDocument(@"
+        var processor = CreateAndInitializeCodeDocument(@"
 @model ModelType
 @inject PropertyType<TModel> PropertyName
 ");
 
-        var engine = CreateEngine();
-        var pass = new InjectDirective.Pass()
-        {
-            Engine = engine,
-        };
-
-        var irDocument = CreateIRDocument(engine, codeDocument);
-
         // Act
-        pass.Execute(codeDocument, irDocument);
+        processor.ExecutePass<InjectDirective.Pass>();
+        var documentNode = processor.GetDocumentNode();
 
         // Assert
-        var @class = FindClassNode(irDocument);
+        var @class = documentNode.FindClassNode();
         Assert.NotNull(@class);
         Assert.Equal(2, @class.Children.Count);
 
@@ -133,81 +120,22 @@ @inject PropertyType<TModel> PropertyName
     public void InjectDirectivePass_Execute_ExpandsTModel_WithModelType()
     {
         // Arrange
-        var codeDocument = CreateDocument(@"
+        var processor = CreateAndInitializeCodeDocument(@"
 @inject PropertyType<TModel> PropertyName
 @model ModelType
 ");
 
-        var engine = CreateEngine();
-        var pass = new InjectDirective.Pass()
-        {
-            Engine = engine,
-        };
-
-        var irDocument = CreateIRDocument(engine, codeDocument);
-
         // Act
-        pass.Execute(codeDocument, irDocument);
+        processor.ExecutePass<InjectDirective.Pass>();
+        var documentNode = processor.GetDocumentNode();
 
         // Assert
-        var @class = FindClassNode(irDocument);
+        var @class = documentNode.FindClassNode();
         Assert.NotNull(@class);
         Assert.Equal(2, @class.Children.Count);
 
         var node = Assert.IsType<InjectIntermediateNode>(@class.Children[1]);
         Assert.Equal("PropertyType<ModelType>", node.TypeName);
         Assert.Equal("PropertyName", node.MemberName);
     }
-
-    private RazorCodeDocument CreateDocument(string content)
-    {
-        var source = RazorSourceDocument.Create(content, "test.cshtml");
-        return RazorCodeDocument.Create(source);
-    }
-
-    private ClassDeclarationIntermediateNode FindClassNode(IntermediateNode node)
-    {
-        var visitor = new ClassNodeVisitor();
-        visitor.Visit(node);
-        return visitor.Node;
-    }
-
-    private RazorEngine CreateEngine()
-    {
-        var configuration = new RazorConfiguration(RazorLanguageVersion.Version_1_1, "test", Extensions: []);
-        return RazorProjectEngine.Create(configuration, RazorProjectFileSystem.Empty, b =>
-        {
-            // Notice we're not registering the InjectDirective.Pass here so we can run it on demand.
-            b.AddDirective(InjectDirective.Directive);
-            b.AddDirective(ModelDirective.Directive);
-
-            b.Features.Add(new RazorPageDocumentClassifierPass());
-            b.Features.Add(new MvcViewDocumentClassifierPass());
-        }).Engine;
-    }
-
-    private DocumentIntermediateNode CreateIRDocument(RazorEngine engine, RazorCodeDocument codeDocument)
-    {
-        foreach (var phase in engine.Phases)
-        {
-            phase.Execute(codeDocument);
-
-            if (phase is IRazorDocumentClassifierPhase)
-            {
-                break;
-            }
-        }
-
-        return codeDocument.GetDocumentIntermediateNode();
-    }
-
-    private class ClassNodeVisitor : IntermediateNodeWalker
-    {
-        public ClassDeclarationIntermediateNode Node { get; set; }
-
-        public override void VisitClassDeclaration(ClassDeclarationIntermediateNode node)
-        {
-            Node = node;
-        }
-    }
 }