From 497a4f62ea5942f78adf7da757378d64bc85ff3f Mon Sep 17 00:00:00 2001 From: Magnus Jacobsson Date: Tue, 2 Aug 2022 16:26:00 +0200 Subject: [PATCH] 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. --- tests/svg_analyzer.cpp | 2 -- tests/svg_analyzer.h | 3 --- tests/svg_analyzer_interface.h | 1 - tests/svgpp_context.cpp | 4 ---- tests/svgpp_context.h | 1 - tests/test_GVContext_render_svg.cpp | 4 ---- tests/test_clusters.cpp | 1 - tests/test_engines.cpp | 1 - tests/test_neatopack.cpp | 1 - tests/test_subgraph_layout.cpp | 1 - tests/test_subgraphs.cpp | 1 - 11 files changed, 20 deletions(-) diff --git a/tests/svg_analyzer.cpp b/tests/svg_analyzer.cpp index 37f0d74c7..2ac848a14 100644 --- 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 e01502c9f..77aff3aa3 100644 --- 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 dc63cd7f7..a0a0bc431 100644 --- 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 307c0ad06..9b75fc727 100644 --- 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 eb74688ee..3e100218b 100644 --- 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 5d04a3eac..6e3d1b995 100644 --- 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 18eff2fb0..9a0d3a819 100644 --- 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 24b08982f..02454cdac 100644 --- 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 eecd56466..4843e0dcf 100644 --- 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 2039ef0d2..0c9241eda 100644 --- 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 cf10c8b60..4e42ffc77 100644 --- 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); -- 2.50.1