Commit 2fd1aac8 authored by 技术部-任文超's avatar 技术部-任文超

JUnit命名规范Test结尾

parent 2f760545
......@@ -785,7 +785,7 @@ public class InnerController implements IBaseController {
}
@ApiResponses({
@ApiResponse(code = 200, message = "Nice!", responseContainer = "UserAssociationModel = {Long id, String uuid, String phoneNo, String idNo, String name, String gender, String marryStatus, String educationEnum, String occupationEnum, String qq, Long registerFrom, Long merchantId, List<AddressModel> addressList, List<ContactModel> contactList}"),
@ApiResponse(code = 200, message = "Nice!", responseContainer = "UserAssociationModel = {Long id, String uuid, String phoneNo, String idNo, String name, String gender, String marryStatus, String educationEnum, String occupationEnum, String qq, Long registerFrom, Long merchantId, List<AddressModel> addressList, List<ContactModel> contactList}"),
@ApiResponse(code = 400, message = "Invalid params supplied", response = cn.quantgroup.xyqb.model.ApiResponse.class),
@ApiResponse(code = 404, message = "User not found", response = cn.quantgroup.xyqb.model.ApiResponse.class)
})
......
......@@ -5,4 +5,4 @@ import service.QuantgroupCaptchaServiceTest;
@RunWith(Suite.class)
@Suite.SuiteClasses({GeetestCaptchaServiceTest.class, QuantgroupCaptchaServiceTest.class})
public class CaptchaVerifyTests {}
\ No newline at end of file
public class CaptchaVerifyTest {}
\ No newline at end of file
import demo.*;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
@RunWith(Suite.class)
@Suite.SuiteClasses({DynamicTest.class, MockMvcTest.class, MvcTest.class,
ParametersJunit4Test.class, ParametersJunit5Test.class,
RepsitoryJpaTest.class, RepsitoryTest.class, ServiceTest.class, WebTest.class})
public class DemoTest {}
\ No newline at end of file
import demo.*;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
@RunWith(Suite.class)
@Suite.SuiteClasses({DynamicTests.class, MockMvcTests.class, MvcTests.class,
ParametersJunit4Tests.class, ParametersJunit5Tests.class,
RepsitoryJpaTests.class, RepsitoryTests.class, ServiceTests.class, WebTests.class})
public class DemoTests {}
\ No newline at end of file
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
import repsitory.UserAuthorizedRepsitoryTest;
import service.UserAuthorizedServiceTest;
import web.UserAuthorizedControllerTest;
@RunWith(Suite.class)
@Suite.SuiteClasses({UserAuthorizedRepsitoryTest.class, UserAuthorizedServiceTest.class, UserAuthorizedControllerTest.class})
public class UserAuthorizedTest {}
\ No newline at end of file
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
import repsitory.UserAuthorizedRepsitoryTests;
import service.UserAuthorizedServiceTests;
import web.UserAuthorizedControllerTests;
@RunWith(Suite.class)
@Suite.SuiteClasses({UserAuthorizedRepsitoryTests.class, UserAuthorizedServiceTests.class, UserAuthorizedControllerTests.class})
public class UserAuthorizedTests {}
\ No newline at end of file
......@@ -18,7 +18,7 @@ import cn.quantgroup.xyqb.util.ValidationUtil;
@Slf4j
@RunWith(JUnit4.class)
public class TestJdk8 {
public class Jdk8Test {
final static String RANDOM_CHARS = "0123456789";
@Test
......
......@@ -9,7 +9,7 @@ import cn.quantgroup.xyqb.util.ValidationUtil;
@Slf4j
@RunWith(JUnit4.class)
public class TestValidationUtil {
public class ValidationUtilTest {
public static void main(String[] args){
String[][] contacts = {
......
......@@ -8,7 +8,7 @@ import org.springframework.test.context.junit4.AbstractTransactionalJUnit4Spring
* @author renwc
* @date 2018-01-05
*/
public abstract class BaseParametersTests extends AbstractTransactionalJUnit4SpringContextTests {
public abstract class BaseParametersTest extends AbstractTransactionalJUnit4SpringContextTests {
private TestContextManager testContextManager;
@Before
public void setUpContext() throws Exception {
......
......@@ -19,7 +19,7 @@ import static org.junit.jupiter.api.DynamicTest.dynamicTest;
* @date 2018-01-05
*/
@Tag("Test Factory")
public class DynamicTests {
public class DynamicTest {
// This will result in a JUnitException!
@Disabled
......@@ -29,7 +29,7 @@ public class DynamicTests {
}
@TestFactory
Collection<DynamicTest> dynamicTestsFromCollection() {
Collection<org.junit.jupiter.api.DynamicTest> dynamicTestsFromCollection() {
return Arrays.asList(
dynamicTest("1st dynamic test", () -> assertTrue(true)),
dynamicTest("2nd dynamic test", () -> assertEquals(4, 2 * 2))
......@@ -37,7 +37,7 @@ public class DynamicTests {
}
@TestFactory
Iterable<DynamicTest> dynamicTestsFromIterable() {
Iterable<org.junit.jupiter.api.DynamicTest> dynamicTestsFromIterable() {
return Arrays.asList(
dynamicTest("3rd dynamic test", () -> assertTrue(true)),
dynamicTest("4th dynamic test", () -> assertEquals(4, 2 * 2))
......@@ -45,7 +45,7 @@ public class DynamicTests {
}
@TestFactory
Iterator<DynamicTest> dynamicTestsFromIterator() {
Iterator<org.junit.jupiter.api.DynamicTest> dynamicTestsFromIterator() {
return Arrays.asList(
dynamicTest("5th dynamic test", () -> assertTrue(true)),
dynamicTest("6th dynamic test", () -> assertEquals(4, 2 * 2))
......@@ -53,20 +53,20 @@ public class DynamicTests {
}
@TestFactory
Stream<DynamicTest> dynamicTestsFromStream() {
Stream<org.junit.jupiter.api.DynamicTest> dynamicTestsFromStream() {
return Stream.of("A", "B", "C")
.map(str -> dynamicTest("test" + str, () -> { /* ... */ }));
}
@TestFactory
Stream<DynamicTest> dynamicTestsFromIntStream() {
Stream<org.junit.jupiter.api.DynamicTest> dynamicTestsFromIntStream() {
// Generates tests for the first 10 even integers.
return IntStream.iterate(0, n -> n + 2).limit(10)
.mapToObj(n -> dynamicTest("test" + n, () -> assertTrue(n % 2 == 0)));
}
@TestFactory
Stream<DynamicTest> generateRandomNumberOfTests() {
Stream<org.junit.jupiter.api.DynamicTest> generateRandomNumberOfTests() {
// Generates random positive integers between 0 and 100 until
// a number evenly divisible by 7 is encountered.
......@@ -94,7 +94,7 @@ public class DynamicTests {
ThrowingConsumer<Integer> testExecutor = (input) -> assertTrue(input % 7 != 0);
// Returns a stream of dynamic tests.
return DynamicTest.stream(inputGenerator, displayNameGenerator, testExecutor);
return org.junit.jupiter.api.DynamicTest.stream(inputGenerator, displayNameGenerator, testExecutor);
}
@TestFactory
......
......@@ -31,7 +31,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
@RunWith(SpringRunner.class)
@WebMvcTest({UserController.class})
@ContextConfiguration(classes = {JpaConfig.class, RedisConfig.class}, initializers = ApolloPropertySourceInitializer.class)
public class MockMvcTests {
public class MockMvcTest {
@Resource
private MockMvc mvc;
@MockBean
......
......@@ -26,7 +26,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
@RunWith(SpringRunner.class)
@SpringBootTest(classes = Bootstrap.class)
@ContextConfiguration(initializers = ApolloPropertySourceInitializer.class)
public class MvcTests {
public class MvcTest {
private MockMvc mvc;
@Resource
WebApplicationContext webApplicationConnect;
......
......@@ -15,10 +15,10 @@ import java.util.Collection;
*/
@Tag("Parameters")
@RunWith(value = Parameterized.class)
public class ParametersJunit4Tests {
public class ParametersJunit4Test {
private String key;
private int value;
public ParametersJunit4Tests(String key, int value) {
public ParametersJunit4Test(String key, int value) {
this.key = key;
this.value = value;
}
......
......@@ -17,7 +17,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
* @date 2018-01-05
*/
@Tag("Parameters")
public class ParametersJunit5Tests {
public class ParametersJunit5Test {
@ParameterizedTest
@ValueSource(strings = { "racecar", "radar", "able was I ere I saw elba" })
void palindromes(String candidate) {
......
......@@ -32,7 +32,7 @@ import java.time.Instant;
@DataJpaTest
@ContextConfiguration(classes = {JpaConfig.class, RedisConfig.class}, initializers = ApolloPropertySourceInitializer.class)
@AutoConfigureTestDatabase(replace= AutoConfigureTestDatabase.Replace.NONE)
public class RepsitoryJpaTests {
public class RepsitoryJpaTest {
@Resource
private TestEntityManager entityManager;
......
......@@ -29,7 +29,7 @@ import java.time.Instant;
@RunWith(SpringRunner.class)
@SpringBootTest(classes = Bootstrap.class)
@ContextConfiguration(initializers = ApolloPropertySourceInitializer.class)
public class RepsitoryTests extends AbstractTransactionalJUnit4SpringContextTests {
public class RepsitoryTest extends AbstractTransactionalJUnit4SpringContextTests {
@Resource
private IUserRepository userRepository;
......
......@@ -28,7 +28,7 @@ import java.time.Instant;
@RunWith(SpringRunner.class)
@SpringBootTest(classes = Bootstrap.class)
@ContextConfiguration(initializers = ApolloPropertySourceInitializer.class)
public class ServiceTests extends AbstractTransactionalJUnit4SpringContextTests {
public class ServiceTest extends AbstractTransactionalJUnit4SpringContextTests {
@Resource
private IUserService userService;
......
......@@ -26,7 +26,7 @@ import javax.annotation.Resource;
@RunWith(SpringRunner.class)
@SpringBootTest(classes = Bootstrap.class, webEnvironment= WebEnvironment.RANDOM_PORT)
@ContextConfiguration(initializers = ApolloPropertySourceInitializer.class)
public class WebTests {
public class WebTest {
@Resource
private TestRestTemplate restTemplate;
......
......@@ -3,7 +3,7 @@ package login;
import java.nio.charset.Charset;
import java.util.Base64;
public class TestStringCode {
public class StringCodeTest {
public static void main(String[] args) {
System.out.println(ap_base64("13461067662", "abc123"));
......
......@@ -34,7 +34,7 @@ import java.util.List;
@RunWith(SpringJUnit4ClassRunner.class)
@SpringBootTest(classes = Bootstrap.class )
@Slf4j
public class TestUserLogin {
public class UserLoginTest {
private MockHttpServletRequest request = new MockHttpServletRequest();;
......
......@@ -5,7 +5,7 @@ import cn.quantgroup.xyqb.entity.UserAuthorized;
import cn.quantgroup.xyqb.model.AuthPattern;
import cn.quantgroup.xyqb.repository.IUserAuthorizedRepository;
import com.ctrip.framework.apollo.spring.config.ApolloPropertySourceInitializer;
import demo.BaseParametersTests;
import demo.BaseParametersTest;
import lombok.extern.slf4j.Slf4j;
import org.junit.Assert;
import org.junit.Test;
......@@ -32,13 +32,13 @@ import java.util.Collection;
@RunWith(value = Parameterized.class)
@SpringBootTest(classes = Bootstrap.class)
@ContextConfiguration(initializers = ApolloPropertySourceInitializer.class)
public class UserAuthorizedRepsitoryTests extends BaseParametersTests {
public class UserAuthorizedRepsitoryTest extends BaseParametersTest {
@Resource
private IUserAuthorizedRepository userAuthorizedRepository;
UserAuthorized obj = new UserAuthorized();
public UserAuthorizedRepsitoryTests(String userUuid, String idNo, String name, AuthPattern authPattern, Boolean available) {
public UserAuthorizedRepsitoryTest(String userUuid, String idNo, String name, AuthPattern authPattern, Boolean available) {
obj.setUserUuid(userUuid);
obj.setIdNo(idNo);
obj.setName(name);
......
......@@ -6,7 +6,7 @@ import cn.quantgroup.xyqb.model.AuthPattern;
import cn.quantgroup.xyqb.model.UserAuthorizedParam;
import cn.quantgroup.xyqb.service.auth.IUserAuthorizedService;
import com.ctrip.framework.apollo.spring.config.ApolloPropertySourceInitializer;
import demo.BaseParametersTests;
import demo.BaseParametersTest;
import lombok.extern.slf4j.Slf4j;
import org.junit.Assert;
import org.junit.FixMethodOrder;
......@@ -36,13 +36,13 @@ import java.util.Optional;
@RunWith(value = Parameterized.class)
@SpringBootTest(classes = Bootstrap.class)
@ContextConfiguration(initializers = ApolloPropertySourceInitializer.class)
public class UserAuthorizedServiceTests extends BaseParametersTests {
public class UserAuthorizedServiceTest extends BaseParametersTest {
@Resource
private IUserAuthorizedService userAuthorizedService;
UserAuthorizedParam obj = new UserAuthorizedParam();
public UserAuthorizedServiceTests(String userUuid, String idNo, String name, AuthPattern authPattern, Boolean available) {
public UserAuthorizedServiceTest(String userUuid, String idNo, String name, AuthPattern authPattern, Boolean available) {
obj.setUserUuid(userUuid);
obj.setIdNo(idNo);
obj.setName(name);
......
......@@ -33,7 +33,7 @@ import java.util.List;
@Rollback
@Transactional
@RunWith(Parameterized.class)
public class TestUserService {
public class UserServiceTest {
private TestContextManager testContextManager;
......@@ -44,7 +44,7 @@ public class TestUserService {
private Address addressObj;
public TestUserService(Address addressObj) {
public UserServiceTest(Address addressObj) {
super();
this.addressObj = addressObj;
}
......
......@@ -4,7 +4,7 @@ import cn.quantgroup.xyqb.Bootstrap;
import cn.quantgroup.xyqb.model.AuthPattern;
import cn.quantgroup.xyqb.model.UserAuthorizedParam;
import com.ctrip.framework.apollo.spring.config.ApolloPropertySourceInitializer;
import demo.BaseParametersTests;
import demo.BaseParametersTest;
import lombok.extern.slf4j.Slf4j;
import org.junit.Assert;
import org.junit.Test;
......@@ -32,7 +32,7 @@ import java.util.Optional;
@RunWith(value = SpringRunner.class)
@SpringBootTest(classes = Bootstrap.class, webEnvironment= SpringBootTest.WebEnvironment.RANDOM_PORT)
@ContextConfiguration(initializers = ApolloPropertySourceInitializer.class)
public class UserAuthorizedControllerTests extends BaseParametersTests {
public class UserAuthorizedControllerTest extends BaseParametersTest {
@Resource
private TestRestTemplate restTemplate;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment