Skip to content

Commit c6927a3

Browse files
vrnskyvrnsky
authored
Merge pull request #71 from vrnsky/feature/#70
feat: #70. Актуализация проекта
2 parents 916209c + a240a61 commit c6927a3

File tree

319 files changed

+2832
-2148
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

319 files changed

+2832
-2148
lines changed

‎.github/workflows/build.yml

+7-3
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,18 @@ on:
88

99
jobs:
1010
build:
11+
permissions:
12+
checks: write
1113
runs-on: ubuntu-latest
1214
steps:
1315
- uses: actions/checkout@v3
14-
- name: Set up JDK 1.8
16+
- name: Set up JDK 17
1517
uses: actions/setup-java@v3
1618
with:
17-
java-version: '11'
19+
java-version: 17
1820
distribution: 'temurin'
1921
cache: maven
2022
- name: Build with Maven
21-
run: mvn -B package --file pom.xml
23+
run: mvn clean install
24+
- name: Publish Pitest Report
25+
uses: Bonajo/[email protected]

‎chapter1/arrays/src/main/java/arrays/BubbleSort.java ‎chapter1/arrays/src/main/java/ru/evrnsky/arrays/BubbleSort.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package arrays;
1+
package ru.evrnsky.arrays;
22

33
/**
44
* Implementation of bubble sort algorithm.

‎chapter1/arrays/src/main/java/arrays/Duplicator.java ‎chapter1/arrays/src/main/java/ru/evrnsky/arrays/Duplicator.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package arrays;
1+
package ru.evrnsky.arrays;
22
/**
33
* It class which remove from string all duplicates.
44
* It operates as follow: find duplicate and set cell in array in null.

‎chapter1/arrays/src/main/java/arrays/Rotate.java ‎chapter1/arrays/src/main/java/ru/evrnsky/arrays/Rotate.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package arrays;
1+
package ru.evrnsky.arrays;
22

33
/**
44
* This class rotate two dimension matrix on 90 degree left.

‎chapter1/arrays/src/main/java/arrays/package-info.java ‎chapter1/arrays/src/main/java/ru/evrnsky/arrays/package-info.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@
44
* @since 11.11.2016
55
* show how work with array in java.
66
*/
7-
package arrays;
7+
package ru.evrnsky.arrays;

‎chapter1/arrays/src/test/java/arrays/BubbleSortTest.java ‎chapter1/arrays/src/test/java/ru/evrnsky/arrays/BubbleSortTest.java

+8-5
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,21 @@
1-
package arrays;
2-
import static org.junit.Assert.assertThat;
1+
package ru.evrnsky.arrays;
2+
3+
4+
import org.junit.jupiter.api.Test;
5+
6+
import static org.hamcrest.MatcherAssert.assertThat;
37
import static org.hamcrest.core.Is.is;
4-
import org.junit.Test;
58

