From d98924b39db3405cdf32eb4856f3b3c5b20b5734 Mon Sep 17 00:00:00 2001 From: Kiran Date: Sun, 9 Oct 2016 13:52:52 -0400 Subject: [PATCH 01/23] Updated indentation and refactored code --- spring-jms/src/com/baeldung/spring/jms/Employee.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-jms/src/com/baeldung/spring/jms/Employee.java b/spring-jms/src/com/baeldung/spring/jms/Employee.java index a0346c4291..36783ebf46 100644 --- a/spring-jms/src/com/baeldung/spring/jms/Employee.java +++ b/spring-jms/src/com/baeldung/spring/jms/Employee.java @@ -18,6 +18,6 @@ public class Employee { } public String toString() { - return "Person: name(" + name + "), age(" + age + ")"; + return "Employee: name(" + name + "), age(" + age + ")"; } } From 94f258f90c16c326979cc8efdab1eefb53cae893 Mon Sep 17 00:00:00 2001 From: Kiran Date: Sun, 9 Oct 2016 13:53:20 -0400 Subject: [PATCH 02/23] Updated indentation and refactored code --- .../spring/jms/SampleJmsMessageSender.java | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/spring-jms/src/com/baeldung/spring/jms/SampleJmsMessageSender.java b/spring-jms/src/com/baeldung/spring/jms/SampleJmsMessageSender.java index e3eccea03e..123edccb4d 100644 --- a/spring-jms/src/com/baeldung/spring/jms/SampleJmsMessageSender.java +++ b/spring-jms/src/com/baeldung/spring/jms/SampleJmsMessageSender.java @@ -1,6 +1,8 @@ package com.baeldung.spring.jms; -import javax.jms.ConnectionFactory; +import java.util.HashMap; +import java.util.Map; + import javax.jms.JMSException; import javax.jms.Message; import javax.jms.Queue; @@ -14,8 +16,8 @@ public class SampleJmsMessageSender { private JmsTemplate jmsTemplate; private Queue queue; - public void setConnectionFactory(ConnectionFactory cf) { - this.jmsTemplate = new JmsTemplate(cf); + public void setJmsTemplate(JmsTemplate jmsTemplate) { + this.jmsTemplate = jmsTemplate; } public void setQueue(Queue queue) { @@ -29,4 +31,12 @@ public class SampleJmsMessageSender { } }); } -} \ No newline at end of file + + public void sendMessage(final Employee employee) { + System.out.println("Jms Message Sender : " + employee); + Map map = new HashMap(); + map.put("name", employee.getName()); + map.put("age", employee.getAge()); + this.jmsTemplate.convertAndSend(map); + } +} From 53a353916b1bf91653c8df6907e630b3751582e1 Mon Sep 17 00:00:00 2001 From: Kiran Date: Sun, 9 Oct 2016 13:55:01 -0400 Subject: [PATCH 03/23] Updated indentation and refactored code Added a a new method receiveMessage() to receive custom converted messages --- .../baeldung/spring/jms/SampleListener.java | 20 ++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/spring-jms/src/com/baeldung/spring/jms/SampleListener.java b/spring-jms/src/com/baeldung/spring/jms/SampleListener.java index 466cac44a0..8c28ab3e35 100644 --- a/spring-jms/src/com/baeldung/spring/jms/SampleListener.java +++ b/spring-jms/src/com/baeldung/spring/jms/SampleListener.java @@ -1,18 +1,26 @@ package com.baeldung.spring.jms; +import java.util.Map; + import javax.jms.JMSException; import javax.jms.Message; import javax.jms.MessageListener; import javax.jms.TextMessage; +import org.springframework.jms.core.JmsTemplate; + public class SampleListener implements MessageListener { - private String textMessage; + public JmsTemplate getJmsTemplate() { + return getJmsTemplate(); + } public void onMessage(Message message) { if (message instanceof TextMessage) { try { - textMessage = ((TextMessage) message).getText(); + + String msg = ((TextMessage) message).getText(); + System.out.println("Message has been consumed : " + msg); } catch (JMSException ex) { throw new RuntimeException(ex); } @@ -20,4 +28,10 @@ public class SampleListener implements MessageListener { throw new IllegalArgumentException("Message Error"); } } -} \ No newline at end of file + + public Employee receiveMessage() throws JMSException { + Map map = (Map) getJmsTemplate().receiveAndConvert(); + Employee employee = new Employee((String) map.get("name"), (Integer) map.get("age")); + return employee; + } +} From fe9c63560d12e51a9ca7318639d9fa3a79da90f2 Mon Sep 17 00:00:00 2001 From: Kiran Date: Sun, 9 Oct 2016 13:55:26 -0400 Subject: [PATCH 04/23] Updated indentation --- .../baeldung/spring/jms/SampleMessageConverter.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/spring-jms/src/com/baeldung/spring/jms/SampleMessageConverter.java b/spring-jms/src/com/baeldung/spring/jms/SampleMessageConverter.java index 856e0e9e49..2142461a5f 100644 --- a/spring-jms/src/com/baeldung/spring/jms/SampleMessageConverter.java +++ b/spring-jms/src/com/baeldung/spring/jms/SampleMessageConverter.java @@ -11,17 +11,17 @@ import org.springframework.jms.support.converter.MessageConverter; public class SampleMessageConverter implements MessageConverter { public Message toMessage(Object object, Session session) throws JMSException, MessageConversionException { - Employee person = (Employee) object; + Employee employee = (Employee) object; MapMessage message = session.createMapMessage(); - message.setString("name", person.getName()); - message.setInt("age", person.getAge()); + message.setString("name", employee.getName()); + message.setInt("age", employee.getAge()); return message; } public Object fromMessage(Message message) throws JMSException, MessageConversionException { MapMessage mapMessage = (MapMessage) message; - Employee person = new Employee(mapMessage.getString("name"), mapMessage.getInt("age")); - return person; + Employee employee = new Employee(mapMessage.getString("name"), mapMessage.getInt("age")); + return employee; } } From d1bdfb5234c94c4c99fbd1eba6ea7f3adde80387 Mon Sep 17 00:00:00 2001 From: Kiran Date: Sun, 9 Oct 2016 13:56:37 -0400 Subject: [PATCH 05/23] This class is not required Embedded ActiveMq is created from XML now. --- .../baeldung/spring/jms/SampleJMSExample.java | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 spring-jms/src/com/baeldung/spring/jms/SampleJMSExample.java diff --git a/spring-jms/src/com/baeldung/spring/jms/SampleJMSExample.java b/spring-jms/src/com/baeldung/spring/jms/SampleJMSExample.java deleted file mode 100644 index bdde97b82d..0000000000 --- a/spring-jms/src/com/baeldung/spring/jms/SampleJMSExample.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.baeldung.spring.jms; - -import java.net.URI; -import java.net.URISyntaxException; - -import org.apache.activemq.broker.BrokerFactory; -import org.apache.activemq.broker.BrokerService; -import org.springframework.context.support.ClassPathXmlApplicationContext; - -public class SampleJMSExample { - public static void main(String[] args) throws URISyntaxException, Exception { - BrokerService broker = BrokerFactory.createBroker(new URI("broker:(tcp://localhost:61616)")); - broker.start(); - ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("applicationContext.xml"); - - } -} From 0af6fbea16c2ed7f1aee6154a06713bee3794c1b Mon Sep 17 00:00:00 2001 From: Kiran Date: Sun, 9 Oct 2016 13:58:30 -0400 Subject: [PATCH 06/23] Updated ApplicationContext.xml --- .../src/main/resources/applicationContext.xml | 34 ++++++++++++------- 1 file changed, 22 insertions(+), 12 deletions(-) diff --git a/spring-jms/src/main/resources/applicationContext.xml b/spring-jms/src/main/resources/applicationContext.xml index c15289763f..d94eb4c371 100644 --- a/spring-jms/src/main/resources/applicationContext.xml +++ b/spring-jms/src/main/resources/applicationContext.xml @@ -3,16 +3,27 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> - - - - - - - - + + + + + + + + + + + + + + + + + + - + @@ -23,8 +34,7 @@ - + - - \ No newline at end of file + From 147e1bfe107eed1dcabca36fa7a27847cd4d9d7d Mon Sep 17 00:00:00 2001 From: Kiran Date: Sun, 9 Oct 2016 13:59:25 -0400 Subject: [PATCH 07/23] Embedded activemq is configured in this file --- .../src/main/resources/EmbeddedActiveMQ.xml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 spring-jms/src/main/resources/EmbeddedActiveMQ.xml diff --git a/spring-jms/src/main/resources/EmbeddedActiveMQ.xml b/spring-jms/src/main/resources/EmbeddedActiveMQ.xml new file mode 100644 index 0000000000..5e956144fd --- /dev/null +++ b/spring-jms/src/main/resources/EmbeddedActiveMQ.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + \ No newline at end of file From 4240e34c376b670ad44df0ce19af55d47eda3329 Mon Sep 17 00:00:00 2001 From: Kiran Date: Sun, 9 Oct 2016 14:01:42 -0400 Subject: [PATCH 08/23] Junit tests JUnit tests for testing default text message as well as custom messages --- .../src/DefaultTextMessageSenderTest.java | 26 ++++++++++++++++++ .../src/MapMessageConvertAndSendTest.java | 27 +++++++++++++++++++ 2 files changed, 53 insertions(+) create mode 100644 spring-jms/src/DefaultTextMessageSenderTest.java create mode 100644 spring-jms/src/MapMessageConvertAndSendTest.java diff --git a/spring-jms/src/DefaultTextMessageSenderTest.java b/spring-jms/src/DefaultTextMessageSenderTest.java new file mode 100644 index 0000000000..8806f4d1ba --- /dev/null +++ b/spring-jms/src/DefaultTextMessageSenderTest.java @@ -0,0 +1,26 @@ +package com.baeldung.spring.jms.test; + +import org.junit.Before; +import org.junit.Test; +import org.springframework.context.ApplicationContext; +import org.springframework.context.support.ClassPathXmlApplicationContext; + +import com.baeldung.spring.jms.SampleJmsMessageSender; + +public class DefaultTextMessageSenderTest { + + private SampleJmsMessageSender messageProducer; + + @SuppressWarnings("resource") + @Before + public void setUp() { + ApplicationContext applicationContext = new ClassPathXmlApplicationContext(new String[] { "classpath:EmbeddedActiveMQ.xml", "classpath:applicationContext.xml" }); + messageProducer = (SampleJmsMessageSender) applicationContext.getBean("SampleJmsMessageSender"); + } + + @Test + public void testSimpleSend() { + messageProducer.simpleSend(); + } + +} \ No newline at end of file diff --git a/spring-jms/src/MapMessageConvertAndSendTest.java b/spring-jms/src/MapMessageConvertAndSendTest.java new file mode 100644 index 0000000000..d2a3867679 --- /dev/null +++ b/spring-jms/src/MapMessageConvertAndSendTest.java @@ -0,0 +1,27 @@ +package com.baeldung.spring.jms.test; + +import org.junit.Before; +import org.junit.Test; +import org.springframework.context.ApplicationContext; +import org.springframework.context.support.ClassPathXmlApplicationContext; + +import com.baeldung.spring.jms.Employee; +import com.baeldung.spring.jms.SampleJmsMessageSender; + +public class MapMessageConvertAndSendTest { + + private SampleJmsMessageSender messageProducer; + + @SuppressWarnings("resource") + @Before + public void setUp() { + ApplicationContext applicationContext = new ClassPathXmlApplicationContext(new String[] { "classpath:EmbeddedActiveMQ.xml", "classpath:applicationContext.xml" }); + messageProducer = (SampleJmsMessageSender) applicationContext.getBean("SampleJmsMessageSender"); + } + + @Test + public void testSendMessage() { + messageProducer.sendMessage(new Employee("JavaDeveloper2", 22)); + } + +} From 528e3b1ef59ee883deabbda34f204c01efbda578 Mon Sep 17 00:00:00 2001 From: Kiran Date: Sun, 9 Oct 2016 14:02:38 -0400 Subject: [PATCH 09/23] Uploaded in wrong location --- .../src/DefaultTextMessageSenderTest.java | 26 ------------------- 1 file changed, 26 deletions(-) delete mode 100644 spring-jms/src/DefaultTextMessageSenderTest.java diff --git a/spring-jms/src/DefaultTextMessageSenderTest.java b/spring-jms/src/DefaultTextMessageSenderTest.java deleted file mode 100644 index 8806f4d1ba..0000000000 --- a/spring-jms/src/DefaultTextMessageSenderTest.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.baeldung.spring.jms.test; - -import org.junit.Before; -import org.junit.Test; -import org.springframework.context.ApplicationContext; -import org.springframework.context.support.ClassPathXmlApplicationContext; - -import com.baeldung.spring.jms.SampleJmsMessageSender; - -public class DefaultTextMessageSenderTest { - - private SampleJmsMessageSender messageProducer; - - @SuppressWarnings("resource") - @Before - public void setUp() { - ApplicationContext applicationContext = new ClassPathXmlApplicationContext(new String[] { "classpath:EmbeddedActiveMQ.xml", "classpath:applicationContext.xml" }); - messageProducer = (SampleJmsMessageSender) applicationContext.getBean("SampleJmsMessageSender"); - } - - @Test - public void testSimpleSend() { - messageProducer.simpleSend(); - } - -} \ No newline at end of file From d640b9818d91615e6594f159226b0b4b87bb0920 Mon Sep 17 00:00:00 2001 From: Kiran Date: Sun, 9 Oct 2016 14:02:46 -0400 Subject: [PATCH 10/23] Uploaded in wrong location --- .../src/MapMessageConvertAndSendTest.java | 27 ------------------- 1 file changed, 27 deletions(-) delete mode 100644 spring-jms/src/MapMessageConvertAndSendTest.java diff --git a/spring-jms/src/MapMessageConvertAndSendTest.java b/spring-jms/src/MapMessageConvertAndSendTest.java deleted file mode 100644 index d2a3867679..0000000000 --- a/spring-jms/src/MapMessageConvertAndSendTest.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.baeldung.spring.jms.test; - -import org.junit.Before; -import org.junit.Test; -import org.springframework.context.ApplicationContext; -import org.springframework.context.support.ClassPathXmlApplicationContext; - -import com.baeldung.spring.jms.Employee; -import com.baeldung.spring.jms.SampleJmsMessageSender; - -public class MapMessageConvertAndSendTest { - - private SampleJmsMessageSender messageProducer; - - @SuppressWarnings("resource") - @Before - public void setUp() { - ApplicationContext applicationContext = new ClassPathXmlApplicationContext(new String[] { "classpath:EmbeddedActiveMQ.xml", "classpath:applicationContext.xml" }); - messageProducer = (SampleJmsMessageSender) applicationContext.getBean("SampleJmsMessageSender"); - } - - @Test - public void testSendMessage() { - messageProducer.sendMessage(new Employee("JavaDeveloper2", 22)); - } - -} From b253563e676013443ec0ead0445e28ae6a8552b9 Mon Sep 17 00:00:00 2001 From: Kiran Date: Sun, 9 Oct 2016 14:06:40 -0400 Subject: [PATCH 11/23] Junit tests JUnit Tests for default text messages and custom converted messages --- .../jms/DefaultTextMessageSenderTest.java | 26 ++++++++++++++++++ .../jms/MapMessageConvertAndSendTest.java | 27 +++++++++++++++++++ 2 files changed, 53 insertions(+) create mode 100644 spring-jms/src/test/com/baeldung/spring/jms/DefaultTextMessageSenderTest.java create mode 100644 spring-jms/src/test/com/baeldung/spring/jms/MapMessageConvertAndSendTest.java diff --git a/spring-jms/src/test/com/baeldung/spring/jms/DefaultTextMessageSenderTest.java b/spring-jms/src/test/com/baeldung/spring/jms/DefaultTextMessageSenderTest.java new file mode 100644 index 0000000000..5176d79386 --- /dev/null +++ b/spring-jms/src/test/com/baeldung/spring/jms/DefaultTextMessageSenderTest.java @@ -0,0 +1,26 @@ +package com.baeldung.spring.jms; + +import org.junit.Before; +import org.junit.Test; +import org.springframework.context.ApplicationContext; +import org.springframework.context.support.ClassPathXmlApplicationContext; + +import com.baeldung.spring.jms.SampleJmsMessageSender; + +public class DefaultTextMessageSenderTest { + + private SampleJmsMessageSender messageProducer; + + @SuppressWarnings("resource") + @Before + public void setUp() { + ApplicationContext applicationContext = new ClassPathXmlApplicationContext(new String[] { "classpath:EmbeddedActiveMQ.xml", "classpath:applicationContext.xml" }); + messageProducer = (SampleJmsMessageSender) applicationContext.getBean("SampleJmsMessageSender"); + } + + @Test + public void testSimpleSend() { + messageProducer.simpleSend(); + } + +} \ No newline at end of file diff --git a/spring-jms/src/test/com/baeldung/spring/jms/MapMessageConvertAndSendTest.java b/spring-jms/src/test/com/baeldung/spring/jms/MapMessageConvertAndSendTest.java new file mode 100644 index 0000000000..4bd9827c60 --- /dev/null +++ b/spring-jms/src/test/com/baeldung/spring/jms/MapMessageConvertAndSendTest.java @@ -0,0 +1,27 @@ +package com.baeldung.spring.jms; + +import org.junit.Before; +import org.junit.Test; +import org.springframework.context.ApplicationContext; +import org.springframework.context.support.ClassPathXmlApplicationContext; + +import com.baeldung.spring.jms.Employee; +import com.baeldung.spring.jms.SampleJmsMessageSender; + +public class MapMessageConvertAndSendTest { + + private SampleJmsMessageSender messageProducer; + + @SuppressWarnings("resource") + @Before + public void setUp() { + ApplicationContext applicationContext = new ClassPathXmlApplicationContext(new String[] { "classpath:EmbeddedActiveMQ.xml", "classpath:applicationContext.xml" }); + messageProducer = (SampleJmsMessageSender) applicationContext.getBean("SampleJmsMessageSender"); + } + + @Test + public void testSendMessage() { + messageProducer.sendMessage(new Employee("JavaDeveloper2", 22)); + } + +} From ca3e67fcd8da6a5ce90a34b1819e92159eaa2f3d Mon Sep 17 00:00:00 2001 From: Kiran Date: Sun, 9 Oct 2016 14:21:43 -0400 Subject: [PATCH 12/23] Changed @Before to @BeforeClass accordingly made the necessary methods staic --- .../spring/jms/DefaultTextMessageSenderTest.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/spring-jms/src/test/com/baeldung/spring/jms/DefaultTextMessageSenderTest.java b/spring-jms/src/test/com/baeldung/spring/jms/DefaultTextMessageSenderTest.java index 5176d79386..2016122105 100644 --- a/spring-jms/src/test/com/baeldung/spring/jms/DefaultTextMessageSenderTest.java +++ b/spring-jms/src/test/com/baeldung/spring/jms/DefaultTextMessageSenderTest.java @@ -1,6 +1,6 @@ package com.baeldung.spring.jms; -import org.junit.Before; +import org.junit.BeforeClass; import org.junit.Test; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; @@ -9,11 +9,11 @@ import com.baeldung.spring.jms.SampleJmsMessageSender; public class DefaultTextMessageSenderTest { - private SampleJmsMessageSender messageProducer; + private static SampleJmsMessageSender messageProducer; @SuppressWarnings("resource") - @Before - public void setUp() { + @BeforeClass + public static void setUp() { ApplicationContext applicationContext = new ClassPathXmlApplicationContext(new String[] { "classpath:EmbeddedActiveMQ.xml", "classpath:applicationContext.xml" }); messageProducer = (SampleJmsMessageSender) applicationContext.getBean("SampleJmsMessageSender"); } @@ -23,4 +23,4 @@ public class DefaultTextMessageSenderTest { messageProducer.simpleSend(); } -} \ No newline at end of file +} From 872654d54cbfd0768e7c36dcc8ab2634df5ec8aa Mon Sep 17 00:00:00 2001 From: Kiran Date: Sun, 9 Oct 2016 14:22:20 -0400 Subject: [PATCH 13/23] Changed @Before to @BeforeClass accordingly made the necessary methods staic --- .../baeldung/spring/jms/MapMessageConvertAndSendTest.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/spring-jms/src/test/com/baeldung/spring/jms/MapMessageConvertAndSendTest.java b/spring-jms/src/test/com/baeldung/spring/jms/MapMessageConvertAndSendTest.java index 4bd9827c60..19b9097601 100644 --- a/spring-jms/src/test/com/baeldung/spring/jms/MapMessageConvertAndSendTest.java +++ b/spring-jms/src/test/com/baeldung/spring/jms/MapMessageConvertAndSendTest.java @@ -1,6 +1,6 @@ package com.baeldung.spring.jms; -import org.junit.Before; +import org.junit.BeforeClass; import org.junit.Test; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; @@ -10,11 +10,11 @@ import com.baeldung.spring.jms.SampleJmsMessageSender; public class MapMessageConvertAndSendTest { - private SampleJmsMessageSender messageProducer; + private static SampleJmsMessageSender messageProducer; @SuppressWarnings("resource") - @Before - public void setUp() { + @BeforeClass + public static void setUp() { ApplicationContext applicationContext = new ClassPathXmlApplicationContext(new String[] { "classpath:EmbeddedActiveMQ.xml", "classpath:applicationContext.xml" }); messageProducer = (SampleJmsMessageSender) applicationContext.getBean("SampleJmsMessageSender"); } From 02a1c2d114f43604baaeeb0a52efabd063ea934f Mon Sep 17 00:00:00 2001 From: Grzegorz Piwowarek Date: Sun, 9 Oct 2016 20:36:41 +0200 Subject: [PATCH 14/23] Merge fix --- .../baeldung/spring/jms/DefaultTextMessageSenderTest.java | 3 +-- .../baeldung/spring/jms/MapMessageConvertAndSendTest.java | 5 ++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/spring-jms/src/test/com/baeldung/spring/jms/DefaultTextMessageSenderTest.java b/spring-jms/src/test/com/baeldung/spring/jms/DefaultTextMessageSenderTest.java index 2016122105..aceb551563 100644 --- a/spring-jms/src/test/com/baeldung/spring/jms/DefaultTextMessageSenderTest.java +++ b/spring-jms/src/test/com/baeldung/spring/jms/DefaultTextMessageSenderTest.java @@ -1,12 +1,11 @@ package com.baeldung.spring.jms; +import com.baeldung.spring.jms.SampleJmsMessageSender; import org.junit.BeforeClass; import org.junit.Test; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import com.baeldung.spring.jms.SampleJmsMessageSender; - public class DefaultTextMessageSenderTest { private static SampleJmsMessageSender messageProducer; diff --git a/spring-jms/src/test/com/baeldung/spring/jms/MapMessageConvertAndSendTest.java b/spring-jms/src/test/com/baeldung/spring/jms/MapMessageConvertAndSendTest.java index 19b9097601..d649938533 100644 --- a/spring-jms/src/test/com/baeldung/spring/jms/MapMessageConvertAndSendTest.java +++ b/spring-jms/src/test/com/baeldung/spring/jms/MapMessageConvertAndSendTest.java @@ -1,13 +1,12 @@ package com.baeldung.spring.jms; +import com.baeldung.spring.jms.Employee; +import com.baeldung.spring.jms.SampleJmsMessageSender; import org.junit.BeforeClass; import org.junit.Test; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import com.baeldung.spring.jms.Employee; -import com.baeldung.spring.jms.SampleJmsMessageSender; - public class MapMessageConvertAndSendTest { private static SampleJmsMessageSender messageProducer; From dd360db0605c335f0169817d94bfa59ff7641ddc Mon Sep 17 00:00:00 2001 From: Grzegorz Piwowarek Date: Sun, 9 Oct 2016 21:21:09 +0200 Subject: [PATCH 15/23] Refactor JMS examples --- spring-jms/pom.xml | 22 ++++++-- .../spring/jms/SampleJmsMessageSender.java | 19 ++----- .../baeldung/spring/jms/SampleListener.java | 8 ++- .../spring/jms/SampleMessageConverter.java | 9 ++-- .../jms/DefaultTextMessageSenderTest.java | 50 +++++++++--------- .../jms/MapMessageConvertAndSendTest.java | 51 +++++++++---------- 6 files changed, 81 insertions(+), 78 deletions(-) rename spring-jms/src/test/{ => java}/com/baeldung/spring/jms/DefaultTextMessageSenderTest.java (78%) rename spring-jms/src/test/{ => java}/com/baeldung/spring/jms/MapMessageConvertAndSendTest.java (75%) diff --git a/spring-jms/pom.xml b/spring-jms/pom.xml index 8f78469989..b15c18f991 100644 --- a/spring-jms/pom.xml +++ b/spring-jms/pom.xml @@ -26,6 +26,12 @@ activemq-all ${activemq.version} + + junit + junit + 4.12 + test + @@ -36,8 +42,8 @@ maven-compiler-plugin 3.2 - 1.7 - 1.7 + 1.8 + 1.8 @@ -52,6 +58,16 @@ - spring-jms + + + org.apache.maven.plugins + maven-compiler-plugin + + 1.8 + 1.8 + + + + spring-jms \ No newline at end of file diff --git a/spring-jms/src/main/java/com/baeldung/spring/jms/SampleJmsMessageSender.java b/spring-jms/src/main/java/com/baeldung/spring/jms/SampleJmsMessageSender.java index 8751b42ff8..1ef3902a31 100644 --- a/spring-jms/src/main/java/com/baeldung/spring/jms/SampleJmsMessageSender.java +++ b/spring-jms/src/main/java/com/baeldung/spring/jms/SampleJmsMessageSender.java @@ -1,16 +1,11 @@ package com.baeldung.spring.jms; +import org.springframework.jms.core.JmsTemplate; + +import javax.jms.Queue; import java.util.HashMap; import java.util.Map; -import javax.jms.JMSException; -import javax.jms.Message; -import javax.jms.Queue; -import javax.jms.Session; - -import org.springframework.jms.core.JmsTemplate; -import org.springframework.jms.core.MessageCreator; - public class SampleJmsMessageSender { private JmsTemplate jmsTemplate; @@ -25,16 +20,12 @@ public class SampleJmsMessageSender { } public void simpleSend() { - this.jmsTemplate.send(this.queue, new MessageCreator() { - public Message createMessage(Session session) throws JMSException { - return session.createTextMessage("hello queue world"); - } - }); + jmsTemplate.send(queue, s -> s.createTextMessage("hello queue world")); } public void sendMessage(final Employee employee) { System.out.println("Jms Message Sender : " + employee); - Map map = new HashMap(); + Map map = new HashMap<>(); map.put("name", employee.getName()); map.put("age", employee.getAge()); this.jmsTemplate.convertAndSend(map); diff --git a/spring-jms/src/main/java/com/baeldung/spring/jms/SampleListener.java b/spring-jms/src/main/java/com/baeldung/spring/jms/SampleListener.java index 3ad4d70829..eb9d51160d 100644 --- a/spring-jms/src/main/java/com/baeldung/spring/jms/SampleListener.java +++ b/spring-jms/src/main/java/com/baeldung/spring/jms/SampleListener.java @@ -1,13 +1,12 @@ package com.baeldung.spring.jms; -import java.util.Map; +import org.springframework.jms.core.JmsTemplate; import javax.jms.JMSException; import javax.jms.Message; import javax.jms.MessageListener; import javax.jms.TextMessage; - -import org.springframework.jms.core.JmsTemplate; +import java.util.Map; public class SampleListener implements MessageListener { @@ -31,7 +30,6 @@ public class SampleListener implements MessageListener { public Employee receiveMessage() throws JMSException { Map map = (Map) getJmsTemplate().receiveAndConvert(); - Employee employee = new Employee((String) map.get("name"), (Integer) map.get("age")); - return employee; + return new Employee((String) map.get("name"), (Integer) map.get("age")); } } diff --git a/spring-jms/src/main/java/com/baeldung/spring/jms/SampleMessageConverter.java b/spring-jms/src/main/java/com/baeldung/spring/jms/SampleMessageConverter.java index c61cd5bc89..368a62841f 100644 --- a/spring-jms/src/main/java/com/baeldung/spring/jms/SampleMessageConverter.java +++ b/spring-jms/src/main/java/com/baeldung/spring/jms/SampleMessageConverter.java @@ -1,13 +1,13 @@ package com.baeldung.spring.jms; +import org.springframework.jms.support.converter.MessageConversionException; +import org.springframework.jms.support.converter.MessageConverter; + import javax.jms.JMSException; import javax.jms.MapMessage; import javax.jms.Message; import javax.jms.Session; -import org.springframework.jms.support.converter.MessageConversionException; -import org.springframework.jms.support.converter.MessageConverter; - public class SampleMessageConverter implements MessageConverter { public Message toMessage(Object object, Session session) throws JMSException, MessageConversionException { @@ -20,8 +20,7 @@ public class SampleMessageConverter implements MessageConverter { public Object fromMessage(Message message) throws JMSException, MessageConversionException { MapMessage mapMessage = (MapMessage) message; - Employee employee = new Employee(mapMessage.getString("name"), mapMessage.getInt("age")); - return employee; + return new Employee(mapMessage.getString("name"), mapMessage.getInt("age")); } } diff --git a/spring-jms/src/test/com/baeldung/spring/jms/DefaultTextMessageSenderTest.java b/spring-jms/src/test/java/com/baeldung/spring/jms/DefaultTextMessageSenderTest.java similarity index 78% rename from spring-jms/src/test/com/baeldung/spring/jms/DefaultTextMessageSenderTest.java rename to spring-jms/src/test/java/com/baeldung/spring/jms/DefaultTextMessageSenderTest.java index aceb551563..439bc6caad 100644 --- a/spring-jms/src/test/com/baeldung/spring/jms/DefaultTextMessageSenderTest.java +++ b/spring-jms/src/test/java/com/baeldung/spring/jms/DefaultTextMessageSenderTest.java @@ -1,25 +1,25 @@ -package com.baeldung.spring.jms; - -import com.baeldung.spring.jms.SampleJmsMessageSender; -import org.junit.BeforeClass; -import org.junit.Test; -import org.springframework.context.ApplicationContext; -import org.springframework.context.support.ClassPathXmlApplicationContext; - -public class DefaultTextMessageSenderTest { - - private static SampleJmsMessageSender messageProducer; - - @SuppressWarnings("resource") - @BeforeClass - public static void setUp() { - ApplicationContext applicationContext = new ClassPathXmlApplicationContext(new String[] { "classpath:EmbeddedActiveMQ.xml", "classpath:applicationContext.xml" }); - messageProducer = (SampleJmsMessageSender) applicationContext.getBean("SampleJmsMessageSender"); - } - - @Test - public void testSimpleSend() { - messageProducer.simpleSend(); - } - -} +package com.baeldung.spring.jms; + +import org.junit.BeforeClass; +import org.junit.Test; +import org.springframework.context.ApplicationContext; +import org.springframework.context.support.ClassPathXmlApplicationContext; + +public class DefaultTextMessageSenderTest { + + private static SampleJmsMessageSender messageProducer; + + @SuppressWarnings("resource") + @BeforeClass + public static void setUp() { + ApplicationContext applicationContext = new ClassPathXmlApplicationContext( + "classpath:EmbeddedActiveMQ.xml", "classpath:applicationContext.xml"); + messageProducer = (SampleJmsMessageSender) applicationContext.getBean("SampleJmsMessageSender"); + } + + @Test + public void testSimpleSend() { + messageProducer.simpleSend(); + } + +} diff --git a/spring-jms/src/test/com/baeldung/spring/jms/MapMessageConvertAndSendTest.java b/spring-jms/src/test/java/com/baeldung/spring/jms/MapMessageConvertAndSendTest.java similarity index 75% rename from spring-jms/src/test/com/baeldung/spring/jms/MapMessageConvertAndSendTest.java rename to spring-jms/src/test/java/com/baeldung/spring/jms/MapMessageConvertAndSendTest.java index d649938533..da9bb0294d 100644 --- a/spring-jms/src/test/com/baeldung/spring/jms/MapMessageConvertAndSendTest.java +++ b/spring-jms/src/test/java/com/baeldung/spring/jms/MapMessageConvertAndSendTest.java @@ -1,26 +1,25 @@ -package com.baeldung.spring.jms; - -import com.baeldung.spring.jms.Employee; -import com.baeldung.spring.jms.SampleJmsMessageSender; -import org.junit.BeforeClass; -import org.junit.Test; -import org.springframework.context.ApplicationContext; -import org.springframework.context.support.ClassPathXmlApplicationContext; - -public class MapMessageConvertAndSendTest { - - private static SampleJmsMessageSender messageProducer; - - @SuppressWarnings("resource") - @BeforeClass - public static void setUp() { - ApplicationContext applicationContext = new ClassPathXmlApplicationContext(new String[] { "classpath:EmbeddedActiveMQ.xml", "classpath:applicationContext.xml" }); - messageProducer = (SampleJmsMessageSender) applicationContext.getBean("SampleJmsMessageSender"); - } - - @Test - public void testSendMessage() { - messageProducer.sendMessage(new Employee("JavaDeveloper2", 22)); - } - -} +package com.baeldung.spring.jms; + +import org.junit.BeforeClass; +import org.junit.Test; +import org.springframework.context.ApplicationContext; +import org.springframework.context.support.ClassPathXmlApplicationContext; + +public class MapMessageConvertAndSendTest { + + private static SampleJmsMessageSender messageProducer; + + @SuppressWarnings("resource") + @BeforeClass + public static void setUp() { + ApplicationContext applicationContext = new ClassPathXmlApplicationContext( + "classpath:EmbeddedActiveMQ.xml", "classpath:applicationContext.xml"); + messageProducer = (SampleJmsMessageSender) applicationContext.getBean("SampleJmsMessageSender"); + } + + @Test + public void testSendMessage() { + messageProducer.sendMessage(new Employee("JavaDeveloper2", 22)); + } + +} From 423dc63cdd0f3f5bb214f04432abf2fda5b2f2d0 Mon Sep 17 00:00:00 2001 From: slavisa-baeldung Date: Mon, 10 Oct 2016 00:34:11 +0200 Subject: [PATCH 16/23] BAEL-226 - Source code for wicket --- .../wicket/examples/{Examples.html => HelloWorld.html} | 0 .../wicket/examples/{Examples.java => HelloWorld.java} | 2 +- ...{ExamplesApplication.java => HelloWorldApplication.java} | 5 ++--- .../java/com/baeldung/wicket/examples/TestHomePage.java | 6 +++--- wicket/src/main/webapp/WEB-INF/web.xml | 2 +- 5 files changed, 7 insertions(+), 8 deletions(-) rename wicket/src/main/java/com/baeldung/wicket/examples/{Examples.html => HelloWorld.html} (100%) rename wicket/src/main/java/com/baeldung/wicket/examples/{Examples.java => HelloWorld.java} (77%) rename wicket/src/main/java/com/baeldung/wicket/examples/{ExamplesApplication.java => HelloWorldApplication.java} (80%) diff --git a/wicket/src/main/java/com/baeldung/wicket/examples/Examples.html b/wicket/src/main/java/com/baeldung/wicket/examples/HelloWorld.html similarity index 100% rename from wicket/src/main/java/com/baeldung/wicket/examples/Examples.html rename to wicket/src/main/java/com/baeldung/wicket/examples/HelloWorld.html diff --git a/wicket/src/main/java/com/baeldung/wicket/examples/Examples.java b/wicket/src/main/java/com/baeldung/wicket/examples/HelloWorld.java similarity index 77% rename from wicket/src/main/java/com/baeldung/wicket/examples/Examples.java rename to wicket/src/main/java/com/baeldung/wicket/examples/HelloWorld.java index 358e4f7b19..ceb0836467 100644 --- a/wicket/src/main/java/com/baeldung/wicket/examples/Examples.java +++ b/wicket/src/main/java/com/baeldung/wicket/examples/HelloWorld.java @@ -2,7 +2,7 @@ package com.baeldung.wicket.examples; import org.apache.wicket.markup.html.WebPage; -public class Examples extends WebPage { +public class HelloWorld extends WebPage { private static final long serialVersionUID = 1L; diff --git a/wicket/src/main/java/com/baeldung/wicket/examples/ExamplesApplication.java b/wicket/src/main/java/com/baeldung/wicket/examples/HelloWorldApplication.java similarity index 80% rename from wicket/src/main/java/com/baeldung/wicket/examples/ExamplesApplication.java rename to wicket/src/main/java/com/baeldung/wicket/examples/HelloWorldApplication.java index 711e8f01fd..079280adce 100644 --- a/wicket/src/main/java/com/baeldung/wicket/examples/ExamplesApplication.java +++ b/wicket/src/main/java/com/baeldung/wicket/examples/HelloWorldApplication.java @@ -4,15 +4,14 @@ import org.apache.wicket.markup.html.WebPage; import org.apache.wicket.protocol.http.WebApplication; import com.baeldung.wicket.examples.cafeaddress.CafeAddress; -import com.baeldung.wicket.examples.helloworld.HelloWorld; -public class ExamplesApplication extends WebApplication { +public class HelloWorldApplication extends WebApplication { /** * @see org.apache.wicket.Application#getHomePage() */ @Override public Class getHomePage() { - return Examples.class; + return HelloWorld.class; } /** diff --git a/wicket/src/main/test/java/com/baeldung/wicket/examples/TestHomePage.java b/wicket/src/main/test/java/com/baeldung/wicket/examples/TestHomePage.java index a393f1d178..7015ffd255 100644 --- a/wicket/src/main/test/java/com/baeldung/wicket/examples/TestHomePage.java +++ b/wicket/src/main/test/java/com/baeldung/wicket/examples/TestHomePage.java @@ -9,15 +9,15 @@ public class TestHomePage { @Before public void setUp() { - tester = new WicketTester(new ExamplesApplication()); + tester = new WicketTester(new HelloWorldApplication()); } @Test public void whenPageInvoked_thanRenderedOK() { //start and render the test page - tester.startPage(Examples.class); + tester.startPage(HelloWorld.class); //assert rendered page class - tester.assertRenderedPage(Examples.class); + tester.assertRenderedPage(HelloWorld.class); } } diff --git a/wicket/src/main/webapp/WEB-INF/web.xml b/wicket/src/main/webapp/WEB-INF/web.xml index 8a4451c80e..8fc1b1aa95 100644 --- a/wicket/src/main/webapp/WEB-INF/web.xml +++ b/wicket/src/main/webapp/WEB-INF/web.xml @@ -21,7 +21,7 @@ org.apache.wicket.protocol.http.WicketFilter applicationClassName - com.baeldung.wicket.examples.ExamplesApplication + com.baeldung.wicket.examples.HelloWorldApplication From b8161aca1a5a9b46931c11b1dabaa5ebb0a009af Mon Sep 17 00:00:00 2001 From: maverick Date: Mon, 10 Oct 2016 08:14:51 +0530 Subject: [PATCH 17/23] Java sorting. Adding required files. This is commit for starting from new fork due to conflicts in PR. --- .../org/baeldung/java/sorting/Employee.java | 58 +++++ .../baeldung/java/sorting/JavaSorting.java | 211 ++++++++++++++++++ 2 files changed, 269 insertions(+) create mode 100644 core-java/src/test/java/org/baeldung/java/sorting/Employee.java create mode 100644 core-java/src/test/java/org/baeldung/java/sorting/JavaSorting.java diff --git a/core-java/src/test/java/org/baeldung/java/sorting/Employee.java b/core-java/src/test/java/org/baeldung/java/sorting/Employee.java new file mode 100644 index 0000000000..c48cdd91a8 --- /dev/null +++ b/core-java/src/test/java/org/baeldung/java/sorting/Employee.java @@ -0,0 +1,58 @@ +package org.baeldung.java.sorting; + +public class Employee implements Comparable { + private String name; + private int age; + private double salary; + + public Employee() { + } + + public Employee(String name, int age, double salary) { + super(); + this.name = name; + this.age = age; + this.salary = salary; + } + + 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; + } + + public double getSalary() { + return salary; + } + + public void setSalary(double salary) { + this.salary = salary; + } + + @Override + public String toString() { + return "(" + name + "," + age + "," + salary + ")"; + + } + + @Override + public boolean equals(Object obj) { + return ((Employee) obj).getName().equals(getName()); + } + + @Override + public int compareTo(Object o) { + Employee e = (Employee) o; + return getName().compareTo(e.getName()); + } +} diff --git a/core-java/src/test/java/org/baeldung/java/sorting/JavaSorting.java b/core-java/src/test/java/org/baeldung/java/sorting/JavaSorting.java new file mode 100644 index 0000000000..54d58dc87c --- /dev/null +++ b/core-java/src/test/java/org/baeldung/java/sorting/JavaSorting.java @@ -0,0 +1,211 @@ +package org.baeldung.java.sorting; + +import static org.junit.Assert.assertTrue; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.Comparator; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedHashMap; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; + +import org.junit.Test; + +public class JavaSorting { + + @Test + public void givenIntArray_whenUsingSort_thenSortedArray() { + int [] numbers = new int[] { 5, 1, 89, 255, 7, 88, 200, 123, 66 }, + sortedInts = {1, 5, 7, 66, 88, 89, 123, 200, 255}; + + Arrays.sort(numbers); + + assertTrue(Arrays.equals(numbers, sortedInts)); + } + + @Test + public void givenIntegerArray_whenUsingSort_thenSortedArray() { + Integer[] integers = new Integer[] + { 5, 1, 89, 255, 7, 88, 200, 123, 66 }, + sortedIntegers = {1, 5, 7, 66, 88, 89, 123, 200, 255}; + + + Arrays.sort(integers, new Comparator() { + @Override + public int compare(Integer a, Integer b) { + return a - b; + } + }); + + assertTrue(Arrays.equals(integers, sortedIntegers)); + } + + @Test + public void givenArray_whenUsingSortWithLambdas_thenSortedArray() { + Integer[] integers = new Integer[] + { 5, 1, 89, 255, 7, 88, 200, 123, 66 }, + sortedIntegers = {1, 5, 7, 66, 88, 89, 123, 200, 255}; + + Arrays.sort(integers, (a, b) -> { + return a - b; + }); + + assertTrue(Arrays.equals(integers, sortedIntegers)); + } + + @Test + public void givenEmpArray_SortEmpArray_thenSortedArrayinNaturalOrder() { + Employee[] employees = new Employee[] { + new Employee("John", 23, 5000), + new Employee("Steve", 26, 6000), + new Employee("Frank", 33, 7000), + new Employee("Earl", 43, 10000), + new Employee("Jessica", 23, 4000), + new Employee("Pearl", 33, 6000)}; + Employee[] employeesSorted = new Employee[] { + new Employee("Earl", 43, 10000), + new Employee("Frank", 33, 70000), + new Employee("Jessica", 23, 4000), + new Employee("John", 23, 5000), + new Employee("Pearl", 33, 4000), + new Employee("Steve", 26, 6000)}; + + Arrays.sort(employees); + + assertTrue(Arrays.equals(employees, employeesSorted)); + } + + + @Test + public void givenIntArray_whenUsingRangeSort_thenRangeSortedArray() { + int [] numbers = new int[] { 5, 1, 89, 255, 7, 88, 200, 123, 66 }, + sortedRangeInts = {5, 1, 89, 7, 88, 200, 255, 123, 66}; + + Arrays.sort(numbers, 3, 7); + + assertTrue(Arrays.equals(numbers, sortedRangeInts)); + } + + @Test + public void givenIntArray_whenUsingParallelSort_thenParallelSortedArray() { + int [] numbers = new int[] { 5, 1, 89, 255, 7, 88, 200, 123, 66 }, + sortedInts = {1, 5, 7, 66, 88, 89, 123, 200, 255}; + + Arrays.parallelSort(numbers); + + assertTrue(Arrays.equals(numbers, sortedInts)); + } + + + + @Test + public void givenArrayObjects_whenUsingComparing_thenSortedArrayObjects() { + List employees = Arrays.asList(new Employee[] { new Employee("John", 23, 5000), + new Employee("Steve", 26, 6000), new Employee("Frank", 33, 7000), + new Employee("Earl", 43, 10000), new Employee("Jessica", 23, 4000), + new Employee("Pearl", 33, 6000) }); + Employee[] employeesSorted = new Employee[] { + new Employee("John", 23, 5000), + new Employee("Jessica", 23, 4000), + new Employee("Steve", 26, 6000), + new Employee("Frank", 33, 70000), + new Employee("Pearl", 33, 4000), + new Employee("Earl", 43, 10000)}; + + employees.sort(Comparator.comparing(Employee::getAge));//.thenComparing(Employee::getName)); + + assertTrue(Arrays.equals(employees.toArray(), employeesSorted)); + } + + @Test + public void givenList_whenUsingSort_thenSortedList() { + List integers = Arrays.asList(new Integer[] { 5, 1, 89, 255, 7, 88, 200, 123, 66 }), + sortedIntegers = Arrays.asList(new Integer[] {1, 5, 7, 66, 88, 89, 123, 200, 255}); + + Collections.sort(integers); + + assertTrue(Arrays.equals(integers.toArray(), sortedIntegers.toArray())); + } + + @Test + public void givenMap_whenSortingByKeys_thenSortedMap() { + HashMap map = new HashMap<>(); + map.put(55, "John"); + map.put(22, "Apple"); + map.put(66, "Earl"); + map.put(77, "Pearl"); + map.put(12, "George"); + map.put(6, "Rocky"); + Integer[] sortedKeys = new Integer[] { 6, 12, 22, 55, 66, 77 }; + + List> entries = new ArrayList<>(map.entrySet()); + Collections.sort(entries, new Comparator>() { + @Override + public int compare(Entry o1, Entry o2) { + return o1.getKey().compareTo(o2.getKey()); + } + }); + HashMap sortedMap = new LinkedHashMap<>(); + for (Map.Entry entry : entries) { + sortedMap.put(entry.getKey(), entry.getValue()); + } + + assertTrue(Arrays.equals(sortedMap.keySet().toArray(), sortedKeys)); + } + + @Test + public void givenMap_whenSortingByValues_thenSortedMap() { + HashMap map = new HashMap<>(); + map.put(55, "John"); + map.put(22, "Apple"); + map.put(66, "Earl"); + map.put(77, "Pearl"); + map.put(12, "George"); + map.put(6, "Rocky"); + String[] sortedValues = new String[] + { "Apple", "Earl", "George", "John", "Pearl", "Rocky" }; + + List> entries = new ArrayList<>(map.entrySet()); + Collections.sort(entries, new Comparator>() { + @Override + public int compare(Entry o1, Entry o2) { + return o1.getValue().compareTo(o2.getValue()); + } + }); + HashMap sortedMap = new LinkedHashMap<>(); + for (Map.Entry entry : entries) { + sortedMap.put(entry.getKey(), entry.getValue()); + } + + assertTrue(Arrays.equals(sortedMap.values().toArray(), sortedValues)); + } + + + + + + + @Test + public void givenSet_whenUsingSort_thenSortedSet() { + HashSet integers = new LinkedHashSet<>(Arrays.asList(new Integer[] + { 5, 1, 89, 255, 7, 88, 200, 123, 66 })), + sortedIntegers = new LinkedHashSet<>(Arrays.asList(new Integer[] + {255, 200, 123, 89, 88, 66, 7, 5, 1})); + + ArrayList list = new ArrayList(integers); + Collections.sort(list, (i1, i2) -> { + return i2 - i1; + }); + integers = new LinkedHashSet<>(list); + + assertTrue(Arrays.equals(integers.toArray(), sortedIntegers.toArray())); + } + + + +} From 9f3c791d99dc3550f8330fc1f5fcbd9f7dfb9883 Mon Sep 17 00:00:00 2001 From: maverick Date: Mon, 10 Oct 2016 08:30:54 +0530 Subject: [PATCH 18/23] Added files missed in earlier PR --- core-java/src/test/resources/test_md5.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 core-java/src/test/resources/test_md5.txt diff --git a/core-java/src/test/resources/test_md5.txt b/core-java/src/test/resources/test_md5.txt new file mode 100644 index 0000000000..95d09f2b10 --- /dev/null +++ b/core-java/src/test/resources/test_md5.txt @@ -0,0 +1 @@ +hello world \ No newline at end of file From 6df151a3f98950940ea4a8de491eb09fb6f976ab Mon Sep 17 00:00:00 2001 From: maverick Date: Mon, 10 Oct 2016 08:32:51 +0530 Subject: [PATCH 19/23] Removes Sorting changes for this PR --- .../org/baeldung/java/sorting/Employee.java | 58 ----- .../baeldung/java/sorting/JavaSorting.java | 211 ------------------ 2 files changed, 269 deletions(-) delete mode 100644 core-java/src/test/java/org/baeldung/java/sorting/Employee.java delete mode 100644 core-java/src/test/java/org/baeldung/java/sorting/JavaSorting.java diff --git a/core-java/src/test/java/org/baeldung/java/sorting/Employee.java b/core-java/src/test/java/org/baeldung/java/sorting/Employee.java deleted file mode 100644 index c48cdd91a8..0000000000 --- a/core-java/src/test/java/org/baeldung/java/sorting/Employee.java +++ /dev/null @@ -1,58 +0,0 @@ -package org.baeldung.java.sorting; - -public class Employee implements Comparable { - private String name; - private int age; - private double salary; - - public Employee() { - } - - public Employee(String name, int age, double salary) { - super(); - this.name = name; - this.age = age; - this.salary = salary; - } - - 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; - } - - public double getSalary() { - return salary; - } - - public void setSalary(double salary) { - this.salary = salary; - } - - @Override - public String toString() { - return "(" + name + "," + age + "," + salary + ")"; - - } - - @Override - public boolean equals(Object obj) { - return ((Employee) obj).getName().equals(getName()); - } - - @Override - public int compareTo(Object o) { - Employee e = (Employee) o; - return getName().compareTo(e.getName()); - } -} diff --git a/core-java/src/test/java/org/baeldung/java/sorting/JavaSorting.java b/core-java/src/test/java/org/baeldung/java/sorting/JavaSorting.java deleted file mode 100644 index 54d58dc87c..0000000000 --- a/core-java/src/test/java/org/baeldung/java/sorting/JavaSorting.java +++ /dev/null @@ -1,211 +0,0 @@ -package org.baeldung.java.sorting; - -import static org.junit.Assert.assertTrue; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.Comparator; -import java.util.HashMap; -import java.util.HashSet; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; - -import org.junit.Test; - -public class JavaSorting { - - @Test - public void givenIntArray_whenUsingSort_thenSortedArray() { - int [] numbers = new int[] { 5, 1, 89, 255, 7, 88, 200, 123, 66 }, - sortedInts = {1, 5, 7, 66, 88, 89, 123, 200, 255}; - - Arrays.sort(numbers); - - assertTrue(Arrays.equals(numbers, sortedInts)); - } - - @Test - public void givenIntegerArray_whenUsingSort_thenSortedArray() { - Integer[] integers = new Integer[] - { 5, 1, 89, 255, 7, 88, 200, 123, 66 }, - sortedIntegers = {1, 5, 7, 66, 88, 89, 123, 200, 255}; - - - Arrays.sort(integers, new Comparator() { - @Override - public int compare(Integer a, Integer b) { - return a - b; - } - }); - - assertTrue(Arrays.equals(integers, sortedIntegers)); - } - - @Test - public void givenArray_whenUsingSortWithLambdas_thenSortedArray() { - Integer[] integers = new Integer[] - { 5, 1, 89, 255, 7, 88, 200, 123, 66 }, - sortedIntegers = {1, 5, 7, 66, 88, 89, 123, 200, 255}; - - Arrays.sort(integers, (a, b) -> { - return a - b; - }); - - assertTrue(Arrays.equals(integers, sortedIntegers)); - } - - @Test - public void givenEmpArray_SortEmpArray_thenSortedArrayinNaturalOrder() { - Employee[] employees = new Employee[] { - new Employee("John", 23, 5000), - new Employee("Steve", 26, 6000), - new Employee("Frank", 33, 7000), - new Employee("Earl", 43, 10000), - new Employee("Jessica", 23, 4000), - new Employee("Pearl", 33, 6000)}; - Employee[] employeesSorted = new Employee[] { - new Employee("Earl", 43, 10000), - new Employee("Frank", 33, 70000), - new Employee("Jessica", 23, 4000), - new Employee("John", 23, 5000), - new Employee("Pearl", 33, 4000), - new Employee("Steve", 26, 6000)}; - - Arrays.sort(employees); - - assertTrue(Arrays.equals(employees, employeesSorted)); - } - - - @Test - public void givenIntArray_whenUsingRangeSort_thenRangeSortedArray() { - int [] numbers = new int[] { 5, 1, 89, 255, 7, 88, 200, 123, 66 }, - sortedRangeInts = {5, 1, 89, 7, 88, 200, 255, 123, 66}; - - Arrays.sort(numbers, 3, 7); - - assertTrue(Arrays.equals(numbers, sortedRangeInts)); - } - - @Test - public void givenIntArray_whenUsingParallelSort_thenParallelSortedArray() { - int [] numbers = new int[] { 5, 1, 89, 255, 7, 88, 200, 123, 66 }, - sortedInts = {1, 5, 7, 66, 88, 89, 123, 200, 255}; - - Arrays.parallelSort(numbers); - - assertTrue(Arrays.equals(numbers, sortedInts)); - } - - - - @Test - public void givenArrayObjects_whenUsingComparing_thenSortedArrayObjects() { - List employees = Arrays.asList(new Employee[] { new Employee("John", 23, 5000), - new Employee("Steve", 26, 6000), new Employee("Frank", 33, 7000), - new Employee("Earl", 43, 10000), new Employee("Jessica", 23, 4000), - new Employee("Pearl", 33, 6000) }); - Employee[] employeesSorted = new Employee[] { - new Employee("John", 23, 5000), - new Employee("Jessica", 23, 4000), - new Employee("Steve", 26, 6000), - new Employee("Frank", 33, 70000), - new Employee("Pearl", 33, 4000), - new Employee("Earl", 43, 10000)}; - - employees.sort(Comparator.comparing(Employee::getAge));//.thenComparing(Employee::getName)); - - assertTrue(Arrays.equals(employees.toArray(), employeesSorted)); - } - - @Test - public void givenList_whenUsingSort_thenSortedList() { - List integers = Arrays.asList(new Integer[] { 5, 1, 89, 255, 7, 88, 200, 123, 66 }), - sortedIntegers = Arrays.asList(new Integer[] {1, 5, 7, 66, 88, 89, 123, 200, 255}); - - Collections.sort(integers); - - assertTrue(Arrays.equals(integers.toArray(), sortedIntegers.toArray())); - } - - @Test - public void givenMap_whenSortingByKeys_thenSortedMap() { - HashMap map = new HashMap<>(); - map.put(55, "John"); - map.put(22, "Apple"); - map.put(66, "Earl"); - map.put(77, "Pearl"); - map.put(12, "George"); - map.put(6, "Rocky"); - Integer[] sortedKeys = new Integer[] { 6, 12, 22, 55, 66, 77 }; - - List> entries = new ArrayList<>(map.entrySet()); - Collections.sort(entries, new Comparator>() { - @Override - public int compare(Entry o1, Entry o2) { - return o1.getKey().compareTo(o2.getKey()); - } - }); - HashMap sortedMap = new LinkedHashMap<>(); - for (Map.Entry entry : entries) { - sortedMap.put(entry.getKey(), entry.getValue()); - } - - assertTrue(Arrays.equals(sortedMap.keySet().toArray(), sortedKeys)); - } - - @Test - public void givenMap_whenSortingByValues_thenSortedMap() { - HashMap map = new HashMap<>(); - map.put(55, "John"); - map.put(22, "Apple"); - map.put(66, "Earl"); - map.put(77, "Pearl"); - map.put(12, "George"); - map.put(6, "Rocky"); - String[] sortedValues = new String[] - { "Apple", "Earl", "George", "John", "Pearl", "Rocky" }; - - List> entries = new ArrayList<>(map.entrySet()); - Collections.sort(entries, new Comparator>() { - @Override - public int compare(Entry o1, Entry o2) { - return o1.getValue().compareTo(o2.getValue()); - } - }); - HashMap sortedMap = new LinkedHashMap<>(); - for (Map.Entry entry : entries) { - sortedMap.put(entry.getKey(), entry.getValue()); - } - - assertTrue(Arrays.equals(sortedMap.values().toArray(), sortedValues)); - } - - - - - - - @Test - public void givenSet_whenUsingSort_thenSortedSet() { - HashSet integers = new LinkedHashSet<>(Arrays.asList(new Integer[] - { 5, 1, 89, 255, 7, 88, 200, 123, 66 })), - sortedIntegers = new LinkedHashSet<>(Arrays.asList(new Integer[] - {255, 200, 123, 89, 88, 66, 7, 5, 1})); - - ArrayList list = new ArrayList(integers); - Collections.sort(list, (i1, i2) -> { - return i2 - i1; - }); - integers = new LinkedHashSet<>(list); - - assertTrue(Arrays.equals(integers.toArray(), sortedIntegers.toArray())); - } - - - -} From 687b7e0044d3ec8ace6921e5ccdac3a84a8e6362 Mon Sep 17 00:00:00 2001 From: Grzegorz Piwowarek Date: Mon, 10 Oct 2016 06:46:31 +0200 Subject: [PATCH 20/23] Refactor Wicket examples --- .../examples/cafeaddress/CafeAddress.java | 33 ++++++++----------- .../examples/helloworld/HelloWorld.java | 3 -- 2 files changed, 14 insertions(+), 22 deletions(-) diff --git a/wicket/src/main/java/com/baeldung/wicket/examples/cafeaddress/CafeAddress.java b/wicket/src/main/java/com/baeldung/wicket/examples/cafeaddress/CafeAddress.java index ce26c5a1ad..86820393c7 100644 --- a/wicket/src/main/java/com/baeldung/wicket/examples/cafeaddress/CafeAddress.java +++ b/wicket/src/main/java/com/baeldung/wicket/examples/cafeaddress/CafeAddress.java @@ -1,10 +1,5 @@ package com.baeldung.wicket.examples.cafeaddress; -import java.io.Serializable; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Map; - import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior; import org.apache.wicket.markup.html.WebPage; @@ -13,29 +8,29 @@ import org.apache.wicket.markup.html.form.DropDownChoice; import org.apache.wicket.model.PropertyModel; import org.apache.wicket.request.mapper.parameter.PageParameters; +import java.io.Serializable; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Map; + public class CafeAddress extends WebPage { - - private static final long serialVersionUID = 1L; - - String selectedCafe; - Address address; - Map cafeNamesAndAddresses = new HashMap<>(); + private String selectedCafe; + private Address address; + private Map cafeNamesAndAddresses = new HashMap<>(); public CafeAddress(final PageParameters parameters) { super(parameters); initCafes(); - ArrayList cafeNames = new ArrayList<>(this.cafeNamesAndAddresses.keySet()); - this.selectedCafe = cafeNames.get(0); - this.address = new Address(this.cafeNamesAndAddresses.get(this.selectedCafe).getAddress()); + ArrayList cafeNames = new ArrayList<>(cafeNamesAndAddresses.keySet()); + selectedCafe = cafeNames.get(0); + address = new Address(cafeNamesAndAddresses.get(selectedCafe).getAddress()); final Label addressLabel = new Label("address", new PropertyModel(this.address, "address")); addressLabel.setOutputMarkupId(true); - final DropDownChoice cafeDropdown = new DropDownChoice<>("cafes", new PropertyModel(this, "selectedCafe"), cafeNames); + final DropDownChoice cafeDropdown = new DropDownChoice<>("cafes", new PropertyModel<>(this, "selectedCafe"), cafeNames); cafeDropdown.add(new AjaxFormComponentUpdatingBehavior("onchange") { - private static final long serialVersionUID = 1L; - @Override protected void onUpdate(AjaxRequestTarget target) { String name = (String) cafeDropdown.getDefaultModel().getObject(); @@ -61,11 +56,11 @@ public class CafeAddress extends WebPage { this.sAddress = address; } - public String getAddress() { + String getAddress() { return this.sAddress; } - public void setAddress(String address) { + void setAddress(String address) { this.sAddress = address; } } diff --git a/wicket/src/main/java/com/baeldung/wicket/examples/helloworld/HelloWorld.java b/wicket/src/main/java/com/baeldung/wicket/examples/helloworld/HelloWorld.java index f819e05be6..6dc7295798 100644 --- a/wicket/src/main/java/com/baeldung/wicket/examples/helloworld/HelloWorld.java +++ b/wicket/src/main/java/com/baeldung/wicket/examples/helloworld/HelloWorld.java @@ -4,9 +4,6 @@ import org.apache.wicket.markup.html.WebPage; import org.apache.wicket.markup.html.basic.Label; public class HelloWorld extends WebPage { - - private static final long serialVersionUID = 1L; - public HelloWorld() { add(new Label("hello", "Hello World!")); } From 9da1680d0f618f1f788d0d8e5fb5006d7b843fab Mon Sep 17 00:00:00 2001 From: Grzegorz Piwowarek Date: Mon, 10 Oct 2016 07:09:47 +0200 Subject: [PATCH 21/23] Refactor readFromInputStream --- .../com/baeldung/file/FileOperationsTest.java | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/core-java-8/src/test/java/com/baeldung/file/FileOperationsTest.java b/core-java-8/src/test/java/com/baeldung/file/FileOperationsTest.java index 3752fc5b7f..1e4f23745c 100644 --- a/core-java-8/src/test/java/com/baeldung/file/FileOperationsTest.java +++ b/core-java-8/src/test/java/com/baeldung/file/FileOperationsTest.java @@ -107,17 +107,14 @@ public class FileOperationsTest { } private String readFromInputStream(InputStream inputStream) throws IOException { - InputStreamReader inputStreamReader = new InputStreamReader(inputStream); - BufferedReader bufferedReader = new BufferedReader(inputStreamReader); StringBuilder resultStringBuilder = new StringBuilder(); - String line; - while ((line = bufferedReader.readLine()) != null) { - resultStringBuilder.append(line); - resultStringBuilder.append("\n"); + try (BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(inputStream))) { + String line; + while ((line = bufferedReader.readLine()) != null) { + resultStringBuilder.append(line); + resultStringBuilder.append("\n"); + } } - bufferedReader.close(); - inputStreamReader.close(); - inputStream.close(); return resultStringBuilder.toString(); } } \ No newline at end of file From fa1fc3cbe7b5509a7147ea8d1c210d6eb8c3c187 Mon Sep 17 00:00:00 2001 From: Grzegorz Piwowarek Date: Mon, 10 Oct 2016 07:11:06 +0200 Subject: [PATCH 22/23] Refactor readFromInputStream --- .../src/test/java/com/baeldung/file/FileOperationsTest.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/core-java-8/src/test/java/com/baeldung/file/FileOperationsTest.java b/core-java-8/src/test/java/com/baeldung/file/FileOperationsTest.java index 1e4f23745c..30f6fc713f 100644 --- a/core-java-8/src/test/java/com/baeldung/file/FileOperationsTest.java +++ b/core-java-8/src/test/java/com/baeldung/file/FileOperationsTest.java @@ -111,8 +111,7 @@ public class FileOperationsTest { try (BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(inputStream))) { String line; while ((line = bufferedReader.readLine()) != null) { - resultStringBuilder.append(line); - resultStringBuilder.append("\n"); + resultStringBuilder.append(line).append("\n"); } } return resultStringBuilder.toString(); From 94fd47d9bb96fe7cb69f5db3b3222a1df049b397 Mon Sep 17 00:00:00 2001 From: Egima profile Date: Mon, 10 Oct 2016 11:14:19 +0300 Subject: [PATCH 23/23] Added test suite, removed bad names (#732) * made changes to java reflection * removed redundant method makeSound in Animal abstract class * added project for play-framework article * added project for regex * changed regex project from own model to core-java * added project for routing in play * made changes to regex project * refactored code for REST API with Play project * refactored student store indexing to zero base * added unit tests, removed bad names --- .../student-api/test/ApplicationTest.java | 203 ++++++++++++++---- .../student-api/test/IntegrationTest.java | 25 --- 2 files changed, 165 insertions(+), 63 deletions(-) delete mode 100644 play-framework/student-api/test/IntegrationTest.java diff --git a/play-framework/student-api/test/ApplicationTest.java b/play-framework/student-api/test/ApplicationTest.java index 3d7c4875aa..1133978e9a 100644 --- a/play-framework/student-api/test/ApplicationTest.java +++ b/play-framework/student-api/test/ApplicationTest.java @@ -1,45 +1,172 @@ -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import com.fasterxml.jackson.databind.JsonNode; -import org.junit.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; -import play.mvc.*; +import java.io.BufferedReader; +import java.io.DataOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.net.HttpURLConnection; +import java.net.MalformedURLException; +import java.net.URL; +import java.util.Arrays; + +import org.json.JSONArray; +import org.json.JSONObject; +import org.junit.Before; +import org.junit.Test; +import model.Student; import play.test.*; -import play.data.DynamicForm; -import play.data.validation.ValidationError; -import play.data.validation.Constraints.RequiredValidator; -import play.i18n.Lang; -import play.libs.F; -import play.libs.F.*; -import play.twirl.api.Content; - import static play.test.Helpers.*; -import static org.junit.Assert.*; - - -/** - * - * Simple (JUnit) tests that can call all parts of a play app. - * If you are interested in mocking a whole application, see the wiki for more details. - * - */ -public class ApplicationTest { - - @Test - public void simpleCheck() { - int a = 1 + 1; - assertEquals(2, a); - } - - @Test - public void renderTemplate() { - Content html = views.html.index.render("Your new application is ready."); - assertEquals("text/html", html.contentType()); - assertTrue(html.body().contains("Your new application is ready.")); - } +public class ApplicationTest{ + private static final String BASE_URL = "http://localhost:9000"; + @Test +public void testInServer() throws Exception { + TestServer server = testServer(3333); + running(server, () -> { + try { + WSClient ws = play.libs.ws.WS.newClient(3333); + CompletionStage completionStage = ws.url("/").get(); + WSResponse response = completionStage.toCompletableFuture().get(); + ws.close(); + assertEquals(OK, response.getStatus()); + } catch (Exception e) { + logger.error(e.getMessage(), e); + } + }); +} + @Test + public void whenCreatesRecord_thenCorrect() { + Student student = new Student("jody", "west", 50); + JSONObject obj = new JSONObject(makeRequest(BASE_URL, "POST", new JSONObject(student))); + assertTrue(obj.getBoolean("isSuccessfull")); + JSONObject body = obj.getJSONObject("body"); + assertEquals(student.getAge(), body.getInt("age")); + assertEquals(student.getFirstName(), body.getString("firstName")); + assertEquals(student.getLastName(), body.getString("lastName")); + } + + @Test + public void whenDeletesCreatedRecord_thenCorrect() { + Student student = new Student("Usain", "Bolt", 25); + JSONObject ob1 = new JSONObject(makeRequest(BASE_URL, "POST", new JSONObject(student))).getJSONObject("body"); + int id = ob1.getInt("id"); + JSONObject obj1 = new JSONObject(makeRequest(BASE_URL + "/" + id, "POST", new JSONObject())); + assertTrue(obj1.getBoolean("isSuccessfull")); + makeRequest(BASE_URL + "/" + id, "DELETE", null); + JSONObject obj2 = new JSONObject(makeRequest(BASE_URL + "/" + id, "POST", new JSONObject())); + assertFalse(obj2.getBoolean("isSuccessfull")); + } + + @Test + public void whenUpdatesCreatedRecord_thenCorrect() { + Student student = new Student("john", "doe", 50); + JSONObject body1 = new JSONObject(makeRequest(BASE_URL, "POST", new JSONObject(student))).getJSONObject("body"); + assertEquals(student.getAge(), body1.getInt("age")); + int newAge = 60; + body1.put("age", newAge); + JSONObject body2 = new JSONObject(makeRequest(BASE_URL, "PUT", body1)).getJSONObject("body"); + assertFalse(student.getAge() == body2.getInt("age")); + assertTrue(newAge == body2.getInt("age")); + } + + @Test + public void whenGetsAllRecords_thenCorrect() { + Student student1 = new Student("jane", "daisy", 50); + Student student2 = new Student("john", "daniel", 60); + Student student3 = new Student("don", "mason", 55); + Student student4 = new Student("scarlet", "ohara", 90); + + makeRequest(BASE_URL, "POST", new JSONObject(student1)); + makeRequest(BASE_URL, "POST", new JSONObject(student2)); + makeRequest(BASE_URL, "POST", new JSONObject(student3)); + makeRequest(BASE_URL, "POST", new JSONObject(student4)); + + JSONObject objects = new JSONObject(makeRequest(BASE_URL, "GET", null)); + assertTrue(objects.getBoolean("isSuccessfull")); + JSONArray array = objects.getJSONArray("body"); + assertTrue(array.length() >= 4); + } + + public static String makeRequest(String myUrl, String httpMethod, JSONObject parameters) { + + URL url = null; + try { + url = new URL(myUrl); + } catch (MalformedURLException e) { + e.printStackTrace(); + } + HttpURLConnection conn = null; + try { + + conn = (HttpURLConnection) url.openConnection(); + } catch (IOException e) { + e.printStackTrace(); + } + conn.setDoInput(true); + + conn.setReadTimeout(10000); + + conn.setRequestProperty("Content-Type", "application/json"); + DataOutputStream dos = null; + int respCode = 0; + String inputString = null; + try { + conn.setRequestMethod(httpMethod); + + if (Arrays.asList("POST", "PUT").contains(httpMethod)) { + String params = parameters.toString(); + + conn.setDoOutput(true); + + dos = new DataOutputStream(conn.getOutputStream()); + dos.writeBytes(params); + dos.flush(); + dos.close(); + } + respCode = conn.getResponseCode(); + if (respCode != 200 && respCode != 201) { + String error = inputStreamToString(conn.getErrorStream()); + return error; + } + inputString = inputStreamToString(conn.getInputStream()); + + } catch (IOException e) { + + e.printStackTrace(); + } + return inputString; + } + + public static String inputStreamToString(InputStream is) { + BufferedReader br = null; + StringBuilder sb = new StringBuilder(); + + String line; + try { + + br = new BufferedReader(new InputStreamReader(is)); + while ((line = br.readLine()) != null) { + sb.append(line); + } + + } catch (IOException e) { + e.printStackTrace(); + } finally { + if (br != null) { + try { + br.close(); + } catch (IOException e) { + e.printStackTrace(); + } + } + } + + return sb.toString(); + + } } diff --git a/play-framework/student-api/test/IntegrationTest.java b/play-framework/student-api/test/IntegrationTest.java deleted file mode 100644 index c53c71e124..0000000000 --- a/play-framework/student-api/test/IntegrationTest.java +++ /dev/null @@ -1,25 +0,0 @@ -import org.junit.*; - -import play.mvc.*; -import play.test.*; - -import static play.test.Helpers.*; -import static org.junit.Assert.*; - -import static org.fluentlenium.core.filter.FilterConstructor.*; - -public class IntegrationTest { - - /** - * add your integration test here - * in this example we just check if the welcome page is being shown - */ - @Test - public void test() { - running(testServer(3333, fakeApplication(inMemoryDatabase())), HTMLUNIT, browser -> { - browser.goTo("http://localhost:3333"); - assertTrue(browser.pageSource().contains("Your new application is ready.")); - }); - } - -}