From 24534f943e06a1309a1c36f0a07fb81a3951a12c Mon Sep 17 00:00:00 2001 From: Marie Verdonck Date: Fri, 7 Aug 2020 12:36:12 +0200 Subject: [PATCH] Builders moved fixes --- .../app/rest/BitstreamRestControllerIT.java | 22 ++++------ .../app/rest/StatisticsRestRepositoryIT.java | 42 ++++++++++--------- 2 files changed, 31 insertions(+), 33 deletions(-) diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/BitstreamRestControllerIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/BitstreamRestControllerIT.java index f8f60a43a5..2a68c2e887 100644 --- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/BitstreamRestControllerIT.java +++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/BitstreamRestControllerIT.java @@ -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.io.IOUtils.toInputStream; 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.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.content.BitstreamFormat.KNOWN; import static org.dspace.content.BitstreamFormat.SUPPORTED; @@ -129,22 +125,22 @@ public class BitstreamRestControllerIT extends AbstractControllerIntegrationTest context.turnOffAuthorisationSystem(); - Community community = createCommunity(context).build(); - Collection collection = createCollection(context, community).build(); - Item item = createItem(context, collection).build(); + Community community = CommunityBuilder.createCommunity(context).build(); + Collection collection = CollectionBuilder.createCollection(context, community).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") .build(); unknownFormat = bitstreamFormatService.findUnknown(context); knownFormat = createBitstreamFormat(context) - .withMimeType("known test mime type") - .withDescription("known test description") - .withShortDescription("known test short description") - .withSupportLevel(KNOWN) - .build(); + .withMimeType("known test mime type") + .withDescription("known test description") + .withShortDescription("known test short description") + .withSupportLevel(KNOWN) + .build(); supportedFormat = createBitstreamFormat(context) .withMimeType("supported mime type") diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/StatisticsRestRepositoryIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/StatisticsRestRepositoryIT.java index 85df5a1cc5..6d85a5054f 100644 --- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/StatisticsRestRepositoryIT.java +++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/StatisticsRestRepositoryIT.java @@ -9,11 +9,6 @@ package org.dspace.app.rest; import static org.apache.commons.codec.CharEncoding.UTF_8; 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_COUNTRIES_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 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.model.UsageReportPointCityRest; 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.test.AbstractControllerIntegrationTest; 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.Collection; import org.dspace.content.Community; @@ -99,16 +98,17 @@ public class StatisticsRestRepositoryIT extends AbstractControllerIntegrationTes context.turnOffAuthorisationSystem(); - Community community = createCommunity(context).build(); - communityNotVisited = createSubCommunity(context, community).build(); - communityVisited = createSubCommunity(context, community).build(); - collectionNotVisited = createCollection(context, community).build(); - collectionVisited = createCollection(context, community).build(); - itemVisited = createItem(context, collectionNotVisited).build(); - itemNotVisitedWithBitstreams = createItem(context, collectionNotVisited).build(); - bitstreamNotVisited = createBitstream(context, + Community community = CommunityBuilder.createCommunity(context).build(); + communityNotVisited = CommunityBuilder.createSubCommunity(context, community).build(); + communityVisited = CommunityBuilder.createSubCommunity(context, community).build(); + collectionNotVisited = CollectionBuilder.createCollection(context, community).build(); + collectionVisited = CollectionBuilder.createCollection(context, community).build(); + itemVisited = ItemBuilder.createItem(context, collectionNotVisited).build(); + itemNotVisitedWithBitstreams = ItemBuilder.createItem(context, collectionNotVisited).build(); + bitstreamNotVisited = BitstreamBuilder.createBitstream(context, 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(); loggedInToken = getAuthToken(eperson.getEmail(), password); @@ -866,7 +866,7 @@ public class StatisticsRestRepositoryIT extends AbstractControllerIntegrationTes public void usageReportsSearch_Site() throws Exception { context.turnOffAuthorisationSystem(); Site site = SiteBuilder.createSite(context).build(); - Item itemVisited2 = createItem(context, collectionNotVisited).build(); + Item itemVisited2 = ItemBuilder.createItem(context, collectionNotVisited).build(); context.restoreAuthSystemState(); // ** WHEN ** @@ -1058,9 +1058,11 @@ public class StatisticsRestRepositoryIT extends AbstractControllerIntegrationTes public void usageReportsSearch_ItemVisited_FilesVisited() throws Exception { context.turnOffAuthorisationSystem(); 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 = - createBitstream(context, itemVisited, toInputStream("test", UTF_8)).withName("bitstream2").build(); + BitstreamBuilder.createBitstream(context, itemVisited, toInputStream("test", UTF_8)).withName("bitstream2") + .build(); context.restoreAuthSystemState(); // ** WHEN **