Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
9866745
Готовое ДЗ1
Newarin Oct 14, 2023
1d5d44b
Готовое ДЗ1
Newarin Oct 14, 2023
3a6bc5a
Merge branch 'rsmitt:master' into master
Newarin Oct 17, 2023
e1fd000
Добавил ентеров для пул реквеста
Newarin Oct 17, 2023
76f52a7
Merge branch 'rsmitt:master' into master
Newarin Oct 24, 2023
3a45131
Пул реквест 2 ДЗ
Newarin Oct 26, 2023
335694a
Merge pull request #1 from Newarin/Homework1
Newarin Oct 26, 2023
368e7c7
Пул реквест 2 ДЗ после исправления
Newarin Oct 31, 2023
b5eb31f
Пул реквест 3 ДЗ
Newarin Oct 31, 2023
7a96213
Merge pull request #4 from Newarin/Homework2.1
Newarin Nov 5, 2023
efb1cf2
Merge branch 'master' into Homework3
Newarin Nov 5, 2023
0a6c5a4
Merge branch 'rsmitt:master' into master
Newarin Nov 6, 2023
cd4a65f
Merge pull request #5 from Newarin/Homework3
Newarin Nov 6, 2023
6129d36
Пул реквест 4 ДЗ
Newarin Nov 8, 2023
f1f645d
Пул реквест 4 ДЗ
Newarin Nov 8, 2023
712166b
Merge branch 'rsmitt:master' into master
Newarin Nov 16, 2023
524591e
Merge branch 'master' into Homework4
Newarin Nov 20, 2023
37df468
Merge pull request #6 from Newarin/Homework4
Newarin Nov 20, 2023
0baa388
Merge branch 'rsmitt:master' into master
Newarin Nov 21, 2023
eb51eed
Merge branch 'rsmitt:master' into master
Newarin Dec 5, 2023
89e8e7b
homework7
Newarin Dec 5, 2023
fcddf32
homework7.1
Newarin Dec 6, 2023
7f7874f
homework7.2
Newarin Dec 10, 2023
5f8ba31
Merge branch 'rsmitt:master' into master
Newarin Dec 11, 2023
850b95b
Merge branch 'rsmitt:master' into master
Newarin Dec 28, 2023
bfe74f9
homework7.2
Newarin Dec 28, 2023
aef2c58
homework8
Newarin Dec 28, 2023
36d9142
Merge pull request #10 from Newarin/Homework8
Newarin Jan 8, 2024
7f9516f
Homework9
Newarin Jan 13, 2024
9a5d0c2
Merge pull request #11 from Newarin/homework9
Newarin Feb 10, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 33 additions & 0 deletions module01/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,39 @@

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<junit.version>5.9.2</junit.version>
<mockito.version>5.5.0</mockito.version>
<mockito.junit.version>5.3.1</mockito.junit.version>
<assertj.version>3.24.2</assertj.version>
</properties>

