You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2022/09/20 01:54:00 UTC

[shardingsphere] branch master updated: Update `CODE_OF_CONDUCT.md` and `code.en.md` about hamcrest (#21046)

This is an automated email from the ASF dual-hosted git repository.

zhonghongsheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git


The following commit(s) were added to refs/heads/master by this push:
     new 801bbc8e970 Update `CODE_OF_CONDUCT.md` and `code.en.md` about hamcrest (#21046)
801bbc8e970 is described below

commit 801bbc8e970b05d5ff195ab4ed93ec0997481dc1
Author: Ling Hengqian <li...@outlook.com>
AuthorDate: Tue Sep 20 09:53:47 2022 +0800

    Update `CODE_OF_CONDUCT.md` and `code.en.md` about hamcrest (#21046)
---
 CODE_OF_CONDUCT.md                                 | 2 +-
 docs/community/content/involved/conduct/code.cn.md | 2 +-
 docs/community/content/involved/conduct/code.en.md | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
index 382b846c518..6b0d1de6764 100644
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -61,7 +61,7 @@ The following code of conduct is based on full compliance with [ASF CODE OF COND
  - Without particular reasons, test cases should be fully covered.
  - Every test case need precised assertion.
  - Environment preparation codes should be separate from test codes.
- - Only those that relate to junit `Assert`, hamcrest `CoreMatchers` and `Mockito` can use static import.
+ - Only those that relate to `Mockito`, junit `Assert`, hamcrest `CoreMatchers` and `MatcherAssert` can use static import.
  - For single parameter asserts, `assertTrue`, `assertFalse`, `assertNull` and `assertNotNull` should be used.
  - For multiple parameter asserts, `assertThat` should be used.
  - For accurate asserts, try not to use `not`, `containsString` to make assertions.
diff --git a/docs/community/content/involved/conduct/code.cn.md b/docs/community/content/involved/conduct/code.cn.md
index 7c5c4fb54c2..2376fa1f546 100644
--- a/docs/community/content/involved/conduct/code.cn.md
+++ b/docs/community/content/involved/conduct/code.cn.md
@@ -74,7 +74,7 @@ chapter = true
  - 除去简单的 `getter /setter` 方法,以及声明 SPI 的静态代码,如:`getType / getOrder`,单元测试需全覆盖。
  - 每个测试用例需精确断言。
  - 准备环境的代码和测试代码分离。
- - 只有 junit `Assert`,hamcrest `CoreMatchers`,Mockito 相关可以使用 static import。
+ - 只有 Mockito,junit `Assert`,hamcrest `CoreMatchers` 和 `MatcherAssert` 相关可以使用 static import。
  - 单数据断言,应使用 `assertTrue`,`assertFalse`,`assertNull` 和 `assertNotNull`。
  - 多数据断言,应使用 `assertThat`。
  - 精确断言,尽量不使用 `not`,`containsString` 断言。
diff --git a/docs/community/content/involved/conduct/code.en.md b/docs/community/content/involved/conduct/code.en.md
index c22ebe77884..7c72389b071 100644
--- a/docs/community/content/involved/conduct/code.en.md
+++ b/docs/community/content/involved/conduct/code.en.md
@@ -72,7 +72,7 @@ The following code of conduct is based on full compliance with [ASF CODE OF COND
  - Test cases should be fully covered expect simply `getter /setter` methods, and declared static codes of SPI, such as: `getType / getOrder`.
  - Every test case need precised assertion.
  - Environment preparation codes should be separate from test codes.
- - Only those that relate to junit `Assert`, hamcrest `CoreMatchers` and `Mockito` can use static import.
+ - Only those that relate to `Mockito`, junit `Assert`, hamcrest `CoreMatchers` and `MatcherAssert` can use static import.
  - For single parameter asserts, `assertTrue`, `assertFalse`, `assertNull` and `assertNotNull` should be used.
  - For multiple parameter asserts, `assertThat` should be used.
  - For accurate asserts, try not to use `not`, `containsString` to make assertions.