Merge pull request #21 from yrris/master

增加对 IOServer 依赖注入的测试

pom.xml

@@ -46,6 +46,36 @@
             <artifactId>log4j-api</artifactId>
             <version>3.0.0-alpha1</version>
         </dependency>
+        <!-- https://mvnrepository.com/artifact/org.springframework/spring-core -->
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-core</artifactId>
+            <version>6.0.11</version>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/org.springframework/spring-context -->
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+            <version>6.0.11</version>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/org.springframework/spring-beans -->
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-beans</artifactId>
+            <version>6.0.11</version>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/org.springframework/spring-expression -->
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-expression</artifactId>
+            <version>6.0.11</version>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/org.springframework/spring-aop -->
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-aop</artifactId>
+            <version>6.0.11</version>
+        </dependency>
 
     </dependencies>
     <groupId>io.github.hit-refresh</groupId>

src/main/java/ReFreSH/JMobileSuit/IO/ColorSetting.java

@@ -1,8 +1,11 @@
 package ReFreSH.JMobileSuit.IO;
 
+import org.springframework.stereotype.Component;
+
 /**
  * Color settings of a IOServer.
  */
+@Component("colorSetting")
 public class ColorSetting {
     /**
      * Default color. For OutputType.Default

src/main/java/ReFreSH/JMobileSuit/IO/IOServer.java

@@ -5,6 +5,8 @@
 import ReFreSH.Jarvis.ObjectModel.Tuple;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -19,6 +21,7 @@
  * An entity, which serves the input/output of a mobile suit.
  */
 @SuppressWarnings({"BooleanMethodIsAlwaysInverted", "unused"})
+@Component("IOServer")
 public class IOServer {
     /**
      * Default IOServer, using stdin, stdout, stderr.
@@ -32,6 +35,7 @@ public class IOServer {
     /**
      * Color settings for this IOServer. (default getInstance)
      */
+    @Autowired
     public ReFreSH.JMobileSuit.IO.ColorSetting ColorSetting;
     public PromptServer Prompt;
     /**
@@ -53,7 +57,7 @@ public class IOServer {
      */
     public IOServer() {
         Prompt = PromptServer.getInstance();
-        ColorSetting = ReFreSH.JMobileSuit.IO.ColorSetting.getInstance();
+//        ColorSetting = ReFreSH.JMobileSuit.IO.ColorSetting.getInstance();
         _input = System.in;
         Output = System.out;
         Error = System.err;

src/test/java/ReFreSH/JMobileSuit/IO/IOServerTests.java

@@ -8,6 +8,8 @@
 import org.junit.Test;
 import org.mockito.Mockito;
 import org.powermock.api.mockito.PowerMockito;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
 
 import java.io.*;
 import java.util.Arrays;
@@ -51,6 +53,13 @@ public void after() throws Exception {
     public void IOServerTest() {
         IOServer instance = getInstance();
         assertNotNull(instance);
+        // 测试 IOServer 和 ColorSetting 依赖注入
+        ApplicationContext context = new ClassPathXmlApplicationContext("applicationContextTest.xml");
+        ColorSetting colorSetting = context.getBean("colorSetting", ColorSetting.class);
+        IOServer ioServer = context.getBean("IOServer", IOServer.class);
+        assertNotNull(colorSetting);
+        assertNotNull(ioServer);
+        assertNotNull(ioServer.ColorSetting);
     }
 
     @Test

src/test/resources/applicationContextTest.xml

@@ -0,0 +1,11 @@
+<?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-3.0.xsd
+       http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
+    <!--开启组件扫描功能-->
+    <context:component-scan base-package="ReFreSH.JMobileSuit"></context:component-scan>
+
+
+</beans>