X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=googletest%2Ftest%2Fgoogletest-message-test.cc;fp=test%2Fgtest-message_test.cc;h=962d519114e6e4e3dc3df19fde7545571bc031bc;hb=e7b4c00007893a03bd18ec50f004b1031e3d635b;hp=175238ef4e64adb4e1f788f13a4ed04d60657e18;hpb=13373a8d7eeda1773ad1a2a28daf0a608b3830cf;p=platform%2Fupstream%2Fgtest.git diff --git a/test/gtest-message_test.cc b/googletest/test/googletest-message-test.cc old mode 100755 new mode 100644 similarity index 98% rename from test/gtest-message_test.cc rename to googletest/test/googletest-message-test.cc index 175238e..962d519 --- a/test/gtest-message_test.cc +++ b/googletest/test/googletest-message-test.cc @@ -26,8 +26,7 @@ // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Author: wan@google.com (Zhanyong Wan) + // // Tests for the Message class. @@ -86,7 +85,7 @@ TEST(MessageTest, StreamsPointer) { // Tests streaming a NULL non-char pointer. TEST(MessageTest, StreamsNullPointer) { - int* p = NULL; + int* p = nullptr; EXPECT_EQ("(null)", (Message() << p).GetString()); } @@ -97,7 +96,7 @@ TEST(MessageTest, StreamsCString) { // Tests streaming a NULL C string. TEST(MessageTest, StreamsNullCString) { - char* p = NULL; + char* p = nullptr; EXPECT_EQ("(null)", (Message() << p).GetString()); }