pull/9585/merge
Andy Wilkinson 8 years ago
parent 0aa0fd0670
commit 99d53a5980

@ -21,9 +21,11 @@ import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.autoconfigure.json.app.ExampleBasicObject; import org.springframework.boot.test.autoconfigure.json.app.ExampleBasicObject;
import org.springframework.boot.test.autoconfigure.json.app.ExampleJsonApplication;
import org.springframework.boot.test.json.BasicJsonTester; import org.springframework.boot.test.json.BasicJsonTester;
import org.springframework.boot.test.json.GsonTester; import org.springframework.boot.test.json.GsonTester;
import org.springframework.boot.test.json.JacksonTester; import org.springframework.boot.test.json.JacksonTester;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringRunner; import org.springframework.test.context.junit4.SpringRunner;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
@ -36,6 +38,7 @@ import static org.assertj.core.api.Assertions.assertThat;
@RunWith(SpringRunner.class) @RunWith(SpringRunner.class)
@JsonTest @JsonTest
@AutoConfigureJsonTesters(enabled = false) @AutoConfigureJsonTesters(enabled = false)
@ContextConfiguration(classes = ExampleJsonApplication.class)
public class JsonTestWithAutoConfigureJsonTestersTests { public class JsonTestWithAutoConfigureJsonTestersTests {
@Autowired(required = false) @Autowired(required = false)

@ -21,10 +21,12 @@ import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.autoconfigure.json.app.ExampleBasicObject; import org.springframework.boot.test.autoconfigure.json.app.ExampleBasicObject;
import org.springframework.boot.test.autoconfigure.json.app.ExampleJsonApplication;
import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.json.BasicJsonTester; import org.springframework.boot.test.json.BasicJsonTester;
import org.springframework.boot.test.json.GsonTester; import org.springframework.boot.test.json.GsonTester;
import org.springframework.boot.test.json.JacksonTester; import org.springframework.boot.test.json.JacksonTester;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringRunner; import org.springframework.test.context.junit4.SpringRunner;
/** /**
@ -35,6 +37,7 @@ import org.springframework.test.context.junit4.SpringRunner;
@RunWith(SpringRunner.class) @RunWith(SpringRunner.class)
@SpringBootTest @SpringBootTest
@AutoConfigureJsonTesters @AutoConfigureJsonTesters
@ContextConfiguration(classes = ExampleJsonApplication.class)
public class SpringBootTestWithAutoConfigureJsonTestersTests { public class SpringBootTestWithAutoConfigureJsonTestersTests {
@Autowired @Autowired

Loading…
Cancel
Save