hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-18 23:43:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Builders moved fixes

Browse Source
This commit is contained in:
Marie Verdonck
2020-08-07 12:36:12 +02:00
parent f0644f5b6b
commit 24534f943e
2 changed files with 31 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
dspace-server-webapp/src/test/java/org/dspace/app/rest/BitstreamRestControllerIT.java
View File

@@ -12,11 +12,7 @@ import static org.apache.commons.codec.CharEncoding.UTF_8;
import static org.apache.commons.collections.CollectionUtils.isEmpty; import static org.apache.commons.collections.CollectionUtils.isEmpty;
import static org.apache.commons.io.IOUtils.toInputStream; import static org.apache.commons.io.IOUtils.toInputStream;
import static org.dspace.app.rest.matcher.BitstreamFormatMatcher.matchBitstreamFormat; import static org.dspace.app.rest.matcher.BitstreamFormatMatcher.matchBitstreamFormat;
import static org.dspace.builder.BitstreamBuilder.createBitstream;
import static org.dspace.builder.BitstreamFormatBuilder.createBitstreamFormat; import static org.dspace.builder.BitstreamFormatBuilder.createBitstreamFormat;
import static org.dspace.builder.CollectionBuilder.createCollection;
import static org.dspace.builder.CommunityBuilder.createCommunity;
import static org.dspace.builder.ItemBuilder.createItem;
import static org.dspace.builder.ResourcePolicyBuilder.createResourcePolicy; import static org.dspace.builder.ResourcePolicyBuilder.createResourcePolicy;
import static org.dspace.content.BitstreamFormat.KNOWN; import static org.dspace.content.BitstreamFormat.KNOWN;
import static org.dspace.content.BitstreamFormat.SUPPORTED; import static org.dspace.content.BitstreamFormat.SUPPORTED;
@@ -129,22 +125,22 @@ public class BitstreamRestControllerIT extends AbstractControllerIntegrationTest
context.turnOffAuthorisationSystem(); context.turnOffAuthorisationSystem();
Community community = createCommunity(context).build(); Community community = CommunityBuilder.createCommunity(context).build();
Collection collection = createCollection(context, community).build(); Collection collection = CollectionBuilder.createCollection(context, community).build();
Item item = createItem(context, collection).build(); Item item = ItemBuilder.createItem(context, collection).build();
bitstream = createBitstream(context, item, toInputStream("test", UTF_8)) bitstream = BitstreamBuilder.createBitstream(context, item, toInputStream("test", UTF_8))
.withFormat("test format") .withFormat("test format")
.build(); .build();
unknownFormat = bitstreamFormatService.findUnknown(context); unknownFormat = bitstreamFormatService.findUnknown(context);
knownFormat = createBitstreamFormat(context) knownFormat = createBitstreamFormat(context)
.withMimeType("known test mime type") .withMimeType("known test mime type")
.withDescription("known test description") .withDescription("known test description")
.withShortDescription("known test short description") .withShortDescription("known test short description")
.withSupportLevel(KNOWN) .withSupportLevel(KNOWN)
.build(); .build();
supportedFormat = createBitstreamFormat(context) supportedFormat = createBitstreamFormat(context)
.withMimeType("supported mime type") .withMimeType("supported mime type")

42
dspace-server-webapp/src/test/java/org/dspace/app/rest/StatisticsRestRepositoryIT.java
View File

