Skip to content

Commit

Permalink
Merge branch 'dev' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
teocomi authored Mar 31, 2023
2 parents 8f5b2d0 + ffcc830 commit 1677715
Show file tree
Hide file tree
Showing 102 changed files with 812 additions and 292 deletions.
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "Objects/Converters/ConverterRevit/ConverterRevitTests/xUnitRevit"]
path = Objects/Converters/ConverterRevit/ConverterRevitTests/xUnitRevit
url = https://github.com/specklesystems/xUnitRevit.git
165 changes: 153 additions & 12 deletions ConnectorRevit/ConnectorRevit.sln

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,17 @@
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>ConveterRevitTests</RootNamespace>
<AssemblyName>ConverterRevitTests</AssemblyName>
<AssemblyName>ConverterRevitTests2021</AssemblyName>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<LangVersion>8</LangVersion>
<FileAlignment>512</FileAlignment>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE;REVIT2021</DefineConstants>
<DefineConstants>TRACE;DEBUG;REVIT2021</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<StartAction>Program</StartAction>
Expand Down Expand Up @@ -61,42 +62,7 @@
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="BrepTests.cs" />
<Compile Include="DuctTests.cs" />
<Compile Include="PipeTests.cs" />
<Compile Include="RoofTests.cs" />
<Compile Include="FamilyInstanceTests.cs" />
<Compile Include="CurveTests.cs" />
<Compile Include="DirectShapeTests.cs" />
<Compile Include="AdaptiveComponentTests.cs" />
<Compile Include="RoomTests.cs" />
<Compile Include="BeamTests.cs" />
<Compile Include="ColumnTests.cs" />
<Compile Include="Globals.cs" />
<Compile Include="OpeningTests.cs" />
<Compile Include="FloorTests.cs" />
<Compile Include="SpeckleConversionFixture.cs" />
<Compile Include="SpeckleConversionTest.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="WallTests.cs" />
<Compile Include="WireTests.cs" />
</ItemGroup>
<ItemGroup>
<None Include="SpeckleRevitTests.addin" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\Core\Core\Core.csproj">
<Project>{7ef0c96c-1fd9-42b2-85ce-bfd9b10dac06}</Project>
<Name>Core</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\Objects\Objects.csproj">
<Project>{95c2153a-642e-4779-90c0-bff56fc561a9}</Project>
<Name>Objects</Name>
</ProjectReference>
<ProjectReference Include="..\ConverterRevit2021\ConverterRevit2021.csproj">
<Project>{bf5515b4-c97c-4fb9-9f93-1740d2b615b3}</Project>
<Name>ConverterRevit2021</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Autodesk.Revit.SDK">
Expand All @@ -110,31 +76,33 @@
<PackageReference Include="ModPlus.Revit.API.2021">
<Version>1.0.0</Version>
</PackageReference>
<PackageReference Include="xunit">
<Version>2.4.1</Version>
</PackageReference>
<PackageReference Include="xunit.abstractions">
<Version>2.0.3</Version>
</PackageReference>
<PackageReference Include="xunit.analyzers">
<Version>0.10.0</Version>
</PackageReference>
<PackageReference Include="xunit.assert">
<Version>2.4.1</Version>
</PackageReference>
<PackageReference Include="xunit.core">
<Version>2.4.1</Version>
</PackageReference>
<PackageReference Include="xunit.extensibility.core">
<Version>2.4.1</Version>
</PackageReference>
<PackageReference Include="xunit.extensibility.execution">
<Version>2.4.1</Version>
</PackageReference>
<PackageReference Include="xUnitRevitUtils.2021">
<Version>1.0.4</Version>
<PackageReference Include="Revit.Async">
<Version>2.0.1</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\..\..\xUnitRevit\speckle.xunit.runner.wpf\speckle.xunit.runner.wpf\speckle.xunit.runner.wpf.csproj">
<Project>{10653ecd-e11b-4d1b-827b-6fd6a454f3ac}</Project>
<Name>speckle.xunit.runner.wpf</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\..\..\..\xUnitRevit\xUnitRevitUtils\xUnitRevitUtils2021\xUnitRevitUtils2021.csproj">
<Project>{b89dbe55-af21-45dd-b469-473d6502cfd0}</Project>
<Name>xUnitRevitUtils2021</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\..\..\Core\Core\Core.csproj">
<Project>{521d4aee-08cf-4913-bbe8-5511d176d126}</Project>
<Name>Core</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\..\Objects\Objects.csproj">
<Project>{be852be3-37b8-4b62-ac2c-0872c41a2542}</Project>
<Name>Objects</Name>
</ProjectReference>
<ProjectReference Include="..\..\ConverterRevit2021\ConverterRevit2021.csproj">
<Project>{cfbd9a83-5aa2-4849-8735-28d4f73f4f56}</Project>
<Name>ConverterRevit2021</Name>
</ProjectReference>
</ItemGroup>
<Import Project="..\ConverterRevitTestsShared\ConverterRevitTestsShared.projitems" Label="Shared" />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PostBuildEvent>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,119 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\..\..\packages\xunit.core.2.4.1\build\xunit.core.props" Condition="Exists('..\..\..\packages\xunit.core.2.4.1\build\xunit.core.props')" />
<Import Project="..\packages\xunit.core.2.4.1\build\xunit.core.props" Condition="Exists('..\packages\xunit.core.2.4.1\build\xunit.core.props')" />
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
None
</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
<TargetFrameworkProfile />
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
<IsPackable>false</IsPackable>
</PropertyGroup>
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{5F2E1759-74A8-4DA6-AD11-906EBEF6B587}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>ConveterRevitTests</RootNamespace>
<AssemblyName>ConverterRevitTests2023</AssemblyName>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<LangVersion>8</LangVersion>
<FileAlignment>512</FileAlignment>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>TRACE;DEBUG;REVIT2023</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<StartAction>Program</StartAction>
<StartProgram>$(ProgramW6432)\Autodesk\Revit 2023\Revit.exe</StartProgram>
<RevitVersion>2023</RevitVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<StartAction>Program</StartAction>
<StartProgram>$(ProgramW6432)\Autodesk\Revit 2023\Revit.exe</StartProgram>
<RevitVersion>2023</RevitVersion>
</PropertyGroup>
<ItemGroup>
<Reference Include="PresentationCore">
<Private>True</Private>
</Reference>
<Reference Include="PresentationFramework">
<Private>True</Private>
</Reference>
<Reference Include="System">
<Private>True</Private>
</Reference>
<Reference Include="WindowsBase">
<Private>True</Private>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Autodesk.Revit.SDK">
<Version>2023.0.0</Version>
</PackageReference>
<PackageReference Include="coverlet.collector">
<Version>1.3.0</Version>
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="ModPlus.Revit.API.2023">
<Version>1.0.0</Version>
</PackageReference>
<PackageReference Include="Revit.Async">
<Version>2.0.1</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\..\..\xUnitRevit\speckle.xunit.runner.wpf\speckle.xunit.runner.wpf\speckle.xunit.runner.wpf.csproj">
<Project>{10653ecd-e11b-4d1b-827b-6fd6a454f3ac}</Project>
<Name>speckle.xunit.runner.wpf</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\..\..\..\xUnitRevit\xUnitRevitUtils\xUnitRevitUtils2023\xUnitRevitUtils2023.csproj">
<Project>{43f0f1cc-6875-4abf-8482-c30ee4bb2562}</Project>
<Name>xUnitRevitUtils2023</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\..\..\Core\Core\Core.csproj">
<Project>{521d4aee-08cf-4913-bbe8-5511d176d126}</Project>
<Name>Core</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\..\Objects\Objects.csproj">
<Project>{be852be3-37b8-4b62-ac2c-0872c41a2542}</Project>
<Name>Objects</Name>
</ProjectReference>
<ProjectReference Include="..\..\ConverterRevit2021\ConverterRevit2021.csproj">
<Project>{cfbd9a83-5aa2-4849-8735-28d4f73f4f56}</Project>
<Name>ConverterRevit2021</Name>
</ProjectReference>
</ItemGroup>
<Import Project="..\ConverterRevitTestsShared\ConverterRevitTestsShared.projitems" Label="Shared" />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PostBuildEvent>
</PostBuildEvent>
</PropertyGroup>
<!--<Target Name="AfterBuild">
<ItemGroup>
<SourceDLLs Include="$(TargetDir)\**\*.*" />
<SourceManifest Include="$(ProjectDir)*.addin" />
</ItemGroup>
<Copy DestinationFolder="$(AppData)\Autodesk\REVIT\Addins\$(RevitVersion)\$(ProjectName)\%(RecursiveDir)" SourceFiles="@(SourceDLLs)" />
<Copy DestinationFolder="$(AppData)\Autodesk\REVIT\Addins\$(RevitVersion)\" SourceFiles="@(SourceManifest)" />
</Target>-->
</Project>
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;

// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("ConverterRevitTests")]
[assembly: AssemblyDescription("Revit Add-In Description for ConverterRevitTests")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Autodesk Inc.")]
[assembly: AssemblyProduct("ConverterRevitTests Revit C# .NET Add-In")]
[assembly: AssemblyCopyright("Copyright (C) 2020 by Jeremy Tammik, Autodesk Inc.")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
// COM, set the ComVisible attribute to true on that type.
[assembly: ComVisible(false)]

// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("321044f7-b0b2-4b1c-af18-e71a19252be0")]

// Version information for an assembly consists of the following four values:
//
// Major Version
// Minor Version
// Build Number
// Revision
//
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2021.0.0.0")]
[assembly: AssemblyFileVersion("2021.0.0.0")]
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@
using System.Collections.Generic;

using Xunit;

using System.Threading.Tasks;

namespace ConverterRevitTests
{
public class AdaptiveComponentFixture : SpeckleConversionFixture
{
public override string TestFile => Globals.GetTestModel("AdaptiveComponent.rvt");
public override string NewFile => Globals.GetTestModel("AdaptiveComponent_ToNative.rvt");
public override string NewFile => Globals.GetTestModel("AdaptiveComponentToNative.rvt");
//USING GENERIC MODELS FOR AC, fine for testing
public override List<BuiltInCategory> Categories => new List<BuiltInCategory> { BuiltInCategory.OST_GenericModel };
public AdaptiveComponentFixture() : base ()
Expand All @@ -21,32 +21,31 @@ public AdaptiveComponentFixture() : base ()

public class AdaptiveComponentTests : SpeckleConversionTest, IClassFixture<AdaptiveComponentFixture>
{
public AdaptiveComponentTests(AdaptiveComponentFixture fixture)
{
this.fixture = fixture;
public AdaptiveComponentTests(AdaptiveComponentFixture fixture) : base (fixture)
{
}

[Fact]
[Trait("AdaptiveComponent", "ToSpeckle")]
public void AdaptiveComponentToSpeckle()
public async Task AdaptiveComponentToSpeckle()
{
NativeToSpeckle();
await NativeToSpeckle();
}

#region ToNative

[Fact]
[Trait("AdaptiveComponent", "ToNative")]
public void AdaptiveComponentToNative()
public async Task AdaptiveComponentToNative()
{
SpeckleToNative<DB.FamilyInstance>(AdaptiveComponentEqual);
await SpeckleToNative<DB.FamilyInstance>(AdaptiveComponentEqual);
}

[Fact]
[Trait("AdaptiveComponent", "Selection")]
public void AdaptiveComponentSelectionToNative()
public async Task AdaptiveComponentSelectionToNative()
{
SelectionToNative<DB.FamilyInstance>(AdaptiveComponentEqual);
await SelectionToNative<DB.FamilyInstance>(AdaptiveComponentEqual);
}

private void AdaptiveComponentEqual(DB.FamilyInstance sourceElem, DB.FamilyInstance destElem)
Expand Down
Loading

0 comments on commit 1677715

Please sign in to comment.