From e02c86a42df1b4604840bba7bd48e1a86fdd7af8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tommi=20Puuper=C3=A4?= <tpuupera@gmail.com>
Date: Mon, 1 Oct 2018 15:09:42 +0300
Subject: [PATCH] Assignment	Finished

---
 bin/StringCalculator.class      | Bin 405 -> 890 bytes
 bin/StringCalculatorTest.class  | Bin 505 -> 1793 bytes
 src/StringCalculator.java       |  30 ++++++++++++++---
 tests/StringCalculatorTest.java |  57 +++++++++++++++++++++++++++++---
 4 files changed, 79 insertions(+), 8 deletions(-)

diff --git a/bin/StringCalculator.class b/bin/StringCalculator.class
index a937b0c43633d36f133837cd90ddd10fb14ac782..287961466bb28d337473e8f717f8deb5af5f5903 100644
GIT binary patch
delta 581
zcmX|;OKTHR6vuxzGwImrq)i{GZB3%q*5*--E$S|Ujv_(SMT?>c_BssHsbf--iMY$g
zFOY=`yD5SoLKm)DQP92Lz^_t#orzX1%(?S_-E;1JWgHIK-+q1i0$gOZZ-40Bc;Wfm
zaoB2hEG87QYjHbl2Ck00ZlvQ@`#*0p#k56Ek=@eIbuH4(p!QeoaGV*%P~<m*cvE4N
z%8f)m=Wv3&5Z<P4UyT)JsZn-qikz}IshHf-caM@>k!UaW+YYChS6E@^dKiQQlUsh6
zm=+usIja~8{P<4yncoh*dphd+Nv@lmIL>hYU|}U4w_+VBR7033>`2CN(!n5JU{{e@
zi?#Rkw%%UXPa?nnz1vHXl}j;El460%V2~ChH0s8c>OPY@+&A{Bg?(l(n>jPPyvw2#
zdzWI){7B(7qxocWW~2U&%4fzO9I*5?F&4~?x6D+fh*y+5j2zJ~4OK`aZ+`dQ=lA3^
z16#h={`HcQ4ovB0gkxl6O)<(mV^oA+l|C;qL7f~onPy$y;1P2?#vvdtp5%!K69|%#
xKbeIRWtlJ~iV9V!CO*ruGb$2(i*uY8s3y`Z>7Qhj`oWU2iiaXqTo63P${!;}Z(slb

delta 98
zcmeyxHkFy{)W2Q(7#J8#7(^y=ZJ6B6s5tpPW3f9U13OUAjDeAX2}m<BuK|$^TtJcy
hD8>Mk<pz>s5LpHu23{Z!q(Xo}5Gc>cAOz+K0|1oX3wZzl

diff --git a/bin/StringCalculatorTest.class b/bin/StringCalculatorTest.class
index d44b83f48579a95c814a0008fdfcca590443d2de..053abfba3bf8e44f66ba5492f5ab78e01c0aaa41 100644
GIT binary patch
literal 1793
zcma)5=~B~B7(KTvy@ZMwOH~vX6sM42=>mdv8AMRAECPe0|3b;sFeTA6b$I|E$Uo}n
zj1S;LIiB05X{9)rAGu5JchC9GIr;Vb`%eG`Y{wB3NNxwd<5rfeYPnvu0?*&EYe5{n
z0>cN^J1bMQ+)8F+@4zkx0{wR#*9q<m^rR<u1$vjfeOp5h1`_B)zrg8|<J#->!#&&I
zvG%IAfL`*-R(03%9kmWOdxO_bO(0b|4!bCDDj<iA)=dK1@`tkhCU88r7RMQZ3rFjs
z@BFq^cLV3p-gRmY5f@$83#>*dJ1Tj8C38?`4;j^FF^&=L9=%ON5(5(F1w>ZOM-#Y+
zOKjTO-xnB3m)gQKON*0FHC)EkIIi%zHpXJDX8S<`*Dx-Suo|o7w{@$^=KIpCt4c$S
z@`TDOwT^P38beBro%dc-*IFOVQ%{e?BspcxTx+LaVwyVzGbfQz6D>zNs(Q_GKZfPe
z>2neVfq223HRsHE0jUnYvVBkDwg3bM)yBI0UU@2Uhm^Bg&dj&aQW6Y;s@LYs+pS$)
z;-NZe&T9+IgSz5{@41y-t6I0&wzNOIVU%nNd9kb6$i||?W5z3+%NHb`GIyqWvJ%e(
zVp&sSjovViNp=70b-O}`--W@eNo<nAbl#k1f7-TJ_sjN*qr%vgn;n+lQf|^B3f9n7
za>g+89p^g3k!qlC>MP`DPGZpbR-d_vLB12=Jb_bO(Jy}O!D-HWxf+JfnL2-#qq=gF
z`!SBmA4tCZ%D+G}^mAWu;nO#awGoCIbOs=aah4bgDb=jwN+C&(*Kvb43rw7V8HAWK
zEzBft8hScJO=8N>&CbQGE<P!C3w9&f&j=Zf^T)`LQJdFH#48=~nmK{jR>&*W=9M+{
zd>49CjZvasBKqYH)Kr8z6rs+ZfZFB2fT7R*19P01H`wn)2WB$DY&$T20_HIeQ1pdJ
z^rE5Pixv+IeX)yA(}6VkOi=@a4w!Ucx`Wqo4lEtRYp{_<fk$O5HzIk+V5vw>v}`c+
z72>}z^e4?>wK<g3(9Y;6?*_7Dlw;oWOhW-<n5ABG9jqoIwZ<Zc*8hi9DP%R=X0`D*
afo3cgNT5gpcRN6bBTyNEJ}222w*CMxG!|<B

delta 190
zcmZqV`^n68>ff$?3=9k=4AK+1X0o!Bq!yP<ysPiP!63xQAncc4qEMMyqL7(ekdvC5
znpcvV!o?uMAjZxh%E%y)UzDz&RhpMsqVHH-oLW@E!ywKe!N|apmYA6{*^W`1F>LZ1
zCKE=c$%@P_flLhiKx^0-fck(mJJ?D_AP*=eB)Ee?cq5R-#J~k4xqvhS11AG3ki`vT
U@jz4oX<i_YkwFqjGBHR2013h%?f?J)

diff --git a/src/StringCalculator.java b/src/StringCalculator.java
index 487916b..1d4c076 100644
--- a/src/StringCalculator.java
+++ b/src/StringCalculator.java
@@ -1,9 +1,31 @@
 
 public class StringCalculator {
-	public int add(String numbersStr) {
-		// Returns the sum of the numbers given in numbersStr
+	public int add(String numbersStr) throws StringCalculatorException {
+		int total = 0;
+		int list = 0;	
 		
-		// not yet implemented
-		return 0;
+		if (numbersStr.length()==0) {
+			return 0;
+		}
+		else {
+	
+			while (list < numbersStr.length()) {				
+				char character  = numbersStr.charAt(list);
+				if (character !=',' && character !='\n') {
+					if (Character.isDigit(character) == true) {
+						total+= Character.getNumericValue(character);
+					} else {
+						throw new StringCalculatorException();
+					}
+				} else {
+					if (numbersStr.length() > (list + 1) &&
+						Character.isDigit(numbersStr.charAt(list + 1)) == false) {
+						throw new StringCalculatorException();
+					} 
+				}									
+				list++;
+			}
+			return total;
+		}
 	}
 }
diff --git a/tests/StringCalculatorTest.java b/tests/StringCalculatorTest.java
index 4ec9afe..e9b852c 100644
--- a/tests/StringCalculatorTest.java
+++ b/tests/StringCalculatorTest.java
@@ -3,10 +3,59 @@
 import org.junit.Test;
 
 public class StringCalculatorTest {
-
+	
+	@Test
+	public void testOneNumber() throws StringCalculatorException{
+		StringCalculator calculator = new StringCalculator();
+		// Assert
+		assertEquals(1,calculator.add("1"));	
+	}
+	
 	@Test
-	public void test() {
-		fail("Not yet implemented");
+	public void testTwoNumbers() throws StringCalculatorException{
+		StringCalculator calculator = new StringCalculator();
+		// Assert
+		assertEquals(3,calculator.add("1,2"));
+		assertEquals(6,calculator.add("4,2"));
+		assertEquals(6,calculator.add("4\n2"));
+
 	}
+	
+	@Test
+	public void testManyNumbers2() throws StringCalculatorException{
+		StringCalculator calculator = new StringCalculator();
+		// Assert
+		assertEquals(23,calculator.add("4,5,6,8"));	
 
-}
+	}
+	
+	@Test
+	public void testZero() throws StringCalculatorException{
+		StringCalculator calculator = new StringCalculator();
+		// Assert
+		assertEquals(0, calculator.add(""));
+	}
+	@Test
+	public void testNewLine() throws StringCalculatorException {
+		StringCalculator calculator = new StringCalculator();
+		
+		assertEquals(6, calculator.add("1\n2,3"));
+		assertEquals(22, calculator.add("4,5\n6,7"));
+		assertEquals(18, calculator.add("1,8\n9"));
+	}
+	
+	@Test (expected = StringCalculatorException.class)
+	public void testWrongValues() throws StringCalculatorException{
+		StringCalculator calculator = new StringCalculator();
+		calculator.add("1234");
+		calculator.add(",,,,,1");
+		calculator.add("1,");
+		calculator.add("t");
+	}
+	@Test (expected = StringCalculatorException.class)
+	public void testhNegativeNumbers() throws StringCalculatorException {
+		StringCalculator calculator = new StringCalculator();
+		
+		calculator.add("-3,-4");
+	}
+}
\ No newline at end of file