From ddc106ccd9931c778304b63d2622498312b373d3 Mon Sep 17 00:00:00 2001
From: Predrag Maric <pedja4@users.noreply.github.com>
Date: Tue, 7 Aug 2018 14:42:57 +0200
Subject: [PATCH] BAEL-1852 moved the code into junit-5 module (#4915)

* BAEL-1852 moved the code into junit-5 module

* BAEL-1852 removed junit-abstract module from parent-modules
---
 pom.xml                                       |  3 -
 testing-modules/junit-5/pom.xml               | 21 ++++++-
 .../abstractmethod/AbstractMethodCalling.java |  2 +-
 .../indepedentmethod/AbstractIndependent.java |  2 +-
 .../indepedentmethod/ConcreteImpl.java        |  2 +-
 .../AbstractInstanceFields.java               |  2 +-
 .../privatemethod/AbstractPrivateMethods.java |  2 +-
 .../AbstractMethodCallingUnitTest.java        |  2 +-
 .../AbstractIndependentUnitTest.java          |  2 +-
 .../AbstractInstanceFieldsUnitTest.java       |  2 +-
 .../AbstractPrivateMethodsUnitTest.java       |  6 +-
 testing-modules/junit-abstract/pom.xml        | 62 -------------------
 .../src/main/resources/logback.xml            | 13 ----
 13 files changed, 31 insertions(+), 90 deletions(-)
 rename testing-modules/{junit-abstract/src/main/java/org/baeldung/testing => junit-5/src/main/java/com/baeldung}/abstractclass/abstractmethod/AbstractMethodCalling.java (83%)
 rename testing-modules/{junit-abstract/src/main/java/org/baeldung/testing => junit-5/src/main/java/com/baeldung}/abstractclass/indepedentmethod/AbstractIndependent.java (76%)
 rename testing-modules/{junit-abstract/src/main/java/org/baeldung/testing => junit-5/src/main/java/com/baeldung}/abstractclass/indepedentmethod/ConcreteImpl.java (68%)
 rename testing-modules/{junit-abstract/src/main/java/org/baeldung/testing => junit-5/src/main/java/com/baeldung}/abstractclass/instancefields/AbstractInstanceFields.java (87%)
 rename testing-modules/{junit-abstract/src/main/java/org/baeldung/testing => junit-5/src/main/java/com/baeldung}/abstractclass/privatemethod/AbstractPrivateMethods.java (84%)
 rename testing-modules/{junit-abstract/src/test/java/org/baeldung/testing => junit-5/src/test/java/com/baeldung}/abstractclass/abstractmethod/AbstractMethodCallingUnitTest.java (94%)
 rename testing-modules/{junit-abstract/src/test/java/org/baeldung/testing => junit-5/src/test/java/com/baeldung}/abstractclass/indepedentmethod/AbstractIndependentUnitTest.java (91%)
 rename testing-modules/{junit-abstract/src/test/java/org/baeldung/testing => junit-5/src/test/java/com/baeldung}/abstractclass/instancefields/AbstractInstanceFieldsUnitTest.java (95%)
 rename testing-modules/{junit-abstract/src/test/java/org/baeldung/testing => junit-5/src/test/java/com/baeldung}/abstractclass/privatemethod/AbstractPrivateMethodsUnitTest.java (95%)
 delete mode 100644 testing-modules/junit-abstract/pom.xml
 delete mode 100644 testing-modules/junit-abstract/src/main/resources/logback.xml

diff --git a/pom.xml b/pom.xml
index e120620c30..a9aaff3e22 100644
--- a/pom.xml
+++ b/pom.xml
@@ -551,7 +551,6 @@
 				<module>apache-meecrowave</module>
 				<module>spring-reactive-kotlin</module>
 				<module>jnosql</module>
-				<module>testing-modules/junit-abstract</module>
 				<module>sse-jaxrs</module>
 				<module>spring-boot-angular-ecommerce</module>
 			</modules>
@@ -673,7 +672,6 @@
 				<module>spring-amqp-simple</module>
 				<module>spring-apache-camel</module>
 				<module>spring-batch</module>
-				<module>testing-modules/junit-abstract</module>				
 				<module>jmh</module>
 
 				<!-- group 2 - Pass, 11-16 min, 42 test failures, 4,020 KB -->
@@ -1080,7 +1078,6 @@
 				<module>antlr</module>
 				<module>maven-archetype</module>
 				<module>apache-meecrowave</module>
-				<module>testing-modules/junit-abstract</module>
 
                 <module>spring-hibernate4</module>
                 <module>xml</module>
diff --git a/testing-modules/junit-5/pom.xml b/testing-modules/junit-5/pom.xml
index f9ea34ca72..c60cc00c2c 100644
--- a/testing-modules/junit-5/pom.xml
+++ b/testing-modules/junit-5/pom.xml
@@ -60,6 +60,24 @@
             <artifactId>spring-context</artifactId>
             <version>${spring.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.powermock</groupId>
+            <artifactId>powermock-module-junit4</artifactId>
+            <version>${powermock.version}</version>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>junit</groupId>
+                    <artifactId>junit</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.powermock</groupId>
+            <artifactId>powermock-api-mockito2</artifactId>
+            <version>${powermock.version}</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
@@ -105,7 +123,8 @@
         <junit.vintage.version>5.2.0</junit.vintage.version>
         <log4j2.version>2.8.2</log4j2.version>
         <h2.version>1.4.196</h2.version>
-        <mockito.version>2.11.0</mockito.version>
+        <mockito.version>2.8.9</mockito.version>
+        <powermock.version>1.7.4</powermock.version>
         <maven-surefire-plugin.version>2.19.1</maven-surefire-plugin.version>
         <exec-maven-plugin.version>1.6.0</exec-maven-plugin.version>
         <spring.version>5.0.1.RELEASE</spring.version>
diff --git a/testing-modules/junit-abstract/src/main/java/org/baeldung/testing/abstractclass/abstractmethod/AbstractMethodCalling.java b/testing-modules/junit-5/src/main/java/com/baeldung/abstractclass/abstractmethod/AbstractMethodCalling.java
similarity index 83%
rename from testing-modules/junit-abstract/src/main/java/org/baeldung/testing/abstractclass/abstractmethod/AbstractMethodCalling.java
rename to testing-modules/junit-5/src/main/java/com/baeldung/abstractclass/abstractmethod/AbstractMethodCalling.java
index b0709bf6bf..e55c6b98e2 100644
--- a/testing-modules/junit-abstract/src/main/java/org/baeldung/testing/abstractclass/abstractmethod/AbstractMethodCalling.java
+++ b/testing-modules/junit-5/src/main/java/com/baeldung/abstractclass/abstractmethod/AbstractMethodCalling.java
@@ -1,7 +1,7 @@
 /**
  * 
  */
-package org.baeldung.testing.abstractclass.abstractmethod;
+package com.baeldung.abstractclass.abstractmethod;
 
 /**
  * When method calls abstract method.
diff --git a/testing-modules/junit-abstract/src/main/java/org/baeldung/testing/abstractclass/indepedentmethod/AbstractIndependent.java b/testing-modules/junit-5/src/main/java/com/baeldung/abstractclass/indepedentmethod/AbstractIndependent.java
similarity index 76%
rename from testing-modules/junit-abstract/src/main/java/org/baeldung/testing/abstractclass/indepedentmethod/AbstractIndependent.java
rename to testing-modules/junit-5/src/main/java/com/baeldung/abstractclass/indepedentmethod/AbstractIndependent.java
index 7456a51c43..4dce2665d5 100644
--- a/testing-modules/junit-abstract/src/main/java/org/baeldung/testing/abstractclass/indepedentmethod/AbstractIndependent.java
+++ b/testing-modules/junit-5/src/main/java/com/baeldung/abstractclass/indepedentmethod/AbstractIndependent.java
@@ -1,4 +1,4 @@
-package org.baeldung.testing.abstractclass.indepedentmethod;
+package com.baeldung.abstractclass.indepedentmethod;
 
 /**
  * Test Independent Method
diff --git a/testing-modules/junit-abstract/src/main/java/org/baeldung/testing/abstractclass/indepedentmethod/ConcreteImpl.java b/testing-modules/junit-5/src/main/java/com/baeldung/abstractclass/indepedentmethod/ConcreteImpl.java
similarity index 68%
rename from testing-modules/junit-abstract/src/main/java/org/baeldung/testing/abstractclass/indepedentmethod/ConcreteImpl.java
rename to testing-modules/junit-5/src/main/java/com/baeldung/abstractclass/indepedentmethod/ConcreteImpl.java
index f568ad4eec..6e71b88946 100644
--- a/testing-modules/junit-abstract/src/main/java/org/baeldung/testing/abstractclass/indepedentmethod/ConcreteImpl.java
+++ b/testing-modules/junit-5/src/main/java/com/baeldung/abstractclass/indepedentmethod/ConcreteImpl.java
@@ -1,4 +1,4 @@
-package org.baeldung.testing.abstractclass.indepedentmethod;
+package com.baeldung.abstractclass.indepedentmethod;
 
 public class ConcreteImpl extends AbstractIndependent {
 
diff --git a/testing-modules/junit-abstract/src/main/java/org/baeldung/testing/abstractclass/instancefields/AbstractInstanceFields.java b/testing-modules/junit-5/src/main/java/com/baeldung/abstractclass/instancefields/AbstractInstanceFields.java
similarity index 87%
rename from testing-modules/junit-abstract/src/main/java/org/baeldung/testing/abstractclass/instancefields/AbstractInstanceFields.java
rename to testing-modules/junit-5/src/main/java/com/baeldung/abstractclass/instancefields/AbstractInstanceFields.java
index 3761eb8c3b..262f72e393 100644
--- a/testing-modules/junit-abstract/src/main/java/org/baeldung/testing/abstractclass/instancefields/AbstractInstanceFields.java
+++ b/testing-modules/junit-5/src/main/java/com/baeldung/abstractclass/instancefields/AbstractInstanceFields.java
@@ -1,4 +1,4 @@
-package org.baeldung.testing.abstractclass.instancefields;
+package com.baeldung.abstractclass.instancefields;
 
 /**
  * Test Independent Method
diff --git a/testing-modules/junit-abstract/src/main/java/org/baeldung/testing/abstractclass/privatemethod/AbstractPrivateMethods.java b/testing-modules/junit-5/src/main/java/com/baeldung/abstractclass/privatemethod/AbstractPrivateMethods.java
similarity index 84%
rename from testing-modules/junit-abstract/src/main/java/org/baeldung/testing/abstractclass/privatemethod/AbstractPrivateMethods.java
rename to testing-modules/junit-5/src/main/java/com/baeldung/abstractclass/privatemethod/AbstractPrivateMethods.java
index 98a9bcaa07..fe7fb25931 100644
--- a/testing-modules/junit-abstract/src/main/java/org/baeldung/testing/abstractclass/privatemethod/AbstractPrivateMethods.java
+++ b/testing-modules/junit-5/src/main/java/com/baeldung/abstractclass/privatemethod/AbstractPrivateMethods.java
@@ -1,4 +1,4 @@
-package org.baeldung.testing.abstractclass.privatemethod;
+package com.baeldung.abstractclass.privatemethod;
 
 import java.time.LocalDateTime;
 
diff --git a/testing-modules/junit-abstract/src/test/java/org/baeldung/testing/abstractclass/abstractmethod/AbstractMethodCallingUnitTest.java b/testing-modules/junit-5/src/test/java/com/baeldung/abstractclass/abstractmethod/AbstractMethodCallingUnitTest.java
similarity index 94%
rename from testing-modules/junit-abstract/src/test/java/org/baeldung/testing/abstractclass/abstractmethod/AbstractMethodCallingUnitTest.java
rename to testing-modules/junit-5/src/test/java/com/baeldung/abstractclass/abstractmethod/AbstractMethodCallingUnitTest.java
index e02915db51..7ebd866f3d 100644
--- a/testing-modules/junit-abstract/src/test/java/org/baeldung/testing/abstractclass/abstractmethod/AbstractMethodCallingUnitTest.java
+++ b/testing-modules/junit-5/src/test/java/com/baeldung/abstractclass/abstractmethod/AbstractMethodCallingUnitTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.testing.abstractclass.abstractmethod;
+package com.baeldung.abstractclass.abstractmethod;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
diff --git a/testing-modules/junit-abstract/src/test/java/org/baeldung/testing/abstractclass/indepedentmethod/AbstractIndependentUnitTest.java b/testing-modules/junit-5/src/test/java/com/baeldung/abstractclass/indepedentmethod/AbstractIndependentUnitTest.java
similarity index 91%
rename from testing-modules/junit-abstract/src/test/java/org/baeldung/testing/abstractclass/indepedentmethod/AbstractIndependentUnitTest.java
rename to testing-modules/junit-5/src/test/java/com/baeldung/abstractclass/indepedentmethod/AbstractIndependentUnitTest.java
index 80e42af756..db9811e6c1 100644
--- a/testing-modules/junit-abstract/src/test/java/org/baeldung/testing/abstractclass/indepedentmethod/AbstractIndependentUnitTest.java
+++ b/testing-modules/junit-5/src/test/java/com/baeldung/abstractclass/indepedentmethod/AbstractIndependentUnitTest.java
@@ -1,7 +1,7 @@
 /**
  * 
  */
-package org.baeldung.testing.abstractclass.indepedentmethod;
+package com.baeldung.abstractclass.indepedentmethod;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
diff --git a/testing-modules/junit-abstract/src/test/java/org/baeldung/testing/abstractclass/instancefields/AbstractInstanceFieldsUnitTest.java b/testing-modules/junit-5/src/test/java/com/baeldung/abstractclass/instancefields/AbstractInstanceFieldsUnitTest.java
similarity index 95%
rename from testing-modules/junit-abstract/src/test/java/org/baeldung/testing/abstractclass/instancefields/AbstractInstanceFieldsUnitTest.java
rename to testing-modules/junit-5/src/test/java/com/baeldung/abstractclass/instancefields/AbstractInstanceFieldsUnitTest.java
index ce2577521b..5187ce00ab 100644
--- a/testing-modules/junit-abstract/src/test/java/org/baeldung/testing/abstractclass/instancefields/AbstractInstanceFieldsUnitTest.java
+++ b/testing-modules/junit-5/src/test/java/com/baeldung/abstractclass/instancefields/AbstractInstanceFieldsUnitTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.testing.abstractclass.instancefields;
+package com.baeldung.abstractclass.instancefields;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
diff --git a/testing-modules/junit-abstract/src/test/java/org/baeldung/testing/abstractclass/privatemethod/AbstractPrivateMethodsUnitTest.java b/testing-modules/junit-5/src/test/java/com/baeldung/abstractclass/privatemethod/AbstractPrivateMethodsUnitTest.java
similarity index 95%
rename from testing-modules/junit-abstract/src/test/java/org/baeldung/testing/abstractclass/privatemethod/AbstractPrivateMethodsUnitTest.java
rename to testing-modules/junit-5/src/test/java/com/baeldung/abstractclass/privatemethod/AbstractPrivateMethodsUnitTest.java
index 7220d9cc47..9ce7ff8706 100644
--- a/testing-modules/junit-abstract/src/test/java/org/baeldung/testing/abstractclass/privatemethod/AbstractPrivateMethodsUnitTest.java
+++ b/testing-modules/junit-5/src/test/java/com/baeldung/abstractclass/privatemethod/AbstractPrivateMethodsUnitTest.java
@@ -1,9 +1,7 @@
 /**
  *
  */
-package org.baeldung.testing.abstractclass.privatemethod;
-
-import java.time.LocalDateTime;
+package com.baeldung.abstractclass.privatemethod;
 
 import org.junit.Test;
 import org.junit.jupiter.api.Assertions;
@@ -12,6 +10,8 @@ import org.powermock.api.mockito.PowerMockito;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
 
+import java.time.LocalDateTime;
+
 /**
  * Providing custom values for private methods using powermock
  *
diff --git a/testing-modules/junit-abstract/pom.xml b/testing-modules/junit-abstract/pom.xml
deleted file mode 100644
index 106ed8e3a4..0000000000
--- a/testing-modules/junit-abstract/pom.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>junit-abstract</artifactId>
-    <version>1.0-SNAPSHOT</version>
-    <packaging>jar</packaging>
-
-    <name>abstractclasses</name>
-    <url>http://maven.apache.org</url>
-    <parent>
-        <groupId>com.baeldung</groupId>
-        <artifactId>parent-modules</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
-        <relativePath>../../</relativePath>
-    </parent>
-
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <powermock.version>1.7.4</powermock.version>
-        <java.version>1.8</java.version>
-        <junit.jupiter.version>5.1.0</junit.jupiter.version>
-        <junit.platform.version>1.1.0</junit.platform.version>
-        <junit.vintage.version>5.2.0</junit.vintage.version>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.powermock</groupId>
-            <artifactId>powermock-module-junit4</artifactId>
-            <version>${powermock.version}</version>
-            <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>junit</groupId>
-                    <artifactId>junit</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.powermock</groupId>
-            <artifactId>powermock-api-mockito2</artifactId>
-            <version>${powermock.version}</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.22.0</version>
-            </plugin>
-        </plugins>
-        <finalName>junit-abstract</finalName>
-    </build>
-
-</project>
-
-
diff --git a/testing-modules/junit-abstract/src/main/resources/logback.xml b/testing-modules/junit-abstract/src/main/resources/logback.xml
deleted file mode 100644
index 7d900d8ea8..0000000000
--- a/testing-modules/junit-abstract/src/main/resources/logback.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration>
-    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder>
-            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n
-            </pattern>
-        </encoder>
-    </appender>
-
-    <root level="INFO">
-        <appender-ref ref="STDOUT" />
-    </root>
-</configuration>
\ No newline at end of file