killbill-payment-test 3.2.0 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a664c1965053965e7f01b9d7976c1e7493b17d51
-  data.tar.gz: 93113c6b15ebf46346d4dd269dbbdb368cdff21e
+  metadata.gz: 7372b10969f7c4de8f1d65a4f43e0b47ff43b715
+  data.tar.gz: 3f4c20f14d7f01fa72beb56bb9f129f8e1938b0d
 SHA512:
-  metadata.gz: 7773e5935ac7985b3441ca8831e691879d53cc124ba7b98fcba76a02fd4499cd4119a34bb02eed627074fd5062f34e7b05428a41be08e43404702dfa4e58ebbc
-  data.tar.gz: 016b3d90189fd4ff93deb6d9f81fa61e4b86529024ac23055a5d725ddf2e7b7af7386a023145dab4fc80e28618e8762ebbf4a228568860aca590030f57ccc27e
+  metadata.gz: 7f0779f9964563294be903d42627de18f7a506cdfd8a0b448d894870be4ca99643367b9195217dbfe11efc731276ad7e6ecde37fc4ca708f1c4c25380d0be179
+  data.tar.gz: 78f9fb8821ca938a0d0f0e07474cb47342110b421688104ef211824f46cc4f8d142d08836fe8aacf9faa3641cf171311cefed5a5fc7e9905a25a93522e6d8b5d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    killbill-payment-test (3.2.0)
+    killbill-payment-test (3.3.0)
       actionpack (~> 4.1.0)
       actionview (~> 4.1.0)
       activemerchant (~> 1.53.0)

data/Jarfile.lock

@@ -8,9 +8,9 @@
 - org.kill-bill.billing.plugin:killbill-plugin-api-notification:jar:0.18
 - commons-beanutils:commons-beanutils:jar:1.8.3
 - org.kill-bill.billing:killbill-internal-api:jar:0.15.10
+- com.google.inject:guice:jar:3.0
 - org.kill-bill.commons:killbill-xmlloader:jar:0.11
 - org.kill-bill.billing.plugin:killbill-plugin-api-entitlement:jar:0.18
-- com.google.inject:guice:jar:3.0
 - org.osgi:org.osgi.core:jar:5.0.0
 - org.slf4j:slf4j-api:jar:1.7.12
 - com.samskivert:jmustache:jar:1.5
@@ -50,14 +50,14 @@
 - org.kill-bill.commons:killbill-locker:jar:0.11
 - org.osgi:org.osgi.compendium:jar:5.0.0
 - org.kill-bill.commons:killbill-queue:jar:0.11
-- org.kill-bill.commons:killbill-concurrent:jar:0.11
 - javax.servlet:javax.servlet-api:jar:3.1.0
+- org.kill-bill.commons:killbill-concurrent:jar:0.11
 - org.apache.shiro:shiro-ehcache:jar:1.2.3
 - javax.inject:javax.inject:jar:1
 - com.fasterxml.jackson.datatype:jackson-datatype-joda:jar:2.4.3
 - com.google.inject.extensions:guice-multibindings:jar:3.0
 - net.sf.ehcache:ehcache:jar:2.9.1
-- org.kill-bill.billing.plugin:killbill-plugin-api-invoice:jar:0.18
 - org.kill-bill.billing:killbill-api:jar:0.32
+- org.kill-bill.billing.plugin:killbill-plugin-api-invoice:jar:0.18
 - org.apache.shiro:shiro-guice:jar:1.2.3
 - com.google.code.findbugs:annotations:jar:3.0.0

data/README.md

