Package: easymock / 4.0.2-1

no-android.patch Patch series | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
From: Markus Koschany <apo@debian.org>
Date: Tue, 30 Oct 2018 12:45:25 +0100
Subject: no android

---
 .../internal/AndroidClassProxyFactory.java         | 101 ---------------------
 .../java/org/easymock/internal/MocksControl.java   |   3 -
 2 files changed, 104 deletions(-)
 delete mode 100644 core/src/main/java/org/easymock/internal/AndroidClassProxyFactory.java

diff --git a/core/src/main/java/org/easymock/internal/AndroidClassProxyFactory.java b/core/src/main/java/org/easymock/internal/AndroidClassProxyFactory.java
deleted file mode 100644
index 3aa140d..0000000
--- a/core/src/main/java/org/easymock/internal/AndroidClassProxyFactory.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Copyright 2001-2018 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.easymock.internal;
-
-import java.io.IOException;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.easymock.ConstructorArgs;
-
-import org.droidparts.dexmaker.stock.ProxyBuilder;
-
-// ///CLOVER:OFF (sadly not possible to test android with clover)
-/**
- * Mocks concrete classes for Android's runtime by generating dex files.
- */
-public final class AndroidClassProxyFactory implements IProxyFactory {
-    public <T> T createProxy(Class<T> toMock, InvocationHandler handler,
-            Method[] mockedMethods, ConstructorArgs constructorArgs) {
-        MockHandler interceptor = new MockHandler(handler, mockedMethods);
-        try {
-            ProxyBuilder<T> builder = ProxyBuilder.forClass(toMock)
-                    .handler(interceptor);
-            if (constructorArgs != null) {
-                builder.constructorArgTypes(constructorArgs.getConstructor().getParameterTypes())
-                        .constructorArgValues(constructorArgs.getInitArgs());
-            } else {
-                try {
-                    DefaultClassInstantiator instantiator = new DefaultClassInstantiator();
-                    Constructor<?> constructor = instantiator.getConstructorToUse(toMock);
-                    Object[] params = instantiator.getArgsForTypes(constructor.getParameterTypes());
-                    builder.constructorArgTypes(constructor.getParameterTypes())
-                            .constructorArgValues(params);
-                } catch (InstantiationException e) {
-                    throw new RuntimeException("Fail to instantiate mock for " + toMock);
-                }
-            }
-            return builder.build();
-        } catch (IOException e) {
-            throw new RuntimeException("Failed to mock " + toMock, e);
-        }
-    }
-
-    public InvocationHandler getInvocationHandler(Object mock) {
-        MockHandler mockHandler = (MockHandler) ProxyBuilder.getInvocationHandler(mock);
-        return mockHandler.delegate;
-    }
-
-    private static class MockHandler implements InvocationHandler {
-        private final InvocationHandler delegate;
-        private final Set<Method> mockedMethods;
-
-        public MockHandler(InvocationHandler delegate, Method... mockedMethods) {
-            this.delegate = delegate;
-            this.mockedMethods = (mockedMethods != null)
-                    ? new HashSet<>(Arrays.asList(mockedMethods))
-                    : null;
-        }
-
-        public Object invoke(Object obj, Method method, Object[] args) throws Throwable {
-            if (method.isBridge()) {
-                method = BridgeMethodResolver.findBridgedMethod(method);
-            }
-
-            // Never intercept EasyMock's own calls to fillInStackTrace
-            boolean internalFillInStackTraceCall = obj instanceof Throwable
-                    && method.getName().equals("fillInStackTrace")
-                    && ClassProxyFactory.isCallerMockInvocationHandlerInvoke(new Throwable());
-
-            if (internalFillInStackTraceCall
-                    || isMocked(method) && !Modifier.isAbstract(method.getModifiers())) {
-                return ProxyBuilder.callSuper(obj, method, args);
-            }
-
-            return delegate.invoke(obj, method, args);
-        }
-
-        private boolean isMocked(Method method) {
-            return mockedMethods != null && !mockedMethods.contains(method);
-        }
-    }
-}
-// ///CLOVER:ON
diff --git a/core/src/main/java/org/easymock/internal/MocksControl.java b/core/src/main/java/org/easymock/internal/MocksControl.java
index d029b78..895a22e 100644
--- a/core/src/main/java/org/easymock/internal/MocksControl.java
+++ b/core/src/main/java/org/easymock/internal/MocksControl.java
@@ -131,9 +131,6 @@ public class MocksControl implements IMocksControl, IExpectationSetters<Object>,
         }
 
         // ///CLOVER:OFF
-        if (AndroidSupport.isAndroid()) {
-            return classProxyFactory = new AndroidClassProxyFactory();
-        }
         // ///CLOVER:ON
 
         return classProxyFactory = new ClassProxyFactory();