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

Side by Side Diff: third_party/WebKit/Source/platform/image-decoders/bmp/BMPImageDecoderTest.cpp

Issue 2496663002: Merge css3/image/ and fast/images/ to images/ (Closed)
Patch Set: Address failing tests (3 of them) Created 4 years, 1 month 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 unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "platform/image-decoders/bmp/BMPImageDecoder.h" 5 #include "platform/image-decoders/bmp/BMPImageDecoder.h"
6 6
7 #include "platform/SharedBuffer.h" 7 #include "platform/SharedBuffer.h"
8 #include "platform/image-decoders/ImageDecoderTestHelpers.h" 8 #include "platform/image-decoders/ImageDecoderTestHelpers.h"
9 #include "testing/gtest/include/gtest/gtest.h" 9 #include "testing/gtest/include/gtest/gtest.h"
10 #include "wtf/PtrUtil.h" 10 #include "wtf/PtrUtil.h"
11 #include <memory> 11 #include <memory>
12 12
13 namespace blink { 13 namespace blink {
14 14
15 namespace { 15 namespace {
16 16
17 std::unique_ptr<ImageDecoder> createDecoder() { 17 std::unique_ptr<ImageDecoder> createDecoder() {
18 return wrapUnique(new BMPImageDecoder(ImageDecoder::AlphaNotPremultiplied, 18 return wrapUnique(new BMPImageDecoder(ImageDecoder::AlphaNotPremultiplied,
19 ImageDecoder::ColorSpaceApplied, 19 ImageDecoder::ColorSpaceApplied,
20 ImageDecoder::noDecodedImageByteLimit)); 20 ImageDecoder::noDecodedImageByteLimit));
21 } 21 }
22 22
23 } // anonymous namespace 23 } // anonymous namespace
24 24
25 TEST(BMPImageDecoderTest, isSizeAvailable) { 25 TEST(BMPImageDecoderTest, isSizeAvailable) {
26 const char* bmpFile = 26 const char* bmpFile = "/LayoutTests/images/resources/lenna.bmp"; // 256x256
27 "/LayoutTests/fast/images/resources/lenna.bmp"; // 256x256
28 RefPtr<SharedBuffer> data = readFile(bmpFile); 27 RefPtr<SharedBuffer> data = readFile(bmpFile);
29 ASSERT_TRUE(data.get()); 28 ASSERT_TRUE(data.get());
30 29
31 std::unique_ptr<ImageDecoder> decoder = createDecoder(); 30 std::unique_ptr<ImageDecoder> decoder = createDecoder();
32 decoder->setData(data.get(), true); 31 decoder->setData(data.get(), true);
33 EXPECT_TRUE(decoder->isSizeAvailable()); 32 EXPECT_TRUE(decoder->isSizeAvailable());
34 EXPECT_EQ(256, decoder->size().width()); 33 EXPECT_EQ(256, decoder->size().width());
35 EXPECT_EQ(256, decoder->size().height()); 34 EXPECT_EQ(256, decoder->size().height());
36 } 35 }
37 36
38 TEST(BMPImageDecoderTest, parseAndDecode) { 37 TEST(BMPImageDecoderTest, parseAndDecode) {
39 const char* bmpFile = 38 const char* bmpFile = "/LayoutTests/images/resources/lenna.bmp"; // 256x256
40 "/LayoutTests/fast/images/resources/lenna.bmp"; // 256x256
41 RefPtr<SharedBuffer> data = readFile(bmpFile); 39 RefPtr<SharedBuffer> data = readFile(bmpFile);
42 ASSERT_TRUE(data.get()); 40 ASSERT_TRUE(data.get());
43 41
44 std::unique_ptr<ImageDecoder> decoder = createDecoder(); 42 std::unique_ptr<ImageDecoder> decoder = createDecoder();
45 decoder->setData(data.get(), true); 43 decoder->setData(data.get(), true);
46 44
47 ImageFrame* frame = decoder->frameBufferAtIndex(0); 45 ImageFrame* frame = decoder->frameBufferAtIndex(0);
48 ASSERT_TRUE(frame); 46 ASSERT_TRUE(frame);
49 EXPECT_EQ(ImageFrame::FrameComplete, frame->getStatus()); 47 EXPECT_EQ(ImageFrame::FrameComplete, frame->getStatus());
50 EXPECT_EQ(256, frame->bitmap().width()); 48 EXPECT_EQ(256, frame->bitmap().width());
51 EXPECT_EQ(256, frame->bitmap().height()); 49 EXPECT_EQ(256, frame->bitmap().height());
52 EXPECT_FALSE(decoder->failed()); 50 EXPECT_FALSE(decoder->failed());
53 } 51 }
54 52
55 // Test if a BMP decoder returns a proper error while decoding an empty image. 53 // Test if a BMP decoder returns a proper error while decoding an empty image.
56 TEST(BMPImageDecoderTest, emptyImage) { 54 TEST(BMPImageDecoderTest, emptyImage) {
57 const char* bmpFile = "/LayoutTests/fast/images/resources/0x0.bmp"; // 0x0 55 const char* bmpFile = "/LayoutTests/images/resources/0x0.bmp"; // 0x0
58 RefPtr<SharedBuffer> data = readFile(bmpFile); 56 RefPtr<SharedBuffer> data = readFile(bmpFile);
59 ASSERT_TRUE(data.get()); 57 ASSERT_TRUE(data.get());
60 58
61 std::unique_ptr<ImageDecoder> decoder = createDecoder(); 59 std::unique_ptr<ImageDecoder> decoder = createDecoder();
62 decoder->setData(data.get(), true); 60 decoder->setData(data.get(), true);
63 61
64 ImageFrame* frame = decoder->frameBufferAtIndex(0); 62 ImageFrame* frame = decoder->frameBufferAtIndex(0);
65 ASSERT_TRUE(frame); 63 ASSERT_TRUE(frame);
66 EXPECT_EQ(ImageFrame::FrameEmpty, frame->getStatus()); 64 EXPECT_EQ(ImageFrame::FrameEmpty, frame->getStatus());
67 EXPECT_TRUE(decoder->failed()); 65 EXPECT_TRUE(decoder->failed());
68 } 66 }
69 67
70 TEST(BMPImageDecoderTest, int32MinHeight) { 68 TEST(BMPImageDecoderTest, int32MinHeight) {
71 const char* bmpFile = 69 const char* bmpFile =
72 "/LayoutTests/fast/images/resources/1xint32_min.bmp"; // 0xINT32_MIN 70 "/LayoutTests/images/resources/1xint32_min.bmp"; // 0xINT32_MIN
73 RefPtr<SharedBuffer> data = readFile(bmpFile); 71 RefPtr<SharedBuffer> data = readFile(bmpFile);
74 std::unique_ptr<ImageDecoder> decoder = createDecoder(); 72 std::unique_ptr<ImageDecoder> decoder = createDecoder();
75 // Test when not all data is received. 73 // Test when not all data is received.
76 decoder->setData(data.get(), false); 74 decoder->setData(data.get(), false);
77 EXPECT_FALSE(decoder->isSizeAvailable()); 75 EXPECT_FALSE(decoder->isSizeAvailable());
78 EXPECT_TRUE(decoder->failed()); 76 EXPECT_TRUE(decoder->failed());
79 } 77 }
80 78
81 // This test verifies that calling SharedBuffer::mergeSegmentsIntoBuffer() does 79 // This test verifies that calling SharedBuffer::mergeSegmentsIntoBuffer() does
82 // not break BMP decoding at a critical point: in between a call to decode the 80 // not break BMP decoding at a critical point: in between a call to decode the
83 // size (when BMPImageDecoder stops while it may still have input data to 81 // size (when BMPImageDecoder stops while it may still have input data to
84 // read) and a call to do a full decode. 82 // read) and a call to do a full decode.
85 TEST(BMPImageDecoderTest, mergeBuffer) { 83 TEST(BMPImageDecoderTest, mergeBuffer) {
86 const char* bmpFile = "/LayoutTests/fast/images/resources/lenna.bmp"; 84 const char* bmpFile = "/LayoutTests/images/resources/lenna.bmp";
87 testMergeBuffer(&createDecoder, bmpFile); 85 testMergeBuffer(&createDecoder, bmpFile);
88 } 86 }
89 87
90 } // namespace blink 88 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698