From 06adccc1887e7b77dd546b30438149e47ff05013 Mon Sep 17 00:00:00 2001
From: Andrew Casey <andrew.casey@microsoft.com>
Date: Wed, 29 Apr 2015 15:44:04 -0700
Subject: [PATCH] Move test hook out of product code.

---
 .../EvaluationContextBase.cs                  | 33 ------------------
 .../ExpressionCompilerTestHelpers.cs          | 34 +++++++++++++++++++
 2 files changed, 34 insertions(+), 33 deletions(-)

diff --git a/src/ExpressionEvaluator/Core/Source/ExpressionCompiler/EvaluationContextBase.cs b/src/ExpressionEvaluator/Core/Source/ExpressionCompiler/EvaluationContextBase.cs
index 85a2b5e107b..8f018b92dda 100644
--- a/src/ExpressionEvaluator/Core/Source/ExpressionCompiler/EvaluationContextBase.cs
+++ b/src/ExpressionEvaluator/Core/Source/ExpressionCompiler/EvaluationContextBase.cs
@@ -21,39 +21,6 @@ internal abstract class EvaluationContextBase
         internal static readonly AssemblyIdentity SystemXmlLinqIdentity = new AssemblyIdentity("System.Xml.Linq");
         internal static readonly AssemblyIdentity MicrosoftVisualBasicIdentity = new AssemblyIdentity("Microsoft.VisualBasic");
 
-        /// <summary>
-        /// Compile C# expression and emit assembly with evaluation method.
-        /// </summary>
-        /// <returns>
-        /// Result containing generated assembly, type and method names, and any format specifiers.
-        /// </returns>
-        internal CompileResult CompileExpression(
-            InspectionContext inspectionContext,
-            string expr,
-            DkmEvaluationFlags compilationFlags,
-            DiagnosticFormatter formatter,
-            out ResultProperties resultProperties,
-            out string error,
-            out ImmutableArray<AssemblyIdentity> missingAssemblyIdentities,
-            CultureInfo preferredUICulture,
-            CompilationTestData testData)
-        {
-            var diagnostics = DiagnosticBag.GetInstance();
-            var result = this.CompileExpression(inspectionContext, expr, compilationFlags, diagnostics, out resultProperties, testData);
-            if (diagnostics.HasAnyErrors())
-            {
-                bool useReferencedModulesOnly;
-                error = GetErrorMessageAndMissingAssemblyIdentities(diagnostics, formatter, preferredUICulture, out useReferencedModulesOnly, out missingAssemblyIdentities);
-            }
-            else
-            {
-                error = null;
-                missingAssemblyIdentities = ImmutableArray<AssemblyIdentity>.Empty;
-            }
-            diagnostics.Free();
-            return result;
-        }
-
         internal abstract CompileResult CompileExpression(
             InspectionContext inspectionContext,
             string expr,
diff --git a/src/ExpressionEvaluator/Core/Test/ExpressionCompiler/ExpressionCompilerTestHelpers.cs b/src/ExpressionEvaluator/Core/Test/ExpressionCompiler/ExpressionCompilerTestHelpers.cs
index 8d94b1f3212..e93f2b0593d 100644
--- a/src/ExpressionEvaluator/Core/Test/ExpressionCompiler/ExpressionCompilerTestHelpers.cs
+++ b/src/ExpressionEvaluator/Core/Test/ExpressionCompiler/ExpressionCompilerTestHelpers.cs
@@ -106,6 +106,40 @@ internal static class ExpressionCompilerTestHelpers
             return result;
         }
 
+        /// <summary>
+        /// Compile C# expression and emit assembly with evaluation method.
+        /// </summary>
+        /// <returns>
+        /// Result containing generated assembly, type and method names, and any format specifiers.
+        /// </returns>
+        static internal CompileResult CompileExpression(
+            this EvaluationContextBase evaluationContext,
+            InspectionContext inspectionContext,
+            string expr,
+            DkmEvaluationFlags compilationFlags,
+            DiagnosticFormatter formatter,
+            out ResultProperties resultProperties,
+            out string error,
+            out ImmutableArray<AssemblyIdentity> missingAssemblyIdentities,
+            CultureInfo preferredUICulture,
+            CompilationTestData testData)
+        {
+            var diagnostics = DiagnosticBag.GetInstance();
+            var result = evaluationContext.CompileExpression(inspectionContext, expr, compilationFlags, diagnostics, out resultProperties, testData);
+            if (diagnostics.HasAnyErrors())
+            {
+                bool useReferencedModulesOnly;
+                error = evaluationContext.GetErrorMessageAndMissingAssemblyIdentities(diagnostics, formatter, preferredUICulture, out useReferencedModulesOnly, out missingAssemblyIdentities);
+            }
+            else
+            {
+                error = null;
+                missingAssemblyIdentities = ImmutableArray<AssemblyIdentity>.Empty;
+            }
+            diagnostics.Free();
+            return result;
+        }
+
         internal static CompileResult CompileExpressionWithRetry(
             ImmutableArray<MetadataBlock> metadataBlocks,
             EvaluationContextBase context,
-- 
GitLab