diff --git a/build.gradle b/build.gradle index 8b82b5a1..fc5fbbdf 100644 --- a/build.gradle +++ b/build.gradle @@ -73,7 +73,7 @@ dependencies { testImplementation 'junit:junit:4.13.2' - implementation 'org.mockito:mockito-core:3.6.0' + implementation 'org.mockito:mockito-core:5.11.0' implementation group: 'org.apache.commons', name: 'commons-csv', version: '1.6' } diff --git a/src/main/java/org/carlmontrobotics/lib199/Mocks.java b/src/main/java/org/carlmontrobotics/lib199/Mocks.java index f20db5d8..18cc06de 100644 --- a/src/main/java/org/carlmontrobotics/lib199/Mocks.java +++ b/src/main/java/org/carlmontrobotics/lib199/Mocks.java @@ -85,7 +85,7 @@ public static T createMock(Class classToMock, U implClass, boolean for public static T createMock(Class classToMock, U implClass, Answer defaultAnswer, Class... interfaces) { HashMap methods = new HashMap<>(); for(Method m: listMethods(classToMock, interfaces)) { - if(Modifier.isStatic(m.getModifiers()) || Modifier.isFinal(m.getModifiers())) { + if(Modifier.isStatic(m.getModifiers())) { continue; } try { diff --git a/src/test/java/org/carlmontrobotics/lib199/MocksTest.java b/src/test/java/org/carlmontrobotics/lib199/MocksTest.java index b202e7d5..d6703c11 100644 --- a/src/test/java/org/carlmontrobotics/lib199/MocksTest.java +++ b/src/test/java/org/carlmontrobotics/lib199/MocksTest.java @@ -22,7 +22,7 @@ public void testSimpleMock() { assertFalse(mock instanceof TestInterface); assertEquals(1, mock.test1()); assertEquals(3, mock.test2()); - assertEquals(3, mock.test3()); + assertEquals(4, mock.test3()); } @Test @@ -37,7 +37,7 @@ public void testNullDefaultAnswer() { TestBase mock = Mocks.createMock(TestBase.class, new TestImpl(), false); assertEquals(0, mock.test1()); assertEquals(3, mock.test2()); - assertEquals(3, mock.test3()); + assertEquals(4, mock.test3()); } @Test @@ -45,7 +45,7 @@ public void testCustomDefaultAnswer() { TestBase mock = Mocks.createMock(TestBase.class, new TestImpl(), invocation -> 5); assertEquals(5, mock.test1()); assertEquals(3, mock.test2()); - assertEquals(3, mock.test3()); + assertEquals(4, mock.test3()); } public class TestBase {