killbill-invoice-test 0.0.1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 82d0509829e577cbfbd6c4401e163dff33bf1e17
-  data.tar.gz: b6301771772e158094e2dd8ac59a58c0e962a8ca
+  metadata.gz: 69342817536c8fa5f97ca6ad306b9647fd6d8e73
+  data.tar.gz: c1237c86065acf28c511399965d5df9fc4dcad15
 SHA512:
-  metadata.gz: b7ab718467e72483c7bfacc4738d8a29b534399145b6deebfe70e5c7909b20869a2e66b983a076241883de7e209dc4978e1605034d7b77cab510a396fbe18990
-  data.tar.gz: 082962826a8c3a170ea286bf119dda3c4d06cba43b420a0a18a1cd431e6f132f8943dab2cfa109b42427a24aded00d23dc2b0fb1980947115425cd1b320d128c
+  metadata.gz: 9c29537778615c408665592664596e29e1b27e07fd74767335667df5ac7aa19d74f6a00e232c298d8a6f2d5351e7ab153be4b48cd734eb14708c0441a2ec21cd
+  data.tar.gz: d772ecb21c95d3f6acad82dfa7c22e187dc79048ae6a92d21b2276487d2c580722dbe03cb108ffff5ee543195a0bc141c37b9aaf17a4df38a0433ad1284641d1

data/.gitignore

@@ -1,8 +1,8 @@
 *.gem
 *.rbc
+*.swp
 .bundle
 .config
-.idea
 coverage
 InstalledFiles
 lib/bundler/man
@@ -12,17 +12,22 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
-build
+
 # YARD artifacts
 .yardoc
 _yardoc
 doc/
 
 .jbundler
-Jarfile.lock
-Gemfile.lock
-*.swp
-killbill-invoice-test
 
 .DS_Store
+
+# Testing database
+test.db
+
+target
 pom.xml.asc
+
+.idea/
+
+Gemfile.head.lock

data/.travis.yml

@@ -1,19 +1,41 @@
 language: ruby
 
+sudo: false
+cache: bundler
+
+before_script:
+  - bundle exec jbundle install
+
+script: 'bundle exec rake spec'
+
 notifications:
   email:
     - kill-bill-commits@googlegroups.com
 
+env:
+  global:
+    - JRUBY_OPTS='-J-Xmx1024M'
+
 rvm:
-  - jruby-19mode
-  - jruby-20mode
+  - jruby-1.7.20
+  - jruby-20mode # latest 1.7.x
   - jruby-head
 
+gemfile:
+  - Gemfile
+  - Gemfile.head
+
 jdk:
-  - openjdk6
   - openjdk7
   - oraclejdk7
+  - oraclejdk8
 
 matrix:
   allow_failures:
     - rvm: jruby-head
+    - jdk: oraclejdk8
+    - gemfile: Gemfile.head
+  fast_finish: true
+
+after_success:
+  - '[ "${TRAVIS_PULL_REQUEST}" = "false" ] && echo "<settings><servers><server><id>sonatype-nexus-snapshots</id><username>\${env.OSSRH_USER}</username><password>\${env.OSSRH_PASS}</password></server></servers></settings>" > ~/settings.xml && MVN="mvn --settings $HOME/settings.xml" NO_RELEASE=1 travis_retry travis_wait bash release.sh | egrep -v "Download|Install|Upload" ; rm -f ~/settings.xml'

data/Gemfile

@@ -1,5 +1,3 @@
-source "http://rubygems.org"
+source 'https://rubygems.org'
 
 gemspec
-
-#gem 'killbill', :path => '../killbill-plugin-framework-ruby'

data/Gemfile.lock

