Browse Source

Rename the "generate_mock_code" codegen option to "TestStubs" and rename the stub classes to `...TestStub` as well.

Daniel Alm 7 years ago
parent
commit
308287ea94

+ 1 - 1
Plugin/Sources/protoc-gen-swiftgrpc/main.swift

@@ -146,7 +146,7 @@ func main() throws {
         "client": true,
         "server": true,
         "access": options.visibility.sourceSnippet,
-        "generate_mock_code": options.generateMockCode
+        "generateTestStubs": options.generateTestStubs
       ]
 
       do {

+ 6 - 6
Plugin/Sources/protoc-gen-swiftgrpc/options.swift

@@ -47,11 +47,11 @@ class GeneratorOptions {
   }
 
   let visibility: Visibility
-  let generateMockCode: Bool
+  let generateTestStubs: Bool
 
   init(parameter: String?) throws {
     var visibility: Visibility = .Internal
-    var generateMockCode = false
+    var generateTestStubs = false
 
     for pair in GeneratorOptions.parseParameter(string: parameter) {
       switch pair.key {
@@ -62,10 +62,10 @@ class GeneratorOptions {
           throw GenerationError.invalidParameterValue(name: pair.key,
                                                       value: pair.value)
         }
-      case "generate_mock_code":
+      case "TestStubs":
         switch pair.value {
-        case "true": generateMockCode = true
-        case "false": generateMockCode = false
+        case "true": generateTestStubs = true
+        case "false": generateTestStubs = false
         default: throw GenerationError.invalidParameterValue(name: pair.key,
                                                              value: pair.value)
         }
@@ -75,7 +75,7 @@ class GeneratorOptions {
     }
 
     self.visibility = visibility
-    self.generateMockCode = generateMockCode
+    self.generateTestStubs = generateTestStubs
   }
 
   static func parseParameter(string: String?) -> [(key: String, value: String)] {

+ 2 - 2
Plugin/Templates/client-call-bidistreaming.swift

@@ -92,10 +92,10 @@ fileprivate final class {{ .|call:file,service,method }}Impl: {{ .|call:file,ser
   }
 }
 
-//-{% if generate_mock_code %}
+//-{% if generateTestStubs %}
 /// Simple fake implementation of {{ .|call:file,service,method }} that returns a previously-defined set of results
 /// and stores sent values for later verification.
-class {{ .|call:file,service,method }}Stub: {{ .|call:file,service,method }} {
+class {{ .|call:file,service,method }}TestStub: {{ .|call:file,service,method }} {
   var inputs: [{{ method|input }}] = []
   var outputs: [{{ method|output }}] = []
   

+ 2 - 2
Plugin/Templates/client-call-clientstreaming.swift

@@ -75,10 +75,10 @@ fileprivate final class {{ .|call:file,service,method }}Impl: {{ .|call:file,ser
   }
 }
 
-//-{% if generate_mock_code %}
+//-{% if generateTestStubs %}
 /// Simple fake implementation of {{ .|call:file,service,method }}
 /// stores sent values for later verification and finall returns a previously-defined result.
-class {{ .|call:file,service,method }}Stub: {{ .|call:file,service,method }} {
+class {{ .|call:file,service,method }}TestStub: {{ .|call:file,service,method }} {
   var inputs: [{{ method|input }}] = []
   var output: {{ method|output }}?
 

+ 2 - 2
Plugin/Templates/client-call-serverstreaming.swift

@@ -72,9 +72,9 @@ fileprivate final class {{ .|call:file,service,method }}Impl: {{ .|call:file,ser
   }
 }
 
-//-{% if generate_mock_code %}
+//-{% if generateTestStubs %}
 /// Simple fake implementation of {{ .|call:file,service,method }} that returns a previously-defined set of results.
-class {{ .|call:file,service,method }}Stub: {{ .|call:file,service,method }} {
+class {{ .|call:file,service,method }}TestStub: {{ .|call:file,service,method }} {
   var outputs: [{{ method|output }}] = []
   
   func receive(completion:@escaping ({{ method|output }}?, {{ .|clienterror:file,service }}?)->()) throws {

+ 2 - 2
Plugin/Templates/client.swift

@@ -159,11 +159,11 @@
   //-{% endfor %}
 }
 
-//-{% if generate_mock_code %}
+//-{% if generateTestStubs %}
 /// Simple fake implementation of {{ .|serviceclass:file,service }} that returns a previously-defined set of results
 /// and stores request values passed into it for later verification.
 /// Note: completion blocks are NOT called with this default implementation, and asynchronous unary calls are NOT implemented!
-class {{ .|serviceclass:file,service }}Stub: {{ .|serviceclass:file,service }} {
+class {{ .|serviceclass:file,service }}TestStub: {{ .|serviceclass:file,service }} {
   var channel: Channel { fatalError("not implemented") }
   var metadata = Metadata()
   var host = ""

+ 2 - 2
Plugin/Templates/server-session-bidistreaming.swift

@@ -68,10 +68,10 @@ fileprivate final class {{ .|session:file,service,method }}Impl : {{ .|service:f
   }
 }
 
-//-{% if generate_mock_code %}
+//-{% if generateTestStubs %}
 /// Simple fake implementation of {{ .|session:file,service,method }} that returns a previously-defined set of results
 /// and stores sent values for later verification.
-class {{ .|session:file,service,method }}Stub : {{ .|service:file,service }}SessionStub, {{ .|session:file,service,method }} {
+class {{ .|session:file,service,method }}TestStub : {{ .|service:file,service }}SessionTestStub, {{ .|session:file,service,method }} {
   var inputs: [{{ method|input }}] = []
   var outputs: [{{ method|output }}] = []
 

+ 2 - 2
Plugin/Templates/server-session-clientstreaming.swift

@@ -53,10 +53,10 @@ fileprivate final class {{ .|session:file,service,method }}Impl : {{ .|service:f
   }
 }
 
-//-{% if generate_mock_code %}
+//-{% if generateTestStubs %}
 /// Simple fake implementation of {{ .|session:file,service,method }} that returns a previously-defined set of results
 /// and stores sent values for later verification.
-class {{ .|session:file,service,method }}Stub: {{ .|service:file,service }}SessionStub, {{ .|session:file,service,method }} {
+class {{ .|session:file,service,method }}TestStub: {{ .|service:file,service }}SessionTestStub, {{ .|session:file,service,method }} {
   var inputs: [{{ method|input }}] = []
   var output: {{ method|output }}?
 

+ 2 - 2
Plugin/Templates/server-session-serverstreaming.swift

@@ -44,10 +44,10 @@ fileprivate final class {{ .|session:file,service,method }}Impl : {{ .|service:f
   }
 }
 
-//-{% if generate_mock_code %}
+//-{% if generateTestStubs %}
 /// Simple fake implementation of {{ .|session:file,service,method }} that returns a previously-defined set of results
 /// and stores sent values for later verification.
-class {{ .|session:file,service,method }}Stub : {{ .|service:file,service }}SessionStub, {{ .|session:file,service,method }} {
+class {{ .|session:file,service,method }}TestStub : {{ .|service:file,service }}SessionTestStub, {{ .|session:file,service,method }} {
   var outputs: [{{ method|output }}] = []
 
   func send(_ response: {{ method|output }}, completion: @escaping ()->()) throws {

+ 2 - 2
Plugin/Templates/server-session-unary.swift

@@ -25,7 +25,7 @@ fileprivate final class {{ .|session:file,service,method }}Impl : {{ .|service:f
   }
 }
 
-//-{% if generate_mock_code %}
+//-{% if generateTestStubs %}
 /// Trivial fake implementation of {{ .|session:file,service,method }}.
-class {{ .|session:file,service,method }}Stub : {{ .|service:file,service }}SessionStub, {{ .|session:file,service,method }} { }
+class {{ .|session:file,service,method }}TestStub : {{ .|service:file,service }}SessionTestStub, {{ .|session:file,service,method }} { }
 //-{% endif %}

+ 2 - 2
Plugin/Templates/server.swift

@@ -47,8 +47,8 @@ fileprivate class {{ .|service:file,service }}SessionImpl: {{ .|service:file,ser
   }
 }
 
-//-{% if generate_mock_code %}
-class {{ .|service:file,service }}SessionStub: {{ .|service:file,service }}Session {
+//-{% if generateTestStubs %}
+class {{ .|service:file,service }}SessionTestStub: {{ .|service:file,service }}Session {
   var requestMetadata = Metadata()
 
   var statusCode = StatusCode.ok