Added Basket.SetDuration, testing Basket.Total

Author: moul

pkg/pricing/basket.go

@@ -1,6 +1,9 @@
 package pricing
 
-import "math/big"
+import (
+	"math/big"
+	"time"
+)
 
 type Basket []Usage
 
@@ -17,6 +20,18 @@ func (b *Basket) Length() int {
 	return len(*b)
 }
 
+func (b *Basket) SetDuration(duration time.Duration) error {
+	var err error
+	for i, usage := range *b {
+		err = usage.SetDuration(duration)
+		if err != nil {
+			return err
+		}
+		(*b)[i] = usage
+	}
+	return nil
+}
+
 func (b *Basket) Total() *big.Rat {
 	total := new(big.Rat)
 	for _, usage := range *b {

pkg/pricing/basket_test.go

@@ -3,6 +3,7 @@ package pricing
 import (
 	"math/big"
 	"testing"
+	"time"
 
 	. "github.com/smartystreets/goconvey/convey"
 )
@@ -37,28 +38,55 @@ func TestBasket_Add(t *testing.T) {
 
 func TestBasket_Total(t *testing.T) {
 	Convey("Testing Basket.Total", t, FailureContinues, func() {
-		basket := NewBasket()
-		So(basket, ShouldNotBeNil)
-		current := ratZero
-		difference := ratZero
-		So(basket.Total(), ShouldEqualBigRat, current)
+		Convey("3 compute instances", func() {
+			basket := NewBasket()
+			So(basket, ShouldNotBeNil)
+			current := ratZero
+			difference := ratZero
+			So(basket.Total(), ShouldEqualBigRat, current)
 
-		err := basket.Add(NewUsageByPathWithQuantity("/compute/c1/run", 1))
-		So(err, ShouldBeNil)
-		difference = new(big.Rat).Mul(big.NewRat(60, 1), new(big.Rat).SetFloat64(0.012))
-		current = new(big.Rat).Add(current, difference)
-		So(basket.Total(), ShouldEqualBigRat, current)
+			err := basket.Add(NewUsageByPathWithQuantity("/compute/c1/run", 1))
+			So(err, ShouldBeNil)
+			difference = new(big.Rat).Mul(big.NewRat(60, 1), new(big.Rat).SetFloat64(0.012))
+			current = new(big.Rat).Add(current, difference)
+			So(basket.Total(), ShouldEqualBigRat, current)
 
-		err = basket.Add(NewUsageByPathWithQuantity("/compute/c1/run", 42))
-		So(err, ShouldBeNil)
-		difference = new(big.Rat).Mul(big.NewRat(60, 1), new(big.Rat).SetFloat64(0.012))
-		current = new(big.Rat).Add(current, difference)
-		So(basket.Total(), ShouldEqualBigRat, current)
+			err = basket.Add(NewUsageByPathWithQuantity("/compute/c1/run", 42))
+			So(err, ShouldBeNil)
+			difference = new(big.Rat).Mul(big.NewRat(60, 1), new(big.Rat).SetFloat64(0.012))
+			//difference = big.NewRat(72, 100)
+			current = new(big.Rat).Add(current, difference)
+			So(basket.Total(), ShouldEqualBigRat, current)
 
-		err = basket.Add(NewUsageByPathWithQuantity("/compute/c1/run", 600))
-		So(err, ShouldBeNil)
-		difference = big.NewRat(6, 1)
-		current = new(big.Rat).Add(current, difference)
-		So(basket.Total(), ShouldEqualBigRat, current)
+			err = basket.Add(NewUsageByPathWithQuantity("/compute/c1/run", 600))
+			So(err, ShouldBeNil)
+			difference = big.NewRat(6, 1)
+			current = new(big.Rat).Add(current, difference)
+			So(basket.Total(), ShouldEqualBigRat, current)
+		})
+		Convey("1 compute instance with 2 volumes and 1 ip", func() {
+			basket := NewBasket()
+
+			basket.Add(NewUsageByPath("/compute/c1/run"))
+			basket.Add(NewUsageByPath("/ip/dynamic"))
+			basket.Add(NewUsageByPath("/storage/local/ssd/storage"))
+			basket.Add(NewUsageByPath("/storage/local/ssd/storage"))
+			So(basket.Length(), ShouldEqual, 4)
+
+			basket.SetDuration(1 * time.Minute)
+			So(basket.Total(), ShouldEqualBigRat, new(big.Rat).SetFloat64(1.36))
+
+			basket.SetDuration(1 * time.Hour)
+			So(basket.Total(), ShouldEqualBigRat, new(big.Rat).SetFloat64(1.36))
+
+			basket.SetDuration(2 * time.Hour)
+			So(basket.Total(), ShouldEqualBigRat, new(big.Rat).SetFloat64(2.32))
+
+			basket.SetDuration(2 * 24 * time.Hour)
+			So(basket.Total(), ShouldEqualBigRat, new(big.Rat).SetFloat64(8.39))
+
+			basket.SetDuration(30 * 24 * time.Hour)
+			So(basket.Total(), ShouldEqualBigRat, new(big.Rat).SetFloat64(1.99))
+		})
 	})
 }