summaryrefslogtreecommitdiffstats
path: root/sandbox/src/job_unittest.cc
diff options
context:
space:
mode:
authormbelshe@chromium.org <mbelshe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-25 20:21:16 +0000
committermbelshe@chromium.org <mbelshe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-25 20:21:16 +0000
commitbd635c097dfc689674d6b21c006850a7b07f23f4 (patch)
treeb9c8bdf9edc379e288c14f64e063e29efe7635c8 /sandbox/src/job_unittest.cc
parent19dc5d7922dc07b61c037ebbcc86f20dad27eab2 (diff)
downloadchromium_src-bd635c097dfc689674d6b21c006850a7b07f23f4.zip
chromium_src-bd635c097dfc689674d6b21c006850a7b07f23f4.tar.gz
chromium_src-bd635c097dfc689674d6b21c006850a7b07f23f4.tar.bz2
Enable warning 4389 as an error on windows builds. This will make
windows builds more similar to linux/mac, which already treat signed/ unsigned equality comparisons as warnings (and hence errors). BUG=44471 TEST=none Review URL: http://codereview.chromium.org/2081007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48186 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sandbox/src/job_unittest.cc')
-rw-r--r--sandbox/src/job_unittest.cc18
1 files changed, 9 insertions, 9 deletions
diff --git a/sandbox/src/job_unittest.cc b/sandbox/src/job_unittest.cc
index d7d29ae..f7174e3 100644
--- a/sandbox/src/job_unittest.cc
+++ b/sandbox/src/job_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -20,7 +20,7 @@ TEST(JobTest, TestCreation) {
// check if the job exists.
HANDLE job_handle = ::OpenJobObjectW(GENERIC_ALL, FALSE,
L"my_test_job_name");
- ASSERT_NE(NULL, reinterpret_cast<ULONG_PTR>(job_handle));
+ ASSERT_NE(reinterpret_cast<HANDLE>(NULL), job_handle);
if (job_handle)
CloseHandle(job_handle);
@@ -28,7 +28,7 @@ TEST(JobTest, TestCreation) {
// Check if the job is destroyed when the object goes out of scope.
HANDLE job_handle = ::OpenJobObjectW(GENERIC_ALL, FALSE, L"my_test_job_name");
- ASSERT_EQ(NULL, reinterpret_cast<ULONG_PTR>(job_handle));
+ ASSERT_EQ(reinterpret_cast<HANDLE>(NULL), job_handle);
ASSERT_EQ(ERROR_FILE_NOT_FOUND, ::GetLastError());
}
@@ -42,14 +42,14 @@ TEST(JobTest, TestDetach) {
ASSERT_EQ(ERROR_SUCCESS, job.Init(JOB_LOCKDOWN, L"my_test_job_name", 0));
job_handle = job.Detach();
- ASSERT_NE(NULL, reinterpret_cast<ULONG_PTR>(job_handle));
+ ASSERT_NE(reinterpret_cast<HANDLE>(NULL), job_handle);
}
// Check to be sure that the job is still alive even after the object is gone
// out of scope.
HANDLE job_handle_dup = ::OpenJobObjectW(GENERIC_ALL, FALSE,
L"my_test_job_name");
- ASSERT_NE(NULL, reinterpret_cast<ULONG_PTR>(job_handle_dup));
+ ASSERT_NE(reinterpret_cast<HANDLE>(NULL), job_handle_dup);
// Remove all references.
if (job_handle_dup)
@@ -60,7 +60,7 @@ TEST(JobTest, TestDetach) {
// Check if the jbo is really dead.
job_handle = ::OpenJobObjectW(GENERIC_ALL, FALSE, L"my_test_job_name");
- ASSERT_EQ(NULL, reinterpret_cast<ULONG_PTR>(job_handle));
+ ASSERT_EQ(reinterpret_cast<HANDLE>(NULL), job_handle);
ASSERT_EQ(ERROR_FILE_NOT_FOUND, ::GetLastError());
}
@@ -75,7 +75,7 @@ TEST(JobTest, TestExceptions) {
JOB_OBJECT_UILIMIT_READCLIPBOARD));
job_handle = job.Detach();
- ASSERT_NE(NULL, reinterpret_cast<ULONG_PTR>(job_handle));
+ ASSERT_NE(reinterpret_cast<HANDLE>(NULL), job_handle);
JOBOBJECT_BASIC_UI_RESTRICTIONS jbur = {0};
DWORD size = sizeof(jbur);
@@ -95,7 +95,7 @@ TEST(JobTest, TestExceptions) {
ASSERT_EQ(ERROR_SUCCESS, job.Init(JOB_LOCKDOWN, L"my_test_job_name", 0));
job_handle = job.Detach();
- ASSERT_NE(NULL, reinterpret_cast<ULONG_PTR>(job_handle));
+ ASSERT_NE(reinterpret_cast<HANDLE>(NULL), job_handle);
JOBOBJECT_BASIC_UI_RESTRICTIONS jbur = {0};
DWORD size = sizeof(jbur);
@@ -124,7 +124,7 @@ TEST(JobTest, NoInit) {
Job job;
ASSERT_EQ(ERROR_NO_DATA, job.UserHandleGrantAccess(NULL));
ASSERT_EQ(ERROR_NO_DATA, job.AssignProcessToJob(NULL));
- ASSERT_EQ(NULL, reinterpret_cast<ULONG_PTR>(job.Detach()));
+ ASSERT_EQ(reinterpret_cast<HANDLE>(NULL), job.Detach());
}
// Tests the initialization of the job with different security level.