--- a/xpcom/tests/gtest/TestStrings.cpp
+++ b/xpcom/tests/gtest/TestStrings.cpp
@@ -19,16 +19,121 @@
#include "gtest/BlackBox.h"
#include "nsBidiUtils.h"
namespace TestStrings {
using mozilla::fallible;
using mozilla::BlackBox;
+#define TestExample1 "Sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium doloremque laudantium,\n totam rem aperiam, eaque ipsa quae ab illo inventore veritatis et quasi\r architecto beatae vitae dicta sunt explicabo. Nemo enim ipsam voluptatem quia voluptas sit aspernatur\n aut odit aut fugit, sed quia consequuntur magni dolores eos qui ratione voluptatem sequi nesciunt. Neque porro quisquam est, qui\r\n\r dolorem ipsum quia dolor sit amet, consectetur, adipisci velit, sed quia non numquam eius modi tempora incidunt ut labore et dolore magnam aliquam quaerat voluptatem. Ut enim ad minima veniam, quis nostrum exercitationem ullam corporis suscipit laboriosam, nisi ut aliquid ex ea commodi consequatur? Quis autem vel eum iure reprehenderit qui in ea voluptate velit esse quam nihil molestiae consequatur, vel illum qui dolorem eum fugiat quo voluptas nulla pariatur?"
+
+#define TestExample2 "At vero eos et accusamus et iusto odio dignissimos ducimus\n\n qui blanditiis praesentium voluptatum deleniti atque corrupti quos dolores et quas molestias excepturi sint occaecati cupiditate non provident, similique sunt in culpa qui officia deserunt\r\r \n mollitia animi, id est laborum et dolorum fuga. Et harum quidem rerum facilis est et expedita distinctio. Nam libero tempore, cum soluta nobis est eligendi optio cumque nihil impedit quo minus id quod maxime placeat facere possimus, omnis voluptas assumenda est, omnis dolor repellendus. Temporibus autem quibusdam et aut officiis debitis aut rerum necessitatibus saepe eveniet ut et voluptates repudiandae sint et molestiae non recusandae. Itaque earum rerum hic tenetur a sapiente delectus, ut aut reiciendis voluptatibus maiores alias consequatur aut perferendis doloribus asperiores repellat."
+
+#define TestExample3 " Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis ac tellus eget velit viverra viverra id sit amet neque. Sed id consectetur mi, vestibulum aliquet arcu. Curabitur sagittis accumsan convallis. Sed eu condimentum ipsum, a laoreet tortor. Orci varius natoque penatibus et magnis dis \r\r\n\n parturient montes, nascetur ridiculus mus. Sed non tellus nec ante sodales placerat a nec risus. Cras vel bibendum sapien, nec ullamcorper felis. Pellentesque congue eget nisi sit amet vehicula. Morbi pulvinar turpis justo, in commodo dolor vulputate id. Curabitur in dui urna. Vestibulum placerat dui in sem congue, ut faucibus nibh rutrum. Duis mattis turpis facilisis ullamcorper tincidunt. Vestibulum pharetra tortor at enim sagittis, dapibus consectetur ex blandit. Curabitur ac fringilla quam. In ornare lectus ut ipsum mattis venenatis. Etiam in mollis lectus, sed luctus risus.\nCras dapibus\f\t \n finibus justo sit amet dictum. Aliquam non elit diam. Fusce magna nulla, bibendum in massa a, commodo finibus lectus. Sed rutrum a augue id imperdiet. Aliquam sagittis sodales felis, a tristique ligula. Aliquam erat volutpat. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Duis volutpat interdum lorem et congue. Phasellus porttitor posuere justo eget euismod. Nam a condimentum turpis, sit amet gravida lacus. Vestibulum dolor diam, lobortis ac metus et, convallis dapibus tellus. Ut nec metus in velit malesuada tincidunt et eget justo. Curabitur ut libero bibendum, porttitor diam vitae, aliquet justo. "
+
+#define TestExample4 " Donec feugiat volutpat massa. Cras ornare lacinia porta. Fusce in feugiat nunc. Praesent non felis varius diam feugiat ultrices ultricies a risus. Donec maximus nisi nisl, non consectetur nulla eleifend in. Nulla in massa interdum, eleifend orci a, vestibulum est. Mauris aliquet, massa et convallis mollis, felis augue vestibulum augue, in lobortis metus eros a quam. Nam ac diam ornare, vestibulum elit sit amet, consectetur ante. Praesent massa mauris, pulvinar sit amet sapien vel, tempus gravida neque. Praesent id quam sit amet est maximus molestie eget at turpis. Nunc sit amet orci id arcu dapibus fermentum non eu erat.\f\tSuspendisse commodo nunc sem, eu congue eros condimentum vel. Nullam sit amet posuere arcu. Nulla facilisi. Mauris dapibus iaculis massa sed gravida. Nullam vitae urna at tortor feugiat auctor ut sit amet dolor. Proin rutrum at nunc et faucibus. Quisque suscipit id nibh a aliquet. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam a dapibus erat, id imperdiet mauris. Nulla blandit libero non magna dapibus tristique. Integer hendrerit imperdiet lorem, quis facilisis lacus semper ut. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae Nullam dignissim elit in congue ultricies. Quisque erat odio, maximus mollis laoreet id, iaculis at turpis. "
+
+#define TestExample5 "Donec id risus urna. Nunc consequat lacinia urna id bibendum. Nulla faucibus faucibus enim. Cras ex risus, ultrices id semper vitae, luctus ut nulla. Sed vehicula tellus sed purus imperdiet efficitur. Suspendisse feugiat\n\n\n imperdiet odio, sed porta lorem feugiat nec. Curabitur laoreet massa venenatis\r\n risus ornare\r\n, vitae feugiat tortor accumsan. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Maecenas id scelerisque mauris, eget facilisis erat. Ut nec pulvinar risus, sed iaculis ante. Mauris tincidunt, risus et pretium elementum, leo nisi consectetur ligula, tincidunt suscipit erat velit eget libero. Sed ac est tempus, consequat dolor mattis, mattis mi. "
+
+// Setup overhead test
+#define OneASCII "a"
+
+// Maximal non-SIMD legth
+#define FifteenASCII "Lorem ipsum dol"
+
+// Around hundred is common length for IsUTF8 check
+#define HundredASCII "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis ac tellus eget velit viverra viverra i"
+
+// Originally ReadVPXFile in TestVPXDecoding.cpp
+static void
+ReadFile(const char* aPath, nsACString& aBuffer)
+{
+ FILE* f = fopen(aPath, "rb");
+ ASSERT_NE(f, (FILE *) nullptr);
+
+ int r = fseek(f, 0, SEEK_END);
+ ASSERT_EQ(r, 0);
+
+ long size = ftell(f);
+ ASSERT_NE(size, -1);
+ aBuffer.SetLength(size);
+
+ r = fseek(f, 0, SEEK_SET);
+ ASSERT_EQ(r, 0);
+
+ size_t got = fread(aBuffer.BeginWriting(), 1, size, f);
+ ASSERT_EQ(got, size_t(size));
+
+ r = fclose(f);
+ ASSERT_EQ(r, 0);
+}
+
+class Strings : public ::testing::Test {
+protected:
+ void SetUp() override {
+ // Intentionally AssignASCII and not AssignLiteral
+ // to simulate the usual heap case.
+ mOneAsciiUtf8.AssignASCII(OneASCII);
+ mFifteenAsciiUtf8.AssignASCII(FifteenASCII);
+ mHundredAsciiUtf8.AssignASCII(HundredASCII);
+ mExample1Utf8.AssignASCII(TestExample1);
+ mExample2Utf8.AssignASCII(TestExample2);
+ mExample3Utf8.AssignASCII(TestExample3);
+ mExample4Utf8.AssignASCII(TestExample4);
+ mExample5Utf8.AssignASCII(TestExample5);
+
+ ReadFile("de.txt", mDeUtf8);
+ ReadFile("ru.txt", mRuUtf8);
+ ReadFile("th.txt", mThUtf8);
+ ReadFile("ja.txt", mJaUtf8);
+
+ CopyASCIItoUTF16(mOneAsciiUtf8, mOneAsciiUtf16);
+ CopyASCIItoUTF16(mFifteenAsciiUtf8, mFifteenAsciiUtf16);
+ CopyASCIItoUTF16(mHundredAsciiUtf8, mHundredAsciiUtf16);
+
+ CopyASCIItoUTF16(mExample1Utf8, mExample1Utf16);
+ CopyASCIItoUTF16(mExample2Utf8, mExample2Utf16);
+ CopyASCIItoUTF16(mExample3Utf8, mExample3Utf16);
+ CopyASCIItoUTF16(mExample4Utf8, mExample4Utf16);
+ CopyASCIItoUTF16(mExample5Utf8, mExample5Utf16);
+
+ CopyUTF8toUTF16(mDeUtf8, mDeUtf16);
+ CopyUTF8toUTF16(mRuUtf8, mRuUtf16);
+ CopyUTF8toUTF16(mThUtf8, mThUtf16);
+ CopyUTF8toUTF16(mJaUtf8, mJaUtf16);
+ }
+public:
+ nsCString mOneAsciiUtf8;
+ nsCString mFifteenAsciiUtf8;
+ nsCString mHundredAsciiUtf8;
+ nsCString mExample1Utf8;
+ nsCString mExample2Utf8;
+ nsCString mExample3Utf8;
+ nsCString mExample4Utf8;
+ nsCString mExample5Utf8;
+ nsCString mDeUtf8;
+ nsCString mRuUtf8;
+ nsCString mThUtf8;
+ nsCString mJaUtf8;
+
+ nsString mOneAsciiUtf16;
+ nsString mFifteenAsciiUtf16;
+ nsString mHundredAsciiUtf16;
+ nsString mExample1Utf16;
+ nsString mExample2Utf16;
+ nsString mExample3Utf16;
+ nsString mExample4Utf16;
+ nsString mExample5Utf16;
+ nsString mDeUtf16;
+ nsString mRuUtf16;
+ nsString mThUtf16;
+ nsString mJaUtf16;
+};
+
void test_assign_helper(const nsACString& in, nsACString &_retval)
{
_retval = in;
}
// Simple helper struct to test if conditionally enabled string functions are
// working.
template <typename T>
@@ -42,17 +147,17 @@ struct EnableTest
template <typename Q = T, typename EnableIfChar16 = mozilla::Char16OnlyT<Q>>
bool IsChar() { return false; }
template <typename Q = T, typename EnableIfChar = mozilla::CharOnlyT<Q>>
bool IsChar(int dummy = 42) { return true; }
};
-TEST(Strings, IsChar)
+TEST_F(Strings, IsChar)
{
EnableTest<char> charTest;
EXPECT_TRUE(charTest.IsChar());
EXPECT_FALSE(charTest.IsChar16());
EnableTest<char16_t> char16Test;
EXPECT_TRUE(char16Test.IsChar16());
EXPECT_FALSE(char16Test.IsChar());
@@ -64,17 +169,17 @@ TEST(Strings, IsChar)
a_ctest.AssignLiteral("hello");
// This should cause a compilation failure.
a_ctest.AssignLiteral(u"hello");
a_test.AssignLiteral(u"hello");
a_test.AssignLiteral("hello");
#endif
}
-TEST(Strings, DependentStrings)
+TEST_F(Strings, DependentStrings)
{
// A few tests that make sure copying nsTDependentStrings behaves properly.
using DataFlags = mozilla::detail::StringDataFlags;
{
// Test copy ctor.
nsDependentCString tmp("foo");
auto data = tmp.Data();
@@ -110,30 +215,30 @@ TEST(Strings, DependentStrings)
EXPECT_TRUE(foo.GetDataFlags() & DataFlags::REFCOUNTED);
// First string should remain the same, the second should be pointing to
// a new buffer.
EXPECT_EQ(data, tmp.Data());
EXPECT_NE(data, foo.Data());
}
}
-TEST(Strings, assign)
+TEST_F(Strings, assign)
{
nsCString result;
test_assign_helper(NS_LITERAL_CSTRING("a") + NS_LITERAL_CSTRING("b"), result);
EXPECT_STREQ(result.get(), "ab");
}
-TEST(Strings, assign_c)
+TEST_F(Strings, assign_c)
{
nsCString c; c.Assign('c');
EXPECT_STREQ(c.get(), "c");
}
-TEST(Strings, test1)
+TEST_F(Strings, test1)
{
NS_NAMED_LITERAL_STRING(empty, "");
const nsAString& aStr = empty;
nsAutoString buf(aStr);
int32_t n = buf.FindChar(',');
EXPECT_EQ(n, kNotFound);
@@ -141,36 +246,36 @@ TEST(Strings, test1)
n = buf.Length();
buf.Cut(0, n + 1);
n = buf.FindChar(',');
EXPECT_EQ(n, kNotFound);
}
-TEST(Strings, test2)
+TEST_F(Strings, test2)
{
nsCString data("hello world");
const nsACString& aStr = data;
nsCString temp(aStr);
temp.Cut(0, 6);
EXPECT_STREQ(temp.get(), "world");
}
-TEST(Strings, find)
+TEST_F(Strings, find)
{
nsCString src("<!DOCTYPE blah blah blah>");
int32_t i = src.Find("DOCTYPE", true, 2, 1);
EXPECT_EQ(i, 2);
}
-TEST(Strings, rfind)
+TEST_F(Strings, rfind)
{
const char text[] = "<!DOCTYPE blah blah blah>";
const char term[] = "bLaH";
nsCString src(text);
int32_t i;
i = src.RFind(term, true, 3, -1);
EXPECT_EQ(i, kNotFound);
@@ -180,40 +285,40 @@ TEST(Strings, rfind)
i = src.RFind(term, true, 13, -1);
EXPECT_EQ(i, 10);
i = src.RFind(term, true, 22, 3);
EXPECT_EQ(i, 20);
}
-TEST(Strings, rfind_2)
+TEST_F(Strings, rfind_2)
{
const char text[] = "<!DOCTYPE blah blah blah>";
nsCString src(text);
int32_t i = src.RFind("TYPE", false, 5, -1);
EXPECT_EQ(i, 5);
}
-TEST(Strings, rfind_3)
+TEST_F(Strings, rfind_3)
{
const char text[] = "urn:mozilla:locale:en-US:necko";
nsAutoCString value(text);
int32_t i = value.RFind(":");
EXPECT_EQ(i, 24);
}
-TEST(Strings, rfind_4)
+TEST_F(Strings, rfind_4)
{
nsCString value("a.msf");
int32_t i = value.RFind(".msf");
EXPECT_EQ(i, 1);
}
-TEST(Strings, findinreadable)
+TEST_F(Strings, findinreadable)
{
const char text[] = "jar:jar:file:///c:/software/mozilla/mozilla_2006_02_21.jar!/browser/chrome/classic.jar!/";
nsAutoCString value(text);
nsACString::const_iterator begin, end;
value.BeginReading(begin);
value.EndReading(end);
nsACString::const_iterator delim_begin (begin),
@@ -268,17 +373,17 @@ TEST(Strings, findinreadable)
delim_begin = begin;
delim_end = end; for (int i=0;i<7;i++) delim_end--;
EXPECT_FALSE(FindInReadable(NS_LITERAL_CSTRING("classic"), delim_begin, delim_end));
// When no match is found, range should be empty
EXPECT_EQ(delim_begin, delim_end);
}
-TEST(Strings, rfindinreadable)
+TEST_F(Strings, rfindinreadable)
{
const char text[] = "jar:jar:file:///c:/software/mozilla/mozilla_2006_02_21.jar!/browser/chrome/classic.jar!/";
nsAutoCString value(text);
nsACString::const_iterator begin, end;
value.BeginReading(begin);
value.EndReading(end);
nsACString::const_iterator delim_begin (begin),
@@ -335,36 +440,36 @@ TEST(Strings, rfindinreadable)
delim_begin = begin;
delim_end = end; for (int i=0;i<7;i++) delim_end--;
EXPECT_FALSE(RFindInReadable(NS_LITERAL_CSTRING("classic"), delim_begin, delim_end));
// When no match is found, range should be empty
EXPECT_EQ(delim_begin, delim_end);
}
-TEST(Strings, distance)
+TEST_F(Strings, distance)
{
const char text[] = "abc-xyz";
nsCString s(text);
nsCString::const_iterator begin, end;
s.BeginReading(begin);
s.EndReading(end);
size_t d = Distance(begin, end);
EXPECT_EQ(d, sizeof(text) - 1);
}
-TEST(Strings, length)
+TEST_F(Strings, length)
{
const char text[] = "abc-xyz";
nsCString s(text);
size_t d = s.Length();
EXPECT_EQ(d, sizeof(text) - 1);
}
-TEST(Strings, trim)
+TEST_F(Strings, trim)
{
const char text[] = " a\t $ ";
const char set[] = " \t$";
nsCString s(text);
s.Trim(set);
EXPECT_STREQ(s.get(), "a");
@@ -380,17 +485,17 @@ TEST(Strings, trim)
s.Trim(set, false, true);
EXPECT_STREQ(s.get(), "");
s.AssignLiteral(" ");
s.Trim(set, true, false);
EXPECT_STREQ(s.get(), "");
}
-TEST(Strings, replace_substr)
+TEST_F(Strings, replace_substr)
{
const char text[] = "abc-ppp-qqq-ppp-xyz";
nsCString s(text);
s.ReplaceSubstring("ppp", "www");
EXPECT_STREQ(s.get(), "abc-www-qqq-www-xyz");
s.AssignLiteral("foobar");
s.ReplaceSubstring("foo", "bar");
@@ -401,17 +506,17 @@ TEST(Strings, replace_substr)
s.ReplaceSubstring("foo", "foo");
EXPECT_STREQ(s.get(), "foofoofoo");
s.AssignLiteral("foofoofoo");
s.ReplaceSubstring("of", "fo");
EXPECT_STREQ(s.get(), "fofoofooo");
}
-TEST(Strings, replace_substr_2)
+TEST_F(Strings, replace_substr_2)
{
const char *oldName = nullptr;
const char *newName = "user";
nsString acctName; acctName.AssignLiteral("forums.foo.com");
nsAutoString newAcctName, oldVal, newVal;
CopyASCIItoUTF16(oldName, oldVal);
CopyASCIItoUTF16(newName, newVal);
newAcctName.Assign(acctName);
@@ -419,17 +524,17 @@ TEST(Strings, replace_substr_2)
// here, oldVal is empty. we are testing that this function
// does not hang. see bug 235355.
newAcctName.ReplaceSubstring(oldVal, newVal);
// we expect that newAcctName will be unchanged.
EXPECT_TRUE(newAcctName.Equals(acctName));
}
-TEST(Strings, replace_substr_3)
+TEST_F(Strings, replace_substr_3)
{
nsCString s;
s.AssignLiteral("abcabcabc");
s.ReplaceSubstring("ca", "X");
EXPECT_STREQ(s.get(), "abXbXbc");
s.AssignLiteral("abcabcabc");
s.ReplaceSubstring("ca", "XYZ");
@@ -487,93 +592,93 @@ TEST(Strings, replace_substr_3)
s.ReplaceSubstring("notfound", "X");
EXPECT_STREQ(s.get(), "abcdabcdabcd");
s.AssignLiteral("abcdabcdabcd");
s.ReplaceSubstring("notfound", "longlongstring");
EXPECT_STREQ(s.get(), "abcdabcdabcd");
}
-TEST(Strings, strip_ws)
+TEST_F(Strings, strip_ws)
{
const char* texts[] = {"",
" a $ ",
"Some\fother\t thing\r\n",
"And \f\t\r\n even\nmore\r \f"};
const char* results[] = {"",
"a$",
"Someotherthing",
"Andevenmore"};
for (size_t i=0; i<sizeof(texts)/sizeof(texts[0]); i++) {
nsCString s(texts[i]);
s.StripWhitespace();
EXPECT_STREQ(s.get(), results[i]);
}
}
-TEST(Strings, equals_ic)
+TEST_F(Strings, equals_ic)
{
nsCString s;
EXPECT_FALSE(s.LowerCaseEqualsLiteral("view-source"));
}
-TEST(Strings, concat)
+TEST_F(Strings, concat)
{
nsCString bar("bar");
const nsACString& barRef = bar;
const nsPromiseFlatCString& result =
PromiseFlatCString(NS_LITERAL_CSTRING("foo") +
NS_LITERAL_CSTRING(",") +
barRef);
EXPECT_STREQ(result.get(), "foo,bar");
}
-TEST(Strings, concat_2)
+TEST_F(Strings, concat_2)
{
nsCString fieldTextStr("xyz");
nsCString text("text");
const nsACString& aText = text;
nsAutoCString result( fieldTextStr + aText );
EXPECT_STREQ(result.get(), "xyztext");
}
-TEST(Strings, concat_3)
+TEST_F(Strings, concat_3)
{
nsCString result;
nsCString ab("ab"), c("c");
result = ab + result + c;
EXPECT_STREQ(result.get(), "abc");
}
-TEST(Strings, empty_assign)
+TEST_F(Strings, empty_assign)
{
nsCString a;
a.AssignLiteral("");
a.AppendLiteral("");
nsCString b;
b.SetCapacity(0);
}
-TEST(Strings, set_length)
+TEST_F(Strings, set_length)
{
const char kText[] = "Default Plugin";
nsCString buf;
buf.SetCapacity(sizeof(kText)-1);
buf.Assign(kText);
buf.SetLength(sizeof(kText)-1);
EXPECT_STREQ(buf.get(), kText);
}
-TEST(Strings, substring)
+TEST_F(Strings, substring)
{
nsCString super("hello world"), sub("hello");
// this tests that |super| starts with |sub|,
EXPECT_TRUE(sub.Equals(StringHead(super, sub.Length())));
// and verifies that |sub| does not start with |super|.
@@ -594,17 +699,17 @@ TEST(Strings, substring)
str.Truncate(); \
str.AppendInt(suffix = prefix ## int ## suffix, base); \
EXPECT_TRUE(str.EqualsLiteral(#int));
#define test_appendbases(prefix, int, suffix, base) \
test_appendbase(str, prefix, int, suffix, base) \
test_appendbase(cstr, prefix, int, suffix, base)
-TEST(Strings, appendint)
+TEST_F(Strings, appendint)
{
nsString str;
nsCString cstr;
int32_t L;
uint32_t UL;
int64_t LL;
uint64_t ULL;
test_appends_expect(INT32_MAX, L, "2147483647")
@@ -622,17 +727,17 @@ TEST(Strings, appendint)
test_appendbases(0x, 7fffffff, L, 16)
test_appendbases(0x, 80000000, L, 16)
test_appendbases(0x, ffffffff, UL, 16)
test_appendbases(0x, 7fffffffffffffff, LL, 16)
test_appendbases(0x, 8000000000000000, LL, 16)
test_appendbases(0x, ffffffffffffffff, ULL, 16)
}
-TEST(Strings, appendint64)
+TEST_F(Strings, appendint64)
{
nsCString str;
int64_t max = INT64_MAX;
static const char max_expected[] = "9223372036854775807";
int64_t min = INT64_MIN;
static const char min_expected[] = "-9223372036854775808";
static const char min_expected_oct[] = "1000000000000000000000";
@@ -655,17 +760,17 @@ TEST(Strings, appendint64)
str.Truncate();
str.AppendInt(maxint_plus1);
EXPECT_TRUE(str.Equals(maxint_plus1_expected));
str.Truncate();
str.AppendInt(maxint_plus1, 16);
EXPECT_TRUE(str.Equals(maxint_plus1_expected_x));
}
-TEST(Strings, appendfloat)
+TEST_F(Strings, appendfloat)
{
nsCString str;
double bigdouble = 11223344556.66;
static const char double_expected[] = "11223344556.66";
static const char float_expected[] = "0.01";
// AppendFloat is used to append doubles, therefore the precision must be
// large enough (see bug 327719)
@@ -673,31 +778,31 @@ TEST(Strings, appendfloat)
EXPECT_TRUE(str.Equals(double_expected));
str.Truncate();
// AppendFloat is used to append floats (bug 327719 #27)
str.AppendFloat( 0.1f * 0.1f );
EXPECT_TRUE(str.Equals(float_expected));
}
-TEST(Strings, findcharinset)
+TEST_F(Strings, findcharinset)
{
nsCString buf("hello, how are you?");
int32_t index = buf.FindCharInSet(",?", 5);
EXPECT_EQ(index, 5);
index = buf.FindCharInSet("helo", 0);
EXPECT_EQ(index, 0);
index = buf.FindCharInSet("z?", 6);
EXPECT_EQ(index, (int32_t) buf.Length() - 1);
}
-TEST(Strings, rfindcharinset)
+TEST_F(Strings, rfindcharinset)
{
nsCString buf("hello, how are you?");
int32_t index = buf.RFindCharInSet(",?", 5);
EXPECT_EQ(index, 5);
index = buf.RFindCharInSet("helo", 0);
EXPECT_EQ(index, 0);
@@ -724,17 +829,17 @@ TEST(Strings, rfindcharinset)
index = buf.RFindCharInSet("cd", 1);
EXPECT_EQ(index, kNotFound);
index = buf.RFindCharInSet("h");
EXPECT_EQ(index, 7);
}
-TEST(Strings, stringbuffer)
+TEST_F(Strings, stringbuffer)
{
const char kData[] = "hello world";
RefPtr<nsStringBuffer> buf;
buf = nsStringBuffer::Alloc(sizeof(kData));
EXPECT_TRUE(!!buf);
@@ -747,17 +852,17 @@ TEST(Strings, stringbuffer)
buf->ToString(sizeof(kData)-1, str);
nsStringBuffer *buf2;
buf2 = nsStringBuffer::FromString(str);
EXPECT_EQ(buf, buf2);
}
-TEST(Strings, voided)
+TEST_F(Strings, voided)
{
const char kData[] = "hello world";
nsCString str;
EXPECT_TRUE(!str.IsVoid());
EXPECT_TRUE(str.IsEmpty());
EXPECT_STREQ(str.get(), "");
@@ -787,17 +892,17 @@ TEST(Strings, voided)
EXPECT_STREQ(str.get(), kData);
str.Adopt(nullptr);
EXPECT_TRUE(str.IsVoid());
EXPECT_TRUE(str.IsEmpty());
EXPECT_STREQ(str.get(), "");
}
-TEST(Strings, voided_autostr)
+TEST_F(Strings, voided_autostr)
{
const char kData[] = "hello world";
nsAutoCString str;
EXPECT_FALSE(str.IsVoid());
EXPECT_TRUE(str.IsEmpty());
str.Assign(kData);
@@ -808,26 +913,26 @@ TEST(Strings, voided_autostr)
EXPECT_TRUE(str.IsEmpty());
str.Assign(kData);
EXPECT_FALSE(str.IsVoid());
EXPECT_FALSE(str.IsEmpty());
EXPECT_STREQ(str.get(), kData);
}
-TEST(Strings, voided_assignment)
+TEST_F(Strings, voided_assignment)
{
nsCString a, b;
b.SetIsVoid(true);
a = b;
EXPECT_TRUE(a.IsVoid());
EXPECT_EQ(a.get(), b.get());
}
-TEST(Strings, empty_assignment)
+TEST_F(Strings, empty_assignment)
{
nsCString a, b;
a = b;
EXPECT_EQ(a.get(), b.get());
}
struct ToIntegerTest
{
@@ -839,17 +944,17 @@ struct ToIntegerTest
static const ToIntegerTest kToIntegerTests[] = {
{ "123", 10, 123, NS_OK },
{ "7b", 16, 123, NS_OK },
{ "90194313659", 10, 0, NS_ERROR_ILLEGAL_VALUE },
{ nullptr, 0, 0, NS_OK }
};
-TEST(Strings, string_tointeger)
+TEST_F(Strings, string_tointeger)
{
nsresult rv;
for (const ToIntegerTest* t = kToIntegerTests; t->str; ++t) {
int32_t result = nsAutoCString(t->str).ToInteger(&rv, t->radix);
EXPECT_EQ(rv, t->rv);
EXPECT_EQ(result, t->result);
result = nsAutoCString(t->str).ToInteger(&rv, t->radix);
EXPECT_EQ(rv, t->rv);
@@ -921,17 +1026,17 @@ TEST(String, strip_chars)
test_strip_chars_helper(u"foo",
u"foo",
NS_LITERAL_STRING(""));
test_strip_chars_helper(u" foo",
u" ",
NS_LITERAL_STRING("foo"));
}
-TEST(Strings, huge_capacity)
+TEST_F(Strings, huge_capacity)
{
nsString a, b, c, d, e, f, g, h, i, j, k, l, m, n;
nsCString n1;
// Ignore the result if the address space is less than 64-bit because
// some of the allocations above will exhaust the address space.
if (sizeof(void*) >= 8) {
EXPECT_TRUE(a.SetCapacity(1, fallible));
@@ -1012,17 +1117,17 @@ static void test_tofloat_helper(const ns
EXPECT_EQ(aStr.ToFloat(&result), aExpected);
if (aSuccess) {
EXPECT_EQ(result, NS_OK);
} else {
EXPECT_NE(result, NS_OK);
}
}
-TEST(Strings, tofloat)
+TEST_F(Strings, tofloat)
{
test_tofloat_helper(NS_LITERAL_STRING("42"), 42.f, true);
test_tofloat_helper(NS_LITERAL_STRING("42.0"), 42.f, true);
test_tofloat_helper(NS_LITERAL_STRING("-42"), -42.f, true);
test_tofloat_helper(NS_LITERAL_STRING("+42"), 42, true);
test_tofloat_helper(NS_LITERAL_STRING("13.37"), 13.37f, true);
test_tofloat_helper(NS_LITERAL_STRING("1.23456789"), 1.23456789f, true);
test_tofloat_helper(NS_LITERAL_STRING("1.98765432123456"), 1.98765432123456f, true);
@@ -1039,34 +1144,34 @@ static void test_todouble_helper(const n
EXPECT_EQ(aStr.ToDouble(&result), aExpected);
if (aSuccess) {
EXPECT_EQ(result, NS_OK);
} else {
EXPECT_NE(result, NS_OK);
}
}
-TEST(Strings, todouble)
+TEST_F(Strings, todouble)
{
test_todouble_helper(NS_LITERAL_STRING("42"), 42, true);
test_todouble_helper(NS_LITERAL_STRING("42.0"), 42, true);
test_todouble_helper(NS_LITERAL_STRING("-42"), -42, true);
test_todouble_helper(NS_LITERAL_STRING("+42"), 42, true);
test_todouble_helper(NS_LITERAL_STRING("13.37"), 13.37, true);
test_todouble_helper(NS_LITERAL_STRING("1.23456789"), 1.23456789, true);
test_todouble_helper(NS_LITERAL_STRING("1.98765432123456"), 1.98765432123456, true);
test_todouble_helper(NS_LITERAL_STRING("123456789.98765432123456"), 123456789.98765432123456, true);
test_todouble_helper(NS_LITERAL_STRING("0"), 0, true);
test_todouble_helper(NS_LITERAL_STRING("1.e5"), 100000, true);
test_todouble_helper(NS_LITERAL_STRING(""), 0, false);
test_todouble_helper(NS_LITERAL_STRING("42foo"), 42, false);
test_todouble_helper(NS_LITERAL_STRING("foo"), 0, false);
}
-TEST(Strings, Split)
+TEST_F(Strings, Split)
{
nsCString one("one"),
two("one;two"),
three("one--three"),
empty(""),
delimStart("-two"),
delimEnd("one-");
@@ -1144,17 +1249,17 @@ TEST(Strings, Split)
EXPECT_EQ(counter, (size_t)2);
}
constexpr bool TestSomeChars(char c)
{
return c == 'a' || c == 'c' || c == 'e' || c == '7' ||
c == 'G' || c == 'Z' || c == '\b' || c == '?';
}
-TEST(Strings,ASCIIMask)
+TEST_F(Strings,ASCIIMask)
{
const ASCIIMaskArray& maskCRLF = mozilla::ASCIIMask::MaskCRLF();
EXPECT_TRUE(maskCRLF['\n'] && mozilla::ASCIIMask::IsMasked(maskCRLF, '\n'));
EXPECT_TRUE(maskCRLF['\r'] && mozilla::ASCIIMask::IsMasked(maskCRLF, '\r'));
EXPECT_FALSE(maskCRLF['g'] || mozilla::ASCIIMask::IsMasked(maskCRLF, 'g'));
EXPECT_FALSE(maskCRLF[' '] || mozilla::ASCIIMask::IsMasked(maskCRLF, ' '));
EXPECT_FALSE(maskCRLF['\0'] || mozilla::ASCIIMask::IsMasked(maskCRLF, '\0'));
EXPECT_FALSE(mozilla::ASCIIMask::IsMasked(maskCRLF, 14324));
@@ -1258,22 +1363,22 @@ CompressWhitespaceHelper()
s.CompressWhitespace(true, false);
EXPECT_TRUE(s.EqualsLiteral(""));
s.AssignLiteral("");
s.CompressWhitespace(true, true);
EXPECT_TRUE(s.EqualsLiteral(""));
}
-TEST(Strings, CompressWhitespace)
+TEST_F(Strings, CompressWhitespace)
{
CompressWhitespaceHelper<nsCString>();
}
-TEST(Strings, CompressWhitespaceW)
+TEST_F(Strings, CompressWhitespaceW)
{
CompressWhitespaceHelper<nsString>();
nsString str, result;
str.AssignLiteral(u"\u263A is\r\n ;-)");
result.AssignLiteral(u"\u263A is ;-)");
str.CompressWhitespace(true, true);
EXPECT_TRUE(str == result);
@@ -1319,266 +1424,196 @@ StripCRLFHelper()
s.StripCRLF();
EXPECT_TRUE(s.EqualsLiteral(" \t"));
s.AssignLiteral("");
s.StripCRLF();
EXPECT_TRUE(s.EqualsLiteral(""));
}
-TEST(Strings, StripCRLF)
+TEST_F(Strings, StripCRLF)
{
StripCRLFHelper<nsCString>();
}
-TEST(Strings, StripCRLFW)
+TEST_F(Strings, StripCRLFW)
{
StripCRLFHelper<nsString>();
nsString str, result;
str.AssignLiteral(u"\u263A is\r\n ;-)");
result.AssignLiteral(u"\u263A is ;-)");
str.StripCRLF();
EXPECT_TRUE(str == result);
}
-#define TestExample1 "Sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium doloremque laudantium,\n totam rem aperiam, eaque ipsa quae ab illo inventore veritatis et quasi\r architecto beatae vitae dicta sunt explicabo. Nemo enim ipsam voluptatem quia voluptas sit aspernatur\n aut odit aut fugit, sed quia consequuntur magni dolores eos qui ratione voluptatem sequi nesciunt. Neque porro quisquam est, qui\r\n\r dolorem ipsum quia dolor sit amet, consectetur, adipisci velit, sed quia non numquam eius modi tempora incidunt ut labore et dolore magnam aliquam quaerat voluptatem. Ut enim ad minima veniam, quis nostrum exercitationem ullam corporis suscipit laboriosam, nisi ut aliquid ex ea commodi consequatur? Quis autem vel eum iure reprehenderit qui in ea voluptate velit esse quam nihil molestiae consequatur, vel illum qui dolorem eum fugiat quo voluptas nulla pariatur?"
-
-#define TestExample2 "At vero eos et accusamus et iusto odio dignissimos ducimus\n\n qui blanditiis praesentium voluptatum deleniti atque corrupti quos dolores et quas molestias excepturi sint occaecati cupiditate non provident, similique sunt in culpa qui officia deserunt\r\r \n mollitia animi, id est laborum et dolorum fuga. Et harum quidem rerum facilis est et expedita distinctio. Nam libero tempore, cum soluta nobis est eligendi optio cumque nihil impedit quo minus id quod maxime placeat facere possimus, omnis voluptas assumenda est, omnis dolor repellendus. Temporibus autem quibusdam et aut officiis debitis aut rerum necessitatibus saepe eveniet ut et voluptates repudiandae sint et molestiae non recusandae. Itaque earum rerum hic tenetur a sapiente delectus, ut aut reiciendis voluptatibus maiores alias consequatur aut perferendis doloribus asperiores repellat."
-
-#define TestExample3 " Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis ac tellus eget velit viverra viverra id sit amet neque. Sed id consectetur mi, vestibulum aliquet arcu. Curabitur sagittis accumsan convallis. Sed eu condimentum ipsum, a laoreet tortor. Orci varius natoque penatibus et magnis dis \r\r\n\n parturient montes, nascetur ridiculus mus. Sed non tellus nec ante sodales placerat a nec risus. Cras vel bibendum sapien, nec ullamcorper felis. Pellentesque congue eget nisi sit amet vehicula. Morbi pulvinar turpis justo, in commodo dolor vulputate id. Curabitur in dui urna. Vestibulum placerat dui in sem congue, ut faucibus nibh rutrum. Duis mattis turpis facilisis ullamcorper tincidunt. Vestibulum pharetra tortor at enim sagittis, dapibus consectetur ex blandit. Curabitur ac fringilla quam. In ornare lectus ut ipsum mattis venenatis. Etiam in mollis lectus, sed luctus risus.\nCras dapibus\f\t \n finibus justo sit amet dictum. Aliquam non elit diam. Fusce magna nulla, bibendum in massa a, commodo finibus lectus. Sed rutrum a augue id imperdiet. Aliquam sagittis sodales felis, a tristique ligula. Aliquam erat volutpat. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Duis volutpat interdum lorem et congue. Phasellus porttitor posuere justo eget euismod. Nam a condimentum turpis, sit amet gravida lacus. Vestibulum dolor diam, lobortis ac metus et, convallis dapibus tellus. Ut nec metus in velit malesuada tincidunt et eget justo. Curabitur ut libero bibendum, porttitor diam vitae, aliquet justo. "
-
-#define TestExample4 " Donec feugiat volutpat massa. Cras ornare lacinia porta. Fusce in feugiat nunc. Praesent non felis varius diam feugiat ultrices ultricies a risus. Donec maximus nisi nisl, non consectetur nulla eleifend in. Nulla in massa interdum, eleifend orci a, vestibulum est. Mauris aliquet, massa et convallis mollis, felis augue vestibulum augue, in lobortis metus eros a quam. Nam ac diam ornare, vestibulum elit sit amet, consectetur ante. Praesent massa mauris, pulvinar sit amet sapien vel, tempus gravida neque. Praesent id quam sit amet est maximus molestie eget at turpis. Nunc sit amet orci id arcu dapibus fermentum non eu erat.\f\tSuspendisse commodo nunc sem, eu congue eros condimentum vel. Nullam sit amet posuere arcu. Nulla facilisi. Mauris dapibus iaculis massa sed gravida. Nullam vitae urna at tortor feugiat auctor ut sit amet dolor. Proin rutrum at nunc et faucibus. Quisque suscipit id nibh a aliquet. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam a dapibus erat, id imperdiet mauris. Nulla blandit libero non magna dapibus tristique. Integer hendrerit imperdiet lorem, quis facilisis lacus semper ut. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae Nullam dignissim elit in congue ultricies. Quisque erat odio, maximus mollis laoreet id, iaculis at turpis. "
-
-#define TestExample5 "Donec id risus urna. Nunc consequat lacinia urna id bibendum. Nulla faucibus faucibus enim. Cras ex risus, ultrices id semper vitae, luctus ut nulla. Sed vehicula tellus sed purus imperdiet efficitur. Suspendisse feugiat\n\n\n imperdiet odio, sed porta lorem feugiat nec. Curabitur laoreet massa venenatis\r\n risus ornare\r\n, vitae feugiat tortor accumsan. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Maecenas id scelerisque mauris, eget facilisis erat. Ut nec pulvinar risus, sed iaculis ante. Mauris tincidunt, risus et pretium elementum, leo nisi consectetur ligula, tincidunt suscipit erat velit eget libero. Sed ac est tempus, consequat dolor mattis, mattis mi. "
-
// Note the five calls in the loop, so divide by 100k
-MOZ_GTEST_BENCH(Strings, PerfStripWhitespace, [] {
- nsCString test1(TestExample1);
- nsCString test2(TestExample2);
- nsCString test3(TestExample3);
- nsCString test4(TestExample4);
- nsCString test5(TestExample5);
+MOZ_GTEST_BENCH_F(Strings, PerfStripWhitespace, [this] {
+ nsCString test1(mExample1Utf8);
+ nsCString test2(mExample2Utf8);
+ nsCString test3(mExample3Utf8);
+ nsCString test4(mExample4Utf8);
+ nsCString test5(mExample5Utf8);
for (int i = 0; i < 20000; i++) {
test1.StripWhitespace();
test2.StripWhitespace();
test3.StripWhitespace();
test4.StripWhitespace();
test5.StripWhitespace();
}
});
-MOZ_GTEST_BENCH(Strings, PerfStripCharsWhitespace, [] {
+MOZ_GTEST_BENCH_F(Strings, PerfStripCharsWhitespace, [this] {
// This is the unoptimized (original) version of
// StripWhitespace using StripChars.
- nsCString test1(TestExample1);
- nsCString test2(TestExample2);
- nsCString test3(TestExample3);
- nsCString test4(TestExample4);
- nsCString test5(TestExample5);
+ nsCString test1(mExample1Utf8);
+ nsCString test2(mExample2Utf8);
+ nsCString test3(mExample3Utf8);
+ nsCString test4(mExample4Utf8);
+ nsCString test5(mExample5Utf8);
for (int i = 0; i < 20000; i++) {
test1.StripChars("\f\t\r\n ");
test2.StripChars("\f\t\r\n ");
test3.StripChars("\f\t\r\n ");
test4.StripChars("\f\t\r\n ");
test5.StripChars("\f\t\r\n ");
}
});
-MOZ_GTEST_BENCH(Strings, PerfCompressWhitespace, [] {
- nsCString test1(TestExample1);
- nsCString test2(TestExample2);
- nsCString test3(TestExample3);
- nsCString test4(TestExample4);
- nsCString test5(TestExample5);
+MOZ_GTEST_BENCH_F(Strings, PerfCompressWhitespace, [this] {
+ nsCString test1(mExample1Utf8);
+ nsCString test2(mExample2Utf8);
+ nsCString test3(mExample3Utf8);
+ nsCString test4(mExample4Utf8);
+ nsCString test5(mExample5Utf8);
for (int i = 0; i < 20000; i++) {
test1.CompressWhitespace();
test2.CompressWhitespace();
test3.CompressWhitespace();
test4.CompressWhitespace();
test5.CompressWhitespace();
}
});
-MOZ_GTEST_BENCH(Strings, PerfStripCRLF, [] {
- nsCString test1(TestExample1);
- nsCString test2(TestExample2);
- nsCString test3(TestExample3);
- nsCString test4(TestExample4);
- nsCString test5(TestExample5);
+MOZ_GTEST_BENCH_F(Strings, PerfStripCRLF, [this] {
+ nsCString test1(mExample1Utf8);
+ nsCString test2(mExample2Utf8);
+ nsCString test3(mExample3Utf8);
+ nsCString test4(mExample4Utf8);
+ nsCString test5(mExample5Utf8);
for (int i = 0; i < 20000; i++) {
test1.StripCRLF();
test2.StripCRLF();
test3.StripCRLF();
test4.StripCRLF();
test5.StripCRLF();
}
});
-MOZ_GTEST_BENCH(Strings, PerfStripCharsCRLF, [] {
+MOZ_GTEST_BENCH_F(Strings, PerfStripCharsCRLF, [this] {
// This is the unoptimized (original) version of
// stripping \r\n using StripChars.
- nsCString test1(TestExample1);
- nsCString test2(TestExample2);
- nsCString test3(TestExample3);
- nsCString test4(TestExample4);
- nsCString test5(TestExample5);
+ nsCString test1(mExample1Utf8);
+ nsCString test2(mExample2Utf8);
+ nsCString test3(mExample3Utf8);
+ nsCString test4(mExample4Utf8);
+ nsCString test5(mExample5Utf8);
for (int i = 0; i < 20000; i++) {
test1.StripChars("\r\n");
test2.StripChars("\r\n");
test3.StripChars("\r\n");
test4.StripChars("\r\n");
test5.StripChars("\r\n");
}
});
-// Setup overhead test
-#define OneASCII "a"
-
-// Maximal non-SIMD legth
-#define FifteenASCII "Lorem ipsum dol"
-
-// Around hundred is common length for IsUTF8 check
-#define HundredASCII "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis ac tellus eget velit viverra viverra i"
-
-MOZ_GTEST_BENCH(Strings, PerfIsUTF8One, [] {
- nsCString test(OneASCII);
+MOZ_GTEST_BENCH_F(Strings, PerfIsUTF8One, [this] {
for (int i = 0; i < 200000; i++) {
- bool b = IsUTF8(*BlackBox(&test));
+ bool b = IsUTF8(*BlackBox(&mOneAsciiUtf8));
BlackBox(&b);
}
});
-MOZ_GTEST_BENCH(Strings, PerfIsUTF8Fifteen, [] {
- nsCString test(FifteenASCII);
+MOZ_GTEST_BENCH_F(Strings, PerfIsUTF8Fifteen, [this] {
for (int i = 0; i < 200000; i++) {
- bool b = IsUTF8(*BlackBox(&test));
- BlackBox(&b);
- }
-});
-
-MOZ_GTEST_BENCH(Strings, PerfIsUTF8Hundred, [] {
- nsCString test(HundredASCII);
- for (int i = 0; i < 200000; i++) {
- bool b = IsUTF8(*BlackBox(&test));
+ bool b = IsUTF8(*BlackBox(&mFifteenAsciiUtf8));
BlackBox(&b);
}
});
-MOZ_GTEST_BENCH(Strings, PerfIsUTF8Example3, [] {
- nsCString test(TestExample3);
- for (int i = 0; i < 100000; i++) {
- bool b = IsUTF8(*BlackBox(&test));
- BlackBox(&b);
- }
-});
-
-MOZ_GTEST_BENCH(Strings, PerfIsASCII8One, [] {
- nsCString test(OneASCII);
+MOZ_GTEST_BENCH_F(Strings, PerfIsUTF8Hundred, [this] {
for (int i = 0; i < 200000; i++) {
- bool b = IsASCII(*BlackBox(&test));
+ bool b = IsUTF8(*BlackBox(&mHundredAsciiUtf8));
BlackBox(&b);
}
});
-MOZ_GTEST_BENCH(Strings, PerfIsASCIIFifteen, [] {
- nsCString test(FifteenASCII);
- for (int i = 0; i < 200000; i++) {
- bool b = IsASCII(*BlackBox(&test));
+MOZ_GTEST_BENCH_F(Strings, PerfIsUTF8Example3, [this] {
+ for (int i = 0; i < 100000; i++) {
+ bool b = IsUTF8(*BlackBox(&mExample3Utf8));
BlackBox(&b);
}
});
-MOZ_GTEST_BENCH(Strings, PerfIsASCIIHundred, [] {
- nsCString test(HundredASCII);
+MOZ_GTEST_BENCH_F(Strings, PerfIsASCII8One, [this] {
for (int i = 0; i < 200000; i++) {
- bool b = IsASCII(*BlackBox(&test));
+ bool b = IsASCII(*BlackBox(&mOneAsciiUtf8));
BlackBox(&b);
}
});
-MOZ_GTEST_BENCH(Strings, PerfIsASCIIExample3, [] {
- nsCString test(TestExample3);
- for (int i = 0; i < 100000; i++) {
- bool b = IsASCII(*BlackBox(&test));
+MOZ_GTEST_BENCH_F(Strings, PerfIsASCIIFifteen, [this] {
+ for (int i = 0; i < 200000; i++) {
+ bool b = IsASCII(*BlackBox(&mFifteenAsciiUtf8));
BlackBox(&b);
}
});
-MOZ_GTEST_BENCH(Strings, PerfHasRTLCharsExample3, [] {
- nsCString utf8(TestExample3);
- nsString test;
- CopyUTF8toUTF16(utf8, test);
+MOZ_GTEST_BENCH_F(Strings, PerfIsASCIIHundred, [this] {
+ for (int i = 0; i < 200000; i++) {
+ bool b = IsASCII(*BlackBox(&mHundredAsciiUtf8));
+ BlackBox(&b);
+ }
+});
+
+MOZ_GTEST_BENCH_F(Strings, PerfIsASCIIExample3, [this] {
for (int i = 0; i < 100000; i++) {
- bool b = HasRTLChars(*BlackBox(&test));
+ bool b = IsASCII(*BlackBox(&mExample3Utf8));
+ BlackBox(&b);
+ }
+});
+
+MOZ_GTEST_BENCH_F(Strings, PerfHasRTLCharsExample3, [this] {
+ for (int i = 0; i < 100000; i++) {
+ bool b = HasRTLChars(*BlackBox(&mExample3Utf16));
BlackBox(&b);
}
});
-// Originally ReadVPXFile in TestVPXDecoding.cpp
-static void
-ReadFile(const char* aPath, nsACString& aBuffer)
-{
- FILE* f = fopen(aPath, "rb");
- ASSERT_NE(f, (FILE *) nullptr);
-
- int r = fseek(f, 0, SEEK_END);
- ASSERT_EQ(r, 0);
-
- long size = ftell(f);
- ASSERT_NE(size, -1);
- aBuffer.SetLength(size);
-
- r = fseek(f, 0, SEEK_SET);
- ASSERT_EQ(r, 0);
-
- size_t got = fread(aBuffer.BeginWriting(), 1, size, f);
- ASSERT_EQ(got, size_t(size));
-
- r = fclose(f);
- ASSERT_EQ(r, 0);
-}
-
-MOZ_GTEST_BENCH(Strings, PerfHasRTLCharsDE, [] {
- nsCString utf8;
- ReadFile("de.txt", utf8);
- nsString test;
- CopyUTF8toUTF16(utf8, test);
+MOZ_GTEST_BENCH_F(Strings, PerfHasRTLCharsDE, [this] {
for (int i = 0; i < 100000; i++) {
- bool b = HasRTLChars(*BlackBox(&test));
+ bool b = HasRTLChars(*BlackBox(&mDeUtf16));
BlackBox(&b);
}
});
-MOZ_GTEST_BENCH(Strings, PerfHasRTLCharsRU, [] {
- nsCString utf8;
- ReadFile("ru.txt", utf8);
- nsString test;
- CopyUTF8toUTF16(utf8, test);
+MOZ_GTEST_BENCH_F(Strings, PerfHasRTLCharsRU, [this] {
for (int i = 0; i < 100000; i++) {
- bool b = HasRTLChars(*BlackBox(&test));
+ bool b = HasRTLChars(*BlackBox(&mRuUtf16));
BlackBox(&b);
}
});
-MOZ_GTEST_BENCH(Strings, PerfHasRTLCharsTH, [] {
- nsCString utf8;
- ReadFile("th.txt", utf8);
- nsString test;
- CopyUTF8toUTF16(utf8, test);
+MOZ_GTEST_BENCH_F(Strings, PerfHasRTLCharsTH, [this] {
for (int i = 0; i < 100000; i++) {
- bool b = HasRTLChars(*BlackBox(&test));
+ bool b = HasRTLChars(*BlackBox(&mThUtf16));
BlackBox(&b);
}
});
-MOZ_GTEST_BENCH(Strings, PerfHasRTLCharsJA, [] {
- nsCString utf8;
- ReadFile("ja.txt", utf8);
- nsString test;
- CopyUTF8toUTF16(utf8, test);
+MOZ_GTEST_BENCH_F(Strings, PerfHasRTLCharsJA, [this] {
for (int i = 0; i < 100000; i++) {
- bool b = HasRTLChars(*BlackBox(&test));
+ bool b = HasRTLChars(*BlackBox(&mJaUtf16));
BlackBox(&b);
}
});
} // namespace TestStrings