This is an automated email from the git hooks/post-receive script. apo pushed a commit to branch master in repository easymock.
commit fcac443bbd5d034f57b1708d0042ea290ca9ad22 Author: Markus Koschany <a...@debian.org> Date: Thu Apr 12 20:13:36 2018 +0200 Rebase no-android.patch. --- debian/changelog | 1 + debian/patches/no-android.patch | 131 ++++++++++++++++++++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 133 insertions(+) diff --git a/debian/changelog b/debian/changelog index 424bc20..eeb0a65 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ easymock (3.6-1) unstable; urgency=medium * Declare compliance with Debian Policy 4.1.4. * Use compat level 11. * Build-depend on libmaven-enforcer-plugin-java and libanimal-sniffer-java. + * Rebase no-android.patch. -- Markus Koschany <a...@debian.org> Thu, 12 Apr 2018 19:58:32 +0200 diff --git a/debian/patches/no-android.patch b/debian/patches/no-android.patch new file mode 100644 index 0000000..2cec676 --- /dev/null +++ b/debian/patches/no-android.patch @@ -0,0 +1,131 @@ +From: Markus Koschany <a...@debian.org> +Date: Thu, 12 Apr 2018 20:13:25 +0200 +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 16243eb..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<Method>(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 c328735..a096fdf 100644 +--- a/core/src/main/java/org/easymock/internal/MocksControl.java ++++ b/core/src/main/java/org/easymock/internal/MocksControl.java +@@ -155,9 +155,6 @@ public class MocksControl implements IMocksControl, IExpectationSetters<Object>, + } + + // ///CLOVER:OFF +- if (AndroidSupport.isAndroid()) { +- return classProxyFactory = new AndroidClassProxyFactory(); +- } + // ///CLOVER:ON + + return classProxyFactory = new ClassProxyFactory(); diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..d1d13c1 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +no-android.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/easymock.git _______________________________________________ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits