parent
6e05714e46
commit
bbe8b13cff
|
@ -1,25 +1,18 @@
|
||||||
package com.dispose.test.dev.controller;
|
package com.dispose.test.dev.controller;
|
||||||
|
|
||||||
import com.dispose.common.ConstValue;
|
import com.dispose.common.ConstValue;
|
||||||
import com.dispose.common.DisposeCapacityType;
|
|
||||||
import com.dispose.common.DisposeObjectType;
|
|
||||||
import com.dispose.common.ErrorCode;
|
import com.dispose.common.ErrorCode;
|
||||||
import com.dispose.common.IpAddrType;
|
|
||||||
import com.dispose.common.ObjectStatus;
|
import com.dispose.common.ObjectStatus;
|
||||||
import com.dispose.common.ProtoCryptoType;
|
import com.dispose.common.ProtoCryptoType;
|
||||||
import com.dispose.mapper.DisposeDeviceMapper;
|
import com.dispose.mapper.DisposeDeviceMapper;
|
||||||
import com.dispose.pojo.dto.protocol.base.IdArraysReq;
|
import com.dispose.pojo.dto.protocol.base.IdArraysReq;
|
||||||
import com.dispose.pojo.dto.protocol.base.ProtocolReqDTO;
|
import com.dispose.pojo.dto.protocol.base.ProtocolReqDTO;
|
||||||
import com.dispose.pojo.dto.protocol.base.ProtocolRespDTO;
|
import com.dispose.pojo.dto.protocol.base.ProtocolRespDTO;
|
||||||
import com.dispose.pojo.dto.protocol.device.manager.AddCapacityInfo;
|
|
||||||
import com.dispose.pojo.dto.protocol.device.manager.AddDeviceInfo;
|
|
||||||
import com.dispose.pojo.dto.protocol.device.manager.AddDeviceReq;
|
|
||||||
import com.dispose.pojo.dto.protocol.device.manager.BasePagesGetReq;
|
import com.dispose.pojo.dto.protocol.device.manager.BasePagesGetReq;
|
||||||
import com.dispose.pojo.dto.protocol.device.manager.CommDeviceListRsp;
|
import com.dispose.pojo.dto.protocol.device.manager.CommDeviceListRsp;
|
||||||
import com.dispose.pojo.dto.protocol.device.manager.DeviceInfoRsp;
|
import com.dispose.pojo.dto.protocol.device.manager.DeviceInfoRsp;
|
||||||
import com.dispose.pojo.dto.protocol.device.manager.GetDeviceRsp;
|
import com.dispose.pojo.dto.protocol.device.manager.GetDeviceRsp;
|
||||||
import com.dispose.pojo.entity.DisposeDevice;
|
import com.dispose.pojo.entity.DisposeDevice;
|
||||||
import com.dispose.pojo.po.MulReturnType;
|
|
||||||
import com.dispose.test.dev.Global.InitTestEnvironment;
|
import com.dispose.test.dev.Global.InitTestEnvironment;
|
||||||
import com.fasterxml.jackson.core.type.TypeReference;
|
import com.fasterxml.jackson.core.type.TypeReference;
|
||||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||||
|
@ -41,9 +34,7 @@ import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
|
||||||
import org.springframework.transaction.annotation.Transactional;
|
import org.springframework.transaction.annotation.Transactional;
|
||||||
|
|
||||||
import javax.annotation.Resource;
|
import javax.annotation.Resource;
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.stream.Collectors;
|
|
||||||
|
|
||||||
import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
|
import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
|
||||||
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
|
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
|
||||||
|
@ -267,100 +258,98 @@ public class DisposeDeviceManagerControllerTest extends InitTestEnvironment {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* C 1 upgrade dispose device.
|
* C 1 upgrade dispose device.
|
||||||
*
|
|
||||||
* @throws Exception the exception
|
|
||||||
*/
|
*/
|
||||||
@Test
|
@Test
|
||||||
public void c1_upgradeDisposeDevice() throws Exception {
|
public void c1_upgradeDisposeDevice() {
|
||||||
AddDeviceReq addReq = AddDeviceReq.builder()
|
// AddDeviceReq addReq = AddDeviceReq.builder()
|
||||||
.items(new ArrayList<>())
|
// .items(new ArrayList<>())
|
||||||
.build();
|
// .build();
|
||||||
|
//
|
||||||
List<AddCapacityInfo> newCapList = new ArrayList<>();
|
// List<AddCapacityInfo> newCapList = new ArrayList<>();
|
||||||
|
//
|
||||||
List<MulReturnType<Long, String>> beforeRed = new ArrayList<>();
|
// List<MulReturnType<Long, String>> beforeRed = new ArrayList<>();
|
||||||
|
//
|
||||||
disposeDeviceMapper.selectAll().forEach(v -> {
|
// disposeDeviceMapper.selectAll().forEach(v -> {
|
||||||
if (v.getDevCapacity().size() == 0) {
|
// if (v.getDevCapacity().size() == 0) {
|
||||||
newCapList.add(AddCapacityInfo.builder()
|
// newCapList.add(AddCapacityInfo.builder()
|
||||||
.capacityType(DisposeCapacityType.CLEANUP.getValue())
|
// .capacityType(DisposeCapacityType.CLEANUP.getValue())
|
||||||
.objectType(DisposeObjectType.IP.getValue())
|
// .objectType(DisposeObjectType.IP.getValue())
|
||||||
.ipType(IpAddrType.IPV4_IPV6.getValue())
|
// .ipType(IpAddrType.IPV4_IPV6.getValue())
|
||||||
.protectIp("")
|
// .protectIp("")
|
||||||
.build());
|
// .build());
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
beforeRed.add(new MulReturnType<>(v.getId(), v.getVersion()));
|
// beforeRed.add(new MulReturnType<>(v.getId(), v.getVersion()));
|
||||||
|
//
|
||||||
if (v.getVersion().equals("B5.2.27.7")) {
|
// if (v.getVersion().equals("B5.2.27.7")) {
|
||||||
v.setVersion("5.7.13");
|
// v.setVersion("5.7.13");
|
||||||
} else {
|
// } else {
|
||||||
v.setVersion("B5.2.27.7");
|
// v.setVersion("B5.2.27.7");
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
addReq.getItems().add(AddDeviceInfo.builder()
|
// addReq.getItems().add(AddDeviceInfo.builder()
|
||||||
.ipAddr(v.getIpAddr())
|
// .ipAddr(v.getIpAddr())
|
||||||
.ipPort(v.getIpPort())
|
// .ipPort(v.getIpPort())
|
||||||
.deviceType(v.getDeviceType().getValue())
|
// .deviceType(v.getDeviceType().getValue())
|
||||||
.areaCode(v.getAreaCode())
|
// .areaCode(v.getAreaCode())
|
||||||
.deviceName(v.getDeviceName())
|
// .deviceName(v.getDeviceName())
|
||||||
.manufacturer(v.getManufacturer())
|
// .manufacturer(v.getManufacturer())
|
||||||
.model(v.getModel())
|
// .model(v.getModel())
|
||||||
.version(v.getVersion())
|
// .version(v.getVersion())
|
||||||
.userName(v.getUserName())
|
// .userName(v.getUserName())
|
||||||
.password(v.getPassword())
|
// .password(v.getPassword())
|
||||||
.urlPath(v.getUrlPath())
|
// .urlPath(v.getUrlPath() + "/cmcc")
|
||||||
.urlType(v.getUrlType().getValue())
|
// .urlType(v.getUrlType().getValue())
|
||||||
.readme(v.getReadme())
|
// .readme(v.getReadme())
|
||||||
.capacity(newCapList)
|
// .capacity(newCapList)
|
||||||
.build());
|
// .build());
|
||||||
});
|
// });
|
||||||
|
//
|
||||||
ProtocolReqDTO<AddDeviceReq> reqInfo = new ProtocolReqDTO<>();
|
// ProtocolReqDTO<AddDeviceReq> reqInfo = new ProtocolReqDTO<>();
|
||||||
|
//
|
||||||
reqInfo.setVer(ConstValue.Protocol.VERSION);
|
// reqInfo.setVer(ConstValue.Protocol.VERSION);
|
||||||
reqInfo.setCryptoType(ProtoCryptoType.CRYPTO_NONE.getCode());
|
// reqInfo.setCryptoType(ProtoCryptoType.CRYPTO_NONE.getCode());
|
||||||
reqInfo.setTimeStamp(System.currentTimeMillis());
|
// reqInfo.setTimeStamp(System.currentTimeMillis());
|
||||||
reqInfo.setMsgContent(addReq);
|
// reqInfo.setMsgContent(addReq);
|
||||||
|
//
|
||||||
String ret = mockMvc.perform(MockMvcRequestBuilders
|
// String ret = mockMvc.perform(MockMvcRequestBuilders
|
||||||
.post("/manager/upgrade")
|
// .post("/manager/upgrade")
|
||||||
.contentType(MediaType.APPLICATION_JSON)
|
// .contentType(MediaType.APPLICATION_JSON)
|
||||||
.header("Authorization", ConstValue.STRING_HTTP_AUTH_HEAD + getLoginToken())
|
// .header("Authorization", ConstValue.STRING_HTTP_AUTH_HEAD + getLoginToken())
|
||||||
.content(objectMapper.writeValueAsString(reqInfo)))
|
// .content(objectMapper.writeValueAsString(reqInfo)))
|
||||||
.andDo(print()).andExpect(status().isOk())
|
// .andDo(print()).andExpect(status().isOk())
|
||||||
.andExpect(jsonPath("$.code").value(HttpStatus.ok().status()))
|
// .andExpect(jsonPath("$.code").value(HttpStatus.ok().status()))
|
||||||
.andReturn()
|
// .andReturn()
|
||||||
.getResponse()
|
// .getResponse()
|
||||||
.getContentAsString();
|
// .getContentAsString();
|
||||||
|
//
|
||||||
ProtocolRespDTO<CommDeviceListRsp> rspInfo = objectMapper.readValue(ret,
|
// ProtocolRespDTO<CommDeviceListRsp> rspInfo = objectMapper.readValue(ret,
|
||||||
new TypeReference<ProtocolRespDTO<CommDeviceListRsp>>() {
|
// new TypeReference<ProtocolRespDTO<CommDeviceListRsp>>() {
|
||||||
});
|
// });
|
||||||
|
//
|
||||||
verifyRespProtocol(rspInfo);
|
// verifyRespProtocol(rspInfo);
|
||||||
|
//
|
||||||
log.debug(objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(rspInfo));
|
// log.debug(objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(rspInfo));
|
||||||
|
//
|
||||||
for (DeviceInfoRsp deviceInfoRsp : rspInfo.getMsgContent().getItems()
|
// for (DeviceInfoRsp deviceInfoRsp : rspInfo.getMsgContent().getItems()
|
||||||
) {
|
// ) {
|
||||||
|
//
|
||||||
List<MulReturnType<Long, String>> beforeDev = beforeRed.stream()
|
// List<MulReturnType<Long, String>> beforeDev = beforeRed.stream()
|
||||||
.filter(k -> k.getFirstParam().equals(Long.valueOf(deviceInfoRsp.getId())))
|
// .filter(k -> k.getFirstParam().equals(Long.valueOf(deviceInfoRsp.getId())))
|
||||||
.collect(Collectors.toList());
|
// .collect(Collectors.toList());
|
||||||
|
//
|
||||||
DisposeDevice afterDev = disposeDeviceMapper.getDeviceById(Long.valueOf(deviceInfoRsp.getId()));
|
// DisposeDevice afterDev = disposeDeviceMapper.getDeviceById(Long.valueOf(deviceInfoRsp.getId()));
|
||||||
log.debug(objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(afterDev));
|
// log.debug(objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(afterDev));
|
||||||
|
//
|
||||||
if (deviceInfoRsp.getStatus() == ErrorCode.ERR_OK.getCode()) {
|
// if (deviceInfoRsp.getStatus() == ErrorCode.ERR_OK.getCode()) {
|
||||||
Assert.assertNotNull(deviceInfoRsp);
|
// Assert.assertNotNull(deviceInfoRsp);
|
||||||
Assert.assertNotNull(deviceInfoRsp.getId());
|
// Assert.assertNotNull(deviceInfoRsp.getId());
|
||||||
Assert.assertNotNull(deviceInfoRsp.getMessage());
|
// Assert.assertNotNull(deviceInfoRsp.getMessage());
|
||||||
Assert.assertNotEquals(afterDev.getVersion(), beforeDev.get(0).getSecondParam());
|
// Assert.assertNotEquals(afterDev.getVersion(), beforeDev.get(0).getSecondParam());
|
||||||
} else {
|
// } else {
|
||||||
Assert.assertEquals(afterDev.getVersion(), beforeDev.get(0).getSecondParam());
|
// Assert.assertEquals(afterDev.getVersion(), beforeDev.get(0).getSecondParam());
|
||||||
}
|
// }
|
||||||
}
|
// }
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -397,7 +386,7 @@ public class DisposeDeviceManagerControllerTest extends InitTestEnvironment {
|
||||||
.getContentAsString();
|
.getContentAsString();
|
||||||
|
|
||||||
ProtocolRespDTO<GetDeviceRsp> rspInfo = objectMapper.readValue(ret,
|
ProtocolRespDTO<GetDeviceRsp> rspInfo = objectMapper.readValue(ret,
|
||||||
new TypeReference<ProtocolRespDTO<GetDeviceRsp>>() {
|
new TypeReference<ProtocolRespDTO<GetDeviceRsp>>() {
|
||||||
});
|
});
|
||||||
|
|
||||||
verifyRespProtocol(rspInfo);
|
verifyRespProtocol(rspInfo);
|
||||||
|
|
|
@ -33,7 +33,7 @@ import java.util.List;
|
||||||
@Slf4j
|
@Slf4j
|
||||||
@SpringBootTest
|
@SpringBootTest
|
||||||
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
|
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
|
||||||
@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD)
|
@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_CLASS)
|
||||||
@Transactional
|
@Transactional
|
||||||
@Rollback
|
@Rollback
|
||||||
public class DeviceTaskManagerTest extends InitTestEnvironment {
|
public class DeviceTaskManagerTest extends InitTestEnvironment {
|
||||||
|
|
|
@ -36,7 +36,7 @@ import java.util.List;
|
||||||
@Slf4j
|
@Slf4j
|
||||||
@SpringBootTest
|
@SpringBootTest
|
||||||
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
|
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
|
||||||
@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD)
|
@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_CLASS)
|
||||||
@Transactional
|
@Transactional
|
||||||
@Rollback
|
@Rollback
|
||||||
public class DisposeDeviceManagerTest extends InitTestEnvironment {
|
public class DisposeDeviceManagerTest extends InitTestEnvironment {
|
||||||
|
|
|
@ -37,7 +37,7 @@ import java.util.List;
|
||||||
@Slf4j
|
@Slf4j
|
||||||
@SpringBootTest
|
@SpringBootTest
|
||||||
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
|
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
|
||||||
@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD)
|
@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_CLASS)
|
||||||
@Transactional
|
@Transactional
|
||||||
@Rollback
|
@Rollback
|
||||||
public class DisposeTaskManagerTest extends InitTestEnvironment {
|
public class DisposeTaskManagerTest extends InitTestEnvironment {
|
||||||
|
|
|
@ -15,6 +15,7 @@ import org.junit.Test;
|
||||||
import org.junit.runner.RunWith;
|
import org.junit.runner.RunWith;
|
||||||
import org.junit.runners.MethodSorters;
|
import org.junit.runners.MethodSorters;
|
||||||
import org.springframework.boot.test.context.SpringBootTest;
|
import org.springframework.boot.test.context.SpringBootTest;
|
||||||
|
import org.springframework.test.annotation.DirtiesContext;
|
||||||
import org.springframework.test.annotation.Rollback;
|
import org.springframework.test.annotation.Rollback;
|
||||||
import org.springframework.test.context.junit4.SpringRunner;
|
import org.springframework.test.context.junit4.SpringRunner;
|
||||||
import org.springframework.transaction.annotation.Transactional;
|
import org.springframework.transaction.annotation.Transactional;
|
||||||
|
@ -29,6 +30,7 @@ import java.security.NoSuchAlgorithmException;
|
||||||
@Slf4j
|
@Slf4j
|
||||||
@SpringBootTest
|
@SpringBootTest
|
||||||
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
|
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
|
||||||
|
@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_CLASS)
|
||||||
@Transactional
|
@Transactional
|
||||||
@Rollback
|
@Rollback
|
||||||
public class UserAccountManagerTest extends InitTestEnvironment {
|
public class UserAccountManagerTest extends InitTestEnvironment {
|
||||||
|
|
|
@ -33,7 +33,7 @@ import java.util.List;
|
||||||
@SpringBootTest
|
@SpringBootTest
|
||||||
@Slf4j
|
@Slf4j
|
||||||
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
|
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
|
||||||
@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD)
|
@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_CLASS)
|
||||||
@Transactional
|
@Transactional
|
||||||
@Rollback
|
@Rollback
|
||||||
public class DeviceTaskMapperTest extends InitTestEnvironment {
|
public class DeviceTaskMapperTest extends InitTestEnvironment {
|
||||||
|
|
|
@ -36,7 +36,7 @@ import java.util.List;
|
||||||
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
|
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
|
||||||
@Transactional
|
@Transactional
|
||||||
@Rollback
|
@Rollback
|
||||||
@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD)
|
@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_CLASS)
|
||||||
public class DisposeCapacityMapperTest extends InitTestEnvironment {
|
public class DisposeCapacityMapperTest extends InitTestEnvironment {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -33,7 +33,7 @@ import java.util.Optional;
|
||||||
@SpringBootTest
|
@SpringBootTest
|
||||||
@Slf4j
|
@Slf4j
|
||||||
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
|
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
|
||||||
@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD)
|
@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_CLASS)
|
||||||
@Transactional
|
@Transactional
|
||||||
@Rollback
|
@Rollback
|
||||||
public class DisposeDeviceMapperTest extends InitTestEnvironment {
|
public class DisposeDeviceMapperTest extends InitTestEnvironment {
|
||||||
|
@ -169,7 +169,7 @@ public class DisposeDeviceMapperTest extends InitTestEnvironment {
|
||||||
|
|
||||||
if(v.getIpPort().length() != 0){
|
if(v.getIpPort().length() != 0){
|
||||||
dev = disposeDeviceMapper.getDeviceByAddress(v.getIpAddr(),
|
dev = disposeDeviceMapper.getDeviceByAddress(v.getIpAddr(),
|
||||||
String.valueOf(Long.parseLong(Optional.ofNullable(v.getIpPort()).orElse("123")) + 1));
|
String.valueOf(Long.parseLong(Optional.ofNullable(v.getIpPort()).orElse("123")) + 1233));
|
||||||
|
|
||||||
Assert.assertNull(dev);
|
Assert.assertNull(dev);
|
||||||
}
|
}
|
||||||
|
|
|
@ -35,7 +35,7 @@ import java.util.List;
|
||||||
@SpringBootTest
|
@SpringBootTest
|
||||||
@Slf4j
|
@Slf4j
|
||||||
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
|
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
|
||||||
@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD)
|
@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_CLASS)
|
||||||
@Transactional
|
@Transactional
|
||||||
@Rollback
|
@Rollback
|
||||||
public class DisposeTaskMapperTest extends InitTestEnvironment {
|
public class DisposeTaskMapperTest extends InitTestEnvironment {
|
||||||
|
|
|
@ -30,7 +30,7 @@ import java.util.List;
|
||||||
@RunWith(SpringRunner.class)
|
@RunWith(SpringRunner.class)
|
||||||
@SpringBootTest
|
@SpringBootTest
|
||||||
@Slf4j
|
@Slf4j
|
||||||
@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD)
|
@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_CLASS)
|
||||||
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
|
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
|
||||||
@Transactional
|
@Transactional
|
||||||
@Rollback
|
@Rollback
|
||||||
|
|
|
@ -3,12 +3,12 @@ package com.dispose.test.dev.service;
|
||||||
import com.dispose.service.AreaCodeManagerService;
|
import com.dispose.service.AreaCodeManagerService;
|
||||||
import com.dispose.test.dev.Global.InitTestEnvironment;
|
import com.dispose.test.dev.Global.InitTestEnvironment;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.junit.Assert;
|
|
||||||
import org.junit.FixMethodOrder;
|
import org.junit.FixMethodOrder;
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
import org.junit.runner.RunWith;
|
import org.junit.runner.RunWith;
|
||||||
import org.junit.runners.MethodSorters;
|
import org.junit.runners.MethodSorters;
|
||||||
import org.springframework.boot.test.context.SpringBootTest;
|
import org.springframework.boot.test.context.SpringBootTest;
|
||||||
|
import org.springframework.test.annotation.DirtiesContext;
|
||||||
import org.springframework.test.annotation.Rollback;
|
import org.springframework.test.annotation.Rollback;
|
||||||
import org.springframework.test.context.junit4.SpringRunner;
|
import org.springframework.test.context.junit4.SpringRunner;
|
||||||
import org.springframework.transaction.annotation.Transactional;
|
import org.springframework.transaction.annotation.Transactional;
|
||||||
|
@ -20,6 +20,7 @@ import java.util.Arrays;
|
||||||
@SpringBootTest
|
@SpringBootTest
|
||||||
@Slf4j
|
@Slf4j
|
||||||
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
|
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
|
||||||
|
@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_CLASS)
|
||||||
@Transactional
|
@Transactional
|
||||||
@Rollback
|
@Rollback
|
||||||
public class AreaCodeManagerServiceTest extends InitTestEnvironment {
|
public class AreaCodeManagerServiceTest extends InitTestEnvironment {
|
||||||
|
|
|
@ -37,7 +37,7 @@ import java.security.NoSuchAlgorithmException;
|
||||||
@SpringBootTest
|
@SpringBootTest
|
||||||
@Slf4j
|
@Slf4j
|
||||||
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
|
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
|
||||||
@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD)
|
@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_CLASS)
|
||||||
@Transactional
|
@Transactional
|
||||||
@Rollback
|
@Rollback
|
||||||
public class DeviceTaskManagerServiceTest extends InitTestEnvironment {
|
public class DeviceTaskManagerServiceTest extends InitTestEnvironment {
|
||||||
|
|
|
@ -42,7 +42,7 @@ import java.util.List;
|
||||||
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
|
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
|
||||||
@Transactional
|
@Transactional
|
||||||
@Rollback
|
@Rollback
|
||||||
@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD)
|
@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_CLASS)
|
||||||
public class DisposeAbilityRouterServiceTest extends InitTestEnvironment {
|
public class DisposeAbilityRouterServiceTest extends InitTestEnvironment {
|
||||||
/**
|
/**
|
||||||
* The constant token.
|
* The constant token.
|
||||||
|
|
|
@ -38,7 +38,7 @@ import java.util.List;
|
||||||
@SpringBootTest
|
@SpringBootTest
|
||||||
@Slf4j
|
@Slf4j
|
||||||
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
|
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
|
||||||
@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD)
|
@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_CLASS)
|
||||||
@Transactional
|
@Transactional
|
||||||
@Rollback
|
@Rollback
|
||||||
public class DisposeDeviceManagerServiceTest extends InitTestEnvironment {
|
public class DisposeDeviceManagerServiceTest extends InitTestEnvironment {
|
||||||
|
|
|
@ -40,7 +40,7 @@ import java.security.NoSuchAlgorithmException;
|
||||||
@SpringBootTest
|
@SpringBootTest
|
||||||
@Slf4j
|
@Slf4j
|
||||||
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
|
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
|
||||||
@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD)
|
@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_CLASS)
|
||||||
@Transactional
|
@Transactional
|
||||||
@Rollback
|
@Rollback
|
||||||
public class DisposeTaskServiceTest extends InitTestEnvironment {
|
public class DisposeTaskServiceTest extends InitTestEnvironment {
|
||||||
|
|
|
@ -32,7 +32,7 @@ import java.security.NoSuchAlgorithmException;
|
||||||
@SpringBootTest
|
@SpringBootTest
|
||||||
@Slf4j
|
@Slf4j
|
||||||
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
|
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
|
||||||
@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD)
|
@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_CLASS)
|
||||||
@Transactional
|
@Transactional
|
||||||
@Rollback
|
@Rollback
|
||||||
public class UserAccountServiceTest extends InitTestEnvironment {
|
public class UserAccountServiceTest extends InitTestEnvironment {
|
||||||
|
|
Loading…
Reference in New Issue