Merge branch 'next' into ReadyForNoModules

Author: MDoerner

Rubberduck.Core/UI/UnitTesting/TestResultToOutcomeTextConverter.cs

@@ -10,9 +10,9 @@ public class TestResultToOutcomeTextConverter : IValueConverter
     {
         public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
         {
-            if (value is TestResult result)
+            if (value is TestOutcome result)
             {
-                return TestExplorer.ResourceManager.GetString("TestOutcome_" + result.Outcome, CultureInfo.CurrentUICulture);
+                return TestExplorer.ResourceManager.GetString($"TestOutcome_{result}", CultureInfo.CurrentUICulture);
             }
 
             return null;

Rubberduck.Resources/UnitTesting/TestExplorer.Designer.cs

@@ -234,4 +234,7 @@
   <data name="TestExplorer_CategoryName" xml:space="preserve">
     <value>Category Name</value>
   </data>
+  <data name="TestExplorer_Uncategorized" xml:space="preserve">
+    <value>Uncategorized</value>
+  </data>
 </root>

Rubberduck.Resources/UnitTesting/TestExplorer.resx

@@ -6,6 +6,7 @@
 using Rubberduck.Parsing.Symbols;
 using Rubberduck.VBEditor;
 using Rubberduck.Interaction.Navigation;
+using Rubberduck.Resources.UnitTesting;
 
 namespace Rubberduck.UnitTesting
 {
@@ -25,7 +26,8 @@ public TestCategory Category
                 var testMethodAnnotation = (TestMethodAnnotation) Declaration.Annotations
                     .First(annotation => annotation.AnnotationType == AnnotationType.TestMethod);
 
-                return new TestCategory(testMethodAnnotation.Category);
+                var categorization = testMethodAnnotation.Category.Equals(string.Empty) ? TestExplorer.TestExplorer_Uncategorized : testMethodAnnotation.Category;
+                return new TestCategory(categorization);
             }
         }
 

Rubberduck.UnitTesting/UnitTesting/TestMethod.cs

@@ -26,7 +26,7 @@ Sub Foo()
         }
 
         [Test]
-        public void TestCategoryIsEmptyWhenNoCategorySpecified()
+        public void TestCategoryIsUncategorizedWhenNoCategorySpecified()
         {
             const string code = @"
 '@TestMethod
@@ -38,12 +38,12 @@ Sub Foo()
                 var testMethodDeclaration = state.AllUserDeclarations.First(declaration => declaration.IdentifierName == "Foo");
                 var testMethod = new TestMethod(testMethodDeclaration);
 
-                Assert.AreEqual("", testMethod.Category.Name);
+                Assert.AreEqual("Uncategorized", testMethod.Category.Name);
             }
         }
 
         [Test]
-        public void TestCategoryIsEmptyWhenSpecifiedCategoryHasWhiteSpaceOnly()
+        public void TestCategoryIsUncategorizedWhenSpecifiedCategoryHasWhiteSpaceOnly()
         {
             const string code = @"
 '@TestMethod(""   "")
@@ -55,7 +55,7 @@ Sub Foo()
                 var testMethodDeclaration = state.AllUserDeclarations.First(declaration => declaration.IdentifierName == "Foo");
                 var testMethod = new TestMethod(testMethodDeclaration);
 
-                Assert.AreEqual("", testMethod.Category.Name);
+                Assert.AreEqual("Uncategorized", testMethod.Category.Name);
             }
         }
     }