From a4e0333984ab19a9a35b7a6b6f0c07f067eefc5c Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 15:31:59 +0300 Subject: [PATCH 01/55] besouro automatic message --- .besouro/20161012152902644/actions.txt | 4 ++ .../20161012152902644/besouroEpisodes.txt | 0 .besouro/20161012152902644/disagreements.txt | 0 .../randomHeuristicEpisodes.txt | 0 .besouro/20161012152902644/userComments.txt | 0 .besouro/20161012152902644/zorroEpisodes.txt | 0 bin/.gitignore | 3 + bin/Spreadsheet.class | Bin 613 -> 2703 bytes bin/SpreadsheetTest.class | Bin 490 -> 1036 bytes src/Spreadsheet.java | 60 ++++++++++++++++-- src/SpreadsheetException.java | 6 ++ tests/SpreadsheetTest.java | 24 ++++++- 12 files changed, 90 insertions(+), 7 deletions(-) create mode 100644 .besouro/20161012152902644/actions.txt create mode 100644 .besouro/20161012152902644/besouroEpisodes.txt create mode 100644 .besouro/20161012152902644/disagreements.txt create mode 100644 .besouro/20161012152902644/randomHeuristicEpisodes.txt create mode 100644 .besouro/20161012152902644/userComments.txt create mode 100644 .besouro/20161012152902644/zorroEpisodes.txt create mode 100644 bin/.gitignore create mode 100644 src/SpreadsheetException.java diff --git a/.besouro/20161012152902644/actions.txt b/.besouro/20161012152902644/actions.txt new file mode 100644 index 0000000..b1bacee --- /dev/null +++ b/.besouro/20161012152902644/actions.txt @@ -0,0 +1,4 @@ +FileOpenedAction 1476275342933 SpreadsheetTest.java 803 4 7 3 +CompilationAction 1476275503008 SpreadsheetTest.java +CompilationAction 1476275503164 SpreadsheetTest.java +EditAction 1476275519071 SpreadsheetTest.java 859 4 7 3 diff --git a/.besouro/20161012152902644/besouroEpisodes.txt b/.besouro/20161012152902644/besouroEpisodes.txt new file mode 100644 index 0000000..e69de29 diff --git a/.besouro/20161012152902644/disagreements.txt b/.besouro/20161012152902644/disagreements.txt new file mode 100644 index 0000000..e69de29 diff --git a/.besouro/20161012152902644/randomHeuristicEpisodes.txt b/.besouro/20161012152902644/randomHeuristicEpisodes.txt new file mode 100644 index 0000000..e69de29 diff --git a/.besouro/20161012152902644/userComments.txt b/.besouro/20161012152902644/userComments.txt new file mode 100644 index 0000000..e69de29 diff --git a/.besouro/20161012152902644/zorroEpisodes.txt b/.besouro/20161012152902644/zorroEpisodes.txt new file mode 100644 index 0000000..e69de29 diff --git a/bin/.gitignore b/bin/.gitignore new file mode 100644 index 0000000..89286d2 --- /dev/null +++ b/bin/.gitignore @@ -0,0 +1,3 @@ +/Spreadsheet.class +/SpreadsheetTest.class +/SpreadsheetException.class diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 92b411f05752a6cee6d06c9769e1b70d40aa0840..3d71dc3ebf7e12746370735e420dbc4b0ae96eb3 100644 GIT binary patch literal 2703 zcmaJ@Yf}?f7=AX_B`gSwa?z-Zc!2;Sh!+H`6ai@gEm3T=tuDzzR^kSCH=@0Frr-Nn z`k~`YXZ+#^dl6>pRQs(n{Uz;xU}~Rp5+F*Z$?Q32-*evgeV+GnlE41_?InPId=o`L zL3MK3wako{wJbl1kb=59=6$m#XF7{Lm*?+TX(NVr3>B-&(ZX(X8pxZ^O-< z`U+~sW@j(Y-kKguCPya56zCNXjpiNCHywY@%oQvZyA(v)##}e=((GZ=^DNi5dE}z) z2{IW4$_)kTP&#Kjwtrqhu)SkWL1;9ev0`XMa}-Sqc5TOKG)E&ETCi6^W5)7q*UF4+ znoatQ3JK82jVdUJYp6p#^`~sdnkn3!x7@43tpJ}-o4GmDwZ(f$SVR5v(zLl;dXEfA zP%#8?NP~ffC=S1ouwrag93_oj744k*R3tc^RMEw$U&V1wr&OHabXr9pr!y-0Ih|E; zn$v)avz)pG-g6qN5EH8*4b{-1U_=@!6hREbI3&)EXb2<1fcaUQ#A~L?%8U68E?TUo zqwPCW)v;5gAU5_OZ7s_LMR7^N?lNmzTPogD&^42H45yIG8J?^!!+NmH+O;yqLf$n* z{Tg=0a(sKiw%iydFeL&w&6=)+Wlr$9tl=WAyoI*d5`*PvOCoX>ZphIS9FJA7yOUyv z^mI+b9IjJyxj@ac<(ehqWt#toAbej`IqTOF3)5%GD!8fPBYdo&DV=wG({{X(H+oF; zb-BkFZg-`UcWWM00t#MmiFm+|Eb6k)|D@g?TOAzA2 zp5;Ul{q~q2y*DYJFTS~4qR?jEWwV zCU6E_5^SRAWDD#79GL++Mjp$A)k>Xvlm%t2@)x(ZY6Ay~zXp{G1lER7<-6D-DFc2ggtd4kSPl|{343t+2EpF+3$ zu_6H$qZ!;lSg8$A&bw#_s7Lf9K=sQ&ZpQI}h@*tr$#f6I`_}O3BZNZ|rjWdR{QB?U zHqHa`UKn8R&JpJjGd_&NIM1*S5%owJ-u^AT{rFM_bT@am@v`Og4gSX@URFOg~Ejm zZG5SaYqbXo?)7YB%E)1(iaZJmb8p! zWsjm`LyzN@_ifydBO8u;?e!vfox$ys{#uD|ja1>8Q(Egwg%{~;gk~V9IDp(Do3JxY$r9D?9N4$W=sZ;UEqV!DvXvrZDzuf zUvHGf5Y4BRe?1{12B*6d{WJ(LA)TJDQxjlMI@31$bfTX+v!Mm_An2_z`fflm8yVe4 znRfQFH<-_2-godmHmYCY=1{xCMu_qRS*g9*$^Upw%5{Ugh7T p|G(V(Tey|2+=s-??Vw#><)drRwrOi_)pq=!G`^L_$*CN){s4~=-UR>v delta 308 zcmeC-c*V?h>ff$?3=9k=4AK+1bmiD=GV?M^>=+rCH8jH*8Cab2Q&PDYm>D>E7+4wD zCi5`5u(Fh-7MDzJVl)gBVq_5Z%P&!=Of6B!%q_@C%}vcKNloEm5MdBwXAos%5Xdh| z*Uu^inyBwsT%1}|!owiWAOSQsEip5PkwH|$Co8cmQ9ma!FI_*lq$o2l-C8qjvKy0b zJp%(110%>vAjuANo<5Lf1k$Wp+Zi}E0vSvUTtE^e%>Y!u4J3IW3V<{(kjKct2b5)E u;D@Rb0ILJ}6JijXkl+pmVT4IsK(!1&b6A18xfvv3#<9VT0}26^NC5x<9W2KH diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index e4f120b..6af9410 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -1,18 +1,68 @@ +import java.util.Hashtable; public class Spreadsheet { + Hashtable cells; + + private String[] allowedIntegerChars = {"1","2","3","4","5","6","7","8","9","-" }; + public final String ERROR_MESSAGE = "#Error"; + + public Spreadsheet() { + cells = new Hashtable(); + } - public String get(String cell) { - // to be implemented - return null; + public String get(String cell) throws SpreadsheetException{ + if (null == cell) + throw new SpreadsheetException("Non null string expected for cell identifier"); + + return cells.get(cell); } public void set(String cell, String value) { // to be implemented + cells.put(cell, value); } - public String evaluate(String cell) { + public String evaluate(String cell) throws SpreadsheetException { // to be implemented - return null; + + String rawVal = cells.get(cell); + + if (!containsAllowedIntegers(rawVal)) + return ERROR_MESSAGE; + + return rawVal; + } + + private String charAsStringFromPos(String str, int pos) throws SpreadsheetException { + if (pos < 0 || pos > (str.length() - 1)) + throw new SpreadsheetException("Position out of bounds when getting string of 1 len from a string"); + + String ret = str.substring(pos, pos + 1); + + assert 1 == ret.length(); + + return ret; + } + + private boolean containsAllowedIntegers(String value) throws SpreadsheetException { + for (int i = 0; i < value.length(); i++) { + if (!isAllowedInteger(charAsStringFromPos(value, i))) + return false; + } + + return true; + } + + private boolean isAllowedInteger(String character) throws SpreadsheetException { + if (character.length() > 1) + throw new SpreadsheetException("Checking if integer is allowed possible for only strings with len of 1"); + + for (int i = 0; i < allowedIntegerChars.length; i++) { + if (character.equals(allowedIntegerChars[i])) + return true; + } + + return false; } } diff --git a/src/SpreadsheetException.java b/src/SpreadsheetException.java new file mode 100644 index 0000000..6adb6b0 --- /dev/null +++ b/src/SpreadsheetException.java @@ -0,0 +1,6 @@ + +public class SpreadsheetException extends Exception { + public SpreadsheetException(String msg) { + super(msg); + } +} diff --git a/tests/SpreadsheetTest.java b/tests/SpreadsheetTest.java index 9e0936a..18b57e9 100644 --- a/tests/SpreadsheetTest.java +++ b/tests/SpreadsheetTest.java @@ -5,11 +5,31 @@ public class SpreadsheetTest { + Spreadsheet spreadsheet = new Spreadsheet(); @Test - public void test() { - fail("Not yet implemented"); + public void testSetGet() throws SpreadsheetException { + spreadsheet.set("A1", "1"); + assertEquals("Cell does not return correct value", "1" , spreadsheet.get("A1")); } + @Test + public void testNegativeEvaluation() throws SpreadsheetException { + spreadsheet.set("A1", "-1"); + + assertEquals("Negative cell value evaluated incorrectly", "-1", spreadsheet.evaluate("A1")); + } + + @Test + public void testWronglyFormattedInteger_expectFail() throws SpreadsheetException { + spreadsheet.set("A1", "5A"); + + assertEquals("Wrongly formatted integer not detected", "#Error", spreadsheet.evaluate("A1")); + } + + @Test + public void testWronglyFormattedInteger_expectSuccess() { + fail("not implemented yet"); + } } From 8c0082fc3fb88903c7f37a1b3d6dd156735dca87 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 15:33:23 +0300 Subject: [PATCH 02/55] besouro automatic message --- .besouro/20161012152902644/actions.txt | 3 +++ bin/SpreadsheetTest.class | Bin 1036 -> 1471 bytes tests/SpreadsheetTest.java | 7 ++++++- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/.besouro/20161012152902644/actions.txt b/.besouro/20161012152902644/actions.txt index b1bacee..0777c63 100644 --- a/.besouro/20161012152902644/actions.txt +++ b/.besouro/20161012152902644/actions.txt @@ -2,3 +2,6 @@ FileOpenedAction 1476275342933 SpreadsheetTest.java 803 4 7 3 CompilationAction 1476275503008 SpreadsheetTest.java CompilationAction 1476275503164 SpreadsheetTest.java EditAction 1476275519071 SpreadsheetTest.java 859 4 7 3 +UnitTestCaseAction 1476275522266 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476275522267 SpreadsheetTest.java FAIL +EditAction 1476275603353 SpreadsheetTest.java 1057 4 12 3 diff --git a/bin/SpreadsheetTest.class b/bin/SpreadsheetTest.class index d098806a3e46835dafd0ea8917ff95f21d96b970..48a96d6aace6878b1e7d20f15d39db037dc3d25a 100644 GIT binary patch literal 1471 zcmb7@ZBG+H5Xb*pN_&)p!ttO$(GwJC6$%O}f@r~(m^7GJQsXOgv`aa1y{mg$0w2pn zfoS3f@Ix7AuPtq)(eUCPW_D+PGyk3W_51rz0IS%IBE%3c)C9N6{t@SLpZhY3FvHNX zbz-F*%dMo}9USwLWa#(X`xplD9bp>`kxkpRI8M{%2Bw1a)M#4z!`?n=ALi?(kQB;&fCw1OzgEboa*`nXPIr2~Y9 z1VbpZqTvn$TTvyLI__bHiuM(Bej(qMtssT%RyMACl0^;o8D@64YzH4H}>+f zX}it3oikPQnvSQcX05e@3RjR1!gDLmSq=hX;uAluk!Cr|b~LOLbSO>ZKC*eGRV}M%3Ne)tbYroX#$r zXIv`vw{`5`4b8zJWyLVoMPH>|tl-r}iRWz9@SQ!X8g5B76ZIEeK8-7*hbAR>Gc{A> z=_6~KR@K^2>H@LU59l8+F!&AeFXRhhnBIdyJdHKQ#3|AspWcYU2u8`G1Zk}YlP;HFG7El^i`C-zz-x+UlBK^jOlaSHD-*$s)$74e0!`7h!m5fen5?n>MuV(6NdtE8*Cv54{N5}CGY WG1?2d?_SJwoEEuKEK92)vfox$ys{#uD|ja1>8Q(Egwg%{~;gk~V9IDp(Do3JxY$r9D?9N4$W=sZ;UEqV!DvXvrZDzuf zUvHGf5Y4BRe?1{12B*6d{WJ(LA)TJDQxjlMI@31$bfTX+v!Mm_An2_z`fflm8yVe4 znRfQFH<-_2-godmHmYCY=1{xCMu_qRS*g9*$^Upw%5{Ugh7T p|G(V(Tey|2+=s-??Vw#><)drRwrOi_)pq=!G`^L_$*CN){s4~=-UR>v diff --git a/tests/SpreadsheetTest.java b/tests/SpreadsheetTest.java index 18b57e9..ed10b8b 100644 --- a/tests/SpreadsheetTest.java +++ b/tests/SpreadsheetTest.java @@ -30,6 +30,11 @@ public void testWronglyFormattedInteger_expectFail() throws SpreadsheetException @Test public void testWronglyFormattedInteger_expectSuccess() { - fail("not implemented yet"); + spreadsheet.set("A1", "4327"); + spreadsheet.set("A2", "437813"); + spreadsheet.set("A3", "2305843570"); + spreadsheet.set("A4", "574139578490"); + spreadsheet.set("A5", "-4719472819"); + spreadsheet.set("A6", "-99378914327"); } } From 35cfa19ceb73748deffdd3655b5077756c4c543b Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 15:33:44 +0300 Subject: [PATCH 03/55] besouro automatic message --- .besouro/20161012152902644/actions.txt | 1 + bin/SpreadsheetTest.class | Bin 1471 -> 1617 bytes tests/SpreadsheetTest.java | 6 +++--- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.besouro/20161012152902644/actions.txt b/.besouro/20161012152902644/actions.txt index 0777c63..f43f860 100644 --- a/.besouro/20161012152902644/actions.txt +++ b/.besouro/20161012152902644/actions.txt @@ -5,3 +5,4 @@ EditAction 1476275519071 SpreadsheetTest.java 859 4 7 3 UnitTestCaseAction 1476275522266 SpreadsheetTest.java FAIL UnitTestSessionAction 1476275522267 SpreadsheetTest.java FAIL EditAction 1476275603353 SpreadsheetTest.java 1057 4 12 3 +EditAction 1476275624871 SpreadsheetTest.java 1062 4 12 3 diff --git a/bin/SpreadsheetTest.class b/bin/SpreadsheetTest.class index 48a96d6aace6878b1e7d20f15d39db037dc3d25a..afa8b5b8975ea860912773f089cfe191fb0455f1 100644 GIT binary patch delta 298 zcmXwz%SyyR5JgWXqD>NzX~m78_y%!clJ3~)l}zIM{q}Qa<;K4m6c;XZ@6MlbDOLuu zxpk^8RkyyhQ#zb$DT}I=nG=f@3)o(Gy)_Ms$UgRTfwiT4#q1 YJe$;PVZ_ZQvAu>l=A~6Uh(|WME}bVh{qdcp$16gc(GDJVpjrAj!nw1_0H59%=vp diff --git a/tests/SpreadsheetTest.java b/tests/SpreadsheetTest.java index ed10b8b..c5c210a 100644 --- a/tests/SpreadsheetTest.java +++ b/tests/SpreadsheetTest.java @@ -31,9 +31,9 @@ public void testWronglyFormattedInteger_expectFail() throws SpreadsheetException @Test public void testWronglyFormattedInteger_expectSuccess() { spreadsheet.set("A1", "4327"); - spreadsheet.set("A2", "437813"); - spreadsheet.set("A3", "2305843570"); - spreadsheet.set("A4", "574139578490"); + spreadsheet.set("A2", "437d813++"); + spreadsheet.set("A3", "23.05843570"); + spreadsheet.set("A4", "574f139578490"); spreadsheet.set("A5", "-4719472819"); spreadsheet.set("A6", "-99378914327"); } From d11d124800094795d846a9da9a42045c174bd673 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 15:33:49 +0300 Subject: [PATCH 04/55] besouro automatic message --- .besouro/20161012152902644/actions.txt | 1 + bin/SpreadsheetTest.class | Bin 1617 -> 1622 bytes tests/SpreadsheetTest.java | 2 +- 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.besouro/20161012152902644/actions.txt b/.besouro/20161012152902644/actions.txt index f43f860..809c481 100644 --- a/.besouro/20161012152902644/actions.txt +++ b/.besouro/20161012152902644/actions.txt @@ -6,3 +6,4 @@ UnitTestCaseAction 1476275522266 SpreadsheetTest.java FAIL UnitTestSessionAction 1476275522267 SpreadsheetTest.java FAIL EditAction 1476275603353 SpreadsheetTest.java 1057 4 12 3 EditAction 1476275624871 SpreadsheetTest.java 1062 4 12 3 +EditAction 1476275629924 SpreadsheetTest.java 1063 4 12 3 diff --git a/bin/SpreadsheetTest.class b/bin/SpreadsheetTest.class index afa8b5b8975ea860912773f089cfe191fb0455f1..99a3242154b0d76e167b18d4e8b08f8ee73cdc34 100644 GIT binary patch delta 66 zcmcb}bB$+19J48>iLrT#g`u&wHV1@@E3qJq= diff --git a/tests/SpreadsheetTest.java b/tests/SpreadsheetTest.java index c5c210a..518ef59 100644 --- a/tests/SpreadsheetTest.java +++ b/tests/SpreadsheetTest.java @@ -30,7 +30,7 @@ public void testWronglyFormattedInteger_expectFail() throws SpreadsheetException @Test public void testWronglyFormattedInteger_expectSuccess() { - spreadsheet.set("A1", "4327"); + spreadsheet.set("A1", "4327_"); spreadsheet.set("A2", "437d813++"); spreadsheet.set("A3", "23.05843570"); spreadsheet.set("A4", "574f139578490"); From aa57e4dfb830b587f54d5179d3d1c597d6096d4a Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 15:33:53 +0300 Subject: [PATCH 05/55] besouro automatic message --- .besouro/20161012152902644/actions.txt | 1 + bin/SpreadsheetTest.class | Bin 1622 -> 1623 bytes tests/SpreadsheetTest.java | 2 +- 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.besouro/20161012152902644/actions.txt b/.besouro/20161012152902644/actions.txt index 809c481..0de0d5e 100644 --- a/.besouro/20161012152902644/actions.txt +++ b/.besouro/20161012152902644/actions.txt @@ -7,3 +7,4 @@ UnitTestSessionAction 1476275522267 SpreadsheetTest.java FAIL EditAction 1476275603353 SpreadsheetTest.java 1057 4 12 3 EditAction 1476275624871 SpreadsheetTest.java 1062 4 12 3 EditAction 1476275629924 SpreadsheetTest.java 1063 4 12 3 +EditAction 1476275633135 SpreadsheetTest.java 1063 4 12 3 diff --git a/bin/SpreadsheetTest.class b/bin/SpreadsheetTest.class index 99a3242154b0d76e167b18d4e8b08f8ee73cdc34..51b6b5d350f4d3ac6007ff298afea6b7a10854e9 100644 GIT binary patch delta 19 acmcb{bDd{{4>KF9iLsG+{N_MrR%QS^=>-k| delta 18 Zcmcc4bB$+%4>K!^iLsIS<{)NPW&k$;1g-!8 diff --git a/tests/SpreadsheetTest.java b/tests/SpreadsheetTest.java index 518ef59..711455c 100644 --- a/tests/SpreadsheetTest.java +++ b/tests/SpreadsheetTest.java @@ -30,7 +30,7 @@ public void testWronglyFormattedInteger_expectFail() throws SpreadsheetException @Test public void testWronglyFormattedInteger_expectSuccess() { - spreadsheet.set("A1", "4327_"); + spreadsheet.set("A1", "43_27"); spreadsheet.set("A2", "437d813++"); spreadsheet.set("A3", "23.05843570"); spreadsheet.set("A4", "574f139578490"); From d073f85a071bde7c2a2e32ef2507386df8793da2 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 15:34:57 +0300 Subject: [PATCH 06/55] besouro automatic message --- .besouro/20161012152902644/actions.txt | 1 + bin/SpreadsheetTest.class | Bin 1623 -> 1623 bytes tests/SpreadsheetTest.java | 3 +++ 3 files changed, 4 insertions(+) diff --git a/.besouro/20161012152902644/actions.txt b/.besouro/20161012152902644/actions.txt index 0de0d5e..f839991 100644 --- a/.besouro/20161012152902644/actions.txt +++ b/.besouro/20161012152902644/actions.txt @@ -8,3 +8,4 @@ EditAction 1476275603353 SpreadsheetTest.java 1057 4 12 3 EditAction 1476275624871 SpreadsheetTest.java 1062 4 12 3 EditAction 1476275629924 SpreadsheetTest.java 1063 4 12 3 EditAction 1476275633135 SpreadsheetTest.java 1063 4 12 3 +EditAction 1476275697497 SpreadsheetTest.java 1226 4 14 5 diff --git a/bin/SpreadsheetTest.class b/bin/SpreadsheetTest.class index 51b6b5d350f4d3ac6007ff298afea6b7a10854e9..5bc40a87d52ab5bd5bcc1a5348e06a0957e5dd98 100644 GIT binary patch delta 16 Xcmcc4bDd{{KQnW@k@@BzW>#hZFzp1S delta 16 Xcmcc4bDd{{KQptDdHm)eW>#hZFqj0S diff --git a/tests/SpreadsheetTest.java b/tests/SpreadsheetTest.java index 711455c..be9cb4d 100644 --- a/tests/SpreadsheetTest.java +++ b/tests/SpreadsheetTest.java @@ -36,5 +36,8 @@ public void testWronglyFormattedInteger_expectSuccess() { spreadsheet.set("A4", "574f139578490"); spreadsheet.set("A5", "-4719472819"); spreadsheet.set("A6", "-99378914327"); + + assertFalse("", spreadsheet.evaluate("A5").equals("#Error")); + assertEquals("Wrongly formatted integer not detected", "#Error", spreadsheet.evaluate("A1")); } } From 25bbdf831dcdb528b66a6f9ead6729655f0f2f70 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 15:35:40 +0300 Subject: [PATCH 07/55] besouro automatic message --- .besouro/20161012152902644/actions.txt | 3 +++ bin/SpreadsheetTest.class | Bin 1623 -> 1796 bytes tests/SpreadsheetTest.java | 5 +++-- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.besouro/20161012152902644/actions.txt b/.besouro/20161012152902644/actions.txt index f839991..5b575ec 100644 --- a/.besouro/20161012152902644/actions.txt +++ b/.besouro/20161012152902644/actions.txt @@ -9,3 +9,6 @@ EditAction 1476275624871 SpreadsheetTest.java 1062 4 12 3 EditAction 1476275629924 SpreadsheetTest.java 1063 4 12 3 EditAction 1476275633135 SpreadsheetTest.java 1063 4 12 3 EditAction 1476275697497 SpreadsheetTest.java 1226 4 14 5 +CompilationAction 1476275697757 SpreadsheetTest.java +CompilationAction 1476275714985 SpreadsheetTest.java +EditAction 1476275740857 SpreadsheetTest.java 1324 4 14 5 diff --git a/bin/SpreadsheetTest.class b/bin/SpreadsheetTest.class index 5bc40a87d52ab5bd5bcc1a5348e06a0957e5dd98..e58f6fa5989584942572ff28499a2d0907407beb 100644 GIT binary patch delta 261 zcmcc4)56Df>ff$?3=9k=49Oe0jxpDBFoZEOFmN$MFhsF4L^3i6WF?j*>gOcprRxWm z6lLb6^Dsm+#4s|jr52VZ<`gqBh-&yCl=vrQr6!kHYesP~Xfed`FvK$?Ffwo_78j=$ zmAC@4Flbu;*I5#k`FaTY`kT&@OtCN9HsMZz+ zej(p&3?@Q0+Ze)kFvJR33E6-JrGbJw7&JEm6*Dmi0!cLn&dKs@(yAH^p$wV~sX(U) V0Y!Nr#xV#phyZzv42fX%NdSFaJZ1m@ delta 126 zcmZqSyUxRP>ff$?3=9k=4B;EOjxlfcV0p?Y&BP!H6k=mwWRL>VoIu>lzzpOuFgQ;R zVsmoc2xKua2m(nt26iB+$iU5@#306?3}mS==rE` Date: Wed, 12 Oct 2016 15:35:42 +0300 Subject: [PATCH 08/55] besouro automatic message --- .besouro/20161012152902644/actions.txt | 1 + bin/SpreadsheetTest.class | Bin 1796 -> 1868 bytes tests/SpreadsheetTest.java | 1 - 3 files changed, 1 insertion(+), 1 deletion(-) diff --git a/.besouro/20161012152902644/actions.txt b/.besouro/20161012152902644/actions.txt index 5b575ec..f0c1239 100644 --- a/.besouro/20161012152902644/actions.txt +++ b/.besouro/20161012152902644/actions.txt @@ -12,3 +12,4 @@ EditAction 1476275697497 SpreadsheetTest.java 1226 4 14 5 CompilationAction 1476275697757 SpreadsheetTest.java CompilationAction 1476275714985 SpreadsheetTest.java EditAction 1476275740857 SpreadsheetTest.java 1324 4 14 5 +EditAction 1476275742518 SpreadsheetTest.java 1228 4 13 4 diff --git a/bin/SpreadsheetTest.class b/bin/SpreadsheetTest.class index e58f6fa5989584942572ff28499a2d0907407beb..da88c10675957c5da1bea6a7f7b270d34630ba74 100644 GIT binary patch delta 136 zcmZqSJHxl(Dzl@5bAC}#YH~?Vr9xVMQEp;MNotBhW?o5ZdTNnEX0bwUW^qYkc50qN zVlhxS8B_7*Ys|$=j5{WKv6buVF>o_5Fem~^B?d7DWgtt1L5D$=!JI*j!HGeG!G%GS TAqYr^GH5ZRGH6eJ!6pL$VpS$I delta 64 zcmX@Z*TT2qDl;R)W-*pxCdLhuyV%Or)fhM#7#I{8xEYif#2A!;EENVF22}=g1~mpJ S1`UQ#22F-k2Cc~k>@onW!wRqf diff --git a/tests/SpreadsheetTest.java b/tests/SpreadsheetTest.java index a4f83c8..32b9e75 100644 --- a/tests/SpreadsheetTest.java +++ b/tests/SpreadsheetTest.java @@ -39,6 +39,5 @@ public void testWronglyFormattedInteger_expectSuccess() throws SpreadsheetExcept assertFalse("Correctly formatted integer is mistaken as incorrectly formatted", spreadsheet.evaluate("A5").equals("#Error")); - assertEquals("Wrongly formatted integer not detected", "#Error", spreadsheet.evaluate("A1")); } } From 31e2293b132389d344f5e0dd188fa7f538851382 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 15:35:54 +0300 Subject: [PATCH 09/55] besouro automatic message --- .besouro/20161012152902644/actions.txt | 3 +++ .../20161012152902644/besouroEpisodes.txt | 1 + .../randomHeuristicEpisodes.txt | 1 + .besouro/20161012152902644/zorroEpisodes.txt | 1 + bin/SpreadsheetTest.class | Bin 1868 -> 1848 bytes tests/SpreadsheetTest.java | 2 +- 6 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.besouro/20161012152902644/actions.txt b/.besouro/20161012152902644/actions.txt index f0c1239..9e58f48 100644 --- a/.besouro/20161012152902644/actions.txt +++ b/.besouro/20161012152902644/actions.txt @@ -13,3 +13,6 @@ CompilationAction 1476275697757 SpreadsheetTest.java CompilationAction 1476275714985 SpreadsheetTest.java EditAction 1476275740857 SpreadsheetTest.java 1324 4 14 5 EditAction 1476275742518 SpreadsheetTest.java 1228 4 13 4 +UnitTestCaseAction 1476275744043 SpreadsheetTest.java OK +UnitTestSessionAction 1476275744044 SpreadsheetTest.java OK +EditAction 1476275754233 SpreadsheetTest.java 1228 4 13 4 diff --git a/.besouro/20161012152902644/besouroEpisodes.txt b/.besouro/20161012152902644/besouroEpisodes.txt index e69de29..a7fea0c 100644 --- a/.besouro/20161012152902644/besouroEpisodes.txt +++ b/.besouro/20161012152902644/besouroEpisodes.txt @@ -0,0 +1 @@ +1476275744044 test-addition 1 401 true diff --git a/.besouro/20161012152902644/randomHeuristicEpisodes.txt b/.besouro/20161012152902644/randomHeuristicEpisodes.txt index e69de29..a7fea0c 100644 --- a/.besouro/20161012152902644/randomHeuristicEpisodes.txt +++ b/.besouro/20161012152902644/randomHeuristicEpisodes.txt @@ -0,0 +1 @@ +1476275744044 test-addition 1 401 true diff --git a/.besouro/20161012152902644/zorroEpisodes.txt b/.besouro/20161012152902644/zorroEpisodes.txt index e69de29..2a620da 100644 --- a/.besouro/20161012152902644/zorroEpisodes.txt +++ b/.besouro/20161012152902644/zorroEpisodes.txt @@ -0,0 +1 @@ +1476275744044 test-addition 1 401 false diff --git a/bin/SpreadsheetTest.class b/bin/SpreadsheetTest.class index da88c10675957c5da1bea6a7f7b270d34630ba74..3e9d67357e9f060d636678a2a25a820fe52670ac 100644 GIT binary patch delta 67 zcmX@Zw}Wp(CmZJy24)6E1_p+($&=VZc{c)CObmiRQj39WG7Gz=v=ETZ15v>s%pd~f LF)}2ARV4uck!}dE delta 65 zcmdnNcZP36CmZJu1{MZJ1_p+-$&=VZCu_4wG3zmKPyWKDDWA%q%^(Dn;ep6A2s4NP Nd5jE+K$3|e2>{4r3Vi?o diff --git a/tests/SpreadsheetTest.java b/tests/SpreadsheetTest.java index 32b9e75..4383e4f 100644 --- a/tests/SpreadsheetTest.java +++ b/tests/SpreadsheetTest.java @@ -38,6 +38,6 @@ public void testWronglyFormattedInteger_expectSuccess() throws SpreadsheetExcept spreadsheet.set("A6", "-99378914327"); assertFalse("Correctly formatted integer is mistaken as incorrectly formatted", - spreadsheet.evaluate("A5").equals("#Error")); + spreadsheet.evaluate("A3").equals("#Error")); } } From d4a99eab29eeeafbbd140c5e6ab33a433913b522 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 15:35:58 +0300 Subject: [PATCH 10/55] besouro automatic message --- .besouro/20161012152902644/actions.txt | 3 +++ bin/SpreadsheetTest.class | Bin 1848 -> 1848 bytes tests/SpreadsheetTest.java | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.besouro/20161012152902644/actions.txt b/.besouro/20161012152902644/actions.txt index 9e58f48..97ed3b7 100644 --- a/.besouro/20161012152902644/actions.txt +++ b/.besouro/20161012152902644/actions.txt @@ -16,3 +16,6 @@ EditAction 1476275742518 SpreadsheetTest.java 1228 4 13 4 UnitTestCaseAction 1476275744043 SpreadsheetTest.java OK UnitTestSessionAction 1476275744044 SpreadsheetTest.java OK EditAction 1476275754233 SpreadsheetTest.java 1228 4 13 4 +UnitTestCaseAction 1476275754972 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476275754973 SpreadsheetTest.java FAIL +EditAction 1476275758898 SpreadsheetTest.java 1228 4 13 4 diff --git a/bin/SpreadsheetTest.class b/bin/SpreadsheetTest.class index 3e9d67357e9f060d636678a2a25a820fe52670ac..7d29f0c8d9bbf8432cb7fd393edfa3bce6f37e12 100644 GIT binary patch delta 13 UcmdnNw}WrPZ8k>N$#>Xd047=mH2?qr delta 13 UcmdnNw}WrPZ8k>V$#>Xd049P3Jpcdz diff --git a/tests/SpreadsheetTest.java b/tests/SpreadsheetTest.java index 4383e4f..32b9e75 100644 --- a/tests/SpreadsheetTest.java +++ b/tests/SpreadsheetTest.java @@ -38,6 +38,6 @@ public void testWronglyFormattedInteger_expectSuccess() throws SpreadsheetExcept spreadsheet.set("A6", "-99378914327"); assertFalse("Correctly formatted integer is mistaken as incorrectly formatted", - spreadsheet.evaluate("A3").equals("#Error")); + spreadsheet.evaluate("A5").equals("#Error")); } } From 5a7448389e763bc8780980c2815a34e71fd9859a Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 15:36:03 +0300 Subject: [PATCH 11/55] besouro automatic message --- .besouro/20161012152902644/actions.txt | 1 + bin/SpreadsheetTest.class | Bin 1848 -> 1848 bytes tests/SpreadsheetTest.java | 2 +- 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.besouro/20161012152902644/actions.txt b/.besouro/20161012152902644/actions.txt index 97ed3b7..300cbd0 100644 --- a/.besouro/20161012152902644/actions.txt +++ b/.besouro/20161012152902644/actions.txt @@ -19,3 +19,4 @@ EditAction 1476275754233 SpreadsheetTest.java 1228 4 13 4 UnitTestCaseAction 1476275754972 SpreadsheetTest.java FAIL UnitTestSessionAction 1476275754973 SpreadsheetTest.java FAIL EditAction 1476275758898 SpreadsheetTest.java 1228 4 13 4 +EditAction 1476275763511 SpreadsheetTest.java 1228 4 13 4 diff --git a/bin/SpreadsheetTest.class b/bin/SpreadsheetTest.class index 7d29f0c8d9bbf8432cb7fd393edfa3bce6f37e12..3e9d67357e9f060d636678a2a25a820fe52670ac 100644 GIT binary patch delta 13 UcmdnNw}WrPZ8k>V$#>Xd049P3Jpcdz delta 13 UcmdnNw}WrPZ8k>N$#>Xd047=mH2?qr diff --git a/tests/SpreadsheetTest.java b/tests/SpreadsheetTest.java index 32b9e75..34ae25c 100644 --- a/tests/SpreadsheetTest.java +++ b/tests/SpreadsheetTest.java @@ -38,6 +38,6 @@ public void testWronglyFormattedInteger_expectSuccess() throws SpreadsheetExcept spreadsheet.set("A6", "-99378914327"); assertFalse("Correctly formatted integer is mistaken as incorrectly formatted", - spreadsheet.evaluate("A5").equals("#Error")); + spreadsheet.evaluate("A1").equals("#Error")); } } From b71fb36dc4725ec23661ac8a0b9353130989c59c Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 15:36:06 +0300 Subject: [PATCH 12/55] besouro automatic message --- .besouro/20161012152902644/actions.txt | 3 +++ bin/SpreadsheetTest.class | Bin 1848 -> 1848 bytes tests/SpreadsheetTest.java | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.besouro/20161012152902644/actions.txt b/.besouro/20161012152902644/actions.txt index 300cbd0..63357c2 100644 --- a/.besouro/20161012152902644/actions.txt +++ b/.besouro/20161012152902644/actions.txt @@ -20,3 +20,6 @@ UnitTestCaseAction 1476275754972 SpreadsheetTest.java FAIL UnitTestSessionAction 1476275754973 SpreadsheetTest.java FAIL EditAction 1476275758898 SpreadsheetTest.java 1228 4 13 4 EditAction 1476275763511 SpreadsheetTest.java 1228 4 13 4 +UnitTestCaseAction 1476275764528 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476275764528 SpreadsheetTest.java FAIL +EditAction 1476275766905 SpreadsheetTest.java 1228 4 13 4 diff --git a/bin/SpreadsheetTest.class b/bin/SpreadsheetTest.class index 3e9d67357e9f060d636678a2a25a820fe52670ac..1fc7095fec4f8572061d47bdbc99b004281a6f38 100644 GIT binary patch delta 13 UcmdnNw}WrPZ8k>f$#>Xd040b83jhEB delta 13 UcmdnNw}WrPZ8k>V$#>Xd049P3Jpcdz diff --git a/tests/SpreadsheetTest.java b/tests/SpreadsheetTest.java index 34ae25c..87a2b2b 100644 --- a/tests/SpreadsheetTest.java +++ b/tests/SpreadsheetTest.java @@ -38,6 +38,6 @@ public void testWronglyFormattedInteger_expectSuccess() throws SpreadsheetExcept spreadsheet.set("A6", "-99378914327"); assertFalse("Correctly formatted integer is mistaken as incorrectly formatted", - spreadsheet.evaluate("A1").equals("#Error")); + spreadsheet.evaluate("A2").equals("#Error")); } } From ac070c0730f1139af0ca1a265d32f5223c77b0c7 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 15:36:11 +0300 Subject: [PATCH 13/55] besouro automatic message --- .besouro/20161012152902644/actions.txt | 3 +++ bin/SpreadsheetTest.class | Bin 1848 -> 1848 bytes tests/SpreadsheetTest.java | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.besouro/20161012152902644/actions.txt b/.besouro/20161012152902644/actions.txt index 63357c2..110eeab 100644 --- a/.besouro/20161012152902644/actions.txt +++ b/.besouro/20161012152902644/actions.txt @@ -23,3 +23,6 @@ EditAction 1476275763511 SpreadsheetTest.java 1228 4 13 4 UnitTestCaseAction 1476275764528 SpreadsheetTest.java FAIL UnitTestSessionAction 1476275764528 SpreadsheetTest.java FAIL EditAction 1476275766905 SpreadsheetTest.java 1228 4 13 4 +UnitTestCaseAction 1476275767677 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476275767678 SpreadsheetTest.java FAIL +EditAction 1476275771720 SpreadsheetTest.java 1228 4 13 4 diff --git a/bin/SpreadsheetTest.class b/bin/SpreadsheetTest.class index 1fc7095fec4f8572061d47bdbc99b004281a6f38..969e1e670e656a3e52393819543b1da2eb035d96 100644 GIT binary patch delta 13 UcmdnNw}WrPZ8k>7$#>Xd047ESF#rGn delta 13 UcmdnNw}WrPZ8k>f$#>Xd040b83jhEB diff --git a/tests/SpreadsheetTest.java b/tests/SpreadsheetTest.java index 87a2b2b..4383e4f 100644 --- a/tests/SpreadsheetTest.java +++ b/tests/SpreadsheetTest.java @@ -38,6 +38,6 @@ public void testWronglyFormattedInteger_expectSuccess() throws SpreadsheetExcept spreadsheet.set("A6", "-99378914327"); assertFalse("Correctly formatted integer is mistaken as incorrectly formatted", - spreadsheet.evaluate("A2").equals("#Error")); + spreadsheet.evaluate("A3").equals("#Error")); } } From fe5c4444ac3a5e1b4e58e00846fb68879abeab01 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 15:36:14 +0300 Subject: [PATCH 14/55] besouro automatic message --- .besouro/20161012152902644/actions.txt | 3 +++ bin/SpreadsheetTest.class | Bin 1848 -> 1848 bytes tests/SpreadsheetTest.java | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.besouro/20161012152902644/actions.txt b/.besouro/20161012152902644/actions.txt index 110eeab..940c77c 100644 --- a/.besouro/20161012152902644/actions.txt +++ b/.besouro/20161012152902644/actions.txt @@ -26,3 +26,6 @@ EditAction 1476275766905 SpreadsheetTest.java 1228 4 13 4 UnitTestCaseAction 1476275767677 SpreadsheetTest.java FAIL UnitTestSessionAction 1476275767678 SpreadsheetTest.java FAIL EditAction 1476275771720 SpreadsheetTest.java 1228 4 13 4 +UnitTestCaseAction 1476275772671 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476275772672 SpreadsheetTest.java FAIL +EditAction 1476275774927 SpreadsheetTest.java 1228 4 13 4 diff --git a/bin/SpreadsheetTest.class b/bin/SpreadsheetTest.class index 969e1e670e656a3e52393819543b1da2eb035d96..7d29f0c8d9bbf8432cb7fd393edfa3bce6f37e12 100644 GIT binary patch delta 13 UcmdnNw}WrPZ8k>N$#>Xd047=mH2?qr delta 13 UcmdnNw}WrPZ8k>7$#>Xd047ESF#rGn diff --git a/tests/SpreadsheetTest.java b/tests/SpreadsheetTest.java index 4383e4f..0954ca0 100644 --- a/tests/SpreadsheetTest.java +++ b/tests/SpreadsheetTest.java @@ -38,6 +38,6 @@ public void testWronglyFormattedInteger_expectSuccess() throws SpreadsheetExcept spreadsheet.set("A6", "-99378914327"); assertFalse("Correctly formatted integer is mistaken as incorrectly formatted", - spreadsheet.evaluate("A3").equals("#Error")); + spreadsheet.evaluate("A4").equals("#Error")); } } From 516a6d682aa9b1c4416bf96c1531330695dc9e91 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 15:36:18 +0300 Subject: [PATCH 15/55] besouro automatic message --- .besouro/20161012152902644/actions.txt | 3 +++ bin/SpreadsheetTest.class | Bin 1848 -> 1848 bytes tests/SpreadsheetTest.java | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.besouro/20161012152902644/actions.txt b/.besouro/20161012152902644/actions.txt index 940c77c..85a908d 100644 --- a/.besouro/20161012152902644/actions.txt +++ b/.besouro/20161012152902644/actions.txt @@ -29,3 +29,6 @@ EditAction 1476275771720 SpreadsheetTest.java 1228 4 13 4 UnitTestCaseAction 1476275772671 SpreadsheetTest.java FAIL UnitTestSessionAction 1476275772672 SpreadsheetTest.java FAIL EditAction 1476275774927 SpreadsheetTest.java 1228 4 13 4 +UnitTestCaseAction 1476275775488 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476275775488 SpreadsheetTest.java FAIL +EditAction 1476275778532 SpreadsheetTest.java 1228 4 13 4 diff --git a/bin/SpreadsheetTest.class b/bin/SpreadsheetTest.class index 7d29f0c8d9bbf8432cb7fd393edfa3bce6f37e12..afbfa7113ba4528cabbade82b413986a5ac1933d 100644 GIT binary patch delta 13 UcmdnNw}WrPZ8k>F$#>Xd048n)IRF3v delta 13 UcmdnNw}WrPZ8k>N$#>Xd047=mH2?qr diff --git a/tests/SpreadsheetTest.java b/tests/SpreadsheetTest.java index 0954ca0..32b9e75 100644 --- a/tests/SpreadsheetTest.java +++ b/tests/SpreadsheetTest.java @@ -38,6 +38,6 @@ public void testWronglyFormattedInteger_expectSuccess() throws SpreadsheetExcept spreadsheet.set("A6", "-99378914327"); assertFalse("Correctly formatted integer is mistaken as incorrectly formatted", - spreadsheet.evaluate("A4").equals("#Error")); + spreadsheet.evaluate("A5").equals("#Error")); } } From b5558ffcac62a9ab21e3842a6d37dd2c9c11230f Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 15:36:22 +0300 Subject: [PATCH 16/55] besouro automatic message --- .besouro/20161012152902644/actions.txt | 3 +++ .../20161012152902644/besouroEpisodes.txt | 1 + .../randomHeuristicEpisodes.txt | 1 + .besouro/20161012152902644/zorroEpisodes.txt | 1 + bin/SpreadsheetTest.class | Bin 1848 -> 1848 bytes tests/SpreadsheetTest.java | 2 +- 6 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.besouro/20161012152902644/actions.txt b/.besouro/20161012152902644/actions.txt index 85a908d..94d9e6e 100644 --- a/.besouro/20161012152902644/actions.txt +++ b/.besouro/20161012152902644/actions.txt @@ -32,3 +32,6 @@ EditAction 1476275774927 SpreadsheetTest.java 1228 4 13 4 UnitTestCaseAction 1476275775488 SpreadsheetTest.java FAIL UnitTestSessionAction 1476275775488 SpreadsheetTest.java FAIL EditAction 1476275778532 SpreadsheetTest.java 1228 4 13 4 +UnitTestCaseAction 1476275779118 SpreadsheetTest.java OK +UnitTestSessionAction 1476275779118 SpreadsheetTest.java OK +EditAction 1476275782389 SpreadsheetTest.java 1228 4 13 4 diff --git a/.besouro/20161012152902644/besouroEpisodes.txt b/.besouro/20161012152902644/besouroEpisodes.txt index a7fea0c..6c9dbac 100644 --- a/.besouro/20161012152902644/besouroEpisodes.txt +++ b/.besouro/20161012152902644/besouroEpisodes.txt @@ -1 +1,2 @@ 1476275744044 test-addition 1 401 true +1476275779118 regression 2 24 true diff --git a/.besouro/20161012152902644/randomHeuristicEpisodes.txt b/.besouro/20161012152902644/randomHeuristicEpisodes.txt index a7fea0c..6c9dbac 100644 --- a/.besouro/20161012152902644/randomHeuristicEpisodes.txt +++ b/.besouro/20161012152902644/randomHeuristicEpisodes.txt @@ -1 +1,2 @@ 1476275744044 test-addition 1 401 true +1476275779118 regression 2 24 true diff --git a/.besouro/20161012152902644/zorroEpisodes.txt b/.besouro/20161012152902644/zorroEpisodes.txt index 2a620da..1f9bd06 100644 --- a/.besouro/20161012152902644/zorroEpisodes.txt +++ b/.besouro/20161012152902644/zorroEpisodes.txt @@ -1 +1,2 @@ 1476275744044 test-addition 1 401 false +1476275779118 regression 2 35 false diff --git a/bin/SpreadsheetTest.class b/bin/SpreadsheetTest.class index afbfa7113ba4528cabbade82b413986a5ac1933d..3e9d67357e9f060d636678a2a25a820fe52670ac 100644 GIT binary patch delta 13 UcmdnNw}WrPZ8k>V$#>Xd049P3Jpcdz delta 13 UcmdnNw}WrPZ8k>F$#>Xd048n)IRF3v diff --git a/tests/SpreadsheetTest.java b/tests/SpreadsheetTest.java index 32b9e75..3464bc9 100644 --- a/tests/SpreadsheetTest.java +++ b/tests/SpreadsheetTest.java @@ -38,6 +38,6 @@ public void testWronglyFormattedInteger_expectSuccess() throws SpreadsheetExcept spreadsheet.set("A6", "-99378914327"); assertFalse("Correctly formatted integer is mistaken as incorrectly formatted", - spreadsheet.evaluate("A5").equals("#Error")); + spreadsheet.evaluate("A6").equals("#Error")); } } From f9ea277393427e022718ed3288a97ffcad8e765c Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 15:41:07 +0300 Subject: [PATCH 17/55] besouro automatic message --- .besouro/20161012152902644/actions.txt | 8 ++++++++ .../20161012152902644/besouroEpisodes.txt | 1 + .../randomHeuristicEpisodes.txt | 1 + .besouro/20161012152902644/zorroEpisodes.txt | 1 + bin/SpreadsheetTest.class | Bin 1848 -> 1848 bytes src/Spreadsheet.java | 11 +++++++++++ 6 files changed, 22 insertions(+) diff --git a/.besouro/20161012152902644/actions.txt b/.besouro/20161012152902644/actions.txt index 94d9e6e..c04e3ef 100644 --- a/.besouro/20161012152902644/actions.txt +++ b/.besouro/20161012152902644/actions.txt @@ -35,3 +35,11 @@ EditAction 1476275778532 SpreadsheetTest.java 1228 4 13 4 UnitTestCaseAction 1476275779118 SpreadsheetTest.java OK UnitTestSessionAction 1476275779118 SpreadsheetTest.java OK EditAction 1476275782389 SpreadsheetTest.java 1228 4 13 4 +UnitTestCaseAction 1476275783927 SpreadsheetTest.java OK +UnitTestSessionAction 1476275783928 SpreadsheetTest.java OK +RefactoringAction 1476275931097 Spreadsheet.java ADD void isString() METHOD +RefactoringAction 1476275937614 Spreadsheet.java RENAME isString()=>void contain() METHOD +RefactoringAction 1476275940128 Spreadsheet.java RENAME contain()=>void containsString() METHOD +RefactoringAction 1476275954205 Spreadsheet.java RENAME containsString()=>boolean containsString(String) METHOD +RefactoringAction 1476276061831 Spreadsheet.java ADD String evaluatedString() METHOD +EditAction 1476276067251 Spreadsheet.java 1944 9 17 0 diff --git a/.besouro/20161012152902644/besouroEpisodes.txt b/.besouro/20161012152902644/besouroEpisodes.txt index 6c9dbac..998f98b 100644 --- a/.besouro/20161012152902644/besouroEpisodes.txt +++ b/.besouro/20161012152902644/besouroEpisodes.txt @@ -1,2 +1,3 @@ 1476275744044 test-addition 1 401 true 1476275779118 regression 2 24 true +1476275783928 regression 1 1 true diff --git a/.besouro/20161012152902644/randomHeuristicEpisodes.txt b/.besouro/20161012152902644/randomHeuristicEpisodes.txt index 6c9dbac..998f98b 100644 --- a/.besouro/20161012152902644/randomHeuristicEpisodes.txt +++ b/.besouro/20161012152902644/randomHeuristicEpisodes.txt @@ -1,2 +1,3 @@ 1476275744044 test-addition 1 401 true 1476275779118 regression 2 24 true +1476275783928 regression 1 1 true diff --git a/.besouro/20161012152902644/zorroEpisodes.txt b/.besouro/20161012152902644/zorroEpisodes.txt index 1f9bd06..032343f 100644 --- a/.besouro/20161012152902644/zorroEpisodes.txt +++ b/.besouro/20161012152902644/zorroEpisodes.txt @@ -1,2 +1,3 @@ 1476275744044 test-addition 1 401 false 1476275779118 regression 2 35 false +1476275783928 regression 1 4 false diff --git a/bin/SpreadsheetTest.class b/bin/SpreadsheetTest.class index 3e9d67357e9f060d636678a2a25a820fe52670ac..39198d59aa30c0e4cd06b9cd0c397675c7188438 100644 GIT binary patch delta 13 UcmdnNw}WrPZ8pZh$#>Xd04A0NK>z>% delta 13 UcmdnNw}WrPZ8k>V$#>Xd049P3Jpcdz diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 6af9410..6d38583 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -27,12 +27,23 @@ public String evaluate(String cell) throws SpreadsheetException { String rawVal = cells.get(cell); + if (isString(rawVal)) + return evaluatedString(rawVal); + if (!containsAllowedIntegers(rawVal)) return ERROR_MESSAGE; return rawVal; } + private boolean containsString(String value) { + + } + + private String evaluatedString(String unevaluatedString) { + + } + private String charAsStringFromPos(String str, int pos) throws SpreadsheetException { if (pos < 0 || pos > (str.length() - 1)) throw new SpreadsheetException("Position out of bounds when getting string of 1 len from a string"); From afa307ade713815ab7a199774cf0dd05a8f03b51 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 15:41:12 +0300 Subject: [PATCH 18/55] besouro automatic message --- .besouro/20161012152902644/actions.txt | 4 ++++ bin/Spreadsheet.class | Bin 2703 -> 3099 bytes src/Spreadsheet.java | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.besouro/20161012152902644/actions.txt b/.besouro/20161012152902644/actions.txt index c04e3ef..484120f 100644 --- a/.besouro/20161012152902644/actions.txt +++ b/.besouro/20161012152902644/actions.txt @@ -43,3 +43,7 @@ RefactoringAction 1476275940128 Spreadsheet.java RENAME contain()=>void contains RefactoringAction 1476275954205 Spreadsheet.java RENAME containsString()=>boolean containsString(String) METHOD RefactoringAction 1476276061831 Spreadsheet.java ADD String evaluatedString() METHOD EditAction 1476276067251 Spreadsheet.java 1944 9 17 0 +CompilationAction 1476276067479 Spreadsheet.java +CompilationAction 1476276067480 Spreadsheet.java +CompilationAction 1476276067480 Spreadsheet.java +EditAction 1476276072115 Spreadsheet.java 1956 9 18 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 3d71dc3ebf7e12746370735e420dbc4b0ae96eb3..a70c0779357f53bb1476cc09136b89dafd5991a0 100644 GIT binary patch delta 1075 zcma)4OHUJF6g^*OTH3Ko)*x zc=l2HE#%5@iDAd2l2uwXMUS`inWkZSafLy>sGHm}v@BQU2_uzGYKomSbUAGr;~GyL zmnGkY1ea6XP8h13w1#ansmB|OuO0;;T5BVfv25AocE;3Yg@BdOY}tqvg~ts;dXaKohyxzO zk2G#Lzr+S^F@!cY(PLTM%ul?q5(y^isnW7dI@1Q_vM3?)$`D+iUXP|3Q(TSeHji`D zlE84=j~L>4bk~o27;}c))$D%ohA1ylRo!)ez05{1i0w$kd`ny61cpG ztIPD|LJgfBq5x{?0sI9l;UrEK?yq5tA{B%;Gbkk(8cH%upbxCO1ch3HB2toqY&y@q z_2&|z`VQNd&_5E;7IAtx5)O-F3($u?VfP$%iOma0yvDXAm?Mj@mzzIO+d{!&72Jdm zp&W-1!V%QrDB98Pta^hjnKjcL$YP2{Qb!p#DJEbK)kqM^eJiLf!(O_ZrZM;V_8+^o zh&yv|3-dEB7LJhY+tokf{C{$tBzgh?bdmW^BI|bE`0A>21(7_p7s3kMtlUM!`ThO$ z)zl`$b%*!!4u!7wsEi!^f{t+O0v2Qjb$F|Wk%l$2eV{RfFV`#1mq delta 705 zcmZ9J&2JJ>6vfYDh5?6x7^H$JZN;`)fog3~gDJ+Uu{MS#CdQ=IYR7^Ui(mo8Z!~eC zE0eyJxG+sj+_Xvk2t=D$*RJ$$aOM9%)H9&fxOg}3@jaI}G`8Z@tG zHM+`21zn6@sEk1v=!OqH@FT<>u)SRXM{$fNmcnV~2rf4+Fxr?4I3b$wJJ8EBi5XAu zR`%$fRZ~s9gnJERliqX#r`99EpgL1WX5tMxYuKU=)?vPYYYp?04P0Fx{EM^|b{6S} z2RjkK0D;0dh-eEd+`^4-V8xMdVF7UzaE$;V{#k$#AiqVZL-A~CqPxw=3Cgc}|AAry z1|Wm1ViN5M}vlG%n*z1mr+;fOr@pLZeD4^E<84>a!9|M zS8381e*n)|&6+~Y5>Wq`anmwGNxVWwgwu%!hwHd4ms~p%ak_bkawD8U0)05l_D3i_ b`p-OK8;!?szty;puS8lje2yx$Y Date: Wed, 12 Oct 2016 15:43:24 +0300 Subject: [PATCH 19/55] besouro automatic message --- .besouro/20161012152902644/actions.txt | 3 +++ bin/Spreadsheet.class | Bin 3099 -> 3033 bytes src/Spreadsheet.java | 3 ++- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.besouro/20161012152902644/actions.txt b/.besouro/20161012152902644/actions.txt index 484120f..edd34df 100644 --- a/.besouro/20161012152902644/actions.txt +++ b/.besouro/20161012152902644/actions.txt @@ -47,3 +47,6 @@ CompilationAction 1476276067479 Spreadsheet.java CompilationAction 1476276067480 Spreadsheet.java CompilationAction 1476276067480 Spreadsheet.java EditAction 1476276072115 Spreadsheet.java 1956 9 18 0 +CompilationAction 1476276072209 Spreadsheet.java +CompilationAction 1476276072210 Spreadsheet.java +EditAction 1476276204528 Spreadsheet.java 2052 9 19 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index a70c0779357f53bb1476cc09136b89dafd5991a0..7c9af15c28c3f3b3271d4e3c7126ded612c48e10 100644 GIT binary patch delta 435 zcmXv~OD{t~7(H|E?OblJCMcR{D_D3`Nu-gG*dQ&DT3}-#X_HoqDy6OW`?+OSY9SJd z4GE33LBig~+QKinKSgZ8ah8Ol@fa5@-E1(V^> zSaNYX9ubqK0b5kZG-eohEF6y{qYQF$%TNho;>k3~<2vTCAXMJO7DWelu!QjQF3XyZ zFs3vxZ0Oh&r@WT!h&%4*dph=UkX65=-Y!xlDj>0Y1K}X#!~tz^5?24I=tDnE#)}a2 zqKBe|O>1b6D4}bVy}&n7F`LKmo6Bxj0y)f$WKo+zrQ*&ZatZSb5)*kWiKy1&P8K78 zZlsW=$a>hYOq`55TA@L_%=p|O6qCQyZc23zcogTxh{P*29`pUgGsB*PFqTAk?!>+h8kCq)43tH(1 OXvLXsRgcIk;rJJriB}Q; delta 438 zcmYL^OD{uF6ouEh_uQlRxSF7%q6iYNrUoLCN=y)s2m>Tyf&to6Mb(>nzXnEUgaHGI ziHS$r1Ysa1et^WlFYpsIVz(hC>+I~E^{sW@b5ES|_51D-KrIfgWa->J<5GLj^>q*s`#Votp>op{YL8?ir3_;E6hDC?FMN0Nf}fwNkT0Bbrio z;;A>Yq}tDi&yjJD*8Z$u934+?mx~X@5bC-{{xPz-CkFp1((e)Ok0YYWWW8th7v{wr z<|(QePAt$)M-ibVbi0{AVH!&5wx|wedFE0aE5|VO%WaLh+(c9_vZZ$|RV&d=)!v%8ORk!fEYGT+_gX!HByQzW>`uBf? Q37(YzPi8Re5lh4V4~1}8;Q#;t diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index e1c5887..ddaf1d9 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -37,7 +37,8 @@ public String evaluate(String cell) throws SpreadsheetException { } private boolean containsString(String value) { - + if (!(value.charAt(0).equals("'") && value.charAt(value.length()).equals("'"))) + return false; } private String evaluatedString(String unevaluatedString) { From dc96cd3a00660e5567e63a152fbb876e38aff95a Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 15:48:05 +0300 Subject: [PATCH 20/55] besouro automatic message --- .besouro/20161012152902644/actions.txt | 9 +++++++++ bin/Spreadsheet.class | Bin 3033 -> 3098 bytes src/Spreadsheet.java | 11 +++++++++++ 3 files changed, 20 insertions(+) diff --git a/.besouro/20161012152902644/actions.txt b/.besouro/20161012152902644/actions.txt index edd34df..ed6a313 100644 --- a/.besouro/20161012152902644/actions.txt +++ b/.besouro/20161012152902644/actions.txt @@ -50,3 +50,12 @@ EditAction 1476276072115 Spreadsheet.java 1956 9 18 0 CompilationAction 1476276072209 Spreadsheet.java CompilationAction 1476276072210 Spreadsheet.java EditAction 1476276204528 Spreadsheet.java 2052 9 19 0 +CompilationAction 1476276204619 Spreadsheet.java +CompilationAction 1476276204619 Spreadsheet.java +RefactoringAction 1476276302819 Spreadsheet.java ADD int charCount FIELD +RefactoringAction 1476276303835 Spreadsheet.java RENAME charCount=>int charCount() METHOD +RefactoringAction 1476276324895 Spreadsheet.java RENAME charCount()=>int characterCount() METHOD +RefactoringAction 1476276347447 Spreadsheet.java RENAME characterCount()=>int characterCount(String) METHOD +RefactoringAction 1476276352474 Spreadsheet.java RENAME characterCount(String)=>int characterCount(String, char) METHOD +RefactoringAction 1476276426652 Spreadsheet.java RENAME characterCount(String, char)=>int characterCount(String, String) METHOD +EditAction 1476276485084 Spreadsheet.java 2251 10 21 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 7c9af15c28c3f3b3271d4e3c7126ded612c48e10..3aba0e4edaa02b204a991e0fc7944e24852f4141 100644 GIT binary patch delta 232 zcmca9K1*W5d=|zjlNYea)fZbSaB(^(=H=y=C}if9P-I1*&=Abz{g<7Ai-eFpvYj#V9sDZ zxr=Lppfv+4gAIcagDryygEfOZgTrKP?&*>)3>*xuKv8!FaRv_t6$VcRH6YuF!DsSq GZhHV#*C$H= diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index ddaf1d9..e8a29e2 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -39,6 +39,17 @@ public String evaluate(String cell) throws SpreadsheetException { private boolean containsString(String value) { if (!(value.charAt(0).equals("'") && value.charAt(value.length()).equals("'"))) return false; + + + } + + private int characterCount(String str, String target) { + int count = 0; + + for (int i = 0; i < str.length(); i++) { + if (charAsStringFromPos(str, i).equals(target)) + count++; + } } private String evaluatedString(String unevaluatedString) { From 882ea3e479776676a5963e6302e4ceb83892f9db Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 15:48:09 +0300 Subject: [PATCH 21/55] besouro automatic message --- .besouro/20161012152902644/actions.txt | 5 +++++ bin/Spreadsheet.class | Bin 3098 -> 3356 bytes src/Spreadsheet.java | 2 ++ 3 files changed, 7 insertions(+) diff --git a/.besouro/20161012152902644/actions.txt b/.besouro/20161012152902644/actions.txt index ed6a313..e977d10 100644 --- a/.besouro/20161012152902644/actions.txt +++ b/.besouro/20161012152902644/actions.txt @@ -59,3 +59,8 @@ RefactoringAction 1476276347447 Spreadsheet.java RENAME characterCount()=>int ch RefactoringAction 1476276352474 Spreadsheet.java RENAME characterCount(String)=>int characterCount(String, char) METHOD RefactoringAction 1476276426652 Spreadsheet.java RENAME characterCount(String, char)=>int characterCount(String, String) METHOD EditAction 1476276485084 Spreadsheet.java 2251 10 21 0 +CompilationAction 1476276485197 Spreadsheet.java +CompilationAction 1476276485198 Spreadsheet.java +CompilationAction 1476276485198 Spreadsheet.java +CompilationAction 1476276485198 Spreadsheet.java +EditAction 1476276489850 Spreadsheet.java 2270 10 22 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 3aba0e4edaa02b204a991e0fc7944e24852f4141..18aae94989aa93c65b90a80472c3f22fe28eb8e4 100644 GIT binary patch delta 748 zcmYjN+fUPQ7(HDtV_luez_G}{ju}w~J|IDtNDLAkC>jkTVVW40t3?sWlLNl?>?CLXZSzN%hyiOm#<%YPR}{tsRUo_mB0S_`~|=up1zm+ z#NEEMo-$KuOEX9FCBtF`F~FAjR`+-dW;vAEh7h@&(6dE#L9_IHMqMZsE!EVll4+0GC3`yYKv*DU}f`06P+xWS}If2HO)G;jj$u)d@!eA z0R{&trx|mW&VfI8i2MtzDvn8}f+8#?NIl$j)+cpxC3Z#{^4(F8#Z?&`?kZSe&!i4+ zmA#eDNoxuoVx9ez);aITHTQ&TBtxV&=VTr{J>@zsCH-0rSGMTQg-)6hae%|pzr(x}KcX?jOyvD9N;z@tLhO=AIP)L}m;@bHS z=%}Do=&xe_CA@W%k~Q4e>VHRiyptgSk@n;8VHiQ2Ko}!9N*U}-y%1=|c6?)4{F^g| zCETPOVftqoN`S=n5mg57^EA-qMufmy?3>&(bi0Of1tPz>>f%CC%JJ&=4`GwY|NF-& z#Tfh;r_SOeHNm3ZaN?fhVGFl_Z$RXHE|Oir49(N@RiMt|PRq|p&2D+nHW0R}xNld% z55K{lXzwS)LIYJiU>n}<=?f%yk?bbXjs*5&3I}K(z_fF=+LYQkdk~MDv)c&$7s&&` P-+*9e;_#TfU3l^bf~u2E delta 481 zcmYk1y-!nN6vlt=y|?$)+qWH{mLjF3g@95!*qCAyFi|6d2#F&b1GN<*|K=7-y@7LD%}WA`*=F8L^y zH7jPy>rxNRoHyw{);wX&?0D7Q Date: Wed, 12 Oct 2016 15:48:57 +0300 Subject: [PATCH 22/55] besouro automatic message --- .besouro/20161012152902644/actions.txt | 8 ++++++++ bin/Spreadsheet.class | Bin 3356 -> 3307 bytes src/Spreadsheet.java | 3 +++ 3 files changed, 11 insertions(+) diff --git a/.besouro/20161012152902644/actions.txt b/.besouro/20161012152902644/actions.txt index e977d10..ef4ca28 100644 --- a/.besouro/20161012152902644/actions.txt +++ b/.besouro/20161012152902644/actions.txt @@ -64,3 +64,11 @@ CompilationAction 1476276485198 Spreadsheet.java CompilationAction 1476276485198 Spreadsheet.java CompilationAction 1476276485198 Spreadsheet.java EditAction 1476276489850 Spreadsheet.java 2270 10 22 0 +CompilationAction 1476276490090 Spreadsheet.java +CompilationAction 1476276490091 Spreadsheet.java +CompilationAction 1476276490091 Spreadsheet.java +CompilationAction 1476276534856 Spreadsheet.java +CompilationAction 1476276535017 Spreadsheet.java +CompilationAction 1476276535018 Spreadsheet.java +CompilationAction 1476276535018 Spreadsheet.java +EditAction 1476276537945 Spreadsheet.java 2377 10 23 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 18aae94989aa93c65b90a80472c3f22fe28eb8e4..520cf61c65f25a57478f5d0d6fb7bb3db5a64a39 100644 GIT binary patch delta 152 zcmbOu^;&X62`i)DSs8cyEJWyxqe`8!vOpd$kxgA;=UgA0QqgByc6gU93^?g@fE z46F>k3_=Wk3?d9Z4Dt+tlXZEfONKIVFoXd`BN)UPA{kT|q8QYGY$Jx)$#;3|0g);v ACIA2c delta 196 zcmaDYIY(+k2`gj$ Date: Wed, 12 Oct 2016 15:49:07 +0300 Subject: [PATCH 23/55] besouro automatic message --- .besouro/20161012152902644/actions.txt | 4 ++++ src/Spreadsheet.java | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.besouro/20161012152902644/actions.txt b/.besouro/20161012152902644/actions.txt index ef4ca28..8badeba 100644 --- a/.besouro/20161012152902644/actions.txt +++ b/.besouro/20161012152902644/actions.txt @@ -72,3 +72,7 @@ CompilationAction 1476276535017 Spreadsheet.java CompilationAction 1476276535018 Spreadsheet.java CompilationAction 1476276535018 Spreadsheet.java EditAction 1476276537945 Spreadsheet.java 2377 10 23 0 +CompilationAction 1476276538040 Spreadsheet.java +CompilationAction 1476276538040 Spreadsheet.java +CompilationAction 1476276538041 Spreadsheet.java +EditAction 1476276547424 Spreadsheet.java 2379 10 23 0 diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 7005e3b..00dc2dc 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -46,7 +46,7 @@ private boolean containsString(String value) { private int characterCount(String str, String target) { int count = 0; - if (target.length != 1) + if (target.length() != 1) throw new SpreadsheetException("Character count target length must be 1"); for (int i = 0; i < str.length(); i++) { From 591615332f255e1dda7cee992b4b7489f91a877d Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 15:54:06 +0300 Subject: [PATCH 24/55] besouro automatic message --- .besouro/20161012152902644/actions.txt | 18 ++++++++++++++++++ bin/Spreadsheet.class | Bin 3307 -> 3432 bytes src/Spreadsheet.java | 9 ++++++--- 3 files changed, 24 insertions(+), 3 deletions(-) diff --git a/.besouro/20161012152902644/actions.txt b/.besouro/20161012152902644/actions.txt index 8badeba..42ecc71 100644 --- a/.besouro/20161012152902644/actions.txt +++ b/.besouro/20161012152902644/actions.txt @@ -76,3 +76,21 @@ CompilationAction 1476276538040 Spreadsheet.java CompilationAction 1476276538040 Spreadsheet.java CompilationAction 1476276538041 Spreadsheet.java EditAction 1476276547424 Spreadsheet.java 2379 10 23 0 +CompilationAction 1476276547679 Spreadsheet.java +CompilationAction 1476276547680 Spreadsheet.java +CompilationAction 1476276547680 Spreadsheet.java +CompilationAction 1476276559331 Spreadsheet.java +CompilationAction 1476276559492 Spreadsheet.java +CompilationAction 1476276559492 Spreadsheet.java +CompilationAction 1476276663043 Spreadsheet.java +CompilationAction 1476276663043 Spreadsheet.java +CompilationAction 1476276663044 Spreadsheet.java +CompilationAction 1476276663044 Spreadsheet.java +CompilationAction 1476276691625 Spreadsheet.java +CompilationAction 1476276691780 Spreadsheet.java +CompilationAction 1476276691780 Spreadsheet.java +CompilationAction 1476276691781 Spreadsheet.java +CompilationAction 1476276838164 Spreadsheet.java +CompilationAction 1476276838320 Spreadsheet.java +CompilationAction 1476276838321 Spreadsheet.java +EditAction 1476276846050 Spreadsheet.java 2583 10 25 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 520cf61c65f25a57478f5d0d6fb7bb3db5a64a39..2ab671e222ae4dc6d74ca6f4f9e97d9abbd57bfd 100644 GIT binary patch delta 859 zcmY*XOHUI~6#nkaooN|HLa;o<7KfGqQd!tku!$HI5E~M~goQ*+Ko|>BT4<-@yQuYz zZte;;L}S7R6JMcG5?Q!&<*zUh{z9XknGqkE+%xCqp8K8e`_A3ovstfw{qgBDfGD27 z)l6kjLkO32Brw6CCe2jBqC{@pANS%iLreF>Xl8WGGBd_lI+wBxYc!KEEyFD|rgK@# zxM&&&H83P~Od}<>lpb|P$1E~p!4qnfvsQ*dbMM(`42lEAz~Zzf#TTVn_Tq-2(^XX5$kH8Y#u?PGn3AWZMDh&P{$*TFjP)vk0+DqIdeRovdn~;@#2YydE)P1 zd)B19gp(wY6Qw@*DEkN*3jJg9(F1ER`7(B`qi?usvWWf-xr48uwk=%EiC-L#|L z$U-MZc4ko~(btI_t`Kl749ro+v5(Gm@DhBi1cg=FRaeDJEfhKi8?}b^ptXZ4;hKXg zInHlt!Mw@GU;UPM-If>j`}xQkZk~RJy-V25+ey+g%GWVJT*Tdt_BVv*N~>`g_n-p3 zs3YeZ5hsTIPTw}-W;5UE`>&dN#9X54IuxMS5ST4OgIrNoLW751mxTLbxxA%gs)z?m zP~_Eu#Qd(cTl}xJZvO#dF^DRhA!`Q+YDkpI8;5LnBnQ|F*>WJmGT TvD-(dL`i(peVzrXlkn^pFGZmB delta 702 zcmZ8eO=}ZT6g_WdGD#+5ktC*7(`1sAstH9cL5WbLTC~A7prAAbrPWN+m@!i`X=?qd z)%xx3?FyoT;HC?!B>@9wRMH|Orx$BG_$IeEY1Eqt<98lqoD9{ zxu3UPBRz(SE2uEYn`{Pg@4l=DbG$B(%2gE>YW$PDht>Iaxi>J6I89i!D%CmDVqjVB zclRZ4t0>{J0){&(mNCV!y<`m=hPj{@vXz=%)QQ1L9<1;)?yRC9fd?uc;t}`CiTBUl z8^TeBpc74mNT<@mWZthgaiL9L0(z;+Bo7=!gsSTF3Xb8pgBN+!mq-jbScv9r&L(De zv(CI=d*r$=zEqY9ud%I#lX<_{#Hn^F9G0dUxSD&1-Kz*l0}Yg4z}LcjzKMnQz+2K2 z9SRhkO<3c?akoYADkx30ud4yRUkx6*)x^>&T;ke_z``l=^6J-DY3)A`W8`EUe&p!h#z^ioUsPk=cbz@9 zxCdefF4iTG^fF0DBW3At=zDf(ap(>xRga;eA&wr@#iL*pIN1_wxMjm~bL_hU| jIPV11oTo`|1x(|y6EH~Vzr|ii{thI2Gs6>dBH-z75nO|j diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 00dc2dc..cfe62eb 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -40,17 +40,20 @@ private boolean containsString(String value) { if (!(value.charAt(0).equals("'") && value.charAt(value.length()).equals("'"))) return false; + if (2 == characterCount(value, "'")) + return true; + throw new SpreadsheetException("String contains ' characters that are not the first or last characters"); } - private int characterCount(String str, String target) { + private int characterCount(String str, String targetChar) throws SpreadsheetException { int count = 0; - if (target.length() != 1) + if (targetChar.length() != 1) throw new SpreadsheetException("Character count target length must be 1"); for (int i = 0; i < str.length(); i++) { - if (charAsStringFromPos(str, i).equals(target)) + if (charAsStringFromPos(str, i).equals(targetChar)) count++; } From 1efa2014444e43b9f6d18ab1e9cbc00b99d98f95 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 15:54:32 +0300 Subject: [PATCH 25/55] besouro automatic message --- .besouro/20161012152902644/actions.txt | 3 +++ src/Spreadsheet.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.besouro/20161012152902644/actions.txt b/.besouro/20161012152902644/actions.txt index 42ecc71..55d8bc1 100644 --- a/.besouro/20161012152902644/actions.txt +++ b/.besouro/20161012152902644/actions.txt @@ -94,3 +94,6 @@ CompilationAction 1476276838164 Spreadsheet.java CompilationAction 1476276838320 Spreadsheet.java CompilationAction 1476276838321 Spreadsheet.java EditAction 1476276846050 Spreadsheet.java 2583 10 25 0 +CompilationAction 1476276846308 Spreadsheet.java +CompilationAction 1476276846309 Spreadsheet.java +EditAction 1476276871953 Spreadsheet.java 2589 10 25 0 diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index cfe62eb..3b9330b 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -43,7 +43,7 @@ private boolean containsString(String value) { if (2 == characterCount(value, "'")) return true; - throw new SpreadsheetException("String contains ' characters that are not the first or last characters"); + throw new SpreadsheetException("String contains ' character(s) that is not at the beginning or end of string"); } private int characterCount(String str, String targetChar) throws SpreadsheetException { From 1bfe024f72c43e042643a98f1465e4ebdfd3edfe Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 15:56:03 +0300 Subject: [PATCH 26/55] besouro automatic message --- .besouro/20161012152902644/actions.txt | 6 ++++++ bin/Spreadsheet.class | Bin 3432 -> 3381 bytes src/Spreadsheet.java | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.besouro/20161012152902644/actions.txt b/.besouro/20161012152902644/actions.txt index 55d8bc1..c4eb97f 100644 --- a/.besouro/20161012152902644/actions.txt +++ b/.besouro/20161012152902644/actions.txt @@ -97,3 +97,9 @@ EditAction 1476276846050 Spreadsheet.java 2583 10 25 0 CompilationAction 1476276846308 Spreadsheet.java CompilationAction 1476276846309 Spreadsheet.java EditAction 1476276871953 Spreadsheet.java 2589 10 25 0 +CompilationAction 1476276872219 Spreadsheet.java +CompilationAction 1476276872219 Spreadsheet.java +CompilationAction 1476276960144 Spreadsheet.java +CompilationAction 1476276960304 Spreadsheet.java +CompilationAction 1476276960304 Spreadsheet.java +EditAction 1476276963095 Spreadsheet.java 2617 10 25 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 2ab671e222ae4dc6d74ca6f4f9e97d9abbd57bfd..a4fec4be43eaf1931e0b01531d84a47add39ed19 100644 GIT binary patch delta 85 zcmaDMwN+}vd=|#U$qQKIoU9bMID;$mN)js+Qj3c6i*yt+^NLf8N)(hd6@p6=OHy-F h^GcKyO7azw^K%PwQcF@5oO1G$v*B{Zn~hmbIRNW%9d-Z! delta 146 zcmdlg^+IaHd=|zjlNYea)fZbSaB(^(=H=y=C}if9>+001O;5;{X5v diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 3b9330b..98e308f 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -37,7 +37,7 @@ public String evaluate(String cell) throws SpreadsheetException { } private boolean containsString(String value) { - if (!(value.charAt(0).equals("'") && value.charAt(value.length()).equals("'"))) + if (!(charAsStringFromPos(value, 0).equals("'") && charAsStringFromPos(value, value.length()).equals("'"))) return false; if (2 == characterCount(value, "'")) From e17f8e3bffe94a63106bff6bd39282f283611e94 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 15:58:00 +0300 Subject: [PATCH 27/55] besouro automatic message --- .besouro/20161012152902644/actions.txt | 10 ++++++++++ bin/Spreadsheet.class | Bin 3381 -> 3461 bytes src/Spreadsheet.java | 4 ++-- tests/SpreadsheetTest.java | 7 +++++++ 4 files changed, 19 insertions(+), 2 deletions(-) diff --git a/.besouro/20161012152902644/actions.txt b/.besouro/20161012152902644/actions.txt index c4eb97f..6174f19 100644 --- a/.besouro/20161012152902644/actions.txt +++ b/.besouro/20161012152902644/actions.txt @@ -103,3 +103,13 @@ CompilationAction 1476276960144 Spreadsheet.java CompilationAction 1476276960304 Spreadsheet.java CompilationAction 1476276960304 Spreadsheet.java EditAction 1476276963095 Spreadsheet.java 2617 10 25 0 +CompilationAction 1476276963338 Spreadsheet.java +CompilationAction 1476276963339 Spreadsheet.java +CompilationAction 1476276975515 Spreadsheet.java +CompilationAction 1476276975688 Spreadsheet.java +CompilationAction 1476276996178 Spreadsheet.java +RefactoringAction 1476277029166 SpreadsheetTest.java ADD void a FIELD +RefactoringAction 1476277030677 SpreadsheetTest.java RENAME a=>void a_ FIELD +RefactoringAction 1476277033689 SpreadsheetTest.java REMOVE a_ FIELD +RefactoringAction 1476277040701 SpreadsheetTest.java ADD void evaluateString() METHOD +EditAction 1476277080961 SpreadsheetTest.java 1361 5 13 4 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index a4fec4be43eaf1931e0b01531d84a47add39ed19..05ef2a53e56b056a38fc5041d74a8b18a0e71901 100644 GIT binary patch delta 1026 zcmZ9L%TE(Q9LK-2k5bxIp;A$3WdTW{t!Ru<(U|y%Jfe~)(ST1Dy0+E2EA0Zl0Y&kF z4;(LW!Gj4G4)~%`67}rOi~oQ}y?Y_X-)uz^GuhwH%+Bxk{mge}-&NeH^nLmL;Uj>p zc>c=wUH19Fa8ko5oaTK>Lx&ii)zFOt46DomBhzmRtzs` z=tGwBGNzSuQVeo^Lz~EUH1uPDGj-Q7FD^42Dp2T4%6dfaO&M9E*D6Y#2)N@j%-eV@ymPP2goz+b%q1)&5oVynow$q@jC|Ad}^h=v(ZG z&7=J@Y7a-_d7PL;v3Q@E6VaH0C$MrZK1WMsgeg|QLooym>rsX(8dsx+S{*jf44@av zVjuR?hy-wi)-rl3k)SA14lq;?q0%n+`vs@D<`jpsHeD&XiyeW#ulNn5{Wds`A^?2|FD}axmR|J zzoyYv5-FvXNw`;a|X5S04BIE&tBoGQa~8lgNU#c*wu{ z%Vqj$_z!*T1!LN0i<*1S%j6%NY_SzxUcSahxUuohl#D@z& i)D+r6M(_pgX#IrCUPd-Amnw!5ScD>KF+3xWCGbC8+}J_@ delta 995 zcmaiyOHb5L6vzL4%s6z4JcNKUV1W>37?i{i4WNlYR8ZnVbOF97)5}bu(+=$&9=>=8 zzID@$vSDMw#*Hr~aS}+3D_6#^;D>NCG2RxGNJz|0ZqGgE-gAEEf4W@r@sRZO*QX5t z?RfE4`XS8i!&MF?!W~gSe?Tl?(b_mxwXje>|IF>O*G$moBGrFNt-7=MoZH*cv z-Kj`Lms3PZ6PmI#MRx|Nt((c{)+fdsO4iiKm~OK7W0tK@cA3s*h%%V5iK;m%LZ}pw zFpL5Brx2S9VU&aV|DuDlCRJw?;(@j*y6F&`Dh)AZkgAlViAft2YWc(lp+xC1ti;6M zm?Lr6pGc{;nxMq)wX!DV&>S5YS6wC07?IG3F&RmuI0Ox1CMh$7Xskbkarb4QMUue5 zkdcPzI^t<|Y(z%JBy9JKSnqxgG&PryDb>g_6m3fh4rN($moJ3dZXwVYyes1#=G^na z=Hvp0>YXWcJ6=~zZGRjR=Fz}7GM2-3n=s_6gvC@~&37AyHBGdBlaeH{9gpv!j7J#Z zP^#~WhVbP5MsR_jYli@y{RC1T!$alQa=5X{PCRPa9%LDSI<^4Ww9t)^%8~5L^hp0$EJ4ZmOVQnpq+a``lsy6=jJYom52-%L@>_TpXVH1A6`&TyyrJ diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 98e308f..67be40c 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -27,7 +27,7 @@ public String evaluate(String cell) throws SpreadsheetException { String rawVal = cells.get(cell); - if (isString(rawVal)) + if (containsString(rawVal)) return evaluatedString(rawVal); if (!containsAllowedIntegers(rawVal)) @@ -36,7 +36,7 @@ public String evaluate(String cell) throws SpreadsheetException { return rawVal; } - private boolean containsString(String value) { + private boolean containsString(String value) throws SpreadsheetException { if (!(charAsStringFromPos(value, 0).equals("'") && charAsStringFromPos(value, value.length()).equals("'"))) return false; diff --git a/tests/SpreadsheetTest.java b/tests/SpreadsheetTest.java index 3464bc9..f72d916 100644 --- a/tests/SpreadsheetTest.java +++ b/tests/SpreadsheetTest.java @@ -40,4 +40,11 @@ public void testWronglyFormattedInteger_expectSuccess() throws SpreadsheetExcept assertFalse("Correctly formatted integer is mistaken as incorrectly formatted", spreadsheet.evaluate("A6").equals("#Error")); } + + @Test + public void evaluateString() { + spreadsheet.set("A1", "'a string'"); + + assertEquals("", spreadsheet.evaluate("A1")) + } } From 3a7ecf00c7e868c4368b9eb9e0f7612acef3d864 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 15:58:41 +0300 Subject: [PATCH 28/55] besouro automatic message --- .besouro/20161012152902644/actions.txt | 6 ++++++ bin/SpreadsheetTest.class | Bin 1848 -> 2095 bytes tests/SpreadsheetTest.java | 4 ++-- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.besouro/20161012152902644/actions.txt b/.besouro/20161012152902644/actions.txt index 6174f19..e5d4e60 100644 --- a/.besouro/20161012152902644/actions.txt +++ b/.besouro/20161012152902644/actions.txt @@ -113,3 +113,9 @@ RefactoringAction 1476277030677 SpreadsheetTest.java RENAME a=>void a_ FIELD RefactoringAction 1476277033689 SpreadsheetTest.java REMOVE a_ FIELD RefactoringAction 1476277040701 SpreadsheetTest.java ADD void evaluateString() METHOD EditAction 1476277080961 SpreadsheetTest.java 1361 5 13 4 +CompilationAction 1476277081208 SpreadsheetTest.java +CompilationAction 1476277100514 SpreadsheetTest.java +CompilationAction 1476277100674 SpreadsheetTest.java +CompilationAction 1476277115236 SpreadsheetTest.java +CompilationAction 1476277115395 SpreadsheetTest.java +EditAction 1476277121606 SpreadsheetTest.java 1432 5 15 5 diff --git a/bin/SpreadsheetTest.class b/bin/SpreadsheetTest.class index 39198d59aa30c0e4cd06b9cd0c397675c7188438..cfbe6ff35f0926c3d43af2dd4454a754bb83895b 100644 GIT binary patch delta 255 zcmdnNw_bqj)W2Q(7#J8#7_v8VHL%q4rIsb;lqQy>2A33N=B2YUBr`JbXC;;;>gOcp zrR%#E73CLkFr+dv1cv4nr55Msl%=L9Bnm$=RDQFf%X$-Oja}At_QQWjjOKejtyDK@do?fn^LB Wgn(=wh$;qQ1`!~Sks%YTDhmKoGDB(r delta 36 scmZ24u!E25)W2Q(7#J8#7?L+~HLy(9WHn`E-5k$a%*4vTz{HRQ0NjQNmjD0& diff --git a/tests/SpreadsheetTest.java b/tests/SpreadsheetTest.java index f72d916..b4e667a 100644 --- a/tests/SpreadsheetTest.java +++ b/tests/SpreadsheetTest.java @@ -42,9 +42,9 @@ public void testWronglyFormattedInteger_expectSuccess() throws SpreadsheetExcept } @Test - public void evaluateString() { + public void evaluateString() throws SpreadsheetException { spreadsheet.set("A1", "'a string'"); - assertEquals("", spreadsheet.evaluate("A1")) + assertEquals("String not evaluated correctly", "a string", spreadsheet.evaluate("A1")); } } From 52733506164d5af25b6c6ecb274b4f848cfc69de Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 15:59:43 +0300 Subject: [PATCH 29/55] besouro automatic message --- .besouro/20161012152902644/actions.txt | 3 +++ bin/SpreadsheetTest.class | Bin 2095 -> 2045 bytes src/Spreadsheet.java | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.besouro/20161012152902644/actions.txt b/.besouro/20161012152902644/actions.txt index e5d4e60..79d575b 100644 --- a/.besouro/20161012152902644/actions.txt +++ b/.besouro/20161012152902644/actions.txt @@ -119,3 +119,6 @@ CompilationAction 1476277100674 SpreadsheetTest.java CompilationAction 1476277115236 SpreadsheetTest.java CompilationAction 1476277115395 SpreadsheetTest.java EditAction 1476277121606 SpreadsheetTest.java 1432 5 15 5 +UnitTestCaseAction 1476277125039 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476277125039 SpreadsheetTest.java FAIL +EditAction 1476277183669 Spreadsheet.java 2655 10 25 0 diff --git a/bin/SpreadsheetTest.class b/bin/SpreadsheetTest.class index cfbe6ff35f0926c3d43af2dd4454a754bb83895b..d3e0d051aa00d571c3fb9ec5436da4e8bb41513b 100644 GIT binary patch delta 130 zcmZ24@Ry(K)W2Q(7#J8#7_v5U^|Lr}FeEcFaH%IM6qgib=B2B1Fr+dv$OVHr3VHb@ z3aMp@Ii-musVNG{`9(#k$t5|J91Q7<3>+{mo7GuQGELsbCcu%jjX_>0MJR3ZIW`$i YJqB(D0|sdZ!^w?oqU;$!E14KF0Xat`b^rhX delta 232 zcmey%zg~dr)W2Q(7#J8#7_v8V^|REoGbA%I@Mk5KCF3q?V*A1eYY1q~@mPm2hz}Br&A(Ft9UZFfxd0_<$_shu9iiQk0pOZmk)% z`8LZ*CVLYGW(G!}Be`}nBt;6PY-dQ@59Bd12m(nqu#5qN5RlCSQN Date: Wed, 12 Oct 2016 16:01:55 +0300 Subject: [PATCH 30/55] besouro automatic message --- .besouro/20161012152902644/actions.txt | 11 +++++++++++ bin/Spreadsheet.class | Bin 3461 -> 3463 bytes src/Spreadsheet.java | 4 ++++ 3 files changed, 15 insertions(+) diff --git a/.besouro/20161012152902644/actions.txt b/.besouro/20161012152902644/actions.txt index 79d575b..42e5d69 100644 --- a/.besouro/20161012152902644/actions.txt +++ b/.besouro/20161012152902644/actions.txt @@ -122,3 +122,14 @@ EditAction 1476277121606 SpreadsheetTest.java 1432 5 15 5 UnitTestCaseAction 1476277125039 SpreadsheetTest.java FAIL UnitTestSessionAction 1476277125039 SpreadsheetTest.java FAIL EditAction 1476277183669 Spreadsheet.java 2655 10 25 0 +UnitTestCaseAction 1476277186084 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476277186084 SpreadsheetTest.java FAIL +RefactoringAction 1476277265764 Spreadsheet.java ADD boolean string FIELD +RefactoringAction 1476277277294 Spreadsheet.java REMOVE string FIELD +RefactoringAction 1476277280808 Spreadsheet.java ADD boolean STR_MARKS FIELD +RefactoringAction 1476277282322 Spreadsheet.java RENAME STR_MARKS=>boolean STR_MARKS_ FIELD +RefactoringAction 1476277286838 Spreadsheet.java RENAME STR_MARKS_=>boolean STR_MARKS_NOT_ALLOWED_ON FIELD +RefactoringAction 1476277298856 Spreadsheet.java RENAME STR_MARKS_NOT_ALLOWED_ON=>boolean STR_MARKS_NOT_ALLOWED_INSIDE_S FIELD +RefactoringAction 1476277300370 Spreadsheet.java RENAME STR_MARKS_NOT_ALLOWED_INSIDE_S=>boolean STR_MARKS_NOT_ALLOWED_INSIDE_STRING FIELD +RefactoringAction 1476277312411 Spreadsheet.java RENAME STR_MARKS_NOT_ALLOWED_INSIDE_STRING=>boolean STR_MARKS_ALLOWED_INSIDE_STRING FIELD +EditAction 1476277315022 Spreadsheet.java 2728 10 25 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 05ef2a53e56b056a38fc5041d74a8b18a0e71901..9f1765be361a8a62ba09507f7f64aad67e18819d 100644 GIT binary patch delta 101 zcmZpbZkOJ0pHse*frWvIfq}tFOPhH+L#j~bHiqn(3}RZ^+S?fNSyCqd;WRZ-WYA<# vX3%EPW6)tR0FrV*^(); @@ -40,6 +41,7 @@ private boolean containsString(String value) throws SpreadsheetException { if (!(charAsStringFromPos(value, 0).equals("'") && charAsStringFromPos(value, value.length() - 1).equals("'"))) return false; + if (2 == characterCount(value, "'")) return true; @@ -61,6 +63,8 @@ private int characterCount(String str, String targetChar) throws SpreadsheetExce } private String evaluatedString(String unevaluatedString) { + + return null; } From 46e46ee1dc15030b145a9cc3955fd2e53c7b5473 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 16:02:54 +0300 Subject: [PATCH 31/55] besouro automatic message --- .besouro/20161012152902644/actions.txt | 1 + bin/Spreadsheet.class | Bin 3463 -> 3537 bytes src/Spreadsheet.java | 4 ++-- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.besouro/20161012152902644/actions.txt b/.besouro/20161012152902644/actions.txt index 42e5d69..83f0821 100644 --- a/.besouro/20161012152902644/actions.txt +++ b/.besouro/20161012152902644/actions.txt @@ -133,3 +133,4 @@ RefactoringAction 1476277298856 Spreadsheet.java RENAME STR_MARKS_NOT_ALLOWED_ON RefactoringAction 1476277300370 Spreadsheet.java RENAME STR_MARKS_NOT_ALLOWED_INSIDE_S=>boolean STR_MARKS_NOT_ALLOWED_INSIDE_STRING FIELD RefactoringAction 1476277312411 Spreadsheet.java RENAME STR_MARKS_NOT_ALLOWED_INSIDE_STRING=>boolean STR_MARKS_ALLOWED_INSIDE_STRING FIELD EditAction 1476277315022 Spreadsheet.java 2728 10 25 0 +EditAction 1476277374017 Spreadsheet.java 2772 10 25 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 9f1765be361a8a62ba09507f7f64aad67e18819d..31987905aa6d0d37b8c810868d7d47a6674ccb60 100644 GIT binary patch literal 3537 zcma)9Yf~J@6+OKVc31`kgLp&%X^=p`E=ZP)k$6}!0VHjBIjoGl*bW+Y2X>@o7VpkV zauUaRD2W~C{j`)1j;d1SFZ!T71eK^_=Ub}sLsH3qprV}aS(e3+RM?vCp6+a0s?i(&4O)ZidozCA_xgI-n4F8XLFXjes*E?rk(Z#!f88~D+;vC zsjN?ZRZ%D$s88YX{{8>ZcbM7Zz9MrjyBuE7JnTp_?Z2Zqc(`Z^_D)Yz;>QYEDfT z3i*P-iR3kkPb|(PS0-j>7p_lFtt94?iK*!oE+po!2#Dn%sR9vnTg9SX@EmHJa*ERL zjDR+t&N;5*T@ncP^)Cs8Ci59Pigp}};4=b8_Nbi9QGt%nqC=oHV;7x*otfBGne<2= z{iKrRT3S1nWeUHD_&>-)qJds3?Ny z)^QRo5uDx^S3d+A`sm>~4Ka4-H4LzOUc(u7LmHlA_kxD=?1nWAvAdvQnB7GU7uk(y z7-cso@s8`LMO2P1>8OJ)M=$AUL{kKxCwYftO%xO8miwl4gi%B4ysSeC>SwF+kqHr8 zx0!&a`wqso|KOBBboy@E-c(_VU{>I0mA1-~hIxU3`MhhorCiP|s)RJ{yPHgQJ7ccp z3#LqX)5+Mb=d3w)A&MEiEUEk=i{LOUOVXdDj;px#DYSkKja8#9Ptj*-hCUXhkG+TJ zJ?LV;vXs)XjMpf+S)$~{YRR(lD#`zaAbeYv1vA-}1IuIb3ase30ZX7Eop(LUaf^Pw z{1?}krAS&w1_@^DuAYo9BiGh+tV?xmyXq$P)i{G*Q?Tx^KIP_{I&OiSG^bhm6J^Vn z3;B(g^W1nCM~P}`eXC;{T;^tP6g}9~@g`X8HTIh&OC4f|u+>i|df@3O;WoGCY=DW_@txE)8a{S<%;5>^Hrv<(W>=bn~9c zk(ag2ReRlWT^^SvbJBJ*W`3=lt{T2ZI^_AN@K7lMnVwZ(y_i0JbE8!BsKPuaQ_Ld= zQGZ=Z$wS@uK`?B>5ojv8p9-Fa?+8qgct;kLnJ;XMe|P9c1;@dBsywWAlJ-u z(zv} zmsS4IZIW192^XnM=1YaNec6$xa%0sgb4DUZ7g5QpBdnepzC}0+K;y%slH(?MP;$Or z%{TC!$7SW+Xl$2P0N3g$a}+IHY318Ed->O7h%K}|KqT}LLcu?v^LLyK;sjf1OpZ;q z0X|)P!U*UuG0gHZU@J9!z)87rIkt^cvBv0M(31)py~$L_=uf7?Mm(9SF$R;Vh;cTV z(u{M-RAY_tJllxz0$a_vz_!*HNj||?%xHLm7h}OE_+0EMCQ{p&e1a(nDWD)7BPh`8 z5c^3ok)TiW^ejaNOs+^Chy<5$g}vY@nxNztI1ce`M&VtdOVXWV@xP(|DP~f}+%^_I ziTx2%@hvR=6+Mr+>Qm6b9ymhjMl`@sHd=k@vJL9NE6Q${k`fIxw1n$yB{_3cAXU^U z^#faY_4=MSQKhMk{wo;5*5Tl;6Yw3^T45Nb3k` z9Yr6;5a;*;E-9=-zQGFC5xk?ah#>HFMQwn4zkzQOS{o(4#ZgFkq9e3}qhbeP(HNi| zUYF%$8)h$g4hR`yzhe9%o~q&}P_Y@nJ!LZ>Z%XdpAGL?H7owh#j$fm`!w=PO%fx(J z5)<#}2;JDicjteP&If1?4U&uxQTG(@vu=Oz$>3g|`9ZtN5=t=DXXwTpom)_#V!n|I zsA?j9NT&nb-Hsm-Xi&M&kI{zO9UN!AagE;t2Y|m#jj|lNf-ioAmRKy_!N6_f$11<> z1%&eD;j@2*_M+wkOfn|dSmm!UYDt#Fs|uiBm0cBpUFEC_pi@Of0tBNTlo4r=5#beb z0Mva#lAwkZk-I$pOeL6v8E5T|b(~k}#mtv5<;=$qpZznqhx52P{a>fGH;8kEnQ;T% rw04@~^UMU37JR%z6}&_Eg^Kb~9IwJ#i;%Iy|I!Fp;FlB&;8*_vDsbQC literal 3463 zcma)9Yf~H78Gcq;&>|KYgt^ov&H|1B3EMHj#u)6HV(id>aV&>Kc2Z}N7PPj!BCD0{ zv`y2C+a$fEw=Z@-q@L+azW9TCF-+@e(r=yV59zf3fvNkvXN3@fb_%oSoIU5f@B6&Z zds+DVzyJIhfKmJ^hKPpd%&PC$`EtQ=f*5oStvBr3_R*s4tsGrgy5Zyk4GlS`SS)Mk zm{Vt!z%3qq*)A6Xd#UJ5XlTl~E1n%xd`H8?Zg(cbO{Fvw_^!87y;i?-hML;#VzG3` z$2|H_G>%kHMGoJzPxbx`ut2LGj(A`Lvq(k(!Tz34x<&|@8S)9ph(5`AQCUZsCbAvM)qJu+=8uaN>-if0V-7$1&*t5ma zbdgF-dpS_WO|_YTtk3}}x!ME`JtkVwM)^6{b1qhHEjj)bF)QFpIlH)M z`>woKH(My5yE$*KR^J;Z6{t9(=rduVJ%)qZ0v2*>;1Jz7W?+!hh=CNRmkbPZ8Z~f) z({TeYaynsPgwvRTQBEffoZvKW;3TKRg7=h(Cd6emX`&fs3}mEzmn4YeH2UP;l!*p3 zlCYrQ((#tLy7Xdvqbm;c>CoWLPz~+e(h#4yn{!rGfMR%A!`?b=wIc&x)i8Xq&U_mn6etK znRpX#X-MQsUSPXkIn0v(;`&t)xo+ZZu%z~E>dA*Pa<*h5C+fO3)lF?HSq8n)x9_mr zV$zC%*cT_`cX7-3m$Da?^JBnlXhWi zh)(ol)xX2n@QqNmnz=>AG28lcQwp~;H*s=tO2X0 zZ?HUM1qC~>+_L4B0*kAl;8;t}itBmoein1m@$yz_xtgv9zD_!%-6=d&NYo$ z#BbfIlmn`;j!B9IbSxg8id( z3XW&dSRm-AU4dM-j)`$=nE|ux>b6jO&&2of12+D0WhuPO<~KOITkK-^P($}tzpV8} z)r8~t0DY49k`7Vd2_!y0G4WH$uvWLcJ+}<}OvCx1*nQ|H6>#@T=3AjFo8A_e!TIbsZ1@k&R5ijsy}0m8MSO?^2qr@M=wSb5*m1>0o0c+0(gq!8$#>H|dkJYDHUAAeuK!8$+#H9!MZKqmGhuKq$lm8lSDu*AH?UXRK!esAp&fn| ztI2kPv+x|zB*bC0gtdFNj-N=)W(40>HY4&uyrMv*LL)U$ z^+f!TPDgmV8$Tk@sB)iwX(pOBaDe&7Gk*4W0Dq4fr5t*rr$0qUDwXbG;MVbDm0$NF zn)2o0vw!JZQ40YsFeaDS8ee797HI5>0vJ|hZw+8?HLHYQiAqGlG7y!BBqSpIQtSYA zpO6I9s3LNc$B$Kl3CuKWcf4mrr57__V9L&C51;)rx`p$AYVvO|$FjtEjhXQ#OZ6=r o;(COcAXO0J9j)OV#m`lg_wsZLFZ*Y5ga2C*u!dhyEP`MD2isQ9*#H0l diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 65ea362..fc2365c 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -41,9 +41,9 @@ private boolean containsString(String value) throws SpreadsheetException { if (!(charAsStringFromPos(value, 0).equals("'") && charAsStringFromPos(value, value.length() - 1).equals("'"))) return false; - + if (false == STR_MARKS_ALLOWED_INSIDE_STRING) if (2 == characterCount(value, "'")) - return true; + return true; throw new SpreadsheetException("String contains ' character(s) that is not at the beginning or end of string"); } From 92354b09ad87f99afc872eba20e3cf1fb05bbf4f Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 16:03:00 +0300 Subject: [PATCH 32/55] besouro automatic message --- .besouro/20161012152902644/actions.txt | 1 + src/Spreadsheet.java | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.besouro/20161012152902644/actions.txt b/.besouro/20161012152902644/actions.txt index 83f0821..4d337ba 100644 --- a/.besouro/20161012152902644/actions.txt +++ b/.besouro/20161012152902644/actions.txt @@ -134,3 +134,4 @@ RefactoringAction 1476277300370 Spreadsheet.java RENAME STR_MARKS_NOT_ALLOWED_IN RefactoringAction 1476277312411 Spreadsheet.java RENAME STR_MARKS_NOT_ALLOWED_INSIDE_STRING=>boolean STR_MARKS_ALLOWED_INSIDE_STRING FIELD EditAction 1476277315022 Spreadsheet.java 2728 10 25 0 EditAction 1476277374017 Spreadsheet.java 2772 10 25 0 +EditAction 1476277380207 Spreadsheet.java 2774 10 25 0 diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index fc2365c..e85a5c0 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -42,8 +42,8 @@ private boolean containsString(String value) throws SpreadsheetException { return false; if (false == STR_MARKS_ALLOWED_INSIDE_STRING) - if (2 == characterCount(value, "'")) - return true; + if (2 == characterCount(value, "'")) + return true; throw new SpreadsheetException("String contains ' character(s) that is not at the beginning or end of string"); } From b677b69b2c3c6b5c91dff92d04b685ec6067d0d7 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 16:05:54 +0300 Subject: [PATCH 33/55] besouro automatic message --- .besouro/20161012152902644/actions.txt | 1 + src/Spreadsheet.java | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.besouro/20161012152902644/actions.txt b/.besouro/20161012152902644/actions.txt index 4d337ba..2405f50 100644 --- a/.besouro/20161012152902644/actions.txt +++ b/.besouro/20161012152902644/actions.txt @@ -135,3 +135,4 @@ RefactoringAction 1476277312411 Spreadsheet.java RENAME STR_MARKS_NOT_ALLOWED_IN EditAction 1476277315022 Spreadsheet.java 2728 10 25 0 EditAction 1476277374017 Spreadsheet.java 2772 10 25 0 EditAction 1476277380207 Spreadsheet.java 2774 10 25 0 +EditAction 1476277554292 Spreadsheet.java 2924 10 26 0 diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index e85a5c0..f38c2a5 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -63,9 +63,10 @@ private int characterCount(String str, String targetChar) throws SpreadsheetExce } private String evaluatedString(String unevaluatedString) { + if (false == STR_MARKS_ALLOWED_INSIDE_STRING) + return removeStringMarks(unevaluatedString); - - return null; + throw new SpreadsheetException("String evaluation method not found"); } private String charAsStringFromPos(String str, int pos) throws SpreadsheetException { From 6a8a9e616b59e4748e60f286760c9bf0ea732b2a Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 16:12:18 +0300 Subject: [PATCH 34/55] besouro automatic message --- .besouro/20161012152902644/actions.txt | 9 +++++++++ bin/Spreadsheet.class | Bin 3537 -> 3729 bytes src/Spreadsheet.java | 10 +++++++++- 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/.besouro/20161012152902644/actions.txt b/.besouro/20161012152902644/actions.txt index 2405f50..8326eeb 100644 --- a/.besouro/20161012152902644/actions.txt +++ b/.besouro/20161012152902644/actions.txt @@ -136,3 +136,12 @@ EditAction 1476277315022 Spreadsheet.java 2728 10 25 0 EditAction 1476277374017 Spreadsheet.java 2772 10 25 0 EditAction 1476277380207 Spreadsheet.java 2774 10 25 0 EditAction 1476277554292 Spreadsheet.java 2924 10 26 0 +CompilationAction 1476277554539 Spreadsheet.java +RefactoringAction 1476277643206 Spreadsheet.java ADD String removePrecedingAndTrailingStringMark FIELD +RefactoringAction 1476277645721 Spreadsheet.java RENAME removePrecedingAndTrailingStringMark=>String removePrecedingAndTrailingStringMark() METHOD +RefactoringAction 1476277654736 Spreadsheet.java RENAME removePrecedingAndTrailingStringMark()=>String removePrecedingAndTrailingStringMark(String) METHOD +CompilationAction 1476277791148 Spreadsheet.java +RefactoringAction 1476277797922 Spreadsheet.java RENAME removePrecedingAndTrailingStringMark(String)=>String removeFirstAndLast(String) METHOD +RefactoringAction 1476277799440 Spreadsheet.java RENAME removeFirstAndLast(String)=>String removeFirstAndLastChar(String) METHOD +CompilationAction 1476277800604 Spreadsheet.java +EditAction 1476277938363 Spreadsheet.java 3101 11 26 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 31987905aa6d0d37b8c810868d7d47a6674ccb60..2c26f05dbe2f1452bab53b181f2095d5e41c30df 100644 GIT binary patch delta 599 zcmYLHTWb?R6#iyYH*vG^QY98`aRWt>5{gnS_!c$Minf)KhbTy=*)d7o>@KrQRD38% zypxV^K(yo$oT%}%U1wnc=ypT z^@SvEGHjjaEk5dSw>Dao(vvCNW|%I!QUspU61G+KntsFKVZ(DRUwU(nXdbnU&1JXF zUE84x;%Zg+F&$p>g*D?#!R??fL|FXK7zP$G&5)I%>9s_uA%n1xb?q}e2#?pfWY9w{ zYa&eHfy(Qr^hYKhpP{0f5iNUx$@=|c7Lk$EB>D~nBpC$R-n7{EE?FoSWFRl&@qpWy~I$Wi^d zYMRH`3)L}m+bg6vkA7UhPE^R_qFOV@*^=6wIlx}26Pd#Y=a52`ZV2qcB@Cm6eS{BT ZK3>71&e4xqUp_*w)rX9gd=oGH_Af6XiG%vSo^T2z4Yrvo1kr* z9-vT=t=qM2*UxAZ-7(r6?&I8Z?!6W7N0;sW=lK;t5LXX2NpLebiy3W0O&3*NOT_hj zDw7nk!|#NMuqR<32mD*;Wrtj`dI!t!GnjMP0%2a$ZD6QKs6u6EO%=w|>FlPKh-P#x zspUnS@pbDPvp)@pU*?f9;+n|U#O@75H=#f^U=lt;*IyT5Oi^YqO1vb6!rOJk8vP!R zWwnOg*++P<(QXOUP`H8p1?9y$jv4_&(%h7Ep@rfI9EhS5(@-#j5MrFkiv1W{B&$&U zga_macFJ?I;*8V89NI9C4#Y`gf#1p@R^^{^ALHEO7#&)Ih-G4|z>QV-p`wT4VI-Q1 W`^edN=l|kCobxq@&w9~3;_??j)l35b diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index f38c2a5..8fdc0a5 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -64,11 +64,19 @@ private int characterCount(String str, String targetChar) throws SpreadsheetExce private String evaluatedString(String unevaluatedString) { if (false == STR_MARKS_ALLOWED_INSIDE_STRING) - return removeStringMarks(unevaluatedString); + return removeFirstAndLastChar(unevaluatedString); throw new SpreadsheetException("String evaluation method not found"); } + private String removeFirstAndLastChar(String target) { + String processedTarget = target.substring(1, target.length() - 2) + + assert ; + + return processedTarget; + } + private String charAsStringFromPos(String str, int pos) throws SpreadsheetException { if (pos < 0 || pos > (str.length() - 1)) throw new SpreadsheetException("Position out of bounds when getting string of 1 len from a string"); From 0bd684cb54a575bace44927cac8c35c7a6408259 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 16:12:42 +0300 Subject: [PATCH 35/55] besouro automatic message --- .besouro/20161012152902644/actions.txt | 3 +++ bin/Spreadsheet.class | Bin 3729 -> 3808 bytes src/Spreadsheet.java | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.besouro/20161012152902644/actions.txt b/.besouro/20161012152902644/actions.txt index 8326eeb..bbefd9b 100644 --- a/.besouro/20161012152902644/actions.txt +++ b/.besouro/20161012152902644/actions.txt @@ -145,3 +145,6 @@ RefactoringAction 1476277797922 Spreadsheet.java RENAME removePrecedingAndTraili RefactoringAction 1476277799440 Spreadsheet.java RENAME removeFirstAndLast(String)=>String removeFirstAndLastChar(String) METHOD CompilationAction 1476277800604 Spreadsheet.java EditAction 1476277938363 Spreadsheet.java 3101 11 26 0 +CompilationAction 1476277938623 Spreadsheet.java +CompilationAction 1476277938624 Spreadsheet.java +EditAction 1476277962813 Spreadsheet.java 3150 11 26 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 2c26f05dbe2f1452bab53b181f2095d5e41c30df..9f22d372d71e674dba3db17c55461a2d856a5440 100644 GIT binary patch delta 409 zcmXAl%P#{_6vn^X*0h<G{!JR+JPCUH^P8JU>`Td`=o>#Fx7 zv9<9?G$GNwKf%hvKVc)TvH9}5=iKw1FDI{kYV!Nf%Nu|$+&styNeW?`V4Sy0vBcQA z=^AU4*|ud<%cQQg%uE_H9EaI%td-8O409QE7t_vvPYz+1-%0(_zJdef`M1f>Q-&FbK-iPERIdt+KfR(`5_H4&mY{8~h3+y5NUTM3Y~!nTl=| zkt>Op5A{MN;Q$PR3ROIokwhQBb4q7&r-Fh8Hhi_xk309hp8ft zO7VL!>i5j5Q6_i<5sac1fr)5#7bS%k9l0}B`17E)hnjN#5AIqK^3Ni zhrw^vZgR#y)Mj$d1Cc~KLkRQY$0BNwMgx}6D7XVzFESOI|8DL@_UMu?MQHF!un*V2 D@!4De delta 365 zcmXAjOG^S_6o%g~ZIp3l=!P07IUt3I2;E#8WF@49w6GwWY8n)AVrHmKtCrpE%QCys zKj;EV1-kDKv~AHJXdlt1Z63~f&wJi;KK&&>|Ni^h05FQ%N50Gn1e~Q9nrb<5K!3Pt z?nuBfPH56GGUg Y5E=$qJ&ZiPmptT(zDNPbb^Gm`KN>et+yDRo diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 8fdc0a5..7b70b7b 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -72,7 +72,7 @@ private String evaluatedString(String unevaluatedString) { private String removeFirstAndLastChar(String target) { String processedTarget = target.substring(1, target.length() - 2) - assert ; + assert (target.length() - 2) == processedTarget.length(); return processedTarget; } From 2a7439946300ce8b03bec4d5be488954223119cd Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 16:13:00 +0300 Subject: [PATCH 36/55] besouro automatic message --- .besouro/20161012152902644/actions.txt | 3 +++ bin/Spreadsheet.class | Bin 3808 -> 3811 bytes src/Spreadsheet.java | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.besouro/20161012152902644/actions.txt b/.besouro/20161012152902644/actions.txt index bbefd9b..08c2d2e 100644 --- a/.besouro/20161012152902644/actions.txt +++ b/.besouro/20161012152902644/actions.txt @@ -148,3 +148,6 @@ EditAction 1476277938363 Spreadsheet.java 3101 11 26 0 CompilationAction 1476277938623 Spreadsheet.java CompilationAction 1476277938624 Spreadsheet.java EditAction 1476277962813 Spreadsheet.java 3150 11 26 0 +CompilationAction 1476277962916 Spreadsheet.java +CompilationAction 1476277962916 Spreadsheet.java +EditAction 1476277980432 Spreadsheet.java 3151 11 29 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 9f22d372d71e674dba3db17c55461a2d856a5440..516f8a83f49ad84afef09a68813e4f3bec3d2278 100644 GIT binary patch delta 78 zcmaDL`&f3v5;n&0$%br7Cc%|?C5aUZsYONkMLG(ZdBv$kB??N`N(v?U3d#Ao1v#lD isR~Xx`N`SAC5a`exv6<2#hZVyondA4+ Date: Wed, 12 Oct 2016 16:14:37 +0300 Subject: [PATCH 37/55] besouro automatic message --- .besouro/20161012152902644/actions.txt | 5 +++++ bin/Spreadsheet.class | Bin 3811 -> 3752 bytes src/Spreadsheet.java | 4 ++-- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.besouro/20161012152902644/actions.txt b/.besouro/20161012152902644/actions.txt index 08c2d2e..fb75e4a 100644 --- a/.besouro/20161012152902644/actions.txt +++ b/.besouro/20161012152902644/actions.txt @@ -151,3 +151,8 @@ EditAction 1476277962813 Spreadsheet.java 3150 11 26 0 CompilationAction 1476277962916 Spreadsheet.java CompilationAction 1476277962916 Spreadsheet.java EditAction 1476277980432 Spreadsheet.java 3151 11 29 0 +CompilationAction 1476277980687 Spreadsheet.java +CompilationAction 1476278005633 Spreadsheet.java +UnitTestCaseAction 1476278047247 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476278047247 SpreadsheetTest.java FAIL +EditAction 1476278077008 Spreadsheet.java 3179 11 29 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 516f8a83f49ad84afef09a68813e4f3bec3d2278..08d2f2f47583d3a5bdc5394e77d57f943706414c 100644 GIT binary patch delta 515 zcmX|-O-~a+7{~v!UE5~aR*gy10}UlWn%WvnVbEu{(MK z40MG#DS#p5$!6LLj9`?qu(t@C`bPK##>7Vwk zo{bhBoR&H}&1r()kKotL8xi*(R^LnwcWAtb=CgRG=Tn31y*^L5Y)hBZMYgS{(t_>k N@9BKvBM}Vj{ROKGbDRJG delta 546 zcmah_OKVd>7(J7Qn>f9xQb7b89IGN?OAuVuRZCLIMhl^o?m8wP?bXSh%iJNht5B)d z_oL&hwOZVDTZINJ+P#0nU*N*6I9_mN!Oi)eoO8Z!yZpV(zy13B6~HBI?eH+@7I25* z@D16K6(!^OO3fH;idbcsnvM;nT6L%;n!24tO4>-rA~E{9qV|~Jho<8N8Ml;Qpv5L7 z+1M^6BpQh!*-96PZ0+xabF5&B;h3Se?$BgpQakP{0iP@4A;Zl72L~|J4`Og1!i%RL^>A(f!q8BDZWm9kenfc# zNAsh*NVm|xhqc)rUbvrOwf`k Date: Wed, 12 Oct 2016 16:16:53 +0300 Subject: [PATCH 38/55] besouro automatic message --- .besouro/20161012152902644/actions.txt | 8 + .../20161012152902644/besouroEpisodes.txt | 828 ++++++++++++++++++ .../randomHeuristicEpisodes.txt | 1 + .besouro/20161012152902644/zorroEpisodes.txt | 7 +- bin/Spreadsheet.class | Bin 3752 -> 3752 bytes tests/SpreadsheetTest.java | 5 + 6 files changed, 846 insertions(+), 3 deletions(-) diff --git a/.besouro/20161012152902644/actions.txt b/.besouro/20161012152902644/actions.txt index fb75e4a..17053f8 100644 --- a/.besouro/20161012152902644/actions.txt +++ b/.besouro/20161012152902644/actions.txt @@ -156,3 +156,11 @@ CompilationAction 1476278005633 Spreadsheet.java UnitTestCaseAction 1476278047247 SpreadsheetTest.java FAIL UnitTestSessionAction 1476278047247 SpreadsheetTest.java FAIL EditAction 1476278077008 Spreadsheet.java 3179 11 29 0 +UnitTestCaseAction 1476278081246 SpreadsheetTest.java OK +UnitTestSessionAction 1476278081246 SpreadsheetTest.java OK +RefactoringAction 1476278107574 SpreadsheetTest.java ADD void evaluateString_ FIELD +RefactoringAction 1476278111086 SpreadsheetTest.java RENAME evaluateString_=>void evaluateString_Too FIELD +RefactoringAction 1476278118598 SpreadsheetTest.java RENAME evaluateString_Too=>void evaluateString_TooManyStr FIELD +RefactoringAction 1476278120109 SpreadsheetTest.java RENAME evaluateString_TooManyStr=>void evaluateString_TooManyStrMarks FIELD +RefactoringAction 1476278127122 SpreadsheetTest.java RENAME evaluateString_TooManyStrMarks=>void evaluateString_TooManyStrMarks() METHOD +EditAction 1476278213264 SpreadsheetTest.java 1547 6 16 5 diff --git a/.besouro/20161012152902644/besouroEpisodes.txt b/.besouro/20161012152902644/besouroEpisodes.txt index 998f98b..a904165 100644 --- a/.besouro/20161012152902644/besouroEpisodes.txt +++ b/.besouro/20161012152902644/besouroEpisodes.txt @@ -1,3 +1,831 @@ 1476275744044 test-addition 1 401 true 1476275779118 regression 2 24 true 1476275783928 regression 1 1 true +1476278081246 test-first 1 2150 true +1476278081247 test-first 1 2150 true +1476278081248 test-first 1 2150 true +1476278081249 test-first 1 2150 true +1476278081250 test-first 1 2150 true +1476278081251 test-first 1 2150 true +1476278081252 test-first 1 2150 true +1476278081253 test-first 1 2150 true +1476278081254 test-first 1 2150 true +1476278081255 test-first 1 2150 true +1476278081256 test-first 1 2150 true +1476278081257 test-first 1 2150 true +1476278081258 test-first 1 2150 true +1476278081259 test-first 1 2150 true +1476278081260 test-first 1 2150 true +1476278081261 test-first 1 2150 true +1476278081262 test-first 1 2150 true +1476278081263 test-first 1 2150 true +1476278081264 test-first 1 2150 true +1476278081265 test-first 1 2150 true +1476278081266 test-first 1 2150 true +1476278081267 test-first 1 2150 true +1476278081268 test-first 1 2150 true +1476278081269 test-first 1 2150 true +1476278081270 test-first 1 2150 true +1476278081271 test-first 1 2150 true +1476278081272 test-first 1 2150 true +1476278081273 test-first 1 2150 true +1476278081274 test-first 1 2150 true +1476278081275 test-first 1 2150 true +1476278081276 test-first 1 2150 true +1476278081277 test-first 1 2150 true +1476278081278 test-first 1 2150 true +1476278081279 test-first 1 2150 true +1476278081280 test-first 1 2150 true +1476278081281 test-first 1 2150 true +1476278081282 test-first 1 2150 true +1476278081283 test-first 1 2150 true +1476278081284 test-first 1 2150 true +1476278081285 test-first 1 2150 true +1476278081286 test-first 1 2150 true +1476278081287 test-first 1 2150 true +1476278081288 test-first 1 2150 true +1476278081289 test-first 1 2150 true +1476278081290 test-first 1 2150 true +1476278081291 test-first 1 2150 true +1476278081292 test-first 1 2150 true +1476278081293 test-first 1 2150 true +1476278081294 test-first 1 2150 true +1476278081295 test-first 1 2150 true +1476278081296 test-first 1 2150 true +1476278081297 test-first 1 2150 true +1476278081298 test-first 1 2150 true +1476278081299 test-first 1 2150 true +1476278081300 test-first 1 2150 true +1476278081301 test-first 1 2150 true +1476278081302 test-first 1 2150 true +1476278081303 test-first 1 2150 true +1476278081304 test-first 1 2150 true +1476278081305 test-first 1 2150 true +1476278081306 test-first 1 2150 true +1476278081307 test-first 1 2150 true +1476278081308 test-first 1 2150 true +1476278081309 test-first 1 2150 true +1476278081310 test-first 1 2150 true +1476278081311 test-first 1 2150 true +1476278081312 test-first 1 2150 true +1476278081313 test-first 1 2150 true +1476278081314 test-first 1 2150 true +1476278081315 test-first 1 2150 true +1476278081316 test-first 1 2150 true +1476278081317 test-first 1 2150 true +1476278081318 test-first 1 2150 true +1476278081319 test-first 1 2150 true +1476278081320 test-first 1 2150 true +1476278081321 test-first 1 2150 true +1476278081322 test-first 1 2150 true +1476278081323 test-first 1 2150 true +1476278081324 test-first 1 2150 true +1476278081325 test-first 1 2150 true +1476278081326 test-first 1 2150 true +1476278081327 test-first 1 2150 true +1476278081328 test-first 1 2150 true +1476278081329 test-first 1 2150 true +1476278081330 test-first 1 2150 true +1476278081331 test-first 1 2150 true +1476278081332 test-first 1 2150 true +1476278081333 test-first 1 2150 true +1476278081334 test-first 1 2150 true +1476278081335 test-first 1 2150 true +1476278081336 test-first 1 2150 true +1476278081337 test-first 1 2150 true +1476278081338 test-first 1 2150 true +1476278081339 test-first 1 2150 true +1476278081340 test-first 1 2150 true +1476278081341 test-first 1 2150 true +1476278081342 test-first 1 2150 true +1476278081343 test-first 1 2150 true +1476278081344 test-first 1 2150 true +1476278081345 test-first 1 2150 true +1476278081346 test-first 1 2150 true +1476278081347 test-first 1 2150 true +1476278081348 test-first 1 2150 true +1476278081349 test-first 1 2150 true +1476278081350 test-first 1 2150 true +1476278081351 test-first 1 2150 true +1476278081352 test-first 1 2150 true +1476278081353 test-first 1 2150 true +1476278081354 test-first 1 2150 true +1476278081355 test-first 1 2150 true +1476278081356 test-first 1 2150 true +1476278081357 test-first 1 2150 true +1476278081358 test-first 1 2150 true +1476278081359 test-first 1 2150 true +1476278081360 test-first 1 2150 true +1476278081361 test-first 1 2150 true +1476278081362 test-first 1 2150 true +1476278081363 test-first 1 2150 true +1476278081364 test-first 1 2150 true +1476278081365 test-first 1 2150 true +1476278081366 test-first 1 2150 true +1476278081367 test-first 1 2150 true +1476278081368 test-first 1 2150 true +1476278081369 test-first 1 2150 true +1476278081370 test-first 1 2150 true +1476278081371 test-first 1 2150 true +1476278081372 test-first 1 2150 true +1476278081373 test-first 1 2150 true +1476278081374 test-first 1 2150 true +1476278081375 test-first 1 2150 true +1476278081376 test-first 1 2150 true +1476278081377 test-first 1 2150 true +1476278081378 test-first 1 2150 true +1476278081379 test-first 1 2150 true +1476278081380 test-first 1 2150 true +1476278081381 test-first 1 2150 true +1476278081382 test-first 1 2150 true +1476278081383 test-first 1 2150 true +1476278081384 test-first 1 2150 true +1476278081385 test-first 1 2150 true +1476278081386 test-first 1 2150 true +1476278081387 test-first 1 2150 true +1476278081388 test-first 1 2150 true +1476278081389 test-first 1 2150 true +1476278081390 test-first 1 2150 true +1476278081391 test-first 1 2150 true +1476278081392 test-first 1 2150 true +1476278081393 test-first 1 2150 true +1476278081394 test-first 1 2150 true +1476278081395 test-first 1 2150 true +1476278081396 test-first 1 2150 true +1476278081397 test-first 1 2150 true +1476278081398 test-first 1 2150 true +1476278081399 test-first 1 2150 true +1476278081400 test-first 1 2150 true +1476278081401 test-first 1 2150 true +1476278081402 test-first 1 2150 true +1476278081403 test-first 1 2150 true +1476278081404 test-first 1 2150 true +1476278081405 test-first 1 2150 true +1476278081406 test-first 1 2150 true +1476278081407 test-first 1 2150 true +1476278081408 test-first 1 2150 true +1476278081409 test-first 1 2150 true +1476278081410 test-first 1 2150 true +1476278081411 test-first 1 2150 true +1476278081412 test-first 1 2150 true +1476278081413 test-first 1 2150 true +1476278081414 test-first 1 2150 true +1476278081415 test-first 1 2150 true +1476278081416 test-first 1 2150 true +1476278081417 test-first 1 2150 true +1476278081418 test-first 1 2150 true +1476278081419 test-first 1 2150 true +1476278081420 test-first 1 2150 true +1476278081421 test-first 1 2150 true +1476278081422 test-first 1 2150 true +1476278081423 test-first 1 2150 true +1476278081424 test-first 1 2150 true +1476278081425 test-first 1 2150 true +1476278081426 test-first 1 2150 true +1476278081427 test-first 1 2150 true +1476278081428 test-first 1 2150 true +1476278081429 test-first 1 2150 true +1476278081430 test-first 1 2150 true +1476278081431 test-first 1 2150 true +1476278081432 test-first 1 2150 true +1476278081433 test-first 1 2150 true +1476278081434 test-first 1 2150 true +1476278081435 test-first 1 2150 true +1476278081436 test-first 1 2150 true +1476278081437 test-first 1 2150 true +1476278081438 test-first 1 2150 true +1476278081439 test-first 1 2150 true +1476278081440 test-first 1 2150 true +1476278081441 test-first 1 2150 true +1476278081442 test-first 1 2150 true +1476278081443 test-first 1 2150 true +1476278081444 test-first 1 2150 true +1476278081445 test-first 1 2150 true +1476278081446 test-first 1 2150 true +1476278081447 test-first 1 2150 true +1476278081448 test-first 1 2150 true +1476278081449 test-first 1 2150 true +1476278081450 test-first 1 2150 true +1476278081451 test-first 1 2150 true +1476278081452 test-first 1 2150 true +1476278081453 test-first 1 2150 true +1476278081454 test-first 1 2150 true +1476278081455 test-first 1 2150 true +1476278081456 test-first 1 2150 true +1476278081457 test-first 1 2150 true +1476278081458 test-first 1 2150 true +1476278081459 test-first 1 2150 true +1476278081460 test-first 1 2150 true +1476278081461 test-first 1 2150 true +1476278081462 test-first 1 2150 true +1476278081463 test-first 1 2150 true +1476278081464 test-first 1 2150 true +1476278081465 test-first 1 2150 true +1476278081466 test-first 1 2150 true +1476278081467 test-first 1 2150 true +1476278081468 test-first 1 2150 true +1476278081469 test-first 1 2150 true +1476278081470 test-first 1 2150 true +1476278081471 test-first 1 2150 true +1476278081472 test-first 1 2150 true +1476278081473 test-first 1 2150 true +1476278081474 test-first 1 2150 true +1476278081475 test-first 1 2150 true +1476278081476 test-first 1 2150 true +1476278081477 test-first 1 2150 true +1476278081478 test-first 1 2150 true +1476278081479 test-first 1 2150 true +1476278081480 test-first 1 2150 true +1476278081481 test-first 1 2150 true +1476278081482 test-first 1 2150 true +1476278081483 test-first 1 2150 true +1476278081484 test-first 1 2150 true +1476278081485 test-first 1 2150 true +1476278081486 test-first 1 2150 true +1476278081487 test-first 1 2150 true +1476278081488 test-first 1 2150 true +1476278081489 test-first 1 2150 true +1476278081490 test-first 1 2150 true +1476278081491 test-first 1 2150 true +1476278081492 test-first 1 2150 true +1476278081493 test-first 1 2150 true +1476278081494 test-first 1 2150 true +1476278081495 test-first 1 2150 true +1476278081496 test-first 1 2150 true +1476278081497 test-first 1 2150 true +1476278081498 test-first 1 2150 true +1476278081499 test-first 1 2150 true +1476278081500 test-first 1 2150 true +1476278081501 test-first 1 2150 true +1476278081502 test-first 1 2150 true +1476278081503 test-first 1 2150 true +1476278081504 test-first 1 2150 true +1476278081505 test-first 1 2150 true +1476278081506 test-first 1 2150 true +1476278081507 test-first 1 2150 true +1476278081508 test-first 1 2150 true +1476278081509 test-first 1 2150 true +1476278081510 test-first 1 2150 true +1476278081511 test-first 1 2150 true +1476278081512 test-first 1 2150 true +1476278081513 test-first 1 2150 true +1476278081514 test-first 1 2150 true +1476278081515 test-first 1 2150 true +1476278081516 test-first 1 2150 true +1476278081517 test-first 1 2150 true +1476278081518 test-first 1 2150 true +1476278081519 test-first 1 2150 true +1476278081520 test-first 1 2150 true +1476278081521 test-first 1 2150 true +1476278081522 test-first 1 2150 true +1476278081523 test-first 1 2150 true +1476278081524 test-first 1 2150 true +1476278081525 test-first 1 2150 true +1476278081526 test-first 1 2150 true +1476278081527 test-first 1 2150 true +1476278081528 test-first 1 2150 true +1476278081529 test-first 1 2150 true +1476278081530 test-first 1 2150 true +1476278081531 test-first 1 2150 true +1476278081532 test-first 1 2150 true +1476278081533 test-first 1 2150 true +1476278081534 test-first 1 2150 true +1476278081535 test-first 1 2150 true +1476278081536 test-first 1 2150 true +1476278081537 test-first 1 2150 true +1476278081538 test-first 1 2150 true +1476278081539 test-first 1 2150 true +1476278081540 test-first 1 2150 true +1476278081541 test-first 1 2150 true +1476278081542 test-first 1 2150 true +1476278081543 test-first 1 2150 true +1476278081544 test-first 1 2150 true +1476278081545 test-first 1 2150 true +1476278081546 test-first 1 2150 true +1476278081547 test-first 1 2150 true +1476278081548 test-first 1 2150 true +1476278081549 test-first 1 2150 true +1476278081550 test-first 1 2150 true +1476278081551 test-first 1 2150 true +1476278081552 test-first 1 2150 true +1476278081553 test-first 1 2150 true +1476278081554 test-first 1 2150 true +1476278081555 test-first 1 2150 true +1476278081556 test-first 1 2150 true +1476278081557 test-first 1 2150 true +1476278081558 test-first 1 2150 true +1476278081559 test-first 1 2150 true +1476278081560 test-first 1 2150 true +1476278081561 test-first 1 2150 true +1476278081562 test-first 1 2150 true +1476278081563 test-first 1 2150 true +1476278081564 test-first 1 2150 true +1476278081565 test-first 1 2150 true +1476278081566 test-first 1 2150 true +1476278081567 test-first 1 2150 true +1476278081568 test-first 1 2150 true +1476278081569 test-first 1 2150 true +1476278081570 test-first 1 2150 true +1476278081571 test-first 1 2150 true +1476278081572 test-first 1 2150 true +1476278081573 test-first 1 2150 true +1476278081574 test-first 1 2150 true +1476278081575 test-first 1 2150 true +1476278081576 test-first 1 2150 true +1476278081577 test-first 1 2150 true +1476278081578 test-first 1 2150 true +1476278081579 test-first 1 2150 true +1476278081580 test-first 1 2150 true +1476278081581 test-first 1 2150 true +1476278081582 test-first 1 2150 true +1476278081583 test-first 1 2150 true +1476278081584 test-first 1 2150 true +1476278081585 test-first 1 2150 true +1476278081586 test-first 1 2150 true +1476278081587 test-first 1 2150 true +1476278081588 test-first 1 2150 true +1476278081589 test-first 1 2150 true +1476278081590 test-first 1 2150 true +1476278081591 test-first 1 2150 true +1476278081592 test-first 1 2150 true +1476278081593 test-first 1 2150 true +1476278081594 test-first 1 2150 true +1476278081595 test-first 1 2150 true +1476278081596 test-first 1 2150 true +1476278081597 test-first 1 2150 true +1476278081598 test-first 1 2150 true +1476278081599 test-first 1 2150 true +1476278081600 test-first 1 2150 true +1476278081601 test-first 1 2150 true +1476278081602 test-first 1 2150 true +1476278081603 test-first 1 2150 true +1476278081604 test-first 1 2150 true +1476278081605 test-first 1 2150 true +1476278081606 test-first 1 2150 true +1476278081607 test-first 1 2150 true +1476278081608 test-first 1 2150 true +1476278081609 test-first 1 2150 true +1476278081610 test-first 1 2150 true +1476278081611 test-first 1 2150 true +1476278081612 test-first 1 2150 true +1476278081613 test-first 1 2150 true +1476278081614 test-first 1 2150 true +1476278081615 test-first 1 2150 true +1476278081616 test-first 1 2150 true +1476278081617 test-first 1 2150 true +1476278081618 test-first 1 2150 true +1476278081619 test-first 1 2150 true +1476278081620 test-first 1 2150 true +1476278081621 test-first 1 2150 true +1476278081622 test-first 1 2150 true +1476278081623 test-first 1 2150 true +1476278081624 test-first 1 2150 true +1476278081625 test-first 1 2150 true +1476278081626 test-first 1 2150 true +1476278081627 test-first 1 2150 true +1476278081628 test-first 1 2150 true +1476278081629 test-first 1 2150 true +1476278081630 test-first 1 2150 true +1476278081631 test-first 1 2150 true +1476278081632 test-first 1 2150 true +1476278081633 test-first 1 2150 true +1476278081634 test-first 1 2150 true +1476278081635 test-first 1 2150 true +1476278081636 test-first 1 2150 true +1476278081637 test-first 1 2150 true +1476278081638 test-first 1 2150 true +1476278081639 test-first 1 2150 true +1476278081640 test-first 1 2150 true +1476278081641 test-first 1 2150 true +1476278081642 test-first 1 2150 true +1476278081643 test-first 1 2150 true +1476278081644 test-first 1 2150 true +1476278081645 test-first 1 2150 true +1476278081646 test-first 1 2150 true +1476278081647 test-first 1 2150 true +1476278081648 test-first 1 2150 true +1476278081649 test-first 1 2150 true +1476278081650 test-first 1 2150 true +1476278081651 test-first 1 2150 true +1476278081652 test-first 1 2150 true +1476278081653 test-first 1 2150 true +1476278081654 test-first 1 2150 true +1476278081655 test-first 1 2150 true +1476278081656 test-first 1 2150 true +1476278081657 test-first 1 2150 true +1476278081658 test-first 1 2150 true +1476278081659 test-first 1 2150 true +1476278081660 test-first 1 2150 true +1476278081661 test-first 1 2150 true +1476278081662 test-first 1 2150 true +1476278081663 test-first 1 2150 true +1476278081664 test-first 1 2150 true +1476278081665 test-first 1 2150 true +1476278081666 test-first 1 2150 true +1476278081667 test-first 1 2150 true +1476278081668 test-first 1 2150 true +1476278081669 test-first 1 2150 true +1476278081670 test-first 1 2150 true +1476278081671 test-first 1 2150 true +1476278081672 test-first 1 2150 true +1476278081673 test-first 1 2150 true +1476278081674 test-first 1 2150 true +1476278081675 test-first 1 2150 true +1476278081676 test-first 1 2150 true +1476278081677 test-first 1 2150 true +1476278081678 test-first 1 2150 true +1476278081679 test-first 1 2150 true +1476278081680 test-first 1 2150 true +1476278081681 test-first 1 2150 true +1476278081682 test-first 1 2150 true +1476278081683 test-first 1 2150 true +1476278081684 test-first 1 2150 true +1476278081685 test-first 1 2150 true +1476278081686 test-first 1 2150 true +1476278081687 test-first 1 2150 true +1476278081688 test-first 1 2150 true +1476278081689 test-first 1 2150 true +1476278081690 test-first 1 2150 true +1476278081691 test-first 1 2150 true +1476278081692 test-first 1 2150 true +1476278081693 test-first 1 2150 true +1476278081694 test-first 1 2150 true +1476278081695 test-first 1 2150 true +1476278081696 test-first 1 2150 true +1476278081697 test-first 1 2150 true +1476278081698 test-first 1 2150 true +1476278081699 test-first 1 2150 true +1476278081700 test-first 1 2150 true +1476278081701 test-first 1 2150 true +1476278081702 test-first 1 2150 true +1476278081703 test-first 1 2150 true +1476278081704 test-first 1 2150 true +1476278081705 test-first 1 2150 true +1476278081706 test-first 1 2150 true +1476278081707 test-first 1 2150 true +1476278081708 test-first 1 2150 true +1476278081709 test-first 1 2150 true +1476278081710 test-first 1 2150 true +1476278081711 test-first 1 2150 true +1476278081712 test-first 1 2150 true +1476278081713 test-first 1 2150 true +1476278081714 test-first 1 2150 true +1476278081715 test-first 1 2150 true +1476278081716 test-first 1 2150 true +1476278081717 test-first 1 2150 true +1476278081718 test-first 1 2150 true +1476278081719 test-first 1 2150 true +1476278081720 test-first 1 2150 true +1476278081721 test-first 1 2150 true +1476278081722 test-first 1 2150 true +1476278081723 test-first 1 2150 true +1476278081724 test-first 1 2150 true +1476278081725 test-first 1 2150 true +1476278081726 test-first 1 2150 true +1476278081727 test-first 1 2150 true +1476278081728 test-first 1 2150 true +1476278081729 test-first 1 2150 true +1476278081730 test-first 1 2150 true +1476278081731 test-first 1 2150 true +1476278081732 test-first 1 2150 true +1476278081733 test-first 1 2150 true +1476278081734 test-first 1 2150 true +1476278081735 test-first 1 2150 true +1476278081736 test-first 1 2150 true +1476278081737 test-first 1 2150 true +1476278081738 test-first 1 2150 true +1476278081739 test-first 1 2150 true +1476278081740 test-first 1 2150 true +1476278081741 test-first 1 2150 true +1476278081742 test-first 1 2150 true +1476278081743 test-first 1 2150 true +1476278081744 test-first 1 2150 true +1476278081745 test-first 1 2150 true +1476278081746 test-first 1 2150 true +1476278081747 test-first 1 2150 true +1476278081748 test-first 1 2150 true +1476278081749 test-first 1 2150 true +1476278081750 test-first 1 2150 true +1476278081751 test-first 1 2150 true +1476278081752 test-first 1 2150 true +1476278081753 test-first 1 2150 true +1476278081754 test-first 1 2150 true +1476278081755 test-first 1 2150 true +1476278081756 test-first 1 2150 true +1476278081757 test-first 1 2150 true +1476278081758 test-first 1 2150 true +1476278081759 test-first 1 2150 true +1476278081760 test-first 1 2150 true +1476278081761 test-first 1 2150 true +1476278081762 test-first 1 2150 true +1476278081763 test-first 1 2150 true +1476278081764 test-first 1 2150 true +1476278081765 test-first 1 2150 true +1476278081766 test-first 1 2150 true +1476278081767 test-first 1 2150 true +1476278081768 test-first 1 2150 true +1476278081769 test-first 1 2150 true +1476278081770 test-first 1 2150 true +1476278081771 test-first 1 2150 true +1476278081772 test-first 1 2150 true +1476278081773 test-first 1 2150 true +1476278081774 test-first 1 2150 true +1476278081775 test-first 1 2150 true +1476278081776 test-first 1 2150 true +1476278081777 test-first 1 2150 true +1476278081778 test-first 1 2150 true +1476278081779 test-first 1 2150 true +1476278081780 test-first 1 2150 true +1476278081781 test-first 1 2150 true +1476278081782 test-first 1 2150 true +1476278081783 test-first 1 2150 true +1476278081784 test-first 1 2150 true +1476278081785 test-first 1 2150 true +1476278081786 test-first 1 2150 true +1476278081787 test-first 1 2150 true +1476278081788 test-first 1 2150 true +1476278081789 test-first 1 2150 true +1476278081790 test-first 1 2150 true +1476278081791 test-first 1 2150 true +1476278081792 test-first 1 2150 true +1476278081793 test-first 1 2150 true +1476278081794 test-first 1 2150 true +1476278081795 test-first 1 2150 true +1476278081796 test-first 1 2150 true +1476278081797 test-first 1 2150 true +1476278081798 test-first 1 2150 true +1476278081799 test-first 1 2150 true +1476278081800 test-first 1 2150 true +1476278081801 test-first 1 2150 true +1476278081802 test-first 1 2150 true +1476278081803 test-first 1 2150 true +1476278081804 test-first 1 2150 true +1476278081805 test-first 1 2150 true +1476278081806 test-first 1 2150 true +1476278081807 test-first 1 2150 true +1476278081808 test-first 1 2150 true +1476278081809 test-first 1 2150 true +1476278081810 test-first 1 2150 true +1476278081811 test-first 1 2150 true +1476278081812 test-first 1 2150 true +1476278081813 test-first 1 2150 true +1476278081814 test-first 1 2150 true +1476278081815 test-first 1 2150 true +1476278081816 test-first 1 2150 true +1476278081817 test-first 1 2150 true +1476278081818 test-first 1 2150 true +1476278081819 test-first 1 2150 true +1476278081820 test-first 1 2150 true +1476278081821 test-first 1 2150 true +1476278081822 test-first 1 2150 true +1476278081823 test-first 1 2150 true +1476278081824 test-first 1 2150 true +1476278081825 test-first 1 2150 true +1476278081826 test-first 1 2150 true +1476278081827 test-first 1 2150 true +1476278081828 test-first 1 2150 true +1476278081829 test-first 1 2150 true +1476278081830 test-first 1 2150 true +1476278081831 test-first 1 2150 true +1476278081832 test-first 1 2150 true +1476278081833 test-first 1 2150 true +1476278081834 test-first 1 2150 true +1476278081835 test-first 1 2150 true +1476278081836 test-first 1 2150 true +1476278081837 test-first 1 2150 true +1476278081838 test-first 1 2150 true +1476278081839 test-first 1 2150 true +1476278081840 test-first 1 2150 true +1476278081841 test-first 1 2150 true +1476278081842 test-first 1 2150 true +1476278081843 test-first 1 2150 true +1476278081844 test-first 1 2150 true +1476278081845 test-first 1 2150 true +1476278081846 test-first 1 2150 true +1476278081847 test-first 1 2150 true +1476278081848 test-first 1 2150 true +1476278081849 test-first 1 2150 true +1476278081850 test-first 1 2150 true +1476278081851 test-first 1 2150 true +1476278081852 test-first 1 2150 true +1476278081853 test-first 1 2150 true +1476278081854 test-first 1 2150 true +1476278081855 test-first 1 2150 true +1476278081856 test-first 1 2150 true +1476278081857 test-first 1 2150 true +1476278081858 test-first 1 2150 true +1476278081859 test-first 1 2150 true +1476278081860 test-first 1 2150 true +1476278081861 test-first 1 2150 true +1476278081862 test-first 1 2150 true +1476278081863 test-first 1 2150 true +1476278081864 test-first 1 2150 true +1476278081865 test-first 1 2150 true +1476278081866 test-first 1 2150 true +1476278081867 test-first 1 2150 true +1476278081868 test-first 1 2150 true +1476278081869 test-first 1 2150 true +1476278081870 test-first 1 2150 true +1476278081871 test-first 1 2150 true +1476278081872 test-first 1 2150 true +1476278081873 test-first 1 2150 true +1476278081874 test-first 1 2150 true +1476278081875 test-first 1 2150 true +1476278081876 test-first 1 2150 true +1476278081877 test-first 1 2150 true +1476278081878 test-first 1 2150 true +1476278081879 test-first 1 2150 true +1476278081880 test-first 1 2150 true +1476278081881 test-first 1 2150 true +1476278081882 test-first 1 2150 true +1476278081883 test-first 1 2150 true +1476278081884 test-first 1 2150 true +1476278081885 test-first 1 2150 true +1476278081886 test-first 1 2150 true +1476278081887 test-last 1 2150 false +1476278081888 test-first 1 2150 true +1476278081889 test-last 1 2150 false +1476278081890 test-first 1 2150 true +1476278081891 test-last 1 2150 false +1476278081892 test-first 1 2150 true +1476278081893 test-last 1 2150 false +1476278081894 test-first 1 2150 true +1476278081895 test-last 1 2150 false +1476278081896 test-first 1 2150 true +1476278081897 test-last 1 2150 false +1476278081898 test-first 1 2150 true +1476278081899 test-last 1 2150 false +1476278081900 test-first 1 2150 true +1476278081901 test-last 1 2150 false +1476278081902 test-first 1 2150 true +1476278081903 test-last 1 2150 false +1476278081904 test-first 1 2150 true +1476278081905 test-last 1 2150 false +1476278081906 test-first 1 2150 true +1476278081907 test-last 1 2150 false +1476278081908 test-first 1 2150 true +1476278081909 test-last 1 2150 false +1476278081910 test-first 1 2150 true +1476278081911 test-last 1 2150 false +1476278081912 test-first 1 2150 true +1476278081913 test-last 1 2150 false +1476278081914 test-first 1 2150 true +1476278081915 test-last 1 2150 false +1476278081916 test-first 1 2150 true +1476278081917 test-last 1 2150 false +1476278081918 test-first 1 2150 true +1476278081919 test-last 1 2150 false +1476278081920 test-first 1 2150 true +1476278081921 test-last 1 2150 false +1476278081922 test-first 1 2150 true +1476278081923 test-first 1 2150 true +1476278081924 test-first 1 2150 true +1476278081925 test-first 1 2150 true +1476278081926 test-first 1 2150 true +1476278081927 test-first 1 2150 true +1476278081928 test-first 1 2150 true +1476278081929 test-first 1 2150 true +1476278081930 test-first 1 2150 true +1476278081931 test-first 1 2150 true +1476278081932 test-first 1 2150 true +1476278081933 test-first 1 2150 true +1476278081934 test-first 1 2150 true +1476278081935 test-first 1 2150 true +1476278081936 test-first 1 2150 true +1476278081937 test-first 1 2150 true +1476278081938 test-first 1 2150 true +1476278081939 test-first 1 2150 true +1476278081940 test-first 1 2150 true +1476278081941 test-first 1 2150 true +1476278081942 test-first 1 2150 true +1476278081943 test-first 1 2150 true +1476278081944 test-first 1 2150 true +1476278081945 test-first 1 2150 true +1476278081946 test-first 1 2150 true +1476278081947 test-first 1 2150 true +1476278081948 test-first 1 2150 true +1476278081949 test-first 1 2150 true +1476278081950 test-first 1 2150 true +1476278081951 test-first 1 2150 true +1476278081952 test-first 1 2150 true +1476278081953 test-first 1 2150 true +1476278081954 test-first 1 2150 true +1476278081955 test-first 1 2150 true +1476278081956 test-first 1 2150 true +1476278081957 test-first 1 2150 true +1476278081958 test-first 1 2150 true +1476278081959 test-first 1 2150 true +1476278081960 test-first 1 2150 true +1476278081961 test-first 1 2150 true +1476278081962 test-first 1 2150 true +1476278081963 test-first 1 2150 true +1476278081964 test-first 1 2150 true +1476278081965 test-first 1 2150 true +1476278081966 test-first 1 2150 true +1476278081967 test-first 1 2150 true +1476278081968 test-first 1 2150 true +1476278081969 test-first 1 2150 true +1476278081970 test-first 1 2150 true +1476278081971 test-first 1 2150 true +1476278081972 test-first 1 2150 true +1476278081973 test-first 1 2150 true +1476278081974 test-first 1 2150 true +1476278081975 test-first 1 2150 true +1476278081976 test-first 1 2150 true +1476278081977 test-first 1 2150 true +1476278081978 test-first 1 2150 true +1476278081979 test-first 1 2150 true +1476278081980 test-first 1 2150 true +1476278081981 test-first 1 2150 true +1476278081982 test-first 1 2150 true +1476278081983 test-first 1 2150 true +1476278081984 test-first 1 2150 true +1476278081985 test-first 1 2150 true +1476278081986 test-first 1 2150 true +1476278081987 test-first 1 2150 true +1476278081988 test-first 1 2150 true +1476278081989 test-first 1 2150 true +1476278081990 test-first 1 2150 true +1476278081991 test-first 1 2150 true +1476278081992 test-first 1 2150 true +1476278081993 test-first 1 2150 true +1476278081994 test-first 1 2150 true +1476278081995 test-first 1 2150 true +1476278081996 test-first 1 2150 true +1476278081997 test-first 1 2150 true +1476278081998 test-first 1 2150 true +1476278081999 test-first 1 2150 true +1476278082000 test-first 1 2150 true +1476278082001 test-first 1 2150 true +1476278082002 test-first 1 2150 true +1476278082003 test-first 1 2150 true +1476278082004 test-first 1 2150 true +1476278082005 test-first 1 2150 true +1476278082006 test-first 1 2150 true +1476278082007 test-first 1 2150 true +1476278082008 test-first 1 2150 true +1476278082009 test-first 1 2150 true +1476278082010 test-first 1 2150 true +1476278082011 test-first 1 2150 true +1476278082012 test-first 1 2150 true +1476278082013 test-first 1 2150 true +1476278082014 test-first 1 2150 true +1476278082015 test-first 1 2150 true +1476278082016 test-first 1 2150 true +1476278082017 test-first 1 2150 true +1476278082018 test-first 1 2150 true +1476278082019 test-first 1 2150 true +1476278082020 test-first 1 2150 true +1476278082021 test-first 1 2150 true +1476278082022 test-first 1 2150 true +1476278082023 test-first 1 2150 true +1476278082024 test-first 1 2150 true +1476278082025 test-first 1 2150 true +1476278082026 test-first 1 2150 true +1476278082027 test-first 1 2150 true +1476278082028 test-first 1 2150 true +1476278082029 test-first 1 2150 true +1476278082030 test-first 1 2150 true +1476278082031 test-first 1 2150 true +1476278082032 test-first 1 2150 true +1476278082033 test-first 1 2150 true +1476278082034 test-first 1 2150 true +1476278082035 test-first 1 2150 true +1476278082036 test-first 1 2150 true +1476278082037 test-first 1 2150 true +1476278082038 test-first 1 2150 true +1476278082039 test-first 1 2150 true +1476278082040 test-first 1 2150 true +1476278082041 test-first 1 2150 true +1476278082042 test-first 1 2150 true +1476278082043 test-first 1 2150 true +1476278082044 test-first 1 2150 true +1476278082045 test-first 1 2150 true +1476278082046 test-first 1 2150 true +1476278082047 test-first 1 2150 true +1476278082048 test-first 1 2150 true +1476278082049 test-first 1 2150 true +1476278082050 test-first 1 2150 true +1476278082051 test-first 1 2150 true +1476278082052 test-first 1 2150 true +1476278082053 test-first 1 2150 true +1476278082054 test-first 1 2150 true +1476278082055 test-first 1 2150 true +1476278082056 test-first 1 2150 true +1476278082057 test-first 1 2150 true +1476278082058 test-first 1 2150 true +1476278082059 test-first 1 2150 true +1476278082060 test-first 1 2150 true +1476278082061 test-first 1 2150 true +1476278082062 test-first 1 2150 true +1476278082063 test-first 1 2150 true +1476278082064 test-first 1 2150 true +1476278082065 test-first 1 2150 true +1476278082066 test-first 1 2150 true +1476278082067 test-first 1 2150 true +1476278082068 test-first 1 2150 true +1476278082069 test-first 1 2150 true +1476278082070 test-first 1 2150 true +1476278082071 test-first 1 2150 true +1476278082072 test-first 1 2150 true +1476278082073 test-first 1 2150 true diff --git a/.besouro/20161012152902644/randomHeuristicEpisodes.txt b/.besouro/20161012152902644/randomHeuristicEpisodes.txt index 998f98b..0bb4006 100644 --- a/.besouro/20161012152902644/randomHeuristicEpisodes.txt +++ b/.besouro/20161012152902644/randomHeuristicEpisodes.txt @@ -1,3 +1,4 @@ 1476275744044 test-addition 1 401 true 1476275779118 regression 2 24 true 1476275783928 regression 1 1 true +1476278081246 test-first 1 2150 true diff --git a/.besouro/20161012152902644/zorroEpisodes.txt b/.besouro/20161012152902644/zorroEpisodes.txt index 032343f..5f8c2b9 100644 --- a/.besouro/20161012152902644/zorroEpisodes.txt +++ b/.besouro/20161012152902644/zorroEpisodes.txt @@ -1,3 +1,4 @@ -1476275744044 test-addition 1 401 false -1476275779118 regression 2 35 false -1476275783928 regression 1 4 false +1476275744044 test-addition 1 401 true +1476275779118 regression 2 35 true +1476275783928 regression 1 4 true +1476278081246 test-first 1 2297 true diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 08d2f2f47583d3a5bdc5394e77d57f943706414c..037ec3349f18c75cb492e1253ff6c1019c4a813b 100644 GIT binary patch delta 14 VcmZ1>yFzw@0S_a~W<#EGCIBKl1LXh! delta 14 VcmZ1>yFzw@0S_bVW<#EGCIBKr1Lgn# diff --git a/tests/SpreadsheetTest.java b/tests/SpreadsheetTest.java index b4e667a..8c567a0 100644 --- a/tests/SpreadsheetTest.java +++ b/tests/SpreadsheetTest.java @@ -47,4 +47,9 @@ public void evaluateString() throws SpreadsheetException { assertEquals("String not evaluated correctly", "a string", spreadsheet.evaluate("A1")); } + + @Test + public void evaluateString_TooManyStrMarks() { + spreadsheet.set("A1", "'str with ' in the middle'"); + } } From ef3cf226a4cb333c131b8b26b6833b357266f17b Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 16:17:54 +0300 Subject: [PATCH 39/55] besouro automatic message --- .besouro/20161012152902644/actions.txt | 1 + bin/SpreadsheetTest.class | Bin 2045 -> 2194 bytes tests/SpreadsheetTest.java | 7 +++++++ 3 files changed, 8 insertions(+) diff --git a/.besouro/20161012152902644/actions.txt b/.besouro/20161012152902644/actions.txt index 17053f8..9a9dae8 100644 --- a/.besouro/20161012152902644/actions.txt +++ b/.besouro/20161012152902644/actions.txt @@ -164,3 +164,4 @@ RefactoringAction 1476278118598 SpreadsheetTest.java RENAME evaluateString_Too=> RefactoringAction 1476278120109 SpreadsheetTest.java RENAME evaluateString_TooManyStr=>void evaluateString_TooManyStrMarks FIELD RefactoringAction 1476278127122 SpreadsheetTest.java RENAME evaluateString_TooManyStrMarks=>void evaluateString_TooManyStrMarks() METHOD EditAction 1476278213264 SpreadsheetTest.java 1547 6 16 5 +EditAction 1476278274348 SpreadsheetTest.java 1692 6 15 5 diff --git a/bin/SpreadsheetTest.class b/bin/SpreadsheetTest.class index d3e0d051aa00d571c3fb9ec5436da4e8bb41513b..e99c1c6cb3e9709d967241903c1d6db676d40f88 100644 GIT binary patch delta 184 zcmey%KS_}5)W2Q(7#J8#7;-mqU1qVDOD#*xDNQU%4K69l%uA0C$wc6x0ld R!VDrn9wS3GkYr-W0RX+3CL#a; delta 36 scmbOv_?MsS)W2Q(7#J8#7_v5UU1pgq$7;&RwmF3LDHAIL0~13g0P83Ue*gdg diff --git a/tests/SpreadsheetTest.java b/tests/SpreadsheetTest.java index 8c567a0..d352157 100644 --- a/tests/SpreadsheetTest.java +++ b/tests/SpreadsheetTest.java @@ -51,5 +51,12 @@ public void evaluateString() throws SpreadsheetException { @Test public void evaluateString_TooManyStrMarks() { spreadsheet.set("A1", "'str with ' in the middle'"); + + try { + + } catch (SpreadsheetException e) { + System.out.println("Caught too many str marks: " + e.getMessage()); + assertEquals() + } } } From b4a236e5bd34337c91a218ab8792e275e4391ab8 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 16:21:07 +0300 Subject: [PATCH 40/55] besouro automatic message --- .besouro/20161012152902644/actions.txt | 17 +++++++++++++++++ bin/Spreadsheet.class | Bin 3752 -> 3827 bytes bin/SpreadsheetTest.class | Bin 2194 -> 2398 bytes src/Spreadsheet.java | 6 ++++-- tests/SpreadsheetTest.java | 6 +++--- 5 files changed, 24 insertions(+), 5 deletions(-) diff --git a/.besouro/20161012152902644/actions.txt b/.besouro/20161012152902644/actions.txt index 9a9dae8..d04c778 100644 --- a/.besouro/20161012152902644/actions.txt +++ b/.besouro/20161012152902644/actions.txt @@ -165,3 +165,20 @@ RefactoringAction 1476278120109 SpreadsheetTest.java RENAME evaluateString_TooMa RefactoringAction 1476278127122 SpreadsheetTest.java RENAME evaluateString_TooManyStrMarks=>void evaluateString_TooManyStrMarks() METHOD EditAction 1476278213264 SpreadsheetTest.java 1547 6 16 5 EditAction 1476278274348 SpreadsheetTest.java 1692 6 15 5 +CompilationAction 1476278274604 SpreadsheetTest.java +CompilationAction 1476278274604 SpreadsheetTest.java +CompilationAction 1476278278300 SpreadsheetTest.java +CompilationAction 1476278278302 SpreadsheetTest.java +CompilationAction 1476278278453 SpreadsheetTest.java +CompilationAction 1476278278453 SpreadsheetTest.java +RefactoringAction 1476278348534 Spreadsheet.java ADD String STR_MARK_IN_T FIELD +RefactoringAction 1476278352050 Spreadsheet.java RENAME STR_MARK_IN_T=>String STR_MARK_IN_THE_MIDDLE_ERROR_MSG FIELD +RefactoringAction 1476278384637 Spreadsheet.java ADD void character() METHOD +RefactoringAction 1476278387152 Spreadsheet.java REMOVE character() METHOD +CompilationAction 1476278387741 Spreadsheet.java +CompilationAction 1476278387741 SpreadsheetTest.java +CompilationAction 1476278387741 SpreadsheetTest.java +CompilationAction 1476278400607 Spreadsheet.java +CompilationAction 1476278400788 SpreadsheetTest.java +CompilationAction 1476278400788 SpreadsheetTest.java +EditAction 1476278467859 SpreadsheetTest.java 1818 6 17 5 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 037ec3349f18c75cb492e1253ff6c1019c4a813b..78d8edd416dbca94ef989e8449c33c9470a80120 100644 GIT binary patch literal 3827 zcma)9YjYFV8Gcr~meykJ*b6oeHLxZG*^+@k9KhI6Tw4ScUnp`RCM{wut*r&Ia&}ih z+NM|9CcUNi7Sfh5(`ml&fnKnuWt#L`XZk}r?SJr;KIg0~%eC97JvwLiT;BJ2pZ7WM zk^c6tKYa*b2=6BlQ?M<+Dfr73{ zIadqa%HeZ%P!8?+iZi01HSaEZc3ATr1tVLn8I1;|(R}E;-eP@O^T=sh+HO}W)!R-f z=Y`Iq3bgTR$w}g4*quPH zg6G!rH(sFu1ADMnL3hasT;C~;t(nY+%oxd~kt?nA)@Ps_JGg(+^_=P2&3VV46)pvf z)uLUwWc#jouMf6yfAPkYy;OgXk4jKUs7M)j5j_bEY!FjKv5pKQJfhgkaG;W|HddeEu zjvWb*&+S`?Hi@%Hi5;Ib(1JKg49hObXq#+04)mxlI@JGx{>?fX*gT{lnY~kVmSn;b z_>_VjP1YJyI`Rqzr>maj)hd;`Xe{T>63?1bvKFW(ao#Mq$N(LM(C}>|hjgfNxOXyd`ma+jC)70*ool>+%%-t|h5$1NT znH$?sVwm)}Z{KDu5R0n@mhc8OBaZ)A5Lr3vS8raZa^Y4S<(jFD){p4mVkMPCKWYYU z;Wm9ZZ`5pAL$_dSfI;-*O#`39=ee}vc#C0Kp3Iy8^_GDz;!A>%wVE_ut$F`{&T=}w zLhz!P%8JG^$L&^V`&73Td9!ZTf{;bc;z?A4kcBE4&5K>)28cW=IR@qmP;VP}M^N7F zJ2$JhoU^VUgkxT5(hkCCOJ~j7l#PCT$G~^-Jzg0>ZJuseKWU;rw-t*Cd|yG&dNpfQ zE?G&Fco!*>6`^G6m;7qcVR0+X%D8m=gq4A5bH#DAsn7kuoaem!$Gm|T6zTs(jCb^ zqkm2{)A>2g9L&$Pn1}Lnar348T*5q>pVQ5u{9H%eJjOO*o?xq+C)u`|qxmN|oi^K_ z;7r==e1cD;)hC!pKgHR(6`Xs5oB$S+!1gf`5syZQVwFLw;t-O9AZ?v|xp} za2}KF71q;fTA1Op#&+v5z*V65l&J~F-)ZgS5Ul%R?#m$7VY)>h?|{{2iL>fB}KQF zru!J&KEl|~_C@}ungFF5fKqip2EVM_lz>Fgt%$8+R|5Sa9#(#~8ySCx{0YWSrZega zJkwuBcn{s_4EesJmDYytqeXqxlFpd^3cm0@TC_(pJMAJn+#O}4o7w|11UyKHhj9om z@&9O3W==NXo|LR9bs4LDilC5{coV=s(zq}?te$3y?r0C{!uYaqtsdh+*_qCCX#~n? zLXY27mAjhKrHKF@KKuLbM-6ykk)dj(Wqf<;cd+iGM}*!|5_CPlwx@WPXZ8ml zHEAn4I_GI}ifWpXE+c^tG+Ykghtj2i-T09VTIfj!gG*6Q1kKBw?M690Bq)vRhI`*b zTW_SHU)MACW0A2;Z?ATZNT(&z?b^YOAP=q|fJjYwp6yvyw@XyjYh?Y31e=bWG{81z z=%>s^jH`R_Gs0G7Uii(qy>%6PBH;YWvI+Pan|Vjq zFtNa~HzzTjvU@<)SH&BZkg#Z8m literal 3752 zcma)9`*Rc575-MwwOAWlVB=B)Yp}5`@d(5LY!e#S7@}gE#G)o5B+gn|TMP2a*8{3?lvhHd#3&$dc_*|viuVj9}7SvRbs70X>ZdU4^JT?{nDi*}{rYv`O( zYqh|s9DUL9%Yn5}vBxyD3Q zxq-c8dlO~Lqu(8`Za%M}b#iw0;_UqNWIjKBeo{kv%S{ti*AFZ=n6oN1TgP?{i35|K zSM@aP%U|O0@!1Rc`SGc#iBvEsN+a7IIPaA;0LY@%ASQ|QL-BtE5K`#O~q6&f(`Y4m95D%rl{*`@I{llg$; zF-{t}(n4>04eUS%&rdn7JyTm=u)Ry-QevzYt;(F`Ir3beY~}gl^=WIR{+u|iK&22x zpMm}8Oyb~%yoM>zF~|sy>Bz7~3scF*ZJ&hCVcVRk2VoM3lK$0>Fr zI!4(Y7QCkov>+v;GX}Q7kkJbU+R>53XGz``s!3rSeX?)TKpY8D7nB`R&^pzmM+zdk zWK)0#2RG+-X!DeY)a0$Ay`s{T#FU1eP1YJqI%YH+nyI>`TdPz|UkTE*Z>>=5cFA0< zdZq~8bV{}xIE#+$rEmc+36(Fi2)4p9C-LMByogKxfi|q6v1YXODaI^r7^5#S4s2m} zbBIIAQ^CL$yvma+HJ&`xe6nu5>E!=H5WgX1K_%NVumXx#!@PkvU}?4`xp6Cwa?R9+UdME})aF16{a7*ZCRpqV`^}oAF0n1x8e$Or2n^J4gIg=MyA+gF zJ>~?|Edy`i3qlA%SrmykQLVZEf6j6`zNBF)1ZS?%U=ElKdxQRv8I-NSbbQmT1|~;A z*)|vKCC7DnU7FOS?Uu~yVqLB}zDzpgepGm9lz_~@@>nlsh~HeU`2kIs$3$WQIY@=; za!M}sFb0ij(;Nx&n+ComN$m3MGIeyjiwglfehVRtQ5@j|my(A_Zhx^=T;^5mVH&0}1=*27V#>YDc|8;tgel!TY0PQg@~M>th@^h($h#b6OpghydoKv zJH5T>jyfXTpqHrR#S>S*1fP-|MWFM?iK3;{}RDUL|bB()*m0 zjaM?OIFM;i{Tcm*XnG)Dh^2?}g?KufFC@~3^Mz#kXuhDQkL3&PiS)Bgkhg zThb%>hZxJG+aBWiO!Of>lX;Bs!YU>n;;cZ5C`h{r3XD3&eu7No7}E^nFEBcjE5ZYj z;2h4g*LVl#c=B@`$M|$X;hkql63*`IU(xy)7Yga=Rb2ce^9P*GKEmu@(Eos|Aq8#h zf$coqjy9x~kFM}^-3RU9^U80pI;FMI(Ht(b6>_F&Kul~?<_|r>E0@=!NhwRa7*Dsd zY=&DKmbcX{^Ej^3M}$US+ajWOxFSvlnqrvF99qTechDmJ!UJjTyGW$l9voT^FQju1 zP4A;LOopnH{>hAhV?aYkVs4jneI zj^HawMFfGbDrzI#`!#%>(01{}H#mx^NDRcDV5jy3ajiWfbB*(-6N_?KZY)?<@4I-UUNO!~zZv=UGy#PWrz0BI4Wer{;zjI{$6$LgE zI%$Ay&d^VojR<#l*saK=_+g0YGSju0kF3&_Xyb(xd=dEGb&PP6G8CZwh7c7 z!j}{eDx@SoWOqu!k-qU|X*KzJuuO*w_7KyV=$vWu6H5}yl kIF_664ma=)r}jfYxIiFHDpQC>tOScw!E$pMlRfu#FT0aqs=R}5A|ir< z_CACU;RA@9OJOq~%y0hl@!0x~#nIIE4vqh=2WMvJO&W>c|nFfCLPg8mxkp7(t5FOP+E_{_MnYytGzTa zVak$e-6I4jFiog~jo>J`_`fV=r_5x~xrsoecJ4AdSNb{GIj)`dp$1WSig*Wg8{fY| c@for$Xa&1lRR$1;xVfR=01iVIL0M6=KPXpYB>(^b delta 127 zcmca7G)a)_)W2Q(7#J8#7;-mqePU7IV8~)*kWw!$DN-oUEXhz%SIEp$D9K1w$jwYi z$w^h;{EpR-+0}}HnSl|gi$`k<1HX{8Q06uU`Het66N4a-NnEEm%N diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 2cf236b..434af73 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -4,8 +4,10 @@ public class Spreadsheet { Hashtable cells; private String[] allowedIntegerChars = {"1","2","3","4","5","6","7","8","9","-" }; + public final String STR_MARK_IN_THE_MIDDLE_ERROR_MSG = + "String contains ' character(s) that is not at the beginning or end of string"; public final String ERROR_MESSAGE = "#Error"; - public final boolean STR_MARKS_ALLOWED_INSIDE_STRING = false; + public final boolean STR_MARKS_ALLOWED_INSIDE_STRING = false; public Spreadsheet() { cells = new Hashtable(); @@ -45,7 +47,7 @@ private boolean containsString(String value) throws SpreadsheetException { if (2 == characterCount(value, "'")) return true; - throw new SpreadsheetException("String contains ' character(s) that is not at the beginning or end of string"); + throw new SpreadsheetException(STR_MARK_IN_THE_MIDDLE_ERROR_MSG); } private int characterCount(String str, String targetChar) throws SpreadsheetException { diff --git a/tests/SpreadsheetTest.java b/tests/SpreadsheetTest.java index d352157..6a70a71 100644 --- a/tests/SpreadsheetTest.java +++ b/tests/SpreadsheetTest.java @@ -53,10 +53,10 @@ public void evaluateString_TooManyStrMarks() { spreadsheet.set("A1", "'str with ' in the middle'"); try { - + spreadsheet.evaluate(cell); } catch (SpreadsheetException e) { - System.out.println("Caught too many str marks: " + e.getMessage()); - assertEquals() + System.out.println("Caught too many str marks exmsg: " + e.getMessage()); + assertEquals("Caught different exception than expected", e.getMessage(), STR_MARK_IN_THE_MIDDLE_ERROR_MSG); } } } From c12de5ab301805cd88084484375073a36e281e5f Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 16:22:10 +0300 Subject: [PATCH 41/55] besouro automatic message --- .besouro/20161012152902644/actions.txt | 9 +++++++++ bin/SpreadsheetTest.class | Bin 2398 -> 2540 bytes tests/SpreadsheetTest.java | 8 +++++--- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/.besouro/20161012152902644/actions.txt b/.besouro/20161012152902644/actions.txt index d04c778..e45df8d 100644 --- a/.besouro/20161012152902644/actions.txt +++ b/.besouro/20161012152902644/actions.txt @@ -182,3 +182,12 @@ CompilationAction 1476278400607 Spreadsheet.java CompilationAction 1476278400788 SpreadsheetTest.java CompilationAction 1476278400788 SpreadsheetTest.java EditAction 1476278467859 SpreadsheetTest.java 1818 6 17 5 +CompilationAction 1476278468107 SpreadsheetTest.java +CompilationAction 1476278468108 SpreadsheetTest.java +CompilationAction 1476278472281 SpreadsheetTest.java +CompilationAction 1476278472442 SpreadsheetTest.java +CompilationAction 1476278472442 SpreadsheetTest.java +CompilationAction 1476278485291 SpreadsheetTest.java +CompilationAction 1476278485446 SpreadsheetTest.java +CompilationAction 1476278502191 SpreadsheetTest.java +EditAction 1476278530275 SpreadsheetTest.java 1820 6 18 5 diff --git a/bin/SpreadsheetTest.class b/bin/SpreadsheetTest.class index 7de9f82088fc2eb74c8d192ef6040686ab536d47..63b913a1c038c811c1917b82a86bac2eac971802 100644 GIT binary patch delta 459 zcmXv~OHLa>5PfY2*>W63jKL1Jl=RLXAVQIhL}IbB*qN1)$hMg&&om4@!*ugWK=KW; z;Sj8?AS=ou2grsSNJX-4E1C}ITc6isO^$%HbUNWP5;0YSb%b2QF!QlX8B z+|KhA1A$j#r-GwhmF=m6guee<_)wmHLm4H0*8A04y!JYtp5xt9I7ff~2Cb2Iv^K|a z!Od~9@16dDKZC$aEaMITqKrjue~Sv+O=h>4|A-ZQLI(r*?ANgkkF(7uAvCbWXodYb W+7~?P3&RRZpDSoJ7=C3~!sR2J+H^Vq delta 344 zcmYL_y-EW?5Xa|?BxVVSiS|Q4NFbOdl~;&GtOScw!E$pMlRfu#FT0aqsytH=5frrd zA$$TWA3)q(3Y+<0e)FG?@77mSeEz<^1Hb^>TKw#;YLG>+pUH*nYiTC^p>x*lfsWw$ z#yIj;FKCRZ%?qU^D{HWDcBCoyrzq;zQ^K5hYR4$OC&$CtTx#FB8fBDn54XOH${+`n zmj&T@38M07EU!=&g;uEyl6Y@jiAgt^=VaJprz`5o(y)9)+AP)!N}Dm*j@!t#+)EP^ zCM=mYJwkv2(|{V-2#z|J|Cc4~l$pfc+XzHr=PsoSrJqi!$Ca}IR3HjZ5pSUGnh!6K ce}rrY4uY+gl^B{KZfq%N!C}ZEC`xMf2c^(shyVZp diff --git a/tests/SpreadsheetTest.java b/tests/SpreadsheetTest.java index 6a70a71..cf77aae 100644 --- a/tests/SpreadsheetTest.java +++ b/tests/SpreadsheetTest.java @@ -53,10 +53,12 @@ public void evaluateString_TooManyStrMarks() { spreadsheet.set("A1", "'str with ' in the middle'"); try { - spreadsheet.evaluate(cell); + spreadsheet.evaluate("A1"); } catch (SpreadsheetException e) { - System.out.println("Caught too many str marks exmsg: " + e.getMessage()); - assertEquals("Caught different exception than expected", e.getMessage(), STR_MARK_IN_THE_MIDDLE_ERROR_MSG); + assertEquals("Caught different exception than expected", + e.getMessage(), spreadsheet.STR_MARK_IN_THE_MIDDLE_ERROR_MSG); } + + fail("String mark not found in the middle of a string"); } } From a1f09bd10f600a3ca3a456f210a9584350939327 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 16:30:16 +0300 Subject: [PATCH 42/55] besouro automatic message --- .besouro/20161012152902644/actions.txt | 11 +++++++++++ bin/Spreadsheet.class | Bin 3827 -> 4327 bytes bin/SpreadsheetTest.class | Bin 2540 -> 2643 bytes src/Spreadsheet.java | 13 ++++++++++--- tests/SpreadsheetTest.java | 1 + 5 files changed, 22 insertions(+), 3 deletions(-) diff --git a/.besouro/20161012152902644/actions.txt b/.besouro/20161012152902644/actions.txt index e45df8d..8b823bc 100644 --- a/.besouro/20161012152902644/actions.txt +++ b/.besouro/20161012152902644/actions.txt @@ -191,3 +191,14 @@ CompilationAction 1476278485291 SpreadsheetTest.java CompilationAction 1476278485446 SpreadsheetTest.java CompilationAction 1476278502191 SpreadsheetTest.java EditAction 1476278530275 SpreadsheetTest.java 1820 6 18 5 +UnitTestCaseAction 1476278531726 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476278531727 SpreadsheetTest.java FAIL +UnitTestCaseAction 1476278705070 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476278705070 SpreadsheetTest.java FAIL +UnitTestCaseAction 1476278744486 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476278744487 SpreadsheetTest.java FAIL +UnitTestCaseAction 1476278922861 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476278922861 SpreadsheetTest.java FAIL +UnitTestCaseAction 1476278981035 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476278981035 SpreadsheetTest.java FAIL +EditAction 1476279016164 SpreadsheetTest.java 1872 6 18 5 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 78d8edd416dbca94ef989e8449c33c9470a80120..8ec8f6d14ebbb2fc9d931409ccb85f7bd5dc9692 100644 GIT binary patch delta 1341 zcmZuwYjYD-7=BLnWRr&N4uqsdCxHZ%(x#A0S3?mjeVYWo%B@eYHO$(jto?e=vl z)7)jGbhFzuwD|rGFWzHNcWGwU&{KLcVj5Y^hYxVvgAWv2L?1f!O$e`N&)e*G%xzNuETVp^<0?R~~JJ>TuG4y4!dLj}x zBPl(h9c;JR$1UP>454LP>YX5*oMv01FfK66Gb&-cNknFQL`38|{=I^N*e18gKPk9| z>mo1Lu}M*o!)!u4kQcEV;!n9J^s9o~=pzrQ!42tjW=KnH(M>IBwL3Mr*Rw~e8V84q z#O$@*fX$_QHyw>g>l=$W z$j4A^d-&AyAg$t;v6Z})aiZ5RO8C4X7UU)9MSM}jDEWQ-Or_=-gr6Y4A!Lvj@vQ^O zODxY>kjF@1{NKqZsN8vig)69VfowP}FUK6(uOYYX@Sy_%ti#h-Pi?<|P1N*0Y`|-D z){jmMW3wGWtJ6j$f)QM_BcRrBiFPjf4dXJdkVY-KaTPUJCgqMV( zJiGI|Yjp0i^Oq?sP_8pM%M}qBKiDEJ6tIJElqe1pt3?0xF}q=&DB?#ktki6r=q=&r zsYZ+0X;ZavyNIC&b=YkyM4Z}+LOp)56%>R~6u&E-xso-RSSZBbAmSYph>T)BZ=z_& zFsBShq-jQ^#?ECgHMtK9@G8AVuVXd69#%UIWEE(uh_zKRYr{=S%0=h}xJ3peJ18F{ zRh+F}*-{>bTPoyTEac4eA)gtZBdC#VAN)wt@H8w!zu;=L_Nq;4W$uM!<*iy{xh>YJ z_3V!5Q&;ZM=_W&UZ_|(r5*@@++CPs2v(jm;7;eQ~JDmW1B{SSr;QncFi=5#%5_93+ EfAy>)f&c&j delta 871 zcmY*WOHUI~7(I99whVO~DuPtgN{dSAOA!lLQG*K>26-eBQ&=EIDn1&TD2Z;gKB`z> zAlDc5QC%1}EPNz1N+LTK#)bdDoyN5r7mfPe+gNKRx%183?>pyw=X~@1@HjsHdiNec z6i;6{zT0#I7sRwZD4tjO`Bf8H@wsZ7{f3E~xFxC$KbsX>4G)_U14bjeD^kXgd)`D2 zM;M&PPVGr1Q>PQ-dncz76N!@s9=-Wu#P#YdI5gteA-c^-+Qt`_FgRRm6)?0+e|0p` zxdt{mL+~Mt4cLOsXr-r(YI&!o(TjcbML0MF6AT-vwn6tXlN!z;P3Hjp;&e5LwN$+& za0wgJcZU~ohUc+zDJ{9rOK!b`zd%DURL={Tr2DCP*fToIa8}Pl)c)-ESI+`XmjpJ! zpt^%Nw!?uK>d=LC*ohYGBH3N&M7I(fEisnG#&A)IB^9_tRkKDAoyg!a0XM*lD^zi{ ziwRyt9V^1doO9Nu^z=(&)RaAT+6m~Xu)|(vu;ZFy(2zwx^~uf85~NP=KuE2^#}{$E z?=`$Rxa4ZKap^}ME0!=bT)^$+u%s$2YN^3qm@VjopB$ADcuQzy&H&~VrwI>)_+<5@ z??_8SZZ{tzs(wYann(U;iTqCu=rWyYmhc;s@;GtEw*G3InnA2u!myA z*&d&ugpbnPaf;;xbtchFbsJI@4n)hMqIj$vsKa^{VF|k$ytW7~!5N;=78>$@0N90$ A#sB~S diff --git a/bin/SpreadsheetTest.class b/bin/SpreadsheetTest.class index 63b913a1c038c811c1917b82a86bac2eac971802..45e4faf7cf54c09669e912dfcd79ad76a8dd37dc 100644 GIT binary patch delta 221 zcmaDOd|8C+)W2Q(7#J8#7@9V6y=IN$V5neZ&<`#t%FIhw$W1KDR>;dQQAo=#%}Y_p z%u^`INL9$qOi9T}Rme|MNK_~WE97F(VyNO_sAi~PWMD~4%*N-Rs%&q>Tn zhZ<+C8MgT=YaBD@bOvSyCZL^0lVdn_q=d?MFjQ`2U}WHC5M_{H5C=*M0wt9gI3~~K yl(w*AFl4Z25CV#bK{PQ4Gl&3rl0dqap$@389>`;7V2WU85Elk=8-QFUhDHD%H!)}c delta 116 zcmcaC@sD1!up zI8a;=C@#mqK8Z`(#Fjw_$Pt4mWe{c%0rDh)bU8x>P)j9{$IieM!OkEq4CGb;xl9bz E0AQyPSO5S3 diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 434af73..c2877d7 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -44,9 +44,11 @@ private boolean containsString(String value) throws SpreadsheetException { return false; if (false == STR_MARKS_ALLOWED_INSIDE_STRING) - if (2 == characterCount(value, "'")) + if (2 == characterCount(value, "'")) { + System.out.println("Returning true"); return true; - + } + System.out.println("now throwing"); throw new SpreadsheetException(STR_MARK_IN_THE_MIDDLE_ERROR_MSG); } @@ -57,10 +59,15 @@ private int characterCount(String str, String targetChar) throws SpreadsheetExce throw new SpreadsheetException("Character count target length must be 1"); for (int i = 0; i < str.length(); i++) { - if (charAsStringFromPos(str, i).equals(targetChar)) + System.out.println("trying " + charAsStringFromPos(str, i)); + if (charAsStringFromPos(str, i).equals(targetChar)) { + System.out.println("found at index: " + i); count++; + } } + System.out.println("returning count: " + count); + return count; } diff --git a/tests/SpreadsheetTest.java b/tests/SpreadsheetTest.java index cf77aae..d1ed834 100644 --- a/tests/SpreadsheetTest.java +++ b/tests/SpreadsheetTest.java @@ -55,6 +55,7 @@ public void evaluateString_TooManyStrMarks() { try { spreadsheet.evaluate("A1"); } catch (SpreadsheetException e) { + System.out.println("caught the eval exception"); assertEquals("Caught different exception than expected", e.getMessage(), spreadsheet.STR_MARK_IN_THE_MIDDLE_ERROR_MSG); } From 36986c0cee3cbc25bbb6553343c83350e1614cbf Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 16:30:58 +0300 Subject: [PATCH 43/55] besouro automatic message --- .besouro/20161012152902644/actions.txt | 3 +++ bin/SpreadsheetTest.class | Bin 2643 -> 2793 bytes tests/SpreadsheetTest.java | 1 + 3 files changed, 4 insertions(+) diff --git a/.besouro/20161012152902644/actions.txt b/.besouro/20161012152902644/actions.txt index 8b823bc..ef48ad5 100644 --- a/.besouro/20161012152902644/actions.txt +++ b/.besouro/20161012152902644/actions.txt @@ -202,3 +202,6 @@ UnitTestSessionAction 1476278922861 SpreadsheetTest.java FAIL UnitTestCaseAction 1476278981035 SpreadsheetTest.java FAIL UnitTestSessionAction 1476278981035 SpreadsheetTest.java FAIL EditAction 1476279016164 SpreadsheetTest.java 1872 6 18 5 +UnitTestCaseAction 1476279017362 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476279017363 SpreadsheetTest.java FAIL +EditAction 1476279058283 SpreadsheetTest.java 1899 6 19 5 diff --git a/bin/SpreadsheetTest.class b/bin/SpreadsheetTest.class index 45e4faf7cf54c09669e912dfcd79ad76a8dd37dc..7e7f23782425f61b2741e1f15864bee92347554e 100644 GIT binary patch delta 419 zcmZvX%TC)+6h+rfa2!%sErtM521$j4LK#>{0a1bkAHV>V3K$_-$ON~J6T(dhEi^69 zmgm5qfYgq8$U+SGfKK}r{ezAW7c%YS+_U%5S^L~SJ%5vl-w${9K%Vo(VJ3RHzD~mAVupXP(Dy#hR_TzAVa`W0wnYYJ$|VT`#T5tXy@n zPQ&)HPIK9*O1I)CkTi7ag6{up8*DJx6zJ6_qUWoSTsx(Ggj9B^Ff{HX!zbpW2)_2>xkfFTWf7KoL7uY}dOk#+IV33!+5Se<$AF@XAb^ zZb+uxhU6E1k(s&Tqq!EcZf*{Te14jRv=+?WTZYX2TMjP~ydX(GeTvnkSc7z`I;z}p y<-a4v1aBxXz$7E;%`>IkX-u%_ZO7A1k6KER=7?j3JW)y~vZ&LSR`OKI2xpHa`(fVz delta 268 zcmaDUdRc_))W2Q(7#J8#7@9V639&MBFyu@=$g0nl$HS1%P%!x$s|H&U4?{6S$z&Ba zWyZ3}9&CY(6_aPNnWDC1&O@GKgyUWF?j*>gOcprRxWm6lLb6TWf}G zzRMQJTtA(GnSlvtiILV827V!Fq0DUz@(|`W29xmR4B|dQ+1lF}azSF-7z)FMN_Q}5 z3YG6*sNBfF$iU4Y${@iY4m3j$XoeC42aq%cidq20Eg2*ktQe#jtQjfVFnRpAXgH|sAZ@F8dneGu`@75urr7Y1Gx=AE)zo|0C@N`djJ3c diff --git a/tests/SpreadsheetTest.java b/tests/SpreadsheetTest.java index d1ed834..c1ba7c3 100644 --- a/tests/SpreadsheetTest.java +++ b/tests/SpreadsheetTest.java @@ -50,6 +50,7 @@ public void evaluateString() throws SpreadsheetException { @Test public void evaluateString_TooManyStrMarks() { + boolean caughtException; spreadsheet.set("A1", "'str with ' in the middle'"); try { From bb6f0cffa784de3b43165a42b24b8c7f9d7ecd2d Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 16:31:23 +0300 Subject: [PATCH 44/55] besouro automatic message --- .besouro/20161012152902644/actions.txt | 1 + bin/SpreadsheetTest.class | Bin 2793 -> 2793 bytes tests/SpreadsheetTest.java | 6 ++++-- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.besouro/20161012152902644/actions.txt b/.besouro/20161012152902644/actions.txt index ef48ad5..b162039 100644 --- a/.besouro/20161012152902644/actions.txt +++ b/.besouro/20161012152902644/actions.txt @@ -205,3 +205,4 @@ EditAction 1476279016164 SpreadsheetTest.java 1872 6 18 5 UnitTestCaseAction 1476279017362 SpreadsheetTest.java FAIL UnitTestSessionAction 1476279017363 SpreadsheetTest.java FAIL EditAction 1476279058283 SpreadsheetTest.java 1899 6 19 5 +EditAction 1476279083744 SpreadsheetTest.java 1943 6 15 5 diff --git a/bin/SpreadsheetTest.class b/bin/SpreadsheetTest.class index 7e7f23782425f61b2741e1f15864bee92347554e..492707dee7a7144f9b54d323e4273a1794f89d04 100644 GIT binary patch delta 115 zcmaDU`cia*Jr^VMWCt!89^Xw2*+PZe7>b1|btY$U>4umwa5Gpkh%#6)NHSP6C^FbE zC^OhH7y@Y%1_z*wBZCkF1A`a?6OgoG5M~eo(vl3)3|$P}K(QVmkDY-jf}KHJnt_p_ K7szE|=mP-Mp%9?} delta 115 zcmaDU`cia*Jr^U>WCt!89-mDN*+PZe7>b1|wI^qA>4umxa5Gpih%#6*NHSP4C^A?x zC^OhF7y@Y%2792W1A`C)1A`a?6OgoG5M~eo(vl3)3|$P}42%ptKpr~-Qv^GMxHOR4 K3*<5}^Z@|S`w)}> diff --git a/tests/SpreadsheetTest.java b/tests/SpreadsheetTest.java index c1ba7c3..63b176f 100644 --- a/tests/SpreadsheetTest.java +++ b/tests/SpreadsheetTest.java @@ -50,17 +50,19 @@ public void evaluateString() throws SpreadsheetException { @Test public void evaluateString_TooManyStrMarks() { - boolean caughtException; + boolean caughtException = false; spreadsheet.set("A1", "'str with ' in the middle'"); try { spreadsheet.evaluate("A1"); } catch (SpreadsheetException e) { + caughtException = true; System.out.println("caught the eval exception"); assertEquals("Caught different exception than expected", e.getMessage(), spreadsheet.STR_MARK_IN_THE_MIDDLE_ERROR_MSG); } - fail("String mark not found in the middle of a string"); + if () + fail("String mark not found in the middle of a string"); } } From de6784bc1fd86332409a0cecb911d2aaedb9d489 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 16:31:30 +0300 Subject: [PATCH 45/55] besouro automatic message --- .besouro/20161012152902644/actions.txt | 2 ++ bin/SpreadsheetTest.class | Bin 2793 -> 2315 bytes tests/SpreadsheetTest.java | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.besouro/20161012152902644/actions.txt b/.besouro/20161012152902644/actions.txt index b162039..abd14a3 100644 --- a/.besouro/20161012152902644/actions.txt +++ b/.besouro/20161012152902644/actions.txt @@ -206,3 +206,5 @@ UnitTestCaseAction 1476279017362 SpreadsheetTest.java FAIL UnitTestSessionAction 1476279017363 SpreadsheetTest.java FAIL EditAction 1476279058283 SpreadsheetTest.java 1899 6 19 5 EditAction 1476279083744 SpreadsheetTest.java 1943 6 15 5 +CompilationAction 1476279084011 SpreadsheetTest.java +EditAction 1476279090364 SpreadsheetTest.java 1959 6 19 5 diff --git a/bin/SpreadsheetTest.class b/bin/SpreadsheetTest.class index 492707dee7a7144f9b54d323e4273a1794f89d04..6dd9a6767f381f35c6e99ff5cb5140c515ba2014 100644 GIT binary patch delta 249 zcmaDU+AYL&>ff$?3=9k=3`HBcKC#rZGh{I`@Mk5KCFI=Y!sBDPYDPS>+5uPvYBQx8+RvZ>(~1I zRX-m52|oDXQ&mFo!5`p@zr$C5fOt2ls2~F~bI+Y~&%I}M?C*K&>(9?$0Mzh$*ZMIX zXRyI=tQ47$Zz|K_C9X6#9m#vjb$wZyfe)QVkKyo!7>cSdv{!9yM@IIt2+(Ip1p~v7 zZ;aC_s9p}0HZ2oM(W_?=G87y!@H%E(RSt#E<(4D+Mg`hJY%ok?z%ch8dKR15Vo3Ls zioPb1@(xjC3t5;8qs5afiY3W~FJ$ zC=#Az$d%uGWBE9RyII`BeTIxD&8jb=h}tVx{*oSpG~7dm22DzBa3|14C>@c3PDg}- zq{4DkNwf`D5!Zp?bW5CFm!8r(Aq63q+T}r;lm7%{@R-G@?w9O|usi0pg8{wz=U)I`9I}hH8ewsA9ig`N4vWnX=-Ssui0ti?Biu}KBgAX=gFRI2 zM|*g(3x Date: Wed, 12 Oct 2016 16:31:49 +0300 Subject: [PATCH 46/55] besouro automatic message --- .besouro/20161012152902644/actions.txt | 3 + .../20161012152902644/besouroEpisodes.txt | 115 ++++++++++++++++++ .../randomHeuristicEpisodes.txt | 1 + .besouro/20161012152902644/zorroEpisodes.txt | 1 + bin/SpreadsheetTest.class | Bin 2315 -> 2856 bytes tests/SpreadsheetTest.java | 1 - 6 files changed, 120 insertions(+), 1 deletion(-) diff --git a/.besouro/20161012152902644/actions.txt b/.besouro/20161012152902644/actions.txt index abd14a3..0637851 100644 --- a/.besouro/20161012152902644/actions.txt +++ b/.besouro/20161012152902644/actions.txt @@ -208,3 +208,6 @@ EditAction 1476279058283 SpreadsheetTest.java 1899 6 19 5 EditAction 1476279083744 SpreadsheetTest.java 1943 6 15 5 CompilationAction 1476279084011 SpreadsheetTest.java EditAction 1476279090364 SpreadsheetTest.java 1959 6 19 5 +UnitTestCaseAction 1476279098215 SpreadsheetTest.java OK +UnitTestSessionAction 1476279098216 SpreadsheetTest.java OK +EditAction 1476279109170 SpreadsheetTest.java 1907 6 19 5 diff --git a/.besouro/20161012152902644/besouroEpisodes.txt b/.besouro/20161012152902644/besouroEpisodes.txt index a904165..f921e8d 100644 --- a/.besouro/20161012152902644/besouroEpisodes.txt +++ b/.besouro/20161012152902644/besouroEpisodes.txt @@ -829,3 +829,118 @@ 1476278082071 test-first 1 2150 true 1476278082072 test-first 1 2150 true 1476278082073 test-first 1 2150 true +1476279098216 refactoring 1A 990 true +1476279098217 refactoring 1A 990 true +1476279098218 refactoring 1A 990 true +1476279098219 refactoring 1A 990 true +1476279098220 refactoring 3 990 true +1476279098221 refactoring 3 990 true +1476279098222 refactoring 3 990 true +1476279098223 refactoring 3 990 true +1476279098224 refactoring 3 990 true +1476279098225 refactoring 3 990 true +1476279098226 refactoring 3 990 true +1476279098227 refactoring 3 990 true +1476279098228 refactoring 3 990 true +1476279098229 refactoring 3 990 true +1476279098230 refactoring 3 990 true +1476279098231 refactoring 3 990 true +1476279098232 refactoring 3 990 true +1476279098233 refactoring 3 990 true +1476279098234 refactoring 3 990 true +1476279098235 refactoring 1A 990 true +1476279098236 refactoring 3 990 true +1476279098237 refactoring 3 990 true +1476279098238 refactoring 3 990 true +1476279098239 refactoring 3 990 true +1476279098240 refactoring 3 990 true +1476279098241 refactoring 3 990 true +1476279098242 refactoring 3 990 true +1476279098243 refactoring 3 990 true +1476279098244 refactoring 3 990 true +1476279098245 refactoring 3 990 true +1476279098246 refactoring 3 990 true +1476279098247 refactoring 3 990 true +1476279098248 refactoring 3 990 true +1476279098249 refactoring 3 990 true +1476279098250 refactoring 3 990 true +1476279098251 refactoring 3 990 true +1476279098252 refactoring 3 990 true +1476279098253 refactoring 3 990 true +1476279098254 refactoring 3 990 true +1476279098255 refactoring 3 990 true +1476279098256 refactoring 3 990 true +1476279098257 refactoring 3 990 true +1476279098258 refactoring 3 990 true +1476279098259 refactoring 3 990 true +1476279098260 refactoring 3 990 true +1476279098261 refactoring 3 990 true +1476279098262 refactoring 3 990 true +1476279098263 refactoring 3 990 true +1476279098264 refactoring 3 990 true +1476279098265 refactoring 3 990 true +1476279098266 refactoring 3 990 true +1476279098267 refactoring 3 990 true +1476279098268 refactoring 3 990 true +1476279098269 refactoring 3 990 true +1476279098270 refactoring 3 990 true +1476279098271 refactoring 3 990 true +1476279098272 refactoring 3 990 true +1476279098273 refactoring 3 990 true +1476279098274 refactoring 3 990 true +1476279098275 refactoring 3 990 true +1476279098276 refactoring 3 990 true +1476279098277 refactoring 3 990 true +1476279098278 refactoring 3 990 true +1476279098279 refactoring 3 990 true +1476279098280 refactoring 3 990 true +1476279098281 refactoring 3 990 true +1476279098282 refactoring 3 990 true +1476279098283 refactoring 3 990 true +1476279098284 refactoring 3 990 true +1476279098285 refactoring 3 990 true +1476279098286 refactoring 3 990 true +1476279098287 refactoring 3 990 true +1476279098288 refactoring 3 990 true +1476279098289 refactoring 3 990 true +1476279098290 refactoring 3 990 true +1476279098291 refactoring 3 990 true +1476279098292 refactoring 3 990 true +1476279098293 refactoring 3 990 true +1476279098294 refactoring 1A 990 true +1476279098295 refactoring 1A 990 true +1476279098296 refactoring 3 990 true +1476279098297 refactoring 3 990 true +1476279098298 refactoring 3 990 true +1476279098299 refactoring 3 990 true +1476279098300 refactoring 3 990 true +1476279098301 refactoring 3 990 true +1476279098302 refactoring 3 990 true +1476279098303 refactoring 3 990 true +1476279098304 refactoring 3 990 true +1476279098305 refactoring 3 990 true +1476279098306 refactoring 3 990 true +1476279098307 refactoring 3 990 true +1476279098308 refactoring 3 990 true +1476279098309 refactoring 3 990 true +1476279098310 refactoring 3 990 true +1476279098311 refactoring 3 990 true +1476279098312 refactoring 3 990 true +1476279098313 refactoring 3 990 true +1476279098314 refactoring 3 990 true +1476279098315 refactoring 3 990 true +1476279098316 refactoring 3 990 true +1476279098317 refactoring 3 990 true +1476279098318 refactoring 3 990 true +1476279098319 refactoring 3 990 true +1476279098320 refactoring 3 990 true +1476279098321 refactoring 3 990 true +1476279098322 refactoring 3 990 true +1476279098323 refactoring 3 990 true +1476279098324 refactoring 3 990 true +1476279098325 refactoring 3 990 true +1476279098326 refactoring 3 990 true +1476279098327 refactoring 3 990 true +1476279098328 refactoring 3 990 true +1476279098329 refactoring 3 990 true +1476279098330 refactoring 3 990 true diff --git a/.besouro/20161012152902644/randomHeuristicEpisodes.txt b/.besouro/20161012152902644/randomHeuristicEpisodes.txt index 0bb4006..4d83bf9 100644 --- a/.besouro/20161012152902644/randomHeuristicEpisodes.txt +++ b/.besouro/20161012152902644/randomHeuristicEpisodes.txt @@ -2,3 +2,4 @@ 1476275779118 regression 2 24 true 1476275783928 regression 1 1 true 1476278081246 test-first 1 2150 true +1476279098216 refactoring 1A 990 true diff --git a/.besouro/20161012152902644/zorroEpisodes.txt b/.besouro/20161012152902644/zorroEpisodes.txt index 5f8c2b9..dcc4236 100644 --- a/.besouro/20161012152902644/zorroEpisodes.txt +++ b/.besouro/20161012152902644/zorroEpisodes.txt @@ -2,3 +2,4 @@ 1476275779118 regression 2 35 true 1476275783928 regression 1 4 true 1476278081246 test-first 1 2297 true +1476279098216 refactoring 1A 1016 true diff --git a/bin/SpreadsheetTest.class b/bin/SpreadsheetTest.class index 6dd9a6767f381f35c6e99ff5cb5140c515ba2014..5ed9124c8b06fc0b77ea5a02d63ee798883d7fae 100644 GIT binary patch delta 778 zcmZuuTWb?R6#k|g%^Fgw+Z#3%#|KGLgrHPWlZrO@mVgkk;@dPk*=)0!jk}Yy^%n29 zdc`;W0s2~%P<-$Qh~R(m2dHPW^#(G`F!P=Bo$s7)HmtW(sn6d(egZI$7n`YXiN1*y zhM8=r1HS6&CeLzLaov=>?b@~{v%BCyCDCTsy&`&|;0fgvYU`nv?KFIJ7!1Fw873>k zuS0yc6CRgqb=lFbuTto1^pfZ@jQ@w8#wykrlAWlc zr${6htHe!cf}LXiyot*UxpFLGyN!knq|$#>NLVO(c4S>kJB4XnP2(D_Go+kRsjD&! zg(DdzaxcHK$-aRbY23su2Gfzc?1?a>_Hy~Zq=z64cZZ=ulTsVJ?kg=^6_SDVrU(Q{ z1-UREX>0C=T=|;QEpm2QI<8U?$q%?xHuoEx{3pP~J=RBIyJTAgts$@BcPZH6U=P(ij5M7`FoL5LIZpTqWKhH`N;rT8WO4EWg%@xPrwLl5 xvkZ$UJZ=f&n4s4PPT>(YsC)-A+!>ff$?3=9k=3`HBcKC#rZGh{I`@Mk5KCF Date: Wed, 12 Oct 2016 16:31:57 +0300 Subject: [PATCH 47/55] besouro automatic message --- .besouro/20161012152902644/actions.txt | 1 + bin/SpreadsheetTest.class | Bin 2856 -> 2706 bytes tests/SpreadsheetTest.java | 2 +- 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.besouro/20161012152902644/actions.txt b/.besouro/20161012152902644/actions.txt index 0637851..355cf2b 100644 --- a/.besouro/20161012152902644/actions.txt +++ b/.besouro/20161012152902644/actions.txt @@ -211,3 +211,4 @@ EditAction 1476279090364 SpreadsheetTest.java 1959 6 19 5 UnitTestCaseAction 1476279098215 SpreadsheetTest.java OK UnitTestSessionAction 1476279098216 SpreadsheetTest.java OK EditAction 1476279109170 SpreadsheetTest.java 1907 6 19 5 +EditAction 1476279117900 SpreadsheetTest.java 1909 6 15 5 diff --git a/bin/SpreadsheetTest.class b/bin/SpreadsheetTest.class index 5ed9124c8b06fc0b77ea5a02d63ee798883d7fae..e1ffd65f1364f104227108fd32343d2810e1a948 100644 GIT binary patch delta 288 zcmXAk%`O9B6o#L#)0s|2MSP5=x~K$6D;SGL{EP%E3l<_V3#-{^N)y$ZgIn}`A*rd6rGizTB;PM^Q%vvMxc3b zXewYzbBCVkkQrHu$hOLef_G1PDelV6;fSq2HDcG3`%UthI;K2ma@0W3PKsWY8l8$Y zN?Z77rPs2|FoMe%v+9XCCYeX7d0*=yU39B1#sp`aD@q2N3oey%rF4n*qoA<_LLd^P MY*X!A|2uAe0WDxS!~g&Q delta 419 zcmZvWTT2^Z5Qd-6b+buW(QZ5tMH>;ViVzSLK`pJ`Dkv%TQWja0w3|&#zQpsfN9)8`j`o{$Poj`Yk1S@mD)@xZ#t2Alpn zy*sdNvcs;wt9OXc{)IjxzWVq2P|bIfJ(Obgf}M7MCIV6m-J+?0asMt99c!Pe9=+zH zwOFQLt@M>y>-|M-nXUKMryF`&&IwvyZuoYEpoS)zRcgFY{C-ToEgYTeWQEEE z-ZIL#suNi1CRTAGLcN-*c*76&l~N0>9B` Date: Wed, 12 Oct 2016 16:32:16 +0300 Subject: [PATCH 48/55] besouro automatic message --- .besouro/20161012152902644/actions.txt | 5 +++++ bin/SpreadsheetTest.class | Bin 2706 -> 2371 bytes tests/SpreadsheetTest.java | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.besouro/20161012152902644/actions.txt b/.besouro/20161012152902644/actions.txt index 355cf2b..53773e1 100644 --- a/.besouro/20161012152902644/actions.txt +++ b/.besouro/20161012152902644/actions.txt @@ -212,3 +212,8 @@ UnitTestCaseAction 1476279098215 SpreadsheetTest.java OK UnitTestSessionAction 1476279098216 SpreadsheetTest.java OK EditAction 1476279109170 SpreadsheetTest.java 1907 6 19 5 EditAction 1476279117900 SpreadsheetTest.java 1909 6 15 5 +CompilationAction 1476279118154 SpreadsheetTest.java +CompilationAction 1476279120651 SpreadsheetTest.java +UnitTestCaseAction 1476279122132 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476279122133 SpreadsheetTest.java FAIL +EditAction 1476279136025 SpreadsheetTest.java 1907 6 19 5 diff --git a/bin/SpreadsheetTest.class b/bin/SpreadsheetTest.class index e1ffd65f1364f104227108fd32343d2810e1a948..3f754a2946742ceeb9f9400b1935c2b5fe926c4b 100644 GIT binary patch delta 154 zcmbOvdRU0-)W2Q(7#J8#7|J$siL*}r#cINq$HS1%P%znq&3tnQn>}+;Is-EU6Htvf zvyIjk27V!Fq0DUz^3t;yIE1oyFyw9oN-;AC0!c9jRv>8#RBXn;%isVMa|DVxF$jU> mz(z0#Gl&3rObnt7g$zXuj10v<9vcJW9|kc-Ag=^0R|)`%EEo|0 delta 473 zcmXv~J5L)y5dPMO@yQq=&UP#~A-2OtB&4uIf{nzpGZh5|)nc#jE+Ko)?efgS;qe0y z?)U@L2xK7&ghWTfKLW-^Xtg^t-#7Ek>^wMU+2rH%?Hzz3PA-$V_;P+pYBkJmzFM4&XE;5A=Ff;vTcUFfzpJkVT)hLdM} z$v34JDAg?rBQ8~)hYhZKDmM05o5xH22Pyoje#^W6vglr jfANo`U1ZV1e?krkcVN9xr&t1vfhCa3+LUwDt2llI*okja diff --git a/tests/SpreadsheetTest.java b/tests/SpreadsheetTest.java index a91e384..c5d219f 100644 --- a/tests/SpreadsheetTest.java +++ b/tests/SpreadsheetTest.java @@ -59,7 +59,7 @@ public void evaluateString_TooManyStrMarks() { caughtException = true; assertEquals("Caught different exception than expected", e.getMessage(), spreadsheet.STR_MARK_IN_THE_MIDDLE_ERROR_MSG); - }*/ + } if (!caughtException) fail("String mark not found in the middle of a string"); From d477ea99ae64b2c1e16142c9a4b4a31525dc9c0c Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 16:34:44 +0300 Subject: [PATCH 49/55] besouro automatic message --- .besouro/20161012152902644/actions.txt | 10 ++++++++++ .../20161012152902644/besouroEpisodes.txt | 3 +++ .../randomHeuristicEpisodes.txt | 2 ++ .besouro/20161012152902644/zorroEpisodes.txt | 2 ++ bin/Spreadsheet.class | Bin 4327 -> 3827 bytes bin/SpreadsheetTest.class | Bin 2371 -> 2706 bytes src/Spreadsheet.java | 10 ++-------- tests/SpreadsheetTest.java | 5 +++++ 8 files changed, 24 insertions(+), 8 deletions(-) diff --git a/.besouro/20161012152902644/actions.txt b/.besouro/20161012152902644/actions.txt index 53773e1..9f2f647 100644 --- a/.besouro/20161012152902644/actions.txt +++ b/.besouro/20161012152902644/actions.txt @@ -217,3 +217,13 @@ CompilationAction 1476279120651 SpreadsheetTest.java UnitTestCaseAction 1476279122132 SpreadsheetTest.java FAIL UnitTestSessionAction 1476279122133 SpreadsheetTest.java FAIL EditAction 1476279136025 SpreadsheetTest.java 1907 6 19 5 +UnitTestCaseAction 1476279180667 SpreadsheetTest.java OK +UnitTestSessionAction 1476279180667 SpreadsheetTest.java OK +UnitTestCaseAction 1476279198452 SpreadsheetTest.java OK +UnitTestSessionAction 1476279198452 SpreadsheetTest.java OK +RefactoringAction 1476279249045 SpreadsheetTest.java ADD void dete FIELD +RefactoringAction 1476279250557 SpreadsheetTest.java RENAME dete=>void detect FIELD +RefactoringAction 1476279254570 SpreadsheetTest.java RENAME detect=>void detectStringIncorrectFomr FIELD +RefactoringAction 1476279256583 SpreadsheetTest.java RENAME detectStringIncorrectFomr=>void detectStringIncorrectFormatting FIELD +RefactoringAction 1476279260095 SpreadsheetTest.java RENAME detectStringIncorrectFormatting=>void detectStringIncorrectFormatting() METHOD +EditAction 1476279284473 SpreadsheetTest.java 2007 7 20 5 diff --git a/.besouro/20161012152902644/besouroEpisodes.txt b/.besouro/20161012152902644/besouroEpisodes.txt index f921e8d..7b7e15e 100644 --- a/.besouro/20161012152902644/besouroEpisodes.txt +++ b/.besouro/20161012152902644/besouroEpisodes.txt @@ -944,3 +944,6 @@ 1476279098328 refactoring 3 990 true 1476279098329 refactoring 3 990 true 1476279098330 refactoring 3 990 true +1476279180667 refactoring 1A 71 true +1476279180668 refactoring 1A 71 true +1476279198452 regression 1 0 true diff --git a/.besouro/20161012152902644/randomHeuristicEpisodes.txt b/.besouro/20161012152902644/randomHeuristicEpisodes.txt index 4d83bf9..d9c27e9 100644 --- a/.besouro/20161012152902644/randomHeuristicEpisodes.txt +++ b/.besouro/20161012152902644/randomHeuristicEpisodes.txt @@ -3,3 +3,5 @@ 1476275783928 regression 1 1 true 1476278081246 test-first 1 2150 true 1476279098216 refactoring 1A 990 true +1476279180667 refactoring 1A 71 false +1476279198452 regression 1 0 false diff --git a/.besouro/20161012152902644/zorroEpisodes.txt b/.besouro/20161012152902644/zorroEpisodes.txt index dcc4236..0e9654a 100644 --- a/.besouro/20161012152902644/zorroEpisodes.txt +++ b/.besouro/20161012152902644/zorroEpisodes.txt @@ -3,3 +3,5 @@ 1476275783928 regression 1 4 true 1476278081246 test-first 1 2297 true 1476279098216 refactoring 1A 1016 true +1476279180667 refactoring 1A 82 true +1476279198452 regression 1 17 true diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 8ec8f6d14ebbb2fc9d931409ccb85f7bd5dc9692..cdd8f17336d94a91970089bacc8d2b37caf4e3be 100644 GIT binary patch delta 871 zcmY*XOHUI~7(I99whVQgRxE<1l@^uKmm(IhqDB^)7!g?12)Y21RwY(2N}?OB4;1kQ za(z)B)rE1x!bd`*O=Rc7xbPpi)3|oyf~eoU6Kl;RcfPszyXTzmocR{~;dg!f_3k}@ z1fITfeRt>vE{F+dL_Dtw@v9~##pkL`&Ko9f;+Cj3LTp-WH2iEz^coH9t{62^zF8A_ z9A@wgpX$nHM^9(cyGO<{M=~c3JbLrR=+~lgua0qtBBMB?doWx zbp;%>MiE2|Yp?<9(Lzrv)$&Z;#vXLj7vbO#Ofama+5tVtOlmlX9Id^y#p$RIE2(-* z;1V{eZ;#F63@>15DJQwlOK!cLzd&6iTFZ+Vq4Tj>ILCE1&RH#wQv0*tU;T4*+ZNae zgX(tT*bEnv@S+o|uocbNMzTB6fi5LBVKbJ+CUH@TB^9_tRg*>#9T>-D0;jgN8};P@kOqEJ5n@4oB4}JUx%= zdtW1vN4*@)k(PcGu%v{kfg)}%#3YqHsHHA;!)zwB5IHF$2-s+4&M;;arwKoV_+;(O z-I10?eLg-!R6UAnIgkI(6930y=beIueW=HN%6))bIjG1YBwpI}H}6Ud?~z*?b=TuQ z3DA{qF6fq+cDJzy;)6T5Y>*NdLJj>SUJRlEY4Ot?tdllts@;GtEw*G3dC}qtvxnk< zr>*}eB|J>`j!`UG>O77ns#|fQ!hu9tR05Bc1756F5!%?*;5Ccj5}e@)O`)Oi2kA46 A+yDRo delta 1341 zcmZuwYjYD-7=BLnWRr&N4uqsdCxHZ%(x#A0S3?mjeVYWo%B@eYHO$(jto?e=vl z)7)jGbhFzuwD|rGFWzHNcWGwU&{KLcVj5Y^hYxVvgAWv2L?1f!O$e`N&)e*G%xzNuETVp^<0?R~~JJ>TuG4y4!dLj}x zBPl(h9c;JR$1UP>454LP>YX5*oMv01FfK66Gb&-cNknFQL`38|{=I^N*e18gKPk9| z>mo1Lu}M*o!)!u4kQcEV;!n9J^s9o~=pzrQ!42tjW=KnH(M>IBwL3Mr*Rw~e8V84q z#O$@*fX$_QHyw>g>l=$W z$j4A^d-&AyAg$t;v6Z})aiZ5RO8C4X7UU)9MSM}jDEWQ-Or_=-gr6Y4A!Lvj@vQ^O zODxY>kjF@1{NKqZsN8vig)69VfowP}FUK6(uOYYX@Sy_%ti#h-Pi?<|P1N*0Y`|-D z){jmMW3wGWtJ6j$f)QM_BcRrBiFPjf4dXJdkVY-KaTPUJCgqMV( zJiGI|Yjp0i^Oq?sP_8pM%M}qBKiDEJ6tIJElqe1pt3?0xF}q=&DB?#ktki6r=q=&r zsYZ+0X;ZavyNIC&b=YkyM4Z}+LOp)56%>R~6u&E-xso-RSSZBbAmSYph>T)BZ=z_& zFsBShq-jQ^#?ECgHMtK9@G8AVuVXd69#%UIWEE(uh_zKRYr{=S%0=h}xJ3peJ18F{ zRh+F}*-{>bTPoyTEac4eA)gtZBdC#VAN)wt@H8w!zu;=L_Nq;4W$uM!<*iy{xh>YJ z_3V!5Q&;ZM=_W&UZ_|(r5*@@++CPs2v(jm;7;eQ~JDmW1B{SSr;QncFi=5#%5_93+ EfAy>)f&c&j diff --git a/bin/SpreadsheetTest.class b/bin/SpreadsheetTest.class index 3f754a2946742ceeb9f9400b1935c2b5fe926c4b..e1ffd65f1364f104227108fd32343d2810e1a948 100644 GIT binary patch delta 473 zcmXv~J5L)y5dPMO@yQq=&UP#~A-2OtB&4uIf{nzpGZh5|)nc#jE+Ko)?efgS;qe0y z?)U@L2xK7&ghWTfKLW-^Xtg^t-#7Ek>^wMU+2rH%?Hzz3PA-$V_;P+pYBkJmzFM4&XE;5A=Ff;vTcUFfzpJkVT)hLdM} z$v34JDAg?rBQ8~)hYhZKDmM05o5xH22Pyoje#^W6vglr jfANo`U1ZV1e?krkcVN9xr&t1vfhCa3+LUwDt2llI*okja delta 154 zcmbOvdRU0-)W2Q(7#J8#7|J$siL*}r#cINq$HS1%P%znq&3tnQn>}+;Is-EU6Htvf zvyIjk27V!Fq0DUz^3t;yIE1oyFyw9oN-;AC0!c9jRv>8#RBXn;%isVMa|DVxF$jU> mz(z0#Gl&3rObnt7g$zXuj10v<9vcJW9|kc-Ag=^0R|)`%EEo|0 diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index c2877d7..7e9ffcf 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -44,11 +44,9 @@ private boolean containsString(String value) throws SpreadsheetException { return false; if (false == STR_MARKS_ALLOWED_INSIDE_STRING) - if (2 == characterCount(value, "'")) { - System.out.println("Returning true"); + if (2 == characterCount(value, "'")) return true; - } - System.out.println("now throwing"); + throw new SpreadsheetException(STR_MARK_IN_THE_MIDDLE_ERROR_MSG); } @@ -59,15 +57,11 @@ private int characterCount(String str, String targetChar) throws SpreadsheetExce throw new SpreadsheetException("Character count target length must be 1"); for (int i = 0; i < str.length(); i++) { - System.out.println("trying " + charAsStringFromPos(str, i)); if (charAsStringFromPos(str, i).equals(targetChar)) { - System.out.println("found at index: " + i); count++; } } - System.out.println("returning count: " + count); - return count; } diff --git a/tests/SpreadsheetTest.java b/tests/SpreadsheetTest.java index c5d219f..7ccbd6f 100644 --- a/tests/SpreadsheetTest.java +++ b/tests/SpreadsheetTest.java @@ -64,4 +64,9 @@ public void evaluateString_TooManyStrMarks() { if (!caughtException) fail("String mark not found in the middle of a string"); } + + @Test + public void detectStringIncorrectFormatting() { + spreadsheet.set("A1", "' a string"); + } } From c678f9ba1d7e2c697d2383ea7cc95de1e3165719 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 16:34:53 +0300 Subject: [PATCH 50/55] besouro automatic message --- .besouro/20161012152902644/actions.txt | 1 + bin/SpreadsheetTest.class | Bin 2706 -> 2840 bytes tests/SpreadsheetTest.java | 2 +- 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.besouro/20161012152902644/actions.txt b/.besouro/20161012152902644/actions.txt index 9f2f647..8f0d3b3 100644 --- a/.besouro/20161012152902644/actions.txt +++ b/.besouro/20161012152902644/actions.txt @@ -227,3 +227,4 @@ RefactoringAction 1476279254570 SpreadsheetTest.java RENAME detect=>void detectS RefactoringAction 1476279256583 SpreadsheetTest.java RENAME detectStringIncorrectFomr=>void detectStringIncorrectFormatting FIELD RefactoringAction 1476279260095 SpreadsheetTest.java RENAME detectStringIncorrectFormatting=>void detectStringIncorrectFormatting() METHOD EditAction 1476279284473 SpreadsheetTest.java 2007 7 20 5 +EditAction 1476279293836 SpreadsheetTest.java 2006 7 20 5 diff --git a/bin/SpreadsheetTest.class b/bin/SpreadsheetTest.class index e1ffd65f1364f104227108fd32343d2810e1a948..f9fb15c94c89afdea556ffa072d5b6bbcfb2522f 100644 GIT binary patch delta 169 zcmbOvIzx=>)W2Q(7#J8#7}_^-^|2Yqr=*soCYJ=46lLb6d*&tQ7Zm}yZuv#Ii6tdK zAr6KXMg}f*g+zs7u#(Bs*vuI@HlJhL&m76Yz{DU4G>eUakwFSba{{py12d4vz`&!m zg@Ip4TBvy&gZxGypNT;bNOA#b1_n0 Date: Wed, 12 Oct 2016 16:35:37 +0300 Subject: [PATCH 51/55] besouro automatic message --- .besouro/20161012152902644/actions.txt | 1 + bin/SpreadsheetTest.class | Bin 2840 -> 2839 bytes tests/SpreadsheetTest.java | 2 ++ 3 files changed, 3 insertions(+) diff --git a/.besouro/20161012152902644/actions.txt b/.besouro/20161012152902644/actions.txt index 8f0d3b3..6ebbfbc 100644 --- a/.besouro/20161012152902644/actions.txt +++ b/.besouro/20161012152902644/actions.txt @@ -228,3 +228,4 @@ RefactoringAction 1476279256583 SpreadsheetTest.java RENAME detectStringIncorrec RefactoringAction 1476279260095 SpreadsheetTest.java RENAME detectStringIncorrectFormatting=>void detectStringIncorrectFormatting() METHOD EditAction 1476279284473 SpreadsheetTest.java 2007 7 20 5 EditAction 1476279293836 SpreadsheetTest.java 2006 7 20 5 +EditAction 1476279337902 SpreadsheetTest.java 2073 7 19 5 diff --git a/bin/SpreadsheetTest.class b/bin/SpreadsheetTest.class index f9fb15c94c89afdea556ffa072d5b6bbcfb2522f..0460b3c2c920fc412c2b2539fb5157427b059334 100644 GIT binary patch delta 15 WcmbOsHeGDPUN$C9_00#^B3J+_gapHyb diff --git a/tests/SpreadsheetTest.java b/tests/SpreadsheetTest.java index b505a1a..f332667 100644 --- a/tests/SpreadsheetTest.java +++ b/tests/SpreadsheetTest.java @@ -68,5 +68,7 @@ public void evaluateString_TooManyStrMarks() { @Test public void detectStringIncorrectFormatting() { spreadsheet.set("A1", "'a string"); + + assertEquals("Did not detect incorrect string formatting", ); } } From c9e08552489618dfafb98ebb59b40cbd6dfb3375 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 16:35:54 +0300 Subject: [PATCH 52/55] besouro automatic message --- .besouro/20161012152902644/actions.txt | 2 ++ bin/SpreadsheetTest.class | Bin 2839 -> 2953 bytes tests/SpreadsheetTest.java | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.besouro/20161012152902644/actions.txt b/.besouro/20161012152902644/actions.txt index 6ebbfbc..4d4affd 100644 --- a/.besouro/20161012152902644/actions.txt +++ b/.besouro/20161012152902644/actions.txt @@ -229,3 +229,5 @@ RefactoringAction 1476279260095 SpreadsheetTest.java RENAME detectStringIncorrec EditAction 1476279284473 SpreadsheetTest.java 2007 7 20 5 EditAction 1476279293836 SpreadsheetTest.java 2006 7 20 5 EditAction 1476279337902 SpreadsheetTest.java 2073 7 19 5 +CompilationAction 1476279338124 SpreadsheetTest.java +EditAction 1476279354817 SpreadsheetTest.java 2109 7 21 6 diff --git a/bin/SpreadsheetTest.class b/bin/SpreadsheetTest.class index 0460b3c2c920fc412c2b2539fb5157427b059334..0dba8248f4b30575c31802d3a218e337774c0947 100644 GIT binary patch delta 225 zcmbO()+x?)>ff$?3=9k=4BZ>K*0I&IGqf-=@Mk5KCFff$?3=9k=4DB1a*0J$(Ftji-aH=ON6qgib=B018XXj>dwPIjqU<4}S z(b~emFC;D0yp2JABaqL;AP6M6fHVVx8v{3kJA)8N6+|tAFoOt?$H>qMB$*i604ysJ Ai2wiq diff --git a/tests/SpreadsheetTest.java b/tests/SpreadsheetTest.java index f332667..48d5d4e 100644 --- a/tests/SpreadsheetTest.java +++ b/tests/SpreadsheetTest.java @@ -69,6 +69,6 @@ public void evaluateString_TooManyStrMarks() { public void detectStringIncorrectFormatting() { spreadsheet.set("A1", "'a string"); - assertEquals("Did not detect incorrect string formatting", ); + assertEquals("Did not detect incorrect string formatting", "#Error", spreadsheet.evaluate("A1")); } } From 41c2fd43bf3a537f8fff24fd1272e597b703d1b4 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 16:42:50 +0300 Subject: [PATCH 53/55] besouro automatic message --- .besouro/20161012152902644/actions.txt | 12 ++++++++++++ .../20161012152902644/besouroEpisodes.txt | 1 + .../randomHeuristicEpisodes.txt | 1 + .besouro/20161012152902644/zorroEpisodes.txt | 1 + bin/SpreadsheetTest.class | Bin 2953 -> 2925 bytes tests/SpreadsheetTest.java | 10 ++++++++-- 6 files changed, 23 insertions(+), 2 deletions(-) diff --git a/.besouro/20161012152902644/actions.txt b/.besouro/20161012152902644/actions.txt index 4d4affd..3feb0fa 100644 --- a/.besouro/20161012152902644/actions.txt +++ b/.besouro/20161012152902644/actions.txt @@ -231,3 +231,15 @@ EditAction 1476279293836 SpreadsheetTest.java 2006 7 20 5 EditAction 1476279337902 SpreadsheetTest.java 2073 7 19 5 CompilationAction 1476279338124 SpreadsheetTest.java EditAction 1476279354817 SpreadsheetTest.java 2109 7 21 6 +CompilationAction 1476279354918 SpreadsheetTest.java +CompilationAction 1476279358921 SpreadsheetTest.java +CompilationAction 1476279359097 SpreadsheetTest.java +CompilationAction 1476279370277 SpreadsheetTest.java +UnitTestCaseAction 1476279373373 SpreadsheetTest.java OK +UnitTestSessionAction 1476279373374 SpreadsheetTest.java OK +RefactoringAction 1476279703936 SpreadsheetTest.java ADD void formula FIELD +RefactoringAction 1476279711949 SpreadsheetTest.java RENAME formula=>void formulaTest FIELD +RefactoringAction 1476279716460 SpreadsheetTest.java RENAME formulaTest=>void formulaTestCorrect FIELD +RefactoringAction 1476279717972 SpreadsheetTest.java RENAME formulaTestCorrect=>void formulaTestCorrectString FIELD +RefactoringAction 1476279719484 SpreadsheetTest.java RENAME formulaTestCorrectString=>void formulaTestCorrectString() METHOD +EditAction 1476279770617 SpreadsheetTest.java 2235 8 22 6 diff --git a/.besouro/20161012152902644/besouroEpisodes.txt b/.besouro/20161012152902644/besouroEpisodes.txt index 7b7e15e..18975ab 100644 --- a/.besouro/20161012152902644/besouroEpisodes.txt +++ b/.besouro/20161012152902644/besouroEpisodes.txt @@ -947,3 +947,4 @@ 1476279180667 refactoring 1A 71 true 1476279180668 refactoring 1A 71 true 1476279198452 regression 1 0 true +1476279373374 test-addition 1 124 true diff --git a/.besouro/20161012152902644/randomHeuristicEpisodes.txt b/.besouro/20161012152902644/randomHeuristicEpisodes.txt index d9c27e9..3018e08 100644 --- a/.besouro/20161012152902644/randomHeuristicEpisodes.txt +++ b/.besouro/20161012152902644/randomHeuristicEpisodes.txt @@ -5,3 +5,4 @@ 1476279098216 refactoring 1A 990 true 1476279180667 refactoring 1A 71 false 1476279198452 regression 1 0 false +1476279373374 test-addition 1 124 true diff --git a/.besouro/20161012152902644/zorroEpisodes.txt b/.besouro/20161012152902644/zorroEpisodes.txt index 0e9654a..04b3580 100644 --- a/.besouro/20161012152902644/zorroEpisodes.txt +++ b/.besouro/20161012152902644/zorroEpisodes.txt @@ -5,3 +5,4 @@ 1476279098216 refactoring 1A 1016 true 1476279180667 refactoring 1A 82 true 1476279198452 regression 1 17 true +1476279373374 test-addition 1 174 true diff --git a/bin/SpreadsheetTest.class b/bin/SpreadsheetTest.class index 0dba8248f4b30575c31802d3a218e337774c0947..911bfaa20f4bd6bc7c35942fdb92fd8ecfb7e665 100644 GIT binary patch delta 173 zcmeAae=Ejy>ff$?3=9k=44oUf*0I@hFtji-aH=ON6qgib=B0Bmv@tShxn!m&ff$?3=9k=4BZ>K*0I&IGqf-=@Mk5KCFrpDIm=Wb|*8C$H2g~o1r;UsC7F-`+gvgi9rxZg48iEcrXY7NgjwQ24Myf OAdiuu6G$>KbO8YEsy#da diff --git a/tests/SpreadsheetTest.java b/tests/SpreadsheetTest.java index 48d5d4e..ea44a59 100644 --- a/tests/SpreadsheetTest.java +++ b/tests/SpreadsheetTest.java @@ -66,9 +66,15 @@ public void evaluateString_TooManyStrMarks() { } @Test - public void detectStringIncorrectFormatting() { + public void detectStringIncorrectFormatting() throws SpreadsheetException { spreadsheet.set("A1", "'a string"); - assertEquals("Did not detect incorrect string formatting", "#Error", spreadsheet.evaluate("A1")); + assertEquals("Did not detect incorrect string formatting", + "#Error", spreadsheet.evaluate("A1")); + } + + @Test + public void formulaTestCorrectString() { + spreadsheet.set("A1", "='a string'"); } } From b4ac5681e85ada667a471a9652534ea58ce24e9c Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 16:44:25 +0300 Subject: [PATCH 54/55] besouro automatic message --- .besouro/20161012152902644/actions.txt | 1 + bin/SpreadsheetTest.class | Bin 2925 -> 3053 bytes tests/SpreadsheetTest.java | 3 +++ 3 files changed, 4 insertions(+) diff --git a/.besouro/20161012152902644/actions.txt b/.besouro/20161012152902644/actions.txt index 3feb0fa..82486e9 100644 --- a/.besouro/20161012152902644/actions.txt +++ b/.besouro/20161012152902644/actions.txt @@ -243,3 +243,4 @@ RefactoringAction 1476279716460 SpreadsheetTest.java RENAME formulaTest=>void fo RefactoringAction 1476279717972 SpreadsheetTest.java RENAME formulaTestCorrect=>void formulaTestCorrectString FIELD RefactoringAction 1476279719484 SpreadsheetTest.java RENAME formulaTestCorrectString=>void formulaTestCorrectString() METHOD EditAction 1476279770617 SpreadsheetTest.java 2235 8 22 6 +EditAction 1476279865772 SpreadsheetTest.java 2360 8 23 7 diff --git a/bin/SpreadsheetTest.class b/bin/SpreadsheetTest.class index 911bfaa20f4bd6bc7c35942fdb92fd8ecfb7e665..80eeda507e328732349faf9515d75c25bff0b619 100644 GIT binary patch delta 163 zcmaDW_Ewzh)W2Q(7#J8#7bW0v delta 36 scmaDW{#K0Z)W2Q(7#J8#7& Date: Wed, 12 Oct 2016 17:06:19 +0300 Subject: [PATCH 55/55] Until formula evaluation --- .besouro/20161012152902644/actions.txt | 62 ++++++++++++++++++ .../20161012152902644/besouroEpisodes.txt | 6 ++ .../randomHeuristicEpisodes.txt | 2 + .besouro/20161012152902644/zorroEpisodes.txt | 2 + bin/Spreadsheet.class | Bin 3827 -> 4764 bytes bin/SpreadsheetTest.class | Bin 3053 -> 3155 bytes src/Spreadsheet.java | 38 +++++++++-- tests/SpreadsheetTest.java | 2 +- 8 files changed, 104 insertions(+), 8 deletions(-) diff --git a/.besouro/20161012152902644/actions.txt b/.besouro/20161012152902644/actions.txt index 82486e9..ad8a99a 100644 --- a/.besouro/20161012152902644/actions.txt +++ b/.besouro/20161012152902644/actions.txt @@ -244,3 +244,65 @@ RefactoringAction 1476279717972 SpreadsheetTest.java RENAME formulaTestCorrect=> RefactoringAction 1476279719484 SpreadsheetTest.java RENAME formulaTestCorrectString=>void formulaTestCorrectString() METHOD EditAction 1476279770617 SpreadsheetTest.java 2235 8 22 6 EditAction 1476279865772 SpreadsheetTest.java 2360 8 23 7 +CompilationAction 1476279866039 SpreadsheetTest.java +CompilationAction 1476279875396 SpreadsheetTest.java +UnitTestCaseAction 1476279877815 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476279877815 SpreadsheetTest.java FAIL +CompilationAction 1476279946334 Spreadsheet.java +CompilationAction 1476279946335 Spreadsheet.java +RefactoringAction 1476279961520 Spreadsheet.java ADD boolean isFormulaExpression FIELD +RefactoringAction 1476279963531 Spreadsheet.java RENAME isFormulaExpression=>boolean isFormulaExpression() METHOD +CompilationAction 1476279977184 Spreadsheet.java +CompilationAction 1476279977185 Spreadsheet.java +CompilationAction 1476279977353 Spreadsheet.java +CompilationAction 1476279977354 Spreadsheet.java +CompilationAction 1476279977354 Spreadsheet.java +CompilationAction 1476279980979 Spreadsheet.java +CompilationAction 1476279981141 Spreadsheet.java +CompilationAction 1476279981142 Spreadsheet.java +CompilationAction 1476279981143 Spreadsheet.java +RefactoringAction 1476279986095 Spreadsheet.java RENAME containsFormulaExpression()=>boolean containsFormulaExpression(String) METHOD +CompilationAction 1476279989730 Spreadsheet.java +CompilationAction 1476279989879 Spreadsheet.java +CompilationAction 1476279989880 Spreadsheet.java +CompilationAction 1476280028108 Spreadsheet.java +CompilationAction 1476280028109 Spreadsheet.java +CompilationAction 1476280035745 Spreadsheet.java +CompilationAction 1476280035936 Spreadsheet.java +RefactoringAction 1476280063919 Spreadsheet.java ADD String processFormula() METHOD +RefactoringAction 1476280075955 Spreadsheet.java RENAME processFormula()=>String processFormula(String) METHOD +UnitTestCaseAction 1476280158293 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476280158293 SpreadsheetTest.java FAIL +UnitTestCaseAction 1476280383769 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476280383770 SpreadsheetTest.java FAIL +RefactoringAction 1476280564981 Spreadsheet.java ADD void evaluateCell() METHOD +RefactoringAction 1476280577012 Spreadsheet.java ADD void evaluateValue() METHOD +CompilationAction 1476280609661 Spreadsheet.java +CompilationAction 1476280609662 Spreadsheet.java +CompilationAction 1476280609662 Spreadsheet.java +CompilationAction 1476280609662 Spreadsheet.java +CompilationAction 1476280635588 Spreadsheet.java +CompilationAction 1476280635763 Spreadsheet.java +CompilationAction 1476280635764 Spreadsheet.java +CompilationAction 1476280635765 Spreadsheet.java +CompilationAction 1476280644719 Spreadsheet.java +CompilationAction 1476280644719 Spreadsheet.java +RefactoringAction 1476280659282 Spreadsheet.java RENAME evaluateCell()=>String evaluateCell(String) METHOD +CompilationAction 1476280659410 Spreadsheet.java +CompilationAction 1476280659592 Spreadsheet.java +CompilationAction 1476280678942 Spreadsheet.java +UnitTestCaseAction 1476280680394 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476280680394 SpreadsheetTest.java FAIL +RefactoringAction 1476280749879 Spreadsheet.java ADD String evaluation FIELD +RefactoringAction 1476280751396 Spreadsheet.java RENAME evaluation=>String evaluation() METHOD +RefactoringAction 1476280789520 Spreadsheet.java RENAME evaluation()=>String evaluation(String) METHOD +CompilationAction 1476280791751 Spreadsheet.java +CompilationAction 1476280807520 Spreadsheet.java +CompilationAction 1476280807692 Spreadsheet.java +CompilationAction 1476280832017 Spreadsheet.java +CompilationAction 1476280832168 Spreadsheet.java +CompilationAction 1476280839284 Spreadsheet.java +UnitTestCaseAction 1476280842261 SpreadsheetTest.java OK +UnitTestSessionAction 1476280842261 SpreadsheetTest.java OK +UnitTestCaseAction 1476281016390 SpreadsheetTest.java OK +UnitTestSessionAction 1476281016391 SpreadsheetTest.java OK diff --git a/.besouro/20161012152902644/besouroEpisodes.txt b/.besouro/20161012152902644/besouroEpisodes.txt index 18975ab..3274eed 100644 --- a/.besouro/20161012152902644/besouroEpisodes.txt +++ b/.besouro/20161012152902644/besouroEpisodes.txt @@ -948,3 +948,9 @@ 1476279180668 refactoring 1A 71 true 1476279198452 regression 1 0 true 1476279373374 test-addition 1 124 true +1476280842261 test-addition 2 1138 true +1476280842262 test-addition 2 1138 true +1476280842263 test-addition 2 1138 true +1476280842264 test-addition 2 1138 true +1476280842265 test-addition 1 1138 true +1476281016391 regression 1 0 true diff --git a/.besouro/20161012152902644/randomHeuristicEpisodes.txt b/.besouro/20161012152902644/randomHeuristicEpisodes.txt index 3018e08..8b6b3e3 100644 --- a/.besouro/20161012152902644/randomHeuristicEpisodes.txt +++ b/.besouro/20161012152902644/randomHeuristicEpisodes.txt @@ -6,3 +6,5 @@ 1476279180667 refactoring 1A 71 false 1476279198452 regression 1 0 false 1476279373374 test-addition 1 124 true +1476280842261 test-addition 2 1138 true +1476281016391 regression 1 0 false diff --git a/.besouro/20161012152902644/zorroEpisodes.txt b/.besouro/20161012152902644/zorroEpisodes.txt index 04b3580..c2b431d 100644 --- a/.besouro/20161012152902644/zorroEpisodes.txt +++ b/.besouro/20161012152902644/zorroEpisodes.txt @@ -6,3 +6,5 @@ 1476279180667 refactoring 1A 82 true 1476279198452 regression 1 17 true 1476279373374 test-addition 1 174 true +1476280842261 test-addition 2 1468 true +1476281016391 regression 1 174 true diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index cdd8f17336d94a91970089bacc8d2b37caf4e3be..923bbba8132f65bc5a81c5208f9ad39709175945 100644 GIT binary patch delta 2098 zcmZ`(Yjaao6kR9x=F#*tv>_o>`=Y$kq_IvxurLJ$R4RyN%ER)(A(Bf8-XOS|TNl=)~+?;#&*?Xg*FZ9*^>S>+ z;|xkXonr7VH^R|)OJ^b)OLe6ZTDW(<9lZ>`lEf4RdlsdmdPGY&5NB{E!u@N)dP94A zgA+P@tK~DnkpvaBh5P!nScD-Yt|%U{RH@43bLY!#TRHl%jlq$M6CM?2@c5fdA|_Ac zEA4#(+wFLgVd70la_qnw27906t;d{T$Z+fgDdEg35sk-)jAVLuSZAmh7l??bHJLET zu?Kq@syD=Asc+yaq(h*B(Jz643`F6a< z@jBiRQ>}|83^TBHC;T|X@fO||DeLt0?{FN!y9{N?^kd1qs$PG`O=P7#sd%T^g#+(X zt(mgcagGmgg7nh0SWk)uNAWjxNai1LjNoH&*4oZK6@OV*s#%VlSZ14LJ1;TE#D3fD z?4lU4)v^oXnysFFE`GPIs`;AZ8`)H4GVbCFcoZr3-eHk`6Y<%0;0PFQ30zYAUaHBVD%EJQ<#9D zn#JLwH>QjWODft56>WGgFC!f|al~0ach&2#&AI;%I z@r$#rYB8o@36*^ScVHJpl}dvNimBJ(Vb@`0m2w0R(EK!HKKrj;kKRJBvw6L8rtnm7 zNB-0_1r54tB#U!&Y8r+yS<<&gWXp$9K86e3Ib6EjTpT;o^a%Jp*oc|fWMG=-rm5gj z6D}K=oKEo-qcz!v1JuGyJIP=%F0?;*V}{&1npgI!R5n;sqpl}5D-1Rh)zFPZLPa8z z4108%zFtg5oQ&NTP+e21rB@ciD+d(mlS}$Ux1dg=MjyUF@NDzpbPXx)l^CHl@T^fMdR41GPQ WGseV(E`#d64pm|^d`|*c@Wa1~^QYnf delta 1137 zcmZuwTW=Fb6#iy+eP4{d#5jaF4u)Lth5`WvtTssSfD|qPN&tn6f{RV!VjOTBVp?b# z2zS~5(*g;hX{AcMP$|$VmOxydK|=5+K&X#A@RDA>U6(?oYPGYoGiT2EE@#H;-bB1l z{=D}Pz;gU}$2+bW`vv^_dUJ(jCfB#Mkk910bY#J^;df_OXS2Nn=~P>;knT?B`vjc%ZCu!9ojb1MD-6m@u2wN5pSiYZXLX#D^WDpgi#oo+ zw*sEN{?Gc#sCT>Pic7NSj))O?)g2Yz%PDtSyHJGJGsSdR_-V*%`Btl&Er2RSN?2Lc`_)2MQx(aV)I5w7z`>vKka3WZV3j+=y3 z)KVpsm&V{wZ#&|qkuTwx9P!r#O_pzB!NvFpOZYU)hyJ)~sr9=*I#|>uFylTpcN$-p z(D6uZ(QY9eH$xf|HrXYd!>Sn8L`bs={q)z%$Zeu3GmOE_c?)r^gck|2{Fp31p=Yfy zIbVU*Hq+&BFfQ>g(*#b~Oo62doV2Mb3?9ZQCJs}W)0}BGeI42~D#SD#BA~EPMn3h` z8fPq(6C4ULdQ|W_z z5uBx37vohhQd894(Y#@IOY1F!Ox}xC)y?b`88c#Yde{>gCOSYPvqW_e^_(~3klbU0 XXWX;}tU!%ru^cigTt5)Ef{DKYzn14e diff --git a/bin/SpreadsheetTest.class b/bin/SpreadsheetTest.class index 80eeda507e328732349faf9515d75c25bff0b619..52e115f33e9d917a15b1b76f52f1ae09169e3874 100644 GIT binary patch delta 140 zcmaDWep!O+)W2Q(7#J8#82UDHNwPa|Fmy9ASh-}TDCFgrC=?Xsr<5kAg6QPb;^Nd4 zh2oN;%)E4kw4(f6g+zt4{G!~_oJ57xih?4bd}e;$W@YwbmdPp{GLtR11vomkF~|#b n38hUA;Fb~eW8h{8VBlp4WRL*T(hNb9-*bqv_W&(tV(0|`y-X=N delta 98 zcmcaC@m8Gc)W2Q(7#J8#7qHB$*hx0XWSMlmGw# diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 7e9ffcf..fe04e19 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -26,24 +26,48 @@ public void set(String cell, String value) { } public String evaluate(String cell) throws SpreadsheetException { - // to be implemented - + return evaluateCell(cell); + } + + private String evaluateCell(String cell) throws SpreadsheetException { String rawVal = cells.get(cell); + System.out.println("rawVal == " + rawVal); - if (containsString(rawVal)) - return evaluatedString(rawVal); + return evaluation(rawVal); + } + + private String evaluateValue(String value) throws SpreadsheetException { + return evaluation(value); + } + + private String evaluation(String value) throws SpreadsheetException { + if (containsFormulaExpression(value)) + return evaluateValue(processFormula(value)); - if (!containsAllowedIntegers(rawVal)) + if (containsString(value)) + return evaluatedString(value); + + if (!containsAllowedIntegers(value)) return ERROR_MESSAGE; - return rawVal; + return value; + } + + private boolean containsFormulaExpression(String value) throws SpreadsheetException { + if (charAsStringFromPos(value, 0).equals("=")) + return true; + return false; + } + + private String processFormula(String toProcess) { + return toProcess.substring(1); } private boolean containsString(String value) throws SpreadsheetException { if (!(charAsStringFromPos(value, 0).equals("'") && charAsStringFromPos(value, value.length() - 1).equals("'"))) return false; - if (false == STR_MARKS_ALLOWED_INSIDE_STRING) + if ( !STR_MARKS_ALLOWED_INSIDE_STRING) if (2 == characterCount(value, "'")) return true; diff --git a/tests/SpreadsheetTest.java b/tests/SpreadsheetTest.java index f2fbf64..8217867 100644 --- a/tests/SpreadsheetTest.java +++ b/tests/SpreadsheetTest.java @@ -74,7 +74,7 @@ public void detectStringIncorrectFormatting() throws SpreadsheetException { } @Test - public void formulaTestCorrectString() { + public void formulaTestCorrectString() throws SpreadsheetException { spreadsheet.set("A1", "='a string'"); assertEquals("Did not produce processed string from a formula expression",