From f994cef83693dcd0eb2c0e1c552fbc2a285488cf Mon Sep 17 00:00:00 2001 From: Alp Toker Date: Sat, 5 Jul 2014 03:08:06 +0000 Subject: Track IntrusiveRefCntPtr::get() changes from LLVM r212366 llvm-svn: 212369 --- clang/unittests/Basic/VirtualFileSystemTest.cpp | 72 ++++++++++++------------- 1 file changed, 36 insertions(+), 36 deletions(-) (limited to 'clang/unittests/Basic/VirtualFileSystemTest.cpp') diff --git a/clang/unittests/Basic/VirtualFileSystemTest.cpp b/clang/unittests/Basic/VirtualFileSystemTest.cpp index 9289b22f8e3..e7d361e252b 100644 --- a/clang/unittests/Basic/VirtualFileSystemTest.cpp +++ b/clang/unittests/Basic/VirtualFileSystemTest.cpp @@ -555,11 +555,11 @@ public: TEST_F(VFSFromYAMLTest, BasicVFSFromYAML) { IntrusiveRefCntPtr FS; FS = getFromYAMLString(""); - EXPECT_EQ(nullptr, FS.getPtr()); + EXPECT_EQ(nullptr, FS.get()); FS = getFromYAMLString("[]"); - EXPECT_EQ(nullptr, FS.getPtr()); + EXPECT_EQ(nullptr, FS.get()); FS = getFromYAMLString("'string'"); - EXPECT_EQ(nullptr, FS.getPtr()); + EXPECT_EQ(nullptr, FS.get()); EXPECT_EQ(3, NumDiagnostics); } @@ -586,7 +586,7 @@ TEST_F(VFSFromYAMLTest, MappedFiles) { "]\n" "}", Lower); - ASSERT_TRUE(FS.getPtr() != nullptr); + ASSERT_TRUE(FS.get() != nullptr); IntrusiveRefCntPtr O( new vfs::OverlayFileSystem(Lower)); @@ -630,7 +630,7 @@ TEST_F(VFSFromYAMLTest, CaseInsensitive) { " ]\n" "}]}", Lower); - ASSERT_TRUE(FS.getPtr() != nullptr); + ASSERT_TRUE(FS.get() != nullptr); IntrusiveRefCntPtr O( new vfs::OverlayFileSystem(Lower)); @@ -666,7 +666,7 @@ TEST_F(VFSFromYAMLTest, CaseSensitive) { " ]\n" "}]}", Lower); - ASSERT_TRUE(FS.getPtr() != nullptr); + ASSERT_TRUE(FS.get() != nullptr); IntrusiveRefCntPtr O( new vfs::OverlayFileSystem(Lower)); @@ -686,89 +686,89 @@ TEST_F(VFSFromYAMLTest, IllegalVFSFile) { // invalid YAML at top-level IntrusiveRefCntPtr FS = getFromYAMLString("{]", Lower); - EXPECT_EQ(nullptr, FS.getPtr()); + EXPECT_EQ(nullptr, FS.get()); // invalid YAML in roots FS = getFromYAMLString("{ 'roots':[}", Lower); // invalid YAML in directory FS = getFromYAMLString( "{ 'roots':[ { 'name': 'foo', 'type': 'directory', 'contents': [}", Lower); - EXPECT_EQ(nullptr, FS.getPtr()); + EXPECT_EQ(nullptr, FS.get()); // invalid configuration FS = getFromYAMLString("{ 'knobular': 'true', 'roots':[] }", Lower); - EXPECT_EQ(nullptr, FS.getPtr()); + EXPECT_EQ(nullptr, FS.get()); FS = getFromYAMLString("{ 'case-sensitive': 'maybe', 'roots':[] }", Lower); - EXPECT_EQ(nullptr, FS.getPtr()); + EXPECT_EQ(nullptr, FS.get()); // invalid roots FS = getFromYAMLString("{ 'roots':'' }", Lower); - EXPECT_EQ(nullptr, FS.getPtr()); + EXPECT_EQ(nullptr, FS.get()); FS = getFromYAMLString("{ 'roots':{} }", Lower); - EXPECT_EQ(nullptr, FS.getPtr()); + EXPECT_EQ(nullptr, FS.get()); // invalid entries FS = getFromYAMLString( "{ 'roots':[ { 'type': 'other', 'name': 'me', 'contents': '' }", Lower); - EXPECT_EQ(nullptr, FS.getPtr()); + EXPECT_EQ(nullptr, FS.get()); FS = getFromYAMLString("{ 'roots':[ { 'type': 'file', 'name': [], " "'external-contents': 'other' }", Lower); - EXPECT_EQ(nullptr, FS.getPtr()); + EXPECT_EQ(nullptr, FS.get()); FS = getFromYAMLString( "{ 'roots':[ { 'type': 'file', 'name': 'me', 'external-contents': [] }", Lower); - EXPECT_EQ(nullptr, FS.getPtr()); + EXPECT_EQ(nullptr, FS.get()); FS = getFromYAMLString( "{ 'roots':[ { 'type': 'file', 'name': 'me', 'external-contents': {} }", Lower); - EXPECT_EQ(nullptr, FS.getPtr()); + EXPECT_EQ(nullptr, FS.get()); FS = getFromYAMLString( "{ 'roots':[ { 'type': 'directory', 'name': 'me', 'contents': {} }", Lower); - EXPECT_EQ(nullptr, FS.getPtr()); + EXPECT_EQ(nullptr, FS.get()); FS = getFromYAMLString( "{ 'roots':[ { 'type': 'directory', 'name': 'me', 'contents': '' }", Lower); - EXPECT_EQ(nullptr, FS.getPtr()); + EXPECT_EQ(nullptr, FS.get()); FS = getFromYAMLString( "{ 'roots':[ { 'thingy': 'directory', 'name': 'me', 'contents': [] }", Lower); - EXPECT_EQ(nullptr, FS.getPtr()); + EXPECT_EQ(nullptr, FS.get()); // missing mandatory fields FS = getFromYAMLString("{ 'roots':[ { 'type': 'file', 'name': 'me' }", Lower); - EXPECT_EQ(nullptr, FS.getPtr()); + EXPECT_EQ(nullptr, FS.get()); FS = getFromYAMLString( "{ 'roots':[ { 'type': 'file', 'external-contents': 'other' }", Lower); - EXPECT_EQ(nullptr, FS.getPtr()); + EXPECT_EQ(nullptr, FS.get()); FS = getFromYAMLString("{ 'roots':[ { 'name': 'me', 'contents': [] }", Lower); - EXPECT_EQ(nullptr, FS.getPtr()); + EXPECT_EQ(nullptr, FS.get()); // duplicate keys FS = getFromYAMLString("{ 'roots':[], 'roots':[] }", Lower); - EXPECT_EQ(nullptr, FS.getPtr()); + EXPECT_EQ(nullptr, FS.get()); FS = getFromYAMLString( "{ 'case-sensitive':'true', 'case-sensitive':'true', 'roots':[] }", Lower); - EXPECT_EQ(nullptr, FS.getPtr()); + EXPECT_EQ(nullptr, FS.get()); FS = getFromYAMLString("{ 'roots':[{'name':'me', 'name':'you', 'type':'file', " "'external-contents':'blah' } ] }", Lower); - EXPECT_EQ(nullptr, FS.getPtr()); + EXPECT_EQ(nullptr, FS.get()); // missing version FS = getFromYAMLRawString("{ 'roots':[] }", Lower); - EXPECT_EQ(nullptr, FS.getPtr()); + EXPECT_EQ(nullptr, FS.get()); // bad version number FS = getFromYAMLRawString("{ 'version':'foo', 'roots':[] }", Lower); - EXPECT_EQ(nullptr, FS.getPtr()); + EXPECT_EQ(nullptr, FS.get()); FS = getFromYAMLRawString("{ 'version':-1, 'roots':[] }", Lower); - EXPECT_EQ(nullptr, FS.getPtr()); + EXPECT_EQ(nullptr, FS.get()); FS = getFromYAMLRawString("{ 'version':100000, 'roots':[] }", Lower); - EXPECT_EQ(nullptr, FS.getPtr()); + EXPECT_EQ(nullptr, FS.get()); EXPECT_EQ(24, NumDiagnostics); } @@ -790,7 +790,7 @@ TEST_F(VFSFromYAMLTest, UseExternalName) { " 'external-contents': '//root/external/file'\n" " }\n" "] }", Lower); - ASSERT_TRUE(nullptr != FS.getPtr()); + ASSERT_TRUE(nullptr != FS.get()); // default true EXPECT_EQ("//root/external/file", FS->status("//root/A")->getName()); @@ -814,7 +814,7 @@ TEST_F(VFSFromYAMLTest, UseExternalName) { " 'external-contents': '//root/external/file'\n" " }\n" "] }", Lower); - ASSERT_TRUE(nullptr != FS.getPtr()); + ASSERT_TRUE(nullptr != FS.get()); // default EXPECT_EQ("//root/A", FS->status("//root/A")->getName()); @@ -833,7 +833,7 @@ TEST_F(VFSFromYAMLTest, MultiComponentPath) { " { 'type': 'file', 'name': '//root/path/to/file',\n" " 'external-contents': '//root/other' }]\n" "}", Lower); - ASSERT_TRUE(nullptr != FS.getPtr()); + ASSERT_TRUE(nullptr != FS.get()); EXPECT_FALSE(FS->status("//root/path/to/file").getError()); EXPECT_FALSE(FS->status("//root/path/to").getError()); EXPECT_FALSE(FS->status("//root/path").getError()); @@ -846,7 +846,7 @@ TEST_F(VFSFromYAMLTest, MultiComponentPath) { " 'contents': [ { 'type': 'file', 'name': 'file',\n" " 'external-contents': '//root/other' }]}]\n" "}", Lower); - ASSERT_TRUE(nullptr != FS.getPtr()); + ASSERT_TRUE(nullptr != FS.get()); EXPECT_FALSE(FS->status("//root/path/to/file").getError()); EXPECT_FALSE(FS->status("//root/path/to").getError()); EXPECT_FALSE(FS->status("//root/path").getError()); @@ -859,7 +859,7 @@ TEST_F(VFSFromYAMLTest, MultiComponentPath) { " 'contents': [ { 'type': 'file', 'name': 'path/to/file',\n" " 'external-contents': '//root/other' }]}]\n" "}", Lower); - ASSERT_TRUE(nullptr != FS.getPtr()); + ASSERT_TRUE(nullptr != FS.get()); EXPECT_FALSE(FS->status("//root/path/to/file").getError()); EXPECT_FALSE(FS->status("//root/path/to").getError()); EXPECT_FALSE(FS->status("//root/path").getError()); @@ -877,7 +877,7 @@ TEST_F(VFSFromYAMLTest, TrailingSlashes) { " 'contents': [ { 'type': 'file', 'name': 'file',\n" " 'external-contents': '//root/other' }]}]\n" "}", Lower); - ASSERT_TRUE(nullptr != FS.getPtr()); + ASSERT_TRUE(nullptr != FS.get()); EXPECT_FALSE(FS->status("//root/path/to/file").getError()); EXPECT_FALSE(FS->status("//root/path/to").getError()); EXPECT_FALSE(FS->status("//root/path").getError()); @@ -913,7 +913,7 @@ TEST_F(VFSFromYAMLTest, DirectoryIteration) { "]\n" "}", Lower); - ASSERT_TRUE(FS.getPtr() != NULL); + ASSERT_TRUE(FS.get() != NULL); IntrusiveRefCntPtr O( new vfs::OverlayFileSystem(Lower)); -- cgit v1.2.3