Skip to content

Commit 6c5793b

Browse files
CBenghiCBenghi
committed
Removed use of [DeploymentItem]
The testing behaviour of net47 has changed and there were outstanding issues of local run See microsoft/testfx#295 and https://github.com/microsoft/testfx-docs/blob/master/RFCs/009-DeploymentItem-Attribute.md [DeploymentItem] should not be used anymore in VS2019.
1 parent d3b3e66 commit 6c5793b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+343
-451
lines changed

‎.gitignore

+2-1
Original file line numberDiff line numberDiff line change
@@ -198,4 +198,5 @@ FakesAssemblies/
198198
# Visual Studio 6 workspace options file
199199
*.opt
200200

201-
SharedFileVersionInfo.cs
201+
SharedFileVersionInfo.cs
202+
*.jfm

‎Tests/ActivationTests.cs

+1-2
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,10 @@ namespace Xbim.Essentials.Tests
1111
public class ActivationTests
1212
{
1313
[TestMethod]
14-
[DeploymentItem("TestSourceFiles")]
1514
public void ObjectActivation()
1615
{
1716
// This test would only make a sense with a not-in-memory model
18-
using (var model = IfcStore.Open("4walls1floorSite.ifc", null, 0))
17+
using (var model = IfcStore.Open(@"TestSourceFiles\4walls1floorSite.ifc", null, 0))
1918
{
2019
using (var txn = model.BeginTransaction("TXN"))
2120
{

‎Tests/BasicModelTests.cs

+5-6
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,12 @@
88
namespace Xbim.Essentials.Tests
99
{
1010
[TestClass]
11-
[DeploymentItem(@"TestSourceFiles")]
1211
public class BasicModelTests
1312
{
1413
[TestMethod]
1514
public void OpenIfcFile()
1615
{
17-
using (var models = new ModelFactory("4walls1floorSite.ifc"))
16+
using (var models = new ModelFactory("TestSourceFiles\\4walls1floorSite.ifc"))
1817
{
1918
models.Do(m =>
2019
Assert.IsTrue(m.Instances.Count > 0)
@@ -25,7 +24,7 @@ public void OpenIfcFile()
2524
[TestMethod]
2625
public void OpenIfcZipFile()
2726
{
28-
using (var models = new ModelFactory("TestZip.ifczip"))
27+
using (var models = new ModelFactory("TestSourceFiles\\TestZip.ifczip"))
2928
{
3029
models.Do(m =>
3130
Assert.IsTrue(m.Instances.Count > 0)
@@ -36,7 +35,7 @@ public void OpenIfcZipFile()
3635
[TestMethod]
3736
public void OpenIfcZipXmlFile()
3837
{
39-
using (var models = new ModelFactory("HelloWallXml.ifczip"))
38+
using (var models = new ModelFactory("TestSourceFiles\\HelloWallXml.ifczip"))
4039
{
4140
models.Do(m =>
4241
Assert.IsTrue(m.Instances.Count > 0)
@@ -50,7 +49,7 @@ public void OpenIfcZipXmlFileWithProgress()
5049
// Opening Zipped IfcXml was crashing when updating progress, since the DeflateStream does not implement Position
5150
void progress(int percent, object o) { };
5251

53-
var model = Ifc.IfcStore.Open("HelloWallXml.ifczip", null, null, progress, XbimDBAccess.Read);
52+
var model = Ifc.IfcStore.Open("TestSourceFiles\\HelloWallXml.ifczip", null, null, progress, XbimDBAccess.Read);
5453

5554
Assert.IsTrue(model.Instances.Count > 0);
5655

@@ -59,7 +58,7 @@ public void OpenIfcZipXmlFileWithProgress()
5958
[TestMethod]
6059
public void OpenIfcXmlFile()
6160
{
62-
using (var models = new ModelFactory("4walls1floorSite.ifcxml"))
61+
using (var models = new ModelFactory("TestSourceFiles\\4walls1floorSite.ifcxml"))
6362
{
6463
models.Do(m =>
6564
Assert.IsTrue(m.Instances.Count > 0)

‎Tests/BinaryDataTests.cs

+1-2
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,9 @@ public class BinaryDataTests
2222
{
2323
[TestCategory("IfcXml")]
2424
[TestMethod]
25-
[DeploymentItem("TestSourceFiles\\xbim.png")]
2625
public void BinaryBlobTextureTest()
2726
{
28-
var data = File.ReadAllBytes("xbim.png");
27+
var data = File.ReadAllBytes("TestSourceFiles\\xbim.png");
2928
using (var model = new MemoryModel(new EntityFactoryIfc4()))
3029
{
3130
using (var txn = model.BeginTransaction(""))

‎Tests/CommonTests.cs

+1-2
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,9 @@ public void StepFileHeaderVersionTest()
5959
}
6060

6161
[TestMethod]
62-
[DeploymentItem("TestFiles\\4walls1floorSite.ifc")]
6362
public void Can_skip_entities_while_parsing()
6463
{
65-
using (var strm = File.OpenRead(@"4walls1floorSite.ifc"))
64+
using (var strm = File.OpenRead(@"TestFiles\4walls1floorSite.ifc"))
6665
{
6766

6867
var ifc2x3MetaData = ExpressMetaData.GetMetadata((new Xbim.Ifc2x3.EntityFactoryIfc2x3()).GetType().GetTypeInfo().Module);

‎Tests/CrossAccessTests.cs

+1-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
namespace Xbim.Essentials.Tests
1515
{
1616
[TestClass]
17-
[DeploymentItem("TestSourceFiles/4walls1floorSite.ifc")]
1817
public class CrossAccessTests
1918
{
2019
[TestMethod]
@@ -50,7 +49,7 @@ public void CollectionRemoval()
5049
[TestMethod]
5150
public void SettingNamesTest()
5251
{
53-
using (var model = MemoryModel.OpenRead("4walls1floorSite.ifc"))
52+
using (var model = MemoryModel.OpenRead("TestSourceFiles\\4walls1floorSite.ifc"))
5453
{
5554
using (var txn = model.BeginTransaction(""))
5655
{

‎Tests/DerivedUnitTests.cs

+1-2
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,9 @@ namespace Xbim.Essentials.Tests
99
public class DerivedUnitTests
1010
{
1111
[TestMethod]
12-
[DeploymentItem("TestSourceFiles\\IfcDerivedUnit.ifcxml")]
1312
public void CheckIfcDerivedUnit()
1413
{
15-
var path = @"IfcDerivedUnit.ifcxml";
14+
var path = @"TestSourceFiles\\IfcDerivedUnit.ifcxml";
1615
var store = IfcStore.Open(path);
1716
var derivedUnit = store.Instances.FirstOrDefault<IfcDerivedUnit>(u => u.UnitType == IfcDerivedUnitEnum.USERDEFINED);
1817
var conversionBasedUnit = store.Instances.FirstOrDefault<IIfcConversionBasedUnit>();

‎Tests/EditableInterfaces.cs

+2-4
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,9 @@ namespace Xbim.Essentials.Tests
2626
public class EditableInterfaces
2727
{
2828
[TestMethod]
29-
[DeploymentItem("TestSourceFiles\\4walls1floorSite.ifc")]
3029
public void SingleFieldTest()
3130
{
32-
const string file = "4walls1floorSite.ifc";
31+
const string file = "TestSourceFiles\\4walls1floorSite.ifc";
3332
using (var model = MemoryModel.OpenRead(file))
3433
{
3534
var extendedChanges = 0;
@@ -111,10 +110,9 @@ public void SingleFieldTest()
111110
}
112111

113112
[TestMethod]
114-
[DeploymentItem("TestSourceFiles\\4walls1floorSite.ifc")]
115113
public void ItemSetTest()
116114
{
117-
const string file = "4walls1floorSite.ifc";
115+
const string file = "TestSourceFiles\\4walls1floorSite.ifc";
118116
using (var model = MemoryModel.OpenRead(file))
119117
{
120118
var extendedChanges = 0;

‎Tests/EntitySelectionTests.cs

+1-2
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,11 @@ namespace Xbim.Essentials.Tests
1313
public class EntitySelectionTests
1414
{
1515
[TestMethod]
16-
[DeploymentItem(@"TestSourceFiles")]
1716
public void CanAddEntity()
1817
{
1918
DirectoryInfo d = new DirectoryInfo(".");
2019
Debug.WriteLine(d.FullName);
21-
using (var model = IfcStore.Open(@"P1.xbim"))
20+
using (var model = IfcStore.Open(@"TestSourceFiles\P1.xbim"))
2221
{
2322
EntitySelection sel = new EntitySelection();
2423
sel.CollectionChanged += Sel_CollectionChanged;

‎Tests/EqualityTests.cs

+3-6
Original file line numberDiff line numberDiff line change
@@ -71,11 +71,10 @@ public void EqualityTest()
7171
/// This method tests the opening and retrival of an esent model from a dictionary
7272
/// </summary>
7373
[TestMethod]
74-
[DeploymentItem(@"TestSourceFiles\P1.xbim")]
7574
public void StoreEqualityTest()
7675
{
7776
Dictionary<IModel, int> d = new Dictionary<IModel, int>();
78-
var model = IfcStore.Open(@"P1.xbim");
77+
var model = IfcStore.Open(@"TestSourceFiles\P1.xbim");
7978
d.Add(model, 1);
8079

8180
int restored;
@@ -89,11 +88,10 @@ public void StoreEqualityTest()
8988
/// This method tests the opening and retrival of an XbimInstanceHandle from a dictionary
9089
/// </summary>
9190
[TestMethod]
92-
[DeploymentItem(@"TestSourceFiles\P1.xbim")]
9391
public void XbimInstanceHandleSupportsDictionary()
9492
{
9593
Dictionary<XbimInstanceHandle, int> d = new Dictionary<XbimInstanceHandle, int>();
96-
using (var model = IfcStore.Open(@"P1.xbim"))
94+
using (var model = IfcStore.Open(@"TestSourceFiles\P1.xbim"))
9795
{
9896
var ent = model.Instances.FirstOrDefault();
9997

@@ -114,11 +112,10 @@ public void XbimInstanceHandleSupportsDictionary()
114112
/// this method tests the opening and retrival of an memory model from a dictionary
115113
/// </summary>
116114
[TestMethod]
117-
[DeploymentItem(@"TestSourceFiles\email.ifc")]
118115
public void IfcStoreEqualityTest()
119116
{
120117
Dictionary<IModel, int> d = new Dictionary<IModel, int>();
121-
var model = IfcStore.Open(@"email.ifc");
118+
var model = IfcStore.Open(@"TestSourceFiles\email.ifc");
122119
d.Add(model, 1);
123120

124121
var hasInstances = model.Instances.Any();

‎Tests/EsentParsingTests.cs

+1-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ public class EsentParsingTests
1212
//
1313
[TestMethod]
1414
[Ignore]
15-
[DeploymentItem("TestFiles\\Issue107.zip")]
1615
public void ForConsideration_Issue107OnEsentModel()
1716
{
1817
// a merged PR on issue 107 makes the memory model more tolerant of bad files.
@@ -21,7 +20,7 @@ public void ForConsideration_Issue107OnEsentModel()
2120
using (var model = new Esent.EsentModel(new Ifc2x3.EntityFactoryIfc2x3()))
2221
{
2322
var temp = Path.GetTempPath() + Guid.NewGuid() + ".zip";
24-
File.Copy("Issue107.zip", temp);
23+
File.Copy("TestFiles\\Issue107.zip", temp);
2524
try
2625
{
2726
var errCount = model.CreateFrom(temp);

‎Tests/EsentProviderTests.cs

+1-2
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,9 @@ namespace Xbim.Essentials.Tests
1313
public class EsentProviderTests
1414
{
1515
[TestMethod]
16-
[DeploymentItem("TestFiles\\4walls1floorSite.ifc")]
1716
public void PersistedEsentTest()
1817
{
19-
var file = "4walls1floorSite.ifc";
18+
var file = "TestFiles\\4walls1floorSite.ifc";
2019
var db = Guid.NewGuid().ToString() + ".xbim";
2120
var provider = new EsentModelProvider { DatabaseFileName = db };
2221
var schema = provider.GetXbimSchemaVersion(file);

‎Tests/FederationPathTests.cs

+7-6
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,16 @@ public class FederationPathTests
2020
const string federationFile = @"RelativePathFederation.ifc";
2121

2222
[TestMethod]
23-
[DeploymentItem(sourceFolder + federationFile, "moved")]
24-
[DeploymentItem(sourceFolder + "P1_cm.ifc", "moved")]
25-
[DeploymentItem(sourceFolder + "P2_cm.ifc", "moved")]
2623
public void CanFindRelativeFiles()
2724
{
28-
FileInfo f = new FileInfo(".");
29-
Debug.WriteLine(f.FullName);
25+
Directory.Delete("moved", true);
26+
Directory.CreateDirectory("moved");
3027

31-
var store = IfcStore.Open("moved\\" + federationFile);
28+
File.Copy("FederationTestFiles\\RelativePathFederation.ifc", "moved\\RelativePathFederation.ifc");
29+
File.Copy("FederationTestFiles\\P1_cm.ifc", "moved\\P1_cm.ifc");
30+
File.Copy("FederationTestFiles\\P2_cm.ifc", "moved\\P2_cm.ifc");
31+
32+
var store = IfcStore.Open("moved\\RelativePathFederation.ifc");
3233
Assert.AreEqual(2, store.ReferencedModels.Count());
3334
}
3435
}

‎Tests/GeometryCacheTests.cs

+4-5
Original file line numberDiff line numberDiff line change
@@ -6,27 +6,26 @@
66
namespace Xbim.Essentials.Tests
77
{
88
[TestClass]
9-
[DeploymentItem(@"GeometryCacheTestFiles\")]
109
public class GeometryCacheTests
1110
{
1211
[TestMethod]
1312
public void FileVersionIsCorrect()
1413
{
1514
var m = new EsentModel(new EntityFactoryIfc4());
1615

17-
m.Open("Monolith-NoGeomTables.xBIM", XbimDBAccess.ReadWrite);
16+
m.Open("GeometryCacheTestFiles\\Monolith-NoGeomTables.xBIM", XbimDBAccess.ReadWrite);
1817
Assert.AreEqual(0, m.GeometrySupportLevel, "GeometrySupportLevel should be 0");
1918
m.Close();
2019

21-
m.Open("Monolith_Nogeom_Version1Schema.xBIM");
20+
m.Open("GeometryCacheTestFiles\\Monolith_Nogeom_Version1Schema.xBIM");
2221
Assert.AreEqual(0, m.GeometrySupportLevel, "GeometrySupportLevel should be 0");
2322
m.Close();
2423

25-
m.Open("Monolith_v10.xBIM");
24+
m.Open("GeometryCacheTestFiles\\Monolith_v10.xBIM");
2625
Assert.AreEqual(1, m.GeometrySupportLevel, "GeometrySupportLevel for Monolith_v10 should be 1");
2726
m.Close();
2827

29-
m.Open("Monolith_v20.xBIM");
28+
m.Open("GeometryCacheTestFiles\\Monolith_v20.xBIM");
3029
Assert.AreEqual(2, m.GeometrySupportLevel, "GeometrySupportLevel for Monolith_v20 should be 2");
3130
m.Close();
3231
}

‎Tests/GeometryPersistencyTables.cs

+3-6
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,11 @@ namespace Xbim.Essentials.Tests
1111
public class GeometryPersistencyTables
1212
{
1313
[TestMethod]
14-
[DeploymentItem(@"GeometryCacheTestFiles\", @"Persistency\")]
1514
public void CanUpgradeDbStucture()
1615
{
1716
using (var m = new EsentModel(new EntityFactoryIfc4()))
1817
{
19-
m.Open(@"Persistency\Monolith_v10.xBIM", XbimDBAccess.Exclusive);
18+
m.Open(@"GeometryCacheTestFiles\Monolith_v10.xBIM", XbimDBAccess.Exclusive);
2019
Assert.AreEqual(1, m.GeometrySupportLevel, "GeometrySupportLevel for Monolith_v10 should be 1");
2120

2221
var updated = m.EnsureGeometryTables();
@@ -29,7 +28,7 @@ public void CanUpgradeDbStucture()
2928
m.Close();
3029
}
3130

32-
using (var store = IfcStore.Open(@"Persistency\Monolith_v10.xBIM"))
31+
using (var store = IfcStore.Open(@"GeometryCacheTestFiles\Monolith_v10.xBIM"))
3332
{
3433
var geometryStore = store.GeometryStore;
3534

@@ -45,11 +44,9 @@ public void CanUpgradeDbStucture()
4544
}
4645

4746
[TestMethod]
48-
[DeploymentItem(@"GeometryCacheTestFiles\", @"Persistency\")]
49-
// [DeploymentItem("TestFiles")]
5047
public void ResourceReleaseOnOldModel()
5148
{
52-
using (var model = IfcStore.Open(@"Persistency\Monolith_v10.xBIM"))
49+
using (var model = IfcStore.Open(@"GeometryCacheTestFiles\Monolith_v10.xBIM"))
5350
{
5451
var geomStore = model.GeometryStore;
5552
var tp = geomStore.GetType().ToString();

0 commit comments

Comments
 (0)