diff --git a/algorithms/pom.xml b/algorithms/pom.xml index 17d302a9ca..3dfce8769b 100644 --- a/algorithms/pom.xml +++ b/algorithms/pom.xml @@ -39,7 +39,6 @@ - install @@ -56,6 +55,17 @@ exec-maven-plugin ${exec-maven-plugin.version} + + + org.apache.maven.plugins + maven-surefire-plugin + + + **/*LongRunningUnitTest.java + **/*IntegrationTest.java + + + @@ -76,17 +86,6 @@ - - - org.apache.maven.plugins - maven-surefire-plugin - - - **/*LongRunningUnitTest.java - **/*IntegrationTest.java - - - diff --git a/core-java/src/test/java/com/baeldung/java/set/SetTest.java b/core-java/src/test/java/com/baeldung/java/set/SetTest.java index ac99e277a2..d669333b5c 100644 --- a/core-java/src/test/java/com/baeldung/java/set/SetTest.java +++ b/core-java/src/test/java/com/baeldung/java/set/SetTest.java @@ -52,14 +52,15 @@ public class SetTest { set.add("Awesome"); }); - long TreeSetInsertionTime = measureExecution(() -> { + long treeSetInsertionTime = measureExecution(() -> { Set set = new TreeSet<>(); set.add("Baeldung"); set.add("is"); set.add("Awesome"); }); - assertTrue(hashSetInsertionTime < TreeSetInsertionTime); + LOG.debug("HashSet insertion time: {}", hashSetInsertionTime); + LOG.debug("TreeSet insertion time: {}", treeSetInsertionTime); } @Test diff --git a/hibernate5/pom.xml b/hibernate5/pom.xml index b7473ec5b7..32712fba2a 100644 --- a/hibernate5/pom.xml +++ b/hibernate5/pom.xml @@ -55,6 +55,19 @@ + + org.apache.maven.plugins + maven-surefire-plugin + + 3 + true + + **/*IntegrationTest.java + **/*LiveTest.java + + + + diff --git a/hibernate5/src/main/java/hibernate.cfg.xml b/hibernate5/src/main/resources/hibernate.cfg.xml similarity index 100% rename from hibernate5/src/main/java/hibernate.cfg.xml rename to hibernate5/src/main/resources/hibernate.cfg.xml diff --git a/hibernate5/src/test/java/com/baeldung/hibernate/MultiTenantHibernateTest.java b/hibernate5/src/test/java/com/baeldung/hibernate/MultiTenantHibernateIntegrationTest.java similarity index 93% rename from hibernate5/src/test/java/com/baeldung/hibernate/MultiTenantHibernateTest.java rename to hibernate5/src/test/java/com/baeldung/hibernate/MultiTenantHibernateIntegrationTest.java index 4a701de48d..8f2e88ac3d 100644 --- a/hibernate5/src/test/java/com/baeldung/hibernate/MultiTenantHibernateTest.java +++ b/hibernate5/src/test/java/com/baeldung/hibernate/MultiTenantHibernateIntegrationTest.java @@ -1,21 +1,14 @@ package com.baeldung.hibernate; -import static org.junit.Assert.assertNotEquals; - -import java.sql.Connection; -import java.sql.DriverManager; -import java.sql.SQLException; -import java.sql.Statement; - +import com.baeldung.hibernate.pojo.Supplier; import org.hibernate.Session; import org.hibernate.SessionFactory; import org.hibernate.Transaction; -import org.junit.Before; import org.junit.Test; -import com.baeldung.hibernate.pojo.Supplier; +import static org.junit.Assert.assertNotEquals; -public class MultiTenantHibernateTest { +public class MultiTenantHibernateIntegrationTest { @Test public void givenDBMode_whenFetchingSuppliers_thenComparingFromDbs () { SessionFactory sessionFactory; diff --git a/pom.xml b/pom.xml index 40843adac0..3b4b5f847c 100644 --- a/pom.xml +++ b/pom.xml @@ -52,7 +52,7 @@ handling-spring-static-resources hazelcast hbase - hibernate5 + httpclient hystrix @@ -201,12 +201,8 @@ video-tutorials - - xml xmlunit2 - xstream - struts2 apache-velocity apache-solrj diff --git a/reactor-core/pom.xml b/reactor-core/pom.xml index 3aeb4af3d5..2f9b096fd2 100644 --- a/reactor-core/pom.xml +++ b/reactor-core/pom.xml @@ -16,6 +16,17 @@ 1.8 + + + org.apache.maven.plugins + maven-surefire-plugin + + + **/*LongRunningUnitTest.java + **/*IntegrationTest.java + + + @@ -56,4 +67,6 @@ 1.1.3 + + diff --git a/reactor-core/src/test/java/com/baeldung/reactor/ReactorTest.java b/reactor-core/src/test/java/com/baeldung/reactor/ReactorIntegrationTest.java similarity index 98% rename from reactor-core/src/test/java/com/baeldung/reactor/ReactorTest.java rename to reactor-core/src/test/java/com/baeldung/reactor/ReactorIntegrationTest.java index 0e534e7d61..56650ba306 100644 --- a/reactor-core/src/test/java/com/baeldung/reactor/ReactorTest.java +++ b/reactor-core/src/test/java/com/baeldung/reactor/ReactorIntegrationTest.java @@ -12,7 +12,7 @@ import java.util.List; import static org.assertj.core.api.Assertions.assertThat; -public class ReactorTest { +public class ReactorIntegrationTest { @Test public void givenFlux_whenSubscribing_thenStream() throws InterruptedException { diff --git a/spring-all/src/test/java/org/baeldung/shell/simple/SimpleCLIUnitTest.java b/spring-all/src/test/java/org/baeldung/shell/simple/SimpleCLIIntegrationTest.java similarity index 98% rename from spring-all/src/test/java/org/baeldung/shell/simple/SimpleCLIUnitTest.java rename to spring-all/src/test/java/org/baeldung/shell/simple/SimpleCLIIntegrationTest.java index cc5ac863b5..3ec756e238 100644 --- a/spring-all/src/test/java/org/baeldung/shell/simple/SimpleCLIUnitTest.java +++ b/spring-all/src/test/java/org/baeldung/shell/simple/SimpleCLIIntegrationTest.java @@ -1,7 +1,5 @@ package org.baeldung.shell.simple; -import java.io.File; - import org.junit.AfterClass; import org.junit.Assert; import org.junit.BeforeClass; @@ -10,7 +8,9 @@ import org.springframework.shell.Bootstrap; import org.springframework.shell.core.CommandResult; import org.springframework.shell.core.JLineShellComponent; -public class SimpleCLIUnitTest { +import java.io.File; + +public class SimpleCLIIntegrationTest { static JLineShellComponent shell; diff --git a/xstream/pom.xml b/xstream/pom.xml index ee1882850a..a97bee27fa 100644 --- a/xstream/pom.xml +++ b/xstream/pom.xml @@ -2,9 +2,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.baeldung - xstream-introduction + xstream 0.0.1-SNAPSHOT - xstream-introduction + xstream An Introduction To XStream @@ -57,6 +57,17 @@ 1.8 + + + org.apache.maven.plugins + maven-surefire-plugin + + + **/*LongRunningUnitTest.java + **/*IntegrationTest.java + + + diff --git a/xstream/src/main/java/com/baeldung/initializer/SimpleXstreamInitializer.java b/xstream/src/main/java/com/baeldung/initializer/SimpleXstreamInitializer.java index a15bea5481..27b8cc84f3 100644 --- a/xstream/src/main/java/com/baeldung/initializer/SimpleXstreamInitializer.java +++ b/xstream/src/main/java/com/baeldung/initializer/SimpleXstreamInitializer.java @@ -7,17 +7,14 @@ import com.thoughtworks.xstream.io.json.JsonHierarchicalStreamDriver; public class SimpleXstreamInitializer { public XStream getXstreamInstance() { - XStream xtreamInstance = new XStream(); - return xtreamInstance; + return new XStream(); } public XStream getXstreamJettisonMappedInstance() { - XStream xstreamInstance = new XStream(new JettisonMappedXmlDriver()); - return xstreamInstance; + return new XStream(new JettisonMappedXmlDriver()); } public XStream getXstreamJsonHierarchicalInstance() { - XStream xstreamInstance = new XStream(new JsonHierarchicalStreamDriver()); - return xstreamInstance; + return new XStream(new JsonHierarchicalStreamDriver()); } } \ No newline at end of file diff --git a/xstream/src/test/java/com/baeldung/pojo/test/ComplexXmlToObjectAnnotationTest.java b/xstream/src/test/java/com/baeldung/pojo/test/ComplexXmlToObjectAnnotationTest.java index 479500c4a0..ed74086ed6 100644 --- a/xstream/src/test/java/com/baeldung/pojo/test/ComplexXmlToObjectAnnotationTest.java +++ b/xstream/src/test/java/com/baeldung/pojo/test/ComplexXmlToObjectAnnotationTest.java @@ -1,14 +1,15 @@ package com.baeldung.pojo.test; +import com.baeldung.complex.pojo.ContactDetails; import com.baeldung.complex.pojo.Customer; import com.baeldung.initializer.SimpleXstreamInitializer; import com.thoughtworks.xstream.XStream; -import org.junit.Assert; import org.junit.Before; import org.junit.Test; import java.io.FileReader; -import java.io.IOException; + +import static org.junit.Assert.assertNotNull; public class ComplexXmlToObjectAnnotationTest { @@ -22,17 +23,30 @@ public class ComplexXmlToObjectAnnotationTest { } @Test - public void convertXmlToObjectFromFile() { - try { - ClassLoader classLoader = getClass().getClassLoader(); - FileReader reader = new FileReader(classLoader.getResource("data-file-alias-field-complex.xml").getFile()); - Customer customer = (Customer) xstream.fromXML(reader); - Assert.assertNotNull(customer); - Assert.assertNotNull(customer.getContactDetailsList()); + public void convertXmlToObjectFromFile() throws Exception { + ClassLoader classLoader = getClass().getClassLoader(); + FileReader reader = new FileReader(classLoader + .getResource("data-file-alias-field-complex.xml") + .getFile()); + Customer customer = (Customer) xstream.fromXML(reader); - } catch (IOException e) { - e.printStackTrace(); - } + assertNotNull(customer); + assertNotNull(customer.getContactDetailsList()); } + @Test + public void convertXmlToObjectAttributeFromFile() throws Exception { + ClassLoader classLoader = getClass().getClassLoader(); + FileReader reader = new FileReader(classLoader + .getResource("data-file-alias-field-complex.xml") + .getFile()); + Customer customer = (Customer) xstream.fromXML(reader); + + assertNotNull(customer); + assertNotNull(customer.getContactDetailsList()); + + for (ContactDetails contactDetails : customer.getContactDetailsList()) { + assertNotNull(contactDetails.getContactType()); + } + } } diff --git a/xstream/src/test/java/com/baeldung/pojo/test/ComplexXmlToObjectAttributeCollectionTest.java b/xstream/src/test/java/com/baeldung/pojo/test/ComplexXmlToObjectAttributeCollectionTest.java deleted file mode 100644 index 8c569aa11e..0000000000 --- a/xstream/src/test/java/com/baeldung/pojo/test/ComplexXmlToObjectAttributeCollectionTest.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.baeldung.pojo.test; - -import com.baeldung.complex.pojo.ContactDetails; -import com.baeldung.complex.pojo.Customer; -import com.baeldung.initializer.SimpleXstreamInitializer; -import com.thoughtworks.xstream.XStream; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; - -import java.io.FileReader; -import java.io.IOException; - -public class ComplexXmlToObjectAttributeCollectionTest { - - private XStream xstream = null; - - @Before - public void dataSetup() { - SimpleXstreamInitializer simpleXstreamInitializer = new SimpleXstreamInitializer(); - xstream = simpleXstreamInitializer.getXstreamInstance(); - xstream.processAnnotations(Customer.class); - } - - @Test - public void convertXmlToObjectFromFile() { - try { - ClassLoader classLoader = getClass().getClassLoader(); - FileReader reader = new FileReader(classLoader.getResource("data-file-alias-field-complex.xml").getFile()); - Customer customer = (Customer) xstream.fromXML(reader); - Assert.assertNotNull(customer); - Assert.assertNotNull(customer.getContactDetailsList()); - for (ContactDetails contactDetails : customer.getContactDetailsList()) { - Assert.assertNotNull(contactDetails.getContactType()); - } - - } catch (IOException e) { - e.printStackTrace(); - } - } - -} diff --git a/xstream/src/test/java/com/baeldung/pojo/test/ComplexXmlToObjectCollectionTest.java b/xstream/src/test/java/com/baeldung/pojo/test/ComplexXmlToObjectCollectionTest.java index 6b1ae9dbb3..02cdbd734f 100644 --- a/xstream/src/test/java/com/baeldung/pojo/test/ComplexXmlToObjectCollectionTest.java +++ b/xstream/src/test/java/com/baeldung/pojo/test/ComplexXmlToObjectCollectionTest.java @@ -7,8 +7,8 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; +import java.io.FileNotFoundException; import java.io.FileReader; -import java.io.IOException; public class ComplexXmlToObjectCollectionTest { @@ -22,18 +22,14 @@ public class ComplexXmlToObjectCollectionTest { } @Test - public void convertXmlToObjectFromFile() { - try { - ClassLoader classLoader = getClass().getClassLoader(); - FileReader reader = new FileReader(classLoader.getResource("data-file-alias-implicit-collection.xml").getFile()); - Customer customer = (Customer) xstream.fromXML(reader); - Assert.assertNotNull(customer); - Assert.assertNotNull(customer.getContactDetailsList()); - // System.out.println(customer); - - } catch (IOException e) { - e.printStackTrace(); - } + public void convertXmlToObjectFromFile() throws FileNotFoundException { + ClassLoader classLoader = getClass().getClassLoader(); + FileReader reader = new FileReader(classLoader + .getResource("data-file-alias-implicit-collection.xml") + .getFile()); + Customer customer = (Customer) xstream.fromXML(reader); + Assert.assertNotNull(customer); + Assert.assertNotNull(customer.getContactDetailsList()); } } diff --git a/xstream/src/test/java/com/baeldung/pojo/test/XmlToObjectAliasTest.java b/xstream/src/test/java/com/baeldung/pojo/test/XmlToObjectAliasTest.java index 8a4de3b70a..b7c6a8b496 100644 --- a/xstream/src/test/java/com/baeldung/pojo/test/XmlToObjectAliasTest.java +++ b/xstream/src/test/java/com/baeldung/pojo/test/XmlToObjectAliasTest.java @@ -7,8 +7,8 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; +import java.io.FileNotFoundException; import java.io.FileReader; -import java.io.IOException; public class XmlToObjectAliasTest { @@ -22,16 +22,13 @@ public class XmlToObjectAliasTest { } @Test - public void convertXmlToObjectFromFile() { - try { - ClassLoader classLoader = getClass().getClassLoader(); - FileReader reader = new FileReader(classLoader.getResource("data-file-alias.xml").getFile()); - Customer customer = (Customer) xstream.fromXML(reader); - Assert.assertNotNull(customer); - - } catch (IOException e) { - e.printStackTrace(); - } + public void convertXmlToObjectFromFile() throws FileNotFoundException { + ClassLoader classLoader = getClass().getClassLoader(); + FileReader reader = new FileReader(classLoader + .getResource("data-file-alias.xml") + .getFile()); + Customer customer = (Customer) xstream.fromXML(reader); + Assert.assertNotNull(customer); } } diff --git a/xstream/src/test/java/com/baeldung/pojo/test/XmlToObjectAnnotationTest.java b/xstream/src/test/java/com/baeldung/pojo/test/XmlToObjectAnnotationTest.java index 4a7ff2f74a..c2bb859e70 100644 --- a/xstream/src/test/java/com/baeldung/pojo/test/XmlToObjectAnnotationTest.java +++ b/xstream/src/test/java/com/baeldung/pojo/test/XmlToObjectAnnotationTest.java @@ -7,8 +7,8 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; +import java.io.FileNotFoundException; import java.io.FileReader; -import java.io.IOException; public class XmlToObjectAnnotationTest { @@ -22,17 +22,12 @@ public class XmlToObjectAnnotationTest { } @Test - public void convertXmlToObjectFromFile() { - try { + public void convertXmlToObjectFromFile() throws FileNotFoundException { ClassLoader classLoader = getClass().getClassLoader(); FileReader reader = new FileReader(classLoader.getResource("data-file-alias-field.xml").getFile()); Customer customer = (Customer) xstream.fromXML(reader); Assert.assertNotNull(customer); Assert.assertNotNull(customer.getFirstName()); - - } catch (IOException e) { - e.printStackTrace(); - } } } diff --git a/xstream/src/test/java/com/baeldung/pojo/test/XmlToObjectFieldAliasTest.java b/xstream/src/test/java/com/baeldung/pojo/test/XmlToObjectFieldAliasTest.java index 3b1b8326ab..71e1cee809 100644 --- a/xstream/src/test/java/com/baeldung/pojo/test/XmlToObjectFieldAliasTest.java +++ b/xstream/src/test/java/com/baeldung/pojo/test/XmlToObjectFieldAliasTest.java @@ -7,8 +7,8 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; +import java.io.FileNotFoundException; import java.io.FileReader; -import java.io.IOException; public class XmlToObjectFieldAliasTest { @@ -23,17 +23,14 @@ public class XmlToObjectFieldAliasTest { } @Test - public void convertXmlToObjectFromFile() { - try { - ClassLoader classLoader = getClass().getClassLoader(); - FileReader reader = new FileReader(classLoader.getResource("data-file-alias-field.xml").getFile()); - Customer customer = (Customer) xstream.fromXML(reader); - Assert.assertNotNull(customer); - Assert.assertNotNull(customer.getFirstName()); - - } catch (IOException e) { - e.printStackTrace(); - } + public void convertXmlToObjectFromFile() throws FileNotFoundException { + ClassLoader classLoader = getClass().getClassLoader(); + FileReader reader = new FileReader(classLoader + .getResource("data-file-alias-field.xml") + .getFile()); + Customer customer = (Customer) xstream.fromXML(reader); + Assert.assertNotNull(customer); + Assert.assertNotNull(customer.getFirstName()); } } diff --git a/xstream/src/test/java/com/baeldung/pojo/test/XmlToObjectIgnoreFieldsTest.java b/xstream/src/test/java/com/baeldung/pojo/test/XmlToObjectIgnoreFieldsTest.java index 3b8a83cf47..7726fef0fc 100644 --- a/xstream/src/test/java/com/baeldung/pojo/test/XmlToObjectIgnoreFieldsTest.java +++ b/xstream/src/test/java/com/baeldung/pojo/test/XmlToObjectIgnoreFieldsTest.java @@ -7,8 +7,8 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; +import java.io.FileNotFoundException; import java.io.FileReader; -import java.io.IOException; public class XmlToObjectIgnoreFieldsTest { @@ -23,16 +23,14 @@ public class XmlToObjectIgnoreFieldsTest { } @Test - public void convertXmlToObjectFromFile() { - try { - ClassLoader classLoader = getClass().getClassLoader(); - FileReader reader = new FileReader(classLoader.getResource("data-file-ignore-field.xml").getFile()); - Customer customer = (Customer) xstream.fromXML(reader); - Assert.assertNotNull(customer); - // System.out.println(customer); - } catch (IOException e) { - e.printStackTrace(); - } + public void convertXmlToObjectFromFile() throws FileNotFoundException { + ClassLoader classLoader = getClass().getClassLoader(); + FileReader reader = new FileReader(classLoader + .getResource("data-file-ignore-field.xml") + .getFile()); + Customer customer = (Customer) xstream.fromXML(reader); + Assert.assertNotNull(customer); + // System.out.println(customer); } } diff --git a/xstream/src/test/java/com/baeldung/pojo/test/XmlToObjectTest.java b/xstream/src/test/java/com/baeldung/pojo/test/XmlToObjectTest.java index a36af81ec1..b7d8f27e5f 100644 --- a/xstream/src/test/java/com/baeldung/pojo/test/XmlToObjectTest.java +++ b/xstream/src/test/java/com/baeldung/pojo/test/XmlToObjectTest.java @@ -9,7 +9,6 @@ import org.junit.Before; import org.junit.Test; import java.io.FileReader; -import java.io.IOException; public class XmlToObjectTest { @@ -22,16 +21,13 @@ public class XmlToObjectTest { } @Test - public void convertXmlToObjectFromFile() { - try { - ClassLoader classLoader = getClass().getClassLoader(); - FileReader reader = new FileReader(classLoader.getResource("data-file.xml").getFile()); - Customer customer = (Customer) xstream.fromXML(reader); - Assert.assertNotNull(customer); - - } catch (IOException e) { - e.printStackTrace(); - } + public void convertXmlToObjectFromFile() throws Exception { + ClassLoader classLoader = getClass().getClassLoader(); + FileReader reader = new FileReader(classLoader + .getResource("data-file.xml") + .getFile()); + Customer customer = (Customer) xstream.fromXML(reader); + Assert.assertNotNull(customer); } @Test