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

Replace deprecated JUnit and Mockito statics. #2956

Browse Source
This commit is contained in:
Mark H. Wood
2020-11-18 16:12:41 -05:00
parent 7d64bb6f71
commit 87cfac01d4
39 changed files with 57 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dspace-api/src/test/java/org/dspace/app/bulkedit/DSpaceCSVTest.java
View File

@@ -8,7 +8,7 @@
package org.dspace.app.bulkedit;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.junit.Assert.assertThat;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.fail;
import java.io.BufferedWriter;

2
dspace-api/src/test/java/org/dspace/content/AbstractDSpaceObjectTest.java
View File

@@ -12,7 +12,7 @@ import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.CoreMatchers.notNullValue;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.junit.Assert.assertThat;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.fail;
import java.sql.SQLException;

2
dspace-api/src/test/java/org/dspace/content/BitstreamFormatTest.java
View File

@@ -11,8 +11,8 @@ import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.CoreMatchers.notNullValue;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import static org.mockito.Mockito.spy;

2
dspace-api/src/test/java/org/dspace/content/BitstreamTest.java
View File

@@ -11,8 +11,8 @@ import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.CoreMatchers.notNullValue;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import static org.mockito.ArgumentMatchers.any;

2
dspace-api/src/test/java/org/dspace/content/BundleTest.java
View File

@@ -12,7 +12,7 @@ import static org.hamcrest.CoreMatchers.instanceOf;
import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.CoreMatchers.notNullValue;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.junit.Assert.assertThat;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import static org.mockito.ArgumentMatchers.any;

2
dspace-api/src/test/java/org/dspace/content/CollectionTest.java
View File

@@ -11,9 +11,9 @@ import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.instanceOf;
import static org.hamcrest.CoreMatchers.notNullValue;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import static org.mockito.ArgumentMatchers.any;

2
dspace-api/src/test/java/org/dspace/content/CommunityTest.java
View File

@@ -12,9 +12,9 @@ import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.CoreMatchers.notNullValue;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import static org.mockito.ArgumentMatchers.any;

2
dspace-api/src/test/java/org/dspace/content/DCDateTest.java
View File

@@ -9,7 +9,7 @@ package org.dspace.content;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.junit.Assert.assertThat;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertTrue;
import java.util.Calendar;

2
dspace-api/src/test/java/org/dspace/content/DCLanguageTest.java
View File

@@ -8,7 +8,7 @@
package org.dspace.content;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.junit.Assert.assertThat;
import static org.hamcrest.MatcherAssert.assertThat;
import java.util.Locale;

2
dspace-api/src/test/java/org/dspace/content/DCPersonNameTest.java
View File

@@ -8,7 +8,7 @@
package org.dspace.content;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.junit.Assert.assertThat;
import static org.hamcrest.MatcherAssert.assertThat;
import org.junit.After;
import org.junit.Before;

2
dspace-api/src/test/java/org/dspace/content/DCSeriesNumberTest.java
View File

@@ -9,7 +9,7 @@ package org.dspace.content;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.junit.Assert.assertThat;
import static org.hamcrest.MatcherAssert.assertThat;
import org.junit.After;
import org.junit.Before;

2
dspace-api/src/test/java/org/dspace/content/FormatIdentifierTest.java
View File

@@ -9,7 +9,7 @@ package org.dspace.content;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.junit.Assert.assertThat;
import static org.hamcrest.MatcherAssert.assertThat;
import java.io.File;
import java.io.FileInputStream;

2
dspace-api/src/test/java/org/dspace/content/ITCommunityCollection.java
View File

@@ -10,7 +10,7 @@ package org.dspace.content;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.junit.Assert.assertThat;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertTrue;
import java.io.File;

2
dspace-api/src/test/java/org/dspace/content/ITMetadata.java
View File

@@ -8,8 +8,8 @@
package org.dspace.content;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
import java.io.IOException;

2
dspace-api/src/test/java/org/dspace/content/InstallItemTest.java
View File

@@ -8,8 +8,8 @@
package org.dspace.content;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.fail;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when;

2
dspace-api/src/test/java/org/dspace/content/ItemTest.java
View File

@@ -10,9 +10,9 @@ package org.dspace.content;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.notNullValue;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import static org.mockito.ArgumentMatchers.any;

6
dspace-api/src/test/java/org/dspace/content/LicenseUtilsTest.java
View File

