diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-07-23 19:51:39 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-23 19:51:39 (GMT) |
| commit | a68f0c201de57da1540f215147f31297df7ea6a4 (patch) | |
| tree | a017350afd3c662995be4cd7c2d4097f1f2b71f6 | |
| parent | 534570b5bd8dfcb72643b5e81d3bdcf1b5454149 (diff) | |
| parent | 82c858b3add3099419f1b6fdc21a076562405251 (diff) | |
| download | googletest-a68f0c201de57da1540f215147f31297df7ea6a4.zip googletest-a68f0c201de57da1540f215147f31297df7ea6a4.tar.gz googletest-a68f0c201de57da1540f215147f31297df7ea6a4.tar.bz2 | |
Merge branch 'master' into feature/fix-build-error-vs2017-win10-jprefs/pull/1606/head
| -rw-r--r-- | googletest/docs/primer.md | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/googletest/docs/primer.md b/googletest/docs/primer.md index f7f26eb..260d50b 100644 --- a/googletest/docs/primer.md +++ b/googletest/docs/primer.md @@ -203,7 +203,7 @@ for more details. If you're working with floating point numbers, you may want to use the floating point variations of some of these macros in order to avoid problems caused by -rounding. See [Advanced googletest Topics](advanced) for details. +rounding. See [Advanced googletest Topics](advanced.md) for details. Macros in this section work with both narrow and wide string objects (`string` and `wstring`). @@ -219,18 +219,12 @@ as `ASSERT_EQ(expected, actual)`, so lots of existing code uses this order. Now The assertions in this group compare two **C strings**. If you want to compare two `string` objects, use `EXPECT_EQ`, `EXPECT_NE`, and etc instead. -| Fatal assertion | Nonfatal assertion | Verifies | -| ----------------------- | ----------------------- | ---------------------- | -| `ASSERT_STREQ(str1, | `EXPECT_STREQ(str1, | the two C strings have | -: str2);` : str2);` : the same content : -| `ASSERT_STRNE(str1, | `EXPECT_STRNE(str1, | the two C strings have | -: str2);` : str2);` : different contents : -| `ASSERT_STRCASEEQ(str1, | `EXPECT_STRCASEEQ(str1, | the two C strings have | -: str2);` : str2);` : the same content, : -: : : ignoring case : -| `ASSERT_STRCASENE(str1, | `EXPECT_STRCASENE(str1, | the two C strings have | -: str2);` : str2);` : different contents, : -: : : ignoring case : +| Fatal assertion | Nonfatal assertion | Verifies | +| ------------------------------- | ------------------------------- | -------------------------------------------------------- | +| `ASSERT_STREQ(str1, str2);` | `EXPECT_STREQ(str1, str2);` | the two C strings have the same content | +| `ASSERT_STRNE(str1, str2);` | `EXPECT_STRNE(str1, str2);` | the two C strings have different contents | +| `ASSERT_STRCASEEQ(str1, str2);` | `EXPECT_STRCASEEQ(str1, str2);` | the two C strings have the same content, ignoring case | +| `ASSERT_STRCASENE(str1, str2);` | `EXPECT_STRCASENE(str1, str2);` | the two C strings have different contents, ignoring case | Note that "CASE" in an assertion name means that case is ignored. A `NULL` pointer and an empty string are considered *different*. |