@@ -17,6 +17,7 @@ When using payment api, one can provide payment plugin properties to enable fail
 
 In that mode, the property `TEST_MODE` must be set to something different than `BEATRIX` (any other string would work. In addition the following properties are allowed:
 
+* `ACTION_RETURN_PLUGIN_STATUS_ERROR`=true : This will make the plugin return a `PaymentPluginStatus.ERROR` on each payment call (e.g to simulate Insuficient Fund type of errors).
 * `THROW_EXCEPTION`=true : This will make the plugin throw RuntimeException exception on each call
 * `RETURN_NIL`=true : This will make the plugin return a nil value on each call
 * `SLEEP_TIME_SEC`=sleep_time_sec : This will make the plugin sleep `sleep_time_sec` on each call
@@ -35,7 +36,7 @@ The json body for the call supports the following:
 
 Examples:
 
-This will confgure the plugin th throw exception on each `purchase_payment` call:
+This will confgure the plugin to return an payment error on each `purchase_payment` call (note that the name of the methods come from the definition of the [payment plugin api](https://github.com/killbill/killbill-plugin-api/blob/master/payment/src/main/java/org/killbill/billing/payment/plugin/api/PaymentPluginApi.java):
 
 ```
 curl -v \
@@ -45,7 +46,7 @@ curl -v \
 -H "Content-Type: application/json" \
 -H 'X-Killbill-CreatedBy: stephane' \
 -X POST \
---data-binary '{"CONFIGURE_ACTION":"ACTION_THROW_EXCEPTION", "METHODS":"purchase_payment"}' \
+--data-binary '{"CONFIGURE_ACTION":"ACTION_RETURN_PLUGIN_STATUS_ERROR", "METHODS":"purchase_payment"}' \
  -v 'http://127.0.0.1:8080/plugins/killbill-payment-test/configure'
 ```
 

data/VERSION

@@ -1 +1 @@
-3.2.0
+3.3.0

data/lib/payment_test/api.rb

@@ -43,6 +43,7 @@ module PaymentTest
 
     def method_missing(method, *args, &block)
       # properties is always the second last argument right before context
+      args[args.length - 2] = [] if args[args.length - 2].nil?
       properties = args[args.length - 2]
 
       # Let's be cautious..
@@ -62,6 +63,10 @@ module PaymentTest
         # Check if we need to sleep
         @api_control.sleep_if_required(properties, @state.sleep_time_sec(method))
 
+        if @state.always_return_plugin_status_error(method)
+          PluginPropertyUtils.add_property_if_not_exist(properties, 'TRANSACTION_STATUS', 'ERROR')
+        end
+
         # Finally make the call
         @api_control.send method, *args
       end

data/lib/payment_test/application.rb

@@ -26,11 +26,13 @@ post '/plugins/killbill-payment-test/configure', :provides => 'json' do
 
   action = data['CONFIGURE_ACTION']
   if action.nil?
-    halt 400, {'Content-Type' => 'text/plain'}, "Invalid json, need to specify one CONFIGURE_ACTION={ACTION_THROW_EXCEPTION|ACTION_RETURN_NIL|ACTION_SLEEP|ACTION_RESET}"
+    halt 400, {'Content-Type' => 'text/plain'}, "Invalid json, need to specify one CONFIGURE_ACTION={ACTION_RETURN_PLUGIN_STATUS_ERROR|ACTION_THROW_EXCEPTION|ACTION_RETURN_NIL|ACTION_SLEEP|ACTION_RESET}"
   end
 
 
-  if action == 'ACTION_THROW_EXCEPTION'
+  if action == 'ACTION_RETURN_PLUGIN_STATUS_ERROR'
+    state.configure_always_return_plugin_status_error(data['METHODS'])
+  elsif action == 'ACTION_THROW_EXCEPTION'
     state.configure_always_throw(data['METHODS'])
   elsif action == 'ACTION_RETURN_NIL'
     state.configure_return_nil(data['METHODS'])

data/lib/payment_test/plugin_property_utils.rb

@@ -10,6 +10,15 @@ module PaymentTest
       test_props.size == 1 ? test_props[0] : nil
     end
 
+    def self.add_property_if_not_exist(properties, key_name, key_value)
+      if get_property_or_nil(properties, key_name).nil?
+        prop = Killbill::Plugin::Model::PluginProperty.new
+        prop.key = key_name
+        prop.value = key_value
+        properties << prop
+      end
+    end
+
     def self.validate_properties(properties)
       if properties.nil?
         return

data/lib/payment_test/state.rb

@@ -9,25 +9,37 @@ module PaymentTest
       reset_configuration
     end
 
+    def configure_always_return_plugin_status_error(methods=nil)
+      reset_configuration
+      configure_methods(methods)
+      @always_return_plugin_status_error = true
+      log_current_state
+    end
+
+
     def configure_always_throw(methods=nil)
+      reset_configuration
       configure_methods(methods)
       @always_throw = true
       log_current_state
     end
 
     def configure_return_nil(methods=nil)
+      reset_configuration
       configure_methods(methods)
       @always_return_nil = true
       log_current_state
     end
 
     def configure_sleep_time(sleep_time_sec, methods=nil)
+      reset_configuration
       configure_methods(methods)
       @sleep_time_sec = sleep_time_sec
       log_current_state
     end
 
     def reset_configuration
+      @always_return_plugin_status_error = false
       @always_throw = false
       @always_return_nil = false
       @sleep_time_sec = nil
@@ -35,6 +47,10 @@ module PaymentTest
       log_current_state
     end
 
+    def always_return_plugin_status_error(method)
+      @always_return_plugin_status_error && is_for_method(method)
+    end
+
     def always_throw(method)
       @always_throw && is_for_method(method)
     end
@@ -49,11 +65,11 @@ module PaymentTest
     end
 
     def is_clear
-      return !@always_throw && !@always_return_nil && @sleep_time_sec.nil?
+      return !@always_return_plugin_status_error && !@always_throw && !@always_return_nil && @sleep_time_sec.nil?
     end
 
     def log_current_state
-      puts "PaymentTest:State : @always_throw = #{@always_throw}, @always_return_nil = #{@always_return_nil}, @sleep_time_sec = #{@sleep_time_sec}, @methods=#{@methods}"
+      puts "PaymentTest:State : @always_return_plugin_status_error = #{@always_return_plugin_status_error}, @always_throw = #{@always_throw}, @always_return_nil = #{@always_return_nil}, @sleep_time_sec = #{@sleep_time_sec}, @methods=#{@methods}"
     end
 
     private

data/pom.xml

@@ -27,7 +27,7 @@
     <groupId>org.kill-bill.billing.plugin.ruby</groupId>
     <artifactId>payment-test-plugin</artifactId>
     <packaging>pom</packaging>
-    <version>3.1.0</version>
+    <version>3.3.0</version>
     <name>payment-test-plugin</name>
     <description></description>
     <scm>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: killbill-payment-test
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.3.0
 platform: ruby
 authors:
 - Kill Bill core team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-12-29 00:00:00.000000000 Z
+date: 2015-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: killbill