Update and merge

JGit/src/test/java/com/baeldung/jgit/JGitBugIntegrationTest.java

@@ -11,7 +11,7 @@ import static org.junit.Assert.assertNotNull;
 /**
  * Tests which show issues with JGit that we reported upstream.
  */
-public class JGitBugTest {
+public class JGitBugIntegrationTest {
     @Test
     public void testRevWalkDisposeClosesReader() throws IOException {
         try (Repository repo = Helper.openJGitRepository()) {

JGit/src/test/java/com/baeldung/jgit/porcelain/PorcelainUnitTest.java

@@ -2,7 +2,7 @@ package com.baeldung.jgit.porcelain;
 
 import org.junit.Test;
 
-public class PorcelainTest {
+public class PorcelainUnitTest {
     @Test
     public void runSamples() throws Exception {
         // simply call all the samples to see any severe problems with the samples

Twitter4J/src/test/java/com/baeldung/ApplicationIntegrationTest.java

@@ -9,7 +9,7 @@ import org.junit.Test;
 
 import twitter4j.TwitterException;
 
-public class ApplicationTest {
+public class ApplicationIntegrationTest {
 
 	/**
 	 * In order run this jUnit test you need to configure your API details in the twitter4j.properties

algorithms/src/test/java/com/baeldung/algorithms/primechecker/PrimeCheckerUnitTest.java

@@ -5,7 +5,7 @@ import org.junit.Test;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
-public class PrimeCheckerTest {
+public class PrimeCheckerUnitTest {
 
     private final BigIntegerPrimeChecker primeChecker = new BigIntegerPrimeChecker();
     

annotations/annotation-user/pom.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         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>
 
@@ -13,11 +12,6 @@
 
     <artifactId>annotation-user</artifactId>
 
-    <properties>
-        <junit.version>4.12</junit.version>
-        <maven-compiler-plugin.version>3.6.0</maven-compiler-plugin.version>        
-    </properties>
-    
     <dependencies>
 
         <dependency>
@@ -26,31 +20,6 @@
             <version>${project.parent.version}</version>
         </dependency>
 
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>${junit.version}</version>
-            <scope>test</scope>
-        </dependency>
-
     </dependencies>
 
-    <build>
-
-        <plugins>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>${maven-compiler-plugin.version}</version>
-                <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
-                </configuration>
-            </plugin>
-
-        </plugins>
-
-    </build>
-
 </project>

annotations/annotation-user/src/test/java/com/baeldung/annotation/PersonBuilderUnitTest.java

@@ -4,7 +4,7 @@ import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
 
-public class PersonBuilderTest {
+public class PersonBuilderUnitTest {
 
     @Test
     public void whenBuildPersonWithBuilder_thenObjectHasPropertyValues() {

apache-bval/src/test/java/com/baeldung/validation/ValidationIntegrationTest.java

@@ -17,7 +17,7 @@ import static org.junit.Assert.*;
 
 import com.baeldung.model.User;
 
-public class ValidationTest {
+public class ValidationIntegrationTest {
     private static ValidatorFactory validatorFactory;
     private static Validator validator;
 

apache-cxf/cxf-aegis/src/test/java/com/baeldung/cxf/aegis/BaeldungIntegrationTest.java

@@ -26,7 +26,7 @@ import org.apache.cxf.aegis.AegisReader;
 import org.apache.cxf.aegis.AegisWriter;
 import org.apache.cxf.aegis.type.AegisType;
 
-public class BaeldungTest {
+public class BaeldungIntegrationTest {
     private AegisContext context;
     private String fileName = "baeldung.xml";
 

apache-fop/pom.xml

@@ -14,38 +14,7 @@
     </parent>
 
     <dependencies>
-
-        <!-- logging -->
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>jcl-over-slf4j</artifactId>
-            <version>${org.slf4j.version}</version>
-            <!-- <scope>runtime</scope> --> <!-- some spring dependencies need to compile against jcl -->
-        </dependency>
-
-        <!-- test scoped -->
-        <dependency>
-            <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-core</artifactId>
-            <version>${org.hamcrest.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-library</artifactId>
-            <version>${org.hamcrest.version}</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
-            <version>${mockito.version}</version>
-            <scope>test</scope>
-        </dependency>
-
         <!-- new dependencies -->
-
         <dependency>
             <groupId>org.apache.xmlgraphics</groupId>
             <artifactId>fop</artifactId>
@@ -154,11 +123,6 @@
         <avalon-framework.version>4.3</avalon-framework.version>
         <dbdoclet.version>8.0.2</dbdoclet.version>
         <jtidy.version>r938</jtidy.version>
-
-        <!-- testing -->
-        <org.hamcrest.version>1.3</org.hamcrest.version>
-        <mockito.version>1.10.19</mockito.version>
-
     </properties>
 
 </project>

apache-poi/src/test/java/com/baeldung/jexcel/JExcelIntegrationTest.java

@@ -21,7 +21,7 @@ import org.junit.Test;
 import org.junit.Before;
 import org.junit.After;
 
-public class JExcelTest {
+public class JExcelIntegrationTest {
 
     private JExcelHelper jExcelHelper;
     private static String FILE_NAME = "temp.xls";

apache-poi/src/test/java/com/baeldung/poi/excel/ExcelIntegrationTest.java

@@ -18,7 +18,7 @@ import org.junit.Test;
 import org.junit.Before;
 import org.junit.After;
 
-public class ExcelTest {
+public class ExcelIntegrationTest {
 
     private ExcelPOIHelper excelPOIHelper;
     private static String FILE_NAME = "temp.xlsx";

apache-poi/src/test/java/com/baeldung/poi/word/WordIntegrationTest.java

@@ -14,12 +14,12 @@ import org.apache.poi.xwpf.usermodel.XWPFRun;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-public class WordTest {
+public class WordIntegrationTest {
     static WordDocument wordDocument;
 
     @BeforeClass
     public static void generateMSWordFile() throws Exception {
-        WordTest.wordDocument = new WordDocument();
+        WordIntegrationTest.wordDocument = new WordDocument();
         wordDocument.handleSimpleDoc();
     }
 

apache-thrift/pom.xml

@@ -48,7 +48,9 @@
                 <executions>
                     <execution>
                         <phase>generate-sources</phase>
-                        <goals><goal>add-source</goal></goals>
+                        <goals>
+                            <goal>add-source</goal>
+                        </goals>
                         <configuration>
                             <sources>
                                 <source>generated</source>

apache-thrift/src/test/java/com/baeldung/thrift/CrossPlatformServiceIntegrationTest.java

@@ -6,7 +6,7 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-public class CrossPlatformServiceTest {
+public class CrossPlatformServiceIntegrationTest {
 
     private CrossPlatformServiceServer server = new CrossPlatformServiceServer();
 

apache-velocity/pom.xml

@@ -35,11 +35,6 @@
             <artifactId>velocity-tools</artifactId>
             <version>${velocity-tools-version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>jcl-over-slf4j</artifactId>
-            <version>${org.slf4j.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>

axon/pom.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         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">
     <parent>
         <artifactId>parent-modules</artifactId>

axon/src/test/java/com/baeldung/axon/MessagesAggregateIntegrationTest.java

@@ -12,7 +12,7 @@ import org.junit.Test;
 
 import java.util.UUID;
 
-public class MessagesAggregateTest {
+public class MessagesAggregateIntegrationTest {
 
     private FixtureConfiguration<MessagesAggregate> fixture;
 

core-java-9/src/test/java/com/baeldung/java9/Java9OptionalsStreamUnitTest.java

@@ -10,7 +10,7 @@ import java.util.stream.Stream;
 
 import org.junit.Test;
 
-public class Java9OptionalsStreamTest {
+public class Java9OptionalsStreamUnitTest {
 
     private static List<Optional<String>> listOfOptionals = Arrays.asList(Optional.empty(), Optional.of("foo"), Optional.empty(), Optional.of("bar"));
 

core-java-9/src/test/java/com/baeldung/java9/MultiResultionImageUnitTest.java

@@ -11,7 +11,7 @@ import java.util.List;
 
 import org.junit.Test;
 
-public class MultiResultionImageTest {
+public class MultiResultionImageUnitTest {
 
     @Test
     public void baseMultiResImageTest() {

core-java-9/src/test/java/com/baeldung/java9/OptionalToStreamUnitTest.java

@@ -6,7 +6,7 @@ import java.util.stream.Stream;
 import org.junit.Test;
 import static org.junit.Assert.assertEquals;
 
-public class OptionalToStreamTest {
+public class OptionalToStreamUnitTest {
 
     @Test
     public void testOptionalToStream() {

core-java-9/src/test/java/com/baeldung/java9/SetExamplesUnitTest.java

@@ -5,7 +5,7 @@ import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
 
-public class SetExamplesTest {
+public class SetExamplesUnitTest {
 
     @Test
     public void testUnmutableSet() {

core-java-9/src/test/java/com/baeldung/java9/concurrent/future/CompletableFutureUnitTest.java

@@ -9,7 +9,7 @@ import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 import org.junit.Test;
 
-public class CompletableFutureTest {
+public class CompletableFutureUnitTest {
     @Test
     public void testDelay () throws Exception {
         Object input = new Object();

core-java-9/src/test/java/com/baeldung/java9/httpclient/SimpleHttpRequestsUnitTest.java

@@ -24,7 +24,7 @@ import javax.net.ssl.SSLParameters;
 import org.junit.Before;
 import org.junit.Test;
 
-public class SimpleHttpRequestsTest {
+public class SimpleHttpRequestsUnitTest {
 
     private URI httpURI;
 

core-java-9/src/test/java/com/baeldung/java9/language/DiamondUnitTest.java

@@ -2,7 +2,7 @@ package com.baeldung.java9.language;
 
 import org.junit.Test;
 
-public class DiamondTest {
+public class DiamondUnitTest {
 
     static class FooClass<X> {
         FooClass(X x) {

core-java-9/src/test/java/com/baeldung/java9/language/PrivateInterfaceUnitTest.java

@@ -3,7 +3,7 @@ package com.baeldung.java9.language;
 import com.baeldung.java9.language.PrivateInterface;
 import org.junit.Test;
 
-public class PrivateInterfaceTest {
+public class PrivateInterfaceUnitTest {
 
     @Test
     public void test() {

core-java-9/src/test/java/com/baeldung/java9/language/TryWithResourcesUnitTest.java

@@ -3,7 +3,7 @@ package com.baeldung.java9.language;
 import static org.junit.Assert.assertEquals;
 import org.junit.Test;
 
-public class TryWithResourcesTest {
+public class TryWithResourcesUnitTest {
 
     static int closeCount = 0;
 

core-java-9/src/test/java/com/baeldung/java9/language/collections/ListFactoryMethodsUnitTest.java

@@ -9,7 +9,7 @@ import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 
-public class ListFactoryMethodsTest {
+public class ListFactoryMethodsUnitTest {
 
     @Test
     public void whenListCreated_thenSuccess() {

core-java-9/src/test/java/com/baeldung/java9/language/collections/MapFactoryMethodsUnitTest.java

@@ -8,7 +8,7 @@ import org.junit.Test;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 
-public class MapFactoryMethodsTest {
+public class MapFactoryMethodsUnitTest {
 
     @Test
     public void whenMapCreated_thenSuccess() {

core-java-9/src/test/java/com/baeldung/java9/language/collections/SetFactoryMethodsUnitTest.java

@@ -9,7 +9,7 @@ import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 
-public class SetFactoryMethodsTest {
+public class SetFactoryMethodsUnitTest {
 
     @Test
     public void whenSetCreated_thenSuccess() {

core-java-9/src/test/java/com/baeldung/java9/language/stream/CollectorImprovementUnitTest.java

@@ -8,7 +8,7 @@ import java.util.function.Function;
 
 import static org.junit.Assert.assertEquals;
 
-public class CollectorImprovementTest {
+public class CollectorImprovementUnitTest {
     @Test
     public void givenList_whenSatifyPredicate_thenMapValueWithOccurences() {
         List<Integer> numbers = List.of(1, 2, 3, 5, 5);

core-java-9/src/test/java/com/baeldung/java9/language/stream/StreamFeaturesUnitTest.java

@@ -12,7 +12,7 @@ import java.util.stream.Stream;
 import static java.lang.Integer.*;
 import static org.junit.Assert.assertEquals;
 
-public class StreamFeaturesTest {
+public class StreamFeaturesUnitTest {
 
     public static class TakeAndDropWhileTest {
 

core-java-9/src/test/java/com/baeldung/java9/process/ProcessAPIEnhancementsUnitTest.java

@@ -16,7 +16,7 @@ import org.slf4j.LoggerFactory;
  * Created by sanaulla on 2/23/2017.
  */
 
-public class ProcessAPIEnhancementsTest {
+public class ProcessAPIEnhancementsUnitTest {
 
     Logger log = LoggerFactory.getLogger(ProcessAPIEnhancementsTest.class);
 

core-java-9/src/test/java/com/baeldung/java9/process/ProcessApiUnitTest.java

@@ -20,7 +20,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
-public class ProcessApi {
+public class ProcessApiUnitTest {
 
     @Before
     public void init() {

core-java-9/src/test/java/com/baeldung/java9/reactive/BaeldungBatchSubscriberImplIntegrationTest.java

@@ -13,7 +13,7 @@ import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.Stopwatch;
 
-public class BaeldungBatchSubscriberImplTest {
+public class BaeldungBatchSubscriberImplIntegrationTest {
 
     private static final int ITEM_SIZE = 10;
     private SubmissionPublisher<String> publisher;

core-java-9/src/test/java/com/baeldung/java9/reactive/BaeldungSubscriberImplIntegrationTest.java

@@ -13,7 +13,7 @@ import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.Stopwatch;
 
-public class BaeldungSubscriberImplTest {
+public class BaeldungSubscriberImplIntegrationTest {
 
     private static final int ITEM_SIZE = 10;
     private SubmissionPublisher<String> publisher;

core-java-9/src/test/java/com/baeldung/java9/stackwalker/StackWalkerDemoUnitTest.java

@@ -2,7 +2,7 @@ package com.baeldung.java9.stackwalker;
 
 import org.junit.Test;
 
-public class StackWalkerDemoTest {
+public class StackWalkerDemoUnitTest {
 
     @Test
     public void giveStalkWalker_whenWalkingTheStack_thenShowStackFrames() {

core-java/README.md

@@ -101,3 +101,4 @@
 - [HashSet and TreeSet Comparison](http://www.baeldung.com/java-hashset-vs-treeset)
 - [How to Perform a Simple HTTP Request in Java](http://www.baeldung.com/java-http-request)
 - [Call Methods at Runtime Using Java Reflection](http://www.baeldung.com/java-method-reflection)
+- [Guide to DelayQueue](http://www.baeldung.com/java-delay-queue)

core-java/pom.xml

@@ -8,12 +8,6 @@
 
 	<name>core-java</name>
 
-    <parent>
-        <groupId>com.baeldung</groupId>
-        <artifactId>parent-modules</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
-     </parent>
-     
 	<dependencies>
 
 		<!-- utils -->
@@ -80,12 +74,29 @@
 		</dependency>
 
 		<!-- logging -->
+
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-api</artifactId>
+			<version>${org.slf4j.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>ch.qos.logback</groupId>
+			<artifactId>logback-classic</artifactId>
+			<version>${logback.version}</version>
+			<!-- <scope>runtime</scope> -->
+		</dependency>
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>jcl-over-slf4j</artifactId>
 			<version>${org.slf4j.version}</version>
 			<!-- <scope>runtime</scope> --> <!-- some spring dependencies need to compile against jcl -->
 		</dependency>
+		<dependency> <!-- needed to bridge to slf4j for projects that use the log4j APIs directly -->
+			<groupId>org.slf4j</groupId>
+			<artifactId>log4j-over-slf4j</artifactId>
+			<version>${org.slf4j.version}</version>
+		</dependency>
 		<dependency>
 			<groupId>org.projectlombok</groupId>
 			<artifactId>lombok</artifactId>
@@ -93,13 +104,6 @@
 			<scope>provided</scope>
 		</dependency>
 
-		<!-- mysql -->
-        <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-            <version>${mysql.version}</version>
-        </dependency>
-
 		<!-- test scoped -->
 
 		<dependency>
@@ -109,6 +113,13 @@
 			<scope>test</scope>
 		</dependency>
 
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>${junit.version}</version>
+			<scope>test</scope>
+		</dependency>
+
 		<dependency>
 			<groupId>org.hamcrest</groupId>
 			<artifactId>hamcrest-core</artifactId>
@@ -153,28 +164,11 @@
 			<artifactId>moneta</artifactId>
 			<version>1.1</version>
 		</dependency>
-		<dependency>
-			<groupId>org.owasp.esapi</groupId>
-			<artifactId>esapi</artifactId>
-			<version>2.1.0.1</version>
-			<exclusions>
-				<exclusion>
-					<artifactId>commons-logging</artifactId>
-					<groupId>commons-logging</groupId>
-				</exclusion>
-			</exclusions>        
-		</dependency>               
 
 		<dependency>
 			<groupId>org.owasp.esapi</groupId>
 			<artifactId>esapi</artifactId>
 			<version>2.1.0.1</version>
-	                <exclusions>
-	                    <exclusion>
-	                        <artifactId>commons-logging</artifactId>
-	                        <groupId>commons-logging</groupId>
-	                    </exclusion>
-	                </exclusions>        
 		</dependency>
 
 	</dependencies>
@@ -189,6 +183,30 @@
 		</resources>
 
 		<plugins>
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>${maven-compiler-plugin.version}</version>
+				<configuration>
+					<source>1.8</source>
+					<target>1.8</target>
+				</configuration>
+			</plugin>
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<configuration>
+					<excludes>
+						<exclude>**/*IntegrationTest.java</exclude>
+						<exclude>**/*LongRunningUnitTest.java</exclude>
+						<exclude>**/*ManualTest.java</exclude>
+					</excludes>
+					<testFailureIgnore>true</testFailureIgnore>
+				</configuration>
+			</plugin>
+
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-dependency-plugin</artifactId>
@@ -219,6 +237,7 @@
 					</archive>
 				</configuration>
 			</plugin>
+
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-assembly-plugin</artifactId>
@@ -242,6 +261,7 @@
 					</execution>
 				</executions>
 			</plugin>
+
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-shade-plugin</artifactId>
@@ -262,6 +282,7 @@
 					</execution>
 				</executions>
 			</plugin>
+
 			<plugin>
 				<groupId>com.jolira</groupId>
 				<artifactId>onejar-maven-plugin</artifactId>
@@ -278,6 +299,7 @@
 					</execution>
 				</executions>
 			</plugin>
+
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
@@ -293,6 +315,7 @@
 					</execution>
 				</executions>
 			</plugin>
+
 		</plugins>
 
 	</build>
@@ -336,8 +359,9 @@
 		<!-- marshalling -->
 		<jackson.version>2.8.5</jackson.version>
 
-        <!-- mysql -->
+		<!-- logging -->
-        <mysql.version>6.0.6</mysql.version>
+		<org.slf4j.version>1.7.21</org.slf4j.version>
+		<logback.version>1.1.7</logback.version>
 
 		<!-- util -->
 		<guava.version>21.0</guava.version>
@@ -354,10 +378,15 @@
 
 		<!-- testing -->
 		<org.hamcrest.version>1.3</org.hamcrest.version>
+		<junit.version>4.12</junit.version>
 		<mockito.version>1.10.19</mockito.version>
 		<assertj.version>3.6.1</assertj.version>
 		<avaitility.version>1.7.0</avaitility.version>
 
+		<!-- maven plugins -->
+		<maven-compiler-plugin.version>3.6.0</maven-compiler-plugin.version>
+		<maven-surefire-plugin.version>2.19.1</maven-surefire-plugin.version>
+
 	</properties>
 
 </project>

core-java/src/main/java/com/baeldung/concurrent/delayqueue/DelayObject.java

@@ -0,0 +1,35 @@
+package com.baeldung.concurrent.delayqueue;
+
+import com.google.common.primitives.Ints;
+
+import java.util.concurrent.Delayed;
+import java.util.concurrent.TimeUnit;
+
+public class DelayObject implements Delayed {
+    private String data;
+    private long startTime;
+
+    public DelayObject(String data, long delayInMilliseconds) {
+        this.data = data;
+        this.startTime = System.currentTimeMillis() + delayInMilliseconds;
+    }
+
+    @Override
+    public long getDelay(TimeUnit unit) {
+        long diff = startTime - System.currentTimeMillis();
+        return unit.convert(diff, TimeUnit.MILLISECONDS);
+    }
+
+    @Override
+    public int compareTo(Delayed o) {
+        return Ints.saturatedCast(this.startTime - ((DelayObject) o).startTime);
+    }
+
+    @Override
+    public String toString() {
+        return "{" +
+                "data='" + data + '\'' +
+                ", startTime=" + startTime +
+                '}';
+    }
+}

core-java/src/main/java/com/baeldung/concurrent/delayqueue/DelayQueueConsumer.java

@@ -0,0 +1,30 @@
+package com.baeldung.concurrent.delayqueue;
+
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.atomic.AtomicInteger;
+
+
+public class DelayQueueConsumer implements Runnable {
+    private BlockingQueue<DelayObject> queue;
+    private final Integer numberOfElementsToTake;
+    public final AtomicInteger numberOfConsumedElements = new AtomicInteger();
+
+    public DelayQueueConsumer(BlockingQueue<DelayObject> queue, Integer numberOfElementsToTake) {
+        this.queue = queue;
+        this.numberOfElementsToTake = numberOfElementsToTake;
+    }
+
+
+    @Override
+    public void run() {
+        for (int i = 0; i < numberOfElementsToTake; i++) {
+            try {
+                DelayObject object = queue.take();
+                numberOfConsumedElements.incrementAndGet();
+                System.out.println("Consumer take: " + object);
+            } catch (InterruptedException e) {
+                e.printStackTrace();
+            }
+        }
+    }
+}

core-java/src/main/java/com/baeldung/concurrent/delayqueue/DelayQueueProducer.java

@@ -0,0 +1,34 @@
+package com.baeldung.concurrent.delayqueue;
+
+import java.util.UUID;
+import java.util.concurrent.BlockingQueue;
+
+
+public class DelayQueueProducer implements Runnable {
+    private BlockingQueue<DelayObject> queue;
+    private final Integer numberOfElementsToProduce;
+    private final Integer delayOfEachProducedMessageMilliseconds;
+
+    public DelayQueueProducer(BlockingQueue<DelayObject> queue,
+                              Integer numberOfElementsToProduce,
+                              Integer delayOfEachProducedMessageMilliseconds) {
+        this.queue = queue;
+        this.numberOfElementsToProduce = numberOfElementsToProduce;
+        this.delayOfEachProducedMessageMilliseconds = delayOfEachProducedMessageMilliseconds;
+    }
+
+    @Override
+    public void run() {
+        for (int i = 0; i < numberOfElementsToProduce; i++) {
+            DelayObject object
+                    = new DelayObject(UUID.randomUUID().toString(), delayOfEachProducedMessageMilliseconds);
+            System.out.println("Put object = " + object);
+            try {
+                queue.put(object);
+                Thread.sleep(500);
+            } catch (InterruptedException ie) {
+                ie.printStackTrace();
+            }
+        }
+    }
+}

core-java/src/main/java/com/baeldung/serialization/Address.java

@@ -0,0 +1,15 @@
+package com.baeuldung.serialization;
+
+public class Address {
+
+	private int houseNumber;
+
+	public int getHouseNumber() {
+		return houseNumber;
+	}
+
+	public void setHouseNumber(int houseNumber) {
+		this.houseNumber = houseNumber;
+	}
+
+}

core-java/src/main/java/com/baeldung/serialization/Employee.java

@@ -0,0 +1,44 @@
+package com.baeuldung.serialization;
+
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.Serializable;
+
+public class Employee implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	private transient Address address; // not an serializable object
+	private Person person;
+
+	public Address getAddress() {
+		return address;
+	}
+
+	public void setAddress(Address address) {
+		this.address = address;
+	}
+
+	public Person getPerson() {
+		return person;
+	}
+
+	public void setPerson(Person person) {
+		this.person = person;
+	}
+
+	private void writeObject(ObjectOutputStream oos) throws IOException {
+		oos.defaultWriteObject();
+		oos.writeObject(address.getHouseNumber());
+	}
+
+	private void readObject(ObjectInputStream ois) throws ClassNotFoundException, IOException {
+		ois.defaultReadObject();
+		Integer houseNumber = (Integer) ois.readObject();
+		Address a = new Address();
+		a.setHouseNumber(houseNumber);
+		this.setAddress(a);
+	}
+
+}

core-java/src/main/java/com/baeldung/serialization/Person.java

@@ -0,0 +1,30 @@
+package com.baeuldung.serialization;
+import java.io.Serializable;
+
+public class Person implements Serializable {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+
+	private int age;
+	private String name;
+
+	public int getAge() {
+		return age;
+	}
+
+	public void setAge(int age) {
+		this.age = age;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+}

core-java/src/main/java/com/baeldung/stackoverflowerror/RecursionWithCorrectTerminationCondition.java

@@ -1,7 +1,7 @@
 package com.baeldung.stackoverflowerror;
 
 public class RecursionWithCorrectTerminationCondition {
-    public static int calculateFactorial(final int number) {
+    public int calculateFactorial(final int number) {
         return number <= 1 ? 1 : number * calculateFactorial(number - 1);
     }
 }

core-java/src/main/java/com/baeldung/string/StringHelper.java

@@ -21,6 +21,10 @@ public class StringHelper {
     public static String removeLastCharRegexOptional(String s) {
         return Optional.ofNullable(s)
             .map(str -> str.replaceAll(".$", ""))
+<<<<<<< HEAD
             .orElse(s);
+=======
+            .orElse(null);
+>>>>>>> refs/remotes/eugenp/master
     }
 }

core-java/src/main/resources/datasource.properties

@@ -0,0 +1,6 @@
+dataSourceClassName=//TBD
+dataSource.user=//TBD
+dataSource.password=//TBD
+dataSource.databaseName=//TBD
+dataSource.portNumber=//TBD
+dataSource.serverName=//TBD

core-java/src/test/java/com/baeldung/arraycopy/ArrayCopyUtilUnitTest.java

@@ -9,7 +9,7 @@ import org.junit.Test;
 
 import java.util.Arrays;
 
-public class ArrayCopyUtilTest {
+public class ArrayCopyUtilUnitTest {
     private static Employee[] employees;
     private static final int MAX = 2;
 

core-java/src/test/java/com/baeldung/concurrent/accumulator/LongAccumulatorUnitTest.java

@@ -11,7 +11,7 @@ import java.util.stream.IntStream;
 
 import static junit.framework.TestCase.assertEquals;
 
-public class LongAccumulatorTest {
+public class LongAccumulatorUnitTest {
 
     @Test
     public void givenLongAccumulator_whenApplyActionOnItFromMultipleThrads_thenShouldProduceProperResult() throws InterruptedException {

core-java/src/test/java/com/baeldung/concurrent/adder/LongAdderUnitTest.java

@@ -11,7 +11,7 @@ import java.util.stream.IntStream;
 import static com.jayway.awaitility.Awaitility.await;
 import static junit.framework.TestCase.assertEquals;
 
-public class LongAdderTest {
+public class LongAdderUnitTest {
     @Test
     public void givenMultipleThread_whenTheyWriteToSharedLongAdder_thenShouldCalculateSumForThem() throws InterruptedException {
         //given

core-java/src/test/java/com/baeldung/concurrent/copyonwrite/CopyOnWriteArrayListUnitTest.java

@@ -11,7 +11,7 @@ import java.util.concurrent.CopyOnWriteArrayList;
 import static org.assertj.core.api.Assertions.assertThat;
 
 
-public class CopyOnWriteArrayListTest {
+public class CopyOnWriteArrayListUnitTest {
 
     @Test
     public void givenCopyOnWriteList_whenIterateAndAddElementToUnderneathList_thenShouldNotChangeIterator() {

core-java/src/test/java/com/baeldung/concurrent/delayqueue/DelayQueueIntegrationTest.java

@@ -0,0 +1,78 @@
+package com.baeldung.concurrent.delayqueue;
+
+import org.junit.FixMethodOrder;
+import org.junit.Test;
+import org.junit.runners.MethodSorters;
+
+import java.util.concurrent.*;
+
+import static junit.framework.TestCase.assertEquals;
+
+@FixMethodOrder(MethodSorters.NAME_ASCENDING)
+public class DelayQueueIntegrationTest {
+    @Test
+    public void givenDelayQueue_whenProduceElement_thenShouldConsumeAfterGivenDelay() throws InterruptedException {
+        //given
+        ExecutorService executor = Executors.newFixedThreadPool(2);
+        BlockingQueue<DelayObject> queue = new DelayQueue<>();
+        int numberOfElementsToProduce = 2;
+        int delayOfEachProducedMessageMilliseconds = 500;
+        DelayQueueConsumer consumer = new DelayQueueConsumer(queue, numberOfElementsToProduce);
+        DelayQueueProducer producer
+                = new DelayQueueProducer(queue, numberOfElementsToProduce, delayOfEachProducedMessageMilliseconds);
+
+        //when
+        executor.submit(producer);
+        executor.submit(consumer);
+
+        //then
+        executor.awaitTermination(5, TimeUnit.SECONDS);
+        executor.shutdown();
+        assertEquals(consumer.numberOfConsumedElements.get(), numberOfElementsToProduce);
+
+    }
+
+    @Test
+    public void givenDelayQueue_whenProduceElementWithHugeDelay_thenConsumerWasNotAbleToConsumeMessageInGivenTime() throws InterruptedException {
+        //given
+        ExecutorService executor = Executors.newFixedThreadPool(2);
+        BlockingQueue<DelayObject> queue = new DelayQueue<>();
+        int numberOfElementsToProduce = 1;
+        int delayOfEachProducedMessageMilliseconds = 10_000;
+        DelayQueueConsumer consumer = new DelayQueueConsumer(queue, numberOfElementsToProduce);
+        DelayQueueProducer producer
+                = new DelayQueueProducer(queue, numberOfElementsToProduce, delayOfEachProducedMessageMilliseconds);
+
+        //when
+        executor.submit(producer);
+        executor.submit(consumer);
+
+        //then
+        executor.awaitTermination(5, TimeUnit.SECONDS);
+        executor.shutdown();
+        assertEquals(consumer.numberOfConsumedElements.get(), 0);
+
+    }
+
+    @Test
+    public void givenDelayQueue_whenProduceElementWithNegativeDelay_thenConsumeMessageImmediately() throws InterruptedException {
+        //given
+        ExecutorService executor = Executors.newFixedThreadPool(2);
+        BlockingQueue<DelayObject> queue = new DelayQueue<>();
+        int numberOfElementsToProduce = 1;
+        int delayOfEachProducedMessageMilliseconds = -10_000;
+        DelayQueueConsumer consumer = new DelayQueueConsumer(queue, numberOfElementsToProduce);
+        DelayQueueProducer producer
+                = new DelayQueueProducer(queue, numberOfElementsToProduce, delayOfEachProducedMessageMilliseconds);
+
+        //when
+        executor.submit(producer);
+        executor.submit(consumer);
+
+        //then
+        executor.awaitTermination(1, TimeUnit.SECONDS);
+        executor.shutdown();
+        assertEquals(consumer.numberOfConsumedElements.get(), 1);
+
+    }
+}

core-java/src/test/java/com/baeldung/concurrent/locks/SharedObjectWithLockManualTest.java

@@ -66,9 +66,7 @@ public class SharedObjectWithLockManualTest {
 
 	private void executeThreads(SharedObjectWithLock object, int threadCount, ExecutorService service) {
 		for (int i = 0; i < threadCount; i++) {
-			service.execute(() -> {
+			service.execute(object::perform);
-				object.perform();
-			});
 		}
 	}
 

core-java/src/test/java/com/baeldung/concurrent/phaser/PhaserUnitTest.java

@@ -11,7 +11,7 @@ import java.util.concurrent.Phaser;
 import static junit.framework.TestCase.assertEquals;
 
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
-public class PhaserTest {
+public class PhaserUnitTest {
 
     @Test
     public void givenPhaser_whenCoordinateWorksBetweenThreads_thenShouldCoordinateBetweenMultiplePhases() {

core-java/src/test/java/com/baeldung/dateapi/JavaDurationUnitTest.java

@@ -9,7 +9,7 @@ import java.time.temporal.ChronoUnit;
 
 import org.junit.Test;
 
-public class JavaDurationTest {
+public class JavaDurationUnitTest {
 
     @Test
     public void test2() {

core-java/src/test/java/com/baeldung/dateapi/JavaPeriodUnitTest.java

@@ -9,9 +9,9 @@ import java.time.Period;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 
-public class JavaPeriodTest {
+public class JavaPeriodUnitTest {
 
-    private static final Logger LOG = Logger.getLogger(JavaPeriodTest.class);
+    private static final Logger LOG = Logger.getLogger(JavaPeriodUnitTest.class);
 
     @Test
     public void whenTestPeriod_thenOk() {

core-java/src/test/java/com/baeldung/dynamicproxy/DynamicProxyIntegrationTest.java

@@ -9,18 +9,18 @@ import java.util.Map;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
 
-public class DynamicProxyTest {
+public class DynamicProxyIntegrationTest {
 
     @Test
     public void givenDynamicProxy_thenPutWorks() {
-        Map proxyInstance = (Map) Proxy.newProxyInstance(DynamicProxyTest.class.getClassLoader(), new Class[] { Map.class }, new DynamicInvocationHandler());
+        Map proxyInstance = (Map) Proxy.newProxyInstance(DynamicProxyIntegrationTest.class.getClassLoader(), new Class[] { Map.class }, new DynamicInvocationHandler());
 
         proxyInstance.put("hello", "world");
     }
 
     @Test
     public void givenInlineDynamicProxy_thenGetWorksOtherMethodsDoNot() {
-        Map proxyInstance = (Map) Proxy.newProxyInstance(DynamicProxyTest.class.getClassLoader(), new Class[] { Map.class }, (proxy, method, methodArgs) -> {
+        Map proxyInstance = (Map) Proxy.newProxyInstance(DynamicProxyIntegrationTest.class.getClassLoader(), new Class[] { Map.class }, (proxy, method, methodArgs) -> {
 
             if (method.getName().equals("get")) {
                 return 42;
@@ -43,12 +43,12 @@ public class DynamicProxyTest {
 
     @Test
     public void givenTimingDynamicProxy_thenMethodInvokationsProduceTiming() {
-        Map mapProxyInstance = (Map) Proxy.newProxyInstance(DynamicProxyTest.class.getClassLoader(), new Class[] { Map.class }, new TimingDynamicInvocationHandler(new HashMap<>()));
+        Map mapProxyInstance = (Map) Proxy.newProxyInstance(DynamicProxyIntegrationTest.class.getClassLoader(), new Class[] { Map.class }, new TimingDynamicInvocationHandler(new HashMap<>()));
 
         mapProxyInstance.put("hello", "world");
         assertEquals("world", mapProxyInstance.get("hello"));
 
-        CharSequence csProxyInstance = (CharSequence) Proxy.newProxyInstance(DynamicProxyTest.class.getClassLoader(), new Class[] { CharSequence.class }, new TimingDynamicInvocationHandler("Hello World"));
+        CharSequence csProxyInstance = (CharSequence) Proxy.newProxyInstance(DynamicProxyIntegrationTest.class.getClassLoader(), new Class[] { CharSequence.class }, new TimingDynamicInvocationHandler("Hello World"));
 
         assertEquals('l', csProxyInstance.charAt(2));
         assertEquals(11, csProxyInstance.length());

core-java/src/test/java/com/baeldung/file/FileOperationsManualTest.java

@@ -14,8 +14,7 @@ import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.stream.Stream;
-
+public class FileOperationsManualTest {
-public class FileOperationsUnitTest {
 
     @Test
     public void givenFileName_whenUsingClassloader_thenFileData() throws IOException {
@@ -33,7 +32,7 @@ public class FileOperationsUnitTest {
     public void givenFileNameAsAbsolutePath_whenUsingClasspath_thenFileData() throws IOException {
         String expectedData = "Hello World from fileTest.txt!!!";
 
-        Class clazz = FileOperationsUnitTest.class;
+        Class clazz = FileOperationsManualTest.class;
         InputStream inputStream = clazz.getResourceAsStream("/fileTest.txt");
         String data = readFromInputStream(inputStream);
 

core-java/src/test/java/com/baeldung/generics/GenericsUnitTest.java

@@ -9,7 +9,7 @@ import static org.hamcrest.CoreMatchers.hasItems;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.fail;
 
-public class GenericsTest {
+public class GenericsUnitTest {
 
     // testing the generic method with Integer
     @Test

core-java/src/test/java/com/baeldung/grep/GrepWithUnix4JIntegrationTest.java

@@ -12,7 +12,7 @@ import org.unix4j.line.Line;
 import static org.unix4j.unix.Grep.*;
 import static org.unix4j.unix.cut.CutOption.*;
 
-public class GrepWithUnix4JTest {
+public class GrepWithUnix4JIntegrationTest {
 
     private File fileToGrep;
 

core-java/src/test/java/com/baeldung/guava/GuavaBiMapUnitTest.java

@@ -9,7 +9,7 @@ import com.google.common.collect.EnumHashBiMap;
 import com.google.common.collect.HashBiMap;
 import com.google.common.collect.ImmutableBiMap;
 
-public class GuavaBiMapTest {
+public class GuavaBiMapUnitTest {
     @Test
     public void whenQueryByValue_returnsKey() {
         final BiMap<String, String> capitalCountryBiMap = HashBiMap.create();

core-java/src/test/java/com/baeldung/hashing/SHA256HashingUnitTest.java

@@ -4,7 +4,7 @@ import org.junit.Test;
 
 import static org.junit.Assert.*;
 
-public class SHA256HashingTest {
+public class SHA256HashingUnitTest {
 
     private static String originalValue = "abc123";
     private static String hashedValue = "6ca13d52ca70c883e0f0bb101e425a89e8624de51db2d2392593af6a84118090";

core-java/src/test/java/com/baeldung/hexToAscii/HexToAsciiUnitTest.java

@@ -1,13 +1,13 @@
 package com.baeldung.hexToAscii;
 
-import static org.junit.Assert.assertEquals;
-
 import org.junit.Test;
 
-public class HexToAscii {
+import static org.junit.Assert.assertEquals;
+
+public class HexToAsciiUnitTest {
 
     @Test
-    public static void whenHexToAscii() {
+    public void whenHexToAscii() {
         String asciiString = "http://www.baeldung.com/jackson-serialize-dates";
         String hexEquivalent = "687474703a2f2f7777772e6261656c64756e672e636f6d2f6a61636b736f6e2d73657269616c697a652d6461746573";
 
@@ -15,7 +15,7 @@ public class HexToAscii {
     }
 
     @Test
-    public static void whenAsciiToHex() {
+    public void whenAsciiToHex() {
         String asciiString = "http://www.baeldung.com/jackson-serialize-dates";
         String hexEquivalent = "687474703a2f2f7777772e6261656c64756e672e636f6d2f6a61636b736f6e2d73657269616c697a652d6461746573";
 

core-java/src/test/java/com/baeldung/http/HttpRequestLiveTest.java

@@ -17,7 +17,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 
-public class HttpRequestTest {
+public class HttpRequestLiveTest {
 
     @Test
     public void whenGetRequest_thenOk() throws IOException {

core-java/src/test/java/com/baeldung/java/collections/ConcurrentModificationExceptionUnitTest.java

@@ -8,7 +8,7 @@ import java.util.concurrent.CopyOnWriteArrayList;
 import static java.util.Arrays.asList;
 import static org.junit.Assert.assertEquals;
 
-public class ConcurrentModificationExceptionTest {
+public class ConcurrentModificationExceptionUnitTest {
 
     @Test
     public void changingContentWithSetDoesNotThrowConcurrentModificationException() throws Exception {

core-java/src/test/java/com/baeldung/java/concurrentmap/ConcurrentNavigableMapManualTest.java

@@ -12,7 +12,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertTrue;
 
-public class ConcurrentNavigableMapManualTests {
+public class ConcurrentNavigableMapManualTest {
 
     @Test
     public void givenSkipListMap_whenAccessInMultiThreads_thenOrderingStable() throws InterruptedException {

core-java/src/test/java/com/baeldung/java/conversion/IterableStreamConversionUnitTest.java

@@ -11,7 +11,7 @@ import java.util.stream.StreamSupport;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.collection.IsIterableContainingInOrder.contains;
 
-public class IterableStreamConversionTest {
+public class IterableStreamConversionUnitTest {
 
     @Test
     public void givenIterable_whenConvertedToStream_thenNotNull() {

core-java/src/test/java/com/baeldung/java/conversion/StringConversionUnitTest.java

@@ -15,7 +15,7 @@ import org.junit.Test;
 
 import com.baeldung.datetime.UseLocalDateTime;
 
-public class StringConversionTest {
+public class StringConversionUnitTest {
 
     @Test
     public void whenConvertedToInt_thenCorrect() {

core-java/src/test/java/com/baeldung/java/countingChars/CountCharsExampleUnitTest.java

@@ -0,0 +1,93 @@
+package com.baeldung.java.countingChars;
+
+import com.google.common.base.CharMatcher;
+import org.apache.commons.lang.StringUtils;
+import org.junit.Test;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import static org.junit.Assert.assertEquals;
+
+
+/***
+ * Example of counting chars in a String.
+ */
+public class CountCharsExampleUnitTest {
+
+    @Test
+    public void givenString_whenUsingLoop_thenCountChars() {
+        String someString = "elephant";
+        char someChar = 'e';
+        int count = 0;
+        for (int i = 0; i < someString.length(); i++) {
+            if (someString.charAt(i) == someChar) {
+                count++;
+            }
+        }
+        assertEquals(2, count);
+    }
+
+    @Test
+    public void givenString_whenUsingReplace_thenCountChars() {
+        String someString = "elephant";
+        int count = someString.length() - someString.replace("e", "").length();
+        assertEquals(2, count);
+    }
+
+    @Test
+    public void givenString_whenUsingSplit_thenCountChars() {
+        String someString = "elephant";
+        int count = someString.split("e", -1).length - 1;
+        assertEquals(2, count);
+    }
+
+    @Test
+    public void givenString_whenUsingReqExp_thenCountChars() {
+        Pattern pattern = Pattern.compile("[^e]*e");
+        Matcher matcher = pattern.matcher("elephant");
+        int count = 0;
+        while (matcher.find()) {
+            count++;
+        }
+        assertEquals(2, count);
+    }
+
+    @Test
+    public void givenString_whenUsingRecursion_thenCountChars() {
+        int count = useRecursion("elephant", 'e', 0);
+        assertEquals(2, count);
+    }
+
+    private int useRecursion(String someString, char searchedChar, int index) {
+        if (index >= someString.length()) {
+            return 0;
+        }
+
+        int count = someString.charAt(index) == searchedChar ? 1 : 0;
+        return count + useRecursion(someString, searchedChar, index + 1);
+    }
+
+    @Test
+    public void givenString_whenUsingStringUtils_thenCountChars() throws InterruptedException {
+        int count = StringUtils.countMatches("elephant", "e");
+        assertEquals(2, count);
+    }
+
+    @Test
+    public void givenString_whenUsingJava8Features_thenCountChars() {
+        String someString = "elephant";
+        long count = someString.chars().filter(ch -> ch == 'e').count();
+        assertEquals(2, count);
+
+        long count2 = someString.codePoints().filter(ch -> ch == 'e').count();
+        assertEquals(2, count2);
+    }
+
+    @Test
+    public void givenString_whenUsingGuavaCharMatcher_thenCountChars() {
+        int count = CharMatcher.is('e').countIn("elephant");
+        assertEquals(2, count);
+    }
+
+}

core-java/src/test/java/com/baeldung/java/doublebrace/DoubleBraceUnitTest.java

@@ -11,7 +11,7 @@ import static java.util.stream.Collectors.collectingAndThen;
 import static java.util.stream.Collectors.toSet;
 import static org.junit.Assert.assertTrue;
 
-public class DoubleBraceTest {
+public class DoubleBraceUnitTest {
 
     @Test
     public void whenInitializeSetWithoutDoubleBraces_containsElements() {

core-java/src/test/java/com/baeldung/java/map/MapUnitTest.java

@@ -9,8 +9,8 @@ import java.util.Map.Entry;
 
 import static org.junit.Assert.*;
 
-public class MapTest {
+public class MapUnitTest {
-    private static final Logger LOG = LoggerFactory.getLogger(MapTest.class);
+    private static final Logger LOG = LoggerFactory.getLogger(MapUnitTest.class);
 
     
     @Test

core-java/src/test/java/com/baeldung/java/nio2/FileIntegrationTest.java

@@ -13,7 +13,7 @@ import java.util.UUID;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
-public class FileTest {
+public class FileIntegrationTest {
     private static final String TEMP_DIR = String.format("%s/temp%s", System.getProperty("user.home"), UUID.randomUUID().toString());
 
     @BeforeClass

core-java/src/test/java/com/baeldung/java/nio2/async/AsyncEchoIntegrationTest.java

@@ -8,7 +8,7 @@ import java.io.IOException;
 
 import static org.junit.Assert.assertEquals;
 
-public class AsyncEchoTest {
+public class AsyncEchoIntegrationTest {
 
     Process server;
     AsyncEchoClient client;

core-java/src/test/java/com/baeldung/java/nio2/async/AsyncFileIntegrationTest.java

@@ -16,7 +16,7 @@ import java.util.concurrent.Future;
 
 import static org.junit.Assert.assertEquals;
 
-public class AsyncFileTest {
+public class AsyncFileIntegrationTest {
     @Test
     public void givenPath_whenReadsContentWithFuture_thenCorrect() throws IOException, ExecutionException, InterruptedException {
         Path path = Paths.get(URI.create(this.getClass().getClassLoader().getResource("file.txt").toString()));
@@ -36,7 +36,7 @@ public class AsyncFileTest {
 
     @Test
     public void givenPath_whenReadsContentWithCompletionHandler_thenCorrect() throws IOException {
-        Path path = Paths.get(URI.create(AsyncFileTest.class.getResource("/file.txt").toString()));
+        Path path = Paths.get(URI.create(AsyncFileIntegrationTest.class.getResource("/file.txt").toString()));
         AsynchronousFileChannel fileChannel = AsynchronousFileChannel.open(path, StandardOpenOption.READ);
 
         ByteBuffer buffer = ByteBuffer.allocate(1024);

core-java/src/test/java/com/baeldung/java/nio2/attributes/BasicAttribsIntegrationTest.java

@@ -16,9 +16,9 @@ import java.nio.file.attribute.FileTime;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
-public class BasicAttribsTest {
+public class BasicAttribsIntegrationTest {
 
-    private static final Logger LOG = LoggerFactory.getLogger(BasicAttribsTest.class);
+    private static final Logger LOG = LoggerFactory.getLogger(BasicAttribsIntegrationTest.class);
 
 
     private static final String HOME = System.getProperty("user.home");

core-java/src/test/java/com/baeldung/java/set/SetUnitTest.java

@@ -9,9 +9,9 @@ import java.util.*;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
-public class SetTest {
+public class SetUnitTest {
 
-    private static final Logger LOG = LoggerFactory.getLogger(SetTest.class);
+    private static final Logger LOG = LoggerFactory.getLogger(SetUnitTest.class);
 
     @Test
     public void givenTreeSet_whenRetrievesObjects_thenNaturalOrder() {

core-java/src/test/java/com/baeldung/java8/Java8FindAnyFindFirstUnitTest.java

@@ -11,7 +11,7 @@ import static org.hamcrest.Matchers.is;
 import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 
-public class Java8FindAnyFindFirstTest {
+public class Java8FindAnyFindFirstUnitTest {
 
     @Test
     public void createStream_whenFindAnyResultIsPresent_thenCorrect() {

core-java/src/test/java/com/baeldung/java8/Java8ForEachUnitTest.java

@@ -8,9 +8,9 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.function.Consumer;
 
-public class Java8ForEachTest {
+public class Java8ForEachUnitTest {
 
-    private static final Logger LOG = LoggerFactory.getLogger(Java8ForEachTest.class);
+    private static final Logger LOG = LoggerFactory.getLogger(Java8ForEachUnitTest.class);
 
     @Test
     public void compareForEachMethods_thenPrintResults() {

core-java/src/test/java/com/baeldung/java8/Java8MaxMinUnitTest.java

@@ -10,7 +10,7 @@ import java.util.NoSuchElementException;
 
 import static org.junit.Assert.assertEquals;
 
-public class Java8MaxMinTest {
+public class Java8MaxMinUnitTest {
 
     @Test
     public void whenListIsOfIntegerThenMaxCanBeDoneUsingIntegerComparator() {

core-java/src/test/java/com/baeldung/java8/comparator/Java8ComparatorUnitTest.java

@@ -8,7 +8,7 @@ import org.junit.Test;
 import lombok.Data;
 import static org.junit.Assert.assertTrue;
 
-public class Java8ComparatorTest {
+public class Java8ComparatorUnitTest {
 
     private Employee[] employees;
     private Employee[] employeesArrayWithNulls;

core-java/src/test/java/com/baeldung/java8/lambda/exceptions/LambdaExceptionWrappersUnitTest.java

@@ -11,9 +11,9 @@ import java.util.List;
 
 import static com.baeldung.java8.lambda.exceptions.LambdaExceptionWrappers.*;
 
-public class LambdaExceptionWrappersTest {
+public class LambdaExceptionWrappersUnitTest {
 
-    private static final Logger LOG = LoggerFactory.getLogger(LambdaExceptionWrappersTest.class);
+    private static final Logger LOG = LoggerFactory.getLogger(LambdaExceptionWrappersUnitTest.class);
 
 
     private List<Integer> integers;

core-java/src/test/java/com/baeldung/java8/optional/OptionalUnitTest.java

@@ -13,9 +13,9 @@ import java.util.Optional;
 
 import static org.junit.Assert.*;
 
-public class OptionalTest {
+public class OptionalUnitTest {
 
-    private static final Logger LOG = LoggerFactory.getLogger(OptionalTest.class);
+    private static final Logger LOG = LoggerFactory.getLogger(OptionalUnitTest.class);
 
     
     // creating Optional

core-java/src/test/java/com/baeldung/jdbc/JdbcIntegrationTest.java

@@ -21,9 +21,9 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
-public class JdbcTest {
+public class JdbcIntegrationTest {
 
-    private static final Logger LOG = Logger.getLogger(JdbcTest.class);
+    private static final Logger LOG = Logger.getLogger(JdbcIntegrationTest.class);
 
     private Connection con;
 

core-java/src/test/java/com/baeldung/junit4vstestng/DivisibilityUnitTest.java

@@ -5,7 +5,7 @@ import static org.junit.Assert.assertEquals;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-public class DivisibilityTest {
+public class DivisibilityUnitTest {
 
     private static int number;
 

core-java/src/test/java/com/baeldung/junit4vstestng/ParametrizedUnitTest.java

@@ -11,12 +11,12 @@ import java.util.Arrays;
 import java.util.Collection;
 
 @RunWith(value = Parameterized.class)
-public class ParametrizedTests {
+public class ParametrizedUnitTest {
 
     private int value;
     private boolean isEven;
 
-    public ParametrizedTests(int value, boolean isEven) {
+    public ParametrizedUnitTest(int value, boolean isEven) {
         this.value = value;
         this.isEven = isEven;
     }

core-java/src/test/java/com/baeldung/junit4vstestng/RegistrationUnitTest.java

@@ -5,8 +5,8 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 
-public class RegistrationTest {
+public class RegistrationUnitTest {
-    private static final Logger LOGGER = LoggerFactory.getLogger(RegistrationTest.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(RegistrationUnitTest.class);
 
     @Test
     public void whenCalledFromSuite_thanOK() {

core-java/src/test/java/com/baeldung/junit4vstestng/SignInUnitTest.java

@@ -4,8 +4,8 @@ import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class SignInTest {
+public class SignInUnitTest {
-    private static final Logger LOGGER = LoggerFactory.getLogger(SignInTest.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(SignInUnitTest.class);
 
     @Test
     public void whenCalledFromSuite_thanOK() {

core-java/src/test/java/com/baeldung/junit4vstestng/SortedUnitTest.java

@@ -7,7 +7,7 @@ import org.junit.Test;
 import org.junit.runners.MethodSorters;
 
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
-public class SortedTests {
+public class SortedUnitTest {
 
     @Test
     public void a_givenString_whenChangedtoInt_thenTrue() {

core-java/src/test/java/com/baeldung/junit4vstestng/StringCaseUnitTest.java

@@ -5,7 +5,7 @@ import static org.junit.Assert.assertEquals;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-public class StringCaseTest {
+public class StringCaseUnitTest {
 
     private static String data;
 

core-java/src/test/java/com/baeldung/junit4vstestng/SuiteTest.java

@@ -4,7 +4,7 @@ import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 
 @RunWith(Suite.class)
-@Suite.SuiteClasses({ RegistrationTest.class, SignInTest.class })
+@Suite.SuiteClasses({ RegistrationUnitTest.class, SignInUnitTest.class })
 public class SuiteTest {
 
 }

core-java/src/test/java/com/baeldung/junit4vstestng/SummationServiceIntegrationTest.java

@@ -11,7 +11,7 @@ import org.junit.Test;
 import java.util.ArrayList;
 import java.util.List;
 
-public class SummationServiceTest {
+public class SummationServiceIntegrationTest {
     private static List<Integer> numbers;
 
     @BeforeClass

core-java/src/test/java/com/baeldung/list/flattennestedlist/FlattenNestedListUnitTest.java

@@ -13,7 +13,7 @@ import java.util.stream.Collectors;
 import org.hamcrest.collection.IsIterableContainingInOrder;
 import org.junit.Test;
 
-public class FlattenNestedListTest {
+public class FlattenNestedListUnitTest {
     List<List<String>> lol = asList(asList("one:one"), asList("two:one", "two:two", "two:three"), asList("three:one", "three:two", "three:three", "three:four"));
 
     @Test

core-java/src/test/java/com/baeldung/list/listoflist/ListOfListsUnitTest.java

@@ -7,7 +7,7 @@ import static org.junit.Assert.assertEquals;
 import org.junit.Before;
 import org.junit.Test;
 
-public class ListOfListsTest {
+public class ListOfListsUnitTest {
 
     private List<ArrayList<? extends Stationery>> listOfLists = new ArrayList<ArrayList<? extends Stationery>>();
     private ArrayList<Pen> penList = new ArrayList<>();

core-java/src/test/java/com/baeldung/mappedbytebuffer/MappedByteBufferUnitTest.java

@@ -16,7 +16,7 @@ import java.util.List;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
-public class MappedByteBufferTest {
+public class MappedByteBufferUnitTest {
 
 
     @Test

core-java/src/test/java/com/baeldung/money/JavaMoneyUnitTest.java

@@ -21,7 +21,7 @@ import java.util.Locale;
 
 import static org.junit.Assert.*;
 
-public class JavaMoneyTest {
+public class JavaMoneyUnitTest {
 
     @Test
     public void givenCurrencyCode_whenString_thanExist() {

core-java/src/test/java/com/baeldung/scripting/NashornUnitTest.java

@@ -9,7 +9,7 @@ import java.io.InputStreamReader;
 import java.util.List;
 import java.util.Map;
 
-public class NashornTest {
+public class NashornUnitTest {
 
     private ScriptEngine engine;
 
@@ -20,17 +20,17 @@ public class NashornTest {
 
     @Test
     public void trim() throws ScriptException {
-        engine.eval(new InputStreamReader(NashornTest.class.getResourceAsStream("/js/trim.js")));
+        engine.eval(new InputStreamReader(NashornUnitTest.class.getResourceAsStream("/js/trim.js")));
     }
 
     @Test
     public void locations() throws ScriptException {
-        engine.eval(new InputStreamReader(NashornTest.class.getResourceAsStream("/js/locations.js")));
+        engine.eval(new InputStreamReader(NashornUnitTest.class.getResourceAsStream("/js/locations.js")));
     }
 
     @Test
     public void bindProperties() throws ScriptException {
-        engine.eval(new InputStreamReader(NashornTest.class.getResourceAsStream("/js/bind.js")));
+        engine.eval(new InputStreamReader(NashornUnitTest.class.getResourceAsStream("/js/bind.js")));
     }
 
     @Test
@@ -40,7 +40,7 @@ public class NashornTest {
 
     @Test
     public void typedArrays() throws ScriptException {
-        engine.eval(new InputStreamReader(NashornTest.class.getResourceAsStream("/js/typed_arrays.js")));
+        engine.eval(new InputStreamReader(NashornUnitTest.class.getResourceAsStream("/js/typed_arrays.js")));
     }
 
     @Test

core-java/src/test/java/com/baeldung/serialization/PersonUnitTest.java

@@ -0,0 +1,64 @@
+package com.baeuldung.serialization;
+
+import static org.junit.Assert.assertTrue;
+
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+
+import org.junit.Test;
+
+public class PersonUnitTest {
+
+	@Test
+	public void whenSerializingAndDeserializing_ThenObjectIsTheSame() throws IOException, ClassNotFoundException {
+		Person p = new Person();
+		p.setAge(20);
+		p.setName("Joe");
+
+		FileOutputStream fileOutputStream = new FileOutputStream("yofile.txt");
+		ObjectOutputStream objectOutputStream = new ObjectOutputStream(fileOutputStream);
+		objectOutputStream.writeObject(p);
+		objectOutputStream.flush();
+		objectOutputStream.close();
+
+		FileInputStream fileInputStream = new FileInputStream("yofile.txt");
+		ObjectInputStream objectInputStream = new ObjectInputStream(fileInputStream);
+		Person p2 = (Person) objectInputStream.readObject();
+		objectInputStream.close();
+
+		assertTrue(p2.getAge() == p.getAge());
+		assertTrue(p2.getName().equals(p.getName()));
+	}
+
+	@Test
+	public void whenCustomSerializingAndDeserializing_ThenObjectIsTheSame() throws IOException, ClassNotFoundException {
+		Person p = new Person();
+		p.setAge(20);
+		p.setName("Joe");
+
+		Address a = new Address();
+		a.setHouseNumber(1);
+
+		Employee e = new Employee();
+		e.setPerson(p);
+		e.setAddress(a);
+
+		FileOutputStream fileOutputStream = new FileOutputStream("yofile2.txt");
+		ObjectOutputStream objectOutputStream = new ObjectOutputStream(fileOutputStream);
+		objectOutputStream.writeObject(e);
+		objectOutputStream.flush();
+		objectOutputStream.close();
+
+		FileInputStream fileInputStream = new FileInputStream("yofile2.txt");
+		ObjectInputStream objectInputStream = new ObjectInputStream(fileInputStream);
+		Employee e2 = (Employee) objectInputStream.readObject();
+		objectInputStream.close();
+
+		assertTrue(e2.getPerson().getAge() == e.getPerson().getAge());
+		assertTrue(e2.getAddress().getHouseNumber() == (e.getAddress().getHouseNumber()));
+	}
+
+}

core-java/src/test/java/com/baeldung/stackoverflowerror/CyclicDependancyManualTest.java

@@ -4,13 +4,8 @@ import static org.junit.Assert.fail;
 import org.junit.Test;
 
 public class CyclicDependancyManualTest {
-    @Test
+    @Test(expected = StackOverflowError.class)
     public void whenInstanciatingClassOne_thenThrowsException() {
-        try {
             ClassOne obj = new ClassOne();
-            fail();
-        } catch (StackOverflowError soe) {
-            soe.printStackTrace();
-        }
     }
 }

core-java/src/test/java/com/baeldung/stackoverflowerror/InfiniteRecursionWithTerminationConditionManualTest.java

@@ -6,7 +6,7 @@ import org.junit.Test;
 
 public class InfiniteRecursionWithTerminationConditionManualTest {
     @Test
-    public void givenPositiveIntNoOne_whenCalcFact_thenThrowsException() {
+    public void givenPositiveIntNoOne_whenCalcFact_thenCorrectlyCalc() {
         int numToCalcFactorial = 1;
         InfiniteRecursionWithTerminationCondition irtc = new InfiniteRecursionWithTerminationCondition();
 
@@ -14,23 +14,18 @@ public class InfiniteRecursionWithTerminationConditionManualTest {
     }
 
     @Test
-    public void givenPositiveIntGtOne_whenCalcFact_thenThrowsException() {
+    public void givenPositiveIntGtOne_whenCalcFact_thenCorrectlyCalc() {
         int numToCalcFactorial = 5;
         InfiniteRecursionWithTerminationCondition irtc = new InfiniteRecursionWithTerminationCondition();
 
         assertEquals(120, irtc.calculateFactorial(numToCalcFactorial));
     }
 
-    @Test
+    @Test(expected = StackOverflowError.class)
     public void givenNegativeInt_whenCalcFact_thenThrowsException() {
-        try {
             int numToCalcFactorial = -1;
             InfiniteRecursionWithTerminationCondition irtc = new InfiniteRecursionWithTerminationCondition();
 
             irtc.calculateFactorial(numToCalcFactorial);
-            fail();
-        } catch (StackOverflowError soe) {
-            soe.printStackTrace();
-        }
     }
 }

core-java/src/test/java/com/baeldung/stackoverflowerror/RecursionWithCorrectTerminationConditionManualTest.java

@@ -0,0 +1,15 @@
+package com.baeldung.stackoverflowerror;
+
+import static junit.framework.TestCase.assertEquals;
+
+import org.junit.Test;
+
+public class RecursionWithCorrectTerminationConditionManualTest {
+    @Test
+    public void givenNegativeInt_whenCalcFact_thenCorrectlyCalc() {
+        int numToCalcFactorial = -1;
+        RecursionWithCorrectTerminationCondition rctc = new RecursionWithCorrectTerminationCondition();
+
+        assertEquals(1, rctc.calculateFactorial(numToCalcFactorial));
+    }
+}