Ch.16 done

yujihamaguchi · Jan 5, 2020 · 7fc41c5 · 7fc41c5
1 parent 1cf9296
commit 7fc41c5
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 0 deletions.
diff --git a/src/Example-TDD-Tests/MoneyTest.class.st b/src/Example-TDD-Tests/MoneyTest.class.st
@@ -50,6 +50,18 @@ MoneyTest >> testPlusReturnsSum [
 	self assert: sum addend equals: five
 ]
 
+{ #category : #tests }
+MoneyTest >> testPlusSumMoney [
+	| fiveBucks bank tenFrancs sum result |
+	fiveBucks := Money dollar: 5.
+	tenFrancs := Money franc: 10.
+	bank := Bank new.
+	bank addRate: (Rate from: 'CHF' to: 'USD' rate: 2).
+	sum := (Sum augend: fiveBucks addend: tenFrancs) plus: fiveBucks .
+	result := sum reduceAt: bank to: 'USD'.
+	self assert: result equals: (Money dollar: 15)
+]
+
 { #category : #tests }
 MoneyTest >> testReduceMoney [
 	| bank result |
@@ -86,3 +98,15 @@ MoneyTest >> testSimpleAddtion [
 	reduced := bank reduce: sum to: 'USD'.
 	self assert: reduced equals: (Money dollar: 10)
 ]
+
+{ #category : #tests }
+MoneyTest >> testSumTimes [
+	| fiveBucks tenFrancs bank sum result |
+	fiveBucks := Money dollar: 5.
+	tenFrancs := Money franc: 10.
+	bank := Bank new.
+	bank addRate: (Rate from: 'CHF' to: 'USD' rate: 2).
+	sum := (Sum augend: fiveBucks addend: tenFrancs) times: 2.
+	result := sum reduceAt: bank to: 'USD'.
+	self assert: result equals: (Money dollar: 20)
+]
diff --git a/src/Example-TDD/Sum.class.st b/src/Example-TDD/Sum.class.st
@@ -35,10 +35,22 @@ Sum >> augend: aMoney [
 	augend := aMoney
 ]
 
+{ #category : #arithmetic }
+Sum >> plus: anObject [
+	^ Sum augend: self addend: anObject
+]
+
 { #category : #enumerating }
 Sum >> reduceAt: aBank to: aCurrency [
 	| sum |
 	sum := (augend reduceAt: aBank to: aCurrency) amount
 		+ (addend reduceAt: aBank to: aCurrency) amount.
 	^ Money new setAmount: sum currency: aCurrency
 ]
+
+{ #category : #arithmetic }
+Sum >> times: aMultiplier [
+	^ Sum
+		augend: (self augend times: aMultiplier)
+		addend: (self addend times: aMultiplier)
+]