From ef7bde7138571e730e3eed46a1b0f2bba17455ed Mon Sep 17 00:00:00 2001
From: DmitriyMX <dimon550@gmail.com>
Date: Fri, 7 Sep 2018 20:50:20 +0300
Subject: [PATCH] =?UTF-8?q?=D0=B7=D0=B0=D0=BC=D0=B5=D0=BD=D0=B0=20=D0=BA?=
 =?UTF-8?q?=D0=BE=D0=BD=D1=84=D0=B8=D0=B3=D1=83=D1=80=D0=B0=D1=86=D0=B8?=
 =?UTF-8?q?=D0=B8=20xml=20=D0=BD=D0=B0=20class?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../test/java/mc/core/h2db/SpringConfig.java  | 38 +++++++++++++++++++
 .../java/mc/core/h2db/TestH2Database.java     | 11 +-----
 .../src/test/resources/springTest.xml         | 21 ----------
 3 files changed, 40 insertions(+), 30 deletions(-)
 create mode 100644 h2_playermanager/src/test/java/mc/core/h2db/SpringConfig.java
 delete mode 100644 h2_playermanager/src/test/resources/springTest.xml

diff --git a/h2_playermanager/src/test/java/mc/core/h2db/SpringConfig.java b/h2_playermanager/src/test/java/mc/core/h2db/SpringConfig.java
new file mode 100644
index 0000000..4e18747
--- /dev/null
+++ b/h2_playermanager/src/test/java/mc/core/h2db/SpringConfig.java
@@ -0,0 +1,38 @@
+package mc.core.h2db;
+
+import mc.core.world.World;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.datasource.DriverManagerDataSource;
+
+import javax.sql.DataSource;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+@Configuration
+public class SpringConfig {
+    @Bean
+    public World mockWorld() {
+        World mockWorld = mock(World.class);
+        when(mockWorld.getName()).thenReturn("mock_world");
+        return mockWorld;
+    }
+
+    @Bean
+    public DataSource dataSource() {
+        DriverManagerDataSource dmds = new DriverManagerDataSource();
+        dmds.setDriverClassName("org.h2.Driver");
+        dmds.setUrl("jdbc:h2:mem:test;DB_CLOSE_DELAY=-1");
+        dmds.setUsername("sa");
+        return dmds;
+    }
+
+    @Bean
+    public JdbcTemplate jdbcTemplate(DataSource dataSource) {
+        JdbcTemplate jdbcTemplate = new JdbcTemplate();
+        jdbcTemplate.setDataSource(dataSource);
+        return jdbcTemplate;
+    }
+}
diff --git a/h2_playermanager/src/test/java/mc/core/h2db/TestH2Database.java b/h2_playermanager/src/test/java/mc/core/h2db/TestH2Database.java
index 1636884..77a2292 100644
--- a/h2_playermanager/src/test/java/mc/core/h2db/TestH2Database.java
+++ b/h2_playermanager/src/test/java/mc/core/h2db/TestH2Database.java
@@ -17,25 +17,18 @@ import java.sql.SQLException;
 import java.util.UUID;
 
 import static org.junit.Assert.assertEquals;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
 
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(locations = {"classpath:springTest.xml"})
+@ContextConfiguration(classes = {SpringConfig.class})
 public class TestH2Database {
     @Autowired
     private JdbcTemplate jdbcTemplate;
+    @Autowired
     private World mockWorld;
 
-    private void createMockWorld() {
-        mockWorld = mock(World.class);
-        when(mockWorld.getName()).thenReturn("mock_world");
-    }
-
     @PostConstruct
     public void init() throws IOException {
         jdbcTemplate.execute(IOUtils.resourceToString("/sqls/create_tables.sql", StandardCharsets.UTF_8));
-        createMockWorld();
     }
 
     private H2Player buildPlayer(final String name, final EntityLocation location) {
diff --git a/h2_playermanager/src/test/resources/springTest.xml b/h2_playermanager/src/test/resources/springTest.xml
deleted file mode 100644
index 8cebaaf..0000000
--- a/h2_playermanager/src/test/resources/springTest.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:context="http://www.springframework.org/schema/context"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans
-						   http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-						   http://www.springframework.org/schema/context
-						   http://www.springframework.org/schema/context/spring-context.xsd">
-    <context:annotation-config />
-
-    <bean id="dataSource" class="org.springframework.jdbc.datasource.DriverManagerDataSource">
-        <property name="driverClassName" value="org.h2.Driver" />
-        <property name="url" value="jdbc:h2:mem:test;DB_CLOSE_DELAY=-1" />
-        <property name="username" value="sa" />
-        <property name="password" value="" />
-    </bean>
-
-    <bean id="jdbcTemplate" class="org.springframework.jdbc.core.JdbcTemplate">
-        <property name="dataSource" ref="dataSource"/>
-    </bean>
-</beans>
\ No newline at end of file