killbill-notification-test 1.9.1 → 1.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 95cd868a5ca6bc75ce0d72d30b05e84fb9864c63
-  data.tar.gz: 17a2d54a9fbca47c303b4bb76730f2b445305fa5
+  metadata.gz: b0db53e3909623cdf3274547e58608289005d1d5
+  data.tar.gz: 22b6a208a5a0804e834143c7e455f084d1677fce
 SHA512:
-  metadata.gz: 42890700aa8e022138dd3928be0dc6f0af02258d8f7cb9c7705abeb4d86246d9ac85e706272f3e05f209998311967d6853fec7ee521cb1bc9e3255eb64ee56b7
-  data.tar.gz: 92d7c5baeb5150e70ae4384f844f89177029eb6678359ae2e46133b3d0b8898eeb7ee621a06078565a875acca4c2499966ef883e4f7cff54001d58b1318e63fa
+  metadata.gz: c84fe0b6dc580e16b69b765224b5cbcafb687a11c2bc6a0b61cde2c248054bb93b70601681b6ac207c42b91fccc0d6ff30d9b45d129129f564ce5396006cc213
+  data.tar.gz: 7d3b00f30338ca4bbd18201f492537563e7dbb5451b26de74822c471008e5dcdc220fa1489b9afe5e0eb4086b4c6648375e1f19ce67dffc6133db35cb8081791

data/Jarfile

@@ -1,6 +1,8 @@
-jar 'org.kill-bill.billing:killbill-api', '0.9.5'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-notification', '0.7.2'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-payment', '0.7.2'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-currency', '0.7.2'
-jar 'org.kill-bill.billing:killbill-util:tests', '0.11.2'
+jar 'org.kill-bill.billing:killbill-api', '0.9.6'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-notification', '0.7.4'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-payment', '0.7.4'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-currency', '0.7.4'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-retry', '0.7.4'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-invoice', '0.7.4'
+jar 'org.kill-bill.billing:killbill-util:tests', '0.11.3'
 jar 'javax.servlet:javax.servlet-api', '3.0.1'

data/VERSION

@@ -1 +1 @@
-1.9.1
+1.9.2

data/killbill-notification-test.gemspec

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

data/lib/notification_test/api.rb

@@ -1,86 +1,26 @@
-require 'date'
-
-require 'killbill'
-require 'killbill/notification'
-
-=begin
-class Killbill::Plugin::Model::ExtBusEvent
-  def to_s
-    "type = #{@event_type}, object_type = #{@object_type} : object_id = #{@object_id}, account_id = #{@account_id}, tenant_id = #{@tenant_id}"
-  end
-end
-=end
-
-
 module NotificationTest
   class NotificationPlugin < Killbill::Plugin::Notification
 
-
-    def start_plugin
-      super
-    end
-
-    def initialize(*args)
-      super(*args)
-      @tag_definition = nil
-    end
-
     def on_event(event)
-
-      print "ENTER #{event.to_s}, class = #{event.class}"
-
       if event.event_type == :ACCOUNT_CREATION
-        #
-        # Retrieve account and update email
-        #
-        print "before get_account_by_id..."
-        account = @kb_apis.account_user_api.get_account_by_id(event.object_id, @kb_apis.create_context)
-
-        print "before update account..."
-        updated_account = Killbill::Plugin::Model::Account.new
-        updated_account.id=account.id
-        updated_account.email="plugintest@plugin.com"
-        @kb_apis.account_user_api.update_account(updated_account, @kb_apis.create_context)
-
-        print "before tag definition creation..."
-        @tag_definition = @kb_apis.tag_user_api.create_tag_definition("NotificationPlugin", "Tag for test NotificationTest", @kb_apis.create_context)
-
-        print "before tag creation... #{@tag_definition.inspect}"
-        @kb_apis.tag_user_api.add_tag(event.account_id, :ACCOUNT, @tag_definition.id, @kb_apis.create_context)
-
+        write_event :TAG_CREATION, :ACCOUNT, event.object_id, event.account_id, event.tenant_id
       elsif event.event_type == :ACCOUNT_CHANGE
-
-        #
-        # Verify new email
-        #
-        print "before get_account_by_id..."
-        account = @kb_apis.account_user_api.get_account_by_id(event.object_id, @kb_apis.create_context)
-        validate(account.email, "plugintest@plugin.com")
-
-
-      elsif event.event_type == :SUBSCRIPTION_CREATION
-      elsif event.event_type == :INVOICE_CREATION
-      elsif event.event_type == :SUBSCRIPTION_CANCEL
-      elsif event.event_type == :PAYMENT_SUCCESS
-      elsif event.event_type == :TAG_CREATION
-
-        print "before getTagsForAccount.."
-        tags = @kb_apis.tag_user_api.get_tags_for_account(event.account_id, @kb_apis.create_context)
-        validate(tags.size, 1)
-        validate(tags.get(0).tag_definition_id, @tag_definition)
+        write_event :TAG_DELETION, :ACCOUNT, event.object_id, event.account_id, event.tenant_id
+      else
+        @logger.warn "Unexpected event type #{event.event_type} for object #{event.object_type}"
+        # Error: unexpected event. Notify the test by sending a bogus event
+        write_event :SUBSCRIPTION_UNCANCEL, :SUBSCRIPTION, 'f2e50cd0-faec-11e3-a3ac-0800200c9a66', 'f2e50cd0-faec-11e3-a3ac-0800200c9a66', 'f2e50cd0-faec-11e3-a3ac-0800200c9a66'
       end
