commit a8e2e1504b9af6ba791637f228debaa23953064a
author tfarina <tfarina@chromium.org> Mon Jul 28 19:26:58 2014 -0700
committer Commit bot <commit-bot@chromium.org> Mon Jul 28 19:26:58 2014 -0700
tree c4dc50d10bb27a4bfd263f877cb7d602f6779afc
parent 2bff230d835fbc84f0ce8b2e7a399fe8416ec7c8

Cleanup: Rename SkOSPath functions.

Mostly for brevity and matches better with Python:

Python           | Old C++                 | New C++
os.path.join     | SkOSPath::SkPathJoin    | SkOSPath::Join
os.path.basename | SkOSPath::SkBasename    | SkOSPath::Basename

BUG=None
TEST=make all
R=mtklein@google.com, bsalomon@google.com

Author: tfarina@chromium.org

Review URL: https://codereview.chromium.org/428443002

tests/OSPathTest.cpp

diff --git a/tests/OSPathTest.cpp b/tests/OSPathTest.cpp
index d36b7cb..1452c38 100644
--- a/tests/OSPathTest.cpp
+++ b/tests/OSPathTest.cpp
@@ -10,9 +10,9 @@
 #include "Test.h"
 
 /**
- *  Test SkPathJoin and SkBasename.
- *  Will use SkPathJoin to append filename to dir, test that it works correctly,
- *  and tests using SkBasename on the result.
+ *  Test SkOSPath::Join and SkOSPath::Basename.
+ *  Will use SkOSPath::Join to append filename to dir, test that it works correctly,
+ *  and tests using SkOSPath::Basename on the result.
  *  @param reporter Reporter for test conditions.
  *  @param dir String representing the path to a folder. May or may not
  *      end with SkPATH_SEPARATOR.
@@ -24,10 +24,10 @@
     // If filename contains SkPATH_SEPARATOR, the tests will fail.
     SkASSERT(!filename.contains(SkPATH_SEPARATOR));
 
-    // Tests for SkOSPath::SkPathJoin and SkOSPath::SkBasename
+    // Tests for SkOSPath::Join and SkOSPath::Basename
 
     // fullName should be "dir<SkPATH_SEPARATOR>file"
-    SkString fullName = SkOSPath::SkPathJoin(dir.c_str(), filename.c_str());
+    SkString fullName = SkOSPath::Join(dir.c_str(), filename.c_str());
 
     // fullName should be the combined size of dir and file, plus one if
     // dir did not include the final path separator.
@@ -37,7 +37,7 @@
     }
     REPORTER_ASSERT(reporter, fullName.size() == expectedSize);
 
-    SkString basename = SkOSPath::SkBasename(fullName.c_str());
+    SkString basename = SkOSPath::Basename(fullName.c_str());
 
     // basename should be the same as filename
     REPORTER_ASSERT(reporter, basename.equals(filename));
@@ -46,7 +46,7 @@
     REPORTER_ASSERT(reporter, !basename.contains(SkPATH_SEPARATOR));
 
     // Now take the basename of filename, which should be the same as filename.
-    basename = SkOSPath::SkBasename(filename.c_str());
+    basename = SkOSPath::Basename(filename.c_str());
     REPORTER_ASSERT(reporter, basename.equals(filename));
 }
 
@@ -71,15 +71,15 @@
 
     // Basename of a directory with a path separator at the end is empty.
     dir.appendUnichar(SkPATH_SEPARATOR);
-    SkString baseOfDir = SkOSPath::SkBasename(dir.c_str());
+    SkString baseOfDir = SkOSPath::Basename(dir.c_str());
     REPORTER_ASSERT(reporter, baseOfDir.size() == 0);
 
     // Basename of NULL is an empty string.
-    SkString empty = SkOSPath::SkBasename(NULL);
+    SkString empty = SkOSPath::Basename(NULL);
     REPORTER_ASSERT(reporter, empty.size() == 0);
 
     // Test that NULL can be used for the directory and filename.
-    SkString emptyPath = SkOSPath::SkPathJoin(NULL, NULL);
+    SkString emptyPath = SkOSPath::Join(NULL, NULL);
     REPORTER_ASSERT(reporter, emptyPath.size() == 1);
     REPORTER_ASSERT(reporter, emptyPath.contains(SkPATH_SEPARATOR));
 }