Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Complete the work on Mocking frame #1872

Merged
merged 26 commits into from
Feb 21, 2022
Merged

Conversation

Nambers
Copy link
Contributor

@Nambers Nambers commented Feb 9, 2022

origin pr: #1521

Stranger

  • broadcastStrangerAddEvent
  • StrangerRelationChangeEvent

Friend

  • FriendAvatarChangedEvent
  • FriendInputStatusChangedEvent Already exist (broadcastFriendInputStateChange())

Group

  • GroupEntranceAnnouncementChangeEvent
  • MemberHonorChangeEvent
  • GroupTalkativeChangeEvent
  • GroupFile sys v2
  • MessageSyncEvent already exists

IDEA提示说要explicitly加public到interface里我就加了

@Karlatemp Karlatemp self-requested a review February 9, 2022 12:35
@Karlatemp Karlatemp self-assigned this Feb 9, 2022
@Karlatemp Karlatemp added the s:core 子系统: mirai-core label Feb 9, 2022
mirai-core-mock/src/contact/MockStranger.kt Outdated Show resolved Hide resolved
mirai-core-mock/src/internal/contact/MockGroupImpl.kt Outdated Show resolved Hide resolved
mirai-core-mock/src/contact/MockFriend.kt Outdated Show resolved Hide resolved
mirai-core-mock/src/contact/MockGroup.kt Outdated Show resolved Hide resolved
mirai-core-mock/test/mock/MockFriendTest.kt Outdated Show resolved Hide resolved
mirai-core-mock/test/mock/MockStrangerTest.kt Outdated Show resolved Hide resolved
mirai-core-mock/test/mock/MockGroupTest.kt Outdated Show resolved Hide resolved
mirai-core-mock/test/mock/MockFriendTest.kt Outdated Show resolved Hide resolved
mirai-core-mock/src/utils/image.kt Outdated Show resolved Hide resolved
mirai-core-mock/src/internal/contact/MockStrangerImpl.kt Outdated Show resolved Hide resolved
mirai-core-mock/src/contact/MockGroupControlPane.kt Outdated Show resolved Hide resolved
mirai-core-mock/src/contact/MockGroup.kt Outdated Show resolved Hide resolved
mirai-core-mock/src/contact/MockGroup.kt Outdated Show resolved Hide resolved
mirai-core-mock/src/contact/MockGroup.kt Outdated Show resolved Hide resolved
mirai-core-mock/src/contact/MockFriend.kt Outdated Show resolved Hide resolved
@Him188
Copy link
Member

Him188 commented Feb 9, 2022

PR 不要用 merge, 用 rebase. 仓库只接受 linear history.

@Nambers
Copy link
Contributor Author

Nambers commented Feb 9, 2022

PR 不要用 merge, 用 rebase. 仓库只接受 linear history.

应该没有用到merge 我commit都是从旧的cherry pick回来的,到时候再检查看看

Nambers and others added 2 commits February 10, 2022 11:22
Co-authored-by: Him188 <Him188@mamoe.net>
@Nambers Nambers marked this pull request as ready for review February 11, 2022 08:40
@Him188 Him188 self-requested a review February 11, 2022 09:59
mirai-core-mock/src/contact/MockContact.kt Outdated Show resolved Hide resolved
mirai-core-mock/src/contact/MockContact.kt Outdated Show resolved Hide resolved
mirai-core-mock/src/internal/contact/MockGroupImpl.kt Outdated Show resolved Hide resolved
mirai-core-mock/src/internal/contact/MockFriendImpl.kt Outdated Show resolved Hide resolved
mirai-core-mock/test/mock/MockFriendTest.kt Show resolved Hide resolved
mirai-core-mock/src/utils/image.kt Outdated Show resolved Hide resolved
mirai-core-mock/test/mock/MockStrangerTest.kt Show resolved Hide resolved
mirai-core-mock/test/mock/MockStrangerTest.kt Outdated Show resolved Hide resolved
mirai-core-mock/test/mock/MockMemberTest.kt Outdated Show resolved Hide resolved
@Nambers Nambers requested a review from Him188 February 16, 2022 12:43
@Him188 Him188 added this to the 2.11.0-RC milestone Feb 21, 2022
@Him188 Him188 added the z:ready-to-merge 状态: PR 已经可以合并, 正在等待一些安排 label Feb 21, 2022
@Him188 Him188 merged commit 320ec01 into mamoe:mock-testframework Feb 21, 2022
@Nambers Nambers deleted the mocking branch February 21, 2022 12:18
Karlatemp pushed a commit that referenced this pull request Mar 4, 2022
* chore: merge from origin pr

