[C++11] Use 'nullptr'. Unittests edition.
llvm-svn: 210423
diff --git a/clang/unittests/Basic/FileManagerTest.cpp b/clang/unittests/Basic/FileManagerTest.cpp
index ae89395..b5df814 100644
--- a/clang/unittests/Basic/FileManagerTest.cpp
+++ b/clang/unittests/Basic/FileManagerTest.cpp
@@ -76,17 +76,17 @@
// (not NULL, correct name).
TEST_F(FileManagerTest, getVirtualFileSetsTheDirFieldCorrectly) {
const FileEntry *file = manager.getVirtualFile("foo.cpp", 42, 0);
- ASSERT_TRUE(file != NULL);
+ ASSERT_TRUE(file != nullptr);
const DirectoryEntry *dir = file->getDir();
- ASSERT_TRUE(dir != NULL);
+ ASSERT_TRUE(dir != nullptr);
EXPECT_STREQ(".", dir->getName());
file = manager.getVirtualFile("x/y/z.cpp", 42, 0);
- ASSERT_TRUE(file != NULL);
+ ASSERT_TRUE(file != nullptr);
dir = file->getDir();
- ASSERT_TRUE(dir != NULL);
+ ASSERT_TRUE(dir != nullptr);
EXPECT_STREQ("x/y", dir->getName());
}
@@ -98,9 +98,9 @@
// by what's in the real file system.
manager.addStatCache(new FakeStatCache);
- EXPECT_EQ(NULL, manager.getDirectory("virtual/dir/foo"));
- EXPECT_EQ(NULL, manager.getDirectory("virtual/dir"));
- EXPECT_EQ(NULL, manager.getDirectory("virtual"));
+ EXPECT_EQ(nullptr, manager.getDirectory("virtual/dir/foo"));
+ EXPECT_EQ(nullptr, manager.getDirectory("virtual/dir"));
+ EXPECT_EQ(nullptr, manager.getDirectory("virtual"));
}
// When a virtual file is added, all of its ancestors should be created.
@@ -109,14 +109,14 @@
manager.addStatCache(new FakeStatCache);
manager.getVirtualFile("virtual/dir/bar.h", 100, 0);
- EXPECT_EQ(NULL, manager.getDirectory("virtual/dir/foo"));
+ EXPECT_EQ(nullptr, manager.getDirectory("virtual/dir/foo"));
const DirectoryEntry *dir = manager.getDirectory("virtual/dir");
- ASSERT_TRUE(dir != NULL);
+ ASSERT_TRUE(dir != nullptr);
EXPECT_STREQ("virtual/dir", dir->getName());
dir = manager.getDirectory("virtual");
- ASSERT_TRUE(dir != NULL);
+ ASSERT_TRUE(dir != nullptr);
EXPECT_STREQ("virtual", dir->getName());
}
@@ -137,11 +137,11 @@
manager.addStatCache(statCache);
const FileEntry *file = manager.getFile("/tmp/test");
- ASSERT_TRUE(file != NULL);
+ ASSERT_TRUE(file != nullptr);
EXPECT_STREQ("/tmp/test", file->getName());
const DirectoryEntry *dir = file->getDir();
- ASSERT_TRUE(dir != NULL);
+ ASSERT_TRUE(dir != nullptr);
EXPECT_STREQ("/tmp", dir->getName());
#ifdef LLVM_ON_WIN32
@@ -161,11 +161,11 @@
manager.getVirtualFile("virtual/dir/bar.h", 100, 0);
const FileEntry *file = manager.getFile("virtual/dir/bar.h");
- ASSERT_TRUE(file != NULL);
+ ASSERT_TRUE(file != nullptr);
EXPECT_STREQ("virtual/dir/bar.h", file->getName());
const DirectoryEntry *dir = file->getDir();
- ASSERT_TRUE(dir != NULL);
+ ASSERT_TRUE(dir != nullptr);
EXPECT_STREQ("virtual/dir", dir->getName());
}
@@ -182,8 +182,8 @@
const FileEntry *fileFoo = manager.getFile("foo.cpp");
const FileEntry *fileBar = manager.getFile("bar.cpp");
- ASSERT_TRUE(fileFoo != NULL);
- ASSERT_TRUE(fileBar != NULL);
+ ASSERT_TRUE(fileFoo != nullptr);
+ ASSERT_TRUE(fileBar != nullptr);
EXPECT_NE(fileFoo, fileBar);
}
@@ -200,7 +200,7 @@
manager.getVirtualFile("bar.cpp", 200, 0);
const FileEntry *file = manager.getFile("xyz.txt");
- EXPECT_EQ(NULL, file);
+ EXPECT_EQ(nullptr, file);
}
// The following tests apply to Unix-like system only.
diff --git a/clang/unittests/Basic/SourceManagerTest.cpp b/clang/unittests/Basic/SourceManagerTest.cpp
index 3f12f47..5416ea7 100644
--- a/clang/unittests/Basic/SourceManagerTest.cpp
+++ b/clang/unittests/Basic/SourceManagerTest.cpp
@@ -65,7 +65,7 @@
bool Complain) override { }
GlobalModuleIndex *loadGlobalModuleIndex(SourceLocation TriggerLoc) override
- { return 0; }
+ { return nullptr; }
bool lookupMissingImports(StringRef Name, SourceLocation TriggerLoc) override
{ return 0; };
};
@@ -83,7 +83,7 @@
&*Target);
Preprocessor PP(new PreprocessorOptions(), Diags, LangOpts, SourceMgr,
HeaderInfo, ModLoader,
- /*IILookup =*/0,
+ /*IILookup =*/nullptr,
/*OwnsHeaderSearch =*/false);
PP.Initialize(*Target);
PP.EnterMainSourceFile();
@@ -168,7 +168,7 @@
EXPECT_TRUE(Invalid);
// Test with no invalid flag.
- EXPECT_EQ(1U, SourceMgr.getColumnNumber(MainFileID, 0, NULL));
+ EXPECT_EQ(1U, SourceMgr.getColumnNumber(MainFileID, 0, nullptr));
}
#if defined(LLVM_ON_UNIX)
@@ -200,7 +200,7 @@
&*Target);
Preprocessor PP(new PreprocessorOptions(), Diags, LangOpts, SourceMgr,
HeaderInfo, ModLoader,
- /*IILookup =*/0,
+ /*IILookup =*/nullptr,
/*OwnsHeaderSearch =*/false);
PP.Initialize(*Target);
PP.EnterMainSourceFile();
@@ -298,7 +298,7 @@
&*Target);
Preprocessor PP(new PreprocessorOptions(), Diags, LangOpts, SourceMgr,
HeaderInfo, ModLoader,
- /*IILookup =*/0,
+ /*IILookup =*/nullptr,
/*OwnsHeaderSearch =*/false);
PP.Initialize(*Target);
diff --git a/clang/unittests/Basic/VirtualFileSystemTest.cpp b/clang/unittests/Basic/VirtualFileSystemTest.cpp
index bcee16a..22e095a 100644
--- a/clang/unittests/Basic/VirtualFileSystemTest.cpp
+++ b/clang/unittests/Basic/VirtualFileSystemTest.cpp
@@ -253,11 +253,11 @@
TEST_F(VFSFromYAMLTest, BasicVFSFromYAML) {
IntrusiveRefCntPtr<vfs::FileSystem> FS;
FS = getFromYAMLString("");
- EXPECT_EQ(NULL, FS.getPtr());
+ EXPECT_EQ(nullptr, FS.getPtr());
FS = getFromYAMLString("[]");
- EXPECT_EQ(NULL, FS.getPtr());
+ EXPECT_EQ(nullptr, FS.getPtr());
FS = getFromYAMLString("'string'");
- EXPECT_EQ(NULL, FS.getPtr());
+ EXPECT_EQ(nullptr, FS.getPtr());
EXPECT_EQ(3, NumDiagnostics);
}
@@ -284,7 +284,7 @@
"]\n"
"}",
Lower);
- ASSERT_TRUE(FS.getPtr() != NULL);
+ ASSERT_TRUE(FS.getPtr() != nullptr);
IntrusiveRefCntPtr<vfs::OverlayFileSystem> O(
new vfs::OverlayFileSystem(Lower));
@@ -327,7 +327,7 @@
" ]\n"
"}]}",
Lower);
- ASSERT_TRUE(FS.getPtr() != NULL);
+ ASSERT_TRUE(FS.getPtr() != nullptr);
IntrusiveRefCntPtr<vfs::OverlayFileSystem> O(
new vfs::OverlayFileSystem(Lower));
@@ -363,7 +363,7 @@
" ]\n"
"}]}",
Lower);
- ASSERT_TRUE(FS.getPtr() != NULL);
+ ASSERT_TRUE(FS.getPtr() != nullptr);
IntrusiveRefCntPtr<vfs::OverlayFileSystem> O(
new vfs::OverlayFileSystem(Lower));
@@ -383,89 +383,89 @@
// invalid YAML at top-level
IntrusiveRefCntPtr<vfs::FileSystem> FS = getFromYAMLString("{]", Lower);
- EXPECT_EQ(NULL, FS.getPtr());
+ EXPECT_EQ(nullptr, FS.getPtr());
// invalid YAML in roots
FS = getFromYAMLString("{ 'roots':[}", Lower);
// invalid YAML in directory
FS = getFromYAMLString(
"{ 'roots':[ { 'name': 'foo', 'type': 'directory', 'contents': [}",
Lower);
- EXPECT_EQ(NULL, FS.getPtr());
+ EXPECT_EQ(nullptr, FS.getPtr());
// invalid configuration
FS = getFromYAMLString("{ 'knobular': 'true', 'roots':[] }", Lower);
- EXPECT_EQ(NULL, FS.getPtr());
+ EXPECT_EQ(nullptr, FS.getPtr());
FS = getFromYAMLString("{ 'case-sensitive': 'maybe', 'roots':[] }", Lower);
- EXPECT_EQ(NULL, FS.getPtr());
+ EXPECT_EQ(nullptr, FS.getPtr());
// invalid roots
FS = getFromYAMLString("{ 'roots':'' }", Lower);
- EXPECT_EQ(NULL, FS.getPtr());
+ EXPECT_EQ(nullptr, FS.getPtr());
FS = getFromYAMLString("{ 'roots':{} }", Lower);
- EXPECT_EQ(NULL, FS.getPtr());
+ EXPECT_EQ(nullptr, FS.getPtr());
// invalid entries
FS = getFromYAMLString(
"{ 'roots':[ { 'type': 'other', 'name': 'me', 'contents': '' }", Lower);
- EXPECT_EQ(NULL, FS.getPtr());
+ EXPECT_EQ(nullptr, FS.getPtr());
FS = getFromYAMLString("{ 'roots':[ { 'type': 'file', 'name': [], "
"'external-contents': 'other' }",
Lower);
- EXPECT_EQ(NULL, FS.getPtr());
+ EXPECT_EQ(nullptr, FS.getPtr());
FS = getFromYAMLString(
"{ 'roots':[ { 'type': 'file', 'name': 'me', 'external-contents': [] }",
Lower);
- EXPECT_EQ(NULL, FS.getPtr());
+ EXPECT_EQ(nullptr, FS.getPtr());
FS = getFromYAMLString(
"{ 'roots':[ { 'type': 'file', 'name': 'me', 'external-contents': {} }",
Lower);
- EXPECT_EQ(NULL, FS.getPtr());
+ EXPECT_EQ(nullptr, FS.getPtr());
FS = getFromYAMLString(
"{ 'roots':[ { 'type': 'directory', 'name': 'me', 'contents': {} }",
Lower);
- EXPECT_EQ(NULL, FS.getPtr());
+ EXPECT_EQ(nullptr, FS.getPtr());
FS = getFromYAMLString(
"{ 'roots':[ { 'type': 'directory', 'name': 'me', 'contents': '' }",
Lower);
- EXPECT_EQ(NULL, FS.getPtr());
+ EXPECT_EQ(nullptr, FS.getPtr());
FS = getFromYAMLString(
"{ 'roots':[ { 'thingy': 'directory', 'name': 'me', 'contents': [] }",
Lower);
- EXPECT_EQ(NULL, FS.getPtr());
+ EXPECT_EQ(nullptr, FS.getPtr());
// missing mandatory fields
FS = getFromYAMLString("{ 'roots':[ { 'type': 'file', 'name': 'me' }", Lower);
- EXPECT_EQ(NULL, FS.getPtr());
+ EXPECT_EQ(nullptr, FS.getPtr());
FS = getFromYAMLString(
"{ 'roots':[ { 'type': 'file', 'external-contents': 'other' }", Lower);
- EXPECT_EQ(NULL, FS.getPtr());
+ EXPECT_EQ(nullptr, FS.getPtr());
FS = getFromYAMLString("{ 'roots':[ { 'name': 'me', 'contents': [] }", Lower);
- EXPECT_EQ(NULL, FS.getPtr());
+ EXPECT_EQ(nullptr, FS.getPtr());
// duplicate keys
FS = getFromYAMLString("{ 'roots':[], 'roots':[] }", Lower);
- EXPECT_EQ(NULL, FS.getPtr());
+ EXPECT_EQ(nullptr, FS.getPtr());
FS = getFromYAMLString(
"{ 'case-sensitive':'true', 'case-sensitive':'true', 'roots':[] }",
Lower);
- EXPECT_EQ(NULL, FS.getPtr());
+ EXPECT_EQ(nullptr, FS.getPtr());
FS =
getFromYAMLString("{ 'roots':[{'name':'me', 'name':'you', 'type':'file', "
"'external-contents':'blah' } ] }",
Lower);
- EXPECT_EQ(NULL, FS.getPtr());
+ EXPECT_EQ(nullptr, FS.getPtr());
// missing version
FS = getFromYAMLRawString("{ 'roots':[] }", Lower);
- EXPECT_EQ(NULL, FS.getPtr());
+ EXPECT_EQ(nullptr, FS.getPtr());
// bad version number
FS = getFromYAMLRawString("{ 'version':'foo', 'roots':[] }", Lower);
- EXPECT_EQ(NULL, FS.getPtr());
+ EXPECT_EQ(nullptr, FS.getPtr());
FS = getFromYAMLRawString("{ 'version':-1, 'roots':[] }", Lower);
- EXPECT_EQ(NULL, FS.getPtr());
+ EXPECT_EQ(nullptr, FS.getPtr());
FS = getFromYAMLRawString("{ 'version':100000, 'roots':[] }", Lower);
- EXPECT_EQ(NULL, FS.getPtr());
+ EXPECT_EQ(nullptr, FS.getPtr());
EXPECT_EQ(24, NumDiagnostics);
}
@@ -487,7 +487,7 @@
" 'external-contents': '//root/external/file'\n"
" }\n"
"] }", Lower);
- ASSERT_TRUE(NULL != FS.getPtr());
+ ASSERT_TRUE(nullptr != FS.getPtr());
// default true
EXPECT_EQ("//root/external/file", FS->status("//root/A")->getName());
@@ -511,7 +511,7 @@
" 'external-contents': '//root/external/file'\n"
" }\n"
"] }", Lower);
- ASSERT_TRUE(NULL != FS.getPtr());
+ ASSERT_TRUE(nullptr != FS.getPtr());
// default
EXPECT_EQ("//root/A", FS->status("//root/A")->getName());
@@ -530,7 +530,7 @@
" { 'type': 'file', 'name': '//root/path/to/file',\n"
" 'external-contents': '//root/other' }]\n"
"}", Lower);
- ASSERT_TRUE(NULL != FS.getPtr());
+ ASSERT_TRUE(nullptr != FS.getPtr());
EXPECT_FALSE(FS->status("//root/path/to/file").getError());
EXPECT_FALSE(FS->status("//root/path/to").getError());
EXPECT_FALSE(FS->status("//root/path").getError());
@@ -543,7 +543,7 @@
" 'contents': [ { 'type': 'file', 'name': 'file',\n"
" 'external-contents': '//root/other' }]}]\n"
"}", Lower);
- ASSERT_TRUE(NULL != FS.getPtr());
+ ASSERT_TRUE(nullptr != FS.getPtr());
EXPECT_FALSE(FS->status("//root/path/to/file").getError());
EXPECT_FALSE(FS->status("//root/path/to").getError());
EXPECT_FALSE(FS->status("//root/path").getError());
@@ -556,7 +556,7 @@
" 'contents': [ { 'type': 'file', 'name': 'path/to/file',\n"
" 'external-contents': '//root/other' }]}]\n"
"}", Lower);
- ASSERT_TRUE(NULL != FS.getPtr());
+ ASSERT_TRUE(nullptr != FS.getPtr());
EXPECT_FALSE(FS->status("//root/path/to/file").getError());
EXPECT_FALSE(FS->status("//root/path/to").getError());
EXPECT_FALSE(FS->status("//root/path").getError());
@@ -574,7 +574,7 @@
" 'contents': [ { 'type': 'file', 'name': 'file',\n"
" 'external-contents': '//root/other' }]}]\n"
"}", Lower);
- ASSERT_TRUE(NULL != FS.getPtr());
+ ASSERT_TRUE(nullptr != FS.getPtr());
EXPECT_FALSE(FS->status("//root/path/to/file").getError());
EXPECT_FALSE(FS->status("//root/path/to").getError());
EXPECT_FALSE(FS->status("//root/path").getError());