Merge pull request #8600 from The-OpenROAD-Project-staging/fixture-improvements

Fixture improvements

Author: maliberty

src/odb/test/cpp/BUILD

@@ -11,14 +11,11 @@ cc_test(
     name = "TestAbstractLef",
     srcs = [
         "TestAbstractLef.cc",
-        "sky130_test_fixture.h",
-    ],
-    data = [
-        "//src/odb/test/data/sky130hd:lef-test-data",
     ],
     deps = [
         "//src/odb",
         "//src/tst",
+        "//src/tst:sky130_fixture",
         "//src/utl",
         "@googletest//:gtest",
         "@googletest//:gtest_main",
@@ -203,14 +200,14 @@ cc_test(
     name = "TestPolygonalFloorplan",
     srcs = [
         "TestPolygonalFloorplan.cc",
-        "nangate45_test_fixture.h",
     ],
     data = [
         "//src/odb/test:regression_resources",
     ],
     deps = [
         "//src/odb",
         "//src/tst",
+        "//src/tst:nangate45_fixture",
         "//src/utl",
         "@googletest//:gtest",
         "@googletest//:gtest_main",
@@ -221,14 +218,14 @@ cc_test(
     name = "Test3DBloxParser",
     srcs = [
         "Test3DBloxParser.cpp",
-        "nangate45_test_fixture.h",
     ],
     data = [
         "//src/odb/test:regression_resources",
     ],
     deps = [
         "//src/odb",
         "//src/tst",
+        "//src/tst:nangate45_fixture",
         "//src/utl",
         "@googletest//:gtest",
         "@googletest//:gtest_main",

src/odb/test/cpp/TestAbstractLef.cc

@@ -14,14 +14,14 @@
 #include "odb/db.h"
 #include "odb/dbWireCodec.h"
 #include "odb/lefout.h"
-#include "sky130_test_fixture.h"
+#include "tst/sky130_fixture.h"
 #include "utl/Logger.h"
 
 namespace odb {
 
 using ::testing::HasSubstr;
 
-TEST_F(Sky130TestFixutre, AbstractLefWriterMapsTieOffToSignal)
+TEST_F(Sky130Fixture, AbstractLefWriterMapsTieOffToSignal)
 {
   // Arrange
   std::ostringstream os;
@@ -41,7 +41,7 @@ TEST_F(Sky130TestFixutre, AbstractLefWriterMapsTieOffToSignal)
   EXPECT_THAT(result, HasSubstr("SIGNAL"));
 }
 
-TEST_F(Sky130TestFixutre, AbstractLefWriterMapsScanToSignal)
+TEST_F(Sky130Fixture, AbstractLefWriterMapsScanToSignal)
 {
   // Arrange
   std::ostringstream os;
@@ -61,7 +61,7 @@ TEST_F(Sky130TestFixutre, AbstractLefWriterMapsScanToSignal)
   EXPECT_THAT(result, HasSubstr("SIGNAL"));
 }
 
-TEST_F(Sky130TestFixutre, AbstractLefWriterMapsResetToSignal)
+TEST_F(Sky130Fixture, AbstractLefWriterMapsResetToSignal)
 {
   // Arrange
   std::ostringstream os;

src/odb/test/cpp/TestAccessPoint.cpp

@@ -1,9 +1,9 @@
+#include <filesystem>
 #include <fstream>
 #include <ios>
 #include <string>
 #include <vector>
 
-#include "env.h"
 #include "gtest/gtest.h"
 #include "helper.h"
 #include "odb/db.h"
@@ -29,7 +29,8 @@ TEST_F(SimpleDbFixture, test_default)
   ap->setHighType(dbAccessType::HalfGrid);
   ap->setAccess(true, dbDirection::DOWN);
   iterm->setAccessPoint(pin, ap);
-  std::string path = testTmpPath("results", "TestAccessPointDbRW");
+  std::filesystem::create_directory("results");
+  std::string path = "results/TestAccessPointDbRW";
   std::ofstream write;
   write.exceptions(std::ifstream::failbit | std::ifstream::badbit
                    | std::ios::eofbit);

src/odb/test/cpp/TestGDSIn.cpp

@@ -7,7 +7,6 @@
 #include <vector>
 
 #include "gtest/gtest.h"
-#include "helper/env.h"
 #include "odb/db.h"
 #include "odb/gdsUtil.h"
 #include "odb/gdsin.h"

src/odb/test/cpp/TestJournal.cpp

@@ -1,6 +1,5 @@
 #include <functional>
 
-#include "env.h"
 #include "gtest/gtest.h"
 #include "helper.h"
 #include "odb/db.h"

src/odb/test/cpp/TestPolygonalFloorplan.cc

@@ -11,21 +11,17 @@
 #include <vector>
 
 #include "gtest/gtest.h"
-#include "nangate45_test_fixture.h"
 #include "odb/db.h"
 #include "odb/dbSet.h"
 #include "odb/defin.h"
 #include "odb/geom.h"
+#include "tst/nangate45_fixture.h"
 #include "utl/Logger.h"
 
 namespace odb {
 
-TEST_F(Nangate45TestFixture, PolygonalFloorplanCreatesBlockagesInNegativeSpace)
+TEST_F(Nangate45Fixture, PolygonalFloorplanCreatesBlockagesInNegativeSpace)
 {
-  // Arrange
-  dbChip* chip = dbChip::create(db_.get(), lib_->getTech());
-  dbBlock* block = dbBlock::create(chip, "block");
-
   // Act
   Polygon area({{0, 0},
                 {0, 300000},
@@ -34,11 +30,11 @@ TEST_F(Nangate45TestFixture, PolygonalFloorplanCreatesBlockagesInNegativeSpace)
                 {300000, 150000},
                 {300000, 0}});
 
-  block->setDieArea(area);
+  block_->setDieArea(area);
 
   // Assert that there is one virtual blockage for this floorplan.
   // There's essentially 1 rectangle cut out of it.
-  dbSet<dbBlockage> blockages = block->getBlockages();
+  dbSet<dbBlockage> blockages = block_->getBlockages();
   std::vector<dbBlockage*> virtual_blockages;
   for (dbBlockage* blockage : blockages) {
     if (!blockage->isSystemReserved()) {
@@ -52,7 +48,7 @@ TEST_F(Nangate45TestFixture, PolygonalFloorplanCreatesBlockagesInNegativeSpace)
 
   // 1 obstruction for each via and metal layer in Nangate 45
   // should be 21 including poly layers.
-  dbSet<dbObstruction> obstructions = block->getObstructions();
+  dbSet<dbObstruction> obstructions = block_->getObstructions();
   std::vector<dbObstruction*> virtual_obstructions;
   for (dbObstruction* obstruction : obstructions) {
     if (!obstruction->isSystemReserved()) {
@@ -65,20 +61,16 @@ TEST_F(Nangate45TestFixture, PolygonalFloorplanCreatesBlockagesInNegativeSpace)
   EXPECT_EQ(virtual_obstructions.size(), 21);
 }
 
-TEST_F(Nangate45TestFixture, SettingTheFloorplanTwiceClearsSystemBlockages)
+TEST_F(Nangate45Fixture, SettingTheFloorplanTwiceClearsSystemBlockages)
 {
-  // Arrange
-  dbChip* chip = dbChip::create(db_.get(), lib_->getTech());
-  dbBlock* block = dbBlock::create(chip, "block");
-
   // Act
   Polygon area({{0, 0},
                 {0, 300000},
                 {400000, 300000},
                 {400000, 150000},
                 {300000, 150000},
                 {300000, 0}});
-  block->setDieArea(area);
+  block_->setDieArea(area);
 
   odb::Polygon new_die_area({{0, 0},
                              {0, 300000},
@@ -87,11 +79,11 @@ TEST_F(Nangate45TestFixture, SettingTheFloorplanTwiceClearsSystemBlockages)
                              {300000, 160000},
                              {300000, 0}});
 
-  block->setDieArea(new_die_area);
+  block_->setDieArea(new_die_area);
 
   // Assert that there is one virtual blockage for this floorplan.
   // There's essentially 1 rectangle cut out of it.
-  dbSet<dbBlockage> blockages = block->getBlockages();
+  dbSet<dbBlockage> blockages = block_->getBlockages();
   std::vector<dbBlockage*> virtual_blockages;
   for (dbBlockage* blockage : blockages) {
     if (!blockage->isSystemReserved()) {
@@ -105,7 +97,7 @@ TEST_F(Nangate45TestFixture, SettingTheFloorplanTwiceClearsSystemBlockages)
 
   // 1 obstruction for each via and metal layer in Nangate 45
   // should be 21 including poly layers.
-  dbSet<dbObstruction> obstructions = block->getObstructions();
+  dbSet<dbObstruction> obstructions = block_->getObstructions();
   std::vector<dbObstruction*> virtual_obstructions;
   for (dbObstruction* obstruction : obstructions) {
     if (!obstruction->isSystemReserved()) {
@@ -118,24 +110,21 @@ TEST_F(Nangate45TestFixture, SettingTheFloorplanTwiceClearsSystemBlockages)
   EXPECT_EQ(virtual_obstructions.size(), 21);
 }
 
-TEST_F(Nangate45TestFixture, DeletingSystemBlockagesThrows)
+TEST_F(Nangate45Fixture, DeletingSystemBlockagesThrows)
 {
   // Arrange
-  dbChip* chip = dbChip::create(db_.get(), lib_->getTech());
-  dbBlock* block = dbBlock::create(chip, "block");
-
   Polygon area({{0, 0},
                 {0, 300000},
                 {400000, 300000},
                 {400000, 150000},
                 {300000, 150000},
                 {300000, 0}});
 
-  block->setDieArea(area);
+  block_->setDieArea(area);
 
   // Assert that there is one virtual blockage for this floorplan.
   // There's essentially 1 rectangle cut out of it.
-  dbSet<dbBlockage> blockages = block->getBlockages();
+  dbSet<dbBlockage> blockages = block_->getBlockages();
   std::vector<dbBlockage*> virtual_blockages;
   for (dbBlockage* blockage : blockages) {
     if (!blockage->isSystemReserved()) {
@@ -150,24 +139,21 @@ TEST_F(Nangate45TestFixture, DeletingSystemBlockagesThrows)
       { dbBlockage::destroy(virtual_blockages[0]); }, std::runtime_error);
 }
 
-TEST_F(Nangate45TestFixture, DeletingSystemObstructionsThrows)
+TEST_F(Nangate45Fixture, DeletingSystemObstructionsThrows)
 {
   // Arrange
-  dbChip* chip = dbChip::create(db_.get(), lib_->getTech());
-  dbBlock* block = dbBlock::create(chip, "block");
-
   Polygon area({{0, 0},
                 {0, 300000},
                 {400000, 300000},
                 {400000, 150000},
                 {300000, 150000},
                 {300000, 0}});
 
-  block->setDieArea(area);
+  block_->setDieArea(area);
 
   // Assert that there is one virtual blockage for this floorplan.
   // There's essentially 1 rectangle cut out of it.
-  dbSet<dbObstruction> obstructions = block->getObstructions();
+  dbSet<dbObstruction> obstructions = block_->getObstructions();
   std::vector<dbObstruction*> virtual_obstructions;
   for (dbObstruction* obstruction : obstructions) {
     if (!obstruction->isSystemReserved()) {

src/odb/test/cpp/helper/BUILD

@@ -10,11 +10,9 @@ package(
 cc_library(
     name = "helper",
     srcs = [
-        "env.cpp",
         "helper.cpp",
     ],
     hdrs = [
-        "env.h",
         "helper.h",
     ],
     includes = ["."],  # not needed after no cmake

src/odb/test/cpp/helper/CMakeLists.txt

@@ -1,7 +1,7 @@
 include(openroad)
 
 
-add_library(odb_test_helper helper.cpp env.cpp)
+add_library(odb_test_helper helper.cpp)
 
 
 target_link_libraries(odb_test_helper