From 9b4cee697d4bfe9401d1c4513b2a35f98e2a4cd4 Mon Sep 17 00:00:00 2001 From: sharifi Date: Sun, 5 Dec 2021 13:57:38 +0330 Subject: [PATCH 1/8] bael-4197: add application-context --- .../src/main/resources/application-context.xml | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 spring-boot-modules/spring-boot-testing/src/main/resources/application-context.xml diff --git a/spring-boot-modules/spring-boot-testing/src/main/resources/application-context.xml b/spring-boot-modules/spring-boot-testing/src/main/resources/application-context.xml new file mode 100644 index 0000000000..a436b39a2f --- /dev/null +++ b/spring-boot-modules/spring-boot-testing/src/main/resources/application-context.xml @@ -0,0 +1,9 @@ + + + + + From 7e83b6b04dd5d93961c59989430ef94cf8e8dd4b Mon Sep 17 00:00:00 2001 From: sharifi Date: Sun, 5 Dec 2021 13:58:13 +0330 Subject: [PATCH 2/8] bael-4197: add main source --- .../XmlBeanApplication.java | 15 +++++++++ .../domain/Employee.java | 32 +++++++++++++++++++ .../service/EmployeeService.java | 8 +++++ .../service/EmployeeServiceImpl.java | 11 +++++++ .../service/EmployeeServiceTestImpl.java | 11 +++++++ 5 files changed, 77 insertions(+) create mode 100644 spring-boot-modules/spring-boot-testing/src/main/java/com/baeldung/xmlapplicationcontext/XmlBeanApplication.java create mode 100644 spring-boot-modules/spring-boot-testing/src/main/java/com/baeldung/xmlapplicationcontext/domain/Employee.java create mode 100644 spring-boot-modules/spring-boot-testing/src/main/java/com/baeldung/xmlapplicationcontext/service/EmployeeService.java create mode 100644 spring-boot-modules/spring-boot-testing/src/main/java/com/baeldung/xmlapplicationcontext/service/EmployeeServiceImpl.java create mode 100644 spring-boot-modules/spring-boot-testing/src/main/java/com/baeldung/xmlapplicationcontext/service/EmployeeServiceTestImpl.java diff --git a/spring-boot-modules/spring-boot-testing/src/main/java/com/baeldung/xmlapplicationcontext/XmlBeanApplication.java b/spring-boot-modules/spring-boot-testing/src/main/java/com/baeldung/xmlapplicationcontext/XmlBeanApplication.java new file mode 100644 index 0000000000..4e2af67ab0 --- /dev/null +++ b/spring-boot-modules/spring-boot-testing/src/main/java/com/baeldung/xmlapplicationcontext/XmlBeanApplication.java @@ -0,0 +1,15 @@ +package com.baeldung.xmlapplicationcontext; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.context.annotation.ImportResource; + +@SpringBootApplication +@ImportResource({"classpath*:application-context.xml"}) +public class XmlBeanApplication { + + public static void main(String[] args) { + SpringApplication.run(XmlBeanApplication.class, args); + } + +} diff --git a/spring-boot-modules/spring-boot-testing/src/main/java/com/baeldung/xmlapplicationcontext/domain/Employee.java b/spring-boot-modules/spring-boot-testing/src/main/java/com/baeldung/xmlapplicationcontext/domain/Employee.java new file mode 100644 index 0000000000..f81277f027 --- /dev/null +++ b/spring-boot-modules/spring-boot-testing/src/main/java/com/baeldung/xmlapplicationcontext/domain/Employee.java @@ -0,0 +1,32 @@ +package com.baeldung.xmlapplicationcontext.domain; + +public class Employee { + + private String name; + private String role; + + public Employee() { + + } + + public Employee(String name, String role) { + this.name = name; + this.role = role; + } + + public String getName() { + return this.name; + } + + public String getRole() { + return this.role; + } + + public void setName(String name) { + this.name = name; + } + + public void setRole(String role) { + this.role = role; + } +} \ No newline at end of file diff --git a/spring-boot-modules/spring-boot-testing/src/main/java/com/baeldung/xmlapplicationcontext/service/EmployeeService.java b/spring-boot-modules/spring-boot-testing/src/main/java/com/baeldung/xmlapplicationcontext/service/EmployeeService.java new file mode 100644 index 0000000000..867e9b8c9f --- /dev/null +++ b/spring-boot-modules/spring-boot-testing/src/main/java/com/baeldung/xmlapplicationcontext/service/EmployeeService.java @@ -0,0 +1,8 @@ +package com.baeldung.xmlapplicationcontext.service; + +import com.baeldung.xmlapplicationcontext.domain.Employee; + +public interface EmployeeService { + + Employee getEmployee(); +} diff --git a/spring-boot-modules/spring-boot-testing/src/main/java/com/baeldung/xmlapplicationcontext/service/EmployeeServiceImpl.java b/spring-boot-modules/spring-boot-testing/src/main/java/com/baeldung/xmlapplicationcontext/service/EmployeeServiceImpl.java new file mode 100644 index 0000000000..b541c62dcd --- /dev/null +++ b/spring-boot-modules/spring-boot-testing/src/main/java/com/baeldung/xmlapplicationcontext/service/EmployeeServiceImpl.java @@ -0,0 +1,11 @@ +package com.baeldung.xmlapplicationcontext.service; + +import com.baeldung.xmlapplicationcontext.domain.Employee; + +public class EmployeeServiceImpl implements EmployeeService { + + @Override + public Employee getEmployee() { + return new Employee("Baeldung", "Admin"); + } +} diff --git a/spring-boot-modules/spring-boot-testing/src/main/java/com/baeldung/xmlapplicationcontext/service/EmployeeServiceTestImpl.java b/spring-boot-modules/spring-boot-testing/src/main/java/com/baeldung/xmlapplicationcontext/service/EmployeeServiceTestImpl.java new file mode 100644 index 0000000000..7cebaa399b --- /dev/null +++ b/spring-boot-modules/spring-boot-testing/src/main/java/com/baeldung/xmlapplicationcontext/service/EmployeeServiceTestImpl.java @@ -0,0 +1,11 @@ +package com.baeldung.xmlapplicationcontext.service; + +import com.baeldung.xmlapplicationcontext.domain.Employee; + +public class EmployeeServiceTestImpl implements EmployeeService { + + @Override + public Employee getEmployee() { + return new Employee("Baeldung-Test", "Admin"); + } +} From 134d83f39d4c193b5ef583e2a4b9231c025e9339 Mon Sep 17 00:00:00 2001 From: sharifi Date: Sun, 5 Dec 2021 13:58:28 +0330 Subject: [PATCH 3/8] bael-4197: add test context --- .../src/test/resources/test-context.xml | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 spring-boot-modules/spring-boot-testing/src/test/resources/test-context.xml diff --git a/spring-boot-modules/spring-boot-testing/src/test/resources/test-context.xml b/spring-boot-modules/spring-boot-testing/src/test/resources/test-context.xml new file mode 100644 index 0000000000..664b528b06 --- /dev/null +++ b/spring-boot-modules/spring-boot-testing/src/test/resources/test-context.xml @@ -0,0 +1,9 @@ + + + + + From a2318c466c2b419f15ebe2a8e9faed6e71406b6f Mon Sep 17 00:00:00 2001 From: sharifi Date: Sun, 5 Dec 2021 13:58:51 +0330 Subject: [PATCH 4/8] bael-4197: add test class --- ...loyeeServiceAppContextIntegrationTest.java | 21 ++++++++++++++++ ...oyeeServiceTestContextIntegrationTest.java | 25 +++++++++++++++++++ 2 files changed, 46 insertions(+) create mode 100644 spring-boot-modules/spring-boot-testing/src/test/java/com/baeldung/xmlapplicationcontext/EmployeeServiceAppContextIntegrationTest.java create mode 100644 spring-boot-modules/spring-boot-testing/src/test/java/com/baeldung/xmlapplicationcontext/EmployeeServiceTestContextIntegrationTest.java diff --git a/spring-boot-modules/spring-boot-testing/src/test/java/com/baeldung/xmlapplicationcontext/EmployeeServiceAppContextIntegrationTest.java b/spring-boot-modules/spring-boot-testing/src/test/java/com/baeldung/xmlapplicationcontext/EmployeeServiceAppContextIntegrationTest.java new file mode 100644 index 0000000000..7a63abf1a3 --- /dev/null +++ b/spring-boot-modules/spring-boot-testing/src/test/java/com/baeldung/xmlapplicationcontext/EmployeeServiceAppContextIntegrationTest.java @@ -0,0 +1,21 @@ +package com.baeldung.xmlapplicationcontext; + +import com.baeldung.xmlapplicationcontext.service.EmployeeService; +import org.junit.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; + +import static org.assertj.core.api.Assertions.assertThat; + +@SpringBootTest(classes = XmlBeanApplication.class) +public class EmployeeServiceAppContextIntegrationTest { + + @Autowired + private EmployeeService service; + + @Test + public void whenContextLoads_thenServiceISNotNull() { + assertThat(service).isNotNull(); + } + +} diff --git a/spring-boot-modules/spring-boot-testing/src/test/java/com/baeldung/xmlapplicationcontext/EmployeeServiceTestContextIntegrationTest.java b/spring-boot-modules/spring-boot-testing/src/test/java/com/baeldung/xmlapplicationcontext/EmployeeServiceTestContextIntegrationTest.java new file mode 100644 index 0000000000..9880c7c567 --- /dev/null +++ b/spring-boot-modules/spring-boot-testing/src/test/java/com/baeldung/xmlapplicationcontext/EmployeeServiceTestContextIntegrationTest.java @@ -0,0 +1,25 @@ +package com.baeldung.xmlapplicationcontext; + +import com.baeldung.xmlapplicationcontext.service.EmployeeService; +import org.junit.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.ContextConfiguration; + +import static org.assertj.core.api.Assertions.assertThat; + +@SpringBootTest +@ContextConfiguration(locations = "/test-context.xml") +public class EmployeeServiceTestContextIntegrationTest { + + @Autowired + @Qualifier("employeeServiceTestImpl") + private EmployeeService serviceTest; + + @Test + public void whenTestContextLoads_thenServiceTestISNotNull() { + assertThat(serviceTest).isNotNull(); + } + +} From 58b12fcfc802dd08f3fa84d423898ce2c4b4c084 Mon Sep 17 00:00:00 2001 From: sharifi Date: Sun, 5 Dec 2021 14:28:10 +0330 Subject: [PATCH 5/8] bael-4197: fix bug --- .../EmployeeServiceAppContextIntegrationTest.java | 4 ++++ .../EmployeeServiceTestContextIntegrationTest.java | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/spring-boot-modules/spring-boot-testing/src/test/java/com/baeldung/xmlapplicationcontext/EmployeeServiceAppContextIntegrationTest.java b/spring-boot-modules/spring-boot-testing/src/test/java/com/baeldung/xmlapplicationcontext/EmployeeServiceAppContextIntegrationTest.java index 7a63abf1a3..0ab157744a 100644 --- a/spring-boot-modules/spring-boot-testing/src/test/java/com/baeldung/xmlapplicationcontext/EmployeeServiceAppContextIntegrationTest.java +++ b/spring-boot-modules/spring-boot-testing/src/test/java/com/baeldung/xmlapplicationcontext/EmployeeServiceAppContextIntegrationTest.java @@ -2,11 +2,15 @@ package com.baeldung.xmlapplicationcontext; import com.baeldung.xmlapplicationcontext.service.EmployeeService; import org.junit.Test; +import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; import static org.assertj.core.api.Assertions.assertThat; + +@RunWith(SpringRunner.class) @SpringBootTest(classes = XmlBeanApplication.class) public class EmployeeServiceAppContextIntegrationTest { diff --git a/spring-boot-modules/spring-boot-testing/src/test/java/com/baeldung/xmlapplicationcontext/EmployeeServiceTestContextIntegrationTest.java b/spring-boot-modules/spring-boot-testing/src/test/java/com/baeldung/xmlapplicationcontext/EmployeeServiceTestContextIntegrationTest.java index 9880c7c567..0182d5dbb1 100644 --- a/spring-boot-modules/spring-boot-testing/src/test/java/com/baeldung/xmlapplicationcontext/EmployeeServiceTestContextIntegrationTest.java +++ b/spring-boot-modules/spring-boot-testing/src/test/java/com/baeldung/xmlapplicationcontext/EmployeeServiceTestContextIntegrationTest.java @@ -2,14 +2,17 @@ package com.baeldung.xmlapplicationcontext; import com.baeldung.xmlapplicationcontext.service.EmployeeService; import org.junit.Test; +import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit4.SpringRunner; import static org.assertj.core.api.Assertions.assertThat; -@SpringBootTest +@RunWith(SpringRunner.class) +@SpringBootTest(classes = XmlBeanApplication.class) @ContextConfiguration(locations = "/test-context.xml") public class EmployeeServiceTestContextIntegrationTest { From 3c9831f32334c91b69392136a448f2ef90dceecf Mon Sep 17 00:00:00 2001 From: sharifi Date: Sun, 2 Jan 2022 13:09:06 +0330 Subject: [PATCH 6/8] bael-4197: add @ContextConfiguration for loading application context --- .../EmployeeServiceAppContextIntegrationTest.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/spring-boot-modules/spring-boot-testing/src/test/java/com/baeldung/xmlapplicationcontext/EmployeeServiceAppContextIntegrationTest.java b/spring-boot-modules/spring-boot-testing/src/test/java/com/baeldung/xmlapplicationcontext/EmployeeServiceAppContextIntegrationTest.java index 0ab157744a..e9ee8f3951 100644 --- a/spring-boot-modules/spring-boot-testing/src/test/java/com/baeldung/xmlapplicationcontext/EmployeeServiceAppContextIntegrationTest.java +++ b/spring-boot-modules/spring-boot-testing/src/test/java/com/baeldung/xmlapplicationcontext/EmployeeServiceAppContextIntegrationTest.java @@ -5,6 +5,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringRunner; import static org.assertj.core.api.Assertions.assertThat; @@ -12,6 +13,7 @@ import static org.assertj.core.api.Assertions.assertThat; @RunWith(SpringRunner.class) @SpringBootTest(classes = XmlBeanApplication.class) +//@ContextConfiguration(locations = "file:src/main/webapp/WEB-INF/application-context.xml") public class EmployeeServiceAppContextIntegrationTest { @Autowired From 784c0e11bdd55475e8829e7f2e8ce42af70b13d5 Mon Sep 17 00:00:00 2001 From: sharifi Date: Sat, 8 Jan 2022 12:48:48 +0330 Subject: [PATCH 7/8] bael-4197: indent with spaces instead of tab --- .../xmlapplicationcontext/XmlBeanApplication.java | 2 +- .../src/main/webapp/WEB-INF/application-context.xml | 8 ++++++++ .../src/test/resources/test-context.xml | 9 ++++----- 3 files changed, 13 insertions(+), 6 deletions(-) create mode 100644 spring-boot-modules/spring-boot-testing/src/main/webapp/WEB-INF/application-context.xml diff --git a/spring-boot-modules/spring-boot-testing/src/main/java/com/baeldung/xmlapplicationcontext/XmlBeanApplication.java b/spring-boot-modules/spring-boot-testing/src/main/java/com/baeldung/xmlapplicationcontext/XmlBeanApplication.java index 4e2af67ab0..ddf1efd396 100644 --- a/spring-boot-modules/spring-boot-testing/src/main/java/com/baeldung/xmlapplicationcontext/XmlBeanApplication.java +++ b/spring-boot-modules/spring-boot-testing/src/main/java/com/baeldung/xmlapplicationcontext/XmlBeanApplication.java @@ -9,7 +9,7 @@ import org.springframework.context.annotation.ImportResource; public class XmlBeanApplication { public static void main(String[] args) { - SpringApplication.run(XmlBeanApplication.class, args); + SpringApplication.run(XmlBeanApplication.class, args); } } diff --git a/spring-boot-modules/spring-boot-testing/src/main/webapp/WEB-INF/application-context.xml b/spring-boot-modules/spring-boot-testing/src/main/webapp/WEB-INF/application-context.xml new file mode 100644 index 0000000000..fc0e0fef25 --- /dev/null +++ b/spring-boot-modules/spring-boot-testing/src/main/webapp/WEB-INF/application-context.xml @@ -0,0 +1,8 @@ + + + + + diff --git a/spring-boot-modules/spring-boot-testing/src/test/resources/test-context.xml b/spring-boot-modules/spring-boot-testing/src/test/resources/test-context.xml index 664b528b06..fbd6da32ca 100644 --- a/spring-boot-modules/spring-boot-testing/src/test/resources/test-context.xml +++ b/spring-boot-modules/spring-boot-testing/src/test/resources/test-context.xml @@ -1,9 +1,8 @@ + 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"> - + From 6c6f179230401efb15a163a8d613c614467e0565 Mon Sep 17 00:00:00 2001 From: sharifi Date: Sat, 8 Jan 2022 12:49:30 +0330 Subject: [PATCH 8/8] bael-4197: add application-context.xml in resource directory --- .../src/main/resources/application-context.xml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/spring-boot-modules/spring-boot-testing/src/main/resources/application-context.xml b/spring-boot-modules/spring-boot-testing/src/main/resources/application-context.xml index a436b39a2f..fc0e0fef25 100644 --- a/spring-boot-modules/spring-boot-testing/src/main/resources/application-context.xml +++ b/spring-boot-modules/spring-boot-testing/src/main/resources/application-context.xml @@ -1,9 +1,8 @@ + 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"> - +