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

Unified Diff: third_party/WebKit/Source/core/clipboard/DataObjectTest.cpp

Issue 2582463002: Fix webkitGetEntry for non-native files. (Closed)
Patch Set: . Created 4 years 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 side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/clipboard/DataObjectTest.cpp
diff --git a/third_party/WebKit/Source/core/clipboard/DataObjectTest.cpp b/third_party/WebKit/Source/core/clipboard/DataObjectTest.cpp
index 659dfe8ef8e09b642ec78d6dac39dc5763190651..ef63afc1ee707389204caef88010b9ffcded54f6 100644
--- a/third_party/WebKit/Source/core/clipboard/DataObjectTest.cpp
+++ b/third_party/WebKit/Source/core/clipboard/DataObjectTest.cpp
@@ -22,7 +22,7 @@ TEST_F(DataObjectTest, addItemWithFilenameAndNoTitle) {
String filePath = testing::blinkRootDir();
filePath.append("/Source/core/clipboard/DataObjectTest.cpp");
- m_dataObject->addFilename(filePath, String());
+ m_dataObject->addFilename(filePath, String(), String());
EXPECT_EQ(1U, m_dataObject->length());
DataObjectItem* item = m_dataObject->item(0);
@@ -40,7 +40,7 @@ TEST_F(DataObjectTest, addItemWithFilenameAndTitle) {
String filePath = testing::blinkRootDir();
filePath.append("/Source/core/clipboard/DataObjectTest.cpp");
- m_dataObject->addFilename(filePath, "name.cpp");
+ m_dataObject->addFilename(filePath, "name.cpp", String());
EXPECT_EQ(1U, m_dataObject->length());
DataObjectItem* item = m_dataObject->item(0);
@@ -55,4 +55,35 @@ TEST_F(DataObjectTest, addItemWithFilenameAndTitle) {
EXPECT_EQ("name.cpp", file->name());
}
+TEST_F(DataObjectTest, fileSystemId) {
+ String filePath = testing::blinkRootDir();
+ filePath.append("/Source/core/clipboard/DataObjectTest.cpp");
+ KURL url;
+
+ m_dataObject->addFilename(filePath, String(), String());
+ m_dataObject->addFilename(filePath, String(), "fileSystemIdForFilename");
+ m_dataObject->add(
+ File::createForFileSystemFile(url, FileMetadata(), File::IsUserVisible),
+ "fileSystemIdForFileSystemFile");
+
+ ASSERT_EQ(3U, m_dataObject->length());
+
+ {
+ DataObjectItem* item = m_dataObject->item(0);
+ EXPECT_FALSE(item->hasFileSystemId());
+ }
+
+ {
+ DataObjectItem* item = m_dataObject->item(1);
+ EXPECT_TRUE(item->hasFileSystemId());
+ EXPECT_EQ("fileSystemIdForFilename", item->fileSystemId());
+ }
+
+ {
+ DataObjectItem* item = m_dataObject->item(2);
+ EXPECT_TRUE(item->hasFileSystemId());
+ EXPECT_EQ("fileSystemIdForFileSystemFile", item->fileSystemId());
+ }
+}
+
} // namespace blink

Powered by Google App Engine
This is Rietveld 408576698