| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (c) 2013, Opera Software ASA. All rights reserved. | 2 * Copyright (c) 2013, Opera Software ASA. 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 | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * | 7 * |
| 8 * 1. Redistributions of source code must retain the above copyright | 8 * 1. 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 * 2. Redistributions in binary form must reproduce the above copyright | 10 * 2. Redistributions in binary form must reproduce the above copyright |
| (...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 68 { | 68 { |
| 69 // We want the images to load and JavaScript to be on. | 69 // We want the images to load and JavaScript to be on. |
| 70 m_helper.initialize(true, 0, 0, &configureSettings); | 70 m_helper.initialize(true, 0, 0, &configureSettings); |
| 71 } | 71 } |
| 72 | 72 |
| 73 virtual void TearDown() | 73 virtual void TearDown() |
| 74 { | 74 { |
| 75 Platform::current()->unitTestSupport()->unregisterAllMockedURLs(); | 75 Platform::current()->unitTestSupport()->unregisterAllMockedURLs(); |
| 76 } | 76 } |
| 77 | 77 |
| 78 void setBaseUrl(const char* url) | |
| 79 { | |
| 80 m_baseUrl = toKURL(url); | |
| 81 } | |
| 82 | |
| 83 void setBaseFolder(const char* folder) | 78 void setBaseFolder(const char* folder) |
| 84 { | 79 { |
| 85 m_folder = WebString::fromUTF8(folder); | 80 m_folder = WebString::fromUTF8(folder); |
| 86 } | 81 } |
| 87 | 82 |
| 88 void registerURL(const char* file, const char* mimeType) | 83 void registerURL(const char* file, const char* mimeType) |
| 89 { | 84 { |
| 90 registerMockedURLLoad(KURL(m_baseUrl, file), WebString::fromUTF8(file),
m_folder, WebString::fromUTF8(mimeType)); | 85 registerMockedURLLoad(KURL(m_baseUrl, file), WebString::fromUTF8(file),
m_folder, WebString::fromUTF8(mimeType)); |
| 91 } | 86 } |
| 92 | 87 |
| (...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 201 | 196 |
| 202 registerURL("font.html", "text/html"); | 197 registerURL("font.html", "text/html"); |
| 203 registerURL("font.ttf", "application/octet-stream"); | 198 registerURL("font.ttf", "application/octet-stream"); |
| 204 | 199 |
| 205 serialize("font.html"); | 200 serialize("font.html"); |
| 206 | 201 |
| 207 EXPECT_TRUE(isSerialized("font.ttf", "application/octet-stream")); | 202 EXPECT_TRUE(isSerialized("font.ttf", "application/octet-stream")); |
| 208 } | 203 } |
| 209 | 204 |
| 210 } | 205 } |
| OLD | NEW |