Merge pull request #6 from ricaun-io/develop

ricaun · web-flow · commit e87b75bc1eda · 2023-04-15T17:32:42.000-03:00
Version 1.0.2
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,15 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [1.0.2] / 2023-04-15
+### Features
+[x] Update `ricaun.NUnit` to 1.2.7
+### Tests
+[x] TestsCase - TestCase with string and null
+### Update
+[x] Update `TestAdapter` to work with `ricaun.NUnit` 1.2.7
+[x] Update `ProcessStart` in `TestAdapter` to work with `"` in the filter.
+
 ## [1.0.1] / 2023-04-11
 ### Features
 [x] Update `ricaun.NUnit` to 1.2.6
@@ -73,5 +82,6 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 [x] TestsFail
 
 [vNext]: ../../compare/1.0.0...HEAD
+[1.0.2]: ../../compare/1.0.1...1.0.2
 [1.0.1]: ../../compare/1.0.0...1.0.1
 [1.0.0]: ../../compare/1.0.0
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,5 +1,5 @@
 <Project>
 	<PropertyGroup>
-		<Version>1.0.1</Version>
+		<Version>1.0.2</Version>
 	</PropertyGroup>
 </Project>
diff --git a/ricaun.RevitTest.Application/ricaun.RevitTest.Application.csproj b/ricaun.RevitTest.Application/ricaun.RevitTest.Application.csproj
@@ -119,7 +119,7 @@
 
   <ItemGroup>
     <PackageReference Include="Revit.Busy" Version="*" />
-    <PackageReference Include="ricaun.Revit.UI" Version="*" />
+    <PackageReference Include="ricaun.Revit.UI" Version="0.4.0" />
     <PackageReference Include="ricaun.Revit.Async" Version="*" />
     <PackageReference Include="ricaun.NUnit" Version="*" />
     <PackageReference Include="NamedPipeWrapper.Json" Version="*" />
diff --git a/ricaun.RevitTest.Console/Resources/ricaun.RevitTest.Application.bundle.zip b/ricaun.RevitTest.Console/Resources/ricaun.RevitTest.Application.bundle.zip
diff --git a/ricaun.RevitTest.TestAdapter/AdapterLogger.cs b/ricaun.RevitTest.TestAdapter/AdapterLogger.cs
@@ -50,6 +50,10 @@ public void Info(string message)
             {
             }
 
+            public void Info(string message, int verbosity)
+            {
+            }
+
             public void Warning(string message)
             {
             }
diff --git a/ricaun.RevitTest.TestAdapter/Resources/ricaun.RevitTest.Console.exe b/ricaun.RevitTest.TestAdapter/Resources/ricaun.RevitTest.Console.exe
diff --git a/ricaun.RevitTest.TestAdapter/Services/ProcessStart.cs b/ricaun.RevitTest.TestAdapter/Services/ProcessStart.cs
@@ -19,8 +19,11 @@ string ConvertKey(string key)
             }
             string ConvertValue(object value)
             {
-                if (value is string)
+                if (value is string valueString)
+                {
+                    value = valueString.Replace("\"", "\\\"");
                     return $"\"{value}\"";
+                }
                 return $"{value}";
             }
             var arguments = "";
@@ -34,6 +37,7 @@ string ConvertValue(object value)
                 arguments += $"{ConvertKey(item.Key)} ";
                 arguments += $"{ConvertValue(item.Value)} ";
             }
+            AdapterLogger.Logger.Debug($"\tCreateArguments: {arguments}");
             return arguments;
         }
 
diff --git a/ricaun.RevitTest.TestAdapter/TestAdapter.cs b/ricaun.RevitTest.TestAdapter/TestAdapter.cs
@@ -29,7 +29,7 @@ protected void Initialize(IDiscoveryContext discoveryContext, IMessageLogger mes
             AdapterSettings.Create(discoveryContext);
             AdapterLogger.Create(messageLogger, AdapterSettings.Settings.NUnit.Verbosity);
 
-            AdapterLogger.Logger.Info($"TestAdapter: {this.AdapterVersion}");
+            AdapterLogger.Logger.Info($"TestAdapter: {this.AdapterVersion}", 0);
             AdapterLogger.Logger.Info($"AdapterSettings: {AdapterSettings.Settings}");
             //AdapterLogger.Logger.Debug($"SettingsXml: {discoveryContext.RunSettings.SettingsXml}");
         }
diff --git a/ricaun.RevitTest.TestAdapter/TestCaseUtils.cs b/ricaun.RevitTest.TestAdapter/TestCaseUtils.cs
@@ -4,6 +4,10 @@ namespace ricaun.RevitTest.TestAdapter
 {
     public static class TestCaseUtils
     {
+        public static string GetFullName(TestCase testCase)
+        {
+            return $"{testCase.FullyQualifiedName}.{testCase.DisplayName}";
+        }
         public static TestCase Create(string source, string testName)
         {
             var fullyQualifiedName = testName.Substring(0, testName.LastIndexOf('.'));
diff --git a/ricaun.RevitTest.TestAdapter/TestExecutor.cs b/ricaun.RevitTest.TestAdapter/TestExecutor.cs
@@ -78,12 +78,23 @@ private async Task RunTests(IFrameworkHandle frameworkHandle, string source, Lis
             tests = tests ?? new List<TestCase>();
 
             AdapterLogger.Logger.Info($"RunTest: {source} [TestCase: {tests.Count}]");
-
+            foreach (var test in tests)
+            {
+                AdapterLogger.Logger.Info($"Test: {test.FullyQualifiedName}.{test.DisplayName}");
+            }
             Metadatas.MetadataSettings.Create(source);
 
+            AdapterLogger.Logger.Info("---------");
+            AdapterLogger.Logger.Info($"RevitTestConsole: {AdapterSettings.Settings.NUnit.Application}");
+            AdapterLogger.Logger.Info("---------");
+
             using (var revit = new RevitTestConsole(AdapterSettings.Settings.NUnit.Application))
             {
-                var filters = tests.Select(e => $"{e.FullyQualifiedName}.{e.DisplayName}").ToArray();
+                var filters = tests.Select(TestCaseUtils.GetFullName).ToArray();
+                foreach (var filter in filters)
+                {
+                    AdapterLogger.Logger.Debug($"\tTestFilter: {filter}");
+                }
 
                 Action<string> outputConsole = (item) =>
                 {
@@ -99,14 +110,14 @@ private async Task RunTests(IFrameworkHandle frameworkHandle, string source, Lis
                     {
                         if (item.Deserialize<TestModel>() is TestModel testModel)
                         {
-                            var testCase = tests.FirstOrDefault(e => $"{e.FullyQualifiedName}.{e.DisplayName}".Equals(testModel.FullName));
+                            var testCase = tests.FirstOrDefault(e => TestCaseUtils.GetFullName(e).Equals(testModel.FullName));
 
                             if (testCase is null)
                             {
                                 testCase = TestCaseUtils.Create(source, testModel.FullName);
                             }
 
-                            AdapterLogger.Logger.Info($"TestCase: {testCase}");
+                            AdapterLogger.Logger.Info($"\tTestCase: {testCase}");
 
                             var testResult = new TestResult(testCase);
 
@@ -131,12 +142,16 @@ private async Task RunTests(IFrameworkHandle frameworkHandle, string source, Lis
                     }
                 };
 
+                AdapterLogger.Logger.Info($"RunRevitTest: {source} [Version: {AdapterSettings.Settings.NUnit.Version}] [TestFilter: {filters.Length}]");
+
                 await revit.RunTestAction(source,
                     AdapterSettings.Settings.NUnit.Version,
                     AdapterSettings.Settings.NUnit.Open,
                     AdapterSettings.Settings.NUnit.Close,
                     outputConsole, filters);
             }
+
+            AdapterLogger.Logger.Info("---------");
         }
     }
 }
diff --git a/ricaun.RevitTest.TestAdapter/TestLogger.cs b/ricaun.RevitTest.TestAdapter/TestLogger.cs
@@ -19,6 +19,7 @@ public interface ITestLogger
         void Warning(string message);
         void Warning(string message, Exception ex);
         void Info(string message);
+        void Info(string message, int verbosity);
         int Verbosity { get; set; }
         void Debug(string message);
     }
@@ -76,9 +77,14 @@ public void Warning(string message, Exception ex)
         #region Information Messages
 
         public void Info(string message)
+        {
+            Info(message, 1);
+        }
+
+        public void Info(string message, int verbosity)
         {
             //if (adapterSettings?.Verbosity >= 0)
-            if (Verbosity >= 1)
+            if (Verbosity >= verbosity)
                 SendMessage(TestMessageLevel.Informational, message);
         }
 
diff --git a/ricaun.RevitTest.Tests/.runsettings b/ricaun.RevitTest.Tests/.runsettings
@@ -4,7 +4,7 @@
     <Version>2023</Version>
     <Open>false</Open>
     <Close>false</Close>
-    <Verbosity>1</Verbosity>
+    <Verbosity>2</Verbosity>
     <!--
     <Application></Application>
     -->
diff --git a/ricaun.RevitTest.Tests/TestsCase.cs b/ricaun.RevitTest.Tests/TestsCase.cs
@@ -0,0 +1,19 @@
+﻿using Autodesk.Revit.DB;
+using Autodesk.Revit.UI;
+using NUnit.Framework;
+using System;
+
+namespace ricaun.RevitTest.Tests
+{
+    public class TestsCase
+    {
+        [TestCase(null)]
+        [TestCase("")]
+        [TestCase(" ")]
+        public void TestStringCase(string value)
+        {
+            Assert.IsTrue(string.IsNullOrWhiteSpace(value));
+        }
+
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -50,6 +50,10 @@ public void Info(string message)`
`50`	`50`	`{`
`51`	`51`	`}`
`52`	`52`
	`53`	`+ public void Info(string message, int verbosity)`
	`54`	`+ {`
	`55`	`+ }`
	`56`	`+`
`53`	`57`	`public void Warning(string message)`
`54`	`58`	`{`
`55`	`59`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,8 +19,11 @@ string ConvertKey(string key)`
`19`	`19`	`}`
`20`	`20`	`string ConvertValue(object value)`
`21`	`21`	`{`
`22`		`- if (value is string)`
	`22`	`+ if (value is string valueString)`
	`23`	`+ {`
	`24`	`+ value = valueString.Replace("\"", "\\\"");`
`23`	`25`	`return $"\"{value}\"";`
	`26`	`+ }`
`24`	`27`	`return $"{value}";`
`25`	`28`	`}`
`26`	`29`	`var arguments = "";`
`@@ -34,6 +37,7 @@ string ConvertValue(object value)`
`34`	`37`	`arguments += $"{ConvertKey(item.Key)} ";`
`35`	`38`	`arguments += $"{ConvertValue(item.Value)} ";`
`36`	`39`	`}`
	`40`	`+ AdapterLogger.Logger.Debug($"\tCreateArguments: {arguments}");`
`37`	`41`	`return arguments;`
`38`	`42`	`}`
`39`	`43`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ protected void Initialize(IDiscoveryContext discoveryContext, IMessageLogger mes`
`29`	`29`	`AdapterSettings.Create(discoveryContext);`
`30`	`30`	`AdapterLogger.Create(messageLogger, AdapterSettings.Settings.NUnit.Verbosity);`
`31`	`31`
`32`		`- AdapterLogger.Logger.Info($"TestAdapter: {this.AdapterVersion}");`
	`32`	`+ AdapterLogger.Logger.Info($"TestAdapter: {this.AdapterVersion}", 0);`
`33`	`33`	`AdapterLogger.Logger.Info($"AdapterSettings: {AdapterSettings.Settings}");`
`34`	`34`	`//AdapterLogger.Logger.Debug($"SettingsXml: {discoveryContext.RunSettings.SettingsXml}");`
`35`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,10 @@ namespace ricaun.RevitTest.TestAdapter`
`4`	`4`	`{`
`5`	`5`	`public static class TestCaseUtils`
`6`	`6`	`{`
	`7`	`+ public static string GetFullName(TestCase testCase)`
	`8`	`+ {`
	`9`	`+ return $"{testCase.FullyQualifiedName}.{testCase.DisplayName}";`
	`10`	`+ }`
`7`	`11`	`public static TestCase Create(string source, string testName)`
`8`	`12`	`{`
`9`	`13`	`var fullyQualifiedName = testName.Substring(0, testName.LastIndexOf('.'));`
Original file line number	Diff line number	Diff line change
`@@ -78,12 +78,23 @@ private async Task RunTests(IFrameworkHandle frameworkHandle, string source, Lis`
`78`	`78`	`tests = tests ?? new List<TestCase>();`
`79`	`79`
`80`	`80`	`AdapterLogger.Logger.Info($"RunTest: {source} [TestCase: {tests.Count}]");`
`81`		`-`
	`81`	`+ foreach (var test in tests)`
	`82`	`+ {`
	`83`	`+ AdapterLogger.Logger.Info($"Test: {test.FullyQualifiedName}.{test.DisplayName}");`
	`84`	`+ }`
`82`	`85`	`Metadatas.MetadataSettings.Create(source);`
`83`	`86`
	`87`	`+ AdapterLogger.Logger.Info("---------");`
	`88`	`+ AdapterLogger.Logger.Info($"RevitTestConsole: {AdapterSettings.Settings.NUnit.Application}");`
	`89`	`+ AdapterLogger.Logger.Info("---------");`
	`90`	`+`
`84`	`91`	`using (var revit = new RevitTestConsole(AdapterSettings.Settings.NUnit.Application))`
`85`	`92`	`{`
`86`		`- var filters = tests.Select(e => $"{e.FullyQualifiedName}.{e.DisplayName}").ToArray();`
	`93`	`+ var filters = tests.Select(TestCaseUtils.GetFullName).ToArray();`
	`94`	`+ foreach (var filter in filters)`
	`95`	`+ {`
	`96`	`+ AdapterLogger.Logger.Debug($"\tTestFilter: {filter}");`
	`97`	`+ }`
`87`	`98`
`88`	`99`	`Action<string> outputConsole = (item) =>`
`89`	`100`	`{`
`@@ -99,14 +110,14 @@ private async Task RunTests(IFrameworkHandle frameworkHandle, string source, Lis`
`99`	`110`	`{`
`100`	`111`	`if (item.Deserialize<TestModel>() is TestModel testModel)`
`101`	`112`	`{`
`102`		`- var testCase = tests.FirstOrDefault(e => $"{e.FullyQualifiedName}.{e.DisplayName}".Equals(testModel.FullName));`
	`113`	`+ var testCase = tests.FirstOrDefault(e => TestCaseUtils.GetFullName(e).Equals(testModel.FullName));`
`103`	`114`
`104`	`115`	`if (testCase is null)`
`105`	`116`	`{`
`106`	`117`	`testCase = TestCaseUtils.Create(source, testModel.FullName);`
`107`	`118`	`}`
`108`	`119`
`109`		`- AdapterLogger.Logger.Info($"TestCase: {testCase}");`
	`120`	`+ AdapterLogger.Logger.Info($"\tTestCase: {testCase}");`
`110`	`121`
`111`	`122`	`var testResult = new TestResult(testCase);`
`112`	`123`
`@@ -131,12 +142,16 @@ private async Task RunTests(IFrameworkHandle frameworkHandle, string source, Lis`
`131`	`142`	`}`
`132`	`143`	`};`
`133`	`144`
	`145`	`+ AdapterLogger.Logger.Info($"RunRevitTest: {source} [Version: {AdapterSettings.Settings.NUnit.Version}] [TestFilter: {filters.Length}]");`
	`146`	`+`
`134`	`147`	`await revit.RunTestAction(source,`
`135`	`148`	`AdapterSettings.Settings.NUnit.Version,`
`136`	`149`	`AdapterSettings.Settings.NUnit.Open,`
`137`	`150`	`AdapterSettings.Settings.NUnit.Close,`
`138`	`151`	`outputConsole, filters);`
`139`	`152`	`}`
	`153`	`+`
	`154`	`+ AdapterLogger.Logger.Info("---------");`
`140`	`155`	`}`
`141`	`156`	`}`
`142`	`157`	`}`