Satisfy Checkstyle. Small tidy-ups. #2956

This commit is contained in:
Mark H. Wood
2020-11-18 18:02:05 -05:00
parent 87cfac01d4
commit 96742fe558
5 changed files with 9 additions and 7 deletions

View File

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

View File

@@ -9,8 +9,8 @@ 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.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;

View File

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

View File

@@ -8,8 +8,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.hamcrest.core.Is.is;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.mock;
@@ -44,15 +44,17 @@ import org.mockito.Mock;
public class ExportEventProcessorTest extends AbstractIntegrationTestWithDatabase {
@Mock
private HttpServletRequest request = mock(HttpServletRequest.class);
private final HttpServletRequest request = mock(HttpServletRequest.class);
private ConfigurationService configurationService = DSpaceServicesFactory.getInstance().getConfigurationService();
private final ConfigurationService configurationService
= DSpaceServicesFactory.getInstance().getConfigurationService();
private EntityType publication;
private EntityType otherEntity;
private final String excluded_type = "Excluded type";
@Before
@Override
public void setUp() throws Exception {
super.setUp();

View File

@@ -7,8 +7,8 @@
*/
package org.dspace.statistics.export.processor;
import static org.hamcrest.core.Is.is;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.core.Is.is;
import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;