tests: svgAnalyzer: remove useless handling of 'any' SVG element

We haven't asked SVG++ to be called back for any element, just for
explicitly specified elements. Therefore we will never receive any
unknown elements that the SVG analyzer could count so this
functionality is also removed.

diff --git a/tests/svg_analyzer.cpp b/tests/svg_analyzer.cpp
index 37f0d74c7fd5d9b30686ceded291a042995f3562..2ac848a143df853c3427348b71fe5c11edeee31f 100644 (file)
--- a/tests/svg_analyzer.cpp
+++ b/tests/svg_analyzer.cpp
@@ -26,5 +26,3 @@ void SVGAnalyzer::on_enter_element_polyline() { m_num_polylines++; }
 void SVGAnalyzer::on_enter_element_rect() { m_num_rects++; }
 
 void SVGAnalyzer::on_enter_element_title() { m_num_titles++; }
-
-void SVGAnalyzer::on_enter_element_unknown() { m_num_unknowns++; }

diff --git a/tests/svg_analyzer.h b/tests/svg_analyzer.h
index e01502c9f29645e23803c498481fd94b784d3cf5..77aff3aa33772d11bec3c62d24e1bc37e440b165 100644 (file)
--- a/tests/svg_analyzer.h
+++ b/tests/svg_analyzer.h
@@ -21,7 +21,6 @@ public:
   void on_enter_element_polyline() override;
   void on_enter_element_rect() override;
   void on_enter_element_title() override;
-  void on_enter_element_unknown() override;
   std::size_t num_svgs() const { return m_num_svgs; };
   std::size_t num_groups() const { return m_num_groups; };
   std::size_t num_circles() const { return m_num_circles; };
@@ -32,7 +31,6 @@ public:
   std::size_t num_polylines() const { return m_num_polylines; };
   std::size_t num_rects() const { return m_num_rects; };
   std::size_t num_titles() const { return m_num_titles; };
-  std::size_t num_unknowns() const { return m_num_unknowns; };
 
 private:
   std::size_t m_num_svgs = 1; // the top level svg is implicit. See
@@ -46,5 +44,4 @@ private:
   std::size_t m_num_polylines = 0;
   std::size_t m_num_rects = 0;
   std::size_t m_num_titles = 0;
-  std::size_t m_num_unknowns = 0;
 };

diff --git a/tests/svg_analyzer_interface.h b/tests/svg_analyzer_interface.h
index dc63cd7f73ea4081f8dcb18108b47b32df3f1c94..a0a0bc431ea2043bd2a1c6d1e52b1a89ca2f5926 100644 (file)
--- a/tests/svg_analyzer_interface.h
+++ b/tests/svg_analyzer_interface.h
@@ -22,5 +22,4 @@ public:
   virtual void on_enter_element_polyline() = 0;
   virtual void on_enter_element_rect() = 0;
   virtual void on_enter_element_title() = 0;
-  virtual void on_enter_element_unknown() = 0;
 };

diff --git a/tests/svgpp_context.cpp b/tests/svgpp_context.cpp
index 307c0ad06e73319daa10fa041cf60df41aed026d..9b75fc7278bf99ddcbac0528ba607cdd6d88e385 100644 (file)
--- a/tests/svgpp_context.cpp
+++ b/tests/svgpp_context.cpp
@@ -56,10 +56,6 @@ void SvgppContext::on_enter_element(svgpp::tag::element::title e) {
   m_svgAnalyzer->on_enter_element_title();
 }
 
