Commit c95cb512 authored by Noel Alonso's avatar Noel Alonso
Browse files

Arregla tests de report de Activit/Program/Project

parent 8255af0d

src/main/java/es/redmic/tasks/common/repository/UserTasksRepository.java

+8 −2
Original line number Diff line number Diff line
@@ -36,13 +36,19 @@ import es.redmic.tasks.ingest.model.status.model.UserTasks; 
@Repository

public class UserTasksRepository extends RWDataESRepository<UserTasks> {



	private static String[] INDEX = { "user" };

	private static String TYPE = "tasks";

	private static String[] INDEX = { "tasks" };

	private static String TYPE = "_doc";



	public UserTasksRepository() {

		super(INDEX, TYPE);

	}



	@Override

	public UserTasks update(UserTasks modelToIndex) {



		return elasticPersistenceUtils.update(getIndex()[0], getType(), modelToIndex, modelToIndex.getId().toString());

	}



	@SuppressWarnings("unchecked")

	public DataSearchWrapper<UserTasks> findByUser(Map<String, String> options, String user) {

src/test/java/es/redmic/test/tasks/integration/report/activity/ReportActivityTest.java

+45 −1
Original line number Diff line number Diff line
@@ -23,8 +23,10 @@ package es.redmic.test.tasks.integration.report.activity; 
import java.util.HashMap;

import java.util.Map;



import org.junit.Before;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.springframework.beans.factory.annotation.Autowired;

import org.springframework.beans.factory.annotation.Value;

import org.springframework.boot.test.context.SpringBootTest;

import org.springframework.kafka.annotation.KafkaListener;
@@ -33,6 +35,12 @@ import org.springframework.test.context.TestPropertySource; 
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;



import es.redmic.brokerlib.avro.common.MessageWrapper;

import es.redmic.es.administrative.repository.ActivityESRepository;

import es.redmic.es.administrative.repository.ProgramESRepository;

import es.redmic.es.administrative.repository.ProjectESRepository;

import es.redmic.models.es.administrative.model.Activity;

import es.redmic.models.es.administrative.model.Program;

import es.redmic.models.es.administrative.model.Project;

import es.redmic.tasks.TasksApplication;

import es.redmic.test.tasks.integration.report.common.ReportBaseTest;
@@ -42,9 +50,45 @@ import es.redmic.test.tasks.integration.report.common.ReportBaseTest; 
@ActiveProfiles("test")

public class ReportActivityTest extends ReportBaseTest {



	private static final Long PROGRAM_ID = 1L;



	private static final Long PROJECT_ID = 5L;



	private static final Long ACTIVITY_ID = 44L;



	@Value("${broker.topic.task.report.activity.run}")

	String REPORT_ACTIVITY_RUN_TOPIC;



	@Autowired

	ActivityESRepository repository;



	@Autowired

	ProjectESRepository projectRepository;



	@Autowired

	ProgramESRepository programESRepository;



	@Before

	public void config() {



		Program program = new Program();

		program.setId(PROGRAM_ID);

		program.setName("Program de prueba");

		programESRepository.save(program);





		Project project = new Project();

		project.setId(PROJECT_ID);

		program.setName("Project de prueba");

		projectRepository.save(project);



		Activity activity = new Activity();

		activity.setId(ACTIVITY_ID);

		activity.setPath("r." + PROGRAM_ID + "." + PROJECT_ID + "." + ACTIVITY_ID);

		activity.setName("Prueba");

		repository.save(activity);

	}



	@Override

	@Test

	public void runIngestData_ReturnStatusMsg_IfBrokerIsListen() throws Exception {
@@ -67,7 +111,7 @@ public class ReportActivityTest extends ReportBaseTest { 
	protected Map<String, String> createRunTaskRequest() {



		Map<String, String> request = new HashMap<>();

		request.put("selectId", "44");

		request.put("selectId", ACTIVITY_ID.toString());

		return request;

	}

}

src/test/java/es/redmic/test/tasks/integration/report/program/ReportProgramTest.java

+22 −3
Original line number Diff line number Diff line
@@ -23,23 +23,42 @@ package es.redmic.test.tasks.integration.report.program; 
import java.util.HashMap;

import java.util.Map;



import org.junit.Before;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.springframework.beans.factory.annotation.Autowired;

import org.springframework.beans.factory.annotation.Value;

import org.springframework.kafka.annotation.KafkaListener;

import org.springframework.test.context.TestPropertySource;

import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;



import es.redmic.brokerlib.avro.common.MessageWrapper;

import es.redmic.es.administrative.repository.ProgramESRepository;

import es.redmic.models.es.administrative.model.Program;

import es.redmic.test.tasks.integration.report.common.ReportBaseTest;



@RunWith(SpringJUnit4ClassRunner.class)

@TestPropertySource(properties = { "schema.registry.port=18089" })

public class ReportProgramTest extends ReportBaseTest {



	private static final Long PROGRAM_ID = 10L;



	@Value("${broker.topic.task.report.program.run}")

	String REPORT_PROGRAM_RUN_TOPIC;



	@Autowired

	ProgramESRepository programESRepository;



	@Before

	public void config() {



		Program program = new Program();

		program.setPath("r." + PROGRAM_ID );

		program.setId(PROGRAM_ID);

		program.setName("Program de prueba");

		programESRepository.save(program);

	}



	@Override

	@Test

	public void runIngestData_ReturnStatusMsg_IfBrokerIsListen() throws Exception {
@@ -62,7 +81,7 @@ public class ReportProgramTest extends ReportBaseTest { 
	protected Map<String, String> createRunTaskRequest() {



		Map<String, String> request = new HashMap<>();

		request.put("selectId", "10");

		request.put("selectId", PROGRAM_ID.toString());

		return request;

	}

}

src/test/java/es/redmic/test/tasks/integration/report/project/ReportProjectTest.java

+35 −3
Original line number Diff line number Diff line
@@ -23,23 +23,55 @@ package es.redmic.test.tasks.integration.report.project; 
import java.util.HashMap;

import java.util.Map;



import org.junit.Before;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.springframework.beans.factory.annotation.Autowired;

import org.springframework.beans.factory.annotation.Value;

import org.springframework.kafka.annotation.KafkaListener;

import org.springframework.test.context.TestPropertySource;

import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;



import es.redmic.brokerlib.avro.common.MessageWrapper;

import es.redmic.es.administrative.repository.ProgramESRepository;

import es.redmic.es.administrative.repository.ProjectESRepository;

import es.redmic.models.es.administrative.model.Program;

import es.redmic.models.es.administrative.model.Project;

import es.redmic.test.tasks.integration.report.common.ReportBaseTest;



@RunWith(SpringJUnit4ClassRunner.class)

@TestPropertySource(properties = { "schema.registry.port=18090" })

public class ReportProjectTest extends ReportBaseTest {



	private static final Long PROGRAM_ID = 1L;



	private static final Long PROJECT_ID = 19L;



	@Value("${broker.topic.task.report.project.run}")

	String REPORT_PROJECT_RUN_TOPIC;



	@Autowired

	ProjectESRepository projectRepository;



	@Autowired

	ProgramESRepository programESRepository;



	@Before

	public void config() {



		Program program = new Program();

		program.setId(PROGRAM_ID);

		program.setName("Program de prueba");

		programESRepository.save(program);





		Project project = new Project();

		project.setPath("r." + PROGRAM_ID + "." + PROJECT_ID);

		project.setId(PROJECT_ID);

		program.setName("Project de prueba");

		projectRepository.save(project);

	}



	@Override

	@Test

	public void runIngestData_ReturnStatusMsg_IfBrokerIsListen() throws Exception {
@@ -62,7 +94,7 @@ public class ReportProjectTest extends ReportBaseTest { 
	protected Map<String, String> createRunTaskRequest() {



		Map<String, String> request = new HashMap<>();

		request.put("selectId", "19");

		request.put("selectId", PROJECT_ID.toString());

		return request;

	}

}