From c3205a6ff446c51fd12999780b949b78c10b03d5 Mon Sep 17 00:00:00 2001 From: chenlinghy Date: Thu, 6 Aug 2020 16:56:59 +0800 Subject: [PATCH] =?UTF-8?q?OCT=20REM:=201.=20=E4=BF=AE=E6=94=B9manager?= =?UTF-8?q?=E5=B1=82=E8=AE=BE=E5=A4=87=E4=BF=A1=E6=81=AF=E6=94=B9=E5=8F=98?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=96=B9=E6=B3=95=E7=9A=84=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=202.=20=E7=BC=96=E5=86=99service=E5=B1=82?= =?UTF-8?q?=E8=AE=BE=E5=A4=87=E4=BF=A1=E6=81=AF=E7=AE=A1=E7=90=86=E7=9A=84?= =?UTF-8?q?=E5=8D=95=E5=85=83=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/DisposeDeviceManagerImpl.java | 2 +- .../DisposeDeviceManagerServiceTest.java | 219 ++++++++++++++++++ 2 files changed, 220 insertions(+), 1 deletion(-) create mode 100644 src/test/java/com/dispose/test/service/DisposeDeviceManagerServiceTest.java diff --git a/src/main/java/com/dispose/manager/impl/DisposeDeviceManagerImpl.java b/src/main/java/com/dispose/manager/impl/DisposeDeviceManagerImpl.java index 810b99cf..2455567e 100644 --- a/src/main/java/com/dispose/manager/impl/DisposeDeviceManagerImpl.java +++ b/src/main/java/com/dispose/manager/impl/DisposeDeviceManagerImpl.java @@ -195,7 +195,7 @@ public class DisposeDeviceManagerImpl implements DisposeDeviceManager { if (ret != 1) { return new MulReturnType<>(ErrorCode.ERR_DATABASE, dev.getStatus()); } else { - return new MulReturnType<>(ErrorCode.ERR_OK, dev.getStatus()); + return new MulReturnType<>(ErrorCode.ERR_OK, disposeDeviceMapper.getDeviceById(id).getStatus()); } } } diff --git a/src/test/java/com/dispose/test/service/DisposeDeviceManagerServiceTest.java b/src/test/java/com/dispose/test/service/DisposeDeviceManagerServiceTest.java new file mode 100644 index 00000000..d8bc231c --- /dev/null +++ b/src/test/java/com/dispose/test/service/DisposeDeviceManagerServiceTest.java @@ -0,0 +1,219 @@ +package com.dispose.test.service; + +import com.dispose.common.*; +import com.dispose.pojo.entity.DisposeDevice; +import com.dispose.pojo.po.MulReturnType; +import com.dispose.service.DisposeDeviceManagerService; +import com.dispose.service.UserAccountService; +import com.dispose.test.Global.InitTestEnvironment; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; +import lombok.extern.slf4j.Slf4j; +import org.junit.Assert; +import org.junit.Before; +import org.junit.FixMethodOrder; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.MethodSorters; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.annotation.Rollback; +import org.springframework.test.context.junit4.SpringRunner; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.security.NoSuchAlgorithmException; +import java.util.ArrayList; +import java.util.List; + +/** + * The type User account service test. + * + * @author + */ +@RunWith(SpringRunner.class) +@SpringBootTest +@Slf4j +@FixMethodOrder(MethodSorters.NAME_ASCENDING) +@Transactional +@Rollback +public class DisposeDeviceManagerServiceTest extends InitTestEnvironment { + /** + * The constant token. + */ + private static String token = ""; + /** + * The User account service. + */ + @Resource + private UserAccountService userAccountService; + /** + * The dispose device manager service. + */ + @Resource + private DisposeDeviceManagerService disposeDeviceManagerService; + /** + * The Object mapper. + */ + @Resource + private ObjectMapper objectMapper; + /** + * User login test. + * + * @throws NoSuchAlgorithmException the no such algorithm exception + */ + @Before + public void userLoginTest() throws NoSuchAlgorithmException { + MulReturnType ret = userAccountService.loginService(getUSER_NAME(), + getPASSWORD()); + + if (ret.getFirstParam() == ErrorCode.ERR_OK) { + DisposeDeviceManagerServiceTest.token = ret.getSecondParam(); + } + } + + /** + * A 1 Add dispose device list. + */ + @Test + public void a1_addDisposeDeviceTest() { + List devList = new ArrayList<>(); + + for (int i = 1; i < 3; i++) { + String ipAddr = "192.168.0." + i; + + DisposeDevice dev = DisposeDevice.builder() + .ipAddr(ipAddr) + .ipPort("") + .deviceType(DisposeDeviceType.DPTECH_UMC) + .areaCode(0) + .deviceName("中移杭研实验室迪普清洗设备") + .manufacturer("DPTech") + .model("UMC") + .version("5.7.13") + .userName("admin") + .password("UMCAdministrator") + .urlPath("UMC/service/AbnormalFlowCleaningService") + .urlType(HttpType.HTTP) + .readme("实验室测试设备") + .status(ObjectStatus.NORMAL) + .build(); + + devList.add(dev); + } + + List> ret = disposeDeviceManagerService.addDisposeDevice(devList); + + ret.forEach(v->{ + if (v.getFirstParam() == ErrorCode.ERR_OK) { + Assert.assertNotNull(v.getSecondParam()); + Assert.assertNotNull(v.getSecondParam().getId()); + } else if (v.getFirstParam() == ErrorCode.ERR_DEVICEEXISTS) { + Assert.assertNotNull(v.getSecondParam()); + Assert.assertNotNull(v.getSecondParam().getId()); + Assert.assertEquals(v.getSecondParam().getStatus(), ObjectStatus.NORMAL); + } else { + Assert.assertNull(v.getSecondParam()); + } + }); + } + + /** + * A 2 Add dispose device list + */ + @Test + public void a2_upgradeDisposeDeviceTest() throws JsonProcessingException { + List devList = new ArrayList<>(); + + for (int i = 1; i < 3; i++) { + String ipAddr = "192.168.0." + i; + + DisposeDevice dev = DisposeDevice.builder() + .ipAddr(ipAddr) + .ipPort("") + .deviceType(DisposeDeviceType.DPTECH_UMC) + .areaCode(0) + .deviceName("中移杭研实验室迪普清洗设备") + .manufacturer("DPTech") + .model("UMC") + .version("5.7.13") + .userName("admin") + .password("UMCAdministrator") + .urlPath("UMC/service/AbnormalFlowCleaningService") + .urlType(HttpType.HTTP) + .readme("实验室测试设备") + .status(ObjectStatus.NORMAL) + .build(); + + devList.add(dev); + } + + disposeDeviceManagerService.addDisposeDevice(devList); + log.info(objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(devList)); + + devList.forEach(dev->{ + dev.setDeviceName("测试清洗设备"); + dev.setManufacturer("Unknown"); + }); + + List> ret = disposeDeviceManagerService.upgradeDisposeDevice(devList); + + ret.forEach(v->{ + if (v.getFirstParam() == ErrorCode.ERR_OK) { + Assert.assertNotNull(v.getSecondParam()); + Assert.assertEquals(v.getSecondParam().getDeviceName(), "测试清洗设备"); + Assert.assertEquals(v.getSecondParam().getManufacturer(), "Unknown"); + } else { + Assert.assertNull(v.getSecondParam()); + } + }); + } + + /** + * A 3 remove dispose device test. + */ + @Test + public void a3_removeDisposeDeviceTest() throws JsonProcessingException { + List devList = new ArrayList<>(); + List removeIds = new ArrayList<>(); + + for (int i = 1; i < 3; i++) { + String ipAddr = "192.168.0." + i; + + DisposeDevice dev = DisposeDevice.builder() + .ipAddr(ipAddr) + .ipPort("") + .deviceType(DisposeDeviceType.DPTECH_UMC) + .areaCode(0) + .deviceName("中移杭研实验室迪普清洗设备") + .manufacturer("DPTech") + .model("UMC") + .version("5.7.13") + .userName("admin") + .password("UMCAdministrator") + .urlPath("UMC/service/AbnormalFlowCleaningService") + .urlType(HttpType.HTTP) + .readme("实验室测试设备") + .status(ObjectStatus.NORMAL) + .build(); + + devList.add(dev); + } + + disposeDeviceManagerService.addDisposeDevice(devList); + log.info(objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(devList)); + + devList.forEach(dev-> removeIds.add(dev.getId())); + + List> ret = disposeDeviceManagerService.removeDisposeDevice(removeIds); + + ret.forEach(v->{ + if (v.getFirstParam() == ErrorCode.ERR_OK) { + Assert.assertNotNull(v.getSecondParam()); + Assert.assertEquals(v.getSecondParam().getStatus(), ObjectStatus.DELETED); + } else { + Assert.assertNotNull(v.getSecondParam()); + Assert.assertNotEquals(v.getSecondParam().getStatus(), ObjectStatus.DELETED); + } + }); + } +}