From 9543cea952767d4fa9cbe69a9ba044db8e9059ce Mon Sep 17 00:00:00 2001
From: Matthias Koefferlein <matthias@koefferlein.de>
Date: Thu, 29 Jul 2021 22:24:22 +0200
Subject: [PATCH] Fixed tests

---
 src/db/unit_tests/dbNetlistCompareTests.cc | 27 +------------------
 src/db/unit_tests/dbNetlistReaderTests.cc  | 31 ----------------------
 testdata/algo/nreader16.cir                |  5 ----
 3 files changed, 1 insertion(+), 62 deletions(-)
 delete mode 100644 testdata/algo/nreader16.cir

diff --git a/src/db/unit_tests/dbNetlistCompareTests.cc b/src/db/unit_tests/dbNetlistCompareTests.cc
index 156a07a4d..7eefa0e09 100644
--- a/src/db/unit_tests/dbNetlistCompareTests.cc
+++ b/src/db/unit_tests/dbNetlistCompareTests.cc
@@ -4855,24 +4855,6 @@ TEST(30_ComparePrimaryAndOtherParameters)
 
   EXPECT_EQ (good, false);
 
-  //  disabling the parameter in the second netlist will make it match too
-
-  dc2->parameter_definition_non_const (db::DeviceClassResistor::param_id_R)->set_is_primary (false);
-
-  logger.clear ();
-  good = comp.compare (&nl1, &nl2);
-
-  EXPECT_EQ (good, true);
-
-  //  enabling the parameter again will make it mismatch again
-
-  dc2->parameter_definition_non_const (db::DeviceClassResistor::param_id_R)->set_is_primary (true);
-
-  logger.clear ();
-  good = comp.compare (&nl1, &nl2);
-
-  EXPECT_EQ (good, false);
-
   //  we can install an ignore handler to make it match again
 
   dc1->set_parameter_compare_delegate (new db::EqualDeviceParameters (db::DeviceClassResistor::param_id_R, true));
@@ -4882,20 +4864,13 @@ TEST(30_ComparePrimaryAndOtherParameters)
 
   EXPECT_EQ (good, true);
 
-  //  if we enable the L parameter we'll get a mismatch again (but we have to enable it in both netlists)
+  //  if we enable the L parameter we'll get a mismatch again
 
   dc1->parameter_definition_non_const (db::DeviceClassResistor::param_id_L)->set_is_primary (true);
 
   logger.clear ();
   good = comp.compare (&nl1, &nl2);
 
-  EXPECT_EQ (good, true);
-
-  dc2->parameter_definition_non_const (db::DeviceClassResistor::param_id_L)->set_is_primary (true);
-
-  logger.clear ();
-  good = comp.compare (&nl1, &nl2);
-
   EXPECT_EQ (good, false);
 
   //  until we install another tolerance
diff --git a/src/db/unit_tests/dbNetlistReaderTests.cc b/src/db/unit_tests/dbNetlistReaderTests.cc
index 8ac7197df..987c432af 100644
--- a/src/db/unit_tests/dbNetlistReaderTests.cc
+++ b/src/db/unit_tests/dbNetlistReaderTests.cc
@@ -590,34 +590,3 @@ TEST(15_ContinuationWithBlanks)
     "end;\n"
   );
 }
-
-TEST(16_PrimaryParametersFromSpice)
-{
-  db::Netlist nl;
-
-  std::string path = tl::combine_path (tl::combine_path (tl::testdata (), "algo"), "nreader16.cir");
-
-  db::NetlistSpiceReader reader;
-  tl::InputStream is (path);
-  reader.read (is, nl);
-
-  const db::DeviceClass *dc;
-
-  //  RMODEL1 does not have L and W parameters
-  dc = nl.device_class_by_name ("RMODEL1");
-  EXPECT_EQ (dc->parameter_definition (db::DeviceClassResistor::param_id_W)->is_primary (), false);
-  EXPECT_EQ (dc->parameter_definition (db::DeviceClassResistor::param_id_L)->is_primary (), false);
-  EXPECT_EQ (dc->parameter_definition (db::DeviceClassResistor::param_id_R)->is_primary (), true);
-
-  //  RMODEL2 has L and W parameters
-  dc = nl.device_class_by_name ("RMODEL2");
-  EXPECT_EQ (dc->parameter_definition (db::DeviceClassResistor::param_id_W)->is_primary (), true);
-  EXPECT_EQ (dc->parameter_definition (db::DeviceClassResistor::param_id_L)->is_primary (), true);
-  EXPECT_EQ (dc->parameter_definition (db::DeviceClassResistor::param_id_R)->is_primary (), true);
-
-  //  RMODEL3 has W parameter only
-  dc = nl.device_class_by_name ("RMODEL3");
-  EXPECT_EQ (dc->parameter_definition (db::DeviceClassResistor::param_id_W)->is_primary (), true);
-  EXPECT_EQ (dc->parameter_definition (db::DeviceClassResistor::param_id_L)->is_primary (), false);
-  EXPECT_EQ (dc->parameter_definition (db::DeviceClassResistor::param_id_R)->is_primary (), true);
-}
diff --git a/testdata/algo/nreader16.cir b/testdata/algo/nreader16.cir
deleted file mode 100644
index 4ba071d79..000000000
--- a/testdata/algo/nreader16.cir
+++ /dev/null
@@ -1,5 +0,0 @@
-
-R$1 1 2 1k RMODEL1 M=2
-R$1 2 3 1k RMODEL2 W=0.5u L=17u
-R$1 3 4 1k RMODEL3 W=0.5u
-