@@ -0,0 +1,78 @@
+PATH
+  remote: .
+  specs:
+    killbill-invoice-test (0.1.0)
+      killbill (~> 7.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    axiom-types (0.1.1)
+      descendants_tracker (~> 0.0.4)
+      ice_nine (~> 0.11.0)
+      thread_safe (~> 0.3, >= 0.3.1)
+    coercible (1.0.0)
+      descendants_tracker (~> 0.0.1)
+    descendants_tracker (0.0.4)
+      thread_safe (~> 0.3, >= 0.3.1)
+    diff-lcs (1.1.3)
+    equalizer (0.0.11)
+    ethon (0.8.0)
+      ffi (>= 1.3.0)
+    ffi (1.9.10-java)
+    ice_nine (0.11.1)
+    jar-dependencies (0.3.1)
+    jbundler (0.9.2)
+      bundler (~> 1.5)
+      jar-dependencies (~> 0.2)
+      maven-tools (~> 1.0.10)
+      ruby-maven (~> 3.3, >= 3.3.3)
+    killbill (7.0.0)
+      rack (>= 1.5.2)
+      sinatra (~> 1.3.4)
+      typhoeus (~> 0.6.9)
+      tzinfo (~> 1.2.0)
+    maven-tools (1.0.13)
+      virtus (~> 1.0)
+    rack (1.6.4)
+    rack-protection (1.5.3)
+      rack
+    rake (10.4.2)
+    rspec (2.12.0)
+      rspec-core (~> 2.12.0)
+      rspec-expectations (~> 2.12.0)
+      rspec-mocks (~> 2.12.0)
+    rspec-core (2.12.2)
+    rspec-expectations (2.12.1)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.12.2)
+    ruby-maven (3.3.8)
+      ruby-maven-libs (~> 3.3.1)
+    ruby-maven-libs (3.3.3)
+    sinatra (1.3.6)
+      rack (~> 1.4)
+      rack-protection (~> 1.3)
+      tilt (~> 1.3, >= 1.3.3)
+    thread_safe (0.3.5-java)
+    tilt (1.4.1)
+    typhoeus (0.6.9)
+      ethon (>= 0.7.1)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+    virtus (1.0.5)
+      axiom-types (~> 0.1)
+      coercible (~> 1.0)
+      descendants_tracker (~> 0.0, >= 0.0.3)
+      equalizer (~> 0.0, >= 0.0.9)
+
+PLATFORMS
+  java
+
+DEPENDENCIES
+  jbundler (~> 0.9.2)
+  killbill-invoice-test!
+  rake (>= 10.0.0)
+  rspec (~> 2.12.0)
+
+BUNDLED WITH
+   1.10.6

data/Jarfile

@@ -1,8 +1,11 @@
-jar 'org.kill-bill.billing:killbill-api', '0.10.3'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-notification', '0.8.2'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-payment', '0.8.2'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-currency', '0.8.2'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-retry', '0.8.1'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-invoice', '0.8.2'
-jar 'org.kill-bill.billing:killbill-util:tests', '0.12.1'
-jar 'javax.servlet:javax.servlet-api', '3.0.1'
+jar 'org.kill-bill.billing:killbill-api', '0.32'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-currency', '0.18'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-invoice', '0.18'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-notification', '0.18'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-payment', '0.18'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-control', '0.18'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-catalog', '0.18'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-entitlement', '0.18'
+jar 'org.kill-bill.billing:killbill-util:tests', '0.15.10'
+jar 'org.mockito:mockito-all', '1.10.19'
+jar 'javax.servlet:javax.servlet-api', '3.1.0'

data/Jarfile.lock

