diff --git a/src/test/java/me/bearns/fias/SchemeTest.java b/src/test/java/me/bearns/fias/SchemeTest.java index a2dd42e..37c78f7 100644 --- a/src/test/java/me/bearns/fias/SchemeTest.java +++ b/src/test/java/me/bearns/fias/SchemeTest.java @@ -24,6 +24,7 @@ public class SchemeTest { private final UUID aoID = UUID.randomUUID(); private final UUID firstHouseID = UUID.randomUUID(); private final UUID nextHouseID = UUID.randomUUID(); + private final String REGION_CODE = "22"; @Autowired private TestEntityManager entityManager; @@ -40,6 +41,7 @@ public class SchemeTest { final Addrobj addrobj = new Addrobj(); addrobj.aoid = aoID; addrobj.aoguid = aoID; + addrobj.regioncode = REGION_CODE; final House firstHouse = new House(); firstHouse.houseid = firstHouseID; @@ -73,6 +75,14 @@ public class SchemeTest { assertThat(firstAoguid.aoguid).isEqualByComparingTo(nextAoguid.aoguid); + final Optional addrobjRet = addrobjRepository.findByAoguid(aoID); + assertThat(addrobjRet.isPresent()).isTrue(); + + final Addrobj retval = addrobjRet.orElse(null); + + assertThat(retval).isNotNull(); + + assertThat(retval.regioncode).isEqualTo(REGION_CODE); } } diff --git a/src/test/java/me/bearns/fias/helper/XMLSourceHelper.java b/src/test/java/me/bearns/fias/helper/XMLSourceHelper.java new file mode 100644 index 0000000..d851802 --- /dev/null +++ b/src/test/java/me/bearns/fias/helper/XMLSourceHelper.java @@ -0,0 +1,56 @@ +package me.bearns.fias.helper; + +import java.io.ByteArrayInputStream; +import java.io.InputStream; + +public class XMLSourceHelper { + +/* + + + + + + + */ + + /* + + + + + + + +*/ + + public static InputStream getAOStream() { + final StringBuilder sba = new StringBuilder(); + + sba.append("") + .append("") + .append("") + .append("") + .append("") + .append("") + .append("") + .append(""); + + return new ByteArrayInputStream(sba.toString().getBytes()); + } + + public static InputStream getHouseStream() { + final StringBuilder sbh = new StringBuilder(); + + sbh.append("?xml version=\"1.0\" encoding=\"utf-8\"?>") + .append("") + .append("") + .append("") + .append("") + .append("") + .append("") + .append(""); + + return new ByteArrayInputStream(sbh.toString().getBytes()); + } +} diff --git a/src/test/java/me/bearns/fias/service/StreamSaverTest.java b/src/test/java/me/bearns/fias/service/StreamSaverTest.java new file mode 100644 index 0000000..be2c671 --- /dev/null +++ b/src/test/java/me/bearns/fias/service/StreamSaverTest.java @@ -0,0 +1,48 @@ +package me.bearns.fias.service; + +import me.bearns.fias.exceptions.CommonException; +import me.bearns.fias.helper.XMLSourceHelper; +import me.bearns.fias.helpers.Catalog; +import me.bearns.fias.helpers.UnmarshallerParameters; +import org.junit.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest; +import org.springframework.test.context.ActiveProfiles; + +import java.io.InputStream; + +@ActiveProfiles("test") +@DataJpaTest +public class StreamSaverTest { + + private static final String AO_FILENAME = "AS_ADDROBJ_20200903_b02fb98f-354f-4ed4-af2f-467c5789989f.XML"; + private static final String HOUSE_FILENAME = "AS_HOUSE_20200903_f7ab498f-1f85-4d80-8254-349399de9460.XML"; + + @Autowired + private StreamSaver service; + + @Autowired + private static Catalog catalog; + + @Test + public void addrobjTest() throws CommonException { + + final UnmarshallerParameters config = catalog.getByPrefix(AO_FILENAME); + + final InputStream stream = XMLSourceHelper.getAOStream(); + + service.process(stream, config, null); + } + + @Test + public void houseTest() throws CommonException { + + final UnmarshallerParameters config = catalog.getByPrefix(AO_FILENAME); + + final InputStream stream = XMLSourceHelper.getAOStream(); + + service.process(stream, config, null); + } + + +}