From 2a4e4ce8efaf8b6466962eef292a9876c17976ad Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Thu, 22 Oct 2015 16:50:23 -0700 Subject: XFA: Make fx_codec_jpx_unittest.cpp match master R=thestig@chromium.org Review URL: https://codereview.chromium.org/1412453005 . --- core/src/fxcodec/codec/fx_codec_jpx_unittest.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'core') 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)); -- cgit v1.2.3