From b8a335ec8f90d10e1f400c5599bde225841740a9 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 14 Sep 2016 15:31:44 +0300 Subject: [PATCH 01/45] besouro automatic message --- .besouro/2016091415302846/actions.txt | 2 + .besouro/2016091415302846/besouroEpisodes.txt | 0 .besouro/2016091415302846/disagreements.txt | 0 .../randomHeuristicEpisodes.txt | 0 .besouro/2016091415302846/userComments.txt | 0 .besouro/2016091415302846/zorroEpisodes.txt | 0 .classpath | 16 ++-- .gitattributes | 34 +++---- .gitignore | 94 +++++++++---------- .project | 34 +++---- .settings/org.eclipse.jdt.core.prefs | 22 ++--- bin/.gitignore | 3 + src/StringCalculator.java | 23 +++-- src/StringCalculatorException.java | 8 +- tests/StringCalculatorTest.java | 24 ++--- 15 files changed, 135 insertions(+), 125 deletions(-) create mode 100644 .besouro/2016091415302846/actions.txt create mode 100644 .besouro/2016091415302846/besouroEpisodes.txt create mode 100644 .besouro/2016091415302846/disagreements.txt create mode 100644 .besouro/2016091415302846/randomHeuristicEpisodes.txt create mode 100644 .besouro/2016091415302846/userComments.txt create mode 100644 .besouro/2016091415302846/zorroEpisodes.txt create mode 100644 bin/.gitignore diff --git a/.besouro/2016091415302846/actions.txt b/.besouro/2016091415302846/actions.txt new file mode 100644 index 0000000..70cffd6 --- /dev/null +++ b/.besouro/2016091415302846/actions.txt @@ -0,0 +1,2 @@ +FileOpenedAction 1473856228158 StringCalculator.java 180 1 1 0 +EditAction 1473856304000 StringCalculator.java 266 1 2 0 diff --git a/.besouro/2016091415302846/besouroEpisodes.txt b/.besouro/2016091415302846/besouroEpisodes.txt new file mode 100644 index 0000000..e69de29 diff --git a/.besouro/2016091415302846/disagreements.txt b/.besouro/2016091415302846/disagreements.txt new file mode 100644 index 0000000..e69de29 diff --git a/.besouro/2016091415302846/randomHeuristicEpisodes.txt b/.besouro/2016091415302846/randomHeuristicEpisodes.txt new file mode 100644 index 0000000..e69de29 diff --git a/.besouro/2016091415302846/userComments.txt b/.besouro/2016091415302846/userComments.txt new file mode 100644 index 0000000..e69de29 diff --git a/.besouro/2016091415302846/zorroEpisodes.txt b/.besouro/2016091415302846/zorroEpisodes.txt new file mode 100644 index 0000000..e69de29 diff --git a/.classpath b/.classpath index e738af1..59486dc 100644 --- a/.classpath +++ b/.classpath @@ -1,8 +1,8 @@ - - - - - - - - + + + + + + + + diff --git a/.gitattributes b/.gitattributes index bdb0cab..7351b55 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,17 +1,17 @@ -# Auto detect text files and perform LF normalization -* text=auto - -# Custom for Visual Studio -*.cs diff=csharp - -# Standard to msysgit -*.doc diff=astextplain -*.DOC diff=astextplain -*.docx diff=astextplain -*.DOCX diff=astextplain -*.dot diff=astextplain -*.DOT diff=astextplain -*.pdf diff=astextplain -*.PDF diff=astextplain -*.rtf diff=astextplain -*.RTF diff=astextplain +# Auto detect text files and perform LF normalization +* text=auto + +# Custom for Visual Studio +*.cs diff=csharp + +# Standard to msysgit +*.doc diff=astextplain +*.DOC diff=astextplain +*.docx diff=astextplain +*.DOCX diff=astextplain +*.dot diff=astextplain +*.DOT diff=astextplain +*.pdf diff=astextplain +*.PDF diff=astextplain +*.rtf diff=astextplain +*.RTF diff=astextplain diff --git a/.gitignore b/.gitignore index cd2946a..09aabbc 100644 --- a/.gitignore +++ b/.gitignore @@ -1,47 +1,47 @@ -# Windows image file caches -Thumbs.db -ehthumbs.db - -# Folder config file -Desktop.ini - -# Recycle Bin used on file shares -$RECYCLE.BIN/ - -# Windows Installer files -*.cab -*.msi -*.msm -*.msp - -# Windows shortcuts -*.lnk - -# ========================= -# Operating System Files -# ========================= - -# OSX -# ========================= - -.DS_Store -.AppleDouble -.LSOverride - -# Thumbnails -._* - -# Files that might appear in the root of a volume -.DocumentRevisions-V100 -.fseventsd -.Spotlight-V100 -.TemporaryItems -.Trashes -.VolumeIcon.icns - -# Directories potentially created on remote AFP share -.AppleDB -.AppleDesktop -Network Trash Folder -Temporary Items -.apdisk +# Windows image file caches +Thumbs.db +ehthumbs.db + +# Folder config file +Desktop.ini + +# Recycle Bin used on file shares +$RECYCLE.BIN/ + +# Windows Installer files +*.cab +*.msi +*.msm +*.msp + +# Windows shortcuts +*.lnk + +# ========================= +# Operating System Files +# ========================= + +# OSX +# ========================= + +.DS_Store +.AppleDouble +.LSOverride + +# Thumbnails +._* + +# Files that might appear in the root of a volume +.DocumentRevisions-V100 +.fseventsd +.Spotlight-V100 +.TemporaryItems +.Trashes +.VolumeIcon.icns + +# Directories potentially created on remote AFP share +.AppleDB +.AppleDesktop +Network Trash Folder +Temporary Items +.apdisk diff --git a/.project b/.project index a75efd1..402135c 100644 --- a/.project +++ b/.project @@ -1,17 +1,17 @@ - - - StringCalculator - - - - - - org.eclipse.jdt.core.javabuilder - - - - - - org.eclipse.jdt.core.javanature - - + + + StringCalculator + + + + + + org.eclipse.jdt.core.javabuilder + + + + + + org.eclipse.jdt.core.javanature + + diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs index 3a21537..bb35fa0 100644 --- a/.settings/org.eclipse.jdt.core.prefs +++ b/.settings/org.eclipse.jdt.core.prefs @@ -1,11 +1,11 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.8 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.8 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.8 diff --git a/bin/.gitignore b/bin/.gitignore new file mode 100644 index 0000000..249513b --- /dev/null +++ b/bin/.gitignore @@ -0,0 +1,3 @@ +/StringCalculator.class +/StringCalculatorException.class +/StringCalculatorTest.class diff --git a/src/StringCalculator.java b/src/StringCalculator.java index 487916b..e363593 100644 --- a/src/StringCalculator.java +++ b/src/StringCalculator.java @@ -1,9 +1,14 @@ - -public class StringCalculator { - public int add(String numbersStr) { - // Returns the sum of the numbers given in numbersStr - - // not yet implemented - return 0; - } -} + +public class StringCalculator { + public int add(String numbersStr) { + // Returns 0 for an empty string + if (numbersStr == "") { + return 0; + } + + // Returns the sum of the numbers given in numbersStr + + // not yet implemented + return 0; + } +} diff --git a/src/StringCalculatorException.java b/src/StringCalculatorException.java index da71147..2f8cf41 100644 --- a/src/StringCalculatorException.java +++ b/src/StringCalculatorException.java @@ -1,4 +1,4 @@ - -public class StringCalculatorException extends Exception { - -} + +public class StringCalculatorException extends Exception { + +} diff --git a/tests/StringCalculatorTest.java b/tests/StringCalculatorTest.java index 4ec9afe..f08749b 100644 --- a/tests/StringCalculatorTest.java +++ b/tests/StringCalculatorTest.java @@ -1,12 +1,12 @@ -import static org.junit.Assert.*; - -import org.junit.Test; - -public class StringCalculatorTest { - - @Test - public void test() { - fail("Not yet implemented"); - } - -} +import static org.junit.Assert.*; + +import org.junit.Test; + +public class StringCalculatorTest { + + @Test + public void test() { + fail("Not yet implemented"); + } + +} From e36f05fc8e1552d0b06e57395c26dd5507745d5d Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 14 Sep 2016 15:33:29 +0300 Subject: [PATCH 02/45] besouro automatic message --- .besouro/2016091415302846/actions.txt | 3 +++ bin/StringCalculator.class | Bin 405 -> 452 bytes src/StringCalculator.java | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.besouro/2016091415302846/actions.txt b/.besouro/2016091415302846/actions.txt index 70cffd6..84e17f1 100644 --- a/.besouro/2016091415302846/actions.txt +++ b/.besouro/2016091415302846/actions.txt @@ -1,2 +1,5 @@ FileOpenedAction 1473856228158 StringCalculator.java 180 1 1 0 EditAction 1473856304000 StringCalculator.java 266 1 2 0 +FileOpenedAction 1473856312568 StringCalculatorTest.java 174 1 1 0 +RefactoringAction 1473856323076 StringCalculatorTest.java RENAME test()=>void testStringCalculator_EmptyString() METHOD +EditAction 1473856408691 StringCalculator.java 273 1 2 0 diff --git a/bin/StringCalculator.class b/bin/StringCalculator.class index a937b0c43633d36f133837cd90ddd10fb14ac782..f763de2c5b2dc76fe239968809965923050d5161 100644 GIT binary patch delta 137 zcmbQre1w_n)W2Q(7#J8#7{n)Xt!3k25M*Rvn7Cbqk2km^F*(~eu^=QdDJON}&FUzB z1|}e6VBpdg5?IE-%Djeo4Uosozy&1vfHVUGD+3!4axm~Pa07W_5Y<2)FOUb+#~{QY W%)rPX0%S8YFmeEyqCh4SgBSpq#S+;7 delta 90 zcmX@YJe8U2)W2Q(7#J8#7(^y=t(~}6W#Y$5M>7US1}2~&6Z0An$-o69*??jU4D1Zt bKvE1M%fQ3H3*>=R2rvi& Date: Wed, 14 Sep 2016 15:33:44 +0300 Subject: [PATCH 03/45] besouro automatic message --- .besouro/2016091415302846/actions.txt | 1 + bin/StringCalculator.class | Bin 452 -> 442 bytes tests/StringCalculatorTest.java | 9 ++++++++- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/.besouro/2016091415302846/actions.txt b/.besouro/2016091415302846/actions.txt index 84e17f1..9909964 100644 --- a/.besouro/2016091415302846/actions.txt +++ b/.besouro/2016091415302846/actions.txt @@ -3,3 +3,4 @@ EditAction 1473856304000 StringCalculator.java 266 1 2 0 FileOpenedAction 1473856312568 StringCalculatorTest.java 174 1 1 0 RefactoringAction 1473856323076 StringCalculatorTest.java RENAME test()=>void testStringCalculator_EmptyString() METHOD EditAction 1473856408691 StringCalculator.java 273 1 2 0 +EditAction 1473856424049 StringCalculatorTest.java 315 1 3 0 diff --git a/bin/StringCalculator.class b/bin/StringCalculator.class index f763de2c5b2dc76fe239968809965923050d5161..308f002db7690b427bc178aabcca76eb863c6a51 100644 GIT binary patch delta 52 zcmX@Yyo-559HST~10MrF10w@F0|SFA0~3(Nz`&(7xr9-Tmj}XO5MmH!V3@p-Q5XQZ CtOg?h delta 77 zcmdnRe1v&J9HST`10MrF10w@F0|SFU0}~K3FmP#4E@4#D5`%CUco=wrf Date: Wed, 14 Sep 2016 15:34:05 +0300 Subject: [PATCH 04/45] besouro automatic message --- .besouro/2016091415302846/actions.txt | 1 + bin/StringCalculatorTest.class | Bin 505 -> 678 bytes tests/StringCalculatorTest.java | 2 +- 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.besouro/2016091415302846/actions.txt b/.besouro/2016091415302846/actions.txt index 9909964..77aa86e 100644 --- a/.besouro/2016091415302846/actions.txt +++ b/.besouro/2016091415302846/actions.txt @@ -4,3 +4,4 @@ FileOpenedAction 1473856312568 StringCalculatorTest.java 174 1 1 0 RefactoringAction 1473856323076 StringCalculatorTest.java RENAME test()=>void testStringCalculator_EmptyString() METHOD EditAction 1473856408691 StringCalculator.java 273 1 2 0 EditAction 1473856424049 StringCalculatorTest.java 315 1 3 0 +EditAction 1473856444901 StringCalculatorTest.java 324 1 3 1 diff --git a/bin/StringCalculatorTest.class b/bin/StringCalculatorTest.class index d44b83f48579a95c814a0008fdfcca590443d2de..4c185e5a10831cfd4ea7eb75f7a50a67dbe09b3c 100644 GIT binary patch delta 331 zcmZXPy-EX75QWbq(OqsGnK6AKZGK(Mi~lWX?6Y}lW$dsj&116YMr zzJS=;1q&a*H?k22w$tV?d~?nW=ezv6B))z=J^}R6n~9f>qgAGFbQ;9|r3^=TD0PzF zT}2Z;E$Hm6{{(?GtQ%+&YJa^JTG$|zrRNcv$HTFFlx`?v-z}VHCj%30LgPBo&Qxh9 zh$f+mRIHUJu#H^c71rdK;zurTwv>+Nr|ffHY%)wJu5I#W38jg#3@p+n1JUhI_UB( Q6U*4g0jCLvyeZ-67yji*5&!@I delta 152 zcmZ3+`jeUK)W2Q(7#J8#7^Ek1&17XMNi8m!c*Mj+*e}0Cp)$2ZAv3oiCp9-UuOu~v zi$R1zjGaN0kwGB8C|y6RG%vG6-?6wjwWx%LL7YKiasi{_ Date: Wed, 14 Sep 2016 15:37:58 +0300 Subject: [PATCH 05/45] besouro automatic message --- .besouro/2016091415302846/actions.txt | 3 +++ .besouro/2016091415302846/besouroEpisodes.txt | 2 ++ .../randomHeuristicEpisodes.txt | 1 + .besouro/2016091415302846/zorroEpisodes.txt | 1 + bin/StringCalculatorTest.class | Bin 678 -> 684 bytes src/StringCalculator.java | 5 +++++ 6 files changed, 12 insertions(+) diff --git a/.besouro/2016091415302846/actions.txt b/.besouro/2016091415302846/actions.txt index 77aa86e..8f80448 100644 --- a/.besouro/2016091415302846/actions.txt +++ b/.besouro/2016091415302846/actions.txt @@ -5,3 +5,6 @@ RefactoringAction 1473856323076 StringCalculatorTest.java RENAME test()=>void te EditAction 1473856408691 StringCalculator.java 273 1 2 0 EditAction 1473856424049 StringCalculatorTest.java 315 1 3 0 EditAction 1473856444901 StringCalculatorTest.java 324 1 3 1 +UnitTestCaseAction 1473856449389 StringCalculatorTest.java OK +UnitTestSessionAction 1473856449390 StringCalculatorTest.java OK +EditAction 1473856678056 StringCalculator.java 419 1 3 0 diff --git a/.besouro/2016091415302846/besouroEpisodes.txt b/.besouro/2016091415302846/besouroEpisodes.txt index e69de29..9d31e9f 100644 --- a/.besouro/2016091415302846/besouroEpisodes.txt +++ b/.besouro/2016091415302846/besouroEpisodes.txt @@ -0,0 +1,2 @@ +1473856449390 test-last 1 221 false +1473856449391 test-last 1 221 false diff --git a/.besouro/2016091415302846/randomHeuristicEpisodes.txt b/.besouro/2016091415302846/randomHeuristicEpisodes.txt index e69de29..1a5de49 100644 --- a/.besouro/2016091415302846/randomHeuristicEpisodes.txt +++ b/.besouro/2016091415302846/randomHeuristicEpisodes.txt @@ -0,0 +1 @@ +1473856449390 test-last 1 221 false diff --git a/.besouro/2016091415302846/zorroEpisodes.txt b/.besouro/2016091415302846/zorroEpisodes.txt index e69de29..1a5de49 100644 --- a/.besouro/2016091415302846/zorroEpisodes.txt +++ b/.besouro/2016091415302846/zorroEpisodes.txt @@ -0,0 +1 @@ +1473856449390 test-last 1 221 false diff --git a/bin/StringCalculatorTest.class b/bin/StringCalculatorTest.class index 4c185e5a10831cfd4ea7eb75f7a50a67dbe09b3c..d55d5f460f775632fe660b94187eee7ac6504f83 100644 GIT binary patch delta 170 zcmZ3+x`uUw4I?j)Yi>bFr9yE@QD$EHaSflW#Ii*F zoW#6z{a~;%YcH?Ky^Pz^q8V5jm>C!t1cd~Bw0AHF+X_i?%CzoaklqLsWMbd~l0pnD zK#~injF*9fK>!E^8MuKW3J{G9JV0>TN!FN`L6CtPD6RmJW#D1p1@f4IVu}n(Ks_7`Yz)c_ PDhy0OwklADi9rnj)NvFA diff --git a/src/StringCalculator.java b/src/StringCalculator.java index 650e578..817aa85 100644 --- a/src/StringCalculator.java +++ b/src/StringCalculator.java @@ -6,6 +6,11 @@ public static int add(String numbersStr) { return 0; } + // Returns the same number when given only one number + if (numbersStr.matches("^\\d+$")) { + return Integer.parseInt(numbersStr); + } + // Returns the sum of the numbers given in numbersStr // not yet implemented From 160c2589b66edbfdc233d352c2f34da5d24e5019 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 14 Sep 2016 15:38:29 +0300 Subject: [PATCH 06/45] besouro automatic message --- .besouro/2016091415302846/actions.txt | 3 +++ bin/StringCalculator.class | Bin 442 -> 586 bytes tests/StringCalculatorTest.java | 12 ++++++++++++ 3 files changed, 15 insertions(+) diff --git a/.besouro/2016091415302846/actions.txt b/.besouro/2016091415302846/actions.txt index 8f80448..bdf7312 100644 --- a/.besouro/2016091415302846/actions.txt +++ b/.besouro/2016091415302846/actions.txt @@ -8,3 +8,6 @@ EditAction 1473856444901 StringCalculatorTest.java 324 1 3 1 UnitTestCaseAction 1473856449389 StringCalculatorTest.java OK UnitTestSessionAction 1473856449390 StringCalculatorTest.java OK EditAction 1473856678056 StringCalculator.java 419 1 3 0 +RefactoringAction 1473856688784 StringCalculatorTest.java ADD void testStringCalculator_EmptyString()/2 METHOD +RefactoringAction 1473856694798 StringCalculatorTest.java RENAME testStringCalculator_EmptyString()/2=>void testStringCalculator_OneNumber() METHOD +EditAction 1473856708537 StringCalculatorTest.java 544 2 6 2 diff --git a/bin/StringCalculator.class b/bin/StringCalculator.class index 308f002db7690b427bc178aabcca76eb863c6a51..abb6e159007e4945a9322b92c662e9eeb223bc54 100644 GIT binary patch delta 228 zcmdnRe2RtZ)W2Q(7#J8#7*r;5Z8qg#5N2dxjf+XqR^eh0We{g)5MyKz$Vx0r)Xz!G zOV28lW6A z0~e4KV_*f6tPE^G$N>})WZ(vhfk*}h9*7wX@(c< Date: Wed, 14 Sep 2016 15:38:47 +0300 Subject: [PATCH 07/45] besouro automatic message --- .besouro/2016091415302846/actions.txt | 5 +++++ .besouro/2016091415302846/besouroEpisodes.txt | 2 ++ .../randomHeuristicEpisodes.txt | 1 + .besouro/2016091415302846/zorroEpisodes.txt | 1 + bin/StringCalculatorTest.class | Bin 684 -> 872 bytes tests/StringCalculatorTest.java | 12 ++++++++++++ 6 files changed, 21 insertions(+) diff --git a/.besouro/2016091415302846/actions.txt b/.besouro/2016091415302846/actions.txt index bdf7312..e4eb25a 100644 --- a/.besouro/2016091415302846/actions.txt +++ b/.besouro/2016091415302846/actions.txt @@ -11,3 +11,8 @@ EditAction 1473856678056 StringCalculator.java 419 1 3 0 RefactoringAction 1473856688784 StringCalculatorTest.java ADD void testStringCalculator_EmptyString()/2 METHOD RefactoringAction 1473856694798 StringCalculatorTest.java RENAME testStringCalculator_EmptyString()/2=>void testStringCalculator_OneNumber() METHOD EditAction 1473856708537 StringCalculatorTest.java 544 2 6 2 +UnitTestCaseAction 1473856711263 StringCalculatorTest.java OK +UnitTestSessionAction 1473856711264 StringCalculatorTest.java OK +RefactoringAction 1473856717335 StringCalculatorTest.java ADD void testStringCalculator_OneNumber()/2 METHOD +RefactoringAction 1473856719347 StringCalculatorTest.java RENAME testStringCalculator_OneNumber()/2=>void testStringCalculator_OneNumber_2() METHOD +EditAction 1473856726491 StringCalculatorTest.java 769 3 9 3 diff --git a/.besouro/2016091415302846/besouroEpisodes.txt b/.besouro/2016091415302846/besouroEpisodes.txt index 9d31e9f..25f1713 100644 --- a/.besouro/2016091415302846/besouroEpisodes.txt +++ b/.besouro/2016091415302846/besouroEpisodes.txt @@ -1,2 +1,4 @@ 1473856449390 test-last 1 221 false 1473856449391 test-last 1 221 false +1473856711264 test-last 1 33 false +1473856711265 test-last 1 33 false diff --git a/.besouro/2016091415302846/randomHeuristicEpisodes.txt b/.besouro/2016091415302846/randomHeuristicEpisodes.txt index 1a5de49..7b31afc 100644 --- a/.besouro/2016091415302846/randomHeuristicEpisodes.txt +++ b/.besouro/2016091415302846/randomHeuristicEpisodes.txt @@ -1 +1,2 @@ 1473856449390 test-last 1 221 false +1473856711264 test-last 1 33 false diff --git a/.besouro/2016091415302846/zorroEpisodes.txt b/.besouro/2016091415302846/zorroEpisodes.txt index 1a5de49..3677f47 100644 --- a/.besouro/2016091415302846/zorroEpisodes.txt +++ b/.besouro/2016091415302846/zorroEpisodes.txt @@ -1 +1,2 @@ 1473856449390 test-last 1 221 false +1473856711264 test-last 1 261 false diff --git a/bin/StringCalculatorTest.class b/bin/StringCalculatorTest.class index d55d5f460f775632fe660b94187eee7ac6504f83..f46f4494ac042434592e056b02a3fe7cd3cb87e1 100644 GIT binary patch delta 206 zcmZ3(`htz?)W2Q(7#J8#81y!BZDw?qD@iRb2`(wh%u9Dp%tWMtq2iYnxRg%vbRHCchCfB@^{-HaxT%#%MbZl7$#B$5%!z{bHAZ#n7A;O>~)4GE}dLvMniGd493Nf$%Nim>8Nd^uE86aPlfg32I0MW|8 i!@vvVF*67-C^9H9Fap(ZGbl5t0Ch7m=m2Gy7<2)1za&Wj delta 35 rcmaFCwuY7K)W2Q(7#J8#7}Pg%ZDyRz#AL+CG})ACJ1YYN6N4H6(V+=0 diff --git a/tests/StringCalculatorTest.java b/tests/StringCalculatorTest.java index c43bbfc..c0a2c01 100644 --- a/tests/StringCalculatorTest.java +++ b/tests/StringCalculatorTest.java @@ -28,4 +28,16 @@ public void testStringCalculator_OneNumber() { assertEquals("One number (5)", 5, sum); } + @Test + public void testStringCalculator_OneNumber_2() { + // Arrange + String numbers = "37"; + + // Act + int sum = StringCalculator.add(numbers); + + // Assert + assertEquals("One number (37)", 37, sum); + } + } From 5cdd9aa2761f3ff82aea118034f1394e1b3e926c Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 14 Sep 2016 15:40:36 +0300 Subject: [PATCH 08/45] besouro automatic message --- .besouro/2016091415302846/actions.txt | 3 +++ .besouro/2016091415302846/besouroEpisodes.txt | 2 ++ .../randomHeuristicEpisodes.txt | 1 + .besouro/2016091415302846/zorroEpisodes.txt | 1 + bin/StringCalculatorTest.class | Bin 872 -> 1064 bytes src/StringCalculator.java | 6 ++++++ 6 files changed, 13 insertions(+) diff --git a/.besouro/2016091415302846/actions.txt b/.besouro/2016091415302846/actions.txt index e4eb25a..621cd30 100644 --- a/.besouro/2016091415302846/actions.txt +++ b/.besouro/2016091415302846/actions.txt @@ -16,3 +16,6 @@ UnitTestSessionAction 1473856711264 StringCalculatorTest.java OK RefactoringAction 1473856717335 StringCalculatorTest.java ADD void testStringCalculator_OneNumber()/2 METHOD RefactoringAction 1473856719347 StringCalculatorTest.java RENAME testStringCalculator_OneNumber()/2=>void testStringCalculator_OneNumber_2() METHOD EditAction 1473856726491 StringCalculatorTest.java 769 3 9 3 +UnitTestCaseAction 1473856730455 StringCalculatorTest.java OK +UnitTestSessionAction 1473856730456 StringCalculatorTest.java OK +EditAction 1473856835700 StringCalculator.java 643 1 4 0 diff --git a/.besouro/2016091415302846/besouroEpisodes.txt b/.besouro/2016091415302846/besouroEpisodes.txt index 25f1713..b19ec82 100644 --- a/.besouro/2016091415302846/besouroEpisodes.txt +++ b/.besouro/2016091415302846/besouroEpisodes.txt @@ -2,3 +2,5 @@ 1473856449391 test-last 1 221 false 1473856711264 test-last 1 33 false 1473856711265 test-last 1 33 false +1473856730456 test-addition 1 13 true +1473856730457 test-addition 1 13 true diff --git a/.besouro/2016091415302846/randomHeuristicEpisodes.txt b/.besouro/2016091415302846/randomHeuristicEpisodes.txt index 7b31afc..121b9d8 100644 --- a/.besouro/2016091415302846/randomHeuristicEpisodes.txt +++ b/.besouro/2016091415302846/randomHeuristicEpisodes.txt @@ -1,2 +1,3 @@ 1473856449390 test-last 1 221 false 1473856711264 test-last 1 33 false +1473856730456 test-addition 1 13 false diff --git a/.besouro/2016091415302846/zorroEpisodes.txt b/.besouro/2016091415302846/zorroEpisodes.txt index 3677f47..a61808f 100644 --- a/.besouro/2016091415302846/zorroEpisodes.txt +++ b/.besouro/2016091415302846/zorroEpisodes.txt @@ -1,2 +1,3 @@ 1473856449390 test-last 1 221 false 1473856711264 test-last 1 261 false +1473856730456 test-addition 1 19 false diff --git a/bin/StringCalculatorTest.class b/bin/StringCalculatorTest.class index f46f4494ac042434592e056b02a3fe7cd3cb87e1..99fc71997e3cc6ffb21d262151dce4b295a9b954 100644 GIT binary patch delta 129 zcmaFCwt|D})W2Q(7#J8#7)&>E{a~E9Sj^BrFV(L!Hz~C!-iU)ikCB1N*qnpGfRTY8 zD4~!CmQm0!HrHeYY6Ah)NlYe;ESpW4^cW| Date: Wed, 14 Sep 2016 15:41:03 +0300 Subject: [PATCH 09/45] besouro automatic message --- .besouro/2016091415302846/actions.txt | 4 ++++ bin/StringCalculator.class | Bin 586 -> 753 bytes tests/StringCalculatorTest.java | 12 ++++++++++++ 3 files changed, 16 insertions(+) diff --git a/.besouro/2016091415302846/actions.txt b/.besouro/2016091415302846/actions.txt index 621cd30..2d210ef 100644 --- a/.besouro/2016091415302846/actions.txt +++ b/.besouro/2016091415302846/actions.txt @@ -19,3 +19,7 @@ EditAction 1473856726491 StringCalculatorTest.java 769 3 9 3 UnitTestCaseAction 1473856730455 StringCalculatorTest.java OK UnitTestSessionAction 1473856730456 StringCalculatorTest.java OK EditAction 1473856835700 StringCalculator.java 643 1 4 0 +RefactoringAction 1473856842946 StringCalculatorTest.java ADD void testStringCalculator_OneNumber_2()/2 METHOD +RefactoringAction 1473856845453 StringCalculatorTest.java RENAME testStringCalculator_OneNumber_2()/2=>void testStringCalculator_TwoNumber_2() METHOD +RefactoringAction 1473856846962 StringCalculatorTest.java RENAME testStringCalculator_TwoNumber_2()=>void testStringCalculator_TwoNumbers() METHOD +EditAction 1473856862342 StringCalculatorTest.java 997 4 12 4 diff --git a/bin/StringCalculator.class b/bin/StringCalculator.class index abb6e159007e4945a9322b92c662e9eeb223bc54..2cbdac193a47e61dab52f65ce59cee1ed487583f 100644 GIT binary patch delta 281 zcmZXNy-LGS7>1wI)95i)t??J3RBKGzlW0Lo7k8&lI#$GpQYvkbwz_%^(#gTqDT_-H z2QQ#^;|++PS>@w<;d$WYo#nqBclPu71vEK&cO!LX*i|fCUfhI{ylaibq6-NyNN*h{)6_0E4cX(_)jpF9k%Z-*nrT4!>qUZ0-PbWm{k_pWQ8(C g0-+{bVi1?DQKcpnlvt*YMG delta 114 zcmey!dWwbX)W2Q(7#J8#7*sZL=`c?2U{slWhOv_~hJlHJ5hyM(IgUxpgLw^*$;`k7 yB*hq5fg~#f8xV2;MFbhRfnp$%fq@62g+ZP{0mxGXVipD_4ql+B5|GWrpbP-9`we*j diff --git a/tests/StringCalculatorTest.java b/tests/StringCalculatorTest.java index c0a2c01..38fc1f0 100644 --- a/tests/StringCalculatorTest.java +++ b/tests/StringCalculatorTest.java @@ -40,4 +40,16 @@ public void testStringCalculator_OneNumber_2() { assertEquals("One number (37)", 37, sum); } + @Test + public void testStringCalculator_TwoNumbers() { + // Arrange + String numbers = "3,9"; + + // Act + int sum = StringCalculator.add(numbers); + + // Assert + assertEquals("Two numbers (3, 9)", 12, sum); + } + } From 3cd0c6f98d218d052f27ef0cccb9ae1d9d292c50 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 14 Sep 2016 15:41:25 +0300 Subject: [PATCH 10/45] besouro automatic message --- .besouro/2016091415302846/actions.txt | 5 +++++ .besouro/2016091415302846/besouroEpisodes.txt | 2 ++ .../randomHeuristicEpisodes.txt | 1 + .besouro/2016091415302846/zorroEpisodes.txt | 1 + bin/StringCalculatorTest.class | Bin 1064 -> 1259 bytes tests/StringCalculatorTest.java | 12 ++++++++++++ 6 files changed, 21 insertions(+) diff --git a/.besouro/2016091415302846/actions.txt b/.besouro/2016091415302846/actions.txt index 2d210ef..e921e4c 100644 --- a/.besouro/2016091415302846/actions.txt +++ b/.besouro/2016091415302846/actions.txt @@ -23,3 +23,8 @@ RefactoringAction 1473856842946 StringCalculatorTest.java ADD void testStringCal RefactoringAction 1473856845453 StringCalculatorTest.java RENAME testStringCalculator_OneNumber_2()/2=>void testStringCalculator_TwoNumber_2() METHOD RefactoringAction 1473856846962 StringCalculatorTest.java RENAME testStringCalculator_TwoNumber_2()=>void testStringCalculator_TwoNumbers() METHOD EditAction 1473856862342 StringCalculatorTest.java 997 4 12 4 +UnitTestCaseAction 1473856865112 StringCalculatorTest.java OK +UnitTestSessionAction 1473856865113 StringCalculatorTest.java OK +RefactoringAction 1473856870004 StringCalculatorTest.java ADD void testStringCalculator_TwoNumbers()/2 METHOD +RefactoringAction 1473856873517 StringCalculatorTest.java RENAME testStringCalculator_TwoNumbers()/2=>void testStringCalculator_TwoNumbers_2() METHOD +EditAction 1473856884887 StringCalculatorTest.java 1229 5 15 5 diff --git a/.besouro/2016091415302846/besouroEpisodes.txt b/.besouro/2016091415302846/besouroEpisodes.txt index b19ec82..6907256 100644 --- a/.besouro/2016091415302846/besouroEpisodes.txt +++ b/.besouro/2016091415302846/besouroEpisodes.txt @@ -4,3 +4,5 @@ 1473856711265 test-last 1 33 false 1473856730456 test-addition 1 13 true 1473856730457 test-addition 1 13 true +1473856865113 test-last 1 29 false +1473856865114 test-last 1 29 false diff --git a/.besouro/2016091415302846/randomHeuristicEpisodes.txt b/.besouro/2016091415302846/randomHeuristicEpisodes.txt index 121b9d8..1334293 100644 --- a/.besouro/2016091415302846/randomHeuristicEpisodes.txt +++ b/.besouro/2016091415302846/randomHeuristicEpisodes.txt @@ -1,3 +1,4 @@ 1473856449390 test-last 1 221 false 1473856711264 test-last 1 33 false 1473856730456 test-addition 1 13 false +1473856865113 test-last 1 29 false diff --git a/.besouro/2016091415302846/zorroEpisodes.txt b/.besouro/2016091415302846/zorroEpisodes.txt index a61808f..3abe00f 100644 --- a/.besouro/2016091415302846/zorroEpisodes.txt +++ b/.besouro/2016091415302846/zorroEpisodes.txt @@ -1,3 +1,4 @@ 1473856449390 test-last 1 221 false 1473856711264 test-last 1 261 false 1473856730456 test-addition 1 19 false +1473856865113 test-last 1 134 false diff --git a/bin/StringCalculatorTest.class b/bin/StringCalculatorTest.class index 99fc71997e3cc6ffb21d262151dce4b295a9b954..ed49932c6e146ed1d1ecca272704668bc4c55609 100644 GIT binary patch delta 156 zcmZ3%@tTwC)W2Q(7#J8#7;H9jIWl?4m!uY#1eX+L=A}C)<|LQqB$nhC#fOyV`<3P< zr4|))FqkqjFdOSwaxj=PG6(@B6!IW43L3^b3YMCzK*K(|*!D4bevna0~12cmm0|(H0AqLaQjm(4AubQ3nl&l delta 36 scmaFOxq^f1)W2Q(7#J8#7)&>EIWkS2&Sb>MviTI#Qbtw=1||j*0OUam82|tP diff --git a/tests/StringCalculatorTest.java b/tests/StringCalculatorTest.java index 38fc1f0..b744e8c 100644 --- a/tests/StringCalculatorTest.java +++ b/tests/StringCalculatorTest.java @@ -52,4 +52,16 @@ public void testStringCalculator_TwoNumbers() { assertEquals("Two numbers (3, 9)", 12, sum); } + @Test + public void testStringCalculator_TwoNumbers_2() { + // Arrange + String numbers = "50,0"; + + // Act + int sum = StringCalculator.add(numbers); + + // Assert + assertEquals("Two numbers (50, 0)", 50, sum); + } + } From 71a340fabe1aa5d2531869fb507ee91355453711 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 14 Sep 2016 15:46:32 +0300 Subject: [PATCH 11/45] besouro automatic message --- .besouro/2016091415302846/actions.txt | 3 +++ .besouro/2016091415302846/besouroEpisodes.txt | 2 ++ .../randomHeuristicEpisodes.txt | 1 + .besouro/2016091415302846/zorroEpisodes.txt | 1 + bin/StringCalculatorTest.class | Bin 1259 -> 1458 bytes src/StringCalculator.java | 10 ++++++++++ 6 files changed, 17 insertions(+) diff --git a/.besouro/2016091415302846/actions.txt b/.besouro/2016091415302846/actions.txt index e921e4c..b27cc1f 100644 --- a/.besouro/2016091415302846/actions.txt +++ b/.besouro/2016091415302846/actions.txt @@ -28,3 +28,6 @@ UnitTestSessionAction 1473856865113 StringCalculatorTest.java OK RefactoringAction 1473856870004 StringCalculatorTest.java ADD void testStringCalculator_TwoNumbers()/2 METHOD RefactoringAction 1473856873517 StringCalculatorTest.java RENAME testStringCalculator_TwoNumbers()/2=>void testStringCalculator_TwoNumbers_2() METHOD EditAction 1473856884887 StringCalculatorTest.java 1229 5 15 5 +UnitTestCaseAction 1473856888505 StringCalculatorTest.java OK +UnitTestSessionAction 1473856888506 StringCalculatorTest.java OK +EditAction 1473857192074 StringCalculator.java 916 1 5 0 diff --git a/.besouro/2016091415302846/besouroEpisodes.txt b/.besouro/2016091415302846/besouroEpisodes.txt index 6907256..3c6229e 100644 --- a/.besouro/2016091415302846/besouroEpisodes.txt +++ b/.besouro/2016091415302846/besouroEpisodes.txt @@ -6,3 +6,5 @@ 1473856730457 test-addition 1 13 true 1473856865113 test-last 1 29 false 1473856865114 test-last 1 29 false +1473856888506 test-addition 1 18 true +1473856888507 test-addition 1 18 true diff --git a/.besouro/2016091415302846/randomHeuristicEpisodes.txt b/.besouro/2016091415302846/randomHeuristicEpisodes.txt index 1334293..75a88ba 100644 --- a/.besouro/2016091415302846/randomHeuristicEpisodes.txt +++ b/.besouro/2016091415302846/randomHeuristicEpisodes.txt @@ -2,3 +2,4 @@ 1473856711264 test-last 1 33 false 1473856730456 test-addition 1 13 false 1473856865113 test-last 1 29 false +1473856888506 test-addition 1 18 false diff --git a/.besouro/2016091415302846/zorroEpisodes.txt b/.besouro/2016091415302846/zorroEpisodes.txt index 3abe00f..46618bb 100644 --- a/.besouro/2016091415302846/zorroEpisodes.txt +++ b/.besouro/2016091415302846/zorroEpisodes.txt @@ -2,3 +2,4 @@ 1473856711264 test-last 1 261 false 1473856730456 test-addition 1 19 false 1473856865113 test-last 1 134 false +1473856888506 test-addition 1 23 false diff --git a/bin/StringCalculatorTest.class b/bin/StringCalculatorTest.class index ed49932c6e146ed1d1ecca272704668bc4c55609..db3d709a0a1ed684a1c387676e4aabffbfe79dc6 100644 GIT binary patch delta 146 zcmaFOxrv+W)W2Q(7#J8#7@Rk9^)fLkPWEAv*NZpeV6b6iU@EEsZ1t}Y@1Ip$uLcBWR}yj_R-$KAZ#mSE5cwe)4GE} mdLvL369X5J6k=cjl2#1N47Lm$3=TlPMx><@@hKZGdfr-Hy0Oi98ng9R* diff --git a/src/StringCalculator.java b/src/StringCalculator.java index 53608b7..7e0cc3b 100644 --- a/src/StringCalculator.java +++ b/src/StringCalculator.java @@ -17,6 +17,16 @@ public static int add(String numbersStr) { return Integer.parseInt(numbers[0]) + Integer.parseInt(numbers[1]); } + // Returns the sum of an unknown amount of numbers + if (numbersStr.matches("^\\d+[\\d,]*\\d+$")) { + String numbers[] = numbersStr.split(",+"); + int sum = 0; + for (String number : numbers) { + sum += Integer.parseInt(number); + } + return sum; + } + // Returns the sum of the numbers given in numbersStr // not yet implemented From 927553987b4bb3d7913e0ca4aee8d3e56ccbc699 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 14 Sep 2016 15:47:14 +0300 Subject: [PATCH 12/45] besouro automatic message --- .besouro/2016091415302846/actions.txt | 4 ++++ bin/StringCalculator.class | Bin 753 -> 948 bytes tests/StringCalculatorTest.java | 12 ++++++++++++ 3 files changed, 16 insertions(+) diff --git a/.besouro/2016091415302846/actions.txt b/.besouro/2016091415302846/actions.txt index b27cc1f..c3b5435 100644 --- a/.besouro/2016091415302846/actions.txt +++ b/.besouro/2016091415302846/actions.txt @@ -31,3 +31,7 @@ EditAction 1473856884887 StringCalculatorTest.java 1229 5 15 5 UnitTestCaseAction 1473856888505 StringCalculatorTest.java OK UnitTestSessionAction 1473856888506 StringCalculatorTest.java OK EditAction 1473857192074 StringCalculator.java 916 1 5 0 +RefactoringAction 1473857207050 StringCalculatorTest.java ADD void testStringCalculator_TwoNumbers()/2 METHOD +RefactoringAction 1473857210654 StringCalculatorTest.java RENAME testStringCalculator_TwoNumbers()/2=>void testStringCalculator_ThreeNumbers() METHOD +RefactoringAction 1473857212713 StringCalculatorTest.java RENAME testStringCalculator_ThreeNumbers()=>void testStringCalculator_ManyNumbers() METHOD +EditAction 1473857233274 StringCalculatorTest.java 1466 6 18 6 diff --git a/bin/StringCalculator.class b/bin/StringCalculator.class index 2cbdac193a47e61dab52f65ce59cee1ed487583f..2d5bc41d25aaab36c1b736f470b1e55659e75558 100644 GIT binary patch delta 324 zcmXX?K`#Sg6r8u;?tYu4ZBiDc2sYI2wy4^JWSyEO5?r`6s%fje&^Cfz9Jn~R@5zmm zOD_^>#GyaHPw*RD`~mfd%bUr|%)HF|(q5$b{{7Ymkc0nhUQ^OQiV!WA>h58w?j1Qy zYy%EK@!ar^^0v6>vt#M9>>|a)oPj{KNCVce?BMIG7vwO+(D<&(!txA?^X^(@?WLI=KLcrv? zg;@BY%-&cCForzFQNRR>NT9-af+;jHhoQeV+V5ew@E8{nMH(3pds6?bz}pq9LSete m8tVkIthJ#Vk?8?uASEn`b?! Date: Wed, 14 Sep 2016 15:47:58 +0300 Subject: [PATCH 13/45] besouro automatic message --- .besouro/2016091415302846/actions.txt | 5 +++++ .besouro/2016091415302846/besouroEpisodes.txt | 2 ++ .../randomHeuristicEpisodes.txt | 1 + .besouro/2016091415302846/zorroEpisodes.txt | 1 + bin/StringCalculatorTest.class | Bin 1458 -> 1662 bytes tests/StringCalculatorTest.java | 12 ++++++++++++ 6 files changed, 21 insertions(+) diff --git a/.besouro/2016091415302846/actions.txt b/.besouro/2016091415302846/actions.txt index c3b5435..5896826 100644 --- a/.besouro/2016091415302846/actions.txt +++ b/.besouro/2016091415302846/actions.txt @@ -35,3 +35,8 @@ RefactoringAction 1473857207050 StringCalculatorTest.java ADD void testStringCal RefactoringAction 1473857210654 StringCalculatorTest.java RENAME testStringCalculator_TwoNumbers()/2=>void testStringCalculator_ThreeNumbers() METHOD RefactoringAction 1473857212713 StringCalculatorTest.java RENAME testStringCalculator_ThreeNumbers()=>void testStringCalculator_ManyNumbers() METHOD EditAction 1473857233274 StringCalculatorTest.java 1466 6 18 6 +UnitTestCaseAction 1473857236459 StringCalculatorTest.java OK +UnitTestSessionAction 1473857236459 StringCalculatorTest.java OK +RefactoringAction 1473857241014 StringCalculatorTest.java ADD void testStringCalculator_ManyNumbers()/2 METHOD +RefactoringAction 1473857244119 StringCalculatorTest.java RENAME testStringCalculator_ManyNumbers()/2=>void testStringCalculator_ManyNumbers_2() METHOD +EditAction 1473857277628 StringCalculatorTest.java 1723 7 21 7 diff --git a/.besouro/2016091415302846/besouroEpisodes.txt b/.besouro/2016091415302846/besouroEpisodes.txt index 3c6229e..c30fbd0 100644 --- a/.besouro/2016091415302846/besouroEpisodes.txt +++ b/.besouro/2016091415302846/besouroEpisodes.txt @@ -8,3 +8,5 @@ 1473856865114 test-last 1 29 false 1473856888506 test-addition 1 18 true 1473856888507 test-addition 1 18 true +1473857236459 test-last 1 44 false +1473857236460 test-last 1 44 false diff --git a/.besouro/2016091415302846/randomHeuristicEpisodes.txt b/.besouro/2016091415302846/randomHeuristicEpisodes.txt index 75a88ba..fbe327f 100644 --- a/.besouro/2016091415302846/randomHeuristicEpisodes.txt +++ b/.besouro/2016091415302846/randomHeuristicEpisodes.txt @@ -3,3 +3,4 @@ 1473856730456 test-addition 1 13 false 1473856865113 test-last 1 29 false 1473856888506 test-addition 1 18 false +1473857236459 test-last 1 44 false diff --git a/.besouro/2016091415302846/zorroEpisodes.txt b/.besouro/2016091415302846/zorroEpisodes.txt index 46618bb..a469abd 100644 --- a/.besouro/2016091415302846/zorroEpisodes.txt +++ b/.besouro/2016091415302846/zorroEpisodes.txt @@ -3,3 +3,4 @@ 1473856730456 test-addition 1 19 false 1473856865113 test-last 1 134 false 1473856888506 test-addition 1 23 false +1473857236459 test-last 1 347 false diff --git a/bin/StringCalculatorTest.class b/bin/StringCalculatorTest.class index db3d709a0a1ed684a1c387676e4aabffbfe79dc6..1c6838f8cb915d48c60c9599bd5904bc5db6ee4d 100644 GIT binary patch delta 142 zcmdnQ{f~$1)W2Q(7#J8#7`!%e-DR4%Sj^TpF|X3EG&d==sF;JnnUR6bT*q9;(2Rq@ zm61UlB&m=GkyX$z*HHi>Lo-cQpb;P-H~A@(2_ySvDdx#clP@yM@i_Tt?_dzN6> Date: Wed, 14 Sep 2016 15:48:38 +0300 Subject: [PATCH 14/45] besouro automatic message --- .besouro/2016091415302846/actions.txt | 5 +++++ .besouro/2016091415302846/besouroEpisodes.txt | 2 ++ .../randomHeuristicEpisodes.txt | 1 + .besouro/2016091415302846/zorroEpisodes.txt | 1 + bin/StringCalculatorTest.class | Bin 1662 -> 1885 bytes tests/StringCalculatorTest.java | 12 ++++++++++++ 6 files changed, 21 insertions(+) diff --git a/.besouro/2016091415302846/actions.txt b/.besouro/2016091415302846/actions.txt index 5896826..b927675 100644 --- a/.besouro/2016091415302846/actions.txt +++ b/.besouro/2016091415302846/actions.txt @@ -40,3 +40,8 @@ UnitTestSessionAction 1473857236459 StringCalculatorTest.java OK RefactoringAction 1473857241014 StringCalculatorTest.java ADD void testStringCalculator_ManyNumbers()/2 METHOD RefactoringAction 1473857244119 StringCalculatorTest.java RENAME testStringCalculator_ManyNumbers()/2=>void testStringCalculator_ManyNumbers_2() METHOD EditAction 1473857277628 StringCalculatorTest.java 1723 7 21 7 +UnitTestCaseAction 1473857281671 StringCalculatorTest.java OK +UnitTestSessionAction 1473857281671 StringCalculatorTest.java OK +RefactoringAction 1473857286835 StringCalculatorTest.java ADD void testStringCalculator_ManyNumbers_2()/2 METHOD +RefactoringAction 1473857293012 StringCalculatorTest.java RENAME testStringCalculator_ManyNumbers_2()/2=>void testStringCalculator_TwoNumbers_ManyCommas() METHOD +EditAction 1473857317691 StringCalculatorTest.java 1982 8 24 8 diff --git a/.besouro/2016091415302846/besouroEpisodes.txt b/.besouro/2016091415302846/besouroEpisodes.txt index c30fbd0..27eeb27 100644 --- a/.besouro/2016091415302846/besouroEpisodes.txt +++ b/.besouro/2016091415302846/besouroEpisodes.txt @@ -10,3 +10,5 @@ 1473856888507 test-addition 1 18 true 1473857236459 test-last 1 44 false 1473857236460 test-last 1 44 false +1473857281671 test-addition 1 40 true +1473857281672 test-addition 1 40 true diff --git a/.besouro/2016091415302846/randomHeuristicEpisodes.txt b/.besouro/2016091415302846/randomHeuristicEpisodes.txt index fbe327f..09e460f 100644 --- a/.besouro/2016091415302846/randomHeuristicEpisodes.txt +++ b/.besouro/2016091415302846/randomHeuristicEpisodes.txt @@ -4,3 +4,4 @@ 1473856865113 test-last 1 29 false 1473856888506 test-addition 1 18 false 1473857236459 test-last 1 44 false +1473857281671 test-addition 1 40 false diff --git a/.besouro/2016091415302846/zorroEpisodes.txt b/.besouro/2016091415302846/zorroEpisodes.txt index a469abd..fec0109 100644 --- a/.besouro/2016091415302846/zorroEpisodes.txt +++ b/.besouro/2016091415302846/zorroEpisodes.txt @@ -4,3 +4,4 @@ 1473856865113 test-last 1 134 false 1473856888506 test-addition 1 23 false 1473857236459 test-last 1 347 false +1473857281671 test-addition 1 45 false diff --git a/bin/StringCalculatorTest.class b/bin/StringCalculatorTest.class index 1c6838f8cb915d48c60c9599bd5904bc5db6ee4d..7607247554f2516f961e5aec21bcd4f7258b16e6 100644 GIT binary patch delta 153 zcmeyzbC-|n)W2Q(7#J8#7y>tP88I^|O@6_o;2Lkl!QjQnAZn;%q+_gOqGPIKrem&S zp<}6IXkfs>;KRru>6@5WsgPHio0M8qte|12r>AGBqX3lEWCfZA0uv`&F`F=QY|dxq zVxG*zCdcFHqrHPc*jC6}gu!=m0E;MZ5CbzqC<6yW1cMMm0$0Mzv# AbpQYW delta 36 scmcc1_m79`)W2Q(7#J8#7`!%e88J^@!feFIzWF*c7c(mZ0~3QM0PKVc3;+NC diff --git a/tests/StringCalculatorTest.java b/tests/StringCalculatorTest.java index 5cd0a94..7a5c9d9 100644 --- a/tests/StringCalculatorTest.java +++ b/tests/StringCalculatorTest.java @@ -88,4 +88,16 @@ public void testStringCalculator_ManyNumbers_2() { assertEquals("Many numbers (1...9, 100)", 145, sum); } + + @Test + public void testStringCalculator_TwoNumbers_ManyCommas() { + // Arrange + String numbers = "5,,,8"; + + // Act + int sum = StringCalculator.add(numbers); + + // Assert + assertEquals("Two numbers, many commas (\"5,,,8\")", 13, sum); + } } From 53e3485b52e6e769e916aef4c33eccb838871d56 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 14 Sep 2016 15:49:23 +0300 Subject: [PATCH 15/45] besouro automatic message --- .besouro/2016091415302846/actions.txt | 5 +++++ .besouro/2016091415302846/besouroEpisodes.txt | 2 ++ .../randomHeuristicEpisodes.txt | 1 + .besouro/2016091415302846/zorroEpisodes.txt | 1 + bin/StringCalculatorTest.class | Bin 1885 -> 2109 bytes tests/StringCalculatorTest.java | 13 ++++++++++++- 6 files changed, 21 insertions(+), 1 deletion(-) diff --git a/.besouro/2016091415302846/actions.txt b/.besouro/2016091415302846/actions.txt index b927675..38bf18f 100644 --- a/.besouro/2016091415302846/actions.txt +++ b/.besouro/2016091415302846/actions.txt @@ -45,3 +45,8 @@ UnitTestSessionAction 1473857281671 StringCalculatorTest.java OK RefactoringAction 1473857286835 StringCalculatorTest.java ADD void testStringCalculator_ManyNumbers_2()/2 METHOD RefactoringAction 1473857293012 StringCalculatorTest.java RENAME testStringCalculator_ManyNumbers_2()/2=>void testStringCalculator_TwoNumbers_ManyCommas() METHOD EditAction 1473857317691 StringCalculatorTest.java 1982 8 24 8 +UnitTestCaseAction 1473857321423 StringCalculatorTest.java OK +UnitTestSessionAction 1473857321423 StringCalculatorTest.java OK +RefactoringAction 1473857335213 StringCalculatorTest.java ADD void testStringCalculator_TwoNumbers_ManyCommas()/2 METHOD +RefactoringAction 1473857338302 StringCalculatorTest.java RENAME testStringCalculator_TwoNumbers_ManyCommas()/2=>void testStringCalculator_ManyNumbers_ManyCommas() METHOD +EditAction 1473857362201 StringCalculatorTest.java 2247 9 27 9 diff --git a/.besouro/2016091415302846/besouroEpisodes.txt b/.besouro/2016091415302846/besouroEpisodes.txt index 27eeb27..c12a969 100644 --- a/.besouro/2016091415302846/besouroEpisodes.txt +++ b/.besouro/2016091415302846/besouroEpisodes.txt @@ -12,3 +12,5 @@ 1473857236460 test-last 1 44 false 1473857281671 test-addition 1 40 true 1473857281672 test-addition 1 40 true +1473857321423 test-addition 1 34 true +1473857321424 test-addition 1 34 true diff --git a/.besouro/2016091415302846/randomHeuristicEpisodes.txt b/.besouro/2016091415302846/randomHeuristicEpisodes.txt index 09e460f..39aad7c 100644 --- a/.besouro/2016091415302846/randomHeuristicEpisodes.txt +++ b/.besouro/2016091415302846/randomHeuristicEpisodes.txt @@ -5,3 +5,4 @@ 1473856888506 test-addition 1 18 false 1473857236459 test-last 1 44 false 1473857281671 test-addition 1 40 false +1473857321423 test-addition 1 34 true diff --git a/.besouro/2016091415302846/zorroEpisodes.txt b/.besouro/2016091415302846/zorroEpisodes.txt index fec0109..8ac7ae4 100644 --- a/.besouro/2016091415302846/zorroEpisodes.txt +++ b/.besouro/2016091415302846/zorroEpisodes.txt @@ -5,3 +5,4 @@ 1473856888506 test-addition 1 23 false 1473857236459 test-last 1 347 false 1473857281671 test-addition 1 45 false +1473857321423 test-addition 1 39 false diff --git a/bin/StringCalculatorTest.class b/bin/StringCalculatorTest.class index 7607247554f2516f961e5aec21bcd4f7258b16e6..ab45800e9404d3e45348a16a55a81213fabc3683 100644 GIT binary patch delta 155 zcmcc1w^xAc)W2Q(7#J8#7$P=u&0=QMn(V_Q?;h`)m{;kXpPQRl%)t=I$iQltk)W2Q(7#J8#7y>tP&0?O+%VNaHvDty8k(rf&fr%ji0O1J Date: Wed, 14 Sep 2016 15:50:38 +0300 Subject: [PATCH 16/45] besouro automatic message --- .besouro/2016091415302846/actions.txt | 3 +++ .besouro/2016091415302846/besouroEpisodes.txt | 2 ++ .../randomHeuristicEpisodes.txt | 1 + .besouro/2016091415302846/zorroEpisodes.txt | 1 + bin/StringCalculatorTest.class | Bin 2109 -> 2342 bytes src/StringCalculator.java | 6 ------ 6 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.besouro/2016091415302846/actions.txt b/.besouro/2016091415302846/actions.txt index 38bf18f..382b799 100644 --- a/.besouro/2016091415302846/actions.txt +++ b/.besouro/2016091415302846/actions.txt @@ -50,3 +50,6 @@ UnitTestSessionAction 1473857321423 StringCalculatorTest.java OK RefactoringAction 1473857335213 StringCalculatorTest.java ADD void testStringCalculator_TwoNumbers_ManyCommas()/2 METHOD RefactoringAction 1473857338302 StringCalculatorTest.java RENAME testStringCalculator_TwoNumbers_ManyCommas()/2=>void testStringCalculator_ManyNumbers_ManyCommas() METHOD EditAction 1473857362201 StringCalculatorTest.java 2247 9 27 9 +UnitTestCaseAction 1473857365714 StringCalculatorTest.java OK +UnitTestSessionAction 1473857365714 StringCalculatorTest.java OK +EditAction 1473857437303 StringCalculator.java 692 1 4 0 diff --git a/.besouro/2016091415302846/besouroEpisodes.txt b/.besouro/2016091415302846/besouroEpisodes.txt index c12a969..293e898 100644 --- a/.besouro/2016091415302846/besouroEpisodes.txt +++ b/.besouro/2016091415302846/besouroEpisodes.txt @@ -14,3 +14,5 @@ 1473857281672 test-addition 1 40 true 1473857321423 test-addition 1 34 true 1473857321424 test-addition 1 34 true +1473857365714 test-addition 1 30 true +1473857365715 test-addition 1 30 true diff --git a/.besouro/2016091415302846/randomHeuristicEpisodes.txt b/.besouro/2016091415302846/randomHeuristicEpisodes.txt index 39aad7c..d616a98 100644 --- a/.besouro/2016091415302846/randomHeuristicEpisodes.txt +++ b/.besouro/2016091415302846/randomHeuristicEpisodes.txt @@ -6,3 +6,4 @@ 1473857236459 test-last 1 44 false 1473857281671 test-addition 1 40 false 1473857321423 test-addition 1 34 true +1473857365714 test-addition 1 30 true diff --git a/.besouro/2016091415302846/zorroEpisodes.txt b/.besouro/2016091415302846/zorroEpisodes.txt index 8ac7ae4..3ea1edf 100644 --- a/.besouro/2016091415302846/zorroEpisodes.txt +++ b/.besouro/2016091415302846/zorroEpisodes.txt @@ -6,3 +6,4 @@ 1473857236459 test-last 1 347 false 1473857281671 test-addition 1 45 false 1473857321423 test-addition 1 39 false +1473857365714 test-addition 1 44 false diff --git a/bin/StringCalculatorTest.class b/bin/StringCalculatorTest.class index ab45800e9404d3e45348a16a55a81213fabc3683..7894780b99a62b89bce96335706ecfb46c775bf1 100644 GIT binary patch delta 164 zcmdlhuuO>S)W2Q(7#J8#7~(f_F|#mgPqt-Nl=n@{t8~uK%}p%kV2EI3;55|HG14*9 z(J|m)h+^Ba7(d0yZw5a3Ad*48pcTks=JylNDJ-d9#3ubAgHrfQk!2irHg<<}oqE0RX@Z BAdUb4 delta 56 zcmZ1`v{!)Z)W2Q(7#J8#7$P=uF|$mrXE9>r+`Nh905fkq12aPs0|!GYgAha7 L>|sEKObp=w&m|39 diff --git a/src/StringCalculator.java b/src/StringCalculator.java index 7e0cc3b..1be4691 100644 --- a/src/StringCalculator.java +++ b/src/StringCalculator.java @@ -11,12 +11,6 @@ public static int add(String numbersStr) { return Integer.parseInt(numbersStr); } - // Returns the sum of two comma separated numbers - if (numbersStr.matches("^\\d+,\\d+$")) { - String numbers[] = numbersStr.split(","); - return Integer.parseInt(numbers[0]) + Integer.parseInt(numbers[1]); - } - // Returns the sum of an unknown amount of numbers if (numbersStr.matches("^\\d+[\\d,]*\\d+$")) { String numbers[] = numbersStr.split(",+"); From 52e0aec7249cc05e340cca59fbb8456cbacfa3b5 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 14 Sep 2016 15:51:03 +0300 Subject: [PATCH 17/45] besouro automatic message --- .besouro/2016091415302846/actions.txt | 5 +++++ .besouro/2016091415302846/besouroEpisodes.txt | 1 + .../randomHeuristicEpisodes.txt | 1 + .besouro/2016091415302846/zorroEpisodes.txt | 1 + bin/StringCalculator.class | Bin 948 -> 873 bytes src/StringCalculator.java | 7 ++++++- 6 files changed, 14 insertions(+), 1 deletion(-) diff --git a/.besouro/2016091415302846/actions.txt b/.besouro/2016091415302846/actions.txt index 382b799..bf7cea8 100644 --- a/.besouro/2016091415302846/actions.txt +++ b/.besouro/2016091415302846/actions.txt @@ -53,3 +53,8 @@ EditAction 1473857362201 StringCalculatorTest.java 2247 9 27 9 UnitTestCaseAction 1473857365714 StringCalculatorTest.java OK UnitTestSessionAction 1473857365714 StringCalculatorTest.java OK EditAction 1473857437303 StringCalculator.java 692 1 4 0 +UnitTestCaseAction 1473857440504 StringCalculatorTest.java OK +UnitTestSessionAction 1473857440504 StringCalculatorTest.java OK +RefactoringAction 1473857452455 StringCalculator.java REMOVE add(String) METHOD +RefactoringAction 1473857452704 StringCalculator.java ADD static int add(String) METHOD +EditAction 1473857462626 StringCalculator.java 746 1 4 0 diff --git a/.besouro/2016091415302846/besouroEpisodes.txt b/.besouro/2016091415302846/besouroEpisodes.txt index 293e898..e8c571e 100644 --- a/.besouro/2016091415302846/besouroEpisodes.txt +++ b/.besouro/2016091415302846/besouroEpisodes.txt @@ -16,3 +16,4 @@ 1473857321424 test-addition 1 34 true 1473857365714 test-addition 1 30 true 1473857365715 test-addition 1 30 true +1473857440504 refactoring 2A 3 true diff --git a/.besouro/2016091415302846/randomHeuristicEpisodes.txt b/.besouro/2016091415302846/randomHeuristicEpisodes.txt index d616a98..ed66f0e 100644 --- a/.besouro/2016091415302846/randomHeuristicEpisodes.txt +++ b/.besouro/2016091415302846/randomHeuristicEpisodes.txt @@ -7,3 +7,4 @@ 1473857281671 test-addition 1 40 false 1473857321423 test-addition 1 34 true 1473857365714 test-addition 1 30 true +1473857440504 refactoring 2A 3 false diff --git a/.besouro/2016091415302846/zorroEpisodes.txt b/.besouro/2016091415302846/zorroEpisodes.txt index 3ea1edf..5e82021 100644 --- a/.besouro/2016091415302846/zorroEpisodes.txt +++ b/.besouro/2016091415302846/zorroEpisodes.txt @@ -7,3 +7,4 @@ 1473857281671 test-addition 1 45 false 1473857321423 test-addition 1 39 false 1473857365714 test-addition 1 44 false +1473857440504 refactoring 2A 74 false diff --git a/bin/StringCalculator.class b/bin/StringCalculator.class index 2d5bc41d25aaab36c1b736f470b1e55659e75558..1a32e492d826adc9d1d56c440abf8cc6dbd31a6c 100644 GIT binary patch delta 208 zcmWlRJx;?=5QM*dPI#6vK}uv%M6tw=jIm9?7E%hQN*zV?7%EHLAVp3Q>0N;fM53a| z0a9^|6kGwbH1o}_X6Dl#PlChm*B*GH+6ARt4BnbHe`(s{HB)orb0wG}cT1VO4|$i& zg=Q1*gTZR;*=@1J$VSW9Gi5JVJk-r=J*(va||YAF8z_AVV@ delta 309 zcmXYsJx;?w5QV?7iPspB5DP>23rdJWu#F)mKm$}L6%`#KL@6R6A;baFa041wNF0F% z2}Ov418@^AKuH)2G}?KyZ{FLP{c>K7_xbbw0dzQc@!C?J?)QdKtf%2p7bMQk+t@Bl3EHl8ZI7XW>`>eojIC%>kx3P%qfd>sc^v(1H~IwxTU7*eEmW` zmWWufNs(<5L_Mwls;le{yIATsv{h%5s Date: Wed, 14 Sep 2016 15:51:27 +0300 Subject: [PATCH 18/45] besouro automatic message --- .besouro/2016091415302846/actions.txt | 1 + bin/StringCalculator.class | Bin 873 -> 873 bytes src/StringCalculator.java | 2 +- 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.besouro/2016091415302846/actions.txt b/.besouro/2016091415302846/actions.txt index bf7cea8..eae0c02 100644 --- a/.besouro/2016091415302846/actions.txt +++ b/.besouro/2016091415302846/actions.txt @@ -58,3 +58,4 @@ UnitTestSessionAction 1473857440504 StringCalculatorTest.java OK RefactoringAction 1473857452455 StringCalculator.java REMOVE add(String) METHOD RefactoringAction 1473857452704 StringCalculator.java ADD static int add(String) METHOD EditAction 1473857462626 StringCalculator.java 746 1 4 0 +EditAction 1473857486478 StringCalculator.java 758 1 4 0 diff --git a/bin/StringCalculator.class b/bin/StringCalculator.class index 1a32e492d826adc9d1d56c440abf8cc6dbd31a6c..47fd9cd2a3a7d7e36fb2e4e4d101fecb54938c1b 100644 GIT binary patch delta 57 zcmaFK_L6PGO(tC~1~vw61`Y;(20;b^1~CQ^26+Zi1~ni{gF&3Znn8lW2}t`eNHO>^ KC`@K!P6hz{9tT1I delta 57 zcmaFK_L6PGO(tDd1~wq%VBlg9WZ-5HW8i0yXAode1M)N&gcz(Dgc+QGv=4(QgCB$R IWH#nx0QJfT1^@s6 diff --git a/src/StringCalculator.java b/src/StringCalculator.java index 3350504..cd1c915 100644 --- a/src/StringCalculator.java +++ b/src/StringCalculator.java @@ -3,7 +3,7 @@ public class StringCalculator { /** * Returns the sum of the numbers given in numbersStr * @param numbersStr - * @return + * @return int the sum */ public static int add(String numbersStr) { // Returns 0 for an empty string From 2936802d58874d2d9dd5540903d857512f7ee40b Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 14 Sep 2016 15:51:38 +0300 Subject: [PATCH 19/45] besouro automatic message --- .besouro/2016091415302846/actions.txt | 1 + src/StringCalculator.java | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.besouro/2016091415302846/actions.txt b/.besouro/2016091415302846/actions.txt index eae0c02..26d9beb 100644 --- a/.besouro/2016091415302846/actions.txt +++ b/.besouro/2016091415302846/actions.txt @@ -59,3 +59,4 @@ RefactoringAction 1473857452455 StringCalculator.java REMOVE add(String) METHOD RefactoringAction 1473857452704 StringCalculator.java ADD static int add(String) METHOD EditAction 1473857462626 StringCalculator.java 746 1 4 0 EditAction 1473857486478 StringCalculator.java 758 1 4 0 +EditAction 1473857497445 StringCalculator.java 710 1 4 0 diff --git a/src/StringCalculator.java b/src/StringCalculator.java index cd1c915..84c713c 100644 --- a/src/StringCalculator.java +++ b/src/StringCalculator.java @@ -2,8 +2,6 @@ public class StringCalculator { /** * Returns the sum of the numbers given in numbersStr - * @param numbersStr - * @return int the sum */ public static int add(String numbersStr) { // Returns 0 for an empty string From dbe1dc907511c37508558d71a19423a3a44d6abf Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 14 Sep 2016 15:54:58 +0300 Subject: [PATCH 20/45] besouro automatic message --- .besouro/2016091415302846/actions.txt | 2 ++ bin/StringCalculator.class | Bin 873 -> 873 bytes src/StringCalculator.java | 8 ++++++-- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.besouro/2016091415302846/actions.txt b/.besouro/2016091415302846/actions.txt index 26d9beb..79ce7ba 100644 --- a/.besouro/2016091415302846/actions.txt +++ b/.besouro/2016091415302846/actions.txt @@ -60,3 +60,5 @@ RefactoringAction 1473857452704 StringCalculator.java ADD static int add(String) EditAction 1473857462626 StringCalculator.java 746 1 4 0 EditAction 1473857486478 StringCalculator.java 758 1 4 0 EditAction 1473857497445 StringCalculator.java 710 1 4 0 +FileOpenedAction 1473857661620 StringCalculatorException.java 67 0 0 0 +EditAction 1473857697656 StringCalculator.java 894 1 5 0 diff --git a/bin/StringCalculator.class b/bin/StringCalculator.class index 47fd9cd2a3a7d7e36fb2e4e4d101fecb54938c1b..470d23d67694bc94b20257f714f384f4bca10dfd 100644 GIT binary patch delta 57 zcmaFK_L6PGO(tCq1~vvx1`Y;Z20;cs1~CR926+Zy1~mo|1`P&L25X>*6Oi^{kYMm* KkekfLoD2Z@mIo>T delta 57 zcmaFK_L6PGO(tC~1~vw61`Y;(20;b^1~CQ^26+Zi1~ni{gF&3Znn8lW2}t`eNHO>^ KC`@K!P6hz{9tT1I diff --git a/src/StringCalculator.java b/src/StringCalculator.java index 84c713c..6521df7 100644 --- a/src/StringCalculator.java +++ b/src/StringCalculator.java @@ -14,8 +14,12 @@ public static int add(String numbersStr) { return Integer.parseInt(numbersStr); } - // Returns the sum of an unknown amount of numbers - if (numbersStr.matches("^\\d+[\\d,]*\\d+$")) { + // Returns the sum of an unknown amount of numbers, + // separated by commas or newlines + if (numbersStr.matches(",\\n|\\n,")) { + throw new StringCalculatorException("Can't have commas and newlines next to each other."); + } + if (numbersStr.matches("^\\d+[\\d,\\n]+\\d+$")) { String numbers[] = numbersStr.split(",+"); int sum = 0; for (String number : numbers) { From 8a91726d73dd5fcfa560e3872eefe901e7540dfd Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 14 Sep 2016 15:55:32 +0300 Subject: [PATCH 21/45] besouro automatic message --- .besouro/2016091415302846/actions.txt | 3 +++ bin/StringCalculator.class | Bin 873 -> 517 bytes src/StringCalculatorException.java | 4 ++++ 3 files changed, 7 insertions(+) diff --git a/.besouro/2016091415302846/actions.txt b/.besouro/2016091415302846/actions.txt index 79ce7ba..5770c4a 100644 --- a/.besouro/2016091415302846/actions.txt +++ b/.besouro/2016091415302846/actions.txt @@ -62,3 +62,6 @@ EditAction 1473857486478 StringCalculator.java 758 1 4 0 EditAction 1473857497445 StringCalculator.java 710 1 4 0 FileOpenedAction 1473857661620 StringCalculatorException.java 67 0 0 0 EditAction 1473857697656 StringCalculator.java 894 1 5 0 +CompilationAction 1473857699356 StringCalculator.java +RefactoringAction 1473857726984 StringCalculatorException.java ADD StringCalculatorException(String) METHOD +EditAction 1473857731399 StringCalculatorException.java 139 1 1 0 diff --git a/bin/StringCalculator.class b/bin/StringCalculator.class index 470d23d67694bc94b20257f714f384f4bca10dfd..7961bfefe0f56c77fc67c9584b16efba46a1445f 100644 GIT binary patch delta 217 zcmaFK*2=ff$?3=9k=43ZPM*4DE#2r@G8XC;;;>gOcprR%#E73CLkFbFd;B!=b{ zr55Msl%=L9Bi(D&`QwuwrM(p#uXcV z0K&?Zaig2MCB_90;G3A}D_C#EgbkZ>|9f)oJty~nZ~nC0AAi1|01v1gx?k%KIRS^f zklxzdEzi05Oxa8d6EDNpVYMB0Th(UL-|MzATw+?VJ7Kc(B8m?`PHjDPxx!VOqL4e2 zFL#ru74euODt*56&J^GD)1QXFiUVVyI}KdL8W}|giwlZba*Q#F#|(K&Zz*tF4^&s` zvDSuu#EKsGqK*WZimS}40!oT^loPEb%2YIXU865(Z*W%?v!tEuP={?B-=?ZJ5G^o1 PRAYVmDiZD~rnvtXl>2P_ diff --git a/src/StringCalculatorException.java b/src/StringCalculatorException.java index 2f8cf41..6670608 100644 --- a/src/StringCalculatorException.java +++ b/src/StringCalculatorException.java @@ -1,4 +1,8 @@ public class StringCalculatorException extends Exception { + StringCalculatorException(String message) { + super(message); + } + } From 337eeb2c67cb513799e43d7fabc2f6a409f0dbf1 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 14 Sep 2016 15:57:00 +0300 Subject: [PATCH 22/45] besouro automatic message --- .besouro/2016091415302846/actions.txt | 4 ++++ bin/StringCalculator.class | Bin 517 -> 1060 bytes bin/StringCalculatorException.class | Bin 303 -> 367 bytes bin/StringCalculatorTest.class | Bin 2342 -> 1516 bytes src/StringCalculator.java | 3 ++- src/StringCalculatorException.java | 4 +--- 6 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.besouro/2016091415302846/actions.txt b/.besouro/2016091415302846/actions.txt index 5770c4a..6a1d75b 100644 --- a/.besouro/2016091415302846/actions.txt +++ b/.besouro/2016091415302846/actions.txt @@ -65,3 +65,7 @@ EditAction 1473857697656 StringCalculator.java 894 1 5 0 CompilationAction 1473857699356 StringCalculator.java RefactoringAction 1473857726984 StringCalculatorException.java ADD StringCalculatorException(String) METHOD EditAction 1473857731399 StringCalculatorException.java 139 1 1 0 +CompilationAction 1473857733520 StringCalculator.java +CompilationAction 1473857814918 StringCalculator.java +CompilationAction 1473857814989 StringCalculatorTest.java +EditAction 1473857820100 StringCalculatorException.java 72 0 0 0 diff --git a/bin/StringCalculator.class b/bin/StringCalculator.class index 7961bfefe0f56c77fc67c9584b16efba46a1445f..81082b8370b2922a6d0c0e9762867195a62535f7 100644 GIT binary patch literal 1060 zcmZ`&&r{P-5dI!Xn^0RzQwkJ8q9C+sp;{4zf)_?-n5p%EGK16~k2FJrY0^nj2 z4?SOjOs~6qkCzzyKFVR!4n*vH-3n#qjRr#|S3RrVLsjx?46z6MrqvE@&kYo4 z4B7J;{=`)bGC;);L*zxhQJ9Kh1fvSFe-Z0_9>*1oF(@q_noWy3yRiJT7_LHBFu{;I zYi`XAtsTpc;~J6-YMc9kMQR#Bi{J9uXm=V(E{?pQi3WN9vep~ehReN3#R8aFr+WcAO)Qk1EaY`dq{@FddSV! zk9fPg3JT__&brs}P3xg8_9b(EpmU-wiA$S78w>Q&jdqPrg}f438Z#os5!BD!aEwk7 z7SKy{#(My=3G(`J8A*x^&|RiTN~B@^lw71U4K4i<5$V9tGKUy`57qdBaq_Nry~H=9 zHnpiEOn*1DeD|qrXoW+}R;87~=2G-{AtEivpODT*Gjh2$HcMZ>T6rh4jGT#lIQcnt zARSN{38Kj*YDH{ll$uhhxfJ4!7x#W`v){9V`&Z8j-q7Q3>}5F@>m_&`xNH6$K*-7D+lr21uSz19TlB6r;X` Gbd}#(J>z=- delta 222 zcmZ3&(aOSg>ff$?3=9k=43ZPM*4DE#2r@G8XC;;;>gOcprR%#E73CLkFbFd;B!=b{ zr55Msl%=L9Bi(D&`Qwu0UUW=Q}5(GxgA diff --git a/bin/StringCalculatorException.class b/bin/StringCalculatorException.class index 4bd989452e88efe466640937d540edeb3220a693..53792e400647c6f137e2c907435cedfa79b54659 100644 GIT binary patch delta 160 zcmZ3_^qz_9)W2Q(7#J8#7=$KrIg5yD_+%xPCFW8epx!N?#0$u1h68j*^Zr4c>_b zL!quC9=EuWF2CN)+6y^k*suG}t}uj_dRVTtYstWlr@IWrPa|bzB3g1N3H(+mZMl_N z5jS7grdRHdsMWH&O(ll{^)|mw%@}RgvCGhGDkFwEz7*Xs(#b%Q1q2BPMiVu883r3o zb-`6PCV}`GiNU07#{&^AH(0wV2LX1l?<~2?uy+G&|3?BFuVrp<12 zdI4U5m*OWoe((akD98V9wwn~UCLxpEJ?G*1J?Cxz{^!rX0IcFPhKPWA>~u}*Vq0%D zdoA7RbQ^~4#4st4y3~Kx3oYHcC>)+$8cj#w+C$SaozDd(vbht1$?eX$k-!AvNknl? z;6~lFjK{t9nbB?NXDve@UGFsY)`{LV-DkgX()r1>1!n7E_J)Awu!gIBr#tPJ&g*`w zz}!*Ka?G}IV%jDXZ&_By(H*m6F>k8g>0T5rdn~o!j%GtaS^x>Cn2q5k1Fq&y;ub#S zsPyx5ft%U-VC4PCjohAsj|7rl4VvvuSpxG|h~YN#4ZJPeHo8s{cc3v`_nvlM_4F3& zx)qXmf8U+RnB~nGW77Y%S(n{w3y3{|h0vKfd^_n1K4n}*K~CTUwrc&nTDFpla?RaO z^nKGCBspDCkQa!QYYK{7)8RbjT99Z-;7({YjbA$bEnq9Cu=uiES5V{7*x?ssYuU2Y z)`MJ0fyEKI+^QaO%T_d}uK0S!w} z1mY#hp;e{32tNwk`yVZc9Efp&#BrzBZ5q3#`*xVSdJr2tu6g(LVG-Oq-i}T1j&B$K z#`s*|m4_M8{QzF4_{5XI-Ux2^Q7K;CM9&!Q0@LZ~`u#VU z*-X#H=YM^Jj|WN9m}G$af}4VZ6#u3@K}Nh(P*DnHGh~;@X36HpX3HbkRiCY@SPNzI zWJ_dM$yUZ@AByETG+QS?_Bl^{1TX#tG_{Yz diff --git a/src/StringCalculator.java b/src/StringCalculator.java index 6521df7..b571df6 100644 --- a/src/StringCalculator.java +++ b/src/StringCalculator.java @@ -3,7 +3,7 @@ public class StringCalculator { /** * Returns the sum of the numbers given in numbersStr */ - public static int add(String numbersStr) { + public static int add(String numbersStr) throws StringCalculatorException { // Returns 0 for an empty string if (numbersStr == "") { return 0; @@ -19,6 +19,7 @@ public static int add(String numbersStr) { if (numbersStr.matches(",\\n|\\n,")) { throw new StringCalculatorException("Can't have commas and newlines next to each other."); } + if (numbersStr.matches("^\\d+[\\d,\\n]+\\d+$")) { String numbers[] = numbersStr.split(",+"); int sum = 0; diff --git a/src/StringCalculatorException.java b/src/StringCalculatorException.java index 6670608..9201d9e 100644 --- a/src/StringCalculatorException.java +++ b/src/StringCalculatorException.java @@ -1,8 +1,6 @@ public class StringCalculatorException extends Exception { - StringCalculatorException(String message) { - super(message); - } + } From 7c3b4ddb2cb7942ec99158de30eb02452a26434d Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 14 Sep 2016 15:57:05 +0300 Subject: [PATCH 23/45] besouro automatic message --- .besouro/2016091415302846/actions.txt | 4 ++++ bin/StringCalculator.class | Bin 1060 -> 571 bytes bin/StringCalculatorException.class | Bin 367 -> 303 bytes src/StringCalculatorException.java | 4 +++- 4 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.besouro/2016091415302846/actions.txt b/.besouro/2016091415302846/actions.txt index 6a1d75b..9368cd2 100644 --- a/.besouro/2016091415302846/actions.txt +++ b/.besouro/2016091415302846/actions.txt @@ -69,3 +69,7 @@ CompilationAction 1473857733520 StringCalculator.java CompilationAction 1473857814918 StringCalculator.java CompilationAction 1473857814989 StringCalculatorTest.java EditAction 1473857820100 StringCalculatorException.java 72 0 0 0 +CompilationAction 1473857822095 StringCalculator.java +CompilationAction 1473857822096 StringCalculatorTest.java +RefactoringAction 1473857823724 StringCalculatorException.java ADD StringCalculatorException(String) METHOD +EditAction 1473857824445 StringCalculatorException.java 139 1 1 0 diff --git a/bin/StringCalculator.class b/bin/StringCalculator.class index 81082b8370b2922a6d0c0e9762867195a62535f7..731ac6083ad3dd31e2bb7381f3c5ae0c961df4b0 100644 GIT binary patch delta 217 zcmZ3&v73eK)W2Q(7#J8#7-S}L-K=M45MgBC&q^#y)Xz!GOV@WTD#|b7U=U+uNDR#@ zN-fUMDN9XJNY2kK$jnJB$;{7FC@9KL%1O<&QsCkY$w&oCrxt)TX+UH&6*7wzO7l`u(=zi?Q@FSogxMJ+co2 z4?SOjOs~6qkCzzyKFVR!4n*vH-3n#qjRr#|S3RrVLsjx?46z6MrqvE@&kYo4 z4B7J;{=`)bGC;);L*zxhQJ9Kh1fvSFe-Z0_9>*1oF(@q_noWy3yRiJT7_LHBFu{;I zYi`XAtsTpc;~J6-YMc9kMQR#Bi{J9uXm=V(E{?pQi3WN9vep~ehReN3#R8aFr+WcAO)Qk1EaY`dq{@FddSV! zk9fPg3JT__&brs}P3xg8_9b(EpmU-wiA$S78w>Q&jdqPrg}f438Z#os5!BD!aEwk7 z7SKy{#(My=3G(`J8A*x^&|RiTN~B@^lw71U4K4i<5$V9tGKUy`57qdBaq_Nry~H=9 zHnpiEOn*1DeD|qrXoW+}R;87~=2G-{AtEivpODT*Gjh2$HcMZ>T6rh4jGT#lIQcnt zARSN{38Kj*YDH{ll$uhhxfJ4!7x#W`v){9V`&Z8j-q7Q3>}5F@>m_&`xNH6$K*-7D+lr21uSz19TlB6r;X` Gbd}#(J>z=- diff --git a/bin/StringCalculatorException.class b/bin/StringCalculatorException.class index 53792e400647c6f137e2c907435cedfa79b54659..4bd989452e88efe466640937d540edeb3220a693 100644 GIT binary patch delta 98 zcmaFQw4RCU)W2Q(7#J8#7z8GAIWsY9OiWCi_|Vdgk%5(gje(JY9Vn*{q#1!UtJZb~ gj*UPD69X5J1WAL~+(42Cq5w$q0(p!Kd|(-V0FFBg&j0`b delta 160 zcmZ3_^qz_9)W2Q(7#J8#7=$KrIg5yD_+%xPCFW8epx!N?#0 Date: Wed, 14 Sep 2016 15:58:34 +0300 Subject: [PATCH 24/45] besouro automatic message --- .besouro/2016091415302846/actions.txt | 3 +++ bin/StringCalculator.class | Bin 571 -> 1060 bytes bin/StringCalculatorException.class | Bin 303 -> 367 bytes bin/StringCalculatorTest.class | Bin 1516 -> 2476 bytes src/StringCalculator.java | 4 +--- tests/StringCalculatorTest.java | 18 +++++++++--------- 6 files changed, 13 insertions(+), 12 deletions(-) diff --git a/.besouro/2016091415302846/actions.txt b/.besouro/2016091415302846/actions.txt index 9368cd2..e690d80 100644 --- a/.besouro/2016091415302846/actions.txt +++ b/.besouro/2016091415302846/actions.txt @@ -73,3 +73,6 @@ CompilationAction 1473857822095 StringCalculator.java CompilationAction 1473857822096 StringCalculatorTest.java RefactoringAction 1473857823724 StringCalculatorException.java ADD StringCalculatorException(String) METHOD EditAction 1473857824445 StringCalculatorException.java 139 1 1 0 +CompilationAction 1473857826531 StringCalculatorTest.java +CompilationAction 1473857880018 StringCalculatorTest.java +EditAction 1473857913857 StringCalculator.java 925 1 5 0 diff --git a/bin/StringCalculator.class b/bin/StringCalculator.class index 731ac6083ad3dd31e2bb7381f3c5ae0c961df4b0..81082b8370b2922a6d0c0e9762867195a62535f7 100644 GIT binary patch literal 1060 zcmZ`&&r{P-5dI!Xn^0RzQwkJ8q9C+sp;{4zf)_?-n5p%EGK16~k2FJrY0^nj2 z4?SOjOs~6qkCzzyKFVR!4n*vH-3n#qjRr#|S3RrVLsjx?46z6MrqvE@&kYo4 z4B7J;{=`)bGC;);L*zxhQJ9Kh1fvSFe-Z0_9>*1oF(@q_noWy3yRiJT7_LHBFu{;I zYi`XAtsTpc;~J6-YMc9kMQR#Bi{J9uXm=V(E{?pQi3WN9vep~ehReN3#R8aFr+WcAO)Qk1EaY`dq{@FddSV! zk9fPg3JT__&brs}P3xg8_9b(EpmU-wiA$S78w>Q&jdqPrg}f438Z#os5!BD!aEwk7 z7SKy{#(My=3G(`J8A*x^&|RiTN~B@^lw71U4K4i<5$V9tGKUy`57qdBaq_Nry~H=9 zHnpiEOn*1DeD|qrXoW+}R;87~=2G-{AtEivpODT*Gjh2$HcMZ>T6rh4jGT#lIQcnt zARSN{38Kj*YDH{ll$uhhxfJ4!7x#W`v){9V`&Z8j-q7Q3>}5F@>m_&`xNH6$K*-7D+lr21uSz19TlB6r;X` Gbd}#(J>z=- delta 217 zcmZ3&v73eK)W2Q(7#J8#7-S}L-K=M45MgBC&q^#y)Xz!GOV@WTD#|b7U=U+uNDR#@ zN-fUMDN9XJNY2kK$jnJB$;{7FC@9KL%1O<&QsCkY$w&oCrxt)TX+UH&6*7wzO7l`u(=zi?Q@FSogxMJ+coW8epx!N?#04mm#ofY;^&W)BMaOD%zGM#$@v25;0V0^24Y9tXuB83TD z5xCwkE#qOob7J(G`bpamNH@AIy?vzjOn2;0jype^w!lmy%zIrxbI5Rc?RdL$;k+2k z3M99GX&D!e*|qFArUYg$hX?CiJLp@E*)fhx+a$!MWpy3h`;z#H!&N>y9~H2oWgr}pB2zgPX%sd8^bCMBG+@f3T_FcJYLQA%A3S(EX1KvZ|Jva z+eXhxA%hPXu6v{H=Y74++T08ge(=C8dff8r%b4`*-sH0T9RaZ`FdtgQ{r@&d!4l&t z3Z%e0oYe-pTDFp#V1KxO6K~pzK;(EuK}le&TvJfy{*UUEYk|$Y>E)D@}Qsb{w4MgV!GNF(oqAukgTc{*gWLd7timcLLP1a?pNbG$! z?yD}Pd_G^NO>qeSo4``2&#r2cJ<R46ftDbGq9eCS)nX!Ri$ zX`JNSrj0@=6NKlSaW(>dRMS;fbp05i0krT83kxHSSW9RN%Q09ONmLS%rV53r(Q zH54F2fJFji36P5nP>l>w^8xBA)n8<02`43?)d=sReTl-aF+lZ1h`Lt z&By?sM+VsT0lrYN8w#*PfL#JK2(T9!;H$_04Ikj4imyWf4hZmw0N)beab$pl$N+~v wz#|pkgaSMxfKGr@0vM429!CcF&IkBj#j{X=a{_b-a6y3QkpX_-4KfD(Uu3wUIsgCw literal 1516 zcmbV~UuzRV6vfY^Y16K)O=DY)f7(q!s1*!KpNt9;A_&ofO#(iJ$!16=?9PPAq?(WA zQ$a!B{ZQhaq)kE?5%y*8+_`6ebLY(c{pb5n0H-+0A;YkHZjDsEDvzU4%&j&JF|;{k z8S;I8$;&ZUz4BS7FCxpZ_DU*g-!QBkKWQ;!tGX)!tYBjkt5{>$u1h68j*^Zr4c>_b zL!quC9=EuWF2CN)+6y^k*suG}t}uj_dRVTtYstWlr@IWrPa|bzB3g1N3H(+mZMl_N z5jS7grdRHdsMWH&O(ll{^)|mw%@}RgvCGhGDkFwEz7*Xs(#b%Q1q2BPMiVu883r3o zb-`6PCV}`GiNU07#{&^AH(0wV2LX1l?<~2?uy Date: Wed, 14 Sep 2016 15:58:52 +0300 Subject: [PATCH 25/45] besouro automatic message --- .besouro/2016091415302846/actions.txt | 1 + bin/StringCalculator.class | Bin 1060 -> 1064 bytes src/StringCalculator.java | 4 ---- 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/.besouro/2016091415302846/actions.txt b/.besouro/2016091415302846/actions.txt index e690d80..9d73662 100644 --- a/.besouro/2016091415302846/actions.txt +++ b/.besouro/2016091415302846/actions.txt @@ -76,3 +76,4 @@ EditAction 1473857824445 StringCalculatorException.java 139 1 1 0 CompilationAction 1473857826531 StringCalculatorTest.java CompilationAction 1473857880018 StringCalculatorTest.java EditAction 1473857913857 StringCalculator.java 925 1 5 0 +EditAction 1473857931407 StringCalculator.java 878 1 4 0 diff --git a/bin/StringCalculator.class b/bin/StringCalculator.class index 81082b8370b2922a6d0c0e9762867195a62535f7..76b2989c960652832595689b0ac15562dcdc307d 100644 GIT binary patch delta 25 hcmZ3&v4Ug66Gk>R9qpQ!yv@%TZ!$6}PCme#0swT;2t&0svIv2Ydhk diff --git a/src/StringCalculator.java b/src/StringCalculator.java index 73a651d..b9720cd 100644 --- a/src/StringCalculator.java +++ b/src/StringCalculator.java @@ -19,7 +19,6 @@ public static int add(String numbersStr) throws StringCalculatorException { if (numbersStr.matches(",\\n|\\n,")) { throw new StringCalculatorException("Can't have commas and newlines next to each other."); } - if (numbersStr.matches("^\\d+[\\d,\\n]+\\d+$")) { String numbers[] = numbersStr.split(",+|\\n+"); int sum = 0; @@ -28,8 +27,5 @@ public static int add(String numbersStr) throws StringCalculatorException { } return sum; } - - // not yet implemented - return 0; } } From 02d97a233543e0cd4f15069260460eeeedd6e585 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 14 Sep 2016 15:59:05 +0300 Subject: [PATCH 26/45] besouro automatic message --- .besouro/2016091415302846/actions.txt | 2 ++ bin/StringCalculator.class | Bin 1064 -> 553 bytes src/StringCalculator.java | 2 ++ 3 files changed, 4 insertions(+) diff --git a/.besouro/2016091415302846/actions.txt b/.besouro/2016091415302846/actions.txt index 9d73662..74e59d6 100644 --- a/.besouro/2016091415302846/actions.txt +++ b/.besouro/2016091415302846/actions.txt @@ -77,3 +77,5 @@ CompilationAction 1473857826531 StringCalculatorTest.java CompilationAction 1473857880018 StringCalculatorTest.java EditAction 1473857913857 StringCalculator.java 925 1 5 0 EditAction 1473857931407 StringCalculator.java 878 1 4 0 +CompilationAction 1473857933357 StringCalculator.java +EditAction 1473857944824 StringCalculator.java 895 1 5 0 diff --git a/bin/StringCalculator.class b/bin/StringCalculator.class index 76b2989c960652832595689b0ac15562dcdc307d..dbb52cc198f57057ebe78f87ba0f43bc3847d218 100644 GIT binary patch delta 209 zcmZ3%v66-B)W2Q(7#J8#7-S}L-K=M45MgBC&q^#y)Xz!GOV@WTD#|b7U=U+u@DI%^ zN-fUMDN9XJNY2kK$jnJB$;{7FC@9KL%1O<&QsCkY$;d2L$W1ND$WKwoEiEolC`v6U zEy`0!1Tu{3ENKAcpEJ|| literal 1064 zcmZ`&&r{P-5dI!Xn^0S!DFuq4Q4!j-P_2kU!3(1^%+z{7nL+B0NBV{a+oY4E$ibuk zghwxW;o=1xox!_*i+_W-uVrLJyu5w;_RH>m-)?^V`g#Ol4oe#P7zWou-*LBBc+>7Q zdFc5XRC?XvyS&)s?soC<){d}4hUk*xI^lf=C7WAkP*=RVh(SSr91%nr1}cs#s-4!B z@SpIlreH8Cp3R%<+;^mZ@~DOlCy=qTb<32Q*Xs=FY~{3i4^_^sGQ=M2*`ggfo*QT| z7&2!w{E6!rVt|fehRBOrJwF-4D8@8o{vy`SptJGcC^7%s!qaD^dx z+T5xeif!S?aTNm$dYk)!pf?@YDPf`JzOA_h9XA+CE8Lw9%?95UrtP&_JTSRiH(l|j zNumXG*$d6kGX=LBrWZDZKN~|5(^A^(e_C4CVG$q6Z?jgXYR~hMs*VE9s*tDJc}aUV zjv{W75J9`?&={xBQ+M-U#Yu0sJIsJ|lJh#HeKHf`c!FR^otr@kIxPl9vy1kS42iXn z+piz-c6S{#%u$^+ujAX|p(A%DeRim`vMvcs+d*3k^wEv>jZTfcB3T+WBGw`F&)sm0 zP8pWa3v|YN0I~`4`f(8h6d9zuN|B^Y!}=+?OlMn0>LVh`zGb8jF!CO{^#v2;UF&*@ zZ%A$!lZTl4ZW+1mQ^_*&2bifS%lVDP=+S&cnO8p{m5HX+QgwWWzJ9g*PGxB|9rX-KD64dxV%oR8JVkw8)xJ-=*s0?f?J) diff --git a/src/StringCalculator.java b/src/StringCalculator.java index b9720cd..2307c12 100644 --- a/src/StringCalculator.java +++ b/src/StringCalculator.java @@ -27,5 +27,7 @@ public static int add(String numbersStr) throws StringCalculatorException { } return sum; } + + return 0; } } From 19e41e2da8668d47ba43448dae03f4abd1554b1c Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 14 Sep 2016 15:59:18 +0300 Subject: [PATCH 27/45] besouro automatic message --- .besouro/2016091415302846/actions.txt | 1 + bin/StringCalculator.class | Bin 553 -> 1064 bytes tests/StringCalculatorTest.java | 1 - 3 files changed, 1 insertion(+), 1 deletion(-) diff --git a/.besouro/2016091415302846/actions.txt b/.besouro/2016091415302846/actions.txt index 74e59d6..be8f031 100644 --- a/.besouro/2016091415302846/actions.txt +++ b/.besouro/2016091415302846/actions.txt @@ -79,3 +79,4 @@ EditAction 1473857913857 StringCalculator.java 925 1 5 0 EditAction 1473857931407 StringCalculator.java 878 1 4 0 CompilationAction 1473857933357 StringCalculator.java EditAction 1473857944824 StringCalculator.java 895 1 5 0 +EditAction 1473857957398 StringCalculatorTest.java 2542 9 27 9 diff --git a/bin/StringCalculator.class b/bin/StringCalculator.class index dbb52cc198f57057ebe78f87ba0f43bc3847d218..71b788999b9be4ed8f8dfd87adb99ad7c1c1c299 100644 GIT binary patch literal 1064 zcmZ`&&r{P-5dI!Xn^0RzQwkKTL`7)RLbW0a1uu-wFjMORWd^A~9%+UK)1;H6$ibuk zghwxW;o=1xox!_*i+_W-uVrLJyu7#j_RH>m-)?^V`g#Ol4oeCK7>3qD-*&fGxMOx5 z9(uk4nO=AJE-yRW-7Y`g+Of=#A-ZI{c6gsb$`{rdd@|n@xsHzIIx@kE#|{8DbCiOsf;xo*O98 z7_w(G{E4d=W`K$jhRBOXvp5;U7{(Q3|034^JdR7qF(_>wnk|buJGcC^7_LB9Fu{;I zZEn>Kt!>MX<0_I2YKQxQMQMg!&>896i^FZfrQ+KU5 z4v7|!u@~y0r(4`?>0a2f{Mi^%m=@CJ|I^aC3WN9vew&RZReN3(R8^E{R;41AH5it&-e(r^1 zbc(QmUZ6AH2hg1$Zx9!eq{tB2GDT7%4I8B7BAsby>5qs=`-YY|!03CZ#ur>B?^@4G zd_!tOn>@tScS9@mo+^e`Jits%S}txZMvvwr(!Bf$>1;G3SL(SL`uf%KJDFwVOytAy z&)mMWPh}*CCKss{v87RJN~PvfM8+j8KgF I64F(F1EKBY{3ENKAcpEJ|| diff --git a/tests/StringCalculatorTest.java b/tests/StringCalculatorTest.java index 7df8c5a..b8574fb 100644 --- a/tests/StringCalculatorTest.java +++ b/tests/StringCalculatorTest.java @@ -3,7 +3,6 @@ import org.junit.Test; public class StringCalculatorTest { - @Test public void testStringCalculator_EmptyString() throws StringCalculatorException { // Arrange From 4c4db4d62d88671e80829b73c96cad6cf563d9af Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 14 Sep 2016 16:00:48 +0300 Subject: [PATCH 28/45] besouro automatic message --- .besouro/2016091415302846/actions.txt | 6 ++++++ .besouro/2016091415302846/besouroEpisodes.txt | 4 ++++ .../randomHeuristicEpisodes.txt | 1 + .besouro/2016091415302846/zorroEpisodes.txt | 1 + bin/StringCalculatorTest.class | Bin 2476 -> 2476 bytes tests/StringCalculatorTest.java | 14 +++++++++++++- 6 files changed, 25 insertions(+), 1 deletion(-) diff --git a/.besouro/2016091415302846/actions.txt b/.besouro/2016091415302846/actions.txt index be8f031..5bfd777 100644 --- a/.besouro/2016091415302846/actions.txt +++ b/.besouro/2016091415302846/actions.txt @@ -80,3 +80,9 @@ EditAction 1473857931407 StringCalculator.java 878 1 4 0 CompilationAction 1473857933357 StringCalculator.java EditAction 1473857944824 StringCalculator.java 895 1 5 0 EditAction 1473857957398 StringCalculatorTest.java 2542 9 27 9 +UnitTestCaseAction 1473857960567 StringCalculatorTest.java OK +UnitTestSessionAction 1473857960567 StringCalculatorTest.java OK +RefactoringAction 1473857987712 StringCalculatorTest.java ADD void testStringCalculator_ManyNumbers_ManyCommas()/2 METHOD +RefactoringAction 1473857996994 StringCalculatorTest.java RENAME testStringCalculator_ManyNumbers_ManyCommas()/2=>void testStringCalculator_ManyNumbers_NewlineAndCommas() METHOD +RefactoringAction 1473857998554 StringCalculatorTest.java RENAME testStringCalculator_ManyNumbers_NewlineAndCommas()=>void testStringCalculator_ManyNumbers_NewlineAndComma() METHOD +EditAction 1473858047179 StringCalculatorTest.java 2851 10 30 10 diff --git a/.besouro/2016091415302846/besouroEpisodes.txt b/.besouro/2016091415302846/besouroEpisodes.txt index e8c571e..56b4ea5 100644 --- a/.besouro/2016091415302846/besouroEpisodes.txt +++ b/.besouro/2016091415302846/besouroEpisodes.txt @@ -17,3 +17,7 @@ 1473857365714 test-addition 1 30 true 1473857365715 test-addition 1 30 true 1473857440504 refactoring 2A 3 true +1473857960567 production 1 508 false +1473857960568 refactoring 2A 508 true +1473857960569 production 2 508 false +1473857960570 refactoring 2A 508 true diff --git a/.besouro/2016091415302846/randomHeuristicEpisodes.txt b/.besouro/2016091415302846/randomHeuristicEpisodes.txt index ed66f0e..c738010 100644 --- a/.besouro/2016091415302846/randomHeuristicEpisodes.txt +++ b/.besouro/2016091415302846/randomHeuristicEpisodes.txt @@ -8,3 +8,4 @@ 1473857321423 test-addition 1 34 true 1473857365714 test-addition 1 30 true 1473857440504 refactoring 2A 3 false +1473857960567 production 1 508 false diff --git a/.besouro/2016091415302846/zorroEpisodes.txt b/.besouro/2016091415302846/zorroEpisodes.txt index 5e82021..362dbe6 100644 --- a/.besouro/2016091415302846/zorroEpisodes.txt +++ b/.besouro/2016091415302846/zorroEpisodes.txt @@ -8,3 +8,4 @@ 1473857321423 test-addition 1 39 false 1473857365714 test-addition 1 44 false 1473857440504 refactoring 2A 74 false +1473857960567 production 1 520 false diff --git a/bin/StringCalculatorTest.class b/bin/StringCalculatorTest.class index 4c410baca23190427fb04ddbde0b3532d2f772a4..2bd92ac1c1437d94e051540e9fd20c40b11c330f 100644 GIT binary patch delta 197 zcmW;A!3F|R6oBDFre^49G$KkWL$!#ZHW9UnxNRb86Hz3h7PIUv?gJ!kXVD|}JKypv zk|OzC1C694RSBggvBW+Pa&0h8rX_W0`&TsbowCy&o3aCTX!~ZzY{pL5scpC7bjHrv s1-rEUuq$@WI(B2*51nq=9lK`_wqN$hp4c;cu}veVH}=jx*e9F)0sPk>;s5{u delta 197 zcmW;A!3F|R6oBDFre@+$4H1=$qS>UVO+;-Xw>A;Ai6{|K%(Az*50JE-MUU9;_;z0& z=kf0vXjuxP5=sSCp9PuLnFiC8nzZ~YN`1TNG+}#epG|Gw?0_AyV|HTODLI|8Gj`4{ qY(MOhU9oF+W1ECdx9pDHvj^KRdt^`SnZ4L{Bd0g^&OX>DJNyF*!XX9# diff --git a/tests/StringCalculatorTest.java b/tests/StringCalculatorTest.java index b8574fb..f37cdaa 100644 --- a/tests/StringCalculatorTest.java +++ b/tests/StringCalculatorTest.java @@ -108,6 +108,18 @@ public void testStringCalculator_ManyNumbers_ManyCommas() throws StringCalculato int sum = StringCalculator.add(numbers); // Assert - assertEquals("Two numbers, many commas (\"1,,2,6,,0\")", 9, sum); + assertEquals("Many numbers, many commas (\"1,,2,6,,0\")", 9, sum); + } + + @Test + public void testStringCalculator_ManyNumbers_NewlineAndComma() throws StringCalculatorException { + // Arrange + String numbers = "1,2\n6"; + + // Act + int sum = StringCalculator.add(numbers); + + // Assert + assertEquals("Many numbers, newline and comma (\"1,2\\n,6\")", 9, sum); } } From 8f9d94d96f4d8f61259a5d687ac76c330aba7a01 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 14 Sep 2016 16:01:41 +0300 Subject: [PATCH 29/45] besouro automatic message --- .besouro/2016091415302846/actions.txt | 5 +++++ .besouro/2016091415302846/besouroEpisodes.txt | 2 ++ .../randomHeuristicEpisodes.txt | 1 + .besouro/2016091415302846/zorroEpisodes.txt | 1 + bin/StringCalculatorTest.class | Bin 2476 -> 2717 bytes tests/StringCalculatorTest.java | 12 ++++++++++++ 6 files changed, 21 insertions(+) diff --git a/.besouro/2016091415302846/actions.txt b/.besouro/2016091415302846/actions.txt index 5bfd777..862baf9 100644 --- a/.besouro/2016091415302846/actions.txt +++ b/.besouro/2016091415302846/actions.txt @@ -86,3 +86,8 @@ RefactoringAction 1473857987712 StringCalculatorTest.java ADD void testStringCal RefactoringAction 1473857996994 StringCalculatorTest.java RENAME testStringCalculator_ManyNumbers_ManyCommas()/2=>void testStringCalculator_ManyNumbers_NewlineAndCommas() METHOD RefactoringAction 1473857998554 StringCalculatorTest.java RENAME testStringCalculator_ManyNumbers_NewlineAndCommas()=>void testStringCalculator_ManyNumbers_NewlineAndComma() METHOD EditAction 1473858047179 StringCalculatorTest.java 2851 10 30 10 +UnitTestCaseAction 1473858051066 StringCalculatorTest.java OK +UnitTestSessionAction 1473858051066 StringCalculatorTest.java OK +RefactoringAction 1473858059802 StringCalculatorTest.java ADD void testStringCalculator_ManyNumbers_NewlineAndComma()/2 METHOD +RefactoringAction 1473858064966 StringCalculatorTest.java RENAME testStringCalculator_ManyNumbers_NewlineAndComma()/2=>void testStringCalculator_ManyNumbers_NewlinesOnly() METHOD +EditAction 1473858101049 StringCalculatorTest.java 3169 11 33 11 diff --git a/.besouro/2016091415302846/besouroEpisodes.txt b/.besouro/2016091415302846/besouroEpisodes.txt index 56b4ea5..ad8a9df 100644 --- a/.besouro/2016091415302846/besouroEpisodes.txt +++ b/.besouro/2016091415302846/besouroEpisodes.txt @@ -21,3 +21,5 @@ 1473857960568 refactoring 2A 508 true 1473857960569 production 2 508 false 1473857960570 refactoring 2A 508 true +1473858051066 test-addition 1 63 true +1473858051067 test-addition 1 63 true diff --git a/.besouro/2016091415302846/randomHeuristicEpisodes.txt b/.besouro/2016091415302846/randomHeuristicEpisodes.txt index c738010..6d54a74 100644 --- a/.besouro/2016091415302846/randomHeuristicEpisodes.txt +++ b/.besouro/2016091415302846/randomHeuristicEpisodes.txt @@ -9,3 +9,4 @@ 1473857365714 test-addition 1 30 true 1473857440504 refactoring 2A 3 false 1473857960567 production 1 508 false +1473858051066 test-addition 1 63 true diff --git a/.besouro/2016091415302846/zorroEpisodes.txt b/.besouro/2016091415302846/zorroEpisodes.txt index 362dbe6..4a9ffc5 100644 --- a/.besouro/2016091415302846/zorroEpisodes.txt +++ b/.besouro/2016091415302846/zorroEpisodes.txt @@ -9,3 +9,4 @@ 1473857365714 test-addition 1 44 false 1473857440504 refactoring 2A 74 false 1473857960567 production 1 520 false +1473858051066 test-addition 1 90 false diff --git a/bin/StringCalculatorTest.class b/bin/StringCalculatorTest.class index 2bd92ac1c1437d94e051540e9fd20c40b11c330f..37c2c88d94ab40eb27637887f0ddfd74c0c9954d 100644 GIT binary patch delta 193 zcmZ1@JXe(K)W2Q(7#J8#7}7U#<+HG=`zGd9PUdHkm^_t5jL~57MP|{-{wzG+eyQa- znR%&>c`45Mxw(lP3`vX(tcE&9TxJ{$DU1x-AZ-eHrMXF|Ma4P_c@WhKiFqjs$sqL# z8cIOLF?l*>N}7{bvY0S(Z@$NJl4Y_IyM|t(kM<4*Fdo;;03Y_c?~5hK@TKh~2htPBiH42b|r CbPLk} diff --git a/tests/StringCalculatorTest.java b/tests/StringCalculatorTest.java index f37cdaa..6419dd4 100644 --- a/tests/StringCalculatorTest.java +++ b/tests/StringCalculatorTest.java @@ -122,4 +122,16 @@ public void testStringCalculator_ManyNumbers_NewlineAndComma() throws StringCalc // Assert assertEquals("Many numbers, newline and comma (\"1,2\\n,6\")", 9, sum); } + + @Test + public void testStringCalculator_ManyNumbers_NewlinesOnly() throws StringCalculatorException { + // Arrange + String numbers = "1\n0\n\n8\n10"; + + // Act + int sum = StringCalculator.add(numbers); + + // Assert + assertEquals("Many numbers, newlines only (\"1\\n0\\n\\n8\\n10\")", 19, sum); + } } From 416b8f4d5b39008c70210421039a601893918037 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 14 Sep 2016 16:02:22 +0300 Subject: [PATCH 30/45] besouro automatic message --- .besouro/2016091415302846/actions.txt | 7 +++++++ .besouro/2016091415302846/besouroEpisodes.txt | 2 ++ .../randomHeuristicEpisodes.txt | 1 + .besouro/2016091415302846/zorroEpisodes.txt | 1 + bin/StringCalculatorTest.class | Bin 2717 -> 2969 bytes tests/StringCalculatorTest.java | 9 +++++++++ 6 files changed, 20 insertions(+) diff --git a/.besouro/2016091415302846/actions.txt b/.besouro/2016091415302846/actions.txt index 862baf9..57b4250 100644 --- a/.besouro/2016091415302846/actions.txt +++ b/.besouro/2016091415302846/actions.txt @@ -91,3 +91,10 @@ UnitTestSessionAction 1473858051066 StringCalculatorTest.java OK RefactoringAction 1473858059802 StringCalculatorTest.java ADD void testStringCalculator_ManyNumbers_NewlineAndComma()/2 METHOD RefactoringAction 1473858064966 StringCalculatorTest.java RENAME testStringCalculator_ManyNumbers_NewlineAndComma()/2=>void testStringCalculator_ManyNumbers_NewlinesOnly() METHOD EditAction 1473858101049 StringCalculatorTest.java 3169 11 33 11 +UnitTestCaseAction 1473858104219 StringCalculatorTest.java OK +UnitTestSessionAction 1473858104219 StringCalculatorTest.java OK +RefactoringAction 1473858111816 StringCalculatorTest.java ADD void testStringCalculator_ManyNumbers_NewlinesOnly()/2 METHOD +RefactoringAction 1473858115950 StringCalculatorTest.java RENAME testStringCalculator_ManyNumbers_NewlinesOnly()/2=>void testStringCalculator_NewlinesOnly() METHOD +RefactoringAction 1473858119553 StringCalculatorTest.java RENAME testStringCalculator_NewlinesOnly()=>void testStringCalculator_NewlineAndCom() METHOD +RefactoringAction 1473858123672 StringCalculatorTest.java RENAME testStringCalculator_NewlineAndCom()=>void testStringCalculator_NewlineAndCommaNextToEachOther() METHOD +EditAction 1473858141503 StringCalculatorTest.java 3414 12 35 11 diff --git a/.besouro/2016091415302846/besouroEpisodes.txt b/.besouro/2016091415302846/besouroEpisodes.txt index ad8a9df..78d983f 100644 --- a/.besouro/2016091415302846/besouroEpisodes.txt +++ b/.besouro/2016091415302846/besouroEpisodes.txt @@ -23,3 +23,5 @@ 1473857960570 refactoring 2A 508 true 1473858051066 test-addition 1 63 true 1473858051067 test-addition 1 63 true +1473858104219 test-addition 1 44 true +1473858104220 test-addition 1 44 true diff --git a/.besouro/2016091415302846/randomHeuristicEpisodes.txt b/.besouro/2016091415302846/randomHeuristicEpisodes.txt index 6d54a74..26e8ac6 100644 --- a/.besouro/2016091415302846/randomHeuristicEpisodes.txt +++ b/.besouro/2016091415302846/randomHeuristicEpisodes.txt @@ -10,3 +10,4 @@ 1473857440504 refactoring 2A 3 false 1473857960567 production 1 508 false 1473858051066 test-addition 1 63 true +1473858104219 test-addition 1 44 true diff --git a/.besouro/2016091415302846/zorroEpisodes.txt b/.besouro/2016091415302846/zorroEpisodes.txt index 4a9ffc5..83b0439 100644 --- a/.besouro/2016091415302846/zorroEpisodes.txt +++ b/.besouro/2016091415302846/zorroEpisodes.txt @@ -10,3 +10,4 @@ 1473857440504 refactoring 2A 74 false 1473857960567 production 1 520 false 1473858051066 test-addition 1 90 false +1473858104219 test-addition 1 53 false diff --git a/bin/StringCalculatorTest.class b/bin/StringCalculatorTest.class index 37c2c88d94ab40eb27637887f0ddfd74c0c9954d..d5c71a9aea501ebea1cb4b96df4dc5ef2edaed66 100644 GIT binary patch delta 188 zcmbO$I#ZnM)W2Q(7#J8#81go939>TkPQJ)2I@zCvXYx4~_JCslyqro7hIB>-PD3sO zE-ni$Ljw+mOhyJ>-^9F1g}l<-q|~Bf9fiEq@|?`P)MABvpn3%jCBv9JgP6RSJd2n- zLjxsER-gqSAUs);)r65}vmdJ$>*Pu78hU9y+B+D;Y=tsJ7_wwqcQD9p1gc_U-~y6D d3@kvhk%5_^g@J>i9mwyPoXe%joq3jh`%D>DE9 delta 36 scmbO!K3A0M)W2Q(7#J8#7}7U#39?R}#%jdKz4;`o7b`0R0~13U0NKO|!T Date: Wed, 14 Sep 2016 16:03:18 +0300 Subject: [PATCH 31/45] besouro automatic message --- .besouro/2016091415302846/actions.txt | 8 ++++++++ bin/StringCalculatorTest.class | Bin 2969 -> 3194 bytes src/StringCalculatorException.java | 2 +- tests/StringCalculatorTest.java | 2 +- 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/.besouro/2016091415302846/actions.txt b/.besouro/2016091415302846/actions.txt index 57b4250..468076f 100644 --- a/.besouro/2016091415302846/actions.txt +++ b/.besouro/2016091415302846/actions.txt @@ -98,3 +98,11 @@ RefactoringAction 1473858115950 StringCalculatorTest.java RENAME testStringCalcu RefactoringAction 1473858119553 StringCalculatorTest.java RENAME testStringCalculator_NewlinesOnly()=>void testStringCalculator_NewlineAndCom() METHOD RefactoringAction 1473858123672 StringCalculatorTest.java RENAME testStringCalculator_NewlineAndCom()=>void testStringCalculator_NewlineAndCommaNextToEachOther() METHOD EditAction 1473858141503 StringCalculatorTest.java 3414 12 35 11 +UnitTestCaseAction 1473858145577 StringCalculatorTest.java FAIL +UnitTestSessionAction 1473858145577 StringCalculatorTest.java FAIL +CompilationAction 1473858161162 StringCalculatorTest.java +CompilationAction 1473858167292 StringCalculatorTest.java +UnitTestCaseAction 1473858170961 StringCalculatorTest.java FAIL +UnitTestSessionAction 1473858170961 StringCalculatorTest.java FAIL +FileOpenedAction 1473858182365 StringCalculatorException.java 139 1 1 0 +EditAction 1473858198090 StringCalculatorException.java 126 1 0 0 diff --git a/bin/StringCalculatorTest.class b/bin/StringCalculatorTest.class index d5c71a9aea501ebea1cb4b96df4dc5ef2edaed66..1546908948c60122e9b4646a9a164d29899c6efb 100644 GIT binary patch delta 230 zcmbO!{!4=E)W2Q(7#J8#7>YM?^{_G;Prk@38t9i=o|BoE>X?_}oS&PU=$Bei5|Zzl zn4IBXl95`($iR_WQIMKklA6NEAng-eQk0pO?wpvDT$+ z$iQOArDHUC3abet@8*-Nr&%XY;u6Z{W?*Cx2IAaghCBv#p#AoJ1> delta 36 scmew*F;krD)W2Q(7#J8#81go9^{`I<&uYZTv)PF4G%G6u0~13o0QJrb00000 diff --git a/src/StringCalculatorException.java b/src/StringCalculatorException.java index 6670608..ffb54ed 100644 --- a/src/StringCalculatorException.java +++ b/src/StringCalculatorException.java @@ -2,7 +2,7 @@ public class StringCalculatorException extends Exception { StringCalculatorException(String message) { - super(message); + // } } diff --git a/tests/StringCalculatorTest.java b/tests/StringCalculatorTest.java index 5cd46cd..bd99d86 100644 --- a/tests/StringCalculatorTest.java +++ b/tests/StringCalculatorTest.java @@ -135,7 +135,7 @@ public void testStringCalculator_ManyNumbers_NewlinesOnly() throws StringCalcula assertEquals("Many numbers, newlines only (\"1\\n0\\n\\n8\\n10\")", 19, sum); } - @Test + @Test (expected = StringCalculatorException.class) public void testStringCalculator_NewlineAndCommaNextToEachOther() throws StringCalculatorException { // Arrange String numbers = "1\n,2"; From c7e6e346f791948e41af4ab665fc093651e735d2 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 14 Sep 2016 16:03:25 +0300 Subject: [PATCH 32/45] besouro automatic message --- .besouro/2016091415302846/actions.txt | 1 + bin/StringCalculatorException.class | Bin 367 -> 372 bytes src/StringCalculatorException.java | 2 +- 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.besouro/2016091415302846/actions.txt b/.besouro/2016091415302846/actions.txt index 468076f..3413b84 100644 --- a/.besouro/2016091415302846/actions.txt +++ b/.besouro/2016091415302846/actions.txt @@ -106,3 +106,4 @@ UnitTestCaseAction 1473858170961 StringCalculatorTest.java FAIL UnitTestSessionAction 1473858170961 StringCalculatorTest.java FAIL FileOpenedAction 1473858182365 StringCalculatorException.java 139 1 1 0 EditAction 1473858198090 StringCalculatorException.java 126 1 0 0 +EditAction 1473858204548 StringCalculatorException.java 124 1 0 0 diff --git a/bin/StringCalculatorException.class b/bin/StringCalculatorException.class index 53792e400647c6f137e2c907435cedfa79b54659..c682ec6d24ad0d87573ed525c3bbf72f3bbb05ee 100644 GIT binary patch delta 102 zcmaFQ^o5D*)W2Q(7#J8#7=$NsWwLWIGB9gshD|Kl Date: Wed, 14 Sep 2016 16:03:44 +0300 Subject: [PATCH 33/45] besouro automatic message --- .besouro/2016091415302846/actions.txt | 3 +++ src/StringCalculator.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.besouro/2016091415302846/actions.txt b/.besouro/2016091415302846/actions.txt index 3413b84..9760175 100644 --- a/.besouro/2016091415302846/actions.txt +++ b/.besouro/2016091415302846/actions.txt @@ -107,3 +107,6 @@ UnitTestSessionAction 1473858170961 StringCalculatorTest.java FAIL FileOpenedAction 1473858182365 StringCalculatorException.java 139 1 1 0 EditAction 1473858198090 StringCalculatorException.java 126 1 0 0 EditAction 1473858204548 StringCalculatorException.java 124 1 0 0 +UnitTestCaseAction 1473858208654 StringCalculatorTest.java FAIL +UnitTestSessionAction 1473858208654 StringCalculatorTest.java FAIL +EditAction 1473858223552 StringCalculator.java 843 1 5 0 diff --git a/src/StringCalculator.java b/src/StringCalculator.java index 2307c12..1f47e45 100644 --- a/src/StringCalculator.java +++ b/src/StringCalculator.java @@ -17,7 +17,7 @@ public static int add(String numbersStr) throws StringCalculatorException { // Returns the sum of an unknown amount of numbers, // separated by commas or newlines if (numbersStr.matches(",\\n|\\n,")) { - throw new StringCalculatorException("Can't have commas and newlines next to each other."); + throw new StringCalculatorException(); } if (numbersStr.matches("^\\d+[\\d,\\n]+\\d+$")) { String numbers[] = numbersStr.split(",+|\\n+"); From c30d88a1689fe449fec9cea48354863a34f806a8 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 14 Sep 2016 16:03:52 +0300 Subject: [PATCH 34/45] besouro automatic message --- .besouro/2016091415302846/actions.txt | 3 +++ bin/StringCalculator.class | Bin 1064 -> 565 bytes src/StringCalculatorException.java | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.besouro/2016091415302846/actions.txt b/.besouro/2016091415302846/actions.txt index 9760175..2f8f05e 100644 --- a/.besouro/2016091415302846/actions.txt +++ b/.besouro/2016091415302846/actions.txt @@ -110,3 +110,6 @@ EditAction 1473858204548 StringCalculatorException.java 124 1 0 0 UnitTestCaseAction 1473858208654 StringCalculatorTest.java FAIL UnitTestSessionAction 1473858208654 StringCalculatorTest.java FAIL EditAction 1473858223552 StringCalculator.java 843 1 5 0 +CompilationAction 1473858225424 StringCalculator.java +RefactoringAction 1473858231259 StringCalculatorException.java RENAME StringCalculatorException(String)=>StringCalculatorException() METHOD +EditAction 1473858231945 StringCalculatorException.java 110 1 0 0 diff --git a/bin/StringCalculator.class b/bin/StringCalculator.class index 71b788999b9be4ed8f8dfd87adb99ad7c1c1c299..36a6b21a7a13caa77030504bc4e5786fd9746284 100644 GIT binary patch delta 211 zcmZ3%v6Y4E)W2Q(7#J8#7-S}L-K=M45MgBC&q^#y)Xz!GOV@WTD#|b7U=U+uhz`vw zN-fUMDN9XJNY2kK$jnJB$;{7FC@9KL%1O<&QsCkY$w&oCrxt)TX=o~B7AutIrKF~1=B1`^aWM!pNboSQGB8R`-pD91xu2=U tj6sWmnSl}LGOpbW!jVFv+Zn|719?mgTtJcyEF;3e4HjVl@}$5lX#hNyHbwvd literal 1064 zcmZ`&&r{P-5dI!Xn^0RzQwkKTL`7)RLbW0a1uu-wFjMORWd^A~9%+UK)1;H6$ibuk zghwxW;o=1xox!_*i+_W-uVrLJyu7#j_RH>m-)?^V`g#Ol4oeCK7>3qD-*&fGxMOx5 z9(uk4nO=AJE-yRW-7Y`g+Of=#A-ZI{c6gsb$`{rdd@|n@xsHzIIx@kE#|{8DbCiOsf;xo*O98 z7_w(G{E4d=W`K$jhRBOXvp5;U7{(Q3|034^JdR7qF(_>wnk|buJGcC^7_LB9Fu{;I zZEn>Kt!>MX<0_I2YKQxQMQMg!&>896i^FZfrQ+KU5 z4v7|!u@~y0r(4`?>0a2f{Mi^%m=@CJ|I^aC3WN9vew&RZReN3(R8^E{R;41AH5it&-e(r^1 zbc(QmUZ6AH2hg1$Zx9!eq{tB2GDT7%4I8B7BAsby>5qs=`-YY|!03CZ#ur>B?^@4G zd_!tOn>@tScS9@mo+^e`Jits%S}txZMvvwr(!Bf$>1;G3SL(SL`uf%KJDFwVOytAy z&)mMWPh}*CCKss{v87RJN~PvfM8+j8KgF I64F(F1EKBY Date: Wed, 14 Sep 2016 16:03:58 +0300 Subject: [PATCH 35/45] besouro automatic message --- .besouro/2016091415302846/actions.txt | 1 + bin/StringCalculator.class | Bin 565 -> 977 bytes bin/StringCalculatorException.class | Bin 372 -> 307 bytes src/StringCalculatorException.java | 3 --- 4 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.besouro/2016091415302846/actions.txt b/.besouro/2016091415302846/actions.txt index 2f8f05e..1fe02c1 100644 --- a/.besouro/2016091415302846/actions.txt +++ b/.besouro/2016091415302846/actions.txt @@ -113,3 +113,4 @@ EditAction 1473858223552 StringCalculator.java 843 1 5 0 CompilationAction 1473858225424 StringCalculator.java RefactoringAction 1473858231259 StringCalculatorException.java RENAME StringCalculatorException(String)=>StringCalculatorException() METHOD EditAction 1473858231945 StringCalculatorException.java 110 1 0 0 +EditAction 1473858237779 StringCalculatorException.java 70 0 0 0 diff --git a/bin/StringCalculator.class b/bin/StringCalculator.class index 36a6b21a7a13caa77030504bc4e5786fd9746284..8ab3ede2b9ddd39902096ff8844b5bfd0e242456 100644 GIT binary patch delta 627 zcmZva&r?!S6vsc;_uxLCpaLRdl>H#V_b`kSO2!33gq^GUud05|Cc>!2y!09N-K_3PVapv#u*fQcIagrr zP>vJAB_{$qt;Swgk;#@%d-eWnTV2@vmpscUY=6JGU2At_07djXgg!+mV&~pqboQGH zwJwVOA{F6E*V}o1&ucx<-gcv=S$h3a9rToD1TCxeoM`Ml0i*9k<3}XkU^$<;DACoE zXzVMIjZdV%InnDUiGmZ&9I;R~*4&Mi;Bhfv6wMFBlEJuHxSv`S?vu3xQ^n1A;N9R? zs&DkAiGeM4g>kVKK}LJx!m`wHrin4f6d5@!k)R|yyi1ZYvsA=yk>ar+#)Rr%iuG9J zhWHX$^1@MqpXVk8nW!u?-IA&yUk1_yt?=YPUR`TuG|RFZ8GISy69Z8o=NW-1ieg77 F{Q;$Xen0>K delta 212 zcmcb}zLkaR)W2Q(7#J8#7-S}L-K=M45MgBC&q^#y)Xz!GOV@WTD#|b7U=U+uhz`vw zN-fUMDN9XJNY2kK$jnJB$;{7FC@9KL%1O<&QsCkY$w&oCrxt)TX=o~B7AutIrKF~1=B1`^aWM!pNboSQGB8R`oG;E8Hra}) u#f(9Vfti63=rpd~48oB@qT3n7_XBxM3|v5x4J;$Vzzr5*0P>{3ENK9WaW+~2 diff --git a/bin/StringCalculatorException.class b/bin/StringCalculatorException.class index c682ec6d24ad0d87573ed525c3bbf72f3bbb05ee..09bb5804391cd984c074c15cde8437833cc44b93 100644 GIT binary patch delta 109 zcmeyuw3&(P)W2Q(7#J8#7z8GAIg2uDXofK|usG+Zq;fGZGjQ@Surjbstn!=q+||yQ xfe{E97+AHoGjMDKGME^+fFu`?W?*0eLN*3&Ad3g02uSk+d5jEvK$3}p9{_*74k!Qs delta 172 zcmdnY^o5D*)W2Q(7#J8#7=$NsIqQmQ_+%xPCF Date: Wed, 14 Sep 2016 16:04:03 +0300 Subject: [PATCH 36/45] besouro automatic message --- .besouro/2016091415302846/actions.txt | 1 + bin/StringCalculatorException.class | Bin 307 -> 303 bytes src/StringCalculatorException.java | 1 - 3 files changed, 1 insertion(+), 1 deletion(-) diff --git a/.besouro/2016091415302846/actions.txt b/.besouro/2016091415302846/actions.txt index 1fe02c1..e780b4f 100644 --- a/.besouro/2016091415302846/actions.txt +++ b/.besouro/2016091415302846/actions.txt @@ -114,3 +114,4 @@ CompilationAction 1473858225424 StringCalculator.java RefactoringAction 1473858231259 StringCalculatorException.java RENAME StringCalculatorException(String)=>StringCalculatorException() METHOD EditAction 1473858231945 StringCalculatorException.java 110 1 0 0 EditAction 1473858237779 StringCalculatorException.java 70 0 0 0 +EditAction 1473858242303 StringCalculatorException.java 68 0 0 0 diff --git a/bin/StringCalculatorException.class b/bin/StringCalculatorException.class index 09bb5804391cd984c074c15cde8437833cc44b93..4bd989452e88efe466640937d540edeb3220a693 100644 GIT binary patch delta 77 zcmdnYw4Q0gOE*RaRt7c(Mh12U1_pf~%?PAfwYD>GYy>ix7`T8WNE*cE29i7w1wfh? M$YW&S1IzFO08BgubpQYW delta 81 zcmXAf%L#xm6a*&^6D9uo@R}~H&Q3%;Sd(2iAPYOQuxH$HygOtHi5_S&$-F%bml9OF SO6W{s)TaL=XIEmegY^Ssw*`#= diff --git a/src/StringCalculatorException.java b/src/StringCalculatorException.java index d8322ca..0b48ac6 100644 --- a/src/StringCalculatorException.java +++ b/src/StringCalculatorException.java @@ -1,5 +1,4 @@ public class StringCalculatorException extends Exception { - } From d37bc921c2eae696d40b22f994795a68fd75e62b Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 14 Sep 2016 16:08:01 +0300 Subject: [PATCH 37/45] besouro automatic message --- .besouro/2016091415302846/actions.txt | 7 +++++++ bin/StringCalculator.class | Bin 977 -> 977 bytes src/StringCalculator.java | 3 +++ 3 files changed, 10 insertions(+) diff --git a/.besouro/2016091415302846/actions.txt b/.besouro/2016091415302846/actions.txt index e780b4f..3685e91 100644 --- a/.besouro/2016091415302846/actions.txt +++ b/.besouro/2016091415302846/actions.txt @@ -115,3 +115,10 @@ RefactoringAction 1473858231259 StringCalculatorException.java RENAME StringCalc EditAction 1473858231945 StringCalculatorException.java 110 1 0 0 EditAction 1473858237779 StringCalculatorException.java 70 0 0 0 EditAction 1473858242303 StringCalculatorException.java 68 0 0 0 +UnitTestCaseAction 1473858248000 StringCalculatorTest.java FAIL +UnitTestSessionAction 1473858248000 StringCalculatorTest.java FAIL +UnitTestCaseAction 1473858457217 StringCalculatorTest.java FAIL +UnitTestSessionAction 1473858457233 StringCalculatorTest.java FAIL +UnitTestCaseAction 1473858460372 StringCalculatorTest.java FAIL +UnitTestSessionAction 1473858460372 StringCalculatorTest.java FAIL +EditAction 1473858480372 StringCalculator.java 869 1 5 0 diff --git a/bin/StringCalculator.class b/bin/StringCalculator.class index 8ab3ede2b9ddd39902096ff8844b5bfd0e242456..47e1765b603c777a097c47c1893d3486e77f258c 100644 GIT binary patch delta 33 ncmcb}evy4c1hc3lgC&C$gAao=LokqzWsqZtXHcA+%bWrLd9DU? delta 33 ncmcb}evy4c1hc3FgC&C`gAaogLokqzWsqTrXON$q%bWrLc}50n diff --git a/src/StringCalculator.java b/src/StringCalculator.java index 1f47e45..fd181dc 100644 --- a/src/StringCalculator.java +++ b/src/StringCalculator.java @@ -17,14 +17,17 @@ public static int add(String numbersStr) throws StringCalculatorException { // Returns the sum of an unknown amount of numbers, // separated by commas or newlines if (numbersStr.matches(",\\n|\\n,")) { + return 100; throw new StringCalculatorException(); } if (numbersStr.matches("^\\d+[\\d,\\n]+\\d+$")) { String numbers[] = numbersStr.split(",+|\\n+"); + int sum = 0; for (String number : numbers) { sum += Integer.parseInt(number); } + return sum; } From c5309853f8a4c20da9ab16525af57001c3391b04 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 14 Sep 2016 16:10:08 +0300 Subject: [PATCH 38/45] besouro automatic message --- .besouro/2016091415302846/actions.txt | 6 ++++++ bin/StringCalculator.class | Bin 977 -> 967 bytes src/StringCalculator.java | 6 ++++-- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/.besouro/2016091415302846/actions.txt b/.besouro/2016091415302846/actions.txt index 3685e91..403772d 100644 --- a/.besouro/2016091415302846/actions.txt +++ b/.besouro/2016091415302846/actions.txt @@ -122,3 +122,9 @@ UnitTestSessionAction 1473858457233 StringCalculatorTest.java FAIL UnitTestCaseAction 1473858460372 StringCalculatorTest.java FAIL UnitTestSessionAction 1473858460372 StringCalculatorTest.java FAIL EditAction 1473858480372 StringCalculator.java 869 1 5 0 +CompilationAction 1473858482353 StringCalculator.java +CompilationAction 1473858492306 StringCalculator.java +UnitTestCaseAction 1473858495153 StringCalculatorTest.java FAIL +UnitTestSessionAction 1473858495153 StringCalculatorTest.java FAIL +RefactoringAction 1473858588149 StringCalculator.java ADD import java.util.regex.Pattern IMPORT +EditAction 1473858607334 StringCalculator.java 974 1 6 0 diff --git a/bin/StringCalculator.class b/bin/StringCalculator.class index 47e1765b603c777a097c47c1893d3486e77f258c..3604a1490bf2d3d90d7b9777483552d748b210e5 100644 GIT binary patch delta 245 zcmWlSF-`(e6h+VblKJC+kwC#j4JKqnoIi?=pa~nGGnNLwR%6QwOsrhNRCFwWhK9m| zR%6G8z-M)D^3FSVW4~?myZu@N1MZj6n`9wpLjBbj?%5ZapT0P)NyxbnWbWNhT|~@9 zjTBeTWhVV{WIp!|2CEuh{+M<%s27X0k*sLV$kRr5MX%hN$BzyzoWAEA>EJPAPI%CK z;*<#;s%l87{Cmi_)XeE|MITYV%QZK;GuEYCuY24okr0Fj)g5iDCAJI%5e+!p5u!C# KN*JPI!`&Zo<|JDH delta 280 zcmW-cK`#SQ6otPxrSF*%?Fb!&gp9V{8?>c{l|Rsh#7azwq}}!xNV@7Tm{ntMWn)u9 z!ct=AzgVlQt8?zX=bn4+r~cOd*YE2)aKy=z-%|~r5_5)%qIjKl-BsF+(|*SZjSMwK zK6ZC$-}!{tc^q+euSTk#wY=e(#zTwOtqqnQn9V)fV0lb=gt0GdNVPq!3U8DypNT$f zurqBmZBQMvoBep_gDNZ3DU-0uDQmP@=R&Z Date: Wed, 14 Sep 2016 16:10:17 +0300 Subject: [PATCH 39/45] besouro automatic message --- .besouro/2016091415302846/actions.txt | 2 ++ bin/StringCalculator.class | Bin 967 -> 545 bytes src/StringCalculator.java | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.besouro/2016091415302846/actions.txt b/.besouro/2016091415302846/actions.txt index 403772d..aa175bf 100644 --- a/.besouro/2016091415302846/actions.txt +++ b/.besouro/2016091415302846/actions.txt @@ -128,3 +128,5 @@ UnitTestCaseAction 1473858495153 StringCalculatorTest.java FAIL UnitTestSessionAction 1473858495153 StringCalculatorTest.java FAIL RefactoringAction 1473858588149 StringCalculator.java ADD import java.util.regex.Pattern IMPORT EditAction 1473858607334 StringCalculator.java 974 1 6 0 +CompilationAction 1473858609640 StringCalculator.java +EditAction 1473858616398 StringCalculator.java 951 1 6 0 diff --git a/bin/StringCalculator.class b/bin/StringCalculator.class index 3604a1490bf2d3d90d7b9777483552d748b210e5..f44d651a92dddbae669674c81f4213e7212d471f 100644 GIT binary patch delta 197 zcmX@kzL16M)W2Q(7#J8#7-S}L-OOQU5MgBC&q^#y)Xz!GOV@WTD#|b7U=U+ua1YHZ zN-fUMDN9XJNY2kK$jnJB$;{7FC@9KL%1O<&QsCnBO)N>yNG(!GPRz^8FHuNJReF!xW{}`vU}cb;IA5GGY_cg+G$ZrmiA)-13|b7#42(dxaP4LgjuaBz d&LF-Y$YWyQ0+MWC8Bqpqum}T?Ck19n0|1BsF8crg literal 967 zcmZuwO-~b16g{sqof%58w55DjQA8*+g=$4iK->@|Bo!AmM4=iV(+LcgX)~P~7cTu1 zF5T#cjT1X2}0@HRV#yI%NA z?lwGuOr`0{#+D3y<(~!hXy0$E+{L*o>@4ebfn1?-KD}49GPfa+c=XQoT9Mxj+9omr zV;4L8&081}fQ4a!_^VponNDC7<0i)bS*-VY5);S^n1?cQ_dO!Jbo_P#*Kpm$q(J%{ z+(r<2dtR8t4WtCDmJHh-V-{|*VX+pxuLVU5w>VXy*s0YSd+8`Z7G}w4(P4$7z|AFL z!y(*utKpOE*~>WC`JWfE5_BnVa~s9#Ik+?Ch~%t7AbV*Ct=%~k5M~nJ95iwb=<>@3F5go4ZK;f|^SjctgG|AV!O?g3_c{qUJ#mx4*&q+D#`YRa%wy zQzm-_)C2VTa0Mx525IZeq*WUcV??#9*_rHT#I++klRL)9M_BfET%|YF^^Czf?dh&v zwlg!wC{(mn=f$#dvJ}^r^e@Pc89BYYnV;upuU9|lBB$r#pH6?}kF+E9*PzfX6N7q0 z2GLkVm8L(8EG998DU873*~%E_k2HaGeKD60hSQO2 Date: Wed, 14 Sep 2016 16:11:31 +0300 Subject: [PATCH 40/45] besouro automatic message --- .besouro/2016091415302846/actions.txt | 6 ++++++ .besouro/2016091415302846/besouroEpisodes.txt | 5 +++++ .../randomHeuristicEpisodes.txt | 1 + .besouro/2016091415302846/zorroEpisodes.txt | 15 ++++++++------- bin/StringCalculator.class | Bin 545 -> 1328 bytes src/StringCalculator.java | 8 +++++--- 6 files changed, 25 insertions(+), 10 deletions(-) diff --git a/.besouro/2016091415302846/actions.txt b/.besouro/2016091415302846/actions.txt index aa175bf..1f549b5 100644 --- a/.besouro/2016091415302846/actions.txt +++ b/.besouro/2016091415302846/actions.txt @@ -130,3 +130,9 @@ RefactoringAction 1473858588149 StringCalculator.java ADD import java.util.regex EditAction 1473858607334 StringCalculator.java 974 1 6 0 CompilationAction 1473858609640 StringCalculator.java EditAction 1473858616398 StringCalculator.java 951 1 6 0 +CompilationAction 1473858618410 StringCalculator.java +RefactoringAction 1473858626393 StringCalculator.java ADD import java.util.regex.Matcher IMPORT +CompilationAction 1473858666539 StringCalculator.java +UnitTestCaseAction 1473858675968 StringCalculatorTest.java OK +UnitTestSessionAction 1473858675968 StringCalculatorTest.java OK +EditAction 1473858690663 StringCalculator.java 1074 1 6 0 diff --git a/.besouro/2016091415302846/besouroEpisodes.txt b/.besouro/2016091415302846/besouroEpisodes.txt index 78d983f..53ca095 100644 --- a/.besouro/2016091415302846/besouroEpisodes.txt +++ b/.besouro/2016091415302846/besouroEpisodes.txt @@ -25,3 +25,8 @@ 1473858051067 test-addition 1 63 true 1473858104219 test-addition 1 44 true 1473858104220 test-addition 1 44 true +1473858675968 test-first 1 564 true +1473858675969 test-first 1 564 true +1473858675970 test-first 1 564 true +1473858675971 test-first 1 564 true +1473858675972 test-first 1 564 true diff --git a/.besouro/2016091415302846/randomHeuristicEpisodes.txt b/.besouro/2016091415302846/randomHeuristicEpisodes.txt index 26e8ac6..1b5f0bd 100644 --- a/.besouro/2016091415302846/randomHeuristicEpisodes.txt +++ b/.besouro/2016091415302846/randomHeuristicEpisodes.txt @@ -11,3 +11,4 @@ 1473857960567 production 1 508 false 1473858051066 test-addition 1 63 true 1473858104219 test-addition 1 44 true +1473858675968 test-first 1 564 true diff --git a/.besouro/2016091415302846/zorroEpisodes.txt b/.besouro/2016091415302846/zorroEpisodes.txt index 83b0439..a9d2d96 100644 --- a/.besouro/2016091415302846/zorroEpisodes.txt +++ b/.besouro/2016091415302846/zorroEpisodes.txt @@ -4,10 +4,11 @@ 1473856865113 test-last 1 134 false 1473856888506 test-addition 1 23 false 1473857236459 test-last 1 347 false -1473857281671 test-addition 1 45 false -1473857321423 test-addition 1 39 false -1473857365714 test-addition 1 44 false -1473857440504 refactoring 2A 74 false -1473857960567 production 1 520 false -1473858051066 test-addition 1 90 false -1473858104219 test-addition 1 53 false +1473857281671 test-addition 1 45 true +1473857321423 test-addition 1 39 true +1473857365714 test-addition 1 44 true +1473857440504 refactoring 2A 74 true +1473857960567 production 1 520 true +1473858051066 test-addition 1 90 true +1473858104219 test-addition 1 53 true +1473858675968 test-first 1 571 true diff --git a/bin/StringCalculator.class b/bin/StringCalculator.class index f44d651a92dddbae669674c81f4213e7212d471f..48ade3c66945f6a87274561ce42dc404b317eb3b 100644 GIT binary patch literal 1328 zcmZuwOHxLU<^Oq6mFJ55gLC26r2$r;@spG<>f5N33 z-LP>3jLzWRU*exo{E`-`(napgJMMg%QK+}R_o7Vc2meWf)&B@y` ze3Wi#Z?t4iv(}T3);0~@5eVEcEz_A0kou#G0=}ty)(AmDFbqEe0*x8dGUiKLYli(q zTgw>&kxX9Ka*LX6y6=k6=WLioSNDJ3G$U)-tbp2|sb()*rK9%+LNjl5qu`i%t0*HP z(D{FaW4(e_0Vrq_@V{8i#xI4?fzvWN|0%5O9>y7T3CLTTqi+~QRx|yx5YFMejBbJE zD!BWWW2_r?7#GkepcFK_Xi%o$A_FE?t#_+dB7|P_$+#@g?m3nmGncgK_BQ!ga~#9A z!stho4tjp8V7j~w)FPnF$w}|Dn;;%W0t3fY*a9Pe$C%pC>;+@HWLUb9j-H4#=ap_V zQW8TluGD~9F$rTBBkcVv(_*7I2;`+1K?Nx?>oUEvnq}S3<1Xn6#yB;JI9Z6h4Hyq2 zjT>x9v5+%4Po4lVq#Jt$v1b%>{{27IXJ87>>}Zs043Q)pz6CQr|~bi;_dlmsc+jzwBN z!7uH^BI+*MKR}7?1U*uDc}2mPy?#`@$jeW+mUvdRDuinjt413==I#e zMgnU>8(Pr?6+Qfmq8&rrx^YS-xmMHY#uCnBjduyNG(!GPRz^8FHuNJReF!xW{}`vU}cb;IA5GGY;q)XG$Zrmt;`x`3|b7#42(dxaP4LgjuaBz d&LF-Y$YWyQ0+MWC8Bqpqum}T?Ck19n0|1ISFEIcB diff --git a/src/StringCalculator.java b/src/StringCalculator.java index ede9554..228fdb4 100644 --- a/src/StringCalculator.java +++ b/src/StringCalculator.java @@ -1,3 +1,4 @@ +import java.util.regex.Matcher; import java.util.regex.Pattern; public class StringCalculator { @@ -15,13 +16,14 @@ public static int add(String numbersStr) throws StringCalculatorException { return Integer.parseInt(numbersStr); } - // Returns the sum of an unknown amount of numbers, - // separated by commas or newlines + // Newlines and commas are not allowed next to each other Pattern p = Pattern.compile(",\\n|\\n,"); Matcher m = p.matcher(numbersStr); if (m.find()) { throw new StringCalculatorException(); } + // Returns the sum of an unknown amount of numbers, + // separated by commas or newlines else if (numbersStr.matches("^\\d+[\\d,\\n]+\\d+$")) { String numbers[] = numbersStr.split(",+|\\n+"); @@ -33,6 +35,6 @@ else if (numbersStr.matches("^\\d+[\\d,\\n]+\\d+$")) { return sum; } - return 0; + throw new StringCalculatorException(); } } From c17db342fec9313c76413e17bf558591df7e9886 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 14 Sep 2016 16:14:51 +0300 Subject: [PATCH 41/45] besouro automatic message --- .besouro/2016091415302846/actions.txt | 25 ++ .besouro/2016091415302846/besouroEpisodes.txt | 318 ++++++++++++++++++ .../randomHeuristicEpisodes.txt | 4 + .besouro/2016091415302846/zorroEpisodes.txt | 4 + bin/StringCalculator.class | Bin 1328 -> 1334 bytes bin/StringCalculatorTest.class | Bin 3194 -> 4011 bytes src/StringCalculator.java | 2 +- tests/StringCalculatorTest.java | 47 ++- 8 files changed, 398 insertions(+), 2 deletions(-) diff --git a/.besouro/2016091415302846/actions.txt b/.besouro/2016091415302846/actions.txt index 1f549b5..a2dd34b 100644 --- a/.besouro/2016091415302846/actions.txt +++ b/.besouro/2016091415302846/actions.txt @@ -136,3 +136,28 @@ CompilationAction 1473858666539 StringCalculator.java UnitTestCaseAction 1473858675968 StringCalculatorTest.java OK UnitTestSessionAction 1473858675968 StringCalculatorTest.java OK EditAction 1473858690663 StringCalculator.java 1074 1 6 0 +RefactoringAction 1473858703377 StringCalculatorTest.java ADD void testStringCalculator_NewlineAndCommaNextToEachOther()/2 METHOD +RefactoringAction 1473858706481 StringCalculatorTest.java RENAME testStringCalculator_NewlineAndCommaNextToEachOther()/2=>void testStringCalculator_CommaNextToEachOther() METHOD +RefactoringAction 1473858709071 StringCalculatorTest.java RENAME testStringCalculator_CommaNextToEachOther()=>void testStringCalculator_CommaAndNewlineNextToEachOther() METHOD +UnitTestCaseAction 1473858717810 StringCalculatorTest.java OK +UnitTestSessionAction 1473858717810 StringCalculatorTest.java OK +RefactoringAction 1473858731195 StringCalculatorTest.java ADD void testStringCalculator_CommaAndNewlineNextToEachOther()/2 METHOD +RefactoringAction 1473858736873 StringCalculatorTest.java RENAME testStringCalculator_CommaAndNewlineNextToEachOther()/2=>void testStringCalculator_NegativeNumber() METHOD +RefactoringAction 1473858747185 StringCalculatorTest.java RENAME testStringCalculator_NegativeNumber()=>void testStringCalculator_NNegativeNumber() METHOD +RefactoringAction 1473858748745 StringCalculatorTest.java RENAME testStringCalculator_NNegativeNumber()=>void testStringCalculator_WithNegativeNumber() METHOD +RefactoringAction 1473858757512 StringCalculatorTest.java ADD void testStringCalculator_WithNegativeNumber()/2 METHOD +RefactoringAction 1473858762161 StringCalculatorTest.java RENAME testStringCalculator_WithNegativeNumber()/2=>void testStringCalculator_OneNegativeNumber() METHOD +RefactoringAction 1473858765265 StringCalculatorTest.java REMOVE testStringCalculator_OneNegativeNumber() METHOD +RefactoringAction 1473858766310 StringCalculatorTest.java ADD void testStringCalculator_OneNegativeNumber() METHOD +UnitTestCaseAction 1473858772288 StringCalculatorTest.java OK +UnitTestSessionAction 1473858772288 StringCalculatorTest.java OK +RefactoringAction 1473858778653 StringCalculatorTest.java ADD void testStringCalculator_OneNegativeNumber()/2 METHOD +RefactoringAction 1473858783302 StringCalculatorTest.java RENAME testStringCalculator_OneNegativeNumber()/2=>void testStringCalculator_IllegalC() METHOD +RefactoringAction 1473858785891 StringCalculatorTest.java RENAME testStringCalculator_IllegalC()=>void testStringCalculator_IllegalCharacters() METHOD +RefactoringAction 1473858798262 StringCalculatorTest.java ADD void testStringCalculator_IllegalCharacters()/2 METHOD +RefactoringAction 1473858800337 StringCalculatorTest.java RENAME testStringCalculator_IllegalCharacters()/2=>void testStringCalculator_IllegalCharacters_2() METHOD +UnitTestCaseAction 1473858811822 StringCalculatorTest.java OK +UnitTestSessionAction 1473858811822 StringCalculatorTest.java OK +UnitTestCaseAction 1473858844663 StringCalculatorTest.java OK +UnitTestSessionAction 1473858844663 StringCalculatorTest.java OK +EditAction 1473858890324 StringCalculator.java 1071 1 6 0 diff --git a/.besouro/2016091415302846/besouroEpisodes.txt b/.besouro/2016091415302846/besouroEpisodes.txt index 53ca095..9e75614 100644 --- a/.besouro/2016091415302846/besouroEpisodes.txt +++ b/.besouro/2016091415302846/besouroEpisodes.txt @@ -30,3 +30,321 @@ 1473858675970 test-first 1 564 true 1473858675971 test-first 1 564 true 1473858675972 test-first 1 564 true +1473858675973 test-first 1 564 true +1473858675974 test-first 1 564 true +1473858675975 test-first 1 564 true +1473858675976 test-first 1 564 true +1473858675977 test-first 1 564 true +1473858675978 test-first 1 564 true +1473858675979 test-first 1 564 true +1473858675980 test-first 1 564 true +1473858675981 test-first 1 564 true +1473858675982 test-first 1 564 true +1473858675983 test-first 1 564 true +1473858675984 test-first 1 564 true +1473858675985 test-first 1 564 true +1473858675986 test-first 1 564 true +1473858675987 test-first 1 564 true +1473858675988 test-first 1 564 true +1473858675989 test-first 1 564 true +1473858675990 test-first 1 564 true +1473858675991 test-first 1 564 true +1473858675992 test-first 1 564 true +1473858675993 test-first 1 564 true +1473858675994 test-first 1 564 true +1473858675995 test-first 1 564 true +1473858675996 test-first 1 564 true +1473858675997 test-first 1 564 true +1473858675998 test-first 1 564 true +1473858675999 test-first 1 564 true +1473858676000 test-first 1 564 true +1473858676001 test-first 1 564 true +1473858676002 test-first 1 564 true +1473858676003 test-first 1 564 true +1473858676004 test-first 1 564 true +1473858676005 test-first 1 564 true +1473858676006 test-first 1 564 true +1473858676007 test-first 1 564 true +1473858676008 test-first 1 564 true +1473858676009 test-first 1 564 true +1473858676010 test-first 1 564 true +1473858676011 test-first 1 564 true +1473858676012 test-first 1 564 true +1473858676013 test-first 1 564 true +1473858676014 test-first 1 564 true +1473858676015 test-first 1 564 true +1473858676016 test-first 1 564 true +1473858676017 test-first 1 564 true +1473858676018 test-first 1 564 true +1473858676019 test-first 1 564 true +1473858676020 test-first 1 564 true +1473858676021 test-first 1 564 true +1473858676022 test-first 1 564 true +1473858676023 test-first 1 564 true +1473858676024 test-first 1 564 true +1473858676025 test-first 1 564 true +1473858676026 test-first 1 564 true +1473858676027 test-first 1 564 true +1473858676028 test-first 1 564 true +1473858676029 test-first 1 564 true +1473858676030 test-first 1 564 true +1473858676031 test-first 1 564 true +1473858676032 test-first 1 564 true +1473858676033 test-first 1 564 true +1473858676034 test-first 1 564 true +1473858676035 test-first 1 564 true +1473858676036 test-first 1 564 true +1473858676037 test-first 1 564 true +1473858676038 test-first 1 564 true +1473858676039 test-first 1 564 true +1473858676040 test-first 1 564 true +1473858676041 test-first 1 564 true +1473858676042 test-first 1 564 true +1473858676043 test-first 1 564 true +1473858676044 test-first 1 564 true +1473858676045 test-first 1 564 true +1473858676046 test-first 1 564 true +1473858676047 test-first 1 564 true +1473858676048 test-first 1 564 true +1473858676049 test-first 1 564 true +1473858676050 test-first 1 564 true +1473858676051 test-first 1 564 true +1473858676052 test-first 1 564 true +1473858676053 test-first 1 564 true +1473858676054 test-first 1 564 true +1473858676055 test-first 1 564 true +1473858676056 test-first 1 564 true +1473858676057 test-first 1 564 true +1473858676058 test-first 1 564 true +1473858676059 test-first 1 564 true +1473858676060 test-first 1 564 true +1473858676061 test-first 1 564 true +1473858676062 test-first 1 564 true +1473858676063 test-first 1 564 true +1473858676064 test-first 1 564 true +1473858676065 test-first 1 564 true +1473858676066 test-first 1 564 true +1473858676067 test-first 1 564 true +1473858676068 test-first 1 564 true +1473858676069 test-first 1 564 true +1473858676070 test-first 1 564 true +1473858676071 test-first 1 564 true +1473858676072 test-first 1 564 true +1473858676073 test-first 1 564 true +1473858676074 test-first 1 564 true +1473858676075 test-first 1 564 true +1473858676076 test-first 1 564 true +1473858676077 test-first 1 564 true +1473858676078 test-first 1 564 true +1473858676079 test-first 1 564 true +1473858676080 test-first 1 564 true +1473858676081 test-first 1 564 true +1473858676082 test-first 1 564 true +1473858676083 test-first 1 564 true +1473858676084 test-first 1 564 true +1473858676085 test-first 1 564 true +1473858676086 test-first 1 564 true +1473858676087 test-first 1 564 true +1473858676088 test-first 1 564 true +1473858676089 test-first 1 564 true +1473858676090 test-first 1 564 true +1473858676091 test-first 1 564 true +1473858676092 test-first 1 564 true +1473858676093 test-first 1 564 true +1473858676094 test-first 1 564 true +1473858676095 test-first 1 564 true +1473858676096 test-first 1 564 true +1473858676097 test-first 1 564 true +1473858676098 test-first 1 564 true +1473858676099 test-first 1 564 true +1473858676100 test-first 1 564 true +1473858676101 test-first 1 564 true +1473858676102 test-first 1 564 true +1473858676103 test-first 1 564 true +1473858676104 test-first 1 564 true +1473858676105 test-first 1 564 true +1473858676106 test-first 1 564 true +1473858676107 test-first 1 564 true +1473858676108 test-first 1 564 true +1473858676109 test-first 1 564 true +1473858676110 test-first 1 564 true +1473858676111 test-first 1 564 true +1473858676112 test-first 1 564 true +1473858676113 test-first 1 564 true +1473858676114 test-first 1 564 true +1473858676115 test-first 1 564 true +1473858676116 test-first 1 564 true +1473858676117 test-first 1 564 true +1473858676118 test-first 1 564 true +1473858676119 test-first 1 564 true +1473858676120 test-first 1 564 true +1473858676121 test-first 1 564 true +1473858676122 test-first 1 564 true +1473858676123 test-first 1 564 true +1473858676124 test-first 1 564 true +1473858676125 test-first 1 564 true +1473858676126 test-first 1 564 true +1473858676127 test-first 1 564 true +1473858676128 test-first 1 564 true +1473858676129 test-first 1 564 true +1473858676130 test-first 1 564 true +1473858676131 test-first 1 564 true +1473858676132 test-first 1 564 true +1473858676133 test-first 1 564 true +1473858676134 test-first 1 564 true +1473858676135 test-first 1 564 true +1473858676136 test-first 1 564 true +1473858676137 test-first 1 564 true +1473858676138 test-first 1 564 true +1473858676139 test-first 1 564 true +1473858676140 test-first 1 564 true +1473858676141 test-first 1 564 true +1473858676142 test-first 1 564 true +1473858676143 test-first 1 564 true +1473858676144 test-first 1 564 true +1473858676145 test-first 1 564 true +1473858676146 test-first 1 564 true +1473858676147 test-first 1 564 true +1473858676148 test-first 1 564 true +1473858676149 test-first 1 564 true +1473858676150 test-first 1 564 true +1473858676151 test-first 1 564 true +1473858676152 test-first 1 564 true +1473858676153 test-first 1 564 true +1473858676154 test-first 1 564 true +1473858676155 test-first 1 564 true +1473858676156 test-first 1 564 true +1473858676157 test-first 1 564 true +1473858676158 test-first 1 564 true +1473858676159 test-first 1 564 true +1473858676160 test-first 1 564 true +1473858676161 test-first 1 564 true +1473858676162 test-first 1 564 true +1473858676163 test-first 1 564 true +1473858676164 test-first 1 564 true +1473858676165 test-first 1 564 true +1473858676166 test-first 1 564 true +1473858676167 test-first 1 564 true +1473858676168 test-first 1 564 true +1473858676169 test-first 1 564 true +1473858676170 test-first 1 564 true +1473858676171 test-first 1 564 true +1473858676172 test-first 1 564 true +1473858676173 test-first 1 564 true +1473858676174 test-first 1 564 true +1473858676175 test-first 1 564 true +1473858676176 test-first 1 564 true +1473858676177 test-first 1 564 true +1473858676178 test-first 1 564 true +1473858676179 test-first 1 564 true +1473858676180 test-first 1 564 true +1473858676181 test-first 1 564 true +1473858676182 test-first 1 564 true +1473858676183 test-first 1 564 true +1473858676184 test-first 1 564 true +1473858676185 test-first 1 564 true +1473858676186 test-first 1 564 true +1473858676187 test-first 1 564 true +1473858676188 test-first 1 564 true +1473858676189 test-first 1 564 true +1473858676190 test-first 1 564 true +1473858676191 test-first 1 564 true +1473858676192 test-first 1 564 true +1473858676193 test-first 1 564 true +1473858676194 test-first 1 564 true +1473858676195 test-first 1 564 true +1473858676196 test-first 1 564 true +1473858676197 test-first 1 564 true +1473858676198 test-first 1 564 true +1473858676199 test-first 1 564 true +1473858676200 test-first 1 564 true +1473858676201 test-first 1 564 true +1473858676202 test-first 1 564 true +1473858676203 test-first 1 564 true +1473858676204 test-first 1 564 true +1473858676205 test-first 1 564 true +1473858676206 test-first 1 564 true +1473858676207 test-first 1 564 true +1473858676208 test-first 1 564 true +1473858676209 test-first 1 564 true +1473858676210 test-first 1 564 true +1473858676211 test-first 1 564 true +1473858676212 test-first 1 564 true +1473858676213 test-first 1 564 true +1473858676214 test-first 1 564 true +1473858676215 test-first 1 564 true +1473858676216 test-first 1 564 true +1473858676217 test-first 1 564 true +1473858676218 test-first 1 564 true +1473858676219 test-first 1 564 true +1473858676220 test-first 1 564 true +1473858676221 test-first 1 564 true +1473858676222 test-first 1 564 true +1473858676223 test-first 1 564 true +1473858676224 test-first 1 564 true +1473858676225 test-first 1 564 true +1473858676226 test-first 1 564 true +1473858676227 test-first 1 564 true +1473858676228 test-first 1 564 true +1473858676229 test-first 1 564 true +1473858676230 test-first 1 564 true +1473858676231 test-first 1 564 true +1473858676232 test-first 1 564 true +1473858676233 test-first 1 564 true +1473858676234 test-first 1 564 true +1473858676235 test-first 1 564 true +1473858676236 test-first 1 564 true +1473858676237 test-first 1 564 true +1473858676238 test-first 1 564 true +1473858676239 test-first 1 564 true +1473858676240 test-first 1 564 true +1473858676241 test-first 1 564 true +1473858676242 test-first 1 564 true +1473858676243 test-first 1 564 true +1473858676244 test-first 1 564 true +1473858676245 test-first 1 564 true +1473858676246 test-first 1 564 true +1473858676247 test-first 1 564 true +1473858676248 test-first 1 564 true +1473858676249 test-first 1 564 true +1473858676250 test-first 1 564 true +1473858676251 test-first 1 564 true +1473858676252 test-first 1 564 true +1473858676253 test-first 1 564 true +1473858676254 test-first 1 564 true +1473858676255 test-first 1 564 true +1473858676256 test-first 1 564 true +1473858676257 test-first 1 564 true +1473858676258 test-first 1 564 true +1473858676259 test-first 1 564 true +1473858676260 test-first 1 564 true +1473858676261 test-first 1 564 true +1473858676262 test-first 1 564 true +1473858676263 test-first 1 564 true +1473858676264 test-first 1 564 true +1473858676265 test-first 1 564 true +1473858676266 test-first 1 564 true +1473858676267 test-first 1 564 true +1473858676268 test-first 1 564 true +1473858676269 test-first 1 564 true +1473858676270 test-first 1 564 true +1473858676271 test-first 1 564 true +1473858676272 test-first 1 564 true +1473858676273 test-first 1 564 true +1473858676274 test-first 1 564 true +1473858676275 test-first 1 564 true +1473858676276 test-first 1 564 true +1473858676277 test-first 1 564 true +1473858676278 test-first 1 564 true +1473858676279 test-first 1 564 true +1473858676280 test-first 1 564 true +1473858676281 test-first 1 564 true +1473858676282 test-first 1 564 true +1473858676283 test-first 1 564 true +1473858717810 test-last 1 27 false +1473858772288 test-addition 1 41 true +1473858772289 test-addition 1 41 true +1473858772290 test-addition 1 41 true +1473858811822 test-addition 1 33 true +1473858811823 test-addition 1 33 true +1473858844663 regression 1 0 true diff --git a/.besouro/2016091415302846/randomHeuristicEpisodes.txt b/.besouro/2016091415302846/randomHeuristicEpisodes.txt index 1b5f0bd..3bb3bbb 100644 --- a/.besouro/2016091415302846/randomHeuristicEpisodes.txt +++ b/.besouro/2016091415302846/randomHeuristicEpisodes.txt @@ -12,3 +12,7 @@ 1473858051066 test-addition 1 63 true 1473858104219 test-addition 1 44 true 1473858675968 test-first 1 564 true +1473858717810 test-last 1 27 false +1473858772288 test-addition 1 41 true +1473858811822 test-addition 1 33 false +1473858844663 regression 1 0 true diff --git a/.besouro/2016091415302846/zorroEpisodes.txt b/.besouro/2016091415302846/zorroEpisodes.txt index a9d2d96..8c0c596 100644 --- a/.besouro/2016091415302846/zorroEpisodes.txt +++ b/.besouro/2016091415302846/zorroEpisodes.txt @@ -12,3 +12,7 @@ 1473858051066 test-addition 1 90 true 1473858104219 test-addition 1 53 true 1473858675968 test-first 1 571 true +1473858717810 test-last 1 41 false +1473858772288 test-addition 1 54 false +1473858811822 test-addition 1 39 false +1473858844663 regression 1 32 false diff --git a/bin/StringCalculator.class b/bin/StringCalculator.class index 48ade3c66945f6a87274561ce42dc404b317eb3b..dcf6c4bbb569f6af7ff6539ca0a274bad89d8d1c 100644 GIT binary patch delta 60 zcmdnMwT)}TJ!Vc{1||kh1_p-m$q Pz`)3$#1K092ultC+5ZkH delta 54 zcmdnSwSjBHJ!VdK1||kh1_p-0$$x0|02_3-JH| diff --git a/bin/StringCalculatorTest.class b/bin/StringCalculatorTest.class index 1546908948c60122e9b4646a9a164d29899c6efb..c0f2ccf7b0bbac32f8eed9aa4348dc6112f9c32b 100644 GIT binary patch delta 676 zcmajbOG^S#7{>AEXcOaTK|&G)N?;do4Db687e#1`z-3G}G{UGfj+gG2uP_kQCa6td z8>t|K`~dCxBJJ9QMDJiAOcS#?aL)OkADs7VrV|q0zI%NDDO_}gPmU#xclUH8TdP#0 zmFiAjZmH#}oR{1BW-TX`l!C6v8jm`|SW*;H3=3u-ESSx%q?em=zERmWlO`q6cr3=S zXeOazSy!yhJ~b&Zn*L=%tEx(hnpGrCD(SLT=W)cq#l_@uhGEHc=KeHW2_B~m9;(EQ zn3jzJmuCLQ#P|m{l>>u|e&_Mm)*~+n6pgqqI2#zA!G{UDb7LG~%u~s*XAHdIwb3hW z_^L~p3j(c^lmnNvUV+CoytMnD(=A-Xp1UFLmbg0yu4Uoc_S`*j9pWAwxC0A!XwP+t edm`@Hfjc(2jnV8*?71Fsuf+8oxHFop3+F$CZgOM* delta 80 zcmZ22|4V}F)W2Q(7#J8#7>YM?ePx|2!fwRKyV;%n9jl-}10w@7P>NG1-$#1~gP84P gH(ohr1qSBH8~H?qIe@Zi4C)L_K)Mj9iix2J0BR}_w*UYD diff --git a/src/StringCalculator.java b/src/StringCalculator.java index 228fdb4..3bbca28 100644 --- a/src/StringCalculator.java +++ b/src/StringCalculator.java @@ -12,7 +12,7 @@ public static int add(String numbersStr) throws StringCalculatorException { } // Returns the same number when given only one number - if (numbersStr.matches("^\\d+$")) { + if (numbersStr.matches("\\d")) { return Integer.parseInt(numbersStr); } diff --git a/tests/StringCalculatorTest.java b/tests/StringCalculatorTest.java index bd99d86..10df53c 100644 --- a/tests/StringCalculatorTest.java +++ b/tests/StringCalculatorTest.java @@ -141,6 +141,51 @@ public void testStringCalculator_NewlineAndCommaNextToEachOther() throws StringC String numbers = "1\n,2"; // Act, should raise an exception - int sum = StringCalculator.add(numbers); + StringCalculator.add(numbers); + } + + @Test (expected = StringCalculatorException.class) + public void testStringCalculator_CommaAndNewlineNextToEachOther() throws StringCalculatorException { + // Arrange + String numbers = "3,\n4"; + + // Act, should raise an exception + StringCalculator.add(numbers); + } + + @Test (expected = StringCalculatorException.class) + public void testStringCalculator_OneNegativeNumber() throws StringCalculatorException { + // Arrange + String numbers = "-100"; + + // Act, should raise an exception + StringCalculator.add(numbers); + } + + @Test (expected = StringCalculatorException.class) + public void testStringCalculator_WithNegativeNumber() throws StringCalculatorException { + // Arrange + String numbers = "4,-5"; + + // Act, should raise an exception + StringCalculator.add(numbers); + } + + @Test (expected = StringCalculatorException.class) + public void testStringCalculator_IllegalCharacters() throws StringCalculatorException { + // Arrange + String numbers = "1,3.6"; + + // Act, should raise an exception + StringCalculator.add(numbers); + } + + @Test (expected = StringCalculatorException.class) + public void testStringCalculator_IllegalCharacters_2() throws StringCalculatorException { + // Arrange + String numbers = "1,3,6,5e2"; + + // Act, should raise an exception + StringCalculator.add(numbers); } } From 87427191cc5b4c28ef373557c248ae63913edf84 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 14 Sep 2016 16:15:00 +0300 Subject: [PATCH 42/45] besouro automatic message --- .besouro/2016091415302846/actions.txt | 3 +++ bin/StringCalculator.class | Bin 1334 -> 1331 bytes src/StringCalculator.java | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.besouro/2016091415302846/actions.txt b/.besouro/2016091415302846/actions.txt index a2dd34b..96b6f99 100644 --- a/.besouro/2016091415302846/actions.txt +++ b/.besouro/2016091415302846/actions.txt @@ -161,3 +161,6 @@ UnitTestSessionAction 1473858811822 StringCalculatorTest.java OK UnitTestCaseAction 1473858844663 StringCalculatorTest.java OK UnitTestSessionAction 1473858844663 StringCalculatorTest.java OK EditAction 1473858890324 StringCalculator.java 1071 1 6 0 +UnitTestCaseAction 1473858892979 StringCalculatorTest.java FAIL +UnitTestSessionAction 1473858892979 StringCalculatorTest.java FAIL +EditAction 1473858899235 StringCalculator.java 1072 1 6 0 diff --git a/bin/StringCalculator.class b/bin/StringCalculator.class index dcf6c4bbb569f6af7ff6539ca0a274bad89d8d1c..d85fb815043a68f956fc4d6584f586f8f2fd1001 100644 GIT binary patch delta 14 VcmdnSwV7+eJ7%Vsl#O4USO6=&1*`x7 delta 17 YcmdnYwT)}SJ2uw1m=tZ5jUSy@06TRCTmS$7 diff --git a/src/StringCalculator.java b/src/StringCalculator.java index 3bbca28..a9bc8db 100644 --- a/src/StringCalculator.java +++ b/src/StringCalculator.java @@ -12,7 +12,7 @@ public static int add(String numbersStr) throws StringCalculatorException { } // Returns the same number when given only one number - if (numbersStr.matches("\\d")) { + if (numbersStr.matches("\\d+")) { return Integer.parseInt(numbersStr); } From 3d6788434c686863ddde9338892f03cc79b5ee3c Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 14 Sep 2016 16:15:57 +0300 Subject: [PATCH 43/45] besouro automatic message --- .besouro/2016091415302846/actions.txt | 3 +++ .besouro/2016091415302846/besouroEpisodes.txt | 1 + .../randomHeuristicEpisodes.txt | 1 + .besouro/2016091415302846/zorroEpisodes.txt | 1 + bin/StringCalculator.class | Bin 1331 -> 1332 bytes src/StringCalculator.java | 4 +++- 6 files changed, 9 insertions(+), 1 deletion(-) diff --git a/.besouro/2016091415302846/actions.txt b/.besouro/2016091415302846/actions.txt index 96b6f99..c8a2377 100644 --- a/.besouro/2016091415302846/actions.txt +++ b/.besouro/2016091415302846/actions.txt @@ -164,3 +164,6 @@ EditAction 1473858890324 StringCalculator.java 1071 1 6 0 UnitTestCaseAction 1473858892979 StringCalculatorTest.java FAIL UnitTestSessionAction 1473858892979 StringCalculatorTest.java FAIL EditAction 1473858899235 StringCalculator.java 1072 1 6 0 +UnitTestCaseAction 1473858902170 StringCalculatorTest.java OK +UnitTestSessionAction 1473858902170 StringCalculatorTest.java OK +EditAction 1473858956584 StringCalculator.java 1116 1 7 0 diff --git a/.besouro/2016091415302846/besouroEpisodes.txt b/.besouro/2016091415302846/besouroEpisodes.txt index 9e75614..9632493 100644 --- a/.besouro/2016091415302846/besouroEpisodes.txt +++ b/.besouro/2016091415302846/besouroEpisodes.txt @@ -348,3 +348,4 @@ 1473858811822 test-addition 1 33 true 1473858811823 test-addition 1 33 true 1473858844663 regression 1 0 true +1473858902170 refactoring 2A 11 true diff --git a/.besouro/2016091415302846/randomHeuristicEpisodes.txt b/.besouro/2016091415302846/randomHeuristicEpisodes.txt index 3bb3bbb..fc1039d 100644 --- a/.besouro/2016091415302846/randomHeuristicEpisodes.txt +++ b/.besouro/2016091415302846/randomHeuristicEpisodes.txt @@ -16,3 +16,4 @@ 1473858772288 test-addition 1 41 true 1473858811822 test-addition 1 33 false 1473858844663 regression 1 0 true +1473858902170 refactoring 2A 11 true diff --git a/.besouro/2016091415302846/zorroEpisodes.txt b/.besouro/2016091415302846/zorroEpisodes.txt index 8c0c596..f1cda38 100644 --- a/.besouro/2016091415302846/zorroEpisodes.txt +++ b/.besouro/2016091415302846/zorroEpisodes.txt @@ -16,3 +16,4 @@ 1473858772288 test-addition 1 54 false 1473858811822 test-addition 1 39 false 1473858844663 regression 1 32 false +1473858902170 refactoring 2A 57 false diff --git a/bin/StringCalculator.class b/bin/StringCalculator.class index d85fb815043a68f956fc4d6584f586f8f2fd1001..d566ab3d89798fdd2683116cb539dc98c970cd2e 100644 GIT binary patch delta 15 WcmdnYwS{ZKI~L}c6zz>4omc=cJ_XbO delta 14 VcmdnOwV7+eJ7%Vsl#QR9SO6=W1*iZ3 diff --git a/src/StringCalculator.java b/src/StringCalculator.java index a9bc8db..4f5eff2 100644 --- a/src/StringCalculator.java +++ b/src/StringCalculator.java @@ -22,9 +22,10 @@ public static int add(String numbersStr) throws StringCalculatorException { if (m.find()) { throw new StringCalculatorException(); } + // Returns the sum of an unknown amount of numbers, // separated by commas or newlines - else if (numbersStr.matches("^\\d+[\\d,\\n]+\\d+$")) { + if (numbersStr.matches("^\\d+[\\d,\\n]+\\d+$")) { String numbers[] = numbersStr.split(",+|\\n+"); int sum = 0; @@ -35,6 +36,7 @@ else if (numbersStr.matches("^\\d+[\\d,\\n]+\\d+$")) { return sum; } + // The string contains illegal characters throw new StringCalculatorException(); } } From ef001a2a715d79e9f896b5e91a8ce36d12ec61f7 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 14 Sep 2016 16:16:03 +0300 Subject: [PATCH 44/45] besouro automatic message --- .besouro/2016091415302846/actions.txt | 1 + bin/StringCalculator.class | Bin 1332 -> 1332 bytes src/StringCalculator.java | 2 +- 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.besouro/2016091415302846/actions.txt b/.besouro/2016091415302846/actions.txt index c8a2377..02e2dee 100644 --- a/.besouro/2016091415302846/actions.txt +++ b/.besouro/2016091415302846/actions.txt @@ -167,3 +167,4 @@ EditAction 1473858899235 StringCalculator.java 1072 1 6 0 UnitTestCaseAction 1473858902170 StringCalculatorTest.java OK UnitTestSessionAction 1473858902170 StringCalculatorTest.java OK EditAction 1473858956584 StringCalculator.java 1116 1 7 0 +EditAction 1473858963167 StringCalculator.java 1114 1 7 0 diff --git a/bin/StringCalculator.class b/bin/StringCalculator.class index d566ab3d89798fdd2683116cb539dc98c970cd2e..e4c35f51adb880cce5844a21c38fb2c52caa45c2 100644 GIT binary patch delta 41 vcmdnOwS{X#H;b$cgB61;gCm1HgA0QKLj;2&LlThAVNhYnXV93uf~5xltOy7F delta 41 vcmdnOwS{X#H;b$^gB61egCm0+gA0Q^Lj;2YLlThAVNhnsXHc8Gf~5xlt7`}J diff --git a/src/StringCalculator.java b/src/StringCalculator.java index 4f5eff2..82162df 100644 --- a/src/StringCalculator.java +++ b/src/StringCalculator.java @@ -25,7 +25,7 @@ public static int add(String numbersStr) throws StringCalculatorException { // Returns the sum of an unknown amount of numbers, // separated by commas or newlines - if (numbersStr.matches("^\\d+[\\d,\\n]+\\d+$")) { + if (numbersStr.matches("\\d+[\\d,\\n]+\\d+")) { String numbers[] = numbersStr.split(",+|\\n+"); int sum = 0; From 53c2432ca5e20b9adc1f5a5d28b552e56f071f7e Mon Sep 17 00:00:00 2001 From: Matias Kinnunen Date: Wed, 14 Sep 2016 16:17:30 +0300 Subject: [PATCH 45/45] Assignment finished --- .besouro/2016091415302846/actions.txt | 2 + .besouro/2016091415302846/besouroEpisodes.txt | 2 + .../randomHeuristicEpisodes.txt | 1 + .besouro/2016091415302846/zorroEpisodes.txt | 1 + .classpath | 16 +- .gitattributes | 34 +- .gitignore | 94 ++--- .project | 34 +- .settings/org.eclipse.jdt.core.prefs | 22 +- bin/StringCalculator.class | Bin 1332 -> 1330 bytes src/StringCalculator.java | 84 ++-- src/StringCalculatorException.java | 8 +- tests/StringCalculatorTest.java | 382 +++++++++--------- 13 files changed, 343 insertions(+), 337 deletions(-) diff --git a/.besouro/2016091415302846/actions.txt b/.besouro/2016091415302846/actions.txt index 02e2dee..a8abb8f 100644 --- a/.besouro/2016091415302846/actions.txt +++ b/.besouro/2016091415302846/actions.txt @@ -168,3 +168,5 @@ UnitTestCaseAction 1473858902170 StringCalculatorTest.java OK UnitTestSessionAction 1473858902170 StringCalculatorTest.java OK EditAction 1473858956584 StringCalculator.java 1116 1 7 0 EditAction 1473858963167 StringCalculator.java 1114 1 7 0 +UnitTestCaseAction 1473858965932 StringCalculatorTest.java OK +UnitTestSessionAction 1473858965932 StringCalculatorTest.java OK diff --git a/.besouro/2016091415302846/besouroEpisodes.txt b/.besouro/2016091415302846/besouroEpisodes.txt index 9632493..cfda047 100644 --- a/.besouro/2016091415302846/besouroEpisodes.txt +++ b/.besouro/2016091415302846/besouroEpisodes.txt @@ -349,3 +349,5 @@ 1473858811823 test-addition 1 33 true 1473858844663 regression 1 0 true 1473858902170 refactoring 2A 11 true +1473858965932 refactoring 2A 9 true +1473858965933 production 1 9 false diff --git a/.besouro/2016091415302846/randomHeuristicEpisodes.txt b/.besouro/2016091415302846/randomHeuristicEpisodes.txt index fc1039d..67c2896 100644 --- a/.besouro/2016091415302846/randomHeuristicEpisodes.txt +++ b/.besouro/2016091415302846/randomHeuristicEpisodes.txt @@ -17,3 +17,4 @@ 1473858811822 test-addition 1 33 false 1473858844663 regression 1 0 true 1473858902170 refactoring 2A 11 true +1473858965932 refactoring 2A 9 true diff --git a/.besouro/2016091415302846/zorroEpisodes.txt b/.besouro/2016091415302846/zorroEpisodes.txt index f1cda38..2eb63e2 100644 --- a/.besouro/2016091415302846/zorroEpisodes.txt +++ b/.besouro/2016091415302846/zorroEpisodes.txt @@ -17,3 +17,4 @@ 1473858811822 test-addition 1 39 false 1473858844663 regression 1 32 false 1473858902170 refactoring 2A 57 false +1473858965932 refactoring 2A 63 false diff --git a/.classpath b/.classpath index 59486dc..e738af1 100644 --- a/.classpath +++ b/.classpath @@ -1,8 +1,8 @@ - - - - - - - - + + + + + + + + diff --git a/.gitattributes b/.gitattributes index 7351b55..bdb0cab 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,17 +1,17 @@ -# Auto detect text files and perform LF normalization -* text=auto - -# Custom for Visual Studio -*.cs diff=csharp - -# Standard to msysgit -*.doc diff=astextplain -*.DOC diff=astextplain -*.docx diff=astextplain -*.DOCX diff=astextplain -*.dot diff=astextplain -*.DOT diff=astextplain -*.pdf diff=astextplain -*.PDF diff=astextplain -*.rtf diff=astextplain -*.RTF diff=astextplain +# Auto detect text files and perform LF normalization +* text=auto + +# Custom for Visual Studio +*.cs diff=csharp + +# Standard to msysgit +*.doc diff=astextplain +*.DOC diff=astextplain +*.docx diff=astextplain +*.DOCX diff=astextplain +*.dot diff=astextplain +*.DOT diff=astextplain +*.pdf diff=astextplain +*.PDF diff=astextplain +*.rtf diff=astextplain +*.RTF diff=astextplain diff --git a/.gitignore b/.gitignore index 09aabbc..cd2946a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,47 +1,47 @@ -# Windows image file caches -Thumbs.db -ehthumbs.db - -# Folder config file -Desktop.ini - -# Recycle Bin used on file shares -$RECYCLE.BIN/ - -# Windows Installer files -*.cab -*.msi -*.msm -*.msp - -# Windows shortcuts -*.lnk - -# ========================= -# Operating System Files -# ========================= - -# OSX -# ========================= - -.DS_Store -.AppleDouble -.LSOverride - -# Thumbnails -._* - -# Files that might appear in the root of a volume -.DocumentRevisions-V100 -.fseventsd -.Spotlight-V100 -.TemporaryItems -.Trashes -.VolumeIcon.icns - -# Directories potentially created on remote AFP share -.AppleDB -.AppleDesktop -Network Trash Folder -Temporary Items -.apdisk +# Windows image file caches +Thumbs.db +ehthumbs.db + +# Folder config file +Desktop.ini + +# Recycle Bin used on file shares +$RECYCLE.BIN/ + +# Windows Installer files +*.cab +*.msi +*.msm +*.msp + +# Windows shortcuts +*.lnk + +# ========================= +# Operating System Files +# ========================= + +# OSX +# ========================= + +.DS_Store +.AppleDouble +.LSOverride + +# Thumbnails +._* + +# Files that might appear in the root of a volume +.DocumentRevisions-V100 +.fseventsd +.Spotlight-V100 +.TemporaryItems +.Trashes +.VolumeIcon.icns + +# Directories potentially created on remote AFP share +.AppleDB +.AppleDesktop +Network Trash Folder +Temporary Items +.apdisk diff --git a/.project b/.project index 402135c..a75efd1 100644 --- a/.project +++ b/.project @@ -1,17 +1,17 @@ - - - StringCalculator - - - - - - org.eclipse.jdt.core.javabuilder - - - - - - org.eclipse.jdt.core.javanature - - + + + StringCalculator + + + + + + org.eclipse.jdt.core.javabuilder + + + + + + org.eclipse.jdt.core.javanature + + diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs index bb35fa0..3a21537 100644 --- a/.settings/org.eclipse.jdt.core.prefs +++ b/.settings/org.eclipse.jdt.core.prefs @@ -1,11 +1,11 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.8 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.8 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.8 diff --git a/bin/StringCalculator.class b/bin/StringCalculator.class index e4c35f51adb880cce5844a21c38fb2c52caa45c2..d93348bce970d0544b8e1410f153fbba27d6d165 100644 GIT binary patch delta 28 icmdnOwTWv(7!yBVOp11NOo~oSUaU5dxjCKbEE52MstEc3 delta 30 kcmdnQwS{X#7?YqtTuh2~bWDm)OkS)ukg2jcmFX-K0F*TeegFUf diff --git a/src/StringCalculator.java b/src/StringCalculator.java index 82162df..b9d5eb2 100644 --- a/src/StringCalculator.java +++ b/src/StringCalculator.java @@ -1,42 +1,42 @@ -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -public class StringCalculator { - /** - * Returns the sum of the numbers given in numbersStr - */ - public static int add(String numbersStr) throws StringCalculatorException { - // Returns 0 for an empty string - if (numbersStr == "") { - return 0; - } - - // Returns the same number when given only one number - if (numbersStr.matches("\\d+")) { - return Integer.parseInt(numbersStr); - } - - // Newlines and commas are not allowed next to each other - Pattern p = Pattern.compile(",\\n|\\n,"); - Matcher m = p.matcher(numbersStr); - if (m.find()) { - throw new StringCalculatorException(); - } - - // Returns the sum of an unknown amount of numbers, - // separated by commas or newlines - if (numbersStr.matches("\\d+[\\d,\\n]+\\d+")) { - String numbers[] = numbersStr.split(",+|\\n+"); - - int sum = 0; - for (String number : numbers) { - sum += Integer.parseInt(number); - } - - return sum; - } - - // The string contains illegal characters - throw new StringCalculatorException(); - } -} +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +public class StringCalculator { + /** + * Returns the sum of the numbers given in numbersStr + */ + public static int add(String numbersStr) throws StringCalculatorException { + // Returns 0 for an empty string + if (numbersStr == "") { + return 0; + } + + // Returns the same number when given only one number + if (numbersStr.matches("\\d+")) { + return Integer.parseInt(numbersStr); + } + + // Newlines and commas are not allowed next to each other + Pattern p = Pattern.compile(",\\n|\\n,"); + Matcher m = p.matcher(numbersStr); + if (m.find()) { + throw new StringCalculatorException(); + } + + // Returns the sum of an unknown amount of numbers, + // separated by commas or newlines + if (numbersStr.matches("\\d+[\\d,\\n]+\\d+")) { + String numbers[] = numbersStr.split(",+|\\n+"); + + int sum = 0; + for (String number : numbers) { + sum += Integer.parseInt(number); + } + + return sum; + } + + // The string contains illegal characters + throw new StringCalculatorException(); + } +} diff --git a/src/StringCalculatorException.java b/src/StringCalculatorException.java index 0b48ac6..0856125 100644 --- a/src/StringCalculatorException.java +++ b/src/StringCalculatorException.java @@ -1,4 +1,4 @@ - -public class StringCalculatorException extends Exception { - -} + +public class StringCalculatorException extends Exception { + +} diff --git a/tests/StringCalculatorTest.java b/tests/StringCalculatorTest.java index 10df53c..4833234 100644 --- a/tests/StringCalculatorTest.java +++ b/tests/StringCalculatorTest.java @@ -1,191 +1,191 @@ -import static org.junit.Assert.*; - -import org.junit.Test; - -public class StringCalculatorTest { - @Test - public void testStringCalculator_EmptyString() throws StringCalculatorException { - // Arrange - String numbers = ""; - - // Act - int sum = StringCalculator.add(numbers); - - // Assert - assertEquals("Empty string", 0, sum); - } - - @Test - public void testStringCalculator_OneNumber() throws StringCalculatorException { - // Arrange - String numbers = "5"; - - // Act - int sum = StringCalculator.add(numbers); - - // Assert - assertEquals("One number (5)", 5, sum); - } - - @Test - public void testStringCalculator_OneNumber_2() throws StringCalculatorException { - // Arrange - String numbers = "37"; - - // Act - int sum = StringCalculator.add(numbers); - - // Assert - assertEquals("One number (37)", 37, sum); - } - - @Test - public void testStringCalculator_TwoNumbers() throws StringCalculatorException { - // Arrange - String numbers = "3,9"; - - // Act - int sum = StringCalculator.add(numbers); - - // Assert - assertEquals("Two numbers (3, 9)", 12, sum); - } - - @Test - public void testStringCalculator_TwoNumbers_2() throws StringCalculatorException { - // Arrange - String numbers = "50,0"; - - // Act - int sum = StringCalculator.add(numbers); - - // Assert - assertEquals("Two numbers (50, 0)", 50, sum); - } - - @Test - public void testStringCalculator_ManyNumbers() throws StringCalculatorException { - // Arrange - String numbers = "7,7,16"; - - // Act - int sum = StringCalculator.add(numbers); - - // Assert - assertEquals("Many numbers (7, 7, 16)", 30, sum); - } - - @Test - public void testStringCalculator_ManyNumbers_2() throws StringCalculatorException { - // Arrange - String numbers = "1,2,3,4,5,6,7,8,9,100"; - - // Act - int sum = StringCalculator.add(numbers); - - // Assert - assertEquals("Many numbers (1...9, 100)", 145, sum); - } - - @Test - public void testStringCalculator_TwoNumbers_ManyCommas() throws StringCalculatorException { - // Arrange - String numbers = "5,,,8"; - - // Act - int sum = StringCalculator.add(numbers); - - // Assert - assertEquals("Two numbers, many commas (\"5,,,8\")", 13, sum); - } - - @Test - public void testStringCalculator_ManyNumbers_ManyCommas() throws StringCalculatorException { - // Arrange - String numbers = "1,,2,6,,0"; - - // Act - int sum = StringCalculator.add(numbers); - - // Assert - assertEquals("Many numbers, many commas (\"1,,2,6,,0\")", 9, sum); - } - - @Test - public void testStringCalculator_ManyNumbers_NewlineAndComma() throws StringCalculatorException { - // Arrange - String numbers = "1,2\n6"; - - // Act - int sum = StringCalculator.add(numbers); - - // Assert - assertEquals("Many numbers, newline and comma (\"1,2\\n,6\")", 9, sum); - } - - @Test - public void testStringCalculator_ManyNumbers_NewlinesOnly() throws StringCalculatorException { - // Arrange - String numbers = "1\n0\n\n8\n10"; - - // Act - int sum = StringCalculator.add(numbers); - - // Assert - assertEquals("Many numbers, newlines only (\"1\\n0\\n\\n8\\n10\")", 19, sum); - } - - @Test (expected = StringCalculatorException.class) - public void testStringCalculator_NewlineAndCommaNextToEachOther() throws StringCalculatorException { - // Arrange - String numbers = "1\n,2"; - - // Act, should raise an exception - StringCalculator.add(numbers); - } - - @Test (expected = StringCalculatorException.class) - public void testStringCalculator_CommaAndNewlineNextToEachOther() throws StringCalculatorException { - // Arrange - String numbers = "3,\n4"; - - // Act, should raise an exception - StringCalculator.add(numbers); - } - - @Test (expected = StringCalculatorException.class) - public void testStringCalculator_OneNegativeNumber() throws StringCalculatorException { - // Arrange - String numbers = "-100"; - - // Act, should raise an exception - StringCalculator.add(numbers); - } - - @Test (expected = StringCalculatorException.class) - public void testStringCalculator_WithNegativeNumber() throws StringCalculatorException { - // Arrange - String numbers = "4,-5"; - - // Act, should raise an exception - StringCalculator.add(numbers); - } - - @Test (expected = StringCalculatorException.class) - public void testStringCalculator_IllegalCharacters() throws StringCalculatorException { - // Arrange - String numbers = "1,3.6"; - - // Act, should raise an exception - StringCalculator.add(numbers); - } - - @Test (expected = StringCalculatorException.class) - public void testStringCalculator_IllegalCharacters_2() throws StringCalculatorException { - // Arrange - String numbers = "1,3,6,5e2"; - - // Act, should raise an exception - StringCalculator.add(numbers); - } -} +import static org.junit.Assert.*; + +import org.junit.Test; + +public class StringCalculatorTest { + @Test + public void testStringCalculator_EmptyString() throws StringCalculatorException { + // Arrange + String numbers = ""; + + // Act + int sum = StringCalculator.add(numbers); + + // Assert + assertEquals("Empty string", 0, sum); + } + + @Test + public void testStringCalculator_OneNumber() throws StringCalculatorException { + // Arrange + String numbers = "5"; + + // Act + int sum = StringCalculator.add(numbers); + + // Assert + assertEquals("One number (5)", 5, sum); + } + + @Test + public void testStringCalculator_OneNumber_2() throws StringCalculatorException { + // Arrange + String numbers = "37"; + + // Act + int sum = StringCalculator.add(numbers); + + // Assert + assertEquals("One number (37)", 37, sum); + } + + @Test + public void testStringCalculator_TwoNumbers() throws StringCalculatorException { + // Arrange + String numbers = "3,9"; + + // Act + int sum = StringCalculator.add(numbers); + + // Assert + assertEquals("Two numbers (3, 9)", 12, sum); + } + + @Test + public void testStringCalculator_TwoNumbers_2() throws StringCalculatorException { + // Arrange + String numbers = "50,0"; + + // Act + int sum = StringCalculator.add(numbers); + + // Assert + assertEquals("Two numbers (50, 0)", 50, sum); + } + + @Test + public void testStringCalculator_ManyNumbers() throws StringCalculatorException { + // Arrange + String numbers = "7,7,16"; + + // Act + int sum = StringCalculator.add(numbers); + + // Assert + assertEquals("Many numbers (7, 7, 16)", 30, sum); + } + + @Test + public void testStringCalculator_ManyNumbers_2() throws StringCalculatorException { + // Arrange + String numbers = "1,2,3,4,5,6,7,8,9,100"; + + // Act + int sum = StringCalculator.add(numbers); + + // Assert + assertEquals("Many numbers (1...9, 100)", 145, sum); + } + + @Test + public void testStringCalculator_TwoNumbers_ManyCommas() throws StringCalculatorException { + // Arrange + String numbers = "5,,,8"; + + // Act + int sum = StringCalculator.add(numbers); + + // Assert + assertEquals("Two numbers, many commas (\"5,,,8\")", 13, sum); + } + + @Test + public void testStringCalculator_ManyNumbers_ManyCommas() throws StringCalculatorException { + // Arrange + String numbers = "1,,2,6,,0"; + + // Act + int sum = StringCalculator.add(numbers); + + // Assert + assertEquals("Many numbers, many commas (\"1,,2,6,,0\")", 9, sum); + } + + @Test + public void testStringCalculator_ManyNumbers_NewlineAndComma() throws StringCalculatorException { + // Arrange + String numbers = "1,2\n6"; + + // Act + int sum = StringCalculator.add(numbers); + + // Assert + assertEquals("Many numbers, newline and comma (\"1,2\\n,6\")", 9, sum); + } + + @Test + public void testStringCalculator_ManyNumbers_NewlinesOnly() throws StringCalculatorException { + // Arrange + String numbers = "1\n0\n\n8\n10"; + + // Act + int sum = StringCalculator.add(numbers); + + // Assert + assertEquals("Many numbers, newlines only (\"1\\n0\\n\\n8\\n10\")", 19, sum); + } + + @Test (expected = StringCalculatorException.class) + public void testStringCalculator_NewlineAndCommaNextToEachOther() throws StringCalculatorException { + // Arrange + String numbers = "1\n,2"; + + // Act, should raise an exception + StringCalculator.add(numbers); + } + + @Test (expected = StringCalculatorException.class) + public void testStringCalculator_CommaAndNewlineNextToEachOther() throws StringCalculatorException { + // Arrange + String numbers = "3,\n4"; + + // Act, should raise an exception + StringCalculator.add(numbers); + } + + @Test (expected = StringCalculatorException.class) + public void testStringCalculator_OneNegativeNumber() throws StringCalculatorException { + // Arrange + String numbers = "-100"; + + // Act, should raise an exception + StringCalculator.add(numbers); + } + + @Test (expected = StringCalculatorException.class) + public void testStringCalculator_WithNegativeNumber() throws StringCalculatorException { + // Arrange + String numbers = "4,-5"; + + // Act, should raise an exception + StringCalculator.add(numbers); + } + + @Test (expected = StringCalculatorException.class) + public void testStringCalculator_IllegalCharacters() throws StringCalculatorException { + // Arrange + String numbers = "1,3.6"; + + // Act, should raise an exception + StringCalculator.add(numbers); + } + + @Test (expected = StringCalculatorException.class) + public void testStringCalculator_IllegalCharacters_2() throws StringCalculatorException { + // Arrange + String numbers = "1,3,6,5e2"; + + // Act, should raise an exception + StringCalculator.add(numbers); + } +}