From e76f3ea4beff6871fb6589a9f8ff097819891cab Mon Sep 17 00:00:00 2001
From: SilviaLi1225 <916621497@qq.com>
Date: Sat, 29 Sep 2018 21:34:12 +0300
Subject: [PATCH] Assignment Finished

---
 bin/StringCalculator.class          | Bin 405 -> 1919 bytes
 bin/StringCalculatorException.class | Bin 303 -> 367 bytes
 bin/StringCalculatorTest.class      | Bin 505 -> 2631 bytes
 src/StringCalculator.java           |  58 ++++++++++++++++-
 src/StringCalculatorException.java  |   3 +
 tests/StringCalculatorTest.java     |  97 +++++++++++++++++++++++++++-
 6 files changed, 153 insertions(+), 5 deletions(-)

diff --git a/bin/StringCalculator.class b/bin/StringCalculator.class
index a937b0c43633d36f133837cd90ddd10fb14ac782..c7cfac73ed72a4e748e6ebbb202207b75a9e97e6 100644
GIT binary patch
literal 1919
zcmZux-%}e^7(F+;*-gSyAP{UyQb@IsK!BD~q@<vTMbQ8%h~reJF3ApTyKLxYq5c6p
z`WHCPC{N5deW)+gQ3s!V@n7-HN2eOk-OWG?naS+^_1*KG?|kRx&;Nco0WgWrbVLL?
z*L=@*w-!vNvgeq7&C{WB_o2COjytBiHNLv}(5m<X+FjeV{W$?8U)T^(7iv{20R?db
zQD_1kW!tq@_I5TcZ{6H<EP-UXRxzCo)3fEexvBcwc3qyG&s!q0S*;4B^5wJaVN|KG
zB#^lGb;a8C?V4NHkrYUuM>suCK%mD!3cUiCY<J&u?COfO<=gvY)!PdGzQlI}@^!*W
zeit~9Uwv;!Krpu5wVs5v)|Xt06OjPI=E0h8Rvs;zyFs}+GGwrAx>d(ov7ShUSo>fr
z1{d?i@H#OQF<j?ROkfBF9r;&!6DnX}7$fBGS-Xx|vF05|V7f()izx~hw*=y$4uK4D
z))^*Y9hKUi>s#L1u48kMgl-tPi3xh6vTb_v)IrTJ6&B>lq=DO*;)!FqTmE+78cGxm
zFl2x37#KiK&PoQx&>=6)8koadjH=5N0z)l|DBQouIe~dB=y*q<>#S?+i?wBW2Hr)7
zKy26a>K6B6Sfp2*ZWstlC5<k;FMUjkE$z1v!-oWEdMT%4S)l(cS7?RBnzv*6r!JJT
zNX2dnbhjXVX1KsXx*hUmuW8cUOGUN>FX>n%!dh+5t5}P+d~T_*QD-lCOcF$n5-WW0
zV0n}l8oxSM;~a(D9e$43Pn<-M;8z~Yc^kh*7{IZeD>?ujJn7_I<*F-y`H|pJ?&Ou(
z;gMr>uZ*62i>UHcnNp9?o*7N4V_(f4s3N6~o*Xv*&OBwT5@foD80S$UYMjNGBTjtz
zY}=9HILJ(r#bk)zWWh{$4VRfe!iY4kaE#GPeY~R}i5_IRr{XGaUV`#3o3Eq)1)?I(
zJG30XvixO6OIg}RlGl=N9Aj{~_>9X?gak*BNF2QZg@G{iltLSd0fji@MmdWRlpbzE
zf5WxP`#EJ+nL9%FNcI@xoy8xZ9Yn-|BC^!!)?wqXm$bM-4G`3lA-gQKy~;{5=qF#P
z!Egw8N+1`cl^XQp&ETF&1!Uz)P<dQdt_xvEX8a#y;45ttE(4|fk7d)QmxqhTn3*d|
zA@0toY4zl{#7tC~(vEN^t){ezpYisTp3=WV`>*KwJbCXq-upe9j-II1@0(j6$gOlV
zrKR-M15Knfo*p*-I6}va7TjqDJR_k#JisQ(q#zwPN8y0$RA7+x4YBS#BSu(xk>4@g
zpjBrufd$-R*KT8-yAN1(71MB03iSDctzt2!`aEuWM8l(?RS}+8SPAs$!IxBTm5TOZ
z10PZ4C^ef8)YFJvz{iZ!iJ!nHSR*g#rCDeVQqpzMPec51Sf{i2T3+C?NdAL(gBP^(
Q=Q6z9#-cwZNCX@I1D2w57ytkO

delta 104
zcmey*H<g*|)W2Q(7#J8#7(^y=ZI~>@s5toyvmPVU<loFL?u-oVKq)f@Mg}Gz&BVM0
nL^5yzNj9Ju15lP5NQyyZ8F(0Yfjp230R};!JR^e;m?sPX9r+BG

diff --git a/bin/StringCalculatorException.class b/bin/StringCalculatorException.class
index 4bd989452e88efe466640937d540edeb3220a693..3fd5967f1e4c61507767a4901707ff845a8b32ae 100644
GIT binary patch
delta 148
zcmZ3_^qz_9)W2Q(7#J8#7=$KrIg5yD_+%xPCF<uS=B4WgmlS2@rCU$*Pn2QLO)V}?
zOiyKG5W-L}ajl1^9Rm{(GBB`dX>VuX*a&1XF>nD%F0d#I11k`61NmYQRSY}~yg(jM
SJp&&DKLaBW3IKUb41xfaIUG*_

delta 86
zcmaFQw4RCU)W2Q(7#J8#7z8GAIWsY9OiWCi_|Vl#pMenw85mf#wli>S1TvTyxPT-Z
YSdfW<8_4E?C;-yDKprClA6OMX02eO{y8r+H

diff --git a/bin/StringCalculatorTest.class b/bin/StringCalculatorTest.class
index d44b83f48579a95c814a0008fdfcca590443d2de..16a2161305d561604e922c8b7683d65f4a159c62 100644
GIT binary patch
literal 2631
zcmbW1eOD7l6vm$+V3wEyrXfVZBWjhmV0iO2Xr+iX7_fy%YiS!d$uuq}Y;?0r{Q~_!
z{RchmIsE{BD38x<)+7znLz?`tJF|0Vp5J}$oqYKC*FOMO@N*b_0`XnfvFysaSuJ^0
z)2%sqS$D(e7Z^D(kIZz{v@7Xn#RFM#1<tHmw&gw$2u;uI3G}bm$})lw2BR3j8G+%P
zWy@{vuqd6pS*%KdSguwwt9zznsd@0R-+g7(1rj-(c7~f=GVDm#bL_&dcUV{~ED1z5
z-j?KR*Q(j|FwO~_@7&y6=h}{EyVjxHv+5RQ*KE7yn*LU%m8&_G^nu4j(kj<X7^D2!
zd0GT<3>ru>*TvM5nq7!u921<I<+8x&bgt!3V{>LEJ3wdEFBHKfu7q)!C%5F*>UHV3
zQC!7W0#VbSZM^Z!D$N*}-rQ84hG>_vt&@kggzDa*fXMR94ucj9%yDIb<?L9Yb%kXE
zHz>d~Qp=wKS*(N#ePY_>sw`~F-&N_9(*~AR&JjQ7n^D}tZGoXzeq0bn-0QmZPdcJ(
zxT_MrCot8%rO{EDwjIG2--EjAC=X5;ERfVgs~o>><QO6TxQfc!M`qP3Z_A2n9mzs4
zT@*0n+t+Mo$tsSY@VVJV83T{l;;Q(n`j4ad7EkDe^{-=TV|!Yk8)2VC3fulgpjmxt
zdO^b!uo>85&^*y}K>@gd?^N#<OMwX;>8V1S26lr&n*tLWK^5h@Vt~Eox5U-|iVPAp
z@Iv)ND#9zcTl1Wfd~B(ked7M*>G=&+GF%3C`1c^n5&s$Z40E35Tkt(F`wqsR9P}Z=
zr&{JmoaIw(P~#}R;G1@HHH2Y~`#Bpyj3X8QCEx1EBEKuC<ll(Dc*nn#x!Bk-&fkyY
z;=~{CajB&eV<f0&@a$opKE|g~oNVk56b))z!*wbQV-QoACZoX2DHJaQibRWIR#6OU
z8RBF}@cc21BH6}}Xfg~n8NyA5)F})aC*~VYq_q?mNpXo3ljOM4Mv-h%=$u$Qh2kas
zQuSzaV(AzwTd}d!d)(=)#uOQ5$S_MM=GqwaPGqp^SL6QwXL#T<%<C8y$go6)WiqUE
z&G1meaMtfjfwdC8@tbomFk__E7VF2@*lO7@<ePPu2pJ-*w#kn)%V0E{K_H7w--4$-
z%I9?QYm{H7{G+brw|kU-rjyT7{wd{iUCV#pqx_CeeuwgT%0E9<ekw3O-=q9<o%}xK
ff1&)ZUCaN_qx_FL`7-5yqkN@n`JZ^Z`>_8BXbPpk

delta 193
zcmX>u@{^hC)W2Q(7#J8#7^Ek1&17XMNi8m!_(<QGgF%RqLD(<9M4>XZL?JV`ASX39
zHLoN!g^NLiL5!V2l#xLozbIWlt28gOMBlNvIJKyRhe4b{f{}qGEip5PkwJ8FAhQT#
z*knr<6Go=Vc`Po0Obq-$o7fnDT7fh>*j7d$4=5%ixPw7>Bap?!zy&0^fHVUGCj%>x
X#SLWfKvV%~ULcQ=K@vzZF-QRbfSn-+

diff --git a/src/StringCalculator.java b/src/StringCalculator.java
index 487916b..902396c 100644
--- a/src/StringCalculator.java
+++ b/src/StringCalculator.java
@@ -1,9 +1,61 @@
 
 public class StringCalculator {
-	public int add(String numbersStr) {
+	public int add(String numbersStr) throws StringCalculatorException {
 		// Returns the sum of the numbers given in numbersStr
+		int sum = 0;
+		int[] newNumbersInt = invalidNegtive(numbersStr);
 		
-		// not yet implemented
-		return 0;
+		if(newNumbersInt.length == 0){
+			return 0;
+		}
+				
+		for(int i=0; i<newNumbersInt.length; i++){
+			sum = sum + newNumbersInt[i];
+			}
+				
+		return sum;
+	
+	}
+	
+	public String handleNewLines(String numberStr){
+		String newString = numberStr.replaceAll("\n", ",");
+		return newString;
+	}
+	
+	public int counterSpliter(String newString){
+		int count = 0;
+		
+		for(int i=0;i<newString.length(); i++){
+			if(newString.charAt(i) == ','){
+				count++;
+			}
+		}
+		return count;
+	}
+	
+	public int[] invalidNegtive(String numbersStr) throws StringCalculatorException{
+		String numberStr = handleNewLines(numbersStr);
+		int count1 = counterSpliter(numberStr);
+		String[] newString = numberStr.split(",");
+		int[] numbersInt = new int[newString.length];
+		
+		try{
+			for(int i=0; i< numbersInt.length; i++){
+				int integer = Integer.parseInt(newString[i]);
+				
+				if(integer<0){
+					throw new StringCalculatorException("Negtive number!");
+				} 
+				
+				if(count1 != (numbersInt.length - 1)){
+					throw new StringCalculatorException("invalid!");
+				}
+				numbersInt[i] = integer; 
+			}			
+			}catch(NumberFormatException e){
+				throw new StringCalculatorException("invalid!");
+		}
+		
+		return numbersInt;
 	}
 }
diff --git a/src/StringCalculatorException.java b/src/StringCalculatorException.java
index da71147..d8ec247 100644
--- a/src/StringCalculatorException.java
+++ b/src/StringCalculatorException.java
@@ -1,4 +1,7 @@
 
 public class StringCalculatorException extends Exception {
+	public StringCalculatorException(String message){
+		super(message);
+	}
 
 }
diff --git a/tests/StringCalculatorTest.java b/tests/StringCalculatorTest.java
index 4ec9afe..580d7a4 100644
--- a/tests/StringCalculatorTest.java
+++ b/tests/StringCalculatorTest.java
@@ -5,8 +5,101 @@
 public class StringCalculatorTest {
 
 	@Test
-	public void test() {
-		fail("Not yet implemented");
+	public void testReturn_Sum_1_2() throws StringCalculatorException {
+		//Arrange
+		StringCalculator cal = new StringCalculator();
+		//Act
+		int sum = cal.add("1,2");
+		assertEquals(3, sum);
+		
+	}
+	
+	@Test
+	public void testReturn_Sum_0() throws StringCalculatorException {
+		//Arrange
+		StringCalculator cal = new StringCalculator();
+		//Act
+		int sum = cal.add("0");
+		assertEquals(0, sum);		
+	}
+	
+	@Test
+	public void testReturn_Sum_1_2_3() throws StringCalculatorException {
+		//Arrange
+		StringCalculator cal = new StringCalculator();
+		//Act
+		int sum = cal.add("1,2,3");
+		assertEquals(6, sum);
+		
+	}
+	
+	@Test
+	public void testHandle_NewLine_1_2() throws StringCalculatorException{
+		//Arrange
+		StringCalculator cal = new StringCalculator();
+		//Act
+		String str = cal.handleNewLines("1\n2");
+		assertEquals("1,2", str);
+	}
+	
+	@Test
+	public void testHandle_NewLine_1_2_3() throws StringCalculatorException{
+		//Arrange
+		StringCalculator cal = new StringCalculator();
+		//Act
+		String str = cal.handleNewLines("1,2\n3");
+		assertEquals("1,2,3", str);
+	}
+	
+	@Test(expected = StringCalculatorException.class)
+	public void testInvalidNegtive_Invalid1() throws StringCalculatorException{
+		//Arrange
+		StringCalculator cal = new StringCalculator();
+		//Act
+		int[] numbers = cal.invalidNegtive("1,2\n");
+	}
+	
+	@Test(expected = StringCalculatorException.class)
+	public void testInvalidNegtive_Negtive() throws StringCalculatorException{
+		//Arrange
+		StringCalculator cal = new StringCalculator();
+		//Act
+		int[] numbers = cal.invalidNegtive("-1");	
+	}
+	
+	@Test(expected = StringCalculatorException.class)
+	public void testInvalidNegtive_Invalid() throws StringCalculatorException{
+		//Arrange
+		StringCalculator cal = new StringCalculator();
+		//Act
+		int[] numbers = cal.invalidNegtive("abc");
+	}
+	
+
+	@Test(expected = StringCalculatorException.class)
+	public void testInvalidNegtive_1_2_a() throws StringCalculatorException{
+		//Arrange
+		StringCalculator cal = new StringCalculator();
+		//Act
+		int[] sum = cal.invalidNegtive("1,2,a");
+	}
+	
+
+	@Test(expected = StringCalculatorException.class)
+	public void testInvalidNegtive_1_2_valid() throws StringCalculatorException{
+		//Arrange
+		StringCalculator cal = new StringCalculator();
+		//Act
+		int[] sum = cal.invalidNegtive("1,2,#");
+	}
+	
+
+	@Test(expected = StringCalculatorException.class)
+	public void testInvalidNegtive_1_invalid() throws StringCalculatorException{
+		//Arrange
+		StringCalculator cal = new StringCalculator();
+		//Act
+		int[] sum = cal.invalidNegtive("1,\n");
 	}
 
 }