@@ -8,7 +8,7 @@
package org.dspace.content;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.junit.Assert.assertThat;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.fail;
import java.io.IOException;
@@ -146,7 +146,7 @@ public class LicenseUtilsTest extends AbstractUnitTest {
locale = Locale.ENGLISH;
collection = collectionService.create(context, owningCommunity);
item = installItemService.installItem(context, workspaceItemService.create(context, collection, false));
additionalInfo = new HashMap<String, Object>();
additionalInfo = new HashMap<>();
additionalInfo.put("arg1", "arg1");
additionalInfo.put("arg2", "arg2");
additionalInfo.put("arg3", "arg3");
@@ -177,7 +177,7 @@ public class LicenseUtilsTest extends AbstractUnitTest {
collection = collectionService.create(context, owningCommunity);
collection.setLicense(context, templateLong);
item = installItemService.installItem(context, workspaceItemService.create(context, collection, false));
additionalInfo = new LinkedHashMap<String, Object>();
additionalInfo = new LinkedHashMap<>();
additionalInfo.put("arg1", "arg1");
additionalInfo.put("arg2", "arg2");
additionalInfo.put("arg3", "arg3");

2
dspace-api/src/test/java/org/dspace/content/MetadataFieldTest.java
View File

@@ -10,7 +10,7 @@ package org.dspace.content;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.notNullValue;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.junit.Assert.assertThat;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import static org.mockito.Mockito.spy;

2
dspace-api/src/test/java/org/dspace/content/MetadataSchemaTest.java
View File

@@ -11,7 +11,7 @@ import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.CoreMatchers.notNullValue;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.junit.Assert.assertThat;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import static org.mockito.Mockito.spy;

2
dspace-api/src/test/java/org/dspace/content/MetadataValueTest.java
View File

@@ -10,7 +10,7 @@ package org.dspace.content;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.notNullValue;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.junit.Assert.assertThat;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;

2
dspace-api/src/test/java/org/dspace/content/RelationshipMetadataServiceTest.java
View File

@@ -8,8 +8,8 @@
package org.dspace.content;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.fail;
import java.sql.SQLException;

2
dspace-api/src/test/java/org/dspace/content/RelationshipServiceImplPlaceTest.java
View File

@@ -8,7 +8,7 @@
package org.dspace.content;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.junit.Assert.assertThat;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.fail;
import java.sql.SQLException;

2
dspace-api/src/test/java/org/dspace/content/RelationshipTypeTest.java
View File

@@ -9,7 +9,7 @@ package org.dspace.content;
import static org.hamcrest.core.IsEqual.equalTo;
import static org.hamcrest.core.IsNull.notNullValue;
import static org.junit.Assert.assertThat;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;

2
dspace-api/src/test/java/org/dspace/content/SiteTest.java
View File

@@ -9,7 +9,7 @@ package org.dspace.content;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.notNullValue;
import static org.junit.Assert.assertThat;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;

2
dspace-api/src/test/java/org/dspace/content/SupervisedItemTest.java
View File

@@ -9,7 +9,7 @@ package org.dspace.content;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.notNullValue;
import static org.junit.Assert.assertThat;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;

2
dspace-api/src/test/java/org/dspace/content/VersioningTest.java
View File

@@ -10,7 +10,7 @@ package org.dspace.content;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.notNullValue;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.junit.Assert.assertThat;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;

2
dspace-api/src/test/java/org/dspace/content/WorkspaceItemTest.java
View File

@@ -10,8 +10,8 @@ package org.dspace.content;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.notNullValue;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import static org.mockito.Mockito.doNothing;

2
dspace-api/src/test/java/org/dspace/content/packager/ITDSpaceAIP.java
View File

@@ -9,8 +9,8 @@ package org.dspace.content.packager;
import static org.hamcrest.CoreMatchers.notNullValue;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.fail;
import java.io.File;

2
dspace-api/src/test/java/org/dspace/content/packager/PackageUtilsTest.java
View File

@@ -8,9 +8,9 @@
package org.dspace.content.packager;
import static org.hamcrest.CoreMatchers.containsString;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.fail;
import java.sql.SQLException;

2
dspace-api/src/test/java/org/dspace/core/ContextTest.java
View File

@@ -10,9 +10,9 @@ package org.dspace.core;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.notNullValue;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import static org.mockito.Mockito.spy;

2
dspace-api/src/test/java/org/dspace/eperson/GroupTest.java
View File

@@ -10,7 +10,7 @@ package org.dspace.eperson;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.notNullValue;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertThat;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;

2
dspace-api/src/test/java/org/dspace/scripts/DSpaceCommandLineParameterTest.java
View File

@@ -8,7 +8,7 @@
package org.dspace.scripts;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.junit.Assert.assertThat;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertTrue;
import java.util.ArrayList;

4
dspace-api/src/test/java/org/dspace/statistics/export/FailedOpenURLTrackerServiceImplTest.java
View File

@@ -8,7 +8,7 @@
package org.dspace.statistics.export;
import static org.junit.Assert.assertEquals;
import static org.mockito.Matchers.any;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.when;
@@ -23,7 +23,7 @@ import org.junit.runner.RunWith;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.Mockito;
import org.mockito.runners.MockitoJUnitRunner;
import org.mockito.junit.MockitoJUnitRunner;
/**
* Class to test the FailedOpenURLTrackerServiceImpl

2
dspace-api/src/test/java/org/dspace/statistics/export/ITIrusExportUsageEventListener.java
View File

@@ -9,7 +9,7 @@ package org.dspace.statistics.export;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.mockito.Matchers.anyString;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;

2
dspace-api/src/test/java/org/dspace/statistics/export/processor/BitstreamEventProcessorTest.java
View File

@@ -8,7 +8,7 @@
package org.dspace.statistics.export.processor;
import static org.hamcrest.core.Is.is;
import static org.junit.Assert.assertThat;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.mockito.Mockito.mock;
import java.io.File;

2
dspace-api/src/test/java/org/dspace/statistics/export/processor/ExportEventProcessorTest.java
View File

@@ -9,8 +9,8 @@ package org.dspace.statistics.export.processor;
import static org.hamcrest.CoreMatchers.startsWith;
import static org.hamcrest.core.Is.is;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;

6
dspace-api/src/test/java/org/dspace/statistics/export/processor/ItemEventProcessorTest.java
View File

@@ -8,7 +8,7 @@
package org.dspace.statistics.export.processor;
import static org.hamcrest.core.Is.is;
import static org.junit.Assert.assertThat;
import static org.hamcrest.MatcherAssert.assertThat;
import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
@@ -32,11 +32,13 @@ import org.junit.Test;
public class ItemEventProcessorTest extends AbstractIntegrationTestWithDatabase {
private ConfigurationService configurationService = DSpaceServicesFactory.getInstance().getConfigurationService();
private final ConfigurationService configurationService
= DSpaceServicesFactory.getInstance().getConfigurationService();
private String encodedUrl;
@Before
@Override
public void setUp() throws Exception {
super.setUp();
configurationService.setProperty("irus.statistics.tracker.enabled", true);

4
dspace-api/src/test/java/org/dspace/statistics/export/service/OpenUrlServiceImplTest.java
View File

@@ -8,6 +8,7 @@
package org.dspace.statistics.export.service;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.doCallRealMethod;
@@ -26,7 +27,6 @@ import java.util.List;
import org.dspace.core.Context;
import org.dspace.statistics.export.OpenURLTracker;
import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.InjectMocks;
@@ -128,7 +128,7 @@ public class OpenUrlServiceImplTest {
String failedUrl = "failed-url";
openUrlService.logfailed(context, failedUrl);
Assert.assertThat(tracker1.getUrl(), is(failedUrl));
assertThat(tracker1.getUrl(), is(failedUrl));
}
}

12
dspace-api/src/test/java/org/dspace/workflowbasic/BasicWorkflowAuthorizationIT.java
View File

@@ -7,6 +7,8 @@
*/
package org.dspace.workflowbasic;
import static org.hamcrest.MatcherAssert.assertThat;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
@@ -208,7 +210,7 @@ public class BasicWorkflowAuthorizationIT
} finally {
context.restoreAuthSystemState();
}
Assert.assertThat("testsetWorkflowGroupSetsPermission 0",
assertThat("testsetWorkflowGroupSetsPermission 0",
collectionService.getWorkflowGroup(context, collection, step),
CoreMatchers.equalTo(group));
Assert.assertTrue(groupService.isDirectMember(group, member));
@@ -230,8 +232,7 @@ public class BasicWorkflowAuthorizationIT
} finally {
context.restoreAuthSystemState();
}
Assert
.assertThat("testsetWorkflowGroupRevokesPermission 0",
assertThat("testsetWorkflowGroupRevokesPermission 0",
collectionService.getWorkflowGroup(context, collection, step),
CoreMatchers
.equalTo(group));
@@ -244,8 +245,7 @@ public class BasicWorkflowAuthorizationIT
} finally {
context.restoreAuthSystemState();
}
Assert
.assertThat("testsetWorkflowGroupRevokesPermission 2",
assertThat("testsetWorkflowGroupRevokesPermission 2",
collectionService.getWorkflowGroup(context, collection, step),
CoreMatchers
.nullValue());
@@ -254,7 +254,7 @@ public class BasicWorkflowAuthorizationIT
}
/**
* Test that a member of a worfklow step group can claim a task and get the
* Test that a member of a workflow step group can claim a task and get the
* appropriate policies.
*/
@Test