Merge pull request #106 from RemcovandenBerg/master

deduplication of code in the testbase classes
icsharpcode · Sep 15, 2015 · de40bb7 · de40bb7
2 parents 0f74be5 + 03a65de
commit de40bb7
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 39 deletions.
diff --git a/Tests/Common/CodeFixTestBase.cs b/Tests/Common/CodeFixTestBase.cs
@@ -1,6 +1,7 @@
 using NUnit.Framework;
 using System.Text;
 using Microsoft.CodeAnalysis.Text;
+using RefactoringEssentials.Tests.Common;
 
 namespace RefactoringEssentials.Tests
 {
@@ -13,23 +14,7 @@ public virtual void SetUp()
 
         internal static string HomogenizeEol(string str)
         {
-            var sb = new StringBuilder();
-            for (int i = 0; i < str.Length; i++)
-            {
-                var ch = str[i];
-                var possibleNewline = NewLine.GetDelimiterLength(ch, i + 1 < str.Length ? str[i + 1] : '\0');
-                if (possibleNewline > 0)
-                {
-                    sb.AppendLine();
-                    if (possibleNewline == 2)
-                        i++;
-                }
-                else
-                {
-                    sb.Append(ch);
-                }
-            }
-            return sb.ToString();
+            return Utils.HomogenizeEol(str);
         }
 
         protected static string ParseText(string input, out TextSpan selectedSpan)

diff --git a/Tests/Common/CodeRefactoringTestBase.cs b/Tests/Common/CodeRefactoringTestBase.cs
@@ -1,6 +1,7 @@
 using NUnit.Framework;
 using System.Text;
 using Microsoft.CodeAnalysis.Text;
+using RefactoringEssentials.Tests.Common;
 
 namespace RefactoringEssentials.Tests
 {
@@ -13,23 +14,7 @@ public virtual void SetUp()
 
         internal static string HomogenizeEol(string str)
         {
-            var sb = new StringBuilder();
-            for (int i = 0; i < str.Length; i++)
-            {
-                var ch = str[i];
-                var possibleNewline = NewLine.GetDelimiterLength(ch, i + 1 < str.Length ? str[i + 1] : '\0');
-                if (possibleNewline > 0)
-                {
-                    sb.AppendLine();
-                    if (possibleNewline == 2)
-                        i++;
-                }
-                else
-                {
-                    sb.Append(ch);
-                }
-            }
-            return sb.ToString();
+            return Utils.HomogenizeEol(str);
         }
 
         protected static string ParseText(string input, out TextSpan selectedSpan, out TextSpan markedSpan)

diff --git a/Tests/Common/DiagnosticTestBase.cs b/Tests/Common/DiagnosticTestBase.cs
@@ -7,10 +7,10 @@
 using System.Threading;
 using Microsoft.CodeAnalysis.CodeFixes;
 using Microsoft.CodeAnalysis.Text;
-using Microsoft.CodeAnalysis.Host.Mef;
 using System.Text;
 using Microsoft.CodeAnalysis.Host;
 using Microsoft.CodeAnalysis.CodeActions;
+using RefactoringEssentials.Tests.Common;
 
 namespace RefactoringEssentials.Tests
 {
@@ -292,8 +292,8 @@ protected static void Analyze<T>(Func<string, SyntaxTree> parseTextFunc, Func<Sy
             }
 
             var txt = workspace.CurrentSolution.GetProject(projectId).GetDocument(documentId).GetTextAsync().Result.ToString();
-            output = CodeFixTestBase.HomogenizeEol(output);
-            txt = CodeFixTestBase.HomogenizeEol(txt);
+            output = Utils.HomogenizeEol(output);
+            txt =  Utils.HomogenizeEol(txt);
             if (output != txt)
             {
                 Console.WriteLine("expected:");
@@ -408,8 +408,8 @@ protected static void AnalyzeWithRule<T>(Func<string, SyntaxTree> parseTextFunc,
             }
 
             var txt = workspace.CurrentSolution.GetProject(projectId).GetDocument(documentId).GetTextAsync().Result.ToString();
-            txt = CodeFixTestBase.HomogenizeEol(txt);
-            output = CodeFixTestBase.HomogenizeEol(output);
+            txt = Utils.HomogenizeEol(txt);
+            output = Utils.HomogenizeEol(output);
             if (output != txt)
             {
                 Console.WriteLine("expected:");

diff --git a/Tests/Common/Utils.cs b/Tests/Common/Utils.cs
@@ -0,0 +1,32 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace RefactoringEssentials.Tests.Common
+{
+    static class Utils
+    {
+        internal static string HomogenizeEol(string str)
+        {
+            var sb = new StringBuilder();
+            for (int i = 0; i < str.Length; i++)
+            {
+                var ch = str[i];
+                var possibleNewline = NewLine.GetDelimiterLength(ch, i + 1 < str.Length ? str[i + 1] : '\0');
+                if (possibleNewline > 0)
+                {
+                    sb.AppendLine();
+                    if (possibleNewline == 2)
+                        i++;
+                }
+                else
+                {
+                    sb.Append(ch);
+                }
+            }
+            return sb.ToString();
+        }
+    }
+}