Fixes for re-enabling more MSVC level 4 warnings: mojo/ edition

mojo/public/cpp/environment/tests/logging_unittest.cc

 // Copyright 2014 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.
 
 #include <stdlib.h>
 
 #include <sstream>
 #include <string>
 
 #include "mojo/public/cpp/environment/environment.h"
@@ skipping 183 matching lines @@
 
   ResetMockLogger();
 
   MOJO_LAZY_LOG_STREAM(INFO, false) << "hello";
   EXPECT_FALSE(log_message_was_called());
 
   ResetMockLogger();
 
   MOJO_LAZY_LOG_STREAM(FATAL, false) << "hello";
   EXPECT_FALSE(log_message_was_called());
-
-  ResetMockLogger();
-
-  bool x = false;
-  // This probably fails to compile if we forget to parenthesize the condition
-  // in the macro (= has low precedence, and needs an lvalue on the LHS).
-  MOJO_LAZY_LOG_STREAM(ERROR, x = true) << "hello";
-  EXPECT_TRUE(log_message_was_called());
-
-  ResetMockLogger();
-
-  MOJO_LAZY_LOG_STREAM(WARNING, x = false) << "hello";
-  EXPECT_FALSE(log_message_was_called());
 }
 
 TEST_F(LoggingTest, ShouldLog) {
   // We start at |MOJO_LOG_LEVEL_INFO|.
   EXPECT_FALSE(MOJO_SHOULD_LOG(VERBOSE));
   EXPECT_TRUE(MOJO_SHOULD_LOG(INFO));
   EXPECT_TRUE(MOJO_SHOULD_LOG(WARNING));
   EXPECT_TRUE(MOJO_SHOULD_LOG(ERROR));
   EXPECT_TRUE(MOJO_SHOULD_LOG(FATAL));
 
@@ skipping 56 matching lines @@
   MOJO_LOG_IF(VERBOSE, true) << "hello";
   EXPECT_FALSE(log_message_was_called());
 
   ResetMockLogger();
 
   MOJO_LOG_IF(VERBOSE, false) << "hello";
   EXPECT_FALSE(log_message_was_called());
 
   ResetMockLogger();
 
-  bool x = false;
-  // Also try to make sure that we parenthesize the condition properly.
-  MOJO_LOG_IF(INFO, x = true) << "hello";
-  EXPECT_TRUE(log_message_was_called());
-  EXPECT_EQ(MOJO_LOG_LEVEL_INFO, last_log_level());
-  EXPECT_EQ(ExpectedLogMessage(__LINE__-3, "hello"), last_message());
-
-  ResetMockLogger();
-
-  MOJO_LOG_IF(INFO, x = false) << "hello";
-  EXPECT_FALSE(log_message_was_called());
-
-  ResetMockLogger();
-
   Environment::GetDefaultLogger()->SetMinimumLogLevel(MOJO_LOG_LEVEL_ERROR);
 
   ResetMockLogger();
 
   MOJO_LOG_IF(INFO, 0 != 1) << "hello";
   EXPECT_FALSE(log_message_was_called());
 
   ResetMockLogger();
 
   MOJO_LOG_IF(WARNING, 1+1 == 2) << "hello";
@@ skipping 18 matching lines @@
   MOJO_LOG_IF(INFO, NotCalled()) << "hello";
   EXPECT_FALSE(log_message_was_called());
 }
 
 TEST_F(LoggingTest, Check) {
   MOJO_CHECK(true) << "hello";
   EXPECT_FALSE(log_message_was_called());
 
   ResetMockLogger();
 
-  bool x = true;
-  // Also try to make sure that we parenthesize the condition properly.

[viettrungluu, 2014/07/08 15:19:28]

Uhm, no. Way to defeat exactly what we're testing. Not LGTM.

-  MOJO_CHECK(x = false) << "hello";
+  MOJO_CHECK(false) << "hello";
   EXPECT_TRUE(log_message_was_called());
   EXPECT_EQ(MOJO_LOG_LEVEL_FATAL, last_log_level());
   // Different compilers have different ideas about the line number of a split
   // line.
   int line = __LINE__;
-  EXPECT_EQ(ExpectedLogMessage(line-5, "Check failed: x = false. hello"),
+  EXPECT_EQ(ExpectedLogMessage(line-5, "Check failed: false. hello"),
             last_message());
 
   ResetMockLogger();
 
   // Also test a "naked" |MOJO_CHECK()|s.
   MOJO_CHECK(1+2 == 3);
   EXPECT_FALSE(log_message_was_called());
 }
 
 TEST_F(LoggingTest, Dlog) {
@@ skipping 59 matching lines @@
 
   MOJO_DCHECK(true) << "hello";
   EXPECT_FALSE(log_message_was_called());
 
   ResetMockLogger();
 
   // |MOJO_DCHECK()| should compile (but not evaluate) its condition even for
   // non-debug builds. (Hopefully, we'll get an unused variable error if it
   // fails to compile the condition.)
   bool x = true;
-  MOJO_DCHECK(x = false) << "hello";
+  MOJO_DCHECK(x == false) << "hello";
 #ifdef NDEBUG
   EXPECT_FALSE(log_message_was_called());
 #else
   EXPECT_TRUE(log_message_was_called());
   EXPECT_EQ(MOJO_LOG_LEVEL_FATAL, last_log_level());
   // Different compilers have different ideas about the line number of a split
   // line.
   int line = __LINE__;
-  EXPECT_EQ(ExpectedLogMessage(line-8, "Check failed: x = false. hello"),
+  EXPECT_EQ(ExpectedLogMessage(line-8, "Check failed: x == false. hello"),
             last_message());
 #endif
 }
 
 }  // namespace
 }  // namespace mojo