content/browser/web_contents/web_drag_dest_mac_unittest.mm - Issue 1128173004: Fix a bug in web_drag_dest_mac_unittest.mm.

Side by Side Diff: content/browser/web_contents/web_drag_dest_mac_unittest.mm

Issue 1128173004: Fix a bug in web_drag_dest_mac_unittest.mm. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 7 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

« no previous file with comments | « no previous file | no next file » | no next file with comments »

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 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 "base/mac/mac_util.h"	5 #include "base/mac/mac_util.h"

6 #include "base/mac/scoped_nsautorelease_pool.h"	6 #include "base/mac/scoped_nsautorelease_pool.h"

7 #import "base/mac/scoped_nsobject.h"	7 #import "base/mac/scoped_nsobject.h"

8 #include "base/strings/sys_string_conversions.h"	8 #include "base/strings/sys_string_conversions.h"

9 #include "base/strings/utf_string_conversions.h"	9 #include "base/strings/utf_string_conversions.h"

10 #import "content/browser/web_contents/web_drag_dest_mac.h"	10 #import "content/browser/web_contents/web_drag_dest_mac.h"

(...skipping 122 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
133 pboard = [NSPasteboard pasteboardWithUniqueName];	133 pboard = [NSPasteboard pasteboardWithUniqueName];

134 url = @"/bin/sh";	134 url = @"/bin/sh";

135 [pboard declareTypes:[NSArray arrayWithObject:NSFilenamesPboardType]	135 [pboard declareTypes:[NSArray arrayWithObject:NSFilenamesPboardType]

136 owner:nil];	136 owner:nil];

137 [pboard setPropertyList:[NSArray arrayWithObject:url]	137 [pboard setPropertyList:[NSArray arrayWithObject:url]

138 forType:NSFilenamesPboardType];	138 forType:NSFilenamesPboardType];

139 EXPECT_FALSE(ui::PopulateURLAndTitleFromPasteboard(	139 EXPECT_FALSE(ui::PopulateURLAndTitleFromPasteboard(

140 &result_url, &result_title, pboard, NO));	140 &result_url, &result_title, pboard, NO));

141 EXPECT_TRUE(ui::PopulateURLAndTitleFromPasteboard(	141 EXPECT_TRUE(ui::PopulateURLAndTitleFromPasteboard(

142 &result_url, &result_title, pboard, YES));	142 &result_url, &result_title, pboard, YES));

143 EXPECT_EQ(base::mac::IsOSYosemiteOrLater() ? "file:///bin/sh"	143 base::scoped_nsobject<NSURL> expected_output(

144 : "file://localhost/bin/sh",	144 [[NSURL alloc] initFileURLWithPath:url isDirectory:NO]);

145 result_url.spec());	145 EXPECT_EQ([[expected_output absoluteString] UTF8String], result_url.spec());

146	146

147 EXPECT_EQ("sh", base::UTF16ToUTF8(result_title));	147 EXPECT_EQ("sh", base::UTF16ToUTF8(result_title));

148 [pboard releaseGlobally];	148 [pboard releaseGlobally];

149 }	149 }

150	150

151 TEST_F(WebDragDestTest, Data) {	151 TEST_F(WebDragDestTest, Data) {

152 DropData data;	152 DropData data;

153 NSPasteboard* pboard = [NSPasteboard pasteboardWithUniqueName];	153 NSPasteboard* pboard = [NSPasteboard pasteboardWithUniqueName];

154	154

155 PutURLOnPasteboard(@"http://www.google.com", pboard);	155 PutURLOnPasteboard(@"http://www.google.com", pboard);

156 [pboard addTypes:[NSArray arrayWithObjects:NSHTMLPboardType,	156 [pboard addTypes:[NSArray arrayWithObjects:NSHTMLPboardType,

157 NSStringPboardType, nil]	157 NSStringPboardType, nil]

158 owner:nil];	158 owner:nil];

159 NSString* htmlString = @"<html><body><b>hi there</b></body></html>";	159 NSString* htmlString = @"<html><body><b>hi there</b></body></html>";

160 NSString* textString = @"hi there";	160 NSString* textString = @"hi there";

161 [pboard setString:htmlString forType:NSHTMLPboardType];	161 [pboard setString:htmlString forType:NSHTMLPboardType];

162 [pboard setString:textString forType:NSStringPboardType];	162 [pboard setString:textString forType:NSStringPboardType];

163 [drag_dest_ populateDropData:&data fromPasteboard:pboard];	163 [drag_dest_ populateDropData:&data fromPasteboard:pboard];

164 EXPECT_EQ(data.url.spec(), "http://www.google.com/");	164 EXPECT_EQ(data.url.spec(), "http://www.google.com/");

165 EXPECT_EQ(base::SysNSStringToUTF16(textString), data.text.string());	165 EXPECT_EQ(base::SysNSStringToUTF16(textString), data.text.string());

166 EXPECT_EQ(base::SysNSStringToUTF16(htmlString), data.html.string());	166 EXPECT_EQ(base::SysNSStringToUTF16(htmlString), data.html.string());

167	167

168 [pboard releaseGlobally];	168 [pboard releaseGlobally];

169 }	169 }

OLD	NEW