From a7c0a8e03141a01127105aa3544e0450c9c8434b Mon Sep 17 00:00:00 2001
From: alang <alang@STUPID-PC729.stnet.local>
Date: Fri, 14 Oct 2016 16:45:31 +0300
Subject: [PATCH] Finished exercise - #5

---
 bin/.gitignore             |   2 ++
 bin/Spreadsheet.class      | Bin 613 -> 1723 bytes
 bin/SpreadsheetTest.class  | Bin 490 -> 1473 bytes
 src/Spreadsheet.java       |  47 ++++++++++++++++++++++++++++++++-----
 tests/SpreadsheetTest.java |  40 +++++++++++++++++++++++++++----
 5 files changed, 79 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..0effaa5326fccf498ac3305a1bda2fc9e963a752 100644
GIT binary patch
literal 1723
zcmZ`&O>^5+6g|(9Eys}@N02~B8d3s@Ka{vFZ3!ez+M1La@&Pdu2BsU?5w?ozWF)!&
zB|CO(x_}vQr!d2?=0{P^ljK+>WfDtQ=iPhmxgYQEe}4ZHz)c)!$Ouff&V0u{33`qb
zYET7AkL{;+-Lw1M`eFOA(+TMlocV6(w4{%~)L!H<2wktfZ=Y=nOtjo?-wp@9BXH~0
z)2;Y3qHBe|+wX2(Mz+b3+j9GExGkWRE5`zA<MhNSK!KrS0tF3I0@LHX5AC4G+yxY2
zOhCZYkws2wbNkN0;7Qx@zqZ>R^_Y979osv$eOG=bpc?kvK)~2b6;BOHSJt;uzO1lv
z8Jfg9SkN#}nz1fw((x9q{D&oO<Yt;Bfi%4PO3ULOvHp(Zc~bp&8cF-uZh3ZWdjpoI
z1XA+qYb0NetQ<?tD>_zDX5`s`ksImAL{lpA|Ah-=pT-jMjx_9$;}WoB`EM7nh;<!x
zT;pInJ=?#>RBE|dX~>fsIzGfro_J2b8}_1+H)Zf`9UozX1-b!e==g3&U?wdvX+h;X
z>HUe0O>7C|-C)$UY`M{phl|+Ov4gv$3I^>U+B<>Sa<iEpLBf{DeQH_W_5D+yyY4$&
z<bKlL?Dwu8P`hYQzh_I+XoYs?2M#*gr97I1)^;A9)XI<6`K;{7^k3-Mla**s?6A{w
zxNAcGZ2sB;h1Ti7?>G-!xuB)g4z9~-<0^|&ctr&=a;y2)_?1CEvUwYbOcJ?IFTr=I
z`W$-o4-~(Bj?!<K{w4B$gU@2bqe5lm6rXPr)8iP-V3uD(jw|6iVh)+NRQ(mxwHKJn
z;4duhTR#)aK=Kv%2Jd5$`6bs<?4NKkl897aq~CkAGPIZRe!_o9Z^>^&{MHM6px~Ra
z*qD5Z0!t}!<AU5s$Vq@oLS7w-7lo)uV7FQuqPA}-L#*9aEo+GD>WQ?oRob`Ck+%+h
z!cuicoyiXI@i|OO9XZ|MNzS}?uqG>3qKd1m8I+S_w+!}bj(=Bqi<U8u>sY`YT)|xq
zyg^iU<cL$EhzrrXiRc{HG49ARnWeYF*pby>r((>&20mrH$~+bx(8}U7GS;BH#0qj6
zgoZ`_LkM8*B?HG8VTrQcyhcgW<xu6&jGFmyh|kZFRi7!(2*mZp8?wTgu5zZ8sD{}%
z;GzZt`_wBU9o)D{n!I=kzfEU3RC9iMY3@hp3(@O!N$OmSYn<(k)O5{@Bqk16tW<B}
QkXB}tu0-%l!Wn$^FV}iAKmY&$

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..3d98d911b11fcd61fead7f614cbb12f13415cd75 100644
GIT binary patch
literal 1473
zcma))*-qO)7=_OSNK7y#gb>OS_ALYmw540<5+Pbu3REg6Qm>E`M#0F~;DzhHMjxX$
zfLf^!(8uV5R6UcpB+y*s#^V|N=Re<>`G5WS{u96x6k~`83>=)h(m3``r1TG^=f}`3
zkT^9ijl5;pwfx7*sjT_}(QVT<{nr9r%h|F(_l|Qc<LE-KjvhqWr)1i4KRByM_t2<V
zQXpA!s)kiITvP4C!*2h?^aKV=_iPISai8`(gz+gJ{S?@~c_z!IXHs3XZO1o!)3GT|
zlpME~KMlx}SIC7Jk^+4#9pe~8ZyduIi6Kovv%ctg()D#b#Hc{OQQz%5{(fLt0>jIt
z`@st;Y{WZfaVs)$V+!}Z^fgSfqPVGHT0m?m>scLhnCDe_k~g>1+V#M9O}kcT@d;0|
zWu;uyv4mwRYf8D;Mw$Izs)DZQ$YE7LZ$#R?2n>r?b;rB$l&#+3Nj+orQaxESf5;_}
zQbBhw4J+Ww9GSK+Ytq%Q$+Vk_`LWJnBC{sL8iBDpl8eCc<?)eMkFMdFK=1D_UyVwY
zUkxvqmj411cSNRLbzGODcci*X4col(hKyIuIgHNjx~}7LZVsHlt;%<%8oE@=6daO!
zT?N7nXu_cfqWt5$@*CqW&sA{kS-FPxjXx2@!y>StkN<k3fNMW@0uLyTU?8kYa8->y
z@GQc${|5#?Ut_40yFsei@Il?Z4;tI3MyheTAqX35q#DC`ooAx0g~c8!!{n_+GLxLT
z!b~oixx&I;a%%Mk*`{Zj9l__(kVFDQ7(ogdPKxrLZgjf!PKVwj46}xHk_p~TyP$0;
zHvUmO+DmS<qZlQ{7%9d{F+qw<#}r$gQ#@^<c;1d;h7_};m?OnJ85TOGc-c8cp@rgA
YJBlnRR!ET}#VRS*I;METmy6)-U!YkDt^fc4

delta 173
zcmX@e{fe3E)W2Q(7#J8#7^Ek1^|P{+q!yP<T%xbY!63xQAncc4qEMMyqL7(ekdvC5
znpcvV!o?uMAjZxhI`N~Zk~o6|BLhoXVrC8_gQ$j2R$^JAeokUux_)p;QD$DcwPx7l
z^Gy1TOq2gJh1r`hFajY11DlZG4hG?kKo%1N7m(xv(hLmT46F>iK$3xh2cil{^8$H{
L43a>Si9regb#EfV

diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java
index e4f120b..3ab828e 100644
--- a/src/Spreadsheet.java
+++ b/src/Spreadsheet.java
@@ -1,18 +1,53 @@
+import java.util.HashMap;
+import java.util.Map;
 
 public class Spreadsheet {
+	
+	private Map<String, String> spriteSheet = new HashMap<String, String>();
 
 	public String get(String cell) {
-		// to be implemented
-		return null;
+		String cellValue = spriteSheet.get(cell);
+		
+		return cellValue;
 	}
 	
 	public void set(String cell, String value) {
-		// to be implemented
+		spriteSheet.put(cell, value);
 	}
 	
 	public String evaluate(String cell) {
-		// to be implemented
-		return null;
+		
+		String cellValue = get(cell);
+		String returnValue;
+		char first = cellValue.charAt(0);
+		char last = cellValue.charAt(cellValue.length() -1);
+		
+		if(isNumeric(cellValue) == true){
+			returnValue = cellValue;
+		}else if(isString(first, last) == true){
+			returnValue = cellValue.substring(1, cellValue.length()-1);
+		}else{
+			returnValue = "#Error";
+		}
+		
+		return returnValue;
+	}
+	
+	public boolean isNumeric(String s){
+		
+		if(s.matches("-?\\d+(\\.\\d+)?")){
+			return true;
+		}else{
+			return false;
+		}
 	}
 	
-}
+	public boolean isString(char a, char b){
+		
+		if(a == '’' && b == '’'){
+			return true;
+		}else{
+			return false;
+		}
+	}
+}
\ No newline at end of file
diff --git a/tests/SpreadsheetTest.java b/tests/SpreadsheetTest.java
index 9e0936a..267f1d4 100644
--- a/tests/SpreadsheetTest.java
+++ b/tests/SpreadsheetTest.java
@@ -7,9 +7,41 @@
 public class SpreadsheetTest {
 
 	@Test
-	public void test() {
-		fail("Not yet implemented");
-		
+	public void testCreate() {
+		Spreadsheet sp = new Spreadsheet();
+		assertNotNull(sp);
 	}
-
+	
+	@Test
+	public void testGet() {
+		Spreadsheet sp = new Spreadsheet();
+		sp.set("A1", "5");
+		String cv = sp.get("A1");
+		assertEquals("5", cv);
+	}
+	
+	@Test
+	public void testEvaluate_integer() {
+		Spreadsheet sp = new Spreadsheet();
+		sp.set("A1", "1");
+		String cv = sp.evaluate("A1");
+		assertEquals("1", cv);
+	}
+	
+	@Test
+	public void testEvaluate_quoted_string() {
+		Spreadsheet sp = new Spreadsheet();
+		sp.set("A1", "’abc’");
+		String cv = sp.evaluate("A1");
+		assertEquals("abc", cv);
+	}
+	
+	@Test
+	public void testEvaluate_incorrect_value() {
+		Spreadsheet sp = new Spreadsheet();
+		sp.set("A1", "’abc1");
+		String cv = sp.evaluate("A1");
+		assertEquals("#Error", cv);
+	}
+	
 }