From 7c3d48eb1b2dc114aea2954f0550b1efca6ee712 Mon Sep 17 00:00:00 2001 From: dominik Date: Mon, 10 Aug 2020 14:04:45 +0200 Subject: [PATCH 1/2] homeWork20 done --- pom.xml | 20 ++--- .../test/FilteringMachineTest.java | 40 +++++----- .../test/FilteringMachineTwoTest.java | 29 ++++--- .../liczbyZeStrumieni/StreamNumbers.java | 3 +- src/main/java/homeWork_20/Calculator.java | 25 ++++++ .../SumOfEvenFibonacciNumbersTest.java | 49 ++++++++++++ .../SumOfMutlipliers5or3Test.java | 77 +++++++++++++++++++ 7 files changed, 196 insertions(+), 47 deletions(-) create mode 100644 src/main/java/homeWork_20/Calculator.java create mode 100644 src/main/test/homeWork_20_Tests/SumOfEvenFibonacciNumbersTest.java create mode 100644 src/main/test/homeWork_20_Tests/SumOfMutlipliers5or3Test.java diff --git a/pom.xml b/pom.xml index 4ca0c3a..7e07810 100644 --- a/pom.xml +++ b/pom.xml @@ -13,25 +13,27 @@ org.apache.maven.plugins maven-compiler-plugin - 8 - 8 + 9 + 9 + - org.hamcrest - hamcrest-all - 1.3 + org.assertj + assertj-core + 3.16.1 - org.testng - testng - RELEASE - compile + junit + junit + 4.12 + + \ No newline at end of file diff --git a/src/main/java/homeWork_19/filtrowanieIPrzetwarzanie/test/FilteringMachineTest.java b/src/main/java/homeWork_19/filtrowanieIPrzetwarzanie/test/FilteringMachineTest.java index a29e5f4..80f538e 100644 --- a/src/main/java/homeWork_19/filtrowanieIPrzetwarzanie/test/FilteringMachineTest.java +++ b/src/main/java/homeWork_19/filtrowanieIPrzetwarzanie/test/FilteringMachineTest.java @@ -2,14 +2,12 @@ import homeWork_19.filtrowanieIPrzetwarzanie.java.Book; import homeWork_19.filtrowanieIPrzetwarzanie.java.FilteringMachine; -import org.testng.annotations.Test; +import org.junit.Test; import java.util.ArrayList; import java.util.List; -import static org.hamcrest.CoreMatchers.hasItem; -import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertThat; +import static org.assertj.core.api.Assertions.*; public class FilteringMachineTest { @@ -33,9 +31,9 @@ public void shouldFilterOutNotEvenNumbers() { List filteredList = machine.filterOutNotEvenNumbers(numberList); // then - assertThat(filteredList.size(), is(2)); - assertThat(filteredList, hasItem(12)); - assertThat(filteredList, hasItem(124)); + assertThat(filteredList.size()).isEqualTo(2); + assertThat(filteredList).contains(12); + assertThat(filteredList.contains(124)); } @Test @@ -56,11 +54,11 @@ public void shouldFilterOutNumberLowerThan20() { List filteredList = machine.filterOutLowerNumbersThan20(numberList); // then - assertThat(filteredList.size(), is(4)); - assertThat(filteredList, hasItem(123)); - assertThat(filteredList, hasItem(124)); - assertThat(filteredList, hasItem(21)); - assertThat(filteredList, hasItem(71)); + assertThat(filteredList.size()).isEqualTo(24); + assertThat(filteredList.contains(123)); + assertThat(filteredList.contains(124)); + assertThat(filteredList.contains(21)); + assertThat(filteredList).contains(27); } @Test @@ -77,12 +75,12 @@ public void shouldConvertTitlesToBooks() { List books = machine.convertToBooks(titles); // then - assertThat(books.size(), is(5)); - assertThat(books, hasItem(new Book("Gra o tron"))); - assertThat(books, hasItem(new Book("Dzieci z Bullerbyn"))); - assertThat(books, hasItem(new Book("Robinson Cruzoe"))); - assertThat(books, hasItem(new Book("Cyfrowa twierdza"))); - assertThat(books, hasItem(new Book("Gra o życie"))); + assertThat(books.size()).isEqualTo(4); + assertThat(books.contains(new Book("Gra o tron"))); + assertThat(books.contains(new Book("Dzieci z Bullerbyn"))); + assertThat(books.contains(new Book("Robinson Cruzoe"))); + assertThat(books.contains(new Book("Cyfrowa twierdza"))); + assertThat(books.contains(new Book("Gra o życie"))); } @Test @@ -99,9 +97,9 @@ public void shouldConvertTitlesToBooksAndFilterOutStartingWithGra() { List books = machine.convertToBooksAndReturnOnlyStartingWithGra(titles); // then - assertThat(books.size(), is(2)); - assertThat(books, hasItem(new Book("Gra o tron"))); - assertThat(books, hasItem(new Book("Gra o życie"))); + assertThat(books.size()).isEqualTo(2); + assertThat(books.contains(new Book("Gra o tron"))); + assertThat(books.contains(new Book("Gra o życie"))); } } diff --git a/src/main/java/homeWork_19/filtrowanieIPrzetwarzanie/test/FilteringMachineTwoTest.java b/src/main/java/homeWork_19/filtrowanieIPrzetwarzanie/test/FilteringMachineTwoTest.java index 38ea356..4c13353 100644 --- a/src/main/java/homeWork_19/filtrowanieIPrzetwarzanie/test/FilteringMachineTwoTest.java +++ b/src/main/java/homeWork_19/filtrowanieIPrzetwarzanie/test/FilteringMachineTwoTest.java @@ -3,22 +3,21 @@ import homeWork_19.filtrowanieIPrzetwarzanie.java.FilteringMachineTwo; import homeWork_19.filtrowanieIPrzetwarzanie.java.Person; import homeWork_19.filtrowanieIPrzetwarzanie.java.User; -import org.testng.annotations.BeforeTest; -import org.testng.annotations.Test; +import org.assertj.core.api.Assertions; +import org.junit.Before; +import org.junit.Test; import java.util.ArrayList; import java.util.List; -import static org.hamcrest.CoreMatchers.hasItem; -import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertThat; + public class FilteringMachineTwoTest { private FilteringMachineTwo machine = new FilteringMachineTwo(); private List people; - @BeforeTest + @Before public void init() { people = new ArrayList<>(); people.add(new Person("Tomek", 2)); @@ -34,9 +33,9 @@ public void shouldReturnKidNames() { List kids = machine.findKidNames(people); // then - assertThat(kids.size(), is(2)); - assertThat(kids, hasItem("Tomek")); - assertThat(kids, hasItem("Sebastian")); + Assertions.assertThat(kids.size()).isEqualTo(2); + Assertions.assertThat(kids.contains("Tomek")); + Assertions.assertThat(kids.contains("Sebastian")); } @Test @@ -45,12 +44,12 @@ public void shouldConvertPeopleToUser() { List users = machine.convertPeopleToUsers(people); // then - assertThat(users.size(), is(5)); - assertThat(users, hasItem(new User("Tomek", 2, "Tomek_2"))); - assertThat(users, hasItem(new User("Ania", 18, "Ania_18"))); - assertThat(users, hasItem(new User("Konrad", 44, "Konrad_44"))); - assertThat(users, hasItem(new User("Janusz", 52, "Janusz_52"))); - assertThat(users, hasItem(new User("Sebastian", 16, "Sebastian_16"))); + Assertions.assertThat(users.size()).isEqualTo(5); + Assertions.assertThat(users.contains(new User("Tomek", 2, "Tomek_2"))); + Assertions.assertThat(users.contains(new User("Ania", 18, "Ania_18"))); + Assertions.assertThat(users.contains(new User("Konrad", 44, "Konrad_44"))); + Assertions.assertThat(users.contains(new User("Janusz", 52, "Janusz_52"))); + Assertions.assertThat(users.contains(new User("Sebastian", 16, "Sebastian_16"))); } diff --git a/src/main/java/homeWork_19/liczbyZeStrumieni/StreamNumbers.java b/src/main/java/homeWork_19/liczbyZeStrumieni/StreamNumbers.java index 70fe847..fcf3292 100644 --- a/src/main/java/homeWork_19/liczbyZeStrumieni/StreamNumbers.java +++ b/src/main/java/homeWork_19/liczbyZeStrumieni/StreamNumbers.java @@ -1,8 +1,7 @@ package homeWork_19.liczbyZeStrumieni; - -import org.testng.annotations.Test; +import org.junit.Test; import java.util.stream.Stream; diff --git a/src/main/java/homeWork_20/Calculator.java b/src/main/java/homeWork_20/Calculator.java new file mode 100644 index 0000000..9abbd52 --- /dev/null +++ b/src/main/java/homeWork_20/Calculator.java @@ -0,0 +1,25 @@ +package homeWork_20; + +import org.assertj.core.api.Assertions; + +import java.util.stream.Stream; + +public class Calculator { + + public static int sumOfNaturalNumbers(int limit) { + return Stream.iterate(1, n -> n < limit, n -> n + 1) + .filter(number -> number % 3 == 0 || number % 5 == 0) + .mapToInt(n -> n) + .sum(); + } + + public static int fibonacciSequence(int limit) { + return Stream.iterate(new int[]{1, 1}, n -> new int[]{n[1], n[0] + n[1]}) + .limit(limit) + .map(n -> n[0]) + .filter(n -> (n % 2 == 0)) + .mapToInt(n -> n) + .sum(); + } + +} diff --git a/src/main/test/homeWork_20_Tests/SumOfEvenFibonacciNumbersTest.java b/src/main/test/homeWork_20_Tests/SumOfEvenFibonacciNumbersTest.java new file mode 100644 index 0000000..4daaf8e --- /dev/null +++ b/src/main/test/homeWork_20_Tests/SumOfEvenFibonacciNumbersTest.java @@ -0,0 +1,49 @@ +package homeWork_20_Tests; + + +import org.assertj.core.api.Assertions; +import org.junit.Test; + +import static homeWork_20.Calculator.fibonacciSequence; + +public class SumOfEvenFibonacciNumbersTest { + + + @Test + void shouldReturn10WhenAddingSumOfEvenFibonacciAndNumbers() { + //given + int numberOfLimit = 7; + + //when + int sumOfEvenNumbers = fibonacciSequence(numberOfLimit); + + //then + int expectedNumber = 10; + Assertions.assertThat(sumOfEvenNumbers).isEqualTo(expectedNumber); + } + + @Test + void shouldReturn44WhenAddingSumOfEvenFibonacciAndNumbers() { + int numberOfLimit = 10; + + //when + int sumOfEvenNumbers = fibonacciSequence(numberOfLimit); + + //then + int expectedNumber = 44; + Assertions.assertThat(sumOfEvenNumbers).isEqualTo(expectedNumber); + + } + + @Test + void shouldReturn188WhenAddingSumOfEvenFibonacciAndNumbers() { + int numberOfLimit = 12; + + //when + int sumOfEvenNumbers = fibonacciSequence(numberOfLimit); + + //then + int expectedNumber = 188; + Assertions.assertThat(sumOfEvenNumbers).isEqualTo(expectedNumber); + } +} diff --git a/src/main/test/homeWork_20_Tests/SumOfMutlipliers5or3Test.java b/src/main/test/homeWork_20_Tests/SumOfMutlipliers5or3Test.java new file mode 100644 index 0000000..46f2bb4 --- /dev/null +++ b/src/main/test/homeWork_20_Tests/SumOfMutlipliers5or3Test.java @@ -0,0 +1,77 @@ +package homeWork_20_Tests; + +import org.assertj.core.api.Assertions; +import org.junit.Test; + +import static homeWork_20.Calculator.*; + +public class SumOfMutlipliers5or3Test { + + + @Test + void shouldReturn23WhenAddingSumOfMutliplies5or3ofNumber10() { + //given + int initialNumber = 10; + + //when + int sumOfMultipliers = sumOfNaturalNumbers(initialNumber); + + //then + int expectedNumber = 23; + Assertions.assertThat(sumOfMultipliers).isEqualTo(expectedNumber); + } + + @Test + void shouldReturn33WhenAddingSumOfMutliplies5or3ofNumber11() { + //given + int initialNumber = 11; + + //when + int sumOfMultipliers = sumOfNaturalNumbers(initialNumber); + + //then + int expectedNumber = 33; + Assertions.assertThat(sumOfMultipliers).isEqualTo(expectedNumber); + } + + @Test + void shouldReturn33WhenAddingSumOfMutliplies5or3ofNumber12() { + //given + int initialNumber = 12; + + //when + int sumOfMultipliers = sumOfNaturalNumbers(initialNumber); + + //then + int expectedNumber = 33; + Assertions.assertThat(sumOfMultipliers).isEqualTo(expectedNumber); + } + + @Test + void shouldReturn45WhenAddingSumOfMutliplies5or3ofNumber13() { + //given + int initialNumber = 13; + + //when + int sumOfMultipliers = sumOfNaturalNumbers(initialNumber); + + //then + int expectedNumber = 45 ; + Assertions.assertThat(sumOfMultipliers).isEqualTo(expectedNumber); + } + + @Test + void shouldReturn60WhenAddingSumOfMutliplies5or3ofNumber16() { + //given + int initialNumber = 16; + + //when + int sumOfMultipliers = sumOfNaturalNumbers(initialNumber); + + //then + int expectedNumber = 60; + Assertions.assertThat(sumOfMultipliers).isEqualTo(expectedNumber); + } + + +} From ac0a25174aff648d05b578d8a40162d28accceac Mon Sep 17 00:00:00 2001 From: dominik Date: Tue, 11 Aug 2020 13:49:39 +0200 Subject: [PATCH 2/2] homeWork20 done --- src/main/java/homeWork_20/Calculator.java | 6 ++--- .../SumOfEvenFibonacciNumbersTest.java | 16 +++++++----- .../SumOfMutlipliers5or3Test.java | 26 +++++++++---------- 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/main/java/homeWork_20/Calculator.java b/src/main/java/homeWork_20/Calculator.java index 9abbd52..7641862 100644 --- a/src/main/java/homeWork_20/Calculator.java +++ b/src/main/java/homeWork_20/Calculator.java @@ -2,14 +2,14 @@ import org.assertj.core.api.Assertions; +import java.util.stream.IntStream; import java.util.stream.Stream; public class Calculator { public static int sumOfNaturalNumbers(int limit) { - return Stream.iterate(1, n -> n < limit, n -> n + 1) + return IntStream.range(1,limit) .filter(number -> number % 3 == 0 || number % 5 == 0) - .mapToInt(n -> n) .sum(); } @@ -17,7 +17,7 @@ public static int fibonacciSequence(int limit) { return Stream.iterate(new int[]{1, 1}, n -> new int[]{n[1], n[0] + n[1]}) .limit(limit) .map(n -> n[0]) - .filter(n -> (n % 2 == 0)) + .filter(n -> n % 2 == 0) .mapToInt(n -> n) .sum(); } diff --git a/src/main/test/homeWork_20_Tests/SumOfEvenFibonacciNumbersTest.java b/src/main/test/homeWork_20_Tests/SumOfEvenFibonacciNumbersTest.java index 4daaf8e..0bc2041 100644 --- a/src/main/test/homeWork_20_Tests/SumOfEvenFibonacciNumbersTest.java +++ b/src/main/test/homeWork_20_Tests/SumOfEvenFibonacciNumbersTest.java @@ -5,12 +5,12 @@ import org.junit.Test; import static homeWork_20.Calculator.fibonacciSequence; +import static org.assertj.core.api.Assertions.*; public class SumOfEvenFibonacciNumbersTest { - @Test - void shouldReturn10WhenAddingSumOfEvenFibonacciAndNumbers() { + public void shouldReturn10WhenAddingSumOfEvenFibonacciAndNumbers() { //given int numberOfLimit = 7; @@ -19,11 +19,12 @@ void shouldReturn10WhenAddingSumOfEvenFibonacciAndNumbers() { //then int expectedNumber = 10; - Assertions.assertThat(sumOfEvenNumbers).isEqualTo(expectedNumber); + assertThat(sumOfEvenNumbers).isEqualTo(expectedNumber); } @Test - void shouldReturn44WhenAddingSumOfEvenFibonacciAndNumbers() { + public void shouldReturn44WhenAddingSumOfEvenFibonacciAndNumbers() { + //given int numberOfLimit = 10; //when @@ -31,12 +32,13 @@ void shouldReturn44WhenAddingSumOfEvenFibonacciAndNumbers() { //then int expectedNumber = 44; - Assertions.assertThat(sumOfEvenNumbers).isEqualTo(expectedNumber); + assertThat(sumOfEvenNumbers).isEqualTo(expectedNumber); } @Test - void shouldReturn188WhenAddingSumOfEvenFibonacciAndNumbers() { + public void shouldReturn188WhenAddingSumOfEvenFibonacciAndNumbers() { + //given int numberOfLimit = 12; //when @@ -44,6 +46,6 @@ void shouldReturn188WhenAddingSumOfEvenFibonacciAndNumbers() { //then int expectedNumber = 188; - Assertions.assertThat(sumOfEvenNumbers).isEqualTo(expectedNumber); + assertThat(sumOfEvenNumbers).isEqualTo(expectedNumber); } } diff --git a/src/main/test/homeWork_20_Tests/SumOfMutlipliers5or3Test.java b/src/main/test/homeWork_20_Tests/SumOfMutlipliers5or3Test.java index 46f2bb4..7c16ed6 100644 --- a/src/main/test/homeWork_20_Tests/SumOfMutlipliers5or3Test.java +++ b/src/main/test/homeWork_20_Tests/SumOfMutlipliers5or3Test.java @@ -4,12 +4,12 @@ import org.junit.Test; import static homeWork_20.Calculator.*; +import static org.assertj.core.api.Assertions.*; public class SumOfMutlipliers5or3Test { - @Test - void shouldReturn23WhenAddingSumOfMutliplies5or3ofNumber10() { + public void shouldReturn23WhenAddingSumOfMutliplies5or3ofNumber10() { //given int initialNumber = 10; @@ -18,11 +18,11 @@ void shouldReturn23WhenAddingSumOfMutliplies5or3ofNumber10() { //then int expectedNumber = 23; - Assertions.assertThat(sumOfMultipliers).isEqualTo(expectedNumber); + assertThat(sumOfMultipliers).isEqualTo(expectedNumber); } @Test - void shouldReturn33WhenAddingSumOfMutliplies5or3ofNumber11() { + public void shouldReturn33WhenAddingSumOfMutliplies5or3ofNumber11() { //given int initialNumber = 11; @@ -31,11 +31,11 @@ void shouldReturn33WhenAddingSumOfMutliplies5or3ofNumber11() { //then int expectedNumber = 33; - Assertions.assertThat(sumOfMultipliers).isEqualTo(expectedNumber); + assertThat(sumOfMultipliers).isEqualTo(expectedNumber); } @Test - void shouldReturn33WhenAddingSumOfMutliplies5or3ofNumber12() { + public void shouldReturn33WhenAddingSumOfMutliplies5or3ofNumber12() { //given int initialNumber = 12; @@ -44,11 +44,11 @@ void shouldReturn33WhenAddingSumOfMutliplies5or3ofNumber12() { //then int expectedNumber = 33; - Assertions.assertThat(sumOfMultipliers).isEqualTo(expectedNumber); + assertThat(sumOfMultipliers).isEqualTo(expectedNumber); } @Test - void shouldReturn45WhenAddingSumOfMutliplies5or3ofNumber13() { + public void shouldReturn45WhenAddingSumOfMutliplies5or3ofNumber13() { //given int initialNumber = 13; @@ -56,12 +56,12 @@ void shouldReturn45WhenAddingSumOfMutliplies5or3ofNumber13() { int sumOfMultipliers = sumOfNaturalNumbers(initialNumber); //then - int expectedNumber = 45 ; - Assertions.assertThat(sumOfMultipliers).isEqualTo(expectedNumber); + int expectedNumber = 45; + assertThat(sumOfMultipliers).isEqualTo(expectedNumber); } @Test - void shouldReturn60WhenAddingSumOfMutliplies5or3ofNumber16() { + public void shouldReturn60WhenAddingSumOfMutliplies5or3ofNumber16() { //given int initialNumber = 16; @@ -70,8 +70,6 @@ void shouldReturn60WhenAddingSumOfMutliplies5or3ofNumber16() { //then int expectedNumber = 60; - Assertions.assertThat(sumOfMultipliers).isEqualTo(expectedNumber); + assertThat(sumOfMultipliers).isEqualTo(expectedNumber); } - - }