luke/klayout
1
0
Fork 0
mirror of https://github.com/KLayout/klayout.git synced 2026-08-31 18:16:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed unit tests

Browse Source
This commit is contained in:
Matthias Koefferlein
2025-08-02 15:13:23 +02:00
parent d1e1f626c7
commit f9ea9af466
4 changed files with 42 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/db/unit_tests/dbAsIfFlatRegionTests.cc
+12
View File
@@ -1663,14 +1663,17 @@ TEST(40_BoolWithProperties)
db::RecursiveShapeIterator si1 (ly, top_cell, l1);
si1.apply_property_translator (db::PropertiesTranslator::make_pass_all ());
db::Region r1 (si1);
r1.set_join_properties_on_merge (false);
db::RecursiveShapeIterator si2 (ly, top_cell, l2);
si2.apply_property_translator (db::PropertiesTranslator::make_pass_all ());
db::Region r2 (si2);
r2.set_join_properties_on_merge (false);
db::RecursiveShapeIterator si3 (ly, top_cell, l3);
si3.apply_property_translator (db::PropertiesTranslator::make_pass_all ());
db::Region r3 (si3);
r3.set_join_properties_on_merge (false);
db::Layout target;
unsigned int target_top_cell_index = target.add_cell (ly.cell_name (top_cell_index));
@@ -1802,6 +1805,7 @@ TEST(41_EdgesWithProperties)
db::RecursiveShapeIterator si2 (ly, top_cell, l2);
si2.apply_property_translator (db::PropertiesTranslator::make_pass_all ());
db::Region r2wp (si2);
r2wp.set_join_properties_on_merge (false);
db::Region r2wp_nomerge = r2wp;
r2wp_nomerge.set_merged_semantics (false);
@@ -1846,12 +1850,14 @@ TEST(42_DRCWithProperties)
db::RecursiveShapeIterator si1 (ly, top_cell, l1);
si1.apply_property_translator (db::PropertiesTranslator::make_pass_all ());
db::Region r1 (si1);
r1.set_join_properties_on_merge (false);
db::Region r1_nomerge (r1);
r1_nomerge.set_merged_semantics (false);
db::RecursiveShapeIterator si2 (ly, top_cell, l2);
si2.apply_property_translator (db::PropertiesTranslator::make_pass_all ());
db::Region r2 (si2);
r2.set_join_properties_on_merge (false);
db::Region r2_nomerge (r2);
r2_nomerge.set_merged_semantics (false);
@@ -2000,10 +2006,12 @@ TEST(44_SizeWithProperties)
db::RecursiveShapeIterator si1 (ly, top_cell, l1);
si1.apply_property_translator (db::PropertiesTranslator::make_pass_all ());
db::Region r1 (si1);
r1.set_join_properties_on_merge (false);
db::RecursiveShapeIterator si2 (ly, top_cell, l2);
si2.apply_property_translator (db::PropertiesTranslator::make_pass_all ());
db::Region r2 (si2);
r2.set_join_properties_on_merge (false);
db::Layout target;
unsigned int target_top_cell_index = target.add_cell (ly.cell_name (top_cell_index));
@@ -2017,6 +2025,10 @@ TEST(44_SizeWithProperties)
target.insert (target_top_cell_index, target.get_layer (db::LayerProperties (20, 0)), r2.sized (200));
target.insert (target_top_cell_index, target.get_layer (db::LayerProperties (21, 0)), r2.sized (250, 50, 2));
r2.set_join_properties_on_merge (true);
target.insert (target_top_cell_index, target.get_layer (db::LayerProperties (30, 0)), r2.sized (200));
target.insert (target_top_cell_index, target.get_layer (db::LayerProperties (31, 0)), r2.sized (250, 50, 2));
CHECKPOINT();
db::compare_layouts (_this, target, tl::testdata () + "/algo/flat_region_au44.gds");
}
src/db/unit_tests/dbRegionTests.cc
+12
View File
@@ -2069,11 +2069,17 @@ TEST(50_PropertiesFlat)
"{}:(10,20;10,220;110,220;110,20)"
);
r.set_join_properties_on_merge (false);
EXPECT_EQ (sip2s (r.begin_merged ()),
"{id=>1}:(1,2;1,202;101,202;101,2)\n"
"{id=>42}:(11,12;11,212;111,212;111,12)\n"
"{}:(0,0;0,200;10,200;10,220;110,220;110,20;100,20;100,0)"
);
r.set_join_properties_on_merge (true);
EXPECT_EQ (sip2s (r.begin_merged ()),
"{id=>42}:(0,0;0,200;1,200;1,202;10,202;10,220;110,220;110,212;111,212;111,12;101,12;101,2;100,2;100,0)"
);
}
// "+" operator with properties (issue #1373)
@@ -2165,11 +2171,17 @@ TEST(51_PropertiesFlatFromLayout)
"{}:(10,20;10,220;110,220;110,20)"
);
r.set_join_properties_on_merge (false);
EXPECT_EQ (sip2s (r.begin_merged ()),
"{id=>1}:(1,2;1,202;101,202;101,2)\n"
"{id=>42}:(11,12;11,212;111,212;111,12)\n"
"{}:(0,0;0,200;10,200;10,220;110,220;110,20;100,20;100,0)"
);
r.set_join_properties_on_merge (true);
EXPECT_EQ (sip2s (r.begin_merged ()),
"{id=>42}:(0,0;0,200;1,200;1,202;10,202;10,220;110,220;110,212;111,212;111,12;101,12;101,2;100,2;100,0)"
);
}
TEST(52_PropertiesDeep)