Simplify testing dependencies

Author: Matt Muller

…c/support/matchers/cbor_value_matcher.rb …b/smithy-client/protocol_spec_matcher.rbgems/smithy/spec/support/matchers/cbor_value_matcher.rb renamed to gems/smithy-client/lib/smithy-client/protocol_spec_matcher.rb gems/smithy/spec/support/matchers/cbor_value_matcher.rb renamed to gems/smithy-client/lib/smithy-client/protocol_spec_matcher.rb

@@ -2,9 +2,9 @@
 
 require 'rspec/expectations'
 
-# Provides an rspec matcher for CBOR encoded values
+# Provides an RSpec matcher for protocol specs.
 # rubocop:disable Metrics/BlockLength
-RSpec::Matchers.define :match_cbor do |expected|
+RSpec::Matchers.define :match_data do |expected|
   match do |actual|
     # identical values don't need more comparison
     return true if actual == expected
@@ -14,7 +14,7 @@
     def match_hash(actual, expected)
       expected.each do |key, value|
         expect(actual).to include(key)
-        match_value(actual[key], value)
+        match_data(actual[key], value)
       end
 
       actual.each_key do |key|
@@ -24,7 +24,7 @@ def match_hash(actual, expected)
 
     def match_array(actual, expected)
       actual.each_with_index do |value, index|
-        match_value(value, expected[index])
+        match_data(value, expected[index])
       end
     end
 
@@ -35,7 +35,7 @@ def match_float(actual, expected)
       expect(actual).to be_within(0.0001).of(expected)
     end
 
-    def match_value(actual, expected)
+    def match_data(actual, expected) # rubocop:disable Metrics/AbcSize
       case actual
       when Hash
         match_hash(actual, expected)
@@ -52,7 +52,7 @@ def match_value(actual, expected)
       end
     end
 
-    match_value(actual, expected)
+    match_data(actual, expected)
   end
 
   diffable

gems/smithy/lib/smithy/templates/client/protocol_spec.erb

@@ -11,25 +11,6 @@ module <%= module_name %>
     let(:client_options) { { stub_responses: true } }
     let(:client) { Client.new(client_options) }
 
-    # temporary
-    def data_to_hash(obj)
-      case obj
-      when Struct
-        obj.members.each.with_object({}) do |member, hash|
-          value = obj[member]
-          hash[member] = data_to_hash(value) unless value.nil?
-        end
-      when Hash
-        obj.each.with_object({}) do |(key, value), hash|
-          hash[key] = data_to_hash(value)
-        end
-      when Array then obj.collect { |value| data_to_hash(value) }
-      when IO, StringIO then obj.read
-      when Smithy::Schema::Union then obj.to_h
-      else obj
-      end
-    end
-
 <% all_operation_tests.each do |operation_tests| -%>
     describe '#<%= operation_tests.name %>' do
 <% unless operation_tests.request_tests.empty? -%>

gems/smithy/lib/smithy/templates/client/spec_helper.erb

@@ -5,4 +5,6 @@
 $LOAD_PATH.unshift(File.expand_path('../lib', __dir__))
 
 require '<%= gem_name %>'
+
 require 'rspec'
+require 'smithy-client/protocol_spec_matcher'

gems/smithy/lib/smithy/views/client/protocol_spec.rb

@@ -10,11 +10,12 @@ class ProtocolSpec < View
         def initialize(plan)
           @plan = plan
           @model = plan.model
-          @all_operation_tests = Model::ServiceIndex
-                                 .new(@model)
-                                 .operations_for(@plan.service)
-                                 .map { |id, o| OperationTests.new(@model, id, o) }
-                                 .reject(&:empty?)
+          @all_operation_tests =
+            Model::ServiceIndex
+            .new(@model)
+            .operations_for(@plan.service)
+            .map { |id, o| OperationTests.new(@model, id, o) }
+            .reject(&:empty?)
           super()
         end
 
@@ -120,7 +121,7 @@ def additional_requires
               requires +=
                 case test_case['bodyMediaType']
                 when 'application/cbor'
-                  %w[base64 cbor_value_matcher]
+                  %w[base64]
                 when 'application/json'
                   %w[json]
                 else
@@ -162,7 +163,7 @@ def body_expect
             case test_case['bodyMediaType']
             when 'application/cbor'
               'expect(Smithy::CBOR.decode(request.body.read)).' \
-              "to match_cbor(Smithy::CBOR.decode(::Base64.decode64('#{test_case['body']}')))"
+              "to match_data(Smithy::CBOR.decode(::Base64.decode64('#{test_case['body']}')))"
             when 'application/json'
               "expect(JSON.parse(request.body.read)).to eq(JSON.parse('#{test_case['body']}'))"
             else
@@ -196,12 +197,7 @@ def stub_body
           end
 
           def data_expect
-            case test_case['bodyMediaType']
-            when 'application/cbor'
-              "expect(output.data.to_h).to match_cbor(#{params})"
-            else
-              "expect(data_to_hash(output.data)).to eq(#{params})"
-            end
+            "expect(output.data.to_h).to match_data(#{params})"
           end
 
           def streaming_member
@@ -229,12 +225,7 @@ def params
           end
 
           def data_expect
-            case test_case['bodyMediaType']
-            when 'application/cbor'
-              "expect(e.data.to_h).to match_cbor(#{params})"
-            else
-              "expect(data_to_hash(e.data)).to eq(#{params})"
-            end
+            "expect(e.data.to_h).to match_data(#{params})"
           end
         end
       end

projections/shapes/spec/shapes/protocol_spec.rb

@@ -8,24 +8,5 @@ module ShapeService
     let(:client_options) { { stub_responses: true } }
     let(:client) { Client.new(client_options) }
 
-    # temporary
-    def data_to_hash(obj)
-      case obj
-      when Struct
-        obj.members.each.with_object({}) do |member, hash|
-          value = obj[member]
-          hash[member] = data_to_hash(value) unless value.nil?
-        end
-      when Hash
-        obj.each.with_object({}) do |(key, value), hash|
-          hash[key] = data_to_hash(value)
-        end
-      when Array then obj.collect { |value| data_to_hash(value) }
-      when IO, StringIO then obj.read
-      when Smithy::Schema::Union then obj.to_h
-      else obj
-      end
-    end
-
   end
 end

projections/shapes/spec/spec_helper.rb

@@ -5,4 +5,6 @@
 $LOAD_PATH.unshift(File.expand_path('../lib', __dir__))
 
 require 'shapes'
+
 require 'rspec'
+require 'smithy-client/protocol_spec_matcher'

projections/weather/spec/spec_helper.rb

@@ -5,4 +5,6 @@
 $LOAD_PATH.unshift(File.expand_path('../lib', __dir__))
 
 require 'weather'
+
 require 'rspec'
+require 'smithy-client/protocol_spec_matcher'

projections/weather/spec/weather/protocol_spec.rb

@@ -8,24 +8,5 @@ module Weather
     let(:client_options) { { stub_responses: true } }
     let(:client) { Client.new(client_options) }
 
-    # temporary
-    def data_to_hash(obj)
-      case obj
-      when Struct
-        obj.members.each.with_object({}) do |member, hash|
-          value = obj[member]
-          hash[member] = data_to_hash(value) unless value.nil?
-        end
-      when Hash
-        obj.each.with_object({}) do |(key, value), hash|
-          hash[key] = data_to_hash(value)
-        end
-      when Array then obj.collect { |value| data_to_hash(value) }
-      when IO, StringIO then obj.read
-      when Smithy::Schema::Union then obj.to_h
-      else obj
-      end
-    end
-
   end
 end