diff --git a/src/main/java/me/bearns/fias/service/OnlineVersionImpl.java b/src/main/java/me/bearns/fias/service/OnlineVersionImpl.java index c890860..ffbafd9 100644 --- a/src/main/java/me/bearns/fias/service/OnlineVersionImpl.java +++ b/src/main/java/me/bearns/fias/service/OnlineVersionImpl.java @@ -2,6 +2,7 @@ package me.bearns.fias.service; import lombok.AllArgsConstructor; import me.bearns.fias.domain.FiasVersion; +import org.springframework.stereotype.Component; import org.springframework.web.client.RestTemplate; import java.util.ArrayList; @@ -9,13 +10,14 @@ import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; -@AllArgsConstructor +//@AllArgsConstructor +@Component public class OnlineVersionImpl implements OnlineVersion{ - private static final String GET_ALL_FILE_INFO = "http://fias.nalog.ru/WebServices/Public/GetAllDownloadFileInfo"; - private static final String GET_LAST_FILE_INFO = "http://fias.nalog.ru/WebServices/Public/GetLastDownloadFileInfo"; + private static final String GET_ALL_FILE_INFO = "https://fias.nalog.ru/WebServices/Public/GetAllDownloadFileInfo"; + private static final String GET_LAST_FILE_INFO = "https://fias.nalog.ru/WebServices/Public/GetLastDownloadFileInfo"; - RestTemplate client; + RestTemplate client = new RestTemplate(); @Override public long getLastVersionId() { diff --git a/src/test/java/me/bearns/fias/DownloaderTest.java b/src/test/java/me/bearns/fias/DownloaderTest.java index 6e410ba..3c92a83 100644 --- a/src/test/java/me/bearns/fias/DownloaderTest.java +++ b/src/test/java/me/bearns/fias/DownloaderTest.java @@ -7,6 +7,7 @@ import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.ActiveProfiles; import org.springframework.test.context.junit4.SpringRunner; import java.io.File; @@ -17,6 +18,7 @@ import java.util.concurrent.CompletableFuture; import java.util.stream.Collectors; import java.util.stream.Stream; +@ActiveProfiles("test") @RunWith(SpringRunner.class) @SpringBootTest public class DownloaderTest { diff --git a/src/test/java/me/bearns/fias/OnlineVersionsTest.java b/src/test/java/me/bearns/fias/OnlineVersionsTest.java index 235b0be..f54df1d 100644 --- a/src/test/java/me/bearns/fias/OnlineVersionsTest.java +++ b/src/test/java/me/bearns/fias/OnlineVersionsTest.java @@ -5,14 +5,18 @@ import me.bearns.fias.service.OnlineVersion; import org.junit.Ignore; import org.junit.runner.RunWith; import org.junit.Test; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.ActiveProfiles; import org.springframework.test.context.junit4.SpringRunner; import java.util.List; +@ActiveProfiles("test") @RunWith(SpringRunner.class) @SpringBootTest public class OnlineVersionsTest { + @Autowired OnlineVersion client; @Ignore @@ -26,7 +30,7 @@ public class OnlineVersionsTest { @Test public void getAfterTest(){ - final long count = 5; + final long count = 14; final long lastVersionId = client.getLastVersionId(); @@ -38,7 +42,7 @@ public class OnlineVersionsTest { assert versions != null; - assert versions.size() == count; + assert versions.size() <= count; } @Test