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

Side by Side Diff: Source/web/tests/WebImageTest.cpp

Issue 1174283002: Fix unit test style in Source/web/. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: remove static Created 5 years, 6 months 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 | Annotate | Revision Log
« no previous file with comments | « Source/web/tests/WebFrameTest.cpp ('k') | Source/web/tests/WebInputEventConversionTest.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2012 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 20 matching lines...) Expand all
31 #include "config.h" 31 #include "config.h"
32 #include "public/platform/WebImage.h" 32 #include "public/platform/WebImage.h"
33 33
34 #include "platform/SharedBuffer.h" 34 #include "platform/SharedBuffer.h"
35 #include "public/platform/Platform.h" 35 #include "public/platform/Platform.h"
36 #include "public/platform/WebData.h" 36 #include "public/platform/WebData.h"
37 #include "public/platform/WebSize.h" 37 #include "public/platform/WebSize.h"
38 #include "public/platform/WebUnitTestSupport.h" 38 #include "public/platform/WebUnitTestSupport.h"
39 #include <gtest/gtest.h> 39 #include <gtest/gtest.h>
40 40
41 using namespace blink; 41 namespace blink {
42
43 namespace {
44 42
45 static PassRefPtr<SharedBuffer> readFile(const char* fileName) 43 static PassRefPtr<SharedBuffer> readFile(const char* fileName)
46 { 44 {
47 String filePath = Platform::current()->unitTestSupport()->webKitRootDir(); 45 String filePath = Platform::current()->unitTestSupport()->webKitRootDir();
48 filePath.append("/Source/web/tests/data/"); 46 filePath.append("/Source/web/tests/data/");
49 filePath.append(fileName); 47 filePath.append(fileName);
50 48
51 return Platform::current()->unitTestSupport()->readFromFile(filePath); 49 return Platform::current()->unitTestSupport()->readFromFile(filePath);
52 } 50 }
53 51
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
90 { 88 {
91 const char badImage[] = "hello world"; 89 const char badImage[] = "hello world";
92 WebVector<WebImage> images = WebImage::framesFromData(WebData(badImage)); 90 WebVector<WebImage> images = WebImage::framesFromData(WebData(badImage));
93 ASSERT_EQ(0u, images.size()); 91 ASSERT_EQ(0u, images.size());
94 92
95 WebImage image = WebImage::fromData(WebData(badImage), WebSize()); 93 WebImage image = WebImage::fromData(WebData(badImage), WebSize());
96 EXPECT_TRUE(image.getSkBitmap().empty()); 94 EXPECT_TRUE(image.getSkBitmap().empty());
97 EXPECT_TRUE(image.getSkBitmap().isNull()); 95 EXPECT_TRUE(image.getSkBitmap().isNull());
98 } 96 }
99 97
100 } // namespace 98 } // namespace blink
OLDNEW
« no previous file with comments | « Source/web/tests/WebFrameTest.cpp ('k') | Source/web/tests/WebInputEventConversionTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698