Compare commits

..

No commits in common. 'a8676172b301c91222d0670c2e3d9ac6d601b010' and '29a1f8cc217b2528adcdcedd331adaf3fcf84c59' have entirely different histories.

  1. 10
      src/main/java/me/bearns/fias/service/OnlineVersionImpl.java
  2. 2
      src/test/java/me/bearns/fias/DownloaderTest.java
  3. 59
      src/test/java/me/bearns/fias/OnlineVersionsTest.java

@ -2,7 +2,6 @@ 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;
@ -10,14 +9,13 @@ import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;
//@AllArgsConstructor
@Component
@AllArgsConstructor
public class OnlineVersionImpl implements OnlineVersion{
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";
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";
RestTemplate client = new RestTemplate();
RestTemplate client;
@Override
public long getLastVersionId() {

@ -7,7 +7,6 @@ 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;
@ -18,7 +17,6 @@ import java.util.concurrent.CompletableFuture;
import java.util.stream.Collectors;
import java.util.stream.Stream;
@ActiveProfiles("test")
@RunWith(SpringRunner.class)
@SpringBootTest
public class DownloaderTest {

@ -1,59 +0,0 @@
package me.bearns.fias;
import me.bearns.fias.domain.FiasVersion;
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
@Test
public void getLastTest(){
final long lastVersionId = client.getLastVersionId();
assert lastVersionId > 0;
}
@Test
public void getAfterTest(){
final long count = 14;
final long lastVersionId = client.getLastVersionId();
assert lastVersionId > 0;
final long fromVersion = lastVersionId - count;
final List<FiasVersion> versions = client.getVersionsAfter(fromVersion);
assert versions != null;
assert versions.size() <= count;
}
@Test
public void getLastObjTest(){
final List<FiasVersion> versions = client.getLastVersion();
assert versions != null;
assert versions.size() == 1;
assert versions.get(0) != null;
}
}
Loading…
Cancel
Save