From 10073d9cf60dde00b94fabdfd706be2df123b352 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 14:25:24 +0300 Subject: [PATCH 01/44] besouro automatic message --- .besouro/20161012142150776/actions.txt | 2 ++ .besouro/20161012142150776/besouroEpisodes.txt | 0 .besouro/20161012142150776/disagreements.txt | 0 .besouro/20161012142150776/randomHeuristicEpisodes.txt | 0 .besouro/20161012142150776/userComments.txt | 0 .besouro/20161012142150776/zorroEpisodes.txt | 0 bin/.gitignore | 2 ++ tests/SpreadsheetTest.java | 8 ++++++-- 8 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 .besouro/20161012142150776/actions.txt create mode 100644 .besouro/20161012142150776/besouroEpisodes.txt create mode 100644 .besouro/20161012142150776/disagreements.txt create mode 100644 .besouro/20161012142150776/randomHeuristicEpisodes.txt create mode 100644 .besouro/20161012142150776/userComments.txt create mode 100644 .besouro/20161012142150776/zorroEpisodes.txt create mode 100644 bin/.gitignore diff --git a/.besouro/20161012142150776/actions.txt b/.besouro/20161012142150776/actions.txt new file mode 100644 index 0000000..3232ae8 --- /dev/null +++ b/.besouro/20161012142150776/actions.txt @@ -0,0 +1,2 @@ +FileOpenedAction 1476271310983 SpreadsheetTest.java 162 1 0 0 +EditAction 1476271524073 SpreadsheetTest.java 273 1 3 1 diff --git a/.besouro/20161012142150776/besouroEpisodes.txt b/.besouro/20161012142150776/besouroEpisodes.txt new file mode 100644 index 0000000..e69de29 diff --git a/.besouro/20161012142150776/disagreements.txt b/.besouro/20161012142150776/disagreements.txt new file mode 100644 index 0000000..e69de29 diff --git a/.besouro/20161012142150776/randomHeuristicEpisodes.txt b/.besouro/20161012142150776/randomHeuristicEpisodes.txt new file mode 100644 index 0000000..e69de29 diff --git a/.besouro/20161012142150776/userComments.txt b/.besouro/20161012142150776/userComments.txt new file mode 100644 index 0000000..e69de29 diff --git a/.besouro/20161012142150776/zorroEpisodes.txt b/.besouro/20161012142150776/zorroEpisodes.txt new file mode 100644 index 0000000..e69de29 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/tests/SpreadsheetTest.java b/tests/SpreadsheetTest.java index 9e0936a..87af968 100644 --- a/tests/SpreadsheetTest.java +++ b/tests/SpreadsheetTest.java @@ -7,8 +7,12 @@ public class SpreadsheetTest { @Test - public void test() { - fail("Not yet implemented"); + public void testSpreadsheet_setA1_1_getA1_return1() { + + Spreadsheet sheet = new Spreadsheet(); + sheet.set("A1", "1"); + + assertEquals(sheet.get("A1"), "1"); } From edd4487997e5c5c57c7571b0393a2bc1836d8b06 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 14:27:53 +0300 Subject: [PATCH 02/44] besouro automatic message --- .besouro/20161012142150776/actions.txt | 6 ++++++ bin/SpreadsheetTest.class | Bin 490 -> 740 bytes src/Spreadsheet.java | 9 ++++++--- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/.besouro/20161012142150776/actions.txt b/.besouro/20161012142150776/actions.txt index 3232ae8..d7b2745 100644 --- a/.besouro/20161012142150776/actions.txt +++ b/.besouro/20161012142150776/actions.txt @@ -1,2 +1,8 @@ FileOpenedAction 1476271310983 SpreadsheetTest.java 162 1 0 0 EditAction 1476271524073 SpreadsheetTest.java 273 1 3 1 +UnitTestCaseAction 1476271526370 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476271526372 SpreadsheetTest.java FAIL +RefactoringAction 1476271606452 Spreadsheet.java ADD Map sheet FIELD +RefactoringAction 1476271614011 Spreadsheet.java ADD import java.util.HashMap IMPORT +RefactoringAction 1476271622211 Spreadsheet.java ADD import java.util.Map IMPORT +EditAction 1476271672549 Spreadsheet.java 351 3 3 0 diff --git a/bin/SpreadsheetTest.class b/bin/SpreadsheetTest.class index e7086bd9ef1b6a8b7afcfb717afbaddbf99a7876..efbc74afa250f2cb2f6d5159e4d166d1933ca4fd 100644 GIT binary patch delta 405 zcmZWl%}T>y5S&e08q*ZpG{&FSf0MR)2mx1MJhk_soCF)0PDN&QJUcGsh(!1~A zrHX)6ap0M`7cLf?x18JT*ROC^>EXo`&$Bgyu!IwNE6($^1!Cj%oSV8>@2w__B delta 169 zcmaFD`ihzB)W2Q(7#J8#7^Ek1^|P{+q!yP<+^_G sheet = new HashMap<>(); public String get(String cell) { - // to be implemented - return null; + return sheet.get(cell); } public void set(String cell, String value) { - // to be implemented + sheet.put(cell, value); } public String evaluate(String cell) { From 1ad845e47476f7c134585cb97ec42c967577e389 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 14:32:24 +0300 Subject: [PATCH 03/44] besouro automatic message --- .besouro/20161012142150776/actions.txt | 24 ++++++++++++++++++ .../20161012142150776/besouroEpisodes.txt | 2 ++ .../randomHeuristicEpisodes.txt | 1 + .besouro/20161012142150776/zorroEpisodes.txt | 1 + bin/Spreadsheet.class | Bin 613 -> 975 bytes tests/SpreadsheetTest.java | 20 +++++++++++---- 6 files changed, 43 insertions(+), 5 deletions(-) diff --git a/.besouro/20161012142150776/actions.txt b/.besouro/20161012142150776/actions.txt index d7b2745..da3d630 100644 --- a/.besouro/20161012142150776/actions.txt +++ b/.besouro/20161012142150776/actions.txt @@ -6,3 +6,27 @@ RefactoringAction 1476271606452 Spreadsheet.java ADD Map sheet FI RefactoringAction 1476271614011 Spreadsheet.java ADD import java.util.HashMap IMPORT RefactoringAction 1476271622211 Spreadsheet.java ADD import java.util.Map IMPORT EditAction 1476271672549 Spreadsheet.java 351 3 3 0 +UnitTestCaseAction 1476271678562 SpreadsheetTest.java OK +UnitTestSessionAction 1476271678563 SpreadsheetTest.java OK +RefactoringAction 1476271716638 SpreadsheetTest.java ADD void testSpreadSheet FIELD +RefactoringAction 1476271718145 SpreadsheetTest.java RENAME testSpreadSheet=>void testSpreadSheet_ FIELD +RefactoringAction 1476271800665 SpreadsheetTest.java RENAME testSpreadSheet_=>void testSpreadSheet_negtive FIELD +RefactoringAction 1476271803182 SpreadsheetTest.java RENAME testSpreadSheet_negtive=>void testSpreadSheet_negtiveInteger FIELD +RefactoringAction 1476271815696 SpreadsheetTest.java RENAME testSpreadSheet_negtiveInteger=>void testSpreadSheet_negtiveIntegerSet FIELD +RefactoringAction 1476271818211 SpreadsheetTest.java RENAME testSpreadSheet_negtiveIntegerSet=>void testSpreadSheet_negtiveIntegerSetB2 FIELD +RefactoringAction 1476271831229 SpreadsheetTest.java RENAME testSpreadSheet_negtiveIntegerSetB2=>void testSpreadSheet_negtiveIntegerSetB2_ FIELD +RefactoringAction 1476271852336 SpreadsheetTest.java RENAME testSpreadSheet_negtiveIntegerSetB2_=>void testSpreadSheet_negtiveIntegerSetB2_neg3_getB2_return_neg3 FIELD +RefactoringAction 1476271873370 SpreadsheetTest.java ADD void testSpreadsheet_setA1_1_getA1_return1()/2 METHOD +RefactoringAction 1476271874884 SpreadsheetTest.java REMOVE testSpreadsheet_setA1_1_getA1_return1()/2 METHOD +RefactoringAction 1476271882911 SpreadsheetTest.java REMOVE testSpreadSheet_negtiveIntegerSetB2_neg3_getB2_return_neg3 FIELD +RefactoringAction 1476271884927 SpreadsheetTest.java ADD void testSpreadSheet_negtiveIntegerSetB2_neg3_getB2_return_neg3 FIELD +RefactoringAction 1476271893456 SpreadsheetTest.java REMOVE testSpreadSheet_negtiveIntegerSetB2_neg3_getB2_return_neg3 FIELD +RefactoringAction 1476271898472 SpreadsheetTest.java ADD void testSpreadsheet_setA1_1_getA1_return1()/2 METHOD +RefactoringAction 1476271908487 SpreadsheetTest.java RENAME testSpreadsheet_setA1_1_getA1_return1()/2=>void testSpreadsheet_setB2_1_getA1_return1() METHOD +RefactoringAction 1476271910503 SpreadsheetTest.java RENAME testSpreadsheet_setB2_1_getA1_return1()=>void testSpreadsheet_setB2_n1_getA1_return1() METHOD +RefactoringAction 1476271913019 SpreadsheetTest.java RENAME testSpreadsheet_setB2_n1_getA1_return1()=>void testSpreadsheet_setB2_neg3_getA1_return1() METHOD +RefactoringAction 1476271916033 SpreadsheetTest.java RENAME testSpreadsheet_setB2_neg3_getA1_return1()=>void testSpreadsheet_setB2_neg3_get_return1() METHOD +RefactoringAction 1476271917547 SpreadsheetTest.java RENAME testSpreadsheet_setB2_neg3_get_return1()=>void testSpreadsheet_setB2_neg3_getB2_return1() METHOD +RefactoringAction 1476271919563 SpreadsheetTest.java RENAME testSpreadsheet_setB2_neg3_getB2_return1()=>void testSpreadsheet_setB2_neg3_getB2_return() METHOD +RefactoringAction 1476271921078 SpreadsheetTest.java RENAME testSpreadsheet_setB2_neg3_getB2_return()=>void testSpreadsheet_setB2_neg3_getB2_returnneg3() METHOD +EditAction 1476271943353 SpreadsheetTest.java 448 2 6 2 diff --git a/.besouro/20161012142150776/besouroEpisodes.txt b/.besouro/20161012142150776/besouroEpisodes.txt index e69de29..d20de36 100644 --- a/.besouro/20161012142150776/besouroEpisodes.txt +++ b/.besouro/20161012142150776/besouroEpisodes.txt @@ -0,0 +1,2 @@ +1476271678563 test-addition 2 367 true +1476271678564 test-addition 1 367 true diff --git a/.besouro/20161012142150776/randomHeuristicEpisodes.txt b/.besouro/20161012142150776/randomHeuristicEpisodes.txt index e69de29..86ed60d 100644 --- a/.besouro/20161012142150776/randomHeuristicEpisodes.txt +++ b/.besouro/20161012142150776/randomHeuristicEpisodes.txt @@ -0,0 +1 @@ +1476271678563 test-addition 2 367 false diff --git a/.besouro/20161012142150776/zorroEpisodes.txt b/.besouro/20161012142150776/zorroEpisodes.txt index e69de29..86ed60d 100644 --- a/.besouro/20161012142150776/zorroEpisodes.txt +++ b/.besouro/20161012142150776/zorroEpisodes.txt @@ -0,0 +1 @@ +1476271678563 test-addition 2 367 false diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 92b411f05752a6cee6d06c9769e1b70d40aa0840..c3dc56cfb020eeabe8268f4e521dfedf7fdc0ab9 100644 GIT binary patch literal 975 zcmZ{i&2G~`6otP< zcaDaqY7`2r#k&I4Uc48Dp5J*V=UstP-y2V57zIk;`Q_b%WEq3{Vc<>2-POn;8N~x{ z>V<~_g=T9YV7{K6C>sU14oa{sR0ZnGbKlCvglF5Rz%4h91;=ve z)2Gp!jif)2fv4AL&=|}A9y3!LFa%%TyQ7}?(Jl*YDuAxu0Iv(+L3jERpe|#eTTbvnKhsimgmSdTb zSIp8mwe~rj_77A(o}=~+^)GSuHI9{-W3sM@D#z=LIY|v}V1p~c*5Ar_22WvC`zz{u z7r1TU7an|O#DJ!06YzXZ*+?=|iau#G_7>Q}cFH^A>G~dS%-g@f;{rY`83~m&?MX-ww1}g;7ZFH;;LXHCun3eBNJ@vD(w9QNLa*R delta 324 zcmX@l{*;C5)W2Q(7#J8#7$hcgX-=Fd!N@uBLeb=Tj6Rc1nQZDA7+4q>8CV(EfFwIm znLdza1k$Wp+Zi}E0vSvUTtE^e4PtWxNgjv-Ak7QpF*5Km@B>MZW-}no1X9Pi0YoC{ zWCQCIgUCX4f>hKCFbD!QF)|1-2ty6A2Wn*oVn%e^xxr>AKqTR2Ffu@l0J%g2Xc!Za V7A3+({9w}*F`Wc+kr>zu;sB~C6f^(; diff --git a/tests/SpreadsheetTest.java b/tests/SpreadsheetTest.java index 87af968..6f61f78 100644 --- a/tests/SpreadsheetTest.java +++ b/tests/SpreadsheetTest.java @@ -1,19 +1,29 @@ import static org.junit.Assert.*; - import org.junit.Test; - public class SpreadsheetTest { @Test public void testSpreadsheet_setA1_1_getA1_return1() { - + Spreadsheet sheet = new Spreadsheet(); sheet.set("A1", "1"); - + assertEquals(sheet.get("A1"), "1"); - + } + + @Test + public void testSpreadsheet_setB2_neg3_getB2_returnneg3() { + + Spreadsheet sheet = new Spreadsheet(); + sheet.set("B2", "-3"); + + assertEquals(sheet.get("B2"), "-3"); + + } + + } From 37628214658229d2281922cf6ca1bbf3eaf34340 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 14:33:52 +0300 Subject: [PATCH 04/44] besouro automatic message --- .besouro/20161012142150776/actions.txt | 4 ++++ .besouro/20161012142150776/besouroEpisodes.txt | 3 +++ .../randomHeuristicEpisodes.txt | 1 + .besouro/20161012142150776/zorroEpisodes.txt | 1 + bin/SpreadsheetTest.class | Bin 740 -> 920 bytes tests/SpreadsheetTest.java | 7 +++---- 6 files changed, 12 insertions(+), 4 deletions(-) diff --git a/.besouro/20161012142150776/actions.txt b/.besouro/20161012142150776/actions.txt index da3d630..65f7bc3 100644 --- a/.besouro/20161012142150776/actions.txt +++ b/.besouro/20161012142150776/actions.txt @@ -30,3 +30,7 @@ RefactoringAction 1476271917547 SpreadsheetTest.java RENAME testSpreadsheet_setB RefactoringAction 1476271919563 SpreadsheetTest.java RENAME testSpreadsheet_setB2_neg3_getB2_return1()=>void testSpreadsheet_setB2_neg3_getB2_return() METHOD RefactoringAction 1476271921078 SpreadsheetTest.java RENAME testSpreadsheet_setB2_neg3_getB2_return()=>void testSpreadsheet_setB2_neg3_getB2_returnneg3() METHOD EditAction 1476271943353 SpreadsheetTest.java 448 2 6 2 +UnitTestCaseAction 1476271950605 SpreadsheetTest.java OK +UnitTestSessionAction 1476271950606 SpreadsheetTest.java OK +RefactoringAction 1476272009695 SpreadsheetTest.java ADD Spreadsheet sheet FIELD +EditAction 1476272032065 SpreadsheetTest.java 408 2 4 2 diff --git a/.besouro/20161012142150776/besouroEpisodes.txt b/.besouro/20161012142150776/besouroEpisodes.txt index d20de36..a3c531c 100644 --- a/.besouro/20161012142150776/besouroEpisodes.txt +++ b/.besouro/20161012142150776/besouroEpisodes.txt @@ -1,2 +1,5 @@ 1476271678563 test-addition 2 367 true 1476271678564 test-addition 1 367 true +1476271950606 test-addition 1 233 true +1476271950607 test-addition 1 233 true +1476271950608 test-addition 1 233 true diff --git a/.besouro/20161012142150776/randomHeuristicEpisodes.txt b/.besouro/20161012142150776/randomHeuristicEpisodes.txt index 86ed60d..8385b1c 100644 --- a/.besouro/20161012142150776/randomHeuristicEpisodes.txt +++ b/.besouro/20161012142150776/randomHeuristicEpisodes.txt @@ -1 +1,2 @@ 1476271678563 test-addition 2 367 false +1476271950606 test-addition 1 233 false diff --git a/.besouro/20161012142150776/zorroEpisodes.txt b/.besouro/20161012142150776/zorroEpisodes.txt index 86ed60d..8435f50 100644 --- a/.besouro/20161012142150776/zorroEpisodes.txt +++ b/.besouro/20161012142150776/zorroEpisodes.txt @@ -1 +1,2 @@ 1476271678563 test-addition 2 367 false +1476271950606 test-addition 1 272 false diff --git a/bin/SpreadsheetTest.class b/bin/SpreadsheetTest.class index efbc74afa250f2cb2f6d5159e4d166d1933ca4fd..6252876a4450ff774c1bfe81ce40ef0af9831a04 100644 GIT binary patch delta 177 zcmaFDI)k0-)W2Q(7#J8#81y%Cy=S!1E=ese2`(r~O-w1yNKGw?FHS9SGK$YjO*f8D z2Q!OOOG=CKKmr^LT8s=#PDUIIIzU?2c=C5feMaWV>P%XUtdoP7;(56kI2gDY1Q>W3 zq#5`p?_*M&oXMoFrzxbpjX^?NNOK#5jF9#Y28E44`56Y7+%&69;OO N1ZtCK*9EK40{}ilCkOxl delta 59 zcmbQi{)Cn5)W2Q(7#J8#7_>HWy=RP4tx>=F#) diff --git a/tests/SpreadsheetTest.java b/tests/SpreadsheetTest.java index 6f61f78..c908c44 100644 --- a/tests/SpreadsheetTest.java +++ b/tests/SpreadsheetTest.java @@ -3,11 +3,11 @@ import org.junit.Test; public class SpreadsheetTest { + + Spreadsheet sheet = new Spreadsheet(); @Test public void testSpreadsheet_setA1_1_getA1_return1() { - - Spreadsheet sheet = new Spreadsheet(); sheet.set("A1", "1"); assertEquals(sheet.get("A1"), "1"); @@ -16,14 +16,13 @@ public void testSpreadsheet_setA1_1_getA1_return1() { @Test public void testSpreadsheet_setB2_neg3_getB2_returnneg3() { - - Spreadsheet sheet = new Spreadsheet(); sheet.set("B2", "-3"); assertEquals(sheet.get("B2"), "-3"); } + } From f1247fbe6ddfe0b0eac77ee39b274abf24321ced Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 14:36:20 +0300 Subject: [PATCH 05/44] besouro automatic message --- .besouro/20161012142150776/actions.txt | 11 +++++++++++ .besouro/20161012142150776/besouroEpisodes.txt | 3 +++ .../randomHeuristicEpisodes.txt | 1 + .besouro/20161012142150776/zorroEpisodes.txt | 1 + bin/SpreadsheetTest.class | Bin 920 -> 925 bytes tests/SpreadsheetTest.java | 10 ++++++++-- 6 files changed, 24 insertions(+), 2 deletions(-) diff --git a/.besouro/20161012142150776/actions.txt b/.besouro/20161012142150776/actions.txt index 65f7bc3..e62cc19 100644 --- a/.besouro/20161012142150776/actions.txt +++ b/.besouro/20161012142150776/actions.txt @@ -34,3 +34,14 @@ UnitTestCaseAction 1476271950605 SpreadsheetTest.java OK UnitTestSessionAction 1476271950606 SpreadsheetTest.java OK RefactoringAction 1476272009695 SpreadsheetTest.java ADD Spreadsheet sheet FIELD EditAction 1476272032065 SpreadsheetTest.java 408 2 4 2 +UnitTestCaseAction 1476272034215 SpreadsheetTest.java OK +UnitTestSessionAction 1476272034216 SpreadsheetTest.java OK +RefactoringAction 1476272056337 SpreadsheetTest.java ADD void test FIELD +RefactoringAction 1476272063353 SpreadsheetTest.java RENAME test=>void testSpreadsheet_setB2_neg3_getB2_returnneg3()/2 METHOD +RefactoringAction 1476272077382 SpreadsheetTest.java RENAME testSpreadsheet_setB2_neg3_getB2_returnneg3()/2=>void testSpreadsheet_setB2_2A_getB2_returnneg3() METHOD +RefactoringAction 1476272084395 SpreadsheetTest.java RENAME testSpreadsheet_setB2_2A_getB2_returnneg3()=>void testSpreadsheet_setB2_2A_getB2_returnError() METHOD +RefactoringAction 1476272087410 SpreadsheetTest.java RENAME testSpreadsheet_setB2_2A_getB2_returnError()=>void testSpreadsheet_setB2_2A_getB2_return_Error() METHOD +RefactoringAction 1476272100926 SpreadsheetTest.java RENAME testSpreadsheet_setB2_neg3_getB2_returnneg3()=>void testSpreadsheetNegative_setB2_neg3_getB2_returnneg3() METHOD +RefactoringAction 1476272103440 SpreadsheetTest.java RENAME testSpreadsheetNegative_setB2_neg3_getB2_returnneg3()=>void testSpreadsheetNegativeInt_setB2_neg3_getB2_returnneg3() METHOD +RefactoringAction 1476272109456 SpreadsheetTest.java RENAME testSpreadsheet_setB2_2A_getB2_return_Error()=>void testSpreadsheetInvalidInt_setB2_2A_getB2_return_Error() METHOD +EditAction 1476272179612 SpreadsheetTest.java 573 3 6 3 diff --git a/.besouro/20161012142150776/besouroEpisodes.txt b/.besouro/20161012142150776/besouroEpisodes.txt index a3c531c..beefc32 100644 --- a/.besouro/20161012142150776/besouroEpisodes.txt +++ b/.besouro/20161012142150776/besouroEpisodes.txt @@ -3,3 +3,6 @@ 1476271950606 test-addition 1 233 true 1476271950607 test-addition 1 233 true 1476271950608 test-addition 1 233 true +1476272034216 refactoring 1A 24 true +1476272034217 refactoring 3 24 true +1476272034218 refactoring 3 24 true diff --git a/.besouro/20161012142150776/randomHeuristicEpisodes.txt b/.besouro/20161012142150776/randomHeuristicEpisodes.txt index 8385b1c..faa42cd 100644 --- a/.besouro/20161012142150776/randomHeuristicEpisodes.txt +++ b/.besouro/20161012142150776/randomHeuristicEpisodes.txt @@ -1,2 +1,3 @@ 1476271678563 test-addition 2 367 false 1476271950606 test-addition 1 233 false +1476272034216 refactoring 1A 24 true diff --git a/.besouro/20161012142150776/zorroEpisodes.txt b/.besouro/20161012142150776/zorroEpisodes.txt index 8435f50..92ef3b4 100644 --- a/.besouro/20161012142150776/zorroEpisodes.txt +++ b/.besouro/20161012142150776/zorroEpisodes.txt @@ -1,2 +1,3 @@ 1476271678563 test-addition 2 367 false 1476271950606 test-addition 1 272 false +1476272034216 refactoring 1A 83 false diff --git a/bin/SpreadsheetTest.class b/bin/SpreadsheetTest.class index 6252876a4450ff774c1bfe81ce40ef0af9831a04..08d1868529861531686142129edf1435bad4fede 100644 GIT binary patch delta 487 zcmaiv%TB^z5QWbaq^142SVW)--W7^aif)X?1l+nXF~PVrp;26j0bKJ8q#HN7bZ>%S zH1Pp^3m?OcaZ0>IW8!9JPUb)7oBvY2lGW$8hbI8*uzPC3eWBz=V5@P~=xh^w*<6j_ z-)Ytz6+UPJG87phg0_F&a*pcl6UXVO5YU1kM0 delta 464 zcma)$J5K^p5QWcNguN__!gX0d@cjftWMg5ZFj|vXSee+ENMdQ!#>&=qvyF}Z25G=( zVr~3U#If5$$Mlx>%p)`_d pxLCtFrGkzBYHOwuYip6V5o>>}yRp_KxIk@@+VUUTCeKjV`UWByG%o-E diff --git a/tests/SpreadsheetTest.java b/tests/SpreadsheetTest.java index c908c44..a114051 100644 --- a/tests/SpreadsheetTest.java +++ b/tests/SpreadsheetTest.java @@ -15,14 +15,20 @@ public void testSpreadsheet_setA1_1_getA1_return1() { } @Test - public void testSpreadsheet_setB2_neg3_getB2_returnneg3() { + public void testSpreadsheetNegativeInt_setB2_neg3_getB2_returnneg3() { sheet.set("B2", "-3"); assertEquals(sheet.get("B2"), "-3"); } - + @Test + public void testSpreadsheetInvalidInt_setB2_2A_getB2_return_Error(){ + sheet.set("C3", "2A"); + + assertEquals(sheet.get("C3"), "#ERROR"); + + } } From d277dcce4084b65e160e4ab538f7f6ca0ee63fd8 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 14:38:41 +0300 Subject: [PATCH 06/44] besouro automatic message --- .besouro/20161012142150776/actions.txt | 5 +++++ bin/SpreadsheetTest.class | Bin 925 -> 1122 bytes src/Spreadsheet.java | 6 +++--- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.besouro/20161012142150776/actions.txt b/.besouro/20161012142150776/actions.txt index e62cc19..97fc49a 100644 --- a/.besouro/20161012142150776/actions.txt +++ b/.besouro/20161012142150776/actions.txt @@ -45,3 +45,8 @@ RefactoringAction 1476272100926 SpreadsheetTest.java RENAME testSpreadsheet_setB RefactoringAction 1476272103440 SpreadsheetTest.java RENAME testSpreadsheetNegative_setB2_neg3_getB2_returnneg3()=>void testSpreadsheetNegativeInt_setB2_neg3_getB2_returnneg3() METHOD RefactoringAction 1476272109456 SpreadsheetTest.java RENAME testSpreadsheet_setB2_2A_getB2_return_Error()=>void testSpreadsheetInvalidInt_setB2_2A_getB2_return_Error() METHOD EditAction 1476272179612 SpreadsheetTest.java 573 3 6 3 +UnitTestCaseAction 1476272185518 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476272185519 SpreadsheetTest.java FAIL +RefactoringAction 1476272202946 Spreadsheet.java REMOVE sheet FIELD +RefactoringAction 1476272205971 Spreadsheet.java ADD Map sheet FIELD +EditAction 1476272321183 Spreadsheet.java 381 3 3 0 diff --git a/bin/SpreadsheetTest.class b/bin/SpreadsheetTest.class index 08d1868529861531686142129edf1435bad4fede..05b930eeecf4a67fce2d93ee2d1cb6a4ced45ca8 100644 GIT binary patch delta 206 zcmbQs{)mI?)W2Q(7#J8#7%Vn&{bZCfD@iRb2`(r~O-w1yNKGyAOHEHK$t+9t%$qF4 zq#tC8CheJ5mY9>7;+a sheet = new HashMap<>(); + Map sheet = new HashMap<>(); public String get(String cell) { - return sheet.get(cell); + return sheet.get(cell).toString(); } public void set(String cell, String value) { - sheet.put(cell, value); + sheet.put(cell, Integer.parseInt(value)); } public String evaluate(String cell) { From 9da18893623dfbc9c5f9c1fb5b76f847aa09b7e0 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 14:40:48 +0300 Subject: [PATCH 07/44] besouro automatic message --- .besouro/20161012142150776/actions.txt | 5 +++++ bin/Spreadsheet.class | Bin 975 -> 1120 bytes src/Spreadsheet.java | 6 +++--- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.besouro/20161012142150776/actions.txt b/.besouro/20161012142150776/actions.txt index 97fc49a..0e40c58 100644 --- a/.besouro/20161012142150776/actions.txt +++ b/.besouro/20161012142150776/actions.txt @@ -50,3 +50,8 @@ UnitTestSessionAction 1476272185519 SpreadsheetTest.java FAIL RefactoringAction 1476272202946 Spreadsheet.java REMOVE sheet FIELD RefactoringAction 1476272205971 Spreadsheet.java ADD Map sheet FIELD EditAction 1476272321183 Spreadsheet.java 381 3 3 0 +UnitTestCaseAction 1476272327414 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476272327415 SpreadsheetTest.java FAIL +RefactoringAction 1476272414546 Spreadsheet.java ADD NumberFormatException ex FIELD +RefactoringAction 1476272416563 Spreadsheet.java REMOVE ex FIELD +EditAction 1476272447894 Spreadsheet.java 351 3 3 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index c3dc56cfb020eeabe8268f4e521dfedf7fdc0ab9..c9f154cbe1aa3dcb470de9e78111a1c31dd43eb6 100644 GIT binary patch delta 429 zcmZXROH0E*6ot=Cz|=HaVjrN3QXkdyVdJwF3hrD43R#E}31d9S*k$pn$flUEP))^4%EK;nQFpMRb yV`yWPC)g5kI$}G7$^mGuf(6V6847_0TbapbRFf)X21PVZm u;{qGO%fJKF3^Gzx0iqgiCNI=Xpa~2bK+~Ck=4wtBW3lFk*`) sheet = new HashMap<>(); + Map sheet = new HashMap<>(); public String get(String cell) { - return sheet.get(cell).toString(); + return sheet.get(cell); } public void set(String cell, String value) { - sheet.put(cell, Integer.parseInt(value)); + sheet.put(cell, value); } public String evaluate(String cell) { From e6e1380fd8068741cb5cee85cba9ac15c4a52f15 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 14:41:36 +0300 Subject: [PATCH 08/44] besouro automatic message --- .besouro/20161012142150776/actions.txt | 2 ++ bin/Spreadsheet.class | Bin 1120 -> 975 bytes tests/SpreadsheetTest.java | 4 ++-- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.besouro/20161012142150776/actions.txt b/.besouro/20161012142150776/actions.txt index 0e40c58..a766c52 100644 --- a/.besouro/20161012142150776/actions.txt +++ b/.besouro/20161012142150776/actions.txt @@ -55,3 +55,5 @@ UnitTestSessionAction 1476272327415 SpreadsheetTest.java FAIL RefactoringAction 1476272414546 Spreadsheet.java ADD NumberFormatException ex FIELD RefactoringAction 1476272416563 Spreadsheet.java REMOVE ex FIELD EditAction 1476272447894 Spreadsheet.java 351 3 3 0 +RefactoringAction 1476272484291 SpreadsheetTest.java RENAME testSpreadsheetInvalidInt_setB2_2A_getB2_return_Error()=>void testSpreadsheetInvalidInt_setB2_2A_evaluateB2_return_Error() METHOD +EditAction 1476272496122 SpreadsheetTest.java 583 3 6 3 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index c9f154cbe1aa3dcb470de9e78111a1c31dd43eb6..c3dc56cfb020eeabe8268f4e521dfedf7fdc0ab9 100644 GIT binary patch delta 253 zcmaFBah{#))W2Q(7#J8#7<49b`7@eMjMACR&&0m4k5Nz{E3qt5KPNFST|c;_C^Ij8 z@)<@SE^Y=X22~ygH3s#`HB4{oofw#akb!|uYYT&*_D%*#CWZqHavOjmObo(6l8u28 zNOCfW07)^3N(NCN3k3KW6c`kN@{9~h49Y-~8z|<_zzl>847_0TbapbRFf)X21PVZm u;{qGO%fJKF3^Gzx0iqgiCNI=Xpa~2bK+~Ck=4wtBW3lFk*`)}31d9S*k$pn$flUEP))^4%EK;nQFpMRb yV`yWPC)g5kI$}G7$^mGuf(6V6 Date: Wed, 12 Oct 2016 14:44:12 +0300 Subject: [PATCH 09/44] besouro automatic message --- .besouro/20161012142150776/actions.txt | 3 +++ bin/SpreadsheetTest.class | Bin 1122 -> 1148 bytes src/Spreadsheet.java | 9 +++++++-- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/.besouro/20161012142150776/actions.txt b/.besouro/20161012142150776/actions.txt index a766c52..e6ab904 100644 --- a/.besouro/20161012142150776/actions.txt +++ b/.besouro/20161012142150776/actions.txt @@ -57,3 +57,6 @@ RefactoringAction 1476272416563 Spreadsheet.java REMOVE ex FIELD EditAction 1476272447894 Spreadsheet.java 351 3 3 0 RefactoringAction 1476272484291 SpreadsheetTest.java RENAME testSpreadsheetInvalidInt_setB2_2A_getB2_return_Error()=>void testSpreadsheetInvalidInt_setB2_2A_evaluateB2_return_Error() METHOD EditAction 1476272496122 SpreadsheetTest.java 583 3 6 3 +UnitTestCaseAction 1476272502142 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476272502142 SpreadsheetTest.java FAIL +EditAction 1476272651965 Spreadsheet.java 460 3 3 0 diff --git a/bin/SpreadsheetTest.class b/bin/SpreadsheetTest.class index 05b930eeecf4a67fce2d93ee2d1cb6a4ced45ca8..05e585c186f0057d0d235d46a04bbb45f8cd01ce 100644 GIT binary patch delta 110 zcmaFF@rQ%!)W2Q(7#J8#7_2vPIWaL>P4;C{wofff%qdMQNp&)cFG?*bEy{~`Eh@?{ z;$SdjWMFbO=3p=e(ngM43_J{`JPc+G%8U#gFg+X$7MrIsO=4s=5i*~w#bU^A2{fLG G!3qG=wi?#} delta 58 zcmeyv@rZ-#)W2Q(7#J8#7%Vn&IWaMsPWEL|W=>BnnOwmn&& Date: Wed, 12 Oct 2016 14:44:24 +0300 Subject: [PATCH 10/44] besouro automatic message --- .besouro/20161012142150776/actions.txt | 1 + bin/Spreadsheet.class | Bin 975 -> 1224 bytes src/Spreadsheet.java | 17 ++++++++--------- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.besouro/20161012142150776/actions.txt b/.besouro/20161012142150776/actions.txt index e6ab904..0756b41 100644 --- a/.besouro/20161012142150776/actions.txt +++ b/.besouro/20161012142150776/actions.txt @@ -60,3 +60,4 @@ EditAction 1476272496122 SpreadsheetTest.java 583 3 6 3 UnitTestCaseAction 1476272502142 SpreadsheetTest.java FAIL UnitTestSessionAction 1476272502142 SpreadsheetTest.java FAIL EditAction 1476272651965 Spreadsheet.java 460 3 3 0 +EditAction 1476272663988 Spreadsheet.java 445 3 3 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index c3dc56cfb020eeabe8268f4e521dfedf7fdc0ab9..a80ffbd777437c00d4d4e7200974a29e3172532a 100644 GIT binary patch delta 341 zcmZvX%}WAN6vfYdg=0f5#xiK*ByLK}>BGJd+L;JiFa|B-DUZRgad2o(B|HIew=$Q_tSb`vOm6FUI7$wdT*bJiH$sVENl~;jvPs^C&R$2hDHTS zFQWjD5Rat3Rm=#f&Dz}6FuENErLAfldxTiF?E9C#g#&^+H(d<-O{LEVx-U(6+)|Ng z4?==aV?w6ZDg562*H|JX8b-Fdbs1gBX78aQDm1x+zykk}%{{`&KVx0s4e2N3uK$2( zJ-Istu`vx7`@FKka}tZQ>acRLiVdW=g8M9z)fy`fXOiLVA6~>EpFCn31KlJn4kH}1 H6gc??1`bIR delta 90 zcmX@Xd7ho?)W2Q(7#J8#7<4vr*)eVY#^lE6XvV sheet = new HashMap<>(); public String get(String cell) { return sheet.get(cell); } - + public void set(String cell, String value) { sheet.put(cell, value); } - + public String evaluate(String cell) { - try{ - int intvalue= Integer.parseInt(sheet.get(cell)); - - return sheet.get(cell); - }catch(NumberFormatException ex){ + try { + Integer.parseInt(sheet.get(cell)); + return sheet.get(cell); + } catch (NumberFormatException ex) { return "#ERROR"; } } - + } From 40f961e0fc646bd669e7bb80c159d58b61e5334a Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 14:45:17 +0300 Subject: [PATCH 11/44] besouro automatic message --- .besouro/20161012142150776/actions.txt | 8 ++++++++ .besouro/20161012142150776/besouroEpisodes.txt | 9 +++++++++ .besouro/20161012142150776/randomHeuristicEpisodes.txt | 1 + .besouro/20161012142150776/zorroEpisodes.txt | 7 ++++--- tests/SpreadsheetTest.java | 8 ++++++++ 5 files changed, 30 insertions(+), 3 deletions(-) diff --git a/.besouro/20161012142150776/actions.txt b/.besouro/20161012142150776/actions.txt index 0756b41..a24ee6f 100644 --- a/.besouro/20161012142150776/actions.txt +++ b/.besouro/20161012142150776/actions.txt @@ -61,3 +61,11 @@ UnitTestCaseAction 1476272502142 SpreadsheetTest.java FAIL UnitTestSessionAction 1476272502142 SpreadsheetTest.java FAIL EditAction 1476272651965 Spreadsheet.java 460 3 3 0 EditAction 1476272663988 Spreadsheet.java 445 3 3 0 +UnitTestCaseAction 1476272669238 SpreadsheetTest.java OK +UnitTestSessionAction 1476272669239 SpreadsheetTest.java OK +RefactoringAction 1476272681372 SpreadsheetTest.java ADD void testSpreadsheetNegativeInt_setB2_neg3_getB2_returnneg3()/2 METHOD +RefactoringAction 1476272687388 SpreadsheetTest.java RENAME testSpreadsheetNegativeInt_setB2_neg3_getB2_returnneg3()/2=>void testSpreadsheetEvaluInt_setB2_neg3_getB2_returnneg3() METHOD +RefactoringAction 1476272688902 SpreadsheetTest.java RENAME testSpreadsheetEvaluInt_setB2_neg3_getB2_returnneg3()=>void testSpreadsheetEvaluateInt_setB2_neg3_getB2_returnneg3() METHOD +RefactoringAction 1476272697415 SpreadsheetTest.java RENAME testSpreadsheetEvaluateInt_setB2_neg3_getB2_returnneg3()=>void testSpreadsheetEvaluateNegInt_setB2_neg3_getB2_returnneg3() METHOD +RefactoringAction 1476272705928 SpreadsheetTest.java RENAME testSpreadsheetEvaluateNegInt_setB2_neg3_getB2_returnneg3()=>void testSpreadsheetEvaluateNegInt_setB2_neg3_evaluateB2_returnneg3() METHOD +EditAction 1476272716910 SpreadsheetTest.java 746 4 8 4 diff --git a/.besouro/20161012142150776/besouroEpisodes.txt b/.besouro/20161012142150776/besouroEpisodes.txt index beefc32..23a7018 100644 --- a/.besouro/20161012142150776/besouroEpisodes.txt +++ b/.besouro/20161012142150776/besouroEpisodes.txt @@ -6,3 +6,12 @@ 1476272034216 refactoring 1A 24 true 1476272034217 refactoring 3 24 true 1476272034218 refactoring 3 24 true +1476272669239 test-first 3 612 true +1476272669240 test-first 3 612 true +1476272669241 test-first 3 612 true +1476272669242 test-first 3 612 true +1476272669243 test-first 3 612 true +1476272669244 test-first 3 612 true +1476272669245 test-first 3 612 true +1476272669246 test-first 3 612 true +1476272669247 test-first 3 612 true diff --git a/.besouro/20161012142150776/randomHeuristicEpisodes.txt b/.besouro/20161012142150776/randomHeuristicEpisodes.txt index faa42cd..54f3a88 100644 --- a/.besouro/20161012142150776/randomHeuristicEpisodes.txt +++ b/.besouro/20161012142150776/randomHeuristicEpisodes.txt @@ -1,3 +1,4 @@ 1476271678563 test-addition 2 367 false 1476271950606 test-addition 1 233 false 1476272034216 refactoring 1A 24 true +1476272669239 test-first 3 612 true diff --git a/.besouro/20161012142150776/zorroEpisodes.txt b/.besouro/20161012142150776/zorroEpisodes.txt index 92ef3b4..7ce6d38 100644 --- a/.besouro/20161012142150776/zorroEpisodes.txt +++ b/.besouro/20161012142150776/zorroEpisodes.txt @@ -1,3 +1,4 @@ -1476271678563 test-addition 2 367 false -1476271950606 test-addition 1 272 false -1476272034216 refactoring 1A 83 false +1476271678563 test-addition 2 367 true +1476271950606 test-addition 1 272 true +1476272034216 refactoring 1A 83 true +1476272669239 test-first 3 635 true diff --git a/tests/SpreadsheetTest.java b/tests/SpreadsheetTest.java index 40a6edc..0cfe51f 100644 --- a/tests/SpreadsheetTest.java +++ b/tests/SpreadsheetTest.java @@ -29,6 +29,14 @@ public void testSpreadsheetInvalidInt_setB2_2A_evaluateB2_return_Error(){ assertEquals(sheet.evaluate("C3"), "#ERROR"); } + + @Test + public void testSpreadsheetEvaluateNegInt_setB2_neg3_evaluateB2_returnneg3() { + sheet.set("B2", "-3"); + + assertEquals(sheet.evaluate("B2"), "-3"); + + } } From da1a4c7c54e5391f28da220d1147cb57b69ac266 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 14:45:31 +0300 Subject: [PATCH 12/44] besouro automatic message --- .besouro/20161012142150776/actions.txt | 5 +++++ .../20161012142150776/besouroEpisodes.txt | 2 ++ .../randomHeuristicEpisodes.txt | 1 + .besouro/20161012142150776/zorroEpisodes.txt | 1 + bin/SpreadsheetTest.class | Bin 1148 -> 1315 bytes tests/SpreadsheetTest.java | 14 ++++++++------ 6 files changed, 17 insertions(+), 6 deletions(-) diff --git a/.besouro/20161012142150776/actions.txt b/.besouro/20161012142150776/actions.txt index a24ee6f..5ecae1f 100644 --- a/.besouro/20161012142150776/actions.txt +++ b/.besouro/20161012142150776/actions.txt @@ -69,3 +69,8 @@ RefactoringAction 1476272688902 SpreadsheetTest.java RENAME testSpreadsheetEvalu RefactoringAction 1476272697415 SpreadsheetTest.java RENAME testSpreadsheetEvaluateInt_setB2_neg3_getB2_returnneg3()=>void testSpreadsheetEvaluateNegInt_setB2_neg3_getB2_returnneg3() METHOD RefactoringAction 1476272705928 SpreadsheetTest.java RENAME testSpreadsheetEvaluateNegInt_setB2_neg3_getB2_returnneg3()=>void testSpreadsheetEvaluateNegInt_setB2_neg3_evaluateB2_returnneg3() METHOD EditAction 1476272716910 SpreadsheetTest.java 746 4 8 4 +UnitTestCaseAction 1476272722601 SpreadsheetTest.java OK +UnitTestSessionAction 1476272722602 SpreadsheetTest.java OK +RefactoringAction 1476272726962 SpreadsheetTest.java REMOVE testSpreadsheetEvaluateNegInt_setB2_neg3_evaluateB2_returnneg3() METHOD +RefactoringAction 1476272729983 SpreadsheetTest.java ADD void testSpreadsheetEvaluateNegInt_setB2_neg3_evaluateB2_returnneg3() METHOD +EditAction 1476272731266 SpreadsheetTest.java 749 4 8 4 diff --git a/.besouro/20161012142150776/besouroEpisodes.txt b/.besouro/20161012142150776/besouroEpisodes.txt index 23a7018..cff53bb 100644 --- a/.besouro/20161012142150776/besouroEpisodes.txt +++ b/.besouro/20161012142150776/besouroEpisodes.txt @@ -15,3 +15,5 @@ 1476272669245 test-first 3 612 true 1476272669246 test-first 3 612 true 1476272669247 test-first 3 612 true +1476272722602 test-addition 1 41 true +1476272722603 test-addition 1 41 true diff --git a/.besouro/20161012142150776/randomHeuristicEpisodes.txt b/.besouro/20161012142150776/randomHeuristicEpisodes.txt index 54f3a88..f5d863c 100644 --- a/.besouro/20161012142150776/randomHeuristicEpisodes.txt +++ b/.besouro/20161012142150776/randomHeuristicEpisodes.txt @@ -2,3 +2,4 @@ 1476271950606 test-addition 1 233 false 1476272034216 refactoring 1A 24 true 1476272669239 test-first 3 612 true +1476272722602 test-addition 1 41 true diff --git a/.besouro/20161012142150776/zorroEpisodes.txt b/.besouro/20161012142150776/zorroEpisodes.txt index 7ce6d38..55ad29c 100644 --- a/.besouro/20161012142150776/zorroEpisodes.txt +++ b/.besouro/20161012142150776/zorroEpisodes.txt @@ -2,3 +2,4 @@ 1476271950606 test-addition 1 272 true 1476272034216 refactoring 1A 83 true 1476272669239 test-first 3 635 true +1476272722602 test-addition 1 53 true diff --git a/bin/SpreadsheetTest.class b/bin/SpreadsheetTest.class index 05e585c186f0057d0d235d46a04bbb45f8cd01ce..8652736d2d62a869795ee9487cbd34b0c0216f70 100644 GIT binary patch delta 146 zcmeyvv6zeN)W2Q(7#J8#7;H9jZD6vuD@iRb2`(r~O-w1yNKGwqElbQPO)N?EOHKF8 zD~T^oEpal6&r3}=j!%Wk0Qp6!C8b4qAkoP?n9LbjH-BJiXPhj^qBQv|GoQSPknRo! km5o44m>2|sBp(AakW^;iW>962WKf@+z#__S1(vl20Hj(e-2eap delta 36 scmZ3?^@oG&)W2Q(7#J8#7_2vPZD5-Go5_@sWwRl3J0mLt0~3Q40PVaAQUCw| diff --git a/tests/SpreadsheetTest.java b/tests/SpreadsheetTest.java index 0cfe51f..3f1c4de 100644 --- a/tests/SpreadsheetTest.java +++ b/tests/SpreadsheetTest.java @@ -21,6 +21,14 @@ public void testSpreadsheetNegativeInt_setB2_neg3_getB2_returnneg3() { assertEquals(sheet.get("B2"), "-3"); } + + @Test + public void testSpreadsheetEvaluateNegInt_setB2_neg3_evaluateB2_returnneg3() { + sheet.set("B2", "-3"); + + assertEquals(sheet.evaluate("B2"), "-3"); + + } @Test public void testSpreadsheetInvalidInt_setB2_2A_evaluateB2_return_Error(){ @@ -30,13 +38,7 @@ public void testSpreadsheetInvalidInt_setB2_2A_evaluateB2_return_Error(){ } - @Test - public void testSpreadsheetEvaluateNegInt_setB2_neg3_evaluateB2_returnneg3() { - sheet.set("B2", "-3"); - assertEquals(sheet.evaluate("B2"), "-3"); - - } } From c82a615eb5c135fec1be3b1bda8aa359b339c598 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 14:47:36 +0300 Subject: [PATCH 13/44] besouro automatic message --- .besouro/20161012142150776/actions.txt | 8 ++++++++ bin/SpreadsheetTest.class | Bin 1315 -> 1315 bytes tests/SpreadsheetTest.java | 8 ++++++++ 3 files changed, 16 insertions(+) diff --git a/.besouro/20161012142150776/actions.txt b/.besouro/20161012142150776/actions.txt index 5ecae1f..5059daa 100644 --- a/.besouro/20161012142150776/actions.txt +++ b/.besouro/20161012142150776/actions.txt @@ -74,3 +74,11 @@ UnitTestSessionAction 1476272722602 SpreadsheetTest.java OK RefactoringAction 1476272726962 SpreadsheetTest.java REMOVE testSpreadsheetEvaluateNegInt_setB2_neg3_evaluateB2_returnneg3() METHOD RefactoringAction 1476272729983 SpreadsheetTest.java ADD void testSpreadsheetEvaluateNegInt_setB2_neg3_evaluateB2_returnneg3() METHOD EditAction 1476272731266 SpreadsheetTest.java 749 4 8 4 +RefactoringAction 1476272803499 SpreadsheetTest.java ADD void testSpreadsheetInvalidInt_setB2_2A_evaluateB2_return_Error()/2 METHOD +RefactoringAction 1476272810012 SpreadsheetTest.java RENAME testSpreadsheetInvalidInt_setB2_2A_evaluateB2_return_Error()/2=>void testSpreadsheetString_setB2_2A_evaluateB2_return_Error() METHOD +RefactoringAction 1476272814524 SpreadsheetTest.java RENAME testSpreadsheetString_setB2_2A_evaluateB2_return_Error()=>void testSpreadsheetString_setA5_2A_evaluateB2_return_Error() METHOD +RefactoringAction 1476272824543 SpreadsheetTest.java RENAME testSpreadsheetString_setA5_2A_evaluateB2_return_Error()=>void testSpreadsheetString_setA5_hello_evaluateB2_return_Error() METHOD +RefactoringAction 1476272826556 SpreadsheetTest.java RENAME testSpreadsheetString_setA5_hello_evaluateB2_return_Error()=>void testSpreadsheetString_setA5__evaluateB2_return_Error() METHOD +RefactoringAction 1476272829569 SpreadsheetTest.java RENAME testSpreadsheetString_setA5__evaluateB2_return_Error()=>void testSpreadsheetString_setA5_aString_evaluateB2_return_Error() METHOD +RefactoringAction 1476272836081 SpreadsheetTest.java RENAME testSpreadsheetString_setA5_aString_evaluateB2_return_Error()=>void testSpreadsheetString_setA5_aString_evaluateB2_return_aString() METHOD +EditAction 1476272855290 SpreadsheetTest.java 930 5 10 5 diff --git a/bin/SpreadsheetTest.class b/bin/SpreadsheetTest.class index 8652736d2d62a869795ee9487cbd34b0c0216f70..8717bf89fae87efcd145476351bdd3be53ed3bc5 100644 GIT binary patch delta 109 zcmZ3?wU}#z57XpbO!lH&3_J{mJPbw*%8U#gsbz^drHLh}lf9VirA!$an4FC{7|emR zks}9#B_jiyvTIO~f6(TiOx28&`B?av4TN+jx3U;A8cz;nQ5G~2GTX)=qqT*BU&v$| MgMpC6i_@% delta 104 zcmZ3?wU}#z57XpDOt$)lj0{Z9#vBaBK-$QWi-Cv1l!w8LL79<(Beg6sr!=u7m4m^8 zk%3LwH7LkGXtEcR Date: Wed, 12 Oct 2016 14:49:47 +0300 Subject: [PATCH 14/44] besouro automatic message --- .besouro/20161012142150776/actions.txt | 3 +++ bin/SpreadsheetTest.class | Bin 1315 -> 1511 bytes src/Spreadsheet.java | 15 ++++++++++----- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/.besouro/20161012142150776/actions.txt b/.besouro/20161012142150776/actions.txt index 5059daa..4bac79b 100644 --- a/.besouro/20161012142150776/actions.txt +++ b/.besouro/20161012142150776/actions.txt @@ -82,3 +82,6 @@ RefactoringAction 1476272826556 SpreadsheetTest.java RENAME testSpreadsheetStrin RefactoringAction 1476272829569 SpreadsheetTest.java RENAME testSpreadsheetString_setA5__evaluateB2_return_Error()=>void testSpreadsheetString_setA5_aString_evaluateB2_return_Error() METHOD RefactoringAction 1476272836081 SpreadsheetTest.java RENAME testSpreadsheetString_setA5_aString_evaluateB2_return_Error()=>void testSpreadsheetString_setA5_aString_evaluateB2_return_aString() METHOD EditAction 1476272855290 SpreadsheetTest.java 930 5 10 5 +UnitTestCaseAction 1476272861748 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476272861749 SpreadsheetTest.java FAIL +EditAction 1476272987163 Spreadsheet.java 601 3 4 0 diff --git a/bin/SpreadsheetTest.class b/bin/SpreadsheetTest.class index 8717bf89fae87efcd145476351bdd3be53ed3bc5..a8e4bff27932eb6c01a748f99ab1f5171d7a8fca 100644 GIT binary patch delta 185 zcmZ3?^_-jQ)W2Q(7#J8#7#ufpePoKUElDjd2`(r~O-w1yNKGvXE-A{)OOG#3EparB zPlWPP%Mx=+6H8K^jN*$@OG=CKU@{yGHjE5h>WK;vh3Xs(c8m-hFz)1^Oy-Pin+=)Y zGENR+QPMRLvfjoZqqT*BU&v$|gMpCk4hEHtK({b42m(ny24*0s&A`o|%OJ_1KY1aG KD7!sa)&T&qY%{I^ delta 36 scmaFPy_k#Z)W2Q(7#J8#7;H9jePo&($!yBVy1AeEEh8%f0~3Qa0PUa(rvLx| diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 97f123a..c3143f3 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -14,11 +14,16 @@ public void set(String cell, String value) { } public String evaluate(String cell) { - try { - Integer.parseInt(sheet.get(cell)); - return sheet.get(cell); - } catch (NumberFormatException ex) { - return "#ERROR"; + String cellStored = sheet.get(cell); + if (cellStored.startsWith("'")) { + return cellStored.substring(1, cellStored.length() - 2); + } else { + try { + Integer.parseInt(sheet.get(cell)); + return sheet.get(cell); + } catch (NumberFormatException ex) { + return "#ERROR"; + } } } From d2c430abfb345de611689da3ae6de4bd81a8bd91 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 14:50:03 +0300 Subject: [PATCH 15/44] besouro automatic message --- .besouro/20161012142150776/actions.txt | 3 +++ bin/Spreadsheet.class | Bin 1224 -> 1426 bytes src/Spreadsheet.java | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.besouro/20161012142150776/actions.txt b/.besouro/20161012142150776/actions.txt index 4bac79b..c7c2047 100644 --- a/.besouro/20161012142150776/actions.txt +++ b/.besouro/20161012142150776/actions.txt @@ -85,3 +85,6 @@ EditAction 1476272855290 SpreadsheetTest.java 930 5 10 5 UnitTestCaseAction 1476272861748 SpreadsheetTest.java FAIL UnitTestSessionAction 1476272861749 SpreadsheetTest.java FAIL EditAction 1476272987163 Spreadsheet.java 601 3 4 0 +UnitTestCaseAction 1476272993013 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476272993014 SpreadsheetTest.java FAIL +EditAction 1476273002580 Spreadsheet.java 601 3 4 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index a80ffbd777437c00d4d4e7200974a29e3172532a..e45cb64d739c21e256f6bb1678bf04bc0249fb65 100644 GIT binary patch delta 407 zcmZXQO-lk%6o%h>$C?}`LrcxgkW7&uQ}$tHS(cTSU?1p0Xc0^)W()?-)YkuytLRS{ zg;Y?ujDAx@XKE##%Xt^)ea?F?_rrPXl0Ls*-vK1B{~)D#YX~t0HZ4KHjEq^t86?xv zo0eIwTNezzaN$zF(c^~RsKrZGv)-tsA}2OJFJl3V41-3sQL|AY9Ld|pl8j}nFgVTY zGxK+Y!5_}&Bma{m5vxdvSZg11zp##tcAZZRZ&Ik5Ef$Z8A~NlJKIxLqtAsLvOkR1{E1> zV+#UCDOZ6=>VX?x1ZbkdPhS=wVjMdN7BEJ3^zRAqk!e>B69`e18%Y8~;Did)yQEq2 SW$-VkB9v2+E@H%kn7tp!#Y_e!tFOf-v54qm^eBy2&=;vNU=X7iyoR?BM>os4 z_xy6tx%>Phr$0Z}8-M`QgFcg49X?tbn(<3oN*kT{EgQw2fa=b}a20A82srUtagGZm z644G43gfPKg5h6KmAJz`!`u9UWNCI22p-yS&}XE?-9#o;gU&%2HB_kJOe^UuI+l~v Xnf~zrL%tl5su0_P#xj91t;FODw~ie7 diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index c3143f3..818cc6f 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -16,7 +16,7 @@ public void set(String cell, String value) { public String evaluate(String cell) { String cellStored = sheet.get(cell); if (cellStored.startsWith("'")) { - return cellStored.substring(1, cellStored.length() - 2); + return cellStored.substring(1, cellStored.length() - 1); } else { try { Integer.parseInt(sheet.get(cell)); From b99200d1962122666ab7c48231afa9586d52f05b Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 14:50:33 +0300 Subject: [PATCH 16/44] besouro automatic message --- .besouro/20161012142150776/actions.txt | 4 ++++ .../20161012142150776/besouroEpisodes.txt | 3 +++ .../randomHeuristicEpisodes.txt | 1 + .besouro/20161012142150776/zorroEpisodes.txt | 1 + bin/Spreadsheet.class | Bin 1426 -> 1426 bytes src/Spreadsheet.java | 16 ++++++++++------ 6 files changed, 19 insertions(+), 6 deletions(-) diff --git a/.besouro/20161012142150776/actions.txt b/.besouro/20161012142150776/actions.txt index c7c2047..5e0080b 100644 --- a/.besouro/20161012142150776/actions.txt +++ b/.besouro/20161012142150776/actions.txt @@ -88,3 +88,7 @@ EditAction 1476272987163 Spreadsheet.java 601 3 4 0 UnitTestCaseAction 1476272993013 SpreadsheetTest.java FAIL UnitTestSessionAction 1476272993014 SpreadsheetTest.java FAIL EditAction 1476273002580 Spreadsheet.java 601 3 4 0 +UnitTestCaseAction 1476273007370 SpreadsheetTest.java OK +UnitTestSessionAction 1476273007371 SpreadsheetTest.java OK +RefactoringAction 1476273033096 Spreadsheet.java ADD String evaluateInt(String) METHOD +EditAction 1476273033103 Spreadsheet.java 671 4 5 0 diff --git a/.besouro/20161012142150776/besouroEpisodes.txt b/.besouro/20161012142150776/besouroEpisodes.txt index cff53bb..7d1e4d0 100644 --- a/.besouro/20161012142150776/besouroEpisodes.txt +++ b/.besouro/20161012142150776/besouroEpisodes.txt @@ -17,3 +17,6 @@ 1476272669247 test-first 3 612 true 1476272722602 test-addition 1 41 true 1476272722603 test-addition 1 41 true +1476273007371 test-first 3 280 true +1476273007372 test-first 3 280 true +1476273007373 test-first 3 280 true diff --git a/.besouro/20161012142150776/randomHeuristicEpisodes.txt b/.besouro/20161012142150776/randomHeuristicEpisodes.txt index f5d863c..07f98ee 100644 --- a/.besouro/20161012142150776/randomHeuristicEpisodes.txt +++ b/.besouro/20161012142150776/randomHeuristicEpisodes.txt @@ -3,3 +3,4 @@ 1476272034216 refactoring 1A 24 true 1476272669239 test-first 3 612 true 1476272722602 test-addition 1 41 true +1476273007371 test-first 3 280 true diff --git a/.besouro/20161012142150776/zorroEpisodes.txt b/.besouro/20161012142150776/zorroEpisodes.txt index 55ad29c..06213fe 100644 --- a/.besouro/20161012142150776/zorroEpisodes.txt +++ b/.besouro/20161012142150776/zorroEpisodes.txt @@ -3,3 +3,4 @@ 1476272034216 refactoring 1A 83 true 1476272669239 test-first 3 635 true 1476272722602 test-addition 1 53 true +1476273007371 test-first 3 284 true diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index e45cb64d739c21e256f6bb1678bf04bc0249fb65..5b117ab9f6afc6a827285f08c4e77b0b3c51c5fc 100644 GIT binary patch delta 13 VcmbQlJ&Ak6TNXx^$?sT}001IC1quKF delta 13 VcmbQlJ&Ak6TNXyv$?sT}001IH1q%QG diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 818cc6f..e2647ca 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -18,12 +18,16 @@ public String evaluate(String cell) { if (cellStored.startsWith("'")) { return cellStored.substring(1, cellStored.length() - 1); } else { - try { - Integer.parseInt(sheet.get(cell)); - return sheet.get(cell); - } catch (NumberFormatException ex) { - return "#ERROR"; - } + return evaluateInt(cell); + } + } + + private String evaluateInt(String cell) { + try { + Integer.parseInt(sheet.get(cell)); + return sheet.get(cell); + } catch (NumberFormatException ex) { + return "#ERROR"; } } From fa9a68dd1b0cef2607a9f1f5672f45d26749b4eb Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 14:52:11 +0300 Subject: [PATCH 17/44] besouro automatic message --- .besouro/20161012142150776/actions.txt | 10 ++++++++++ .../20161012142150776/besouroEpisodes.txt | 1 + .../randomHeuristicEpisodes.txt | 1 + .besouro/20161012142150776/zorroEpisodes.txt | 1 + bin/Spreadsheet.class | Bin 1426 -> 1530 bytes tests/SpreadsheetTest.java | 8 ++++++++ 6 files changed, 21 insertions(+) diff --git a/.besouro/20161012142150776/actions.txt b/.besouro/20161012142150776/actions.txt index 5e0080b..8e46433 100644 --- a/.besouro/20161012142150776/actions.txt +++ b/.besouro/20161012142150776/actions.txt @@ -92,3 +92,13 @@ UnitTestCaseAction 1476273007370 SpreadsheetTest.java OK UnitTestSessionAction 1476273007371 SpreadsheetTest.java OK RefactoringAction 1476273033096 Spreadsheet.java ADD String evaluateInt(String) METHOD EditAction 1476273033103 Spreadsheet.java 671 4 5 0 +UnitTestCaseAction 1476273047922 SpreadsheetTest.java OK +UnitTestSessionAction 1476273047923 SpreadsheetTest.java OK +RefactoringAction 1476273097171 SpreadsheetTest.java ADD void testSpreadsheetString_setA5_aString_evaluateB2_return_aString()/2 METHOD +RefactoringAction 1476273106683 SpreadsheetTest.java RENAME testSpreadsheetString_setA5_aString_evaluateB2_return_aString()/2=>void testSpreadsheetString_setA5_aString__evaluateB2_return_aString() METHOD +RefactoringAction 1476273109195 SpreadsheetTest.java RENAME testSpreadsheetString_setA5_aString__evaluateB2_return_aString()=>void testSpreadsheetString_setA5_aString_without_evaluateB2_return_aString() METHOD +RefactoringAction 1476273111207 SpreadsheetTest.java RENAME testSpreadsheetString_setA5_aString_without_evaluateB2_return_aString()=>void testSpreadsheetString_setA5_aString_withoutEndQu_evaluateB2_return_aString() METHOD +RefactoringAction 1476273113219 SpreadsheetTest.java RENAME testSpreadsheetString_setA5_aString_withoutEndQu_evaluateB2_return_aString()=>void testSpreadsheetString_setA5_aString_withoutEndQuote_evaluateB2_return_aString() METHOD +RefactoringAction 1476273118231 SpreadsheetTest.java RENAME testSpreadsheetString_setA5_aString_withoutEndQuote_evaluateB2_return_aString()=>void testSpreadsheetString_setA5_aString_withoutEndQuote_evaluateB2_return_E() METHOD +RefactoringAction 1476273120743 SpreadsheetTest.java RENAME testSpreadsheetString_setA5_aString_withoutEndQuote_evaluateB2_return_E()=>void testSpreadsheetString_setA5_aString_withoutEndQuote_evaluateB2_return_ERROR() METHOD +EditAction 1476273130931 SpreadsheetTest.java 1122 6 12 6 diff --git a/.besouro/20161012142150776/besouroEpisodes.txt b/.besouro/20161012142150776/besouroEpisodes.txt index 7d1e4d0..c75d617 100644 --- a/.besouro/20161012142150776/besouroEpisodes.txt +++ b/.besouro/20161012142150776/besouroEpisodes.txt @@ -20,3 +20,4 @@ 1476273007371 test-first 3 280 true 1476273007372 test-first 3 280 true 1476273007373 test-first 3 280 true +1476273047923 production 2 14 false diff --git a/.besouro/20161012142150776/randomHeuristicEpisodes.txt b/.besouro/20161012142150776/randomHeuristicEpisodes.txt index 07f98ee..efccf9f 100644 --- a/.besouro/20161012142150776/randomHeuristicEpisodes.txt +++ b/.besouro/20161012142150776/randomHeuristicEpisodes.txt @@ -4,3 +4,4 @@ 1476272669239 test-first 3 612 true 1476272722602 test-addition 1 41 true 1476273007371 test-first 3 280 true +1476273047923 production 2 14 true diff --git a/.besouro/20161012142150776/zorroEpisodes.txt b/.besouro/20161012142150776/zorroEpisodes.txt index 06213fe..c2252c2 100644 --- a/.besouro/20161012142150776/zorroEpisodes.txt +++ b/.besouro/20161012142150776/zorroEpisodes.txt @@ -4,3 +4,4 @@ 1476272669239 test-first 3 635 true 1476272722602 test-addition 1 53 true 1476273007371 test-first 3 284 true +1476273047923 production 2 40 true diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 5b117ab9f6afc6a827285f08c4e77b0b3c51c5fc..63ce55f55ca1d20347e9526109957185d3a7e8a8 100644 GIT binary patch delta 381 zcmY+9O)mpc6o%hBw>r!qS`;ZWWLPj;3sv8gmNa78#8O7h%0xwmtu+3D`6DAFJ`#f#gNS%1ZGz3sd7pdFInTY;KXvW(`>6?F7CSduQ^^bDx-pMo0o}WB{c|_)N+*GU zR`Yzn64cMUBY~bu;MR`I?rGIM^gRtrSW&SYz9|{GinZ`Vnd;jRNLmHQ*>zNG3Yg)Z zG{d5_!z-B+9kr0{&&a^0>>3p0AH>e!IN6U`g_|omH76&yB)=#%WpV+tHXm16 zVp2}(bEcmYVTx_WMVkLAh(0TB3uhuV1u8K z-3A6m24x0E1}6pw24)6fphh_cb|5Lpz{eoOAPy8!W)K59UL2@Gg29J%B6fGU}RSl$IlxdIjNFfjdLP-bV4i(>~`#0b>D0951- E0Q&4Sod5s; diff --git a/tests/SpreadsheetTest.java b/tests/SpreadsheetTest.java index f735262..689e156 100644 --- a/tests/SpreadsheetTest.java +++ b/tests/SpreadsheetTest.java @@ -46,6 +46,14 @@ public void testSpreadsheetString_setA5_aString_evaluateB2_return_aString(){ } + @Test + public void testSpreadsheetString_setA5_aString_withoutEndQuote_evaluateB2_return_ERROR(){ + sheet.set("C3", "'a String"); + + assertEquals(sheet.evaluate("C3"), "#ERROR"); + + } + From 45ca01bb2d78b526b99e7f3296efbcb505a2c7ff Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 14:53:19 +0300 Subject: [PATCH 18/44] besouro automatic message --- .besouro/20161012142150776/actions.txt | 3 +++ bin/SpreadsheetTest.class | Bin 1511 -> 1706 bytes src/Spreadsheet.java | 4 ++++ 3 files changed, 7 insertions(+) diff --git a/.besouro/20161012142150776/actions.txt b/.besouro/20161012142150776/actions.txt index 8e46433..d2133d2 100644 --- a/.besouro/20161012142150776/actions.txt +++ b/.besouro/20161012142150776/actions.txt @@ -102,3 +102,6 @@ RefactoringAction 1476273113219 SpreadsheetTest.java RENAME testSpreadsheetStrin RefactoringAction 1476273118231 SpreadsheetTest.java RENAME testSpreadsheetString_setA5_aString_withoutEndQuote_evaluateB2_return_aString()=>void testSpreadsheetString_setA5_aString_withoutEndQuote_evaluateB2_return_E() METHOD RefactoringAction 1476273120743 SpreadsheetTest.java RENAME testSpreadsheetString_setA5_aString_withoutEndQuote_evaluateB2_return_E()=>void testSpreadsheetString_setA5_aString_withoutEndQuote_evaluateB2_return_ERROR() METHOD EditAction 1476273130931 SpreadsheetTest.java 1122 6 12 6 +UnitTestCaseAction 1476273139086 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476273139087 SpreadsheetTest.java FAIL +EditAction 1476273198417 Spreadsheet.java 740 4 5 0 diff --git a/bin/SpreadsheetTest.class b/bin/SpreadsheetTest.class index a8e4bff27932eb6c01a748f99ab1f5171d7a8fca..68b9db0077163b956c57836618e26cda0cfe0925 100644 GIT binary patch delta 117 zcmaFPy^5FX)W2Q(7#J8#7+f}T`7<+mPyWNCqF0_-l969p;+mHdSejpw8lPI0m{Xcq zlImm>UzA!>T9g;>8WiLo#KGXm$iS&S*`L{-k$rPNb1>874J=B`CPEIAtyvX0jTyKZ VOc^8@%qRb65oLD*+QP)(3;^(lAszq# delta 36 scmZ3*`<$EW)W2Q(7#J8#7#ufp`7=-6#%#*Sw)qWnFcT{S0~3P-0Ozj?JOBUy diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index e2647ca..68586fc 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -16,7 +16,11 @@ public void set(String cell, String value) { public String evaluate(String cell) { String cellStored = sheet.get(cell); if (cellStored.startsWith("'")) { + if(cellStored.endsWith("'")){ return cellStored.substring(1, cellStored.length() - 1); + }else{ + return "#ERROR"; + } } else { return evaluateInt(cell); } From b9b0bc30f1bffe1d5e3187cc1d150a60eadefebd Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 14:53:23 +0300 Subject: [PATCH 19/44] besouro automatic message --- .besouro/20161012142150776/actions.txt | 1 + bin/Spreadsheet.class | Bin 1530 -> 1572 bytes src/Spreadsheet.java | 6 +++--- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.besouro/20161012142150776/actions.txt b/.besouro/20161012142150776/actions.txt index d2133d2..c0269bd 100644 --- a/.besouro/20161012142150776/actions.txt +++ b/.besouro/20161012142150776/actions.txt @@ -105,3 +105,4 @@ EditAction 1476273130931 SpreadsheetTest.java 1122 6 12 6 UnitTestCaseAction 1476273139086 SpreadsheetTest.java FAIL UnitTestSessionAction 1476273139087 SpreadsheetTest.java FAIL EditAction 1476273198417 Spreadsheet.java 740 4 5 0 +EditAction 1476273203109 Spreadsheet.java 745 4 5 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 63ce55f55ca1d20347e9526109957185d3a7e8a8..acdc7fefbbe3e1b56670349398552e3e8f856b73 100644 GIT binary patch delta 391 zcmY+APfG$(6vcltV@^#&F_RT#XeLqVzyxLg%l?;@25wx2;GjjgC}|gch8PH127Lgd zFlr&KTl9eojNm7X?tmF#=DsM!xj-6=W+!Fo;lecs` z0jI%KpwwWtZZFmo$!C`9GN{obb&#M`i!N;Xg&8J<@IqKN$c3 delta 356 zcmY*UJ4?e*6#nkLX%k|oB)-sUVhDmw0}-rRAN5@|mLgMgbm?+9=i_^wJMF7SegAoR1yDlmUOnd{(+t^G)NXc;7{p{DP+?+5 z!z||Flusxs80IxB#Gl-^ma!^hg+V`VoHhJbquum_b|-2^ryAC<9#@28DA*)Nry7QP zp^PmCE4~)i!<9H;7nhJAD7)Z3LN7jJnBxs*-80-2-Yt4P$xAUM9i}KHZt)4_gvbJY zG!2phI&!oP5#nF~{e+DF8PYXK7g-ZxQ|BD=Sfq_(iBJXX8;&f~Z=8O)$=Kz}epiX4 pZfqo^15qqgyHfL%J4)ynd7JS^#?EhJ=ifOCb|4d Date: Wed, 12 Oct 2016 14:53:45 +0300 Subject: [PATCH 20/44] besouro automatic message --- .besouro/20161012142150776/actions.txt | 4 ++++ .besouro/20161012142150776/besouroEpisodes.txt | 4 ++++ .besouro/20161012142150776/randomHeuristicEpisodes.txt | 1 + .besouro/20161012142150776/zorroEpisodes.txt | 1 + src/Spreadsheet.java | 5 +++-- 5 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.besouro/20161012142150776/actions.txt b/.besouro/20161012142150776/actions.txt index c0269bd..3eb4ec9 100644 --- a/.besouro/20161012142150776/actions.txt +++ b/.besouro/20161012142150776/actions.txt @@ -106,3 +106,7 @@ UnitTestCaseAction 1476273139086 SpreadsheetTest.java FAIL UnitTestSessionAction 1476273139087 SpreadsheetTest.java FAIL EditAction 1476273198417 Spreadsheet.java 740 4 5 0 EditAction 1476273203109 Spreadsheet.java 745 4 5 0 +UnitTestCaseAction 1476273209684 SpreadsheetTest.java OK +UnitTestSessionAction 1476273209685 SpreadsheetTest.java OK +RefactoringAction 1476273224938 Spreadsheet.java ADD String ERROR FIELD +EditAction 1476273224945 Spreadsheet.java 786 4 5 0 diff --git a/.besouro/20161012142150776/besouroEpisodes.txt b/.besouro/20161012142150776/besouroEpisodes.txt index c75d617..07e9c65 100644 --- a/.besouro/20161012142150776/besouroEpisodes.txt +++ b/.besouro/20161012142150776/besouroEpisodes.txt @@ -21,3 +21,7 @@ 1476273007372 test-first 3 280 true 1476273007373 test-first 3 280 true 1476273047923 production 2 14 false +1476273209685 test-first 3 112 true +1476273209686 test-first 3 112 true +1476273209687 test-first 3 112 true +1476273209688 test-first 3 112 true diff --git a/.besouro/20161012142150776/randomHeuristicEpisodes.txt b/.besouro/20161012142150776/randomHeuristicEpisodes.txt index efccf9f..7f92367 100644 --- a/.besouro/20161012142150776/randomHeuristicEpisodes.txt +++ b/.besouro/20161012142150776/randomHeuristicEpisodes.txt @@ -5,3 +5,4 @@ 1476272722602 test-addition 1 41 true 1476273007371 test-first 3 280 true 1476273047923 production 2 14 true +1476273209685 test-first 3 112 true diff --git a/.besouro/20161012142150776/zorroEpisodes.txt b/.besouro/20161012142150776/zorroEpisodes.txt index c2252c2..96e6977 100644 --- a/.besouro/20161012142150776/zorroEpisodes.txt +++ b/.besouro/20161012142150776/zorroEpisodes.txt @@ -5,3 +5,4 @@ 1476272722602 test-addition 1 53 true 1476273007371 test-first 3 284 true 1476273047923 production 2 40 true +1476273209685 test-first 3 161 true diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 64573cb..c2b2113 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -3,6 +3,7 @@ public class Spreadsheet { + private static final String ERROR = "#ERROR"; Map sheet = new HashMap<>(); public String get(String cell) { @@ -19,7 +20,7 @@ public String evaluate(String cell) { if (cellStored.endsWith("'")) { return cellStored.substring(1, cellStored.length() - 1); } else { - return "#ERROR"; + return ERROR; } } else { return evaluateInt(cell); @@ -31,7 +32,7 @@ private String evaluateInt(String cell) { Integer.parseInt(sheet.get(cell)); return sheet.get(cell); } catch (NumberFormatException ex) { - return "#ERROR"; + return ERROR; } } From 7e7248263aa92f6922cdfc8d48de4cbff622fd42 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 14:54:14 +0300 Subject: [PATCH 21/44] besouro automatic message --- .besouro/20161012142150776/actions.txt | 4 ++++ .../20161012142150776/besouroEpisodes.txt | 1 + .../randomHeuristicEpisodes.txt | 1 + .besouro/20161012142150776/zorroEpisodes.txt | 1 + bin/Spreadsheet.class | Bin 1572 -> 1612 bytes src/Spreadsheet.java | 14 +++++++++----- 6 files changed, 16 insertions(+), 5 deletions(-) diff --git a/.besouro/20161012142150776/actions.txt b/.besouro/20161012142150776/actions.txt index 3eb4ec9..3ebdb7e 100644 --- a/.besouro/20161012142150776/actions.txt +++ b/.besouro/20161012142150776/actions.txt @@ -110,3 +110,7 @@ UnitTestCaseAction 1476273209684 SpreadsheetTest.java OK UnitTestSessionAction 1476273209685 SpreadsheetTest.java OK RefactoringAction 1476273224938 Spreadsheet.java ADD String ERROR FIELD EditAction 1476273224945 Spreadsheet.java 786 4 5 0 +UnitTestCaseAction 1476273233712 SpreadsheetTest.java OK +UnitTestSessionAction 1476273233713 SpreadsheetTest.java OK +RefactoringAction 1476273253740 Spreadsheet.java ADD String evaluateString(String) METHOD +EditAction 1476273253745 Spreadsheet.java 875 5 6 0 diff --git a/.besouro/20161012142150776/besouroEpisodes.txt b/.besouro/20161012142150776/besouroEpisodes.txt index 07e9c65..ea6943d 100644 --- a/.besouro/20161012142150776/besouroEpisodes.txt +++ b/.besouro/20161012142150776/besouroEpisodes.txt @@ -25,3 +25,4 @@ 1476273209686 test-first 3 112 true 1476273209687 test-first 3 112 true 1476273209688 test-first 3 112 true +1476273233713 refactoring 2A 8 true diff --git a/.besouro/20161012142150776/randomHeuristicEpisodes.txt b/.besouro/20161012142150776/randomHeuristicEpisodes.txt index 7f92367..f64445e 100644 --- a/.besouro/20161012142150776/randomHeuristicEpisodes.txt +++ b/.besouro/20161012142150776/randomHeuristicEpisodes.txt @@ -6,3 +6,4 @@ 1476273007371 test-first 3 280 true 1476273047923 production 2 14 true 1476273209685 test-first 3 112 true +1476273233713 refactoring 2A 8 false diff --git a/.besouro/20161012142150776/zorroEpisodes.txt b/.besouro/20161012142150776/zorroEpisodes.txt index 96e6977..a4941c8 100644 --- a/.besouro/20161012142150776/zorroEpisodes.txt +++ b/.besouro/20161012142150776/zorroEpisodes.txt @@ -6,3 +6,4 @@ 1476273007371 test-first 3 284 true 1476273047923 production 2 40 true 1476273209685 test-first 3 161 true +1476273233713 refactoring 2A 24 true diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index acdc7fefbbe3e1b56670349398552e3e8f856b73..3d2578590edb81204363038dc834bee689baee21 100644 GIT binary patch literal 1612 zcmZ{jYi|=r6o%hfJ6U_Pxj7`^9)b&r9fP?UC`q9uB*i5mD6SIGFV)5#ISXcO?XD4D z`4dR|i&Sb8pi-UO2CvV#D$3#jU*;vKk5ut!-~_Z3|>JdS{i;cfIWcbrCBrjQmG z&PEPHT2^4Zz)&~eJN1tKV2D&GHAI^jo}s7bHn=riN)NGKytNN zlNJ)l*cijOi4y{o8d%4D>;(IaZD9(TGz4aCSQt@kt|yNIv7 z-&Om_m<;#bfZ1-u>P3b`U9v!z7Y7M*gQgM8Vcx_A%JjI%WaBI@ex=f>{c>C-GMV_M zuS=ayF#oD-G)NREqJ?9K27z)r3MpqJk0pAx+Vs2|_l!cuJpZ4IbMjh^fIv#BA1CBA z6a~bBg)FYyxPhAj7H7o|gIzb=7nqL6iY6-ei@IL2aa&zaNw20aE8|@o-{Kw{-;iEi z`Lpq5b+BUNJ8%%vL3=OIgDEhxST4t_7s*>}{r5J0z&XzT7tXTB#4T07O4#&ejSZ@V zPW2^wquXy`4L_P#|1wbebmWejv5bv00T(JQ0}dJ)q9WtvCHwPPq1_ zDqEr3^aKp~MqoZx@MG_B@~ld;?N{Zxt44MrHkDUZ49qjn1mC%V(-^`qcc$K@xN`2f zxAlIMr$W6Kt`oF8q?h1#B7cO*{GXV5euU{iF!P(feUj^#)=eTw#c{5uXtO&$jCF=P z!FfK{)icOIul(+r37cq2@}DZz^$^$IDu bc8RhPkt*K?HW^Y8u~)yE)Dn2goq?^-rZq}U literal 1572 zcmZ`&?{Cvq6g|%gICY)03DEIlw1og|(m)sxU~5+>&_bZ4QiEE-7vv^SsUbL#?I6DH zpP0mdQ6$!mO`7<;ziFB{@5LkzEg$0e-goc0=bm@`@Be@O1K3M6I=n*z!E?S{0FK-$I#EE8h_*}>dLPO!t-7BWbWKpJ0l*k&hL|@2i`iZE>%rQ_2Pswg*gE+V__1PZCpWFzzRag4}&c? z+z~htpA~ITc%jOFvT;q7r=-`=#VUEjMg=$NhL-f2s-JGCs)O4$e#S4fTF~7Nw2uTP zW~q!D}y3k1k7Z)~h@SoFrCjXO9=kALM{^(ca+1g?c`Up9Dywa}@*=H+RBSh$a6 z6A!*RPMeoavMGHVD|krK9mfx(20C=Zs)?$=)Zp@Zo?L1BZ=7)XU0rrUx9tfS@}0oB znD~d*(VAAR-Sz8o#Z{gjkJ{&C>=(bxyLG1GhW<> zUHluF=ldA{1KAI{`WT-Xjgv%@C}VscXU^{R-~=WZ2^#!lAJ5&eC*ZtdpgcZ+lT_*Lzc z&^w*xRzQ{%a#Z3NM;=Fs+m&%DMyk>$Rf$MtFoV0A)DrtgVEl)YiAg0O{TT`H8zaRr zKg97*+}j#T?5>fQ)^-w8coZ?qaX~Q7a^e&xO;cH=d{3r)pHZF} Date: Wed, 12 Oct 2016 14:55:03 +0300 Subject: [PATCH 22/44] besouro automatic message --- .besouro/20161012142150776/actions.txt | 3 +++ .../20161012142150776/besouroEpisodes.txt | 1 + .../randomHeuristicEpisodes.txt | 1 + .besouro/20161012142150776/zorroEpisodes.txt | 1 + bin/Spreadsheet.class | Bin 1612 -> 1719 bytes src/Spreadsheet.java | 8 ++++---- 6 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.besouro/20161012142150776/actions.txt b/.besouro/20161012142150776/actions.txt index 3ebdb7e..07e4805 100644 --- a/.besouro/20161012142150776/actions.txt +++ b/.besouro/20161012142150776/actions.txt @@ -114,3 +114,6 @@ UnitTestCaseAction 1476273233712 SpreadsheetTest.java OK UnitTestSessionAction 1476273233713 SpreadsheetTest.java OK RefactoringAction 1476273253740 Spreadsheet.java ADD String evaluateString(String) METHOD EditAction 1476273253745 Spreadsheet.java 875 5 6 0 +UnitTestCaseAction 1476273261059 SpreadsheetTest.java OK +UnitTestSessionAction 1476273261060 SpreadsheetTest.java OK +EditAction 1476273302652 Spreadsheet.java 877 5 6 0 diff --git a/.besouro/20161012142150776/besouroEpisodes.txt b/.besouro/20161012142150776/besouroEpisodes.txt index ea6943d..f52f5a1 100644 --- a/.besouro/20161012142150776/besouroEpisodes.txt +++ b/.besouro/20161012142150776/besouroEpisodes.txt @@ -26,3 +26,4 @@ 1476273209687 test-first 3 112 true 1476273209688 test-first 3 112 true 1476273233713 refactoring 2A 8 true +1476273261060 production 2 7 false diff --git a/.besouro/20161012142150776/randomHeuristicEpisodes.txt b/.besouro/20161012142150776/randomHeuristicEpisodes.txt index f64445e..1956182 100644 --- a/.besouro/20161012142150776/randomHeuristicEpisodes.txt +++ b/.besouro/20161012142150776/randomHeuristicEpisodes.txt @@ -7,3 +7,4 @@ 1476273047923 production 2 14 true 1476273209685 test-first 3 112 true 1476273233713 refactoring 2A 8 false +1476273261060 production 2 7 true diff --git a/.besouro/20161012142150776/zorroEpisodes.txt b/.besouro/20161012142150776/zorroEpisodes.txt index a4941c8..0a35fce 100644 --- a/.besouro/20161012142150776/zorroEpisodes.txt +++ b/.besouro/20161012142150776/zorroEpisodes.txt @@ -7,3 +7,4 @@ 1476273047923 production 2 40 true 1476273209685 test-first 3 161 true 1476273233713 refactoring 2A 24 true +1476273261060 production 2 27 true diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 3d2578590edb81204363038dc834bee689baee21..5b9cd7af2b73eac8a70aa9826698459c5f17b52d 100644 GIT binary patch delta 418 zcmY+9+e!j)5XQg%?z*eXW**Wk-Av2`m5j23ozG=uCyA~i7F^5_FU-90qKEiHU{7HL z3S9)=MlVp$647WE(Ok?hGko*?=3Q&|sc+veuK-fWJ*kgEh+#&%hU6-+Z&&2s+sqFB9F5yqN^b!_mC;Fh;EY-5Li3en&m_7!9p zoHs_zNS2IpA(<&x&4O9caDYR8E=Jf9uZs^%es)PJV|CuKc&4%m*F+1G4cKCdHd4)4 zyp6dgp^ETPc0uZ8JKPw=0Cae{L)P!@@L&Nl1T50t3ibtEAvU4=75(6#=_P3es=j#F zVyS`txD;<;Rm!)p*>qX|TWIss=t-Gf05 delta 396 zcmY*UOG^S_6g}Vfjjv&PIF>zR9BU9kr)H7%erRtit5q&TP^<`vlD5)s_#miXF;S?s zh+4FXeo{nNa?|E=&$;KGdv2@eOH)68US0vDarmI#bHhSL!!)KC{FPeys(4yIQDI?L z!yM*iP=vgT8kVpulOo||$ZE*R5AK*7*z#eMA$V50E;;9=TGh$d>XmBcQo}a#@lmeFCf0ajX#=0RM*VgT;x+!N3ti zKk+vNJDIHH6T+!yL^0Ac!$y$EmYq!(*78NP8%B QPg9s Date: Wed, 12 Oct 2016 14:58:46 +0300 Subject: [PATCH 23/44] besouro automatic message --- .besouro/20161012142150776/actions.txt | 15 +++++++++++++++ .../20161012142150776/besouroEpisodes.txt | 1 + .../randomHeuristicEpisodes.txt | 1 + .besouro/20161012142150776/zorroEpisodes.txt | 1 + bin/Spreadsheet.class | Bin 1719 -> 1695 bytes tests/SpreadsheetTest.java | 7 +++++++ 6 files changed, 25 insertions(+) diff --git a/.besouro/20161012142150776/actions.txt b/.besouro/20161012142150776/actions.txt index 07e4805..2aa3ae1 100644 --- a/.besouro/20161012142150776/actions.txt +++ b/.besouro/20161012142150776/actions.txt @@ -117,3 +117,18 @@ EditAction 1476273253745 Spreadsheet.java 875 5 6 0 UnitTestCaseAction 1476273261059 SpreadsheetTest.java OK UnitTestSessionAction 1476273261060 SpreadsheetTest.java OK EditAction 1476273302652 Spreadsheet.java 877 5 6 0 +UnitTestCaseAction 1476273310611 SpreadsheetTest.java OK +UnitTestSessionAction 1476273310613 SpreadsheetTest.java OK +RefactoringAction 1476273475802 SpreadsheetTest.java ADD void testSpreadsheetString_setA5_aString_withoutEndQuote_evaluateB2_return_ERROR()/2 METHOD +RefactoringAction 1476273483817 SpreadsheetTest.java RENAME testSpreadsheetString_setA5_aString_withoutEndQuote_evaluateB2_return_ERROR()/2=>void testSpreadsheetequa_setA5_aString_withoutEndQuote_evaluateB2_return_ERROR() METHOD +RefactoringAction 1476273484829 SpreadsheetTest.java RENAME testSpreadsheetequa_setA5_aString_withoutEndQuote_evaluateB2_return_ERROR()=>void testSpreadsheetequal_setA5_aString_withoutEndQuote_evaluateB2_return_ERROR() METHOD +RefactoringAction 1476273486343 SpreadsheetTest.java RENAME testSpreadsheetequal_setA5_aString_withoutEndQuote_evaluateB2_return_ERROR()=>void testSpreadsheetequalSign_setA5_aString_withoutEndQuote_evaluateB2_return_ERROR() METHOD +RefactoringAction 1476273491359 SpreadsheetTest.java RENAME testSpreadsheetequalSign_setA5_aString_withoutEndQuote_evaluateB2_return_ERROR()=>void testSpreadsheetequalSign_St_setA5_aString_withoutEndQuote_evaluateB2_return_ERROR() METHOD +RefactoringAction 1476273493372 SpreadsheetTest.java RENAME testSpreadsheetequalSign_St_setA5_aString_withoutEndQuote_evaluateB2_return_ERROR()=>void testSpreadsheetequalSign_String_setA5_aString_withoutEndQuote_evaluateB2_return_ERROR() METHOD +RefactoringAction 1476273497890 SpreadsheetTest.java RENAME testSpreadsheetequalSign_String_setA5_aString_withoutEndQuote_evaluateB2_return_ERROR()=>void testSpreadsheetequalSign_String_setA5_ FIELD +RefactoringAction 1476273505912 SpreadsheetTest.java RENAME testSpreadsheetequalSign_String_setA5_aString_withoutEndQuote_evaluateB2_return_ERROR()=>void testSpreadsheetequalSign_String_setA5_EqualaString_withoutEndQuote_evaluateB2_return_ERROR() METHOD +RefactoringAction 1476273511925 SpreadsheetTest.java RENAME testSpreadsheetequalSign_String_setA5_EqualaString_withoutEndQuote_evaluateB2_return_ERROR()=>void testSpreadsheetequalSign_String_setA5_EqualsaString_withoutEndQuote_evaluateB2_return_ERROR() METHOD +RefactoringAction 1476273518437 SpreadsheetTest.java RENAME testSpreadsheetequalSign_String_setA5_EqualsaString_withoutEndQuote_evaluateB2_return_ERROR()=>void testSpreadsheetequalSign_String_setA5_EqualsaString_evaluateB2_return_ERROR() METHOD +RefactoringAction 1476273523448 SpreadsheetTest.java RENAME testSpreadsheetequalSign_String_setA5_EqualsaString_evaluateB2_return_ERROR()=>void testSpreadsheetequalSign_String_setA5_EqualsaString_evaluateB2_return_aSt() METHOD +RefactoringAction 1476273524460 SpreadsheetTest.java RENAME testSpreadsheetequalSign_String_setA5_EqualsaString_evaluateB2_return_aSt()=>void testSpreadsheetequalSign_String_setA5_EqualsaString_evaluateB2_return_aString() METHOD +EditAction 1476273525862 SpreadsheetTest.java 1314 7 14 7 diff --git a/.besouro/20161012142150776/besouroEpisodes.txt b/.besouro/20161012142150776/besouroEpisodes.txt index f52f5a1..0968a83 100644 --- a/.besouro/20161012142150776/besouroEpisodes.txt +++ b/.besouro/20161012142150776/besouroEpisodes.txt @@ -27,3 +27,4 @@ 1476273209688 test-first 3 112 true 1476273233713 refactoring 2A 8 true 1476273261060 production 2 7 false +1476273310613 refactoring 2A 7 true diff --git a/.besouro/20161012142150776/randomHeuristicEpisodes.txt b/.besouro/20161012142150776/randomHeuristicEpisodes.txt index 1956182..2626223 100644 --- a/.besouro/20161012142150776/randomHeuristicEpisodes.txt +++ b/.besouro/20161012142150776/randomHeuristicEpisodes.txt @@ -8,3 +8,4 @@ 1476273209685 test-first 3 112 true 1476273233713 refactoring 2A 8 false 1476273261060 production 2 7 true +1476273310613 refactoring 2A 7 true diff --git a/.besouro/20161012142150776/zorroEpisodes.txt b/.besouro/20161012142150776/zorroEpisodes.txt index 0a35fce..cbb0f24 100644 --- a/.besouro/20161012142150776/zorroEpisodes.txt +++ b/.besouro/20161012142150776/zorroEpisodes.txt @@ -8,3 +8,4 @@ 1476273209685 test-first 3 161 true 1476273233713 refactoring 2A 24 true 1476273261060 production 2 27 true +1476273310613 refactoring 2A 49 true diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 5b9cd7af2b73eac8a70aa9826698459c5f17b52d..7d358cf44db84866db94715b6edf99d71e0d3303 100644 GIT binary patch delta 130 zcmdnaJD+z$94n*FKtmX;fchAL^2`kW3;_&G4AwwVpolxj NEJlVvAdiV52mq5q4FCWD delta 130 zcmbQwyPbDK94n*tTeREyTbABvlv$8B~FyY77bt>XYkPW#tus^8O3~K%=dJ@@x!@@$5i7 Mj0}N59uq?l09C&elK=n! diff --git a/tests/SpreadsheetTest.java b/tests/SpreadsheetTest.java index 689e156..e582893 100644 --- a/tests/SpreadsheetTest.java +++ b/tests/SpreadsheetTest.java @@ -55,6 +55,13 @@ public void testSpreadsheetString_setA5_aString_withoutEndQuote_evaluateB2_retur } + @Test + public void testSpreadsheetequalSign_String_setA5_EqualsaString_evaluateB2_return_aString(){ + sheet.set("C3", "'a String"); + + assertEquals(sheet.evaluate("C3"), "#ERROR"); + + } } From c7030f992997917dd9f25892dc64510a2b8caa9c Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 14:59:04 +0300 Subject: [PATCH 24/44] besouro automatic message --- .besouro/20161012142150776/actions.txt | 1 + bin/SpreadsheetTest.class | Bin 1706 -> 1888 bytes tests/SpreadsheetTest.java | 4 ++-- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.besouro/20161012142150776/actions.txt b/.besouro/20161012142150776/actions.txt index 2aa3ae1..e47fc6f 100644 --- a/.besouro/20161012142150776/actions.txt +++ b/.besouro/20161012142150776/actions.txt @@ -132,3 +132,4 @@ RefactoringAction 1476273518437 SpreadsheetTest.java RENAME testSpreadsheetequal RefactoringAction 1476273523448 SpreadsheetTest.java RENAME testSpreadsheetequalSign_String_setA5_EqualsaString_evaluateB2_return_ERROR()=>void testSpreadsheetequalSign_String_setA5_EqualsaString_evaluateB2_return_aSt() METHOD RefactoringAction 1476273524460 SpreadsheetTest.java RENAME testSpreadsheetequalSign_String_setA5_EqualsaString_evaluateB2_return_aSt()=>void testSpreadsheetequalSign_String_setA5_EqualsaString_evaluateB2_return_aString() METHOD EditAction 1476273525862 SpreadsheetTest.java 1314 7 14 7 +EditAction 1476273543978 SpreadsheetTest.java 1317 7 14 7 diff --git a/bin/SpreadsheetTest.class b/bin/SpreadsheetTest.class index 68b9db0077163b956c57836618e26cda0cfe0925..35036d32dabf24e7b3b120a6099a144c81b067a8 100644 GIT binary patch delta 110 zcmZ3*`+$$@)W2Q(7#J8#7+g1Utzp*nElDjd2`(r~O-w1yNKGwCEi6sU3C>Kvx!2^UY6U{;*Gh1r~uWAhv4olKJ*S(GLxvZ-*|FmN;2F-S5vOrF3Z M%I*v_o{7N)0G#F`Z~y=R delta 36 scmaFBw~CkR)W2Q(7#J8#7+f}Ttzn+b#$w9IzS)LlClf0J0~3QY0N^qSqyPW_ diff --git a/tests/SpreadsheetTest.java b/tests/SpreadsheetTest.java index e582893..42663d3 100644 --- a/tests/SpreadsheetTest.java +++ b/tests/SpreadsheetTest.java @@ -57,9 +57,9 @@ public void testSpreadsheetString_setA5_aString_withoutEndQuote_evaluateB2_retur @Test public void testSpreadsheetequalSign_String_setA5_EqualsaString_evaluateB2_return_aString(){ - sheet.set("C3", "'a String"); + sheet.set("C3", "='a String"); - assertEquals(sheet.evaluate("C3"), "#ERROR"); + assertEquals(sheet.evaluate("C3"), "a String"); } From dfad40701937a773c7679e37bd74fc987c8c580b Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 15:00:24 +0300 Subject: [PATCH 25/44] besouro automatic message --- .besouro/20161012142150776/actions.txt | 3 +++ bin/SpreadsheetTest.class | Bin 1888 -> 1904 bytes src/Spreadsheet.java | 3 +++ 3 files changed, 6 insertions(+) diff --git a/.besouro/20161012142150776/actions.txt b/.besouro/20161012142150776/actions.txt index e47fc6f..9fa2df3 100644 --- a/.besouro/20161012142150776/actions.txt +++ b/.besouro/20161012142150776/actions.txt @@ -133,3 +133,6 @@ RefactoringAction 1476273523448 SpreadsheetTest.java RENAME testSpreadsheetequal RefactoringAction 1476273524460 SpreadsheetTest.java RENAME testSpreadsheetequalSign_String_setA5_EqualsaString_evaluateB2_return_aSt()=>void testSpreadsheetequalSign_String_setA5_EqualsaString_evaluateB2_return_aString() METHOD EditAction 1476273525862 SpreadsheetTest.java 1314 7 14 7 EditAction 1476273543978 SpreadsheetTest.java 1317 7 14 7 +UnitTestCaseAction 1476273550180 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476273550181 SpreadsheetTest.java FAIL +EditAction 1476273623196 Spreadsheet.java 954 5 7 0 diff --git a/bin/SpreadsheetTest.class b/bin/SpreadsheetTest.class index 35036d32dabf24e7b3b120a6099a144c81b067a8..8080e1fc85bc57a4c05bcad438aa39a9c8b8307b 100644 GIT binary patch delta 53 zcmaFB_koY=)W2Q(7#J8#7~D5<{bJ_gU~pk%;IdUuRM`BFS(=&Ad9ojy;$&-fId)f| IDkcUu0K82NRR910 delta 40 vcmeys_kfS<)W2Q(7#J8#7+g1U{bJrM!XnB%`7oQ(WN&skc4wdj6N3u?CFu)X diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index bc1efe9..8f65cb1 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -16,6 +16,9 @@ public void set(String cell, String value) { public String evaluate(String cell) { String cellStored = sheet.get(cell); + if(cellStored.startsWith("=")){ + cellStored=cellStored.substring(1); + } if (cellStored.startsWith("'")) { return evaluateString(cellStored); } else { From 232b97f29382ff391f063ab61bac1b9a5f42b9b1 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 15:01:20 +0300 Subject: [PATCH 26/44] besouro automatic message --- .besouro/20161012142150776/actions.txt | 3 +++ bin/Spreadsheet.class | Bin 1695 -> 1760 bytes tests/SpreadsheetTest.java | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.besouro/20161012142150776/actions.txt b/.besouro/20161012142150776/actions.txt index 9fa2df3..8961639 100644 --- a/.besouro/20161012142150776/actions.txt +++ b/.besouro/20161012142150776/actions.txt @@ -136,3 +136,6 @@ EditAction 1476273543978 SpreadsheetTest.java 1317 7 14 7 UnitTestCaseAction 1476273550180 SpreadsheetTest.java FAIL UnitTestSessionAction 1476273550181 SpreadsheetTest.java FAIL EditAction 1476273623196 Spreadsheet.java 954 5 7 0 +UnitTestCaseAction 1476273629353 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476273629354 SpreadsheetTest.java FAIL +EditAction 1476273679536 SpreadsheetTest.java 1318 7 14 7 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 7d358cf44db84866db94715b6edf99d71e0d3303..3284b5c0c7d2ea6a2d04d945bdb054b8355898d9 100644 GIT binary patch delta 600 zcmZvYO-~b16o#KWGtlXDs4~z}CAE-(6s8HF_=!mU04!3!Q0m6T5GJLDG=>(o{SmWb ze~2-jnKt0UOmcGXd(U~F^UlYiUqjZS)Shl%GR+03Ny@MmK z<@Z{`r~5Xm!4GY5{E^LLt}9HxvDd8DTl*Gy)@?R;5)A7jrOgohRFN)}|3|Z^@I1yd z#qjwi4mkYt20M#+-qs+@{kk`E?&e$qECH*scKCL}mhl;ouGK-4(e zZ?ZA+NfG47NW(?i@D4)+$hhGW4^Oz@8g7?0W3NlOwa#`kOGsn_xjgf|F{41_O15F+11f8Fv7Q;NJ*;!x2lIN#Veap z_n+-=nX0)d!P6$ RBrm1p&Us#nFVbng{s$T(K?(o> diff --git a/tests/SpreadsheetTest.java b/tests/SpreadsheetTest.java index 42663d3..7196f48 100644 --- a/tests/SpreadsheetTest.java +++ b/tests/SpreadsheetTest.java @@ -57,7 +57,7 @@ public void testSpreadsheetString_setA5_aString_withoutEndQuote_evaluateB2_retur @Test public void testSpreadsheetequalSign_String_setA5_EqualsaString_evaluateB2_return_aString(){ - sheet.set("C3", "='a String"); + sheet.set("C3", "='a String'"); assertEquals(sheet.evaluate("C3"), "a String"); From 6fd0dd279d4beaefb6dea5cc3dabbd2f6e98249a Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 15:04:05 +0300 Subject: [PATCH 27/44] besouro automatic message --- .besouro/20161012142150776/actions.txt | 21 ++++++++++++++++++ .../20161012142150776/besouroEpisodes.txt | 2 ++ .../randomHeuristicEpisodes.txt | 1 + .besouro/20161012142150776/zorroEpisodes.txt | 1 + bin/Spreadsheet.class | Bin 1760 -> 1821 bytes bin/SpreadsheetTest.class | Bin 1904 -> 1905 bytes src/Spreadsheet.java | 8 ++++--- tests/SpreadsheetTest.java | 16 +++++++++---- 8 files changed, 42 insertions(+), 7 deletions(-) diff --git a/.besouro/20161012142150776/actions.txt b/.besouro/20161012142150776/actions.txt index 8961639..95070c6 100644 --- a/.besouro/20161012142150776/actions.txt +++ b/.besouro/20161012142150776/actions.txt @@ -139,3 +139,24 @@ EditAction 1476273623196 Spreadsheet.java 954 5 7 0 UnitTestCaseAction 1476273629353 SpreadsheetTest.java FAIL UnitTestSessionAction 1476273629354 SpreadsheetTest.java FAIL EditAction 1476273679536 SpreadsheetTest.java 1318 7 14 7 +UnitTestCaseAction 1476273685749 SpreadsheetTest.java OK +UnitTestSessionAction 1476273685750 SpreadsheetTest.java OK +RefactoringAction 1476273707364 Spreadsheet.java ADD String EQUALS FIELD +RefactoringAction 1476273726385 Spreadsheet.java ADD String STRING_CLASSIFIER FIELD +RefactoringAction 1476273738567 SpreadsheetTest.java ADD void testSpreadsheetequalSign_String_setA5_EqualsaString_evaluateB2_return_aString()/2 METHOD +RefactoringAction 1476273744112 SpreadsheetTest.java RENAME testSpreadsheetequalSign_String_setA5_EqualsaString_evaluateB2_return_aString()/2=>void testSpreadsheetequalSign_I_setA5_EqualsaString_evaluateB2_return_aString() METHOD +RefactoringAction 1476273745124 SpreadsheetTest.java RENAME testSpreadsheetequalSign_I_setA5_EqualsaString_evaluateB2_return_aString()=>void testSpreadsheetequalSign_Int_setA5_EqualsaString_evaluateB2_return_aString() METHOD +RefactoringAction 1476273750135 SpreadsheetTest.java RENAME testSpreadsheetequalSign_Int_setA5_EqualsaString_evaluateB2_return_aString()=>void testSpreadsheetequalSign_Int_setA5_EqualsInt_evaluateB2_return_aString() METHOD +RefactoringAction 1476273765645 SpreadsheetTest.java RENAME testSpreadsheetString_setA5_aString_evaluateB2_return_aString()=>void testSpreadsheetString_setA5_aString_evaluate_return_aString() METHOD +RefactoringAction 1476273769157 SpreadsheetTest.java RENAME testSpreadsheetString_setA5_aString_evaluate_return_aString()=>void testSpreadsheetString_setA5_aString_evaluateC3_return_aString() METHOD +RefactoringAction 1476273772168 SpreadsheetTest.java RENAME testSpreadsheetString_setA5_aString_evaluateC3_return_aString()=>void testSpreadsheetString_setC_aString_evaluateC3_return_aString() METHOD +RefactoringAction 1476273773179 SpreadsheetTest.java RENAME testSpreadsheetString_setC_aString_evaluateC3_return_aString()=>void testSpreadsheetString_setC3_aString_evaluateC3_return_aString() METHOD +RefactoringAction 1476273778690 SpreadsheetTest.java RENAME testSpreadsheetInvalidInt_setB2_2A_evaluateB2_return_Error()=>void testSpreadsheetInvalidInt_setC3_2A_evaluateB2_return_Error() METHOD +RefactoringAction 1476273781202 SpreadsheetTest.java RENAME testSpreadsheetInvalidInt_setC3_2A_evaluateB2_return_Error()=>void testSpreadsheetInvalidInt_setC3_2A_evaluateC3_return_Error() METHOD +RefactoringAction 1476273821719 SpreadsheetTest.java RENAME testSpreadsheetString_setA5_aString_withoutEndQuote_evaluateB2_return_ERROR()=>void testSpreadsheetString_setC3_aString_withoutEndQuote_evaluateB2_return_ERROR() METHOD +RefactoringAction 1476273825230 SpreadsheetTest.java RENAME testSpreadsheetString_setC3_aString_withoutEndQuote_evaluateB2_return_ERROR()=>void testSpreadsheetString_setC3_aString_withoutEndQuote_evaluateC3_return_ERROR() METHOD +RefactoringAction 1476273830746 SpreadsheetTest.java RENAME testSpreadsheetequalSign_String_setA5_EqualsaString_evaluateB2_return_aString()=>void testSpreadsheetequalSign_String_setC3_EqualsaString_evaluateB2_return_aString() METHOD +RefactoringAction 1476273834257 SpreadsheetTest.java RENAME testSpreadsheetequalSign_String_setC3_EqualsaString_evaluateB2_return_aString()=>void testSpreadsheetequalSign_String_setC3_EqualsaString_evaluateC3_return_aString() METHOD +RefactoringAction 1476273839270 SpreadsheetTest.java RENAME testSpreadsheetequalSign_Int_setA5_EqualsInt_evaluateB2_return_aString()=>void testSpreadsheetequalSign_Int_setC3_EqualsInt_evaluateB2_return_aString() METHOD +RefactoringAction 1476273842284 SpreadsheetTest.java RENAME testSpreadsheetequalSign_Int_setC3_EqualsInt_evaluateB2_return_aString()=>void testSpreadsheetequalSign_Int_setC3_EqualsInt_evaluateC3_return_aString() METHOD +EditAction 1476273844455 SpreadsheetTest.java 1509 8 16 8 diff --git a/.besouro/20161012142150776/besouroEpisodes.txt b/.besouro/20161012142150776/besouroEpisodes.txt index 0968a83..3f8b93a 100644 --- a/.besouro/20161012142150776/besouroEpisodes.txt +++ b/.besouro/20161012142150776/besouroEpisodes.txt @@ -28,3 +28,5 @@ 1476273233713 refactoring 2A 8 true 1476273261060 production 2 7 false 1476273310613 refactoring 2A 7 true +1476273685750 test-first 3 209 true +1476273685751 test-first 3 209 true diff --git a/.besouro/20161012142150776/randomHeuristicEpisodes.txt b/.besouro/20161012142150776/randomHeuristicEpisodes.txt index 2626223..e392de7 100644 --- a/.besouro/20161012142150776/randomHeuristicEpisodes.txt +++ b/.besouro/20161012142150776/randomHeuristicEpisodes.txt @@ -9,3 +9,4 @@ 1476273233713 refactoring 2A 8 false 1476273261060 production 2 7 true 1476273310613 refactoring 2A 7 true +1476273685750 test-first 3 209 true diff --git a/.besouro/20161012142150776/zorroEpisodes.txt b/.besouro/20161012142150776/zorroEpisodes.txt index cbb0f24..979bd11 100644 --- a/.besouro/20161012142150776/zorroEpisodes.txt +++ b/.besouro/20161012142150776/zorroEpisodes.txt @@ -9,3 +9,4 @@ 1476273233713 refactoring 2A 24 true 1476273261060 production 2 27 true 1476273310613 refactoring 2A 49 true +1476273685750 test-first 3 375 true diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 3284b5c0c7d2ea6a2d04d945bdb054b8355898d9..4d652652980884b46db62529f6c43117fb45f6f9 100644 GIT binary patch literal 1821 zcmZ`(ZBrXn7(F)$6+yMX}XtDM~TWXaJj~!FI-RmgG*@nr@iQrqlo7 zr~V6^QLsAW_}Sm&I6e37k}L+l?C$g2=Q-y*FL(d`_xC>m+`+RrA_8gi*p*hZdnBb7 zM@(Six%JXoX8nVxGqt@{FFn;oa? zS&mn?+C7;-Qa~&TjFuli*{GTc7_=V)-geo zrrmNZujfjEyBAN_hD8i})`>B?W;?dGE)ZSL*9Bsmou*77ikyLWF%`!Qi`4aK-bYsV zh}K$0A_{x~R#(O)UQh#UIoCFiPNxqi|uM{-9WYL$=#g)K!X>E>Scr zC|_5SRt$WIkC=JfW9GeZW_e-@Q0tu-;ERWO3Qbsnrq^+0lT$D~tMMZTpl7Vu%LcZT*o1VNTB>qBGEl+S+_$!LT1q|lt)dR9O6!im z^m65LfqQry$G7KesIMPY$d+^s)L@e5*mAp4E4#EMl{lUV+!)+Se^IwO?hDH+ziP;1 z&+a$^5&24BJ~XCF!6>abtq2mdQz1J| zdn{yU7{%Mf_^gh9N1yQ)(lbrZL!t^5Q#iww!XLQ$^bFU2#r20~Ezn)aL>vd=TL6 zkzLh2rtwN|a65{Ffw+{0m>}S!hMe<*`;cP+BmuBW@Cac)?u-42wgO+hAa`d7JlRp`f{syc+I~=MmU_VZHG%@YMQ&dy dRAjo(ln$5@%&X%dD3Y_^R#*bx5ha4BZvkLfWu5>4 literal 1760 zcmZ{kZ&Mpp6vm&M1d?o)Ktl<%N-0t$|165FR-xDyp^ZYZqz&qfFP7v^*qUxKn@y+R z!&m(lIHO>7#__eE$#Hzn?vgA9-z=Pa?|GizJ?Gr~_0MmA0Jw#3l87l}YF$@b&EApL zUJ?m~spr;9Yo%>Dt(CpQ=epr3jBV}j@9it(c7}U3&$XS_n!?0p$LV>N8`KzIw;kKtP>2_bb%n%c zr>PCZku#CSWD=JZF8RQ|?<1>sL~jGr$fcn$Yr;TA*lb5X?!P$H?o;cqO`hCNr(w10 zmTOBKE+)JqyT{w^MCwI`cuTWD?-fP~i=#^!EMPH->y#OCk;%l{c;`PVLG9O~D&bNR zH_mk_=mhWI(Cs#fdP1~(0nsQ>u`WnO6D5?H+3hp)PBb&LjAZ^l7w6=qjDSK)%RiRK zX;@KEcMUAzLldj`NWtK&xL)tT_Kp;0qF&)d6~B|?w@rMEPdF#N{$bA_H91|4mLoi$ z!l(3DHrUcN6YH2)$e#HJM`UZm#OJb=Ioql_ysIH4t9cz)H`$Y#XElCcJN%9d#HNWa zggK?1rcW%3+a@035vQ-Mot9jJ(^r*^F9rE4g?yoU5vPG&>?QH|Y$*K~Mhe~1u8FVl zgg#x%?P;Iv!pc;Ws3|NAA7L=I+a33X9Z}D*cY> zZ%;Av3-Uktr|0<1`nm}us5r^*6|R{<4!z!Dr1&Q02YN9wFst-4^5r+U7Q>%dI_63Y zq9$ZQBr5sfWT+xe@A~_EURVzG_UJD6n(*~1Z%~NiU0^@_KN1AUP3AQUDc- z$0+;$0QN`5BEEVKcDItdd4dmKBV9?H;1L0GDs;^CDv%@mG-h#` z+Iiy7((OuwXmvoe8WLr31NVHQ`^--x_BZB}SjrNK4NL2p=c@88O3n$FQ;l;IRF3v diff --git a/bin/SpreadsheetTest.class b/bin/SpreadsheetTest.class index 8080e1fc85bc57a4c05bcad438aa39a9c8b8307b..5be344838666e91039eef62a33f632e319d6daea 100644 GIT binary patch delta 25 gcmeys_mOV{Ckqd^t$LzDa7j^SUb^~b5tbNc0BVE>e*gdg delta 24 fcmey!_knK%Ckr>1t$LzDa7j^SUixNHmKbILV^IfJ diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 8f65cb1..37ecb67 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -3,6 +3,8 @@ public class Spreadsheet { + private static final String STRING_CLASSIFIER = "'"; + private static final String EQUALS = "="; private static final String ERROR = "#ERROR"; Map sheet = new HashMap<>(); @@ -16,10 +18,10 @@ public void set(String cell, String value) { public String evaluate(String cell) { String cellStored = sheet.get(cell); - if(cellStored.startsWith("=")){ + if(cellStored.startsWith(EQUALS)){ cellStored=cellStored.substring(1); } - if (cellStored.startsWith("'")) { + if (cellStored.startsWith(STRING_CLASSIFIER)) { return evaluateString(cellStored); } else { return evaluateInt(cellStored); @@ -27,7 +29,7 @@ public String evaluate(String cell) { } private String evaluateString(String cellStored) { - if (cellStored.endsWith("'")) { + if (cellStored.endsWith(STRING_CLASSIFIER)) { return cellStored.substring(1, cellStored.length() - 1); } else { return ERROR; diff --git a/tests/SpreadsheetTest.java b/tests/SpreadsheetTest.java index 7196f48..2d3e2c1 100644 --- a/tests/SpreadsheetTest.java +++ b/tests/SpreadsheetTest.java @@ -31,7 +31,7 @@ public void testSpreadsheetEvaluateNegInt_setB2_neg3_evaluateB2_returnneg3() { } @Test - public void testSpreadsheetInvalidInt_setB2_2A_evaluateB2_return_Error(){ + public void testSpreadsheetInvalidInt_setC3_2A_evaluateC3_return_Error(){ sheet.set("C3", "2A"); assertEquals(sheet.evaluate("C3"), "#ERROR"); @@ -39,7 +39,7 @@ public void testSpreadsheetInvalidInt_setB2_2A_evaluateB2_return_Error(){ } @Test - public void testSpreadsheetString_setA5_aString_evaluateB2_return_aString(){ + public void testSpreadsheetString_setC3_aString_evaluateC3_return_aString(){ sheet.set("C3", "'a String'"); assertEquals(sheet.evaluate("C3"), "a String"); @@ -47,7 +47,7 @@ public void testSpreadsheetString_setA5_aString_evaluateB2_return_aString(){ } @Test - public void testSpreadsheetString_setA5_aString_withoutEndQuote_evaluateB2_return_ERROR(){ + public void testSpreadsheetString_setC3_aString_withoutEndQuote_evaluateC3_return_ERROR(){ sheet.set("C3", "'a String"); assertEquals(sheet.evaluate("C3"), "#ERROR"); @@ -56,7 +56,15 @@ public void testSpreadsheetString_setA5_aString_withoutEndQuote_evaluateB2_retur @Test - public void testSpreadsheetequalSign_String_setA5_EqualsaString_evaluateB2_return_aString(){ + public void testSpreadsheetequalSign_String_setC3_EqualsaString_evaluateC3_return_aString(){ + sheet.set("C3", "='a String'"); + + assertEquals(sheet.evaluate("C3"), "a String"); + + } + + @Test + public void testSpreadsheetequalSign_Int_setC3_EqualsInt_evaluateC3_return_aString(){ sheet.set("C3", "='a String'"); assertEquals(sheet.evaluate("C3"), "a String"); From bab7f22eac8a2dd1126805353cba169b46c8d331 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 15:04:34 +0300 Subject: [PATCH 28/44] besouro automatic message --- .besouro/20161012142150776/actions.txt | 3 +++ bin/SpreadsheetTest.class | Bin 1905 -> 2080 bytes tests/SpreadsheetTest.java | 6 +++--- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.besouro/20161012142150776/actions.txt b/.besouro/20161012142150776/actions.txt index 95070c6..bf8bcc4 100644 --- a/.besouro/20161012142150776/actions.txt +++ b/.besouro/20161012142150776/actions.txt @@ -160,3 +160,6 @@ RefactoringAction 1476273834257 SpreadsheetTest.java RENAME testSpreadsheetequal RefactoringAction 1476273839270 SpreadsheetTest.java RENAME testSpreadsheetequalSign_Int_setA5_EqualsInt_evaluateB2_return_aString()=>void testSpreadsheetequalSign_Int_setC3_EqualsInt_evaluateB2_return_aString() METHOD RefactoringAction 1476273842284 SpreadsheetTest.java RENAME testSpreadsheetequalSign_Int_setC3_EqualsInt_evaluateB2_return_aString()=>void testSpreadsheetequalSign_Int_setC3_EqualsInt_evaluateC3_return_aString() METHOD EditAction 1476273844455 SpreadsheetTest.java 1509 8 16 8 +RefactoringAction 1476273857306 SpreadsheetTest.java RENAME testSpreadsheetequalSign_Int_setC3_EqualsInt_evaluateC3_return_aString()=>void testSpreadsheetequalSign_Int_setC3_Equals4_evaluateC3_return_aString() METHOD +RefactoringAction 1476273861318 SpreadsheetTest.java RENAME testSpreadsheetequalSign_Int_setC3_Equals4_evaluateC3_return_aString()=>void testSpreadsheetequalSign_Int_setC3_Equals4_evaluateC3_return_4() METHOD +EditAction 1476273874173 SpreadsheetTest.java 1485 8 16 8 diff --git a/bin/SpreadsheetTest.class b/bin/SpreadsheetTest.class index 5be344838666e91039eef62a33f632e319d6daea..03373f9d153ff5a1e0fc6b30d37e8e7e16bda2de 100644 GIT binary patch delta 225 zcmey!w?KgF)W2Q(7#J8#7(6y|ZDSH}HjX!Pj882~%qdMQNp&`!e1XYT6eyS&TvC*o zmyRr>#q7xhR8Y#S2%=^%J4pl8xfYft<`iR5{gqkC-K`|GxFoosC^a#qI3qQ+Bo(AM zI5Ryj-ZQTxzBsi6ZUBgna727jYDsBP9?TJwMOn-lIXC;V$TLq~#G*7=gI$Hwg@K#F UjX{#ZWAaB9QFb?=kC+(T0ol(=oB#j- delta 129 zcmZ1=@R5(})W2Q(7#J8#7~D5CuyKM*TT}ooMJ4hzcMRLPGB)* Date: Wed, 12 Oct 2016 15:06:11 +0300 Subject: [PATCH 29/44] besouro automatic message --- .besouro/20161012142150776/actions.txt | 9 +++++++++ .../20161012142150776/besouroEpisodes.txt | 2 ++ .../randomHeuristicEpisodes.txt | 1 + .besouro/20161012142150776/zorroEpisodes.txt | 1 + bin/SpreadsheetTest.class | Bin 2080 -> 2087 bytes tests/SpreadsheetTest.java | 9 +++++++++ 6 files changed, 22 insertions(+) diff --git a/.besouro/20161012142150776/actions.txt b/.besouro/20161012142150776/actions.txt index bf8bcc4..be713df 100644 --- a/.besouro/20161012142150776/actions.txt +++ b/.besouro/20161012142150776/actions.txt @@ -163,3 +163,12 @@ EditAction 1476273844455 SpreadsheetTest.java 1509 8 16 8 RefactoringAction 1476273857306 SpreadsheetTest.java RENAME testSpreadsheetequalSign_Int_setC3_EqualsInt_evaluateC3_return_aString()=>void testSpreadsheetequalSign_Int_setC3_Equals4_evaluateC3_return_aString() METHOD RefactoringAction 1476273861318 SpreadsheetTest.java RENAME testSpreadsheetequalSign_Int_setC3_Equals4_evaluateC3_return_aString()=>void testSpreadsheetequalSign_Int_setC3_Equals4_evaluateC3_return_4() METHOD EditAction 1476273874173 SpreadsheetTest.java 1485 8 16 8 +UnitTestCaseAction 1476273881110 SpreadsheetTest.java OK +UnitTestSessionAction 1476273881112 SpreadsheetTest.java OK +RefactoringAction 1476273929369 SpreadsheetTest.java ADD void testSpreadsheetequalSign_Int_setC3_Equals4_evaluateC3_return_4()/2 METHOD +RefactoringAction 1476273940381 SpreadsheetTest.java RENAME testSpreadsheetequalSign_Int_setC3_Equals4_evaluateC3_return_4()/2=>void testSpreadsheetequalSign_Int_setC3_Equals_evaluateC3_return_4() METHOD +RefactoringAction 1476273942393 SpreadsheetTest.java RENAME testSpreadsheetequalSign_Int_setC3_Equals_evaluateC3_return_4()=>void testSpreadsheetequalSign_Int_setC3_EqualsD3_evaluateC3_return_4() METHOD +RefactoringAction 1476273947406 SpreadsheetTest.java RENAME testSpreadsheetequalSign_Int_setC3_EqualsD3_evaluateC3_return_4()=>void testSpreadsheetequalSign_Int_setC3_EqualsD3_evaluateC3_return_Error() METHOD +RefactoringAction 1476273953418 SpreadsheetTest.java RENAME testSpreadsheetequalSign_Int_setC3_EqualsD3_evaluateC3_return_Error()=>void testSpreadsheetequalSign__Int_setC3_EqualsD3_evaluateC3_return_Error() METHOD +RefactoringAction 1476273956436 SpreadsheetTest.java RENAME testSpreadsheetequalSign__Int_setC3_EqualsD3_evaluateC3_return_Error()=>void testSpreadsheetequalSignWithError_Int_setC3_EqualsD3_evaluateC3_return_Error() METHOD +EditAction 1476273970963 SpreadsheetTest.java 1673 9 18 9 diff --git a/.besouro/20161012142150776/besouroEpisodes.txt b/.besouro/20161012142150776/besouroEpisodes.txt index 3f8b93a..24e50b6 100644 --- a/.besouro/20161012142150776/besouroEpisodes.txt +++ b/.besouro/20161012142150776/besouroEpisodes.txt @@ -30,3 +30,5 @@ 1476273310613 refactoring 2A 7 true 1476273685750 test-first 3 209 true 1476273685751 test-first 3 209 true +1476273881112 test-addition 1 173 true +1476273881113 test-addition 1 173 true diff --git a/.besouro/20161012142150776/randomHeuristicEpisodes.txt b/.besouro/20161012142150776/randomHeuristicEpisodes.txt index e392de7..bbc9e37 100644 --- a/.besouro/20161012142150776/randomHeuristicEpisodes.txt +++ b/.besouro/20161012142150776/randomHeuristicEpisodes.txt @@ -10,3 +10,4 @@ 1476273261060 production 2 7 true 1476273310613 refactoring 2A 7 true 1476273685750 test-first 3 209 true +1476273881112 test-addition 1 173 false diff --git a/.besouro/20161012142150776/zorroEpisodes.txt b/.besouro/20161012142150776/zorroEpisodes.txt index 979bd11..4f89050 100644 --- a/.besouro/20161012142150776/zorroEpisodes.txt +++ b/.besouro/20161012142150776/zorroEpisodes.txt @@ -10,3 +10,4 @@ 1476273261060 production 2 27 true 1476273310613 refactoring 2A 49 true 1476273685750 test-first 3 375 true +1476273881112 test-addition 1 195 true diff --git a/bin/SpreadsheetTest.class b/bin/SpreadsheetTest.class index 03373f9d153ff5a1e0fc6b30d37e8e7e16bda2de..413518ed7238e087a473e93d9bdb02fc9614254c 100644 GIT binary patch delta 95 zcmZ1=uv~!a)W2Q(7#J8#7<@Kz@v<=5O_pHMR56K9ElbQPO)N=uHjXb!Eh#O^i#Oq5 xaA#y-vIWwfj0}t>o8wrjnfcweG013bVc-`s*~VZX Date: Wed, 12 Oct 2016 15:06:28 +0300 Subject: [PATCH 30/44] besouro automatic message --- .besouro/20161012142150776/actions.txt | 4 ++++ .../20161012142150776/besouroEpisodes.txt | 2 ++ .../randomHeuristicEpisodes.txt | 1 + .besouro/20161012142150776/zorroEpisodes.txt | 1 + bin/SpreadsheetTest.class | Bin 2087 -> 2277 bytes tests/SpreadsheetTest.java | 7 ++++--- 6 files changed, 12 insertions(+), 3 deletions(-) diff --git a/.besouro/20161012142150776/actions.txt b/.besouro/20161012142150776/actions.txt index be713df..1cb2353 100644 --- a/.besouro/20161012142150776/actions.txt +++ b/.besouro/20161012142150776/actions.txt @@ -172,3 +172,7 @@ RefactoringAction 1476273947406 SpreadsheetTest.java RENAME testSpreadsheetequal RefactoringAction 1476273953418 SpreadsheetTest.java RENAME testSpreadsheetequalSign_Int_setC3_EqualsD3_evaluateC3_return_Error()=>void testSpreadsheetequalSign__Int_setC3_EqualsD3_evaluateC3_return_Error() METHOD RefactoringAction 1476273956436 SpreadsheetTest.java RENAME testSpreadsheetequalSign__Int_setC3_EqualsD3_evaluateC3_return_Error()=>void testSpreadsheetequalSignWithError_Int_setC3_EqualsD3_evaluateC3_return_Error() METHOD EditAction 1476273970963 SpreadsheetTest.java 1673 9 18 9 +UnitTestCaseAction 1476273977581 SpreadsheetTest.java OK +UnitTestSessionAction 1476273977582 SpreadsheetTest.java OK +RefactoringAction 1476273987769 SpreadsheetTest.java ADD String ERROR FIELD +EditAction 1476273987775 SpreadsheetTest.java 1711 9 18 9 diff --git a/.besouro/20161012142150776/besouroEpisodes.txt b/.besouro/20161012142150776/besouroEpisodes.txt index 24e50b6..e07dfcc 100644 --- a/.besouro/20161012142150776/besouroEpisodes.txt +++ b/.besouro/20161012142150776/besouroEpisodes.txt @@ -32,3 +32,5 @@ 1476273685751 test-first 3 209 true 1476273881112 test-addition 1 173 true 1476273881113 test-addition 1 173 true +1476273977582 test-addition 1 48 true +1476273977583 test-addition 1 48 true diff --git a/.besouro/20161012142150776/randomHeuristicEpisodes.txt b/.besouro/20161012142150776/randomHeuristicEpisodes.txt index bbc9e37..b71f894 100644 --- a/.besouro/20161012142150776/randomHeuristicEpisodes.txt +++ b/.besouro/20161012142150776/randomHeuristicEpisodes.txt @@ -11,3 +11,4 @@ 1476273310613 refactoring 2A 7 true 1476273685750 test-first 3 209 true 1476273881112 test-addition 1 173 false +1476273977582 test-addition 1 48 true diff --git a/.besouro/20161012142150776/zorroEpisodes.txt b/.besouro/20161012142150776/zorroEpisodes.txt index 4f89050..4562889 100644 --- a/.besouro/20161012142150776/zorroEpisodes.txt +++ b/.besouro/20161012142150776/zorroEpisodes.txt @@ -11,3 +11,4 @@ 1476273310613 refactoring 2A 49 true 1476273685750 test-first 3 375 true 1476273881112 test-addition 1 195 true +1476273977582 test-addition 1 96 true diff --git a/bin/SpreadsheetTest.class b/bin/SpreadsheetTest.class index 413518ed7238e087a473e93d9bdb02fc9614254c..88ec6e14f98cba23abfd969b80f451286320929c 100644 GIT binary patch delta 151 zcmZ23@KliN)W2Q(7#J8#82mSK#j=F?l%y7y1Q!&gCZ-f;q^6dn7M3RF1ZSq_g=dyz zxE2-V7sY$#mBbgPmN*;7yMiQ(U5w*X%Mx=+6H8KoVnwMXrA2x1V5J-kK8y^^wl2n# wQ(4Rzxi-&bX=R@LiA9OoM96!xCz~Rt4+A%YAA=-Az+^{OQFdRTJD3>!03K;CQ2+n{ delta 36 scmaDVxLkni)W2Q(7#J8#7<@Kz#j;G^&tl5Rx%n$gD>Ewt0~3Qc0PTVbuK)l5 diff --git a/tests/SpreadsheetTest.java b/tests/SpreadsheetTest.java index 3b14e4b..b09896f 100644 --- a/tests/SpreadsheetTest.java +++ b/tests/SpreadsheetTest.java @@ -4,6 +4,7 @@ public class SpreadsheetTest { + private static final String ERROR = "#ERROR"; Spreadsheet sheet = new Spreadsheet(); @Test @@ -34,7 +35,7 @@ public void testSpreadsheetEvaluateNegInt_setB2_neg3_evaluateB2_returnneg3() { public void testSpreadsheetInvalidInt_setC3_2A_evaluateC3_return_Error(){ sheet.set("C3", "2A"); - assertEquals(sheet.evaluate("C3"), "#ERROR"); + assertEquals(sheet.evaluate("C3"), ERROR); } @@ -50,7 +51,7 @@ public void testSpreadsheetString_setC3_aString_evaluateC3_return_aString(){ public void testSpreadsheetString_setC3_aString_withoutEndQuote_evaluateC3_return_ERROR(){ sheet.set("C3", "'a String"); - assertEquals(sheet.evaluate("C3"), "#ERROR"); + assertEquals(sheet.evaluate("C3"), ERROR); } @@ -75,7 +76,7 @@ public void testSpreadsheetequalSign_Int_setC3_Equals4_evaluateC3_return_4(){ public void testSpreadsheetequalSignWithError_Int_setC3_EqualsD3_evaluateC3_return_Error(){ sheet.set("C3", "=D3"); - assertEquals(sheet.evaluate("C3"), "#ERROR"); + assertEquals(sheet.evaluate("C3"), ERROR); } From b5d82e1f6e7e074a113609db568a0fef91851eb7 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 15:08:23 +0300 Subject: [PATCH 31/44] besouro automatic message --- .besouro/20161012142150776/actions.txt | 6 ++++++ bin/SpreadsheetTest.class | Bin 2277 -> 2338 bytes tests/SpreadsheetTest.java | 5 +++-- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.besouro/20161012142150776/actions.txt b/.besouro/20161012142150776/actions.txt index 1cb2353..9179cf7 100644 --- a/.besouro/20161012142150776/actions.txt +++ b/.besouro/20161012142150776/actions.txt @@ -176,3 +176,9 @@ UnitTestCaseAction 1476273977581 SpreadsheetTest.java OK UnitTestSessionAction 1476273977582 SpreadsheetTest.java OK RefactoringAction 1476273987769 SpreadsheetTest.java ADD String ERROR FIELD EditAction 1476273987775 SpreadsheetTest.java 1711 9 18 9 +RefactoringAction 1476274006994 SpreadsheetTest.java ADD void testSpreadsheetequalSignWithError_Int_setC3_EqualsD3_evaluateC3_return_Error()/2 METHOD +RefactoringAction 1476274011507 SpreadsheetTest.java REMOVE testSpreadsheetequalSignWithError_Int_setC3_EqualsD3_evaluateC3_return_Error()/2 METHOD +RefactoringAction 1476274097040 SpreadsheetTest.java RENAME testSpreadsheetequalSignWithError_Int_setC3_EqualsD3_evaluateC3_return_Error()=>void testSpreadsheetequalSignWithError_Int_setC3_Equals3_evaluateC3_return_Error() METHOD +RefactoringAction 1476274098051 SpreadsheetTest.java RENAME testSpreadsheetequalSignWithError_Int_setC3_Equals3_evaluateC3_return_Error()=>void testSpreadsheetequalSignWithError_Int_setC3_Equals_evaluateC3_return_Error() METHOD +RefactoringAction 1476274099563 SpreadsheetTest.java RENAME testSpreadsheetequalSignWithError_Int_setC3_Equals_evaluateC3_return_Error()=>void testSpreadsheetequalSignWithError_Int_setC3_Equals3D_evaluateC3_return_Error() METHOD +EditAction 1476274102749 SpreadsheetTest.java 1714 9 18 9 diff --git a/bin/SpreadsheetTest.class b/bin/SpreadsheetTest.class index 88ec6e14f98cba23abfd969b80f451286320929c..68dbc867cd1c82af4ba214819b3ec73a7bb3c242 100644 GIT binary patch literal 2338 zcmb7^Yfl?T6o%h17cb5N#-(XO(}dhG&;(=S&?Lkp#yAO$fnt!WezF!AnMKaJU61MS zs??IImHGqvqpH5+U4t)E$^A03XJ*d(oO5Q+{Qb`#e*ws%97RN6`tV0zI;YJuDbD!eSg~B*FAF3}*L#P`cfHz%z+|D}HI?J3ic@b%3ljq4 z4?~BswlvR_x=8dHf8~0v+7uXBT&f6+78<8Ah7rVV*qDqWA#kJ1BZe8oCm`^-jTmk) z@RIAvz1GKL=^r`Ab*V#ZoH+H0$5uVL!0( z5RaHB^#ziPgB2WHS*mEy1sh2$(vuMhEEqhO23=!V#*-+%W^mWB<(p0ED;rO-B49gh ztN2sPsWXS3h=Tjx=#mXr^d+tLRcuezScnU`<0)OdtxVOEwKZKoeg^f^3l><#$X3R} z8t11RHv5E%7yNM?B`MgaCBvN_L0y}58{g>KSe+9BFZ)z?JUY9lp<-dJn#or?r)dQN zR*Syh@GZP#Xa$D)igP9}kn0l*es-NEU7gSxR10@3ycUQho%!Hk(gG!|jw$eA81Gp!8n>f6ofE@2A=?yuD^n4zF^b9h2MUZx%ajwEPqK*459$ zY*(uvvGZ5-Lx%f&Qbzb5MlgpljMIv?EsG=HnfAzz!6bL4Xl?Pd;2dB6gz4o!G4sPG zeD)h=f8kmLH#ttV^~Nv?3)9s6f@^l*gIl;wOOQ3m(_ivi6YsRWfKsSExBM$+6JI6n zUE+T5d5On~d%t6;pJFq@DQd>MD05eo)DV=_M5aSo)s&2ZGE2%$Qf?V3+5b&>W~AI9 z<&fQ>!Fw`woA%B ODF;T%ckIIm4*ms3;pdS6 literal 2277 zcmb7^Yg5}s6o%h57Ykbi;v`KWO_P)ob189rNzw*PV!$*s3beq`=_ieV9V5n(T6sl( zS7%z%X=nNa`lC91W!d<`c1Ham?VjB|?{m)C%isU}@fUy!_R>fROdb3fNawV5CZ#%* zEtSTo!1TFu;S`#V*C^~ApUV>^FxFlnFlqHUtO|^;xt^=m1x6MYj|4_H{ZpC22(l*9 zFw&S5$o6?;U?MvKB20{7oP5jmSO$mAaZ?K9EdRu59yx&<*`2{rb>_ANZuZlo za2dh8V%vwXTT<1EcF}IM+d!%?@QMO6`=O`Y_wvYXxfHH>p06C``W|(sEk9@!&O@eB zXv-Ry5lGdF2JQ)nVifj$6QAM%6Q#aDe!=P$=|Bap*I2zivUn7EJ~Htc=IF_Y1RiTV z7q7c!Fpqp1j~QGqwpyzt17%_Xivp(8w(38HPLnwdL=5b>@ev?wx)Y`bz5Zh+;KR z6PUPS3A`H;m(ivlxDC%9NFqK92~yeOwX9z0=dW*N574W7tX|OsT`}-A3tnZr!~0SZ zu>LFH?^%KNUfILKTV;)MXIm}ap6V8lT;{+JgA=*!Mo-1CGm*Q%Lt!1 z!H;hY{~7lA8u33tYlE}V-1O21WS0Jf`NId?_zhFPa4dzJ{NHH%k71NvQ`E?D%#3|- z3%6+r+@W3yAF)49>n__!+v;e~F8zwB+{d}uOMDV{FYz!p`#U}#reu-DBxcCzQD(0w zO9?2;xs@(uIijp+D7Q$tL&{w(rSQKgPqmbLq}(UvftFHEK&j-OcXO#+;%V+nO)hh! z%#)JWQeGyatPW7B8p<*$E2I>(lvjx;uLmf)T*{<8BjtsbvXO|gIY80nvPQ}}DX+DZ qdLqj90OgIQVq2talk!GO`6dzN?EpnrF^iO4Qohwv-ti8mu=_8w2-al) diff --git a/tests/SpreadsheetTest.java b/tests/SpreadsheetTest.java index b09896f..75dc742 100644 --- a/tests/SpreadsheetTest.java +++ b/tests/SpreadsheetTest.java @@ -73,13 +73,14 @@ public void testSpreadsheetequalSign_Int_setC3_Equals4_evaluateC3_return_4(){ } @Test - public void testSpreadsheetequalSignWithError_Int_setC3_EqualsD3_evaluateC3_return_Error(){ + public void testSpreadsheetequalSignWithError_Int_setC3_Equals3D_evaluateC3_return_Error(){ sheet.set("C3", "=D3"); assertEquals(sheet.evaluate("C3"), ERROR); } - + + } From 65277185bfa508725aec08ce2011e46e38a447dd Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 15:11:30 +0300 Subject: [PATCH 32/44] besouro automatic message --- .besouro/20161012142150776/actions.txt | 15 +++++++++++++++ .../20161012142150776/besouroEpisodes.txt | 1 + .../randomHeuristicEpisodes.txt | 1 + .besouro/20161012142150776/zorroEpisodes.txt | 1 + bin/SpreadsheetTest.class | Bin 2338 -> 2338 bytes tests/SpreadsheetTest.java | 10 ++++++++-- 6 files changed, 26 insertions(+), 2 deletions(-) diff --git a/.besouro/20161012142150776/actions.txt b/.besouro/20161012142150776/actions.txt index 9179cf7..6c18076 100644 --- a/.besouro/20161012142150776/actions.txt +++ b/.besouro/20161012142150776/actions.txt @@ -182,3 +182,18 @@ RefactoringAction 1476274097040 SpreadsheetTest.java RENAME testSpreadsheetequal RefactoringAction 1476274098051 SpreadsheetTest.java RENAME testSpreadsheetequalSignWithError_Int_setC3_Equals3_evaluateC3_return_Error()=>void testSpreadsheetequalSignWithError_Int_setC3_Equals_evaluateC3_return_Error() METHOD RefactoringAction 1476274099563 SpreadsheetTest.java RENAME testSpreadsheetequalSignWithError_Int_setC3_Equals_evaluateC3_return_Error()=>void testSpreadsheetequalSignWithError_Int_setC3_Equals3D_evaluateC3_return_Error() METHOD EditAction 1476274102749 SpreadsheetTest.java 1714 9 18 9 +UnitTestCaseAction 1476274107668 SpreadsheetTest.java OK +UnitTestSessionAction 1476274107669 SpreadsheetTest.java OK +RefactoringAction 1476274122095 SpreadsheetTest.java ADD void testSpreadsheetequalSignWithError_Int_setC3_Equals3D_evaluateC3_return_Error()/2 METHOD +RefactoringAction 1476274135108 SpreadsheetTest.java RENAME testSpreadsheetequalSignWithError_Int_setC3_Equals3D_evaluateC3_return_Error()/2=>void testSpreadsheetequalSignWithCellRef_setC3_Equals3D_evaluateC3_return_Error() METHOD +RefactoringAction 1476274139621 SpreadsheetTest.java RENAME testSpreadsheetequalSignWithCellRef_setC3_Equals3D_evaluateC3_return_Error()=>void testSpreadsheetequalSignWithCellRef_setC3_EqualsA_evaluateC3_return_Error() METHOD +RefactoringAction 1476274140634 SpreadsheetTest.java RENAME testSpreadsheetequalSignWithCellRef_setC3_EqualsA_evaluateC3_return_Error()=>void testSpreadsheetequalSignWithCellRef_setC3_EqualsA3_evaluateC3_return_Error() METHOD +RefactoringAction 1476274150645 SpreadsheetTest.java RENAME testSpreadsheetequalSignWithCellRef_setC3_EqualsA3_evaluateC3_return_Error()=>void testSpreadsheetequalSignWithCellRef_setsetC3_EqualsA3_evaluateC3_return_Error() METHOD +RefactoringAction 1476274151657 SpreadsheetTest.java RENAME testSpreadsheetequalSignWithCellRef_setsetC3_EqualsA3_evaluateC3_return_Error()=>void testSpreadsheetequalSignWithCellRef_setAsetC3_EqualsA3_evaluateC3_return_Error() METHOD +RefactoringAction 1476274153669 SpreadsheetTest.java RENAME testSpreadsheetequalSignWithCellRef_setAsetC3_EqualsA3_evaluateC3_return_Error()=>void testSpreadsheetequalSignWithCellRef_setA3setC3_EqualsA3_evaluateC3_return_Error() METHOD +RefactoringAction 1476274156183 SpreadsheetTest.java RENAME testSpreadsheetequalSignWithCellRef_setA3setC3_EqualsA3_evaluateC3_return_Error()=>void testSpreadsheetequalSignWithCellRef_setA3 FIELD +RefactoringAction 1476274166205 SpreadsheetTest.java RENAME testSpreadsheetequalSignWithCellRef_setA3setC3_EqualsA3_evaluateC3_return_Error()=>void testSpreadsheetequalSignWithCellRef_setA313setC3_EqualsA3_evaluateC3_return_Error() METHOD +RefactoringAction 1476274168713 SpreadsheetTest.java RENAME testSpreadsheetequalSignWithCellRef_setA313setC3_EqualsA3_evaluateC3_return_Error()=>void testSpreadsheetequalSignWithCellRef_setA313_setC3_EqualsA3_evaluateC3_return_Error() METHOD +RefactoringAction 1476274188725 SpreadsheetTest.java RENAME testSpreadsheetequalSignWithCellRef_setA313_setC3_EqualsA3_evaluateC3_return_Error()=>void testSpreadsheetequalSignWithCellRef_setA313_setC3_EqualsA3_evaluateC3_return_13() METHOD +RefactoringAction 1476274191737 SpreadsheetTest.java RENAME testSpreadsheetequalSignWithCellRef_setA313_setC3_EqualsA3_evaluateC3_return_13()=>void testSpreadsheetequalSignWithCellRef_setA3_13_setC3_EqualsA3_evaluateC3_return_13() METHOD +EditAction 1476274289735 SpreadsheetTest.java 1921 10 21 10 diff --git a/.besouro/20161012142150776/besouroEpisodes.txt b/.besouro/20161012142150776/besouroEpisodes.txt index e07dfcc..d15df61 100644 --- a/.besouro/20161012142150776/besouroEpisodes.txt +++ b/.besouro/20161012142150776/besouroEpisodes.txt @@ -34,3 +34,4 @@ 1476273881113 test-addition 1 173 true 1476273977582 test-addition 1 48 true 1476273977583 test-addition 1 48 true +1476274107669 test-addition 1 119 true diff --git a/.besouro/20161012142150776/randomHeuristicEpisodes.txt b/.besouro/20161012142150776/randomHeuristicEpisodes.txt index b71f894..4a6bf87 100644 --- a/.besouro/20161012142150776/randomHeuristicEpisodes.txt +++ b/.besouro/20161012142150776/randomHeuristicEpisodes.txt @@ -12,3 +12,4 @@ 1476273685750 test-first 3 209 true 1476273881112 test-addition 1 173 false 1476273977582 test-addition 1 48 true +1476274107669 test-addition 1 119 true diff --git a/.besouro/20161012142150776/zorroEpisodes.txt b/.besouro/20161012142150776/zorroEpisodes.txt index 4562889..9a71b62 100644 --- a/.besouro/20161012142150776/zorroEpisodes.txt +++ b/.besouro/20161012142150776/zorroEpisodes.txt @@ -12,3 +12,4 @@ 1476273685750 test-first 3 375 true 1476273881112 test-addition 1 195 true 1476273977582 test-addition 1 96 true +1476274107669 test-addition 1 130 true diff --git a/bin/SpreadsheetTest.class b/bin/SpreadsheetTest.class index 68dbc867cd1c82af4ba214819b3ec73a7bb3c242..d3354f82c2e18ab2dd4c2d47fb4a39597a40226a 100644 GIT binary patch delta 19 bcmZ1^v`A>faTX?Hm&yN_q&7chv1b7QNc0Bh delta 19 bcmZ1^v`A>faTX>Q Date: Wed, 12 Oct 2016 15:20:47 +0300 Subject: [PATCH 33/44] besouro automatic message --- .besouro/20161012142150776/actions.txt | 16 ++++++++++++++++ .../20161012142150776/besouroEpisodes.txt | 9 +++++++++ .../randomHeuristicEpisodes.txt | 3 +++ .besouro/20161012142150776/zorroEpisodes.txt | 3 +++ bin/Spreadsheet.class | Bin 1821 -> 1918 bytes bin/SpreadsheetTest.class | Bin 2338 -> 2563 bytes src/Spreadsheet.java | 17 +++++++++++------ tests/SpreadsheetTest.java | 9 +++++++++ 8 files changed, 51 insertions(+), 6 deletions(-) diff --git a/.besouro/20161012142150776/actions.txt b/.besouro/20161012142150776/actions.txt index 6c18076..1a14b8c 100644 --- a/.besouro/20161012142150776/actions.txt +++ b/.besouro/20161012142150776/actions.txt @@ -197,3 +197,19 @@ RefactoringAction 1476274168713 SpreadsheetTest.java RENAME testSpreadsheetequal RefactoringAction 1476274188725 SpreadsheetTest.java RENAME testSpreadsheetequalSignWithCellRef_setA313_setC3_EqualsA3_evaluateC3_return_Error()=>void testSpreadsheetequalSignWithCellRef_setA313_setC3_EqualsA3_evaluateC3_return_13() METHOD RefactoringAction 1476274191737 SpreadsheetTest.java RENAME testSpreadsheetequalSignWithCellRef_setA313_setC3_EqualsA3_evaluateC3_return_13()=>void testSpreadsheetequalSignWithCellRef_setA3_13_setC3_EqualsA3_evaluateC3_return_13() METHOD EditAction 1476274289735 SpreadsheetTest.java 1921 10 21 10 +UnitTestCaseAction 1476274298157 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476274298158 SpreadsheetTest.java FAIL +UnitTestCaseAction 1476274409526 SpreadsheetTest.java OK +UnitTestSessionAction 1476274409528 SpreadsheetTest.java OK +UnitTestCaseAction 1476274462300 SpreadsheetTest.java OK +UnitTestSessionAction 1476274462301 SpreadsheetTest.java OK +RefactoringAction 1476274525810 Spreadsheet.java ADD String evaluateFormula() METHOD +RefactoringAction 1476274532829 Spreadsheet.java RENAME evaluateFormula()=>String evaluateFormula(String) METHOD +RefactoringAction 1476274635482 Spreadsheet.java REMOVE evaluateFormula(String) METHOD +UnitTestCaseAction 1476274766502 SpreadsheetTest.java OK +UnitTestSessionAction 1476274766504 SpreadsheetTest.java OK +RefactoringAction 1476274801946 SpreadsheetTest.java ADD void testSpreadsheetequalSignWithCellRef_setA3_13_setC3_EqualsA3_evaluateC3_return_13()/2 METHOD +RefactoringAction 1476274814459 SpreadsheetTest.java RENAME testSpreadsheetequalSignWithCellRef_setA3_13_setC3_EqualsA3_evaluateC3_return_13()/2=>void testSpreadsheetequalSignWithCellRefWithString_setA3_13_setC3_EqualsA3_evaluateC3_return_13() METHOD +RefactoringAction 1476274822473 SpreadsheetTest.java RENAME testSpreadsheetequalSignWithCellRefWithString_setA3_13_setC3_EqualsA3_evaluateC3_return_13()=>void testSpreadsheetequalSignWithCellRefWithString_setA3_aString_setC3_EqualsA3_evaluateC3_return_13() METHOD +RefactoringAction 1476274828985 SpreadsheetTest.java RENAME testSpreadsheetequalSignWithCellRefWithString_setA3_aString_setC3_EqualsA3_evaluateC3_return_13()=>void testSpreadsheetequalSignWithCellRefWithString_setA3_aString_setC3_EqualsA3_evaluateC3_return_aString() METHOD +EditAction 1476274846643 SpreadsheetTest.java 2167 11 24 11 diff --git a/.besouro/20161012142150776/besouroEpisodes.txt b/.besouro/20161012142150776/besouroEpisodes.txt index d15df61..4c8c214 100644 --- a/.besouro/20161012142150776/besouroEpisodes.txt +++ b/.besouro/20161012142150776/besouroEpisodes.txt @@ -35,3 +35,12 @@ 1476273977582 test-addition 1 48 true 1476273977583 test-addition 1 48 true 1476274107669 test-addition 1 119 true +1476274409528 test-addition 2 287 true +1476274409529 test-addition 1 287 true +1476274409530 test-addition 2 287 true +1476274409531 test-addition 1 287 true +1476274462301 regression 1 0 true +1476274766504 refactoring 2B 240 true +1476274766505 refactoring 2B 240 true +1476274766506 refactoring 2B 240 true +1476274766507 regression 1 240 true diff --git a/.besouro/20161012142150776/randomHeuristicEpisodes.txt b/.besouro/20161012142150776/randomHeuristicEpisodes.txt index 4a6bf87..3377f24 100644 --- a/.besouro/20161012142150776/randomHeuristicEpisodes.txt +++ b/.besouro/20161012142150776/randomHeuristicEpisodes.txt @@ -13,3 +13,6 @@ 1476273881112 test-addition 1 173 false 1476273977582 test-addition 1 48 true 1476274107669 test-addition 1 119 true +1476274409528 test-addition 2 287 false +1476274462301 regression 1 0 false +1476274766504 refactoring 2B 240 true diff --git a/.besouro/20161012142150776/zorroEpisodes.txt b/.besouro/20161012142150776/zorroEpisodes.txt index 9a71b62..10d7395 100644 --- a/.besouro/20161012142150776/zorroEpisodes.txt +++ b/.besouro/20161012142150776/zorroEpisodes.txt @@ -13,3 +13,6 @@ 1476273881112 test-addition 1 195 true 1476273977582 test-addition 1 96 true 1476274107669 test-addition 1 130 true +1476274409528 test-addition 2 301 true +1476274462301 regression 1 52 true +1476274766504 refactoring 2B 304 true diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 4d652652980884b46db62529f6c43117fb45f6f9..4e8763334cb973c105cfba23ad136fb48554eabb 100644 GIT binary patch delta 656 zcmYLFU279j5IuJ{Zj#NqVlZh6RiibM%`Q#ELjA5*YZ}|NYHFj^s<+7{O07C@b|r^wridMOle z*}xS{Go+fEe!x5a*1UMdkSQ)~@NHi9xZf@>u5E~BaM4=P!EnvMS&Ylybptmr&R~jd z?!DxJs0ZDS-9`-hZu*PB7?FxgKnGMN7vr9>mdLIK00B z*^9R58hD76exw%I;}1X7Z>;wY3RF7CZ0RG$>>Zp^@D-Npq*DAZVhnAj@c31SS!Na zFm3M7V-9T!By<`X6o=kf>djO0fA1WYhThUq1Al2q9Kk)f7eXY o0KfzepiI>YEq$i{QyVGl=_H7?iYFu^6=|!g>|}UKnSy7308J=zj{pDw delta 589 zcmYL_%Wl(P5QV?rc9YaGMnp{rmy$*;sEH$0LX|*>TcJ<_HMbN3NGweAD=An81=DRF z!mBP2uMh+Zf(2sDQ?TY4s)}(^+Rgkvb3EtFnLYQTYyaN+@e^3)#b^7kF|biwak$F7 z!qwYB_#udOEADSa-ITiSu#!^w|5P)I751hM!&dyZuRDq(tvJ|x;|K3Hf>)uosd3BU zHWw5*9d+Kfx8h#fyyMX1t|Alas2leb=3=dByTYtHT*6nB7MsZ*W2S2JfJa##DvrGl zwu7ZGh`LMStGl}I@R(MzYo4{9C@P6>RlclRpVT11z?4|$>t8wTeP_Yo7d5|8$d6dw zVY*?BxF|3;f%V2WE)UasZ75SFXQZAaBXtIsBF8B)OPO<=pus6B!puz^ff$?3=9k=43QhT9#XynNvc#Oy#FA8?SW#+8X;B_f4F^LIBLkBo zkPZRTAbuDl1GBB8F(U(4aDHh~a;jTqPAVgV2-woe|5=O}xi=fJzGj{r$RUyz&A`mS z2y~vR))od4p+KSFZ48QFrln9QoVks`R48}{gXTt{LM8?=ASuMa0whBjxEaEL{0IgW bhA0Mcpa>7dFa`+*Ng$7rAsk3DF+>0W)(=2T delta 36 scmZn`StP`D>ff$?3=9k=3_%;Y9 Date: Wed, 12 Oct 2016 15:21:52 +0300 Subject: [PATCH 34/44] besouro automatic message --- .besouro/20161012142150776/actions.txt | 8 ++++++++ .../20161012142150776/besouroEpisodes.txt | 2 ++ .../randomHeuristicEpisodes.txt | 1 + .besouro/20161012142150776/zorroEpisodes.txt | 1 + bin/SpreadsheetTest.class | Bin 2563 -> 2783 bytes tests/SpreadsheetTest.java | 9 +++++++++ 6 files changed, 21 insertions(+) diff --git a/.besouro/20161012142150776/actions.txt b/.besouro/20161012142150776/actions.txt index 1a14b8c..d21acc8 100644 --- a/.besouro/20161012142150776/actions.txt +++ b/.besouro/20161012142150776/actions.txt @@ -213,3 +213,11 @@ RefactoringAction 1476274814459 SpreadsheetTest.java RENAME testSpreadsheetequal RefactoringAction 1476274822473 SpreadsheetTest.java RENAME testSpreadsheetequalSignWithCellRefWithString_setA3_13_setC3_EqualsA3_evaluateC3_return_13()=>void testSpreadsheetequalSignWithCellRefWithString_setA3_aString_setC3_EqualsA3_evaluateC3_return_13() METHOD RefactoringAction 1476274828985 SpreadsheetTest.java RENAME testSpreadsheetequalSignWithCellRefWithString_setA3_aString_setC3_EqualsA3_evaluateC3_return_13()=>void testSpreadsheetequalSignWithCellRefWithString_setA3_aString_setC3_EqualsA3_evaluateC3_return_aString() METHOD EditAction 1476274846643 SpreadsheetTest.java 2167 11 24 11 +UnitTestCaseAction 1476274853106 SpreadsheetTest.java OK +UnitTestSessionAction 1476274853107 SpreadsheetTest.java OK +RefactoringAction 1476274859521 SpreadsheetTest.java ADD void testSpreadsheetequalSignWithCellRefWithString_setA3_aString_setC3_EqualsA3_evaluateC3_return_aString()/2 METHOD +RefactoringAction 1476274869034 SpreadsheetTest.java RENAME testSpreadsheetequalSignWithCellRefWithString_setA3_aString_setC3_EqualsA3_evaluateC3_return_aString()/2=>void testSpreadsheetequalSignWithCellRefWithwrongInt_setA3_aString_setC3_EqualsA3_evaluateC3_return_aString() METHOD +RefactoringAction 1476274878548 SpreadsheetTest.java RENAME testSpreadsheetequalSignWithCellRefWithwrongInt_setA3_aString_setC3_EqualsA3_evaluateC3_return_aString()=>void testSpreadsheetequalSignWithCellRefWithwrongInt_setA3_4_setC3_EqualsA3_evaluateC3_return_aString() METHOD +RefactoringAction 1476274879598 SpreadsheetTest.java RENAME testSpreadsheetequalSignWithCellRefWithwrongInt_setA3_4_setC3_EqualsA3_evaluateC3_return_aString()=>void testSpreadsheetequalSignWithCellRefWithwrongInt_setA3_4G_setC3_EqualsA3_evaluateC3_return_aString() METHOD +RefactoringAction 1476274889610 SpreadsheetTest.java RENAME testSpreadsheetequalSignWithCellRefWithwrongInt_setA3_4G_setC3_EqualsA3_evaluateC3_return_aString()=>void testSpreadsheetequalSignWithCellRefWithwrongInt_setA3_4G_setC3_EqualsA3_evaluateC3_return_Error() METHOD +EditAction 1476274911975 SpreadsheetTest.java 2395 12 27 12 diff --git a/.besouro/20161012142150776/besouroEpisodes.txt b/.besouro/20161012142150776/besouroEpisodes.txt index 4c8c214..5ff5cc1 100644 --- a/.besouro/20161012142150776/besouroEpisodes.txt +++ b/.besouro/20161012142150776/besouroEpisodes.txt @@ -44,3 +44,5 @@ 1476274766505 refactoring 2B 240 true 1476274766506 refactoring 2B 240 true 1476274766507 regression 1 240 true +1476274853107 test-addition 1 51 true +1476274853108 test-addition 1 51 true diff --git a/.besouro/20161012142150776/randomHeuristicEpisodes.txt b/.besouro/20161012142150776/randomHeuristicEpisodes.txt index 3377f24..70f51e1 100644 --- a/.besouro/20161012142150776/randomHeuristicEpisodes.txt +++ b/.besouro/20161012142150776/randomHeuristicEpisodes.txt @@ -16,3 +16,4 @@ 1476274409528 test-addition 2 287 false 1476274462301 regression 1 0 false 1476274766504 refactoring 2B 240 true +1476274853107 test-addition 1 51 true diff --git a/.besouro/20161012142150776/zorroEpisodes.txt b/.besouro/20161012142150776/zorroEpisodes.txt index 10d7395..e9cd542 100644 --- a/.besouro/20161012142150776/zorroEpisodes.txt +++ b/.besouro/20161012142150776/zorroEpisodes.txt @@ -16,3 +16,4 @@ 1476274409528 test-addition 2 301 true 1476274462301 regression 1 52 true 1476274766504 refactoring 2B 304 true +1476274853107 test-addition 1 86 true diff --git a/bin/SpreadsheetTest.class b/bin/SpreadsheetTest.class index 1bed70b19ce2ad8cff6d09a1e0195646cfc02025..2ba0cd0a93fdf40d5f954fdb9695ad7c39be2195 100644 GIT binary patch delta 135 zcmZn`xi89f>ff$?3=9k=3{e}o{8$-NCckA-mI%)*$p|hf%FIiTFHS9SG>%V%@Fq*L zDou`OW}h6!>dwfsc^+#5%jA#jB9rHG3NYGDUdJghc`rMkz7PWo(8M?fZiaXUF@{72 e6^3L6ai9nf10#@BWsqQy1k#KQ5kQiOArb)H;UDn; delta 36 scmcaF+AP9#>ff$?3=9k=43QhT{8%UNXLV)d-ptCDz{1MFz{C&%0N<(!ng9R* diff --git a/tests/SpreadsheetTest.java b/tests/SpreadsheetTest.java index 6fda739..9a2d083 100644 --- a/tests/SpreadsheetTest.java +++ b/tests/SpreadsheetTest.java @@ -97,5 +97,14 @@ public void testSpreadsheetequalSignWithCellRefWithString_setA3_aString_setC3_Eq assertEquals(sheet.evaluate("C3"), "a String"); } + + @Test + public void testSpreadsheetequalSignWithCellRefWithwrongInt_setA3_4G_setC3_EqualsA3_evaluateC3_return_Error(){ + sheet.set("A3", "4G"); + sheet.set("C3", "=A3"); + + assertEquals(sheet.evaluate("C3"), ERROR); + + } } From 714e7fc8b92ff5b0b78582a7dca0b197ed2e1b9b Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 15:24:24 +0300 Subject: [PATCH 35/44] besouro automatic message --- .besouro/20161012142150776/actions.txt | 21 ++++++++++++++++++ .../20161012142150776/besouroEpisodes.txt | 2 ++ .../randomHeuristicEpisodes.txt | 1 + .besouro/20161012142150776/zorroEpisodes.txt | 1 + bin/SpreadsheetTest.class | Bin 2783 -> 3006 bytes tests/SpreadsheetTest.java | 9 ++++++++ 6 files changed, 34 insertions(+) diff --git a/.besouro/20161012142150776/actions.txt b/.besouro/20161012142150776/actions.txt index d21acc8..60280f1 100644 --- a/.besouro/20161012142150776/actions.txt +++ b/.besouro/20161012142150776/actions.txt @@ -221,3 +221,24 @@ RefactoringAction 1476274878548 SpreadsheetTest.java RENAME testSpreadsheetequal RefactoringAction 1476274879598 SpreadsheetTest.java RENAME testSpreadsheetequalSignWithCellRefWithwrongInt_setA3_4_setC3_EqualsA3_evaluateC3_return_aString()=>void testSpreadsheetequalSignWithCellRefWithwrongInt_setA3_4G_setC3_EqualsA3_evaluateC3_return_aString() METHOD RefactoringAction 1476274889610 SpreadsheetTest.java RENAME testSpreadsheetequalSignWithCellRefWithwrongInt_setA3_4G_setC3_EqualsA3_evaluateC3_return_aString()=>void testSpreadsheetequalSignWithCellRefWithwrongInt_setA3_4G_setC3_EqualsA3_evaluateC3_return_Error() METHOD EditAction 1476274911975 SpreadsheetTest.java 2395 12 27 12 +UnitTestCaseAction 1476274919061 SpreadsheetTest.java OK +UnitTestSessionAction 1476274919063 SpreadsheetTest.java OK +RefactoringAction 1476274982176 SpreadsheetTest.java ADD void testSpreadsheetequalSignWithCellRefWithwrongInt_setA3_4G_setC3_EqualsA3_evaluateC3_return_Error()/2 METHOD +RefactoringAction 1476274989689 SpreadsheetTest.java RENAME testSpreadsheetequalSignWithCellRefWithwrongInt_setA3_4G_setC3_EqualsA3_evaluateC3_return_Error()/2=>void testSpreadsheetCircular_setA3_4G_setC3_EqualsA3_evaluateC3_return_Error() METHOD +RefactoringAction 1476274991202 SpreadsheetTest.java RENAME testSpreadsheetCircular_setA3_4G_setC3_EqualsA3_evaluateC3_return_Error()=>void testSpreadsheetCircularRef_setA3_4G_setC3_EqualsA3_evaluateC3_return_Error() METHOD +RefactoringAction 1476274994715 SpreadsheetTest.java RENAME testSpreadsheetCircularRef_setA3_4G_setC3_EqualsA3_evaluateC3_return_Error()=>void testSpreadsheetCircularRef_setA3__setC3_EqualsA3_evaluateC3_return_Error() METHOD +RefactoringAction 1476274996227 SpreadsheetTest.java RENAME testSpreadsheetCircularRef_setA3__setC3_EqualsA3_evaluateC3_return_Error()=>void testSpreadsheetCircularRef_setA3_eq_setC3_EqualsA3_evaluateC3_return_Error() METHOD +RefactoringAction 1476274997239 SpreadsheetTest.java RENAME testSpreadsheetCircularRef_setA3_eq_setC3_EqualsA3_evaluateC3_return_Error()=>void testSpreadsheetCircularRef_setA3_eqA_setC3_EqualsA3_evaluateC3_return_Error() METHOD +RefactoringAction 1476274999251 SpreadsheetTest.java RENAME testSpreadsheetCircularRef_setA3_eqA_setC3_EqualsA3_evaluateC3_return_Error()=>void testSpreadsheetCircularRef_setA3_eq_setC3_EqualsA3_evaluateC3_return_Error() METHOD +RefactoringAction 1476275001758 SpreadsheetTest.java RENAME testSpreadsheetCircularRef_setA3_eq_setC3_EqualsA3_evaluateC3_return_Error()=>void testSpreadsheetCircularRef_setA1_eq_setC3_EqualsA3_evaluateC3_return_Error() METHOD +RefactoringAction 1476275003768 SpreadsheetTest.java RENAME testSpreadsheetCircularRef_setA1_eq_setC3_EqualsA3_evaluateC3_return_Error()=>void testSpreadsheetCircularRef_setA1_eqA5_setC3_EqualsA3_evaluateC3_return_Error() METHOD +RefactoringAction 1476275007280 SpreadsheetTest.java RENAME testSpreadsheetCircularRef_setA1_eqA5_setC3_EqualsA3_evaluateC3_return_Error()=>void testSpreadsheetCircularRef_setA1_eqA5_set_EqualsA3_evaluateC3_return_Error() METHOD +RefactoringAction 1476275013793 SpreadsheetTest.java RENAME testSpreadsheetCircularRef_setA1_eqA5_set_EqualsA3_evaluateC3_return_Error()=>void testSpreadsheetCircularRef_setA1_eqA5_setA_EqualsA3_evaluateC3_return_Error() METHOD +RefactoringAction 1476275014807 SpreadsheetTest.java RENAME testSpreadsheetCircularRef_setA1_eqA5_setA_EqualsA3_evaluateC3_return_Error()=>void testSpreadsheetCircularRef_setA1_eqA5_setA5_EqualsA3_evaluateC3_return_Error() METHOD +RefactoringAction 1476275017324 SpreadsheetTest.java RENAME testSpreadsheetCircularRef_setA1_eqA5_setA5_EqualsA3_evaluateC3_return_Error()=>void testSpreadsheetCircularRef_setA1_eqA5_setA5_3_evaluateC3_return_Error() METHOD +RefactoringAction 1476275019834 SpreadsheetTest.java RENAME testSpreadsheetCircularRef_setA1_eqA5_setA5_3_evaluateC3_return_Error()=>void testSpreadsheetCircularRef_setA1_eqA5_setA5_eqA1_evaluateC3_return_Error() METHOD +RefactoringAction 1476275022845 SpreadsheetTest.java RENAME testSpreadsheetCircularRef_setA1_eqA5_setA5_eqA1_evaluateC3_return_Error()=>void testSpreadsheetCircularRef_setA1_eqA5_setA5_eqA1_evaluate_return_Error() METHOD +RefactoringAction 1476275024356 SpreadsheetTest.java RENAME testSpreadsheetCircularRef_setA1_eqA5_setA5_eqA1_evaluate_return_Error()=>void testSpreadsheetCircularRef_setA1_eqA5_setA5_eqA1_evaluateA5_return_Error() METHOD +RefactoringAction 1476275029868 SpreadsheetTest.java RENAME testSpreadsheetCircularRef_setA1_eqA5_setA5_eqA1_evaluateA5_return_Error()=>void testSpreadsheetCircularRef_setA1_eqA5_setA5_eqA1_evaluateA5_return_Circula() METHOD +RefactoringAction 1476275031879 SpreadsheetTest.java RENAME testSpreadsheetCircularRef_setA1_eqA5_setA5_eqA1_evaluateA5_return_Circula()=>void testSpreadsheetCircularRef_setA1_eqA5_setA5_eqA1_evaluateA5_return_CircularErr() METHOD +EditAction 1476275063915 SpreadsheetTest.java 2613 13 30 13 diff --git a/.besouro/20161012142150776/besouroEpisodes.txt b/.besouro/20161012142150776/besouroEpisodes.txt index 5ff5cc1..15d96de 100644 --- a/.besouro/20161012142150776/besouroEpisodes.txt +++ b/.besouro/20161012142150776/besouroEpisodes.txt @@ -46,3 +46,5 @@ 1476274766507 regression 1 240 true 1476274853107 test-addition 1 51 true 1476274853108 test-addition 1 51 true +1476274919063 test-addition 1 59 true +1476274919064 test-addition 1 59 true diff --git a/.besouro/20161012142150776/randomHeuristicEpisodes.txt b/.besouro/20161012142150776/randomHeuristicEpisodes.txt index 70f51e1..45b5423 100644 --- a/.besouro/20161012142150776/randomHeuristicEpisodes.txt +++ b/.besouro/20161012142150776/randomHeuristicEpisodes.txt @@ -17,3 +17,4 @@ 1476274462301 regression 1 0 false 1476274766504 refactoring 2B 240 true 1476274853107 test-addition 1 51 true +1476274919063 test-addition 1 59 true diff --git a/.besouro/20161012142150776/zorroEpisodes.txt b/.besouro/20161012142150776/zorroEpisodes.txt index e9cd542..f6e861b 100644 --- a/.besouro/20161012142150776/zorroEpisodes.txt +++ b/.besouro/20161012142150776/zorroEpisodes.txt @@ -17,3 +17,4 @@ 1476274462301 regression 1 52 true 1476274766504 refactoring 2B 304 true 1476274853107 test-addition 1 86 true +1476274919063 test-addition 1 65 true diff --git a/bin/SpreadsheetTest.class b/bin/SpreadsheetTest.class index 2ba0cd0a93fdf40d5f954fdb9695ad7c39be2195..77e35de6d4244b02b5a244182ebe7676fdb60b91 100644 GIT binary patch delta 149 zcmcaFx=)z$)vpJvbDhn$E0~13e0PW}si~s-t diff --git a/tests/SpreadsheetTest.java b/tests/SpreadsheetTest.java index 9a2d083..6bc617b 100644 --- a/tests/SpreadsheetTest.java +++ b/tests/SpreadsheetTest.java @@ -106,5 +106,14 @@ public void testSpreadsheetequalSignWithCellRefWithwrongInt_setA3_4G_setC3_Equal assertEquals(sheet.evaluate("C3"), ERROR); } + + @Test + public void testSpreadsheetCircularRef_setA1_eqA5_setA5_eqA1_evaluateA5_return_CircularErr(){ + sheet.set("A1", "=A5"); + sheet.set("A5", "=A1"); + + assertEquals(sheet.evaluate("A5"), "#CIRCULAR"); + + } } From dc4c2ed18e91d161d036a11a4c40095d20272c84 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 15:31:14 +0300 Subject: [PATCH 36/44] besouro automatic message --- .besouro/20161012142150776/actions.txt | 12 ++++++++++++ .../20161012142150776/besouroEpisodes.txt | 4 ++++ .../randomHeuristicEpisodes.txt | 1 + .besouro/20161012142150776/zorroEpisodes.txt | 1 + bin/Spreadsheet.class | Bin 1918 -> 1988 bytes bin/SpreadsheetTest.class | Bin 3006 -> 3245 bytes src/Spreadsheet.java | 3 +++ tests/SpreadsheetTest.java | 8 ++++++++ 8 files changed, 29 insertions(+) diff --git a/.besouro/20161012142150776/actions.txt b/.besouro/20161012142150776/actions.txt index 60280f1..8f4ad3c 100644 --- a/.besouro/20161012142150776/actions.txt +++ b/.besouro/20161012142150776/actions.txt @@ -242,3 +242,15 @@ RefactoringAction 1476275024356 SpreadsheetTest.java RENAME testSpreadsheetCircu RefactoringAction 1476275029868 SpreadsheetTest.java RENAME testSpreadsheetCircularRef_setA1_eqA5_setA5_eqA1_evaluateA5_return_Error()=>void testSpreadsheetCircularRef_setA1_eqA5_setA5_eqA1_evaluateA5_return_Circula() METHOD RefactoringAction 1476275031879 SpreadsheetTest.java RENAME testSpreadsheetCircularRef_setA1_eqA5_setA5_eqA1_evaluateA5_return_Circula()=>void testSpreadsheetCircularRef_setA1_eqA5_setA5_eqA1_evaluateA5_return_CircularErr() METHOD EditAction 1476275063915 SpreadsheetTest.java 2613 13 30 13 +UnitTestCaseAction 1476275070073 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476275070074 SpreadsheetTest.java FAIL +UnitTestCaseAction 1476275247004 SpreadsheetTest.java OK +UnitTestSessionAction 1476275247005 SpreadsheetTest.java OK +RefactoringAction 1476275391550 SpreadsheetTest.java ADD void testSpreadsheetCircularRef_setA1_eqA5_setA5_eqA1_evaluateA5_return_CircularErr()/2 METHOD +RefactoringAction 1476275400564 SpreadsheetTest.java RENAME testSpreadsheetCircularRef_setA1_eqA5_setA5_eqA1_evaluateA5_return_CircularErr()/2=>void testSpreadsheetFormulaCal_setA1_eqA5_setA5_eqA1_evaluateA5_return_CircularErr() METHOD +RefactoringAction 1476275401576 SpreadsheetTest.java RENAME testSpreadsheetFormulaCal_setA1_eqA5_setA5_eqA1_evaluateA5_return_CircularErr()=>void testSpreadsheetFormulaCalcula_setA1_eqA5_setA5_eqA1_evaluateA5_return_CircularErr() METHOD +RefactoringAction 1476275402590 SpreadsheetTest.java RENAME testSpreadsheetFormulaCalcula_setA1_eqA5_setA5_eqA1_evaluateA5_return_CircularErr()=>void testSpreadsheetFormulaCalculation_setA1_eqA5_setA5_eqA1_evaluateA5_return_CircularErr() METHOD +RefactoringAction 1476275419102 SpreadsheetTest.java RENAME testSpreadsheetFormulaCalculation_setA1_eqA5_setA5_eqA1_evaluateA5_return_CircularErr()=>void testSpreadsheetFormulaCalculation_evaluateFormula() METHOD +RefactoringAction 1476275445122 SpreadsheetTest.java RENAME testSpreadsheetFormulaCalculation_evaluateFormula()=>void testSpreadsheetFormulaCalculation_evaluateAddition() METHOD +RefactoringAction 1476275447133 SpreadsheetTest.java RENAME testSpreadsheetFormulaCalculation_evaluateAddition()=>void testSpreadsheetFormulaCalculation_evaluateAdditionFormula() METHOD +EditAction 1476275473811 SpreadsheetTest.java 2777 14 32 14 diff --git a/.besouro/20161012142150776/besouroEpisodes.txt b/.besouro/20161012142150776/besouroEpisodes.txt index 15d96de..73a3c12 100644 --- a/.besouro/20161012142150776/besouroEpisodes.txt +++ b/.besouro/20161012142150776/besouroEpisodes.txt @@ -48,3 +48,7 @@ 1476274853108 test-addition 1 51 true 1476274919063 test-addition 1 59 true 1476274919064 test-addition 1 59 true +1476275247005 test-addition 2 264 true +1476275247006 test-addition 1 264 true +1476275247007 test-addition 2 264 true +1476275247008 test-addition 1 264 true diff --git a/.besouro/20161012142150776/randomHeuristicEpisodes.txt b/.besouro/20161012142150776/randomHeuristicEpisodes.txt index 45b5423..7aa8847 100644 --- a/.besouro/20161012142150776/randomHeuristicEpisodes.txt +++ b/.besouro/20161012142150776/randomHeuristicEpisodes.txt @@ -18,3 +18,4 @@ 1476274766504 refactoring 2B 240 true 1476274853107 test-addition 1 51 true 1476274919063 test-addition 1 59 true +1476275247005 test-addition 2 264 true diff --git a/.besouro/20161012142150776/zorroEpisodes.txt b/.besouro/20161012142150776/zorroEpisodes.txt index f6e861b..fb2c0c6 100644 --- a/.besouro/20161012142150776/zorroEpisodes.txt +++ b/.besouro/20161012142150776/zorroEpisodes.txt @@ -18,3 +18,4 @@ 1476274766504 refactoring 2B 304 true 1476274853107 test-addition 1 86 true 1476274919063 test-addition 1 65 true +1476275247005 test-addition 2 327 true diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 4e8763334cb973c105cfba23ad136fb48554eabb..73bf9f749b510bdce85bb28c9bce1d3473695a7b 100644 GIT binary patch delta 651 zcmYL{&u$V?6vlsdX3F2m5J{nEP})!vU`VRAN!6HW1*}-8mRiwj)lo*MAtbi6+dc#< zR=xs8LsJ*Vg)0{>d;%Y&X*>f>ySewC?>pyw-#NJ_)~`tD_sRDkzycq>gpztS%aX}` z?karlr#+{=8=$BNrVHg-VWYBC3!!*mGEdrjJv1qkR#@)7)82Es?s|7;yVLZj6_ZMD zO}}>QiOCv^ih$c`?AEuttq@t(O`ftLB5k+R?6wqoCR_H1y2)*xE8>}Q@1Hi=`=duv zFWK_*N^#+%v+vBcolbME-08YacgN&4Z+gf2Rl`xFdQ~I!wP<`+2Y=DfWvaKiZzSy_ zW;K42t>&ZQAq#yL^Tv>yRgcUcaYv)i>}fF0^k{p?y*|EZVUWuYDGl<`z^FKw%OA2V z;31C&qM>s|&Kw~*C$We#b-)ytNeFmRc6o^sNmiJak!RQ>O-fRy#|Gt|kw~m!eGu7!tPU>T#clZHVET(HQb

fpV&a9D8hM;UW zCL*4Ad|Z4cp5Vnu+>_K%F`+9x<&U*C>-M1PbyLFl@QcmyyiqX#*O}mkpz{Re2c3@< cKI_A8G&42!HN}6!6WbhsA8O=f{t{~nSW;ffByMi+_UpP_P%}t=J7t{E4rh&WO0Vs zJc=t8SD97V{+2g->xKSGxG@X{Y3iCqC)(88i#IKnSx{vCU~RKM4A=8CxMgvhI|_5; z2ZL~3q1PMTG;z=394m@)y&L`1CZb<@vG$Nh8TyJNue~j=HS&T%s~d#=z~8WV%#)~U z%o)!Vwdjpe`}oRur*iMn&}HVO$TrK{71u~O+iQNJ;(p=0#tylrn{Y99OWB0^ak$In zxasb)6ic5@RqhjH<(|N%%#@sCOw;5jZTT%q#RX=lNyW^*mb}L$5>*^bS%J+0*D?Dt zOjqC>+Hcw!8nytkHmN8Jyow<)Ogrf?H+CpGhLg}U))MZdC+&_Udp8eFv;*#QmMz1sKY4^(Gs*Rj!*yRsc_(_ Zz`jye`c`@V*OGY{)k(<|FN8+p2WP8;$VnnWMH;+H05B3XJlXk z(TQLILk@;yMg~r0XU`z#P#?!2Mh33n{L-SydTb7ie4F#xyjUk6;t-jf$Hf;RD-^Sh zK~ZZ9gNRU^Py(E}jlonXX$OPmMxg7N7{q|25CaR4EMVYfC Date: Wed, 12 Oct 2016 15:52:28 +0300 Subject: [PATCH 37/44] besouro automatic message --- .besouro/20161012142150776/actions.txt | 25 ++++++++++++++++++ .../20161012142150776/besouroEpisodes.txt | 21 +++++++++++++++ .../randomHeuristicEpisodes.txt | 2 ++ .besouro/20161012142150776/zorroEpisodes.txt | 2 ++ bin/Spreadsheet.class | Bin 1988 -> 2280 bytes bin/SpreadsheetTest.class | Bin 3245 -> 3424 bytes src/Spreadsheet.java | 23 ++++++++++------ tests/SpreadsheetTest.java | 8 ++++++ 8 files changed, 73 insertions(+), 8 deletions(-) diff --git a/.besouro/20161012142150776/actions.txt b/.besouro/20161012142150776/actions.txt index 8f4ad3c..66c39b5 100644 --- a/.besouro/20161012142150776/actions.txt +++ b/.besouro/20161012142150776/actions.txt @@ -254,3 +254,28 @@ RefactoringAction 1476275419102 SpreadsheetTest.java RENAME testSpreadsheetFormu RefactoringAction 1476275445122 SpreadsheetTest.java RENAME testSpreadsheetFormulaCalculation_evaluateFormula()=>void testSpreadsheetFormulaCalculation_evaluateAddition() METHOD RefactoringAction 1476275447133 SpreadsheetTest.java RENAME testSpreadsheetFormulaCalculation_evaluateAddition()=>void testSpreadsheetFormulaCalculation_evaluateAdditionFormula() METHOD EditAction 1476275473811 SpreadsheetTest.java 2777 14 32 14 +UnitTestCaseAction 1476275481215 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476275481216 SpreadsheetTest.java FAIL +UnitTestCaseAction 1476275956683 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476275956686 Rerun SpreadsheetTest.testSpreadsheetFormulaCalculation_evaluateAdditionFormula FAIL +UnitTestCaseAction 1476276030283 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476276030285 Rerun SpreadsheetTest.testSpreadsheetFormulaCalculation_evaluateAdditionFormula FAIL +UnitTestCaseAction 1476276075485 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476276075486 Rerun SpreadsheetTest.testSpreadsheetFormulaCalculation_evaluateAdditionFormula FAIL +UnitTestCaseAction 1476276447816 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476276447817 SpreadsheetTest.java FAIL +UnitTestCaseAction 1476276506974 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476276506976 Rerun SpreadsheetTest.testSpreadsheetequalSignWithError_Int_setC3_Equals3D_evaluateC3_return_Error FAIL +UnitTestCaseAction 1476276592375 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476276592376 SpreadsheetTest.java FAIL +UnitTestCaseAction 1476276627273 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476276627274 SpreadsheetTest.java FAIL +UnitTestCaseAction 1476276690109 SpreadsheetTest.java OK +UnitTestSessionAction 1476276690110 SpreadsheetTest.java OK +RefactoringAction 1476276703369 Spreadsheet.java ADD NumberFormatException ex FIELD +RefactoringAction 1476276710426 Spreadsheet.java REMOVE ex FIELD +UnitTestCaseAction 1476276717634 SpreadsheetTest.java OK +UnitTestSessionAction 1476276717635 SpreadsheetTest.java OK +RefactoringAction 1476276726863 SpreadsheetTest.java ADD void testSpreadsheetFormulaCalculation_evaluateAdditionFormula()/2 METHOD +RefactoringAction 1476276734875 SpreadsheetTest.java RENAME testSpreadsheetFormulaCalculation_evaluateAdditionFormula()/2=>void testSpreadsheetFormulaCalculation_evaluatesubstractionFormula() METHOD +EditAction 1476276748220 SpreadsheetTest.java 2945 15 34 15 diff --git a/.besouro/20161012142150776/besouroEpisodes.txt b/.besouro/20161012142150776/besouroEpisodes.txt index 73a3c12..8ff30d3 100644 --- a/.besouro/20161012142150776/besouroEpisodes.txt +++ b/.besouro/20161012142150776/besouroEpisodes.txt @@ -52,3 +52,24 @@ 1476275247006 test-addition 1 264 true 1476275247007 test-addition 2 264 true 1476275247008 test-addition 1 264 true +1476276690110 test-addition 2 1298 true +1476276690111 test-addition 2 1298 true +1476276690112 test-addition 1 1298 true +1476276690113 test-addition 2 1298 true +1476276690114 test-addition 2 1298 true +1476276690115 test-addition 2 1298 true +1476276690116 test-addition 2 1298 true +1476276690117 test-addition 2 1298 true +1476276690118 test-addition 2 1298 true +1476276690119 test-addition 2 1298 true +1476276690120 test-addition 2 1298 true +1476276690121 test-addition 2 1298 true +1476276690122 test-addition 2 1298 true +1476276690123 test-addition 2 1298 true +1476276690124 test-addition 2 1298 true +1476276690125 test-addition 2 1298 true +1476276690126 test-addition 1 1298 true +1476276690127 test-addition 2 1298 true +1476276717635 refactoring 2B 14 true +1476276717636 refactoring 2B 14 true +1476276717637 regression 1 14 true diff --git a/.besouro/20161012142150776/randomHeuristicEpisodes.txt b/.besouro/20161012142150776/randomHeuristicEpisodes.txt index 7aa8847..594a52d 100644 --- a/.besouro/20161012142150776/randomHeuristicEpisodes.txt +++ b/.besouro/20161012142150776/randomHeuristicEpisodes.txt @@ -19,3 +19,5 @@ 1476274853107 test-addition 1 51 true 1476274919063 test-addition 1 59 true 1476275247005 test-addition 2 264 true +1476276690110 test-addition 2 1298 true +1476276717635 refactoring 2B 14 true diff --git a/.besouro/20161012142150776/zorroEpisodes.txt b/.besouro/20161012142150776/zorroEpisodes.txt index fb2c0c6..b19f4ca 100644 --- a/.besouro/20161012142150776/zorroEpisodes.txt +++ b/.besouro/20161012142150776/zorroEpisodes.txt @@ -19,3 +19,5 @@ 1476274853107 test-addition 1 86 true 1476274919063 test-addition 1 65 true 1476275247005 test-addition 2 327 true +1476276690110 test-addition 2 1443 true +1476276717635 refactoring 2B 27 true diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 73bf9f749b510bdce85bb28c9bce1d3473695a7b..92e98e4db97c35bb138d3910e06801851b365269 100644 GIT binary patch delta 472 zcmZvYO-mb56o#KWAGytfshDsJd`vqpf3{#L+RalQCO2-FJ~+ z;L5F1DAI)>xblaT?z`*4c*ZWek;~=2ob#UNoOAD9{qA?~AAa5dZ|PjQf6Nhws=};J z?YI=#$?}QM3cGz0h21`5c)nQuaOijZQsg%qrOhM`n~jQ#PffF@=>MNvZ6-k@h_mby zbVse%BPp+u<$#Jpcl_uy*r;m`6@_lgDl916+JPVYwIqn!ios|4$Q(&4@gs#=l`Ae4 zcI#Hr)I{IES+~a7UkqNzGViAbKK@{P&0L<|TGBV=j9IoX$mO(W&n{Ux>zduNllPq6 z<*&B#Y%g=(`<1_@ez`W#cZm|h0`CYh85RBJi8+I2R@5AM`K$@%WuG}YsdG_Ig~FMb zSHva*FvhsNsoEkVNX-mKL{9^jIHoD^JXucH15k*8fsKKkAps~Q2V@H|umDLz237_mpr|ne2he_bpojuQE09(M@_>dgL<03O e0_B+*k{FU1m>B$kqCgRMkXeijDL@_*Ln;7tiy-R& diff --git a/bin/SpreadsheetTest.class b/bin/SpreadsheetTest.class index d1852e96576d9a4892bd97dbab1a830e1b2d2c0f..6084eb1b4cd80df5872c1a3e8e833542473bbe46 100644 GIT binary patch delta 154 zcmZ20`9O;6)W2Q(7#J8#7_v8V&1CboEJ-ac2`(r~O-w1yNKGwq%P-0;%}I1l%t;1P zC7Jno@u_8rIi-musg5ZrnIHkE5)OtmMg|sJLv2G2h73jqMx)6K+1wfVH@{@t&pLS# yr;?zoQ0g`YMXfCiB0{p;7)*uICl|5{b5=5NGgLE3GSp7~$SKO633Lh*Llyu*TQ4vG delta 36 scmaDLwN{er)W2Q(7#J8#7}7R!&19SWfz6eXZ?hTuepXfn1}2770QI>F`~Uy| diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 9ca68d6..8b1e5ce 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -18,17 +18,17 @@ public void set(String cell, String value) { public String evaluate(String cell) { String cellValue = sheet.get(cell); - - if(cellValue.startsWith(EQUALS)){ - cellValue=cellValue.substring(1); //remove equal sign - if(sheet.containsKey(cellValue)){ - if(sheet.get(cellValue).substring(1).equals(cell)){ + + if (cellValue.startsWith(EQUALS)) { + cellValue = cellValue.substring(1); // remove equal sign + if (sheet.containsKey(cellValue)) { + if (sheet.get(cellValue).substring(1).equals(cell)) { return "#CIRCULAR"; } return evaluate(cellValue); } } - + if (cellValue.startsWith(STRING_CLASSIFIER)) { return evaluateString(cellValue); } else { @@ -46,9 +46,16 @@ private String evaluateString(String cellStored) { private String evaluateInt(String cellStored) { try { - Integer.parseInt(cellStored); - return cellStored; + String[] characters = cellStored.split("[+]"); + int total = 0; + for (String s : characters) { + int i = Integer.parseInt(s); + total = total + i; + } + return String.valueOf(total); + } catch (NumberFormatException ex) { + return ERROR; } } diff --git a/tests/SpreadsheetTest.java b/tests/SpreadsheetTest.java index 663ba7d..a3502f3 100644 --- a/tests/SpreadsheetTest.java +++ b/tests/SpreadsheetTest.java @@ -123,5 +123,13 @@ public void testSpreadsheetFormulaCalculation_evaluateAdditionFormula(){ assertEquals(sheet.evaluate("A1"), "2"); } + + @Test + public void testSpreadsheetFormulaCalculation_evaluatesubstractionFormula(){ + sheet.set("A1", "=4-1"); + + assertEquals(sheet.evaluate("A1"), "3"); + + } } From ec3d7896c375f15c2c37ae2e7dd96bdb208d796b Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 16:21:02 +0300 Subject: [PATCH 38/44] besouro automatic message --- .besouro/20161012142150776/actions.txt | 20 ++++++++++++++++ bin/Spreadsheet.class | Bin 2280 -> 2918 bytes bin/SpreadsheetTest.class | Bin 3424 -> 3607 bytes src/Spreadsheet.java | 32 +++++++++++++++++++------ tests/SpreadsheetTest.java | 2 +- 5 files changed, 46 insertions(+), 8 deletions(-) diff --git a/.besouro/20161012142150776/actions.txt b/.besouro/20161012142150776/actions.txt index 66c39b5..b6c4b8c 100644 --- a/.besouro/20161012142150776/actions.txt +++ b/.besouro/20161012142150776/actions.txt @@ -279,3 +279,23 @@ UnitTestSessionAction 1476276717635 SpreadsheetTest.java OK RefactoringAction 1476276726863 SpreadsheetTest.java ADD void testSpreadsheetFormulaCalculation_evaluateAdditionFormula()/2 METHOD RefactoringAction 1476276734875 SpreadsheetTest.java RENAME testSpreadsheetFormulaCalculation_evaluateAdditionFormula()/2=>void testSpreadsheetFormulaCalculation_evaluatesubstractionFormula() METHOD EditAction 1476276748220 SpreadsheetTest.java 2945 15 34 15 +UnitTestCaseAction 1476276754189 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476276754190 SpreadsheetTest.java FAIL +RefactoringAction 1476277258670 Spreadsheet.java ADD String evaluate FIELD +RefactoringAction 1476277263189 Spreadsheet.java RENAME evaluate=>String evaluateIntFormula FIELD +RefactoringAction 1476277264709 Spreadsheet.java RENAME evaluateIntFormula=>String evaluateIntFormula() METHOD +RefactoringAction 1476277280283 Spreadsheet.java RENAME evaluateIntFormula()=>String evaluateIntFormula(char METHOD +RefactoringAction 1476277387977 Spreadsheet.java ADD import java.util.Arrays IMPORT +RefactoringAction 1476277611674 Spreadsheet.java ADD import java.util.List IMPORT +CompilationAction 1476277988380 Spreadsheet.java +CompilationAction 1476277988381 Spreadsheet.java +CompilationAction 1476277988382 Spreadsheet.java +UnitTestCaseAction 1476278079560 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476278079561 SpreadsheetTest.java FAIL +UnitTestCaseAction 1476278174405 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476278174407 Rerun SpreadsheetTest.testSpreadsheetequalSignWithCellRef_setA3_13_setC3_EqualsA3_evaluateC3_return_13 FAIL +UnitTestCaseAction 1476278260535 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476278260536 SpreadsheetTest.java FAIL +UnitTestCaseAction 1476278431362 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476278431362 SpreadsheetTest.java FAIL +EditAction 1476278461296 SpreadsheetTest.java 2945 15 34 15 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 92e98e4db97c35bb138d3910e06801851b365269..22cc8ce8ed9a9f1083198833ceb7043be0813a06 100644 GIT binary patch delta 1093 zcmY+D-E$LV6vlt=CcB$#);0~@RVg zxxT+rTWFNT*^|uY{NJ=KA(MiCJ^Zw-<#P(nTUHDn^lyX*+|dX{1s11SFexeGr`#oX zq){)HM%t|wZOT-neW6lqPR+gUmghZ1L<&z#v`2V{MU$GMtDRU9d_+d@=DnItorYfs z?-)H}v&^W%3}*DE=1ksI^!}glM!i-n&yP2XrCF~QkbW;ncwg~E(m$^C`+sVtWzl5C zrkhp&N3A#hRuJ}K5cZM6Nw#VB1ThzEKIRjJ;a00&c~&v(-`2YQYpQGTUW3sf?4r#j zE(?=-qQXkk0fvM-HW)yu-1zLy3+x*@WO0W6TKLFLpxO z!?WnJOffRj_&El|lWO}rd6Yr z;PJkUl}bB$dZWcDA#8=Jnw<8R9PAapGcUWzH9c%S%LfS$K~L=W&L~v6H>*5rMPp7hbP$m{-a38pk*& zYdXd`@do-F6}g4jfBLMpRgs@YB0gi~iWoX)xhlehq{%X$^M$ApqrsPA=~Cn{UvWk7 ztXzaIK1)hJz%{XAZAqulH|6pz6J_$XoFOIa6WFjR+i)MC?g2ZrAZOq{?B680zHek` Hjc@+}rYy_z delta 541 zcmZvYzfV(96vsce@5g*;xzUO=I(dds<;@h9Ehd_zmUgD=U z?om@%wcJXAEGs@wd8TkWTT#;_V`JrP?f!b$3-eLfYUCew+s#&^njqwb=D8wu(wlE} z>y3Kb=OuMB;#?bU_`IU3(7iC)u0L4QteeMnVRHCCin6i0*$pFwnwRWIHq8e+YiT0$ z-rZ2H`Q?`5Ha2liW1EtmQ@(kt7o9Wsq|A5y<;n<2Mj4aHaF!|3++mzK&T)^6JYs@n zE}4&BCq5}ESpsq<9WUB7FIbdyfVJNwa5``Pwq>06O!B>wp3uuahro~f<%ampBw8VgUOQOn! z9UxMb2SMYMuyLyrC_;MVX$$>dQ}f d8l}l<2Hz>D13{lt#QxO>&E{Z7S4LuN{{>RmUZns4 diff --git a/bin/SpreadsheetTest.class b/bin/SpreadsheetTest.class index 6084eb1b4cd80df5872c1a3e8e833542473bbe46..2f216e40993158a4ff1f1589842bfd56a12dcb11 100644 GIT binary patch delta 135 zcmaDLHC=}5)W2Q(7#J8#7z#FWJ!50EoxFriOQpCpsko#lF}Wl&KhG_{D7Q2xk%J+d zk%7h5MAwjmA(xSX(RlJZHg`sW&1USXY?D8-E9uG#Wo=_n)Y`%zA|$(w!Bi+`2ZQED ipvg=OVnC9Qff-0PGH^3AGe|PDPIllBWzPf4<^uqb-XQ=0 delta 36 scmbO(^FWI0)W2Q(7#J8#7_v8VJ!6~f$nMI>zqy@Vm5r5wfr%jt0PI)_O8@`> diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 8b1e5ce..d6aa3be 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -1,4 +1,6 @@ +import java.util.Arrays; import java.util.HashMap; +import java.util.List; import java.util.Map; public class Spreadsheet { @@ -46,13 +48,8 @@ private String evaluateString(String cellStored) { private String evaluateInt(String cellStored) { try { - String[] characters = cellStored.split("[+]"); - int total = 0; - for (String s : characters) { - int i = Integer.parseInt(s); - total = total + i; - } - return String.valueOf(total); + char[] characters = cellStored.toCharArray(); + return evaluateIntFormula(characters); } catch (NumberFormatException ex) { @@ -60,4 +57,25 @@ private String evaluateInt(String cellStored) { } } + private String evaluateIntFormula(char[] characters) { + char operand = 0; + String number=""; + int calculation = 0; + int i = 0; + for (char c : characters) { + if (c >= '0' && c <= '9') { + operand = c; + } else if (c == '+') { + int x = operand; + int y = Integer.parseInt(evaluateIntFormula(Arrays.copyOfRange(characters, i, characters.length))); + calculation = x + y; + return String.valueOf(calculation); + } else { + return ERROR; + } + number = number + String.valueOf(operand); + } + return number; + } + } diff --git a/tests/SpreadsheetTest.java b/tests/SpreadsheetTest.java index a3502f3..83a0212 100644 --- a/tests/SpreadsheetTest.java +++ b/tests/SpreadsheetTest.java @@ -27,7 +27,7 @@ public void testSpreadsheetNegativeInt_setB2_neg3_getB2_returnneg3() { public void testSpreadsheetEvaluateNegInt_setB2_neg3_evaluateB2_returnneg3() { sheet.set("B2", "-3"); - assertEquals(sheet.evaluate("B2"), "-3"); + assertEquals("-3", sheet.evaluate("B2")); } From bec801bfbef17fea81e4b477fe4c42e6a06d092a Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 16:29:57 +0300 Subject: [PATCH 39/44] besouro automatic message --- .besouro/20161012142150776/actions.txt | 13 ++++++++++++ .../20161012142150776/besouroEpisodes.txt | 20 ++++++++++++++++++ .../randomHeuristicEpisodes.txt | 1 + .besouro/20161012142150776/zorroEpisodes.txt | 1 + bin/Spreadsheet.class | Bin 2918 -> 3060 bytes bin/SpreadsheetTest.class | Bin 3607 -> 3607 bytes src/Spreadsheet.java | 13 ++++++++++-- tests/SpreadsheetTest.java | 8 +++++++ 8 files changed, 54 insertions(+), 2 deletions(-) diff --git a/.besouro/20161012142150776/actions.txt b/.besouro/20161012142150776/actions.txt index b6c4b8c..3f3f09c 100644 --- a/.besouro/20161012142150776/actions.txt +++ b/.besouro/20161012142150776/actions.txt @@ -299,3 +299,16 @@ UnitTestSessionAction 1476278260536 SpreadsheetTest.java FAIL UnitTestCaseAction 1476278431362 SpreadsheetTest.java FAIL UnitTestSessionAction 1476278431362 SpreadsheetTest.java FAIL EditAction 1476278461296 SpreadsheetTest.java 2945 15 34 15 +UnitTestCaseAction 1476278538510 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476278538510 SpreadsheetTest.java FAIL +UnitTestCaseAction 1476278685034 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476278685035 SpreadsheetTest.java FAIL +UnitTestCaseAction 1476278841412 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476278841413 SpreadsheetTest.java FAIL +UnitTestCaseAction 1476278929658 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476278929659 SpreadsheetTest.java FAIL +UnitTestCaseAction 1476278967933 SpreadsheetTest.java OK +UnitTestSessionAction 1476278967934 SpreadsheetTest.java OK +RefactoringAction 1476278976687 SpreadsheetTest.java ADD void testSpreadsheetFormulaCalculation_evaluatesubstractionFormula()/2 METHOD +RefactoringAction 1476278985699 SpreadsheetTest.java RENAME testSpreadsheetFormulaCalculation_evaluatesubstractionFormula()/2=>void testSpreadsheetFormulaCalculation_evaluateMultiplyFormula() METHOD +EditAction 1476278996701 SpreadsheetTest.java 3109 16 36 16 diff --git a/.besouro/20161012142150776/besouroEpisodes.txt b/.besouro/20161012142150776/besouroEpisodes.txt index 8ff30d3..5f33b75 100644 --- a/.besouro/20161012142150776/besouroEpisodes.txt +++ b/.besouro/20161012142150776/besouroEpisodes.txt @@ -73,3 +73,23 @@ 1476276717635 refactoring 2B 14 true 1476276717636 refactoring 2B 14 true 1476276717637 regression 1 14 true +1476278967934 test-addition 2 2241 true +1476278967935 test-addition 2 2241 true +1476278967936 test-addition 2 2241 true +1476278967937 test-addition 2 2241 true +1476278967938 test-addition 2 2241 true +1476278967939 test-addition 2 2241 true +1476278967940 test-addition 2 2241 true +1476278967941 test-addition 2 2241 true +1476278967942 test-addition 2 2241 true +1476278967943 test-addition 2 2241 true +1476278967944 test-addition 2 2241 true +1476278967945 test-addition 1 2241 true +1476278967946 test-addition 2 2241 true +1476278967947 test-addition 2 2241 true +1476278967948 test-addition 1 2241 true +1476278967949 test-addition 2 2241 true +1476278967950 test-addition 2 2241 true +1476278967951 test-addition 2 2241 true +1476278967952 test-addition 2 2241 true +1476278967953 test-addition 2 2241 true diff --git a/.besouro/20161012142150776/randomHeuristicEpisodes.txt b/.besouro/20161012142150776/randomHeuristicEpisodes.txt index 594a52d..bf8a733 100644 --- a/.besouro/20161012142150776/randomHeuristicEpisodes.txt +++ b/.besouro/20161012142150776/randomHeuristicEpisodes.txt @@ -21,3 +21,4 @@ 1476275247005 test-addition 2 264 true 1476276690110 test-addition 2 1298 true 1476276717635 refactoring 2B 14 true +1476278967934 test-addition 2 2241 false diff --git a/.besouro/20161012142150776/zorroEpisodes.txt b/.besouro/20161012142150776/zorroEpisodes.txt index b19f4ca..7180685 100644 --- a/.besouro/20161012142150776/zorroEpisodes.txt +++ b/.besouro/20161012142150776/zorroEpisodes.txt @@ -21,3 +21,4 @@ 1476275247005 test-addition 2 327 true 1476276690110 test-addition 2 1443 true 1476276717635 refactoring 2B 27 true +1476278967934 test-addition 2 2250 true diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 22cc8ce8ed9a9f1083198833ceb7043be0813a06..dd34762bf351853b78470576d89518e96a6aeeb5 100644 GIT binary patch delta 866 zcmaJWQYbUQj*5R>ee>7oW z920htx})%lfk`w8XcLk6c(lDw!&N(^R_NEA_zi*W)%JO*!d{g$UB?ur4HV&~U8xp( zPwS|`Z3i|ZU{<%--=)GV=B|NzxNrYdo7_{FHSiFR?11a+!mR77lza;bGJq2Q61v+0 za)UQG57nQl4J_kas;wX|MF5Zo6FtahGsnuPV5}4_zB{3!0lC=4>~3cFz=tMOGE)nM zZwacfjn?tHSRsh_q8Cx}`p_w(5B+pQ1Z;)$2l*Oe8Db<2LgPk!dYBI*!crd~R!M6R zy(sT37zoLhB3r7zt1)NAa?6(X9&`4uoYG|2bb0;rs44f>_gZ?b-&B>bezhWL@PRR6x}$+g^yF1HVjdkX|(f% z9e9irc!raBhg0~#`URZHDm_9r3bLW}B9e~4f(;i~^n_ML3QsA&%;uj+@|-Gq@DVTQ zsU(?&O`MA(RN*CKItR(cD|#M|upXPDf!goNEaIK^r4YhW}$zMyzEJ U2uK-}ZO;9x;&t(w#1iKI0?4wObN~PV delta 706 zcmZ{h%TE(g7{z~g9-T5Bg@6MFv1(!{Qn4nQiGiR3z9LfMf(4>TiA6zt0R<{bQSk-7 zuaA|9uH2a>8fapI@egs~#+B||i(k>0xNtFd&OPV5=YHqAKdQb~=HFYjVFneroaLOu zu%c`zHJ(aj#s-HIEh8hT?5M|iF6htJy3i#?9Y*v|tI`}JqpR###e~NsO$ui`HJnLz z4me!aNA0M4rO01Z)Yj>fMpS<{9M>gF&SMQT`mIr=KiYQWda>$;!mn%7UyO>ClA9j4 zxUIk0P2nteJ?5C#iBON}kbXB8`efuLFff7A_yWf|>bEY^o9`%JokwCwjtKoCM+KK- z$+`oZox%oq>|%p3^(%ZS8`&f~F`}E0oVH~>MOy4VaTwsVprq)cwL9W!&_{}xq7u}+ zn0O-2n9b#9l4f9;fgSH|ELjS|X5hS`U$1wobKCq-S^O27YXY}E?%VOD0z=Yofr~-J zcl}6TVEI;o@x1i^foyj}fvH8NYYJRjV0M8!$yrDFjvs!#{IVf0*Zoe`N}1qh>1elf zy@xP+C1H!CYo&oUwzH2$_LFPofJ8V*7l-KKFufdMObVxkEso+iCB+PXM=`T9042uL z+~dCdZKil2BQWKXNgnb@a!1JUSdc9qT|AMxkTerT3+IaSDxM08kUSygo!HB)#dS~) e&*a;p6sm|}nd*N9^+$*q|2-oQ^;~QXUi<>`O?Vps diff --git a/bin/SpreadsheetTest.class b/bin/SpreadsheetTest.class index 2f216e40993158a4ff1f1589842bfd56a12dcb11..feaa8057238db787e8a05c903a920726fec82dcc 100644 GIT binary patch delta 28 kcmbO(GhJrG1rBZ@BdskAB0>h+7)&QSatd#L$Dzpz0DUhABme*a delta 28 kcmbO(GhJrG1rBblEes+;2HO}+g^VUUatd#L$Dzpz0DlPxBme*a diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index d6aa3be..572126c 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -49,6 +49,9 @@ private String evaluateString(String cellStored) { private String evaluateInt(String cellStored) { try { char[] characters = cellStored.toCharArray(); + if(characters[0] == '-'){ + return cellStored; + } return evaluateIntFormula(characters); } catch (NumberFormatException ex) { @@ -66,14 +69,20 @@ private String evaluateIntFormula(char[] characters) { if (c >= '0' && c <= '9') { operand = c; } else if (c == '+') { - int x = operand; - int y = Integer.parseInt(evaluateIntFormula(Arrays.copyOfRange(characters, i, characters.length))); + int x = (int)operand -48; + int y = Integer.parseInt(evaluateIntFormula(Arrays.copyOfRange(characters, i+1, characters.length))); calculation = x + y; return String.valueOf(calculation); + } else if (c == '-') { + int x = (int)operand -48; + int y = Integer.parseInt(evaluateIntFormula(Arrays.copyOfRange(characters, i+1, characters.length))); + calculation = x - y; + return String.valueOf(calculation); } else { return ERROR; } number = number + String.valueOf(operand); + i++; } return number; } diff --git a/tests/SpreadsheetTest.java b/tests/SpreadsheetTest.java index 83a0212..cfb30a1 100644 --- a/tests/SpreadsheetTest.java +++ b/tests/SpreadsheetTest.java @@ -131,5 +131,13 @@ public void testSpreadsheetFormulaCalculation_evaluatesubstractionFormula(){ assertEquals(sheet.evaluate("A1"), "3"); } + + @Test + public void testSpreadsheetFormulaCalculation_evaluateMultiplyFormula(){ + sheet.set("A1", "=4*2"); + + assertEquals(sheet.evaluate("A1"), "8"); + + } } From 54af3cae4a749a0f882ae0d30fbc607b303a56c4 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 16:30:49 +0300 Subject: [PATCH 40/44] besouro automatic message --- .besouro/20161012142150776/actions.txt | 7 +++++++ .../20161012142150776/besouroEpisodes.txt | 4 ++++ .../randomHeuristicEpisodes.txt | 1 + .besouro/20161012142150776/zorroEpisodes.txt | 1 + bin/Spreadsheet.class | Bin 3060 -> 3146 bytes bin/SpreadsheetTest.class | Bin 3607 -> 3786 bytes src/Spreadsheet.java | 5 +++++ tests/SpreadsheetTest.java | 8 ++++++++ 8 files changed, 26 insertions(+) diff --git a/.besouro/20161012142150776/actions.txt b/.besouro/20161012142150776/actions.txt index 3f3f09c..f81c083 100644 --- a/.besouro/20161012142150776/actions.txt +++ b/.besouro/20161012142150776/actions.txt @@ -312,3 +312,10 @@ UnitTestSessionAction 1476278967934 SpreadsheetTest.java OK RefactoringAction 1476278976687 SpreadsheetTest.java ADD void testSpreadsheetFormulaCalculation_evaluatesubstractionFormula()/2 METHOD RefactoringAction 1476278985699 SpreadsheetTest.java RENAME testSpreadsheetFormulaCalculation_evaluatesubstractionFormula()/2=>void testSpreadsheetFormulaCalculation_evaluateMultiplyFormula() METHOD EditAction 1476278996701 SpreadsheetTest.java 3109 16 36 16 +UnitTestCaseAction 1476279001902 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476279001903 SpreadsheetTest.java FAIL +UnitTestCaseAction 1476279027988 SpreadsheetTest.java OK +UnitTestSessionAction 1476279027989 SpreadsheetTest.java OK +RefactoringAction 1476279035763 SpreadsheetTest.java ADD void testSpreadsheetFormulaCalculation_evaluateMultiplyFormula()/2 METHOD +RefactoringAction 1476279040774 SpreadsheetTest.java RENAME testSpreadsheetFormulaCalculation_evaluateMultiplyFormula()/2=>void testSpreadsheetFormulaCalculation_evaluateDivisionFormula() METHOD +EditAction 1476279049075 SpreadsheetTest.java 3273 17 38 17 diff --git a/.besouro/20161012142150776/besouroEpisodes.txt b/.besouro/20161012142150776/besouroEpisodes.txt index 5f33b75..12d27c1 100644 --- a/.besouro/20161012142150776/besouroEpisodes.txt +++ b/.besouro/20161012142150776/besouroEpisodes.txt @@ -93,3 +93,7 @@ 1476278967951 test-addition 2 2241 true 1476278967952 test-addition 2 2241 true 1476278967953 test-addition 2 2241 true +1476279027989 test-addition 2 51 true +1476279027990 test-addition 1 51 true +1476279027991 test-addition 2 51 true +1476279027992 test-addition 1 51 true diff --git a/.besouro/20161012142150776/randomHeuristicEpisodes.txt b/.besouro/20161012142150776/randomHeuristicEpisodes.txt index bf8a733..ec2982d 100644 --- a/.besouro/20161012142150776/randomHeuristicEpisodes.txt +++ b/.besouro/20161012142150776/randomHeuristicEpisodes.txt @@ -22,3 +22,4 @@ 1476276690110 test-addition 2 1298 true 1476276717635 refactoring 2B 14 true 1476278967934 test-addition 2 2241 false +1476279027989 test-addition 2 51 false diff --git a/.besouro/20161012142150776/zorroEpisodes.txt b/.besouro/20161012142150776/zorroEpisodes.txt index 7180685..2aefc8c 100644 --- a/.besouro/20161012142150776/zorroEpisodes.txt +++ b/.besouro/20161012142150776/zorroEpisodes.txt @@ -22,3 +22,4 @@ 1476276690110 test-addition 2 1443 true 1476276717635 refactoring 2B 27 true 1476278967934 test-addition 2 2250 true +1476279027989 test-addition 2 60 true diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index dd34762bf351853b78470576d89518e96a6aeeb5..4b59d01db7e55f20ab3e9c78cb6d1242c6eb1aef 100644 GIT binary patch delta 255 zcmew&eoA7)Z%!p9X9gAq9tH-6N6fZDnSRV>EX-!C+L2bA`^-3)&DfVS9GNW3CB@h~ z*@7#IMU+iIYqAZO0%OMHE-qbuYuyb%jm!*kKr)X(dh#(Y_xeDFDGWgjvlxOI)-r@J zY+(px*u@aeu$Li{;W9%M!!-sMh6fBW4Dvu7EeyOMYZ(+66oE8|mBNt9z{tP^RME@O z2c%gU?lSZEgkxq@3( fdKR3&7HG#*pbR&IAJB$C2KLEwxJ@RX=T-#(bvHE+ delta 186 zcmX>l@kM;YZ%!q~w+t){JPZsBTbXTzGX0p%SeVUNwIi)K_nC1po3Srvm_AvSONudJ zvISSvGoN diff --git a/bin/SpreadsheetTest.class b/bin/SpreadsheetTest.class index feaa8057238db787e8a05c903a920726fec82dcc..f0b1a74d3e56b49ffc57452068094e3d25d86d81 100644 GIT binary patch delta 115 zcmbO(b4r%$)W2Q(7#J8#7)m#CnX^w`%%-j2TbfgnS&&odmS2=xnv=-EP{7E*Vr!yh z#KBO+$iQeZ*`D2lJ6(qB)W2Q(7#J8#7z#FWnX^ysV|Qf~*nEY(n~jx$fr%j>0O-vMl>h($ diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 572126c..4a21093 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -78,6 +78,11 @@ private String evaluateIntFormula(char[] characters) { int y = Integer.parseInt(evaluateIntFormula(Arrays.copyOfRange(characters, i+1, characters.length))); calculation = x - y; return String.valueOf(calculation); + }else if (c == '*') { + int x = (int)operand -48; + int y = Integer.parseInt(evaluateIntFormula(Arrays.copyOfRange(characters, i+1, characters.length))); + calculation = x * y; + return String.valueOf(calculation); } else { return ERROR; } diff --git a/tests/SpreadsheetTest.java b/tests/SpreadsheetTest.java index cfb30a1..009745e 100644 --- a/tests/SpreadsheetTest.java +++ b/tests/SpreadsheetTest.java @@ -139,5 +139,13 @@ public void testSpreadsheetFormulaCalculation_evaluateMultiplyFormula(){ assertEquals(sheet.evaluate("A1"), "8"); } + + @Test + public void testSpreadsheetFormulaCalculation_evaluateDivisionFormula(){ + sheet.set("A1", "=4/2"); + + assertEquals(sheet.evaluate("A1"), "2"); + + } } From f0ccb3008ae7c06b1f42e4c151609be061f657bc Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 16:31:45 +0300 Subject: [PATCH 41/44] besouro automatic message --- .besouro/20161012142150776/actions.txt | 7 +++++++ .../20161012142150776/besouroEpisodes.txt | 4 ++++ .../randomHeuristicEpisodes.txt | 1 + .besouro/20161012142150776/zorroEpisodes.txt | 1 + bin/Spreadsheet.class | Bin 3146 -> 3232 bytes bin/SpreadsheetTest.class | Bin 3786 -> 3958 bytes src/Spreadsheet.java | 5 +++++ tests/SpreadsheetTest.java | 9 +++++++++ 8 files changed, 27 insertions(+) diff --git a/.besouro/20161012142150776/actions.txt b/.besouro/20161012142150776/actions.txt index f81c083..99ded14 100644 --- a/.besouro/20161012142150776/actions.txt +++ b/.besouro/20161012142150776/actions.txt @@ -319,3 +319,10 @@ UnitTestSessionAction 1476279027989 SpreadsheetTest.java OK RefactoringAction 1476279035763 SpreadsheetTest.java ADD void testSpreadsheetFormulaCalculation_evaluateMultiplyFormula()/2 METHOD RefactoringAction 1476279040774 SpreadsheetTest.java RENAME testSpreadsheetFormulaCalculation_evaluateMultiplyFormula()/2=>void testSpreadsheetFormulaCalculation_evaluateDivisionFormula() METHOD EditAction 1476279049075 SpreadsheetTest.java 3273 17 38 17 +UnitTestCaseAction 1476279054147 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476279054148 SpreadsheetTest.java FAIL +UnitTestCaseAction 1476279075079 SpreadsheetTest.java OK +UnitTestSessionAction 1476279075080 SpreadsheetTest.java OK +RefactoringAction 1476279086321 SpreadsheetTest.java ADD void testSpreadsheetFormulaCalculation_evaluateDivisionFormula()/2 METHOD +RefactoringAction 1476279091333 SpreadsheetTest.java RENAME testSpreadsheetFormulaCalculation_evaluateDivisionFormula()/2=>void testSpreadsheetFormulaCalculation_evaluateModFormula() METHOD +EditAction 1476279105112 SpreadsheetTest.java 3433 18 40 18 diff --git a/.besouro/20161012142150776/besouroEpisodes.txt b/.besouro/20161012142150776/besouroEpisodes.txt index 12d27c1..9f34284 100644 --- a/.besouro/20161012142150776/besouroEpisodes.txt +++ b/.besouro/20161012142150776/besouroEpisodes.txt @@ -97,3 +97,7 @@ 1476279027990 test-addition 1 51 true 1476279027991 test-addition 2 51 true 1476279027992 test-addition 1 51 true +1476279075080 test-addition 2 39 true +1476279075081 test-addition 1 39 true +1476279075082 test-addition 2 39 true +1476279075083 test-addition 1 39 true diff --git a/.besouro/20161012142150776/randomHeuristicEpisodes.txt b/.besouro/20161012142150776/randomHeuristicEpisodes.txt index ec2982d..aaf2f51 100644 --- a/.besouro/20161012142150776/randomHeuristicEpisodes.txt +++ b/.besouro/20161012142150776/randomHeuristicEpisodes.txt @@ -23,3 +23,4 @@ 1476276717635 refactoring 2B 14 true 1476278967934 test-addition 2 2241 false 1476279027989 test-addition 2 51 false +1476279075080 test-addition 2 39 true diff --git a/.besouro/20161012142150776/zorroEpisodes.txt b/.besouro/20161012142150776/zorroEpisodes.txt index 2aefc8c..7ea0d8d 100644 --- a/.besouro/20161012142150776/zorroEpisodes.txt +++ b/.besouro/20161012142150776/zorroEpisodes.txt @@ -23,3 +23,4 @@ 1476276717635 refactoring 2B 27 true 1476278967934 test-addition 2 2250 true 1476279027989 test-addition 2 60 true +1476279075080 test-addition 2 47 true diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 4b59d01db7e55f20ab3e9c78cb6d1242c6eb1aef..97a6b3ffa74320c666562607ed60586f9b4ec6b1 100644 GIT binary patch delta 254 zcmX|*Jxc>&5QLx2dw03Kmv|xwexP28R1(C(Lqx&CI)#E76-CfO@IMGPRvL8`w6n8K zCt3(r0e?a|K@jYMt%aM$W|^6to!R%1htc+Lsd`U986e-;c!gEPA5Gdb2LUrz_>ZNM>U^OQ_~{PxK@Z*0(ElP*m@*y4*FzS$Mn z6UT~F*k{Tv?nwK!WK@my(E*1D1#_HpL4i;_Eh1}(rN|{$_G%&l*M>sN_(aVYv1}PP frg_%%Ihh^r{PQjqZf%p$u!>b;?Im+sE7$%2D#tIQ delta 192 zcmZ1=c}il#A5KMQ1{MY$1_p*l%(gl`%RAP)W2Q(7#J8#7%Db$wXjcK%%&~rl3A8noSC2JmS2=xnv=-EP|C=_Vr!yr yG`WY}ol$7>750y8lMiw#G0O^-Oy0q($T^XLn_)78B*WCn0$if(WkBPY7|H?Ih#P1C delta 36 scmew+cS@G))W2Q(7#J8#7)m#CwXjdV!tTl_xLJzhBO5CN0~13D0Q`~*K>z>% diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 4a21093..eb5a587 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -83,6 +83,11 @@ private String evaluateIntFormula(char[] characters) { int y = Integer.parseInt(evaluateIntFormula(Arrays.copyOfRange(characters, i+1, characters.length))); calculation = x * y; return String.valueOf(calculation); + } else if (c == '/') { + int x = (int)operand -48; + int y = Integer.parseInt(evaluateIntFormula(Arrays.copyOfRange(characters, i+1, characters.length))); + calculation = x / y; + return String.valueOf(calculation); } else { return ERROR; } diff --git a/tests/SpreadsheetTest.java b/tests/SpreadsheetTest.java index 009745e..41a9cac 100644 --- a/tests/SpreadsheetTest.java +++ b/tests/SpreadsheetTest.java @@ -147,5 +147,14 @@ public void testSpreadsheetFormulaCalculation_evaluateDivisionFormula(){ assertEquals(sheet.evaluate("A1"), "2"); } + + @Test + public void testSpreadsheetFormulaCalculation_evaluateModFormula(){ + sheet.set("A1", "=4%3"); + + assertEquals(sheet.evaluate("A1"), "1"); + + } + } From d807583b65bba7d691725eed6b1fa76361be737e Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 16:32:59 +0300 Subject: [PATCH 42/44] besouro automatic message --- .besouro/20161012142150776/actions.txt | 7 +++++++ .../20161012142150776/besouroEpisodes.txt | 4 ++++ .../randomHeuristicEpisodes.txt | 1 + .besouro/20161012142150776/zorroEpisodes.txt | 1 + bin/Spreadsheet.class | Bin 3232 -> 3318 bytes bin/SpreadsheetTest.class | Bin 3958 -> 4125 bytes src/Spreadsheet.java | 5 +++++ tests/SpreadsheetTest.java | 8 ++++++++ 8 files changed, 26 insertions(+) diff --git a/.besouro/20161012142150776/actions.txt b/.besouro/20161012142150776/actions.txt index 99ded14..f038f6b 100644 --- a/.besouro/20161012142150776/actions.txt +++ b/.besouro/20161012142150776/actions.txt @@ -326,3 +326,10 @@ UnitTestSessionAction 1476279075080 SpreadsheetTest.java OK RefactoringAction 1476279086321 SpreadsheetTest.java ADD void testSpreadsheetFormulaCalculation_evaluateDivisionFormula()/2 METHOD RefactoringAction 1476279091333 SpreadsheetTest.java RENAME testSpreadsheetFormulaCalculation_evaluateDivisionFormula()/2=>void testSpreadsheetFormulaCalculation_evaluateModFormula() METHOD EditAction 1476279105112 SpreadsheetTest.java 3433 18 40 18 +UnitTestCaseAction 1476279110219 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476279110220 SpreadsheetTest.java FAIL +UnitTestCaseAction 1476279135284 SpreadsheetTest.java OK +UnitTestSessionAction 1476279135285 SpreadsheetTest.java OK +RefactoringAction 1476279146909 SpreadsheetTest.java ADD void testSpreadsheetFormulaCalculation_evaluateModFormula()/2 METHOD +RefactoringAction 1476279156422 SpreadsheetTest.java RENAME testSpreadsheetFormulaCalculation_evaluateModFormula()/2=>void testSpreadsheetFormulaCalculation_evaluateadditionMultiplicationFormula() METHOD +EditAction 1476279178983 SpreadsheetTest.java 3613 19 42 19 diff --git a/.besouro/20161012142150776/besouroEpisodes.txt b/.besouro/20161012142150776/besouroEpisodes.txt index 9f34284..b2e6ea4 100644 --- a/.besouro/20161012142150776/besouroEpisodes.txt +++ b/.besouro/20161012142150776/besouroEpisodes.txt @@ -101,3 +101,7 @@ 1476279075081 test-addition 1 39 true 1476279075082 test-addition 2 39 true 1476279075083 test-addition 1 39 true +1476279135285 test-addition 2 48 true +1476279135286 test-addition 1 48 true +1476279135287 test-addition 2 48 true +1476279135288 test-addition 1 48 true diff --git a/.besouro/20161012142150776/randomHeuristicEpisodes.txt b/.besouro/20161012142150776/randomHeuristicEpisodes.txt index aaf2f51..41d57c9 100644 --- a/.besouro/20161012142150776/randomHeuristicEpisodes.txt +++ b/.besouro/20161012142150776/randomHeuristicEpisodes.txt @@ -24,3 +24,4 @@ 1476278967934 test-addition 2 2241 false 1476279027989 test-addition 2 51 false 1476279075080 test-addition 2 39 true +1476279135285 test-addition 2 48 true diff --git a/.besouro/20161012142150776/zorroEpisodes.txt b/.besouro/20161012142150776/zorroEpisodes.txt index 7ea0d8d..4205a6c 100644 --- a/.besouro/20161012142150776/zorroEpisodes.txt +++ b/.besouro/20161012142150776/zorroEpisodes.txt @@ -24,3 +24,4 @@ 1476278967934 test-addition 2 2250 true 1476279027989 test-addition 2 60 true 1476279075080 test-addition 2 47 true +1476279135285 test-addition 2 60 true diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 97a6b3ffa74320c666562607ed60586f9b4ec6b1..ef9a599252c97ecd4dbe792636570b7bae881a84 100644 GIT binary patch delta 262 zcmXwzJ4*v`5X66*|J^0`P!jPKA(u;Wl?D{#ln}u}+cc@fM-Zc6rM*S`0zUt0ZD(VV z!rJd52zJ^83lViw*eo- z^Q=jO1FHJ*NNJc$LQUBab=gPAsp5=ta=5a@1)e4pWRXj*v}-5}Tq|;^N(rkvk5%=! l(Op2>eueAt;Gb)U5pMMo($a`F{x8$^G@7)XsA5l|^bffHF!TTb delta 194 zcmew+xj=HmA5O)Y3@i*h3=E9?%(gAx+O`dReKcMCy29C+IdCVqX;!yzrjk+SG diff --git a/bin/SpreadsheetTest.class b/bin/SpreadsheetTest.class index 412e4ed8e3e6b528ef2f91d0b94d7ff746447ef3..80f0c92410895f6ae0694e3dc59ce5557128812f 100644 GIT binary patch delta 103 zcmV-t0GR*w9-SZx%Ko~(0000q0DG|t$_D{7lko;B6ishrMsIR$b!=e>0C)ia1U)n* zGn3K>M*$PF8VFYhlc5PB4;>PBwg4e2v;Y(m9ku{9lb{F{37G&30Gj|A0G*TY2^9x< J000020D68A9CQEx delta 36 scmbQM@J){E)W2Q(7#J8#7%Db$onoIX%Hhf=v^kn1oSl_{fr+6U0PU~}P5=M^ diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index eb5a587..15bccc2 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -88,6 +88,11 @@ private String evaluateIntFormula(char[] characters) { int y = Integer.parseInt(evaluateIntFormula(Arrays.copyOfRange(characters, i+1, characters.length))); calculation = x / y; return String.valueOf(calculation); + } else if (c == '%') { + int x = (int)operand -48; + int y = Integer.parseInt(evaluateIntFormula(Arrays.copyOfRange(characters, i+1, characters.length))); + calculation = x % y; + return String.valueOf(calculation); } else { return ERROR; } diff --git a/tests/SpreadsheetTest.java b/tests/SpreadsheetTest.java index 41a9cac..b324661 100644 --- a/tests/SpreadsheetTest.java +++ b/tests/SpreadsheetTest.java @@ -155,6 +155,14 @@ public void testSpreadsheetFormulaCalculation_evaluateModFormula(){ assertEquals(sheet.evaluate("A1"), "1"); } + + @Test + public void testSpreadsheetFormulaCalculation_evaluateadditionMultiplicationFormula(){ + sheet.set("A1", "=1+1*2"); + + assertEquals(sheet.evaluate("A1"), "4"); + + } } From 200aa079c157071f1928a9d0f91763c1f0948b99 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 16:36:00 +0300 Subject: [PATCH 43/44] besouro automatic message --- .besouro/20161012142150776/actions.txt | 3 +++ bin/SpreadsheetTest.class | Bin 4125 -> 4313 bytes tests/SpreadsheetTest.java | 36 ++++++++++++------------- 3 files changed, 21 insertions(+), 18 deletions(-) diff --git a/.besouro/20161012142150776/actions.txt b/.besouro/20161012142150776/actions.txt index f038f6b..e2d9773 100644 --- a/.besouro/20161012142150776/actions.txt +++ b/.besouro/20161012142150776/actions.txt @@ -333,3 +333,6 @@ UnitTestSessionAction 1476279135285 SpreadsheetTest.java OK RefactoringAction 1476279146909 SpreadsheetTest.java ADD void testSpreadsheetFormulaCalculation_evaluateModFormula()/2 METHOD RefactoringAction 1476279156422 SpreadsheetTest.java RENAME testSpreadsheetFormulaCalculation_evaluateModFormula()/2=>void testSpreadsheetFormulaCalculation_evaluateadditionMultiplicationFormula() METHOD EditAction 1476279178983 SpreadsheetTest.java 3613 19 42 19 +UnitTestCaseAction 1476279185359 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476279185360 SpreadsheetTest.java FAIL +EditAction 1476279359268 SpreadsheetTest.java 3614 19 42 19 diff --git a/bin/SpreadsheetTest.class b/bin/SpreadsheetTest.class index 80f0c92410895f6ae0694e3dc59ce5557128812f..13682cb9cbb53159d0615ac4e55b6aa93043442e 100644 GIT binary patch delta 124 zcmbQMa8r@%)W2Q(7#J8#80t21adR-bPyWcJrJ0zLl39|OpXXbeQ<7PblbM_d;<@D) z<(B3oaxhdgGO*biY8z@9O%~>GXB62S&9Rq#@+N*2{;F*ZidtJ3M1*9wF_;Q@PkzWH a%(;+(n_)47B*W6lhFqfTH9*Ul7-|9E-Xr(` delta 36 scmcbqI9Gw|)W2Q(7#J8#7^*jNadS-0=5S>c-n@}xFFPv(0~13P0O-{Uj{pDw diff --git a/tests/SpreadsheetTest.java b/tests/SpreadsheetTest.java index b324661..43759ed 100644 --- a/tests/SpreadsheetTest.java +++ b/tests/SpreadsheetTest.java @@ -11,7 +11,7 @@ public class SpreadsheetTest { public void testSpreadsheet_setA1_1_getA1_return1() { sheet.set("A1", "1"); - assertEquals(sheet.get("A1"), "1"); + assertEquals("1", sheet.get("A1")); } @@ -19,7 +19,7 @@ public void testSpreadsheet_setA1_1_getA1_return1() { public void testSpreadsheetNegativeInt_setB2_neg3_getB2_returnneg3() { sheet.set("B2", "-3"); - assertEquals(sheet.get("B2"), "-3"); + assertEquals("-3", sheet.get("B2")); } @@ -35,7 +35,7 @@ public void testSpreadsheetEvaluateNegInt_setB2_neg3_evaluateB2_returnneg3() { public void testSpreadsheetInvalidInt_setC3_2A_evaluateC3_return_Error(){ sheet.set("C3", "2A"); - assertEquals(sheet.evaluate("C3"), ERROR); + assertEquals(ERROR, sheet.evaluate("C3")); } @@ -43,7 +43,7 @@ public void testSpreadsheetInvalidInt_setC3_2A_evaluateC3_return_Error(){ public void testSpreadsheetString_setC3_aString_evaluateC3_return_aString(){ sheet.set("C3", "'a String'"); - assertEquals(sheet.evaluate("C3"), "a String"); + assertEquals("a String", sheet.evaluate("C3")); } @@ -51,7 +51,7 @@ public void testSpreadsheetString_setC3_aString_evaluateC3_return_aString(){ public void testSpreadsheetString_setC3_aString_withoutEndQuote_evaluateC3_return_ERROR(){ sheet.set("C3", "'a String"); - assertEquals(sheet.evaluate("C3"), ERROR); + assertEquals(ERROR, sheet.evaluate("C3")); } @@ -60,7 +60,7 @@ public void testSpreadsheetString_setC3_aString_withoutEndQuote_evaluateC3_retur public void testSpreadsheetequalSign_String_setC3_EqualsaString_evaluateC3_return_aString(){ sheet.set("C3", "='a String'"); - assertEquals(sheet.evaluate("C3"), "a String"); + assertEquals("a String", sheet.evaluate("C3")); } @@ -68,7 +68,7 @@ public void testSpreadsheetequalSign_String_setC3_EqualsaString_evaluateC3_retur public void testSpreadsheetequalSign_Int_setC3_Equals4_evaluateC3_return_4(){ sheet.set("C3", "=4"); - assertEquals(sheet.evaluate("C3"), "4"); + assertEquals("4", sheet.evaluate("C3")); } @@ -76,7 +76,7 @@ public void testSpreadsheetequalSign_Int_setC3_Equals4_evaluateC3_return_4(){ public void testSpreadsheetequalSignWithError_Int_setC3_Equals3D_evaluateC3_return_Error(){ sheet.set("C3", "=D3"); - assertEquals(sheet.evaluate("C3"), ERROR); + assertEquals(ERROR, sheet.evaluate("C3")); } @@ -85,7 +85,7 @@ public void testSpreadsheetequalSignWithCellRef_setA3_13_setC3_EqualsA3_evaluate sheet.set("A3", "13"); sheet.set("C3", "=A3"); - assertEquals(sheet.evaluate("C3"), "13"); + assertEquals("13", sheet.evaluate("C3")); } @@ -94,7 +94,7 @@ public void testSpreadsheetequalSignWithCellRefWithString_setA3_aString_setC3_Eq sheet.set("A3", "'a String'"); sheet.set("C3", "=A3"); - assertEquals(sheet.evaluate("C3"), "a String"); + assertEquals("a String", sheet.evaluate("C3")); } @@ -103,7 +103,7 @@ public void testSpreadsheetequalSignWithCellRefWithwrongInt_setA3_4G_setC3_Equal sheet.set("A3", "4G"); sheet.set("C3", "=A3"); - assertEquals(sheet.evaluate("C3"), ERROR); + assertEquals(ERROR, sheet.evaluate("C3")); } @@ -112,7 +112,7 @@ public void testSpreadsheetCircularRef_setA1_eqA5_setA5_eqA1_evaluateA5_return_C sheet.set("A1", "=A5"); sheet.set("A5", "=A1"); - assertEquals(sheet.evaluate("A5"), "#CIRCULAR"); + assertEquals("#CIRCULAR", sheet.evaluate("A5")); } @@ -120,7 +120,7 @@ public void testSpreadsheetCircularRef_setA1_eqA5_setA5_eqA1_evaluateA5_return_C public void testSpreadsheetFormulaCalculation_evaluateAdditionFormula(){ sheet.set("A1", "=1+1"); - assertEquals(sheet.evaluate("A1"), "2"); + assertEquals("2", sheet.evaluate("A1")); } @@ -128,7 +128,7 @@ public void testSpreadsheetFormulaCalculation_evaluateAdditionFormula(){ public void testSpreadsheetFormulaCalculation_evaluatesubstractionFormula(){ sheet.set("A1", "=4-1"); - assertEquals(sheet.evaluate("A1"), "3"); + assertEquals("3", sheet.evaluate("A1")); } @@ -136,7 +136,7 @@ public void testSpreadsheetFormulaCalculation_evaluatesubstractionFormula(){ public void testSpreadsheetFormulaCalculation_evaluateMultiplyFormula(){ sheet.set("A1", "=4*2"); - assertEquals(sheet.evaluate("A1"), "8"); + assertEquals("8", sheet.evaluate("A1")); } @@ -144,7 +144,7 @@ public void testSpreadsheetFormulaCalculation_evaluateMultiplyFormula(){ public void testSpreadsheetFormulaCalculation_evaluateDivisionFormula(){ sheet.set("A1", "=4/2"); - assertEquals(sheet.evaluate("A1"), "2"); + assertEquals("2", sheet.evaluate("A1")); } @@ -152,7 +152,7 @@ public void testSpreadsheetFormulaCalculation_evaluateDivisionFormula(){ public void testSpreadsheetFormulaCalculation_evaluateModFormula(){ sheet.set("A1", "=4%3"); - assertEquals(sheet.evaluate("A1"), "1"); + assertEquals( "1", sheet.evaluate("A1")); } @@ -160,7 +160,7 @@ public void testSpreadsheetFormulaCalculation_evaluateModFormula(){ public void testSpreadsheetFormulaCalculation_evaluateadditionMultiplicationFormula(){ sheet.set("A1", "=1+1*2"); - assertEquals(sheet.evaluate("A1"), "4"); + assertEquals("4", sheet.evaluate("A1")); } From 336c0069396787c28ce03b2a69e5a60dc264fd9f Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 16:46:17 +0300 Subject: [PATCH 44/44] besouro automatic message --- .besouro/20161012142150776/actions.txt | 9 +++++++++ bin/Spreadsheet.class | Bin 3318 -> 3607 bytes bin/SpreadsheetTest.class | Bin 4313 -> 4313 bytes src/Spreadsheet.java | 13 +++++++++++++ 4 files changed, 22 insertions(+) diff --git a/.besouro/20161012142150776/actions.txt b/.besouro/20161012142150776/actions.txt index e2d9773..3e57218 100644 --- a/.besouro/20161012142150776/actions.txt +++ b/.besouro/20161012142150776/actions.txt @@ -336,3 +336,12 @@ EditAction 1476279178983 SpreadsheetTest.java 3613 19 42 19 UnitTestCaseAction 1476279185359 SpreadsheetTest.java FAIL UnitTestSessionAction 1476279185360 SpreadsheetTest.java FAIL EditAction 1476279359268 SpreadsheetTest.java 3614 19 42 19 +UnitTestCaseAction 1476279365276 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476279365277 SpreadsheetTest.java FAIL +RefactoringAction 1476279609589 Spreadsheet.java ADD int get FIELD +RefactoringAction 1476279611109 Spreadsheet.java RENAME get=>int getNext FIELD +RefactoringAction 1476279613629 Spreadsheet.java RENAME getNext=>int getNextNumber FIELD +RefactoringAction 1476279616148 Spreadsheet.java RENAME getNextNumber=>int getNextNumber() METHOD +RefactoringAction 1476279625700 Spreadsheet.java RENAME getNextNumber()=>int getNextNumber(char METHOD +UnitTestCaseAction 1476279945010 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476279945011 SpreadsheetTest.java FAIL diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index ef9a599252c97ecd4dbe792636570b7bae881a84..2fde2935736937452f15f947d830517447d1128e 100644 GIT binary patch delta 509 zcmYL_%S%*o6vscmd+*#kjgJQLP7FA{R+!Wnx_5E4vC zA_mpM&~i7paAQP_m>3AIB>x0=uG+N{H-h7Fqnq>ip6_{l&!K;@%CmdCxdnt+`sJB6 zePt;pn{eJ{6K^tO&MSqhVYs8QXa1u(q1=T-b3wC1xVSD*_Se~j>-M;!22Sv*nYjH=2C#?&RoRSS*^5>*jWh5eFJmD5;Y5haJh z5jvLmSjDq=Q!-+1gz{_|Ft{?E@Oy|QA?fp z(`Xz=PSoW|Uohp7KH<#sS&)R(qZmcJSQeu9sYN5|G=QSe&QW!S8s})`8CjDJ-(;G` F_Y)rZT*&|c delta 219 zcmWNMy-I>{97fOY1$|S~AW{j0u0Rk>BwhSYQ~S_Lt<=Iu9J&U@rK!o#aBhu|*F}e* zN$3*Xn%bH|a1sCObIuu_foHL6{a#H!fqh;_)~>ntW^RdYIP|{e^kY)9od8<|adLo* zuraZGNIQZ?RN)vK#IccJk0f4F_&6j)ng|(+9C1aKTXHnX^T;tBPI%&!XU=$`z))H5 zoHOQvDVKavVn&%c6@FCx%Qb)8@K05AYT}?SJKNlen}&F~7as`;@n9@%n_?0A>Wju; E4U`uv{{R30 diff --git a/bin/SpreadsheetTest.class b/bin/SpreadsheetTest.class index 13682cb9cbb53159d0615ac4e55b6aa93043442e..736efd1fe84ee957b8dce484ec047b28373354f3 100644 GIT binary patch delta 337 zcmcbqcvEqM9w)buyw(;55h2-a462haatTlN;q;jNi<65H!rR2Tj$4QWtio~|gDF@= z9hV2UkOQ(^4Zge%mlQ)3Gypi<@PZr|=ilLcb!xPLc6pT=Jizf@kK7U>yA4$&< z5I+g5J`UtYOTKt+p>!}G=qreuxA6h($w3v9;RlKpqKY+v#L)D<0Exjv31Xg~08k9# K7qA@*1uOvIlUob` delta 343 zcmcbqcvEqM9w)cf76uU^*=-D}Lh_R@atTlN;q-ur8Gyu$z+#&?*FnTAw=tLsae&3@ zxS;C5Vh%vDXbd%8+~{hACvQLz^9GwG#)GU5Vtx%zFp_z}lW*~4A@Ln1`|~36IVK;0 z@#8>lOqy)T7Y|Vn^qZ+rI@q3Vd{BG9VmV+j8GdB3La-C= '0' && c <= '9') { + number = number + String.valueOf(c); + }else{ + return Integer.parseInt(number); + } + } + return 0; + } }