From 3d0927928285962988e9c28c1f9d244f13f6f041 Mon Sep 17 00:00:00 2001 From: SoldatovAR Date: Wed, 16 May 2018 02:47:20 +0300 Subject: [PATCH 1/2] AddDemoTests4HW1 --- .../TestGenerateIntSequence.java | 48 +++++++++++++++++++ .../TestSortStringsByLength.java | 42 ++++++++++++++++ 2 files changed, 90 insertions(+) create mode 100644 src/test/java/ru/odnoklassniki/ClassToBeTestedTests/TestGenerateIntSequence.java create mode 100644 src/test/java/ru/odnoklassniki/ClassToBeTestedTests/TestSortStringsByLength.java diff --git a/src/test/java/ru/odnoklassniki/ClassToBeTestedTests/TestGenerateIntSequence.java b/src/test/java/ru/odnoklassniki/ClassToBeTestedTests/TestGenerateIntSequence.java new file mode 100644 index 0000000..7d31efa --- /dev/null +++ b/src/test/java/ru/odnoklassniki/ClassToBeTestedTests/TestGenerateIntSequence.java @@ -0,0 +1,48 @@ +package ru.odnoklassniki.ClassToBeTestedTests; + +import org.junit.Assert; +import org.junit.Test; +import ru.odnoklassniki.ClassToBeTested; + +import java.util.List; + + +/** + * Created by Soldatov Artem as demotests + */ + +public class TestGenerateIntSequence { + + @Test + public void testSequenceGeneratedCorrectly() { + final int startNum = 21; + final int numCount = 3; + final List sequence = ClassToBeTested.generateIntSequence(startNum, numCount); + + Assert.assertNotNull(sequence); + Assert.assertEquals(3, sequence.size()); + for (int i : sequence) Assert.assertEquals(startNum+i,sequence.get(i).intValue()); + } + + @Test(expected = IllegalArgumentException.class) + public void testNullItemsCountExceptionThrown() { + try { ClassToBeTested.generateIntSequence(5, 0); + Assert.fail("Method did not throw exception when second items count was 0"); + } catch (IllegalArgumentException e) { + Assert.assertEquals("itemsCount must be greater than 0", e.getMessage()); + } + + } + + @Test(expected = IllegalArgumentException.class) + public void testMoreThenIntegerMaxValueSequenceGen() { + for (int i = 0; i <1; i++) { + try { ClassToBeTested.generateIntSequence(i, Integer.MAX_VALUE); + Assert.fail("Method did not throw exception when sum startingNumber and itemsCount more then Integer max value"); + } catch (IllegalArgumentException e) { + Assert.assertEquals("can't generate an int greater than integer's max value", e.getMessage()); + } + } + } + +} diff --git a/src/test/java/ru/odnoklassniki/ClassToBeTestedTests/TestSortStringsByLength.java b/src/test/java/ru/odnoklassniki/ClassToBeTestedTests/TestSortStringsByLength.java new file mode 100644 index 0000000..dbdaf14 --- /dev/null +++ b/src/test/java/ru/odnoklassniki/ClassToBeTestedTests/TestSortStringsByLength.java @@ -0,0 +1,42 @@ +package ru.odnoklassniki.ClassToBeTestedTests; + +import org.junit.Assert; +import org.junit.Test; +import ru.odnoklassniki.ClassToBeTested; + +import java.util.List; + +import static org.hamcrest.Matchers.*; + +/** + * Created by Soldatov Artem as demotests + */ + +public class TestSortStringsByLength { + + @Test + public void testSortedListContainsStrings() throws Exception{ + final String str1 = "string01"; + final String str2 = "string0123"; + final List sortedStrings = ClassToBeTested.sortStringsByLength(str1, str2); + + Assert.assertThat( + "В ответе нет строк", + sortedStrings, + hasSize(notNullValue()) + ); + } + + @Test + public void testSortedListContainsFirstString() throws Exception{ + final String str1 = "string1"; + final String str2 = "string11"; + final List sortedStrings = ClassToBeTested.sortStringsByLength(str1, str2); + + Assert.assertThat( + "Ответ не содержит первую строку", + sortedStrings, + contains(str1) + ); + } +} From 187297565ea288dc75388fb01e3fbb21255b5b1b Mon Sep 17 00:00:00 2001 From: SoldatovAR Date: Wed, 16 May 2018 14:59:06 +0300 Subject: [PATCH 2/2] AddDemoTests4HW1(fixed) --- .../TestGenerateIntSequence.java | 8 +++++--- .../TestSortStringsByLength.java | 16 ++++++++++++---- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/src/test/java/ru/odnoklassniki/ClassToBeTestedTests/TestGenerateIntSequence.java b/src/test/java/ru/odnoklassniki/ClassToBeTestedTests/TestGenerateIntSequence.java index 7d31efa..de2532d 100644 --- a/src/test/java/ru/odnoklassniki/ClassToBeTestedTests/TestGenerateIntSequence.java +++ b/src/test/java/ru/odnoklassniki/ClassToBeTestedTests/TestGenerateIntSequence.java @@ -21,10 +21,12 @@ public void testSequenceGeneratedCorrectly() { Assert.assertNotNull(sequence); Assert.assertEquals(3, sequence.size()); - for (int i : sequence) Assert.assertEquals(startNum+i,sequence.get(i).intValue()); + for (int i : sequence) { + Assert.assertEquals(startNum+i,sequence.get(i).intValue()); + } } - @Test(expected = IllegalArgumentException.class) + @Test public void testNullItemsCountExceptionThrown() { try { ClassToBeTested.generateIntSequence(5, 0); Assert.fail("Method did not throw exception when second items count was 0"); @@ -34,7 +36,7 @@ public void testNullItemsCountExceptionThrown() { } - @Test(expected = IllegalArgumentException.class) + @Test public void testMoreThenIntegerMaxValueSequenceGen() { for (int i = 0; i <1; i++) { try { ClassToBeTested.generateIntSequence(i, Integer.MAX_VALUE); diff --git a/src/test/java/ru/odnoklassniki/ClassToBeTestedTests/TestSortStringsByLength.java b/src/test/java/ru/odnoklassniki/ClassToBeTestedTests/TestSortStringsByLength.java index dbdaf14..1bdb272 100644 --- a/src/test/java/ru/odnoklassniki/ClassToBeTestedTests/TestSortStringsByLength.java +++ b/src/test/java/ru/odnoklassniki/ClassToBeTestedTests/TestSortStringsByLength.java @@ -6,7 +6,12 @@ import java.util.List; -import static org.hamcrest.Matchers.*; +import static org.hamcrest.CoreMatchers.equalTo; +import static org.hamcrest.Matchers.contains; +import static org.hamcrest.Matchers.hasSize; +import static org.hamcrest.Matchers.notNullValue; +import static org.hamcrest.core.AllOf.allOf; + /** * Created by Soldatov Artem as demotests @@ -15,15 +20,18 @@ public class TestSortStringsByLength { @Test - public void testSortedListContainsStrings() throws Exception{ + public void testSortedListContainsCorrectLength() throws Exception{ final String str1 = "string01"; final String str2 = "string0123"; final List sortedStrings = ClassToBeTested.sortStringsByLength(str1, str2); Assert.assertThat( - "В ответе нет строк", + "Некорретный размер коллекции", sortedStrings, - hasSize(notNullValue()) + allOf( + notNullValue(), + hasSize(equalTo(2)) + ) ); }