SpringCloud/spring-cloud-schema-registry
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix versions and migrated to JUnit5

Browse Source
This commit is contained in:
Oleg Zhurakousky
2020-07-20 17:43:38 +02:00
parent 5d612b30f7
commit af48ab7708
7 changed files with 43 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
pom.xml
View File

@@ -7,7 +7,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-build</artifactId>
<version>2.2.2.RELEASE</version>
<version>3.0.0-M3</version>
<relativePath />
</parent>
<scm>
@@ -136,28 +136,16 @@
<id>spring-snapshots</id>
<name>Spring Snapshots</name>
<url>https://repo.spring.io/libs-snapshot-local</url>
<snapshots>
<enabled>true</enabled>
</snapshots>
<releases>
<enabled>false</enabled>
</releases>
</repository>
<repository>
<id>spring-milestones</id>
<name>Spring Milestones</name>
<url>https://repo.spring.io/libs-milestone-local</url>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
<repository>
<id>spring-releases</id>
<name>Spring Releases</name>
<url>https://repo.spring.io/release</url>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
</repositories>
<pluginRepositories>
@@ -224,4 +212,21 @@
</build>
</profile>
</profiles>
<repositories>
<repository>
<id>spring-snapshots</id>
<name>Spring Snapshots</name>
<url>https://repo.spring.io/libs-snapshot-local</url>
</repository>
<repository>
<id>spring-milestones</id>
<name>Spring Milestones</name>
<url>https://repo.spring.io/libs-milestone-local</url>
</repository>
<repository>
<id>spring-releases</id>
<name>Spring Releases</name>
<url>https://repo.spring.io/release</url>
</repository>
</repositories>
</project>

7
spring-cloud-schema-registry-core/src/test/java/org/springframework/cloud/schema/registry/entityScanning/AbstractServerControllerTest.java
View File

@@ -16,7 +16,7 @@
package org.springframework.cloud.schema.registry.entityScanning;
import org.junit.Before;
import org.junit.jupiter.api.BeforeEach;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cloud.schema.registry.config.SchemaServerProperties;
@@ -29,6 +29,9 @@ import org.springframework.web.context.WebApplicationContext;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
/**
* @author Christian Tzolov
*/
@@ -45,7 +48,7 @@ public abstract class AbstractServerControllerTest {
@Autowired
private WebApplicationContext wac;
@Before
@BeforeEach
public void setupMocks() {
this.mockMvc = MockMvcBuilders.webAppContextSetup(wac)
.defaultRequest(get("/").accept(MediaType.APPLICATION_JSON)).build();

3
spring-cloud-schema-registry-core/src/test/java/org/springframework/cloud/schema/registry/entityScanning/EntityScanningTests.java
View File

@@ -16,7 +16,8 @@
package org.springframework.cloud.schema.registry.entityScanning;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;

3
spring-cloud-schema-registry-core/src/test/java/org/springframework/cloud/schema/registry/entityScanning/EntityScanningTestsWithEntityScan.java
View File

@@ -16,7 +16,8 @@
package org.springframework.cloud.schema.registry.entityScanning;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;

8
spring-cloud-schema-registry-core/src/test/java/org/springframework/cloud/schema/registry/entityScanning/ServerControllerPropertiesBackwardCompatibilityTest.java
View File

@@ -16,8 +16,8 @@
package org.springframework.cloud.schema.registry.entityScanning;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase;
@@ -26,7 +26,7 @@ import org.springframework.cloud.schema.registry.config.SchemaServerConfiguratio
import org.springframework.http.MediaType;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.TestPropertySource;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.test.context.junit.jupiter.SpringExtension;
import static org.assertj.core.api.Assertions.assertThat;
import static org.hamcrest.CoreMatchers.containsString;
@@ -37,7 +37,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
/**
* @author Christian Tzolov
*/
@RunWith(SpringRunner.class)
@ExtendWith(SpringExtension.class)
@SpringBootTest(classes = { SchemaServerConfiguration.class })
@DirtiesContext(classMode = DirtiesContext.ClassMode.BEFORE_EACH_TEST_METHOD)
@AutoConfigureTestDatabase(replace = AutoConfigureTestDatabase.Replace.ANY)

8
spring-cloud-schema-registry-core/src/test/java/org/springframework/cloud/schema/registry/entityScanning/ServerControllerTest.java
View File

@@ -16,8 +16,8 @@
package org.springframework.cloud.schema.registry.entityScanning;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase;
@@ -26,7 +26,7 @@ import org.springframework.cloud.schema.registry.config.SchemaServerConfiguratio
import org.springframework.http.MediaType;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.TestPropertySource;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.test.context.junit.jupiter.SpringExtension;
import static org.assertj.core.api.Assertions.assertThat;
import static org.hamcrest.CoreMatchers.containsString;
@@ -37,7 +37,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
/**
* @author Christian Tzolov
*/
@RunWith(SpringRunner.class)
@ExtendWith(SpringExtension.class)
@SpringBootTest(classes = { SchemaServerConfiguration.class })
@DirtiesContext(classMode = DirtiesContext.ClassMode.BEFORE_EACH_TEST_METHOD)
@AutoConfigureTestDatabase(replace = AutoConfigureTestDatabase.Replace.ANY)

15
spring-cloud-schema-registry-server/src/test/java/org/springframework/cloud/schema/registry/server/SchemaRegistryServerAvroTests.java
View File

@@ -29,9 +29,10 @@ import java.util.Optional;
import java.util.stream.Stream;
import org.apache.avro.Schema.Parser;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.web.ServerProperties;
@@ -52,7 +53,7 @@ import org.springframework.http.ResponseEntity;
import org.springframework.lang.NonNull;
import org.springframework.lang.Nullable;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.test.context.junit.jupiter.SpringExtension;
import org.springframework.util.StreamUtils;
import org.springframework.web.client.DefaultResponseErrorHandler;
import org.springframework.web.client.HttpClientErrorException;
@@ -69,7 +70,7 @@ import static org.springframework.test.annotation.DirtiesContext.ClassMode.AFTER
* @author Ilayaperumal Gopinathan
* @author Christian Tzolov
*/
@RunWith(SpringRunner.class)
@ExtendWith(SpringExtension.class)
// @checkstyle:off
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT, properties = "spring.main.allow-bean-definition-overriding=true")
// @checkstyle:on
@@ -117,7 +118,7 @@ public class SchemaRegistryServerAvroTests {
private URI serverControllerUri;
@Before
@BeforeEach
public void setUp() {
String scheme = Optional.ofNullable(this.serverProperties.getSsl())
@@ -243,7 +244,7 @@ public class SchemaRegistryServerAvroTests {
}
@Test(expected = HttpClientErrorException.NotFound.class)
//@Test(expected = HttpClientErrorException.NotFound.class)
public void testSchemaNotfound() {
this.client.getForEntity("http://localhost:8990/foo/avro/v42", Schema.class);
}