Use Gradle test fixture support for spring-core

See gh-23550
This commit is contained in:
Sam Brannen
2019-12-28 11:44:40 +01:00
parent 75fd391fc7
commit 5718bf424b
224 changed files with 552 additions and 453 deletions

View File

@@ -36,7 +36,7 @@ import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Text;
import org.springframework.tests.XmlContent;
import org.springframework.core.test.fixtures.xml.XmlContent;
import org.springframework.util.xml.StaxUtils;
import static org.assertj.core.api.Assertions.assertThat;

View File

@@ -46,6 +46,7 @@ import org.xmlunit.diff.DifferenceEvaluator;
import org.springframework.core.io.ClassPathResource;
import org.springframework.core.io.Resource;
import org.springframework.core.test.fixtures.xml.XmlContent;
import org.springframework.oxm.AbstractMarshallerTests;
import org.springframework.oxm.UncategorizedMappingException;
import org.springframework.oxm.XmlMappingException;
@@ -53,7 +54,6 @@ import org.springframework.oxm.jaxb.test.FlightType;
import org.springframework.oxm.jaxb.test.Flights;
import org.springframework.oxm.jaxb.test.ObjectFactory;
import org.springframework.oxm.mime.MimeContainer;
import org.springframework.tests.XmlContent;
import org.springframework.util.FileCopyUtils;
import org.springframework.util.ReflectionUtils;

View File

@@ -23,8 +23,8 @@ import javax.xml.transform.stream.StreamResult;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.EnabledOnJre;
import org.springframework.core.test.fixtures.xml.XmlContent;
import org.springframework.oxm.AbstractMarshallerTests;
import org.springframework.tests.XmlContent;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;

View File

@@ -56,7 +56,7 @@ import org.xml.sax.ContentHandler;
import org.xmlunit.builder.Input;
import org.xmlunit.xpath.JAXPXPathEngine;
import org.springframework.tests.XmlContent;
import org.springframework.core.test.fixtures.xml.XmlContent;
import org.springframework.util.xml.StaxUtils;
import static org.assertj.core.api.Assertions.assertThat;