From 2ac041d5889b379646e0e9cfcf5f11082d96e909 Mon Sep 17 00:00:00 2001
From: Kati <Kati@Kati-Netbook.Dlink>
Date: Mon, 8 Oct 2018 19:54:10 +0300
Subject: [PATCH] Assignment Finished

---
 bin/StringCalculator.class      | Bin 405 -> 1965 bytes
 bin/StringCalculatorTest.class  | Bin 505 -> 2982 bytes
 src/StringCalculator.java       |  99 +++++++++++++++++++++++++++++---
 tests/StringCalculatorTest.java |  99 ++++++++++++++++++++++++++++++--
 4 files changed, 187 insertions(+), 11 deletions(-)

diff --git a/bin/StringCalculator.class b/bin/StringCalculator.class
index a937b0c43633d36f133837cd90ddd10fb14ac782..579dd69e13a2919d0d193fda358d24be232b299b 100644
GIT binary patch
literal 1965
zcmZuy-%}e^6#i~@!zLj#C4^{c_*Gj<vZ0h8Vj&H-rC_muc0$p%<4l*ZL$?i^m@I<t
z&iEfVQ^y(gsV{ly3phH1Prmr-i+_QC1&ZIj8$w!m$lbf=o;~OLzH`papa1=O0ALa;
z1_A=-3trW6H|MNUal2%B<*EUl*5}q&)@aFcH%C8Ne{L5&fwr5D>v*#Q+HiVJK%Xmb
z*b!(5M-fDuKy1lz?Un7Vb-TK1t(R<p_)@uOmDa4PBi|cF-FxQL<k{PKbBt_lYzTA@
zFP&ufy>jVAfyn%B(XMz-*{vCf3tV_RLi0R=1d;~2-{9eUNAV8c6)>FI{8q*LTCsT?
zfk00b7ZD?kP1`F_kWzz72)zO#B185^F@QmVP_gWKmgADf#a66y&#Y>}{&L%Pi*_!p
zqP`c!WfiqjEf?)tZN=V^GSxyDV$`gRIvhnB8G&G}QgW#C)z*;5^q-uTB!W(aCGwFd
zu3=OlO!ZcG$}E9Ea`=od(u>l4EQ)dI-bMF^?hCiP<KEsXZ@ZrQFyg8T)|glp=~N*o
zSk)$R!GahKU&cBkn?Ogwvx+a4t%@qWfg2Ir#H@k5K<7!|Mc1=8?P?SsN})m(t6H;Z
zGjLm=|HO^x*jWqZ>Xzj-3r#dN2{d5u3JkWOJ<~fE!U7xjNjCBYKiM6V%eV|76%!7B
zF1xHy-mVty1xI#px3B-na9opsFi06S&JfVX9lM{a!M9O91)sspK0>d#2_VvN0uS1`
zkNOULcJNK$9Afl3&%MsKP8H^FT69|On|tVbiJ(@`nESYpPX&HNFjY6>sXg?)L|9rc
z@%73cuC9z6e2@0u(D`T|=I<j1!Jl|OvX5+CuGi}frztQ~DzU*tA%tm(5mth5lC<{|
z&J}{m637_hm_`??lE6HNMuN}yuo~bA5EHydI5Vv4`<No^EMt6t8_YFL{}_VdLqx^7
zLv$IKX{Q5c>=fVcXpwRz&0mnqr+zr$k*Y5T>PoRVq1<Xv=%L`?Tm=a>j3I&@=4qNh
zGc7QaO_)jCQ80s~=fg}e;~egCl`xYC9HLVkF;T#PFc^r-EuM0AxxQJQZ)uTehs^jq
zg<sCL3ZM0b&nn@$wg~T|zE0uCiEM&NCecGY0~Ab(JK#rcq8@69YcwSFv4$nqL_<uD
z{V8~V&?1{>!qmno=c9a!oTjc!vn{4n@6-D7aoZ@Rc^Ng8?o<7Ehxq2G@Llw=6^8H;
zJ?_E8qQX7NIxt-m_k?NyPBJdhQ#OUH`91D5eiLfZy$2c_LmculKjNXU{milUyrfQ%
z`-c{pZCcA~v#&5>_DVuidbi$6sat=Ve}#@2{g~G`n&>qTem?puC7a3M{9bNS%&4jO
zlz|`cq(G>vEX_ltutvYnNcVGIuMbG-v7$Sxns2&Ece+70z~`c(t5b}R72OzT=stHk
mqxi&i)o}d?{tH8pd4kOOhpW17M)3Av--QDNxkQ!$EdLMYxm!E{

delta 130
zcmZ3>Kb4v5)W2Q(7#J8#7(^y=ZI~?2q&QigS&xxvvLCZnA`=5QP>P3v5lFHEX<i`B
z$iT<I4<y-vY%?Iu1f-dm*MLX{E+EMUR?QC9DF%^+>IA6}U=Re#GcpK))e8dvq^k=^

diff --git a/bin/StringCalculatorTest.class b/bin/StringCalculatorTest.class
index d44b83f48579a95c814a0008fdfcca590443d2de..687aa687ec8d3cfea59a7a8aa2eb7edb8cebdd67 100644
GIT binary patch
literal 2982
zcmb7_4O1Fd6o%gmD(gaHRW#M4i8f85&LSUv#6(T1R?`@oFO6wFTC(6u*5G1bNs}MY
zAJmz)>9jNb0sT>(zW2f|2<te=2zxK*zR!ElJ?HZ8e}DZ0U>@%x2nob@+=}fKH_TF@
zRx;gkW!I{@5%dUrerUcolO@wBCLiVxt%57iS9J>v6d203FI(ofE4E|1w*|se(|ZCv
z8|8gVM;Or<BG3c|vbJMAs2%04%C4C&SyHA<y*;yH%W-3}$9-d01x7m%(it&5k|Hqn
zq~^Hxk+o-6Z7yDOoU&`WcG=-t>Q;)$!x{sV>()WJVl77y=a$-C>lj9~9|GrN=tZBv
zpi4;3Iy!bg=Bg?)0{Z5Mf_1E<Be+0vyNdrk2`yyhSHmR%NX|qIllY3+G57ZcMy9gO
z{MH4Rr|;?b8rLGYN}=Ws)~Z#j;>K_tQvxwljW*xa%o2CnJGH$nlRcz-S9y{pE9a;j
z_wtnGpROSx5K5;gs-oPV%Z-q#2F`{Tjd?FPtYMxrX(Qv!gfuL1CS_#2^``UDTki#F
z8dhm0ZOj?-8t(8hW$>k8O&~%sInN_KVY2KtR0K5Z!!ZlYVqPwE9J`<0Wer<0eR&q(
z`CzGxhI<0S5EyQ5)dy+F(hk=f`_=(VKOlqx4_V3Slwq1C-JHN!MHbk5FTWa|Fs+F+
z3!*7>GKBek%3LJUMuOQJKQ)ZhA6VFljLg#MVRIT@GHk&}EDBsvYDcW?ocqRfa_Uq&
z@ISG96I`&wGmuv68)~V5T!~GY%U3M(tp@HmJg+Z$r`oH5O&U(=3jz~uBvoS7met;(
zJ`IPm6m%ZChLWm^jLt`=KC92s(oVTnDOg*!yaYPhX_qZHE1Lt8?94Drn0c1%$)`a+
z^D^OkKSxP^vb)eb^9lN|d<Y@N_dYe*htK#Ns|Vm51~_5~b8(0=^{63!N}*fCNTJxw
z-xz-W2_wH_w5g|ag;a`Cv8fsJHNT){7-Nj-p~|?gevva$eO1i^1N}3<VRY!rKXCb%
zKXIiU5U1cs3t+$pOrHU`(*O*{F{2R1DTp!df4l`T=p$y&KolE@w1-GG5OJgxa?T$w
zsPT;s3qzCuF44keOz@TB`8Ly;_O0AJ!;00gl8ob)Laj7V_4MBMjns4T%_&B%(#SR1
zxsF*(wHQhIM%Dw2M0vs&`M*)Xx9V_jvN&YvM3t3I!k)Dstik(#wuKP&33t0Ed>2H>
zkT4fW*zTTiKZtOHgrz{j_uUg71QAw9SPdjR>Yng8h_FV&dLUt^d%|uIVT**jfrP#8
z3D1HE_esbG5}tQYco9T+M8e}h!mI8HKL!z=lCT#@$ORDOZSLKqJB`+#^lqWo)R%W@
z9C_7$`;Bq41<$EpkQZ$Bm%MXcwO}XxHas{3+j9986~^|l_3_)b@ll73`sMeUHcZ;c
S^YSaSSZQ8<WnLvA9RCkt<jYwA

literal 505
zcmZut%TB^T6g|VEg<1u9DZ0TOy09B|7!yL`s=-7E`=N|Dq@6MC)WpwnrE%d0_)*3?
zLV^o6_c7<5Gw0s#pU*D<1Dv}kFtny7m1;HSag@j0=yWDB<D$e+U-K6p#9Xa{`^8#B
zhQYa!N}5}SV*hf^P#Wu{@K8k6M;Q)7EtE=3@?;^>8DGSLp%Lnc$8(-a+ixFB=1FD@
zop9gZL((<mfuZ}5D<cyzmzgB;NGWZ&ky;VA9_n-ztaGvxSjWQ(8Vt>eHoaG2dNO&A
zMIw|DOAjq{T(pU^ql~glq{hbyPU*WxE@OsvKiqA+aW=GDdQ+XJk+_p~pYA@(*OrG1
z&|T=VK!GZ{2St~<fHI?8zIsRH?GN@ST9_VjK+)gUJ`Sm4I3l!w+IFf=*$NE^u^gvy
a{DJ09$)j1IN?P7OHHTC;YF$DLIQs?OC2EEM

diff --git a/src/StringCalculator.java b/src/StringCalculator.java
index 487916b..e773aff 100644
--- a/src/StringCalculator.java
+++ b/src/StringCalculator.java
@@ -1,9 +1,94 @@
-
 public class StringCalculator {
-	public int add(String numbersStr) {
-		// Returns the sum of the numbers given in numbersStr
-		
-		// not yet implemented
-		return 0;
+
+    // public add method to be implemented and tested - main code 
+	// Returns the sum of the numbers given in numbersStr
+	public int add(String numbersStr) throws StringCalculatorException {
+		int res;
+		if (numbersStr.isEmpty()) // Checking if input is empty
+			return 0;             // Yes - return 0
+		else {
+			res = getSingleNumber(numbersStr); // Calling private method for single number
+			if (res != -1)                     // If ok? -1 is not ok
+				return res;                    // Yes - return method's result
+			else if (numbersStr.contains("\n"))       // If new lines in input
+				return processNewLines(numbersStr);   // then call private method to process
+			else { // Split input into array of numbers, separated by comma
+				String[] numbers = numbersStr.split(",");  
+				if (numbers.length == 0)   // If array's length = 0 - exception 
+					throw new StringCalculatorException();
+				else if (numbers.length == 2)  // exactly 2 numbers
+					return addTwoNum(numbers);  
+				else
+					// And at last - private method for unknown amount of numbers in input
+					return addUnknownAmountNum(numbers);  
+			}
+		}
+	} // End of add method
+	
+	// ------------------------------------------------------------------------------------
+	// private methods to use from add method
+	// Note - in case we need to test these methods separately, we should redefine them as public 
+	
+
+	// Get an integer number from string input. Returns -1, if input is not number
+	private int getSingleNumber(String str) throws StringCalculatorException {
+		try {
+				int res = Integer.parseInt(str); // Convert string to int
+				if (res < 0)                     // Negative - exception
+					throw new StringCalculatorException();
+				else
+					return res;
+			} catch (NumberFormatException ex) {  // Not number - return -1
+				return -1;
+			}
+	}
+
+	// Process New Lines
+	private int processNewLines(String numbersStr) throws StringCalculatorException {
+		String[] numbers = numbersStr.split("[,\n]");  // Split input into string array,
+		                                               // Separator is comma + new line
+		if (numbers.length == 0)                       // Empty array - exception
+			throw new StringCalculatorException();
+		else if (numbers.length == 2)
+			return addTwoNum(numbers);  
+		else
+			return addUnknownAmountNum(numbers);
 	}
-}
+	
+
+	// Returns the sum of two numbers given in string numbers array
+	private int addTwoNum(String[] numbers) throws StringCalculatorException {
+		try {
+			int x1, x2;
+			// Convert both strings to ints and check for negatives
+			// For negatives - StringCalculatorException
+			// For not numbers Integer.parseInt - NumberFormatException
+			if ((x1 = Integer.parseInt(numbers[0])) < 0) 
+				throw new StringCalculatorException();
+			else if ((x2 = Integer.parseInt(numbers[1])) < 0)
+				throw new StringCalculatorException();
+			else
+				return x1 + x2; // All ok - return sum of 2 numbers
+			} catch (NumberFormatException ex) {
+				throw new StringCalculatorException();
+			}
+	}
+	
+	
+	// Returns the sum of the numbers given in string numbers array
+	private int addUnknownAmountNum(String[] numbers) throws StringCalculatorException {
+		int sum = 0; // Initialize sum
+		for (int i = 0; i < numbers.length; i++) // Loop through...
+			try {
+				int n = Integer.parseInt(numbers[i]); // Convert string to int
+				if (n < 0) // Negative - exception
+					throw new StringCalculatorException();
+				else sum += n; // add to sum
+			} catch (NumberFormatException ex) { // Check for not number - exception
+				throw new StringCalculatorException();
+			}
+		return sum;
+	}
+	
+
+} // End of class
\ No newline at end of file
diff --git a/tests/StringCalculatorTest.java b/tests/StringCalculatorTest.java
index 4ec9afe..7115a48 100644
--- a/tests/StringCalculatorTest.java
+++ b/tests/StringCalculatorTest.java
@@ -1,12 +1,103 @@
 import static org.junit.Assert.*;
 
+import org.junit.Before;
 import org.junit.Test;
 
 public class StringCalculatorTest {
 
+	private StringCalculator stcalc; // Define an object
+	
+	@Before
+	public void init() {
+		stcalc = new StringCalculator(); // and create it
+	}
+	
+	
+	// Set of test cases below
+	
 	@Test
-	public void test() {
-		fail("Not yet implemented");
+	public void test_empty_string() throws StringCalculatorException {
+		assertEquals(0, stcalc.add(""));
 	}
-
-}
+	
+	@Test
+	public void test_single_number() throws StringCalculatorException {
+		assertEquals(10, stcalc.add("10"));
+	}
+	
+	@Test
+	public void test_two_numbers() throws StringCalculatorException {
+		assertEquals(10, stcalc.add("6,4"));
+		assertEquals(3, stcalc.add("1,2"));
+		assertEquals(2, stcalc.add("0,2"));
+	}
+	
+	@Test
+	public void test_any_numbers() throws StringCalculatorException {
+		assertEquals(8, stcalc.add("1,3,4"));
+		assertEquals(0, stcalc.add("0,0,0"));
+		assertEquals(10, stcalc.add("1,2,3,4"));
+	}
+	
+	@Test(expected = StringCalculatorException.class)
+	public void test_single_not_number() throws StringCalculatorException {
+		stcalc.add("abc");
+		
+	}
+	
+	@Test(expected = StringCalculatorException.class)
+	public void test_single_not_number2() throws StringCalculatorException {
+		stcalc.add(",");
+	}
+	
+	@Test(expected = StringCalculatorException.class)
+	public void test_two_not_number() throws StringCalculatorException {
+		stcalc.add("abc,def");
+	}
+	
+	@Test(expected = StringCalculatorException.class)
+	public void test_two_not_number2() throws StringCalculatorException {
+		stcalc.add("10,aaa");
+	}
+	
+	@Test(expected = StringCalculatorException.class)
+	public void test_single_negative_number() throws StringCalculatorException {
+		stcalc.add("-1");
+	}
+	
+	@Test(expected = StringCalculatorException.class)
+	public void test_two_negative_numbers() throws StringCalculatorException {
+		stcalc.add("-1,-2");
+	}
+	
+	@Test(expected = StringCalculatorException.class)
+	public void test_two_negative_numbers2() throws StringCalculatorException {
+		stcalc.add("-2,4");
+	}
+	
+	@Test(expected = StringCalculatorException.class)
+	public void test_two_negative_numbers3() throws StringCalculatorException {
+		stcalc.add("5,-6");
+	}
+	
+	@Test(expected = StringCalculatorException.class)
+	public void test_more_than_two_negative_numbers() throws StringCalculatorException {
+		stcalc.add("-5,-8,2,-1");
+	}
+	
+	@Test
+	public void test_two_numbers_line_break() throws StringCalculatorException {
+		assertEquals(10, stcalc.add("4\n6"));
+		assertEquals(5, stcalc.add("0\n5"));
+	}
+	
+	@Test
+	public void more_than_two_numbers_line_break() throws StringCalculatorException {
+		assertEquals(6, stcalc.add("1\n2,3"));
+		assertEquals(6, stcalc.add("1,2\n3"));
+		assertEquals(6, stcalc.add("1\n2\n3"));
+	}
+	
+	// More tests can go here
+	
+} // End of test class
\ No newline at end of file