eson/googletest
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merging, upstream http://cl/182836545

Browse Source
This commit is contained in:
Gennadiy Civil 2018-01-23 10:15:28 -05:00
parent bbb17ad0f7
commit 6723b6c588
5 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
googletest/test/gtest_repeat_test.cc
View File

@ -67,7 +67,7 @@ namespace {
// Used for verifying that global environment set-up and tear-down are // Used for verifying that global environment set-up and tear-down are
// inside the gtest_repeat loop. // inside the --gtest_repeat loop.
int g_environment_set_up_count = 0; int g_environment_set_up_count = 0;
int g_environment_tear_down_count = 0; int g_environment_tear_down_count = 0;

5
googletest/test/gtest_uninitialized_test.py
View File

@ -36,7 +36,6 @@ __author__ = 'wan@google.com (Zhanyong Wan)'
import os import os
import gtest_test_utils import gtest_test_utils
COMMAND = gtest_test_utils.GetTestExecutablePath('gtest_uninitialized_test_') COMMAND = gtest_test_utils.GetTestExecutablePath('gtest_uninitialized_test_')
@ -57,8 +56,8 @@ def TestExitCodeAndOutput(command):
# Verifies that 'command' exits with code 1. # Verifies that 'command' exits with code 1.
p = gtest_test_utils.Subprocess(command) p = gtest_test_utils.Subprocess(command)
Assert(p.exited) if p.exited and p.exit_code == 0:
AssertEq(1, p.exit_code) Assert('IMPORTANT NOTICE' in p.output);
Assert('InitGoogleTest' in p.output) Assert('InitGoogleTest' in p.output)

4
googletest/test/gtest_uninitialized_test_.cc
View File

@ -34,8 +34,8 @@
TEST(DummyTest, Dummy) { TEST(DummyTest, Dummy) {
// This test doesn't verify anything. We just need it to create a // This test doesn't verify anything. We just need it to create a
// realistic stage for testing the behavior of Google Test when // realistic stage for testing the behavior of Google Test when
// RUN_ALL_TESTS() is called without testing::InitGoogleTest() being // RUN_ALL_TESTS() is called without
// called first. // testing::InitGoogleTest() being called first.
} }
int main() { int main() {

6
googletest/test/gtest_unittest.cc
View File

@ -34,9 +34,9 @@
#include "gtest/gtest.h" #include "gtest/gtest.h"
// Verifies that the command line flag variables can be accessed // Verifies that the command line flag variables can be accessed in
// in code once <gtest/gtest.h> has been #included. // code once "gtest/gtest.h" has been
// Do not move it after other #includes. // #included. Do not move it after other gtest #includes.
TEST(CommandLineFlagsTest, CanBeAccessedInCodeOnceGTestHIsIncluded) { TEST(CommandLineFlagsTest, CanBeAccessedInCodeOnceGTestHIsIncluded) {
bool dummy = testing::GTEST_FLAG(also_run_disabled_tests) bool dummy = testing::GTEST_FLAG(also_run_disabled_tests)
|| testing::GTEST_FLAG(break_on_failure) || testing::GTEST_FLAG(break_on_failure)

1
googletest/test/gtest_xml_test_utils.py
View File

@ -35,7 +35,6 @@ import gtest_test_utils
from xml.dom import minidom, Node from xml.dom import minidom, Node
GTEST_OUTPUT_FLAG = '--gtest_output'
GTEST_DEFAULT_OUTPUT_FILE = 'test_detail.xml' GTEST_DEFAULT_OUTPUT_FILE = 'test_detail.xml'
class GTestXMLTestCase(gtest_test_utils.TestCase): class GTestXMLTestCase(gtest_test_utils.TestCase):