69
/**
710
* Unit test for BubbleSort.java.
811
* It test implementation of bubble sort algorithm.
912
*/
10-
public class BubbleSortTest {
13+
class BubbleSortTest {
1114
/**
1215
* try to sort by ascending.
1316
*/
1417
@Test
15-
public final void whenPassInSortMethodArrayShouldSortByAscending() {
18+
void whenPassInSortMethodArrayShouldSortByAscending() {
1619
BubbleSort sorter = new BubbleSort();
1720
final int[] randomArray = new int[]{5, 3, 2, 4, 6, 1, 7};
1821
final int[] expectedArray = new int[]{1, 2, 3, 4, 5, 6, 7};

‎chapter1/arrays/src/test/java/arrays/DuplicatorTest.java ‎chapter1/arrays/src/test/java/ru/evrnsky/arrays/DuplicatorTest.java

+9-7
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,28 @@
1-
package arrays;
1+
package ru.evrnsky.arrays;
2+
3+
import org.junit.jupiter.api.Assertions;
4+
import org.junit.jupiter.api.Test;
5+
6+
import java.util.Arrays;
27

3-
import static org.junit.Assert.assertThat;
4-
import static org.hamcrest.core.Is.is;
5-
import org.junit.Test;
68

79
/**
810
* Unit test for Duplicator.java.
911
* It test algorithm of removing duplicates from string array.
1012
*/
11-
public class DuplicatorTest {
13+
class DuplicatorTest {
1214
/**
1315
* Try to delete duplicate.
1416
*/
1517
@Test
16-
public final void whenPassToMethodDeleteDuplicatesShouldOnlyUniqueString() {
18+
void whenPassToMethodDeleteDuplicatesShouldOnlyUniqueString() {
1719
Duplicator deleteDuplicator = new Duplicator();
1820
String[] values = new String[]{"A", "C", "C", "A", "B", "A"};
1921
String[] expectedValues = new String[]{"A", "C", "B"};
2022

2123
String[] result = deleteDuplicator.removeDuplicates(values);
2224

23-
assertThat(result, is(expectedValues));
25+
Assertions.assertTrue(Arrays.deepEquals(expectedValues, result));
2426
}
2527
}
2628

‎chapter1/arrays/src/test/java/arrays/RotateTest.java ‎chapter1/arrays/src/test/java/ru/evrnsky/arrays/RotateTest.java

+9-8
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,29 @@
1-
package arrays;
1+
package ru.evrnsky.arrays;
2+
3+
4+
import org.junit.jupiter.api.Assertions;
5+
import org.junit.jupiter.api.Test;
26

3-
import static org.junit.Assert.assertThat;
4-
import static org.hamcrest.core.Is.is;
5-
import org.junit.Test;
67
import java.util.Arrays;
78

89
/**
910
* Unit test for Rotate.java.
10-
* It test algorithm of rotating quad matrix on to 90 degrees.
11+
* It testing algorithm of rotating quad matrix on to 90 degrees.
1112
*/
12-
public class RotateTest {
13+
class RotateTest {
1314

1415

1516
/**
1617
* when try rotate should check that matrix rotated.
1718
*/
1819
@Test
19-
public final void whenWeTryRotateMatrixShouldRotatedMatrix() {
20+
void whenWeTryRotateMatrixShouldRotatedMatrix() {
2021
Rotate rotater = new Rotate();
2122
final int[][] values = new int[][]{{1, 2}, {3, 4}};
2223
final int[][] expected = {{1, 3}, {2, 4}};
2324

2425
int[][] result = rotater.rotate90(values);
2526

26-
assertThat(Arrays.deepEquals(expected, result), is(true));
27+
Assertions.assertTrue(Arrays.deepEquals(expected, result));
2728
}
2829
}

‎chapter1/arrays/src/test/java/arrays/package-info.java ‎chapter1/arrays/src/test/java/ru/evrnsky/arrays/package-info.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@
44
* @since 11.11.2016
55
* test on arrays.
66
*/
7-
package arrays;
7+
package ru.evrnsky.arrays;

‎chapter1/calculator/src/main/java/calculator/CalcInit.java ‎chapter1/calculator/src/main/java/ru/evrnsky/calculator/CalcInit.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
package calculator;
1+
package ru.evrnsky.calculator;
22

3-
import start.ConsoleIO;
4-
import start.IO;
5-
import start.Validator;
3+
import ru.evrnsky.start.ConsoleIO;
4+
import ru.evrnsky.start.IO;
5+
import ru.evrnsky.start.Validator;
66

77
/**
88
* It class interact with user by accept data,

‎chapter1/calculator/src/main/java/calculator/Calculator.java ‎chapter1/calculator/src/main/java/ru/evrnsky/calculator/Calculator.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package calculator;
1+
package ru.evrnsky.calculator;
22

33

44
/**

‎chapter1/calculator/src/main/java/calculator/MenuCalculator.java ‎chapter1/calculator/src/main/java/ru/evrnsky/calculator/MenuCalculator.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
package calculator;
1+
package ru.evrnsky.calculator;
22

3-
import start.IO;
4-
import templates.BaseAction;
5-
import templates.UserAction;
3+
import ru.evrnsky.start.IO;
4+
import ru.evrnsky.templates.BaseAction;
5+
import ru.evrnsky.templates.UserAction;
66

77
/**
88
* Menu for Calculator it handle all query to calculator.

‎chapter1/calculator/src/main/java/calculator/MenuSciCalculator.java ‎chapter1/calculator/src/main/java/ru/evrnsky/calculator/MenuSciCalculator.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package calculator;
1+
package ru.evrnsky.calculator;
22

3-
import start.IO;
4-
import templates.BaseAction;
3+
import ru.evrnsky.start.IO;
4+
import ru.evrnsky.templates.BaseAction;
55

66
/**
77
* More complex calculator.

‎chapter1/calculator/src/main/java/calculator/package-info.java ‎chapter1/calculator/src/main/java/ru/evrnsky/calculator/package-info.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@
44
* @since 14.11.2016
55
* Implement functional of calculator.
66
*/
7-
package calculator;
7+
package ru.evrnsky.calculator;

‎chapter1/calculator/src/main/java/templates/BaseAction.java ‎chapter1/calculator/src/main/java/ru/evrnsky/templates/BaseAction.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package templates;
1+
package ru.evrnsky.templates;
22

33
/**
44
* All actions must expand this class.

‎chapter1/calculator/src/main/java/templates/UserAction.java ‎chapter1/calculator/src/main/java/ru/evrnsky/templates/UserAction.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package templates;
1+
package ru.evrnsky.templates;
22

3-
import start.IO;
3+
import ru.evrnsky.start.IO;
44

55
/**
66
* Contract for all user actions.

‎chapter1/calculator/src/main/java/templates/package-info.java ‎chapter1/calculator/src/main/java/ru/evrnsky/templates/package-info.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@
44
* @since 14.11.2016
55
* Templates for calculator.
66
*/
7-
package templates;
7+
package ru.evrnsky.templates;

‎chapter1/calculator/src/test/java/calculator/CalcInitTest.java ‎chapter1/calculator/src/test/java/ru/evrnsky/calculator/CalcInitTest.java

+15-9
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,26 @@
1-
package calculator;
1+
package ru.evrnsky.calculator;
22

3-
import org.junit.Test;
4-
import start.StubIO;
3+
4+
import org.junit.jupiter.api.Test;
5+
import ru.evrnsky.start.StubIO;
6+
7+
import static org.hamcrest.MatcherAssert.assertThat;
58
import static org.hamcrest.core.StringContains.containsString;
6-
import static org.junit.Assert.assertThat;
79

810
/**
911
* Unit test for CalcInit.java.
1012
* It test all opportunity from UI of Calculator.
1113
*/
12-
public class CalcInitTest {
14+
class CalcInitTest {
1315

1416
/**
1517
* When try execute addiction from calculator UI.
1618
* should check that calculator return correct result.
19+
*
1720
* @throws Exception if something wrong.
1821
*/
1922
@Test
20-
public void whenTryAddTwoDoubleUseCalculatorUIShouldCheckThatCorrectResult()
23+
void whenTryAddTwoDoubleUseCalculatorUIShouldCheckThatCorrectResult()
2124
throws Exception {
2225
String[] answer = new String[]{"0", "1.0", "y"};
2326
StubIO stubIO = new StubIO(answer);
@@ -32,10 +35,11 @@ public void whenTryAddTwoDoubleUseCalculatorUIShouldCheckThatCorrectResult()
3235
/**
3336
* When try execute deduct use calculator UI.
3437
* should check that calculator return correct result.
38+
*
3539
* @throws Exception if something wrong.
3640
*/
3741
@Test
38-
public void whenTryDeductTwoDoubleUseCalculatorUIShouldCheckThatCorrectResult()
42+
void whenTryDeductTwoDoubleUseCalculatorUIShouldCheckThatCorrectResult()
3943
throws Exception {
4044
String[] answer = new String[]{"0", "100.0", "n", "1", "1", "y"};
4145
StubIO stubIO = new StubIO(answer);
@@ -49,10 +53,11 @@ public void whenTryDeductTwoDoubleUseCalculatorUIShouldCheckThatCorrectResult()
4953

5054
/**
5155
* When try execute multiply should check that calculator return correct result.
56+
*
5257
* @throws Exception if something wrong.
5358
*/
5459
@Test
55-
public void whenTryMultiplyTwoDoubleUseCalculatorUIShouldCheckThatCorrectResult()
60+
void whenTryMultiplyTwoDoubleUseCalculatorUIShouldCheckThatCorrectResult()
5661
throws Exception {
5762
String[] answer = new String[]{"0", "2.0", "n", "2", "10", "y"};
5863
StubIO stubIO = new StubIO(answer);
@@ -66,10 +71,11 @@ public void whenTryMultiplyTwoDoubleUseCalculatorUIShouldCheckThatCorrectResult(
6671

6772
/**
6873
* When try execute divide use calculator UI should check than calculator return correct result.
74+
*
6975
* @throws Exception if something wrong.
7076
*/
7177
@Test
72-
public void whenTryDivideTwoDoubleUseCalculatorUIShouldCheckThatCorrectResult()
78+
void whenTryDivideTwoDoubleUseCalculatorUIShouldCheckThatCorrectResult()
7379
throws Exception {
7480
String[] answer = new String[]{"0", "100.0", "n", "3", "2", "y"};
7581
StubIO stubIO = new StubIO(answer);

0 commit comments

Comments
 (0)