From b58eeb853b99535f6d9947a1fd73fcc65e059461 Mon Sep 17 00:00:00 2001 From: Andrei Silviu Dragnea Date: Wed, 16 Mar 2022 22:56:31 +0200 Subject: [PATCH] Delete ListUtil and Fields --- .../internal/util/collections/ListUtil.java | 50 ------ .../internal/util/reflection/Fields.java | 158 ------------------ .../ThreadsRunAllTestsHalfManualTest.java | 17 +- .../util/collections/ListUtilTest.java | 42 ----- .../internal/util/reflection/FieldsTest.java | 91 ---------- 5 files changed, 14 insertions(+), 344 deletions(-) delete mode 100644 src/main/java/org/mockito/internal/util/collections/ListUtil.java delete mode 100644 src/main/java/org/mockito/internal/util/reflection/Fields.java delete mode 100644 src/test/java/org/mockito/internal/util/collections/ListUtilTest.java delete mode 100644 src/test/java/org/mockito/internal/util/reflection/FieldsTest.java diff --git a/src/main/java/org/mockito/internal/util/collections/ListUtil.java b/src/main/java/org/mockito/internal/util/collections/ListUtil.java deleted file mode 100644 index 2608359796..0000000000 --- a/src/main/java/org/mockito/internal/util/collections/ListUtil.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Copyright (c) 2007 Mockito contributors - * This program is made available under the terms of the MIT License. - */ -package org.mockito.internal.util.collections; - -import java.util.Collection; -import java.util.LinkedList; - -/** - * Basic list/collection operators. We know that there are existing libraries that implement those - * use cases neatly. However, we want to keep Mockito dependencies minimal. In Java8 we should be - * able to get rid of this class. - */ -@Deprecated -public final class ListUtil { - - @Deprecated - public static LinkedList filter(Collection collection, Filter filter) { - LinkedList filtered = new LinkedList(); - for (T t : collection) { - if (!filter.isOut(t)) { - filtered.add(t); - } - } - return filtered; - } - - @Deprecated - public static LinkedList convert( - Collection collection, Converter converter) { - LinkedList converted = new LinkedList(); - for (FromT f : collection) { - converted.add(converter.convert(f)); - } - return converted; - } - - @Deprecated - public interface Filter { - boolean isOut(T object); - } - - @Deprecated - public interface Converter { - To convert(FromT from); - } - - private ListUtil() {} -} diff --git a/src/main/java/org/mockito/internal/util/reflection/Fields.java b/src/main/java/org/mockito/internal/util/reflection/Fields.java deleted file mode 100644 index b244cb0c24..0000000000 --- a/src/main/java/org/mockito/internal/util/reflection/Fields.java +++ /dev/null @@ -1,158 +0,0 @@ -/* - * Copyright (c) 2007 Mockito contributors - * This program is made available under the terms of the MIT License. - */ -package org.mockito.internal.util.reflection; - -import java.lang.annotation.Annotation; -import java.lang.reflect.Field; -import java.util.ArrayList; -import java.util.List; - -import org.mockito.internal.util.Checks; -import org.mockito.internal.util.collections.ListUtil; -import org.mockito.internal.util.collections.ListUtil.Filter; - -/** - * Small fluent reflection tools to work with fields. - * - * Code is very new and might need rework. - */ -@Deprecated -public abstract class Fields { - - /** - * Instance fields declared in the class and superclasses of the given instance. - * - * @param instance Instance from which declared fields will be retrieved. - * @return InstanceFields of this object instance. - */ - @Deprecated - public static InstanceFields allDeclaredFieldsOf(Object instance) { - List instanceFields = new ArrayList<>(); - for (Class clazz = instance.getClass(); - clazz != Object.class; - clazz = clazz.getSuperclass()) { - instanceFields.addAll(instanceFieldsIn(instance, clazz.getDeclaredFields())); - } - return new InstanceFields(instance, instanceFields); - } - - /** - * Instance fields declared in the class of the given instance. - * - * @param instance Instance from which declared fields will be retrieved. - * @return InstanceFields of this object instance. - */ - @Deprecated - public static InstanceFields declaredFieldsOf(Object instance) { - List instanceFields = new ArrayList<>(); - instanceFields.addAll(instanceFieldsIn(instance, instance.getClass().getDeclaredFields())); - return new InstanceFields(instance, instanceFields); - } - - @Deprecated - private static List instanceFieldsIn(Object instance, Field[] fields) { - List instanceDeclaredFields = new ArrayList<>(); - for (Field field : fields) { - InstanceField instanceField = new InstanceField(field, instance); - instanceDeclaredFields.add(instanceField); - } - return instanceDeclaredFields; - } - - /** - * Accept fields annotated by the given annotations. - * - * @param annotations Annotation types to check. - * @return The filter. - */ - @SuppressWarnings({"unchecked", "vararg"}) - @Deprecated - public static Filter annotatedBy( - final Class... annotations) { - return new Filter() { - @Override - public boolean isOut(InstanceField instanceField) { - Checks.checkNotNull(annotations, "Provide at least one annotation class"); - - for (Class annotation : annotations) { - if (instanceField.isAnnotatedBy(annotation)) { - return false; - } - } - return true; - } - }; - } - - /** - * Accept fields with non null value. - * - * @return The filter. - */ - @Deprecated - private static Filter nullField() { - return new Filter() { - @Override - public boolean isOut(InstanceField instanceField) { - return instanceField.isNull(); - } - }; - } - - /** - * Accept fields with non null value. - * - * @return The filter. - */ - @Deprecated - public static Filter syntheticField() { - return new Filter() { - @Override - public boolean isOut(InstanceField instanceField) { - return instanceField.isSynthetic(); - } - }; - } - - @Deprecated - public static class InstanceFields { - private final Object instance; - - private final List instanceFields; - - public InstanceFields(Object instance, List instanceFields) { - this.instance = instance; - this.instanceFields = instanceFields; - } - - public InstanceFields filter(Filter withFilter) { - return new InstanceFields(instance, ListUtil.filter(instanceFields, withFilter)); - } - - public InstanceFields notNull() { - return filter(nullField()); - } - - public List instanceFields() { - return new ArrayList<>(instanceFields); - } - - public List assignedValues() { - List values = new ArrayList<>(instanceFields.size()); - for (InstanceField instanceField : instanceFields) { - values.add(instanceField.read()); - } - return values; - } - - public List names() { - List fieldNames = new ArrayList<>(instanceFields.size()); - for (InstanceField instanceField : instanceFields) { - fieldNames.add(instanceField.name()); - } - return fieldNames; - } - } -} diff --git a/src/test/java/org/concurrentmockito/ThreadsRunAllTestsHalfManualTest.java b/src/test/java/org/concurrentmockito/ThreadsRunAllTestsHalfManualTest.java index 3443c79c83..a56330cee5 100644 --- a/src/test/java/org/concurrentmockito/ThreadsRunAllTestsHalfManualTest.java +++ b/src/test/java/org/concurrentmockito/ThreadsRunAllTestsHalfManualTest.java @@ -34,7 +34,6 @@ import org.mockito.internal.stubbing.defaultanswers.ReturnsEmptyValuesTest; import org.mockito.internal.stubbing.defaultanswers.ReturnsGenericDeepStubsTest; import org.mockito.internal.util.MockUtilTest; -import org.mockito.internal.util.collections.ListUtilTest; import org.mockito.internal.verification.DefaultRegisteredInvocationsTest; import org.mockito.internal.verification.checkers.MissingInvocationCheckerTest; import org.mockito.internal.verification.checkers.MissingInvocationInOrderCheckerTest; @@ -57,7 +56,20 @@ import org.mockitousage.stubbing.BasicStubbingTest; import org.mockitousage.stubbing.ReturningDefaultValuesTest; import org.mockitousage.stubbing.StubbingWithThrowablesTest; -import org.mockitousage.verification.*; +import org.mockitousage.verification.AtMostXVerificationTest; +import org.mockitousage.verification.BasicVerificationInOrderTest; +import org.mockitousage.verification.BasicVerificationTest; +import org.mockitousage.verification.DescriptiveMessagesOnVerificationInOrderErrorsTest; +import org.mockitousage.verification.DescriptiveMessagesWhenTimesXVerificationFailsTest; +import org.mockitousage.verification.DescriptiveMessagesWhenVerificationFailsTest; +import org.mockitousage.verification.ExactNumberOfTimesVerificationTest; +import org.mockitousage.verification.NoMoreInteractionsVerificationTest; +import org.mockitousage.verification.RelaxedVerificationInOrderTest; +import org.mockitousage.verification.SelectedMocksInOrderVerificationTest; +import org.mockitousage.verification.VerificationInOrderMixedWithOrdinaryVerificationTest; +import org.mockitousage.verification.VerificationInOrderTest; +import org.mockitousage.verification.VerificationOnMultipleMocksUsingMatchersTest; +import org.mockitousage.verification.VerificationUsingMatchersTest; import org.mockitoutil.TestBase; public class ThreadsRunAllTestsHalfManualTest extends TestBase { @@ -70,7 +82,6 @@ public void run() { Result result = JUnitCore.runClasses( EqualsTest.class, - ListUtilTest.class, MockingProgressImplTest.class, TimesTest.class, MockHandlerImplTest.class, diff --git a/src/test/java/org/mockito/internal/util/collections/ListUtilTest.java b/src/test/java/org/mockito/internal/util/collections/ListUtilTest.java deleted file mode 100644 index 6f47fe29b5..0000000000 --- a/src/test/java/org/mockito/internal/util/collections/ListUtilTest.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright (c) 2007 Mockito contributors - * This program is made available under the terms of the MIT License. - */ -package org.mockito.internal.util.collections; - -import static java.util.Arrays.asList; - -import static org.junit.Assert.assertTrue; - -import java.util.LinkedList; -import java.util.List; - -import org.assertj.core.api.Assertions; -import org.junit.Test; -import org.mockito.internal.util.collections.ListUtil.Filter; -import org.mockitoutil.TestBase; - -public class ListUtilTest extends TestBase { - - @Test - public void shouldFilterList() throws Exception { - List list = asList("one", "x", "two", "x", "three"); - List filtered = - ListUtil.filter( - list, - new Filter() { - public boolean isOut(String object) { - return object == "x"; - } - }); - - Assertions.assertThat(filtered).containsSequence("one", "two", "three"); - } - - @Test - public void shouldReturnEmptyIfEmptyListGiven() throws Exception { - List list = new LinkedList(); - List filtered = ListUtil.filter(list, null); - assertTrue(filtered.isEmpty()); - } -} diff --git a/src/test/java/org/mockito/internal/util/reflection/FieldsTest.java b/src/test/java/org/mockito/internal/util/reflection/FieldsTest.java deleted file mode 100644 index 270cfaefdf..0000000000 --- a/src/test/java/org/mockito/internal/util/reflection/FieldsTest.java +++ /dev/null @@ -1,91 +0,0 @@ -/* - * Copyright (c) 2007 Mockito contributors - * This program is made available under the terms of the MIT License. - */ -package org.mockito.internal.util.reflection; - -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.internal.util.reflection.Fields.syntheticField; - -import java.lang.reflect.Field; - -import org.junit.Test; - -public class FieldsTest { - - @Test - public void fields_should_return_all_declared_fields_in_hierarchy() throws Exception { - assertThat( - Fields.allDeclaredFieldsOf(new HierarchyOfClasses()) - .filter(syntheticField()) - .names()) - .containsOnly("a", "b", "static_a", "static_b"); - } - - @Test - public void fields_should_return_declared_fields() throws Exception { - assertThat( - Fields.declaredFieldsOf(new HierarchyOfClasses()) - .filter(syntheticField()) - .names()) - .containsOnly("b", "static_b"); - } - - @Test - public void can_filter_not_null_fields() throws Exception { - assertThat( - Fields.declaredFieldsOf(new NullOrNotNullFields()) - .notNull() - .filter(syntheticField()) - .names()) - .containsOnly("c"); - } - - @Test - public void can_get_values_of_instance_fields() throws Exception { - assertThat( - Fields.declaredFieldsOf(new ValuedFields()) - .filter(syntheticField()) - .assignedValues()) - .containsOnly("a", "b"); - } - - @Test - public void can_get_list_of_InstanceField() throws Exception { - ValuedFields instance = new ValuedFields(); - - assertThat(Fields.declaredFieldsOf(instance).filter(syntheticField()).instanceFields()) - .containsOnly( - new InstanceField(field("a", instance), instance), - new InstanceField(field("b", instance), instance)); - } - - private Field field(String name, Object instance) throws NoSuchFieldException { - return instance.getClass().getDeclaredField(name); - } - - interface AnInterface { - int someStaticInInterface = 0; - } - - public static class ParentClass implements AnInterface { - static int static_a; - int a; - } - - public static class HierarchyOfClasses extends ParentClass { - static int static_b; - int b = 1; - } - - public static class NullOrNotNullFields { - static Object static_b; - Object b; - Object c = new Object(); - } - - public static class ValuedFields { - String a = "a"; - String b = "b"; - } -}