Some cleanup/simplification related to Tests namespace

nikhilk · Dec 19, 2012 · 220b5c8 · 220b5c8
1 parent 7767ce0
commit 220b5c8
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 23 deletions.
diff --git a/src/Core/App/Application.cs b/src/Core/App/Application.cs
@@ -162,15 +162,6 @@ compile code.
 
             CompilerOptions compilerOptions = CreateCompilerOptions(commandLine);
 
-#if DEBUG
-            if (compilerOptions.InternalTestMode) {
-                // HACK: Our tests are currently in the Tests subnamespace, which is now
-                //       used as a pattern for writing unit tests. This hack allows postponing
-                //       modifying all tests and baselines.
-                compilerOptions.TestsSubnamespace = "UnitTests";
-            }
-#endif // DEBUG
-
             string errorMessage;
             if (compilerOptions.Validate(out errorMessage) == false) {
                 ShowUsage(errorMessage);

diff --git a/src/Core/Compiler/Compiler/MetadataBuilder.cs b/src/Core/Compiler/Compiler/MetadataBuilder.cs
@@ -812,8 +812,8 @@ internal sealed class MetadataBuilder {
 
                 BuildType(typeSymbol, typeNode);
 
-                if (namespaceSymbol.Name.EndsWith("." + _options.TestsSubnamespace, StringComparison.Ordinal) ||
+                if (namespaceSymbol.Name.EndsWith(".Tests", StringComparison.Ordinal) ||
-                    (namespaceSymbol.Name.IndexOf("." + _options.TestsSubnamespace + ".", StringComparison.Ordinal) > 0)) {
+                    (namespaceSymbol.Name.IndexOf(".Tests.", StringComparison.Ordinal) > 0)) {
                     typeSymbol.SetTestType();
                 }
             }

diff --git a/src/Core/Compiler/CompilerOptions.cs b/src/Core/Compiler/CompilerOptions.cs
@@ -26,8 +26,6 @@ public sealed class CompilerOptions {
         private bool _minimize;
         private ScriptInfo _scriptInfo;
 
-        private string _testsSubnamespace;
-
         private bool _hasTestTypes;
 
         // TODO: Get rid of internal test mode/type...
@@ -36,7 +34,6 @@ public sealed class CompilerOptions {
 
         public CompilerOptions() {
             _scriptInfo = new ScriptInfo();
-            _testsSubnamespace = "Tests";
         }
 
         public ICollection<string> Defines {
@@ -150,15 +147,6 @@ public sealed class CompilerOptions {
             }
         }
 
-        public string TestsSubnamespace {
-            get {
-                return _testsSubnamespace;
-            }
-            set {
-                _testsSubnamespace = value;
-            }
-        }
-
         public bool Validate(out string errorMessage) {
             errorMessage = String.Empty;