From 5880abc72bb1d5f827eb6c38145c1f64d0e84d40 Mon Sep 17 00:00:00 2001 From: Terekhin Alexander Date: Thu, 17 Sep 2020 18:09:46 +0300 Subject: [PATCH] Unmarshaller tests Ok --- .../me/bearns/fias/helper/XMLSourceHelper.java | 14 +++++++------- .../me/bearns/fias/service/StreamSaverTest.java | 12 ++++++++---- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/src/test/java/me/bearns/fias/helper/XMLSourceHelper.java b/src/test/java/me/bearns/fias/helper/XMLSourceHelper.java index d851802..7c0ff07 100644 --- a/src/test/java/me/bearns/fias/helper/XMLSourceHelper.java +++ b/src/test/java/me/bearns/fias/helper/XMLSourceHelper.java @@ -27,13 +27,13 @@ public class XMLSourceHelper { public static InputStream getAOStream() { final StringBuilder sba = new StringBuilder(); - sba.append("") + sba.append("") .append("") - .append("") - .append("") - .append("") - .append("") - .append("") + .append("") + .append("") + .append("") + .append("") + .append("") .append(""); return new ByteArrayInputStream(sba.toString().getBytes()); @@ -42,7 +42,7 @@ public class XMLSourceHelper { public static InputStream getHouseStream() { final StringBuilder sbh = new StringBuilder(); - sbh.append("?xml version=\"1.0\" encoding=\"utf-8\"?>") + sbh.append("") .append("") .append("") .append("") diff --git a/src/test/java/me/bearns/fias/service/StreamSaverTest.java b/src/test/java/me/bearns/fias/service/StreamSaverTest.java index be2c671..5a4ad06 100644 --- a/src/test/java/me/bearns/fias/service/StreamSaverTest.java +++ b/src/test/java/me/bearns/fias/service/StreamSaverTest.java @@ -5,14 +5,18 @@ import me.bearns.fias.helper.XMLSourceHelper; import me.bearns.fias.helpers.Catalog; import me.bearns.fias.helpers.UnmarshallerParameters; import org.junit.Test; +import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest; +import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.ActiveProfiles; +import org.springframework.test.context.junit4.SpringRunner; import java.io.InputStream; @ActiveProfiles("test") -@DataJpaTest +@RunWith(SpringRunner.class) +@SpringBootTest public class StreamSaverTest { private static final String AO_FILENAME = "AS_ADDROBJ_20200903_b02fb98f-354f-4ed4-af2f-467c5789989f.XML"; @@ -22,7 +26,7 @@ public class StreamSaverTest { private StreamSaver service; @Autowired - private static Catalog catalog; + private Catalog catalog; @Test public void addrobjTest() throws CommonException { @@ -37,9 +41,9 @@ public class StreamSaverTest { @Test public void houseTest() throws CommonException { - final UnmarshallerParameters config = catalog.getByPrefix(AO_FILENAME); + final UnmarshallerParameters config = catalog.getByPrefix(HOUSE_FILENAME); - final InputStream stream = XMLSourceHelper.getAOStream(); + final InputStream stream = XMLSourceHelper.getHouseStream(); service.process(stream, config, null); }