summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorTom Sepez <tsepez@chromium.org>2015-10-22 16:50:23 -0700
committerTom Sepez <tsepez@chromium.org>2015-10-22 16:50:23 -0700
commit2a4e4ce8efaf8b6466962eef292a9876c17976ad (patch)
treed6fbf6894f483318ef71611762199b21ecdeb949 /core
parent361a48c04bf14db54731ac99c3c3411b62684775 (diff)
downloadpdfium-2a4e4ce8efaf8b6466962eef292a9876c17976ad.tar.xz
XFA: Make fx_codec_jpx_unittest.cpp match master
R=thestig@chromium.org Review URL: https://codereview.chromium.org/1412453005 .
Diffstat (limited to 'core')
-rw-r--r--core/src/fxcodec/codec/fx_codec_jpx_unittest.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/core/src/fxcodec/codec/fx_codec_jpx_unittest.cpp b/core/src/fxcodec/codec/fx_codec_jpx_unittest.cpp
index 1245cf6e23..8c4a5b2705 100644
--- a/core/src/fxcodec/codec/fx_codec_jpx_unittest.cpp
+++ b/core/src/fxcodec/codec/fx_codec_jpx_unittest.cpp
@@ -45,16 +45,16 @@ TEST(fxcodec, DecodeDataNullStream) {
EXPECT_EQ(0xbd, buffer[0]);
// writes of size 0 do nothing but return an error code.
- EXPECT_EQ(kReadError, opj_write_from_memory(buffer, 0, &dd));
+ EXPECT_EQ(kWriteError, opj_write_from_memory(buffer, 0, &dd));
// writes of nonzero size do nothing but return an error code.
- EXPECT_EQ(kReadError, opj_write_from_memory(buffer, sizeof(buffer), &dd));
+ EXPECT_EQ(kWriteError, opj_write_from_memory(buffer, sizeof(buffer), &dd));
// Skips of size 0 always return an error code.
- EXPECT_EQ(kReadError, opj_skip_from_memory(0, &dd));
+ EXPECT_EQ(kSkipError, opj_skip_from_memory(0, &dd));
// Skips of nonzero size always return an error code.
- EXPECT_EQ(kReadError, opj_skip_from_memory(1, &dd));
+ EXPECT_EQ(kSkipError, opj_skip_from_memory(1, &dd));
// Seeks to 0 offset return in error.
EXPECT_FALSE(opj_seek_from_memory(0, &dd));
@@ -78,16 +78,16 @@ TEST(fxcodec, DecodeDataZeroSize) {
EXPECT_EQ(0xbd, buffer[0]);
// writes of size 0 do nothing but return an error code.
- EXPECT_EQ(kReadError, opj_write_from_memory(buffer, 0, &dd));
+ EXPECT_EQ(kWriteError, opj_write_from_memory(buffer, 0, &dd));
// writes of nonzero size do nothing but return an error code.
- EXPECT_EQ(kReadError, opj_write_from_memory(buffer, sizeof(buffer), &dd));
+ EXPECT_EQ(kWriteError, opj_write_from_memory(buffer, sizeof(buffer), &dd));
// Skips of size 0 always return an error code.
- EXPECT_EQ(kReadError, opj_skip_from_memory(0, &dd));
+ EXPECT_EQ(kSkipError, opj_skip_from_memory(0, &dd));
// Skips of nonzero size always return an error code.
- EXPECT_EQ(kReadError, opj_skip_from_memory(1, &dd));
+ EXPECT_EQ(kSkipError, opj_skip_from_memory(1, &dd));
// Seeks to 0 offset return in error.
EXPECT_FALSE(opj_seek_from_memory(0, &dd));