Skip to content

Commit 7de0799

Browse files
author
NickNick1210
committed
UnitTests an die Anpassungen angepasst
1 parent 1ce9db8 commit 7de0799

6 files changed

+105
-74
lines changed

‎test/algorithm/test_converter_lod0.py

+36-30
Original file line numberDiff line numberDiff line change
@@ -264,19 +264,19 @@ def test_1(self):
264264
root = etree.Element("root")
265265
lod0Conv = LoD0Converter(Converter(), ifc1, "Test123", trans1, True)
266266
result = lod0Conv.convert(root)
267-
self.assertEqual(5026, len(etree.tostring(result)))
267+
self.assertEqual(5110, len(etree.tostring(result)))
268268

269269
def test_2(self):
270270
root = etree.Element("root")
271271
lod0Conv = LoD0Converter(Converter(), ifc2, "TestABC", trans2, False)
272272
result = lod0Conv.convert(root)
273-
self.assertEqual(2878, len(etree.tostring(result)))
273+
self.assertEqual(3196, len(etree.tostring(result)))
274274

275275
def test_3(self):
276276
root = etree.Element("root")
277277
lod0Conv = LoD0Converter(Converter(), ifc3, "ÄÖÜß", trans3, False)
278278
result = lod0Conv.convert(root)
279-
self.assertEqual(6583, len(etree.tostring(result)))
279+
self.assertEqual(8845, len(etree.tostring(result)))
280280

281281

