c76218d5ed
make_canonical_dir_path only worked if the provided directory did not end with a slash. Remove this function, and call SkPathJoin instead. Update the documentation to acknowledge that this is an acceptable use of SkPathJoin, and update its test. R=epoger@google.com Review URL: https://codereview.chromium.org/16098011 git-svn-id: http://skia.googlecode.com/svn/trunk@9458 2bbb7eff-a529-9590-31e7-b0007b416f81
89 lines
3.2 KiB
C++
89 lines
3.2 KiB
C++
/*
|
|
* Copyright 2013 Google Inc.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license that can be
|
|
* found in the LICENSE file.
|
|
*/
|
|
|
|
#include "SkString.h"
|
|
#include "SkOSFile.h"
|
|
#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.
|
|
* @param reporter Reporter for test conditions.
|
|
* @param dir String representing the path to a folder. May or may not
|
|
* end with SkPATH_SEPARATOR.
|
|
* @param filename String representing the basename of a file. Must NOT
|
|
* contain SkPATH_SEPARATOR.
|
|
*/
|
|
static void test_dir_with_file(skiatest::Reporter* reporter, SkString dir,
|
|
SkString filename) {
|
|
// If filename contains SkPATH_SEPARATOR, the tests will fail.
|
|
SkASSERT(!filename.contains(SkPATH_SEPARATOR));
|
|
|
|
// Tests for SkOSPath::SkPathJoin and SkOSPath::SkBasename
|
|
|
|
// fullName should be "dir<SkPATH_SEPARATOR>file"
|
|
SkString fullName = SkOSPath::SkPathJoin(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.
|
|
size_t expectedSize = dir.size() + filename.size();
|
|
if (!dir.endsWith(SkPATH_SEPARATOR)) {
|
|
expectedSize++;
|
|
}
|
|
REPORTER_ASSERT(reporter, fullName.size() == expectedSize);
|
|
|
|
SkString basename = SkOSPath::SkBasename(fullName.c_str());
|
|
|
|
// basename should be the same as filename
|
|
REPORTER_ASSERT(reporter, basename.equals(filename));
|
|
|
|
// basename will not contain a path separator
|
|
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());
|
|
REPORTER_ASSERT(reporter, basename.equals(filename));
|
|
}
|
|
|
|
static void test_os_path_utils_tests(skiatest::Reporter* reporter) {
|
|
SkString dir("dir");
|
|
SkString filename("file");
|
|
test_dir_with_file(reporter, dir, filename);
|
|
|
|
// Now make sure this works with a path separator at the end of dir.
|
|
dir.appendUnichar(SkPATH_SEPARATOR);
|
|
test_dir_with_file(reporter, dir, filename);
|
|
|
|
// Test using no filename.
|
|
test_dir_with_file(reporter, dir, SkString());
|
|
|
|
// Testing using no directory.
|
|
test_dir_with_file(reporter, SkString(), filename);
|
|
|
|
// Test with a sub directory.
|
|
dir.append("subDir");
|
|
test_dir_with_file(reporter, dir, filename);
|
|
|
|
// Basename of a directory with a path separator at the end is empty.
|
|
dir.appendUnichar(SkPATH_SEPARATOR);
|
|
SkString baseOfDir = SkOSPath::SkBasename(dir.c_str());
|
|
REPORTER_ASSERT(reporter, baseOfDir.size() == 0);
|
|
|
|
// Basename of NULL is an empty string.
|
|
SkString empty = SkOSPath::SkBasename(NULL);
|
|
REPORTER_ASSERT(reporter, empty.size() == 0);
|
|
|
|
// Test that NULL can be used for the directory and filename.
|
|
SkString emptyPath = SkOSPath::SkPathJoin(NULL, NULL);
|
|
REPORTER_ASSERT(reporter, emptyPath.size() == 1);
|
|
REPORTER_ASSERT(reporter, emptyPath.contains(SkPATH_SEPARATOR));
|
|
}
|
|
|
|
#include "TestClassDef.h"
|
|
DEFINE_TESTCLASS("OSPath", OSPathTestClass, test_os_path_utils_tests)
|