@@ -0,0 +1,61 @@
+---
+:runtime:
+- io.dropwizard.metrics:metrics-core:jar:3.1.1
+- org.kill-bill.billing.plugin:killbill-plugin-api-catalog:jar:0.18
+- com.fasterxml.jackson.core:jackson-core:jar:2.4.3
+- joda-time:joda-time:jar:2.3
+- org.weakref:jmxutils:jar:1.18
+- 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
+- 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
+- org.kill-bill.billing:killbill-util:jar:tests:0.15.10
+- org.kill-bill.billing.plugin:killbill-plugin-api-currency:jar:0.18
+- org.bgee.log4jdbc-log4j2:log4jdbc-log4j2-jdbc4:jar:1.16
+- com.h2database:h2:jar:1.4.186
+- javax.activation:activation:jar:1.1
+- org.skife.config:config-magic:jar:0.14
+- com.fasterxml.jackson.dataformat:jackson-dataformat-csv:jar:2.4.3
+- org.kill-bill.billing.plugin:killbill-plugin-api-control:jar:0.18
+- org.apache.commons:commons-email:jar:1.2
+- org.mockito:mockito-all:jar:1.10.19
+- antlr:antlr:jar:2.7.7
+- aopalliance:aopalliance:jar:1.0
+- com.fasterxml.jackson.core:jackson-annotations:jar:2.4.3
+- org.antlr:stringtemplate:jar:3.2.1
+- org.kill-bill.commons:killbill-clock:jar:0.11
+- javax.mail:mail:jar:1.4.1
+- org.kill-bill.billing:killbill-platform-base:jar:0.15
+- io.dropwizard.metrics:metrics-ehcache:jar:3.1.1
+- org.slf4j:jcl-over-slf4j:jar:1.7.12
+- org.jdbi:jdbi:jar:2.62
+- org.kill-bill.billing:killbill-platform-api:jar:0.15
+- org.kill-bill.billing:killbill-platform-osgi:jar:0.15
+- org.apache.felix:org.apache.felix.framework:jar:4.4.1
+- org.joda:joda-money:jar:0.9
+- org.kill-bill.commons:killbill-jdbi:jar:0.11
+- org.kill-bill.commons:killbill-embeddeddb-common:jar:0.11
+- org.apache.shiro:shiro-core:jar:1.2.3
+- org.kill-bill.billing:killbill-platform-osgi-api:jar:0.15
+- org.kill-bill.billing.plugin:killbill-plugin-api-payment:jar:0.18
+- com.fasterxml.jackson.core:jackson-databind:jar:2.4.3
+- com.google.guava:guava:jar:r09
+- 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.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.apache.shiro:shiro-guice:jar:1.2.3
+- com.google.code.findbugs:annotations:jar:3.0.0

data/README.md

@@ -1,5 +1,5 @@
 killbill-invoice-test-plugin
-==============================
+============================
 
 Plugin to test the Kill Bill InvoicePlugin API.
 

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.1.0

data/killbill-invoice-test.gemspec

@@ -22,9 +22,9 @@ Gem::Specification.new do |s|
 
   s.rdoc_options << '--exclude' << '.'
 
-  s.add_dependency 'killbill', '~> 3.2.2'
+  s.add_dependency 'killbill', '~> 7.0'
 
-  s.add_development_dependency 'jbundler', '~> 0.4.1'
+  s.add_development_dependency 'jbundler', '~> 0.9.2'
   s.add_development_dependency 'rake', '>= 10.0.0'
   s.add_development_dependency 'rspec', '~> 2.12.0'
 end

data/lib/invoice_test/api.rb

@@ -2,13 +2,102 @@ module InvoiceTest
 
   class InvoicePlugin < Killbill::Plugin::Invoice
 
-    def get_additional_invoice_items(invoice, properties, context)
-      additional_items = []
-      invoice.invoice_items.each do |original_item|
-        additional_items << build_item(original_item, original_item.amount * 7 / 100, 'Tax item', :TAX) unless original_item.amount == 0
+    # This implementation is idempotent, will apply tax on old invoices if needed
+    # and automatically handle adjustments
+    def get_additional_invoice_items(new_invoice, properties, context)
+      all_invoices = @kb_apis.invoice_user_api.get_invoices_by_account(new_invoice.account_id, context)
+      # Workaround for https://github.com/killbill/killbill/issues/265
+      all_invoices << new_invoice unless all_invoices.find { |inv| inv.id == new_invoice.id }
+
+      existing_taxable_items    = []
+      existing_tax_items        = {}
+      existing_adjustment_items = {}
+      all_invoices.each do |invoice|
+        invoice.invoice_items.each do |invoice_item|
+          existing_taxable_items << invoice_item if is_taxable_item(invoice_item)
+          (existing_tax_items[invoice_item.linked_item_id] ||= []) << invoice_item if is_tax_item(invoice_item)
+          (existing_adjustment_items[invoice_item.linked_item_id] ||= []) << invoice_item if is_adjustment_item(invoice_item)
+        end
       end
 
+      compute_tax_for_items(new_invoice, existing_taxable_items, existing_tax_items, existing_adjustment_items)
+    end
+
+    private
+
+    def compute_tax_for_items(current_invoice, taxable_items, tax_items, adjustment_items)
+      additional_items = taxable_items.map { |taxable_item| compute_tax_for_item(current_invoice, taxable_item, tax_items[taxable_item.id] || [], adjustment_items) }
+      additional_items.compact!
+
+      # Add all new items on the latest invoice
+      additional_items.map { |ii| ii.invoice_id = current_invoice.id }
+
       additional_items
     end
+
+    def compute_tax_for_item(current_invoice, taxable_item, tax_items, adjustment_items)
+      current_tax_amount  = tax_items.inject(0) { |sum, tax_item| sum + net_amount(tax_item, adjustment_items) }
+      expected_tax_amount = compute_tax_amount(net_amount(taxable_item, adjustment_items))
+
+      build_missing_item(current_invoice, current_tax_amount, expected_tax_amount, taxable_item, tax_items, adjustment_items)
+    end
+
+    def build_missing_item(current_invoice, current_tax_amount, expected_tax_amount, taxable_item, tax_items, adjustment_items)
+      if current_tax_amount < expected_tax_amount
+        # Add missing TAX item
+        build_tax_item(taxable_item, expected_tax_amount - current_tax_amount)
+      elsif current_tax_amount > expected_tax_amount
+        # Item adjust the TAX item
+        adjustment_amount  = current_tax_amount - expected_tax_amount
+        tax_item_to_adjust = find_tax_item_to_adjust(tax_items, adjustment_items, adjustment_amount)
+        build_adjustment_item(current_invoice, tax_item_to_adjust, adjustment_amount)
+      else
+        # Nothing to do
+        nil
+      end
+    end
+
+    def build_tax_item(original_item, amount)
+      rounded_amount = amount.round(2)
+      return nil if rounded_amount == 0
+      build_item(original_item, rounded_amount, 'Tax item', :TAX)
+    end
+
+    def build_adjustment_item(current_invoice, item_to_adjust, amount)
+      rounded_amount = amount.round(2)
+      return nil if rounded_amount == 0
+      item = build_item(item_to_adjust, -rounded_amount, 'Tax item', :ITEM_ADJ)
+      item.start_date = current_invoice.invoice_date
+      item.end_date = nil
+      item
+    end
+
+    def compute_tax_amount(net_taxable_amount)
+      net_taxable_amount * 7.0 / 100
+    end
+
+    def find_tax_item_to_adjust(tax_items, adjustment_items, amount_to_adjust)
+      tax_items.find { |tax_item| net_amount(tax_item, adjustment_items) >= amount_to_adjust }
+    end
+
+    def net_amount(invoice_item, adjustment_items)
+      invoice_item.amount + sum(adjustment_items[invoice_item.id])
+    end
+
+    def sum(invoice_items)
+      (invoice_items || []).inject(0) { |sum, ii| sum + ii.amount }
+    end
+
+    def is_taxable_item(invoice_item)
+      invoice_item.amount > 0 and [:EXTERNAL_CHARGE, :FIXED, :RECURRING, :USAGE].include?(invoice_item.invoice_item_type)
+    end
+
+    def is_tax_item(invoice_item)
+      invoice_item.invoice_item_type == :TAX
+    end
+
+    def is_adjustment_item(invoice_item)
+      [:ITEM_ADJ, :REPAIR_ADJ].include?(invoice_item.invoice_item_type)
+    end
   end
 end

data/pom.xml

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

data/release.sh

@@ -1,41 +1,61 @@
 set -e
 
-if [ "GNU" != "$(tar --help | grep GNU | head -1 | awk '{print $1}')" ]; then
-  echo "Unable to release: make sure to use GNU tar"
+BUNDLE=${BUNDLE-"bundle exec"}
+MVN=${MVN-"mvn"}
+
+if [ 'GNU' != "$(tar --help | grep GNU | head -1 | awk '{print $1}')" ]; then
+  echo 'Unable to release: make sure to use GNU tar'
   exit 1
 fi
 
 if $(ruby -e'require "java"'); then
   # Good
-  echo "Detected JRuby"
+  echo 'Detected JRuby'
 else
-  echo "Unable to release: make sure to use JRuby"
+  echo 'Unable to release: make sure to use JRuby'
   exit 1
 fi
 
 VERSION=`grep -E '<version>([0-9]+\.[0-9]+\.[0-9]+)</version>' pom.xml | sed 's/[\t \n]*<version>\(.*\)<\/version>[\t \n]*/\1/'`
