Fixed typo

ssaip · Jun 1, 2016 · a2a6dbb · a2a6dbb
1 parent 2714492
commit a2a6dbb
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 34 deletions.
diff --git a/api/easymock/src/main/java/org/powermock/api/easymock/PowerMock.java b/api/easymock/src/main/java/org/powermock/api/easymock/PowerMock.java
@@ -392,7 +392,7 @@ public static synchronized <T> T createPartialMockForAllMethodsExcept(Class<T> t
            */
         final Class<?>[] argumentTypes = mergeArgumentTypes(firstArgumentType, moreTypes);
 
-        return createMock(type, WhiteboxImpl.getAllMetodsExcept(type, methodNameToExclude, argumentTypes));
+        return createMock(type, WhiteboxImpl.getAllMethodsExcept(type, methodNameToExclude, argumentTypes));
     }
 
     /**
@@ -416,7 +416,7 @@ public static synchronized <T> T createNicePartialMockForAllMethodsExcept(Class<
            */
         final Class<?>[] argumentTypes = mergeArgumentTypes(firstArgumentType, moreTypes);
 
-        return createNiceMock(type, WhiteboxImpl.getAllMetodsExcept(type, methodNameToExclude, argumentTypes));
+        return createNiceMock(type, WhiteboxImpl.getAllMethodsExcept(type, methodNameToExclude, argumentTypes));
     }
 
     /**
@@ -440,7 +440,7 @@ public static synchronized <T> T createStrictPartialMockForAllMethodsExcept(Clas
            */
         final Class<?>[] argumentTypes = mergeArgumentTypes(firstArgumentType, moreTypes);
 
-        return createStrictMock(type, WhiteboxImpl.getAllMetodsExcept(type, methodNameToExclude, argumentTypes));
+        return createStrictMock(type, WhiteboxImpl.getAllMethodsExcept(type, methodNameToExclude, argumentTypes));
     }
 
     /**

diff --git a/changelog.txt b/changelog.txt
@@ -1,6 +1,7 @@
 Change log next version
 -----------------------
 * Fix #668 @Mock fields are not injected anymore (1.6.5 regression)
+* Renamed org.powermock.reflect.internal.WhiteboxImpl.getAllMetodsExcept to org.powermock.reflect.internal.WhiteboxImpl.getAllMethodsExcept (typo)
 
 Change log 1.6.5 (2015-04-30)
 -----------------------------

diff --git a/reflect/src/main/java/org/powermock/reflect/internal/WhiteboxImpl.java b/reflect/src/main/java/org/powermock/reflect/internal/WhiteboxImpl.java
@@ -18,45 +18,19 @@
 import org.objenesis.Objenesis;
 import org.objenesis.ObjenesisStd;
 import org.objenesis.instantiator.ObjectInstantiator;
-import org.powermock.reflect.exceptions.ConstructorNotFoundException;
-import org.powermock.reflect.exceptions.FieldNotFoundException;
-import org.powermock.reflect.exceptions.MethodInvocationException;
-import org.powermock.reflect.exceptions.MethodNotFoundException;
-import org.powermock.reflect.exceptions.TooManyConstructorsFoundException;
-import org.powermock.reflect.exceptions.TooManyFieldsFoundException;
-import org.powermock.reflect.exceptions.TooManyMethodsFoundException;
+import org.powermock.reflect.exceptions.*;
 import org.powermock.reflect.internal.comparator.ComparatorFactory;
-import org.powermock.reflect.internal.matcherstrategies.AllFieldsMatcherStrategy;
-import org.powermock.reflect.internal.matcherstrategies.AssignableFromFieldTypeMatcherStrategy;
-import org.powermock.reflect.internal.matcherstrategies.AssignableToFieldTypeMatcherStrategy;
-import org.powermock.reflect.internal.matcherstrategies.FieldAnnotationMatcherStrategy;
-import org.powermock.reflect.internal.matcherstrategies.FieldMatcherStrategy;
-import org.powermock.reflect.internal.matcherstrategies.FieldNameMatcherStrategy;
+import org.powermock.reflect.internal.matcherstrategies.*;
 import org.powermock.reflect.internal.primitivesupport.BoxedWrapper;
 import org.powermock.reflect.internal.primitivesupport.PrimitiveWrapper;
 import org.powermock.reflect.matching.FieldMatchingStrategy;
 import org.powermock.reflect.spi.ProxyFramework;
 
 import java.lang.annotation.Annotation;
-import java.lang.reflect.Array;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.lang.reflect.Proxy;
+import java.lang.reflect.*;
 import java.security.AccessController;
 import java.security.PrivilegedAction;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.LinkedHashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 
 /**
  * Various utilities for accessing internals of a class. Basically a simplified
@@ -1946,7 +1920,7 @@ public static <T> Method[] getAllMethodExcept(Class<T> type, String... methodNam
      * @param argumentTypes       the argument types
      * @return the all metods except
      */
-    public static <T> Method[] getAllMetodsExcept(Class<T> type, String methodNameToExclude, Class<?>[] argumentTypes) {
+    public static <T> Method[] getAllMethodsExcept(Class<T> type, String methodNameToExclude, Class<?>[] argumentTypes) {
         Method[] methods = getAllMethods(type);
         List<Method> methodList = new ArrayList<Method>();
         outer: