diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-07-23 11:59:29 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-23 11:59:29 -0400 |
| commit | 82c858b3add3099419f1b6fdc21a076562405251 (patch) | |
| tree | 0863d2dd69f8e714564145a9ea61f1d2d704297b | |
| parent | 2a151c93c180ac765c27c5f2e37af9366abd4d55 (diff) | |
| parent | bb9fc6f66e4954576a51cc05c99f01ff97c2da29 (diff) | |
| download | googletest-82c858b3add3099419f1b6fdc21a076562405251.tar.gz googletest-82c858b3add3099419f1b6fdc21a076562405251.tar.bz2 googletest-82c858b3add3099419f1b6fdc21a076562405251.zip | |
Merge pull request #1678 from stianval/master
Fixing some formatting in docs/primer
| -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 f7f26ebc..260d50b8 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*. |