internal/fix-another-integration-tests (#312)

* Set Default charset to UTF-8 in Integration tests

* Fixed test in the ExternalHandleRestRepositoryIT - problem was with encoding

* Fixed WorkspaceItemRestRepositoryIT#patchRejectLicenseTest - the configuration property that disable LicenseValidation was set to false.

* Fixed ClarinDiscoveryRestControllerIT.java#discoverFacetsDateTestWithLabels
FacetEntryMatcher.dateIssuedFacet(false), was missing

* Fixed ClarinDiscoveryRestControllerIT.java#discoverSearchObjectsTestWithBasicQuery missing FacetEntryMatcher.dateIssuedFacet(false),

* Fixed ClarinDiscoveryRestControllerIT tests by updating the discovery.xml

* Fixed MetadataExportSearchIT.exportMetadataSearchFilterDate - commented out the test for Date Issued date search filter which was removed from the discovery.xml

* test  (#317)

* Initial commit

* Fixed SystemWideAlertRestRepositoryIT - wrong Date comparing, the fix was copied from the upstream

* Copied fix from the upstream

* Enabled distribution license validation.

dspace-api/src/test/java/org/dspace/app/bulkedit/MetadataExportSearchIT.java

@@ -169,15 +169,17 @@ public void exportMetadataSearchFilter() throws Exception {
         checkItemsPresentInFile(filename, itemsSubject1);
     }
 
-    @Test
-    public void exportMetadataSearchFilterDate() throws Exception {
-        int result = runDSpaceScript(
-            "metadata-export-search", "-f", "dateIssued,equals=[2000 TO 2020]", "-n", filename
-        );
-
-        assertEquals(0, result);
-        checkItemsPresentInFile(filename, itemsSubject1);
-    }
+    // CLARIN - CLARIN-DSpace doesn't use DateIssues search filter (commented in the discovery.xml), so this test
+    // is failing
+//    @Test
+//    public void exportMetadataSearchFilterDate() throws Exception {
+//        int result = runDSpaceScript(
+//            "metadata-export-search", "-f", "dateIssued,equals=[2000 TO 2020]", "-n", filename
+//        );
+//
+//        assertEquals(0, result);
+//        checkItemsPresentInFile(filename, itemsSubject1);
+//    }
 
     @Test
     public void exportMetadataSearchMultipleFilters() throws Exception {

dspace-server-webapp/src/test/java/org/dspace/app/rest/BitstreamFormatRestRepositoryIT.java

@@ -56,7 +56,7 @@ public class BitstreamFormatRestRepositoryIT extends AbstractControllerIntegrati
     @Autowired
     private BitstreamFormatConverter bitstreamFormatConverter;
 
-    private final int DEFAULT_AMOUNT_FORMATS = 81;
+    private final int DEFAULT_AMOUNT_FORMATS = 85;
 
     @Test
     public void findAllPaginationTest() throws Exception {

dspace-server-webapp/src/test/java/org/dspace/app/rest/ExternalHandleRestRepositoryIT.java

@@ -81,7 +81,7 @@ public void findAllExternalHandles() throws Exception {
 
         getClient().perform(get("/api/services/handles/magic"))
                 .andExpect(status().isOk())
-                .andExpect(content().contentType(MediaType.APPLICATION_JSON))
+                .andExpect(content().contentType(MediaType.valueOf("application/json;charset=UTF-8")))
                 .andExpect(jsonPath("$", ExternalHandleMatcher.matchListOfExternalHandles(
                         expectedExternalHandles
                 )))

dspace-server-webapp/src/test/java/org/dspace/app/rest/WorkspaceItemRestRepositoryIT.java

@@ -43,6 +43,7 @@
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.UUID;
 import java.util.concurrent.atomic.AtomicReference;
@@ -127,6 +128,7 @@ public class WorkspaceItemRestRepositoryIT extends AbstractControllerIntegration
     public void setUp() throws Exception {
         super.setUp();
         context.turnOffAuthorisationSystem();
+        Locale.setDefault(new Locale.Builder().setLanguage("en").setRegion("US").build());
         this.groupService = EPersonServiceFactory.getInstance().getGroupService();
 
         embargoedGroups = GroupBuilder.createGroup(context)
@@ -3748,6 +3750,8 @@ public void patchRejectLicenseTest() throws Exception {
 
         //disable file upload mandatory
         configurationService.setProperty("webui.submit.upload.required", false);
+        // enable distribution license validation
+        configurationService.setProperty("webui.submit.distribution.license.required", true);
 
         context.restoreAuthSystemState();
 

dspace/config/spring/api/discovery.xml

@@ -170,7 +170,7 @@
             <list>
                 <ref bean="searchFilterAuthor" />
                 <ref bean="searchFilterSubject" />
-                <ref bean="searchFilterIssued" />
+<!--                <ref bean="searchFilterIssued" />-->
                 <ref bean="searchFilterRights" />
                 <ref bean="searchFilterLanguage" />
                 <ref bean="searchFilterContentInOriginalBundle"/>
@@ -186,7 +186,7 @@
                 <ref bean="searchFilterTitle" />
                 <ref bean="searchFilterAuthor" />
                 <ref bean="searchFilterSubject" />
-                <ref bean="searchFilterIssued" />
+<!--                <ref bean="searchFilterIssued" />-->
                 <ref bean="searchFilterContentInOriginalBundle"/>
                 <ref bean="searchFilterFileNameInOriginalBundle" />
                 <ref bean="searchFilterFileDescriptionInOriginalBundle" />

pom.xml

@@ -524,7 +524,7 @@
                 </property>
             </activation>
             <properties>
-                <test.argLine>-Xmx1024m</test.argLine>
+                <test.argLine>-Xmx1024m -Dfile.encoding=UTF-8</test.argLine>
             </properties>
         </profile>