-if [ "$VERSION" != "$(cat $PWD/VERSION)" ]; then
-  echo "Unable to release: make sure the versions in pom.xml and VERSION match"
+if [[ -z "$NO_RELEASE" && "$VERSION" != "$(cat $PWD/VERSION)" ]]; then
+  echo 'Unable to release: make sure the versions in pom.xml and VERSION match'
   exit 1
 fi
 
-echo "Cleaning up"
-rake killbill:clean ; rake build
+echo 'Cleaning up'
+$BUNDLE rake killbill:clean
+
+echo 'Building gem'
+$BUNDLE rake build
 
-echo "Pushing the gem to Rubygems"
-rake release
+if [[ -z "$NO_RELEASE" ]]; then
+  echo 'Pushing the gem to Rubygems'
+  $BUNDLE rake release
+fi
 
-echo "Building artifact"
-rake killbill:package
+echo 'Building artifact'
+$BUNDLE rake killbill:package
 
 ARTIFACT="$PWD/pkg/killbill-invoice-test-$VERSION.tar.gz"
 echo "Pushing $ARTIFACT to Maven Central"
-mvn gpg:sign-and-deploy-file \
-    -DgroupId=org.kill-bill.billing.plugin.ruby \
-    -DartifactId=invoice-test-plugin \
-    -Dversion=$VERSION \
-    -Dpackaging=tar.gz \
-    -DrepositoryId=ossrh-releases \
-    -Durl=https://oss.sonatype.org/service/local/staging/deploy/maven2/ \
-    -Dfile=$ARTIFACT \
-    -DpomFile=pom.xml
+
+if [[ -z "$NO_RELEASE" ]]; then
+  GOAL=gpg:sign-and-deploy-file
+  REPOSITORY_ID=ossrh-releases
+  URL=https://oss.sonatype.org/service/local/staging/deploy/maven2/
+else
+  GOAL=deploy:deploy-file
+  REPOSITORY_ID=sonatype-nexus-snapshots
+  URL=https://oss.sonatype.org/content/repositories/snapshots/
+  VERSION="$VERSION-SNAPSHOT"
+fi
+
+$MVN $GOAL \
+     -DgroupId=org.kill-bill.billing.plugin.ruby \
+     -DartifactId=invoice-test-plugin \
+     -Dversion=$VERSION \
+     -Dpackaging=tar.gz \
+     -DrepositoryId=$REPOSITORY_ID \
+     -Durl=$URL \
+     -Dfile=$ARTIFACT \
+     -DpomFile=pom.xml

data/spec/invoice_test/base_plugin_spec.rb

@@ -2,9 +2,19 @@ require 'spec_helper'
 require 'logger'
 
 describe InvoiceTest::InvoicePlugin do
+
+  class FakeJavaInvoiceUserApi
+    attr_accessor :invoices
+
+    def get_invoices_by_account(accountId, context)
+      @invoices
+    end
+  end
+
   before(:each) do
+    @invoice_api = FakeJavaInvoiceUserApi.new
+    kb_apis      = Killbill::Plugin::KillbillApi.new('killbill-invoice-test', {:invoice_user_api => @invoice_api})
 
-    kb_apis         = Killbill::Plugin::KillbillApi.new('killbill-invoice-test', {})
     @plugin         = InvoiceTest::InvoicePlugin.new
     @plugin.logger  = Logger.new(STDOUT)
     @plugin.kb_apis = kb_apis
@@ -18,22 +28,89 @@ describe InvoiceTest::InvoicePlugin do
     @plugin.stop_plugin
   end
 
-  it 'should add additional item' do
-    item        = Killbill::Plugin::Model::InvoiceItem.new
-    item.id     = SecureRandom.uuid
-    item.amount = 100
+  it 'should add two additional items' do
+    fixed_item     = build_invoice_item(100, :FIXED)
+    recurring_item = build_invoice_item(150, :RECURRING)
+    invoice        = build_invoice([fixed_item, recurring_item])
 
