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

Side by Side Diff: app/gtk_dnd_util_unittest.cc

Issue 6186008: Linux: fix a bunch of NULL vs. 0 issues spotted by gcc 4.5. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 11 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 | « no previous file | chrome/browser/automation/automation_provider_observers.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 <string> 5 #include <string>
6 6
7 #include "app/gtk_dnd_util.h" 7 #include "app/gtk_dnd_util.h"
8 #include "base/pickle.h" 8 #include "base/pickle.h"
9 #include "base/scoped_ptr.h" 9 #include "base/scoped_ptr.h"
10 #include "base/utf_string_conversions.h" 10 #include "base/utf_string_conversions.h"
(...skipping 28 matching lines...) Expand all
39 pickle.WriteString(kBadUrl); 39 pickle.WriteString(kBadUrl);
40 40
41 GtkSelectionData data; 41 GtkSelectionData data;
42 scoped_array<guchar> test_data(new guchar[pickle.size()]); 42 scoped_array<guchar> test_data(new guchar[pickle.size()]);
43 memcpy(test_data.get(), pickle.data(), pickle.size()); 43 memcpy(test_data.get(), pickle.data(), pickle.size());
44 data.data = test_data.get(); 44 data.data = test_data.get();
45 data.length = pickle.size(); 45 data.length = pickle.size();
46 46
47 GURL url; 47 GURL url;
48 string16 title; 48 string16 title;
49 EXPECT_EQ(false, gtk_dnd_util::ExtractNamedURL(&data, &url, &title)); 49 EXPECT_FALSE(gtk_dnd_util::ExtractNamedURL(&data, &url, &title));
50 } 50 }
51 51
52 TEST(GtkDndUtilTest, ExtractNamedURLInvalidInput) { 52 TEST(GtkDndUtilTest, ExtractNamedURLInvalidInput) {
53 GURL url; 53 GURL url;
54 string16 title; 54 string16 title;
55 GtkSelectionData data; 55 GtkSelectionData data;
56 data.data = NULL; 56 data.data = NULL;
57 data.length = 0; 57 data.length = 0;
58 58
59 EXPECT_EQ(false, gtk_dnd_util::ExtractNamedURL(&data, &url, &title)); 59 EXPECT_FALSE(gtk_dnd_util::ExtractNamedURL(&data, &url, &title));
60 60
61 guchar empty_data[] = ""; 61 guchar empty_data[] = "";
62 data.data = empty_data; 62 data.data = empty_data;
63 data.length = 0; 63 data.length = 0;
64 64
65 EXPECT_EQ(false, gtk_dnd_util::ExtractNamedURL(&data, &url, &title)); 65 EXPECT_FALSE(gtk_dnd_util::ExtractNamedURL(&data, &url, &title));
66 66
67 const std::string kTitle = "title"; 67 const std::string kTitle = "title";
68 Pickle pickle; 68 Pickle pickle;
69 pickle.WriteString(kTitle); 69 pickle.WriteString(kTitle);
70 70
71 scoped_array<guchar> test_data(new guchar[pickle.size()]); 71 scoped_array<guchar> test_data(new guchar[pickle.size()]);
72 memcpy(test_data.get(), pickle.data(), pickle.size()); 72 memcpy(test_data.get(), pickle.data(), pickle.size());
73 data.data = test_data.get(); 73 data.data = test_data.get();
74 data.length = pickle.size(); 74 data.length = pickle.size();
75 75
76 EXPECT_EQ(false, gtk_dnd_util::ExtractNamedURL(&data, &url, &title)); 76 EXPECT_FALSE(gtk_dnd_util::ExtractNamedURL(&data, &url, &title));
77 } 77 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/automation/automation_provider_observers.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698