Skip to content

Commit 4ed33f7

Browse files
committed
Merge branch 'develop'
2 parents 2feda62 + 4fd86d7 commit 4ed33f7

File tree

9 files changed

+4867
-3137
lines changed

9 files changed

+4867
-3137
lines changed

Tests/BinaryDataTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ private static void PixelTextureTestCode(XbimSchemaVersion version)
9090
var data = new List<byte[]>() { new byte[] { 0, 0, 255, 255 }, new byte[] { 0, 255, 255, 255 }, new byte[] { 255, 0, 255, 255 }, new byte[] { 255, 0, 0, 255 } };
9191
using (var model = new MemoryModel(new EntityFactoryIfc4()))
9292
{
93-
var create = new Create(model);
93+
var create = new EntityCreator(model);
9494
using (var txn = model.BeginTransaction(""))
9595
{
9696
var pt = create.PixelTexture(t => {

Tests/Ifc4x3Tests.cs

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
using Xbim.Ifc4x3.GeometryResource;
1313
using Xbim.Ifc4x3.MeasureResource;
1414
using Xbim.Ifc4x3.ProductExtension;
15+
using Xbim.IO.Memory;
1516

1617
namespace Xbim.Essentials.Tests
1718
{
@@ -121,5 +122,17 @@ public void SurfaceDimensionsImplemented()
121122

122123
}
123124
}
125+
126+
[TestMethod]
127+
public void CanCreateEntitiesWithFactory()
128+
{
129+
using var model = new MemoryModel(new EntityFactoryIfc4x3Add2());
130+
using var txn = model.BeginTransaction("Creation");
131+
132+
var c = new EntityCreator(model);
133+
c.Wall(w => w.Name = "First wall");
134+
135+
txn.Commit();
136+
}
124137
}
125138
}

Tests/OwnerHistoryTests.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public void NonEmptyEditorCredentials()
1717
{
1818
using (var txn = model.BeginTransaction())
1919
{
20-
var create = new Create(model);
20+
var create = new EntityCreator(model);
2121
var wall = create.Wall(w => w.Name = "New wall");
2222
Assert.IsNotNull(wall.OwnerHistory);
2323
Assert.IsTrue(model.Instances.Count > 1);
@@ -33,7 +33,7 @@ public void EmptyEditorCredentials()
3333
model.ManageOwnerHistory = false;
3434
using (var txn = model.BeginTransaction())
3535
{
36-
var create = new Create(model);
36+
var create = new EntityCreator(model);
3737
var wall = create.Wall(w => w.Name = "New wall");
3838
Assert.IsNull(wall.OwnerHistory);
3939
Assert.AreEqual(1, model.Instances.Count);
@@ -48,7 +48,7 @@ public void NoOwnerHistoryForInsertCopy()
4848
{
4949
using (var txn = source.BeginTransaction())
5050
{
51-
var create = new Create(source);
51+
var create = new EntityCreator(source);
5252
source.ManageOwnerHistory = false;
5353
create.Wall(w => w.Name = "New wall #1");
5454
create.Wall(w => w.Name = "New wall #2");

Tests/Pure4Tests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public void IndependentCreation()
2222

2323
public void CreateDataWithoutInitializers(IModel model)
2424
{
25-
var create = new Create(model);
25+
var create = new EntityCreator(model);
2626
var wall = create.Wall();
2727
wall.PredefinedType = IfcWallTypeEnum.POLYGONAL;
2828
wall.Name = "Name of the perfect wall";
@@ -37,7 +37,7 @@ public void CreateDataWithoutInitializers(IModel model)
3737

3838
public void CreateDataWithInitializers(IModel model)
3939
{
40-
var create = new Create(model);
40+
var create = new EntityCreator(model);
4141
var wall = create.Wall(w =>
4242
{
4343
w.PredefinedType = IfcWallTypeEnum.POLYGONAL;

Tests/ValidationTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public void ContextDependentUnitValidationTest()
4646
{
4747
using (var txn = model.BeginTransaction())
4848
{
49-
var c = new Create(model);
49+
var c = new EntityCreator(model);
5050
var unit = c.ContextDependentUnit(u =>
5151
{
5252
u.UnitType = IfcUnitEnum.USERDEFINED;

Xbim.Essentials.tmpl

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,22 +38,32 @@
3838
</group>
3939
<group targetFramework="netstandard2.1">
4040
<dependency id="Xbim.Common" version="{{version}}" />
41+
<dependency id="Xbim.Ifc" version="{{version}}" />
4142
<dependency id="Xbim.Ifc4" version="{{version}}" />
4243
<dependency id="Xbim.Ifc2x3" version="{{version}}" />
4344
<dependency id="Xbim.Ifc4x3" version="{{version}}" />
4445
<dependency id="Xbim.IO.Esent" version="{{version}}" />
4546
<dependency id="Xbim.IO.MemoryModel" version="{{version}}" />
46-
<dependency id="Xbim.Ifc" version="{{version}}" />
4747
<dependency id="Xbim.Tessellator" version="{{version}}" />
4848
</group>
4949
<group targetFramework="net6.0">
5050
<dependency id="Xbim.Common" version="{{version}}" />
51+
<dependency id="Xbim.Ifc" version="{{version}}" />
5152
<dependency id="Xbim.Ifc4" version="{{version}}" />
5253
<dependency id="Xbim.Ifc2x3" version="{{version}}" />
5354
<dependency id="Xbim.Ifc4x3" version="{{version}}" />
5455
<dependency id="Xbim.IO.Esent" version="{{version}}" />
5556
<dependency id="Xbim.IO.MemoryModel" version="{{version}}" />
57+
<dependency id="Xbim.Tessellator" version="{{version}}" />
58+
</group>
59+
<group targetFramework="net8.0">
60+
<dependency id="Xbim.Common" version="{{version}}" />
5661
<dependency id="Xbim.Ifc" version="{{version}}" />
62+
<dependency id="Xbim.Ifc4" version="{{version}}" />
63+
<dependency id="Xbim.Ifc2x3" version="{{version}}" />
64+
<dependency id="Xbim.Ifc4x3" version="{{version}}" />
65+
<dependency id="Xbim.IO.Esent" version="{{version}}" />
66+
<dependency id="Xbim.IO.MemoryModel" version="{{version}}" />
5767
<dependency id="Xbim.Tessellator" version="{{version}}" />
5868
</group>
5969
</dependencies>

0 commit comments

Comments
 (0)