-    invoice               = Killbill::Plugin::Model::Invoice.new
-    invoice.id            = SecureRandom.uuid
-    invoice.invoice_items = [item]
+    new_items = @plugin.get_additional_invoice_items(invoice, @properties, @call_context)
+    new_items.size.should == 2
+
+    check_invoice_item(new_items[0], 7, fixed_item)
+    check_invoice_item(new_items[1], 10.5, recurring_item)
+
+    check_idempotency(invoice, new_items)
+  end
+
+  it 'should add no additional item' do
+    fixed_item         = build_invoice_item(100, :FIXED)
+    recurring_item     = build_invoice_item(150, :RECURRING)
+    recurring_adj_item = build_invoice_item(-150, :ITEM_ADJ, recurring_item.id)
+    fixed_adj_item     = build_invoice_item(-100, :ITEM_ADJ, fixed_item.id)
+    invoice            = build_invoice([fixed_item, recurring_item, recurring_adj_item, fixed_adj_item])
+
+    new_items = @plugin.get_additional_invoice_items(invoice, @properties, @call_context)
+    new_items.size.should == 0
+
+    check_idempotency(invoice, new_items)
+  end
+
+  it 'should add a single additional item' do
+    fixed_item     = build_invoice_item(100, :FIXED)
+    recurring_item = build_invoice_item(150, :RECURRING)
+    fixed_adj_item = build_invoice_item(-100, :ITEM_ADJ, fixed_item.id)
+    invoice        = build_invoice([fixed_item, recurring_item, fixed_adj_item])
 
     new_items = @plugin.get_additional_invoice_items(invoice, @properties, @call_context)
     new_items.size.should == 1
 
-    new_item = new_items.first
-    new_item.should be_an_instance_of Killbill::Plugin::Model::InvoiceItem
-    new_item.amount.should == 7
-    new_item.invoice_item_type.should == :TAX
-    new_item.linked_item_id.should == item.id
+    check_invoice_item(new_items[0], 10.5, recurring_item)
+
+    check_idempotency(invoice, new_items)
+  end
+
+  it 'should handle partial adjustments' do
+    fixed_item     = build_invoice_item(100, :FIXED)
+    tax_item       = build_invoice_item(7, :TAX, fixed_item.id)
+    fixed_adj_item = build_invoice_item(-20, :ITEM_ADJ, fixed_item.id)
+    invoice        = build_invoice([fixed_item, tax_item, fixed_adj_item])
+
+    new_items = @plugin.get_additional_invoice_items(invoice, @properties, @call_context)
+    new_items.size.should == 1
+
+    check_invoice_item(new_items[0], -1.4, tax_item, :ITEM_ADJ)
+
+    check_idempotency(invoice, new_items)
+  end
+
+  private
+
+  def build_invoice(items)
+    invoice               = Killbill::Plugin::Model::Invoice.new
+    invoice.id            = SecureRandom.uuid
+    invoice.invoice_items = items
+    invoice
+  end
+
+  def build_invoice_item(amount, invoice_item_type=:FIXED, linked_item_id=nil)
+    item                   = Killbill::Plugin::Model::InvoiceItem.new
+    item.id                = SecureRandom.uuid
+    item.amount            = amount
+    item.invoice_item_type = invoice_item_type
+    item.linked_item_id    = linked_item_id
+    item
+  end
+
+  def check_invoice_item(item, amount, original_item, invoice_item_type=:TAX)
+    item.should be_an_instance_of Killbill::Plugin::Model::InvoiceItem
+    item.amount.should == amount
+    item.invoice_item_type.should == invoice_item_type
+    item.linked_item_id.should == original_item.id
+  end
+
+  def check_idempotency(original_invoice, new_items)
+    invoice          = build_invoice(original_invoice.invoice_items + new_items)
+    additional_items = @plugin.get_additional_invoice_items(invoice, @properties, @call_context)
+    additional_items.size.should == 0
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: killbill-invoice-test
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors:
 - Kill Bill core team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-01-15 00:00:00.000000000 Z
+date: 2015-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: killbill
@@ -16,12 +16,12 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.2
+        version: '7.0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.2
+        version: '7.0'
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
@@ -30,12 +30,12 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 0.9.2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 0.9.2
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency
@@ -75,7 +75,9 @@ files:
 - .gitignore
 - .travis.yml
 - Gemfile
+- Gemfile.lock
 - Jarfile
+- Jarfile.lock
 - README.md
 - Rakefile
 - VERSION
@@ -109,10 +111,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.2.2
+rubygems_version: 2.1.9
 signing_key:
 specification_version: 4
 summary: Plugin to test the invoice plugin api.
-test_files:
-- spec/invoice_test/base_plugin_spec.rb
-- spec/spec_helper.rb
+test_files: []