gCubeSystem
/
gcube-cms-suite
14
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request 'patch_#23400' (#6) from patch_#23400 into master 

Reviewed-on: #6
This commit is contained in:
Fabio Sinibaldi 2022-05-27 16:29:19 +02:00
parent b12c4b456f 17f4f5e991
commit 47043b482c
2 changed files with 32 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
geoportal-client/src/main/java/org/gcube/application/geoportal/client/utils/ConcessioniUtils.java
View File

@ -82,7 +82,7 @@ public class ConcessioniUtils {
copied.getPianteFineScavo().add(clean(src.getPianteFineScavo().get(i))); copied.getPianteFineScavo().add(clean(src.getPianteFineScavo().get(i)));
copied=client.replace(copied); copied=client.replace(copied);
req=asCopyRequest(src.getPianteFineScavo().get(i),storage); req=asCopyRequest(src.getPianteFineScavo().get(i),storage);
req.setDestinationPath(Concessione.Paths.imgByIndex(i)); req.setDestinationPath(Concessione.Paths.piantaByIndex(i));
if(req.getStreams()!=null&&!req.getStreams().isEmpty()) if(req.getStreams()!=null&&!req.getStreams().isEmpty())
copied=client.registerFileSet(copied.getMongo_id(),req); copied=client.registerFileSet(copied.getMongo_id(),req);
} }

31
geoportal-client/src/test/java/org/gcube/application/geoportal/clients/StatelessClientTests.java
View File

@ -10,7 +10,9 @@ import java.nio.charset.Charset;
import java.util.Collections; import java.util.Collections;
import java.util.Iterator; import java.util.Iterator;
import java.util.concurrent.atomic.AtomicLong; import java.util.concurrent.atomic.AtomicLong;
import java.util.stream.Collectors;
import com.sun.corba.se.spi.orbutil.threadpool.Work;
import org.bson.Document; import org.bson.Document;
import org.gcube.application.cms.tests.model.concessioni.TestConcessioniFilters; import org.gcube.application.cms.tests.model.concessioni.TestConcessioniFilters;
import org.gcube.application.cms.tests.model.concessioni.TestConcessioniModel; import org.gcube.application.cms.tests.model.concessioni.TestConcessioniModel;
@ -113,10 +115,39 @@ public class StatelessClientTests extends BasicVreTests{
Concessione c= prepare(); Concessione c= prepare();
Concessione copied = ConcessioniUtils.clone(client,c.getMongo_id()); Concessione copied = ConcessioniUtils.clone(client,c.getMongo_id());
assertEquals(copied.getNome(),c.getNome()); assertEquals(copied.getNome(),c.getNome());
checkCopied(copied.getRelazioneScavo(),c.getRelazioneScavo());
checkCopied(copied.getAbstractRelazione(),c.getAbstractRelazione());
checkCopied(copied.getPosizionamentoScavo(),c.getPosizionamentoScavo());
assertEquals(copied.getPianteFineScavo().size(),c.getPianteFineScavo().size()); assertEquals(copied.getPianteFineScavo().size(),c.getPianteFineScavo().size());
for(int i=0;i<c.getPianteFineScavo().size();i++)
checkCopied(copied.getPianteFineScavo().get(i),c.getPianteFineScavo().get(i));
assertEquals(copied.getImmaginiRappresentative().size(),c.getImmaginiRappresentative().size());
for(int i=0;i<c.getImmaginiRappresentative().size();i++)
checkCopied(copied.getImmaginiRappresentative().get(i),c.getImmaginiRappresentative().get(i));
} }
private static void checkCopied(AssociatedContent copied,AssociatedContent original){
assertEquals(copied.getPolicy(),original.getPolicy());
assertEquals(copied.getLicenseID(),original.getLicenseID());
assertEquals(copied.getTitolo(),original.getTitolo());
if(copied instanceof LayerConcessione){
assertNull(((LayerConcessione)copied).getLayerName());
assertNull(((LayerConcessione)copied).getLayerID());
assertNull(((LayerConcessione)copied).getLayerUUID());
assertNull(((LayerConcessione)copied).getWorkspace());
assertNull(((LayerConcessione)copied).getWmsLink());
}
if(original.getActualContent()!=null){
assertNotNull(copied.getActualContent());
// count only workspace content
int oriringalCount= original.getActualContent().stream().
filter(persistedContent -> persistedContent instanceof WorkspaceContent).
collect(Collectors.toList()).size();
assertEquals(copied.getActualContent().size(),oriringalCount);
}
}