Skip to content

Commit 63dcbf6

Browse files
committed
add MockData for mock puppet
1 parent 8977a56 commit 63dcbf6

File tree

8 files changed

+70
-9
lines changed

8 files changed

+70
-9
lines changed

pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,11 @@
191191
<artifactId>junit</artifactId>
192192
<version>4.12</version>
193193
</dependency>
194+
<dependency>
195+
<groupId>com.github.javafaker</groupId>
196+
<artifactId>javafaker</artifactId>
197+
<version>1.0.2</version>
198+
</dependency>
194199

195200
</dependencies>
196201
</dependencyManagement>

wechaty-puppet-hostie/src/main/kotlin/io/github/wechaty/grpc/GrpcPuppet.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ import org.apache.commons.lang3.StringUtils
1616
import org.apache.commons.lang3.math.NumberUtils
1717
import org.slf4j.LoggerFactory
1818
import java.util.concurrent.CompletableFuture
19-
import java.util.concurrent.CountDownLatch
2019
import java.util.concurrent.Executors.newFixedThreadPool
2120
import java.util.concurrent.Future
2221
import java.util.concurrent.TimeUnit
@@ -404,7 +403,7 @@ class GrpcPuppet(puppetOptions: PuppetOptions) : Puppet(puppetOptions) {
404403
payload.province = response.province
405404
payload.signature = response.signature
406405
payload.star = response.star
407-
payload.type = ContractType.getByCode(response.type.number)
406+
payload.type = ContactType.getByCode(response.type.number)
408407
payload.weixin = response.weixin
409408
payload
410409
}

wechaty-puppet-mock/pom.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,10 @@
4848
<groupId>junit</groupId>
4949
<artifactId>junit</artifactId>
5050
</dependency>
51+
<dependency>
52+
<groupId>com.github.javafaker</groupId>
53+
<artifactId>javafaker</artifactId>
54+
</dependency>
5155
</dependencies>
5256

5357
<build>
Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
package io.github.wechaty
2+
3+
import com.github.javafaker.Faker
4+
import io.github.wechaty.filebox.FileBox
5+
import io.github.wechaty.schemas.*
6+
import java.util.*
7+
8+
/**
9+
* Data for mock
10+
* @author renxiaoya
11+
* @date 2020-06-01
12+
**/
13+
class MockData {
14+
15+
companion object {
16+
private val faker = Faker()
17+
18+
fun getFakeContactPayload(): ContactPayload {
19+
val contactPayload = ContactPayload(UUID.randomUUID().toString())
20+
contactPayload.address = faker.address().streetAddress()
21+
contactPayload.avatar = faker.avatar().toString()
22+
contactPayload.city = faker.address().city()
23+
contactPayload.friend = true
24+
contactPayload.gender = ContractGender.Male
25+
contactPayload.name = faker.name().firstName()
26+
contactPayload.province = faker.address().state()
27+
contactPayload.signature = faker.lorem().sentence()
28+
contactPayload.star = false
29+
contactPayload.type = ContactType.Personal
30+
return contactPayload
31+
}
32+
33+
fun getFakeImageFileBox(): FileBox {
34+
return FileBox.fromUrl(faker.avatar().image(), null)
35+
}
36+
37+
fun getFakeMessagePayload(): MessagePayload {
38+
val messagePayload = MessagePayload(UUID.randomUUID().toString())
39+
messagePayload.fromId = UUID.randomUUID().toString()
40+
messagePayload.mentionIdList = listOf()
41+
messagePayload.text = faker.lorem().sentence()
42+
messagePayload.timestamp = Date().time
43+
messagePayload.toId = UUID.randomUUID().toString()
44+
messagePayload.type = MessageType.Text
45+
messagePayload.roomId = "${UUID.randomUUID().toString()}@chatroom"
46+
messagePayload.filename = faker.file().fileName()
47+
return messagePayload
48+
}
49+
}
50+
51+
}

wechaty-puppet-mock/src/main/kotlin/wechaty/MockPuppet.kt renamed to wechaty-puppet-mock/src/main/kotlin/io/github/wechaty/MockPuppet.kt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package wechaty
1+
package io.github.wechaty
22

33
import io.github.wechaty.Puppet
44
import io.github.wechaty.filebox.FileBox
@@ -24,9 +24,11 @@ class MockPuppet(puppetOptions: PuppetOptions) : Puppet(puppetOptions) {
2424
this.state.on(true)
2525
*/
2626
val eventScanPayload = EventScanPayload(ScanStatus.Cancel)
27-
eventScanPayload.qrcode = "https://github.com/wechaty/wechaty-puppet-mock"
27+
eventScanPayload.qrcode = "https://github.com/wechaty/java-wechaty/wechaty-puppet-mock"
2828
emit("scan", eventScanPayload)
2929

30+
31+
val userPayload = MockData.getFakeContactPayload()
3032
TODO("Not yet implemented")
3133

3234
}

wechaty-puppet-mock/src/main/kotlin/wechaty/utils/MockitoHelper.kt renamed to wechaty-puppet-mock/src/main/kotlin/io/github/wechaty/utils/MockitoHelper.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package wechaty.utils
1+
package io.github.wechaty.utils
22

33
import org.mockito.Mockito
44

wechaty-puppet/src/main/kotlin/io/github/wechaty/schemas/Contact.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ enum class ContractGender(var code: Int) {
1717
}
1818
}
1919

20-
enum class ContractType(var code: Int) {
20+
enum class ContactType(var code: Int) {
2121
Unknown(0), Personal(1), Official(2);
2222

2323
companion object {
24-
fun getByCode(code: Int): ContractType {
24+
fun getByCode(code: Int): ContactType {
2525
val values = values()
2626
for (value in values) {
2727
if (value.code == code) {
@@ -47,7 +47,7 @@ class ContactQueryFilter {
4747

4848
class ContactPayload(val id:String) {
4949
var gender: ContractGender? = null
50-
var type: ContractType? = null
50+
var type: ContactType? = null
5151
var name: String? = null
5252
var avatar: String? = null
5353
var address: String? = null

wechaty/src/test/kotlin/io/github/wechaty/user/RoomTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import org.mockito.ArgumentMatchers
99
import org.mockito.Mockito
1010
import org.mockito.Mockito.`when`
1111
import org.mockito.Mockito.verify
12-
import wechaty.utils.MockitoHelper
12+
import io.github.wechaty.utils.MockitoHelper
1313

1414
/**
1515
* @author renxiaoya

0 commit comments

Comments
 (0)