1 files changed, 11 insertions, 11 deletions

diff --git a/test/xserver-test.cpp b/test/xserver-test.cpp
index 5e24ae7..a7f4759 100644
--- a/test/xserver-test.cpp
+++ b/test/xserver-test.cpp
@@ -70,7 +70,7 @@ TEST(XServer, WaitForSIGUSR1)
     server.Start();
     ASSERT_EQ(server.GetState(), Process::RUNNING);
     Display *dpy = XOpenDisplay(server.GetDisplayString().c_str());
-    ASSERT_TRUE(dpy != NULL);
+    ASSERT_TRUE(dpy != nullptr);
     XCloseDisplay(dpy);
     server.Terminate(500);
   }
@@ -111,7 +111,7 @@ TEST(XServer, WaitForDeviceEventMask)
   server.Start();
   ASSERT_EQ(server.GetState(), Process::RUNNING);
   ::Display *dpy = XOpenDisplay(server.GetDisplayString().c_str());
-  ASSERT_TRUE(dpy != NULL);
+  ASSERT_TRUE(dpy != nullptr);
   int major = 2, minor = 0;
   XIQueryVersion(dpy, &major, &minor);
 
@@ -174,7 +174,7 @@ TEST(XServer, WaitForExistingDevice)
   server.Start();
   ASSERT_EQ(server.GetState(), Process::RUNNING);
   ::Display *dpy = XOpenDisplay(server.GetDisplayString().c_str());
-  ASSERT_TRUE(dpy != NULL);
+  ASSERT_TRUE(dpy != nullptr);
 
   ASSERT_TRUE(XServer::WaitForDevice(dpy, "PIXART USB OPTICAL MOUSE", 1000));
 }
@@ -190,7 +190,7 @@ TEST(XServer, WaitForNewDevice)
   server.Start();
   ASSERT_EQ(server.GetState(), Process::RUNNING);
   ::Display *dpy = XOpenDisplay(server.GetDisplayString().c_str());
-  ASSERT_TRUE(dpy != NULL);
+  ASSERT_TRUE(dpy != nullptr);
 
   xorg::testing::evemu::Device d(TEST_ROOT_DIR "PIXART-USB-OPTICAL-MOUSE.desc");
 
@@ -208,7 +208,7 @@ TEST(XServer, IOErrorException)
   server.Start();
   ASSERT_EQ(server.GetState(), Process::RUNNING);
   ::Display *dpy = XOpenDisplay(server.GetDisplayString().c_str());
-  ASSERT_TRUE(dpy != NULL);
+  ASSERT_TRUE(dpy != nullptr);
   close(ConnectionNumber(dpy));
   XSync(dpy, False);
   }, XIOError);
@@ -230,7 +230,7 @@ TEST(XServer, ErrorHandler)
       server.Start();
       ASSERT_EQ(server.GetState(), Process::RUNNING);
       ::Display *dpy = XOpenDisplay(server.GetDisplayString().c_str());
-      ASSERT_TRUE(dpy != NULL);
+      ASSERT_TRUE(dpy != nullptr);
       XColor color;
       XQueryColor(dpy, 0, &color);
       XSync(dpy, False);
@@ -273,7 +273,7 @@ TEST(XServer, NondefaultErrorHandler)
     server.Start();
     ASSERT_EQ(server.GetState(), Process::RUNNING);
     ::Display *dpy = XOpenDisplay(server.GetDisplayString().c_str());
-    ASSERT_TRUE(dpy != NULL);
+    ASSERT_TRUE(dpy != nullptr);
     XColor color;
     XQueryColor(dpy, 0, &color);
     XSync(dpy, False);
@@ -301,7 +301,7 @@ TEST(XServer, KeepAlive)
     close(pipefd[0]);
 
     ASSERT_EQ(setenv("XORG_GTEST_XSERVER_KEEPALIVE", "1", 1), 0);
-    ASSERT_TRUE(getenv("XORG_GTEST_XSERVER_KEEPALIVE") != NULL);
+    ASSERT_TRUE(getenv("XORG_GTEST_XSERVER_KEEPALIVE") != nullptr);
 
     XServer server;
     server.SetOption("-logfile", LOGFILE_DIR "/Xorg-keepalive.log");
@@ -310,7 +310,7 @@ TEST(XServer, KeepAlive)
     server.Start();
     ASSERT_EQ(server.GetState(), Process::RUNNING);
     ::Display *dpy = XOpenDisplay(server.GetDisplayString().c_str());
-    ASSERT_TRUE(dpy != NULL);
+    ASSERT_TRUE(dpy != nullptr);
 
     server.Terminate();
     ASSERT_EQ(server.GetState(), Process::RUNNING);
@@ -331,7 +331,7 @@ TEST(XServer, KeepAlive)
   sigemptyset(&sig_mask);
   sigaddset(&sig_mask, SIGCHLD);
   struct timespec tv = { 1, 0 };
-  sigprocmask(SIG_BLOCK, &sig_mask, NULL);
+  sigprocmask(SIG_BLOCK, &sig_mask, nullptr);
 
   /* parent */
   close(pipefd[1]);
@@ -341,7 +341,7 @@ TEST(XServer, KeepAlive)
   close(pipefd[0]);
 
   /* wait for forked child to die */
-  ASSERT_EQ(sigtimedwait(&sig_mask, NULL, &tv), SIGCHLD);
+  ASSERT_EQ(sigtimedwait(&sig_mask, nullptr, &tv), SIGCHLD);
 
   pid_t server_pid = atoi(buffer);