Merge "Fix broken liblatinime_unittests" am: 62013c4f80
am: 5e1756c5fe
Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/1589747 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I6dd60fb5d01feed612f81fbb33adf07b1abec0ccmain
commit
326ff853c7
|
@ -57,7 +57,13 @@ TEST(FormatUtilsTest, TestDetectFormatVersion) {
|
||||||
{
|
{
|
||||||
const std::vector<uint8_t> buffer =
|
const std::vector<uint8_t> buffer =
|
||||||
getBuffer(FormatUtils::MAGIC_NUMBER, FormatUtils::VERSION_2, 0, 0);
|
getBuffer(FormatUtils::MAGIC_NUMBER, FormatUtils::VERSION_2, 0, 0);
|
||||||
EXPECT_EQ(FormatUtils::VERSION_2, FormatUtils::detectFormatVersion(
|
EXPECT_EQ(FormatUtils::UNKNOWN_VERSION, FormatUtils::detectFormatVersion(
|
||||||
|
ReadOnlyByteArrayView(buffer.data(), buffer.size())));
|
||||||
|
}
|
||||||
|
{
|
||||||
|
const std::vector<uint8_t> buffer =
|
||||||
|
getBuffer(FormatUtils::MAGIC_NUMBER, FormatUtils::VERSION_202, 0, 0);
|
||||||
|
EXPECT_EQ(FormatUtils::VERSION_202, FormatUtils::detectFormatVersion(
|
||||||
ReadOnlyByteArrayView(buffer.data(), buffer.size())));
|
ReadOnlyByteArrayView(buffer.data(), buffer.size())));
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
|
@ -75,7 +81,7 @@ TEST(FormatUtilsTest, TestDetectFormatVersion) {
|
||||||
|
|
||||||
{
|
{
|
||||||
const std::vector<uint8_t> buffer =
|
const std::vector<uint8_t> buffer =
|
||||||
getBuffer(FormatUtils::MAGIC_NUMBER - 1, FormatUtils::VERSION_2, 0, 0);
|
getBuffer(FormatUtils::MAGIC_NUMBER - 1, FormatUtils::VERSION_402, 0, 0);
|
||||||
EXPECT_EQ(FormatUtils::UNKNOWN_VERSION, FormatUtils::detectFormatVersion(
|
EXPECT_EQ(FormatUtils::UNKNOWN_VERSION, FormatUtils::detectFormatVersion(
|
||||||
ReadOnlyByteArrayView(buffer.data(), buffer.size())));
|
ReadOnlyByteArrayView(buffer.data(), buffer.size())));
|
||||||
}
|
}
|
||||||
|
@ -87,7 +93,7 @@ TEST(FormatUtilsTest, TestDetectFormatVersion) {
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
const std::vector<uint8_t> buffer =
|
const std::vector<uint8_t> buffer =
|
||||||
getBuffer(FormatUtils::MAGIC_NUMBER, FormatUtils::VERSION_2, 0, 0);
|
getBuffer(FormatUtils::MAGIC_NUMBER, FormatUtils::VERSION_402, 0, 0);
|
||||||
EXPECT_EQ(FormatUtils::UNKNOWN_VERSION, FormatUtils::detectFormatVersion(
|
EXPECT_EQ(FormatUtils::UNKNOWN_VERSION, FormatUtils::detectFormatVersion(
|
||||||
ReadOnlyByteArrayView(buffer.data(), buffer.size() - 1)));
|
ReadOnlyByteArrayView(buffer.data(), buffer.size() - 1)));
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue