From a49d34e8dcd951145b1d1c9bd1673937e5f90a40 Mon Sep 17 00:00:00 2001
From: akairala <akairala@STUPID-PC721.stnet.local>
Date: Fri, 14 Oct 2016 16:47:51 +0300
Subject: [PATCH] Project finished

---
 bin/.gitignore             |   2 ++
 bin/Spreadsheet.class      | Bin 613 -> 897 bytes
 bin/SpreadsheetTest.class  | Bin 490 -> 1255 bytes
 src/Spreadsheet.java       |  20 +++++++++++------
 tests/SpreadsheetTest.java |  43 ++++++++++++++++++++++++++++++++++---
 5 files changed, 55 insertions(+), 10 deletions(-)
 create mode 100644 bin/.gitignore

diff --git a/bin/.gitignore b/bin/.gitignore
new file mode 100644
index 0000000..2079672
--- /dev/null
+++ b/bin/.gitignore
@@ -0,0 +1,2 @@
+/Spreadsheet.class
+/SpreadsheetTest.class
diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class
index 92b411f05752a6cee6d06c9769e1b70d40aa0840..791dfc31d47e8394882c1a911a94ef659be6e4bc 100644
GIT binary patch
literal 897
zcmZ{iOK;Oa6ot>&Nlk1gaa!Kb7Wzm+MK&xzsk#6Ou}A<ZD2U}G9VM=e6FGK&7f8@b
zAR*TLD8w1tY7K^k$1~UWe)rtt`T6VXcL0ykv0w-|qh+Mz(Q2+#Y@s6H9m^Bh3uHL!
zy`CJaX)I8ksvuYiYz)$GN$dx`mvS{9%4J`mHu7hojFU(SJS}G&WT6x|iX%Uq^~;e%
za@G#~(2oxV%ywriP<g&MQZ`J~UDRM(XbQAS{cSW*uR&nlMHOoT&4C}PSILKoir&ge
zKuzm|#Z(4k8TtC02P^U1=S1~EVSH*ZXNvRgw#y1T<&f@u)5SI1`l}@KtzRt3Ll*A*
z;c#XMht&>isTbzwUeWy%86=#;Txo54|Ik*h>WsCxZ5KP(W#uwq<&$D%uBTA>f6)T=
zXpuxy^}^SFdIifKX}#E@|0eI0;KQH5x5b@-ON{b<z~<^O@+>_AUiS=c_Zu4T&)|JQ
z>r<M&!L^Zcs;H3AB<nI`Zp!s=1y^|z^!s|wd&3^OZ=?Get%s+$@dLMq`yUxGplLSW
zdUe@dlQy&LoTR(m#XYiI=52CkaKDB7Ieo}%O?OiI{wW^3yAYb8n}mA>v~!Mjax}}&
K(R+j$X#WNgyS=0U

literal 613
zcma)2%T5A85Ug32hdcyd=us~U9OPoWVDw<(X`=@W_hFg9kaaQ3!guM(#DgE;M;WVk
zH%i1rFWuGCT~*!l{_*+-;0y;vI0}{iV`TJbJ~1XP!c}NY^-^~O9ge$q!>RFOg~Ejm
zZG5SaYqbXo?)7YB%E)1(iaZJmb<c+8cJVMY(Y+o9Mq%5V`8pWr$V#0(y79!$6>8p!
zWsjm`LyzN@_ifydBO8u;?e!<R`z8p)VQrjJbCEjvMQVLoF3B%-u;98SBS6Q5<^F6D
z`R2yT8I6@qPsI;MpbNhbaEW+5W06&tSuy83FDN||I4CnpTX2Q3nhr46SSf6x&M4$_
zW=H1Klf)HfAz?PtZpM^}2DZrIFJLFrxFS;)Q$NisiNs;r{F2~piG(b&OXM)`{bQl}
L9}6{;1NJ`w6*Odv

diff --git a/bin/SpreadsheetTest.class b/bin/SpreadsheetTest.class
index e7086bd9ef1b6a8b7afcfb717afbaddbf99a7876..48845f0c38882ab2ee2b882a57af2aaa2941c3ac 100644
GIT binary patch
literal 1255
zcma)*TTc@~9L3L+LQA_)SOEnE7rC|wwFoLgObUVc&`4rQjV~rkJCr5cS=~<YbD1a@
zP5c0UDC3#7NlV%U9(Hyvd(Q8Fnf?3k*B<~|*oz?|kScx-rCX_=OQ}y}UB?g=7`t#U
z-K_7bYWDc_LYB3_u;yX&D}j+hmuOdDXwOrgej_ljnl1@M4}ywJU;s%AF~nmS5lD6^
z60ndQ1~C=}F~k@Oo|5kxwNn|MxTn4punR%i^-FH(nRR<Js?WW;z<4*^gv<zR6J1g2
zlIu6*NpK*2Uts!uLus!jOJ3chOJ1o!yV?sBO~wjASj}EE7<abm5y!MZB%h1pp@7Jl
z7-uca;W4wSOBP^dwa}?bQHP$Y?)L7aOGY_w;RzO~tQzHVA7#2%8po1=bL4uytT;Mw
zLa7^}axP6u&RH1LoHEl&U<K(IR+&O4gM7U%Lv100H37?Qt`5I6T%Vcl^r3gbTm9|M
zq`hN0IoO1ocJ!p)u6e6#Z(UXKS&%rMv54y|;-)~RClw{DtpBBSRI}Heqy(l+0}sP6
z2#?i=Fi_Q_AgsAMj%^xl=i_+EI`$Y!BX9!cd^Hm1tgYGMm0W0=2_%X^BP`1!R#jl4
z>lT`>Z<w?&&#O4VUqbNVedHMBoHv)_FjxCLHD_a)Ya}wiVST*D=ntg6aW8^#j-yRI
ze;t0GqSEG`)zaV|Cb$xqq+bM6oDXqzpKs&+iOLAybD8f**$?cQD?DmVuizByMSEuL
zCzd-Tn+!&RBz-68HcKZ%n`*hVX_NGRigj`XHtxjD-sI-&Y(MTCx%1>MlDl*Z_xYW;
bTQ|8c>{tD`YvgW_n<IDg7Vc|SBZA%kVs-|+

delta 266
zcmaFP`HGqA)W2Q(7#J8#7^Ek1=}rumVC0<G<H^cWl3H9c@r9wI5F>-IUw(-~Won5+
zW^O@FYHn&?Nooogg9w8dJA)`AgFt>!x_(w^US^5DV{vh6Q3(%&ID-Tu14~+BW)35R
z=;V)#!c3ZBlixDw)-y0LF)%W)GOz(jcA%yDK$;OqvubT;;MfRcFfnieNsu%HPysiP
z<bfyv(!4+(BLg2$mWhEMs!9N?4&-`>L2N>TI~ar!CUF7PG62nC1?uKzkc1h>1~(2U
I1XLmg0Nx@c$N&HU

diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java
index e4f120b..4d438c8 100644
--- a/src/Spreadsheet.java
+++ b/src/Spreadsheet.java
@@ -1,18 +1,24 @@
+import java.util.*;
+import java.util.regex.Pattern;
+
 
 public class Spreadsheet {
+	
+	HashMap<String,String> cells = new HashMap<String,String>();
 
 	public String get(String cell) {
-		// to be implemented
-		return null;
+		String value = cells.get(cell);
+		return value;
 	}
 	
 	public void set(String cell, String value) {
-		// to be implemented
+		cells.put(cell, value);
 	}
 	
-	public String evaluate(String cell) {
-		// to be implemented
-		return null;
-	}
+	// ## Not implemented yet ##
+	//public String evaluate(String cell) {
+	//	
+	//	Pattern correctFormats = Pattern.compile("");
+	//}
 	
 }
diff --git a/tests/SpreadsheetTest.java b/tests/SpreadsheetTest.java
index 9e0936a..aaf73cd 100644
--- a/tests/SpreadsheetTest.java
+++ b/tests/SpreadsheetTest.java
@@ -6,10 +6,47 @@
 
 public class SpreadsheetTest {
 
+	Spreadsheet testsheet = new Spreadsheet();
+
+	
 	@Test
-	public void test() {
-		fail("Not yet implemented");
+	public void testSetValueToCell() {
+		
+		// Arrange value to cell A1
+		testsheet.set("A1", "1");
 		
+		// Get value from cell A1
+		String value = testsheet.get("A1");
+		
+		// Assert
+		assertEquals("Failed to return value from cell", "1", value);
 	}
-
+	
+	
+	@Test
+	public void testNumberHandling() {
+		
+		// Arrange value to cell A1
+		testsheet.set("A1", "-1");
+		
+		// Get value from cell A1
+		String value = testsheet.get("A1");
+		
+		// Assert
+		assertEquals("Failed to return negative number from cell", "-1", value);
+	}
+	
+	
+	@Test
+	public void testErrorOnWrongFormat() {
+		// Arrange
+		testsheet.set("A1", "5A");
+		
+		// Get value from cell A1
+		String value = testsheet.get("A1");
+		
+		// Assert
+		assertEquals("Failed to return error on wrong format", "#Error", value);
+	}
+	
 }