From dbec772d37c372a4699fa272f4c5a3fa07462a03 Mon Sep 17 00:00:00 2001 From: paul Date: Tue, 31 Mar 2020 23:10:07 +0200 Subject: [PATCH] moved Solution to package stream --- src/main/java/{ => stream}/Board.java | 2 ++ src/main/java/{ => stream}/Solution.java | 4 +++- .../java/{ => stream}/SudokuVerifier.java | 2 ++ src/test/java/{ => stream}/SolutionTest.java | 4 +++- src/test/resources/testdata.csv | 20 +++++++++---------- 5 files changed, 20 insertions(+), 12 deletions(-) rename src/main/java/{ => stream}/Board.java (98%) rename src/main/java/{ => stream}/Solution.java (82%) rename src/main/java/{ => stream}/SudokuVerifier.java (96%) rename src/test/java/{ => stream}/SolutionTest.java (97%) diff --git a/src/main/java/Board.java b/src/main/java/stream/Board.java similarity index 98% rename from src/main/java/Board.java rename to src/main/java/stream/Board.java index 569aa57..fff4f7d 100644 --- a/src/main/java/Board.java +++ b/src/main/java/stream/Board.java @@ -1,3 +1,5 @@ +package stream; + import java.util.List; import java.util.stream.IntStream; import java.util.stream.Stream; diff --git a/src/main/java/Solution.java b/src/main/java/stream/Solution.java similarity index 82% rename from src/main/java/Solution.java rename to src/main/java/stream/Solution.java index e09c879..8e0f13f 100644 --- a/src/main/java/Solution.java +++ b/src/main/java/stream/Solution.java @@ -1,3 +1,5 @@ +package stream; + import java.util.List; import java.util.Scanner; import java.util.Spliterator; @@ -5,7 +7,7 @@ import java.util.stream.Collectors; import java.util.stream.StreamSupport; /** - * Solution involving a Sukdoku Board, a SudokuVerifier, plus some Stream processing. + * stream.Solution involving a Sukdoku stream.Board, a stream.SudokuVerifier, plus some Stream processing. **/ class Solution { diff --git a/src/main/java/SudokuVerifier.java b/src/main/java/stream/SudokuVerifier.java similarity index 96% rename from src/main/java/SudokuVerifier.java rename to src/main/java/stream/SudokuVerifier.java index cd4a101..a30c450 100644 --- a/src/main/java/SudokuVerifier.java +++ b/src/main/java/stream/SudokuVerifier.java @@ -1,3 +1,5 @@ +package stream; + import java.util.stream.Stream; public class SudokuVerifier { diff --git a/src/test/java/SolutionTest.java b/src/test/java/stream/SolutionTest.java similarity index 97% rename from src/test/java/SolutionTest.java rename to src/test/java/stream/SolutionTest.java index c5912a4..c9eb1ad 100644 --- a/src/test/java/SolutionTest.java +++ b/src/test/java/stream/SolutionTest.java @@ -1,3 +1,5 @@ +package stream; + import java.io.*; import java.util.stream.Collectors; @@ -34,7 +36,7 @@ class SolutionTest { } @ParameterizedTest - @CsvFileSource( resources = "testdata.csv" ) + @CsvFileSource( resources = "/testdata.csv" ) void main( @ConvertWith( SudokuConverter.class ) final String input, final String expected ) throws IOException { // keep original streams InputStream oldIn = System.in; diff --git a/src/test/resources/testdata.csv b/src/test/resources/testdata.csv index b7a8a83..cdec158 100644 --- a/src/test/resources/testdata.csv +++ b/src/test/resources/testdata.csv @@ -1,10 +1,10 @@ -sudoku1.txt, true -sudoku2.txt, true -sudoku3.txt, false -sudoku4.txt, true -sudoku5.txt, false -sudoku6.txt, true -sudoku7.txt, true -sudoku8.txt, false -sudoku9.txt, false -sudoku10.txt, false \ No newline at end of file +/sudoku1.txt, true +/sudoku2.txt, true +/sudoku3.txt, false +/sudoku4.txt, true +/sudoku5.txt, false +/sudoku6.txt, true +/sudoku7.txt, true +/sudoku8.txt, false +/sudoku9.txt, false +/sudoku10.txt, false \ No newline at end of file