282282
class TestConvertFootPrint(unittest.TestCase):
@@ -286,11 +286,11 @@ def test_1(self):
286286
lod0Conv = LoD0Converter(Converter(), ifc1, "Test123", trans1, True)
287287
result = lod0Conv.convertFootPrint(ifcBldg1, root)
288288
corr = b'<root><ns0:lod0FootPrint xmlns:ns0="http://www.opengis.net/citygml/building/2.0"><ns1:MultiSurface' + \
289-
b' xmlns:ns1="http://www.opengis.net/gml"><ns1:surfaceMember><ns1:Polygon><ns1:outerBoundaryIs>' + \
290-
b'<ns1:LinearRing><ns1:coordinates>458870.063285681,5438773.62904949,110 ' + \
291-
b'458862.40284125,5438780.05692559,110 458870.116292566,5438789.24945891,110 ' + \
292-
b'458877.776736998,5438782.82158281,110 458870.063285681,5438773.62904949,110</ns1:coordinates>' + \
293-
b'</ns1:LinearRing></ns1:outerBoundaryIs></ns1:Polygon></ns1:surfaceMember></ns1:MultiSurface>' + \
289+
b' xmlns:ns1="http://www.opengis.net/gml"><ns1:surfaceMember><ns1:Polygon><ns1:exterior>' + \
290+
b'<ns1:LinearRing><ns1:pos>458870.063285681 5438773.62904949 110</ns1:pos><ns1:pos>458862.40284125 ' + \
291+
b'5438780.05692559 110</ns1:pos><ns1:pos>458870.116292566 5438789.24945891 110</ns1:pos><ns1:pos>' + \
292+
b'458877.776736998 5438782.82158281 110</ns1:pos><ns1:pos>458870.063285681 5438773.62904949 110' + \
293+
b'</ns1:pos></ns1:LinearRing></ns1:exterior></ns1:Polygon></ns1:surfaceMember></ns1:MultiSurface>' + \
294294
b'</ns0:lod0FootPrint></root>'
295295
self.assertEqual(corr, etree.tostring(root))
296296
corr = "POLYGON ((458870.063285681 5438773.62904949 110,458862.40284125 5438780.05692559 110," + \
@@ -303,14 +303,17 @@ def test_2(self):
303303
lod0Conv = LoD0Converter(Converter(), ifc2, "TestABC", trans2, False)
304304
result = lod0Conv.convertFootPrint(ifcBldg2, root)
305305
corr = b'<root><ns0:lod0FootPrint xmlns:ns0="http://www.opengis.net/citygml/building/2.0"><ns1:MultiSurface' + \
306-
b' xmlns:ns1="http://www.opengis.net/gml"><ns1:surfaceMember><ns1:Polygon><ns1:outerBoundaryIs>' + \
307-
b'<ns1:LinearRing><ns1:coordinates>479356.600506348,5444183.43024925,-3 479356.600506348,' + \
308-
b'5444185.43024925,-3 479362.600506348,5444185.43024925,-3 479362.600506348,5444183.43024925,-3 ' + \
309-
b'479380.600506348,5444183.43024925,-3 479380.600506348,5444171.43024925,-3 479363.100506348,' + \
310-
b'5444171.43024925,-3 479363.100506348,5444167.43024925,-3 479356.100506348,5444167.43024925,-3 ' + \
311-
b'479356.100506348,5444171.43024925,-3 479338.600506348,5444171.43024925,-3 479338.600506348,' + \
312-
b'5444183.43024925,-3 479356.600506348,5444183.43024925,-3</ns1:coordinates></ns1:LinearRing>' + \
313-
b'</ns1:outerBoundaryIs></ns1:Polygon></ns1:surfaceMember></ns1:MultiSurface></ns0:lod0FootPrint></root>'
306+
b' xmlns:ns1="http://www.opengis.net/gml"><ns1:surfaceMember><ns1:Polygon><ns1:exterior>' + \
307+
b'<ns1:LinearRing><ns1:pos>479356.600506348 5444183.43024925 -3</ns1:pos><ns1:pos>479356.600506348 ' + \
308+
b'5444185.43024925 -3</ns1:pos><ns1:pos>479362.600506348 5444185.43024925 -3</ns1:pos><ns1:pos>' + \
309+
b'479362.600506348 5444183.43024925 -3</ns1:pos><ns1:pos>479380.600506348 5444183.43024925 -3' + \
310+
b'</ns1:pos><ns1:pos>479380.600506348 5444171.43024925 -3</ns1:pos><ns1:pos>479363.100506348 ' + \
311+
b'5444171.43024925 -3</ns1:pos><ns1:pos>479363.100506348 5444167.43024925 -3</ns1:pos><ns1:pos>' + \
312+
b'479356.100506348 5444167.43024925 -3</ns1:pos><ns1:pos>479356.100506348 5444171.43024925 -3' + \
313+
b'</ns1:pos><ns1:pos>479338.600506348 5444171.43024925 -3</ns1:pos><ns1:pos>479338.600506348 ' + \
314+
b'5444183.43024925 -3</ns1:pos><ns1:pos>479356.600506348 5444183.43024925 -3</ns1:pos>' + \
315+
b'</ns1:LinearRing></ns1:exterior></ns1:Polygon></ns1:surfaceMember></ns1:MultiSurface>' + \
316+
b'</ns0:lod0FootPrint></root>'
314317
self.assertEqual(corr, etree.tostring(root))
315318
corr = "POLYGON ((479356.600506348 5444183.43024925 -3,479356.600506348 5444185.43024925 -3," + \
316319
"479362.600506348 5444185.43024925 -3,479362.600506348 5444183.43024925 -3,479380.600506348 " + \
@@ -324,7 +327,7 @@ def test_3(self):
324327
root = etree.Element("root")
325328
lod0Conv = LoD0Converter(Converter(), ifc3, "Test123", trans3, False)
326329
result = lod0Conv.convertFootPrint(ifcBldg3, root)
327-
self.assertEqual(3584, len(etree.tostring(root)))
330+
self.assertEqual(5066, len(etree.tostring(root)))
328331
self.assertEqual(85, result.GetGeometryRef(0).GetPointCount())
329332

330333

