Merge branch 'develop'

Dcard · May 12, 2020 · 2d1b0f4 · 2d1b0f4
2 parents 4674e0b + 854de7c
commit 2d1b0f4
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 30 deletions.
diff --git a/app/src/debug/java/tw/dcard/bubblemock/sample/api/mock/MyMockSource.kt b/app/src/debug/java/tw/dcard/bubblemock/sample/api/mock/MyMockSource.kt
@@ -1,14 +1,14 @@
 package tw.dcard.bubblemock.sample.api.mock
 
-import tw.dcard.bubblemock.model.MockRequest
+import tw.dcard.bubblemock.model.MockScenario
 import tw.dcard.bubblemock.module.MockSource
-import tw.dcard.bubblemock.sample.api.member.MemberMockRequest
-import tw.dcard.bubblemock.sample.api.member.MemberMockRequest2
+import tw.dcard.bubblemock.sample.api.member.MemberMockScenario
+import tw.dcard.bubblemock.sample.api.member.MemberMockScenario2
 
 class MyMockSource : MockSource {
-    override fun create(): List<MockRequest> =
-        mutableListOf<MockRequest>().apply {
-            addAll(MemberMockRequest.create())
-            addAll(MemberMockRequest2.create())
+    override fun create(): List<MockScenario> =
+        mutableListOf<MockScenario>().apply {
+            addAll(MemberMockScenario.create())
+            addAll(MemberMockScenario2.create())
         }
 }
diff --git a/...ck/sample/api/member/MemberMockRequest.kt → ...k/sample/api/member/MemberMockScenario.kt b/...ck/sample/api/member/MemberMockRequest.kt → ...k/sample/api/member/MemberMockScenario.kt
@@ -1,14 +1,14 @@
 package tw.dcard.bubblemock.sample.api.member
 
-import tw.dcard.bubblemock.model.MockRequest
+import tw.dcard.bubblemock.model.MockScenario
 import tw.dcard.bubblemock.model.api
-import tw.dcard.bubblemock.model.request
+import tw.dcard.bubblemock.model.scenario
 import tw.dcard.bubblemock.module.MockBubbleManager
 import tw.dcard.bubblemock.sample.model.Member
 
-object MemberMockRequest {
-    fun create(): List<MockRequest> = listOf(
-        request(page = "Main Page", name = "Member List - several") {
+object MemberMockScenario {
+    fun create(): List<MockScenario> = listOf(
+        scenario(page = "Main Page", name = "Member List - several") {
             select {
                 true
             }
@@ -20,7 +20,7 @@ object MemberMockRequest {
                 }
             }
         },
-        request(page = "Main Page", name = "Member List - lots data with long delay") {
+        scenario(page = "Main Page", name = "Member List - lots data with long delay") {
             add {
                 api("members") {
                     response {
@@ -32,7 +32,7 @@ object MemberMockRequest {
                 }
             }
         },
-        request(page = "Main Page", name = "Member List - empty") {
+        scenario(page = "Main Page", name = "Member List - empty") {
             add {
                 api("members") {
                     response {
@@ -41,7 +41,7 @@ object MemberMockRequest {
                 }
             }
         },
-        request(page = "Main Page", name = "Member List - Error") {
+        scenario(page = "Main Page", name = "Member List - Error") {
             add {
                 api("members") {
                     response {

diff --git a/...k/sample/api/member/MemberMockRequest2.kt → .../sample/api/member/MemberMockScenario2.kt b/...k/sample/api/member/MemberMockRequest2.kt → .../sample/api/member/MemberMockScenario2.kt
@@ -1,15 +1,15 @@
 package tw.dcard.bubblemock.sample.api.member
 
 import tw.dcard.bubblemock.model.MockApi
-import tw.dcard.bubblemock.model.MockRequest
+import tw.dcard.bubblemock.model.MockScenario
 import tw.dcard.bubblemock.model.api
-import tw.dcard.bubblemock.model.request
+import tw.dcard.bubblemock.model.scenario
 
-object MemberMockRequest2 {
+object MemberMockScenario2 {
 
-    fun create(): List<MockRequest> = listOf(
+    fun create(): List<MockScenario> = listOf(
         //  DSL Declaration Method
-        request(page = "Main Page", name = "Member List - same data") {
+        scenario(page = "Main Page", name = "Member List - same data") {
             select {
                 false
             }
@@ -22,7 +22,7 @@ object MemberMockRequest2 {
             }
         },
         //  Regular Declaration Method
-        MockRequest(page = "Main Page", name = "Member List - same data with address").apply {
+        MockScenario(page = "Main Page", name = "Member List - same data with address").apply {
             mockApiList = mutableListOf(
                 MockApi(listOf("members")).apply {
                     responseObject = getMembersWithAddress()

diff --git a/app/src/release/java/tw/dcard/bubblemock/sample/api/mock/MyMockSource.kt b/app/src/release/java/tw/dcard/bubblemock/sample/api/mock/MyMockSource.kt
@@ -1,8 +1,8 @@
 package tw.dcard.bubblemock.sample.api.mock
 
-import tw.dcard.bubblemock.model.MockRequest
+import tw.dcard.bubblemock.model.MockScenario
 import tw.dcard.bubblemock.module.MockSource
 
 class MyMockSource : MockSource {
-    override fun create(): List<MockRequest> = list()
+    override fun create(): List<MockScenario> = listOf()
 }
diff --git a/.../tw/dcard/bubblemock/model/MockRequest.kt → ...tw/dcard/bubblemock/model/MockScenario.kt b/.../tw/dcard/bubblemock/model/MockRequest.kt → ...tw/dcard/bubblemock/model/MockScenario.kt
@@ -3,7 +3,7 @@ package tw.dcard.bubblemock.model
 /**
  * @author Batu
  */
-data class MockRequest(
+data class MockScenario(
     val page: String,
     val name: String
 ) {
@@ -18,8 +18,8 @@ data class MockRequest(
     }
 }
 
-fun request(page: String, name: String, init: MockRequest.() -> Unit): MockRequest {
-    val mockRequest = MockRequest(page, name)
+fun scenario(page: String, name: String, init: MockScenario.() -> Unit): MockScenario {
+    val mockRequest = MockScenario(page, name)
     mockRequest.init()
     return mockRequest
 }
diff --git a/library/src/main/java/tw/dcard/bubblemock/module/MockBubbleManager.kt b/library/src/main/java/tw/dcard/bubblemock/module/MockBubbleManager.kt
@@ -13,7 +13,7 @@ import com.google.gson.JsonParser
 import okhttp3.*
 import tw.dcard.bubblemock.R
 import tw.dcard.bubblemock.model.MimeType
-import tw.dcard.bubblemock.model.MockRequest
+import tw.dcard.bubblemock.model.MockScenario
 import tw.dcard.bubblemock.sample.screen.BubbleActivity
 
 /**
@@ -46,7 +46,7 @@ class MockBubbleManager {
         }
     }
 
-    var mockOperationModels: List<MockRequest>? = null
+    var mockOperationModels: List<MockScenario>? = null
 
     fun handle(request: Request): Response? {
         mockOperationModels?.forEach { mockRequest ->

diff --git a/library/src/main/java/tw/dcard/bubblemock/module/MockSource.kt b/library/src/main/java/tw/dcard/bubblemock/module/MockSource.kt
@@ -1,10 +1,10 @@
 package tw.dcard.bubblemock.module
 
-import tw.dcard.bubblemock.model.MockRequest
+import tw.dcard.bubblemock.model.MockScenario
 
 /**
  * @author Batu
  */
 interface MockSource {
-    fun create(): List<MockRequest>
+    fun create(): List<MockScenario>
 }