update test.

examcloud-core-print-starter/src/test/java/cn/com/qmth/examcloud/core/print/test/BaseTest.java

@@ -0,0 +1,30 @@
+/*
+ * *************************************************
+ * Copyright (c) 2018 QMTH. All Rights Reserved.
+ * Created by Deason on 2018-11-02 13:51:23.
+ * *************************************************
+ */
+
+package cn.com.qmth.examcloud.core.print.test;
+
+import cn.com.qmth.examcloud.core.print.PrintApplication;
+import cn.com.qmth.examcloud.core.print.common.utils.JsonMapper;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+/**
+ * @author: fengdesheng
+ * @since: 2018/11/2
+ */
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = PrintApplication.class)
+public class BaseTest {
+    protected JsonMapper jsonMapper = new JsonMapper();
+
+    //@Test
+    public void init() throws Exception {
+
+    }
+
+}

examcloud-core-print-starter/src/test/java/cn/com/qmth/examcloud/core/print/test/CourseStatisticServiceTest.java

@@ -7,22 +7,16 @@
 
 package cn.com.qmth.examcloud.core.print.test;
 
-import cn.com.qmth.examcloud.core.print.PrintApplication;
 import cn.com.qmth.examcloud.core.print.service.CourseStatisticService;
 import cn.com.qmth.examcloud.core.print.service.bean.coursestatistic.CourseStatisticQuery;
 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;
 
 /**
  * @author: fengdesheng
  * @since: 2018/10/17
  */