<dependencies>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>${mockito.version}</version>
<scope>test</scope>
</dependency>
<!-- ExtendWith -->
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-junit-jupiter</artifactId>
<version>${mockito.junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<version>${assertj.version}</version>
</dependency>
</dependencies>

</project>
22 changes: 22 additions & 0 deletions module01/src/main/java/ru/sberbank/edu/GCD.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
package ru.sberbank.edu;

/***
* В данном методе мы всегда ставим на первое место наибольшее число
* в последствии ищем наибольший делитель путём деления
*/
public class GCD implements CommonDivisor {
@Override
public int getDivisor(int firstNumber, int secondNumber) {

if (firstNumber < secondNumber){
firstNumber = secondNumber * firstNumber;
secondNumber = firstNumber / secondNumber;
firstNumber = firstNumber / secondNumber;
}

if (secondNumber == 0) {
return firstNumber;
}
return getDivisor(secondNumber, firstNumber % secondNumber);
}
}
19 changes: 19 additions & 0 deletions module01/src/main/java/ru/sberbank/edu/GreetingImpl.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
package ru.sberbank.edu;

public class GreetingImpl implements Greeting {
/***
* В данном методе мы всегда выводим как лучшее хобби Водный туризм
*/
public void main(String[] args) {

System.out.println(getBestHobby());

}

@Override
public String getBestHobby() {

return "Водный туризм";

}
}
19 changes: 19 additions & 0 deletions module01/src/test/java/ru/sberbank/edu/GreetingImplTest.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
package ru.sberbank.edu;

import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;

class GreetingImplTest {



@Test
void main() {
}

@Test
void getBestHobby() {
GreetingImpl greeting = new GreetingImpl();
Assertions.assertThat(greeting.getBestHobby()).isEqualTo("Водный туризм");
}
}
3 changes: 3 additions & 0 deletions module02/input.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Мы добавляем первую базовую строку
Мы добавляем вторую базовую строку
Мы добавляем третью базовую строку, но чтуь чуть подлинее
3 changes: 3 additions & 0 deletions module02/output.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
В данном файле строк 3
В данном файле пробелов 16
Самая длинная строка в файле 'Мы добавляем третью базовую строку, но чтуь чуть подлинее'
35 changes: 34 additions & 1 deletion module02/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,39 @@

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<junit.version>5.9.2</junit.version>
<mockito.version>5.5.0</mockito.version>
<mockito.junit.version>5.3.1</mockito.junit.version>
<assertj.version>3.24.2</assertj.version>
</properties>

</project>
<dependencies>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>${mockito.version}</version>
<scope>test</scope>
</dependency>
<!-- ExtendWith -->
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-junit-jupiter</artifactId>
<version>${mockito.junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<version>${assertj.version}</version>
</dependency>
</dependencies>

</project>
13 changes: 8 additions & 5 deletions module02/src/main/java/ru/sberbank/edu/App.java
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
package ru.sberbank.edu;

import java.io.IOException;

/**
* Hello world!
*
*/
public class App
public class App
{
public static void main( String[] args )
{
System.out.println( "Hello World!" );
public static void main( String[] args ) throws IOException {

StatisticImpl main = new StatisticImpl();
main.start();
}
}
}
13 changes: 9 additions & 4 deletions module02/src/main/java/ru/sberbank/edu/Statistic.java
Original file line number Diff line number Diff line change
@@ -1,11 +1,16 @@
package ru.sberbank.edu;

import java.io.IOException;

// интерфейс можно менять
public interface Statistic {

int getLineCount();
int getSpaceCount();
int getLinesCount();
String getLongestLine();
void save(int lineCount, int spaceCount, String line);
void save(int lineCount, int spaceCount, String line) throws IOException;
void setLineCount();

void setSpaceCount();

}
void setLongestLine(String longestLine);
}
101 changes: 101 additions & 0 deletions module02/src/main/java/ru/sberbank/edu/StatisticImpl.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,101 @@
package ru.sberbank.edu;

import java.io.*;

public class StatisticImpl implements Statistic{
private int spaceCount;
private int lineCount;
private String longestLine;
private static char SPACE = ' ';
public void start() throws IOException {

File inputFile = new File("input.txt");
BufferedReader inputReader;
FileWriter basicWriter;

if(inputFile.exists()) {
inputReader = new BufferedReader(new FileReader("input.txt"));
}
else{
basicWriter = new FileWriter("input.txt");
try {
basicWriter.append("Мы добавляем первую базовую строку" + "\n");
basicWriter.append("Мы добавляем вторую базовую строку" + "\n");
basicWriter.append("Мы добавляем третью базовую строку, но чтуь чуть подлинее" + "\n");
}
finally {
basicWriter.close();
}
inputReader = new BufferedReader(new FileReader("input.txt"));
};


/***
* Получили файл на вход, теперь читаем его
*/
String line;
while( (line = inputReader.readLine()) != null){
setLineCount();
if(line.length() > getLongestLine().length()){
setLongestLine(line);
}
char[] charArray = line.toCharArray();
for(int i = 0; i < line.length(); i++){

if(charArray[i] == SPACE){
setSpaceCount();
}
}
}

save(getLinesCount(),getSpaceCount(),getLongestLine());
}


@Override
public int getSpaceCount() {
return this.spaceCount;
}

@Override
public String getLongestLine() {
if(this.longestLine == null){
return "";
}
else
return this.longestLine;
}

@Override
public int getLinesCount() {
return lineCount;
}

@Override
public void save(int lineCount, int spaceCount, String line) throws IOException {
FileWriter outputFile = new FileWriter("output.txt");
try {
outputFile.append("В данном файле строк " + lineCount + "\n");
outputFile.append("В данном файле пробелов " + spaceCount + "\n");
outputFile.append("Самая длинная строка в файле '" + line + "'" + "\n");
}
finally {
outputFile.close();
}
}

@Override
public void setLineCount() {
this.lineCount++;
}

@Override
public void setSpaceCount() {
this.spaceCount++;
}

@Override
public void setLongestLine(String longestLine) {
this.longestLine = longestLine;
}
}
42 changes: 14 additions & 28 deletions module02/src/test/java/ru/sberbank/edu/AppTest.java
Original file line number Diff line number Diff line change
@@ -1,38 +1,24 @@
package ru.sberbank.edu;

import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;

import java.io.IOException;

/**
* Unit test for simple App.
*/
public class AppTest
extends TestCase
{
/**
* Create the test case
*
* @param testName name of the test case
*/
public AppTest( String testName )
{
super( testName );
}

/**
* @return the suite of tests being tested
*/
public static Test suite()
{
return new TestSuite( AppTest.class );
}
public class AppTest
extends TestCase{

/**
* Rigourous Test :-)
*/
public void testApp()
{
assertTrue( true );
@Test
void main() throws IOException {
StatisticImpl newStatistic = new StatisticImpl();
newStatistic.start();
Assertions.assertThat(newStatistic.getLongestLine()).isEqualTo("Мы добавляем третью базовую строку, но чтуь чуть подлинее");
Assertions.assertThat(newStatistic.getSpaceCount()).isEqualTo(16);
Assertions.assertThat(newStatistic.getLinesCount()).isEqualTo(3);
}
}
}
35 changes: 35 additions & 0 deletions module03/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,41 @@

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<junit.version>5.9.2</junit.version>
<mockito.version>5.5.0</mockito.version>
<mockito.junit.version>5.3.1</mockito.junit.version>
<assertj.version>3.24.2</assertj.version>
</properties>

<dependencies>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>${mockito.version}</version>
<scope>test</scope>
</dependency>
<!-- ExtendWith -->
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-junit-jupiter</artifactId>
<version>${mockito.junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<version>${assertj.version}</version>
</dependency>
</dependencies>


</project>
Loading