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

Side by Side Diff: Source/web/tests/WebPageSerializerTest.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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2011 Google Inc. All rights reserved. 2 * Copyright (C) 2011 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 24 matching lines...) Expand all
35 #include "public/platform/Platform.h" 35 #include "public/platform/Platform.h"
36 #include "public/platform/WebString.h" 36 #include "public/platform/WebString.h"
37 #include "public/platform/WebURL.h" 37 #include "public/platform/WebURL.h"
38 #include "public/platform/WebURLRequest.h" 38 #include "public/platform/WebURLRequest.h"
39 #include "public/platform/WebURLResponse.h" 39 #include "public/platform/WebURLResponse.h"
40 #include "public/platform/WebUnitTestSupport.h" 40 #include "public/platform/WebUnitTestSupport.h"
41 #include "public/web/WebDocument.h" 41 #include "public/web/WebDocument.h"
42 #include "public/web/WebFrame.h" 42 #include "public/web/WebFrame.h"
43 #include "public/web/WebView.h" 43 #include "public/web/WebView.h"
44 #include "web/tests/FrameTestHelpers.h" 44 #include "web/tests/FrameTestHelpers.h"
45
46 #include <gtest/gtest.h> 45 #include <gtest/gtest.h>
47 46
48 using namespace blink;
49 using blink::Document; 47 using blink::Document;
50 using blink::URLTestHelpers::toKURL; 48 using blink::URLTestHelpers::toKURL;
51 49
52 namespace { 50 namespace blink {
53 51
54 class WebPageSerializerTest : public testing::Test { 52 class WebPageSerializerTest : public testing::Test {
55 public: 53 public:
56 WebPageSerializerTest() : m_supportedSchemes(static_cast<size_t>(3)) 54 WebPageSerializerTest() : m_supportedSchemes(static_cast<size_t>(3))
57 { 55 {
58 m_supportedSchemes[0] = "http"; 56 m_supportedSchemes[0] = "http";
59 m_supportedSchemes[1] = "https"; 57 m_supportedSchemes[1] = "https";
60 m_supportedSchemes[2] = "file"; 58 m_supportedSchemes[2] = "file";
61 } 59 }
62 60
63 protected: 61 protected:
64 virtual void SetUp() 62 void SetUp() override
65 { 63 {
66 m_helper.initialize(); 64 m_helper.initialize();
67 } 65 }
68 66
69 virtual void TearDown() 67 void TearDown() override
70 { 68 {
71 Platform::current()->unitTestSupport()->unregisterAllMockedURLs(); 69 Platform::current()->unitTestSupport()->unregisterAllMockedURLs();
72 } 70 }
73 71
74 void registerMockedURLLoad(const std::string& url, const WebString& fileName ) 72 void registerMockedURLLoad(const std::string& url, const WebString& fileName )
75 { 73 {
76 URLTestHelpers::registerMockedURLLoad(toKURL(url), fileName, WebString:: fromUTF8("pageserialization/"), WebString::fromUTF8("text/html")); 74 URLTestHelpers::registerMockedURLLoad(toKURL(url), fileName, WebString:: fromUTF8("pageserialization/"), WebString::fromUTF8("text/html"));
77 } 75 }
78 76
79 void loadURLInTopFrame(const WebURL& url) 77 void loadURLInTopFrame(const WebURL& url)
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
172 EXPECT_TRUE(webVectorContains(resources, "http://www.test.com/awesome.png")) ; 170 EXPECT_TRUE(webVectorContains(resources, "http://www.test.com/awesome.png")) ;
173 EXPECT_TRUE(webVectorContains(resources, "http://www.test.com/innerFrame.png ")); 171 EXPECT_TRUE(webVectorContains(resources, "http://www.test.com/innerFrame.png "));
174 EXPECT_TRUE(webVectorContains(resources, "http://www.test.com/flash.swf")); 172 EXPECT_TRUE(webVectorContains(resources, "http://www.test.com/flash.swf"));
175 // FIXME: for some reason the following resources is missing on one of the b ot 173 // FIXME: for some reason the following resources is missing on one of the b ot
176 // causing the test to fail. Probably a plugin issue. 174 // causing the test to fail. Probably a plugin issue.
177 // EXPECT_TRUE(webVectorContains(resources, "http://www.test.com/music.mid") ); 175 // EXPECT_TRUE(webVectorContains(resources, "http://www.test.com/music.mid") );
178 EXPECT_TRUE(webVectorContains(resources, "http://www.test.com/object.png")); 176 EXPECT_TRUE(webVectorContains(resources, "http://www.test.com/object.png"));
179 EXPECT_TRUE(webVectorContains(resources, "http://www.test.com/embed.png")); 177 EXPECT_TRUE(webVectorContains(resources, "http://www.test.com/embed.png"));
180 } 178 }
181 179
182 } 180 } // namespace blink
OLDNEW
« no previous file with comments | « Source/web/tests/WebInputEventConversionTest.cpp ('k') | Source/web/tests/WebPluginContainerTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698