From b5dcb13c41cae9374210dfe4c178b11a242a04de Mon Sep 17 00:00:00 2001 From: amit2103 Date: Sun, 14 Oct 2018 18:13:40 +0530 Subject: [PATCH] [BAEL-9635] - Moved Junit vs TestNg junit code examples to junit-5 module from core-java --- .../customtestname/CustomNameUnitTest.java | 17 ------ .../ParameterizedUnitTest.java | 48 ----------------- .../suite/SelectClassesSuiteUnitTest.java | 13 ----- .../suite/SelectPackagesSuiteUnitTest.java | 11 ---- .../suite/childpackage1/Class1UnitTest.java | 15 ------ .../suite/childpackage2/Class2UnitTest.java | 14 ----- .../log4j2/${sys:logging.folder.path} | 0 pom.xml | 6 +++ .../baeldung/throwsexception/Calculator.java | 0 .../DivideByZeroException.java | 0 .../junit4vstestng/SortedUnitTest.java | 0 .../SummationServiceIntegrationTest.java | 0 .../SummationServiceIntegrationTest.java | 53 +++++++++++++++++++ .../throwsexception/CalculatorUnitTest.java | 0 14 files changed, 59 insertions(+), 118 deletions(-) delete mode 100644 core-java/src/test/java/org/baeldung/java/customtestname/CustomNameUnitTest.java delete mode 100644 core-java/src/test/java/org/baeldung/java/parameterisedsource/ParameterizedUnitTest.java delete mode 100644 core-java/src/test/java/org/baeldung/java/suite/SelectClassesSuiteUnitTest.java delete mode 100644 core-java/src/test/java/org/baeldung/java/suite/SelectPackagesSuiteUnitTest.java delete mode 100644 core-java/src/test/java/org/baeldung/java/suite/childpackage1/Class1UnitTest.java delete mode 100644 core-java/src/test/java/org/baeldung/java/suite/childpackage2/Class2UnitTest.java delete mode 100755 logging-modules/log4j2/${sys:logging.folder.path} rename {core-java => testing-modules/junit-5}/src/main/java/com/baeldung/throwsexception/Calculator.java (100%) rename {core-java => testing-modules/junit-5}/src/main/java/com/baeldung/throwsexception/DivideByZeroException.java (100%) rename {core-java => testing-modules/junit-5}/src/test/java/com/baeldung/junit4vstestng/SortedUnitTest.java (100%) rename {core-java => testing-modules/junit-5}/src/test/java/com/baeldung/junit4vstestng/SummationServiceIntegrationTest.java (100%) create mode 100644 testing-modules/junit-5/src/test/java/com/baeldung/junit5vstestng/SummationServiceIntegrationTest.java rename {core-java => testing-modules/junit-5}/src/test/java/com/baeldung/throwsexception/CalculatorUnitTest.java (100%) diff --git a/core-java/src/test/java/org/baeldung/java/customtestname/CustomNameUnitTest.java b/core-java/src/test/java/org/baeldung/java/customtestname/CustomNameUnitTest.java deleted file mode 100644 index f04b825c89..0000000000 --- a/core-java/src/test/java/org/baeldung/java/customtestname/CustomNameUnitTest.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.baeldung.java.customtestname; - -import static org.junit.Assert.assertNotNull; - -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.params.ParameterizedTest; -import org.junit.jupiter.params.provider.ValueSource; - -public class CustomNameUnitTest { - - @ParameterizedTest - @ValueSource(strings = { "Hello", "World" }) - @DisplayName("Test Method to check that the inputs are not nullable") - void givenString_TestNullOrNot(String word) { - assertNotNull(word); - } -} diff --git a/core-java/src/test/java/org/baeldung/java/parameterisedsource/ParameterizedUnitTest.java b/core-java/src/test/java/org/baeldung/java/parameterisedsource/ParameterizedUnitTest.java deleted file mode 100644 index af9ad870b9..0000000000 --- a/core-java/src/test/java/org/baeldung/java/parameterisedsource/ParameterizedUnitTest.java +++ /dev/null @@ -1,48 +0,0 @@ -package org.baeldung.java.parameterisedsource; - -import static org.junit.Assert.assertNotEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; - -import java.util.EnumSet; -import java.util.stream.Stream; - -import org.junit.jupiter.params.ParameterizedTest; -import org.junit.jupiter.params.provider.CsvSource; -import org.junit.jupiter.params.provider.EnumSource; -import org.junit.jupiter.params.provider.MethodSource; -import org.junit.jupiter.params.provider.ValueSource; - -import com.baeldung.enums.PizzaDeliveryStrategy; - -public class ParameterizedUnitTest { - - @ParameterizedTest - @ValueSource(strings = { "Hello", "World" }) - void givenString_TestNullOrNot(String word) { - assertNotNull(word); - } - - @ParameterizedTest - @EnumSource(value = PizzaDeliveryStrategy.class, names = {"EXPRESS", "NORMAL"}) - void givenEnum_TestContainsOrNot(PizzaDeliveryStrategy timeUnit) { - assertTrue(EnumSet.of(PizzaDeliveryStrategy.EXPRESS, PizzaDeliveryStrategy.NORMAL).contains(timeUnit)); - } - - @ParameterizedTest - @MethodSource("wordDataProvider") - void givenMethodSource_TestInputStream(String argument) { - assertNotNull(argument); - } - - static Stream wordDataProvider() { - return Stream.of("foo", "bar"); - } - - @ParameterizedTest - @CsvSource({ "1, Car", "2, House", "3, Train" }) - void givenCSVSource_TestContent(int id, String word) { - assertNotNull(id); - assertNotNull(word); - } -} diff --git a/core-java/src/test/java/org/baeldung/java/suite/SelectClassesSuiteUnitTest.java b/core-java/src/test/java/org/baeldung/java/suite/SelectClassesSuiteUnitTest.java deleted file mode 100644 index 220897eae7..0000000000 --- a/core-java/src/test/java/org/baeldung/java/suite/SelectClassesSuiteUnitTest.java +++ /dev/null @@ -1,13 +0,0 @@ -package org.baeldung.java.suite; - -import org.baeldung.java.suite.childpackage1.Class1UnitTest; -import org.baeldung.java.suite.childpackage2.Class2UnitTest; -import org.junit.platform.runner.JUnitPlatform; -import org.junit.platform.suite.api.SelectClasses; -import org.junit.runner.RunWith; - -@RunWith(JUnitPlatform.class) -@SelectClasses({Class1UnitTest.class, Class2UnitTest.class}) -public class SelectClassesSuiteUnitTest { - -} diff --git a/core-java/src/test/java/org/baeldung/java/suite/SelectPackagesSuiteUnitTest.java b/core-java/src/test/java/org/baeldung/java/suite/SelectPackagesSuiteUnitTest.java deleted file mode 100644 index ae887ae43b..0000000000 --- a/core-java/src/test/java/org/baeldung/java/suite/SelectPackagesSuiteUnitTest.java +++ /dev/null @@ -1,11 +0,0 @@ -package org.baeldung.java.suite; - -import org.junit.platform.runner.JUnitPlatform; -import org.junit.platform.suite.api.SelectPackages; -import org.junit.runner.RunWith; - -@RunWith(JUnitPlatform.class) -@SelectPackages({ "org.baeldung.java.suite.childpackage1", "org.baeldung.java.suite.childpackage2" }) -public class SelectPackagesSuiteUnitTest { - -} diff --git a/core-java/src/test/java/org/baeldung/java/suite/childpackage1/Class1UnitTest.java b/core-java/src/test/java/org/baeldung/java/suite/childpackage1/Class1UnitTest.java deleted file mode 100644 index 78469cb971..0000000000 --- a/core-java/src/test/java/org/baeldung/java/suite/childpackage1/Class1UnitTest.java +++ /dev/null @@ -1,15 +0,0 @@ -package org.baeldung.java.suite.childpackage1; - -import static org.junit.jupiter.api.Assertions.assertTrue; - -import org.junit.Test; - - -public class Class1UnitTest { - - @Test - public void testCase_InClass1UnitTest() { - assertTrue(true); - } - -} diff --git a/core-java/src/test/java/org/baeldung/java/suite/childpackage2/Class2UnitTest.java b/core-java/src/test/java/org/baeldung/java/suite/childpackage2/Class2UnitTest.java deleted file mode 100644 index 4463ecfad9..0000000000 --- a/core-java/src/test/java/org/baeldung/java/suite/childpackage2/Class2UnitTest.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.baeldung.java.suite.childpackage2; - -import static org.junit.jupiter.api.Assertions.assertTrue; - -import org.junit.Test; - -public class Class2UnitTest { - - @Test - public void testCase_InClass2UnitTest() { - assertTrue(true); - } - -} diff --git a/logging-modules/log4j2/${sys:logging.folder.path} b/logging-modules/log4j2/${sys:logging.folder.path} deleted file mode 100755 index e69de29bb2..0000000000 diff --git a/pom.xml b/pom.xml index 28a6dd358e..da1733d2b2 100644 --- a/pom.xml +++ b/pom.xml @@ -46,6 +46,12 @@ ${junit-jupiter.version} test + + org.junit.jupiter + junit-jupiter-params + ${junit-jupiter.version} + test + org.junit.jupiter junit-jupiter-api diff --git a/core-java/src/main/java/com/baeldung/throwsexception/Calculator.java b/testing-modules/junit-5/src/main/java/com/baeldung/throwsexception/Calculator.java similarity index 100% rename from core-java/src/main/java/com/baeldung/throwsexception/Calculator.java rename to testing-modules/junit-5/src/main/java/com/baeldung/throwsexception/Calculator.java diff --git a/core-java/src/main/java/com/baeldung/throwsexception/DivideByZeroException.java b/testing-modules/junit-5/src/main/java/com/baeldung/throwsexception/DivideByZeroException.java similarity index 100% rename from core-java/src/main/java/com/baeldung/throwsexception/DivideByZeroException.java rename to testing-modules/junit-5/src/main/java/com/baeldung/throwsexception/DivideByZeroException.java diff --git a/core-java/src/test/java/com/baeldung/junit4vstestng/SortedUnitTest.java b/testing-modules/junit-5/src/test/java/com/baeldung/junit4vstestng/SortedUnitTest.java similarity index 100% rename from core-java/src/test/java/com/baeldung/junit4vstestng/SortedUnitTest.java rename to testing-modules/junit-5/src/test/java/com/baeldung/junit4vstestng/SortedUnitTest.java diff --git a/core-java/src/test/java/com/baeldung/junit4vstestng/SummationServiceIntegrationTest.java b/testing-modules/junit-5/src/test/java/com/baeldung/junit4vstestng/SummationServiceIntegrationTest.java similarity index 100% rename from core-java/src/test/java/com/baeldung/junit4vstestng/SummationServiceIntegrationTest.java rename to testing-modules/junit-5/src/test/java/com/baeldung/junit4vstestng/SummationServiceIntegrationTest.java diff --git a/testing-modules/junit-5/src/test/java/com/baeldung/junit5vstestng/SummationServiceIntegrationTest.java b/testing-modules/junit-5/src/test/java/com/baeldung/junit5vstestng/SummationServiceIntegrationTest.java new file mode 100644 index 0000000000..92e7a6f5db --- /dev/null +++ b/testing-modules/junit-5/src/test/java/com/baeldung/junit5vstestng/SummationServiceIntegrationTest.java @@ -0,0 +1,53 @@ +package com.baeldung.junit5vstestng; + +import java.util.ArrayList; +import java.util.List; + +import org.junit.Assert; +import org.junit.Ignore; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +public class SummationServiceIntegrationTest { + private static List numbers; + + @BeforeAll + public static void initialize() { + numbers = new ArrayList<>(); + } + + @AfterAll + public static void tearDown() { + numbers = null; + } + + @BeforeEach + public void runBeforeEachTest() { + numbers.add(1); + numbers.add(2); + numbers.add(3); + } + + @AfterEach + public void runAfterEachTest() { + numbers.clear(); + } + + @Test + public void givenNumbers_sumEquals_thenCorrect() { + int sum = numbers.stream() + .reduce(0, Integer::sum); + Assert.assertEquals(6, sum); + } + + @Ignore + @Test + public void givenEmptyList_sumEqualsZero_thenCorrect() { + int sum = numbers.stream() + .reduce(0, Integer::sum); + Assert.assertEquals(6, sum); + } +} diff --git a/core-java/src/test/java/com/baeldung/throwsexception/CalculatorUnitTest.java b/testing-modules/junit-5/src/test/java/com/baeldung/throwsexception/CalculatorUnitTest.java similarity index 100% rename from core-java/src/test/java/com/baeldung/throwsexception/CalculatorUnitTest.java rename to testing-modules/junit-5/src/test/java/com/baeldung/throwsexception/CalculatorUnitTest.java