Commit ff424e96 authored by Nicola Fulvio Calabria's avatar Nicola Fulvio Calabria
Browse files

#3824: JobDAO tests added

parent 326b89a3

src/main/java/it/inaf/ia2/transfer/persistence/JobDAO.java

+18 −0
Original line number Diff line number Diff line
@@ -43,4 +43,22 @@ public class JobDAO { 
        });

    }

    

    public ExecutionPhase getJobPhase(String jobId) {

        String sql = "SELECT phase FROM job WHERE job_id = ?";

        

        ExecutionPhase result = jdbcTemplate.query(sql,

                ps -> {

                    ps.setString(1, jobId);

                }, rs -> {

                    if(rs.next())

                    {

                        return ExecutionPhase.fromValue(rs.getString("phase"));

                    } else {

                        return null;

                    }

                });



        return result;

    }



}

src/test/java/it/inaf/ia2/transfer/persistence/JobDAOTest.java

0 → 100644
+45 −0
Original line number Diff line number Diff line 
package it.inaf.ia2.transfer.persistence;



import javax.sql.DataSource;

import org.junit.jupiter.api.BeforeEach;

import org.junit.jupiter.api.extension.ExtendWith;

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

import org.springframework.test.context.ContextConfiguration;

import org.springframework.test.context.TestPropertySource;

import org.springframework.test.context.junit.jupiter.SpringExtension;

import org.junit.jupiter.api.Test;

import static org.junit.jupiter.api.Assertions.assertTrue;

import static org.junit.jupiter.api.Assertions.assertFalse;

import static org.junit.jupiter.api.Assertions.assertEquals;

import net.ivoa.xml.uws.v1.ExecutionPhase;



@ExtendWith(SpringExtension.class)

@ContextConfiguration(classes = {DataSourceConfig.class})

@TestPropertySource(locations = "classpath:test.properties")

public class JobDAOTest {

    

    @Autowired

    private DataSource dataSource;

    private JobDAO dao;



    @BeforeEach

    public void init() {

        dao = new JobDAO(dataSource);

    }

    

    @Test

    public void testNodeDAO()

    {

        assertTrue(dao.isJobExisting("pippo5"));        

        assertFalse(dao.isJobExisting("pippo22"));

        

        ExecutionPhase phase = dao.getJobPhase("pippo5");

        assertEquals(ExecutionPhase.EXECUTING, phase);

        dao.updateJobPhase(ExecutionPhase.COMPLETED, "pippo5");

        phase = dao.getJobPhase("pippo5");

        assertEquals(ExecutionPhase.COMPLETED, phase);       

    }

    

    

    

}

src/test/resources/test-data.sql

+9 −0
Original line number Diff line number Diff line
@@ -10,3 +10,12 @@ INSERT INTO node (parent_path, parent_relative_path, name, type, owner_id, creat 
INSERT INTO node (parent_path, parent_relative_path, name, type, owner_id, creator_id, group_read, group_write) VALUES ('2', NULL, '.tmp-123.txt', 'structured', 'user1', 'user1', '{"group1","group2"}','{"group2"}');      -- /test1/.tmp-123.txt

INSERT INTO node (parent_path, parent_relative_path, name, type, owner_id, creator_id, group_read, group_write, location_id) VALUES ('2', '', 'file1.txt', 'data', 'user1', 'user1', '{"group1","group2"}','{"group2"}', 1);      -- /test1/file1.txt

INSERT INTO node (parent_path, parent_relative_path, name, type, owner_id, creator_id, group_read, group_write, location_id) VALUES ('2', '', 'file2.txt', 'data', 'user1', 'user1', '{"group1","group2"}','{"group2"}', 1);      -- /test1/file2.txt



DELETE FROM job;



INSERT INTO job (job_id, owner_id, job_type, phase, start_time, end_time, creation_time, job_info, results) VALUES ('pippo1', 'user1', 'pullFromVoSpace', 'ARCHIVED', NULL, NULL, '2011-06-22 19:10:25', NULL, NULL);

INSERT INTO job (job_id, owner_id, job_type, phase, start_time, end_time, creation_time, job_info, results) VALUES ('pippo2', 'user1', 'pullToVoSpace', 'PENDING', NULL, NULL, '2012-06-22 19:10:25', NULL, NULL);

INSERT INTO job (job_id, owner_id, job_type, phase, start_time, end_time, creation_time, job_info, results) VALUES ('pippo3', 'user1', 'pullFromVoSpace', 'QUEUED', NULL, NULL, '2013-06-22 19:10:25', NULL, NULL);

INSERT INTO job (job_id, owner_id, job_type, phase, start_time, end_time, creation_time, job_info, results) VALUES ('pippo4', 'user2', 'copyNode', 'PENDING', NULL, NULL, '2014-06-22 19:10:25', NULL, NULL);

INSERT INTO job (job_id, owner_id, job_type, phase, start_time, end_time, creation_time, job_info, results) VALUES ('pippo5', 'user1', 'pushToVoSpace', 'EXECUTING', NULL, NULL, '2015-06-22 19:10:25', NULL, NULL);

INSERT INTO job (job_id, owner_id, job_type, phase, start_time, end_time, creation_time, job_info, results) VALUES ('pippo6', 'user2', 'pullFromVoSpace', 'PENDING', NULL, NULL, '2015-06-22 19:10:25', NULL, NULL);
 
 No newline at end of file