From e3755df1c2cf89d647e99da5b6dea3f57d09daac Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 16:41:52 +0300 Subject: [PATCH 01/11] besouro automatic message --- .besouro/20161007164022502/actions.txt | 4 ++++ .besouro/20161007164022502/besouroEpisodes.txt | 1 + .besouro/20161007164022502/disagreements.txt | 0 .../randomHeuristicEpisodes.txt | 1 + .besouro/20161007164022502/userComments.txt | 0 .besouro/20161007164022502/zorroEpisodes.txt | 1 + bin/.gitignore | 2 ++ bin/Spreadsheet.class | Bin 613 -> 960 bytes bin/SpreadsheetTest.class | Bin 490 -> 975 bytes src/Spreadsheet.java | 10 +++++++++- tests/SpreadsheetTest.java | 14 ++++++++++++-- 11 files changed, 30 insertions(+), 3 deletions(-) create mode 100644 .besouro/20161007164022502/actions.txt create mode 100644 .besouro/20161007164022502/besouroEpisodes.txt create mode 100644 .besouro/20161007164022502/disagreements.txt create mode 100644 .besouro/20161007164022502/randomHeuristicEpisodes.txt create mode 100644 .besouro/20161007164022502/userComments.txt create mode 100644 .besouro/20161007164022502/zorroEpisodes.txt create mode 100644 bin/.gitignore diff --git a/.besouro/20161007164022502/actions.txt b/.besouro/20161007164022502/actions.txt new file mode 100644 index 0000000..1e10a17 --- /dev/null +++ b/.besouro/20161007164022502/actions.txt @@ -0,0 +1,4 @@ +FileOpenedAction 1475847622795 SpreadsheetTest.java 452 2 7 2 +UnitTestCaseAction 1475847638127 SpreadsheetTest.java OK +UnitTestSessionAction 1475847638127 SpreadsheetTest.java OK +EditAction 1475847712375 SpreadsheetTest.java 441 2 3 1 diff --git a/.besouro/20161007164022502/besouroEpisodes.txt b/.besouro/20161007164022502/besouroEpisodes.txt new file mode 100644 index 0000000..7d9b486 --- /dev/null +++ b/.besouro/20161007164022502/besouroEpisodes.txt @@ -0,0 +1 @@ +1475847638127 regression 1 15 true diff --git a/.besouro/20161007164022502/disagreements.txt b/.besouro/20161007164022502/disagreements.txt new file mode 100644 index 0000000..e69de29 diff --git a/.besouro/20161007164022502/randomHeuristicEpisodes.txt b/.besouro/20161007164022502/randomHeuristicEpisodes.txt new file mode 100644 index 0000000..7d9b486 --- /dev/null +++ b/.besouro/20161007164022502/randomHeuristicEpisodes.txt @@ -0,0 +1 @@ +1475847638127 regression 1 15 true diff --git a/.besouro/20161007164022502/userComments.txt b/.besouro/20161007164022502/userComments.txt new file mode 100644 index 0000000..e69de29 diff --git a/.besouro/20161007164022502/zorroEpisodes.txt b/.besouro/20161007164022502/zorroEpisodes.txt new file mode 100644 index 0000000..5ac7252 --- /dev/null +++ b/.besouro/20161007164022502/zorroEpisodes.txt @@ -0,0 +1 @@ +1475847638127 regression 1 15 false diff --git a/bin/.gitignore b/bin/.gitignore new file mode 100644 index 0000000..2079672 --- /dev/null +++ b/bin/.gitignore @@ -0,0 +1,2 @@ +/Spreadsheet.class +/SpreadsheetTest.class diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 92b411f05752a6cee6d06c9769e1b70d40aa0840..edba622888053339e71736ad6f31b06e63c89787 100644 GIT binary patch literal 960 zcmZ{iOK;Oa6ot=B(z^e#aHtqZKHsSgA!~DHGxL%d>d6%N)Tu|Si`zNZQ%O)ZS--hgF`j; z$kZInC(0YCz%~1{SPW+_C#noGj|HJa)Pm~ui!VPT} zD&*20&ZA(WU%MvSdM3Tc1|4^J6$SoY0@Biq>GetRedvuDs@6W;P*r3T#TCw4F(z-G%r-qbc eht`tTyDQMA+!;_QF5+!v@Z`!(uJGDMh0Y((O2QZb literal 613 zcma)2%T5A85Ug32hdcyd=us~U9OPoWVDw<(X`=@W_hFg9kaaQ3!guM(#DgE;M;WVk zH%i1rFWuGCT~*!l{_*+-;0y;vI0}{iV`TJbJ~1XP!c}NY^-^~O9ge$q!>RFOg~Ejm zZG5SaYqbXo?)7YB%E)1(iaZJmb8p! zWsjm`LyzN@_ifydBO8u;?e!9MHn!^G0oK?@Y&mxK8lzsDCelH-b~jRL zIas$^U4)6>DMrd9QBdr|J#taRCgHjkZf62q=`LOtPq3ZA7W){rQIBI485cX)6>w$W zJNcGKpY6VwfI9{|7}9v*!-yS~2n6QG^`_QqeXR%MdMAU9&%RGpm+JPEgQwK&plZcB zbWyS0IjSf9L>fL;Ihd1y$59k@T;y1a?J$b^dy;L2Nz_(vv|WLvv3b}j9a^oi3ChJ4 z1g)^!Lz|&j;VF1d@87`r&PxheTKfzp%+b1o1fKKsxHEiBVPTk+>*oQVk!BRw_=WtZ z8!R@;-jY|i#(nRhSK$2`8$a-P#NaU>#CM3BBj!4-Wh)F&hHMV~J(S2Qus@Mk4|%u8 tdCTPOa~^#3o_Xa7^aW}FERueS#LHMA(H8BfgzeiB)^AHV;-3_r{{yAV%##2B delta 189 zcmX@l{)(CF)W2Q(7#J8#7^Ek1^|P>)q!v$HZVu=9n7s)DBM>q$un7t7U=ZF2WHB*t0ZA?(&A`CT az{ cells; + + public Spreadsheet(){ + cells = new HashMap(); + } public String get(String cell) { // to be implemented - return null; + return cells.get(cell); } public void set(String cell, String value) { // to be implemented + cells.put(cell, value); } public String evaluate(String cell) { diff --git a/tests/SpreadsheetTest.java b/tests/SpreadsheetTest.java index 9e0936a..eddc52c 100644 --- a/tests/SpreadsheetTest.java +++ b/tests/SpreadsheetTest.java @@ -7,9 +7,19 @@ public class SpreadsheetTest { @Test - public void test() { - fail("Not yet implemented"); + public void test_SetAndGet() { + Spreadsheet n = new Spreadsheet(); + n.set("A1", "2"); + assertEquals("Should return 2", "2", n.get("A1")); + + } + @Test + public void test_NumberHandlingNegative() { + Spreadsheet n = new Spreadsheet(); + n.set("A1", "-1"); + + assertEquals("Evaluation is not correct", "-1", n.evaluate("A1");); } } From cecd69314af02de8c3f4dfe7bc3cbe63b2507d7c Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 16:42:21 +0300 Subject: [PATCH 02/11] besouro automatic message --- .besouro/20161007164022502/actions.txt | 5 +++++ bin/SpreadsheetTest.class | Bin 975 -> 964 bytes src/Spreadsheet.java | 2 +- tests/SpreadsheetTest.java | 2 +- 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.besouro/20161007164022502/actions.txt b/.besouro/20161007164022502/actions.txt index 1e10a17..a54b2ef 100644 --- a/.besouro/20161007164022502/actions.txt +++ b/.besouro/20161007164022502/actions.txt @@ -2,3 +2,8 @@ FileOpenedAction 1475847622795 SpreadsheetTest.java 452 2 7 2 UnitTestCaseAction 1475847638127 SpreadsheetTest.java OK UnitTestSessionAction 1475847638127 SpreadsheetTest.java OK EditAction 1475847712375 SpreadsheetTest.java 441 2 3 1 +CompilationAction 1475847712519 SpreadsheetTest.java +CompilationAction 1475847713842 SpreadsheetTest.java +UnitTestCaseAction 1475847717539 SpreadsheetTest.java FAIL +UnitTestSessionAction 1475847717539 SpreadsheetTest.java FAIL +EditAction 1475847741840 Spreadsheet.java 432 4 4 0 diff --git a/bin/SpreadsheetTest.class b/bin/SpreadsheetTest.class index df841500e210b89120d84e4ca94a50380f46df3f..a899e0e4231c1e88f60257c65793e92784bac053 100644 GIT binary patch delta 104 zcmX@leuRC4CKEFUgWhCECK*vK20;b`9tJ}OMMegW)Uw2!(!`R~$+1lTCO>8p)zjX_ zAR(kHq^&I^vW-E12ZPc^1_lNu1}-2e#J~b1g&8;)L>L4Z#2925#3!pU%d;DSRTu*R DXdn@r delta 157 zcmX@Yex7}UCX)mggCK(*4}(5~A|nGwYFT1VX<|t#2ZP~c9VVH{u}uF;G8tGHm>3us zRChB7Ms8;i_R$s+5z^kqAOWPeG3bU183<{EnQ}WAlr{ntGBI!gNihaiASuki!63pQ oz#z&X4ir%VlH6c9uz?Ib47@-d2ZJnw27@L8BM=$^`AiJP0I``B8~^|S diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 4c218c0..8520833 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -20,7 +20,7 @@ public void set(String cell, String value) { public String evaluate(String cell) { // to be implemented - return null; + return "-1"; } } diff --git a/tests/SpreadsheetTest.java b/tests/SpreadsheetTest.java index eddc52c..f2b98e0 100644 --- a/tests/SpreadsheetTest.java +++ b/tests/SpreadsheetTest.java @@ -19,7 +19,7 @@ public void test_NumberHandlingNegative() { Spreadsheet n = new Spreadsheet(); n.set("A1", "-1"); - assertEquals("Evaluation is not correct", "-1", n.evaluate("A1");); + assertEquals("Evaluation is not correct", "-1", n.evaluate("A1")); } } From 13fa8b0e10a1fdafa2180c09fbd9252e32542ac3 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 16:42:45 +0300 Subject: [PATCH 03/11] besouro automatic message --- .besouro/20161007164022502/actions.txt | 5 +++++ .besouro/20161007164022502/besouroEpisodes.txt | 1 + .../randomHeuristicEpisodes.txt | 1 + .besouro/20161007164022502/zorroEpisodes.txt | 1 + bin/Spreadsheet.class | Bin 960 -> 969 bytes tests/SpreadsheetTest.java | 7 +++++++ 6 files changed, 15 insertions(+) diff --git a/.besouro/20161007164022502/actions.txt b/.besouro/20161007164022502/actions.txt index a54b2ef..355cddf 100644 --- a/.besouro/20161007164022502/actions.txt +++ b/.besouro/20161007164022502/actions.txt @@ -7,3 +7,8 @@ CompilationAction 1475847713842 SpreadsheetTest.java UnitTestCaseAction 1475847717539 SpreadsheetTest.java FAIL UnitTestSessionAction 1475847717539 SpreadsheetTest.java FAIL EditAction 1475847741840 Spreadsheet.java 432 4 4 0 +UnitTestCaseAction 1475847745278 SpreadsheetTest.java OK +UnitTestSessionAction 1475847745278 SpreadsheetTest.java OK +RefactoringAction 1475847752473 SpreadsheetTest.java ADD void test_NumberHandlingNegative()/2 METHOD +RefactoringAction 1475847758984 SpreadsheetTest.java RENAME test_NumberHandlingNegative()/2=>void test_NumberHandlingPositive() METHOD +EditAction 1475847765757 SpreadsheetTest.java 623 3 9 3 diff --git a/.besouro/20161007164022502/besouroEpisodes.txt b/.besouro/20161007164022502/besouroEpisodes.txt index 7d9b486..14e02fb 100644 --- a/.besouro/20161007164022502/besouroEpisodes.txt +++ b/.besouro/20161007164022502/besouroEpisodes.txt @@ -1 +1,2 @@ 1475847638127 regression 1 15 true +1475847745278 refactoring 1A 32 true diff --git a/.besouro/20161007164022502/randomHeuristicEpisodes.txt b/.besouro/20161007164022502/randomHeuristicEpisodes.txt index 7d9b486..14e02fb 100644 --- a/.besouro/20161007164022502/randomHeuristicEpisodes.txt +++ b/.besouro/20161007164022502/randomHeuristicEpisodes.txt @@ -1 +1,2 @@ 1475847638127 regression 1 15 true +1475847745278 refactoring 1A 32 true diff --git a/.besouro/20161007164022502/zorroEpisodes.txt b/.besouro/20161007164022502/zorroEpisodes.txt index 5ac7252..ad6ed1c 100644 --- a/.besouro/20161007164022502/zorroEpisodes.txt +++ b/.besouro/20161007164022502/zorroEpisodes.txt @@ -1 +1,2 @@ 1475847638127 regression 1 15 false +1475847745278 refactoring 1A 107 false diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index edba622888053339e71736ad6f31b06e63c89787..26a0e52b44972ec4f4b7f75538187a9a8d825f0e 100644 GIT binary patch delta 77 zcmX@Wev+N*)W2Q(7#J8#7<4vr88dNkFlaI|FzFg@wq4hnPsGz a8AKVxfPA0`gB*iAP?nKF3&>+)&;|ff`3j%_ delta 90 zcmX@fet@0p)W2Q(7#J8#7_>HW88dBmWpZM4G-F_7U;+vU~n48lN?4JgLIAkH8H aB*h@I45C052rx0oF~|eu85uOdJWT+%SqZuT diff --git a/tests/SpreadsheetTest.java b/tests/SpreadsheetTest.java index f2b98e0..8441359 100644 --- a/tests/SpreadsheetTest.java +++ b/tests/SpreadsheetTest.java @@ -21,5 +21,12 @@ public void test_NumberHandlingNegative() { assertEquals("Evaluation is not correct", "-1", n.evaluate("A1")); } + @Test + public void test_NumberHandlingPositive() { + Spreadsheet n = new Spreadsheet(); + n.set("A1", "1"); + + assertEquals("Evaluation is not correct", "1", n.evaluate("A1")); + } } From 0a28fe138b4cb2dfd3f52bcd7fd3f6df466870c0 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 16:43:47 +0300 Subject: [PATCH 04/11] besouro automatic message --- .besouro/20161007164022502/actions.txt | 3 +++ bin/SpreadsheetTest.class | Bin 964 -> 1121 bytes src/Spreadsheet.java | 3 ++- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.besouro/20161007164022502/actions.txt b/.besouro/20161007164022502/actions.txt index 355cddf..20ca1ce 100644 --- a/.besouro/20161007164022502/actions.txt +++ b/.besouro/20161007164022502/actions.txt @@ -12,3 +12,6 @@ UnitTestSessionAction 1475847745278 SpreadsheetTest.java OK RefactoringAction 1475847752473 SpreadsheetTest.java ADD void test_NumberHandlingNegative()/2 METHOD RefactoringAction 1475847758984 SpreadsheetTest.java RENAME test_NumberHandlingNegative()/2=>void test_NumberHandlingPositive() METHOD EditAction 1475847765757 SpreadsheetTest.java 623 3 9 3 +UnitTestCaseAction 1475847769128 SpreadsheetTest.java FAIL +UnitTestSessionAction 1475847769128 SpreadsheetTest.java FAIL +EditAction 1475847827739 Spreadsheet.java 446 4 4 0 diff --git a/bin/SpreadsheetTest.class b/bin/SpreadsheetTest.class index a899e0e4231c1e88f60257c65793e92784bac053..db4762fb93763f2ce4188762b7b78166913e93ce 100644 GIT binary patch delta 129 zcmX@Y{*Z&~)W2Q(7#J8#7|b_vg)%8im!uY##QT-zCZ!g6B<7{$Wagy@?|nfr-Hw0O6 Date: Fri, 7 Oct 2016 16:44:03 +0300 Subject: [PATCH 05/11] besouro automatic message --- .besouro/20161007164022502/actions.txt | 3 +++ bin/Spreadsheet.class | Bin 969 -> 970 bytes tests/SpreadsheetTest.java | 7 +++++++ 3 files changed, 10 insertions(+) diff --git a/.besouro/20161007164022502/actions.txt b/.besouro/20161007164022502/actions.txt index 20ca1ce..dbc583b 100644 --- a/.besouro/20161007164022502/actions.txt +++ b/.besouro/20161007164022502/actions.txt @@ -15,3 +15,6 @@ EditAction 1475847765757 SpreadsheetTest.java 623 3 9 3 UnitTestCaseAction 1475847769128 SpreadsheetTest.java FAIL UnitTestSessionAction 1475847769128 SpreadsheetTest.java FAIL EditAction 1475847827739 Spreadsheet.java 446 4 4 0 +RefactoringAction 1475847835528 SpreadsheetTest.java ADD void test_NumberHandlingPositive()/2 METHOD +RefactoringAction 1475847842539 SpreadsheetTest.java RENAME test_NumberHandlingPositive()/2=>void test_NumberHandlingSigned() METHOD +EditAction 1475847842969 SpreadsheetTest.java 804 4 12 4 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 26a0e52b44972ec4f4b7f75538187a9a8d825f0e..394df25a120ef1c2bc81acad246986dfe68e7257 100644 GIT binary patch delta 68 zcmX@feu|yz)W2Q(7#J8#7_>HW88dBmWpZMie2+;*U4lUbC@jXn1SEMFM1d?2;9-zs PkY`{7LJc5~i9r(p7(WV5 delta 100 zcmXAeDGq=z6hx=L32iD_9avUDAVFbzVh9d_r-vd8VZ>}NnA^DUoELx@{q82Q7L9@o lB`e~gUnlSYY(T%qL>bT2eC3Yq`_ diff --git a/tests/SpreadsheetTest.java b/tests/SpreadsheetTest.java index 8441359..389d1a5 100644 --- a/tests/SpreadsheetTest.java +++ b/tests/SpreadsheetTest.java @@ -28,5 +28,12 @@ public void test_NumberHandlingPositive() { assertEquals("Evaluation is not correct", "1", n.evaluate("A1")); } + @Test + public void test_NumberHandlingSigned() { + Spreadsheet n = new Spreadsheet(); + n.set("A1", "1"); + + assertEquals("Evaluation is not correct", "1", n.evaluate("A1")); + } } From 517ef7b2d4da673cb18c587754ee27ea94212c27 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 16:44:10 +0300 Subject: [PATCH 06/11] besouro automatic message --- .besouro/20161007164022502/actions.txt | 1 + bin/SpreadsheetTest.class | Bin 1121 -> 1269 bytes tests/SpreadsheetTest.java | 1 + 3 files changed, 2 insertions(+) diff --git a/.besouro/20161007164022502/actions.txt b/.besouro/20161007164022502/actions.txt index dbc583b..4290b35 100644 --- a/.besouro/20161007164022502/actions.txt +++ b/.besouro/20161007164022502/actions.txt @@ -18,3 +18,4 @@ EditAction 1475847827739 Spreadsheet.java 446 4 4 0 RefactoringAction 1475847835528 SpreadsheetTest.java ADD void test_NumberHandlingPositive()/2 METHOD RefactoringAction 1475847842539 SpreadsheetTest.java RENAME test_NumberHandlingPositive()/2=>void test_NumberHandlingSigned() METHOD EditAction 1475847842969 SpreadsheetTest.java 804 4 12 4 +EditAction 1475847850100 SpreadsheetTest.java 807 4 12 4 diff --git a/bin/SpreadsheetTest.class b/bin/SpreadsheetTest.class index db4762fb93763f2ce4188762b7b78166913e93ce..e75fb2466f981e620ea9b312cd2834d1b47f74ef 100644 GIT binary patch delta 91 zcmaFJ@s*S7)W2Q(7#J8#7%Vn&RWV6PmZTP!#QT-zCZ!g6B<7{$Wagy@XQt<+rc7>P v(r0AdyoqTQ&B?qhioA*p91Kbf0t_k)vJ9$|y_x0N&46YxF_;4YbPyP! delta 36 scmey$`H+L_)W2Q(7#J8#7|b_vRWVIoz@*E_viTg-Dn?cY1||kG0P;QxrT_o{ diff --git a/tests/SpreadsheetTest.java b/tests/SpreadsheetTest.java index 389d1a5..2c4429d 100644 --- a/tests/SpreadsheetTest.java +++ b/tests/SpreadsheetTest.java @@ -31,6 +31,7 @@ public void test_NumberHandlingPositive() { @Test public void test_NumberHandlingSigned() { Spreadsheet n = new Spreadsheet(); + n.set("A1", "1"); assertEquals("Evaluation is not correct", "1", n.evaluate("A1")); From c92e3b9e6b870dd9e911296e3bb1725806045467 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 16:52:37 +0300 Subject: [PATCH 07/11] besouro automatic message --- .besouro/20161007164022502/actions.txt | 10 ++++++++++ .../20161007164022502/besouroEpisodes.txt | 4 ++++ .../randomHeuristicEpisodes.txt | 1 + .besouro/20161007164022502/zorroEpisodes.txt | 5 +++-- bin/SpreadsheetTest.class | Bin 1269 -> 1269 bytes tests/SpreadsheetTest.java | 9 +++++++++ 6 files changed, 27 insertions(+), 2 deletions(-) diff --git a/.besouro/20161007164022502/actions.txt b/.besouro/20161007164022502/actions.txt index 4290b35..47ad010 100644 --- a/.besouro/20161007164022502/actions.txt +++ b/.besouro/20161007164022502/actions.txt @@ -19,3 +19,13 @@ RefactoringAction 1475847835528 SpreadsheetTest.java ADD void test_NumberHandlin RefactoringAction 1475847842539 SpreadsheetTest.java RENAME test_NumberHandlingPositive()/2=>void test_NumberHandlingSigned() METHOD EditAction 1475847842969 SpreadsheetTest.java 804 4 12 4 EditAction 1475847850100 SpreadsheetTest.java 807 4 12 4 +UnitTestCaseAction 1475848217412 SpreadsheetTest.java OK +UnitTestSessionAction 1475848217413 SpreadsheetTest.java OK +RefactoringAction 1475848312589 SpreadsheetTest.java ADD void test_NumberHandlingSigned()/2 METHOD +RefactoringAction 1475848317103 SpreadsheetTest.java RENAME test_NumberHandlingSigned()/2=>void test_NumberHandling() METHOD +RefactoringAction 1475848321116 SpreadsheetTest.java RENAME test_NumberHandling()=>void test_NumberHandlingTwoCells() METHOD +RefactoringAction 1475848331127 SpreadsheetTest.java REMOVE test_NumberHandlingTwoCells() METHOD +RefactoringAction 1475848348140 SpreadsheetTest.java ADD void test_NumberHandlingSigned()/2 METHOD +RefactoringAction 1475848355159 SpreadsheetTest.java RENAME test_NumberHandlingSigned()/2=>void test_Incorrect() METHOD +RefactoringAction 1475848357175 SpreadsheetTest.java RENAME test_Incorrect()=>void test_IncorrectInteger() METHOD +EditAction 1475848357363 SpreadsheetTest.java 989 5 15 5 diff --git a/.besouro/20161007164022502/besouroEpisodes.txt b/.besouro/20161007164022502/besouroEpisodes.txt index 14e02fb..103771c 100644 --- a/.besouro/20161007164022502/besouroEpisodes.txt +++ b/.besouro/20161007164022502/besouroEpisodes.txt @@ -1,2 +1,6 @@ 1475847638127 regression 1 15 true 1475847745278 refactoring 1A 32 true +1475848217413 test-first 3 464 true +1475848217414 test-first 3 464 true +1475848217415 test-last 1 464 false +1475848217416 test-last 1 464 false diff --git a/.besouro/20161007164022502/randomHeuristicEpisodes.txt b/.besouro/20161007164022502/randomHeuristicEpisodes.txt index 14e02fb..91084ce 100644 --- a/.besouro/20161007164022502/randomHeuristicEpisodes.txt +++ b/.besouro/20161007164022502/randomHeuristicEpisodes.txt @@ -1,2 +1,3 @@ 1475847638127 regression 1 15 true 1475847745278 refactoring 1A 32 true +1475848217413 test-first 3 464 true diff --git a/.besouro/20161007164022502/zorroEpisodes.txt b/.besouro/20161007164022502/zorroEpisodes.txt index ad6ed1c..b77b0b2 100644 --- a/.besouro/20161007164022502/zorroEpisodes.txt +++ b/.besouro/20161007164022502/zorroEpisodes.txt @@ -1,2 +1,3 @@ -1475847638127 regression 1 15 false -1475847745278 refactoring 1A 107 false +1475847638127 regression 1 15 true +1475847745278 refactoring 1A 107 true +1475848217413 test-first 3 472 true diff --git a/bin/SpreadsheetTest.class b/bin/SpreadsheetTest.class index e75fb2466f981e620ea9b312cd2834d1b47f74ef..58f53ee7faa47a89439985bfc0bcc5d05ec91094 100644 GIT binary patch delta 21 ccmey$`IU3SF&0i`1_1_D23ZER$>&+r07|h1rvLx| delta 21 ccmey$`IU3SF&0iG1_1^Y23ZEx$>&+r07{kxqyPW_ diff --git a/tests/SpreadsheetTest.java b/tests/SpreadsheetTest.java index 2c4429d..a99cc97 100644 --- a/tests/SpreadsheetTest.java +++ b/tests/SpreadsheetTest.java @@ -36,5 +36,14 @@ public void test_NumberHandlingSigned() { assertEquals("Evaluation is not correct", "1", n.evaluate("A1")); } + @Test + public void test_IncorrectInteger() { + Spreadsheet n = new Spreadsheet(); + + n.set("A1", "1"); + + assertEquals("Evaluation is not correct", "1", n.evaluate("A1")); + } + } From 90be9b13f344c85ae83c9aeaf1a33deabb21baaa Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 16:52:55 +0300 Subject: [PATCH 08/11] besouro automatic message --- .besouro/20161007164022502/actions.txt | 1 + bin/SpreadsheetTest.class | Bin 1269 -> 1413 bytes tests/SpreadsheetTest.java | 2 +- 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.besouro/20161007164022502/actions.txt b/.besouro/20161007164022502/actions.txt index 47ad010..d6eaece 100644 --- a/.besouro/20161007164022502/actions.txt +++ b/.besouro/20161007164022502/actions.txt @@ -29,3 +29,4 @@ RefactoringAction 1475848348140 SpreadsheetTest.java ADD void test_NumberHandlin RefactoringAction 1475848355159 SpreadsheetTest.java RENAME test_NumberHandlingSigned()/2=>void test_Incorrect() METHOD RefactoringAction 1475848357175 SpreadsheetTest.java RENAME test_Incorrect()=>void test_IncorrectInteger() METHOD EditAction 1475848357363 SpreadsheetTest.java 989 5 15 5 +EditAction 1475848375863 SpreadsheetTest.java 990 5 15 5 diff --git a/bin/SpreadsheetTest.class b/bin/SpreadsheetTest.class index 58f53ee7faa47a89439985bfc0bcc5d05ec91094..3dc1fc264064216080c62f60756177adbbc9bcb3 100644 GIT binary patch delta 82 zcmey$*~-mz>ff$?3=9k=43-FCYN~Tm87Pp7EPYVq|eB< m`5coH(sU9>ff$?3=9k=3>F)?rZG+4!KBN`y7?KC5)&%}0~3Qe0Ok7%6#xJL diff --git a/tests/SpreadsheetTest.java b/tests/SpreadsheetTest.java index a99cc97..888811e 100644 --- a/tests/SpreadsheetTest.java +++ b/tests/SpreadsheetTest.java @@ -40,7 +40,7 @@ public void test_NumberHandlingSigned() { public void test_IncorrectInteger() { Spreadsheet n = new Spreadsheet(); - n.set("A1", "1"); + n.set("A1", "5A"); assertEquals("Evaluation is not correct", "1", n.evaluate("A1")); } From 16e5b880253bbbf3bf43aa6038e34e3be29f5976 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 16:53:14 +0300 Subject: [PATCH 09/11] besouro automatic message --- .besouro/20161007164022502/actions.txt | 1 + bin/SpreadsheetTest.class | Bin 1413 -> 1421 bytes tests/SpreadsheetTest.java | 2 +- 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.besouro/20161007164022502/actions.txt b/.besouro/20161007164022502/actions.txt index d6eaece..d9bccfc 100644 --- a/.besouro/20161007164022502/actions.txt +++ b/.besouro/20161007164022502/actions.txt @@ -30,3 +30,4 @@ RefactoringAction 1475848355159 SpreadsheetTest.java RENAME test_NumberHandlingS RefactoringAction 1475848357175 SpreadsheetTest.java RENAME test_Incorrect()=>void test_IncorrectInteger() METHOD EditAction 1475848357363 SpreadsheetTest.java 989 5 15 5 EditAction 1475848375863 SpreadsheetTest.java 990 5 15 5 +EditAction 1475848394837 SpreadsheetTest.java 995 5 15 5 diff --git a/bin/SpreadsheetTest.class b/bin/SpreadsheetTest.class index 3dc1fc264064216080c62f60756177adbbc9bcb3..3b5c19c463648f74b988575e95d49ae8b360fcdd 100644 GIT binary patch delta 58 zcmZqW?&an>^>5cc1_lNb2J4MnYnV7V7%UhWm`oivZ)2)v;xOOFAR(kHWIXvIv*hF; NRvmUrpi(9VD*(}04VM4_ delta 40 vcmeC>Zsq1W^>5cc1_lNb2Fs0HYnV3gW2$DF?8%}yIf_+>-5e;v#9#pc4Oj}$ diff --git a/tests/SpreadsheetTest.java b/tests/SpreadsheetTest.java index 888811e..0b20651 100644 --- a/tests/SpreadsheetTest.java +++ b/tests/SpreadsheetTest.java @@ -42,7 +42,7 @@ public void test_IncorrectInteger() { n.set("A1", "5A"); - assertEquals("Evaluation is not correct", "1", n.evaluate("A1")); + assertEquals("Evaluation is not correct", "#Error", n.evaluate("A1")); } From 93b822400d34779e9406b066ad3f89a8acc727c4 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 16:54:52 +0300 Subject: [PATCH 10/11] besouro automatic message --- .besouro/20161007164022502/actions.txt | 3 +++ bin/SpreadsheetTest.class | Bin 1421 -> 1433 bytes src/Spreadsheet.java | 1 + 3 files changed, 4 insertions(+) diff --git a/.besouro/20161007164022502/actions.txt b/.besouro/20161007164022502/actions.txt index d9bccfc..d4838de 100644 --- a/.besouro/20161007164022502/actions.txt +++ b/.besouro/20161007164022502/actions.txt @@ -31,3 +31,6 @@ RefactoringAction 1475848357175 SpreadsheetTest.java RENAME test_Incorrect()=>vo EditAction 1475848357363 SpreadsheetTest.java 989 5 15 5 EditAction 1475848375863 SpreadsheetTest.java 990 5 15 5 EditAction 1475848394837 SpreadsheetTest.java 995 5 15 5 +UnitTestCaseAction 1475848398079 SpreadsheetTest.java FAIL +UnitTestSessionAction 1475848398080 SpreadsheetTest.java FAIL +EditAction 1475848492364 Spreadsheet.java 449 4 4 0 diff --git a/bin/SpreadsheetTest.class b/bin/SpreadsheetTest.class index 3b5c19c463648f74b988575e95d49ae8b360fcdd..a5cbea2acbb27b568a5d6e66664ee52158cc5dd4 100644 GIT binary patch delta 51 zcmeC>p2^L1>ff$?3=9k=47MA&wlMKff$?3=9k=4AvXDwlHlz#ni+!`3j5F Date: Fri, 14 Oct 2016 16:35:06 +0300 Subject: [PATCH 11/11] Finishing later --- src/Spreadsheet.java | 56 +++++++++++++++++++++++++++++- tests/SpreadsheetTest.java | 70 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 125 insertions(+), 1 deletion(-) diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index c9b8fe2..7f1094e 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -21,8 +21,62 @@ public void set(String cell, String value) { public String evaluate(String cell) { // to be implemented + String ev = cells.get(cell); + if(checkEquation(ev)){ + ev = ev.substring(1); + if(ev.charAt(0) != '\''){ + if(isCircular(cell, cells.get(ev))){ + return "#Circular"; + } + ev = evaluate(ev); + } + } + if(checkFormat(ev)){ + if(ev.charAt(0) == '\''){ + ev = ev.substring(1, ev.length() - 1); + return ev; + } + return ev; + } + return "#Error"; + } + public boolean checkFormat(String cell){ + for(int i = 0; i < cell.length(); i++){ + if(cell.charAt(0) == '-'){ + continue; + } + else if(cell.charAt(0) == '\'' && + cell.charAt(cell.length() - 1) == '\''){ + return true; + } + else if(cell.charAt(i) >= '0' && cell.charAt(i) <= '9'){ + continue; + } + else{ + return false; + } + } + return true; + } + public boolean checkEquation(String cell){ + if(cell.charAt(0) == '='){ + return true; + } + return false; + } + public boolean isCircular(String current, String next){ + boolean circular = false; + if(checkEquation(next)){ + next = next.substring(1); + } + if(current.equals(next)){ + return true; + } + + + return circular; + - return cells.get(cell); } } diff --git a/tests/SpreadsheetTest.java b/tests/SpreadsheetTest.java index 0b20651..73ebd49 100644 --- a/tests/SpreadsheetTest.java +++ b/tests/SpreadsheetTest.java @@ -44,6 +44,76 @@ public void test_IncorrectInteger() { assertEquals("Evaluation is not correct", "#Error", n.evaluate("A1")); } + @Test + public void test_String() { + Spreadsheet n = new Spreadsheet(); + + n.set("A1", "'This is correct'"); + + assertEquals("Evaluation is not correct", "This is correct", n.evaluate("A1")); + } + @Test + public void test_StringUnquated() { + Spreadsheet n = new Spreadsheet(); + + n.set("A1", "'This is incorrect"); + + assertEquals("Evaluation is not correct", "#Error", n.evaluate("A1")); + } + @Test + public void test_SimpleFormulas() { + Spreadsheet n = new Spreadsheet(); + + n.set("A1", "='a string'"); + + assertEquals("Evaluation is not correct", "a string", n.evaluate("A1")); + } + @Test + public void test_SimpleFormulasError() { + Spreadsheet n = new Spreadsheet(); + + n.set("A1", "='a string"); + + assertEquals("Evaluation is not correct", "#Error", n.evaluate("A1")); + } + @Test + public void test_CellReference() { + Spreadsheet n = new Spreadsheet(); + + n.set("A2", "5"); + n.set("A1", "=A2"); + + assertEquals("Evaluation is not correct", "5", n.evaluate("A1")); + } + @Test + public void test_CellReferenceError() { + Spreadsheet n = new Spreadsheet(); + + n.set("A2", "k5"); + n.set("A1", "=A2"); + + assertEquals("Evaluation is not correct", "#Error", n.evaluate("A1")); + } + @Test + public void test_CircularReference() { + Spreadsheet n = new Spreadsheet(); + + n.set("A2", "=A1"); + n.set("A1", "=A2"); + + assertEquals("Evaluation is not correct", "#Circular", n.evaluate("A1")); + } + @Test + public void test_IntegerOperations() { + Spreadsheet n = new Spreadsheet(); + + n.set("A2", "=A1"); + n.set("A1", "=A2"); + + assertEquals("Evaluation is not correct", "#Circular", n.evaluate("A1")); + } + + }