implementation of FINERACT-724 (Upgrade Spring Boot, Spring and Spring Security to their latest stable version)

fineract-provider/src/test/java/org/apache/fineract/infrastructure/core/boot/tests/AbstractSpringBootWithMariaDB4jIntegrationTest.java

@@ -20,21 +20,19 @@ package org.apache.fineract.infrastructure.core.boot.tests;
 
 import org.apache.fineract.ServerWithMariaDB4jApplication;
 import org.junit.runner.RunWith;
-import org.springframework.boot.test.IntegrationTest;
-import org.springframework.boot.test.SpringApplicationConfiguration;
+import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.web.WebAppConfiguration;
 
 @RunWith(SpringJUnit4ClassRunner.class)
-@SpringApplicationConfiguration(classes = ServerWithMariaDB4jApplication.Configuration.class)
+@SpringBootTest(classes = ServerWithMariaDB4jApplication.Configuration.class)
 @WebAppConfiguration
 @ActiveProfiles("basicauth")
-@IntegrationTest({ "server.port=0", "management.port=0", "mariaDB4j.port=0", "mariaDB4j.dataDir=null" })
 public abstract class AbstractSpringBootWithMariaDB4jIntegrationTest {
 
 	// do NOT put any helper methods here!
 	// it's much better to use composition instead of inheritance
 	// so write a test util ("fixture") and use it as a field in your test
 
-}
+}

fineract-provider/src/test/java/org/apache/fineract/mix/report/service/XBRLBuilderTest.java

@@ -20,6 +20,7 @@ package org.apache.fineract.mix.report.service;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
+import static org.mockito.Mockito.lenient;
 import static org.mockito.Mockito.when;
 
 import java.io.ByteArrayInputStream;
@@ -55,10 +56,10 @@ public class XBRLBuilderTest {
     private final XBRLBuilder xbrlBuilder = new XBRLBuilder();
 
     @Before
-    public void setUp() throws Exception {
+    public void setUp() {
 
         this.readNamespaceService = Mockito.mock(NamespaceReadPlatformServiceImpl.class);
-        when(this.readNamespaceService.retrieveNamespaceByPrefix(Matchers.anyString())).thenReturn(
+        lenient().when(this.readNamespaceService.retrieveNamespaceByPrefix(Matchers.anyString())).thenReturn(
                 new NamespaceData(1l, "mockedprefix", "mockedurl"));
 
     }

fineract-provider/src/test/java/org/apache/fineract/notification/StorageTest.java

@@ -19,6 +19,7 @@
 
 package org.apache.fineract.notification;
 
+import edu.emory.mathcs.backport.java.util.Collections;
 import org.apache.fineract.notification.domain.Notification;
 import org.apache.fineract.notification.domain.NotificationMapper;
 import org.apache.fineract.notification.service.NotificationGeneratorReadRepositoryWrapper;
@@ -32,9 +33,11 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.runners.MockitoJUnitRunner;
+import org.springframework.security.core.userdetails.User;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.Optional;
 
 import static org.junit.Assert.assertEquals;
 import static org.mockito.Mockito.*;
@@ -86,8 +89,10 @@ public class StorageTest {
                 getCurrentDateTime()
         );
 
-
-        AppUser appUser = this.appUserRepository.findOne(1L);
+        AppUser appUser = new AppUser(null, new User("J.J.", "", true, true,
+                true, true, Collections.emptyList()),
+                null, "user@com", "John", "", null, false,
+                 false, null);
 
         NotificationMapper notificationMapper = new NotificationMapper(
                 notification,
@@ -96,10 +101,9 @@ public class StorageTest {
                 getCurrentDateTime()
         );
 
-
         when(this.notificationGeneratorWritePlatformService.create(refEq(notification))).thenReturn(1L);
 
-        when(this.appUserRepository.findOne(userId)).thenReturn(appUser);
+        when(this.appUserRepository.findById(userId)).thenReturn(Optional.of(appUser));
 
         when(this.notificationGeneratorReadRepositoryWrapper.findById(1L)).thenReturn(notification);
 

fineract-provider/src/test/java/org/apache/fineract/notification/TopicTest.java

@@ -91,8 +91,8 @@ public class TopicTest {
 	
 	@Test
 	public void testTopicSubscriberStorage() {
-		AppUser user = appUserRepository.findOne(1L);
-		Topic topic = topicRepository.findOne(1L);
+		AppUser user = appUserRepository.findById(1L).get();
+		Topic topic = topicRepository.findById(1L).get();
 		
 		TopicSubscriber topicSubscriber = new TopicSubscriber(topic, user, new Date());