* chore: merge from origin pr

* feat: StrangerRelationChangeEvent

* feat: GroupEntranceAnnouncementChangeEvent

* feat: MemberHonorChangeEvent

* feat: GroupTalkativeChangeEvent

* fix: fix all mentioned problems

* fix: modify as requirement

* doc: group.controlPane

Co-authored-by: Him188 <Him188@mamoe.net>

* fix: assertNotEqual in MockFriendTest

* feat: mockAbsoluteFile and mockAbsoluteFolder(WIP)

* improve: mockAbsoluteFile and mockAbsoluteFolder (WIP)

* fix: if parent == root, null

* improve: mockAbsoluteFile and mockAbsoluteFolder (WIP)

* getUrl in mockAbsoluteFile

* add remoteFile v2 to Group

* add contentsCount

* override AvatarUrl in mockContact

* member test

* fix: data race in MockAbsFile _exists

Co-authored-by: Him188 <Him188@mamoe.net>

* perf: remove general avatarUrl

* chore: move package to net.mamoe.mirai.mock.internal.absoluteFile

* fix: update tests following suggestions

* fix: reduce utils methods

* fix: absoluteFile rename

* fix: add random suspend

Co-authored-by: Him188 <Him188@mamoe.net>
@Him188 Him188 modified the milestones: 2.11.0-RC, 2.11.0-M1 Mar 8, 2022
Karlatemp pushed a commit that referenced this pull request May 13, 2022
* chore: merge from origin pr

* chore: merge from origin pr

* feat: StrangerRelationChangeEvent

* feat: GroupEntranceAnnouncementChangeEvent

* feat: MemberHonorChangeEvent

* feat: GroupTalkativeChangeEvent

* fix: fix all mentioned problems

* fix: modify as requirement

* doc: group.controlPane

Co-authored-by: Him188 <Him188@mamoe.net>

* fix: assertNotEqual in MockFriendTest

* feat: mockAbsoluteFile and mockAbsoluteFolder(WIP)

* improve: mockAbsoluteFile and mockAbsoluteFolder (WIP)

* fix: if parent == root, null

* improve: mockAbsoluteFile and mockAbsoluteFolder (WIP)

* getUrl in mockAbsoluteFile

* add remoteFile v2 to Group

* add contentsCount

* override AvatarUrl in mockContact

* member test

* fix: data race in MockAbsFile _exists

Co-authored-by: Him188 <Him188@mamoe.net>

* perf: remove general avatarUrl

* chore: move package to net.mamoe.mirai.mock.internal.absoluteFile

* fix: update tests following suggestions

* fix: reduce utils methods

* fix: absoluteFile rename

* fix: add random suspend

Co-authored-by: Him188 <Him188@mamoe.net>
Karlatemp pushed a commit that referenced this pull request Jun 19, 2022
* chore: merge from origin pr

* chore: merge from origin pr

* feat: StrangerRelationChangeEvent

* feat: GroupEntranceAnnouncementChangeEvent

* feat: MemberHonorChangeEvent

* feat: GroupTalkativeChangeEvent

* fix: fix all mentioned problems

* fix: modify as requirement

* doc: group.controlPane

Co-authored-by: Him188 <Him188@mamoe.net>

* fix: assertNotEqual in MockFriendTest

* feat: mockAbsoluteFile and mockAbsoluteFolder(WIP)

* improve: mockAbsoluteFile and mockAbsoluteFolder (WIP)

* fix: if parent == root, null

* improve: mockAbsoluteFile and mockAbsoluteFolder (WIP)

* getUrl in mockAbsoluteFile

* add remoteFile v2 to Group

* add contentsCount

* override AvatarUrl in mockContact

* member test

* fix: data race in MockAbsFile _exists

Co-authored-by: Him188 <Him188@mamoe.net>

* perf: remove general avatarUrl

* chore: move package to net.mamoe.mirai.mock.internal.absoluteFile

* fix: update tests following suggestions

* fix: reduce utils methods

* fix: absoluteFile rename

* fix: add random suspend

Co-authored-by: Him188 <Him188@mamoe.net>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
s:core 子系统: mirai-core z:ready-to-merge 状态: PR 已经可以合并, 正在等待一些安排
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants