killbill-payment-test 1.0.9 → 1.1.0

data/Jarfile

@@ -1,3 +1,5 @@
-jar 'com.ning.billing:killbill-api', '0.1.80'
-jar 'com.ning.billing:killbill-util:tests', '0.1.80'
+jar 'com.ning.billing:killbill-api', '0.3.0'
+jar 'com.ning.billing.plugin:killbill-plugin-api-notification', '0.2.4'
+jar 'com.ning.billing.plugin:killbill-plugin-api-payment', '0.2.4'
+jar 'com.ning.billing:killbill-util:tests', '0.2.6-SNAPSHOT'
 jar 'javax.servlet:javax.servlet-api', '3.0.1'

data/VERSION

@@ -1 +1 @@
-1.0.9
+1.1.0

data/killbill-payment-test.gemspec

@@ -22,8 +22,7 @@ Gem::Specification.new do |s|
 
   s.rdoc_options << '--exclude' << '.'
 
-  s.add_dependency 'killbill', '~> 1.0.19'
-  s.add_dependency 'sinatra', '~> 1.3.4'
+  s.add_dependency 'killbill', '~> 1.1.2'
 
   s.add_development_dependency 'jbundler', '~> 0.4.1'
   s.add_development_dependency 'rake', '>= 10.0.0'

data/lib/payment_test/api.rb

@@ -10,31 +10,58 @@ module PaymentTest
       super
     end
 
-    def initialize(*args)
+    def initialize()
       @raise_exception = false
-      super(*args)
+      super()
     end
 
     def get_name
     end
 
-    def process_payment(kb_account_id, kb_payment_id, kb_payment_method_id, amount_in_cents, currency, call_context, options = {})
+    def process_payment(kb_account_id, kb_payment_id, kb_payment_method_id, amount, currency, call_context, options = {})
       # Make an API call from the payment call
-      account = @kb_apis.get_account_by_id(kb_account_id)
-      puts "process_payment got ACCOUNT #{account.inspect}"
-      Killbill::Plugin::Model::PaymentInfoPlugin.new(amount_in_cents, DateTime.now, DateTime.now, Killbill::Plugin::Model::PaymentPluginStatus.new(:PROCESSED), "gateway_error", "gateway_error_code", nil, nil)
+      account = @kb_apis.account_user_api.get_account_by_id(kb_account_id, @kb_apis.create_context)
+      res = Killbill::Plugin::Model::PaymentInfoPlugin.new
+      res.amount= amount
+      res.created_date= DateTime.now
+      res.effective_date= DateTime.now
+      res.status=:PROCESSED
+      res.gateway_error="gateway_error"
+      res.gateway_error_code="gateway_error_code"
+      res
     end
 
     def get_payment_info(kb_account_id, kb_payment_id, tenant_context, options = {})
-        Killbill::Plugin::Model::PaymentInfoPlugin.new(0, DateTime.now, DateTime.now, Killbill::Plugin::Model::PaymentPluginStatus.new(:PROCESSED), "gateway_error", "gateway_error_code", nil, nil)
+        res = Killbill::Plugin::Model::PaymentInfoPlugin.new
+        res.amount= 0
+        res.created_date= DateTime.now
+        res.effective_date= DateTime.now
+        res.status=:PROCESSED
+        res.gateway_error="gateway_error"
+        res.gateway_error_code="gateway_error_code"
+        res
     end
 
-    def process_refund(kb_account_id, kb_payment_id, amount_in_cents, currency, call_context, options = {})
-      Killbill::Plugin::Model::RefundInfoPlugin.new(amount_in_cents, DateTime.now, DateTime.now, Killbill::Plugin::Model::RefundPluginStatus.new(:PROCESSED), "gateway_error", "gateway_error_code", nil)
+    def process_refund(kb_account_id, kb_payment_id, amount, currency, call_context, options = {})
+      res = Killbill::Plugin::Model::RefundInfoPlugin.new
+      res.amount= amount
+      res.created_date= DateTime.now
+      res.effective_date=DateTime.now
+      res.status=:PROCESSED
+      res.gateway_error="gateway_error"
+      res.gateway_error_code="gateway_error_code"
+      res
     end
 
     def get_refund_info(kb_account_id, kb_payment_id, tenant_context, options = {})
-      Killbill::Plugin::Model::RefundInfoPlugin.new(amount_in_cents, DateTime.now, DateTime.now, illbill::Plugin::Model::RefundPluginStatus.new(:PROCESSED), "gateway_error", "gateway_error_code", nil)
+      res = Killbill::Plugin::Model::RefundInfoPlugin.new
+      res.amount= 0
+      res.created_date= DateTime.now
+      res.effective_date=DateTime.now
+      res.status=:PROCESSED
+      res.gateway_error="gateway_error"
+      res.gateway_error_code="gateway_error_code"
+      res
     end
 
     def add_payment_method(kb_account_id, kb_payment_method_id, payment_method_props, set_default, call_context, options = {})
@@ -45,14 +72,43 @@ module PaymentTest
     end
 
     def get_payment_method_detail(kb_account_id, kb_payment_method_id, tenant_context, options = {})
-      Killbill::Plugin::Model::PaymentMethodPlugin.new("external_payment_method_id", false, [], nil, "Test", "cc_name", "cc_type", "cc_expiration_month", "cc_expiration_year", "cc_last4", "address1", "address2", "city", "state", "zip", "country")
+      res = Killbill::Plugin::Model::PaymentMethodPlugin.new
+      res.external_payment_method_id="external_payment_method_id"
+      res.is_default_payment_method=true
+      res.type="Test"
+      res.cc_name="cc_name"
+      res.cc_expiration_month="cc_expiration_month"
+      res.cc_expiration_year="cc_expiration_year"
+      res.cc_last4="cc_last4"
+      res.address1="address1"
+      res.address2="address2"
+      res.city="city"
+      res.state="state"
+      res.zip="zip"
+      res.country="country"
+      properties = []
+      prop1 =  Killbill::Plugin::Model::PaymentMethodKVInfo.new
+      prop1.key = "key1"
+      prop1.value = "value1"
+      properties << prop1
+      prop2 =  Killbill::Plugin::Model::PaymentMethodKVInfo.new
+      prop2.key = "key2"
+      prop2.value = "value2"
+      properties << prop2
+      res.properties=properties
+      res
     end
 
     def set_default_payment_method(kb_account_id, kb_payment_method_id, call_context, options = {})
     end
 
     def get_payment_methods(kb_account_id, refresh_from_gateway, call_context, options = {})
-      [Killbill::Plugin::Model::PaymentMethodInfoPlugin.new(kb_account_id, kb_account_id, false, "external_payment_method_id")]
+      res = Killbill::Plugin::Model::PaymentMethodInfoPlugin.new
+      res.account_id=kb_account_id
+      res.payment_method_id=kb_account_id
+      res.is_default=true
+      res.external_payment_method_id="external_payment_method_id"
+      [res]
     end
 
     def reset_payment_methods(kb_account_id, payment_methods)

data/spec/payment_test/base_plugin_spec.rb

@@ -6,22 +6,23 @@ require 'killbill'
 
 require 'payment_test'
 
-class KillbillApiWithFakeGetAccountById < Killbill::Plugin::KillbillApi
-  def initialize(japi_proxy)
-    super(japi_proxy)
-  end
+class FakeJavaUserAccountApi
 
   # Returns an account where we specify the currency for the report group
-  def get_account_by_id(id)
-    Killbill::Plugin::Model::Account.new(id, nil, nil, nil, nil, nil, 1, nil, 1, 'USD', nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, false, true)
+  def get_account_by_id(id, context)
+    account = Killbill::Plugin::Model::Account.new
+    account.id=id
+    account
   end
 end
 
 describe PaymentTest::PaymentPlugin do
   before(:each) do
+    svcs = {:account_user_api =>  FakeJavaUserAccountApi.new}
+    kb_apis = Killbill::Plugin::KillbillApi.new("foo", svcs)
     @plugin = PaymentTest::PaymentPlugin.new
     @plugin.logger = Logger.new(STDOUT)
-    @plugin.kb_apis = KillbillApiWithFakeGetAccountById.new(nil)
+    @plugin.kb_apis = kb_apis
 
     @kb_account_id = "a86ed6d4-c0bd-4a44-b49a-5ec29c3b314a"
     @kb_payment_id = "9f73c8e9-188a-4603-a3ba-2ce684411fb9"
@@ -41,7 +42,7 @@ describe PaymentTest::PaymentPlugin do
 
     output.should be_an_instance_of Killbill::Plugin::Model::PaymentInfoPlugin
     output.amount.should == @amount_in_cents
-    output.status.should == Killbill::Plugin::Model::PaymentPluginStatus.new(:PROCESSED)
+    output.status.to_s.should == "PROCESSED"
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: killbill-payment-test
 version: !ruby/object:Gem::Version
-  version: 1.0.9
+  version: 1.1.0
   prerelease:
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-06-03 00:00:00.000000000 Z
+date: 2013-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: killbill
@@ -17,29 +17,13 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.19
+        version: 1.1.2
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.19
-    none: false
-  prerelease: false
-  type: :runtime
-- !ruby/object:Gem::Dependency
-  name: sinatra
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.3.4
-    none: false
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.3.4
+        version: 1.1.2
     none: false
   prerelease: false
   type: :runtime