diff --git a/.idea/compiler.xml b/.idea/compiler.xml index b0713f4..0531354 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -10,7 +10,7 @@ - + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 7c00046..01a5e6d 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -1,7 +1,19 @@ - + + + + + + + + + + + + + + + + + + @@ -79,26 +97,26 @@ - + - - + + - - + + - - + + - - + + - + diff --git a/log.log b/log.log index 5466f58..3d3517e 100644 --- a/log.log +++ b/log.log @@ -21,3 +21,7 @@ 2020-04-02 22:03:04 INFO VerifyPesel:18 - Running the test code in VerifyPeselTest 2020-04-02 22:03:04 INFO VerifyPesel:18 - Running the test code in VerifyPeselTest 2020-04-02 22:03:04 INFO VerifyPesel:18 - Running the test code in VerifyPeselTest +2020-04-04 23:10:21 INFO AddToFile:19 - Running the test code in AddToFileTest +2020-04-04 23:10:22 INFO VerifyPesel:18 - Running the test code in VerifyPeselTest +2020-04-04 23:10:22 INFO VerifyPesel:18 - Running the test code in VerifyPeselTest +2020-04-04 23:10:22 INFO VerifyPesel:18 - Running the test code in VerifyPeselTest diff --git a/src/main/java/com/company/ReadParameters.java b/src/main/java/com/company/ReadParameters.java index c73e1da..b002a1a 100644 --- a/src/main/java/com/company/ReadParameters.java +++ b/src/main/java/com/company/ReadParameters.java @@ -10,14 +10,14 @@ import java.util.regex.Pattern; public class ReadParameters { private boolean isInputWordsOnly(String input) { - Pattern wordsOnlyRegex = Pattern.compile("\\^[Aa-zZ]"); + Pattern wordsOnlyRegex = Pattern.compile("^[a-zA-Z]+"); Matcher matcher = wordsOnlyRegex.matcher(input); return matcher.matches(); } private boolean isInputDigitsOnly(String input) { - Pattern digitsOnlyRegex = Pattern.compile("\\^[0-9]+"); + Pattern digitsOnlyRegex = Pattern.compile("^[0-9]+"); Matcher matcher = digitsOnlyRegex.matcher(input); return matcher.matches(); diff --git a/target/classes/com/company/ReadParameters.class b/target/classes/com/company/ReadParameters.class index 271cacf..b9d8038 100644 Binary files a/target/classes/com/company/ReadParameters.class and b/target/classes/com/company/ReadParameters.class differ diff --git a/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst index 3b9f19f..c2ae72b 100644 --- a/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst +++ b/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst @@ -1,5 +1,5 @@ -C:\Users\micha\dev\Studia\Java_JSON_XML\Project1Pesel\src\main\java\com\company\ReadParameters.java -C:\Users\micha\dev\Studia\Java_JSON_XML\Project1Pesel\src\main\java\com\company\Main.java -C:\Users\micha\dev\Studia\Java_JSON_XML\Project1Pesel\src\main\java\com\company\Person.java -C:\Users\micha\dev\Studia\Java_JSON_XML\Project1Pesel\src\main\java\com\company\VerifyPesel.java -C:\Users\micha\dev\Studia\Java_JSON_XML\Project1Pesel\src\main\java\com\company\AddToFile.java +C:\Users\micha\dev\Studia\Java_JSON_XML\test\Projekt_1_Java\src\main\java\com\company\Person.java +C:\Users\micha\dev\Studia\Java_JSON_XML\test\Projekt_1_Java\src\main\java\com\company\AddToFile.java +C:\Users\micha\dev\Studia\Java_JSON_XML\test\Projekt_1_Java\src\main\java\com\company\Main.java +C:\Users\micha\dev\Studia\Java_JSON_XML\test\Projekt_1_Java\src\main\java\com\company\VerifyPesel.java +C:\Users\micha\dev\Studia\Java_JSON_XML\test\Projekt_1_Java\src\main\java\com\company\ReadParameters.java diff --git a/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst b/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst index 372566d..375b781 100644 --- a/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst +++ b/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst @@ -1,2 +1,2 @@ -C:\Users\micha\dev\Studia\Java_JSON_XML\Project1Pesel\src\test\java\junit\AddToFileTest.java -C:\Users\micha\dev\Studia\Java_JSON_XML\Project1Pesel\src\test\java\junit\VerifyPeselTest.java +C:\Users\micha\dev\Studia\Java_JSON_XML\test\Projekt_1_Java\src\test\java\junit\VerifyPeselTest.java +C:\Users\micha\dev\Studia\Java_JSON_XML\test\Projekt_1_Java\src\test\java\junit\AddToFileTest.java diff --git a/target/surefire-reports/TEST-junit.AddToFileTest.xml b/target/surefire-reports/TEST-junit.AddToFileTest.xml index 1c9de9b..c78d2aa 100644 --- a/target/surefire-reports/TEST-junit.AddToFileTest.xml +++ b/target/surefire-reports/TEST-junit.AddToFileTest.xml @@ -1,10 +1,10 @@ - + - + @@ -15,7 +15,7 @@ - + @@ -59,5 +59,5 @@ - + \ No newline at end of file diff --git a/target/surefire-reports/TEST-junit.VerifyPeselTest.xml b/target/surefire-reports/TEST-junit.VerifyPeselTest.xml index 57c117e..670b83f 100644 --- a/target/surefire-reports/TEST-junit.VerifyPeselTest.xml +++ b/target/surefire-reports/TEST-junit.VerifyPeselTest.xml @@ -1,10 +1,10 @@ - + - + @@ -15,7 +15,7 @@ - + @@ -61,5 +61,5 @@ - + \ No newline at end of file diff --git a/target/surefire-reports/junit.AddToFileTest.txt b/target/surefire-reports/junit.AddToFileTest.txt index e3e0939..83e6d10 100644 --- a/target/surefire-reports/junit.AddToFileTest.txt +++ b/target/surefire-reports/junit.AddToFileTest.txt @@ -1,4 +1,4 @@ ------------------------------------------------------------------------------- Test set: junit.AddToFileTest ------------------------------------------------------------------------------- -Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.515 sec +Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.678 sec diff --git a/target/test-classes/META-INF/Project1Pesel.kotlin_module b/target/test-classes/META-INF/Project1Pesel.kotlin_module deleted file mode 100644 index a49347a..0000000 Binary files a/target/test-classes/META-INF/Project1Pesel.kotlin_module and /dev/null differ