@@ -335,32 +338,35 @@ def test_1(self):
335338
lod0Conv = LoD0Converter(Converter(), ifc1, "Test123", trans1, True)
336339
lod0Conv.convertRoofEdge(ifcBldg1, root)
337340
corr = b'<root><ns0:lod0RoofEdge xmlns:ns0="http://www.opengis.net/citygml/building/2.0"><ns1:MultiSurface ' + \
338-
b'xmlns:ns1="http://www.opengis.net/gml"><ns1:surfaceMember><ns1:Polygon><ns1:outerBoundaryIs>' + \
339-
b'<ns1:LinearRing><ns1:coordinates>458878.864175246,5438782.56181742,113 458870.50793632,' + \
340-
b'5438772.60323966,113 458861.315403002,5438780.31669098,113 458869.671641928,5438790.27526874,113 ' + \
341-
b'458878.864175246,5438782.56181742,113</ns1:coordinates></ns1:LinearRing></ns1:outerBoundaryIs>' + \
342-
b'</ns1:Polygon></ns1:surfaceMember></ns1:MultiSurface></ns0:lod0RoofEdge></root>'
341+
b'xmlns:ns1="http://www.opengis.net/gml"><ns1:surfaceMember><ns1:Polygon><ns1:exterior>' + \
342+
b'<ns1:LinearRing><ns1:pos>458878.864175246 5438782.56181742 113</ns1:pos><ns1:pos>' + \
343+
b'458870.50793632 5438772.60323966 113</ns1:pos><ns1:pos>458861.315403002 5438780.31669098 113' + \
344+
b'</ns1:pos><ns1:pos>458869.671641928 5438790.27526874 113</ns1:pos><ns1:pos>458878.864175246 ' + \
345+
b'5438782.56181742 113</ns1:pos></ns1:LinearRing></ns1:exterior></ns1:Polygon></ns1:surfaceMember>' + \
346+
b'</ns1:MultiSurface></ns0:lod0RoofEdge></root>'
343347
self.assertEqual(corr, etree.tostring(root))
344348

345349
def test_2(self):
346350
root = etree.Element("root")
347351
lod0Conv = LoD0Converter(Converter(), ifc2, "Test123", trans2, True)
348352
lod0Conv.convertRoofEdge(ifcBldg2, root)
349353
corr = b'<root><ns0:lod0RoofEdge xmlns:ns0="http://www.opengis.net/citygml/building/2.0"><ns1:MultiSurface ' + \
350-
b'xmlns:ns1="http://www.opengis.net/gml"><ns1:surfaceMember><ns1:Polygon><ns1:outerBoundaryIs>' + \
351-
b'<ns1:LinearRing><ns1:coordinates>479337.600506348,5444176.43024925,9 479337.600506348,' + \
352-
b'5444184.43024925,9 479355.600506348,5444184.43024925,9 479355.600506348,5444186.43024925,9 ' + \
353-
b'479363.600506348,5444186.43024925,9 479363.600506348,5444184.43024925,9 479381.600506348,' + \
354-
b'5444184.43024925,9 479381.600506348,5444170.43024925,9 479337.600506348,5444170.43024925,9 ' + \
355-
b'479337.600506348,5444176.43024925,9</ns1:coordinates></ns1:LinearRing></ns1:outerBoundaryIs>' + \
356-
b'</ns1:Polygon></ns1:surfaceMember></ns1:MultiSurface></ns0:lod0RoofEdge></root>'
354+
b'xmlns:ns1="http://www.opengis.net/gml"><ns1:surfaceMember><ns1:Polygon><ns1:exterior>' + \
355+
b'<ns1:LinearRing><ns1:pos>479337.600506348 5444176.43024925 9</ns1:pos><ns1:pos>479337.600506348 ' + \
356+
b'5444184.43024925 9</ns1:pos><ns1:pos>479355.600506348 5444184.43024925 9</ns1:pos><ns1:pos>' + \
357+
b'479355.600506348 5444186.43024925 9</ns1:pos><ns1:pos>479363.600506348 5444186.43024925 9' + \
358+
b'</ns1:pos><ns1:pos>479363.600506348 5444184.43024925 9</ns1:pos><ns1:pos>479381.600506348 ' + \
359+
b'5444184.43024925 9</ns1:pos><ns1:pos>479381.600506348 5444170.43024925 9</ns1:pos><ns1:pos>' + \
360+
b'479337.600506348 5444170.43024925 9</ns1:pos><ns1:pos>479337.600506348 5444176.43024925 9' + \
361+
b'</ns1:pos></ns1:LinearRing></ns1:exterior></ns1:Polygon></ns1:surfaceMember></ns1:MultiSurface>' + \
362+
b'</ns0:lod0RoofEdge></root>'
357363
self.assertEqual(corr, etree.tostring(root))
358364