-
-      print "EXIT #{event.to_s}"
-
     end
 
-    def validate(value, expected)
-      print "VALIDATION Got #{value} : expected #{expected}"
-    end
+    private
+
+    def write_event(event_type, object_type, object_id, account_id, tenant_id)
+      file_name = "/var/tmp/killbill-notification-test.txt"
+      content   = "#{event_type}-#{object_type}-#{object_id}-#{account_id}-#{tenant_id}"
 
-    def print(msg)
-      puts "*******************************************       NotificationTestPlugin #{msg}"
-      $stdout.flush
+      # Append the content to make sure we fail in case we receive multiple events
+      File.open(file_name, 'a') { |f| f.puts content }
     end
   end
 end

data/lib/notification_test.rb

@@ -1,2 +1,2 @@
-
+require 'killbill'
 require 'notification_test/api'

data/pom.xml

@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 ~ Copyright 2010-2013 Ning, Inc.
+~ Copyright 2014 Groupon, Inc
+~ Copyright 2014 The Billing Project, LLC
 ~
 ~  Ning licenses this file to you under the Apache License, version 2.0
 ~  (the "License"); you may not use this file except in compliance with the
@@ -25,7 +27,7 @@
     <groupId>org.kill-bill.billing.plugin.ruby</groupId>
     <artifactId>notification-test-plugin</artifactId>
     <packaging>pom</packaging>
-    <version>1.9.1</version>
+    <version>1.9.2</version>
     <name>notification-test-plugin</name>
     <description></description>
     <scm>

data/spec/notification_test/base_plugin_spec.rb

@@ -1,56 +1,23 @@
 require 'spec_helper'
 require 'logger'
-require 'tempfile'
 
 require 'notification_test'
 
-class FakeJavaUserAccountApi
-  # Returns an account where we specify the currency for the report group
-  def get_account_by_id(id, context)
-    account = Killbill::Plugin::Model::Account.new
-    account.id=id
-    account
-  end
-
-  def update_account(updated_account, context)
-  end
-end
-
-class FakeTagUserApi
-  def add_tag(account_id, object_type, tag_definition_id, context)
-  end
-
-  def create_tag_definition(type, desc, context)
-  end
-
-  def get_tags_for_account(account_id, context)
-  end
-
-end
-
-
 describe NotificationTest::NotificationPlugin do
-  before(:each) do
 
-    svcs = {:account_user_api =>  FakeJavaUserAccountApi.new,
-            :tag_user_api => FakeTagUserApi.new }
-    
-    kb_apis = Killbill::Plugin::KillbillApi.new("foo", svcs)
+  before(:each) do
+    kb_apis = Killbill::Plugin::KillbillApi.new("killbill-notification-test", {})
 
-    @plugin = NotificationTest::NotificationPlugin.new
-    @plugin.logger = Logger.new(STDOUT)
+    @plugin         = NotificationTest::NotificationPlugin.new
+    @plugin.logger  = Logger.new(STDOUT)
     @plugin.kb_apis = kb_apis
 
-    account_id = "a86ed6d4-c0bd-4a44-b49a-5ec29c3b314a"
-    object_id = "9f73c8e9-188a-4603-a3ba-2ce684411fb9"
-    event_type = "INVOICE_CREATION"
-    object_type = "INVOICE"
-    tenant_id = "b86fd6d4-c0bd-4a44-b49a-5ec29c3b3765"
-    @kb_event = Killbill::Plugin::Model::ExtBusEvent.new
-    @kb_event.event_type=event_type
-    @kb_event.object_type=object_type
-    @kb_event.account_id=account_id
-    @kb_event.tenant_id=tenant_id
+    @kb_event             = Killbill::Plugin::Model::ExtBusEvent.new
+    @kb_event.event_type  = :INVOICE_CREATION
+    @kb_event.object_type = :INVOICE
+    @kb_event.object_id   = "9f73c8e9-188a-4603-a3ba-2ce684411fb9"
+    @kb_event.account_id  = "a86ed6d4-c0bd-4a44-b49a-5ec29c3b314a"
+    @kb_event.tenant_id   = "b86fd6d4-c0bd-4a44-b49a-5ec29c3b3765"
   end
 
   it "should start and stop correctly" do
@@ -58,8 +25,13 @@ describe NotificationTest::NotificationPlugin do
     @plugin.stop_plugin
   end
 
-  it "should should test charge" do
+  it "should should test receiving an event" do
+    file_name = '/var/tmp/killbill-notification-test.txt'
+
     output = @plugin.on_event(@kb_event)
-  end
+    output.should be_nil
 
+    File.file?(file_name).should be_true
+    File.delete file_name
+  end
 end

data/spec/spec_helper.rb

@@ -8,9 +8,3 @@ RSpec.configure do |config|
   config.tty = true
   config.formatter = 'documentation'
 end
-
-class Object
-  def blank?
-    respond_to?(:empty?) ? empty? : !self
-  end
-end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: killbill-notification-test
 version: !ruby/object:Gem::Version
-  version: 1.9.1
+  version: 1.9.2
 platform: ruby
 authors:
 - Killbill core team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-04-28 00:00:00.000000000 Z
+date: 2014-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: killbill
@@ -16,12 +16,12 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.1.1
+        version: 3.1.4
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.1.1
+        version: 3.1.4
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency