From 7318db67689ae609f6e0e0b5e8085fa1c3729359 Mon Sep 17 00:00:00 2001 From: somename Date: Thu, 6 Oct 2016 16:27:00 +0300 Subject: [PATCH 01/17] besouro automatic message --- .besouro/20161006162637726/actions.txt | 2 ++ .besouro/20161006162637726/besouroEpisodes.txt | 0 .besouro/20161006162637726/disagreements.txt | 0 .../randomHeuristicEpisodes.txt | 0 .besouro/20161006162637726/userComments.txt | 0 .besouro/20161006162637726/zorroEpisodes.txt | 0 bin/.gitignore | 2 ++ bin/SpreadsheetTest.class | Bin 490 -> 913 bytes tests/SpreadsheetTest.java | 16 +++++++++++++--- 9 files changed, 17 insertions(+), 3 deletions(-) create mode 100644 .besouro/20161006162637726/actions.txt create mode 100644 .besouro/20161006162637726/besouroEpisodes.txt create mode 100644 .besouro/20161006162637726/disagreements.txt create mode 100644 .besouro/20161006162637726/randomHeuristicEpisodes.txt create mode 100644 .besouro/20161006162637726/userComments.txt create mode 100644 .besouro/20161006162637726/zorroEpisodes.txt create mode 100644 bin/.gitignore diff --git a/.besouro/20161006162637726/actions.txt b/.besouro/20161006162637726/actions.txt new file mode 100644 index 0000000..1159d31 --- /dev/null +++ b/.besouro/20161006162637726/actions.txt @@ -0,0 +1,2 @@ +FileOpenedAction 1475760397941 SpreadsheetTest.java 323 2 5 1 +EditAction 1475760420015 SpreadsheetTest.java 326 2 5 1 diff --git a/.besouro/20161006162637726/besouroEpisodes.txt b/.besouro/20161006162637726/besouroEpisodes.txt new file mode 100644 index 0000000..e69de29 diff --git a/.besouro/20161006162637726/disagreements.txt b/.besouro/20161006162637726/disagreements.txt new file mode 100644 index 0000000..e69de29 diff --git a/.besouro/20161006162637726/randomHeuristicEpisodes.txt b/.besouro/20161006162637726/randomHeuristicEpisodes.txt new file mode 100644 index 0000000..e69de29 diff --git a/.besouro/20161006162637726/userComments.txt b/.besouro/20161006162637726/userComments.txt new file mode 100644 index 0000000..e69de29 diff --git a/.besouro/20161006162637726/zorroEpisodes.txt b/.besouro/20161006162637726/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/bin/SpreadsheetTest.class b/bin/SpreadsheetTest.class index e7086bd9ef1b6a8b7afcfb717afbaddbf99a7876..a847979e77257e76ed292eee4bdd02b3669d1c8f 100644 GIT binary patch literal 913 zcmaJN7!xFGVlvT0ki=s%QwvRIy2qX#5^w$n z|B0tfG|{_1%2+)h%z=2A{-~*X_1^3H{pb5n0JwyUDwG%;jS_<*Oy`JpjH#_cg+X&6 zmZBF4HS4{bE-!>F(=b#m;5Q;JAqH=un4>Yrx?AeWt98@r_!_R8r+YDQ$(7T2W!m ze}&iDV805d)O5@L${1~GaGSxG56WPwqa}ts&~YN8yqG6O6Iz@;=U#mU!UN&3`4su4 z!fGzK{hXjzAJ37;Xy-cQj#{V7Wy&)Z;x$PPInm&jQd}}GnB{qJ0(YG)XAIgMf6H-X zja0L~^RH=1^pIY};t-=~@QlIPTKHs#?53~HthdOBMlZLk1`ip0{l8Ktw4gzxDH?nA zDHBoJSy6eySI_=$CxvROX^C6Q9TDloH zE%@SiKXqon1<)ALY%==xV4v19ooS3{t<$YXd;ah74S3%uP=W@n`+2YmhjebN65tjb z(T)71;u0LMvs$z}pvxQ>!21CwA6xAkxbusmMYMwgnzuo_m!qAp(eCd=d$0qoy%X(G H-jn|Y{2<=P delta 285 zcmbQp{)(CF)W2Q(7#J8#7^Ek1=}z>QVB_RrU}a#NnCr??l3H9cc|D_Hm=Gg_uwQS7lR0c7(0U~BZEMGQM!IsX Date: Thu, 6 Oct 2016 16:39:40 +0300 Subject: [PATCH 02/17] besouro automatic message --- .besouro/20161006162637726/actions.txt | 30 +++++++++++++++++++++++++ bin/.gitignore | 3 +++ bin/SpreadsheetTest.class | Bin 913 -> 1072 bytes src/Cell.java | 19 ++++++++++++++++ 4 files changed, 52 insertions(+) create mode 100644 src/Cell.java diff --git a/.besouro/20161006162637726/actions.txt b/.besouro/20161006162637726/actions.txt index 1159d31..5a389b0 100644 --- a/.besouro/20161006162637726/actions.txt +++ b/.besouro/20161006162637726/actions.txt @@ -1,2 +1,32 @@ FileOpenedAction 1475760397941 SpreadsheetTest.java 323 2 5 1 EditAction 1475760420015 SpreadsheetTest.java 326 2 5 1 +CompilationAction 1475760420171 SpreadsheetTest.java +CompilationAction 1475760420171 SpreadsheetTest.java +UnitTestCaseAction 1475760425033 SpreadsheetTest.java FAIL +UnitTestSessionAction 1475760425034 SpreadsheetTest.java FAIL +RefactoringAction 1475760476452 TableCell.java ADD TableCell.java CLASS +FileOpenedAction 1475760476609 TableCell.java 33 0 0 0 +RefactoringAction 1475760491520 TableCell.java REMOVE TableCell.java CLASS +RefactoringAction 1475760512672 Tablecell.java ADD Tablecell.java CLASS +FileOpenedAction 1475760512792 Tablecell.java 33 0 0 0 +RefactoringAction 1475760549974 Tablecell.java REMOVE Tablecell.java CLASS +RefactoringAction 1475760566738 Cell.java ADD Cell.java CLASS +FileOpenedAction 1475760566858 Cell.java 28 0 0 0 +RefactoringAction 1475760581353 Spreadsheet.java ADD Cell cells FIELD +RefactoringAction 1475760630905 Cell.java ADD String id FIELD +RefactoringAction 1475760639419 Cell.java ADD String value FIELD +RefactoringAction 1475760652935 Cell.java ADD String getId() METHOD +RefactoringAction 1475760652936 Cell.java ADD void setId(String) METHOD +RefactoringAction 1475760652937 Cell.java ADD String getValue() METHOD +RefactoringAction 1475760652938 Cell.java ADD void setValue(String) METHOD +RefactoringAction 1475760792258 Cell.java REMOVE Cell.java CLASS +RefactoringAction 1475760797474 Spreadsheet.java REMOVE cells FIELD +RefactoringAction 1475761112631 Cell.java ADD Cell.java CLASS +FileOpenedAction 1475761112776 Cell.java 28 0 0 0 +RefactoringAction 1475761133807 Cell.java ADD String id FIELD +RefactoringAction 1475761133808 Cell.java ADD String value FIELD +RefactoringAction 1475761157828 Cell.java ADD String getId() METHOD +RefactoringAction 1475761157829 Cell.java ADD void setId(String) METHOD +RefactoringAction 1475761157829 Cell.java ADD String getValue() METHOD +RefactoringAction 1475761157830 Cell.java ADD void setValue(String) METHOD +EditAction 1475761180142 Cell.java 291 4 4 0 diff --git a/bin/.gitignore b/bin/.gitignore index 2079672..376fff6 100644 --- a/bin/.gitignore +++ b/bin/.gitignore @@ -1,2 +1,5 @@ /Spreadsheet.class /SpreadsheetTest.class +/TableCell.class +/Tablecell.class +/Cell.class diff --git a/bin/SpreadsheetTest.class b/bin/SpreadsheetTest.class index a847979e77257e76ed292eee4bdd02b3669d1c8f..75da7d7e53047cb72b950782d8b7c87f5490deb8 100644 GIT binary patch delta 401 zcmZXQ%TB^z5QV?LsKrumRdnGMFF--9cwM++;f}-w2`e{Mn+hSQZDGqZ7+*vZLyQX_ zz_m-C#W;v2MDiz-|D2gKb7mg&r?~O{_4)=Ja?&wARC^r7ipeNran=-Cu@Glnp$Z0@ zq;<9wiSk|Gx!2*1=S3zNvWi&fMT$(eRC8OdQ+FG_Q;vda!#^En>`Jdy&Lq#aDE*!? z{ikdXNbO;*!7h6`j$-;Y@SR$-QH`8p7a#t~tirVM??ZkvL0&Ig;`g aSztn#`F;;3nG%#l=Roc*qd5|+ar_M&e_8|p delta 225 zcmdnMF_E3?)W2Q(7#J8#7!)^hU14P7V31>Em^AU1T)mY77iUODszPpRNk)E(LSk`o zYEg-6VQFGcu|{x7QD$Dcj)H$uR%&tyjMh}h%u^@;dQQAjK( z$jMAjOv*`BNXst*t4b_NFU?KOD=Aihny1Od$iNkxUs{x$>XteA2h&A+69#4mMxg7s sb~6Y^3dwF~5Z@2vF){D}Nj9*IC<8B$%>z-zz{kK3 Date: Thu, 6 Oct 2016 16:44:35 +0300 Subject: [PATCH 03/17] besouro automatic message --- .besouro/20161006162637726/actions.txt | 10 ++++++++++ bin/SpreadsheetTest.class | Bin 1072 -> 874 bytes src/Cell.java | 11 +++++++++++ tests/SpreadsheetTest.java | 4 +--- 4 files changed, 22 insertions(+), 3 deletions(-) diff --git a/.besouro/20161006162637726/actions.txt b/.besouro/20161006162637726/actions.txt index 5a389b0..7c15ada 100644 --- a/.besouro/20161006162637726/actions.txt +++ b/.besouro/20161006162637726/actions.txt @@ -30,3 +30,13 @@ RefactoringAction 1475761157829 Cell.java ADD void setId(String) METHOD RefactoringAction 1475761157829 Cell.java ADD String getValue() METHOD RefactoringAction 1475761157830 Cell.java ADD void setValue(String) METHOD EditAction 1475761180142 Cell.java 291 4 4 0 +RefactoringAction 1475761190050 Spreadsheet.java ADD Cell cells FIELD +RefactoringAction 1475761201096 Spreadsheet.java ADD void init FIELD +RefactoringAction 1475761204609 Spreadsheet.java RENAME init=>void init() METHOD +RefactoringAction 1475761239195 Spreadsheet.java REMOVE init() METHOD +RefactoringAction 1475761291168 Spreadsheet.java ADD import java.util.ArrayList IMPORT +CompilationAction 1475761340878 SpreadsheetTest.java +RefactoringAction 1475761372891 SpreadsheetTest.java ADD import org.junit.Before IMPORT +CompilationAction 1475761377331 SpreadsheetTest.java +RefactoringAction 1475761463921 Cell.java ADD Cell(String, String) METHOD +EditAction 1475761475432 Cell.java 396 5 6 0 diff --git a/bin/SpreadsheetTest.class b/bin/SpreadsheetTest.class index 75da7d7e53047cb72b950782d8b7c87f5490deb8..930eea05140060eecbe424630fa5f8fb366482b7 100644 GIT binary patch delta 397 zcmYjM%TB^T6g|^wDWyJWEk3B=3&B>cOLAc-z-suEBJ^j-;CA6-h$RGv2ie(1o zry6A)D_CWaV=fq~wXoex%2Gu&v94nSl_Zq>QWaYn)JX7euON1%lLu+Ql;l`; zdk2tdB|vxHVV=FfdPbp7y#$@2Mwu|=FhwV=ez};&40Q|(P>GSJTA^-{a+dBnX{K|w zGeE&uGVCErqjHF~(6HTCY>qt+iDqDeVxCM4SoFan#nh}Y5*eFW$Y2{gWW%sas08l^ DT){tj delta 566 zcmYjP-D(p-6#gb^cC%S+*)*-18mG2u(zLEyYXx%^O9dfUwhAr1**4Q;%Vs9bP6A%F z7rsEqdx%1bqM&%|jql+@h{tTPGR&NFIN#6VFu$_zZRf}D&tCzo~?IiHZlJ#Sc}t7sa88l;l0F z4r0+wo^mIbitxiwN@e(g;Qts#@sOK0J>lebI)ZnF>8KWuWMnE;9_=N(FI(a$k|a)Z za6_2CXujRkB5WlcA&ldofa@+S++ZkHnioTE8y(4Zz51GA+K9w#632*55yy>SI4*BZ zH_fuZc;3bHmhL#7efxWm8#2TQnT;Vwh|KW7*BQ5ijFYxWYBUDU8L zI%Prm0UlcL$@4 Date: Thu, 6 Oct 2016 16:46:56 +0300 Subject: [PATCH 04/17] besouro automatic message --- .besouro/20161006162637726/actions.txt | 1 + src/Spreadsheet.java | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.besouro/20161006162637726/actions.txt b/.besouro/20161006162637726/actions.txt index 7c15ada..5e53ded 100644 --- a/.besouro/20161006162637726/actions.txt +++ b/.besouro/20161006162637726/actions.txt @@ -40,3 +40,4 @@ RefactoringAction 1475761372891 SpreadsheetTest.java ADD import org.junit.Before CompilationAction 1475761377331 SpreadsheetTest.java RefactoringAction 1475761463921 Cell.java ADD Cell(String, String) METHOD EditAction 1475761475432 Cell.java 396 5 6 0 +EditAction 1475761616333 Spreadsheet.java 364 3 3 0 diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index e4f120b..102d7aa 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -1,13 +1,16 @@ +import java.util.ArrayList; public class Spreadsheet { - + private ArrayList cells = new ArrayList(); + + public String get(String cell) { // to be implemented return null; } public void set(String cell, String value) { - // to be implemented + cells.add(new Cell(cell, value)); } public String evaluate(String cell) { From 7cfa35c63aa33ccfb78a5414f35c84956f14937a Mon Sep 17 00:00:00 2001 From: somename Date: Thu, 6 Oct 2016 16:49:38 +0300 Subject: [PATCH 05/17] besouro automatic message --- .besouro/20161006162637726/actions.txt | 1 + bin/Spreadsheet.class | Bin 613 -> 845 bytes src/Spreadsheet.java | 5 ++++- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.besouro/20161006162637726/actions.txt b/.besouro/20161006162637726/actions.txt index 5e53ded..0469605 100644 --- a/.besouro/20161006162637726/actions.txt +++ b/.besouro/20161006162637726/actions.txt @@ -41,3 +41,4 @@ CompilationAction 1475761377331 SpreadsheetTest.java RefactoringAction 1475761463921 Cell.java ADD Cell(String, String) METHOD EditAction 1475761475432 Cell.java 396 5 6 0 EditAction 1475761616333 Spreadsheet.java 364 3 3 0 +EditAction 1475761778311 Spreadsheet.java 423 3 4 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 92b411f05752a6cee6d06c9769e1b70d40aa0840..13fadd977e409fa3d95203c9813fa449d074f5f7 100644 GIT binary patch literal 845 zcma)(O>fgc5Qg8i-MVp|FPE0D23ja>91yu6E~zR(B~BI`QU#UUCRwFhxejvHmH1a6 z0gl=c!AJ`C9vNAm?}A*ohfBpI0B7xc`3WG zOeWoT!*ew<0xKgG$1{P=D1Xb0j=QhYRDO!|%=82*eLYE}$xEfY=Y6Sv;j}@#6)FYj!x7o!|r6+P2Q|BO> zj$}NLspfkbbj+D1<<)3mOj2P_6wS5YF2v@;_D!mjNiVz^B9*)V?r^=EGM!K}Mjb3c z-OLULE*|jEg!9nC4iCM}vpw?h7<)vM<1sCIkyiXdFZ@6saVg`BMqN|vNJFmIpJwSu zz0tga#=?}(Su1vFWj1}cfW>>G)1{k*H8|wc#>uWzr*kyEq4_1x z-XL4cIX2ZfsFQz-Vt!GBO>EIk;5P1*yq9!ZTq{1a1rxYCs3%u$6|ZF_XWYd-dKb8l zZL+NCgcP&(pz{^YE3{6ZKAYp=ckI5uR^{cKDw?E^xjRM0Uv5xxiGnB8!6Nqlf2a)p Lq4I!wS!n+Ot(BRS delta 320 zcma)1I}XAy6!Qyhffgv=(h){jSWqV Date: Thu, 6 Oct 2016 16:51:05 +0300 Subject: [PATCH 06/17] besouro automatic message --- .besouro/20161006162637726/actions.txt | 5 +++ .../20161006162637726/besouroEpisodes.txt | 33 ++++++++++++++++++ .../randomHeuristicEpisodes.txt | 1 + .besouro/20161006162637726/zorroEpisodes.txt | 1 + bin/Spreadsheet.class | Bin 845 -> 1211 bytes tests/SpreadsheetTest.java | 8 +++++ 6 files changed, 48 insertions(+) diff --git a/.besouro/20161006162637726/actions.txt b/.besouro/20161006162637726/actions.txt index 0469605..c954c70 100644 --- a/.besouro/20161006162637726/actions.txt +++ b/.besouro/20161006162637726/actions.txt @@ -42,3 +42,8 @@ RefactoringAction 1475761463921 Cell.java ADD Cell(String, String) METHOD EditAction 1475761475432 Cell.java 396 5 6 0 EditAction 1475761616333 Spreadsheet.java 364 3 3 0 EditAction 1475761778311 Spreadsheet.java 423 3 4 0 +UnitTestCaseAction 1475761782519 SpreadsheetTest.java OK +UnitTestSessionAction 1475761782520 SpreadsheetTest.java OK +RefactoringAction 1475761841966 SpreadsheetTest.java ADD void testCreateCellA1()/2 METHOD +RefactoringAction 1475761846485 SpreadsheetTest.java RENAME testCreateCellA1()/2=>void testCreateCellA1_ FIELD +EditAction 1475761865867 SpreadsheetTest.java 471 3 7 2 diff --git a/.besouro/20161006162637726/besouroEpisodes.txt b/.besouro/20161006162637726/besouroEpisodes.txt index e69de29..b7626f0 100644 --- a/.besouro/20161006162637726/besouroEpisodes.txt +++ b/.besouro/20161006162637726/besouroEpisodes.txt @@ -0,0 +1,33 @@ +1475761782520 refactoring 3 1384 true +1475761782521 refactoring 3 1384 true +1475761782522 refactoring 3 1384 true +1475761782523 refactoring 3 1384 true +1475761782524 refactoring 3 1384 true +1475761782525 refactoring 3 1384 true +1475761782526 production 1 1384 false +1475761782527 production 3 1384 false +1475761782528 refactoring 3 1384 true +1475761782529 refactoring 3 1384 true +1475761782530 refactoring 3 1384 true +1475761782531 refactoring 3 1384 true +1475761782532 refactoring 3 1384 true +1475761782533 refactoring 3 1384 true +1475761782534 refactoring 3 1384 true +1475761782535 refactoring 3 1384 true +1475761782536 refactoring 3 1384 true +1475761782537 refactoring 3 1384 true +1475761782538 refactoring 3 1384 true +1475761782539 refactoring 3 1384 true +1475761782540 refactoring 3 1384 true +1475761782541 refactoring 3 1384 true +1475761782542 refactoring 3 1384 true +1475761782543 refactoring 3 1384 true +1475761782544 refactoring 3 1384 true +1475761782545 refactoring 3 1384 true +1475761782546 refactoring 3 1384 true +1475761782547 refactoring 3 1384 true +1475761782548 refactoring 3 1384 true +1475761782549 refactoring 3 1384 true +1475761782550 refactoring 3 1384 true +1475761782551 refactoring 3 1384 true +1475761782552 refactoring 3 1384 true diff --git a/.besouro/20161006162637726/randomHeuristicEpisodes.txt b/.besouro/20161006162637726/randomHeuristicEpisodes.txt index e69de29..b2f6f8a 100644 --- a/.besouro/20161006162637726/randomHeuristicEpisodes.txt +++ b/.besouro/20161006162637726/randomHeuristicEpisodes.txt @@ -0,0 +1 @@ +1475761782520 refactoring 3 1384 true diff --git a/.besouro/20161006162637726/zorroEpisodes.txt b/.besouro/20161006162637726/zorroEpisodes.txt index e69de29..f309aeb 100644 --- a/.besouro/20161006162637726/zorroEpisodes.txt +++ b/.besouro/20161006162637726/zorroEpisodes.txt @@ -0,0 +1 @@ +1475761782520 refactoring 3 1384 false diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 13fadd977e409fa3d95203c9813fa449d074f5f7..c0cf9c4e60932a7869a91deba0a6f8aba8073ec7 100644 GIT binary patch delta 656 zcmZXQT~8BH5Qd-G7Pf3xh1%8tR;v|lDbT9;SyU7?A%S`U(MaOO(r#*TQ?+c3ca6WH zH|iho#tTSHjgT0xP5cl35^=W0k7!OZXEHPAecm(Q26u<7uRnG^1GC)SwzAT;ILMgI zI7fv@-FKUg|FkJ2v$>@W=Y>;f`E{?bxL+?tIY!##xDfllYjc8=Lb&0+^o95@12r*vzcZ_ z7<8Yv9B)%dWc#N7M&{N6RMF;aK#C~ozT>sr;3wy8QnOqT%*W1Vx#v2R&8?}!iaOLk zcG40bmx>aW0?#Gkz>4owo-8}hR-JXv?UbcB7RX<>8DcKj<-EU$Gz_ayK91m^;HQvd(} delta 260 zcmdnZd6tdq)W2Q(7#J8#7&JF>X)ww#GO#44=HxIk2>E0smL=-vB<7{-2bUCO=A~Ot zu3<7zVP}v7s&NLY;bM?wP~c(UWRT%v;A2qYVNhmJVPs%VOi7vihf!kkF{U+>t5~Fz zIT=KN=8G{f0ZAqXQ6LKhm>47(q!<{1P?|wzvLK6?mu#fA&UOa*Z48Rx8^H>Mfg~4L t8!v+(&<2n(3JlCZQV4F05Y!lum@3dfCZK_8lM7jt)rAOHs}8n90|4IeA@u+N diff --git a/tests/SpreadsheetTest.java b/tests/SpreadsheetTest.java index d190086..b9c3099 100644 --- a/tests/SpreadsheetTest.java +++ b/tests/SpreadsheetTest.java @@ -19,5 +19,13 @@ public void testCreateCellA1() { assertEquals("1", s); } + + @Test + public void testCreateCellA1_minus1() { + sheet.set("A1", "-1"); + String s = sheet.get("A1"); + assertEquals("-1", s); + + } } From 1bb48ebb447546fc24208aa40f795dc77e33a7bd Mon Sep 17 00:00:00 2001 From: somename Date: Thu, 6 Oct 2016 16:53:15 +0300 Subject: [PATCH 07/17] besouro automatic message --- .besouro/20161006162637726/actions.txt | 6 ++++++ .besouro/20161006162637726/besouroEpisodes.txt | 2 ++ .../randomHeuristicEpisodes.txt | 1 + .besouro/20161006162637726/zorroEpisodes.txt | 1 + bin/SpreadsheetTest.class | Bin 874 -> 1026 bytes tests/SpreadsheetTest.java | 8 ++++++++ 6 files changed, 18 insertions(+) diff --git a/.besouro/20161006162637726/actions.txt b/.besouro/20161006162637726/actions.txt index c954c70..a1253af 100644 --- a/.besouro/20161006162637726/actions.txt +++ b/.besouro/20161006162637726/actions.txt @@ -47,3 +47,9 @@ UnitTestSessionAction 1475761782520 SpreadsheetTest.java OK RefactoringAction 1475761841966 SpreadsheetTest.java ADD void testCreateCellA1()/2 METHOD RefactoringAction 1475761846485 SpreadsheetTest.java RENAME testCreateCellA1()/2=>void testCreateCellA1_ FIELD EditAction 1475761865867 SpreadsheetTest.java 471 3 7 2 +UnitTestCaseAction 1475761868322 SpreadsheetTest.java OK +UnitTestSessionAction 1475761868322 SpreadsheetTest.java OK +RefactoringAction 1475761914545 SpreadsheetTest.java ADD void testCreateCellA1_minus1()/2 METHOD +RefactoringAction 1475761919073 SpreadsheetTest.java RENAME testCreateCellA1_minus1()/2=>void testCreateCellA1_5() METHOD +RefactoringAction 1475761920086 SpreadsheetTest.java RENAME testCreateCellA1_5()=>void testCreateCellA1_5A() METHOD +EditAction 1475761995345 SpreadsheetTest.java 610 4 10 3 diff --git a/.besouro/20161006162637726/besouroEpisodes.txt b/.besouro/20161006162637726/besouroEpisodes.txt index b7626f0..eee6bdd 100644 --- a/.besouro/20161006162637726/besouroEpisodes.txt +++ b/.besouro/20161006162637726/besouroEpisodes.txt @@ -31,3 +31,5 @@ 1475761782550 refactoring 3 1384 true 1475761782551 refactoring 3 1384 true 1475761782552 refactoring 3 1384 true +1475761868322 test-addition 1 26 true +1475761868323 test-addition 1 26 true diff --git a/.besouro/20161006162637726/randomHeuristicEpisodes.txt b/.besouro/20161006162637726/randomHeuristicEpisodes.txt index b2f6f8a..6364088 100644 --- a/.besouro/20161006162637726/randomHeuristicEpisodes.txt +++ b/.besouro/20161006162637726/randomHeuristicEpisodes.txt @@ -1 +1,2 @@ 1475761782520 refactoring 3 1384 true +1475761868322 test-addition 1 26 false diff --git a/.besouro/20161006162637726/zorroEpisodes.txt b/.besouro/20161006162637726/zorroEpisodes.txt index f309aeb..9835123 100644 --- a/.besouro/20161006162637726/zorroEpisodes.txt +++ b/.besouro/20161006162637726/zorroEpisodes.txt @@ -1 +1,2 @@ 1475761782520 refactoring 3 1384 false +1475761868322 test-addition 1 85 false diff --git a/bin/SpreadsheetTest.class b/bin/SpreadsheetTest.class index 930eea05140060eecbe424630fa5f8fb366482b7..6f7acad23e62d5fce1c76a58ef5b3b6d9520bcfa 100644 GIT binary patch delta 155 zcmaFG*2KYe>ff$?3=9k=48|L|B$*V%OHzwVoQqNuOH!Rvb8;LF<8w3fN{bCS7z`L0 zm~;&%D>9igvTTlI;$fWpo=GKKe;b3G))odaA*pQ)Nff$?3=9k=3 Date: Thu, 6 Oct 2016 16:53:36 +0300 Subject: [PATCH 08/17] besouro automatic message --- .besouro/20161006162637726/actions.txt | 1 + bin/SpreadsheetTest.class | Bin 1026 -> 1195 bytes tests/SpreadsheetTest.java | 4 ++-- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.besouro/20161006162637726/actions.txt b/.besouro/20161006162637726/actions.txt index a1253af..be43336 100644 --- a/.besouro/20161006162637726/actions.txt +++ b/.besouro/20161006162637726/actions.txt @@ -53,3 +53,4 @@ RefactoringAction 1475761914545 SpreadsheetTest.java ADD void testCreateCellA1_m RefactoringAction 1475761919073 SpreadsheetTest.java RENAME testCreateCellA1_minus1()/2=>void testCreateCellA1_5() METHOD RefactoringAction 1475761920086 SpreadsheetTest.java RENAME testCreateCellA1_5()=>void testCreateCellA1_5A() METHOD EditAction 1475761995345 SpreadsheetTest.java 610 4 10 3 +EditAction 1475762016230 SpreadsheetTest.java 619 4 10 3 diff --git a/bin/SpreadsheetTest.class b/bin/SpreadsheetTest.class index 6f7acad23e62d5fce1c76a58ef5b3b6d9520bcfa..ddf11e6742ea3f259ae38606e284c013a94b1570 100644 GIT binary patch delta 126 zcmZqTSk1|G>ff$?3=9k=43-WsR2dmKQp*x^N)t;`85x92Qj1HR zi&B9c=hU1WN5gniM-B!vMg}HR$H~r2=8UYHtC?&V84V}zV0LCSnJmDp%4j-y4YM+@ cA_F&r5`!p%GJ`aO>f}4j^6ch7>zEiU0I^~llmGw# delta 46 zcmZ3@*~Gzh>ff$?3=9k=48|L|ESV;kF_|;6Y+lD?!#FvCMPf1&iw?UXP@0Ls2mnE~ B3k?7O diff --git a/tests/SpreadsheetTest.java b/tests/SpreadsheetTest.java index 88f6460..ba6b5ce 100644 --- a/tests/SpreadsheetTest.java +++ b/tests/SpreadsheetTest.java @@ -31,8 +31,8 @@ public void testCreateCellA1_minus1() { @Test public void testCreateCellA1_5A() { sheet.set("A1", "5A"); - String s = sheet.get("A1"); - assertEquals("-1", s); + String s = sheet.evaluate("A1"); + assertEquals("#Error", s); } From 68a0837d5777871c14c3492c932bbe3870a884e7 Mon Sep 17 00:00:00 2001 From: somename Date: Thu, 6 Oct 2016 17:08:55 +0300 Subject: [PATCH 09/17] besouro automatic message --- .besouro/20161006162637726/actions.txt | 3 +++ bin/SpreadsheetTest.class | Bin 1195 -> 1207 bytes src/Spreadsheet.java | 11 ++++++++++- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.besouro/20161006162637726/actions.txt b/.besouro/20161006162637726/actions.txt index be43336..e1ea4df 100644 --- a/.besouro/20161006162637726/actions.txt +++ b/.besouro/20161006162637726/actions.txt @@ -54,3 +54,6 @@ RefactoringAction 1475761919073 SpreadsheetTest.java RENAME testCreateCellA1_min RefactoringAction 1475761920086 SpreadsheetTest.java RENAME testCreateCellA1_5()=>void testCreateCellA1_5A() METHOD EditAction 1475761995345 SpreadsheetTest.java 610 4 10 3 EditAction 1475762016230 SpreadsheetTest.java 619 4 10 3 +UnitTestCaseAction 1475762018134 SpreadsheetTest.java FAIL +UnitTestSessionAction 1475762018135 SpreadsheetTest.java FAIL +EditAction 1475762935482 Spreadsheet.java 621 3 7 0 diff --git a/bin/SpreadsheetTest.class b/bin/SpreadsheetTest.class index ddf11e6742ea3f259ae38606e284c013a94b1570..7761e8a774abbf1ffbe00c43c3c49084398e413a 100644 GIT binary patch delta 54 zcmZ3@xt){i)W2Q(7#J8#7_2vPDc delta 41 wcmdnaxtf#f)W2Q(7#J8#7%Vq(R#f!!P^!^B_#02?m~=>Px# diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index c51ec38..a0f1e8e 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -17,7 +17,16 @@ public void set(String cell, String value) { } public String evaluate(String cell) { - // to be implemented + String value = get(cell); + char c = value.charAt(0); + + if(Character.isDigit(c) || c =='-') + for(char ch: value.toCharArray()){ + if(!Character.isDigit(ch)) + return "#Error"; + else + return value; + } return null; } From 9e39fa3cb0b48c9dc58914662c2d990a663c7bed Mon Sep 17 00:00:00 2001 From: somename Date: Thu, 6 Oct 2016 17:13:46 +0300 Subject: [PATCH 10/17] besouro automatic message --- .besouro/20161006162637726/actions.txt | 3 +++ bin/Spreadsheet.class | Bin 1211 -> 1497 bytes src/Spreadsheet.java | 11 ++++++++--- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/.besouro/20161006162637726/actions.txt b/.besouro/20161006162637726/actions.txt index e1ea4df..466b1ae 100644 --- a/.besouro/20161006162637726/actions.txt +++ b/.besouro/20161006162637726/actions.txt @@ -57,3 +57,6 @@ EditAction 1475762016230 SpreadsheetTest.java 619 4 10 3 UnitTestCaseAction 1475762018134 SpreadsheetTest.java FAIL UnitTestSessionAction 1475762018135 SpreadsheetTest.java FAIL EditAction 1475762935482 Spreadsheet.java 621 3 7 0 +UnitTestCaseAction 1475762937427 SpreadsheetTest.java FAIL +UnitTestSessionAction 1475762937428 SpreadsheetTest.java FAIL +EditAction 1475763226289 Spreadsheet.java 674 3 7 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index c0cf9c4e60932a7869a91deba0a6f8aba8073ec7..581110bb619b63f6c1305f244cff0d28fef171ca 100644 GIT binary patch delta 379 zcmW-dNlQXe9L0b4IXrzDL}qCdRGTy-Xs~n<*wbd4XWKj^)QE(a1g-oWwW@Dm1QG?( zx=m|8N{gcZb93&2Gu(6Uhrb;#zW&}@z#JDZ#`YDJ zo>-5W2Akw{wiKZ&>&}|Kwr)z(rZ}u(?a~gi&5lB^+-57KN+)B+&YiZsAp0CB0=25+ z&e*nf?^MPLrjH}JWjq(Q?W(O%ra~*0bMbaqz1L~hZ-~a#s delta 90 zcmcb~y_=Kk)W2Q(7#J8#7~D2;ooCvd%e;`$(TstSfe9$c#JB-OG6(}nHlP>-gD8Ut akQ9T+0(oLU9!P~5gE>&1k--Jba|Hky(F<_^ diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index a0f1e8e..7264d95 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -20,13 +20,18 @@ public String evaluate(String cell) { String value = get(cell); char c = value.charAt(0); - if(Character.isDigit(c) || c =='-') + if(Character.isDigit(c) || c =='-') { + int counter = 0; for(char ch: value.toCharArray()){ + if(ch == '-') { + + } + if(!Character.isDigit(ch)) return "#Error"; - else - return value; } + return value; + } return null; } From b8a75ecd5675c6629d59b7c8966ad6505eeb27a3 Mon Sep 17 00:00:00 2001 From: somename Date: Thu, 6 Oct 2016 17:15:12 +0300 Subject: [PATCH 11/17] besouro automatic message --- .besouro/20161006162637726/actions.txt | 3 +++ bin/Spreadsheet.class | Bin 1497 -> 1581 bytes src/Spreadsheet.java | 5 +++-- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.besouro/20161006162637726/actions.txt b/.besouro/20161006162637726/actions.txt index 466b1ae..175b641 100644 --- a/.besouro/20161006162637726/actions.txt +++ b/.besouro/20161006162637726/actions.txt @@ -60,3 +60,6 @@ EditAction 1475762935482 Spreadsheet.java 621 3 7 0 UnitTestCaseAction 1475762937427 SpreadsheetTest.java FAIL UnitTestSessionAction 1475762937428 SpreadsheetTest.java FAIL EditAction 1475763226289 Spreadsheet.java 674 3 7 0 +UnitTestCaseAction 1475763229457 SpreadsheetTest.java FAIL +UnitTestSessionAction 1475763229457 SpreadsheetTest.java FAIL +EditAction 1475763312214 Spreadsheet.java 710 3 7 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 581110bb619b63f6c1305f244cff0d28fef171ca..6fd2f141274afd53b0969bdf96bdd4d756cd9d3a 100644 GIT binary patch delta 322 zcmXw!%}T>S6otP@nwj)xp*7J4T1DK&>c$YILJ*OnMZtw=>))mnx>68bcjHsI(uKGZ zB0>-seE{FUC-5n>-U@EcoO|cH=gxc7K}rbM=h#*Xz9mB96N6g$52 z$LaDxdaISMee*E-s;4TIJew)ekbb(H R!X;<${;yw`v|G8p%~AFLLRrS;Vdh10u8L&;*QrH8V`4 H93K7v(y}Ao diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 7264d95..8b13cb6 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -23,12 +23,13 @@ public String evaluate(String cell) { if(Character.isDigit(c) || c =='-') { int counter = 0; for(char ch: value.toCharArray()){ - if(ch == '-') { + if(ch == '-' && counter == 0) { } - if(!Character.isDigit(ch)) + else if(!Character.isDigit(ch)) return "#Error"; + counter++; } return value; } From d304e1cdec7555a924c2d15706a7468e84a0b072 Mon Sep 17 00:00:00 2001 From: somename Date: Thu, 6 Oct 2016 17:18:35 +0300 Subject: [PATCH 12/17] besouro automatic message --- .besouro/20161006162637726/actions.txt | 7 +++++++ .../20161006162637726/besouroEpisodes.txt | 12 ++++++++++++ .../randomHeuristicEpisodes.txt | 1 + .besouro/20161006162637726/zorroEpisodes.txt | 5 +++-- bin/Spreadsheet.class | Bin 1581 -> 1651 bytes tests/SpreadsheetTest.java | 8 ++++++++ 6 files changed, 31 insertions(+), 2 deletions(-) diff --git a/.besouro/20161006162637726/actions.txt b/.besouro/20161006162637726/actions.txt index 175b641..9561a4a 100644 --- a/.besouro/20161006162637726/actions.txt +++ b/.besouro/20161006162637726/actions.txt @@ -63,3 +63,10 @@ EditAction 1475763226289 Spreadsheet.java 674 3 7 0 UnitTestCaseAction 1475763229457 SpreadsheetTest.java FAIL UnitTestSessionAction 1475763229457 SpreadsheetTest.java FAIL EditAction 1475763312214 Spreadsheet.java 710 3 7 0 +UnitTestCaseAction 1475763314092 SpreadsheetTest.java OK +UnitTestSessionAction 1475763314092 SpreadsheetTest.java OK +RefactoringAction 1475763444823 SpreadsheetTest.java ADD void set() METHOD +RefactoringAction 1475763450339 SpreadsheetTest.java ADD void testCreateCellA1_5A()/2 METHOD +RefactoringAction 1475763505465 SpreadsheetTest.java RENAME testCreateCellA1_5A()/2=>void testCreateCellA1astring() METHOD +RefactoringAction 1475763513478 SpreadsheetTest.java REMOVE set() METHOD +EditAction 1475763515350 SpreadsheetTest.java 776 5 13 4 diff --git a/.besouro/20161006162637726/besouroEpisodes.txt b/.besouro/20161006162637726/besouroEpisodes.txt index eee6bdd..d808a93 100644 --- a/.besouro/20161006162637726/besouroEpisodes.txt +++ b/.besouro/20161006162637726/besouroEpisodes.txt @@ -33,3 +33,15 @@ 1475761782552 refactoring 3 1384 true 1475761868322 test-addition 1 26 true 1475761868323 test-addition 1 26 true +1475763314092 test-first 3 1399 true +1475763314093 test-first 3 1399 true +1475763314094 test-first 3 1399 true +1475763314095 test-first 3 1399 true +1475763314096 test-first 3 1399 true +1475763314097 test-first 3 1399 true +1475763314098 test-first 3 1399 true +1475763314099 test-first 3 1399 true +1475763314100 test-first 3 1399 true +1475763314101 test-first 3 1399 true +1475763314102 test-first 3 1399 true +1475763314103 test-first 3 1399 true diff --git a/.besouro/20161006162637726/randomHeuristicEpisodes.txt b/.besouro/20161006162637726/randomHeuristicEpisodes.txt index 6364088..d629c6f 100644 --- a/.besouro/20161006162637726/randomHeuristicEpisodes.txt +++ b/.besouro/20161006162637726/randomHeuristicEpisodes.txt @@ -1,2 +1,3 @@ 1475761782520 refactoring 3 1384 true 1475761868322 test-addition 1 26 false +1475763314092 test-first 3 1399 true diff --git a/.besouro/20161006162637726/zorroEpisodes.txt b/.besouro/20161006162637726/zorroEpisodes.txt index 9835123..40ea4bd 100644 --- a/.besouro/20161006162637726/zorroEpisodes.txt +++ b/.besouro/20161006162637726/zorroEpisodes.txt @@ -1,2 +1,3 @@ -1475761782520 refactoring 3 1384 false -1475761868322 test-addition 1 85 false +1475761782520 refactoring 3 1384 true +1475761868322 test-addition 1 85 true +1475763314092 test-first 3 1445 true diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 6fd2f141274afd53b0969bdf96bdd4d756cd9d3a..e774787b70e3a567c8c79b1541de27a0c00a5b4f 100644 GIT binary patch delta 322 zcmYk0y-EW?6otRp-I?8$MI<^(LSjS&A+C+eC;=m=D1-zpG#Y;@@i}Z#+NIJ;D=T5E z#meXKHN*#4?~0(8;oQT$=bX8($ybuq^<58-7`SY$5T{=a42{7U;|Pj75eli4-~_m;1yrE4^fnO_WSe*%jtV)Dc?@E$N7cfzX@c)9}ML|UHXOJkxm7vGi5QV>+pPN*(Q0vte5{tNt(T(9M6@rKqDGDy6TF_^4;~Thhr7KrLR>768 z;{)^o>QNZZoS8XuW)|6J*5>h(C7=gfmHQnR*HzdtX^JnVuk?zwgE#8XM^(qoe4Kv! zB=q)!!7z2U_OXlqb#~*neYVC~m%J~3s@Amf3+W3>R)m{a92wgT8ITK)*x{5B%}m85 zyG+@W3>r!GjO1I&f6Q}?QFp?*SRk7-PMGOH&LMZ)6UlCsxq2~U?bO6CsT~#T!IG3H P!6cLlqnY7B81VQD=b#~y diff --git a/tests/SpreadsheetTest.java b/tests/SpreadsheetTest.java index ba6b5ce..9667558 100644 --- a/tests/SpreadsheetTest.java +++ b/tests/SpreadsheetTest.java @@ -35,5 +35,13 @@ public void testCreateCellA1_5A() { assertEquals("#Error", s); } + + @Test + public void testCreateCellA1astring() { + sheet.set("A1", "'a string'"); + String s = sheet.evaluate("A1"); + assertEquals("a string", s); + + } } From 376f3ec49502e4b47354ee5d23f18c162cb9a7bb Mon Sep 17 00:00:00 2001 From: somename Date: Thu, 6 Oct 2016 17:28:37 +0300 Subject: [PATCH 13/17] besouro automatic message --- .besouro/20161006162637726/actions.txt | 3 +++ bin/SpreadsheetTest.class | Bin 1207 -> 1381 bytes src/Spreadsheet.java | 9 +++++++++ 3 files changed, 12 insertions(+) diff --git a/.besouro/20161006162637726/actions.txt b/.besouro/20161006162637726/actions.txt index 9561a4a..8e05e59 100644 --- a/.besouro/20161006162637726/actions.txt +++ b/.besouro/20161006162637726/actions.txt @@ -70,3 +70,6 @@ RefactoringAction 1475763450339 SpreadsheetTest.java ADD void testCreateCellA1_5 RefactoringAction 1475763505465 SpreadsheetTest.java RENAME testCreateCellA1_5A()/2=>void testCreateCellA1astring() METHOD RefactoringAction 1475763513478 SpreadsheetTest.java REMOVE set() METHOD EditAction 1475763515350 SpreadsheetTest.java 776 5 13 4 +UnitTestCaseAction 1475763517210 SpreadsheetTest.java FAIL +UnitTestSessionAction 1475763517210 SpreadsheetTest.java FAIL +EditAction 1475764116999 Spreadsheet.java 936 3 7 0 diff --git a/bin/SpreadsheetTest.class b/bin/SpreadsheetTest.class index 7761e8a774abbf1ffbe00c43c3c49084398e413a..ea40892ad337e590f21c19914c72358216f201a7 100644 GIT binary patch delta 123 zcmdna`IL+6)W2Q(7#J8#7#ucoRWVIgW)f6QEG{X^%uDBBux4c7QcqNXaMd{&Y#A9i zVBE<~Oy-Pin|Cq&V4NJltRi5wjX_Rp3xk-D)HVh~A0eB`1uP=Gnhe|wS`4BL+6>YR Rx|1ie$g|r4?P6lE2LNzQ9tHpa delta 36 scmaFLwVjje)W2Q(7#J8#7_2vPRWVK8!(__Hy7?2+4@Oo71||k80P!9R4FCWD diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 8b13cb6..cb8d05c 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -33,6 +33,15 @@ else if(!Character.isDigit(ch)) } return value; } + + else { + if(c == '\'' && value.substring(value.length() - 1).equals("'")) { + StringBuilder sb = new StringBuilder(value); + sb.deleteCharAt(0); + sb.deleteCharAt(sb.length()-1); + return sb.toString(); + } + } return null; } From 776e2556431585b6b07d60249867bc6a53910455 Mon Sep 17 00:00:00 2001 From: somename Date: Thu, 6 Oct 2016 17:29:20 +0300 Subject: [PATCH 14/17] besouro automatic message --- .besouro/20161006162637726/actions.txt | 8 ++++++++ .../20161006162637726/besouroEpisodes.txt | 3 +++ .../randomHeuristicEpisodes.txt | 1 + .besouro/20161006162637726/zorroEpisodes.txt | 1 + bin/Spreadsheet.class | Bin 1651 -> 1998 bytes tests/SpreadsheetTest.java | 8 ++++++++ 6 files changed, 21 insertions(+) diff --git a/.besouro/20161006162637726/actions.txt b/.besouro/20161006162637726/actions.txt index 8e05e59..cf55c92 100644 --- a/.besouro/20161006162637726/actions.txt +++ b/.besouro/20161006162637726/actions.txt @@ -73,3 +73,11 @@ EditAction 1475763515350 SpreadsheetTest.java 776 5 13 4 UnitTestCaseAction 1475763517210 SpreadsheetTest.java FAIL UnitTestSessionAction 1475763517210 SpreadsheetTest.java FAIL EditAction 1475764116999 Spreadsheet.java 936 3 7 0 +UnitTestCaseAction 1475764119390 SpreadsheetTest.java OK +UnitTestSessionAction 1475764119390 SpreadsheetTest.java OK +RefactoringAction 1475764135540 SpreadsheetTest.java ADD void testCreateCellA1astring()/2 METHOD +RefactoringAction 1475764139052 SpreadsheetTest.java RENAME testCreateCellA1astring()/2=>void testCreateCellA1astringW() METHOD +RefactoringAction 1475764140064 SpreadsheetTest.java RENAME testCreateCellA1astringW()=>void testCreateCellA1astringWith() METHOD +RefactoringAction 1475764141075 SpreadsheetTest.java RENAME testCreateCellA1astringWith()=>void testCreateCellA1astringWithBAd() METHOD +RefactoringAction 1475764144589 SpreadsheetTest.java RENAME testCreateCellA1astringWithBAd()=>void testCreateCellA1astringWithBadFormat() METHOD +EditAction 1475764160091 SpreadsheetTest.java 943 6 16 5 diff --git a/.besouro/20161006162637726/besouroEpisodes.txt b/.besouro/20161006162637726/besouroEpisodes.txt index d808a93..d7d16f2 100644 --- a/.besouro/20161006162637726/besouroEpisodes.txt +++ b/.besouro/20161006162637726/besouroEpisodes.txt @@ -45,3 +45,6 @@ 1475763314101 test-first 3 1399 true 1475763314102 test-first 3 1399 true 1475763314103 test-first 3 1399 true +1475764119390 test-first 3 674 true +1475764119391 test-first 3 674 true +1475764119392 test-first 3 674 true diff --git a/.besouro/20161006162637726/randomHeuristicEpisodes.txt b/.besouro/20161006162637726/randomHeuristicEpisodes.txt index d629c6f..eb1098d 100644 --- a/.besouro/20161006162637726/randomHeuristicEpisodes.txt +++ b/.besouro/20161006162637726/randomHeuristicEpisodes.txt @@ -1,3 +1,4 @@ 1475761782520 refactoring 3 1384 true 1475761868322 test-addition 1 26 false 1475763314092 test-first 3 1399 true +1475764119390 test-first 3 674 true diff --git a/.besouro/20161006162637726/zorroEpisodes.txt b/.besouro/20161006162637726/zorroEpisodes.txt index 40ea4bd..b421149 100644 --- a/.besouro/20161006162637726/zorroEpisodes.txt +++ b/.besouro/20161006162637726/zorroEpisodes.txt @@ -1,3 +1,4 @@ 1475761782520 refactoring 3 1384 true 1475761868322 test-addition 1 85 true 1475763314092 test-first 3 1445 true +1475764119390 test-first 3 805 true diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index e774787b70e3a567c8c79b1541de27a0c00a5b4f..8fa8245c6d01b499e7860e90c9f825fb10e27db5 100644 GIT binary patch delta 596 zcmZvZOKTHR7>1vdnPieMpjN9+iMY~aLL>{tOG6j7AVyp%G{$QunK4ZrCpt5U3l{;m z3L-(ooh#i|gb@_{0WSPAuDyJxwczb6&iSs-_nvdU+Fy2+KY#!52{^%nx8+O5v`n3j z%@w+eLKsAYbX{T8+_p|!v$@U(v&-XQ=m&9`HTpIsd`;PAOn-;CtGeX2%>WT$`#~6_!OFT9pG_5&|IPhHZt1>` z-tO3h)D*>Zw5?23tthPiXdIkB@Y^b}6zpR4R3Ez)-rxVs<3o zy>MuE^%Z9tjf_>(&$v2wGsAsJ^&@ND#(R2;rehizLB|mzW2lR?ld-X>HU(p_SN3!4 znLWujr$@O@m50=Lgv(QT^XD96pH!U3(nFbNznt1S$tmQMc*e3=Icy$tn!7@*utdZN zljAIKPhxptE(kl8*rIg%Sl@6g>goq`lq{6k7PCsB=p^t*u&(s7NM=iggNL`WMa-R+ Nx`LMI7z;JW Date: Thu, 6 Oct 2016 17:29:49 +0300 Subject: [PATCH 15/17] besouro automatic message --- .besouro/20161006162637726/actions.txt | 3 +++ bin/SpreadsheetTest.class | Bin 1381 -> 1553 bytes src/Spreadsheet.java | 2 ++ 3 files changed, 5 insertions(+) diff --git a/.besouro/20161006162637726/actions.txt b/.besouro/20161006162637726/actions.txt index cf55c92..5e64894 100644 --- a/.besouro/20161006162637726/actions.txt +++ b/.besouro/20161006162637726/actions.txt @@ -81,3 +81,6 @@ RefactoringAction 1475764140064 SpreadsheetTest.java RENAME testCreateCellA1astr RefactoringAction 1475764141075 SpreadsheetTest.java RENAME testCreateCellA1astringWith()=>void testCreateCellA1astringWithBAd() METHOD RefactoringAction 1475764144589 SpreadsheetTest.java RENAME testCreateCellA1astringWithBAd()=>void testCreateCellA1astringWithBadFormat() METHOD EditAction 1475764160091 SpreadsheetTest.java 943 6 16 5 +UnitTestCaseAction 1475764163364 SpreadsheetTest.java FAIL +UnitTestSessionAction 1475764163364 SpreadsheetTest.java FAIL +EditAction 1475764189020 Spreadsheet.java 965 3 7 0 diff --git a/bin/SpreadsheetTest.class b/bin/SpreadsheetTest.class index ea40892ad337e590f21c19914c72358216f201a7..a4613ed64007f7c648551a0964426d2fe209eb80 100644 GIT binary patch delta 111 zcmaFLHIaww)W2Q(7#J8#7@Rk9ZDP_9ZaV| Date: Thu, 6 Oct 2016 17:30:33 +0300 Subject: [PATCH 16/17] besouro automatic message --- .besouro/20161006162637726/actions.txt | 4 ++++ .../20161006162637726/besouroEpisodes.txt | 2 ++ .../randomHeuristicEpisodes.txt | 1 + .besouro/20161006162637726/zorroEpisodes.txt | 1 + bin/Spreadsheet.class | Bin 1998 -> 1999 bytes src/Spreadsheet.java | 1 - 6 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.besouro/20161006162637726/actions.txt b/.besouro/20161006162637726/actions.txt index 5e64894..8ec9827 100644 --- a/.besouro/20161006162637726/actions.txt +++ b/.besouro/20161006162637726/actions.txt @@ -84,3 +84,7 @@ EditAction 1475764160091 SpreadsheetTest.java 943 6 16 5 UnitTestCaseAction 1475764163364 SpreadsheetTest.java FAIL UnitTestSessionAction 1475764163364 SpreadsheetTest.java FAIL EditAction 1475764189020 Spreadsheet.java 965 3 7 0 +CompilationAction 1475764189298 Spreadsheet.java +CompilationAction 1475764204616 Spreadsheet.java +UnitTestCaseAction 1475764206957 SpreadsheetTest.java OK +UnitTestSessionAction 1475764206957 SpreadsheetTest.java OK diff --git a/.besouro/20161006162637726/besouroEpisodes.txt b/.besouro/20161006162637726/besouroEpisodes.txt index d7d16f2..f86867e 100644 --- a/.besouro/20161006162637726/besouroEpisodes.txt +++ b/.besouro/20161006162637726/besouroEpisodes.txt @@ -48,3 +48,5 @@ 1475764119390 test-first 3 674 true 1475764119391 test-first 3 674 true 1475764119392 test-first 3 674 true +1475764206957 test-first 3 71 true +1475764206958 test-first 3 71 true diff --git a/.besouro/20161006162637726/randomHeuristicEpisodes.txt b/.besouro/20161006162637726/randomHeuristicEpisodes.txt index eb1098d..6ad0aca 100644 --- a/.besouro/20161006162637726/randomHeuristicEpisodes.txt +++ b/.besouro/20161006162637726/randomHeuristicEpisodes.txt @@ -2,3 +2,4 @@ 1475761868322 test-addition 1 26 false 1475763314092 test-first 3 1399 true 1475764119390 test-first 3 674 true +1475764206957 test-first 3 71 true diff --git a/.besouro/20161006162637726/zorroEpisodes.txt b/.besouro/20161006162637726/zorroEpisodes.txt index b421149..1c5ddee 100644 --- a/.besouro/20161006162637726/zorroEpisodes.txt +++ b/.besouro/20161006162637726/zorroEpisodes.txt @@ -2,3 +2,4 @@ 1475761868322 test-addition 1 85 true 1475763314092 test-first 3 1445 true 1475764119390 test-first 3 805 true +1475764206957 test-first 3 87 true diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 8fa8245c6d01b499e7860e90c9f825fb10e27db5..449f013d0fb61baa2c5f20020b4fdf08c4447c49 100644 GIT binary patch delta 64 zcmX@df1ZDX3>)VP24)6M1_p*1lU3QKG6{uD-pv*xKZ8M(K@2De6lO4EFlS(7U}KoX R-~?nbG4L?-Og3Ym0RX<(3`qb0 delta 63 zcmX@le~y2H3>)Wi24)6M1_p-dlU3QKGBQry!xkeyok5gA3@8Q^WiVqfXJBMtW0=U` Q1Y|KW@Gx{wHfNs!0I01C-v9sr diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index cdcc53b..7169d82 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -44,7 +44,6 @@ else if(!Character.isDigit(ch)) else return "#Error"; } - return null; } } From 6b31a76ad35213140c5e630def47ee414d797cee Mon Sep 17 00:00:00 2001 From: pasilack Date: Thu, 13 Oct 2016 17:02:45 +0300 Subject: [PATCH 17/17] 11 finished --- .besouro/20161013143012955/actions.txt | 0 .besouro/20161013143012955/zorroEpisodes.txt | 0 .besouro/20161013143038987/actions.txt | 0 .besouro/20161013143038987/zorroEpisodes.txt | 0 .besouro/20161013143105748/actions.txt | 0 .besouro/20161013143105748/zorroEpisodes.txt | 0 bin/.gitignore | 5 - bin/Cell.class | Bin 0 -> 750 bytes bin/Spreadsheet.class | Bin 1999 -> 4002 bytes bin/SpreadsheetTest.class | Bin 1553 -> 4203 bytes src/Spreadsheet.java | 131 +++++++++++++++++-- tests/SpreadsheetTest.java | 120 +++++++++++++++-- 12 files changed, 227 insertions(+), 29 deletions(-) create mode 100644 .besouro/20161013143012955/actions.txt create mode 100644 .besouro/20161013143012955/zorroEpisodes.txt create mode 100644 .besouro/20161013143038987/actions.txt create mode 100644 .besouro/20161013143038987/zorroEpisodes.txt create mode 100644 .besouro/20161013143105748/actions.txt create mode 100644 .besouro/20161013143105748/zorroEpisodes.txt delete mode 100644 bin/.gitignore create mode 100644 bin/Cell.class diff --git a/.besouro/20161013143012955/actions.txt b/.besouro/20161013143012955/actions.txt new file mode 100644 index 0000000..e69de29 diff --git a/.besouro/20161013143012955/zorroEpisodes.txt b/.besouro/20161013143012955/zorroEpisodes.txt new file mode 100644 index 0000000..e69de29 diff --git a/.besouro/20161013143038987/actions.txt b/.besouro/20161013143038987/actions.txt new file mode 100644 index 0000000..e69de29 diff --git a/.besouro/20161013143038987/zorroEpisodes.txt b/.besouro/20161013143038987/zorroEpisodes.txt new file mode 100644 index 0000000..e69de29 diff --git a/.besouro/20161013143105748/actions.txt b/.besouro/20161013143105748/actions.txt new file mode 100644 index 0000000..e69de29 diff --git a/.besouro/20161013143105748/zorroEpisodes.txt b/.besouro/20161013143105748/zorroEpisodes.txt new file mode 100644 index 0000000..e69de29 diff --git a/bin/.gitignore b/bin/.gitignore deleted file mode 100644 index 376fff6..0000000 --- a/bin/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -/Spreadsheet.class -/SpreadsheetTest.class -/TableCell.class -/Tablecell.class -/Cell.class diff --git a/bin/Cell.class b/bin/Cell.class new file mode 100644 index 0000000000000000000000000000000000000000..fa2e5b08023c082840cdb529c27eaf4c1609a675 GIT binary patch literal 750 zcmZ{gPfG$(6vfXQ|Bd6MHvXx!qE@LzZrT-Yf*_Du7(&a@1{;|abo6r-BteTlKp!eP zcV@^)Sx%^Zc~g*$TnmcmhORkoU`cg1o1;24O(G@)ZdAy%t*(@@BnNFXWE zrim1i%(UH+b2EGDIg>lP=h4qwafu)?UY!>h;Xr zd*|Hq_|A9EozMRJ`&$6E;bRRxg|fcUtZ5{3Bc^F<2q;t>Gfo*TDI-1H(mQm_OxOy+ zgqcd^6k=V@yS#0sT6Sc!##on?v)dISeb#W=u=80{p=K$W?OkzdXz!qGWx~oP@+l*` z-#lt&&2++~;)bO+&3n>kXRY+Gqad{1N?Ue^g1^3@Um+0BB+V%NSgxZCx`q`BE0=IH ziV7@`Kw*`RAVM-)ts{bv!tyRFZT93(44K&j#!!kuRCZ+&MylV)S~B+*1NMkTUzc^2 zAjW|F!zLlxTTo?N)p$upv4Q$0uRwY zA(ueDDBB7uL3=KD2z;MyB#w6*qh3DzIRU<|)C(_&#i|e6h)04!Ak=;R?f%?vdcoe| zPse`rF<2|N(;Bv%J#hg?;h>IwRFic{(?|_i_K3^8oQ9_q)_fU+$MaSyX=bAsz#;Me zX;$G95legnct*#wcuql2nkmyZ#Tjw8n(i)w#8ccZ`wSgJPQL7ni=Zq%DbAWYj$&A$ z+{*1>Cat9VUKqPbW4jlirQ_Iw0Np(~0W78Cgy2$UVsB#G;d3`U)FIJ-=d3l#sN_JoTR+rX(#2c==e6i!}O8c%$%9E z5)Q>hB;G)uw;~h8Ih@zBSF3_=gH> zsktPKIg(N69NyINBY`e#rQKo^*nTYJ{fTg8fpV`(MfZe`3%E!q6J&`O0Sl5b4q&<5 zF6)>SGKCB#D$Od<5}7<>5O6yQZh~0~IZ?1FMl(#NVOyCrC!wsF%cn>@W$_Igsq}l> zq>73;vG|-WrgQbeb~`p&Y`KkY)C&)s?IlnY(UOy;`Tq&e#$9z(mAhlnHz#ml zPT=?i9<2&cQG&t~crYkR(^GI&wFMb`tSVSQb^@Ww{7i8gr**DAKT|n2)7V_&n0LG# zkrl?|=Bb~kgI9}DP8DPc+NoaePT<1jQrl*CJ636E>ntp8s$so36~hLj%6nu+XliEjo?MRZ*`M zoGajs)<`Vun?f`e5jW0=mIB`T1ib~k-C7nadzWDI?>MhbyjplAy}7Ivue}^^_vX93 z=b@MuiyRTP^)gDz=x!N}$Y_;}QZkClXtY%u4=Zua=|#^91+L?gpz>4Zyt`Sl9&ob$ z9(fD&FpIrh*~`AS51Vm-_osLtjuX8J#-!kOfZ69z{LCf z3i=Qu_ya5B&y@ZP<^GNg{=u)7FK`n7MizI#qYt+7^8=+4&#S!{Qv>`aIfNIKffrR0 zXVh`Lq|!L6^8CO!jaSqeysFOf@IKFPg-f(3we%Xwg<(ZTa^y17M+vuY1=Iyh;R?C9 zj!6EDRTaQ7wGBUK6$a=<6MYV`s!pkT{E~7ZjPbkhR~%`KY>!iiVfy|l>sr>nz#s7r zM`6Zs9>3-&!U#?{a%HT0>G3|#!f)m*T=nYqZ&)$Q79MuHx705b`}l8xS@z-9~7Z z!7L@{s$r$`i`Q#2$GtXFU0qQ(g*8n)8(3QfykGe{=Tr;^uKKSMAGgDn^9j5`FW+Q; jd8?$qR2Q?!PV$k{U%*j;nR8D-9`Se4}jC@6> literal 1999 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 delta 162 zcmaE@Fp-Dr)W2Q(7#J8#7@Rk9ZDL|nnY@=tTEZzY#Vx-mH?f3+!GV#1Q$10kxTGjE zFMV<@n>i!<QkbD5?q; qoedP#1d3__MYVyVx?oX3PA^_Vpr{d0)EFpg3KC^^1UiX{!3h94Ng{Iq diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 7169d82..a0f2fdf 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -2,6 +2,7 @@ public class Spreadsheet { private ArrayList cells = new ArrayList(); + private ArrayList circularReferences = new ArrayList(); public String get(String cell) { @@ -21,29 +22,131 @@ public String evaluate(String cell) { char c = value.charAt(0); if(Character.isDigit(c) || c =='-') { - int counter = 0; - for(char ch: value.toCharArray()){ - if(ch == '-' && counter == 0) { - + return dealWithNumbers(value); + } + + else if(c== '=') { + StringBuilder sb = new StringBuilder(value); + sb.deleteCharAt(0); + if(isAValidString(sb.toString(), sb.charAt(0))) { + return dealWithStrings(sb.toString()); + } + + else if(Character.isDigit(sb.charAt(0)) || sb.charAt(0) =='-') { + return dealWithNumbers(sb.toString()); + } + + //definition of cell #ID? Uppercase A-Z, number + else if(Character.isUpperCase(sb.charAt(0)) && Character.isDigit(sb.charAt(1)) && 2 == sb.length()) { + String cellName = sb.toString(); + if(circularReferences.contains(cellName)){ + return "#Circular"; + } + else { + circularReferences.add(cellName); + return evaluate(cellName); } - - else if(!Character.isDigit(ch)) - return "#Error"; - counter++; } - return value; + + else + return "#Error"; } else { - if(c == '\'' && value.substring(value.length() - 1).equals("'")) { - StringBuilder sb = new StringBuilder(value); - sb.deleteCharAt(0); - sb.deleteCharAt(sb.length()-1); - return sb.toString(); + if(isAValidString(value, c)) { + return dealWithStrings(value); + } + else + return "#Error"; + } + } + + + + + public String dealWithStrings(String input) { + StringBuilder sb = new StringBuilder(input); + sb.deleteCharAt(0); + sb.deleteCharAt(sb.length()-1); + return sb.toString(); + } + + + + + public String dealWithNumbers(String input) { + String value = input; + int counter = 0; + for(char ch: value.toCharArray()){ + if(ch == '-' && counter == 0) { + + } + else if(Character.isDigit(ch) || ch == '+' || ch == '-' || ch == '*' || ch == '/' || ch == '%') { + } else return "#Error"; + counter++; + } + + ArrayList values = new ArrayList(); + ArrayList operations = new ArrayList(); + + int result = 0; + for (int i=0; i < value.length(); i++) { + char c = value.charAt(i); + if (Character.isDigit(c)) { + result = result*10 + Character.getNumericValue(c); + if(i == value.length()-1) + values.add(result); + } + else { + values.add(result); + operations.add(c); + result = 0; + } + + } + + int calculated = 0; + int operationCounter = -1; + for(int v : values) { + if(operationCounter == -1) { + calculated = v; + } + else { + char c = operations.get(operationCounter); + switch(c) { + case '+' : + calculated += v; + break; + case '-' : + calculated -= v; + break; + case '*' : + calculated = calculated * v; + break; + case '/' : + calculated = calculated / v; + break; + case '%' : + calculated = calculated % v; + break; + } + } + operationCounter++; + } + value = "" + calculated; + return value; + } + + + + public boolean isAValidString(String testable, char first) { + if(first == '\'' && testable.substring(testable.length() - 1).equals("'")) { + return true; } + return false; } } diff --git a/tests/SpreadsheetTest.java b/tests/SpreadsheetTest.java index eb37ff1..4754e9b 100644 --- a/tests/SpreadsheetTest.java +++ b/tests/SpreadsheetTest.java @@ -16,40 +16,140 @@ public void init() { public void testCreateCellA1() { sheet.set("A1", "1"); String s = sheet.get("A1"); - assertEquals("1", s); - + assertEquals("1", s); } @Test public void testCreateCellA1_minus1() { sheet.set("A1", "-1"); String s = sheet.evaluate("A1"); - assertEquals("-1", s); - + assertEquals("-1", s); } @Test public void testCreateCellA1_5A() { sheet.set("A1", "5A"); String s = sheet.evaluate("A1"); - assertEquals("#Error", s); - + assertEquals("#Error", s); } @Test public void testCreateCellA1astring() { sheet.set("A1", "'a string'"); String s = sheet.evaluate("A1"); - assertEquals("a string", s); - + assertEquals("a string", s); } @Test - public void testCreateCellA1astringWithBadFormat() { + public void testCreateCellA1astringWithNoEndQuote() { sheet.set("A1", "'a string"); String s = sheet.evaluate("A1"); + assertEquals("#Error", s); + } + + @Test + public void testCreateCellA1astringWithNoStartQuote() { + sheet.set("A1", "a string'"); + String s = sheet.evaluate("A1"); + assertEquals("#Error", s); + } + + @Test + public void testCreateCellA1WithSimpleEquationResultingInString() { + sheet.set("A1", "='a string'"); + String s = sheet.evaluate("A1"); + assertEquals("a string", s); + } + + @Test + public void testCreateCellA1WithSimpleEquationStringWithError() { + sheet.set("A1", "=a string'"); + String s = sheet.evaluate("A1"); + assertEquals("#Error", s); + } + + @Test + public void testCreateCellA1WithCellReferenceA5() { + sheet.set("A5", "3"); + sheet.set("A1", "=A5"); + String s = sheet.evaluate("A1"); + assertEquals("3", s); + } + + @Test + public void testCreateCellA1WithCellReferenceA5WithErrorInIt() { + sheet.set("A5", "5A"); + sheet.set("A1", "=A5"); + String s = sheet.evaluate("A1"); assertEquals("#Error", s); - + } + + @Test + public void testCreateCellA1WithCircularCellReference() { + sheet.set("A5", "=A1"); + sheet.set("A1", "=A5"); + String s = sheet.evaluate("A1"); + assertEquals("#Circular", s); + } + + @Test + public void testCreateCellA1WithCircularCellReferences() { + sheet.set("A5", "=A4"); + sheet.set("A4", "=A3"); + sheet.set("A3", "=A2"); + sheet.set("A2", "=A1"); + sheet.set("A1", "=A5"); + String s = sheet.evaluate("A1"); + assertEquals("#Circular", s); + } + + @Test + public void testCreateCellA1WithIntegerOperation5Plus1() { + sheet.set("A1", "=5+1"); + String s = sheet.evaluate("A1"); + assertEquals("6", s); + } + + @Test + public void testCreateCellA1WithIntegerOperation5Minus1() { + sheet.set("A1", "=5-1"); + String s = sheet.evaluate("A1"); + assertEquals("4", s); + } + + @Test + public void testCreateCellA1WithIntegerOperation5Divided1() { + sheet.set("A1", "=5/1"); + String s = sheet.evaluate("A1"); + assertEquals("5", s); + } + + @Test + public void testCreateCellA1WithIntegerOperation5Times2() { + sheet.set("A1", "=5*2"); + String s = sheet.evaluate("A1"); + assertEquals("10", s); + } + + @Test + public void testCreateCellA1WithIntegerOperation5Modus1() { + sheet.set("A1", "=5%1"); + String s = sheet.evaluate("A1"); + assertEquals("0", s); + } + + @Test + public void testCreateCellA1WithIntegerOperation555Plus1() { + sheet.set("A1", "=555+1"); + String s = sheet.evaluate("A1"); + assertEquals("556", s); + } + + @Test + public void testCreateCellA1Equals1() { + sheet.set("A1", "=1"); + String s = sheet.evaluate("A1"); + assertEquals("1", s); } }