359365
def test_3(self):
360366
root = etree.Element("root")
361367
lod0Conv = LoD0Converter(Converter(), ifc3, "Test123", trans3, True)
362368
lod0Conv.convertRoofEdge(ifcBldg3, root)
363-
self.assertEqual(2091, len(etree.tostring(root)))
369+
self.assertEqual(2871, len(etree.tostring(root)))
364370

365371

366372
if __name__ == '__main__':

‎test/algorithm/test_converter_lod1.py

+6-6
Original file line numberDiff line numberDiff line change
@@ -249,19 +249,19 @@ def test_1(self):
249249
root = etree.Element("root")
250250
lod1Conv = LoD1Converter(Converter(), ifc1, "Test123", trans1, True)
251251
result = lod1Conv.convert(root)
252-
self.assertEqual(11408, len(etree.tostring(result)))
252+
self.assertEqual(11912, len(etree.tostring(result)))
253253

254254
def test_2(self):
255255
root = etree.Element("root")
256256
lod1Conv = LoD1Converter(Converter(), ifc2, "TestABC", trans2, False)
257257
result = lod1Conv.convert(root)
258-
self.assertEqual(7802, len(etree.tostring(result)))
258+
self.assertEqual(8678, len(etree.tostring(result)))
259259

260260
def test_3(self):
261261
root = etree.Element("root")
262262
lod1Conv = LoD1Converter(Converter(), ifc3, "ÄÖÜß", trans3, False)
263263
result = lod1Conv.convert(root)
264-
self.assertEqual(39525, len(etree.tostring(result)))
264+
self.assertEqual(46017, len(etree.tostring(result)))
265265

266266

267267
class TestConvertSolid(unittest.TestCase):
@@ -270,7 +270,7 @@ def test_1(self):
270270
root = etree.Element("root")
271271
lod1Conv = LoD1Converter(Converter(), ifc1, "Test123", trans1, True)
272272
result = lod1Conv.convertSolid(ifcBldg1, root, 10)
273-
self.assertEqual(2425, len(etree.tostring(root)))
273+
self.assertEqual(2677, len(etree.tostring(root)))
274274
corr = "POLYGON ((458870.063285681 5438773.62904949 110,458862.40284125 5438780.05692559 110," + \
275275
"458870.116292566 5438789.24945891 110,458877.776736998 5438782.82158281 110,458870.063285681 " + \
276276
"5438773.62904949 110))"
@@ -280,7 +280,7 @@ def test_2(self):
280280
root = etree.Element("root")
281281
lod1Conv = LoD1Converter(Converter(), ifc2, "Test123", trans2, True)
282282
result = lod1Conv.convertSolid(ifcBldg2, root, 10)
283-
self.assertEqual(5845, len(etree.tostring(root)))
283+
self.assertEqual(6721, len(etree.tostring(root)))
284284
corr = "POLYGON ((479356.600506348 5444183.43024925 -3,479356.600506348 5444185.43024925 -3," + \
285285
"479362.600506348 5444185.43024925 -3,479362.600506348 5444183.43024925 -3,479380.600506348 " + \
286286
"5444183.43024925 -3,479380.600506348 5444171.43024925 -3,479363.100506348 5444171.43024925 -3," + \
@@ -293,7 +293,7 @@ def test_3(self):
293293
root = etree.Element("root")
294294
lod1Conv = LoD1Converter(Converter(), ifc3, "Test123", trans3, True)
295295
result = lod1Conv.convertSolid(ifcBldg3, root, 10)
296-
self.assertEqual(37750, len(etree.tostring(root)))
296+
self.assertEqual(44242, len(etree.tostring(root)))
297297
self.assertEqual(85, result.GetGeometryRef(0).GetPointCount())
298298

299299

‎test/algorithm/test_converter_lod2.py

+5-5
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@ def test_1(self):
292292
root = etree.Element("root")
293293
lod2Conv = LoD2Converter(Converter(), ifc1, "Test123", trans1, True)
294294
result = lod2Conv.convert(root)
295-
self.assertEqual(24431, len(etree.tostring(result)))
295+
self.assertEqual(25163, len(etree.tostring(result)))
296296

297297

