Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(275)

Unified Diff: components/keyed_service/core/dependency_graph_unittest.cc

Issue 1419843006: Revert of Properly escape node names in DependencyGraph Graphviz export (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « components/keyed_service/core/dependency_graph.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/keyed_service/core/dependency_graph_unittest.cc
diff --git a/components/keyed_service/core/dependency_graph_unittest.cc b/components/keyed_service/core/dependency_graph_unittest.cc
index 10168d03c5f5e6e8f5c6a2e4eeba65486c06e268..3bf175834065728ef6b0d1e99d1d6259c9180e2e 100644
--- a/components/keyed_service/core/dependency_graph_unittest.cc
+++ b/components/keyed_service/core/dependency_graph_unittest.cc
@@ -2,12 +2,9 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "base/bind.h"
-#include "base/strings/string_piece.h"
#include "components/keyed_service/core/dependency_graph.h"
#include "components/keyed_service/core/dependency_node.h"
#include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/re2/re2/re2.h"
namespace {
@@ -158,55 +155,4 @@
EXPECT_EQ(&parent, destruction_order[3]);
}
-std::string NodeNameProvider(const std::string& name, DependencyNode* node) {
- return name;
-}
-
-// When this returns true, then |name| is a valid ID according to the DOT
-// language specification [1]. Note that DOT language also allows HTML strings
-// as valid identifiers, but those are not used in the production code calling
-// the tested DumpAsGraphviz.
-// [1] http://www.graphviz.org/content/dot-language
-bool IsValidDotId(base::StringPiece name) {
- static const char pattern[] =
- "[a-zA-Z\\200-\\377_][0-9a-zA-Z\\200-\\377_]*"
- "|-?(?:\\.[0-9]+|[0-9]+(\\.[0-9]*)?)"
- "|\"(?:[^\"]|\\\")*\"";
- return RE2::FullMatch(re2::StringPiece(name.data(), name.size()), pattern);
-}
-
-// Returns the source name of the first edge of the graphstr described in DOT
-// format in |graphstr|.
-base::StringPiece LocateNodeNameInGraph(base::StringPiece graphstr) {
- re2::StringPiece name;
- EXPECT_TRUE(RE2::FullMatch(
- re2::StringPiece(graphstr.data(), graphstr.size()),
- "(?sm).*^[ \\t]*([^ \\t]*(?:[ \\t]+[^ \\t]+)*)[ \\t]*->.*", &name))
- << "graphstr=" << graphstr;
- return base::StringPiece(name.data(), name.size());
-}
-
-// Node names in the dependency graph should be properly escaped.
-TEST_F(DependencyGraphTest, DumpAsGraphviz_Escaping) {
- const char* names[] = {
- "namespace::Service", "justAlphabeticService",
- "Service_with_underscores", "AlphaNumeric123Service",
- "123ServiceStartingWithDigits", "service with spaces",
- "ServiceWith\"Quotes"};
-
- DependencyGraph graph;
- DummyNode parent(&graph);
- DummyNode child(&graph);
-
- graph.AddEdge(&parent, &child);
-
- for (const char* name : names) {
- SCOPED_TRACE(testing::Message("name=") << name);
- std::string graph_str =
- graph.DumpAsGraphviz("Test", base::Bind(&NodeNameProvider, name));
- base::StringPiece dumped_name(LocateNodeNameInGraph(graph_str));
- EXPECT_TRUE(IsValidDotId(dumped_name)) << "dumped_name=" << dumped_name;
- }
-}
-
} // namespace
« no previous file with comments | « components/keyed_service/core/dependency_graph.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698