Commit 0a0539e3 authored by Nicola Fulvio Calabria's avatar Nicola Fulvio Calabria
Browse files

Fixed tests

parent 8cac32ac

src/test/java/it/inaf/oats/vospace/FileServiceClientTest.java

+21 −8
Original line number Diff line number Diff line
@@ -10,10 +10,12 @@ import it.inaf.ia2.aa.data.User; 
import it.inaf.oats.vospace.FileServiceClient.ArchiveRequest;

import it.inaf.oats.vospace.datamodel.Views;

import it.inaf.oats.vospace.exception.InvalidArgumentException;

import it.inaf.oats.vospace.parent.exchange.ArchiveEntryDescriptor;

import java.io.ByteArrayOutputStream;

import java.io.IOException;

import java.io.UncheckedIOException;

import java.net.URI;

import java.util.List;

import javax.servlet.http.HttpServletRequest;

import net.ivoa.xml.vospace.v2.Param;

import net.ivoa.xml.vospace.v2.Transfer;
@@ -55,6 +57,9 @@ public class FileServiceClientTest { 
    @Mock

    private HttpServletRequest request;

    

    @Mock

    private LinkService linkService;



    @InjectMocks

    private FileServiceClient fileServiceClient;
@@ -64,8 +69,6 @@ public class FileServiceClientTest { 
        ReflectionTestUtils.setField(fileServiceClient, "fileServiceUrl", "http://file-service");

    }

        

    // TODO: fix tests



    @Test

    public void testTarArchiveJob() {

        testStartArchiveJob(Views.TAR_VIEW_URI);
@@ -95,10 +98,13 @@ public class FileServiceClientTest { 
        view.setUri(Views.ZIP_VIEW_URI);

        transfer.setView(view);

        

        when(linkService.followLinksForArchiveService(any()))

                .thenReturn(List.of(new ArchiveEntryDescriptor("/mydir")));



        ArchiveRequest archiveRequest = testStartArchiveJob(transfer);



        //assertEquals(1, archiveRequest.getPaths().size());

        //assertEquals("/mydir", archiveRequest.getPaths().get(0));

        assertEquals(1, archiveRequest.getEntryDescriptors().size());

        assertEquals("/mydir", archiveRequest.getEntryDescriptors().get(0).getTargetNodeVosPath());

    }



    @Test
@@ -156,11 +162,18 @@ public class FileServiceClientTest { 
        param2.setValue("file2");

        view.getParam().add(param2);

        

        when(linkService.followLinksForArchiveService(any())).thenReturn(

                List.of(new ArchiveEntryDescriptor("/parent_dir/file1"),

                        new ArchiveEntryDescriptor("/parent_dir/file2")                

                ));



        ArchiveRequest archiveRequest = testStartArchiveJob(transfer);



        //assertEquals(2, archiveRequest.getPaths().size());

        //assertEquals("/parent_dir/file1", archiveRequest.getPaths().get(0));

        //assertEquals("/parent_dir/file2", archiveRequest.getPaths().get(1));

        assertEquals(2, archiveRequest.getEntryDescriptors().size());

        assertEquals("/parent_dir/file1", 

                archiveRequest.getEntryDescriptors().get(0).getTargetNodeVosPath());

        assertEquals("/parent_dir/file2", 

                archiveRequest.getEntryDescriptors().get(1).getTargetNodeVosPath());

    }



    private ArchiveRequest testStartArchiveJob(Transfer transfer) {