298298
class TestConvertBldgBound(unittest.TestCase):
@@ -301,7 +301,7 @@ def test_1(self):
301301
root = etree.Element("root")
302302
lod2Conv = LoD2Converter(Converter(), ifc1, "Test123", trans1, True)
303303
result1, result2, result3 = lod2Conv.convertBldgBound(ifcBldg1, root, 10)
304-
self.assertEqual(5555, len(etree.tostring(root)))
304+
self.assertEqual(5941, len(etree.tostring(root)))
305305
self.assertEqual(7, len(result1))
306306
corr = "POLYGON ((458870.063285681 5438773.62904949 110,458862.40284125 5438780.05692559 110," + \
307307
"458870.116292566 5438789.24945891 110,458877.776736998 5438782.82158281 110,458870.063285681 " + \
@@ -413,23 +413,23 @@ def test_1(self):
413413
root = etree.Element("root")
414414
lod2Conv = LoD2Converter(Converter(), ifc1, "Test123", trans1, False)
415415
result1, result2 = lod2Conv.setElement(root, base.geom, "GroundSurface", base.name)
416-
self.assertEqual(612, len(etree.tostring(root)))
416+
self.assertEqual(654, len(etree.tostring(root)))
417417
self.assertEqual(42, len(result1))
418418
self.assertEqual(40, len(result2))
419419

420420
def test_2(self):
421421
root = etree.Element("root")
422422
lod2Conv = LoD2Converter(Converter(), ifc2, "Test123", trans2, False)
423423
result1, result2 = lod2Conv.setElement(root, roof1.geom, "RoofSurface", roof1.name)
424-
self.assertEqual(602, len(etree.tostring(root)))
424+
self.assertEqual(644, len(etree.tostring(root)))
425425
self.assertEqual(42, len(result1))
426426
self.assertEqual(40, len(result2))
427427

428428
def test_3(self):
429429
root = etree.Element("root")
430430
lod2Conv = LoD2Converter(Converter(), ifc3, "Test123", trans3, False)
431431
result1, result2 = lod2Conv.setElement(root, wall1.geom, "WallSurface", wall1.name)
432-
self.assertEqual(645, len(etree.tostring(root)))
432+
self.assertEqual(705, len(etree.tostring(root)))
433433
self.assertEqual(42, len(result1))
434434
self.assertEqual(40, len(result2))
435435

‎test/algorithm/test_converter_lod3.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -491,7 +491,7 @@ def test_1(self):
491491
root = etree.Element("root")
492492
lod3Conv = LoD3Converter(Converter(), ifc1, "Test123", trans1, False)
493493
result1, result2, result3 = lod3Conv.setElementGroup(root, base.geom, "GroundSurface", base.name, base.openings)
494-
self.assertEqual(741, len(etree.tostring(root)))
494+
self.assertEqual(783, len(etree.tostring(root)))
495495
self.assertEqual(42, len(result1[0]))
496496
self.assertEqual(40, len(result2))
497497
self.assertEqual(0, len(result3))
@@ -500,7 +500,7 @@ def test_2(self):
500500
root = etree.Element("root")
501501
lod3Conv = LoD3Converter(Converter(), ifc1, "Test123", trans1, False)
502502
result1, result2, result3 = lod3Conv.setElementGroup(root, wall1.geom, "WallSurface", wall1.name, [door2])
503-
self.assertEqual(1360, len(etree.tostring(root)))
503+
self.assertEqual(1444, len(etree.tostring(root)))
504504
self.assertEqual(42, len(result1[0]))
505505
self.assertEqual(40, len(result2))
506506
self.assertEqual(1, len(result3))
@@ -509,7 +509,7 @@ def test_3(self):
509509
root = etree.Element("root")
510510
lod3Conv = LoD3Converter(Converter(), ifc1, "Test123", trans1, False)
511511
result1, result2, result3 = lod3Conv.setElementGroup(root, wall2.geom, "WallSurface", wall2.name, [])
512-
self.assertEqual(749, len(etree.tostring(root)))
512+
self.assertEqual(791, len(etree.tostring(root)))
513513
self.assertEqual(42, len(result1[0]))
514514
self.assertEqual(40, len(result2))
515515
self.assertEqual(0, len(result3))

0 commit comments

Comments
 (0)