Merge branch 'master' of https://github.com/eugenp/tutorials into

task/JAVA-13721

# Conflicts:
#	testing-modules/mockito-simple/pom.xml

testing-modules/mockito-simple/src/test/java/com/baeldung/mockito/mockfinal/MockFinalsUnitTest.java

@@ -3,8 +3,10 @@ package com.baeldung.mockito.mockfinal;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.withSettings;
 
 import org.junit.jupiter.api.Test;
+import org.mockito.MockMakers;
 
 import com.baeldung.mockito.FinalList;
 import com.baeldung.mockito.MyList;
@@ -28,4 +30,14 @@ class MockFinalsUnitTest {
 
         assertThat(mock.size()).isNotEqualTo(1);
     }
+
+    @Test
+    public void whenMockFinalMethodMockWorks_withInlineMockMaker() {
+        MyList myList = new MyList();
+
+        MyList mock = mock(MyList.class, withSettings().mockMaker(MockMakers.INLINE));
+        when(mock.finalMethod()).thenReturn(1);
+
+        assertThat(mock.finalMethod()).isNotEqualTo(myList.finalMethod());
+    }
 }