Skip to content

Commit

Permalink
fix unrelated tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@apriltuesday
apriltuesday committed Jun 19, 2024
1 parent 1be9e49 commit 3717206
Show file tree
Hide file tree
Showing 2 changed files with 55 additions and 2 deletions.
28 changes: 27 additions & 1 deletion ...onfiguration/batch/jobs/CreateSeveralIntervalsOfSubsnpAccessionsJobConfigurationTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,17 @@
import org.springframework.batch.core.StepExecution;
import org.springframework.batch.test.JobLauncherTestUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.data.mongodb.core.MongoTemplate;
import org.springframework.http.HttpMethod;
import org.springframework.http.HttpStatus;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.TestPropertySource;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.test.web.client.ExpectedCount;
import org.springframework.test.web.client.MockRestServiceServer;
import org.springframework.web.client.RestTemplate;

import uk.ac.ebi.eva.accession.core.configuration.nonhuman.SubmittedVariantAccessioningConfiguration;
import uk.ac.ebi.eva.accession.core.repository.nonhuman.eva.SubmittedVariantAccessioningRepository;
Expand All @@ -38,11 +44,13 @@
import uk.ac.ebi.eva.accession.pipeline.parameters.InputParameters;
import uk.ac.ebi.eva.accession.pipeline.test.BatchTestConfiguration;
import uk.ac.ebi.eva.commons.core.utils.FileUtils;
import uk.ac.ebi.eva.metrics.count.CountServiceParameters;

import java.io.BufferedReader;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStreamReader;
import java.net.URI;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.util.Arrays;
Expand All @@ -52,6 +60,9 @@
import java.util.TreeSet;

import static org.junit.Assert.assertEquals;
import static org.springframework.test.web.client.match.MockRestRequestMatchers.method;
import static org.springframework.test.web.client.match.MockRestRequestMatchers.requestTo;
import static org.springframework.test.web.client.response.MockRestResponseCreators.withStatus;
import static uk.ac.ebi.eva.accession.pipeline.configuration.BeanNames.ACCESSIONING_SHUTDOWN_STEP;
import static uk.ac.ebi.eva.accession.pipeline.configuration.BeanNames.BUILD_REPORT_STEP;
import static uk.ac.ebi.eva.accession.pipeline.configuration.BeanNames.CHECK_SUBSNP_ACCESSION_STEP;
Expand All @@ -76,9 +87,24 @@ public class CreateSeveralIntervalsOfSubsnpAccessionsJobConfigurationTest {
@Autowired
private MongoTemplate mongoTemplate;

@Autowired
private CountServiceParameters countServiceParameters;

private final String URL_PATH_SAVE_COUNT = "/v1/bulk/count";

@Autowired
@Qualifier("COUNT_STATS_REST_TEMPLATE")
private RestTemplate restTemplate;

private MockRestServiceServer mockServer;

@Before
public void setUp() {
public void setUp() throws Exception {
mongoTemplate.dropCollection(SubmittedVariantEntity.class);
mockServer = MockRestServiceServer.createServer(restTemplate);
mockServer.expect(ExpectedCount.manyTimes(), requestTo(new URI(countServiceParameters.getUrl() + URL_PATH_SAVE_COUNT)))
.andExpect(method(HttpMethod.POST))
.andRespond(withStatus(HttpStatus.OK));
}

@After
Expand Down
29 changes: 28 additions & 1 deletion ...cession/pipeline/configuration/batch/jobs/CreateSubsnpAccessionsJobConfigurationTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,17 @@
import org.springframework.batch.core.StepExecution;
import org.springframework.batch.test.JobLauncherTestUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.data.mongodb.core.MongoTemplate;
import org.springframework.http.HttpMethod;
import org.springframework.http.HttpStatus;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.TestPropertySource;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.test.web.client.ExpectedCount;
import org.springframework.test.web.client.MockRestServiceServer;
import org.springframework.web.client.RestTemplate;

import uk.ac.ebi.eva.accession.core.configuration.nonhuman.SubmittedVariantAccessioningConfiguration;
import uk.ac.ebi.eva.accession.core.repository.nonhuman.eva.SubmittedVariantAccessioningRepository;
Expand All @@ -38,19 +44,24 @@
import uk.ac.ebi.eva.accession.pipeline.parameters.InputParameters;
import uk.ac.ebi.eva.accession.pipeline.test.BatchTestConfiguration;
import uk.ac.ebi.eva.commons.core.utils.FileUtils;
import uk.ac.ebi.eva.metrics.count.CountServiceParameters;

import java.io.BufferedReader;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStreamReader;
import java.net.URI;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.util.Collection;
import java.util.Iterator;

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.springframework.test.web.client.match.MockRestRequestMatchers.method;
import static org.springframework.test.web.client.match.MockRestRequestMatchers.requestTo;
import static org.springframework.test.web.client.response.MockRestResponseCreators.withStatus;
import static uk.ac.ebi.eva.accession.pipeline.configuration.BeanNames.ACCESSIONING_SHUTDOWN_STEP;
import static uk.ac.ebi.eva.accession.pipeline.configuration.BeanNames.BUILD_REPORT_STEP;
import static uk.ac.ebi.eva.accession.pipeline.configuration.BeanNames.CHECK_SUBSNP_ACCESSION_STEP;
Expand All @@ -75,9 +86,25 @@ public class CreateSubsnpAccessionsJobConfigurationTest {
@Autowired
private MongoTemplate mongoTemplate;


@Autowired
private CountServiceParameters countServiceParameters;

private final String URL_PATH_SAVE_COUNT = "/v1/bulk/count";

@Autowired
@Qualifier("COUNT_STATS_REST_TEMPLATE")
private RestTemplate restTemplate;

private MockRestServiceServer mockServer;

@Before
public void setUp() {
public void setUp() throws Exception {
mongoTemplate.dropCollection(SubmittedVariantEntity.class);
mockServer = MockRestServiceServer.createServer(restTemplate);
mockServer.expect(ExpectedCount.manyTimes(), requestTo(new URI(countServiceParameters.getUrl() + URL_PATH_SAVE_COUNT)))
.andExpect(method(HttpMethod.POST))
.andRespond(withStatus(HttpStatus.OK));
}

@After
Expand Down

0 comments on commit 3717206

Please sign in to comment.