OLD | NEW |
1 /* | 1 /* |
2 * This file is part of Adblock Plus <https://adblockplus.org/>, | 2 * This file is part of Adblock Plus <https://adblockplus.org/>, |
3 * Copyright (C) 2006-2017 eyeo GmbH | 3 * Copyright (C) 2006-2017 eyeo GmbH |
4 * | 4 * |
5 * Adblock Plus is free software: you can redistribute it and/or modify | 5 * Adblock Plus is free software: you can redistribute it and/or modify |
6 * it under the terms of the GNU General Public License version 3 as | 6 * it under the terms of the GNU General Public License version 3 as |
7 * published by the Free Software Foundation. | 7 * published by the Free Software Foundation. |
8 * | 8 * |
9 * Adblock Plus is distributed in the hope that it will be useful, | 9 * Adblock Plus is distributed in the hope that it will be useful, |
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of | 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
70 { | 70 { |
71 } | 71 } |
72 ServerResponse GET(const std::string& url, | 72 ServerResponse GET(const std::string& url, |
73 const HeaderList& requestHeaders) const | 73 const HeaderList& requestHeaders) const |
74 { | 74 { |
75 if (url.find("/notification.json") == std::string::npos) | 75 if (url.find("/notification.json") == std::string::npos) |
76 { | 76 { |
77 return ServerResponse(); | 77 return ServerResponse(); |
78 } | 78 } |
79 ServerResponse serverResponse; | 79 ServerResponse serverResponse; |
80 serverResponse.status = NS_OK; | 80 serverResponse.status = IWebRequest::NS_OK; |
81 serverResponse.responseStatus = 200; | 81 serverResponse.responseStatus = 200; |
82 serverResponse.responseText = responseText; | 82 serverResponse.responseText = responseText; |
83 return serverResponse; | 83 return serverResponse; |
84 } | 84 } |
85 }; | 85 }; |
86 | 86 |
87 #ifdef NotificationMockWebRequestTest_ENABLED | 87 #ifdef NotificationMockWebRequestTest_ENABLED |
88 class NotificationMockWebRequestTest : public BaseJsTest | 88 class NotificationMockWebRequestTest : public BaseJsTest |
89 { | 89 { |
90 protected: | 90 protected: |
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
194 TEST_F(NotificationTest, Links) | 194 TEST_F(NotificationTest, Links) |
195 { | 195 { |
196 AddNotification("{ id: 'id', links: ['link1', 'link2'] }"); | 196 AddNotification("{ id: 'id', links: ['link1', 'link2'] }"); |
197 auto notification = PeekNotification(); | 197 auto notification = PeekNotification(); |
198 ASSERT_TRUE(notification); | 198 ASSERT_TRUE(notification); |
199 std::vector<std::string> notificationLinks = notification->GetLinks(); | 199 std::vector<std::string> notificationLinks = notification->GetLinks(); |
200 ASSERT_EQ(2u, notificationLinks.size()); | 200 ASSERT_EQ(2u, notificationLinks.size()); |
201 EXPECT_EQ("link1", notificationLinks[0]); | 201 EXPECT_EQ("link1", notificationLinks[0]); |
202 EXPECT_EQ("link2", notificationLinks[1]); | 202 EXPECT_EQ("link2", notificationLinks[1]); |
203 } | 203 } |
OLD | NEW |