diff --git a/Build/Program.cs b/Build/Program.cs index 4ff6843..6276b61 100644 --- a/Build/Program.cs +++ b/Build/Program.cs @@ -83,9 +83,9 @@ Target( return Glob.Files(".", d); } - foreach (var file in GetFiles("**/*.Test.csproj")) + foreach (var file in GetFiles("**/*.Tests.csproj")) { - Run("dotnet", $"test {file} -c Release --no-restore --verbosity=normal"); + Run("dotnet", $"test {file} -c Release --no-build --verbosity=normal"); } } ); diff --git a/Directory.Packages.props b/Directory.Packages.props index 8a79e88..595b6f7 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -1,11 +1,18 @@ - + - + + - + + + + + + + - + \ No newline at end of file diff --git a/Revit/Speckle.Revit.Api/IRevitDocumentProxy.cs b/Revit/Speckle.Revit.Api/IRevitDocumentProxy.cs index 74040f9..605d7e6 100644 --- a/Revit/Speckle.Revit.Api/IRevitDocumentProxy.cs +++ b/Revit/Speckle.Revit.Api/IRevitDocumentProxy.cs @@ -33,7 +33,9 @@ public partial interface IRevitElementProxy : IRevitElement; public partial class ElementProxy { public IRevitParameter GetParameter(RevitBuiltInParameter builtInParameter) => - new ParameterProxy(_Instance.get_Parameter(EnumUtility.Convert(builtInParameter))); + new ParameterProxy( + _Instance.get_Parameter(EnumUtility.Convert(builtInParameter)) + ); public IRevitBoundingBoxXYZ GetBoundingBox() => new BoundingBoxXYZProxy(_Instance.get_BoundingBox(null)); diff --git a/Revit/Speckle.Revit.Api/IRevitUnitsProxy.cs b/Revit/Speckle.Revit.Api/IRevitUnitsProxy.cs index 1cacff3..a1c84a3 100644 --- a/Revit/Speckle.Revit.Api/IRevitUnitsProxy.cs +++ b/Revit/Speckle.Revit.Api/IRevitUnitsProxy.cs @@ -197,7 +197,8 @@ public partial interface IRevitFamilyInstanceProxy : IRevitFamilyInstance; public partial class FamilyInstanceProxy { - public RevitStructuralType StructuralType => EnumUtility.Convert(_Instance.StructuralType); + public RevitStructuralType StructuralType => + EnumUtility.Convert(_Instance.StructuralType); } [Proxy(typeof(Solid), ImplementationOptions.UseExtendedInterfaces | ImplementationOptions.ProxyForBaseInterface)] @@ -222,7 +223,8 @@ public partial interface IRevitOptionsProxy : IRevitOptions; public partial class OptionsProxy { - public RevitViewDetailLevel DetailLevel => EnumUtility.Convert(_Instance.DetailLevel); + public RevitViewDetailLevel DetailLevel => + EnumUtility.Convert(_Instance.DetailLevel); } [Proxy( diff --git a/Revit/Speckle.Revit.Api/RevitFilterFactory.cs b/Revit/Speckle.Revit.Api/RevitFilterFactory.cs index d457c6a..72f987c 100644 --- a/Revit/Speckle.Revit.Api/RevitFilterFactory.cs +++ b/Revit/Speckle.Revit.Api/RevitFilterFactory.cs @@ -41,7 +41,9 @@ public class RevitFilterFactory : IRevitFilterFactory ); public IRevitElementCategoryFilter CreateElementCategoryFilter(RevitBuiltInCategory category) => - new ElementCategoryFilterProxy(new ElementCategoryFilter(EnumUtility.Convert(category))); + new ElementCategoryFilterProxy( + new ElementCategoryFilter(EnumUtility.Convert(category)) + ); } [Proxy( diff --git a/Revit/Speckle.Revit.Api/RevitUnitUtils.cs b/Revit/Speckle.Revit.Api/RevitUnitUtils.cs index 339022a..ccf224d 100644 --- a/Revit/Speckle.Revit.Api/RevitUnitUtils.cs +++ b/Revit/Speckle.Revit.Api/RevitUnitUtils.cs @@ -91,5 +91,7 @@ public class RevitSolidUtils : IRevitSolidUtils public class RevitOptionsFactory : IRevitOptionsFactory { public IRevitOptions Create(RevitViewDetailLevel viewDetailLevel) => - new OptionsProxy(new Options() { DetailLevel = EnumUtility.Convert(viewDetailLevel) }); + new OptionsProxy( + new Options() { DetailLevel = EnumUtility.Convert(viewDetailLevel) } + ); } diff --git a/Revit/Speckle.Revit.Interfaces/EnumUtility.cs b/Revit/Speckle.Revit.Interfaces/EnumUtility.cs index 8b4c6cc..eb1d923 100644 --- a/Revit/Speckle.Revit.Interfaces/EnumUtility.cs +++ b/Revit/Speckle.Revit.Interfaces/EnumUtility.cs @@ -7,13 +7,14 @@ namespace Speckle.Revit.Interfaces where TDestination : struct, Enum { private static readonly ConcurrentDictionary _destinations = new(); + static EnumUtility() { - var sources = - ((TSource[])Enum.GetValues(typeof(TSource))).Select(x => (x.ToString().ToUpperInvariant(), x)); - var destinations = - ((TDestination[])Enum.GetValues(typeof(TDestination))).Select(x => (x.ToString().ToUpperInvariant(), x)).ToList(); - foreach (var (name, val) in sources) + var sources = ((TSource[])Enum.GetValues(typeof(TSource))).Select(x => (x.ToString().ToUpperInvariant(), x)); + var destinations = ((TDestination[])Enum.GetValues(typeof(TDestination))) + .Select(x => (x.ToString().ToUpperInvariant(), x)) + .ToList(); + foreach (var (name, val) in sources) { var d = destinations.Where(x => x.Item1 == name).ToList(); if (d.Any()) diff --git a/Revit/Speckle.Revit.Interfaces/RevitBuiltInParameter.cs b/Revit/Speckle.Revit.Interfaces/RevitBuiltInParameter.cs index 14ec87c..d28c800 100644 --- a/Revit/Speckle.Revit.Interfaces/RevitBuiltInParameter.cs +++ b/Revit/Speckle.Revit.Interfaces/RevitBuiltInParameter.cs @@ -795,9 +795,11 @@ public enum RevitBuiltInParameter FABRICATION_END_SIZE = -1141013, // 0xFFEE96EB FABRICATION_BRANCH_SIZE = -1141012, // 0xFFEE96EC FABRICATION_SECONDARY_SIZE = -1141011, // 0xFFEE96ED + //FABRICATION_SEC_SIZE = -1141011, // 0xFFEE96ED FABRICATION_PRIMARY_SIZE = -1141010, // 0xFFEE96EE - // FABRICATION_PRI_SIZE = -1141010, // 0xFFEE96EE + + // FABRICATION_PRI_SIZE = -1141010, // 0xFFEE96EE FABRICATION_CHANGE_SERVICE_PARAM = -1141009, // 0xFFEE96EF FABRICATION_SET_UP_DOWN_TAG_FROM_BOTTOM = -1141008, // 0xFFEE96F0 FABRICATION_INSULATION_MATERIAL_FINISH = -1141007, // 0xFFEE96F1 diff --git a/Speckle.Host.Apis.sln b/Speckle.Host.Apis.sln index 871fb1c..d90b6fa 100644 --- a/Speckle.Host.Apis.sln +++ b/Speckle.Host.Apis.sln @@ -46,6 +46,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{42C36267 EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Speckle.Tests", "Speckle.Tests\Speckle.Tests.csproj", "{D909A986-7D4F-45A6-B0A2-D69D4CEF86C5}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{1A746BD2-E68A-4877-9922-3549F6C00EDF}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -87,5 +89,6 @@ Global {E5BCFB04-C8E2-4F34-8E12-E4E6CB908153} = {8B47C7AE-9C8C-47D5-A3C5-ACEFCF54E3B9} {917D7C89-FA2D-4A26-906B-E18317C49734} = {8B47C7AE-9C8C-47D5-A3C5-ACEFCF54E3B9} {00F3BEC6-614D-4AEE-923A-0E2DF40FDE6B} = {42C36267-88A8-4F94-9E62-5D43A02D033C} + {D909A986-7D4F-45A6-B0A2-D69D4CEF86C5} = {1A746BD2-E68A-4877-9922-3549F6C00EDF} EndGlobalSection EndGlobal diff --git a/Speckle.Tests/EnumUtilityTests.cs b/Speckle.Tests/EnumUtilityTests.cs index 3e48b16..03ab297 100644 --- a/Speckle.Tests/EnumUtilityTests.cs +++ b/Speckle.Tests/EnumUtilityTests.cs @@ -11,7 +11,7 @@ public class EnumUtilityTests X = 1, Y = 2, } - + public enum Test2 { X = 3, @@ -30,7 +30,7 @@ public class EnumUtilityTests var x = EnumUtility.Convert(Test1.X); x.Should().Be(Test2.X); } - + [Test] public void Fails() { diff --git a/Speckle.Tests/Speckle.Tests.csproj b/Speckle.Tests/Speckle.Tests.csproj index 0843ba0..c0b2975 100644 --- a/Speckle.Tests/Speckle.Tests.csproj +++ b/Speckle.Tests/Speckle.Tests.csproj @@ -2,19 +2,16 @@ net8.0 - true + true - - - - - - - - - - + + + + + + + diff --git a/Speckle.Tests/packages.lock.json b/Speckle.Tests/packages.lock.json index c8fbffe..1dcc706 100644 --- a/Speckle.Tests/packages.lock.json +++ b/Speckle.Tests/packages.lock.json @@ -48,6 +48,12 @@ "resolved": "4.2.0", "contentHash": "4fJojPkzdoa4nB2+p6U+fITvPnVvwWSnsmiJ/Dl30xqiL3oxNbYvfeSLVd91hOmEjoUqSwN3Z7j1aFedjqWbUA==" }, + "NUnit3TestAdapter": { + "type": "Direct", + "requested": "[4.5.0, )", + "resolved": "4.5.0", + "contentHash": "s8JpqTe9bI2f49Pfr3dFRfoVSuFQyraTj68c3XXjIS/MRGvvkLnrg6RLqnTjdShX+AdFUCCU/4Xex58AdUfs6A==" + }, "Castle.Core": { "type": "Transitive", "resolved": "5.1.1",