From 6856ff42ad49a476dfbae5f39cc44e27bf06bea2 Mon Sep 17 00:00:00 2001 From: pivovarit Date: Tue, 9 May 2017 19:47:06 +0200 Subject: [PATCH 1/6] Idiomatic refactor --- .../baeldung/reports/CustomisedReports.java | 91 ++++++++++++------- 1 file changed, 60 insertions(+), 31 deletions(-) diff --git a/testng/src/test/java/com/baeldung/reports/CustomisedReports.java b/testng/src/test/java/com/baeldung/reports/CustomisedReports.java index 70810ab0dc..d4f1319deb 100644 --- a/testng/src/test/java/com/baeldung/reports/CustomisedReports.java +++ b/testng/src/test/java/com/baeldung/reports/CustomisedReports.java @@ -10,56 +10,85 @@ import java.nio.file.Files; import java.nio.file.Paths; import java.util.List; import java.util.Map; +import java.util.Set; +import java.util.function.Function; +import java.util.stream.Collectors; import java.util.stream.Stream; +import static java.util.stream.Collectors.toList; + public class CustomisedReports implements IReporter { private static final Logger LOGGER = LoggerFactory.getLogger(CustomisedReports.class); + private static final String ROW_TEMPLATE = "%s%s%s%s%s"; + public void generateReport(List xmlSuites, List suites, String outputDirectory) { String reportTemplate = initReportTemplate(); - String resultRow = "%s%s%s%s%s"; - StringBuilder rows = new StringBuilder(); - suites.forEach(suite -> { - Map suiteResults = suite.getResults(); - suiteResults.forEach((testName, suiteResult) -> { - ITestContext testContext = suiteResult.getTestContext(); + final List rows = suites + .stream() + .flatMap(suiteToResults()) + .collect(Collectors.toList()); - Stream failedTests = testContext.getFailedTests().getAllResults().stream(); - Stream passedTests = testContext.getPassedTests().getAllResults().stream(); - Stream skippedTests = testContext.getSkippedTests().getAllResults().stream(); - - String suiteName = suite.getName(); - - Stream allTestResults = Stream.concat(Stream.concat(failedTests, passedTests), skippedTests); - generateReportRows(resultRow, rows, testName, suiteName, allTestResults); - }); - }); reportTemplate = reportTemplate.replaceFirst("", rows.toString() + ""); saveReportTemplate(outputDirectory, reportTemplate); } - private void generateReportRows(String resultRow, StringBuilder rows, String testName, String suiteName, Stream allTestResults) { - allTestResults - .forEach(testResult -> { - String testReportRow = ""; - if (testResult.getStatus() == ITestResult.FAILURE) { - testReportRow = String.format(resultRow, "danger", suiteName, testName, testResult.getName(), "FAILED", "NA"); - } - if (testResult.getStatus() == ITestResult.SUCCESS) { - testReportRow = String.format(resultRow, "success", suiteName, testName, testResult.getName(), "PASSED", String.valueOf(testResult.getEndMillis() - testResult.getStartMillis())); + private Function> suiteToResults() { + return suite -> suite.getResults().entrySet() + .stream() + .flatMap(resultsToRows(suite)); + } + private Function, Stream> resultsToRows(ISuite suite) { + return e -> { + ITestContext testContext = e.getValue().getTestContext(); + + Set failedTests = testContext + .getFailedTests() + .getAllResults(); + Set passedTests = testContext + .getPassedTests() + .getAllResults(); + Set skippedTests = testContext + .getSkippedTests() + .getAllResults(); + + String suiteName = suite.getName(); + + return Stream + .of(failedTests, passedTests, skippedTests) + .flatMap(results -> generateReportRows(e.getKey(), suiteName, results).stream()); + }; + } + + private List generateReportRows(String testName, String suiteName, Set allTestResults) { + return allTestResults.stream() + .map(testResultToResultRow(testName, suiteName)) + .collect(toList()); + } + + private Function testResultToResultRow(String testName, String suiteName) { + return testResult -> { + switch (testResult.getStatus()) { + case ITestResult.FAILURE: + return String.format(ROW_TEMPLATE, "danger", suiteName, testName, testResult.getName(), "FAILED", "NA"); + + case ITestResult.SUCCESS: + return String.format(ROW_TEMPLATE, "success", suiteName, testName, testResult.getName(), "PASSED", String.valueOf(testResult.getEndMillis() - testResult.getStartMillis())); + + case ITestResult.SKIP: + return String.format(ROW_TEMPLATE, "warning", suiteName, testName, testResult.getName(), "SKIPPED", "NA"); + + default: + return ""; } - if (testResult.getStatus() == ITestResult.SKIP) { - testReportRow = String.format(resultRow, "warning", suiteName, testName, testResult.getName(), "SKIPPED", "NA"); - } - rows.append(testReportRow); - }); + }; } private String initReportTemplate() { String template = null; - byte[] reportTemplate = null; + byte[] reportTemplate; try { reportTemplate = Files.readAllBytes(Paths.get("src/test/resources/reportTemplate.html")); template = new String(reportTemplate, "UTF-8"); From fd3f569f20f9a0e9a2ad7ee9bfbae5ab76dec636 Mon Sep 17 00:00:00 2001 From: pivovarit Date: Tue, 9 May 2017 21:44:39 +0200 Subject: [PATCH 2/6] Refactor --- .../test/java/com/baeldung/reports/CustomisedReports.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/testng/src/test/java/com/baeldung/reports/CustomisedReports.java b/testng/src/test/java/com/baeldung/reports/CustomisedReports.java index d4f1319deb..2c57993e0b 100644 --- a/testng/src/test/java/com/baeldung/reports/CustomisedReports.java +++ b/testng/src/test/java/com/baeldung/reports/CustomisedReports.java @@ -25,13 +25,12 @@ public class CustomisedReports implements IReporter { public void generateReport(List xmlSuites, List suites, String outputDirectory) { String reportTemplate = initReportTemplate(); - final List rows = suites + final String body = suites .stream() .flatMap(suiteToResults()) - .collect(Collectors.toList()); + .collect(Collectors.joining()); - reportTemplate = reportTemplate.replaceFirst("", rows.toString() + ""); - saveReportTemplate(outputDirectory, reportTemplate); + saveReportTemplate(outputDirectory, reportTemplate.replaceFirst("", String.format("%s", body))); } private Function> suiteToResults() { From 6e589636edc472e8cb7a6998a33ad6a6b2ade47a Mon Sep 17 00:00:00 2001 From: iaforek Date: Sun, 7 May 2017 23:53:55 +0200 Subject: [PATCH 3/6] BAEL-838 Initial code showing how to remove last char - helper class and tests. (cherry picked from commit d889dba) --- .../com/baeldung/string/RemoveLastChar.java | 18 ++++++ .../baeldung/string/RemoveLastCharTest.java | 56 +++++++++++++++++++ 2 files changed, 74 insertions(+) create mode 100644 core-java/src/main/java/com/baeldung/string/RemoveLastChar.java create mode 100644 core-java/src/test/java/com/baeldung/string/RemoveLastCharTest.java diff --git a/core-java/src/main/java/com/baeldung/string/RemoveLastChar.java b/core-java/src/main/java/com/baeldung/string/RemoveLastChar.java new file mode 100644 index 0000000000..3816a61f45 --- /dev/null +++ b/core-java/src/main/java/com/baeldung/string/RemoveLastChar.java @@ -0,0 +1,18 @@ +/** + * + */ +package com.baeldung.string; + +/** + * @author iaforek + * + */ +public class RemoveLastChar { + public static String substring (String s) { + if (s == null || s.length() == 0) { + return null; + } else { + return (s.substring(0, s.length() - 1)); + } + } +} diff --git a/core-java/src/test/java/com/baeldung/string/RemoveLastCharTest.java b/core-java/src/test/java/com/baeldung/string/RemoveLastCharTest.java new file mode 100644 index 0000000000..80d76e96ac --- /dev/null +++ b/core-java/src/test/java/com/baeldung/string/RemoveLastCharTest.java @@ -0,0 +1,56 @@ +/** + * + */ +package com.baeldung.string; + +import org.apache.commons.lang3.StringUtils; +import org.junit.Assert; +import org.junit.Test; + +/** + * @author iaforek + * + */ +public class RemoveLastCharTest { + + public static final String TEST_STRING = "abcdef"; + public static final String NULL_STRING = null; + public static final String EMPTY_STRING = ""; + public static final String ONE_CHAR_STRING = "a"; + public static final String WHITE_SPACE_AT_THE_END_STRING = "abc "; + + /** + * Test method for {@link com.baeldung.string.RemoveLastChar#substring(java.lang.String)}. + */ + @Test + public void givenTestString_substring_getStingWithoutLastChar() { + Assert.assertEquals("abcde", RemoveLastChar.substring(TEST_STRING)); + Assert.assertEquals("abcde", StringUtils.chop(TEST_STRING)); + } + + @Test + public void givenNullString_substring_getNullString() { + Assert.assertEquals(NULL_STRING, RemoveLastChar.substring(NULL_STRING)); + Assert.assertEquals(NULL_STRING, StringUtils.chop(NULL_STRING)); + + } + + @Test + public void givenEmptyString_substring_getEmptyString() { + Assert.assertEquals(NULL_STRING, RemoveLastChar.substring(EMPTY_STRING)); + Assert.assertEquals(NULL_STRING, StringUtils.chop(NULL_STRING)); + } + + @Test + public void givenOneCharString_substring_getEmptyString() { + Assert.assertEquals(EMPTY_STRING, RemoveLastChar.substring(ONE_CHAR_STRING)); + Assert.assertEquals(EMPTY_STRING, StringUtils.chop(ONE_CHAR_STRING)); + } + + @Test + public void givenStringWithWhiteSpaceAtTheEnd_substring_getStringWithoutWhiteSpaceAtTheEnd() { + Assert.assertEquals("abc", RemoveLastChar.substring(WHITE_SPACE_AT_THE_END_STRING)); + Assert.assertEquals("abc", StringUtils.chop(WHITE_SPACE_AT_THE_END_STRING)); + } + +} From b29cb580a62b70661a23ba8109bd885908ee697a Mon Sep 17 00:00:00 2001 From: iaforek Date: Mon, 8 May 2017 00:11:03 +0200 Subject: [PATCH 4/6] BAEL-838 Corrected Helper class and associated empty string test case. Added StringUtils.substing tests. (cherry picked from commit 124966a) --- .../main/java/com/baeldung/string/RemoveLastChar.java | 2 +- .../java/com/baeldung/string/RemoveLastCharTest.java | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/core-java/src/main/java/com/baeldung/string/RemoveLastChar.java b/core-java/src/main/java/com/baeldung/string/RemoveLastChar.java index 3816a61f45..faf30f7b25 100644 --- a/core-java/src/main/java/com/baeldung/string/RemoveLastChar.java +++ b/core-java/src/main/java/com/baeldung/string/RemoveLastChar.java @@ -10,7 +10,7 @@ package com.baeldung.string; public class RemoveLastChar { public static String substring (String s) { if (s == null || s.length() == 0) { - return null; + return s; } else { return (s.substring(0, s.length() - 1)); } diff --git a/core-java/src/test/java/com/baeldung/string/RemoveLastCharTest.java b/core-java/src/test/java/com/baeldung/string/RemoveLastCharTest.java index 80d76e96ac..a39212ced4 100644 --- a/core-java/src/test/java/com/baeldung/string/RemoveLastCharTest.java +++ b/core-java/src/test/java/com/baeldung/string/RemoveLastCharTest.java @@ -26,6 +26,7 @@ public class RemoveLastCharTest { public void givenTestString_substring_getStingWithoutLastChar() { Assert.assertEquals("abcde", RemoveLastChar.substring(TEST_STRING)); Assert.assertEquals("abcde", StringUtils.chop(TEST_STRING)); + Assert.assertEquals("abcde", StringUtils.substring(TEST_STRING, 0, TEST_STRING.length() - 1)); } @Test @@ -37,20 +38,25 @@ public class RemoveLastCharTest { @Test public void givenEmptyString_substring_getEmptyString() { - Assert.assertEquals(NULL_STRING, RemoveLastChar.substring(EMPTY_STRING)); - Assert.assertEquals(NULL_STRING, StringUtils.chop(NULL_STRING)); + Assert.assertEquals(EMPTY_STRING, RemoveLastChar.substring(EMPTY_STRING)); + Assert.assertEquals(EMPTY_STRING, StringUtils.chop(EMPTY_STRING)); + Assert.assertEquals(EMPTY_STRING, StringUtils.substring(EMPTY_STRING, 0, EMPTY_STRING.length() - 1)); + } @Test public void givenOneCharString_substring_getEmptyString() { Assert.assertEquals(EMPTY_STRING, RemoveLastChar.substring(ONE_CHAR_STRING)); Assert.assertEquals(EMPTY_STRING, StringUtils.chop(ONE_CHAR_STRING)); + Assert.assertEquals(EMPTY_STRING, StringUtils.substring(ONE_CHAR_STRING, 0, ONE_CHAR_STRING.length() - 1)); + } @Test public void givenStringWithWhiteSpaceAtTheEnd_substring_getStringWithoutWhiteSpaceAtTheEnd() { Assert.assertEquals("abc", RemoveLastChar.substring(WHITE_SPACE_AT_THE_END_STRING)); Assert.assertEquals("abc", StringUtils.chop(WHITE_SPACE_AT_THE_END_STRING)); + Assert.assertEquals("abc", StringUtils.substring(WHITE_SPACE_AT_THE_END_STRING, 0, WHITE_SPACE_AT_THE_END_STRING.length() - 1)); } } From c53095a3d7d6e2d2c525dc068f6a2ea830677f99 Mon Sep 17 00:00:00 2001 From: iaforek Date: Mon, 8 May 2017 20:12:17 +0200 Subject: [PATCH 5/6] BAEL-838 Refromatted code using formatter.xml. Added Assert.assertEquals import. Renamed test to follow convention. Reordered tests. (cherry picked from commit d9d35f8) --- .../com/baeldung/string/RemoveLastChar.java | 21 ++--- .../baeldung/string/RemoveLastCharTest.java | 87 ++++++++----------- 2 files changed, 44 insertions(+), 64 deletions(-) diff --git a/core-java/src/main/java/com/baeldung/string/RemoveLastChar.java b/core-java/src/main/java/com/baeldung/string/RemoveLastChar.java index faf30f7b25..ee1d5c597d 100644 --- a/core-java/src/main/java/com/baeldung/string/RemoveLastChar.java +++ b/core-java/src/main/java/com/baeldung/string/RemoveLastChar.java @@ -1,18 +1,11 @@ -/** - * - */ package com.baeldung.string; -/** - * @author iaforek - * - */ public class RemoveLastChar { - public static String substring (String s) { - if (s == null || s.length() == 0) { - return s; - } else { - return (s.substring(0, s.length() - 1)); - } - } + public static String substring(String s) { + if (s == null || s.length() == 0) { + return s; + } else { + return (s.substring(0, s.length() - 1)); + } + } } diff --git a/core-java/src/test/java/com/baeldung/string/RemoveLastCharTest.java b/core-java/src/test/java/com/baeldung/string/RemoveLastCharTest.java index a39212ced4..f1212b2ed9 100644 --- a/core-java/src/test/java/com/baeldung/string/RemoveLastCharTest.java +++ b/core-java/src/test/java/com/baeldung/string/RemoveLastCharTest.java @@ -1,62 +1,49 @@ -/** - * - */ package com.baeldung.string; +import static org.junit.Assert.assertEquals; + import org.apache.commons.lang3.StringUtils; -import org.junit.Assert; import org.junit.Test; -/** - * @author iaforek - * - */ public class RemoveLastCharTest { - - public static final String TEST_STRING = "abcdef"; - public static final String NULL_STRING = null; - public static final String EMPTY_STRING = ""; - public static final String ONE_CHAR_STRING = "a"; - public static final String WHITE_SPACE_AT_THE_END_STRING = "abc "; - /** - * Test method for {@link com.baeldung.string.RemoveLastChar#substring(java.lang.String)}. - */ - @Test - public void givenTestString_substring_getStingWithoutLastChar() { - Assert.assertEquals("abcde", RemoveLastChar.substring(TEST_STRING)); - Assert.assertEquals("abcde", StringUtils.chop(TEST_STRING)); - Assert.assertEquals("abcde", StringUtils.substring(TEST_STRING, 0, TEST_STRING.length() - 1)); - } - - @Test - public void givenNullString_substring_getNullString() { - Assert.assertEquals(NULL_STRING, RemoveLastChar.substring(NULL_STRING)); - Assert.assertEquals(NULL_STRING, StringUtils.chop(NULL_STRING)); + public static final String TEST_STRING = "abcdef"; + public static final String NULL_STRING = null; + public static final String EMPTY_STRING = ""; + public static final String ONE_CHAR_STRING = "a"; + public static final String WHITE_SPACE_AT_THE_END_STRING = "abc "; - } + @Test + public void givenTestString_whenSubstring_thenGetStingWithoutLastChar() { + assertEquals("abcde", RemoveLastChar.substring(TEST_STRING)); + assertEquals("abcde", StringUtils.substring(TEST_STRING, 0, TEST_STRING.length() - 1)); + assertEquals("abcde", StringUtils.chop(TEST_STRING)); + } - @Test - public void givenEmptyString_substring_getEmptyString() { - Assert.assertEquals(EMPTY_STRING, RemoveLastChar.substring(EMPTY_STRING)); - Assert.assertEquals(EMPTY_STRING, StringUtils.chop(EMPTY_STRING)); - Assert.assertEquals(EMPTY_STRING, StringUtils.substring(EMPTY_STRING, 0, EMPTY_STRING.length() - 1)); + @Test + public void givenNullString_whenSubstring_thenGetNullString() { + assertEquals(NULL_STRING, RemoveLastChar.substring(NULL_STRING)); + assertEquals(NULL_STRING, StringUtils.chop(NULL_STRING)); + } - } - - @Test - public void givenOneCharString_substring_getEmptyString() { - Assert.assertEquals(EMPTY_STRING, RemoveLastChar.substring(ONE_CHAR_STRING)); - Assert.assertEquals(EMPTY_STRING, StringUtils.chop(ONE_CHAR_STRING)); - Assert.assertEquals(EMPTY_STRING, StringUtils.substring(ONE_CHAR_STRING, 0, ONE_CHAR_STRING.length() - 1)); + @Test + public void givenEmptyString_whenSubstring_thenGetEmptyString() { + assertEquals(EMPTY_STRING, RemoveLastChar.substring(EMPTY_STRING)); + assertEquals(EMPTY_STRING, StringUtils.substring(EMPTY_STRING, 0, EMPTY_STRING.length() - 1)); + assertEquals(EMPTY_STRING, StringUtils.chop(EMPTY_STRING)); + } - } - - @Test - public void givenStringWithWhiteSpaceAtTheEnd_substring_getStringWithoutWhiteSpaceAtTheEnd() { - Assert.assertEquals("abc", RemoveLastChar.substring(WHITE_SPACE_AT_THE_END_STRING)); - Assert.assertEquals("abc", StringUtils.chop(WHITE_SPACE_AT_THE_END_STRING)); - Assert.assertEquals("abc", StringUtils.substring(WHITE_SPACE_AT_THE_END_STRING, 0, WHITE_SPACE_AT_THE_END_STRING.length() - 1)); - } - + @Test + public void givenOneCharString_whenSubstring_thenGetEmptyString() { + assertEquals(EMPTY_STRING, RemoveLastChar.substring(ONE_CHAR_STRING)); + assertEquals(EMPTY_STRING, StringUtils.substring(ONE_CHAR_STRING, 0, ONE_CHAR_STRING.length() - 1)); + assertEquals(EMPTY_STRING, StringUtils.chop(ONE_CHAR_STRING)); + } + + @Test + public void givenStringWithWhiteSpaceAtTheEnd_whenSubstring_thenGetStringWithoutWhiteSpaceAtTheEnd() { + assertEquals("abc", RemoveLastChar.substring(WHITE_SPACE_AT_THE_END_STRING)); + assertEquals("abc", StringUtils.substring(WHITE_SPACE_AT_THE_END_STRING, 0, WHITE_SPACE_AT_THE_END_STRING.length() - 1)); + assertEquals("abc", StringUtils.chop(WHITE_SPACE_AT_THE_END_STRING)); + } } From e8e3234647c3deb5bb0ffe73b8593068ca0dbfc5 Mon Sep 17 00:00:00 2001 From: buddhini81 Date: Thu, 11 May 2017 14:00:33 +0530 Subject: [PATCH 6/6] Add renamed tests for BAEL-876 (#1822) * Deleting file AccountHolderUnitTest * Deleting file CyclicDependancyUnitTest * Delete InfiniteRecursionWithTerminationConditionUnitTest * Delete file UnintendedInfiniteRecursionUnitTest * Create .test * Add renamed tests for BAEL-876 * Delete file --- ...Test.java => AccountHolderManualTest.java} | 2 +- ...t.java => CyclicDependancyManualTest.java} | 3 +- ...onWithTerminationConditionManualTest.java} | 3 +- ...nintendedInfiniteRecursionManualTest.java} | 28 +++++++++++-------- 4 files changed, 19 insertions(+), 17 deletions(-) rename core-java/src/test/java/com/baeldung/stackoverflowerror/{AccountHolderUnitTest.java => AccountHolderManualTest.java} (83%) rename core-java/src/test/java/com/baeldung/stackoverflowerror/{CyclicDependancyUnitTest.java => CyclicDependancyManualTest.java} (85%) rename core-java/src/test/java/com/baeldung/stackoverflowerror/{InfiniteRecursionWithTerminationConditionUnitTest.java => InfiniteRecursionWithTerminationConditionManualTest.java} (92%) rename core-java/src/test/java/com/baeldung/stackoverflowerror/{UnintendedInfiniteRecursionUnitTest.java => UnintendedInfiniteRecursionManualTest.java} (55%) diff --git a/core-java/src/test/java/com/baeldung/stackoverflowerror/AccountHolderUnitTest.java b/core-java/src/test/java/com/baeldung/stackoverflowerror/AccountHolderManualTest.java similarity index 83% rename from core-java/src/test/java/com/baeldung/stackoverflowerror/AccountHolderUnitTest.java rename to core-java/src/test/java/com/baeldung/stackoverflowerror/AccountHolderManualTest.java index 40530ddba5..e6a8f89a16 100644 --- a/core-java/src/test/java/com/baeldung/stackoverflowerror/AccountHolderUnitTest.java +++ b/core-java/src/test/java/com/baeldung/stackoverflowerror/AccountHolderManualTest.java @@ -2,7 +2,7 @@ package com.baeldung.stackoverflowerror; import org.junit.Test; -public class AccountHolderUnitTest { +public class AccountHolderManualTest { @Test(expected = StackOverflowError.class) public void whenInstanciatingAccountHolder_thenThrowsException() { AccountHolder holder = new AccountHolder(); diff --git a/core-java/src/test/java/com/baeldung/stackoverflowerror/CyclicDependancyUnitTest.java b/core-java/src/test/java/com/baeldung/stackoverflowerror/CyclicDependancyManualTest.java similarity index 85% rename from core-java/src/test/java/com/baeldung/stackoverflowerror/CyclicDependancyUnitTest.java rename to core-java/src/test/java/com/baeldung/stackoverflowerror/CyclicDependancyManualTest.java index 480edcf49d..9a53a83b2a 100644 --- a/core-java/src/test/java/com/baeldung/stackoverflowerror/CyclicDependancyUnitTest.java +++ b/core-java/src/test/java/com/baeldung/stackoverflowerror/CyclicDependancyManualTest.java @@ -1,10 +1,9 @@ package com.baeldung.stackoverflowerror; import static org.junit.Assert.fail; - import org.junit.Test; -public class CyclicDependancyUnitTest { +public class CyclicDependancyManualTest { @Test public void whenInstanciatingClassOne_thenThrowsException() { try { diff --git a/core-java/src/test/java/com/baeldung/stackoverflowerror/InfiniteRecursionWithTerminationConditionUnitTest.java b/core-java/src/test/java/com/baeldung/stackoverflowerror/InfiniteRecursionWithTerminationConditionManualTest.java similarity index 92% rename from core-java/src/test/java/com/baeldung/stackoverflowerror/InfiniteRecursionWithTerminationConditionUnitTest.java rename to core-java/src/test/java/com/baeldung/stackoverflowerror/InfiniteRecursionWithTerminationConditionManualTest.java index c3a210f54f..a262ee86a0 100644 --- a/core-java/src/test/java/com/baeldung/stackoverflowerror/InfiniteRecursionWithTerminationConditionUnitTest.java +++ b/core-java/src/test/java/com/baeldung/stackoverflowerror/InfiniteRecursionWithTerminationConditionManualTest.java @@ -2,10 +2,9 @@ package com.baeldung.stackoverflowerror; import static junit.framework.TestCase.assertEquals; import static org.junit.Assert.fail; - import org.junit.Test; -public class InfiniteRecursionWithTerminationConditionUnitTest { +public class InfiniteRecursionWithTerminationConditionManualTest { @Test public void givenPositiveIntNoOne_whenCalcFact_thenThrowsException() { int numToCalcFactorial = 1; diff --git a/core-java/src/test/java/com/baeldung/stackoverflowerror/UnintendedInfiniteRecursionUnitTest.java b/core-java/src/test/java/com/baeldung/stackoverflowerror/UnintendedInfiniteRecursionManualTest.java similarity index 55% rename from core-java/src/test/java/com/baeldung/stackoverflowerror/UnintendedInfiniteRecursionUnitTest.java rename to core-java/src/test/java/com/baeldung/stackoverflowerror/UnintendedInfiniteRecursionManualTest.java index a712366ee7..c643da4aeb 100644 --- a/core-java/src/test/java/com/baeldung/stackoverflowerror/UnintendedInfiniteRecursionUnitTest.java +++ b/core-java/src/test/java/com/baeldung/stackoverflowerror/UnintendedInfiniteRecursionManualTest.java @@ -1,29 +1,33 @@ package com.baeldung.stackoverflowerror; + import org.junit.Test; -public class UnintendedInfiniteRecursionUnitTest { +public class UnintendedInfiniteRecursionManualTest { @Test(expected = StackOverflowError.class) public void givenPositiveIntNoOne_whenCalFact_thenThrowsException() { - int numToCalcFactorial = 1; - UnintendedInfiniteRecursion uir = new UnintendedInfiniteRecursion(); - + int numToCalcFactorial= 1; + UnintendedInfiniteRecursion uir + = new UnintendedInfiniteRecursion(); + uir.calculateFactorial(numToCalcFactorial); } - + @Test(expected = StackOverflowError.class) public void givenPositiveIntGtOne_whenCalcFact_thenThrowsException() { - int numToCalcFactorial = 2; - UnintendedInfiniteRecursion uir = new UnintendedInfiniteRecursion(); - + int numToCalcFactorial= 2; + UnintendedInfiniteRecursion uir + = new UnintendedInfiniteRecursion(); + uir.calculateFactorial(numToCalcFactorial); } - + @Test(expected = StackOverflowError.class) public void givenNegativeInt_whenCalcFact_thenThrowsException() { - int numToCalcFactorial = -1; - UnintendedInfiniteRecursion uir = new UnintendedInfiniteRecursion(); - + int numToCalcFactorial= -1; + UnintendedInfiniteRecursion uir + = new UnintendedInfiniteRecursion(); + uir.calculateFactorial(numToCalcFactorial); } }