Move CanonicalizePath into util.h so it can be shared by the other modules.

Also add util_test.cc and move the CanonicalizePathTest into there.

Signed-off-by: Thiago Farina <tfarina@chromium.org>

1 files changed, 50 insertions, 0 deletions

diff --git a/src/util_test.cc b/src/util_test.cc
new file mode 100644
index 0000000..145c80e
--- /dev/null
+++ b/src/util_test.cc
@@ -0,0 +1,50 @@
+// Copyright 2011 Google Inc. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#include "util.h"
+
+#include "test.h"
+
+TEST(CanonicalizePath, PathSamples) {
+  std::string path = "foo.h";
+  std::string err;
+  EXPECT_TRUE(CanonicalizePath(&path, &err));
+  EXPECT_EQ("", err);
+  EXPECT_EQ("foo.h", path);
+
+  path = "./foo.h"; err = "";
+  EXPECT_TRUE(CanonicalizePath(&path, &err));
+  EXPECT_EQ("", err);
+  EXPECT_EQ("foo.h", path);
+
+  path = "./foo/./bar.h"; err = "";
+  EXPECT_TRUE(CanonicalizePath(&path, &err));
+  EXPECT_EQ("", err);
+  EXPECT_EQ("foo/bar.h", path);
+
+  path = "./x/foo/../bar.h"; err = "";
+  EXPECT_TRUE(CanonicalizePath(&path, &err));
+  EXPECT_EQ("", err);
+  EXPECT_EQ("x/bar.h", path);
+
+  path = "./x/foo/../../bar.h"; err = "";
+  EXPECT_TRUE(CanonicalizePath(&path, &err));
+  EXPECT_EQ("", err);
+  EXPECT_EQ("bar.h", path);
+
+  path = "./x/../foo/../../bar.h"; err = "";
+  EXPECT_FALSE(CanonicalizePath(&path, &err));
+  EXPECT_EQ("can't canonicalize path './x/../foo/../../bar.h' that reaches "
+            "above its directory", err);
+}