From 8f6603d88ea4b781cd92253d7d93f31794974968 Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Tue, 18 Oct 2022 01:26:42 +0200 Subject: [PATCH] Fixed unit test fails --- src/laybasic/laybasic/layBitmapsToImage.cc | 2 +- .../tools/net_tracer/db_plugin/gsiDeclDbNetTracer.cc | 4 ++-- testdata/ruby/extNetTracer.rb | 6 +++--- testdata/ruby/layTechnologies.rb | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/laybasic/laybasic/layBitmapsToImage.cc b/src/laybasic/laybasic/layBitmapsToImage.cc index b4cc038f1..405a8fac1 100644 --- a/src/laybasic/laybasic/layBitmapsToImage.cc +++ b/src/laybasic/laybasic/layBitmapsToImage.cc @@ -312,7 +312,7 @@ render_scanline_cross (const uint32_t *dp, unsigned int ds, const lay::Bitmap *p } // NOTE: hardcoded bar/width ratio for crosses. - unsigned int lw = std::min ((unsigned int) 6, pixels / 9); + unsigned int lw = std::max (std::min ((unsigned int) 6, pixels / 9), (unsigned int) 1); const int max_pixels = 31; if (pixels > max_pixels) { diff --git a/src/plugins/tools/net_tracer/db_plugin/gsiDeclDbNetTracer.cc b/src/plugins/tools/net_tracer/db_plugin/gsiDeclDbNetTracer.cc index e14be4dcf..5f24ca7d3 100644 --- a/src/plugins/tools/net_tracer/db_plugin/gsiDeclDbNetTracer.cc +++ b/src/plugins/tools/net_tracer/db_plugin/gsiDeclDbNetTracer.cc @@ -334,7 +334,7 @@ gsi::Class decl_NetTracer ("db", "NetTracer", "\n" "tracer = RBA::NetTracer::new\n" "\n" - "tech = RBA::NetTracerTechnology::new\n" + "tech = RBA::NetTracerConnectivity::new\n" "tech.connection(\"1/0\", \"2/0\", \"3/0\")\n" "\n" "tracer.trace(tech, ly, ly.top_cell, RBA::Point::new(7000, 1500), ly.find_layer(1, 0))\n" @@ -344,7 +344,7 @@ gsi::Class decl_NetTracer ("db", "NetTracer", "end\n" "@/code\n" "\n" - "This class has been introduced in version 0.25." + "This class has been introduced in version 0.25. With version 0.28, the \\NetTracerConnectivity class replaces the 'NetTracerTechnology' class." ); } diff --git a/testdata/ruby/extNetTracer.rb b/testdata/ruby/extNetTracer.rb index fd21fa5e0..b5a0744a0 100644 --- a/testdata/ruby/extNetTracer.rb +++ b/testdata/ruby/extNetTracer.rb @@ -32,7 +32,7 @@ class EXT_TestClass < TestBase tracer = RBA::NetTracer::new - tech = RBA::NetTracerTechnology::new + tech = RBA::NetTracerConnectivity::new tech.connection("1/0", "2/0", "3/0") tracer.trace(tech, ly, ly.top_cell, RBA::Point::new(7000, 1500), ly.find_layer(1, 0)) @@ -77,7 +77,7 @@ class EXT_TestClass < TestBase tracer = RBA::NetTracer::new - tech = RBA::NetTracerTechnology::new + tech = RBA::NetTracerConnectivity::new tech.connection("1/0", "2/0", "3/0") tracer.trace(tech, ly, ly.top_cell, RBA::Point::new(7000, 1500), ly.find_layer(1, 0), RBA::Point::new(6000, -6000), ly.find_layer(3, 0)) @@ -122,7 +122,7 @@ class EXT_TestClass < TestBase tracer = RBA::NetTracer::new - tech = RBA::NetTracerTechnology::new + tech = RBA::NetTracerConnectivity::new tech.connection("1/0", "3/0") tracer.trace(tech, ly, ly.top_cell, RBA::Point::new(7000, 1500), ly.find_layer(1, 0)) diff --git a/testdata/ruby/layTechnologies.rb b/testdata/ruby/layTechnologies.rb index c19e8916d..3bbe22ecb 100644 --- a/testdata/ruby/layTechnologies.rb +++ b/testdata/ruby/layTechnologies.rb @@ -117,7 +117,7 @@ END assert_equal(tech.component_names.size > 0, true) assert_equal(tech.component_names.find("connectivity") != nil, true) - assert_equal(tech.component("connectivity").class.to_s, "RBA::NetTracerTechnology") + assert_equal(tech.component("connectivity").class.to_s, "RBA::TechnologyComponent") end