-@RunWith(SpringRunner.class)
-@SpringBootTest(classes = PrintApplication.class)
-public class CourseStatisticServiceTest {
+public class CourseStatisticServiceTest extends BaseTest {
     @Autowired
     private CourseStatisticService courseStatisticService;
 

examcloud-core-print-starter/src/test/java/cn/com/qmth/examcloud/core/print/test/ExamStructureServiceTest.java

@@ -7,21 +7,15 @@
 
 package cn.com.qmth.examcloud.core.print.test;
 
-import cn.com.qmth.examcloud.core.print.PrintApplication;
 import cn.com.qmth.examcloud.core.print.service.ExamStructureService;
 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;
 
 /**
  * @author: fengdesheng
  * @since: 2018/11/01
  */
-@RunWith(SpringRunner.class)
-@SpringBootTest(classes = PrintApplication.class)
-public class ExamStructureServiceTest {
+public class ExamStructureServiceTest extends BaseTest {
     @Autowired
     private ExamStructureService examStructureService;
 

examcloud-core-print-starter/src/test/java/cn/com/qmth/examcloud/core/print/test/PrintingProjectServiceTest.java

@@ -7,12 +7,10 @@
 
 package cn.com.qmth.examcloud.core.print.test;
 
-import cn.com.qmth.examcloud.core.print.PrintApplication;
 import cn.com.qmth.examcloud.core.print.common.jpa.OrderBuilder;
 import cn.com.qmth.examcloud.core.print.common.jpa.SearchBuilder;
 import cn.com.qmth.examcloud.core.print.common.jpa.SpecUtils;
 import cn.com.qmth.examcloud.core.print.common.jpa.SqlWrapper;
-import cn.com.qmth.examcloud.core.print.common.utils.JsonMapper;
 import cn.com.qmth.examcloud.core.print.entity.PrintingProject;
 import cn.com.qmth.examcloud.core.print.repository.PrintingProjectRepository;
 import cn.com.qmth.examcloud.core.print.service.PrintingProjectService;
@@ -20,14 +18,11 @@ import cn.com.qmth.examcloud.core.print.service.bean.printingproject.OrgExamInfo
 import cn.com.qmth.examcloud.core.print.service.bean.printingproject.PrintingProjectInfo;
 import cn.com.qmth.examcloud.core.print.service.bean.printingproject.PrintingProjectQuery;
 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.data.domain.Page;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.jdbc.core.BeanPropertyRowMapper;
 import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.test.context.junit4.SpringRunner;
 
 import java.util.Date;
 import java.util.List;
@@ -36,9 +31,7 @@ import java.util.List;
  * @author: fengdesheng
  * @since: 2018/10/17
  */
-@RunWith(SpringRunner.class)
-@SpringBootTest(classes = PrintApplication.class)
-public class PrintingProjectServiceTest {
+public class PrintingProjectServiceTest extends BaseTest {
     @Autowired
     private PrintingProjectService printingProjectService;
     @Autowired
@@ -54,7 +47,7 @@ public class PrintingProjectServiceTest {
         query.setPmId(1L);
         query.setSupplierId(1L);
         Page<PrintingProjectInfo> page = printingProjectService.getPrintingProjectList(query);
-        System.out.println(new JsonMapper().toJson(page));
+        System.out.println(jsonMapper.toJson(page));
     }
 
     @Test
@@ -105,7 +98,7 @@ public class PrintingProjectServiceTest {
 
         OrderBuilder orderBuilder = new OrderBuilder().desc("id");
         List<PrintingProject> list = printingProjectRepository.findAll(spec, orderBuilder.build());
-        System.out.println(new JsonMapper().toJson(list));
+        System.out.println(jsonMapper.toJson(list));
     }
 
     //@Test
@@ -113,7 +106,7 @@ public class PrintingProjectServiceTest {
         SqlWrapper wrapper = new SqlWrapper();
         wrapper.select().from("ec_prt_project").where().like("exam_id", 1L);
         List<PrintingProject> list = jdbcTemplate.query(wrapper.build(), new BeanPropertyRowMapper(PrintingProject.class));
-        System.out.println(new JsonMapper().toJson(list));
+        System.out.println(jsonMapper.toJson(list));
     }
 
 }

examcloud-core-print-starter/src/test/java/cn/com/qmth/examcloud/core/print/test/ProjectSettingServiceTest.java

@@ -7,18 +7,13 @@
 
 package cn.com.qmth.examcloud.core.print.test;
 
-import cn.com.qmth.examcloud.core.print.PrintApplication;
-import cn.com.qmth.examcloud.core.print.common.utils.JsonMapper;
 import cn.com.qmth.examcloud.core.print.entity.ProjectBackupSetting;
 import cn.com.qmth.examcloud.core.print.entity.ProjectOtherSetting;
 import cn.com.qmth.examcloud.core.print.enums.BackupGroupType;
 import cn.com.qmth.examcloud.core.print.service.ProjectBackupSettingService;
 import cn.com.qmth.examcloud.core.print.service.ProjectOtherSettingService;
 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 java.util.List;
 
@@ -26,9 +21,7 @@ import java.util.List;
  * @author: fengdesheng
  * @since: 2018/10/17
  */
-@RunWith(SpringRunner.class)
-@SpringBootTest(classes = PrintApplication.class)
-public class ProjectSettingServiceTest {
+public class ProjectSettingServiceTest extends BaseTest {
     @Autowired
     private ProjectBackupSettingService projectBackupSettingService;
     @Autowired
@@ -52,7 +45,7 @@ public class ProjectSettingServiceTest {
     @Test
     public void getProjectBackupSettingTest() throws Exception {
         ProjectBackupSetting setting = projectBackupSettingService.getProjectBackupSettingById(projectId);
-        System.out.println(new JsonMapper().toJson(setting));
+        System.out.println(jsonMapper.toJson(setting));
     }
 
     @Test
@@ -68,10 +61,10 @@ public class ProjectSettingServiceTest {
     @Test
     public void getProjectOtherSettingTest() throws Exception {
         List<ProjectOtherSetting> settings = projectOtherSettingService.getProjectOtherSettingList(projectId);
-        System.out.println(new JsonMapper().toJson(settings));
+        System.out.println(jsonMapper.toJson(settings));
 
         ProjectOtherSetting setting = projectOtherSettingService.getProjectOtherSettingById(1L);
-        System.out.println(new JsonMapper().toJson(setting));
+        System.out.println(jsonMapper.toJson(setting));
     }
 
 }

examcloud-core-print-starter/src/test/java/cn/com/qmth/examcloud/core/print/test/ProjectStatisticServiceTest.java

@@ -7,21 +7,15 @@
 
 package cn.com.qmth.examcloud.core.print.test;
 
-import cn.com.qmth.examcloud.core.print.PrintApplication;
 import cn.com.qmth.examcloud.core.print.service.PrintingProjectStatisticService;
 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;
 
 /**
  * @author: fengdesheng
  * @since: 2018/10/17
  */
-@RunWith(SpringRunner.class)
-@SpringBootTest(classes = PrintApplication.class)
-public class ProjectStatisticServiceTest {
+public class ProjectStatisticServiceTest extends BaseTest {
     @Autowired
     private PrintingProjectStatisticService printingProjectStatisticService;
 

examcloud-core-print-starter/src/test/java/cn/com/qmth/examcloud/core/print/test/ProjectTemplateServiceTest.java

@@ -7,27 +7,41 @@
 
 package cn.com.qmth.examcloud.core.print.test;
 
-import cn.com.qmth.examcloud.core.print.PrintApplication;
+import cn.com.qmth.examcloud.core.print.enums.TemplateType;
 import cn.com.qmth.examcloud.core.print.service.PrintingTemplateService;
+import cn.com.qmth.examcloud.core.print.service.bean.printingtemplate.PrintingTemplateInfo;
 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 java.util.List;
 
 /**
  * @author: fengdesheng
  * @since: 2018/11/01
  */
-@RunWith(SpringRunner.class)
-@SpringBootTest(classes = PrintApplication.class)
-public class ProjectTemplateServiceTest {
+public class ProjectTemplateServiceTest extends BaseTest {
     @Autowired
     private PrintingTemplateService printingTemplateService;
 
     @Test
-    public void test() throws Exception {
+    public void saveTest() throws Exception {
+        Long orgId = 1L;
+        Long examId = 1L;
+        PrintingTemplateInfo info = new PrintingTemplateInfo();
+        info.setOrgId(orgId);
+        info.setExamId(examId);
+        info.setTemplateType(TemplateType.考生数据表.getIndex());
+        info.setFileName("Test");
+        info.setFileUrl("test.xls");
+        printingTemplateService.savePrintingTemplate(info);
+    }
 
+    @Test
+    public void listTest() throws Exception {
+        Long orgId = 1L;
+        Long examId = 1L;
+        List<PrintingTemplateInfo> list = printingTemplateService.getPrintingTemplateList(orgId, examId);
+        System.out.println(jsonMapper.toJson(list));
     }
 
 }

examcloud-core-print-starter/src/test/java/cn/com/qmth/examcloud/core/print/test/RedisServiceTest.java

@@ -7,13 +7,9 @@
 
 package cn.com.qmth.examcloud.core.print.test;
 
-import cn.com.qmth.examcloud.core.print.PrintApplication;
 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.data.redis.core.RedisTemplate;
-import org.springframework.test.context.junit4.SpringRunner;
 
 import java.util.concurrent.TimeUnit;
 
@@ -21,9 +17,7 @@ import java.util.concurrent.TimeUnit;
  * @author: fengdesheng
  * @since: 2018/10/25
  */
-@RunWith(SpringRunner.class)
-@SpringBootTest(classes = PrintApplication.class)
-public class RedisServiceTest {
+public class RedisServiceTest extends BaseTest {
     @Autowired
     private RedisTemplate<String, Object> redisTemplate;
 

examcloud-core-print-starter/src/test/java/cn/com/qmth/examcloud/core/print/test/UpYunServiceTest.java

@@ -7,15 +7,11 @@
 
 package cn.com.qmth.examcloud.core.print.test;
 
-import cn.com.qmth.examcloud.core.print.PrintApplication;
 import cn.com.qmth.examcloud.core.print.common.upyun.UpYunClient;
 import cn.com.qmth.examcloud.core.print.common.utils.FileUtils;
 import main.java.com.UpYun;
 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 java.io.File;
 
@@ -23,9 +19,7 @@ import java.io.File;
  * @author: fengdesheng
  * @since: 2018/11/01
  */
-@RunWith(SpringRunner.class)
-@SpringBootTest(classes = PrintApplication.class)
-public class UpYunServiceTest {
+public class UpYunServiceTest extends BaseTest {
     @Autowired
     private UpYunClient upYunClient;