diff --git a/.besouro/20150930115137755/actions.txt b/.besouro/20150930115137755/actions.txt index 5e645161..0dfab216 100644 --- a/.besouro/20150930115137755/actions.txt +++ b/.besouro/20150930115137755/actions.txt @@ -1,8 +1,8 @@ -FileOpenedAction 1443603101760 SudokuVerifier.java 75 1 0 0 -EditAction 1443603121425 SudokuVerifier.java 116 1 1 0 -RefactoringAction 1443603133972 SudokuVerifier.java RENAME verify()=>int verify(String) METHOD -EditAction 1443603167403 SudokuVerifier.java 189 1 1 0 -RefactoringAction 1443603212994 TestSudokuVerifier.java ADD void test() METHOD -RefactoringAction 1443603213121 TestSudokuVerifier.java ADD import org.junit.Assert.* IMPORT -RefactoringAction 1443603213283 TestSudokuVerifier.java ADD TestSudokuVerifier.java CLASS -FileOpenedAction 1443603215695 TestSudokuVerifier.java 202 1 1 0 +FileOpenedAction 1443603101760 SudokuVerifier.java 75 1 0 0 +EditAction 1443603121425 SudokuVerifier.java 116 1 1 0 +RefactoringAction 1443603133972 SudokuVerifier.java RENAME verify()=>int verify(String) METHOD +EditAction 1443603167403 SudokuVerifier.java 189 1 1 0 +RefactoringAction 1443603212994 TestSudokuVerifier.java ADD void test() METHOD +RefactoringAction 1443603213121 TestSudokuVerifier.java ADD import org.junit.Assert.* IMPORT +RefactoringAction 1443603213283 TestSudokuVerifier.java ADD TestSudokuVerifier.java CLASS +FileOpenedAction 1443603215695 TestSudokuVerifier.java 202 1 1 0 diff --git a/.besouro/20151002114139498/actions.txt b/.besouro/20151002114139498/actions.txt new file mode 100644 index 00000000..95a7d53c --- /dev/null +++ b/.besouro/20151002114139498/actions.txt @@ -0,0 +1,100 @@ +FileOpenedAction 1443775299821 TestSudokuVerifier.java 216 1 1 0 +RefactoringAction 1443775858822 TestSudokuVerifier.java RENAME test()=>void testIfThe() METHOD +RefactoringAction 1443775861339 TestSudokuVerifier.java RENAME testIfThe()=>void testIfTheStringIs() METHOD +RefactoringAction 1443775872856 TestSudokuVerifier.java RENAME testIfTheStringIs()=>void testIfTheStringIs81Characters() METHOD +RefactoringAction 1443775874873 TestSudokuVerifier.java RENAME testIfTheStringIs81Characters()=>void testIfTheStringIs81CharactersLong() METHOD +RefactoringAction 1443776337170 SudokuVerifier.java ADD SudokuVerifier(String) METHOD +RefactoringAction 1443776386295 SudokuVerifier.java REMOVE SudokuVerifier(String) METHOD +EditAction 1443776745761 TestSudokuVerifier.java 413 1 3 1 +CompilationAction 1443776746067 TestSudokuVerifier.java +CompilationAction 1443777333078 TestSudokuVerifier.java +CompilationAction 1443777333237 TestSudokuVerifier.java +RefactoringAction 1443777425867 SudokuVerifier.java ADD String candidateSolution FIELD +RefactoringAction 1443777462424 SudokuVerifier.java ADD SudokuVerifier() METHOD +EditAction 1443777489153 SudokuVerifier.java 281 2 1 0 +CompilationAction 1443777489442 TestSudokuVerifier.java +EditAction 1443777548437 SudokuVerifier.java 309 2 2 0 +UnitTestCaseAction 1443777551773 TestSudokuVerifier.java FAIL +UnitTestSessionAction 1443777551776 TestSudokuVerifier FAIL +RefactoringAction 1443777601506 SudokuVerifier.java ADD String getCandidateSolution() METHOD +RefactoringAction 1443777601508 SudokuVerifier.java ADD void setCandidateSolution(String) METHOD +RefactoringAction 1443777615019 SudokuVerifier.java REMOVE setCandidateSolution(String) METHOD +EditAction 1443777819145 SudokuVerifier.java 380 3 3 0 +CompilationAction 1443777819230 TestSudokuVerifier.java +UnitTestCaseAction 1443777819451 TestSudokuVerifier.java FAIL +UnitTestSessionAction 1443777819452 TestSudokuVerifier FAIL +RefactoringAction 1443778027156 SudokuVerifier.java REMOVE candidateSolution FIELD +RefactoringAction 1443778033177 SudokuVerifier.java RENAME getCandidateSolution()=> null +EditAction 1443778143029 SudokuVerifier.java 481 2 1 0 +EditAction 1443778143103 TestSudokuVerifier.java 652 1 3 1 +UnitTestCaseAction 1443778143422 TestSudokuVerifier.java OK +UnitTestSessionAction 1443778143423 TestSudokuVerifier OK +EditAction 1443778156351 TestSudokuVerifier.java 651 1 3 1 +UnitTestCaseAction 1443778156644 TestSudokuVerifier.java FAIL +UnitTestSessionAction 1443778156645 TestSudokuVerifier FAIL +EditAction 1443778160302 TestSudokuVerifier.java 652 1 3 1 +UnitTestCaseAction 1443778160615 TestSudokuVerifier.java OK +UnitTestSessionAction 1443778160615 TestSudokuVerifier OK +EditAction 1443778404846 SudokuVerifier.java 335 2 1 0 +EditAction 1443778404928 TestSudokuVerifier.java 651 1 3 1 +UnitTestCaseAction 1443778405229 TestSudokuVerifier.java OK +UnitTestSessionAction 1443778405229 TestSudokuVerifier OK +EditAction 1443778418122 TestSudokuVerifier.java 652 1 3 1 +UnitTestCaseAction 1443778418427 TestSudokuVerifier.java FAIL +UnitTestSessionAction 1443778418428 TestSudokuVerifier FAIL +EditAction 1443778422354 TestSudokuVerifier.java 651 1 3 1 +UnitTestCaseAction 1443778422670 TestSudokuVerifier.java OK +UnitTestSessionAction 1443778422671 TestSudokuVerifier OK +RefactoringAction 1443778549757 TestSudokuVerifier.java ADD void setup() METHOD +RefactoringAction 1443778556983 TestSudokuVerifier.java ADD import org.junit.Before IMPORT +RefactoringAction 1443778581826 TestSudokuVerifier.java REMOVE setup() METHOD +EditAction 1443778602187 TestSudokuVerifier.java 513 1 3 1 +EditAction 1443778674907 SudokuVerifier.java 403 2 1 0 +EditAction 1443778716242 TestSudokuVerifier.java 511 1 3 1 +EditAction 1443778955353 TestSudokuVerifier.java 556 1 3 1 +RefactoringAction 1443779224254 TestSudokuVerifier.java ADD void testIfTheStringIs81CharactersLong()/2 METHOD +RefactoringAction 1443779303309 TestSudokuVerifier.java RENAME testIfTheStringIs81CharactersLong()/2=>void testIf() METHOD +RefactoringAction 1443779307325 TestSudokuVerifier.java RENAME testIf()=>void testIfThe() METHOD +RefactoringAction 1443779326341 TestSudokuVerifier.java RENAME testIfTheStringIs81CharactersLong()=>void testIfCandidateSolution81CharactersLong() METHOD +RefactoringAction 1443779333856 TestSudokuVerifier.java RENAME testIfThe()=>void testIfCandidateSolution() METHOD +RefactoringAction 1443779336870 TestSudokuVerifier.java RENAME testIfCandidateSolution()=>void testIfCandidateSolutionIs() METHOD +RefactoringAction 1443779341387 TestSudokuVerifier.java RENAME testIfCandidateSolution81CharactersLong()=>void testIfCandidateSolutionIs81CharactersLong() METHOD +RefactoringAction 1443779405404 TestSudokuVerifier.java RENAME testIfCandidateSolutionIs()=>void testIfCandidateSolutionDigitsArePositive() METHOD +EditAction 1443779983259 SudokuVerifier.java 582 2 1 0 +EditAction 1443779983361 TestSudokuVerifier.java 914 2 6 2 +UnitTestCaseAction 1443779984550 TestSudokuVerifier.java FAIL +UnitTestSessionAction 1443779984551 TestSudokuVerifier FAIL +RefactoringAction 1443780009877 SudokuVerifier.java ADD import org.apache.commons.lang3.StringUtils IMPORT +RefactoringAction 1443780206588 SudokuVerifier.java ADD import org.apache.commons.lang3.StringUtils IMPORT +CompilationAction 1443780826189 Sudoku +RefactoringAction 1443780936951 SudokuVerifier.java RENAME import org.apache.commons.lang3.StringUtils=>import apache.commons.lang3.StringUtils IMPORT +RefactoringAction 1443780938462 SudokuVerifier.java RENAME import apache.commons.lang3.StringUtils=>import org.apache.commons.lang3.StringUtils IMPORT +RefactoringAction 1443781254024 SudokuVerifier.java ADD import com.sun.xml.internal.ws.util.StringUtils IMPORT +RefactoringAction 1443781618801 SudokuVerifier.java RENAME import com.sun.xml.internal.ws.util.StringUtils=>import org.apache.commons.lang3.StringUtils IMPORT +EditAction 1443781629527 SudokuVerifier.java 724 2 2 0 +CompilationAction 1443781629749 Sudoku +CompilationAction 1443781630805 Sudoku +CompilationAction 1443781633023 Sudoku +CompilationAction 1443781728907 Sudoku +CompilationAction 1443781853997 Sudoku +CompilationAction 1443781860584 Sudoku +CompilationAction 1443781943881 Sudoku +UnitTestCaseAction 1443781997511 TestSudokuVerifier.java FAIL +UnitTestSessionAction 1443781997511 TestSudokuVerifier FAIL +UnitTestCaseAction 1443782057431 TestSudokuVerifier.java FAIL +UnitTestSessionAction 1443782057433 TestSudokuVerifier FAIL +EditAction 1443782096762 TestSudokuVerifier.java 915 2 6 2 +UnitTestCaseAction 1443782097061 TestSudokuVerifier.java OK +UnitTestSessionAction 1443782097062 TestSudokuVerifier OK +EditAction 1443782116911 TestSudokuVerifier.java 932 2 6 2 +UnitTestCaseAction 1443782117220 TestSudokuVerifier.java OK +UnitTestSessionAction 1443782117221 TestSudokuVerifier OK +EditAction 1443782122354 TestSudokuVerifier.java 933 2 6 2 +UnitTestCaseAction 1443782122680 TestSudokuVerifier.java OK +UnitTestSessionAction 1443782122680 TestSudokuVerifier OK +EditAction 1443782177834 SudokuVerifier.java 737 2 2 0 +RefactoringAction 1443782803307 TestSudokuVerifier.java REMOVE import org.junit.Before IMPORT +UnitTestCaseAction 1443783221229 TestSudokuVerifier.java OK +UnitTestSessionAction 1443783221230 TestSudokuVerifier OK +UnitTestCaseAction 1443783248837 TestSudokuVerifier.java OK +UnitTestSessionAction 1443783248837 TestSudokuVerifier OK diff --git a/.besouro/20151002114139498/besouroEpisodes.txt b/.besouro/20151002114139498/besouroEpisodes.txt new file mode 100644 index 00000000..680aa328 --- /dev/null +++ b/.besouro/20151002114139498/besouroEpisodes.txt @@ -0,0 +1,54 @@ +1443778143423 test-first 1 2843 true +1443778143424 test-first 1 2843 true +1443778143425 test-first 1 2843 true +1443778143426 test-first 1 2843 true +1443778143427 test-first 1 2843 true +1443778143428 test-first 1 2843 true +1443778143429 test-first 1 2843 true +1443778143430 test-first 1 2843 true +1443778143431 test-first 1 2843 true +1443778143432 test-first 1 2843 true +1443778143433 test-first 1 2843 true +1443778143434 test-first 1 2843 true +1443778143435 test-first 1 2843 true +1443778143436 test-first 1 2843 true +1443778143437 test-first 1 2843 true +1443778143438 test-first 1 2843 true +1443778143439 test-first 1 2843 true +1443778143440 test-first 1 2843 true +1443778143441 test-first 1 2843 true +1443778143442 test-first 1 2843 true +1443778143443 test-first 1 2843 true +1443778143444 test-first 1 2843 true +1443778143445 test-first 1 2843 true +1443778143446 test-first 1 2843 true +1443778143447 test-first 1 2843 true +1443778143448 test-first 1 2843 true +1443778143449 test-first 1 2843 true +1443778143450 test-first 1 2843 true +1443778143451 test-first 1 2843 true +1443778143452 test-first 1 2843 true +1443778143453 test-first 1 2843 true +1443778143454 test-first 1 2843 true +1443778143455 test-first 1 2843 true +1443778143456 test-first 1 2843 true +1443778143457 test-first 1 2843 true +1443778143458 test-first 1 2843 true +1443778143459 test-first 1 2843 true +1443778143460 test-first 1 2843 true +1443778143461 test-first 1 2843 true +1443778160615 regression 2 4 true +1443778405229 refactoring 2A 0 true +1443778422671 regression 2 4 true +1443782097062 test-first 3 3547 true +1443782097063 test-first 3 3547 true +1443782097064 test-last 1 3547 false +1443782097065 test-first 3 3547 true +1443782097066 test-last 1 3547 false +1443782097067 test-last 1 3547 false +1443782117221 regression 1 0 true +1443782122680 regression 1 0 true +1443783221230 refactoring 3 1043 true +1443783221231 refactoring 3 1043 true +1443783221232 refactoring 2A 1043 true +1443783248837 regression 1 0 true diff --git a/.besouro/20151002114139498/disagreements.txt b/.besouro/20151002114139498/disagreements.txt new file mode 100644 index 00000000..e69de29b diff --git a/.besouro/20151002114139498/randomHeuristicEpisodes.txt b/.besouro/20151002114139498/randomHeuristicEpisodes.txt new file mode 100644 index 00000000..f817bdca --- /dev/null +++ b/.besouro/20151002114139498/randomHeuristicEpisodes.txt @@ -0,0 +1,9 @@ +1443778143423 test-first 1 2843 true +1443778160615 regression 2 4 true +1443778405229 refactoring 2A 0 true +1443778422671 regression 2 4 true +1443782097062 test-first 3 3547 true +1443782117221 regression 1 0 true +1443782122680 regression 1 0 false +1443783221230 refactoring 3 1043 true +1443783248837 regression 1 0 false diff --git a/.besouro/20151002114139498/userComments.txt b/.besouro/20151002114139498/userComments.txt new file mode 100644 index 00000000..e69de29b diff --git a/.besouro/20151002114139498/zorroEpisodes.txt b/.besouro/20151002114139498/zorroEpisodes.txt new file mode 100644 index 00000000..f39ee7dc --- /dev/null +++ b/.besouro/20151002114139498/zorroEpisodes.txt @@ -0,0 +1,9 @@ +1443778143423 test-first 1 2843 true +1443778160615 regression 2 17 true +1443778405229 refactoring 2A 244 true +1443778422671 regression 2 17 true +1443782097062 test-first 3 3674 true +1443782117221 regression 1 20 true +1443782122680 regression 1 5 true +1443783221230 refactoring 3 1098 true +1443783248837 regression 1 27 true diff --git a/.classpath b/.classpath index 3e0fb272..131a7b0f 100644 --- a/.classpath +++ b/.classpath @@ -1,7 +1,8 @@ - - - - - - - + + + + + + + + diff --git a/.gitignore b/.gitignore index ed9f7620..4e9f5ccf 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -/bin/ +/bin/ .DS_Store \ No newline at end of file diff --git a/.project b/.project index b273577a..fe8c58e6 100644 --- a/.project +++ b/.project @@ -1,17 +1,17 @@ - - - Sudoku - - - - - - org.eclipse.jdt.core.javabuilder - - - - - - org.eclipse.jdt.core.javanature - - + + + Sudoku + + + + + + org.eclipse.jdt.core.javabuilder + + + + + + org.eclipse.jdt.core.javanature + + diff --git a/README.md b/README.md index badc70df..e840d8d4 100644 --- a/README.md +++ b/README.md @@ -1 +1 @@ -# Sudoku +# Sudoku diff --git a/src/org/univoulu/tol/sqatlab/sudoku/SudokuVerifier.java b/src/org/univoulu/tol/sqatlab/sudoku/SudokuVerifier.java index a4b68fe7..b0194d35 100644 --- a/src/org/univoulu/tol/sqatlab/sudoku/SudokuVerifier.java +++ b/src/org/univoulu/tol/sqatlab/sudoku/SudokuVerifier.java @@ -1,9 +1,34 @@ -package org.univoulu.tol.sqatlab.sudoku; - -public class SudokuVerifier { - - public int verify(String candidateSolution) { - // returns 1 if the candidate solution is correct - return 0; - } -} +package org.univoulu.tol.sqatlab.sudoku; +import org.apache.commons.lang3.StringUtils; + +public class SudokuVerifier { + + + + public SudokuVerifier(){ + + } + + + + public int verify(String candidateSolution) { + + //is candicateSolution correct length? + if (candidateSolution.length() != 81) + { + //returns -1 if candidateSolution's length is different than 81 + return -1; + } + //does candidateSolution consist only of positive numeric digits? + if (StringUtils.containsOnly(candidateSolution, "123456789") == false) + { + //returns -1 if candidateSolution contains digits which are not positive + return -1; + } + else{ + // returns 0 if the candidate solution is correct + return 0; + } + + } +} diff --git a/src/org/univoulu/tol/sqatlab/sudoku/TestSudokuVerifier.java b/src/org/univoulu/tol/sqatlab/sudoku/TestSudokuVerifier.java index c0c92901..69c79122 100644 --- a/src/org/univoulu/tol/sqatlab/sudoku/TestSudokuVerifier.java +++ b/src/org/univoulu/tol/sqatlab/sudoku/TestSudokuVerifier.java @@ -1,14 +1,34 @@ -package org.univoulu.tol.sqatlab.sudoku; - -import static org.junit.Assert.*; - -import org.junit.Test; - -public class TestSudokuVerifier { - - @Test - public void test() { - fail("Not yet implemented"); - } - -} +package org.univoulu.tol.sqatlab.sudoku; + +import static org.junit.Assert.*; + +//import org.junit.Before; +import org.junit.Test; + +public class TestSudokuVerifier { + + + @Test + public void testIfCandidateSolutionIs81CharactersLong() { + + SudokuVerifier verifier = new SudokuVerifier(); + + //expects 0 when the string is correct length + int expected = 0, actual = verifier.verify("417369825632158947958724316825437169791586432346912758289643571573291684164875293"); + + assertEquals(expected, actual); + //fail("Not yet implemented"); + } + + @Test + public void testIfCandidateSolutionDigitsArePositive() { + + SudokuVerifier verifier = new SudokuVerifier(); + + //expects -1 when the string is incorrect (negative number) + int expected = -1, actual = verifier.verify("-123456789912345678891234567789123456678912345567891234456789123345678912234567891"); + + assertEquals(expected, actual); + } + +}