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

Unified Diff: Source/platform/text/BidiResolverTest.cpp

Issue 39523002: Add harness for running Unicode.org Bidi tests. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: update comments about reference implementations Created 7 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 | « no previous file | Source/platform/text/BidiTestHarness.h » ('j') | Source/platform/text/BidiTestHarness.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/platform/text/BidiResolverTest.cpp
diff --git a/Source/platform/text/BidiResolverTest.cpp b/Source/platform/text/BidiResolverTest.cpp
index 90c294dd636e45cc6aa53ca4781f07f0eec6b6ba..d28b6414d10703d5d715cb086d9c4685a9363838 100644
--- a/Source/platform/text/BidiResolverTest.cpp
+++ b/Source/platform/text/BidiResolverTest.cpp
@@ -32,7 +32,9 @@
#include "platform/text/BidiResolver.h"
#include "platform/graphics/TextRunIterator.h"
+#include "platform/text/BidiTestHarness.h"
#include "wtf/OwnPtr.h"
+#include <fstream>
#include <gtest/gtest.h>
namespace {
@@ -53,4 +55,196 @@ TEST(BidiResolver, Basic)
EXPECT_EQ(direction, LTR);
}
+class BidiTestRunner {
+public:
+ BidiTestRunner()
+ : m_testsRun(0)
+ , m_testsSkipped(0)
+ , m_ignoredCharFailures(0)
+ , m_levelFailures(0)
+ , m_orderFailures(0)
+ {
+ }
+
+ void skipTestsWith(UChar codepoint)
+ {
+ m_skippedCodePoints.insert(codepoint);
+ }
+
+ void runTest(const std::basic_string<UChar>& input, const std::vector<int>& reorder,
+ const std::vector<int>& levels, bidi_test::ParagraphDirection,
+ const std::string& line, size_t lineNumber);
+
+ size_t m_testsRun;
+ size_t m_testsSkipped;
+ std::set<UChar> m_skippedCodePoints;
+ size_t m_ignoredCharFailures;
+ size_t m_levelFailures;
+ size_t m_orderFailures;
+};
+
+// Blink's UBA does not filter out control characters, etc. Maybe it should?
leviw_travelin_and_unemployed 2013/10/28 21:33:11 Do you mean that we put them into the BidiRuns? If
+// Instead it depends on later layers of Blink to simply ignore them.
+// This function helps us emulate that to be compatible with BidiTest.txt expectations.
+static bool isNonRenderedCodePoint(UChar c)
+{
+ // The tests also expect us to ignore soft-hyphen.
+ if (c == 0xAD)
+ return true;
+ // Control characters are not rendered:
+ return c >= 0x202A && c <= 0x202E;
+ // But it seems to expect LRI, etc. to be rendered!?
leviw_travelin_and_unemployed 2013/10/28 21:33:11 Wat? This seems so weird...
+}
+
+std::string diffString(const std::vector<int>& actual, const std::vector<int>& expected)
+{
+ std::ostringstream diff;
leviw_travelin_and_unemployed 2013/10/28 21:33:11 Seems like you may just want "using namespace std"
+ diff << "actual: ";
+ // This is the magical way to print a vector to a stream, clear, right?
+ std::copy(actual.begin(), actual.end(), std::ostream_iterator<int>(diff, " "));
+ diff << " expected: ";
+ std::copy(expected.begin(), expected.end(), std::ostream_iterator<int>(diff, " "));
+ return diff.str();
+}
+
+TextDirection determineParagraphDirectionality(const TextRun& textRun)
+{
+ BidiResolver<TextRunIterator, BidiCharacterRun> resolver;
+ resolver.setStatus(BidiStatus(LTR, false));
+ resolver.setPositionIgnoringNestedIsolates(TextRunIterator(&textRun, 0));
+ return resolver.determineParagraphDirectionality();
+}
+
+void BidiTestRunner::runTest(const std::basic_string<UChar>& input, const std::vector<int>& expectedOrder,
+ const std::vector<int>& expectedLevels, bidi_test::ParagraphDirection paragraphDirection,
+ const std::string& line, size_t lineNumber)
+{
+ if (!m_skippedCodePoints.empty()) {
+ for (size_t i = 0; i < input.size(); i++) {
+ if (m_skippedCodePoints.count(input[i])) {
+ m_testsSkipped++;
+ return;
+ }
+ }
+ }
+
+ m_testsRun++;
+
+ TextRun textRun(input.data(), input.size());
+ switch (paragraphDirection) {
+ case bidi_test::DirectionAutoLTR:
+ textRun.setDirection(determineParagraphDirectionality(textRun));
+ break;
+ case bidi_test::DirectionLTR:
+ textRun.setDirection(LTR);
+ break;
+ case bidi_test::DirectionRTL:
+ textRun.setDirection(RTL);
+ break;
+ }
+ BidiResolver<TextRunIterator, BidiCharacterRun> resolver;
+ resolver.setStatus(BidiStatus(textRun.direction(), textRun.directionalOverride()));
+ resolver.setPositionIgnoringNestedIsolates(TextRunIterator(&textRun, 0));
+
+ BidiRunList<BidiCharacterRun>& runs = resolver.runs();
+ resolver.createBidiRunsForLine(TextRunIterator(&textRun, textRun.length()));
+
+ std::ostringstream errorContext;
+ errorContext << ", line " << lineNumber << " \"" << line << "\"";
+ errorContext << " context: " << bidi_test::nameFromParagraphDirection(paragraphDirection);
+
+ std::vector<int> actualOrder;
+ std::vector<int> actualLevels;
+ actualLevels.assign(input.size(), -1);
+ BidiCharacterRun* run = runs.firstRun();
+ size_t actualIndex = 0;
+ size_t actualLength = 0;
+ while (run) {
+ // Blink's UBA just makes runs, the actual ordering of the display of characters
+ // is handled later in our pipeline, so we fake it here:
+ bool reversed = run->reversed(false);
+ int length = run->stop() - run->start();
+ for (size_t i = 0; i < length; i++) {
+ int inputIndex = reversed ? run->stop() - i - 1 : run->start() + i;
+ if (!isNonRenderedCodePoint(input[inputIndex]))
+ actualOrder.push_back(inputIndex);
+ // BidiTest.txt gives expected level data in the order of the original input.
+ actualLevels[inputIndex] = run->level();
+ }
+ run = run->next();
+ }
+
+ if (expectedOrder.size() != actualOrder.size()) {
+ m_ignoredCharFailures++;
+ EXPECT_EQ(expectedOrder.size(), actualOrder.size()) << errorContext.str();
+ } else if (expectedOrder != actualOrder) {
+ m_orderFailures++;
+ std::cout << "ORDER " << diffString(actualOrder, expectedOrder) << errorContext.str() << std::endl;
+ }
+
+ if (expectedLevels.size() != actualLevels.size()) {
+ m_ignoredCharFailures++;
+ EXPECT_EQ(expectedLevels.size(), actualLevels.size()) << errorContext.str();
+ } else {
+ for (size_t i = 0; i < expectedLevels.size(); i++) {
+ // level == -1 means the level should be ignored.
+ if (expectedLevels[i] == actualLevels[i] || expectedLevels[i] == -1)
+ continue;
+
+ std::cout << "LEVELS " << diffString(actualLevels, expectedLevels) << errorContext.str() << std::endl;
+ m_levelFailures++;
+ break;
+ }
+ }
+}
+
+
+TEST(BidiResolver, BidiTest_txt)
+{
+ BidiTestRunner runner;
+ // Blink's Unicode Bidi Algorithm (UBA) doesn't yet support the
+ // new isolate directives from Unicode 6.3:
+ // http://www.unicode.org/reports/tr9/#Explicit_Directional_Isolates
+ runner.skipTestsWith(0x2066); // LRI
+ runner.skipTestsWith(0x2067); // RLI
+ runner.skipTestsWith(0x2068); // FSI
+ runner.skipTestsWith(0x2069); // PDI
+
+ // This code wants to use PathService from base/path_service.h
+ // but we aren't allowed to depend on base/ directly from Blink yet.
+ // Alternatively we could use:
+ // WebKit::Platform::current()->unitTestSupport()->webKitRootDir()
+ // and a relative path, but that would require running inside
+ // webkit_unit_tests (to have a functioning Platform object).
+ // The file we want is:
+ // src/third_party/icu/source/test/testdata/BidiTest.txt
+ // but we don't have any good way to find it from this unittest.
+ // Just assume we're running this test manually for now. On the
+ // bots we just print a warning that we can't find the test file.
+ std::string bidiTestPath = "BidiTest.txt";
+ std::ifstream bidiTestFile(bidiTestPath);
+ if (!bidiTestFile.is_open()) {
+ std::cout << "ERROR: Failed to open BidiTest.txt, cannot run tests." << std::endl;
+ return;
+ }
+
+ bidi_test::Harness<BidiTestRunner> harness(runner);
+ harness.parse(bidiTestFile);
+ bidiTestFile.close();
+
+ if (runner.m_testsSkipped)
+ std::cout << "WARNING: Skipped " << runner.m_testsSkipped << " tests." << std::endl;
+ std::cout << "Ran " << runner.m_testsRun << " tests: ";
+ std::cout << runner.m_levelFailures << " level failures, ";
+ std::cout << runner.m_orderFailures << " order failures." << std::endl;
+
+ // The unittest harness only pays attention to GTest output, so we verify
+ // that the tests behaved as expected:
+ EXPECT_EQ(runner.m_testsRun, 352098);
+ EXPECT_EQ(runner.m_testsSkipped, 418143);
+ EXPECT_EQ(runner.m_ignoredCharFailures, 0);
+ EXPECT_EQ(runner.m_levelFailures, 44887);
+ EXPECT_EQ(runner.m_orderFailures, 19153);
+}
+
}
« no previous file with comments | « no previous file | Source/platform/text/BidiTestHarness.h » ('j') | Source/platform/text/BidiTestHarness.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698