@@ -9,11 +9,6 @@ package org.dspace.app.rest;
import static org.apache.commons.codec.CharEncoding.UTF_8; import static org.apache.commons.codec.CharEncoding.UTF_8;
import static org.apache.commons.io.IOUtils.toInputStream; import static org.apache.commons.io.IOUtils.toInputStream;
import static org.dspace.app.rest.builder.BitstreamBuilder.createBitstream;
import static org.dspace.app.rest.builder.CollectionBuilder.createCollection;
import static org.dspace.app.rest.builder.CommunityBuilder.createCommunity;
import static org.dspace.app.rest.builder.CommunityBuilder.createSubCommunity;
import static org.dspace.app.rest.builder.ItemBuilder.createItem;
import static org.dspace.app.rest.repository.UsageReportService.TOP_CITIES_REPORT_ID; import static org.dspace.app.rest.repository.UsageReportService.TOP_CITIES_REPORT_ID;
import static org.dspace.app.rest.repository.UsageReportService.TOP_COUNTRIES_REPORT_ID; import static org.dspace.app.rest.repository.UsageReportService.TOP_COUNTRIES_REPORT_ID;
import static org.dspace.app.rest.repository.UsageReportService.TOTAL_DOWNLOADS_REPORT_ID; import static org.dspace.app.rest.repository.UsageReportService.TOTAL_DOWNLOADS_REPORT_ID;
@@ -34,9 +29,6 @@ import java.util.Locale;
import java.util.UUID; import java.util.UUID;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import org.dspace.app.rest.builder.EPersonBuilder;
import org.dspace.app.rest.builder.ResourcePolicyBuilder;
import org.dspace.app.rest.builder.SiteBuilder;
import org.dspace.app.rest.matcher.UsageReportMatcher; import org.dspace.app.rest.matcher.UsageReportMatcher;
import org.dspace.app.rest.model.UsageReportPointCityRest; import org.dspace.app.rest.model.UsageReportPointCityRest;
import org.dspace.app.rest.model.UsageReportPointCountryRest; import org.dspace.app.rest.model.UsageReportPointCountryRest;
@@ -48,6 +40,13 @@ import org.dspace.app.rest.repository.StatisticsRestRepository;
import org.dspace.app.rest.repository.UsageReportService; import org.dspace.app.rest.repository.UsageReportService;
import org.dspace.app.rest.test.AbstractControllerIntegrationTest; import org.dspace.app.rest.test.AbstractControllerIntegrationTest;
import org.dspace.authorize.service.AuthorizeService; import org.dspace.authorize.service.AuthorizeService;
import org.dspace.builder.BitstreamBuilder;
import org.dspace.builder.CollectionBuilder;
import org.dspace.builder.CommunityBuilder;
import org.dspace.builder.EPersonBuilder;
import org.dspace.builder.ItemBuilder;
import org.dspace.builder.ResourcePolicyBuilder;
import org.dspace.builder.SiteBuilder;
import org.dspace.content.Bitstream; import org.dspace.content.Bitstream;
import org.dspace.content.Collection; import org.dspace.content.Collection;
import org.dspace.content.Community; import org.dspace.content.Community;
@@ -99,16 +98,17 @@ public class StatisticsRestRepositoryIT extends AbstractControllerIntegrationTes
context.turnOffAuthorisationSystem(); context.turnOffAuthorisationSystem();
Community community = createCommunity(context).build(); Community community = CommunityBuilder.createCommunity(context).build();
communityNotVisited = createSubCommunity(context, community).build(); communityNotVisited = CommunityBuilder.createSubCommunity(context, community).build();
communityVisited = createSubCommunity(context, community).build(); communityVisited = CommunityBuilder.createSubCommunity(context, community).build();
collectionNotVisited = createCollection(context, community).build(); collectionNotVisited = CollectionBuilder.createCollection(context, community).build();
collectionVisited = createCollection(context, community).build(); collectionVisited = CollectionBuilder.createCollection(context, community).build();
itemVisited = createItem(context, collectionNotVisited).build(); itemVisited = ItemBuilder.createItem(context, collectionNotVisited).build();
itemNotVisitedWithBitstreams = createItem(context, collectionNotVisited).build(); itemNotVisitedWithBitstreams = ItemBuilder.createItem(context, collectionNotVisited).build();
bitstreamNotVisited = createBitstream(context, bitstreamNotVisited = BitstreamBuilder.createBitstream(context,
itemNotVisitedWithBitstreams, toInputStream("test", UTF_8)).withName("BitstreamNotVisitedName").build(); itemNotVisitedWithBitstreams, toInputStream("test", UTF_8)).withName("BitstreamNotVisitedName").build();
bitstreamVisited = createBitstream(context, itemNotVisitedWithBitstreams, toInputStream("test", UTF_8)) bitstreamVisited = BitstreamBuilder
.createBitstream(context, itemNotVisitedWithBitstreams, toInputStream("test", UTF_8))
.withName("BitstreamVisitedName").build(); .withName("BitstreamVisitedName").build();
loggedInToken = getAuthToken(eperson.getEmail(), password); loggedInToken = getAuthToken(eperson.getEmail(), password);
@@ -866,7 +866,7 @@ public class StatisticsRestRepositoryIT extends AbstractControllerIntegrationTes
public void usageReportsSearch_Site() throws Exception { public void usageReportsSearch_Site() throws Exception {
context.turnOffAuthorisationSystem(); context.turnOffAuthorisationSystem();
Site site = SiteBuilder.createSite(context).build(); Site site = SiteBuilder.createSite(context).build();
Item itemVisited2 = createItem(context, collectionNotVisited).build(); Item itemVisited2 = ItemBuilder.createItem(context, collectionNotVisited).build();
context.restoreAuthSystemState(); context.restoreAuthSystemState();
// ** WHEN ** // ** WHEN **
@@ -1058,9 +1058,11 @@ public class StatisticsRestRepositoryIT extends AbstractControllerIntegrationTes
public void usageReportsSearch_ItemVisited_FilesVisited() throws Exception { public void usageReportsSearch_ItemVisited_FilesVisited() throws Exception {
context.turnOffAuthorisationSystem(); context.turnOffAuthorisationSystem();
Bitstream bitstream1 = Bitstream bitstream1 =
createBitstream(context, itemVisited, toInputStream("test", UTF_8)).withName("bitstream1").build(); BitstreamBuilder.createBitstream(context, itemVisited, toInputStream("test", UTF_8)).withName("bitstream1")
.build();
Bitstream bitstream2 = Bitstream bitstream2 =
createBitstream(context, itemVisited, toInputStream("test", UTF_8)).withName("bitstream2").build(); BitstreamBuilder.createBitstream(context, itemVisited, toInputStream("test", UTF_8)).withName("bitstream2")
.build();
context.restoreAuthSystemState(); context.restoreAuthSystemState();
// ** WHEN ** // ** WHEN **