-void SvgppContext::on_enter_element(svgpp::tag::element::any) {
-  m_svgAnalyzer->on_enter_element_unknown();
-}
-
 void SvgppContext::on_exit_element() {}
 
 void SvgppContext::path_move_to(double x, double y,

diff --git a/tests/svgpp_context.h b/tests/svgpp_context.h
index eb74688ee049da2bc027f7152a059185f526eef7..3e100218b9920e852ba701fc31cb36631e396ebf 100644 (file)
--- a/tests/svgpp_context.h
+++ b/tests/svgpp_context.h
@@ -31,7 +31,6 @@ public:
   void on_enter_element(svgpp::tag::element::polyline e);
   void on_enter_element(svgpp::tag::element::rect e);
   void on_enter_element(svgpp::tag::element::title e);
-  void on_enter_element(svgpp::tag::element::any e);
   void on_exit_element();
   void path_move_to(double x, double y, svgpp::tag::coordinate::absolute);
   void path_line_to(double x, double y, svgpp::tag::coordinate::absolute);

diff --git a/tests/test_GVContext_render_svg.cpp b/tests/test_GVContext_render_svg.cpp
index 5d04a3eac2a6d2bf846456e87cbf5d7fc4cff657..6e3d1b995c6ab41caeb9d2e9601afbb4373cfed4 100644 (file)
--- a/tests/test_GVContext_render_svg.cpp
+++ b/tests/test_GVContext_render_svg.cpp
@@ -31,7 +31,6 @@ TEST_CASE(
   REQUIRE(svgAnalyzer.num_polylines() == 0);
   REQUIRE(svgAnalyzer.num_rects() == 0);
   REQUIRE(svgAnalyzer.num_titles() == 0);
-  REQUIRE(svgAnalyzer.num_unknowns() == 0);
 }
 
 TEST_CASE("Rendering an SVG from a graph with a single node outputs an SVG "
@@ -56,7 +55,6 @@ TEST_CASE("Rendering an SVG from a graph with a single node outputs an SVG "
   REQUIRE(svgAnalyzer.num_polylines() == 0);
   REQUIRE(svgAnalyzer.num_rects() == 0);
   REQUIRE(svgAnalyzer.num_titles() == 1);
-  REQUIRE(svgAnalyzer.num_unknowns() == 0);
 }
 
 TEST_CASE("Rendering an SVG from a graph with two nodes outputs an SVG "
@@ -81,7 +79,6 @@ TEST_CASE("Rendering an SVG from a graph with two nodes outputs an SVG "
   REQUIRE(svgAnalyzer.num_polylines() == 0);
   REQUIRE(svgAnalyzer.num_rects() == 0);
   REQUIRE(svgAnalyzer.num_titles() == 2);
-  REQUIRE(svgAnalyzer.num_unknowns() == 0);
 }
 
 TEST_CASE("Rendering an SVG from a graph with two nodes and one edge outputs "
@@ -106,5 +103,4 @@ TEST_CASE("Rendering an SVG from a graph with two nodes and one edge outputs "
   REQUIRE(svgAnalyzer.num_polylines() == 0);
   REQUIRE(svgAnalyzer.num_rects() == 0);
   REQUIRE(svgAnalyzer.num_titles() == 3);
-  REQUIRE(svgAnalyzer.num_unknowns() == 0);
 }

diff --git a/tests/test_clusters.cpp b/tests/test_clusters.cpp
index 18eff2fb0d44283b47f1903d1f8a84c7cbd9f8dd..9a0d3a819eee2f4f3892766cb2f351beb4ecf5ec 100644 (file)
--- a/tests/test_clusters.cpp
+++ b/tests/test_clusters.cpp
@@ -87,7 +87,6 @@ TEST_CASE(
   CHECK(svg_analyzer.num_polylines() == 0);
   CHECK(svg_analyzer.num_rects() == 0);
   CHECK(svg_analyzer.num_titles() == num_titles);
-  CHECK(svg_analyzer.num_unknowns() == 0);
 
   gvFreeRenderData(result);
   gvFreeLayout(gvc, g);

diff --git a/tests/test_engines.cpp b/tests/test_engines.cpp
index 24b08982f783365604cfc22dee502bba51200916..02454cdacdece1e3fda7186131527eda9a99ee92 100644 (file)
--- a/tests/test_engines.cpp
+++ b/tests/test_engines.cpp
@@ -72,7 +72,6 @@ TEST_CASE(
   CHECK(svg_analyzer.num_polylines() == 0);
   CHECK(svg_analyzer.num_rects() == 0);
   CHECK(svg_analyzer.num_titles() == num_titles);
-  CHECK(svg_analyzer.num_unknowns() == 0);
 
   gvFreeRenderData(result);
   gvFreeLayout(gvc, g);

diff --git a/tests/test_neatopack.cpp b/tests/test_neatopack.cpp
index eecd564664c492b552aa4dc94a1857e76981c481..4843e0dcfc336c38e5749e198e487104772cfa43 100644 (file)
--- a/tests/test_neatopack.cpp
+++ b/tests/test_neatopack.cpp
@@ -78,7 +78,6 @@ TEST_CASE("take an input graph, compute its connected components, lay out each "
   CHECK(svg_analyzer.num_polylines() == 0);
   CHECK(svg_analyzer.num_rects() == 0);
   CHECK(svg_analyzer.num_titles() == num_titles);
-  CHECK(svg_analyzer.num_unknowns() == 0);
 
   gvFreeRenderData(result);
 

diff --git a/tests/test_subgraph_layout.cpp b/tests/test_subgraph_layout.cpp
index 2039ef0d2fc24b96d6e306474ce7f050d403268c..0c9241edad09b74a0095df02eaa534d87d0fd000 100644 (file)
--- a/tests/test_subgraph_layout.cpp
+++ b/tests/test_subgraph_layout.cpp
@@ -80,7 +80,6 @@ TEST_CASE("subgraph layout in directed and undirected graphs with different "
     CHECK(svg_analyzer.num_polylines() == 0);
     CHECK(svg_analyzer.num_rects() == 0);
     CHECK(svg_analyzer.num_titles() == num_titles);
-    CHECK(svg_analyzer.num_unknowns() == 0);
 
     gvFreeRenderData(result);
   }

diff --git a/tests/test_subgraphs.cpp b/tests/test_subgraphs.cpp
index cf10c8b60a72243223ae5af2ae4afe5a80186677..4e42ffc77552662bc6d908a96316ba5ead3f788c 100644 (file)
--- a/tests/test_subgraphs.cpp
+++ b/tests/test_subgraphs.cpp
@@ -78,7 +78,6 @@ TEST_CASE("subgraphs in directed and undirected graphs with different layout "
   CHECK(svg_analyzer.num_polylines() == 0);
   CHECK(svg_analyzer.num_rects() == 0);
   CHECK(svg_analyzer.num_titles() == num_titles);
-  CHECK(svg_analyzer.num_unknowns() == 0);
 
   gvFreeRenderData(result);
   gvFreeLayout(gvc, g);