Merge branch '2.7.x'

This commit is contained in:
Andy Wilkinson
2022-05-26 18:22:27 +01:00
35 changed files with 99 additions and 286 deletions

View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2020 the original author or authors.
* Copyright 2012-2022 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -28,12 +28,15 @@ import static org.assertj.core.api.Assertions.assertThat;
/**
* Tests for {@link MockBean} with abstract class and generics.
*
* @param <T> type of thing
* @param <U> type of something
* @author Madhura Bhave
*/
@SpringBootTest(classes = AbstractMockBeanOnGenericTests.TestConfiguration.class)
abstract class AbstractMockBeanOnGenericTests<T extends AbstractMockBeanOnGenericTests.Thing<U>, U extends AbstractMockBeanOnGenericTests.Something> {
@Autowired
@SuppressWarnings("unused")
private T thing;
@MockBean