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/20151002114049827/actions.txt b/.besouro/20151002114049827/actions.txt new file mode 100644 index 00000000..e1d8857f --- /dev/null +++ b/.besouro/20151002114049827/actions.txt @@ -0,0 +1,32 @@ +FileOpenedAction 1443775250148 SudokuVerifier.java 198 1 1 0 +RefactoringAction 1443776476771 Game.java ADD Game.java CLASS +FileOpenedAction 1443776476929 Game.java 70 0 0 0 +RefactoringAction 1443776786751 SudokuVerifier.java ADD boolean solutionIsValid() METHOD +RefactoringAction 1443776847222 TestSudokuVerifier.java RENAME test()=> null +RefactoringAction 1443776851734 TestSudokuVerifier.java RENAME =>void s() METHOD +RefactoringAction 1443776854242 TestSudokuVerifier.java RENAME s()=>void sudoku() METHOD +RefactoringAction 1443776862756 TestSudokuVerifier.java RENAME sudoku()=>void test() METHOD +RefactoringAction 1443776868767 TestSudokuVerifier.java RENAME test()=>void testSolutionIsValid() METHOD +RefactoringAction 1443778066478 SudokuVerifier.java REMOVE solutionIsValid() METHOD +EditAction 1443778580287 TestSudokuVerifier.java 346 1 4 1 +EditAction 1443778580443 SudokuVerifier.java 262 1 1 0 +UnitTestCaseAction 1443778581285 TestSudokuVerifier.java OK +UnitTestSessionAction 1443778581287 TestSudokuVerifier OK +EditAction 1443778609618 TestSudokuVerifier.java 346 1 4 1 +UnitTestCaseAction 1443778609910 TestSudokuVerifier.java FAIL +UnitTestSessionAction 1443778609910 TestSudokuVerifier FAIL +EditAction 1443778632294 TestSudokuVerifier.java 321 1 3 1 +CompilationAction 1443778632405 TestSudokuVerifier.java +UnitTestCaseAction 1443778633475 TestSudokuVerifier.java FAIL +UnitTestSessionAction 1443778633475 TestSudokuVerifier FAIL +CompilationAction 1443778781633 TestSudokuVerifier.java +UnitTestCaseAction 1443778781868 TestSudokuVerifier.java OK +UnitTestSessionAction 1443778781868 TestSudokuVerifier OK +RefactoringAction 1443779454568 Game.java ADD List rows FIELD +RefactoringAction 1443779454569 Game.java ADD List columns FIELD +RefactoringAction 1443779454569 Game.java ADD List blocks FIELD +EditAction 1443779735848 SudokuVerifier.java 346 1 2 0 +EditAction 1443779738666 TestSudokuVerifier.java 364 1 4 1 +UnitTestCaseAction 1443779738960 TestSudokuVerifier.java OK +UnitTestSessionAction 1443779738961 TestSudokuVerifier OK +EditAction 1443779773477 SudokuVerifier.java 383 1 3 0 diff --git a/.besouro/20151002114049827/besouroEpisodes.txt b/.besouro/20151002114049827/besouroEpisodes.txt new file mode 100644 index 00000000..c3509e83 --- /dev/null +++ b/.besouro/20151002114049827/besouroEpisodes.txt @@ -0,0 +1,51 @@ +1443778581287 refactoring 3 3331 true +1443778581288 refactoring 3 3331 true +1443778581289 refactoring 3 3331 true +1443778581290 refactoring 3 3331 true +1443778581291 refactoring 3 3331 true +1443778581292 refactoring 3 3331 true +1443778581293 refactoring 3 3331 true +1443778581294 refactoring 3 3331 true +1443778581295 refactoring 3 3331 true +1443778581296 refactoring 3 3331 true +1443778581297 refactoring 3 3331 true +1443778581298 refactoring 3 3331 true +1443778581299 refactoring 2A 3331 true +1443778581300 refactoring 3 3331 true +1443778581301 refactoring 3 3331 true +1443778581302 refactoring 3 3331 true +1443778581303 refactoring 3 3331 true +1443778581304 refactoring 3 3331 true +1443778581305 refactoring 3 3331 true +1443778581306 refactoring 3 3331 true +1443778581307 refactoring 3 3331 true +1443778581308 refactoring 3 3331 true +1443778581309 refactoring 3 3331 true +1443778581310 refactoring 3 3331 true +1443778581311 refactoring 3 3331 true +1443778581312 refactoring 3 3331 true +1443778581313 refactoring 3 3331 true +1443778581314 refactoring 3 3331 true +1443778581315 refactoring 3 3331 true +1443778581316 refactoring 3 3331 true +1443778581317 refactoring 3 3331 true +1443778581318 refactoring 3 3331 true +1443778581319 refactoring 3 3331 true +1443778581320 refactoring 3 3331 true +1443778581321 refactoring 3 3331 true +1443778581322 refactoring 3 3331 true +1443778581323 refactoring 3 3331 true +1443778581324 refactoring 3 3331 true +1443778581325 refactoring 3 3331 true +1443778581326 refactoring 3 3331 true +1443778581327 refactoring 3 3331 true +1443778581328 refactoring 3 3331 true +1443778581329 refactoring 3 3331 true +1443778581330 refactoring 3 3331 true +1443778581331 refactoring 3 3331 true +1443778581332 refactoring 3 3331 true +1443778781868 refactoring 1A 172 true +1443779738961 refactoring 3 284 true +1443779738962 refactoring 3 284 true +1443779738963 refactoring 3 284 true +1443779738964 refactoring 3 284 true diff --git a/.besouro/20151002114049827/disagreements.txt b/.besouro/20151002114049827/disagreements.txt new file mode 100644 index 00000000..e69de29b diff --git a/.besouro/20151002114049827/randomHeuristicEpisodes.txt b/.besouro/20151002114049827/randomHeuristicEpisodes.txt new file mode 100644 index 00000000..47c9a525 --- /dev/null +++ b/.besouro/20151002114049827/randomHeuristicEpisodes.txt @@ -0,0 +1,3 @@ +1443778581287 refactoring 3 3331 false +1443778781868 refactoring 1A 172 false +1443779738961 refactoring 3 284 true diff --git a/.besouro/20151002114049827/userComments.txt b/.besouro/20151002114049827/userComments.txt new file mode 100644 index 00000000..e69de29b diff --git a/.besouro/20151002114049827/zorroEpisodes.txt b/.besouro/20151002114049827/zorroEpisodes.txt new file mode 100644 index 00000000..06aafe59 --- /dev/null +++ b/.besouro/20151002114049827/zorroEpisodes.txt @@ -0,0 +1,3 @@ +1443778581287 refactoring 3 3331 false +1443778781868 refactoring 1A 200 false +1443779738961 refactoring 3 957 false diff --git a/.besouro/20151008230345148/actions.txt b/.besouro/20151008230345148/actions.txt new file mode 100644 index 00000000..a3275559 --- /dev/null +++ b/.besouro/20151008230345148/actions.txt @@ -0,0 +1 @@ +FileOpenedAction 1444334625433 TestSudokuVerifier.java 364 4 16 4 diff --git a/.besouro/20151008230345148/besouroEpisodes.txt b/.besouro/20151008230345148/besouroEpisodes.txt new file mode 100644 index 00000000..e69de29b diff --git a/.besouro/20151008230345148/disagreements.txt b/.besouro/20151008230345148/disagreements.txt new file mode 100644 index 00000000..e69de29b diff --git a/.besouro/20151008230345148/randomHeuristicEpisodes.txt b/.besouro/20151008230345148/randomHeuristicEpisodes.txt new file mode 100644 index 00000000..e69de29b diff --git a/.besouro/20151008230345148/userComments.txt b/.besouro/20151008230345148/userComments.txt new file mode 100644 index 00000000..e69de29b diff --git a/.besouro/20151008230345148/zorroEpisodes.txt b/.besouro/20151008230345148/zorroEpisodes.txt new file mode 100644 index 00000000..e69de29b diff --git a/.besouro/2015100823043225/actions.txt b/.besouro/2015100823043225/actions.txt new file mode 100644 index 00000000..62b88701 --- /dev/null +++ b/.besouro/2015100823043225/actions.txt @@ -0,0 +1,86 @@ +FileOpenedAction 1444334672136 TestSudokuVerifier.java 364 4 16 4 +RefactoringAction 1444334838873 TestSudokuVerifier.java RENAME testSudokuRule1()=>void testSudoku() METHOD +RefactoringAction 1444334842385 TestSudokuVerifier.java RENAME testSudoku()=>void testSudokuOnlyPositive() METHOD +RefactoringAction 1444334846911 TestSudokuVerifier.java RENAME testSudokuOnlyPositive()=>void testSudokuOnlyPositiveDigitsRule1() METHOD +RefactoringAction 1444334858931 TestSudokuVerifier.java RENAME testSudokuRule2()=>void testSudokuAllRule2() METHOD +RefactoringAction 1444334863942 TestSudokuVerifier.java RENAME testSudokuAllRule2()=>void testSudokuAllDigitsAppearOnceRule2() METHOD +RefactoringAction 1444334881095 TestSudokuVerifier.java RENAME testSudokuAllDigitsAppearOnceRule2()=>void testSudokuAllDigitsAppearOnceInSubRule2() METHOD +RefactoringAction 1444334884107 TestSudokuVerifier.java RENAME testSudokuAllDigitsAppearOnceInSubRule2()=>void testSudokuAllDigitsAppearOnceInSubgridRule2() METHOD +RefactoringAction 1444334919651 TestSudokuVerifier.java RENAME testSudokuRule3()=>void testSudokuRowsRule3() METHOD +RefactoringAction 1444334927167 TestSudokuVerifier.java ADD void testSudokuRowsRule3()/2 METHOD +RefactoringAction 1444334930179 TestSudokuVerifier.java RENAME testSudokuRowsRule3()/2=>void testSudokuCRule3() METHOD +RefactoringAction 1444334933191 TestSudokuVerifier.java RENAME testSudokuCRule3()=>void testSudokuColumnsRule3() METHOD +RefactoringAction 1444334935703 TestSudokuVerifier.java RENAME testSudokuColumnsRule3()=>void testSudokuColumnsRule4() METHOD +EditAction 1444341127012 TestSudokuVerifier.java 1327 5 20 5 +RefactoringAction 1444342040172 TestSudokuVerifier.java ADD String incorretSudoku FIELD +RefactoringAction 1444342134784 TestSudokuVerifier.java ADD String correctSudoku FIELD +FileOpenedAction 1444342266267 SudokuVerifier.java 383 1 3 0 +RefactoringAction 1444342472849 SudokuVerifier.java ADD String incorretSudoku FIELD +RefactoringAction 1444342472850 SudokuVerifier.java ADD String correctSudoku FIELD +RefactoringAction 1444342911943 TestSudokuVerifier.java RENAME incorretSudoku=>SudokuVerifier String FIELD +RefactoringAction 1444342915955 TestSudokuVerifier.java RENAME String=>SudokuVerifier veri FIELD +RefactoringAction 1444342917969 TestSudokuVerifier.java RENAME veri=>SudokuVerifier sv FIELD +RefactoringAction 1444342919983 TestSudokuVerifier.java RENAME sv=>SudokuVerifier sverify FIELD +RefactoringAction 1444342925497 TestSudokuVerifier.java RENAME sverify=>SudokuVerifier sVerify FIELD +RefactoringAction 1444342971065 TestSudokuVerifier.java ADD void setup FIELD +RefactoringAction 1444342973578 TestSudokuVerifier.java RENAME setup=>void setup() METHOD +RefactoringAction 1444343038012 SudokuVerifier.java REMOVE correctSudoku FIELD +RefactoringAction 1444343038013 SudokuVerifier.java REMOVE incorretSudoku FIELD +EditAction 1444343045193 SudokuVerifier.java 318 1 1 0 +CompilationAction 1444343045792 SudokuVerifier.java +CompilationAction 1444343045792 SudokuVerifier.java +RefactoringAction 1444343200673 TestSudokuVerifier.java REMOVE testSudokuRowsRule3() METHOD +RefactoringAction 1444343200673 TestSudokuVerifier.java REMOVE testSudokuColumnsRule4() METHOD +RefactoringAction 1444343200673 TestSudokuVerifier.java REMOVE testSudokuAllDigitsAppearOnceInSubgridRule2() METHOD +CompilationAction 1444343263255 SudokuVerifier.java +CompilationAction 1444343263255 SudokuVerifier.java +CompilationAction 1444343263414 SudokuVerifier.java +EditAction 1444343268236 TestSudokuVerifier.java 1599 3 8 2 +CompilationAction 1444343410456 SudokuVerifier.java +RefactoringAction 1444343552734 TestSudokuVerifier.java REMOVE testSolutionIsValid() METHOD +RefactoringAction 1444343976035 TestSudokuVerifier.java RENAME setup()=>void init() METHOD +EditAction 1444343981453 TestSudokuVerifier.java 1137 2 4 1 +UnitTestCaseAction 1444343981869 TestSudokuVerifier.java OK +UnitTestSessionAction 1444343981872 TestSudokuVerifier OK +RefactoringAction 1444344150905 TestSudokuVerifier.java RENAME incorretSudoku=>String incorrectSudoku FIELD +EditAction 1444344359736 TestSudokuVerifier.java 1111 2 3 1 +UnitTestCaseAction 1444344363523 TestSudokuVerifier.java FAIL +UnitTestSessionAction 1444344363523 TestSudokuVerifier FAIL +EditAction 1444344522577 TestSudokuVerifier.java 1113 2 3 1 +UnitTestCaseAction 1444344522976 TestSudokuVerifier.java FAIL +UnitTestSessionAction 1444344522977 TestSudokuVerifier FAIL +EditAction 1444344596717 TestSudokuVerifier.java 1121 2 4 1 +UnitTestCaseAction 1444344597115 TestSudokuVerifier.java FAIL +UnitTestSessionAction 1444344597115 TestSudokuVerifier FAIL +EditAction 1444344876899 TestSudokuVerifier.java 1123 2 4 1 +UnitTestCaseAction 1444344879149 TestSudokuVerifier.java FAIL +UnitTestSessionAction 1444344879150 TestSudokuVerifier FAIL +EditAction 1444344894865 TestSudokuVerifier.java 1123 2 4 1 +EditAction 1444344900773 TestSudokuVerifier.java 1123 2 4 1 +EditAction 1444345173364 TestSudokuVerifier.java 1167 2 5 1 +UnitTestCaseAction 1444345173772 TestSudokuVerifier.java FAIL +UnitTestSessionAction 1444345173772 TestSudokuVerifier FAIL +EditAction 1444345241520 TestSudokuVerifier.java 1171 2 5 1 +UnitTestCaseAction 1444345241933 TestSudokuVerifier.java FAIL +UnitTestSessionAction 1444345241933 TestSudokuVerifier FAIL +EditAction 1444345259091 TestSudokuVerifier.java 1282 2 6 1 +UnitTestCaseAction 1444345259503 TestSudokuVerifier.java FAIL +UnitTestSessionAction 1444345259503 TestSudokuVerifier FAIL +EditAction 1444345276929 TestSudokuVerifier.java 1171 2 5 1 +EditAction 1444345286777 TestSudokuVerifier.java 1173 2 5 1 +UnitTestCaseAction 1444345288718 TestSudokuVerifier.java FAIL +UnitTestSessionAction 1444345288718 TestSudokuVerifier FAIL +EditAction 1444345300758 SudokuVerifier.java 342 1 2 0 +UnitTestCaseAction 1444345303791 TestSudokuVerifier.java FAIL +UnitTestSessionAction 1444345303792 TestSudokuVerifier FAIL +EditAction 1444345336338 SudokuVerifier.java 352 1 2 0 +EditAction 1444345429743 SudokuVerifier.java 351 1 2 0 +EditAction 1444345430811 TestSudokuVerifier.java 1129 2 4 1 +UnitTestCaseAction 1444345432424 TestSudokuVerifier.java FAIL +UnitTestSessionAction 1444345432424 TestSudokuVerifier FAIL +EditAction 1444345436762 TestSudokuVerifier.java 1131 2 4 1 +EditAction 1444345439528 TestSudokuVerifier.java 1129 2 4 1 +EditAction 1444345439689 SudokuVerifier.java 352 1 2 0 +UnitTestCaseAction 1444345440126 TestSudokuVerifier.java FAIL +UnitTestSessionAction 1444345440126 TestSudokuVerifier FAIL +EditAction 1444345569643 SudokuVerifier.java 436 1 2 0 diff --git a/.besouro/2015100823043225/besouroEpisodes.txt b/.besouro/2015100823043225/besouroEpisodes.txt new file mode 100644 index 00000000..4ea7aab4 --- /dev/null +++ b/.besouro/2015100823043225/besouroEpisodes.txt @@ -0,0 +1,2 @@ +1444343981872 test-first 4 9309 true +1444343981873 test-first 4 9309 true diff --git a/.besouro/2015100823043225/disagreements.txt b/.besouro/2015100823043225/disagreements.txt new file mode 100644 index 00000000..e69de29b diff --git a/.besouro/2015100823043225/randomHeuristicEpisodes.txt b/.besouro/2015100823043225/randomHeuristicEpisodes.txt new file mode 100644 index 00000000..4c7b2d90 --- /dev/null +++ b/.besouro/2015100823043225/randomHeuristicEpisodes.txt @@ -0,0 +1 @@ +1444343981872 test-first 4 9309 true diff --git a/.besouro/2015100823043225/userComments.txt b/.besouro/2015100823043225/userComments.txt new file mode 100644 index 00000000..e69de29b diff --git a/.besouro/2015100823043225/zorroEpisodes.txt b/.besouro/2015100823043225/zorroEpisodes.txt new file mode 100644 index 00000000..4c7b2d90 --- /dev/null +++ b/.besouro/2015100823043225/zorroEpisodes.txt @@ -0,0 +1 @@ +1444343981872 test-first 4 9309 true diff --git a/.classpath b/.classpath index 3e0fb272..2d749757 100644 --- a/.classpath +++ b/.classpath @@ -1,7 +1,7 @@ - - - - - - - + + + + + + + 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..49b176c9 100644 --- a/src/org/univoulu/tol/sqatlab/sudoku/SudokuVerifier.java +++ b/src/org/univoulu/tol/sqatlab/sudoku/SudokuVerifier.java @@ -1,9 +1,22 @@ -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; + +public class SudokuVerifier { + + public int verify(String candidateSolution) { + + // returns -1 if the string has other than positive digits in string. + + for(char c: candidateSolution.toCharArray()){ + if(!Character.isDigit(c) || c == '-') { + return -1; + } + + if(candidateSolution != null){ + System.out.println("Jeeeeeee!"); + } + } + + return 0; + } + +} diff --git a/src/org/univoulu/tol/sqatlab/sudoku/TestSudokuVerifier.java b/src/org/univoulu/tol/sqatlab/sudoku/TestSudokuVerifier.java index c0c92901..843b8ae5 100644 --- a/src/org/univoulu/tol/sqatlab/sudoku/TestSudokuVerifier.java +++ b/src/org/univoulu/tol/sqatlab/sudoku/TestSudokuVerifier.java @@ -1,14 +1,50 @@ -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.Test; + +public class TestSudokuVerifier { + + SudokuVerifier sVerify; + String incorrectSudoku = "a23456789912345678891234567789123456678912345567891234456789123345678912234567891"; + String correctSudoku = "417369825632158947958724316825437169791586432346912758289643571573291684164875293"; + + public void init(){ + sVerify = new SudokuVerifier(); + } + + @Test + public void testSudokuOnlyPositiveDigitsRule1() { + int checked = 0; + checked = sVerify.verify(incorrectSudoku); + + assertEquals(-1, checked); + } + +/* public void testSudokuAllDigitsAppearOnceInSubgridRule2() { + String actual = "123456789"; + String expected = "123456789"; + + + assertEquals(actual, expected); + } + + public void testSudokuRowsRule3() { + String actual = "123456789"; + String expected = "123456789"; + + + assertEquals(actual, expected); + } + + public void testSudokuColumnsRule4() { + String actual = "123456789"; + String expected = "123456789"; + + + assertEquals(actual, expected); + } + */ + +}